Add the possibility to rotate pictures (#616)

* Adding rotation to server side * Added width and height swap * Added config file migrate * sync Lychee-front * add coverage
LycheeOrg · Jun 10, 2020 · c75811e · c75811e
1 parent c51722a
commit c75811e
Show file tree

Hide file tree

Showing 23 changed files with 441 additions and 16 deletions.
diff --git a/app/Http/Controllers/PhotoEditorController.php b/app/Http/Controllers/PhotoEditorController.php
@@ -0,0 +1,126 @@
+<?php
+
+/** @noinspection PhpUndefinedClassInspection */
+
+namespace App\Http\Controllers;
+
+use App\Configs;
+use App\Logs;
+use App\Photo;
+use Illuminate\Http\Request;
+use Storage;
+
+class PhotoEditorController extends Controller
+{
+	public function __construct()
+	{
+	}
+
+	/**
+	 * Given a photoID and a direction (+1: 90° clockwise, -1: 90° counterclockwise) rotate an image.
+	 *
+	 * @param Request $request
+	 *
+	 * @return tring
+	 */
+	public function rotate(Request $request)
+	{
+		// Safety check...
+		if (!Configs::get_value('editor_enabled', '0')) {
+			return 'false';
+		}
+
+		if (!Configs::hasImagick()) {
+			// @codeCoverageIgnoreStart
+			return 'false';
+			// @codeCoverageIgnoreEnd
+		}
+
+		$request->validate([
+			'photoID' => 'string|required',
+			'direction' => 'integer|required',
+		]);
+
+		$photo = Photo::find($request['photoID']);
+		$direction = $request['direction'];
+
+		// Photo not found?
+		if ($photo == null) {
+			Logs::error(__METHOD__, __LINE__, 'Could not find specified photo');
+
+			return 'false';
+		}
+
+		// direction is valid?
+		if (($direction != 1) && ($direction != -1)) {
+			Logs::error(__METHOD__, __LINE__, 'Direction must be 1 or -1');
+
+			return 'false';
+		}
+
+		// Abort on symlinks to avoid messing with originals linked
+		if (is_link(Storage::path('big/') . $photo->url)) {
+			// @codeCoverageIgnoreStart
+			Logs::error(__METHOD__, __LINE__, 'Synlinked images cannot be rotated');
+
+			return 'false';
+			// @codeCoverageIgnoreEnd
+		}
+
+		// We must rotate all the various formats
+		$img_types = ['big', 'medium', 'medium2x', 'small', 'small2x', 'thumb', 'thumb2x'];
+		$save_photo = false;
+		foreach ($img_types as $img_type) {
+			// This will be FALSE if not 2x, or the position of the '2' char otherwise
+			$image_2x = strpos($img_type, '2');
+
+			// Build path to stored image
+			if (substr($img_type, 0, 5) !== 'thumb') {
+				// Rotate image sizes
+				$filename = $photo->url;
+				if (!is_null($photo->{$img_type})) {
+					$x_pos = strpos($photo->{$img_type}, 'x');
+					$old_w = substr($photo->{$img_type}, 0, $x_pos);
+					$old_h = substr($photo->{$img_type}, $x_pos + 1);
+					$photo->{$img_type} = $old_h . 'x' . $old_w;
+					$save_photo = true;
+				}
+			} else {
+				$filename = $photo->thumbUrl;
+			}
+			if ($image_2x !== false) {
+				$img_type = substr($img_type, 0, $image_2x);
+				$filename = preg_replace('/^(.*)\.(.*)$/', '\1@2x.\2', $filename);
+			}
+			$uploadFolder = Storage::path($img_type . '/');
+			$img_path = $uploadFolder . $photo->url;
+
+			// Rotate the image
+			$img_path = $uploadFolder . $filename;
+			if (file_exists($img_path)) {
+				$image = new \Imagick();
+				$image->readImage($img_path);
+
+				if ($direction == 1) {
+					$image->rotateImage(new \ImagickPixel(), 90);
+				} else {
+					$image->rotateImage(new \ImagickPixel(), -90);
+				}
+				$save_photo = true;
+				$image->writeImage();
+				$image->clear();
+				$image->destroy();
+			}
+		}
+		if ($save_photo) {
+			// rotate image width and height and save to the database
+			$old_w = $photo->width;
+			$old_h = $photo->height;
+			$photo->width = $old_h;
+			$photo->height = $old_w;
+			$photo->save();
+		}
+
+		return 'true';
+	}
+}
diff --git a/app/Locale/ChineseSimplified.php b/app/Locale/ChineseSimplified.php
@@ -413,6 +413,9 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Square thumb HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video part of live-photo',
 			'PHOTO_VIEW' => 'Lychee Photo View:',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Rotate clockwise',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Rotate counter-clockwise',
 		];
 
 		return $locale;

diff --git a/app/Locale/Czech.php b/app/Locale/Czech.php
@@ -420,6 +420,9 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Čtvercový náhled HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video part of live-photo',
 			'PHOTO_VIEW' => 'Zobrazení foto Lychee:',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Rotate clockwise',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Rotate counter-clockwise',
 		];
 
 		return $locale;

diff --git a/app/Locale/Dutch.php b/app/Locale/Dutch.php
@@ -413,6 +413,9 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Square thumb HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video part of live-photo',
 			'PHOTO_VIEW' => 'Lychee Photo View:',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Rotate clockwise',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Rotate counter-clockwise',
 		];
 
 		return $locale;

diff --git a/app/Locale/English.php b/app/Locale/English.php
@@ -414,8 +414,11 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Square thumb HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video part of live-photo',
 			'PHOTO_VIEW' => 'Lychee Photo View:',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Rotate clockwise',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Rotate counter-clockwise',
 		];
 
 		return $locale;
 	}
