do not crash on mount issue

nextcloud · May 15, 2021 · 0706881 · 0706881
1 parent 1666c62
commit 0706881
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/lib/Service/FilesService.php b/lib/Service/FilesService.php
@@ -412,10 +412,14 @@ private function generateFilesDocumentFromFile(string $viewerId, Node $file): Fi
 			$ownerId = '';
 		}
 
-		$document->setType($file->getType())
-				 ->setOwnerId($ownerId)
-				 ->setPath($this->getPathFromViewerId($file->getId(), $viewerId))
-				 ->setViewerId($viewerId);
+		try {
+			$document->setType($file->getType())
+					 ->setOwnerId($ownerId)
+					 ->setPath($this->getPathFromViewerId($file->getId(), $viewerId))
+					 ->setViewerId($viewerId);
+		} catch (Throwable $t) {
+			throw new FileIsNotIndexableException();
+		}
 
 		if ($file->getMimetype() !== null) {
 			$document->setMimetype($file->getMimetype());
@@ -779,7 +783,7 @@ private function updateShareNames(FilesDocument $document, Node $file): array {
 				$shareNames[$this->miscService->secureUsername($username)] =
 					(!is_string($path)) ? $path = '' : $path;
 
-			} catch (Exception $e) {
+			} catch (Throwable $e) {
 				$this->miscService->log(
 					'Issue while getting information on documentId:' . $document->getId(), 0
 				);