mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #22139 from nextcloud/fix/noid/check-for-preview-multibucket-fallback-as-second-step 

Check previews in multibucket fallback folder as the last step and not as first step
This commit is contained in:
Morris Jobke 2020-08-07 16:02:02 +02:00 committed by GitHub
parent d12dd3370e 4d0c3fa4a8
commit 408ed7ebd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/private/Preview/Storage/Root.php
View File

@ -43,14 +43,6 @@ class Root extends AppData {
public function getFolder(string $name): ISimpleFolder {
$internalFolder = self::getInternalFolder($name);
if ($this->isMultibucketPreviewDistributionEnabled) {
try {
return parent::getFolder('old-multibucket/' . $internalFolder);
} catch (NotFoundException $e) {
// not in multibucket fallback
}
}
try {
return parent::getFolder($internalFolder);
} catch (NotFoundException $e) {
@ -60,7 +52,20 @@ class Root extends AppData {
*/
}
return parent::getFolder($name);
try {
return parent::getFolder($name);
} catch (NotFoundException $e) {
/*
* The old folder structure is not found.
* Lets try the multibucket fallback if available
*/
if ($this->isMultibucketPreviewDistributionEnabled) {
return parent::getFolder('old-multibucket/' . $internalFolder);
}
// when there is no further fallback just throw the exception
throw $e;
}
}
public function newFolder(string $name): ISimpleFolder {