Merge pull request FluidTYPO3#634 from bjo3rnf/falsupport

[TASK] Add FAL support to image info view helpers
netresearch · Jul 24, 2014 · d69d571 · d69d571
2 parents 65cbe85 + 7c0e890
commit d69d571
Showing 1 changed file with 52 additions and 11 deletions.
diff --git a/Classes/ViewHelpers/Media/Image/AbstractImageInfoViewHelper.php b/Classes/ViewHelpers/Media/Image/AbstractImageInfoViewHelper.php
@@ -26,6 +26,7 @@
 use TYPO3\CMS\Core\Utility\GeneralUtility;
 use TYPO3\CMS\Fluid\Core\ViewHelper\AbstractViewHelper;
 use TYPO3\CMS\Fluid\Core\ViewHelper\Exception;
+use FluidTYPO3\Vhs\Utility\ResourceUtility;
 
 /**
  * Base class: Media\Image view helpers
@@ -36,6 +37,15 @@
  */
 abstract class AbstractImageInfoViewHelper extends AbstractViewHelper {
 
+	/**
+	 * @var \TYPO3\CMS\Core\Resource\ResourceFactory
+	 */
+	protected $resourceFactory;
+
+	public function __construct() {
+		$this->resourceFactory = GeneralUtility::makeInstance('TYPO3\\CMS\\Core\\Resource\\ResourceFactory');
+	}
+
 	/**
 	 * Initialize arguments.
 	 *
@@ -44,15 +54,18 @@ abstract class AbstractImageInfoViewHelper extends AbstractViewHelper {
 	 */
 	public function initializeArguments() {
 		$this->registerArgument('path', 'string', 'Path to the image file to determine info for.', TRUE);
+		$this->registerArgument('treatIdAsUid', 'boolean', 'If TRUE, the path argument is treated as a resource uid.', FALSE, FALSE);
+		$this->registerArgument('treatIdAsReference', 'boolean', 'If TRUE, the path argument is treated as a reference uid and will be resolved to a resource via sys_file_reference.', FALSE, FALSE);
 	}
 
 	/**
 	 * @throws Exception
 	 * @return array
 	 */
 	public function getInfo() {
-
 		$path = $this->arguments['path'];
+		$treatIdAsUid = (boolean) $this->arguments['treatIdAsUid'];
+		$treatIdAsReference = (boolean) $this->arguments['treatIdAsReference'];
 
 		if (NULL === $path) {
 			$path = $this->renderChildren();
@@ -61,19 +74,47 @@ public function getInfo() {
 			}
 		}
 
-		$file = GeneralUtility::getFileAbsFileName($path);
-
-		if (FALSE === file_exists($file) || TRUE === is_dir($file)) {
-			throw new Exception('Cannot determine info for "' . $file . '". File does not exist or is a directory.', 1357066532);
+		if (TRUE === $treatIdAsUid || TRUE === $treatIdAsReference) {
+			$id = (integer) $path;
+			$info = array();
+			if (TRUE === $treatIdAsUid) {
+				$info = $this->getInfoByUid($id);
+			} elseif (TRUE === $treatIdAsReference) {
+				$info = $this->getInfoByReference($id);
+			}
+		} else {
+			$file = GeneralUtility::getFileAbsFileName($path);
+			if (FALSE === file_exists($file) || TRUE === is_dir($file)) {
+				throw new Exception('Cannot determine info for "' . $file . '". File does not exist or is a directory.', 1357066532);
+			}
+			$imageSize = getimagesize($file);
+			$info = array(
+				'width'  => $imageSize[0],
+				'height' => $imageSize[1],
+				'type'   => $imageSize['mime'],
+			);
 		}
 
-		$info = getimagesize($file);
+		return $info;
+	}
 
-		return array(
-			'width'  => $info[0],
-			'height' => $info[1],
-			'type'   => $info['mime'],
-		);
+	/**
+	 * @param integer $id
+	 * @return array
+	 */
+	public function getInfoByReference($id) {
+		$fileReference = $this->resourceFactory->getFileReferenceObject($id);
+		$file = $fileReference->getOriginalFile();
+		return ResourceUtility::getFileArray($file);
+	}
+
+	/**
+	 * @param integer $uid
+	 * @return array
+	 */
+	public function getInfoByUid($uid) {
+		$file = $this->resourceFactory->getFileObject($uid);
+		return ResourceUtility::getFileArray($file);
 	}
 
 }