@mfgames-writing/format 4.2.4 → 4.2.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/cmds/build.js +5 -2
- package/lib/cmds/build.js.map +1 -1
- package/lib/image.js +27 -48
- package/lib/image.js.map +1 -1
- package/package.json +1 -1
package/lib/cmds/build.js
CHANGED
|
@@ -101,6 +101,7 @@ async function loadPublication(args, argv) {
|
|
|
101
101
|
if (argv.config) {
|
|
102
102
|
// The user provided a -c or --config option. We need the absolute
|
|
103
103
|
// path though to ensure everything works.
|
|
104
|
+
args.logger.debug("using configuration", argv.config);
|
|
104
105
|
publicationFile = path.resolve(argv.config);
|
|
105
106
|
}
|
|
106
107
|
else {
|
|
@@ -142,8 +143,10 @@ async function chooseEditions(args) {
|
|
|
142
143
|
// If we have arguments that list build, we want to filter that. If
|
|
143
144
|
// there are no targets, then we include everything.
|
|
144
145
|
count++;
|
|
145
|
-
|
|
146
|
-
|
|
146
|
+
args.logger.trace("chooseEditions", "edition", editionName, "argv", args.argv);
|
|
147
|
+
if (args.argv.editions && args.argv.editions.length > 0) {
|
|
148
|
+
if (args.argv.editions.indexOf(editionName) < 0) {
|
|
149
|
+
args.logger.trace("skipping edition", editionName, "because not in the list", args.argv.editions);
|
|
147
150
|
continue;
|
|
148
151
|
}
|
|
149
152
|
}
|
package/lib/cmds/build.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/cmds/build.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"build.js","sourceRoot":"","sources":["../../src/cmds/build.ts"],"names":[],"mappings":"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"}
|
package/lib/image.js
CHANGED
|
@@ -123,61 +123,40 @@ function getFormatImageRequest(content, href, imagePath) {
|
|
|
123
123
|
};
|
|
124
124
|
return results;
|
|
125
125
|
}
|
|
126
|
-
function processImage(content, imageRequest) {
|
|
126
|
+
async function processImage(content, imageRequest) {
|
|
127
127
|
// Make a little noise.
|
|
128
|
-
content.logger.debug(
|
|
128
|
+
content.logger.debug(`${content.source}: processing image: ${imageRequest.imagePath}`);
|
|
129
129
|
// Start by reading in the image.
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
// Making the image opaque.
|
|
141
|
-
if (imageRequest.opaque) {
|
|
142
|
-
promise = promise.then((image) => {
|
|
130
|
+
try {
|
|
131
|
+
let image = await jimp.Jimp.read(imageRequest.imagePath);
|
|
132
|
+
// Grayscaling the image.
|
|
133
|
+
if (imageRequest.grayscale) {
|
|
134
|
+
content.logger.trace(`${content.source}: making image grayscale`);
|
|
135
|
+
image.greyscale();
|
|
136
|
+
}
|
|
137
|
+
// Making the image opaque.
|
|
138
|
+
if (imageRequest.opaque) {
|
|
139
|
+
content.logger.trace(`${content.source}: adding white background`);
|
|
143
140
|
var width = image.bitmap.width;
|
|
144
141
|
var height = image.bitmap.height;
|
|
145
142
|
var color = 0xffffff;
|
|
146
143
|
var background = new jimp.Jimp({ width, height, color });
|
|
147
|
-
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
promise = promise.then((image) => {
|
|
158
|
-
return new Promise((resolve, reject) => {
|
|
159
|
-
let buffer = image.getBuffer(imageRequest.mime, (err, buffer) => {
|
|
160
|
-
if (err)
|
|
161
|
-
reject(err);
|
|
162
|
-
resolve(buffer);
|
|
163
|
-
});
|
|
164
|
-
});
|
|
165
|
-
});
|
|
166
|
-
promise = promise.then((buffer) => {
|
|
144
|
+
image = background.composite(image, 0, 0);
|
|
145
|
+
}
|
|
146
|
+
// Scaling images.
|
|
147
|
+
if (imageRequest?.scale && imageRequest.scale !== 1.0) {
|
|
148
|
+
content.logger.trace(`${content.source}: scaling image to ${imageRequest.scale}`);
|
|
149
|
+
image.scale(imageRequest.scale);
|
|
150
|
+
}
|
|
151
|
+
// After we're done processing, pull it out and return it.
|
|
152
|
+
content.logger.trace(`${content.source}: generating image for ${imageRequest.mime}`);
|
|
153
|
+
let buffer = await image.getBuffer(imageRequest.mime);
|
|
167
154
|
imageRequest.buffer = buffer;
|
|
168
155
|
return imageRequest;
|
|
169
|
-
}
|
|
170
|
-
|
|
156
|
+
}
|
|
157
|
+
catch (exception) {
|
|
158
|
+
content.logger.error(`${content.source}: could not process image`, exception);
|
|
159
|
+
throw exception;
|
|
160
|
+
}
|
|
171
161
|
}
|
|
172
|
-
/*
|
|
173
|
-
return jimp.read(data.buffer)
|
|
174
|
-
.then((image: any) => {
|
|
175
|
-
if (data.scale !== 1.00) {
|
|
176
|
-
image = image.scale(data.scale);
|
|
177
|
-
}
|
|
178
|
-
return image;
|
|
179
|
-
})
|
|
180
|
-
.then((image: any) => {
|
|
181
|
-
let buffer = image.getBuffer(data.mime, (err, buffer) => {
|
|
182
|
-
*/
|
|
183
162
|
//# sourceMappingURL=image.js.map
|
package/lib/image.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image.js","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"image.js","sourceRoot":"","sources":["../src/image.ts"],"names":[],"mappings":"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"}
|