Skip to content

Commit da66ec5

Browse files
odednivodedniv
committed
config option to change the extension
1 parent 513c53b commit da66ec5

7 files changed

Lines changed: 96 additions & 11 deletions

File tree

‎README.md‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,8 @@ It's copy of our example file `config.json.sample`. More or less it looks like:
6464
"size": 600,
6565
"directory": "./resized/600-jpeg",
6666
"format": "jpg",
67-
"background": "white"
67+
"background": "white",
68+
"changeExtension": true
6869
},
6970
{
7071
"size": 900,
@@ -88,6 +89,7 @@ It's copy of our example file `config.json.sample`. More or less it looks like:
8889
| | template | Object | Map representing pattern substitution pair. Mode details in [DIRECTORY.md](doc/DIRECTORY.md/#template) |
8990
| | prefix | String | Prepend filename prefix if supplied. |
9091
| | suffix | String | Append filename suffix if supplied. |
92+
| | changeExtension | Boolean | Change the extension to match the actual file type. |
9193
| | acl | String | Permission of S3 object. [See AWS ACL documentation](http://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#putObject-property). |
9294
| | move | Boolean | If `true`, an original uploaded file will delete from Bucket after completion. |
9395
| reduce | - | Object | Reduce setting following fields. |
@@ -98,6 +100,7 @@ It's copy of our example file `config.json.sample`. More or less it looks like:
98100
| | template | Object | Map representing pattern substitution pair. Mode details in [DIRECTORY.md](doc/DIRECTORY.md/#template) |
99101
| | prefix | String | Prepend filename prefix if supplied. |
100102
| | suffix | String | Append filename suffix if supplied. |
103+
| | changeExtension | Boolean | Change the extension to match the actual file type. |
101104
| | acl | String | Permission of S3 object. [See AWS ACL documentation](http://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#putObject-property). |
102105
| resize | - | Array | Resize setting list of following fields. |
103106
| | size | String | Image dimensions. [See ImageMagick geometry documentation](http://imagemagick.org/script/command-line-processing.php#geometry). |
@@ -112,6 +115,7 @@ It's copy of our example file `config.json.sample`. More or less it looks like:
112115
| | template | Object | Map representing pattern substitution pair. Mode details in [DIRECTORY.md](doc/DIRECTORY.md/#template) |
113116
| | prefix | String | Prepend filename prefix if supplied. |
114117
| | suffix | String | Append filename suffix if supplied. |
118+
| | changeExtension | Boolean | Change the extension to match the actual file type. |
115119
| | acl | String | Permission of S3 object. [See AWS ACL documentation](http://docs.aws.amazon.com/AWSJavaScriptSDK/latest/AWS/S3.html#putObject-property). |
116120
| optimizers | - | Object | Definitions for override the each Optimizers command arguments. |
117121
| | pngquant | Array | `Pngquant` command arguments. Default is `["--speed=1", "256"]`. |

‎bin/configtest‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ var reset = '\u001b[0m';
6565
stdout.write("--------------------------------\r\n");
6666
if ( "backup" in config ) {
6767
var backup = config.backup || {};
68-
validateDestination(stdout, bucket, backup.bucket, backup.directory, backup.template);
68+
validateDestination(stdout, bucket, backup.bucket, backup.directory, backup.template, backup.changeExtension);
6969
validatePrefixAndSuffix(stdout, backup.prefix, backup.suffix);
7070
validateAcl(stdout, acl, backup.acl);
7171
} else {
@@ -79,7 +79,7 @@ var reset = '\u001b[0m';
7979
var reduce = config.reduce || {};
8080
validateQuality(stdout, reduce.quality);
8181
validateOptimizer(stdout, reduce.jpegOptimizer || jpegOptimizer);
82-
validateDestination(stdout, bucket, reduce.bucket, reduce.directory, reduce.template);
82+
validateDestination(stdout, bucket, reduce.bucket, reduce.directory, reduce.template, reduce.changeExtension);
8383
validatePrefixAndSuffix(stdout, reduce.prefix, reduce.suffix);
8484
validateAcl(stdout, acl, reduce.acl);
8585
} else {
@@ -99,7 +99,7 @@ var reset = '\u001b[0m';
9999
validateFormat(stdout, resize.format);
100100
validateQuality(stdout, resize.quality);
101101
validateOptimizer(stdout, resize.jpegOptimizer || jpegOptimizer);
102-
validateDestination(stdout, bucket, resize.bucket, resize.directory, resize.template);
102+
validateDestination(stdout, bucket, resize.bucket, resize.directory, resize.template, resize.changeExtension);
103103
validatePrefixAndSuffix(stdout, resize.prefix, resize.suffix);
104104
validateAcl(stdout, acl, resize.acl);
105105
stdout.write("\r\n");
@@ -171,7 +171,7 @@ var reset = '\u001b[0m';
171171
}
172172
}
173173

174-
function validateDestination(stdout, globalBucket, bucket, directory, template) {
174+
function validateDestination(stdout, globalBucket, bucket, directory, template, changeExtension) {
175175
var color = reset;
176176
if ( ! bucket && ! globalBucket && (! directory || /^\.\//.test(directory)) && (! template || ! template.pattern)) {
177177
warning.push(" Saving image to the same or relative directory may cause infinite Lambda process loop.");
@@ -192,6 +192,7 @@ var reset = '\u001b[0m';
192192
stdout.write("[Same directory]");
193193
}
194194
stdout.write(reset + "\r\n");
195+
stdout.write(magenta + " Change extension: " + reset + Boolean(changeExtension) + "\r\n");
195196
}
196197

197198
function validatePrefixAndSuffix(stdout, prefix, suffix) {

‎config.json.sample‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
{
1111
"size": 300,
1212
"directory": "./resized/small",
13-
"prefix": "resized-"
13+
"prefix": "resized-",
14+
"changeExtension": true
1415
},
1516
{
1617
"size": 450,

‎lib/ImageArchiver.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ class ImageArchiver {
3434
directory: option.directory,
3535
template: option.template,
3636
prefix: option.prefix,
37-
suffix: option.suffix
37+
suffix: option.suffix,
38+
changeExtension: option.changeExtension
3839
}),
3940
option.bucket || image.bucketName,
4041
image.data,

‎lib/ImageData.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,9 @@ class ImageData {
160160
combineWithDirectory(output) {
161161
const prefix = output.prefix || "";
162162
const suffix = output.suffix || "";
163-
const fileName = path.parse(this.baseName).name;
164-
const extension = "." + this.type.ext;
163+
const parsed = path.parse(this.baseName);
164+
const fileName = parsed.name;
165+
const extension = output.changeExtension ? ("." + this.type.ext) : parsed.ext;
165166

166167
const template = output.template;
167168
if ( typeof template === "object" && template.pattern ) {

‎lib/ImageReducer.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ class ImageReducer {
4242
directory: option.directory,
4343
template: option.template,
4444
prefix: option.prefix,
45-
suffix: option.suffix
45+
suffix: option.suffix,
46+
changeExtension: option.changeExtension
4647
}),
4748
option.bucket || image.bucketName,
4849
buffer,

‎test/e2e-jpeg.js‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,11 +125,87 @@ test("Resize JPEG with format", async t => {
125125
}));
126126
t.is(images.length, 2);
127127

128+
const pngImage = images.shift();
129+
t.is(pngImage.fileName, "HappyFace.jpg");
130+
t.true(pngImage.data.length > 0);
131+
132+
const gifImage = images.shift();
133+
t.is(gifImage.fileName, "HappyFace.jpg");
134+
t.true(gifImage.data.length > 0);
135+
});
136+
137+
test("Resize JPEG with format and changeExtension", async t => {
138+
await processor.run(new Config({
139+
"resizes": [
140+
{
141+
"size": 100,
142+
"format": "png",
143+
"changeExtension": true
144+
},
145+
{
146+
"size": 100,
147+
"format": "gif",
148+
"changeExtension": true
149+
}
150+
]
151+
}));
152+
t.is(images.length, 2);
153+
128154
const pngImage = images.shift();
129155
t.is(pngImage.fileName, "HappyFace.png");
130156
t.true(pngImage.data.length > 0);
131157

132158
const gifImage = images.shift();
133159
t.is(gifImage.fileName, "HappyFace.gif");
134160
t.true(gifImage.data.length > 0);
135-
});
161+
});
162+
163+
test("Resize JPEG with format", async t => {
164+
await processor.run(new Config({
165+
"resizes": [
166+
{
167+
"size": 100,
168+
"format": "png"
169+
},
170+
{
171+
"size": 100,
172+
"format": "gif"
173+
}
174+
]
175+
}));
176+
t.is(images.length, 2);
177+
178+
const pngImage = images.shift();
179+
t.is(pngImage.fileName, "HappyFace.jpg");
180+
t.true(pngImage.data.length > 0);
181+
182+
const gifImage = images.shift();
183+
t.is(gifImage.fileName, "HappyFace.jpg");
184+
t.true(gifImage.data.length > 0);
185+
});
186+
187+
test("Resize JPEG with format and changeExtension", async t => {
188+
await processor.run(new Config({
189+
"resizes": [
190+
{
191+
"size": 100,
192+
"format": "png",
193+
"changeExtension": true
194+
},
195+
{
196+
"size": 100,
197+
"format": "gif",
198+
"changeExtension": true
199+
}
200+
]
201+
}));
202+
t.is(images.length, 2);
203+
204+
const pngImage = images.shift();
205+
t.is(pngImage.fileName, "HappyFace.png");
206+
t.true(pngImage.data.length > 0);
207+
208+
const gifImage = images.shift();
209+
t.is(gifImage.fileName, "HappyFace.gif");
210+
t.true(gifImage.data.length > 0);
211+
});

0 commit comments

Comments
 (0)