nextcloud / server

lib/private/Preview/Movie.php

Indentation +134 added lines, -134 removed lines

@@ -35,138 +35,138 @@
 use Psr\Log\LoggerInterface;
 
 class Movie extends ProviderV2 {
-	/**
-	 * @deprecated 23.0.0 pass option to \OCP\Preview\ProviderV2
-	 * @var string
-	 */
-	public static $avconvBinary;
-
-	/**
-	 * @deprecated 23.0.0 pass option to \OCP\Preview\ProviderV2
-	 * @var string
-	 */
-	public static $ffmpegBinary;
-
-	/** @var string */
-	private $binary;
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/video\/.*/';
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isAvailable(FileInfo $file): bool {
-		// TODO: remove when avconv is dropped
-		if (is_null($this->binary)) {
-			if (isset($this->options['movieBinary'])) {
-				$this->binary = $this->options['movieBinary'];
-			} elseif (is_string(self::$avconvBinary)) {
-				$this->binary = self::$avconvBinary;
-			} elseif (is_string(self::$ffmpegBinary)) {
-				$this->binary = self::$ffmpegBinary;
-			}
-		}
-		return is_string($this->binary);
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		// TODO: use proc_open() and stream the source file ?
-
-		if (!$this->isAvailable($file)) {
-			return null;
-		}
-
-		$result = null;
-		if ($this->useTempFile($file)) {
-			// try downloading 5 MB first as it's likely that the first frames are present there
-			// in some cases this doesn't work for example when the moov atom is at the
-			// end of the file, so if it fails we fall back to getting the full file
-			$sizeAttempts = [5242880, null];
-		} else {
-			// size is irrelevant, only attempt once
-			$sizeAttempts = [null];
-		}
-
-		foreach ($sizeAttempts as $size) {
-			$absPath = $this->getLocalFile($file, $size);
-
-			$result = null;
-			if (is_string($absPath)) {
-				$result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
-				if ($result === null) {
-					$result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
-					if ($result === null) {
-						$result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
-					}
-				}
-			}
-
-			$this->cleanTmpFiles();
-
-			if ($result !== null) {
-				break;
-			}
-		}
-
-		return $result;
-	}
-
-	private function generateThumbNail(int $maxX, int $maxY, string $absPath, int $second): ?IImage {
-		$tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
-
-		$binaryType = substr(strrchr($this->binary, '/'), 1);
-
-		if ($binaryType === 'avconv') {
-			$cmd = [$this->binary, '-y', '-ss', (string)$second,
-				'-i', $absPath,
-				'-an', '-f', 'mjpeg', '-vframes', '1', '-vsync', '1',
-				$tmpPath];
-		} elseif ($binaryType === 'ffmpeg') {
-			$cmd = [$this->binary, '-y', '-ss', (string)$second,
-				'-i', $absPath,
-				'-f', 'mjpeg', '-vframes', '1',
-				$tmpPath];
-		} else {
-			// Not supported
-			unlink($tmpPath);
-			return null;
-		}
-
-		$proc = proc_open($cmd, [1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $pipes);
-		$returnCode = -1;
-		$output = "";
-		if (is_resource($proc)) {
-			$stdout = trim(stream_get_contents($pipes[1]));
-			$stderr = trim(stream_get_contents($pipes[2]));
-			$returnCode = proc_close($proc);
-			$output = $stdout . $stderr;
-		}
-
-		if ($returnCode === 0) {
-			$image = new \OCP\Image();
-			$image->loadFromFile($tmpPath);
-			if ($image->valid()) {
-				unlink($tmpPath);
-				$image->scaleDownToFit($maxX, $maxY);
-
-				return $image;
-			}
-		}
-
-		if ($second === 0) {
-			$logger = \OC::$server->get(LoggerInterface::class);
-			$logger->error('Movie preview generation failed Output: {output}', ['app' => 'core', 'output' => $output]);
-		}
-
-		unlink($tmpPath);
-		return null;
-	}
+    /**
+     * @deprecated 23.0.0 pass option to \OCP\Preview\ProviderV2
+     * @var string
+     */
+    public static $avconvBinary;
+
+    /**
+     * @deprecated 23.0.0 pass option to \OCP\Preview\ProviderV2
+     * @var string
+     */
+    public static $ffmpegBinary;
+
+    /** @var string */
+    private $binary;
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/video\/.*/';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isAvailable(FileInfo $file): bool {
+        // TODO: remove when avconv is dropped
+        if (is_null($this->binary)) {
+            if (isset($this->options['movieBinary'])) {
+                $this->binary = $this->options['movieBinary'];
+            } elseif (is_string(self::$avconvBinary)) {
+                $this->binary = self::$avconvBinary;
+            } elseif (is_string(self::$ffmpegBinary)) {
+                $this->binary = self::$ffmpegBinary;
+            }
+        }
+        return is_string($this->binary);
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        // TODO: use proc_open() and stream the source file ?
+
+        if (!$this->isAvailable($file)) {
+            return null;
+        }
+
+        $result = null;
+        if ($this->useTempFile($file)) {
+            // try downloading 5 MB first as it's likely that the first frames are present there
+            // in some cases this doesn't work for example when the moov atom is at the
+            // end of the file, so if it fails we fall back to getting the full file
+            $sizeAttempts = [5242880, null];
+        } else {
+            // size is irrelevant, only attempt once
+            $sizeAttempts = [null];
+        }
+
+        foreach ($sizeAttempts as $size) {
+            $absPath = $this->getLocalFile($file, $size);
+
+            $result = null;
+            if (is_string($absPath)) {
+                $result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
+                if ($result === null) {
+                    $result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
+                    if ($result === null) {
+                        $result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
+                    }
+                }
+            }
+
+            $this->cleanTmpFiles();
+
+            if ($result !== null) {
+                break;
+            }
+        }
+
+        return $result;
+    }
+
+    private function generateThumbNail(int $maxX, int $maxY, string $absPath, int $second): ?IImage {
+        $tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
+
+        $binaryType = substr(strrchr($this->binary, '/'), 1);
+
+        if ($binaryType === 'avconv') {
+            $cmd = [$this->binary, '-y', '-ss', (string)$second,
+                '-i', $absPath,
+                '-an', '-f', 'mjpeg', '-vframes', '1', '-vsync', '1',
+                $tmpPath];
+        } elseif ($binaryType === 'ffmpeg') {
+            $cmd = [$this->binary, '-y', '-ss', (string)$second,
+                '-i', $absPath,
+                '-f', 'mjpeg', '-vframes', '1',
+                $tmpPath];
+        } else {
+            // Not supported
+            unlink($tmpPath);
+            return null;
+        }
+
+        $proc = proc_open($cmd, [1 => ['pipe', 'w'], 2 => ['pipe', 'w']], $pipes);
+        $returnCode = -1;
+        $output = "";
+        if (is_resource($proc)) {
+            $stdout = trim(stream_get_contents($pipes[1]));
+            $stderr = trim(stream_get_contents($pipes[2]));
+            $returnCode = proc_close($proc);
+            $output = $stdout . $stderr;
+        }
+
+        if ($returnCode === 0) {
+            $image = new \OCP\Image();
+            $image->loadFromFile($tmpPath);
+            if ($image->valid()) {
+                unlink($tmpPath);
+                $image->scaleDownToFit($maxX, $maxY);
+
+                return $image;
+            }
+        }
+
+        if ($second === 0) {
+            $logger = \OC::$server->get(LoggerInterface::class);
+            $logger->error('Movie preview generation failed Output: {output}', ['app' => 'core', 'output' => $output]);
+        }
+
+        unlink($tmpPath);
+        return null;
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -125,12 +125,12 @@ 
 		$binaryType = substr(strrchr($this->binary, '/'), 1);
 
 		if ($binaryType === 'avconv') {
-			$cmd = [$this->binary, '-y', '-ss', (string)$second,
+			$cmd = [$this->binary, '-y', '-ss', (string) $second,
 				'-i', $absPath,
 				'-an', '-f', 'mjpeg', '-vframes', '1', '-vsync', '1',
 				$tmpPath];
 		} elseif ($binaryType === 'ffmpeg') {
-			$cmd = [$this->binary, '-y', '-ss', (string)$second,
+			$cmd = [$this->binary, '-y', '-ss', (string) $second,
 				'-i', $absPath,
 				'-f', 'mjpeg', '-vframes', '1',
 				$tmpPath];
@@ -147,7 +147,7 @@ 
 			$stdout = trim(stream_get_contents($pipes[1]));
 			$stderr = trim(stream_get_contents($pipes[2]));
 			$returnCode = proc_close($proc);
-			$output = $stdout . $stderr;
+			$output = $stdout.$stderr;
 		}
 
 		if ($returnCode === 0) {