Attempt to fix issues with the image version shell

Author: Florian Krämer

src/Event/ImageProcessingListener.php

@@ -8,6 +8,7 @@
 use Cake\ORM\Table;
 use Burzum\FileStorage\Storage\StorageManager;
 use Burzum\FileStorage\Storage\StorageUtils;
+use RuntimeException;
 
 /**
  * @author Florian Krämer
@@ -113,7 +114,7 @@ protected function _autoRotate($imageFile, $format) {
 	 * @return false|null
 	 */
 	protected function _createVersions(Table $table, $entity, array $operations) {
-		$Storage = StorageManager::adapter($entity['adapter']);
+		$Storage = StorageManager::getAdapter($entity['adapter']);
 		$path = $this->_buildPath($entity, true);
 		$tmpFile = $this->_tmpFile($Storage, $path, TMP . 'image-processing');
 
@@ -266,7 +267,7 @@ public function afterSave(Event $Event) {
 		if ($this->_checkEvent($Event)) {
 			$table = $Event->subject();
 			$record = $Event->getData('record');
-			$Storage = StorageManager::adapter($record->adapter);
+			$Storage = StorageManager::getAdapter($record->get('adapter'));
 			try {
 				$id = $record->{$table->primaryKey()};
 				$filename = $this->stripDashes($id);
@@ -313,7 +314,7 @@ public function imagePath(Event $Event) {
 		extract($data);
 
 		if (!isset($Event->data['image']['adapter'])) {
-			throw new \RuntimeException(__d('file_storage', 'No adapter config key passed!'));
+			throw new RuntimeException(__d('file_storage', 'No adapter config key passed!'));
 		}
 
 		$adapterClass = $this->getAdapterClassName($Event->data['image']['adapter']);
@@ -323,7 +324,7 @@ public function imagePath(Event $Event) {
 			return $this->$buildMethod($Event);
 		}
 
-		throw new \RuntimeException(__d('file_storage', 'No callback image url callback implemented for adapter %s', $adapterClass));
+		throw new RuntimeException(__d('file_storage', 'No callback image url callback implemented for adapter %s', $adapterClass));
 	}
 
 	/**

src/Shell/ImageVersionShell.php

@@ -266,17 +266,20 @@ protected function _loop($action, $model, $operations = [], $options = []) {
 							'options' => $options
 						);
 
-						if ($action == 'generate' || $action == 'regenerate') {
+						if ($action === 'generate' || $action === 'regenerate') {
 							$Event = new Event('ImageVersion.createVersion', $this->Table, $payload);
 							EventManager::instance()->dispatch($Event);
 						}
 
-						if ($action == 'remove') {
+						if ($action === 'remove') {
 							$Event = new Event('ImageVersion.removeVersion', $this->Table, $payload);
 							EventManager::instance()->dispatch($Event);
 						}
 
-						$this->out(__('{0} processed', $image->id));
+						$this->out(__('{0} processed', $image->get('id')));
+						$this->verbose('Path: ' . $image->get('path'));
+						$this->verbose('Adapter Config: ' . $image->get('adapter'));
+						$this->verbose($this->nl());
 					}
 				}
 			}

src/Storage/Listener/BaseListener.php

@@ -185,7 +185,7 @@ protected function _processImages(Event $event, $method) {
 
 		$this->_loadImageProcessingFromConfig();
 
-		$event->setResult($this->{$method}(
+		$event->setResult($this->{$method} (
 			$event->getData('record'),
 			$versions,
 			$options
@@ -204,7 +204,7 @@ protected function _processImages(Event $event, $method) {
 	 */
 	protected function _getVersionData($event)
 	{
-		$data = $event->data['versions'];
+		$data = $event->getData();
 
 		if (isset($data['versions'])) {
 			$versions = $data['versions'];

src/Storage/Listener/ImageProcessingTrait.php

@@ -7,8 +7,11 @@
 namespace Burzum\FileStorage\Storage\Listener;
 
 use Burzum\FileStorage\Storage\StorageUtils;
+use Cake\Console\Shell;
 use Cake\Core\Configure;
 use Cake\Datasource\EntityInterface;
+use Exception;
+use RuntimeException;
 
 /**
  * ImageProcessingTrait
@@ -84,7 +87,7 @@ public function imageProcessor(array $config = [], $renew = false) {
 	 */
 	public function getImageVersionHash($model, $version) {
 		if (empty($this->_imageVersionHashes[$model][$version])) {
-			throw new \RuntimeException(sprintf('Version "%s" for identifier "%s" does not exist!', $version, $model));
+			throw new RuntimeException(sprintf('Version "%s" for identifier "%s" does not exist!', $version, $model));
 		}
 		return $this->_imageVersionHashes[$model][$version];
 	}
@@ -99,11 +102,11 @@ public function getImageVersionHash($model, $version) {
 	 */
 	protected function _checkImageVersions($identifier, array $versions) {
 		if (!isset($this->_imageVersions[$identifier])) {
-			throw new \RuntimeException(sprintf('No image version config found for identifier "%s"!', $identifier));
+			throw new RuntimeException(sprintf('No image version config found for identifier "%s"!', $identifier));
 		}
 		foreach ($versions as $version) {
 			if (!isset($this->_imageVersions[$identifier][$version])) {
-				throw new \RuntimeException(sprintf('Invalid version "%s" for identifier "%s"!', $identifier, $version));
+				throw new RuntimeException(sprintf('Invalid version "%s" for identifier "%s"!', $identifier, $version));
 			}
 		}
 	}
@@ -117,18 +120,27 @@ protected function _checkImageVersions($identifier, array $versions) {
 	 * @return array
 	 */
 	public function createImageVersions(EntityInterface $entity, array $versions, array $options = []) {
-		$this->_checkImageVersions($entity->model, $versions);
+		$this->_checkImageVersions($entity->get('model'), $versions);
 
 		$options += $this->_defaultOutput + [
 			'overwrite' => true
 		];
 
 		$result = [];
-		$storage = $this->storageAdapter($entity->adapter);
-		foreach ($this->_imageVersions[$entity->model] as $version => $operations) {
+		$storage = $this->storageAdapter($entity->get('adapter'));
+
+		foreach ($this->_imageVersions[$entity->get('model')] as $version => $operations) {
 			if (!in_array($version, $versions)) {
+				if ($this instanceof Shell) {
+					$this->warn(sprintf(
+						'Version `%s` for identifier `%s` not found',
+						$version,
+						$entity->get('model')
+					));
+				}
 				continue;
 			}
+
 			$saveOptions = $options + ['format' => $entity->extension];
 			if (isset($operations['_output'])) {
 				$saveOptions = $operations['_output'] + $saveOptions;
@@ -155,7 +167,7 @@ public function createImageVersions(EntityInterface $entity, array $versions, ar
 					'path' => $path,
 					'hash' => $this->getImageVersionHash($entity->model, $version)
 				];
-			} catch (\Exception $e) {
+			} catch (Exception $e) {
 				$result[$version] = [
 					'status' => 'error',
 					'error' => $e->getMessage(),
@@ -207,7 +219,7 @@ public function removeImageVersions(EntityInterface $entity, array $versions, ar
 	 */
 	public function getAllVersionsKeysForModel($identifier) {
 		if (!isset($this->_imageVersions[$identifier])) {
-			throw new \RuntimeException(sprintf('No image config present for identifier "%s"!', $identifier));
+			throw new RuntimeException(sprintf('No image config present for identifier "%s"!', $identifier));
 		}
 		return array_keys($this->_imageVersions[$identifier]);
 	}