nextcloud / server

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(): string {
-		return '/image\/gif/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/gif/';
+    }
 }

lib/private/Preview/Image.php

Indentation +20 added lines, -20 removed lines

@@ -32,32 +32,32 @@
 
 abstract class Image extends ProviderV2 {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$maxSizeForImages = \OC::$server->getConfig()->getSystemValue('preview_max_filesize_image', 50);
-		$size = $file->getSize();
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $maxSizeForImages = \OC::$server->getConfig()->getSystemValue('preview_max_filesize_image', 50);
+        $size = $file->getSize();
 
-		if ($maxSizeForImages !== -1 && $size > ($maxSizeForImages * 1024 * 1024)) {
-			return null;
-		}
+        if ($maxSizeForImages !== -1 && $size > ($maxSizeForImages * 1024 * 1024)) {
+            return null;
+        }
 
-		$image = new \OC_Image();
+        $image = new \OC_Image();
 
-		$fileName = $this->getLocalFile($file);
+        $fileName = $this->getLocalFile($file);
 
-		$image->loadFromFile($fileName);
-		$image->fixOrientation();
+        $image->loadFromFile($fileName);
+        $image->fixOrientation();
 
-		$this->cleanTmpFiles();
+        $this->cleanTmpFiles();
 
-		if ($image->valid()) {
-			$image->scaleDownToFit($maxX, $maxY);
+        if ($image->valid()) {
+            $image->scaleDownToFit($maxX, $maxY);
 
-			return $image;
-		}
-		return null;
-	}
+            return $image;
+        }
+        return null;
+    }
 
 }

lib/private/Preview/GeneratorHelper.php

Indentation +38 added lines, -38 removed lines

@@ -37,47 +37,47 @@
  */
 class GeneratorHelper {
 
-	/** @var IRootFolder */
-	private $rootFolder;
+    /** @var IRootFolder */
+    private $rootFolder;
 
-	/** @var IConfig */
-	private $config;
+    /** @var IConfig */
+    private $config;
 
-	public function __construct(IRootFolder $rootFolder, IConfig $config) {
-		$this->rootFolder = $rootFolder;
-		$this->config = $config;
-	}
+    public function __construct(IRootFolder $rootFolder, IConfig $config) {
+        $this->rootFolder = $rootFolder;
+        $this->config = $config;
+    }
 
-	/**
-	 * @param IProvider $provider
-	 * @param File $file
-	 * @param int $maxWidth
-	 * @param int $maxHeight
-	 * @return bool|IImage
-	 */
-	public function getThumbnail(IProviderV2 $provider, File $file, $maxWidth, $maxHeight) {
-		return $provider->getThumbnail($file, $maxWidth, $maxHeight);
-	}
+    /**
+     * @param IProvider $provider
+     * @param File $file
+     * @param int $maxWidth
+     * @param int $maxHeight
+     * @return bool|IImage
+     */
+    public function getThumbnail(IProviderV2 $provider, File $file, $maxWidth, $maxHeight) {
+        return $provider->getThumbnail($file, $maxWidth, $maxHeight);
+    }
 
-	/**
-	 * @param ISimpleFile $maxPreview
-	 * @return IImage
-	 */
-	public function getImage(ISimpleFile $maxPreview) {
-		$image = new OCPImage();
-		$image->loadFromData($maxPreview->getContent());
-		return $image;
-	}
+    /**
+     * @param ISimpleFile $maxPreview
+     * @return IImage
+     */
+    public function getImage(ISimpleFile $maxPreview) {
+        $image = new OCPImage();
+        $image->loadFromData($maxPreview->getContent());
+        return $image;
+    }
 
-	/**
-	 * @param callable $providerClosure
-	 * @return IProviderV2
-	 */
-	public function getProvider($providerClosure) {
-		$provider = $providerClosure();
-		if ($provider instanceof IProvider) {
-			$provider = new ProviderV1Adapter($provider);
-		}
-		return $provider;
-	}
+    /**
+     * @param callable $providerClosure
+     * @return IProviderV2
+     */
+    public function getProvider($providerClosure) {
+        $provider = $providerClosure();
+        if ($provider instanceof IProvider) {
+            $provider = new ProviderV1Adapter($provider);
+        }
+        return $provider;
+    }
 }

lib/private/Preview/SVG.php

