nextcloud / server

lib/private/Preview/Bitmap.php

Indentation +77 added lines, -77 removed lines

@@ -34,82 +34,82 @@
  */
 abstract class Bitmap extends Provider {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-
-		$tmpPath = $fileview->toTmpFile($path);
-		if (!$tmpPath) {
-			return false;
-		}
-
-		// Creates \Imagick object from bitmap or vector file
-		try {
-			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
-		} catch (\Exception $e) {
-			\OCP\Util::writeLog('core', 'ImageMagick says: ' . $e->getmessage(), \OCP\Util::ERROR);
-			return false;
-		}
-
-		unlink($tmpPath);
-
-		//new bitmap image object
-		$image = new \OC_Image();
-		$image->loadFromData($bp);
-		//check if image object is valid
-		return $image->valid() ? $image : false;
-	}
-
-	/**
-	 * Returns a preview of maxX times maxY dimensions in PNG format
-	 *
-	 *    * The default resolution is already 72dpi, no need to change it for a bitmap output
-	 *    * It's possible to have proper colour conversion using profileimage().
-	 *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
-	 *    * It's possible to Gamma-correct an image via gammaImage()
-	 *
-	 * @param string $tmpPath the location of the file to convert
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function getResizedPreview($tmpPath, $maxX, $maxY) {
-		$bp = new Imagick();
-
-		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-		$bp->readImage($tmpPath . '[0]');
-
-		$bp = $this->resize($bp, $maxX, $maxY);
-
-		$bp->setImageFormat('png');
-
-		return $bp;
-	}
-
-	/**
-	 * Returns a resized \Imagick object
-	 *
-	 * If you want to know more on the various methods available to resize an
-	 * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
-	 *
-	 * @param \Imagick $bp
-	 * @param int $maxX
-	 * @param int $maxY
-	 *
-	 * @return \Imagick
-	 */
-	private function resize($bp, $maxX, $maxY) {
-		list($previewWidth, $previewHeight) = array_values($bp->getImageGeometry());
-
-		// We only need to resize a preview which doesn't fit in the maximum dimensions
-		if ($previewWidth > $maxX || $previewHeight > $maxY) {
-			// TODO: LANCZOS is the default filter, CATROM could bring similar results faster
-			$bp->resizeImage($maxX, $maxY, imagick::FILTER_LANCZOS, 1, true);
-		}
-
-		return $bp;
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+
+        $tmpPath = $fileview->toTmpFile($path);
+        if (!$tmpPath) {
+            return false;
+        }
+
+        // Creates \Imagick object from bitmap or vector file
+        try {
+            $bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
+        } catch (\Exception $e) {
+            \OCP\Util::writeLog('core', 'ImageMagick says: ' . $e->getmessage(), \OCP\Util::ERROR);
+            return false;
+        }
+
+        unlink($tmpPath);
+
+        //new bitmap image object
+        $image = new \OC_Image();
+        $image->loadFromData($bp);
+        //check if image object is valid
+        return $image->valid() ? $image : false;
+    }
+
+    /**
+     * Returns a preview of maxX times maxY dimensions in PNG format
+     *
+     *    * The default resolution is already 72dpi, no need to change it for a bitmap output
+     *    * It's possible to have proper colour conversion using profileimage().
+     *    ICC profiles are here: http://www.color.org/srgbprofiles.xalter
+     *    * It's possible to Gamma-correct an image via gammaImage()
+     *
+     * @param string $tmpPath the location of the file to convert
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function getResizedPreview($tmpPath, $maxX, $maxY) {
+        $bp = new Imagick();
+
+        // Layer 0 contains either the bitmap or a flat representation of all vector layers
+        $bp->readImage($tmpPath . '[0]');
+
+        $bp = $this->resize($bp, $maxX, $maxY);
+
+        $bp->setImageFormat('png');
+
+        return $bp;
+    }
+
+    /**
+     * Returns a resized \Imagick object
+     *
+     * If you want to know more on the various methods available to resize an
+     * image, check out this link : @link https://stackoverflow.com/questions/8517304/what-the-difference-of-sample-resample-scale-resize-adaptive-resize-thumbnail-im
+     *
+     * @param \Imagick $bp
+     * @param int $maxX
+     * @param int $maxY
+     *
+     * @return \Imagick
+     */
+    private function resize($bp, $maxX, $maxY) {
+        list($previewWidth, $previewHeight) = array_values($bp->getImageGeometry());
+
+        // We only need to resize a preview which doesn't fit in the maximum dimensions
+        if ($previewWidth > $maxX || $previewHeight > $maxY) {
+            // TODO: LANCZOS is the default filter, CATROM could bring similar results faster
+            $bp->resizeImage($maxX, $maxY, imagick::FILTER_LANCZOS, 1, true);
+        }
+
+        return $bp;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -48,7 +48,7 @@ 
 		try {
 			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
 		} catch (\Exception $e) {
-			\OCP\Util::writeLog('core', 'ImageMagick says: ' . $e->getmessage(), \OCP\Util::ERROR);
+			\OCP\Util::writeLog('core', 'ImageMagick says: '.$e->getmessage(), \OCP\Util::ERROR);
 			return false;
 		}
 
@@ -79,7 +79,7 @@ 
 		$bp = new Imagick();
 
 		// Layer 0 contains either the bitmap or a flat representation of all vector layers
-		$bp->readImage($tmpPath . '[0]');
+		$bp->readImage($tmpPath.'[0]');
 
 		$bp = $this->resize($bp, $maxX, $maxY);
 

lib/private/Preview/Office.php

Indentation +57 added lines, -57 removed lines

@@ -26,80 +26,80 @@
 namespace OC\Preview;
 
 abstract class Office extends Provider {
-	private $cmd;
+    private $cmd;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-		$this->initCmd();
-		if (is_null($this->cmd)) {
-			return false;
-		}
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+        $this->initCmd();
+        if (is_null($this->cmd)) {
+            return false;
+        }
 
-		$absPath = $fileview->toTmpFile($path);
+        $absPath = $fileview->toTmpFile($path);
 
-		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
+        $tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
 
-		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir ';
-		$clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);
+        $defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir ';
+        $clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);
 
