Properly log errors in Movie previews generation

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

diff --git a/lib/private/Preview/Generator.php b/lib/private/Preview/Generator.php
index 454439a6f653ab4ae4265c668610f6636ecb6200..6e1e0997a68f389a264776c31a3d2d92a0a5af82 100644 (file)
--- a/lib/private/Preview/Generator.php
+++ b/lib/private/Preview/Generator.php
@@ -224,6 +224,7 @@ class Generator {
 
                $previewProviders = $this->previewManager->getProviders();
                foreach ($previewProviders as $supportedMimeType => $providers) {
+                       // Filter out providers that does not support this mime
                        if (!preg_match($supportedMimeType, $mimeType)) {
                                continue;
                        }

diff --git a/lib/private/Preview/Movie.php b/lib/private/Preview/Movie.php
index 80f2b5eb7636614251f67ebdce8bf1d2c9e29fe5..e7fc7745996ec89328dc01ee0c71659d08e41942 100644 (file)
--- a/lib/private/Preview/Movie.php
+++ b/lib/private/Preview/Movie.php
@@ -31,6 +31,7 @@ namespace OC\Preview;
 
 use OCP\Files\File;
 use OCP\IImage;
+use Psr\Log\LoggerInterface;
 
 class Movie extends ProviderV2 {
        public static $avconvBinary;
@@ -78,13 +79,13 @@ class Movie extends ProviderV2 {
                        $cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) .
                                ' -i ' . escapeshellarg($absPath) .
                                ' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
-                               ' > /dev/null 2>&1';
+                               ' 2>&1';
                } else {
                        $cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
                                ' -i ' . escapeshellarg($absPath) .
                                ' -f mjpeg -vframes 1' .
                                ' ' . escapeshellarg($tmpPath) .
-                               ' > /dev/null 2>&1';
+                               ' 2>&1';
                }
 
                exec($cmd, $output, $returnCode);
@@ -99,6 +100,10 @@ class Movie extends ProviderV2 {
                                return $image;
                        }
                }
+
+               $logger = \OC::$server->get(LoggerInterface::class);
+               $logger->error('Movie preview generation failed Output: {output}', ['app' => 'core', 'output' => $output]);
+
                unlink($tmpPath);
                return null;
        }