Merge remote-tracking branch 'old-origin/master' into jim-merge # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.

Author: dashjim

source/new-image-handler/src/processor/image/interlace.ts

@@ -26,9 +26,9 @@ export class InterlaceAction implements IImageAction {
 
   public async process(ctx: IImageContext, params: string[]): Promise<void> {
     const opt = this.validate(params);
-    if (opt.interlace) {
+    const metadata = await ctx.image.metadata();
+    if (('jpg' === metadata.format || 'jpeg' === metadata.format) && opt.interlace) {
       ctx.image.jpeg({ progressive: true });
     }
-
   }
 }

source/new-image-handler/test/processor/image/interlace.test.ts

@@ -33,7 +33,7 @@ test('Interlace action validate', () => {
 });
 
 
-test('quality action', async () => {
+test('interlace,1', async () => {
   const image = sharp((await fixtureStore.get('example.jpg')).buffer);
   const ctx: IImageContext = { image, bufferStore: fixtureStore, features: {} };
   const action = new InterlaceAction();
@@ -43,11 +43,24 @@ test('quality action', async () => {
 });
 
 
-test('quality action', async () => {
+test('interlace,0', async () => {
   const image = sharp((await fixtureStore.get('example.jpg')).buffer);
   const ctx: IImageContext = { image, bufferStore: fixtureStore, features: {} };
   const action = new InterlaceAction();
   await action.process(ctx, 'interlace,0'.split(','));
   const { info } = await ctx.image.toBuffer({ resolveWithObject: true });
   expect(info.format).toBe(sharp.format.jpeg.id);
+});
+
+test('interlace,1 for gif', async () => {
+  const image = sharp((await fixtureStore.get('example.gif')).buffer, { animated: true });
+  const ctx: IImageContext = { image, bufferStore: fixtureStore, features: {} };
+  const action = new InterlaceAction();
+  await action.process(ctx, 'interlace,1'.split(','));
+  const { data, info } = await ctx.image.toBuffer({ resolveWithObject: true });
+
+  expect(info.format).toBe(sharp.format.gif.id);
+
+  const metadata = await sharp(data, { animated: true }).metadata();
+  expect(metadata.pages).toBe(3);
 });