-		$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+        $exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
 
-		shell_exec($exec);
+        shell_exec($exec);
 
-		//create imagick object from pdf
-		$pdfPreview = null;
-		try {
-			list($dirname, , , $filename) = array_values(pathinfo($absPath));
-			$pdfPreview = $dirname . '/' . $filename . '.pdf';
+        //create imagick object from pdf
+        $pdfPreview = null;
+        try {
+            list($dirname, , , $filename) = array_values(pathinfo($absPath));
+            $pdfPreview = $dirname . '/' . $filename . '.pdf';
 
-			$pdf = new \imagick($pdfPreview . '[0]');
-			$pdf->setImageFormat('jpg');
-		} catch (\Exception $e) {
-			unlink($absPath);
-			unlink($pdfPreview);
-			\OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::ERROR);
-			return false;
-		}
+            $pdf = new \imagick($pdfPreview . '[0]');
+            $pdf->setImageFormat('jpg');
+        } catch (\Exception $e) {
+            unlink($absPath);
+            unlink($pdfPreview);
+            \OCP\Util::writeLog('core', $e->getmessage(), \OCP\Util::ERROR);
+            return false;
+        }
 
-		$image = new \OC_Image();
-		$image->loadFromData($pdf);
+        $image = new \OC_Image();
+        $image->loadFromData($pdf);
 
-		unlink($absPath);
-		unlink($pdfPreview);
+        unlink($absPath);
+        unlink($pdfPreview);
 
-		if ($image->valid()) {
-			$image->scaleDownToFit($maxX, $maxY);
+        if ($image->valid()) {
+            $image->scaleDownToFit($maxX, $maxY);
 
-			return $image;
-		}
-		return false;
+            return $image;
+        }
+        return false;
 
-	}
+    }
 
