fix issue where processFiles would re-process local server files

pqina · May 13, 2019 · 607ecd0 · 607ecd0
1 parent e075026
commit 607ecd0
Show file tree

Hide file tree

Showing 10 changed files with 49 additions and 27 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.4.6
+
+- Fix issue where `processFiles` would re-process `local` server images.
+
+
 ## 4.4.5
 
 - Fix issue where FilePond event loop would freeze when tab was inactive.

diff --git a/dist/filepond.css b/dist/filepond.css
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.4.5
+ * FilePond 4.4.6
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */

diff --git a/dist/filepond.esm.js b/dist/filepond.esm.js
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.4.5
+ * FilePond 4.4.6
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -1739,6 +1739,12 @@ const ItemStatus = {
   LOAD_ERROR: 8
 };
 
+const FileOrigin = {
+  INPUT: 1,
+  LIMBO: 2,
+  LOCAL: 3
+};
+
 const getNonNumeric = str => /[^0-9]+/.exec(str);
 
 const getDecimalSeparator = () => getNonNumeric((1.1).toLocaleString())[0];
@@ -3083,12 +3089,6 @@ const createFileStub = source => {
   };
 };
 
-const FileOrigin = {
-  INPUT: 1,
-  LIMBO: 2,
-  LOCAL: 3
-};
-
 const isFile = value =>
   value instanceof File || (value instanceof Blob && value.name);
 
@@ -7998,6 +7998,9 @@ const createApp = (initialOptions = {}) => {
     if (!queries.length) {
       const files = getFiles().filter(
         item =>
+          !(
+            item.status === ItemStatus.IDLE && item.origin === FileOrigin.LOCAL
+          ) &&
           item.status !== ItemStatus.PROCESSING &&
           item.status !== ItemStatus.PROCESSING_COMPLETE &&
           item.status !== ItemStatus.PROCESSING_REVERT_ERROR

diff --git a/dist/filepond.esm.min.js b/dist/filepond.esm.min.js
diff --git a/dist/filepond.js b/dist/filepond.js
@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.4.5
+ * FilePond 4.4.6
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -2035,6 +2035,12 @@
     LOAD_ERROR: 8
   };
 
+  var FileOrigin = {
+    INPUT: 1,
+    LIMBO: 2,
+    LOCAL: 3
+  };
+
   var getNonNumeric = function getNonNumeric(str) {
     return /[^0-9]+/.exec(str);
   };
@@ -3622,12 +3628,6 @@
     };
   };
 
-  var FileOrigin = {
-    INPUT: 1,
-    LIMBO: 2,
-    LOCAL: 3
-  };
-
   var isFile = function isFile(value) {
     return value instanceof File || (value instanceof Blob && value.name);
   };
@@ -9155,6 +9155,10 @@
       if (!queries.length) {
         var files = getFiles().filter(function(item) {
           return (
+            !(
+              item.status === ItemStatus.IDLE &&
+              item.origin === FileOrigin.LOCAL
+            ) &&
             item.status !== ItemStatus.PROCESSING &&
             item.status !== ItemStatus.PROCESSING_COMPLETE &&
             item.status !== ItemStatus.PROCESSING_REVERT_ERROR

diff --git a/dist/filepond.min.css b/dist/filepond.min.css
diff --git a/dist/filepond.min.js b/dist/filepond.min.js
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "filepond",
-    "version": "4.4.5",
+    "version": "4.4.6",
     "description": "FilePond, Where files go to stretch their bits.",
     "license": "MIT",
     "author": {
@@ -53,7 +53,7 @@
         "node-sass": "^4.11.0",
         "postcss-cli": "^6.1.2",
         "prettier": "^1.16.4",
-        "rollup": "^1.7.0",
+        "rollup": "^1.11.3",
         "rollup-plugin-babel": "^4.3.2",
         "rollup-plugin-commonjs": "^9.2.1",
         "rollup-plugin-license": "^0.8.1",

diff --git a/src/js/app/index.js b/src/js/app/index.js
@@ -14,6 +14,7 @@ import { isNumber } from '../utils/isNumber';
 import { createItemAPI } from './utils/createItemAPI';
 import { removeReleasedItems } from './utils/removeReleasedItems';
 import { ItemStatus } from './enum/ItemStatus';
+import { FileOrigin } from './enum/FileOrigin';
 
 // defaults
 import { getOptions } from './options';
@@ -393,6 +394,7 @@ export const createApp = (initialOptions = {}) => {
         const queries = Array.isArray(args[0]) ? args[0] : args;
         if (!queries.length) {
             const files = getFiles().filter(item => 
+                !(item.status === ItemStatus.IDLE && item.origin === FileOrigin.LOCAL) &&
                 item.status !== ItemStatus.PROCESSING &&
                 item.status !== ItemStatus.PROCESSING_COMPLETE &&
                 item.status !== ItemStatus.PROCESSING_REVERT_ERROR