-}
+}
diff --git a/app/Locale/French.php b/app/Locale/French.php
@@ -413,6 +413,9 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Square thumb HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video part of live-photo',
 			'PHOTO_VIEW' => 'Lychee Photo View:',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Rotate clockwise',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Rotate counter-clockwise',
 		];
 
 		return $locale;

diff --git a/app/Locale/German.php b/app/Locale/German.php
@@ -422,6 +422,9 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Quadratische Miniaturansicht HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video des Live-Photos',
 			'PHOTO_VIEW' => 'Lychee Foto Ansicht:',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Rotate clockwise',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Rotate counter-clockwise',
 		];
 
 		return $locale;

diff --git a/app/Locale/Greek.php b/app/Locale/Greek.php
@@ -413,6 +413,9 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Τετράγωνη Μικρογραφία HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video part of live-photo',
 			'PHOTO_VIEW' => 'Lychee Προβολή Φωτογραφιών:',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Rotate clockwise',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Rotate counter-clockwise',
 		];
 
 		return $locale;

diff --git a/app/Locale/Italian.php b/app/Locale/Italian.php
@@ -419,6 +419,9 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Square thumb HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video part of live-photo',
 			'PHOTO_VIEW' => 'Lychee Photo View:',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Ruota in senso orario',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Ruota in senso anti-orario',
 		];
 
 		return $locale;

diff --git a/app/Locale/Russian.php b/app/Locale/Russian.php
@@ -414,8 +414,11 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Square thumb HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video part of live-photo',
 			'PHOTO_VIEW' => 'Lychee Photo View:',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Rotate clockwise',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Rotate counter-clockwise',
 		];
 
 		return $locale;
 	}
-}
+}
diff --git a/app/Locale/Slovak.php b/app/Locale/Slovak.php
@@ -420,6 +420,9 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Štvorcový náhľad HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video part of live-photo',
 			'PHOTO_VIEW' => 'Zobrazenie foto Lychee:',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Rotate clockwise',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Rotate counter-clockwise',
 		];
 
 		return $locale;

diff --git a/app/Locale/Spanish.php b/app/Locale/Spanish.php
@@ -413,6 +413,9 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Cuadrado de Miniatura HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video part of live-photo',
 			'PHOTO_VIEW' => 'Vista de Foto de Lychee',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Rotate clockwise',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Rotate counter-clockwise',
 		];
 
 		return $locale;

diff --git a/app/Locale/Swedish.php b/app/Locale/Swedish.php
@@ -413,6 +413,9 @@ public static function get_locale()
 			'PHOTO_THUMB_HIDPI' => 'Square thumb HiDPI',
 			'PHOTO_LIVE_VIDEO' => 'Video part of live-photo',
 			'PHOTO_VIEW' => 'Lychee Photo View:',
+
+			'PHOTO_EDIT_ROTATECWISE' => 'Rotate clockwise',
+			'PHOTO_EDIT_ROTATECCWISE' => 'Rotate counter-clockwise',
 		];
 
 		return $locale;

diff --git a/database/migrations/2020_05_12_114228_rss.php b/database/migrations/2020_05_12_114228_rss.php
@@ -19,21 +19,21 @@ public function up()
 			[
 				'key' => 'rss_enable',
 				'value' => '0',
-				'confidentiality' => 0,
+				'confidentiality' => '0',
 				'cat' => 'Mod RSS',
 				'type_range' => BOOL,
 			],
 			[
 				'key' => 'rss_recent_days',
 				'value' => '7',
-				'confidentiality' => 0,
+				'confidentiality' => '0',
 				'cat' => 'Mod RSS',
 				'type_range' => INT,
 			],
 			[
 				'key' => 'rss_max_items',
 				'value' => '100',
-				'confidentiality' => 0,
+				'confidentiality' => '0',
 				'cat' => 'Mod RSS',
 				'type_range' => INT,
 			],

diff --git a/database/migrations/2020_05_19_174233_config_prefer_available_xmp_metadata.php b/database/migrations/2020_05_19_174233_config_prefer_available_xmp_metadata.php
@@ -17,8 +17,8 @@ public function up()
 		DB::table('configs')->insert([
 			[
 				'key' => 'prefer_available_xmp_metadata',
-				'value' => 0,
-				'confidentiality' => 2,
+				'value' => '0',
+				'confidentiality' => '2',
 				'cat' => 'Image Processing',
 				'type_range' => BOOL,
 			],

diff --git a/database/migrations/2020_06_04_104605_config_editor_enabled.php b/database/migrations/2020_06_04_104605_config_editor_enabled.php
@@ -0,0 +1,36 @@
+<?php
+
+use App\Configs;
+use Illuminate\Database\Migrations\Migration;
+
+class ConfigEditorEnabled extends Migration
+{
+	/**
+	 * Run the migrations.
+	 *
+	 * @return void
+	 */
+	public function up()
+	{
+		defined('BOOL') or define('BOOL', '0|1');
+		DB::table('configs')->insert([
+			[
+				'key' => 'editor_enabled',
+				'value' => '1',
+				'confidentiality' => '2',
+				'cat' => 'Image Processing',
+				'type_range' => BOOL,
+			],
+		]);
+	}
+
+	/**
+	 * Reverse the migrations.
+	 *
+	 * @return void
+	 */
+	public function down()
+	{
+		Configs::where('key', '=', 'editor_enabled')->delete();
+	}
+}
diff --git a/public/Lychee-front b/public/Lychee-front