fix(): error too many open files

al3xLvs · Jun 20, 2019 · ea5ea83 · ea5ea83
1 parent 4330989
commit ea5ea83
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 24 deletions.
diff --git a/rtorrent-cleaner-php5.phar b/rtorrent-cleaner-php5.phar
diff --git a/rtorrent-cleaner-php7.phar b/rtorrent-cleaner-php7.phar
diff --git a/src/Cleaner.php b/src/Cleaner.php
@@ -70,7 +70,7 @@ protected function getFileListFromRtorrent()
             $progressBar->advance(1);
         }
 
-        $this->directories = array_unique($this->directories);
+        $this->directories = Helpers::getParentFolder($this->directories);
         $progressBar->setMessage('<fg=green>completed successfully!</>', 'status');
         $progressBar->finish();
 
@@ -101,11 +101,6 @@ protected function getFileListFromDisk()
             $i++;
         }
 
-        $this->localFileData = array_intersect_key(
-            $this->localFileData,
-            array_unique(array_map('serialize', $this->localFileData))
-        );
-
         return $this;
     }
 
@@ -129,16 +124,6 @@ public function getFilesMissingFromRtorrent()
         return Helpers::find_diff($this->rtorrentFileData, $this->localFileData);
     }
 
-    public function getDirectories()
-    {
-        return $this->directories;
-    }
-
-    public function setDirectories($directories)
-    {
-        $this->directories = $directories;
-    }
-
     public function getEmptyDirectory()
     {
         $emptyDirectory = [];
@@ -163,7 +148,7 @@ public function getEmptyDirectory()
             }
         }
 
-        return array_unique($emptyDirectory);
+        return $emptyDirectory;
     }
 
     public function removeDirectory($emptyDirectory)

diff --git a/src/Command/RemoveCommand.php b/src/Command/RemoveCommand.php
@@ -109,13 +109,6 @@ protected function execute(InputInterface $input, OutputInterface $output)
                     $console->writeln("directory: <fg=yellow>{$folder}</> has been removed");
                 }
 
-                foreach ($cleaner->getDirectories() as $dir) {
-                    if (is_dir($dir)) {
-                        $directories[] = $dir;
-                    }
-                }
-
-                $cleaner->setDirectories($directories);
                 $emptyDirectory = $cleaner->getEmptyDirectory();
             }
         }

diff --git a/src/Helpers.php b/src/Helpers.php
@@ -91,4 +91,19 @@ public static function title($title, $output)
 
         return $output->writeln([$top, '│ '.$title.' │', $bottom, '']);
     }
+
+    public function getParentFolder($array)
+    {
+        sort($array);
+        $directories = [];
+
+        foreach ($array as $value) {
+            $test_path = preg_replace('#\/([^\/]+)$#', '', $value);
+            if (!in_array($test_path, $directories)) {
+                $directories[] = $value;
+            }
+        }
+
+        return array_unique($directories);
+    }
 }