use separate tempfile directory

anneb · Sep 10, 2019 · eb592d8 · eb592d8
1 parent 8bab553
commit eb592d8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 node_modules
 config/dbconfig.json
-admin/files
 cache
diff --git a/admin/files/.gitignore b/admin/files/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/admin/temp/.gitignore b/admin/temp/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
diff --git a/admin/upload.html b/admin/upload.html
@@ -45,8 +45,13 @@
 
 
     function progressHandler(event){
-        document.querySelector("#status").innerHTML = `Uploaded ${byteString(event.loaded,1)} of ${byteString(event.total,1)}`
-        let percent = 100 * event.loaded / event.total;
+        document.querySelector("#status").innerHTML = `Uploaded ${byteString(event.loaded,1)} of ${byteString(event.total,1)}`;
+        let percent;
+        if (event.total) {
+            percent = 100 * event.loaded / event.total;
+        } else {
+            percent = 100;
+        }
         let secondsElapsed = (Date.now() - timeStart)/1000;
         let speed;
         if (secondsElapsed > 1) {

diff --git a/upload.js b/upload.js
@@ -11,7 +11,7 @@ module.exports = function(app, pool) {
   }
   app.use(fileUpload({
     useTempFiles: true,
-    tempFileDir : `${__dirname}/admin/files/`
+    tempFileDir : `${__dirname}/temp/`
   }));
 
   app.post('/admin/upload', (req, res) => {