Filesystem refactor conditions

flow-php · Jan 9, 2024 · 25f85ce · 25f85ce
1 parent 9b3c9ab
commit 25f85ce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git a/src/adapter/etl-adapter-filesystem/src/Flow/ETL/Adapter/Filesystem/FlysystemFS.php b/src/adapter/etl-adapter-filesystem/src/Flow/ETL/Adapter/Filesystem/FlysystemFS.php
@@ -149,10 +149,8 @@ public function scan(Path $path, PartitionFilter $partitionFilter = new NoopFilt
                 return false;
             }
 
-            if ($path->isPattern()) {
-                if (!$path->matches(new Path($path->scheme() . '://' . $file->path(), $path->options()))) {
-                    return false;
-                }
+            if (!$path->matches(new Path($path->scheme() . '://' . $file->path(), $path->options()))) {
+                return false;
             }
 
             return $partitionFilter->keep(...(new Path(DIRECTORY_SEPARATOR . $file->path()))->partitions()->toArray());

diff --git a/src/core/etl/src/Flow/ETL/Filesystem/LocalFilesystem.php b/src/core/etl/src/Flow/ETL/Filesystem/LocalFilesystem.php
@@ -124,21 +124,6 @@ public function scan(Path $path, PartitionFilter $partitionFilter = new NoopFilt
             }
 
             throw new RuntimeException(\sprintf('Path "%s" does not exists', $path->uri()));
-
-        }
-
-        if (!$path->isPattern()) {
-            foreach (Glob::glob(\rtrim($path->path(), '/') . '/**/*') as $filePath) {
-                if (\is_dir($filePath)) {
-                    continue;
-                }
-
-                if ($partitionFilter->keep(...(Path::realpath($filePath, $path->options()))->partitions()->toArray())) {
-                    yield Path::realpath($filePath, $path->options());
-                }
-            }
-
-            return;
         }
 
         foreach (Glob::glob($path->path()) as $filePath) {