Merge pull request #19 from akrys/master

Finale Änderungen v2.0
FriendsOfREDAXO · Aug 9, 2020 · e020313 · e020313
2 parents 81bba56 + e66e483
commit e020313
Show file tree

Hide file tree

Showing 13 changed files with 138 additions and 44 deletions.
diff --git a/README.md b/README.md
@@ -25,9 +25,9 @@ Namens einzufügen, sofern beim Upload keine Kategorie definiert wurde.
 ![Screenshot](https://raw.githubusercontent.com/FriendsOfREDAXO/mediapool_exif/master/assets/screenshot.png)
 
 
-## Beta-Features (Version 1.1)
+## Speicherung der Rohdaten
 
-Es werden alle EXIF-Daten in der Spalte ```rex_media.exif``` gespeichert, so dass man leichten Zugriff erhält.
+Ab Version 2.0 werden alle EXIF-Daten in der Spalte ```rex_media.exif``` gespeichert, so dass man leichten Zugriff erhält.
 
 Im Prinzip sind die Daten über folgenden Code erreichbar:
 
@@ -80,7 +80,7 @@ if(!$vendor) {
 }
 ```
 
-Das hier ist nicht das Standard-Vorgehen, da es u.U. schwierig werden kann, wenn man die Unterscheidung zwischen ```false``` und ```false``` machen muss. In speziellen Fällen kann man es noch mit ```null``` (```\FriendsOfRedaxo\addon\MediapoolExif\Exif::MODE_RETURN_NULL```) statt ```false```(```\FriendsOfRedaxo\addon\MediapoolExif\Exif::MODE_RETURN_FALSE```) zu versuchen.
+Das hier ist nicht das Standard-Vorgehen, da es u.U. schwierig werden kann, wenn man die Unterscheidung zwischen ```false``` und ```false``` machen muss. In speziellen Fällen kann man es mit ```null``` (```\FriendsOfRedaxo\addon\MediapoolExif\Exif::MODE_RETURN_NULL```) statt ```false```(```\FriendsOfRedaxo\addon\MediapoolExif\Exif::MODE_RETURN_FALSE```) versuchen.
 Am Besten aber, man bleibt einfach bei Exceptions. Es ist und bleibt das Eindeutigste.
 
 ### Formatierung
@@ -203,7 +203,7 @@ select exif,
 	exif->"$.ExposureTime" exposure,
 	exif->"$.ISOSpeedRatings" iso
 from rex_media;
--- where exif->"$.Make" = 'Apple' 
+-- where exif->"$.Make" = 'Apple'
 ```
 
 Äquivalent in MariaDB:

diff --git a/boot.php b/boot.php
@@ -1,8 +1,10 @@
 <?php
 
-rex_fragment::addDirectory(realpath(__DIR__));
+use FriendsOfRedaxo\addon\MediapoolExif\MediapoolExif;
 
+rex_fragment::addDirectory(realpath(__DIR__));
 
-rex_extension::register('MEDIA_ADDED', ['rex_mediapool_exif', 'processUploadedMedia'], rex_extension::LATE );
-rex_extension::register('MEDIA_UPDATED', ['rex_mediapool_exif', 'processUploadedMedia'], rex_extension::LATE );
-rex_extension::register('MEDIA_DETAIL_SIDEBAR', ['rex_mediapool_exif', 'mediapoolDetailOutput']);
+$class = MediapoolExif::class;
+rex_extension::register('MEDIA_ADDED', [$class, 'processUploadedMedia'], rex_extension::LATE);
+rex_extension::register('MEDIA_UPDATED', [$class, 'processUploadedMedia'], rex_extension::LATE);
+rex_extension::register('MEDIA_DETAIL_SIDEBAR', [$class, 'mediapoolDetailOutput']);
diff --git a/lib/Cli/Read.php b/lib/Cli/Read.php
@@ -8,6 +8,8 @@
  */
 namespace FriendsOfRedaxo\addon\MediapoolExif\Cli;
 
+use FriendsOfRedaxo\addon\MediapoolExif\Exif;
+use FriendsOfRedaxo\addon\MediapoolExif\MediapoolExif;
 use rex_console_command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
@@ -48,13 +50,13 @@ protected function execute(InputInterface $input, OutputInterface $output)
 		$updateAll = $input->getOption('all');
 		$updateSilent = $input->getOption('silent');
 
-		$mode = \FriendsOfRedaxo\addon\MediapoolExif\Exif::GETMEDIA_MODE_NULL_ONLY;
+		$mode = Exif::GETMEDIA_MODE_NULL_ONLY;
 		if ($updateAll) {
 			if ($updateSilent || $io->confirm('You are going to update all files. Are you sure?', false)) {
-				$mode = \FriendsOfRedaxo\addon\MediapoolExif\Exif::GETMEDIA_MODE_ALL;
+				$mode = Exif::GETMEDIA_MODE_ALL;
 			}
 		}
-		$files = \FriendsOfRedaxo\addon\MediapoolExif\Exif::getMediaToRead($mode);
+		$files = Exif::getMediaToRead($mode);
 
 		$numEntries = count($files);
 		$io->writeln($numEntries.' entries to read');
@@ -64,7 +66,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 			$counter++;
 			$io->writeln('Process file '.$counter.' of '.$numEntries.': '.$file['filename']);
 
-			\rex_mediapool_exif::readExifFromFile($file['filename']);
+			MediapoolExif::readExifFromFile($file['filename']);
 		}
 
 		$io->success('done');

diff --git a/lib/Exception/InvalidFormatExcption.php b/lib/Exception/InvalidFormatExcption.php
@@ -9,6 +9,7 @@
 namespace FriendsOfRedaxo\addon\MediapoolExif\Exception;
 
 use Exception;
