Skip removing top-level files from temporary directory

Maksold · Feb 26, 2025 · 020486b · 020486b
1 parent 50fb547
commit 020486b
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/Command/CatalogAbstract.php b/Command/CatalogAbstract.php
@@ -234,12 +234,17 @@ protected function getTmpFilePaths($useCache = true, int $maxLifetimeInHours = 0
                 if ($this->driverFile->isDirectory($filePath)) {
                     // Skip directories
                     unset($this->tmpFilePaths[$k]);
-                } elseif ($this->driverFile->isFile($filePath)
-                    && $this->driverFile->isReadable($filePath)
-                    && (time() - $this->driverFile->stat($filePath)['mtime']) < $maxLifetime
-                ) {
-                    // Skip newly created files
-                    unset($this->tmpFilePaths[$k]);
+                } elseif ($this->driverFile->isFile($filePath) && $this->driverFile->isReadable($filePath)) {
+                    if ($this->getTmpMediaDirectoryPath() === $this->driverFile->getParentDirectory($filePath)) {
+                        // Skip top-level files
+                        unset($this->tmpFilePaths[$k]);
+                        continue;
+                    }
+
+                    if ((time() - $this->driverFile->stat($filePath)['mtime']) > $maxLifetime) {
+                        // Skip new files
+                        unset($this->tmpFilePaths[$k]);
+                    }
                 }
             }
         }