nextcloud / server

lib/public/HintException.php

Indentation +42 added lines, -42 removed lines

@@ -34,49 +34,49 @@
  * @since 23.0.0
  */
 class HintException extends \Exception {
-	private $hint;
+    private $hint;
 
-	/**
-	 * HintException constructor.
-	 *
-	 * @since 23.0.0
-	 * @param string $message  The error message. It will be not revealed to the
-	 *                         the user (unless the hint is empty) and thus
-	 *                         should be not translated.
-	 * @param string $hint     A useful message that is presented to the end
-	 *                         user. It should be translated, but must not
-	 *                         contain sensitive data.
-	 * @param int $code
-	 * @param \Exception|null $previous
-	 */
-	public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) {
-		$this->hint = $hint;
-		parent::__construct($message, $code, $previous);
-	}
+    /**
+     * HintException constructor.
+     *
+     * @since 23.0.0
+     * @param string $message  The error message. It will be not revealed to the
+     *                         the user (unless the hint is empty) and thus
+     *                         should be not translated.
+     * @param string $hint     A useful message that is presented to the end
+     *                         user. It should be translated, but must not
+     *                         contain sensitive data.
+     * @param int $code
+     * @param \Exception|null $previous
+     */
+    public function __construct($message, $hint = '', $code = 0, \Exception $previous = null) {
+        $this->hint = $hint;
+        parent::__construct($message, $code, $previous);
+    }
 
-	/**
-	 * Returns a string representation of this Exception that includes the error
-	 * code, the message and the hint.
-	 *
-	 * @since 23.0.0
-	 * @return string
-	 */
-	public function __toString(): string {
-		return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
-	}
+    /**
+     * Returns a string representation of this Exception that includes the error
+     * code, the message and the hint.
+     *
+     * @since 23.0.0
+     * @return string
+     */
+    public function __toString(): string {
+        return __CLASS__ . ": [{$this->code}]: {$this->message} ({$this->hint})\n";
+    }
 
-	/**
-	 * Returns the hint with the intention to be presented to the end user. If
-	 * an empty hint was specified upon instantiation, the message is returned
-	 * instead.
-	 *
-	 * @since 23.0.0
-	 * @return string
-	 */
-	public function getHint(): string {
-		if (empty($this->hint)) {
-			return $this->message;
-		}
-		return $this->hint;
-	}
+    /**
+     * Returns the hint with the intention to be presented to the end user. If
+     * an empty hint was specified upon instantiation, the message is returned
+     * instead.
+     *
+     * @since 23.0.0
+     * @return string
+     */
+    public function getHint(): string {
+        if (empty($this->hint)) {
+            return $this->message;
+        }
+        return $this->hint;
+    }
 }

lib/public/Files.php

Indentation +64 added lines, -64 removed lines

@@ -42,73 +42,73 @@
  * @deprecated 14.0.0
  */
 class Files {
-	/**
-	 * Recursive deletion of folders
-	 * @return bool
-	 * @since 5.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function rmdirr($dir) {
-		return \OC_Helper::rmdirr($dir);
-	}
+    /**
+     * Recursive deletion of folders
+     * @return bool
+     * @since 5.0.0
+     * @deprecated 14.0.0
+     */
+    public static function rmdirr($dir) {
+        return \OC_Helper::rmdirr($dir);
+    }
 
-	/**
-	 * Get the mimetype form a local file
-	 * @param string $path
-	 * @return string
-	 * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
-	 * @since 5.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function getMimeType($path) {
-		return \OC::$server->getMimeTypeDetector()->detect($path);
-	}
+    /**
+     * Get the mimetype form a local file
+     * @param string $path
+     * @return string
+     * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
+     * @since 5.0.0
+     * @deprecated 14.0.0
+     */
+    public static function getMimeType($path) {
+        return \OC::$server->getMimeTypeDetector()->detect($path);
+    }
 
-	/**
-	 * Search for files by mimetype
-	 * @param string $mimetype
-	 * @return array
-	 * @since 6.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function searchByMime($mimetype) {
-		return \OC\Files\Filesystem::searchByMime($mimetype);
-	}
+    /**
+     * Search for files by mimetype
+     * @param string $mimetype
+     * @return array
+     * @since 6.0.0
+     * @deprecated 14.0.0
+     */
+    public static function searchByMime($mimetype) {
+        return \OC\Files\Filesystem::searchByMime($mimetype);
+    }
 
-	/**
-	 * Copy the contents of one stream to another
-	 * @param resource $source
-	 * @param resource $target
-	 * @return int the number of bytes copied
-	 * @since 5.0.0
-	 * @deprecated 14.0.0
-	 */
-	public static function streamCopy($source, $target) {
-		[$count, ] = \OC_Helper::streamCopy($source, $target);
-		return $count;
-	}
+    /**
+     * Copy the contents of one stream to another
+     * @param resource $source
+     * @param resource $target
+     * @return int the number of bytes copied
+     * @since 5.0.0
+     * @deprecated 14.0.0
+     */
+    public static function streamCopy($source, $target) {
+        [$count, ] = \OC_Helper::streamCopy($source, $target);
+        return $count;
+    }
 
-	/**
-	 * Adds a suffix to the name in case the file exists
-	 * @param string $path
-	 * @param string $filename
-	 * @return string
-	 * @since 5.0.0
-	 * @deprecated 14.0.0 use getNonExistingName of the OCP\Files\Folder object
-	 */
-	public static function buildNotExistingFileName($path, $filename) {
-		return \OC_Helper::buildNotExistingFileName($path, $filename);
-	}
+    /**
+     * Adds a suffix to the name in case the file exists
+     * @param string $path
+     * @param string $filename
+     * @return string
+     * @since 5.0.0
+     * @deprecated 14.0.0 use getNonExistingName of the OCP\Files\Folder object
+     */
+    public static function buildNotExistingFileName($path, $filename) {
+        return \OC_Helper::buildNotExistingFileName($path, $filename);
+    }
 
-	/**
-	 * Gets the Storage for an app - creates the needed folder if they are not
-	 * existent
-	 * @param string $app
-	 * @return \OC\Files\View
-	 * @since 5.0.0
-	 * @deprecated 14.0.0 use IAppData instead
-	 */
-	public static function getStorage($app) {
-		return \OC_App::getStorage($app);
-	}
+    /**
+     * Gets the Storage for an app - creates the needed folder if they are not
+     * existent
+     * @param string $app
+     * @return \OC\Files\View
+     * @since 5.0.0
+     * @deprecated 14.0.0 use IAppData instead
+     */
+    public static function getStorage($app) {
+        return \OC_App::getStorage($app);
+    }
 }