-	private function initCmd() {
-		$cmd = '';
+    private function initCmd() {
+        $cmd = '';
 
-		$libreOfficePath = \OC::$server->getConfig()->getSystemValue('preview_libreoffice_path', null);
-		if (is_string($libreOfficePath)) {
-			$cmd = $libreOfficePath;
-		}
+        $libreOfficePath = \OC::$server->getConfig()->getSystemValue('preview_libreoffice_path', null);
+        if (is_string($libreOfficePath)) {
+            $cmd = $libreOfficePath;
+        }
 
-		$whichLibreOffice = shell_exec('command -v libreoffice');
-		if ($cmd === '' && !empty($whichLibreOffice)) {
-			$cmd = 'libreoffice';
-		}
+        $whichLibreOffice = shell_exec('command -v libreoffice');
+        if ($cmd === '' && !empty($whichLibreOffice)) {
+            $cmd = 'libreoffice';
+        }
 
-		$whichOpenOffice = shell_exec('command -v openoffice');
-		if ($cmd === '' && !empty($whichOpenOffice)) {
-			$cmd = 'openoffice';
-		}
+        $whichOpenOffice = shell_exec('command -v openoffice');
+        if ($cmd === '' && !empty($whichOpenOffice)) {
+            $cmd = 'openoffice';
+        }
 
-		if ($cmd === '') {
-			$cmd = null;
-		}
+        if ($cmd === '') {
+            $cmd = null;
+        }
 
-		$this->cmd = $cmd;
-	}
+        $this->cmd = $cmd;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -41,20 +41,20 @@
 
 		$tmpDir = \OC::$server->getTempManager()->getTempBaseDir();
 
-		$defaultParameters = ' -env:UserInstallation=file://' . escapeshellarg($tmpDir . '/owncloud-' . \OC_Util::getInstanceId() . '/') . ' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir ';
+		$defaultParameters = ' -env:UserInstallation=file://'.escapeshellarg($tmpDir.'/owncloud-'.\OC_Util::getInstanceId().'/').' --headless --nologo --nofirststartwizard --invisible --norestore --convert-to pdf --outdir ';
 		$clParameters = \OCP\Config::getSystemValue('preview_office_cl_parameters', $defaultParameters);
 
-		$exec = $this->cmd . $clParameters . escapeshellarg($tmpDir) . ' ' . escapeshellarg($absPath);
+		$exec = $this->cmd.$clParameters.escapeshellarg($tmpDir).' '.escapeshellarg($absPath);
 
 		shell_exec($exec);
 
 		//create imagick object from pdf
 		$pdfPreview = null;
 		try {
-			list($dirname, , , $filename) = array_values(pathinfo($absPath));
-			$pdfPreview = $dirname . '/' . $filename . '.pdf';
+			list($dirname,,, $filename) = array_values(pathinfo($absPath));
+			$pdfPreview = $dirname.'/'.$filename.'.pdf';
 
-			$pdf = new \imagick($pdfPreview . '[0]');
+			$pdf = new \imagick($pdfPreview.'[0]');
 			$pdf->setImageFormat('jpg');
 		} catch (\Exception $e) {
 			unlink($absPath);

lib/private/Preview/Movie.php

Indentation +71 added lines, -71 removed lines

@@ -26,89 +26,89 @@
 namespace OC\Preview;
 
 class Movie extends Provider {
-	public static $avconvBinary;
-	public static $ffmpegBinary;
+    public static $avconvBinary;
+    public static $ffmpegBinary;
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType() {
-		return '/video\/.*/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType() {
+        return '/video\/.*/';
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-		// TODO: use proc_open() and stream the source file ?
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+        // TODO: use proc_open() and stream the source file ?
 
-		$fileInfo = $fileview->getFileInfo($path);
-		$useFileDirectly = (!$fileInfo->isEncrypted() && !$fileInfo->isMounted());
+        $fileInfo = $fileview->getFileInfo($path);
+        $useFileDirectly = (!$fileInfo->isEncrypted() && !$fileInfo->isMounted());
 
-		if ($useFileDirectly) {
-			$absPath = $fileview->getLocalFile($path);
-		} else {
-			$absPath = \OC::$server->getTempManager()->getTemporaryFile();
+        if ($useFileDirectly) {
+            $absPath = $fileview->getLocalFile($path);
+        } else {
+            $absPath = \OC::$server->getTempManager()->getTemporaryFile();
 
-			$handle = $fileview->fopen($path, 'rb');
+            $handle = $fileview->fopen($path, 'rb');
 
-			// we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.
-			// in some cases 1MB was no enough to generate thumbnail
-			$firstmb = stream_get_contents($handle, 5242880);
-			file_put_contents($absPath, $firstmb);
-		}
+            // we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.
+            // in some cases 1MB was no enough to generate thumbnail
+            $firstmb = stream_get_contents($handle, 5242880);
+            file_put_contents($absPath, $firstmb);
+        }
 
-		$result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
-		if ($result === false) {
-			$result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
-			if ($result === false) {
-				$result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
-			}
-		}
+        $result = $this->generateThumbNail($maxX, $maxY, $absPath, 5);
+        if ($result === false) {
+            $result = $this->generateThumbNail($maxX, $maxY, $absPath, 1);
+            if ($result === false) {
+                $result = $this->generateThumbNail($maxX, $maxY, $absPath, 0);
+            }
+        }
 
-		if (!$useFileDirectly) {
-			unlink($absPath);
-		}
+        if (!$useFileDirectly) {
+            unlink($absPath);
+        }
 
-		return $result;
-	}
+        return $result;
+    }
 
-	/**
-	 * @param int $maxX
-	 * @param int $maxY
-	 * @param string $absPath
-	 * @param int $second
-	 * @return bool|\OCP\IImage
-	 */
-	private function generateThumbNail($maxX, $maxY, $absPath, $second) {
-		$tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
+    /**
+     * @param int $maxX
+     * @param int $maxY
+     * @param string $absPath
+     * @param int $second
+     * @return bool|\OCP\IImage
+     */
+    private function generateThumbNail($maxX, $maxY, $absPath, $second) {
+        $tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
 
-		if (self::$avconvBinary) {
-			$cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
-				' > /dev/null 2>&1';
-		} else {
-			$cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -f mjpeg -vframes 1' .
-				' ' . escapeshellarg($tmpPath) .
-				' > /dev/null 2>&1';
-		}
+        if (self::$avconvBinary) {
+            $cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) .
+                ' -i ' . escapeshellarg($absPath) .
+                ' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
+                ' > /dev/null 2>&1';
+        } else {
+            $cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
+                ' -i ' . escapeshellarg($absPath) .
+                ' -f mjpeg -vframes 1' .
+                ' ' . escapeshellarg($tmpPath) .
+                ' > /dev/null 2>&1';
+        }
 
-		exec($cmd, $output, $returnCode);
+        exec($cmd, $output, $returnCode);
 
-		if ($returnCode === 0) {
-			$image = new \OC_Image();
-			$image->loadFromFile($tmpPath);
-			unlink($tmpPath);
-			if ($image->valid()) {
-				$image->scaleDownToFit($maxX, $maxY);
+        if ($returnCode === 0) {
+            $image = new \OC_Image();
+            $image->loadFromFile($tmpPath);
+            unlink($tmpPath);
+            if ($image->valid()) {
+                $image->scaleDownToFit($maxX, $maxY);
 
-				return $image;
-			}
-		}
-		unlink($tmpPath);
-		return false;
-	}
+                return $image;
+            }
+        }
+        unlink($tmpPath);
+        return false;
+    }
 }

