Iterate all sub directories instead of collecting all files at once. (spatie#34)

* Iterate all sub directories instead of collecting all files at once.

* Styleguide fix.

* Cleaner code.

* Styleguide.

Author: Schnoop

src/DirectoryCleaner.php

@@ -3,8 +3,8 @@
 namespace Spatie\DirectoryCleanup;
 
 use Carbon\Carbon;
-use Illuminate\Support\Collection;
 use Illuminate\Filesystem\Filesystem;
+use Illuminate\Support\Collection;
 use Spatie\DirectoryCleanup\Policies\CleanupPolicy;
 
 class DirectoryCleaner
@@ -15,6 +15,9 @@ class DirectoryCleaner
     /** @var string */
     protected $directory;
 
+    /** @var Carbon */
+    protected $timeInPast;
+
     public function __construct(Filesystem $filesystem)
     {
         $this->filesystem = $filesystem;
@@ -27,24 +30,41 @@ public function setDirectory(string $directory)
         return $this;
     }
 
-    public function deleteFilesOlderThanMinutes(int $minutes) : Collection
+    public function setMinutes($minutes)
     {
-        $timeInPast = Carbon::now()->subMinutes($minutes);
+        $this->timeInPast = Carbon::now()->subMinutes($minutes);
+
+        return $this;
+    }
 
-        return collect($this->filesystem->allFiles($this->directory, true))
-            ->filter(function ($file) use ($timeInPast) {
+    public function deleteFilesOlderThanMinutes($amountOfFilesDeleted = 0, $directory = null): int
+    {
+        $workingDir = $directory ?: realpath($this->directory);
+        $directories = collect($this->filesystem->directories($workingDir));
+        if ($directory === null) {
+            $directories = $directories->add($workingDir);
+        }
+
+        foreach ($directories as $subDirectory) {
+            $amountOfFilesDeleted = $this->deleteFilesOlderThanMinutes($amountOfFilesDeleted, $subDirectory);
+        }
+
+        $files = collect($this->filesystem->files($workingDir, true))
+            ->filter(function ($file) {
                 return Carbon::createFromTimestamp(filemtime($file))
-                    ->lt($timeInPast);
+                    ->lt($this->timeInPast);
             })
             ->filter(function ($file) {
                 return $this->policy()->shouldDelete($file);
             })
             ->each(function ($file) {
                 $this->filesystem->delete($file);
             });
+
+        return $amountOfFilesDeleted + $files->count();
     }
 
-    public function deleteEmptySubdirectories() : Collection
+    public function deleteEmptySubdirectories(): Collection
     {
         return collect($this->filesystem->directories($this->directory))
             ->filter(function ($directory) {
@@ -55,7 +75,7 @@ public function deleteEmptySubdirectories() : Collection
             });
     }
 
-    protected function policy() : CleanupPolicy
+    protected function policy(): CleanupPolicy
     {
         return resolve(config(
             'laravel-directory-cleanup.cleanup_policy',

src/DirectoryCleanupCommand.php

@@ -31,9 +31,10 @@ protected function deleteFilesIfOlderThanMinutes(string $directory, int $minutes
     {
         $deletedFiles = app(DirectoryCleaner::class)
             ->setDirectory($directory)
+            ->setMinutes($minutes)
             ->deleteFilesOlderThanMinutes($minutes);
 
-        $this->info("Deleted {$deletedFiles->count()} file(s) from {$directory}.");
+        $this->info("Deleted {$deletedFiles} file(s) from {$directory}.");
     }
 
     protected function deleteEmptySubdirectories(string $directory)