improvements

mkloubert · Jun 30, 2018 · fb65002 · fb65002
1 parent c6d0dab
commit fb65002
Show file tree

Hide file tree

Showing 9 changed files with 96 additions and 227 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 [![Share via Facebook](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Facebook.png)](https://www.facebook.com/sharer/sharer.php?u=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&quote=vscode-deploy-reloaded) [![Share via Twitter](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Twitter.png)](https://twitter.com/intent/tweet?source=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&text=vscode-deploy-reloaded:%20https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&via=mjkloubert) [![Share via Google+](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Google+.png)](https://plus.google.com/share?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) [![Share via Pinterest](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Pinterest.png)](https://pinterest.com/pin/create/button/?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&media=https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/demo1.gif&description=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.) [![Share via Reddit](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Reddit.png)](https://www.reddit.com/submit?url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&title=vscode-deploy-reloaded) [![Share via LinkedIn](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/LinkedIn.png)](https://www.linkedin.com/shareArticle?mini=true&url=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&title=vscode-deploy-reloaded&summary=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.&source=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded) [![Share via Wordpress](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Wordpress.png)](https://wordpress.com/press-this.php?u=https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded&quote=vscode-deploy-reloaded&s=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20%27vs-deploy%27%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.&i=https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/demo1.gif) [![Share via Email](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/share/Email.png)](mailto:?subject=vscode-deploy-reloaded&body=Recoded%20version%20of%20Visual%20Studio%20Code%20extension%20'vs-deploy'%2C%20which%20provides%20commands%20to%20deploy%20files%20to%20one%20or%20more%20destinations.:%20https%3A%2F%2Fmarketplace.visualstudio.com%2Fitems%3FitemName%3Dmkloubert.vscode-deploy-reloaded)
 
+## 0.79.0 (June 30th, 2018; improvements)
+
+* added `useGlobalQueue` [setting](https://github.com/mkloubert/vscode-deploy-reloaded/wiki#settings--)
+* code cleanups and improvements
+* updated the following [npm](https://www.npmjs.com/) modules:
+  * [vscode-helpers](https://www.npmjs.com/package/vscode-helpers) `^2.9.0`
+
 ## 0.78.0 (June 30th, 2018; speed improvements)
 
 * improved speed of auto deploy

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
  "name": "vscode-deploy-reloaded",
  "displayName": "Deploy (Reloaded)",
  "description": "Deploys files of a workspace to a destination.",
- "version": "0.78.0",
+ "version": "0.79.0",
  "publisher": "mkloubert",
  "engines": {
   "vscode": "^1.24.0"
@@ -71615,6 +71615,11 @@
        "type": "integer",
        "minimum": 0
       },
+      "useGlobalQueue": {
+       "description": "Use a global queue for all deploy operations or not.",
+       "type": "boolean",
+       "default": false
+      },
       "values": {
        "description": "One or more values to define.",
        "type": "object",
@@ -71900,7 +71905,6 @@
   "@types/node": "^7.0.66",
   "@types/node-emoji": "^1.8.0",
   "@types/nodemailer": "^4.6.2",
-  "@types/p-queue": "^2.3.1",
   "@types/public-ip": "^2.3.0",
   "@types/pug": "^2.0.4",
   "@types/sanitize-filename": "^1.1.28",
@@ -71966,7 +71970,6 @@
   "node-simple-socket": "^2.8.1",
   "node-zip": "^1.1.1",
   "nodemailer": "^4.6.7",
-  "p-queue": "^2.4.2",
   "parse-listing": "^1.1.3",
   "public-ip": "^2.4.0",
   "pug": "^2.0.3",
@@ -71976,6 +71979,6 @@
   "tmp": "0.0.33",
   "uglify-js": "^3.4.2",
   "uuid": "^3.3.2",
-  "vscode-helpers": "^2.7.0"
+  "vscode-helpers": "^2.9.0"
  }
 }
diff --git a/src/contracts.ts b/src/contracts.ts
@@ -321,6 +321,10 @@ export interface Configuration extends deploy_packages.WithFastFileCheckSettings
      * The time (in milliseconds) to wait before activating 'remove on change' feature.
      */
     readonly timeToWaitBeforeActivateRemoveOnChange?: number;
+    /**
+     * Use a global queue for all deploy operations or not.
+     */
+    readonly useGlobalQueue?: boolean;
 }
 
 /**

diff --git a/src/delete.ts b/src/delete.ts
@@ -162,19 +162,21 @@ export async function deleteFilesIn(files: string[],
                                     deleteLocalFiles?: boolean) {
     const ME: deploy_workspaces.Workspace = this;
 
-    await deploy_helpers.withProgress(async (progress) => {
-        await deploy_helpers.applyFuncFor(
-            deleteFilesInWithProgress,
-            ME,
-        )(progress,
-          files,
-          target,
-          fileListReloader,
-          deleteLocalFiles);
-    }, {
-        location: vscode.ProgressLocation.Notification,
-        cancellable: true,
-        title: `🗑️ ` + ME.t('DELETE.deletingFiles'),        
+    await ME.deployQueue.add(async () => {
+        await deploy_helpers.withProgress(async (progress) => {
+            await deploy_helpers.applyFuncFor(
+                deleteFilesInWithProgress,
+                ME,
+            )(progress,
+              files,
+              target,
+              fileListReloader,
+              deleteLocalFiles);
+        }, {
+            location: vscode.ProgressLocation.Notification,
+            cancellable: true,
+            title: `🗑️ ` + ME.t('DELETE.deletingFiles'),        
+        });
     });
 }
 
@@ -285,7 +287,6 @@ async function deleteFilesInWithProgress(progress: deploy_helpers.ProgressContex
         return f;
     };
 
-    const TARGET_SESSION = await deploy_targets.waitForOtherTargets(target);
     try {
         const ITEMS_FOR_PROGRESS: any[] = [];
         const TOTAL_COUNT = files.length * PLUGINS.length;
@@ -619,10 +620,6 @@ async function deleteFilesInWithProgress(progress: deploy_helpers.ProgressContex
     }
     finally {
         deploy_helpers.tryDispose(CANCELLATION_SOURCE);
-
-        deploy_targets.unmarkTargetAsInProgress(
-            target, TARGET_SESSION
-        );
     }
 }
 

diff --git a/src/deploy.ts b/src/deploy.ts
@@ -408,18 +408,20 @@ export async function deployFilesTo(files: string[],
                                     fileListReloader: deploy_contracts.Reloader<string>) {
     const ME: deploy_workspaces.Workspace = this;
 
-    await deploy_helpers.withProgress(async (progress) => {
-        await deploy_helpers.applyFuncFor(
-            deployFilesToWithProgress,
-            ME,
-        )(progress,
-          files,
-          target,
-          fileListReloader);
-    }, {
-        location: vscode.ProgressLocation.Notification,
-        cancellable: true,
-        title: `🚀 ` + ME.t('deploy.deployingFiles'),        
+    await ME.deployQueue.add(async () => {
+        await deploy_helpers.withProgress(async (progress) => {
+            await deploy_helpers.applyFuncFor(
+                deployFilesToWithProgress,
+                ME,
+            )(progress,
+              files,
+              target,
+              fileListReloader);
+        }, {
+            location: vscode.ProgressLocation.Notification,
+            cancellable: true,
+            title: `🚀 ` + ME.t('deploy.deployingFiles'),        
+        });
     });
 }
 
@@ -549,7 +551,6 @@ async function deployFilesToWithProgress(progress: deploy_helpers.ProgressContex
         return f;
     };
 
-    const TARGET_SESSION = await deploy_targets.waitForOtherTargets(target);
     try {
         const ITEMS_FOR_PROGRESS: any[] = [];
         const TOTAL_COUNT = files.length * PLUGINS.length;
@@ -891,10 +892,6 @@ async function deployFilesToWithProgress(progress: deploy_helpers.ProgressContex
     }
     finally {
         deploy_helpers.tryDispose(CANCELLATION_SOURCE);
-
-        deploy_targets.unmarkTargetAsInProgress(
-            target, TARGET_SESSION
-        );
     }
 }
 

diff --git a/src/pull.ts b/src/pull.ts
@@ -425,18 +425,20 @@ export async function pullFilesFrom(files: string[],
                                     fileListReloader: deploy_contracts.Reloader<string>) {
     const ME: deploy_workspaces.Workspace = this;
 
-    await deploy_helpers.withProgress(async (progress) => {
-        await deploy_helpers.applyFuncFor(
-            pullFilesFromWithProgress,
-            ME,
-        )(progress,
-          files,
-          target,
-          fileListReloader);
-    }, {
-        location: vscode.ProgressLocation.Notification,
-        cancellable: true,
-        title: `🚚 ` + ME.t('pull.pullingFiles'),
+    await ME.deployQueue.add(async () => {
+        await deploy_helpers.withProgress(async (progress) => {
+            await deploy_helpers.applyFuncFor(
+                pullFilesFromWithProgress,
+                ME,
+            )(progress,
+              files,
+              target,
+              fileListReloader);
+        }, {
+            location: vscode.ProgressLocation.Notification,
+            cancellable: true,
+            title: `🚚 ` + ME.t('pull.pullingFiles'),
+        });
     });
 }
 
@@ -557,7 +559,6 @@ async function pullFilesFromWithProgress(progress: deploy_helpers.ProgressContex
         return f;
     };
 
-    const TARGET_SESSION = await deploy_targets.waitForOtherTargets(target);
     try {
         const ITEMS_FOR_PROGRESS: any[] = [];
         const TOTAL_COUNT = files.length * PLUGINS.length;
@@ -976,10 +977,6 @@ async function pullFilesFromWithProgress(progress: deploy_helpers.ProgressContex
     }
     finally {
         deploy_helpers.tryDispose(CANCELLATION_SOURCE);
-
-        deploy_targets.unmarkTargetAsInProgress(
-            target, TARGET_SESSION
-        );
     }
 }