vtb-appit 0.0.42 → 0.0.45

package/appit.js

@@ -102,6 +102,9 @@ class Appit {
             let model = await this.createExcursion({...excursion, ...images, workspace_id: this.transformer.workspace_id});
             this.history.excursionId = model.data.id;
         } else {
+            if(excursion.hasOwnProperty('code'))
+                delete excursion.code;
+                
             await this.updateExcursion(this.history.excursionId, {...excursion, ...images, workspace_id: this.transformer.workspace_id});
         }
     }
@@ -270,9 +273,9 @@ class Appit {
         return [];
     }
 
-    getImages(media, crop)
+    async getImages(media, crop)
     {
-        const result = {
+        let result = {
             file_size: [],
             file_mime_type: [],
             file_name: [],
@@ -281,12 +284,30 @@ class Appit {
             file_type: []
         };
         
-        return new Promise((resolve, reject) => {
-            media.forEach(image => {
+        const parsed = await this.getImageParsed(media, crop);
+
+        parsed.forEach(image => {
+            result.file_name.push(image.file_name);
+            result.file_path.push(image.file_path);
+            result.file_mime_type.push(image.file_mime_type);
+            result.file_size.push(image.file_size);
+            result.file_active.push(image.file_active);
+            result.file_type.push(image.file_type);
+        });
+
+        return result;
+    }
+
+    getImageParsed(media, crop)
+    {
+        let promises = []
+        
+        media.forEach(image => {
+            promises.push(new Promise((resolve, reject) => {
                 const regex = (image.url.match(/amazonaws\.com/)) ? /\.com\/(.*?)\/((?:.*?)\/(?:.*?))\//g : /\.(?:nl|com|travel|io|be)\.?\/((?:.*?)\/(?:.*?))\//g;
                 const match = regex.exec(image.url);
     
-                if(match) {
+                if(match && image.url.indexOf('flightdata') === -1) {
                     let replace = (match.length == 3) ? match[2] : match[1];
                     image.url = image.url.replace(replace, crop);
                 }
@@ -296,22 +317,26 @@ class Appit {
                     res.on('data', chunk => {
                         body += chunk;
                     })
-                  
+                
                     res.on('end', () => {
                         const frags = image.url.split('/');
-                        result.file_name.push(frags[frags.length - 1]);
-                        result.file_path.push(image.url);
-                        result.file_mime_type.push(res.headers['content-type']);
-                        result.file_size.push(res.headers['content-length']);
-                        result.file_active.push(1)
-                        result.file_type.push(1);
-
-                        resolve(result);
+
+                        resolve({
+                            file_name: frags[frags.length - 1],
+                            file_path: image.url,
+                            file_mime_type: res.headers['content-type'],
+                            file_size: res.headers['content-length'],
+                            file_active: 1,
+                            file_type: 1
+                        });
                     })
                 });
                 req.end();
-            });
-        })
+            }));
+        });
+        
+
+        return Promise.all(promises);
     }
 
     async mediaToBase64(media)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "vtb-appit",
-    "version": "0.0.42",
+    "version": "0.0.45",
     "description": "",
     "main": "index.js",
     "scripts": {