Indentation +40 added lines, -40 removed lines

@@ -29,50 +29,50 @@
 use OCP\Files\File;
 
 class SVG extends ProviderV2 {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/svg\+xml/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/svg\+xml/';
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		try {
-			$svg = new \Imagick();
-			$svg->setBackgroundColor(new \ImagickPixel('transparent'));
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        try {
+            $svg = new \Imagick();
+            $svg->setBackgroundColor(new \ImagickPixel('transparent'));
 
-			$content = stream_get_contents($file->fopen('r'));
-			if (substr($content, 0, 5) !== '<?xml') {
-				$content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $content;
-			}
+            $content = stream_get_contents($file->fopen('r'));
+            if (substr($content, 0, 5) !== '<?xml') {
+                $content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $content;
+            }
 
-			// Do not parse SVG files with references
-			if (stripos($content, 'xlink:href') !== false) {
-				return null;
-			}
+            // Do not parse SVG files with references
+            if (stripos($content, 'xlink:href') !== false) {
+                return null;
+            }
 
-			$svg->readImageBlob($content);
-			$svg->setImageFormat('png32');
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return null;
-		}
+            $svg->readImageBlob($content);
+            $svg->setImageFormat('png32');
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return null;
+        }
 
-		//new image object
-		$image = new \OC_Image();
-		$image->loadFromData($svg);
-		//check if image object is valid
-		if ($image->valid()) {
-			$image->scaleDownToFit($maxX, $maxY);
+        //new image object
+        $image = new \OC_Image();
+        $image->loadFromData($svg);
+        //check if image object is valid
+        if ($image->valid()) {
+            $image->scaleDownToFit($maxX, $maxY);
 
-			return $image;
-		}
-		return null;
-	}
+            return $image;
+        }
+        return null;
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -46,7 +46,7 @@
 
 			$content = stream_get_contents($file->fopen('r'));
 			if (substr($content, 0, 5) !== '<?xml') {
-				$content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>' . $content;
+				$content = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>'.$content;
 			}
 
 			// Do not parse SVG files with references

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(): string {
-		return '/image\/x-xbitmap/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/x-xbitmap/';
+    }
 }

lib/private/Preview/PNG.php

Indentation +6 added lines, -6 removed lines

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

lib/private/Preview/HEIC.php

Indentation +101 added lines, -101 removed lines

