From: Morris Jobke <hey@morrisjobke.de>
Date: Fri, 7 Aug 2020 09:09:16 +0000 (+0200)
Subject: Merge pull request #22135 from nextcloud/enh/noid/occ-preview-repair
X-Git-Tag: v20.0.0beta1~116
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=06eb230d247f01055c204d73482b6d4667c92bc7;p=nextcloud-server.git

Merge pull request #22135 from nextcloud/enh/noid/occ-preview-repair

Add occ preview:migrate to migrate previews from the old flat structure to a subfolder structure
---

06eb230d247f01055c204d73482b6d4667c92bc7
diff --cc lib/private/Preview/Storage/Root.php
index a284b037b35,1f332c32085..2a3367b83b7
--- a/lib/private/Preview/Storage/Root.php
+++ b/lib/private/Preview/Storage/Root.php
@@@ -41,16 -39,8 +41,16 @@@ class Root extends AppData 
  
  
  	public function getFolder(string $name): ISimpleFolder {
- 		$internalFolder = $this->getInternalFolder($name);
+ 		$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) {