Use storage filter when fetching previews to cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/lib/private/Files/AppData/AppData.php b/lib/private/Files/AppData/AppData.php
index df72978a1422324244ae735ee3f20972d0dd963e..53f69be71274a984b611bb60dd41f7b9dc9afeeb 100644 (file)
--- a/lib/private/Files/AppData/AppData.php
+++ b/lib/private/Files/AppData/AppData.php
@@ -79,7 +79,7 @@ class AppData implements IAppData {
                return 'appdata_' . $instanceId;
        }
 
-       private function getAppDataRootFolder(): Folder {
+       protected function getAppDataRootFolder(): Folder {
                $name = $this->getAppDataFolderName();
 
                try {

diff --git a/lib/private/Preview/BackgroundCleanupJob.php b/lib/private/Preview/BackgroundCleanupJob.php
index c78ef7d725714595a8625dddfa22bf2dcdd0cd88..ab40aeaaa79bd0e212603128802dc6c0d99c1d4e 100644 (file)
--- a/lib/private/Preview/BackgroundCleanupJob.php
+++ b/lib/private/Preview/BackgroundCleanupJob.php
@@ -134,6 +134,7 @@ class BackgroundCleanupJob extends TimedJob {
                        ))
                        ->where(
                                $qb->expr()->andX(
+                                       $qb->expr()->eq('a.storage', $qb->createNamedParameter($this->previewFolder->getStorageId())),
                                        $qb->expr()->isNull('b.fileid'),
                                        $qb->expr()->like('a.path', $qb->createNamedParameter($like)),
                                        $qb->expr()->eq('a.mimetype', $qb->createNamedParameter($this->mimeTypeLoader->getId('httpd/unix-directory')))

diff --git a/lib/private/Preview/Storage/Root.php b/lib/private/Preview/Storage/Root.php
index 0eac3ce206418d05c9fab04673844d89a00fd7bd..c4191228ec70b6315fe39d6837668ad984960ffb 100644 (file)
--- a/lib/private/Preview/Storage/Root.php
+++ b/lib/private/Preview/Storage/Root.php
@@ -85,4 +85,8 @@ class Root extends AppData {
        public static function getInternalFolder(string $name): string {
                return implode('/', str_split(substr(md5($name), 0, 7))) . '/' . $name;
        }
+
+       public function getStorageId(): int {
+               return $this->getAppDataRootFolder()->getStorage()->getCache()->getNumericStorageId();
+       }
 }