Fix the format conversion not happening due to outdated data

Author: dtdesign

wcfsetup/install/files/lib/system/endpoint/controller/core/files/GenerateThumbnails.class.php

@@ -28,7 +28,7 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
     {
         $file = Helper::fetchObjectFromRequestParameter($variables['id'], File::class);
 
-        FileProcessor::getInstance()->generateWebpVariant($file);
+        $file = FileProcessor::getInstance()->generateWebpVariant($file);
         $file = FileProcessor::getInstance()->convertImageFormat($file);
         $file = FileProcessor::getInstance()->stripExif($file);
         FileProcessor::getInstance()->generateThumbnails($file);

wcfsetup/install/files/lib/system/endpoint/controller/core/files/upload/SaveChunk.class.php

@@ -138,6 +138,10 @@ public function __invoke(ServerRequestInterface $request, array $variables): Res
                 $thumbnailFormats = $processor->getThumbnailFormats();
                 if ($thumbnailFormats !== []) {
                     $generateThumbnails = true;
+                } else if (\IMAGE_CONVERT_FORMAT !== 'keep' || \IMAGE_STRIP_EXIF) {
+                    // The action to generate thumbnails implicitly handles the
+                    // format conversion and EXIF removal.
+                    $generateThumbnails = true;
                 }
             }
 

wcfsetup/install/files/lib/system/file/command/ReplaceFileSource.class.php

@@ -167,7 +167,9 @@ private function regenerateExistingThumbnails(File $file): void
         }
 
         try {
-            FileProcessor::getInstance()->generateWebpVariant($file);
+            $file = FileProcessor::getInstance()->generateWebpVariant($file);
+            $file = FileProcessor::getInstance()->convertImageFormat($file);
+            $file = FileProcessor::getInstance()->stripExif($file);
             FileProcessor::getInstance()->generateThumbnails($file);
         } catch (DamagedImage $e) {
             logThrowable($e);

wcfsetup/install/files/lib/system/file/command/ReplaceWithWebpVariant.class.php

@@ -36,9 +36,9 @@ public function __invoke(): File
             $pathnameWebp,
             $this->getNewFilename(),
         );
-        $command();
+        $newFile = $command();
 
-        return new File($this->file->fileID);
+        return $newFile;
     }
 
     private function getNewFilename(): string

wcfsetup/install/files/lib/system/file/processor/FileProcessor.class.php

@@ -152,7 +152,7 @@ public function canAdopt(IFileProcessor $fileProcessor, File $file, array $conte
         return $fileProcessor->canAdopt($file, $context);
     }
 
-    public function generateWebpVariant(File $file): void
+    public function generateWebpVariant(File $file): File
     {
         $canGenerateThumbnail = match ($file->mimeType) {
             'image/jpeg', 'image/png' => true,
@@ -166,13 +166,13 @@ public function generateWebpVariant(File $file): void
                 ]);
             }
 
-            return;
+            return $file;
         }
 
         if ($file->fileHashWebp !== null) {
             $pathname = $file->getPathnameWebp();
             if (\file_exists($pathname) && \hash_file('sha256', $pathname) === $file->fileHashWebp) {
-                return;
+                return $file;
             }
         }
 
@@ -186,7 +186,7 @@ public function generateWebpVariant(File $file): void
         if ($filename === null) {
             $imageAdapter = ImageHandler::getInstance()->getAdapter();
             if (!$imageAdapter->checkMemoryLimit($file->width, $file->height, $file->mimeType)) {
-                return;
+                return $file;
             }
 
             try {
@@ -196,7 +196,7 @@ public function generateWebpVariant(File $file): void
             } catch (ImageNotProcessable $e) {
                 logThrowable($e);
 
-                return;
+                return $file;
             }
 
             $filename = FileUtil::getTemporaryFilename(extension: 'webp');
@@ -209,7 +209,7 @@ public function generateWebpVariant(File $file): void
                     throw $e;
                 }
 
-                return;
+                return $file;
             }
         }
 
@@ -223,6 +223,8 @@ public function generateWebpVariant(File $file): void
         \assert($pathname !== null);
 
         \rename($filename, $pathname);
+
+        return $file;
     }
 
     public function generateThumbnails(File $file): void

wcfsetup/install/files/lib/system/worker/FileRebuildDataWorker.class.php

@@ -52,7 +52,7 @@ public function execute()
         $damagedFileIDs = [];
         foreach ($this->objectList->getObjects() as $file) {
             try {
-                FileProcessor::getInstance()->generateWebpVariant($file);
+                $file = FileProcessor::getInstance()->generateWebpVariant($file);
                 $file = FileProcessor::getInstance()->convertImageFormat($file);
                 $file = FileProcessor::getInstance()->stripExif($file);
                 FileProcessor::getInstance()->generateThumbnails($file);