@gudhub/core 1.0.44 → 1.0.47

package/GUDHUB/Managers/FileManager/FileManager.js

@@ -26,29 +26,11 @@ export class FileManager {
     }
   }
 
-  async uploadFileFromStringApi(
-    source,
-    file_name,
-    app_id,
-    item_id,
-    extension,
-    format,
-    element_id
-  ) {
+  async uploadFileFromStringApi(fileObject) {
     try {
-      const fileObj = {
-        app_id,
-        item_id,
-        extension,
-        file_name,
-        format,
-        element_id,
-        source,
-      };
-
       const file = await this.req.post({
         url: "/file/upload",
-        form: { file: JSON.stringify(fileObj) },
+        form: { file: JSON.stringify(fileObject) },
       });
       return file;
     } catch (err) {
@@ -78,7 +60,7 @@ export class FileManager {
     }
   }
 
-  async duplicateFile(files) {
+  async duplicateFileApi(files) {
     return this.req.post({
       url: "/api/new/file/duplicate",
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
@@ -88,6 +70,31 @@ export class FileManager {
     });
   }
 
+  async downloadFileFromString(app_id, file_id) {
+    if(await this.isFileExists(app_id, file_id)) {
+      let file = await this.getFile(app_id, file_id);
+      let data = await this.req.get({
+        url: file.url + '?timestamp=' + file.last_update,
+        externalResource: true
+      });
+      return {
+        file,
+        data,
+        type: 'file'
+      }
+    } else {
+      return false;
+    }
+  }
+
+  async duplicateFile(files) {
+    let duplicatedFiles = await this.duplicateFileApi(files);
+    duplicatedFiles.forEach(file => {
+      this.addFileToStorage(file.app_id, file);
+    });
+    return duplicatedFiles;
+  }
+
   async deleteFileApi(id) {
     try {
       const file = await this.req.get({
@@ -105,6 +112,7 @@ export class FileManager {
     if (app) {
       app.file_list.push(file);
       this.storage.updateApp(app);
+      this.pipeService.emit("gh_file_upload", { app_id }, file);
     }
   }
 
@@ -113,15 +121,26 @@ export class FileManager {
     if (app) {
       app.file_list.push(...files);
       this.storage.updateApp(app);
+      files.forEach(file => {
+        this.pipeService.emit("gh_file_upload", { app_id }, file);
+      });
     }
   }
 
   deleteFileFromStorage(fileId, app_id) {
     const app = this.storage.getApp(app_id);
     if (app) {
-      app.file_list = app.file_list.filter((file) => file.file_id != fileId);
+      let deletedFile;
+      app.file_list = app.file_list.filter((file) =>  {
+        if(file.file_id != fileId) {
+          return true;
+        } else {
+          deletedFile = file;
+          return false;
+        }
+      });
       this.storage.updateApp(app);
-      this.pipeService.emit("gh_file_delete", { file_id: fileId }, file);
+      this.pipeService.emit("gh_file_delete", { file_id: fileId }, deletedFile);
     }
   }
 
@@ -137,29 +156,35 @@ export class FileManager {
   }
 
   async getFile(app_id, file_id) {
-    try {
-      const app = await this.appProcessor.getApp(app_id);
-      return app.file_list.find((file) => {
-        return file.file_id == file_id;
+    const app = await this.appProcessor.getApp(app_id);
+    return new Promise((resolve,reject) => {
+      let findedFile = app.file_list.find((file) => {
+        return file.file_id == file_id
       });
-    } catch (err) {
-      console.log(err);
-      return null;
-    }
-  }
+      if(findedFile) {
+        resolve(findedFile)
+      } else {
+        resolve('')
+      }
+    })
+}
 
-  async getFiles(app_id, filesId = []) {
-    try {
-      const app = await this.appProcessor.getApp(app_id);
-      return app.file_list.filter((file) => {
+async getFiles(app_id, filesId = []) {
+  
+    const app = await this.appProcessor.getApp(app_id);
+    return new Promise((resolve, reject) => {
+      let findedFiles = app.file_list.filter((file) => {
         return filesId.some(id => {
           return id == file.file_id;
-        })});
-    } catch (err) {
-      console.log(err);
-      return null;
-    }
-  }
+        })
+      });
+      if(findedFiles) {
+        resolve(findedFiles);
+      } else {
+        resolve('')
+      }
+    })
+}
 
   async uploadFile(fileData, app_id, item_id) {
     const file = await this.uploadFileApi(fileData, app_id, item_id);
@@ -167,25 +192,9 @@ export class FileManager {
     return file;
   }
 
-  async uploadFileFromString(
-    source,
-    file_name,
-    app_id,
-    item_id,
-    extension,
-    format,
-    element_id
-  ) {
-    const file = await this.uploadFileFromStringApi(
-      source,
-      file_name,
-      app_id,
-      item_id,
-      extension,
-      format,
-      element_id
-    );
-    this.addFileToStorage(app_id, file);
+  async uploadFileFromString(fileObject) {
+    const file = await this.uploadFileFromStringApi(fileObject);
+    this.addFileToStorage(file.app_id, file);
     return file;
   }
 
@@ -201,8 +210,23 @@ export class FileManager {
     return file;
   }
 
-  deleteFile(app_id, id) {
-    this.deleteFileApi(id);
+  async deleteFile(id, app_id) {
+    await this.deleteFileApi(id);
     this.deleteFileFromStorage(id, app_id);
+    return true;
+  }
+
+  async isFileExists(app_id, file_id) {
+    let urlPattern = /^(https?:\/\/)?([\da-z\.-]+)\.([a-z\.]{2,6})([\/\w \.-]*)*\/?$/;
+    if(Boolean(file_id)) {
+      let file = await this.getFile(app_id, file_id);
+      if(Boolean(file)) {
+        return urlPattern.test(file.url);
+      } else {
+        return false;
+      }
+    } else {
+      return false;
+    }
   }
 }

package/GUDHUB/Managers/FileManager/file_manager.test.js

@@ -8,10 +8,27 @@ describe("FILE MANAGER", function () {
       let file = await gudhub.getFile(16259,809199);
       file.should.have.property("url","https://gudhub.com/userdata/16259/809199.jpg");
     });
+    
     it("GET FILES URL's", async function () {
       //-- checking if file exist
       let files = await gudhub.getFiles(16259,[809199,811768]);
       files[0].should.have.property("url","https://gudhub.com/userdata/16259/809199.jpg");
       files[1].should.have.property("url", "https://gudhub.com/userdata/16259/811768.png");
     });
+
+    it("CHECK IF FILE EXISTS", async function() {
+      let existingFile = await gudhub.fileManager.isFileExists(16259,809199);
+      let notExistingFile = await gudhub.fileManager.isFileExists(16259,300);
+      
+      existingFile.should.equals(true);
+      notExistingFile.should.equals(false);
+    });
+
+    it("DOWNLOAD FILE", async function() {
+      let file = await gudhub.downloadFileFromString(16259,811769);
+
+      file.file.url.should.equals('https://gudhub.com/userdata/16259/811769.html');
+      file.data.should.not.be.empty();
+    });
+    
   });

package/GUDHUB/gudhub-https-service.js

@@ -31,13 +31,17 @@ export class GudHubHttpsService {
     }
 
      const promise = new Promise((resolve, reject) => {
-      const url = this.root + request.url;
+      let url;
+      if(request.externalResource) {
+        url = request.url;
+      } else {
+        url = this.root + request.url;
+        url = `${url}${
+         /\?/.test(url) ? "&" : "?"
+       }token=${accessToken}${convertObjToUrlParams(request.params)}`;
+      }
 
-      axios.get(
-        `${url}${
-          /\?/.test(url) ? "&" : "?"
-        }token=${accessToken}${convertObjToUrlParams(request.params)}`
-      ).then(function (response) {
+      axios.get(url).then(function (response) {
         // handle success
         resolve(response.data);
       })

package/GUDHUB/gudhub.js

@@ -359,6 +359,10 @@ export class GudHub {
     return this.fileManager.duplicateFile(files);
   }
 
+  downloadFileFromString(app_id, file_id) {
+    return this.fileManager.downloadFileFromString(app_id, file_id);
+  }
+
   createDocument(documentObject) {
     return this.documentManager.createDocument(documentObject);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.0.44",
+  "version": "1.0.47",
   "description": "",
   "main": "index.js",
   "scripts": {