FileChecker::checkFromDroidOutput(): catch and report as ordinary err…

…or if the file was removed in the meantime
acdh-oeaw · Aug 26, 2024 · 29cd2bd · 29cd2bd
1 parent 6f8355f
commit 29cd2bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/acdhOeaw/arche/fileChecker/FileChecker.php b/src/acdhOeaw/arche/fileChecker/FileChecker.php
@@ -183,9 +183,12 @@ private function checkFromDroidOutput(string $droidOutput, string $continue): vo
                         $this->progressBar->advance();
                         continue;
                     }
+                    if (!file_exists($fileInfo->path)) {
+                        $fileInfo->error('Removed', "File removed during the filechecker run");
+                    }
                     $this->runChecks($fileInfo, $this->checksFile);
 
-                    if (!is_link($fileInfo->path)) {
+                    if (!is_link($fileInfo->path) && file_exists($fileInfo->path)) {
                         $hash = $this->computeHash($fileInfo->path);
                         if (isset($hashes[$hash])) {
                             $fileInfo->error("Duplicated file", "Same hash as " . substr($hashes[$hash], strlen($this->checkDir) + 1));

diff --git a/src/acdhOeaw/arche/fileChecker/FileInfo.php b/src/acdhOeaw/arche/fileChecker/FileInfo.php
@@ -115,7 +115,6 @@ static public function fromDroid(array $data) {
                 break;
         }
 
-
         return $fi;
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -115,7 +115,6 @@ static public function fromDroid(array $data) { @@
                     break;
             }
             return $fi;
         }
@@ Expand Down @@