@@ -33,107 +33,107 @@
  * @package OC\Preview
  */
 class HEIC extends ProviderV2 {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/image\/hei(f|c)/';
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function isAvailable(\OCP\Files\FileInfo $file): bool {
-		return in_array('HEIC', \Imagick::queryFormats("HEI*"));
-	}
-
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-		$tmpPath = $this->getLocalFile($file);
-
-		// Creates \Imagick object from the heic file
-		try {
-			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
-			$bp->setFormat('jpg');
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $file->getPath() . ' Imagick says:',
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return null;
-		}
-
-		$this->cleanTmpFiles();
-
-		//new bitmap image object
-		$image = new \OC_Image();
-		$image->loadFromData($bp);
-		//check if image object is valid
-		return $image->valid() ? $image : null;
-	}
-
-	/**
-	 * Returns a preview of maxX times maxY dimensions in JPG 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->setImageFormat('jpg');
-
-		$bp = $this->resize($bp, $maxX, $maxY);
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/image\/hei(f|c)/';
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function isAvailable(\OCP\Files\FileInfo $file): bool {
+        return in_array('HEIC', \Imagick::queryFormats("HEI*"));
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
+        $tmpPath = $this->getLocalFile($file);
+
+        // Creates \Imagick object from the heic file
+        try {
+            $bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
+            $bp->setFormat('jpg');
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => 'File: ' . $file->getPath() . ' Imagick says:',
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return null;
+        }
+
+        $this->cleanTmpFiles();
+
+        //new bitmap image object
+        $image = new \OC_Image();
+        $image->loadFromData($bp);
+        //check if image object is valid
+        return $image->valid() ? $image : null;
+    }
+
+    /**
+     * Returns a preview of maxX times maxY dimensions in JPG 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->setImageFormat('jpg');
+
+        $bp = $this->resize($bp, $maxX, $maxY);
 		
-		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) {
-			// If we want a small image (thumbnail) let's be most space- and time-efficient
-			if ($maxX <= 500 && $maxY <= 500) {
-				$bp->thumbnailImage($maxY, $maxX, true);
-				$bp->stripImage();
-			} else {
-				// A bigger image calls for some better resizing algorithm
-				// According to http://www.imagemagick.org/Usage/filter/#lanczos
-				// the catrom filter is almost identical to Lanczos2, but according
-				// to http://php.net/manual/en/imagick.resizeimage.php it is
-				// significantly faster
-				$bp->resizeImage($maxX, $maxY, \Imagick::FILTER_CATROM, 1, true);
-			}
-		}
-
-		return $bp;
-	}
+        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) {
+            // If we want a small image (thumbnail) let's be most space- and time-efficient
+            if ($maxX <= 500 && $maxY <= 500) {
+                $bp->thumbnailImage($maxY, $maxX, true);
+                $bp->stripImage();
+            } else {
+                // A bigger image calls for some better resizing algorithm
+                // According to http://www.imagemagick.org/Usage/filter/#lanczos
+                // the catrom filter is almost identical to Lanczos2, but according
+                // to http://php.net/manual/en/imagick.resizeimage.php it is
+                // significantly faster
+                $bp->resizeImage($maxX, $maxY, \Imagick::FILTER_CATROM, 1, true);
+            }
+        }
+
+        return $bp;
+    }
 
 }

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 			$bp->setFormat('jpg');
 		} catch (\Exception $e) {
 			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $file->getPath() . ' Imagick says:',
+				'message' => 'File: '.$file->getPath().' Imagick says:',
 				'level' => ILogger::ERROR,
 				'app' => 'core',
 			]);
@@ -93,7 +93,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->setImageFormat('jpg');
 

lib/private/Preview/MSOffice2003.php

Indentation +6 added lines, -6 removed lines

@@ -23,10 +23,10 @@
 
 //.docm, .dotm, .xls(m), .xlt(m), .xla(m), .ppt(m), .pot(m), .pps(m), .ppa(m)
 class MSOffice2003 extends Office {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType(): string {
-		return '/application\/vnd.ms-.*/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType(): string {
+        return '/application\/vnd.ms-.*/';
+    }
 }

lib/private/Preview/Bitmap.php

Indentation +78 added lines, -78 removed lines

@@ -37,83 +37,83 @@
  */
 abstract class Bitmap extends ProviderV2 {
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail(File $file, int $maxX, int $maxY): ?IImage {
-
-		$tmpPath = $this->getLocalFile($file);
-
-		// Creates \Imagick object from bitmap or vector file
-		try {
-			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
-		} catch (\Exception $e) {
-			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $file->getPath() . ' Imagick says:',
-				'level' => ILogger::ERROR,
-				'app' => 'core',
-			]);
-			return null;
-		}
-
-		$this->cleanTmpFiles();
-
-		//new bitmap image object
-		$image = new \OC_Image();
-		$image->loadFromData($bp);
-		//check if image object is valid
-		return $image->valid() ? $image : null;
-	}
-
-	/**
-	 * 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(File $file, int $maxX, int $maxY): ?IImage {
+
+        $tmpPath = $this->getLocalFile($file);
+
+        // Creates \Imagick object from bitmap or vector file
+        try {
+            $bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
+        } catch (\Exception $e) {
+            \OC::$server->getLogger()->logException($e, [
+                'message' => 'File: ' . $file->getPath() . ' Imagick says:',
+                'level' => ILogger::ERROR,
+                'app' => 'core',
+            ]);
+            return null;
+        }
+
+        $this->cleanTmpFiles();
+
+        //new bitmap image object
+        $image = new \OC_Image();
+        $image->loadFromData($bp);
+        //check if image object is valid
+        return $image->valid() ? $image : null;
+    }
+
+    /**
+     * 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

@@ -49,7 +49,7 @@ 
 			$bp = $this->getResizedPreview($tmpPath, $maxX, $maxY);
 		} catch (\Exception $e) {
 			\OC::$server->getLogger()->logException($e, [
-				'message' => 'File: ' . $file->getPath() . ' Imagick says:',
+				'message' => 'File: '.$file->getPath().' Imagick says:',
 				'level' => ILogger::ERROR,
 				'app' => 'core',
 			]);
@@ -83,7 +83,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);