fixed "deploy all open files" feature

mkloubert · Jan 3, 2018 · 777ddd0 · 777ddd0
1 parent 83168d8
commit 777ddd0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 24 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,19 +3,15 @@
 [![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.17.0 (January 4th, 2018; improvements)
-
-* improved displaying dates in git commit lists
-
-## 0.16.1 (January 3rd, 2018; deploy all opened files)
+## 0.16.2 (January 3rd, 2018; deploy all opened files)
 
 * added commands for deploying (`extension.deploy.reloaded.deployAllOpenFiles`) or pulling (`extension.deploy.reloaded.pullAllOpenFiles`) files of all opened text editors
 
 ![Demo Deploy or pull all opened files](https://raw.githubusercontent.com/mkloubert/vscode-deploy-reloaded/master/img/demo13.gif)
 
 * improved displaying "deploy messages" in output, s. [issue #5](https://github.com/mkloubert/vscode-deploy-reloaded/issues/5)
-* bug fixes
-* code improvements
+* improved displaying dates in git commit lists
+* more bugfixes and improvements
 
 ## 0.15.0 (January 3rd, 2018; check for requirements)
 

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.17.0",
+ "version": "0.16.2",
  "publisher": "mkloubert",
  "engines": {
   "vscode": "^1.19.0"

diff --git a/src/deploy.ts b/src/deploy.ts
@@ -25,6 +25,7 @@ import * as deploy_targets from './targets';
 import * as deploy_transformers from './transformers';
 import * as deploy_workspaces from './workspaces';
 import * as Enumerable from 'node-enumerable';
+import * as FS from 'fs';
 import * as i18 from './i18';
 import * as Path from 'path';
 import * as vscode from 'vscode';
@@ -47,7 +48,10 @@ export async function deployAllOpenFiles(workspaces: deploy_workspaces.Workspace
         return;
     }
 
-    const DOCUMENTS = deploy_helpers.asArray(vscode.workspace.textDocuments);
+    const DOCUMENTS = deploy_helpers.asArray(vscode.workspace.textDocuments).filter(d => {
+        return !d.isClosed &&
+               !d.isUntitled;
+    });
     if (DOCUMENTS.length < 1) {
         deploy_helpers.showWarningMessage(
             i18.t('editors.noOpen')
@@ -57,7 +61,7 @@ export async function deployAllOpenFiles(workspaces: deploy_workspaces.Workspace
     }
 
     for (const WS of workspaces) {
-        const MATCHING_EDITORS = DOCUMENTS.map(doc => {
+        const FILES = DOCUMENTS.map(doc => {
             if (!deploy_helpers.isEmptyString(doc.fileName)) {
                 if (WS.isPathOf(doc.fileName)) {
                     return doc;
@@ -68,14 +72,12 @@ export async function deployAllOpenFiles(workspaces: deploy_workspaces.Workspace
         }).filter(e => {
             return false !== e;
         }).map((doc: vscode.TextDocument) => {
-            return doc.fileName;
+            return Path.resolve(doc.fileName);
+        }).filter(f => {
+            return FS.existsSync(f) &&
+                   FS.lstatSync(f).isFile();
         });
 
-        const FILES = Enumerable.from( MATCHING_EDITORS ).select(e => {
-            return Path.resolve(e);
-        }).distinct()
-          .toArray();
-
         if (FILES.length < 1) {
             continue;
         }

diff --git a/src/pull.ts b/src/pull.ts
@@ -26,6 +26,7 @@ import * as deploy_targets from './targets';
 import * as deploy_transformers from './transformers';
 import * as deploy_workspaces from './workspaces';
 import * as Enumerable from 'node-enumerable';
+import * as FS from 'fs';
 import * as i18 from './i18';
 import * as IsStream from 'is-stream';
 import * as Path from 'path';
@@ -49,7 +50,10 @@ export async function pullAllOpenFiles(workspaces: deploy_workspaces.Workspace |
         return;
     }
 
-    const DOCUMENTS = deploy_helpers.asArray(vscode.workspace.textDocuments);
+    const DOCUMENTS = deploy_helpers.asArray(vscode.workspace.textDocuments).filter(d => {
+        return !d.isClosed &&
+               !d.isUntitled;
+    });
     if (DOCUMENTS.length < 1) {
         deploy_helpers.showWarningMessage(
             i18.t('editors.noOpen')
@@ -59,7 +63,7 @@ export async function pullAllOpenFiles(workspaces: deploy_workspaces.Workspace |
     }
 
     for (const WS of workspaces) {
-        const MATCHING_EDITORS = DOCUMENTS.map(doc => {
+        const FILES = DOCUMENTS.map(doc => {
             if (!deploy_helpers.isEmptyString(doc.fileName)) {
                 if (WS.isPathOf(doc.fileName)) {
                     return doc;
@@ -70,14 +74,12 @@ export async function pullAllOpenFiles(workspaces: deploy_workspaces.Workspace |
         }).filter(e => {
             return false !== e;
         }).map((doc: vscode.TextDocument) => {
-            return doc.fileName;
+            return Path.resolve(doc.fileName);
+        }).filter(f => {
+            return FS.existsSync(f) &&
+                   FS.lstatSync(f).isFile();
         });
 
-        const FILES = Enumerable.from( MATCHING_EDITORS ).select(e => {
-            return Path.resolve(e);
-        }).distinct()
-          .toArray();
-
         if (FILES.length < 1) {
             continue;
         }