+use Throwable;
 
 /**
  * Description of InvalidFormatExcption
@@ -30,9 +31,9 @@ class InvalidFormatExcption
 	 * @param string $format
 	 * @param string $message
 	 * @param int $code
-	 * @param \Throwable $previous
+	 * @param Throwable $previous
 	 */
-	public function __construct(string $format, string $message = "", int $code = 0, \Throwable $previous = NULL)
+	public function __construct(string $format, string $message = "", int $code = 0, Throwable $previous = NULL)
 	{
 		$this->format = $format;
 		if ($message === '') {

diff --git a/lib/Exception/NotFoundException.php b/lib/Exception/NotFoundException.php
@@ -8,13 +8,16 @@
  */
 namespace FriendsOfRedaxo\addon\MediapoolExif\Exception;
 
+use Exception;
+use Throwable;
+
 /**
  * Description of NotFoundException
  *
  * @author akrys
  */
 class NotFoundException
-	extends \Exception
+	extends Exception
 {
 	/**
 	 *
@@ -28,9 +31,9 @@ class NotFoundException
 	 * @param string $index
 	 * @param string $message
 	 * @param int $code
-	 * @param \Throwable $previous
+	 * @param Throwable $previous
 	 */
-	public function __construct(string $index, string $message = "", int $code = 0, \Throwable $previous = NULL)
+	public function __construct(string $index, string $message = "", int $code = 0, Throwable $previous = NULL)
 	{
 		$this->index = $index;
 		parent::__construct($message, $code, $previous);

diff --git a/lib/Exif.php b/lib/Exif.php
@@ -8,7 +8,7 @@
  */
 namespace FriendsOfRedaxo\addon\MediapoolExif;
 
-use rex_media;
+use FriendsOfRedaxo\addon\MediapoolExif\ExifData;
 
 /**
  * Description of Exif
@@ -45,7 +45,7 @@ public static function get(rex_media $media, $mode = self::MODE_THROW_EXCEPTION)
 	 */
 	public static function getMediaToRead($mode = self::GETMEDIA_MODE_NULL_ONLY): array
 	{
-		$rexSQL = \rex_sql::factory();
+		$rexSQL = rex_sql::factory();
 
 		switch ($mode) {
 			case self::GETMEDIA_MODE_ALL:

diff --git a/lib/ExifData.php b/lib/ExifData.php
@@ -9,8 +9,8 @@
 namespace FriendsOfRedaxo\addon\MediapoolExif;
 
 use FriendsOfRedaxo\addon\MediapoolExif\Exception\NotFoundException;
+use FriendsOfRedaxo\addon\MediapoolExif\Exif;
 use FriendsOfRedaxo\addon\MediapoolExif\Format\FormatInterface;
-use rex_media;
 
 /**
  * Description of ExifData
@@ -106,7 +106,7 @@ public function format(string $type, string $format = null)
 	{
 		try {
 			return FormatInterface::get($this->exif, $type, $format)->format();
-		} catch (\Exception $e) {
+		} catch (Exception $e) {
 			return $this->handleExcption($e);
 		}
 	}
@@ -120,7 +120,7 @@ public function format(string $type, string $format = null)
 	 * @return mixed
 	 * @throws NotFoundException
 	 */
-	private function handleExcption(\Exception $exception)
+	private function handleExcption(Exception $exception)
 	{
 		$return = '';
 

diff --git a/lib/Format/Camera.php b/lib/Format/Camera.php
@@ -8,12 +8,12 @@
  */
 namespace FriendsOfRedaxo\addon\MediapoolExif\Format;
 
-use Exception;
 use FriendsOfRedaxo\addon\MediapoolExif\Exception\InvalidFormatExcption;
 use FriendsOfRedaxo\addon\MediapoolExif\Format\Camera\Aperture;
 use FriendsOfRedaxo\addon\MediapoolExif\Format\Camera\Exposure;
 use FriendsOfRedaxo\addon\MediapoolExif\Format\Camera\Iso;
 use FriendsOfRedaxo\addon\MediapoolExif\Format\Camera\Length;
+use FriendsOfRedaxo\addon\MediapoolExif\Format\FormatInterface;
 
 /**
  * Description of Camera

diff --git a/lib/Format/FormatInterface.php b/lib/Format/FormatInterface.php
@@ -9,6 +9,7 @@
 namespace FriendsOfRedaxo\addon\MediapoolExif\Format;
 
 use FriendsOfRedaxo\addon\MediapoolExif\Exception\InvalidFormatExcption;
+use FriendsOfRedaxo\addon\MediapoolExif\Format\FormatInterface;
 
 /**
  * Description of FormatBase

diff --git a/lib/Format/Geo.php b/lib/Format/Geo.php
@@ -1,18 +1,14 @@
 <?php
 
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-namespace FriendsOfRedaxo\addon\MediapoolExif\Format;
-
 /**
- * Datei für ...
+ * Datei für GEO
  *
  * @version       1.0 / 2020-06-12
  * @author        akrys
  */
+namespace FriendsOfRedaxo\addon\MediapoolExif\Format;
+
+use Exception;
 
 /**
  * Description of Geo
@@ -26,7 +22,7 @@ class Geo
 	/**
 	 * Formatierung der Daten
 	 * @return array
-	 * @throws \Exception
+	 * @throws Exception
 	 */
 	public function format()
 	{
@@ -35,7 +31,7 @@ public function format()
 			!isset($this->data['GPSLatitudeRef']) ||
 			!isset($this->data['GPSLongitude']) ||
 			!isset($this->data['GPSLongitudeRef'])) {
-			throw new \Exception('GPS not found');
+			throw new Exception('GPS not found');
 		}
 
 		$GPSLatitude = $this->data['GPSLatitude'];