nodejs-file-downloader - npm Package Compare versions

Comparing version 1.1.1 to 1.2.0

Downloader.js

@@ -66,2 +66,3 @@ const fs = require('fs');
    * @param {string} [config.auth] 
+   * @param {boolean} [config.useSynchronousMode = false] 
    */
@@ -79,2 +80,3 @@ constructor(config) {
       timeout: 6000,
+      useSynchronousMode:false,
       // proxy: null,
@@ -190,2 +192,3 @@ // auth:null,
   async getFinalFileName() {
+    // debugger;
     let fileName;
@@ -198,6 +201,6 @@ if (this.config.fileName) {
     // debugger;
-    var fileProcessor = new FileProcessor({ fileName, path: this.config.directory })
+    var fileProcessor = new FileProcessor({useSynchronousMode:this.config.useSynchronousMode, fileName, path: this.config.directory })
     // debugger;
     // if (! await fileProcessor.pathExists(this.config.directory)) {
-    if (!fileProcessor.pathExists(this.config.directory)) {
+    if (!await fileProcessor.pathExists(this.config.directory)) {
       // debugger;
@@ -215,4 +218,4 @@ try {
       // debugger;
-      // fileName = await fileProcessor.getAvailableFileName()
-      fileName = fileProcessor.getAvailableFileName()
+      fileName = await fileProcessor.getAvailableFileName()
+      // fileName = fileProcessor.getAvailableFileName()
     }
@@ -219,0 +222,0 @@

FileProcessor.js

 const path = require('path');
 const fs = require('fs');
+// const { resolve } = require('path');
 
@@ -8,4 +9,3 @@
 
-        // console.log(config)
-        // debugger;
+   
         this.originalFileName = config.fileName;
@@ -16,46 +16,64 @@ this.fileExtension = path.extname(this.originalFileName);
 
-        // console.log(this);
+        this.useSynchronousMode = config.useSynchronousMode || false;
+        
     }
 
-    // async getAvailableFileName() {
+ 
     getAvailableFileName() {
+        if (this.useSynchronousMode) {
+            // console.log('useSynchronousMode')
+            return this.createNewFileNameSync(this.originalFileName);
+        }
 
-        // return await this.createNewFileName(this.originalFileName);
-        return this.createNewFileName(this.originalFileName);
-    }
+        return new Promise(async (resolve) => {
+            // console.log('useSynchronousMode!!',this.useSynchronousMode)
+            try {
+                const name = await this.createNewFileName(this.originalFileName);
+                resolve(name);
+            } catch (error) {
+                reject(error);
+            }
 
-    // pathExists(path) {
-    //     return new Promise((resolve, reject) => {
-    //         fs.open(path, 'r', (err, fd) => {
-    //             if (err) {
-    //                 // debugger;
-    //                 if (err.code === 'ENOENT') {
-    //                     return resolve(false)
-    //                 }
+        })
 
-    //                 reject(err)
-    //             } else {
-    //                 // debugger;
-    //                 resolve(true)
-    //             }
+    }
 
+    pathExistsSync(path){
+        return fs.existsSync(path);
+    }
 
-    //         });
-    //     })
 
-    // }
     pathExists(path) {
-        if(fs.existsSync(path)) return true;
+        // debugger;
+        if(this.useSynchronousMode){
+            // console.log('path',path)
+            return this.pathExistsSync(path);
+        }
+       
+        // console.log('useSynchronousMode',this.useSynchronousMode)
 
-        return false;
+        return new Promise((resolve, reject) => {
+            fs.open(path, 'r', (err) => {
+                // debugger;
+                if (err) {
+                    if (err.code === 'ENOENT') {
+                        // console.error('myfile does not exist');
+                        return resolve(false);
+                    }
 
+                    reject(err);
+                }
+
+                resolve(true);
+            });
+        })
+
+
     }
 
-    // async createNewFileName(fileName, counter = 1) {
-    createNewFileName(fileName, counter = 1) {
 
+    createNewFileNameSync(fileName, counter = 1) {
 
-        // if (! await this.fileNameExists(fileName)) {
-        if (!this.fileNameExists(fileName)) {
-            // console.log('new file name', newFileName)
+
+        if (!this.pathExistsSync(this.basePath +fileName)) {
             return fileName;
@@ -67,37 +85,55 @@ }
 
-        // return await this.createNewFileName(newFileName, counter);
-        return this.createNewFileName(newFileName, counter);
+        return this.createNewFileNameSync(newFileName, counter);
 
     }
 
+    async createNewFileName(fileName, counter = 1) {
 
-    fileNameExists(fileName) {
-        return this.pathExists(this.basePath + fileName);
-        // debugger;
-        // return new Promise((resolve, reject) => {
-        //     fs.open(this.basePath + fileName, 'r', (err) => {
-        //         debugger;
-        //         if (err) {
-        //             if (err.code === 'ENOENT') {
-        //                 // console.error('myfile does not exist');
-        //                 return resolve(false);
-        //             }
 
-        //             reject(err);
-        //         }
+        if (! await this.pathExists(this.basePath + fileName)) {
 
-        //         resolve(true);
-        //     });
-        // })
+            return fileName;
+        }
 
-        // if (fs.existsSync(this.basePath+fileName)) {
-        //     // console.log(`file ${fileName} already exists!`);
-        //     return true;
-        // }
-        // // console.log(`file ${fileName} is being created for the first time`);
-        // return false;
+        counter = counter + 1;
+        let newFileName = this.fileNameWithoutExtension + counter + this.fileExtension;
 
+        return await this.createNewFileName(newFileName, counter);
+
     }
+
+
+
+    // fileNameExistsSync(fileName) {
+    //     if (this.useSynchronousMode) {
+    //         return this.pathExists(this.basePath + fileName);
+    //     }
+
+
+
+    // }
+
+    // fileNameExists(fileName) {
+
+
+    //     return new Promise((resolve, reject) => {
+    //         fs.open(this.basePath + fileName, 'r', (err) => {
+    //             debugger;
+    //             if (err) {
+    //                 if (err.code === 'ENOENT') {
+    //                     // console.error('myfile does not exist');
+    //                     return resolve(false);
+    //                 }
+
+    //                 reject(err);
+    //             }
+
+    //             resolve(true);
+    //         });
+    //     })
+
+
+    // }
 }
 
 module.exports = FileProcessor;

package.json

 {
   "name": "nodejs-file-downloader",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "A file fownloader for NodeJs",
@@ -5,0 +5,0 @@ "main": "Downloader.js",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

2808845

increased by0.03%

Lines of code

591

increased by2.96%

No dependency changes