Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/photos.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'lib/Controller/AlbumsController.php')
-rw-r--r--lib/Controller/AlbumsController.php13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/Controller/AlbumsController.php b/lib/Controller/AlbumsController.php
index 678ea0a7..fa8cfed9 100644
--- a/lib/Controller/AlbumsController.php
+++ b/lib/Controller/AlbumsController.php
@@ -34,6 +34,7 @@ use OCP\Files\Folder;
use OCP\Files\IRootFolder;
use OCP\FIles\Node;
use OCP\Files\NotFoundException;
+use OCP\Files\StorageNotAvailableException;
use OCP\IRequest;
class AlbumsController extends Controller {
@@ -142,13 +143,17 @@ class AlbumsController extends Controller {
return [];
}
- // Ignore folder with a .noimage or .nomedia node
- if ($folder->nodeExists('.noimage') || $folder->nodeExists('.nomedia')) {
+ try {
+ // Ignore folder with a .noimage or .nomedia node
+ if ($folder->nodeExists('.noimage') || $folder->nodeExists('.nomedia')) {
+ return [];
+ }
+
+ $nodes = $folder->getDirectoryListing();
+ } catch (StorageNotAvailableException $e) {
return [];
}
- $nodes = $folder->getDirectoryListing();
-
foreach ($nodes as $node) {
if ($node instanceof File) {
if ($this->validFile($node, $shared)) {