lib/public/Collaboration/AutoComplete/IManager.php

Indentation +12 added lines, -12 removed lines

@@ -28,17 +28,17 @@
  * @since 13.0.0
  */
 interface IManager {
-	/**
-	 * @param string $className – class name of the ISorter implementation
-	 * @since 13.0.0
-	 */
-	public function registerSorter($className);
+    /**
+     * @param string $className – class name of the ISorter implementation
+     * @since 13.0.0
+     */
+    public function registerSorter($className);
 
-	/**
-	 * @param array $sorters	list of sorter IDs, separated by "|"
-	 * @param array $sortArray	array representation of OCP\Collaboration\Collaborators\ISearchResult
-	 * @param array $context	context info of the search, keys: itemType, itemId
-	 * @since 13.0.0
-	 */
-	public function runSorters(array $sorters, array &$sortArray, array $context);
+    /**
+     * @param array $sorters	list of sorter IDs, separated by "|"
+     * @param array $sortArray	array representation of OCP\Collaboration\Collaborators\ISearchResult
+     * @param array $context	context info of the search, keys: itemType, itemId
+     * @since 13.0.0
+     */
+    public function runSorters(array $sorters, array &$sortArray, array $context);
 }

lib/private/Preview/Generator.php

Indentation +597 added lines, -597 removed lines

