fix problem where directories with over 100 files weren't read correctly

Author: rikschennink

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 4.7.1
+
+- Fix problem where directories with over 100 files weren't read correctly.
+
+
 ## 4.7.0
 
 - Add support for [chunked uploads](https://pqina.nl/filepond/docs/patterns/api/server/#process-chunks). Thanks to Ryan Olson (@ams-ryanolson) Arctic Media for donating the funds to build this.

dist/filepond.css

@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.7.0
+ * FilePond 4.7.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */

dist/filepond.esm.js

@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.7.0
+ * FilePond 4.7.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -6845,16 +6845,18 @@ const getFiles = dataTransfer =>
     }
 
     // done!
-    Promise.all(promisedFiles).then(returendFileGroups => {
-      // flatten groups
-      const files = [];
-      returendFileGroups.forEach(group => {
-        files.push.apply(files, group);
-      });
+    Promise.all(promisedFiles)
+      .then(returnedFileGroups => {
+        // flatten groups
+        const files = [];
+        returnedFileGroups.forEach(group => {
+          files.push.apply(files, group);
+        });
 
-      // done (filter out empty files)!
-      resolve(files.filter(file => file));
-    });
+        // done (filter out empty files)!
+        resolve(files.filter(file => file));
+      })
+      .catch(console.error);
   });
 
 const isFileSystemItem = item => {
@@ -6870,7 +6872,9 @@ const isFileSystemItem = item => {
 const getFilesFromItem = item =>
   new Promise((resolve, reject) => {
     if (isDirectoryEntry(item)) {
-      getFilesInDirectory(getAsEntry(item)).then(resolve);
+      getFilesInDirectory(getAsEntry(item))
+        .then(resolve)
+        .catch(reject);
       return;
     }
 
@@ -6882,29 +6886,53 @@ const getFilesInDirectory = entry =>
     const files = [];
 
     // the total entries to read
-    let totalFilesFound = 0;
+    let dirCounter = 0;
+    let fileCounter = 0;
+
+    const resolveIfDone = () => {
+      if (fileCounter === 0 && dirCounter === 0) {
+        resolve(files);
+      }
+    };
 
     // the recursive function
     const readEntries = dirEntry => {
+      dirCounter++;
+
       const directoryReader = dirEntry.createReader();
-      directoryReader.readEntries(entries => {
-        entries.forEach(entry => {
-          // recursively read more directories
-          if (entry.isDirectory) {
-            readEntries(entry);
-          } else {
-            // read as file
-            totalFilesFound++;
-            entry.file(file => {
-              files.push(correctMissingFileType(file));
-
-              if (totalFilesFound === files.length) {
-                resolve(files);
-              }
-            });
+
+      // directories are returned in batches, we need to process all batches before we're done
+      const readBatch = () => {
+        directoryReader.readEntries(entries => {
+          if (entries.length === 0) {
+            dirCounter--;
+            resolveIfDone();
+            return;
           }
-        });
-      });
+
+          entries.forEach(entry => {
+            // recursively read more directories
+            if (entry.isDirectory) {
+              readEntries(entry);
+            } else {
+              // read as file
+              fileCounter++;
+
+              entry.file(file => {
+                files.push(correctMissingFileType(file));
+                fileCounter--;
+                resolveIfDone();
+              });
+            }
+          });
+
+          // try to get next batch of files
+          readBatch();
+        }, reject);
+      };
+
+      // read first batch of files
+      readBatch();
     };
 
     // go!

dist/filepond.esm.min.js

@@ -1,5 +1,5 @@
 /*!
- * FilePond 4.7.0
+ * FilePond 4.7.1
  * Licensed under MIT, https://opensource.org/licenses/MIT/
  * Please visit https://pqina.nl/filepond/ for details.
  */
@@ -9573,20 +9573,22 @@
       }
 
       // done!
-      Promise.all(promisedFiles).then(function(returendFileGroups) {
-        // flatten groups
-        var files = [];
-        returendFileGroups.forEach(function(group) {
-          files.push.apply(files, group);
-        });
+      Promise.all(promisedFiles)
+        .then(function(returnedFileGroups) {
+          // flatten groups
+          var files = [];
+          returnedFileGroups.forEach(function(group) {
+            files.push.apply(files, group);
+          });
 
-        // done (filter out empty files)!
-        resolve(
-          files.filter(function(file) {
-            return file;
-          })
-        );
-      });
+          // done (filter out empty files)!
+          resolve(
+            files.filter(function(file) {
+              return file;
+            })
+          );
+        })
+        .catch(console.error);
     });
   };
 
@@ -9603,7 +9605,9 @@
   var getFilesFromItem = function getFilesFromItem(item) {
     return new Promise(function(resolve, reject) {
       if (isDirectoryEntry(item)) {
-        getFilesInDirectory(getAsEntry(item)).then(resolve);
+        getFilesInDirectory(getAsEntry(item))
+          .then(resolve)
+          .catch(reject);
         return;
       }
 
@@ -9616,29 +9620,53 @@
       var files = [];
 
       // the total entries to read
-      var totalFilesFound = 0;
+      var dirCounter = 0;
+      var fileCounter = 0;
+
+      var resolveIfDone = function resolveIfDone() {
+        if (fileCounter === 0 && dirCounter === 0) {
+          resolve(files);
+        }
+      };
 
       // the recursive function
       var readEntries = function readEntries(dirEntry) {
+        dirCounter++;
+
         var directoryReader = dirEntry.createReader();
-        directoryReader.readEntries(function(entries) {
-          entries.forEach(function(entry) {
-            // recursively read more directories
-            if (entry.isDirectory) {
-              readEntries(entry);
-            } else {
-              // read as file
-              totalFilesFound++;
-              entry.file(function(file) {
-                files.push(correctMissingFileType(file));
 
-                if (totalFilesFound === files.length) {
-                  resolve(files);
-                }
-              });
+        // directories are returned in batches, we need to process all batches before we're done
+        var readBatch = function readBatch() {
+          directoryReader.readEntries(function(entries) {
+            if (entries.length === 0) {
+              dirCounter--;
+              resolveIfDone();
+              return;
             }
-          });
-        });
+
+            entries.forEach(function(entry) {
+              // recursively read more directories
+              if (entry.isDirectory) {
+                readEntries(entry);
+              } else {
+                // read as file
+                fileCounter++;
+
+                entry.file(function(file) {
+                  files.push(correctMissingFileType(file));
+                  fileCounter--;
+                  resolveIfDone();
+                });
+              }
+            });
+
+            // try to get next batch of files
+            readBatch();
+          }, reject);
+        };
+
+        // read first batch of files
+        readBatch();
       };
 
       // go!

dist/filepond.js

@@ -1,6 +1,6 @@
 {
     "name": "filepond",
-    "version": "4.7.0",
+    "version": "4.7.1",
     "description": "FilePond, Where files go to stretch their bits.",
     "license": "MIT",
     "author": {