Merge pull request #268 from nextcloud/bugfix/noid/storage-not-available

Filter out entries that fail due to StorageNotAvailableException
nextcloud · Aug 21, 2020 · 2048d76 · 2048d76
2 parents 8a86563 + e546cd9
commit 2048d76
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/lib/Dashboard/RecommendationWidget.php b/lib/Dashboard/RecommendationWidget.php
@@ -41,8 +41,6 @@ class RecommendationWidget implements IWidget {
 	private $recommendationService;
 	/** @var IL10N */
 	private $l10n;
-	/** @var IURLGenerator */
-	private $urlGenerator;
 
 	public function __construct(
 		IInitialStateService $initialStateService,
@@ -55,7 +53,6 @@ public function __construct(
 		$this->userSession = $userSession;
 		$this->recommendationService = $recommendationService;
 		$this->l10n = $l10n;
-		$this->urlGenerator = $urlGenerator;
 	}
 
 	public function getId(): string {

diff --git a/lib/Service/RecentlyEditedFilesSource.php b/lib/Service/RecentlyEditedFilesSource.php
@@ -26,6 +26,7 @@
 namespace OCA\Recommendations\Service;
 
 use OCP\Files\Node;
+use OCP\Files\StorageNotAvailableException;
 use OCP\IL10N;
 use OCP\IServerContainer;
 use OCP\IUser;
@@ -50,14 +51,20 @@ public function __construct(IServerContainer $serverContainer,
 	public function getMostRecentRecommendation(IUser $user, int $max): array {
 		$userFolder = $this->serverContainer->getUserFolder($user->getUID());
 
-		return array_map(function (Node $node) use ($userFolder) {
-			return new RecommendedFile(
-				$userFolder->getRelativePath($node->getParent()->getPath()),
-				$node,
-				$node->getMTime(),
-				$this->l10n->t("Recently edited")
-			);
-		}, $userFolder->getRecent($max));
+		return array_filter(array_map(function (Node $node) use ($userFolder) {
+			try {
+				return new RecommendedFile(
+					$userFolder->getRelativePath($node->getParent()->getPath()),
+					$node,
+					$node->getMTime(),
+					$this->l10n->t("Recently edited")
+				);
+			} catch (StorageNotAvailableException $e) {
+				return null;
+			}
+		}, $userFolder->getRecent($max)), function ($entry) {
+			return $entry !== null;
+		});
 	}
 
 }