@@ -48,615 +48,615 @@
 use Symfony\Component\EventDispatcher\GenericEvent;
 
 class Generator {
-	public const SEMAPHORE_ID_ALL = 0x0a11;
-	public const SEMAPHORE_ID_NEW = 0x07ea;
-
-	/** @var IPreview */
-	private $previewManager;
-	/** @var IConfig */
-	private $config;
-	/** @var IAppData */
-	private $appData;
-	/** @var GeneratorHelper */
-	private $helper;
-	/** @var EventDispatcherInterface */
-	private $legacyEventDispatcher;
-	/** @var IEventDispatcher */
-	private $eventDispatcher;
-
-	public function __construct(
-		IConfig $config,
-		IPreview $previewManager,
-		IAppData $appData,
-		GeneratorHelper $helper,
-		EventDispatcherInterface $legacyEventDispatcher,
-		IEventDispatcher $eventDispatcher
-	) {
-		$this->config = $config;
-		$this->previewManager = $previewManager;
-		$this->appData = $appData;
-		$this->helper = $helper;
-		$this->legacyEventDispatcher = $legacyEventDispatcher;
-		$this->eventDispatcher = $eventDispatcher;
-	}
-
-	/**
-	 * Returns a preview of a file
-	 *
-	 * The cache is searched first and if nothing usable was found then a preview is
-	 * generated by one of the providers
-	 *
-	 * @param File $file
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @param string $mode
-	 * @param string $mimeType
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
-	 */
-	public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) {
-		$specification = [
-			'width' => $width,
-			'height' => $height,
-			'crop' => $crop,
-			'mode' => $mode,
-		];
-
-		$this->legacyEventDispatcher->dispatch(
-			IPreview::EVENT,
-			new GenericEvent($file, $specification)
-		);
-		$this->eventDispatcher->dispatchTyped(new BeforePreviewFetchedEvent(
-			$file
-		));
-
-		// since we only ask for one preview, and the generate method return the last one it created, it returns the one we want
-		return $this->generatePreviews($file, [$specification], $mimeType);
-	}
-
-	/**
-	 * Generates previews of a file
-	 *
-	 * @param File $file
-	 * @param non-empty-array $specifications
-	 * @param string $mimeType
-	 * @return ISimpleFile the last preview that was generated
-	 * @throws NotFoundException
-	 * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
-	 */
-	public function generatePreviews(File $file, array $specifications, $mimeType = null) {
-		//Make sure that we can read the file
-		if (!$file->isReadable()) {
-			throw new NotFoundException('Cannot read file');
-		}
-
-		if ($mimeType === null) {
-			$mimeType = $file->getMimeType();
-		}
-
-		$previewFolder = $this->getPreviewFolder($file);
-		// List every existing preview first instead of trying to find them one by one
-		$previewFiles = $previewFolder->getDirectoryListing();
-
-		$previewVersion = '';
-		if ($file instanceof IVersionedPreviewFile) {
-			$previewVersion = $file->getPreviewVersion() . '-';
-		}
-
-		// If imaginary is enabled, and we request a small thumbnail,
-		// let's not generate the max preview for performance reasons
-		if (count($specifications) === 1
-			&& ($specifications[0]['width'] <= 256 || $specifications[0]['height'] <= 256)
-			&& preg_match(Imaginary::supportedMimeTypes(), $mimeType)
-			&& $this->config->getSystemValueString('preview_imaginary_url', 'invalid') !== 'invalid') {
-			$crop = $specifications[0]['crop'] ?? false;
-			$preview = $this->getSmallImagePreview($previewFolder, $previewFiles, $file, $mimeType, $previewVersion, $crop);
-
-			if ($preview->getSize() === 0) {
-				$preview->delete();
-				throw new NotFoundException('Cached preview size 0, invalid!');
-			}
-
-			return $preview;
-		}
-
-		// Get the max preview and infer the max preview sizes from that
-		$maxPreview = $this->getMaxPreview($previewFolder, $previewFiles, $file, $mimeType, $previewVersion);
-		$maxPreviewImage = null; // only load the image when we need it
-		if ($maxPreview->getSize() === 0) {
-			$maxPreview->delete();
-			throw new NotFoundException('Max preview size 0, invalid!');
-		}
-
-		[$maxWidth, $maxHeight] = $this->getPreviewSize($maxPreview, $previewVersion);
-
-		$preview = null;
-
-		foreach ($specifications as $specification) {
-			$width = $specification['width'] ?? -1;
-			$height = $specification['height'] ?? -1;
-			$crop = $specification['crop'] ?? false;
-			$mode = $specification['mode'] ?? IPreview::MODE_FILL;
-
-			// If both width and height are -1 we just want the max preview
-			if ($width === -1 && $height === -1) {
-				$width = $maxWidth;
-				$height = $maxHeight;
-			}
-
-			// Calculate the preview size
-			[$width, $height] = $this->calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight);
-
-			// No need to generate a preview that is just the max preview
-			if ($width === $maxWidth && $height === $maxHeight) {
-				// ensure correct return value if this was the last one
-				$preview = $maxPreview;
-				continue;
-			}
-
-			// Try to get a cached preview. Else generate (and store) one
-			try {
-				try {
-					$preview = $this->getCachedPreview($previewFiles, $width, $height, $crop, $maxPreview->getMimeType(), $previewVersion);
-				} catch (NotFoundException $e) {
-					if (!$this->previewManager->isMimeSupported($mimeType)) {
-						throw new NotFoundException();
-					}
-
-					if ($maxPreviewImage === null) {
-						$maxPreviewImage = $this->helper->getImage($maxPreview);
-					}
-
-					$preview = $this->generatePreview($previewFolder, $maxPreviewImage, $width, $height, $crop, $maxWidth, $maxHeight, $previewVersion);
-					// New file, augment our array
-					$previewFiles[] = $preview;
-				}
-			} catch (\InvalidArgumentException $e) {
-				throw new NotFoundException("", 0, $e);
-			}
-
-			if ($preview->getSize() === 0) {
-				$preview->delete();
-				throw new NotFoundException('Cached preview size 0, invalid!');
-			}
-		}
-		assert($preview !== null);
-
-		// Free memory being used by the embedded image resource.  Without this the image is kept in memory indefinitely.
-		// Garbage Collection does NOT free this memory.  We have to do it ourselves.
-		if ($maxPreviewImage instanceof \OCP\Image) {
-			$maxPreviewImage->destroy();
-		}
-
-		return $preview;
-	}
-
-	/**
-	 * Generate a small image straight away without generating a max preview first
-	 * Preview generated is 256x256
-	 *
-	 * @param ISimpleFile[] $previewFiles
-	 *
-	 * @throws NotFoundException
-	 */
-	private function getSmallImagePreview(ISimpleFolder $previewFolder, array $previewFiles, File $file, string $mimeType, string $prefix, bool $crop): ISimpleFile {
-		$width = 256;
-		$height = 256;
-
-		try {
-			return $this->getCachedPreview($previewFiles, $width, $height, $crop, $mimeType, $prefix);
-		} catch (NotFoundException $e) {
-			return $this->generateProviderPreview($previewFolder, $file, $width, $height, $crop, false, $mimeType, $prefix);
-		}
-	}
-
-	/**
-	 * Acquire a semaphore of the specified id and concurrency, blocking if necessary.
-	 * Return an identifier of the semaphore on success, which can be used to release it via
-	 * {@see Generator::unguardWithSemaphore()}.
-	 *
-	 * @param int $semId
-	 * @param int $concurrency
-	 * @return false|resource the semaphore on success or false on failure
-	 */
-	public static function guardWithSemaphore(int $semId, int $concurrency) {
-		if (!extension_loaded('sysvsem')) {
-			return false;
-		}
-		$sem = sem_get($semId, $concurrency);
-		if ($sem === false) {
-			return false;
-		}
-		if (!sem_acquire($sem)) {
-			return false;
-		}
-		return $sem;
-	}
-
-	/**
-	 * Releases the semaphore acquired from {@see Generator::guardWithSemaphore()}.
-	 *
-	 * @param resource|bool $semId the semaphore identifier returned by guardWithSemaphore
-	 * @return bool
-	 */
-	public static function unguardWithSemaphore($semId): bool {
-		if (!is_resource($semId) || !extension_loaded('sysvsem')) {
-			return false;
-		}
-		return sem_release($semId);
-	}
-
-	/**
-	 * Get the number of concurrent threads supported by the host.
-	 *
-	 * @return int number of concurrent threads, or 0 if it cannot be determined
-	 */
-	public static function getHardwareConcurrency(): int {
-		static $width;
-		if (!isset($width)) {
-			if (is_file("/proc/cpuinfo")) {
-				$width = substr_count(file_get_contents("/proc/cpuinfo"), "processor");
-			} else {
-				$width = 0;
-			}
-		}
-		return $width;
-	}
-
-	/**
-	 * Get number of concurrent preview generations from system config
-	 *
-	 * Two config entries, `preview_concurrency_new` and `preview_concurrency_all`,
-	 * are available. If not set, the default values are determined with the hardware concurrency
-	 * of the host. In case the hardware concurrency cannot be determined, or the user sets an
-	 * invalid value, fallback values are:
-	 * For new images whose previews do not exist and need to be generated, 4;
-	 * For all preview generation requests, 8.
-	 * Value of `preview_concurrency_all` should be greater than or equal to that of
-	 * `preview_concurrency_new`, otherwise, the latter is returned.
-	 *
-	 * @param string $type either `preview_concurrency_new` or `preview_concurrency_all`
-	 * @return int number of concurrent preview generations, or -1 if $type is invalid
-	 */
-	public function getNumConcurrentPreviews(string $type): int {
-		static $cached = array();
-		if (array_key_exists($type, $cached)) {
-			return $cached[$type];
-		}
-
-		$hardwareConcurrency = self::getHardwareConcurrency();
-		switch ($type) {
-			case "preview_concurrency_all":
-				$fallback = $hardwareConcurrency > 0 ? $hardwareConcurrency * 2 : 8;
-				$concurrency_all = $this->config->getSystemValueInt($type, $fallback);
-				$concurrency_new = $this->getNumConcurrentPreviews("preview_concurrency_new");
-				$cached[$type] = max($concurrency_all, $concurrency_new);
-				break;
-			case "preview_concurrency_new":
-				$fallback = $hardwareConcurrency > 0 ? $hardwareConcurrency : 4;
-				$cached[$type] = $this->config->getSystemValueInt($type, $fallback);
-				break;
-			default:
-				return -1;
-		}
-		return $cached[$type];
-	}
-
-	/**
-	 * @param ISimpleFolder $previewFolder
-	 * @param ISimpleFile[] $previewFiles
-	 * @param File $file
-	 * @param string $mimeType
-	 * @param string $prefix
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 */
-	private function getMaxPreview(ISimpleFolder $previewFolder, array $previewFiles, File $file, $mimeType, $prefix) {
-		// We don't know the max preview size, so we can't use getCachedPreview.
-		// It might have been generated with a higher resolution than the current value.
-		foreach ($previewFiles as $node) {
-			$name = $node->getName();
-			if (($prefix === '' || strpos($name, $prefix) === 0) && strpos($name, 'max')) {
-				return $node;
-			}
-		}
-
-		$maxWidth = $this->config->getSystemValueInt('preview_max_x', 4096);
-		$maxHeight = $this->config->getSystemValueInt('preview_max_y', 4096);
-
-		return $this->generateProviderPreview($previewFolder, $file, $maxWidth, $maxHeight, false, true, $mimeType, $prefix);
-	}
-
-	private function generateProviderPreview(ISimpleFolder $previewFolder, File $file, int $width, int $height, bool $crop, bool $max, string $mimeType, string $prefix) {
-		$previewProviders = $this->previewManager->getProviders();
-		foreach ($previewProviders as $supportedMimeType => $providers) {
-			// Filter out providers that does not support this mime
-			if (!preg_match($supportedMimeType, $mimeType)) {
-				continue;
-			}
-
-			foreach ($providers as $providerClosure) {
-				$provider = $this->helper->getProvider($providerClosure);
-				if (!($provider instanceof IProviderV2)) {
-					continue;
-				}
-
-				if (!$provider->isAvailable($file)) {
-					continue;
-				}
-
-				$previewConcurrency = $this->getNumConcurrentPreviews('preview_concurrency_new');
-				$sem = self::guardWithSemaphore(self::SEMAPHORE_ID_NEW, $previewConcurrency);
-				try {
-					$preview = $this->helper->getThumbnail($provider, $file, $width, $height);
-				} finally {
-					self::unguardWithSemaphore($sem);
-				}
-
-				if (!($preview instanceof IImage)) {
-					continue;
-				}
-
-				$path = $this->generatePath($preview->width(), $preview->height(), $crop, $max, $preview->dataMimeType(), $prefix);
-				try {
-					$file = $previewFolder->newFile($path);
-					if ($preview instanceof IStreamImage) {
-						$file->putContent($preview->resource());
-					} else {
-						$file->putContent($preview->data());
-					}
-				} catch (NotPermittedException $e) {
-					throw new NotFoundException();
-				}
-
-				return $file;
-			}
-		}
-
-		throw new NotFoundException('No provider successfully handled the preview generation');
-	}
-
-	/**
-	 * @param ISimpleFile $file
-	 * @param string $prefix
-	 * @return int[]
-	 */
-	private function getPreviewSize(ISimpleFile $file, string $prefix = '') {
-		$size = explode('-', substr($file->getName(), strlen($prefix)));
-		return [(int)$size[0], (int)$size[1]];
-	}
-
-	/**
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @param bool $max
-	 * @param string $mimeType
-	 * @param string $prefix
-	 * @return string
-	 */
-	private function generatePath($width, $height, $crop, $max, $mimeType, $prefix) {
-		$path = $prefix . (string)$width . '-' . (string)$height;
-		if ($crop) {
-			$path .= '-crop';
-		}
-		if ($max) {
-			$path .= '-max';
-		}
-
-		$ext = $this->getExtension($mimeType);
-		$path .= '.' . $ext;
-		return $path;
-	}
-
-
-	/**
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @param string $mode
-	 * @param int $maxWidth
-	 * @param int $maxHeight
-	 * @return int[]
-	 */
-	private function calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight) {
-		/*
+    public const SEMAPHORE_ID_ALL = 0x0a11;
+    public const SEMAPHORE_ID_NEW = 0x07ea;
+
+    /** @var IPreview */
+    private $previewManager;
+    /** @var IConfig */
+    private $config;
+    /** @var IAppData */
+    private $appData;
+    /** @var GeneratorHelper */
+    private $helper;
+    /** @var EventDispatcherInterface */
+    private $legacyEventDispatcher;
+    /** @var IEventDispatcher */
+    private $eventDispatcher;
+
+    public function __construct(
+        IConfig $config,
+        IPreview $previewManager,
+        IAppData $appData,
+        GeneratorHelper $helper,
+        EventDispatcherInterface $legacyEventDispatcher,
+        IEventDispatcher $eventDispatcher
+    ) {
+        $this->config = $config;
+        $this->previewManager = $previewManager;
+        $this->appData = $appData;
+        $this->helper = $helper;
+        $this->legacyEventDispatcher = $legacyEventDispatcher;
+        $this->eventDispatcher = $eventDispatcher;
+    }
+
+    /**
+     * Returns a preview of a file
+     *
+     * The cache is searched first and if nothing usable was found then a preview is
+     * generated by one of the providers
+     *
+     * @param File $file
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @param string $mode
+     * @param string $mimeType
+     * @return ISimpleFile
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
+     */
+    public function getPreview(File $file, $width = -1, $height = -1, $crop = false, $mode = IPreview::MODE_FILL, $mimeType = null) {
+        $specification = [
+            'width' => $width,
+            'height' => $height,
+            'crop' => $crop,
+            'mode' => $mode,
+        ];
+
+        $this->legacyEventDispatcher->dispatch(
+            IPreview::EVENT,
+            new GenericEvent($file, $specification)
+        );
+        $this->eventDispatcher->dispatchTyped(new BeforePreviewFetchedEvent(
+            $file
+        ));
+
+        // since we only ask for one preview, and the generate method return the last one it created, it returns the one we want
+        return $this->generatePreviews($file, [$specification], $mimeType);
+    }
+
+    /**
+     * Generates previews of a file
+     *
+     * @param File $file
+     * @param non-empty-array $specifications
+     * @param string $mimeType
+     * @return ISimpleFile the last preview that was generated
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
+     */
+    public function generatePreviews(File $file, array $specifications, $mimeType = null) {
+        //Make sure that we can read the file
+        if (!$file->isReadable()) {
+            throw new NotFoundException('Cannot read file');
+        }
+
+        if ($mimeType === null) {
+            $mimeType = $file->getMimeType();
+        }
+
+        $previewFolder = $this->getPreviewFolder($file);
+        // List every existing preview first instead of trying to find them one by one
+        $previewFiles = $previewFolder->getDirectoryListing();
+
+        $previewVersion = '';
+        if ($file instanceof IVersionedPreviewFile) {
+            $previewVersion = $file->getPreviewVersion() . '-';
+        }
+
+        // If imaginary is enabled, and we request a small thumbnail,
+        // let's not generate the max preview for performance reasons
+        if (count($specifications) === 1
+            && ($specifications[0]['width'] <= 256 || $specifications[0]['height'] <= 256)
+            && preg_match(Imaginary::supportedMimeTypes(), $mimeType)
+            && $this->config->getSystemValueString('preview_imaginary_url', 'invalid') !== 'invalid') {
+            $crop = $specifications[0]['crop'] ?? false;
+            $preview = $this->getSmallImagePreview($previewFolder, $previewFiles, $file, $mimeType, $previewVersion, $crop);
+
+            if ($preview->getSize() === 0) {
+                $preview->delete();
+                throw new NotFoundException('Cached preview size 0, invalid!');
+            }
+
+            return $preview;
+        }
+
+        // Get the max preview and infer the max preview sizes from that
+        $maxPreview = $this->getMaxPreview($previewFolder, $previewFiles, $file, $mimeType, $previewVersion);
+        $maxPreviewImage = null; // only load the image when we need it
+        if ($maxPreview->getSize() === 0) {
+            $maxPreview->delete();
+            throw new NotFoundException('Max preview size 0, invalid!');
+        }
+
+        [$maxWidth, $maxHeight] = $this->getPreviewSize($maxPreview, $previewVersion);
+
+        $preview = null;
+
+        foreach ($specifications as $specification) {
+            $width = $specification['width'] ?? -1;
+            $height = $specification['height'] ?? -1;
+            $crop = $specification['crop'] ?? false;
+            $mode = $specification['mode'] ?? IPreview::MODE_FILL;
+
+            // If both width and height are -1 we just want the max preview
+            if ($width === -1 && $height === -1) {
+                $width = $maxWidth;
+                $height = $maxHeight;
+            }
+
+            // Calculate the preview size
+            [$width, $height] = $this->calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight);
+
+            // No need to generate a preview that is just the max preview
+            if ($width === $maxWidth && $height === $maxHeight) {
+                // ensure correct return value if this was the last one
+                $preview = $maxPreview;
+                continue;
+            }
+
+            // Try to get a cached preview. Else generate (and store) one
+            try {
+                try {
+                    $preview = $this->getCachedPreview($previewFiles, $width, $height, $crop, $maxPreview->getMimeType(), $previewVersion);
+                } catch (NotFoundException $e) {
+                    if (!$this->previewManager->isMimeSupported($mimeType)) {
+                        throw new NotFoundException();
+                    }
+
+                    if ($maxPreviewImage === null) {
+                        $maxPreviewImage = $this->helper->getImage($maxPreview);
+                    }
+
+                    $preview = $this->generatePreview($previewFolder, $maxPreviewImage, $width, $height, $crop, $maxWidth, $maxHeight, $previewVersion);
+                    // New file, augment our array
+                    $previewFiles[] = $preview;
+                }
+            } catch (\InvalidArgumentException $e) {
+                throw new NotFoundException("", 0, $e);
+            }
+
+            if ($preview->getSize() === 0) {
+                $preview->delete();
+                throw new NotFoundException('Cached preview size 0, invalid!');
+            }
+        }
+        assert($preview !== null);
+
+        // Free memory being used by the embedded image resource.  Without this the image is kept in memory indefinitely.
+        // Garbage Collection does NOT free this memory.  We have to do it ourselves.
+        if ($maxPreviewImage instanceof \OCP\Image) {
+            $maxPreviewImage->destroy();
+        }
+
+        return $preview;
+    }
+
+    /**
+     * Generate a small image straight away without generating a max preview first
+     * Preview generated is 256x256
+     *
+     * @param ISimpleFile[] $previewFiles
+     *
+     * @throws NotFoundException
+     */
+    private function getSmallImagePreview(ISimpleFolder $previewFolder, array $previewFiles, File $file, string $mimeType, string $prefix, bool $crop): ISimpleFile {
+        $width = 256;
+        $height = 256;
+
+        try {
+            return $this->getCachedPreview($previewFiles, $width, $height, $crop, $mimeType, $prefix);
+        } catch (NotFoundException $e) {
+            return $this->generateProviderPreview($previewFolder, $file, $width, $height, $crop, false, $mimeType, $prefix);
+        }
+    }
+
+    /**
+     * Acquire a semaphore of the specified id and concurrency, blocking if necessary.
+     * Return an identifier of the semaphore on success, which can be used to release it via
+     * {@see Generator::unguardWithSemaphore()}.
+     *
+     * @param int $semId
+     * @param int $concurrency
+     * @return false|resource the semaphore on success or false on failure
+     */
+    public static function guardWithSemaphore(int $semId, int $concurrency) {
+        if (!extension_loaded('sysvsem')) {
+            return false;
+        }
+        $sem = sem_get($semId, $concurrency);
+        if ($sem === false) {
+            return false;
+        }
+        if (!sem_acquire($sem)) {
+            return false;
+        }
+        return $sem;
+    }
+
+    /**
+     * Releases the semaphore acquired from {@see Generator::guardWithSemaphore()}.
+     *
+     * @param resource|bool $semId the semaphore identifier returned by guardWithSemaphore
+     * @return bool
+     */
+    public static function unguardWithSemaphore($semId): bool {
+        if (!is_resource($semId) || !extension_loaded('sysvsem')) {
+            return false;
+        }
+        return sem_release($semId);
+    }
+
+    /**
+     * Get the number of concurrent threads supported by the host.
+     *
+     * @return int number of concurrent threads, or 0 if it cannot be determined
+     */
+    public static function getHardwareConcurrency(): int {
+        static $width;
+        if (!isset($width)) {
+            if (is_file("/proc/cpuinfo")) {
+                $width = substr_count(file_get_contents("/proc/cpuinfo"), "processor");
+            } else {
+                $width = 0;
+            }
+        }
+        return $width;
+    }
+
+    /**
+     * Get number of concurrent preview generations from system config
+     *
+     * Two config entries, `preview_concurrency_new` and `preview_concurrency_all`,
+     * are available. If not set, the default values are determined with the hardware concurrency
+     * of the host. In case the hardware concurrency cannot be determined, or the user sets an
+     * invalid value, fallback values are:
+     * For new images whose previews do not exist and need to be generated, 4;
+     * For all preview generation requests, 8.
+     * Value of `preview_concurrency_all` should be greater than or equal to that of
+     * `preview_concurrency_new`, otherwise, the latter is returned.
+     *
+     * @param string $type either `preview_concurrency_new` or `preview_concurrency_all`
+     * @return int number of concurrent preview generations, or -1 if $type is invalid
+     */
+    public function getNumConcurrentPreviews(string $type): int {
+        static $cached = array();
+        if (array_key_exists($type, $cached)) {
+            return $cached[$type];
+        }
+
+        $hardwareConcurrency = self::getHardwareConcurrency();
+        switch ($type) {
+            case "preview_concurrency_all":
+                $fallback = $hardwareConcurrency > 0 ? $hardwareConcurrency * 2 : 8;
+                $concurrency_all = $this->config->getSystemValueInt($type, $fallback);
+                $concurrency_new = $this->getNumConcurrentPreviews("preview_concurrency_new");
+                $cached[$type] = max($concurrency_all, $concurrency_new);
+                break;
+            case "preview_concurrency_new":
+                $fallback = $hardwareConcurrency > 0 ? $hardwareConcurrency : 4;
+                $cached[$type] = $this->config->getSystemValueInt($type, $fallback);
+                break;
+            default:
+                return -1;
+        }
+        return $cached[$type];
+    }
+
+    /**
+     * @param ISimpleFolder $previewFolder
+     * @param ISimpleFile[] $previewFiles
+     * @param File $file
+     * @param string $mimeType
+     * @param string $prefix
+     * @return ISimpleFile
+     * @throws NotFoundException
+     */
+    private function getMaxPreview(ISimpleFolder $previewFolder, array $previewFiles, File $file, $mimeType, $prefix) {
+        // We don't know the max preview size, so we can't use getCachedPreview.
+        // It might have been generated with a higher resolution than the current value.
+        foreach ($previewFiles as $node) {
+            $name = $node->getName();
+            if (($prefix === '' || strpos($name, $prefix) === 0) && strpos($name, 'max')) {
+                return $node;
+            }
+        }
+
+        $maxWidth = $this->config->getSystemValueInt('preview_max_x', 4096);
+        $maxHeight = $this->config->getSystemValueInt('preview_max_y', 4096);
+
+        return $this->generateProviderPreview($previewFolder, $file, $maxWidth, $maxHeight, false, true, $mimeType, $prefix);
+    }
+
+    private function generateProviderPreview(ISimpleFolder $previewFolder, File $file, int $width, int $height, bool $crop, bool $max, string $mimeType, string $prefix) {
+        $previewProviders = $this->previewManager->getProviders();
+        foreach ($previewProviders as $supportedMimeType => $providers) {
+            // Filter out providers that does not support this mime
+            if (!preg_match($supportedMimeType, $mimeType)) {
+                continue;
+            }
+
+            foreach ($providers as $providerClosure) {
+                $provider = $this->helper->getProvider($providerClosure);
+                if (!($provider instanceof IProviderV2)) {
+                    continue;
+                }
+
+                if (!$provider->isAvailable($file)) {
+                    continue;
+                }
+
+                $previewConcurrency = $this->getNumConcurrentPreviews('preview_concurrency_new');
+                $sem = self::guardWithSemaphore(self::SEMAPHORE_ID_NEW, $previewConcurrency);
+                try {
+                    $preview = $this->helper->getThumbnail($provider, $file, $width, $height);
+                } finally {
+                    self::unguardWithSemaphore($sem);
+                }
+
+                if (!($preview instanceof IImage)) {
+                    continue;
+                }
+
+                $path = $this->generatePath($preview->width(), $preview->height(), $crop, $max, $preview->dataMimeType(), $prefix);
+                try {
+                    $file = $previewFolder->newFile($path);
+                    if ($preview instanceof IStreamImage) {
+                        $file->putContent($preview->resource());
+                    } else {
+                        $file->putContent($preview->data());
+                    }
+                } catch (NotPermittedException $e) {
+                    throw new NotFoundException();
+                }
+
+                return $file;
+            }
+        }
+
+        throw new NotFoundException('No provider successfully handled the preview generation');
+    }
+
+    /**
+     * @param ISimpleFile $file
+     * @param string $prefix
+     * @return int[]
+     */
+    private function getPreviewSize(ISimpleFile $file, string $prefix = '') {
+        $size = explode('-', substr($file->getName(), strlen($prefix)));
+        return [(int)$size[0], (int)$size[1]];
+    }
+
+    /**
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @param bool $max
+     * @param string $mimeType
+     * @param string $prefix
+     * @return string
+     */
+    private function generatePath($width, $height, $crop, $max, $mimeType, $prefix) {
+        $path = $prefix . (string)$width . '-' . (string)$height;
+        if ($crop) {
+            $path .= '-crop';
+        }
+        if ($max) {
+            $path .= '-max';
+        }
+
+        $ext = $this->getExtension($mimeType);
+        $path .= '.' . $ext;
+        return $path;
+    }
+
+
+    /**
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @param string $mode
+     * @param int $maxWidth
+     * @param int $maxHeight
+     * @return int[]
+     */
+    private function calculateSize($width, $height, $crop, $mode, $maxWidth, $maxHeight) {
+        /*
 		 * If we are not cropping we have to make sure the requested image
 		 * respects the aspect ratio of the original.
 		 */
-		if (!$crop) {
-			$ratio = $maxHeight / $maxWidth;
+        if (!$crop) {
+            $ratio = $maxHeight / $maxWidth;
 
-			if ($width === -1) {
-				$width = $height / $ratio;
-			}
-			if ($height === -1) {
-				$height = $width * $ratio;
-			}
+            if ($width === -1) {
+                $width = $height / $ratio;
+            }
+            if ($height === -1) {
+                $height = $width * $ratio;
+            }
 
-			$ratioH = $height / $maxHeight;
-			$ratioW = $width / $maxWidth;
+            $ratioH = $height / $maxHeight;
+            $ratioW = $width / $maxWidth;
 
-			/*
+            /*
 			 * Fill means that the $height and $width are the max
 			 * Cover means min.
 			 */
-			if ($mode === IPreview::MODE_FILL) {
-				if ($ratioH > $ratioW) {
-					$height = $width * $ratio;
-				} else {
-					$width = $height / $ratio;
-				}
-			} elseif ($mode === IPreview::MODE_COVER) {
-				if ($ratioH > $ratioW) {
-					$width = $height / $ratio;
-				} else {
-					$height = $width * $ratio;
-				}
-			}
-		}
-
-		if ($height !== $maxHeight && $width !== $maxWidth) {
-			/*
+            if ($mode === IPreview::MODE_FILL) {
+                if ($ratioH > $ratioW) {
+                    $height = $width * $ratio;
+                } else {
+                    $width = $height / $ratio;
+                }
+            } elseif ($mode === IPreview::MODE_COVER) {
+                if ($ratioH > $ratioW) {
+                    $width = $height / $ratio;
+                } else {
+                    $height = $width * $ratio;
+                }
+            }
+        }
+
+        if ($height !== $maxHeight && $width !== $maxWidth) {
+            /*
 			 * Scale to the nearest power of four
 			 */
-			$pow4height = 4 ** ceil(log($height) / log(4));
-			$pow4width = 4 ** ceil(log($width) / log(4));
-
-			// Minimum size is 64
-			$pow4height = max($pow4height, 64);
-			$pow4width = max($pow4width, 64);
-
-			$ratioH = $height / $pow4height;
-			$ratioW = $width / $pow4width;
-
-			if ($ratioH < $ratioW) {
-				$width = $pow4width;
-				$height /= $ratioW;
-			} else {
-				$height = $pow4height;
-				$width /= $ratioH;
-			}
-		}
-
-		/*
+            $pow4height = 4 ** ceil(log($height) / log(4));
+            $pow4width = 4 ** ceil(log($width) / log(4));
+
+            // Minimum size is 64
+            $pow4height = max($pow4height, 64);
+            $pow4width = max($pow4width, 64);
+
+            $ratioH = $height / $pow4height;
+            $ratioW = $width / $pow4width;
+
+            if ($ratioH < $ratioW) {
+                $width = $pow4width;
+                $height /= $ratioW;
+            } else {
+                $height = $pow4height;
+                $width /= $ratioH;
+            }
+        }
+
+        /*
 		 * Make sure the requested height and width fall within the max
 		 * of the preview.
 		 */
-		if ($height > $maxHeight) {
-			$ratio = $height / $maxHeight;
-			$height = $maxHeight;
-			$width /= $ratio;
-		}
-		if ($width > $maxWidth) {
-			$ratio = $width / $maxWidth;
-			$width = $maxWidth;
-			$height /= $ratio;
-		}
-
-		return [(int)round($width), (int)round($height)];
-	}
-
-	/**
-	 * @param ISimpleFolder $previewFolder
-	 * @param ISimpleFile $maxPreview
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @param int $maxWidth
-	 * @param int $maxHeight
-	 * @param string $prefix
-	 * @return ISimpleFile
-	 * @throws NotFoundException
-	 * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
-	 */
-	private function generatePreview(ISimpleFolder $previewFolder, IImage $maxPreview, $width, $height, $crop, $maxWidth, $maxHeight, $prefix) {
-		$preview = $maxPreview;
-		if (!$preview->valid()) {
-			throw new \InvalidArgumentException('Failed to generate preview, failed to load image');
-		}
-
-		$previewConcurrency = $this->getNumConcurrentPreviews('preview_concurrency_new');
-		$sem = self::guardWithSemaphore(self::SEMAPHORE_ID_NEW, $previewConcurrency);
-		try {
-			if ($crop) {
-				if ($height !== $preview->height() && $width !== $preview->width()) {
-					//Resize
-					$widthR = $preview->width() / $width;
-					$heightR = $preview->height() / $height;
-
-					if ($widthR > $heightR) {
-						$scaleH = $height;
-						$scaleW = $maxWidth / $heightR;
-					} else {
-						$scaleH = $maxHeight / $widthR;
-						$scaleW = $width;
-					}
-					$preview = $preview->preciseResizeCopy((int)round($scaleW), (int)round($scaleH));
-				}
-				$cropX = (int)floor(abs($width - $preview->width()) * 0.5);
-				$cropY = (int)floor(abs($height - $preview->height()) * 0.5);
-				$preview = $preview->cropCopy($cropX, $cropY, $width, $height);
-			} else {
-				$preview = $maxPreview->resizeCopy(max($width, $height));
-			}
-		} finally {
-			self::unguardWithSemaphore($sem);
-		}
-
-
-		$path = $this->generatePath($width, $height, $crop, false, $preview->dataMimeType(), $prefix);
-		try {
-			$file = $previewFolder->newFile($path);
-			$file->putContent($preview->data());
-		} catch (NotPermittedException $e) {
-			throw new NotFoundException();
-		}
-
-		return $file;
-	}
-
-	/**
-	 * @param ISimpleFile[] $files Array of FileInfo, as the result of getDirectoryListing()
-	 * @param int $width
-	 * @param int $height
-	 * @param bool $crop
-	 * @param string $mimeType
-	 * @param string $prefix
-	 * @return ISimpleFile
-	 *
-	 * @throws NotFoundException
-	 */
-	private function getCachedPreview($files, $width, $height, $crop, $mimeType, $prefix) {
-		$path = $this->generatePath($width, $height, $crop, false, $mimeType, $prefix);
-		foreach ($files as $file) {
-			if ($file->getName() === $path) {
-				return $file;
-			}
-		}
-		throw new NotFoundException();
-	}
-
-	/**
-	 * Get the specific preview folder for this file
-	 *
-	 * @param File $file
-	 * @return ISimpleFolder
-	 *
-	 * @throws InvalidPathException
-	 * @throws NotFoundException
-	 * @throws NotPermittedException
-	 */
-	private function getPreviewFolder(File $file) {
-		// Obtain file id outside of try catch block to prevent the creation of an existing folder
-		$fileId = (string)$file->getId();
-
-		try {
-			$folder = $this->appData->getFolder($fileId);
-		} catch (NotFoundException $e) {
-			$folder = $this->appData->newFolder($fileId);
-		}
-
-		return $folder;
-	}
-
-	/**
-	 * @param string $mimeType
-	 * @return null|string
-	 * @throws \InvalidArgumentException
-	 */
-	private function getExtension($mimeType) {
-		switch ($mimeType) {
-			case 'image/png':
-				return 'png';
-			case 'image/jpeg':
-				return 'jpg';
-			case 'image/gif':
-				return 'gif';
-			default:
-				throw new \InvalidArgumentException('Not a valid mimetype: "' . $mimeType . '"');
-		}
-	}
+        if ($height > $maxHeight) {
+            $ratio = $height / $maxHeight;
+            $height = $maxHeight;
+            $width /= $ratio;
+        }
+        if ($width > $maxWidth) {
+            $ratio = $width / $maxWidth;
+            $width = $maxWidth;
+            $height /= $ratio;
+        }
+
+        return [(int)round($width), (int)round($height)];
+    }
+
+    /**
+     * @param ISimpleFolder $previewFolder
+     * @param ISimpleFile $maxPreview
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @param int $maxWidth
+     * @param int $maxHeight
+     * @param string $prefix
+     * @return ISimpleFile
+     * @throws NotFoundException
+     * @throws \InvalidArgumentException if the preview would be invalid (in case the original image is invalid)
+     */
+    private function generatePreview(ISimpleFolder $previewFolder, IImage $maxPreview, $width, $height, $crop, $maxWidth, $maxHeight, $prefix) {
+        $preview = $maxPreview;
+        if (!$preview->valid()) {
+            throw new \InvalidArgumentException('Failed to generate preview, failed to load image');
+        }
+
+        $previewConcurrency = $this->getNumConcurrentPreviews('preview_concurrency_new');
+        $sem = self::guardWithSemaphore(self::SEMAPHORE_ID_NEW, $previewConcurrency);
+        try {
+            if ($crop) {
+                if ($height !== $preview->height() && $width !== $preview->width()) {
+                    //Resize
+                    $widthR = $preview->width() / $width;
+                    $heightR = $preview->height() / $height;
+
+                    if ($widthR > $heightR) {
+                        $scaleH = $height;
+                        $scaleW = $maxWidth / $heightR;
+                    } else {
+                        $scaleH = $maxHeight / $widthR;
+                        $scaleW = $width;
+                    }
+                    $preview = $preview->preciseResizeCopy((int)round($scaleW), (int)round($scaleH));
+                }
+                $cropX = (int)floor(abs($width - $preview->width()) * 0.5);
+                $cropY = (int)floor(abs($height - $preview->height()) * 0.5);
+                $preview = $preview->cropCopy($cropX, $cropY, $width, $height);
+            } else {
+                $preview = $maxPreview->resizeCopy(max($width, $height));
+            }
+        } finally {
+            self::unguardWithSemaphore($sem);
+        }
+
+
+        $path = $this->generatePath($width, $height, $crop, false, $preview->dataMimeType(), $prefix);
+        try {
+            $file = $previewFolder->newFile($path);
+            $file->putContent($preview->data());
+        } catch (NotPermittedException $e) {
+            throw new NotFoundException();
+        }
+
+        return $file;
+    }
+
+    /**
+     * @param ISimpleFile[] $files Array of FileInfo, as the result of getDirectoryListing()
+     * @param int $width
+     * @param int $height
+     * @param bool $crop
+     * @param string $mimeType
+     * @param string $prefix
+     * @return ISimpleFile
+     *
+     * @throws NotFoundException
+     */
+    private function getCachedPreview($files, $width, $height, $crop, $mimeType, $prefix) {
+        $path = $this->generatePath($width, $height, $crop, false, $mimeType, $prefix);
+        foreach ($files as $file) {
+            if ($file->getName() === $path) {
+                return $file;
+            }
+        }
+        throw new NotFoundException();
+    }
+
+    /**
+     * Get the specific preview folder for this file
+     *
+     * @param File $file
+     * @return ISimpleFolder
+     *
+     * @throws InvalidPathException
+     * @throws NotFoundException
+     * @throws NotPermittedException
+     */
+    private function getPreviewFolder(File $file) {
+        // Obtain file id outside of try catch block to prevent the creation of an existing folder
+        $fileId = (string)$file->getId();
+
+        try {
+            $folder = $this->appData->getFolder($fileId);
+        } catch (NotFoundException $e) {
+            $folder = $this->appData->newFolder($fileId);
+        }
+
+        return $folder;
+    }
+
+    /**
+     * @param string $mimeType
+     * @return null|string
+     * @throws \InvalidArgumentException
+     */
+    private function getExtension($mimeType) {
+        switch ($mimeType) {
+            case 'image/png':
+                return 'png';
+            case 'image/jpeg':
+                return 'jpg';
+            case 'image/gif':
+                return 'gif';
+            default:
+                throw new \InvalidArgumentException('Not a valid mimetype: "' . $mimeType . '"');
+        }
+    }
 }

