Extra error handling added

estruyf · Apr 7, 2017 · ba9dffd · ba9dffd
1 parent 1f117ce
commit ba9dffd
Show file tree

Hide file tree

Showing 7 changed files with 62 additions and 41 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,6 @@ src/**/*.js
 *.tgz
 tests/local-test.js
 tests/download-test.js
-tests/downloads
+tests/downloads
+yarn.lock
+.vscode
diff --git a/README.md b/README.md
@@ -112,46 +112,46 @@ With the files_metadata option you can specify the metadata of all the files you
     {
         "name": "Item_Minimal.js",
         "metadata": {
-        "__metadata": {
-            "type": "SP.Data.OData__x005f_catalogs_x002f_masterpageItem"
-        },
-        "Title": "Item Minimal Template (via GULP)",
-        "MasterPageDescription": "This is a display template added via gulp.",
-        "ManagedPropertyMapping": "'Path','Title':'Title'",
-        "ContentTypeId": "0x0101002039C03B61C64EC4A04F5361F38510660500A0383064C59087438E649B7323C95AF6",
-        "DisplayTemplateLevel": "Item",
-        "TemplateHidden": false,
-        "TargetControlType": {
             "__metadata": {
-            "type": "Collection(Edm.String)"
+                "type": "SP.Data.OData__x005f_catalogs_x002f_masterpageItem"
             },
-            "results": [
-            "SearchResults",
-            "Content Web Parts"
-            ]
-        }
+            "Title": "Item Minimal Template (via GULP)",
+            "MasterPageDescription": "This is a display template added via gulp.",
+            "ManagedPropertyMapping": "'Path','Title':'Title'",
+            "ContentTypeId": "0x0101002039C03B61C64EC4A04F5361F38510660500A0383064C59087438E649B7323C95AF6",
+            "DisplayTemplateLevel": "Item",
+            "TemplateHidden": false,
+            "TargetControlType": {
+                "__metadata": {
+                "type": "Collection(Edm.String)"
+                },
+                "results": [
+                "SearchResults",
+                "Content Web Parts"
+                ]
+            }
         }
     },
     {
         "name": "Control_Minimal.js",
-        "metadata": {
-        "__metadata": {
-            "type": "SP.Data.OData__x005f_catalogs_x002f_masterpageItem"
-        },
-        "Title": "Control Minimal Template (via GULP)",
-        "MasterPageDescription": "This is a display template added via gulp.",
-        "ContentTypeId": "0x0101002039C03B61C64EC4A04F5361F38510660500A0383064C59087438E649B7323C95AF6",
-        "DisplayTemplateLevel": "Control",
-        "TemplateHidden": false,
-        "TargetControlType": {
+            "metadata": {
             "__metadata": {
-            "type": "Collection(Edm.String)"
+                "type": "SP.Data.OData__x005f_catalogs_x002f_masterpageItem"
             },
-            "results": [
-            "SearchResults",
-            "Content Web Parts"
-            ]
-        }
+            "Title": "Control Minimal Template (via GULP)",
+            "MasterPageDescription": "This is a display template added via gulp.",
+            "ContentTypeId": "0x0101002039C03B61C64EC4A04F5361F38510660500A0383064C59087438E649B7323C95AF6",
+            "DisplayTemplateLevel": "Control",
+            "TemplateHidden": false,
+            "TargetControlType": {
+                "__metadata": {
+                "type": "Collection(Edm.String)"
+                },
+                "results": [
+                "SearchResults",
+                "Content Web Parts"
+                ]
+            }
         }
     }
 ]

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gulp-spsync-creds",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "description": "Gulp plugin that syncs with a library in SharePoint Online and on-premises",
   "main": "./release/index.js",
   "scripts": {

diff --git a/release/helpers/downloadFiles.js b/release/helpers/downloadFiles.js
@@ -18,6 +18,8 @@ var FileDownload = (function () {
         return new Promise(function (resolve, reject) {
             _this.start().then(function (results) {
                 resolve(results);
+            }).catch(function (err) {
+                reject(err);
             });
         });
     };
@@ -77,6 +79,8 @@ var FileDownload = (function () {
                 else {
                     resolve(null);
                 }
+            }).catch(function (err) {
+                reject(err);
             });
         });
     };
@@ -133,9 +137,8 @@ var FileDownload = (function () {
             _this.spr.get(_this.config.site + "/_api/web/GetFolderByServerRelativeUrl('" + _this.config.startFolder + "')?$expand=" + expand, headers)
                 .then(function (data) {
                 resolve(data);
-            })
-                .catch(function (err) {
-                resolve(null);
+            }).catch(function (err) {
+                reject(err);
             });
         });
     };

diff --git a/release/index.js b/release/index.js
@@ -72,6 +72,13 @@ function download(args) {
                     stream.end();
                 });
             }
+        }).catch(function (err) {
+            if (typeof err.message !== "undefined") {
+                gutil.log(gutil.colors.red("ERROR: " + err.message));
+            }
+            else {
+                gutil.log(gutil.colors.red("ERROR: " + JSON.stringify(err)));
+            }
         });
     }
     else {

diff --git a/src/helpers/downloadFiles.ts b/src/helpers/downloadFiles.ts
@@ -29,6 +29,8 @@ export class FileDownload {
 		return new Promise<any>((resolve, reject) => {
 			this.start().then(results => {
                 resolve(results);
+            }).catch(err => {
+                reject(err);
             });
 		});
     }
@@ -87,6 +89,8 @@ export class FileDownload {
                 } else {
                     resolve(null);
                 }
+            }).catch(err => {
+                reject(err);
             });
         });
     }
@@ -150,9 +154,8 @@ export class FileDownload {
             )
             .then(data => {
                 resolve(data);
-            })
-            .catch(err => {
-                resolve(null);
+            }).catch(err => {
+                reject(err);
             });
         });
     };

diff --git a/src/index.ts b/src/index.ts
@@ -87,7 +87,13 @@ export function download (args: ISettings) {
 					stream.end();
 				});
 			}
-		});
+		}).catch(err => {
+            if (typeof err.message !== "undefined") {
+                gutil.log(gutil.colors.red(`ERROR: ${err.message}`));
+            } else {
+                gutil.log(gutil.colors.red(`ERROR: ${JSON.stringify(err)}`));
+            }
+        });
 	} else {
 		gutil.log(gutil.colors.red("Please specify the startFolder"));
 		// End the steam