nextcloud / server

lib/private/Preview/Movie.php

Spacing +17 added lines, -17 removed lines

@@ -88,7 +88,7 @@ 
 			}
 			if ($absPath === false) {
 				Server::get(LoggerInterface::class)->error(
-					'Failed to get local file to generate thumbnail for: ' . $file->getPath(),
+					'Failed to get local file to generate thumbnail for: '.$file->getPath(),
 					['app' => 'core']
 				);
 				return null;
@@ -111,7 +111,7 @@ 
 		return $result;
 	}
 
-	private function getSparseFile(File $file, int $size): string|false {
+	private function getSparseFile(File $file, int $size): string | false {
 		// File is smaller than $size or file is larger than max int size
 		// of the host so return false so getLocalFile method is used
 		if (($size >= $file->getSize()) || ($file->getSize() > PHP_INT_MAX)) {
@@ -128,7 +128,7 @@ 
 		$absPath = Server::get(ITempManager::class)->getTemporaryFile();
 		if ($absPath === false) {
 			Server::get(LoggerInterface::class)->error(
-				'Failed to get sparse file to generate thumbnail: ' . $file->getPath(),
+				'Failed to get sparse file to generate thumbnail: '.$file->getPath(),
 				['app' => 'core']
 			);
 			fclose($content);
@@ -137,7 +137,7 @@ 
 		$sparseFile = fopen($absPath, 'w');
 
 		// Firsts 4 bytes indicate length of 1st atom.
-		$ftypSize = (int)hexdec(bin2hex(stream_get_contents($content, 4, 0)));
+		$ftypSize = (int) hexdec(bin2hex(stream_get_contents($content, 4, 0)));
 		// Download next 4 bytes to find name of 1st atom.
 		$ftypLabel = stream_get_contents($content, 4, 4);
 
@@ -152,9 +152,9 @@ 
 			// EOF is reached
 			while (($offset + 8 < $file->getSize()) && ($moovSize === 0)) {
 				// First 4 bytes of atom header indicates size of the atom.
-				$atomSize = (int)hexdec(bin2hex(stream_get_contents($content, 4, (int)$offset)));
+				$atomSize = (int) hexdec(bin2hex(stream_get_contents($content, 4, (int) $offset)));
 				// Next 4 bytes of atom header is the name/label of the atom
-				$atomLabel = stream_get_contents($content, 4, (int)($offset + 4));
+				$atomLabel = stream_get_contents($content, 4, (int) ($offset + 4));
 				// Size value has two special values that don't directly indicate size
 				// 0 = atom size equals the rest of the file
 				if ($atomSize === 0) {
@@ -163,7 +163,7 @@ 
 					// 1 = read an additional 8 bytes after the label to get the 64 bit
 					// size of the atom. Needed for large atoms like 'mdat' (the video data)
 					if ($atomSize === 1) {
-						$atomSize = (int)hexdec(bin2hex(stream_get_contents($content, 8, (int)($offset + 8))));
+						$atomSize = (int) hexdec(bin2hex(stream_get_contents($content, 8, (int) ($offset + 8))));
 					}
 				}
 				// Found the 'moov' atom, store its location and size
@@ -188,7 +188,7 @@ 
 				return false;
 			}
 			// Generate new file of same size
-			ftruncate($sparseFile, (int)($file->getSize()));
+			ftruncate($sparseFile, (int) ($file->getSize()));
 			fseek($sparseFile, 0);
 			fseek($content, 0);
 			// Copy first $size bytes of video into new file
@@ -198,9 +198,9 @@ 
 			// so no need to download it again.
 			if ($moovOffset >= $size) {
 				// Seek to where 'moov' atom needs to be placed
-				fseek($content, (int)$moovOffset);
-				fseek($sparseFile, (int)$moovOffset);
-				stream_copy_to_stream($content, $sparseFile, (int)$moovSize, 0);
+				fseek($content, (int) $moovOffset);
+				fseek($sparseFile, (int) $moovOffset);
+				stream_copy_to_stream($content, $sparseFile, (int) $moovSize, 0);
 			}
 		} else {
 			// 'ftyp' atom not found, not a valid MP4/MOV
@@ -215,9 +215,9 @@ 
 
 	private function useHdr(string $absPath): bool {
 		// load ffprobe path from configuration, otherwise generate binary path using ffmpeg binary path
-		$ffprobe_binary = $this->config->getSystemValue('preview_ffprobe_path', null) ?? (pathinfo($this->binary, PATHINFO_DIRNAME) . '/ffprobe');
+		$ffprobe_binary = $this->config->getSystemValue('preview_ffprobe_path', null) ?? (pathinfo($this->binary, PATHINFO_DIRNAME).'/ffprobe');
 		// run ffprobe on the video file to get value of "color_transfer"
-		$test_hdr_cmd = [$ffprobe_binary,'-select_streams', 'v:0',
+		$test_hdr_cmd = [$ffprobe_binary, '-select_streams', 'v:0',
 			'-show_entries', 'stream=color_transfer',
 			'-of', 'default=noprint_wrappers=1:nokey=1',
 			$absPath];
@@ -243,7 +243,7 @@ 
 		$tmpPath = Server::get(ITempManager::class)->getTemporaryFile();
 		if ($tmpPath === false) {
 			Server::get(LoggerInterface::class)->error(
-				'Failed to get local file to generate thumbnail for: ' . $absPath,
+				'Failed to get local file to generate thumbnail for: '.$absPath,
 				['app' => 'core']
 			);
 			return null;
@@ -255,14 +255,14 @@ 
 			if ($this->useHdr($absPath)) {
 				// Force colorspace to '2020_ncl' because some videos are
 				// tagged incorrectly as 'reserved' resulting in fail if not forced.
-				$cmd = [$this->binary, '-y', '-ss', (string)$second,
+				$cmd = [$this->binary, '-y', '-ss', (string) $second,
 					'-i', $absPath,
 					'-f', 'mjpeg', '-vframes', '1',
 					'-vf', 'zscale=min=2020_ncl:t=linear:npl=100,format=gbrpf32le,zscale=p=bt709,tonemap=tonemap=hable:desat=0,zscale=t=bt709:m=bt709:r=tv,format=yuv420p',
 					$tmpPath];
 			} else {
 				// always default to generating preview using non-HDR command
-				$cmd = [$this->binary, '-y', '-ss', (string)$second,
+				$cmd = [$this->binary, '-y', '-ss', (string) $second,
 					'-i', $absPath,
 					'-f', 'mjpeg', '-vframes', '1',
 					$tmpPath];
@@ -280,7 +280,7 @@ 
 			$stderr = trim(stream_get_contents($pipes[2]));
 			$stdout = trim(stream_get_contents($pipes[1]));
 			$returnCode = proc_close($proc);
-			$output = $stdout . $stderr;
+			$output = $stdout.$stderr;
 		}
 
 		if ($returnCode === 0) {

tests/lib/Preview/MovieTestRemoteFile.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 		$movieBinary = $binaryFinder->findBinaryPath('ffmpeg');
 		if (is_string($movieBinary)) {
 			parent::setUp();
-			$this->imgPath = $this->prepareTestFile($this->fileName, \OC::$SERVERROOT . '/tests/data/' . $this->fileName);
+			$this->imgPath = $this->prepareTestFile($this->fileName, \OC::$SERVERROOT.'/tests/data/'.$this->fileName);
 			$this->provider = new Movie(['movieBinary' => $movieBinary]);
 		} else {
 			$this->markTestSkipped('No Movie provider present');