[4.2] Local adapter thumbnails

administrator/language/en-GB/plg_filesystem_local.ini

@@ -6,5 +6,6 @@
 PLG_FILESYSTEM_LOCAL="FileSystem - Local"
 PLG_FILESYSTEM_LOCAL_DEFAULT_NAME="Local"
 PLG_FILESYSTEM_LOCAL_DIRECTORIES_DIRECTORY_LABEL="Select directories"
+PLG_FILESYSTEM_LOCAL_DIRECTORIES_DIRECTORY_THUMBS_LABEL="Create thumbnails"
 PLG_FILESYSTEM_LOCAL_DIRECTORIES_LABEL="Directories"
 PLG_FILESYSTEM_LOCAL_XML_DESCRIPTION="Filesystem plugin to define one or multiple local directories to store your media files."

libraries/src/Image/Image.php

@@ -316,19 +316,20 @@ public function generateThumbs($thumbSizes, $creationMethod = self::SCALE_INSIDE
 	/**
 	 * Method to create thumbnails from the current image and save them to disk. It allows creation by resizing or cropping the original image.
 	 *
-	 * @param   mixed    $thumbSizes      string or array of strings. Example: $thumbSizes = array('150x75','250x150');
-	 * @param   integer  $creationMethod  1-3 resize $scaleMethod | 4 create cropping
-	 * @param   string   $thumbsFolder    destination thumbs folder. null generates a thumbs folder in the image folder
+	 * @param   mixed    $thumbSizes       string or array of strings. Example: $thumbSizes = ['150x75','250x150'];
+	 * @param   integer  $creationMethod   1-3 resize $scaleMethod | 4 create cropping
+	 * @param   string   $thumbsFolder     destination thumbs folder. null generates a thumbs folder in the image folder
+	 * @param   boolean  $useOriginalName  Shall we use the original image name? Defaults is false, {filename}_{width}x{height}.{ext}
 	 *
 	 * @return  array
 	 *
-	 * @since   2.5.0
+	 * @since   __DEPLOY_VERSION__
 	 * @throws  \LogicException
 	 * @throws  \InvalidArgumentException
 	 */
-	public function createThumbs($thumbSizes, $creationMethod = self::SCALE_INSIDE, $thumbsFolder = null)
+	public function createThumbnails($thumbSizes, $creationMethod = self::SCALE_INSIDE, $thumbsFolder = null, $useOriginalName = false)
 	{
-		// Make sure the resource handle is valid.
+				// Make sure the resource handle is valid.
 		if (!$this->isLoaded())
 		{
 			throw new \LogicException('No valid image was loaded.');
@@ -365,8 +366,16 @@ public function createThumbs($thumbSizes, $creationMethod = self::SCALE_INSIDE,
 				$thumbWidth  = $thumb->getWidth();
 				$thumbHeight = $thumb->getHeight();
 
-				// Generate thumb name
-				$thumbFileName = $filename . '_' . $thumbWidth . 'x' . $thumbHeight . '.' . $fileExtension;
+				if ($useOriginalName)
+				{
+					// Generate thumb name
+					$thumbFileName = $filename . '.' . $fileExtension;
+				}
+				else
+				{
+					// Generate thumb name
+					$thumbFileName = $filename . '_' . $thumbWidth . 'x' . $thumbHeight . '.' . $fileExtension;
+				}
 
 				// Save thumb file to disk
 				$thumbFileName = $thumbsFolder . '/' . $thumbFileName;
@@ -383,6 +392,24 @@ public function createThumbs($thumbSizes, $creationMethod = self::SCALE_INSIDE,
 		return $thumbsCreated;
 	}
 
+	/**
+	 * Method to create thumbnails from the current image and save them to disk. It allows creation by resizing or cropping the original image.
+	 *
+	 * @param   mixed    $thumbSizes       string or array of strings. Example: $thumbSizes = ['150x75','250x150'];
+	 * @param   integer  $creationMethod   1-3 resize $scaleMethod | 4 create cropping
+	 * @param   string   $thumbsFolder     destination thumbs folder. null generates a thumbs folder in the image folder
+	 *
+	 * @return  array
+	 *
+	 * @since   2.5.0
+	 * @throws  \LogicException
+	 * @throws  \InvalidArgumentException
+	 */
+	public function createThumbs($thumbSizes, $creationMethod = self::SCALE_INSIDE)
+	{
+		$this->createThumbnails($thumbSizes, $creationMethod, false);
+	}
+
 	/**
 	 * Method to crop the current image.
 	 *

plugins/filesystem/local/local.php

@@ -79,7 +79,7 @@ public function getDisplayName()
 	public function getAdapters()
 	{
 		$adapters = [];
-		$directories = $this->params->get('directories', '[{"directory": "images"}]');
+		$directories = $this->params->get('directories', '[{"directory": "images", "thumbs": 1}]');
 
 		// Do a check if default settings are not saved by user
 		// If not initialize them manually
@@ -95,8 +95,16 @@ public function getAdapters()
 				$directoryPath = JPATH_ROOT . '/' . $directoryEntity->directory;
 				$directoryPath = rtrim($directoryPath) . '/';
 
+				if (!isset($directoryEntity->thumbs))
+				{
+					$directoryEntity->thumbs = 1;
+				}
+
 				$adapter = new \Joomla\Plugin\Filesystem\Local\Adapter\LocalAdapter(
-					$directoryPath, $directoryEntity->directory
+					$directoryPath,
+					$directoryEntity->directory,
+					$directoryEntity->thumbs,
+					[200, 200]
 				);
 
 				$adapters[$adapter->getAdapterName()] = $adapter;

plugins/filesystem/local/local.xml

@@ -44,6 +44,17 @@
 							hide_none="true"
 							validate="options"
 						/>
+						<field
+							name="thumbs"
+							type="radio"
+							label="PLG_FILESYSTEM_LOCAL_DIRECTORIES_DIRECTORY_THUMBS_LABEL"
+							layout="joomla.form.field.radio.switcher"
+							default="1"
+							filter="integer"
+							>
+							<option value="0">JNO</option>
+							<option value="1">JYES</option>
+						</field>
 					</form>
 				</field>
 			</fieldset>