Don't throw error on file unlink

modules/item/back/methods/item-image-queue/download.js

@@ -11,14 +11,19 @@ module.exports = Self => {
         accessType: 'WRITE',
         http: {
             path: `/download`,
-            verb: 'POST'
+            verb: 'POST',
-        }
+        },
     });
 
     Self.download = async () => {
         const models = Self.app.models;
-        const tempContainer = await models.TempContainer.container('salix-image');
+        const tempContainer = await models.TempContainer.container(
-        const tempPath = path.join(tempContainer.client.root, tempContainer.name);
+            'salix-image'
+        );
+        const tempPath = path.join(
+            tempContainer.client.root,
+            tempContainer.name
+        );
         const maxAttempts = 3;
         const collectionName = 'catalog';
 
@@ -29,55 +34,58 @@ module.exports = Self => {
         try {
             const myOptions = { transaction: tx };
 
-            queueRow = await Self.findOne({
+            queueRow = await Self.findOne(
-                fields: [
+                {
-                    'id',
+                    fields: ['id', 'itemFk', 'url', 'attempts'],
-                    'itemFk',
-                    'url',
-                    'attempts'
-                ],
                     where: {
                         url: { neq: null },
                         attempts: {
-                        lt: maxAttempts
+                            lt: maxAttempts,
-                    }
                         },
-                order: 'priority, attempts, updated'
+                    },
-            }, myOptions);
+                    order: 'priority, attempts, updated',
+                },
+                myOptions
+            );
 
             if (!queueRow) return;
 
-            const collection = await models.ImageCollection.findOne({
+            const collection = await models.ImageCollection.findOne(
+                {
                     fields: [
                         'id',
                         'maxWidth',
                         'maxHeight',
                         'model',
-                    'property'
+                        'property',
                     ],
                     where: { name: collectionName },
                     include: {
                         relation: 'sizes',
                         scope: {
-                        fields: ['width', 'height', 'crop']
+                            fields: ['width', 'height', 'crop'],
-                    }
+                        },
-                }
+                    },
-            }, myOptions);
+                },
+                myOptions
+            );
 
             const fileName = `${uuid.v4()}.png`;
             tempFilePath = path.join(tempPath, fileName);
 
             // Insert image row
-            await models.Image.create({
+            await models.Image.create(
+                {
                     name: fileName,
                     collectionFk: collectionName,
-                updated: Date.vnNow()
+                    updated: Date.vnNow(),
-            }, myOptions);
+                },
+                myOptions
+            );
 
             // Update item
             const model = models[collection.model];
-            if (!model)
+            if (!model) throw new Error('No matching model found');
-                throw new Error('No matching model found');
 
             const item = await model.findById(queueRow.itemFk, null, myOptions);
             if (item) {
@@ -101,7 +109,9 @@ module.exports = Self => {
             });
 
             // Resize
-            const container = await models.ImageContainer.container(collectionName);
+            const container = await models.ImageContainer.container(
+                collectionName
+            );
             const rootPath = container.client.root;
             const collectionDir = path.join(rootPath, collectionName);
 
@@ -139,8 +149,7 @@ module.exports = Self => {
                             .crop(width, height);
                     }
 
-                    if (!size.crop)
+                    if (!size.crop) gmInstance.resize(width, height, '>');
-                        gmInstance.resize(width, height, '>');
 
                     gmInstance
                         .setFormat('png')
@@ -151,8 +160,9 @@ module.exports = Self => {
                 });
             }
 
-            if (await fs.stat(tempFilePath))
+            try {
                 await fs.unlink(tempFilePath);
+            } catch (error) { }
 
             await queueRow.destroy(myOptions);
 
@@ -167,7 +177,7 @@ module.exports = Self => {
                 await queueRow.updateAttributes({
                     error: error,
                     attempts: queueRow.attempts + 1,
-                    updated: Date.vnNew()
+                    updated: Date.vnNew(),
                 });
             }