1717use OCP \DB \Exception ;
1818use OCP \Files \AppData \IAppDataFactory ;
1919use OCP \Files \IAppData ;
20- use OCP \Files \SimpleFS \ ISimpleFile ;
20+ use OCP \Files \NotFoundException ;
2121use OCP \Files \SimpleFS \ISimpleFolder ;
2222use OCP \IAppConfig ;
2323use OCP \IDBConnection ;
@@ -42,15 +42,6 @@ public function __construct(
4242 }
4343
4444 protected function run (mixed $ argument ): void {
45- try {
46- $ this ->doRun ($ argument );
47- } catch (\Throwable $ exception ) {
48- echo $ exception ->getMessage ();
49- throw $ exception ;
50- }
51- }
52-
53- private function doRun ($ argument ): void {
5445 if ($ this ->appConfig ->getValueBool ('core ' , 'previewMovedDone ' )) {
5546 return ;
5647 }
@@ -118,8 +109,12 @@ private function doRun($argument): void {
118109 }
119110 }
120111
121- // Delete any leftover preview directory
122- $ this ->appData ->getFolder ('. ' )->delete ();
112+ try {
113+ // Delete any leftover preview directory
114+ $ this ->appData ->getFolder ('. ' )->delete ();
115+ } catch (NotFoundException ) {
116+ // ignore
117+ }
123118 $ this ->appConfig ->setValueBool ('core ' , 'previewMovedDone ' , true );
124119 }
125120
@@ -166,7 +161,7 @@ private function processPreviews(array $previewFolders, bool $simplePaths): void
166161 $ qb = $ this ->connection ->getQueryBuilder ();
167162 $ qb ->select ('* ' )
168163 ->from ('filecache ' )
169- ->where ($ qb ->expr ()->like ('fileid ' , $ qb ->createNamedParameter ($ fileId )));
164+ ->where ($ qb ->expr ()->eq ('fileid ' , $ qb ->createNamedParameter ($ fileId )));
170165
171166 $ result = $ qb ->executeQuery ();
172167 $ result = $ result ->fetchAll ();
@@ -175,13 +170,17 @@ private function processPreviews(array $previewFolders, bool $simplePaths): void
175170 foreach ($ previewFiles as $ previewFile ) {
176171 $ preview = new Preview ();
177172 $ preview ->setFileId ((int )$ fileId );
178- $ preview ->setOldFileId ($ previewFile ['file ' ]->getId ());
173+ /** @var SimpleFile $file */
174+ $ file = $ previewFile ['file ' ];
175+ $ preview ->setOldFileId ($ file ->getId ());
176+ $ preview ->setStorageId ($ result [0 ]['storage ' ]);
179177 $ preview ->setEtag ($ result [0 ]['etag ' ]);
180178 $ preview ->setMtime ($ previewFile ['mtime ' ]);
181179 $ preview ->setWidth ($ previewFile ['width ' ]);
182180 $ preview ->setHeight ($ previewFile ['height ' ]);
183- $ preview ->setCrop ($ previewFile ['crop ' ]);
184- $ preview ->setIsMax ($ previewFile ['max ' ]);
181+ $ preview ->setCropped ($ previewFile ['crop ' ]);
182+ $ preview ->setMax ($ previewFile ['max ' ]);
183+ $ preview ->setEncrypted (false );
185184 $ preview ->setMimetype (match ($ previewFile ['extension ' ]) {
186185 'png ' => IPreview::MIMETYPE_PNG ,
187186 'webp ' => IPreview::MIMETYPE_WEBP ,
0 commit comments