Spacing +7 added lines, -7 removed lines

@@ -84,15 +84,15 @@
 		$tmpPath = \OC::$server->getTempManager()->getTemporaryFile();
 
 		if (self::$avconvBinary) {
-			$cmd = self::$avconvBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -an -f mjpeg -vframes 1 -vsync 1 ' . escapeshellarg($tmpPath) .
+			$cmd = self::$avconvBinary.' -y -ss '.escapeshellarg($second).
+				' -i '.escapeshellarg($absPath).
+				' -an -f mjpeg -vframes 1 -vsync 1 '.escapeshellarg($tmpPath).
 				' > /dev/null 2>&1';
 		} else {
-			$cmd = self::$ffmpegBinary . ' -y -ss ' . escapeshellarg($second) .
-				' -i ' . escapeshellarg($absPath) .
-				' -f mjpeg -vframes 1' .
-				' ' . escapeshellarg($tmpPath) .
+			$cmd = self::$ffmpegBinary.' -y -ss '.escapeshellarg($second).
+				' -i '.escapeshellarg($absPath).
+				' -f mjpeg -vframes 1'.
+				' '.escapeshellarg($tmpPath).
 				' > /dev/null 2>&1';
 		}
 

lib/private/Preview/Illustrator.php

Indentation +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@
 
 //.ai
 class Illustrator extends Bitmap {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType() {
-		return '/application\/illustrator/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType() {
+        return '/application\/illustrator/';
+    }
 }

lib/private/Preview/BMP.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
 namespace OC\Preview;
 
 class BMP extends Image {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType() {
-		return '/image\/bmp/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType() {
+        return '/image\/bmp/';
+    }
 }

lib/private/Preview/PDF.php

Indentation +6 added lines, -6 removed lines

@@ -25,10 +25,10 @@
 
 //.pdf
 class PDF extends Bitmap {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType() {
-		return '/application\/pdf/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType() {
+        return '/application\/pdf/';
+    }
 }

lib/private/Preview/XBitmap.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
 namespace OC\Preview;
 
 class XBitmap extends Image {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType() {
-		return '/image\/x-xbitmap/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType() {
+        return '/image\/x-xbitmap/';
+    }
 }

lib/private/Preview/GIF.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
 namespace OC\Preview;
 
 class GIF extends Image {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType() {
-		return '/image\/gif/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType() {
+        return '/image\/gif/';
+    }
 }

lib/private/Preview/MarkDown.php

Indentation +6 added lines, -6 removed lines

@@ -22,11 +22,11 @@
 namespace OC\Preview;
 
 class MarkDown extends TXT {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType() {
-		return '/text\/(x-)?markdown/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType() {
+        return '/text\/(x-)?markdown/';
+    }
 
 }