Fixed bug in path for downloaded images and pdfs

davidmerfield · Feb 14, 2019 · 93b8778 · 93b8778
1 parent 8d6907d
commit 93b8778
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/app/dashboard/routes/importer/helper/download_images.js b/app/dashboard/routes/importer/helper/download_images.js
@@ -70,16 +70,22 @@ module.exports = function download_images(post, callback) {
             });
           })
           .catch(function(err) {
-            console.log("Image error", src, err);
+            console.log("Image error:", src, err.name, err.statusCode);
             return next();
           });
       },
       function() {
-        if (changes) {
-          post.path = post.path + "/post.txt";
-        } else {
-          post.path = post.path + ".txt";
-        }
+
+      // Download PDFS or download images might have already moved the output
+      // path for this file into its own folder, so check.
+      if (changes && post.path.slice(-'/post.txt'.length) !== '/post.txt') {
+        post.path = post.path + "/post.txt";
+      }
+
+      if (!changes && post.path.slice(-'.txt'.length) !== '.txt') {
+        post.path = post.path + ".txt";
+      }
+
 
         post.html = $.html();
 

diff --git a/app/dashboard/routes/importer/helper/download_pdfs.js b/app/dashboard/routes/importer/helper/download_pdfs.js
@@ -60,14 +60,21 @@ module.exports = function download_pdfs(post, callback) {
           });
         })
         .catch(function(err) {
-          console.log("PDF error", href, err);
+            console.log("PDF error:", href, err.name, err.statusCode);
           return next();
         });
     },
     function() {
-      if (changes) {
+      // Download PDFS or download images might have already moved the output
+      // path for this file into its own folder, so check.
+      if (changes && post.path.slice(-'/post.txt'.length) !== '/post.txt') {
         post.path = post.path + "/post.txt";
       }
+
+      if (!changes && post.path.slice(-'.txt'.length) !== '.txt') {
+        post.path = post.path + ".txt";
+      }
+
       post.html = $.html();
       callback(null, post);
     }