Spacing +10 added lines, -10 removed lines

@@ -142,7 +142,7 @@ 
 
 		$previewVersion = '';
 		if ($file instanceof IVersionedPreviewFile) {
-			$previewVersion = $file->getPreviewVersion() . '-';
+			$previewVersion = $file->getPreviewVersion().'-';
 		}
 
 		// If imaginary is enabled, and we request a small thumbnail,
@@ -425,7 +425,7 @@ 
 	 */
 	private function getPreviewSize(ISimpleFile $file, string $prefix = '') {
 		$size = explode('-', substr($file->getName(), strlen($prefix)));
-		return [(int)$size[0], (int)$size[1]];
+		return [(int) $size[0], (int) $size[1]];
 	}
 
 	/**
@@ -438,7 +438,7 @@ 
 	 * @return string
 	 */
 	private function generatePath($width, $height, $crop, $max, $mimeType, $prefix) {
-		$path = $prefix . (string)$width . '-' . (string)$height;
+		$path = $prefix.(string) $width.'-'.(string) $height;
 		if ($crop) {
 			$path .= '-crop';
 		}
@@ -447,7 +447,7 @@ 
 		}
 
 		$ext = $this->getExtension($mimeType);
-		$path .= '.' . $ext;
+		$path .= '.'.$ext;
 		return $path;
 	}
 
