Merge pull request #488 from nielstron/patch-1

Catch GenericFileException in Generate
nextcloud · Jul 29, 2024 · ca48f67 · ca48f67
2 parents fc79f66 + c08d74a
commit ca48f67
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/Command/Generate.php b/lib/Command/Generate.php
@@ -32,6 +32,7 @@
 use OCP\Encryption\IManager;
 use OCP\Files\File;
 use OCP\Files\Folder;
+use OCP\Files\GenericFileException;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\Files\StorageInvalidException;
@@ -231,9 +232,10 @@ private function parseFile(File $file): void {
 				$this->previewGenerator->generatePreviews($file, $this->specifications);
 			} catch (NotFoundException $e) {
 				// Maybe log that previews could not be generated?
-			} catch (\InvalidArgumentException $e) {
+			} catch (\InvalidArgumentException | GenericFileException $e) {
+				$class = $e::class;
 				$error = $e->getMessage();
-				$this->output->writeln("<error>{$error}</error>");
+				$this->output->writeln("<error>{$class}: {$error}</error>");
 			}
 		}
 	}

diff --git a/lib/Command/PreGenerate.php b/lib/Command/PreGenerate.php
@@ -31,6 +31,7 @@
 use OCP\AppFramework\Utility\ITimeFactory;
 use OCP\Encryption\IManager;
 use OCP\Files\File;
+use OCP\Files\GenericFileException;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
 use OCP\IConfig;
@@ -205,9 +206,10 @@ private function processFile(File $file): void {
 				$this->previewGenerator->generatePreviews($file, $specifications);
 			} catch (NotFoundException $e) {
 				// Maybe log that previews could not be generated?
-			} catch (\InvalidArgumentException $e) {
+			} catch (\InvalidArgumentException | GenericFileException $e) {
+				$class = $e::class;
 				$error = $e->getMessage();
-				$this->output->writeln("<error>{$error}</error>");
+				$this->output->writeln("<error>{$class}: {$error}</error>");
 			}
 		}
 	}