@@ -536,7 +536,7 @@ 
 			$height /= $ratio;
 		}
 
-		return [(int)round($width), (int)round($height)];
+		return [(int) round($width), (int) round($height)];
 	}
 
 	/**
@@ -574,10 +574,10 @@ 
 						$scaleH = $maxHeight / $widthR;
 						$scaleW = $width;
 					}
-					$preview = $preview->preciseResizeCopy((int)round($scaleW), (int)round($scaleH));
+					$preview = $preview->preciseResizeCopy((int) round($scaleW), (int) round($scaleH));
 				}
-				$cropX = (int)floor(abs($width - $preview->width()) * 0.5);
-				$cropY = (int)floor(abs($height - $preview->height()) * 0.5);
+				$cropX = (int) floor(abs($width - $preview->width()) * 0.5);
+				$cropY = (int) floor(abs($height - $preview->height()) * 0.5);
 				$preview = $preview->cropCopy($cropX, $cropY, $width, $height);
 			} else {
 				$preview = $maxPreview->resizeCopy(max($width, $height));
@@ -631,7 +631,7 @@ 
 	 */
 	private function getPreviewFolder(File $file) {
 		// Obtain file id outside of try catch block to prevent the creation of an existing folder
-		$fileId = (string)$file->getId();
+		$fileId = (string) $file->getId();
 
 		try {
 			$folder = $this->appData->getFolder($fileId);
@@ -656,7 +656,7 @@ 
 			case 'image/gif':
 				return 'gif';
 			default:
-				throw new \InvalidArgumentException('Not a valid mimetype: "' . $mimeType . '"');
+				throw new \InvalidArgumentException('Not a valid mimetype: "'.$mimeType.'"');
 		}
 	}
 }