Upgrade version (#721)

* migrate files to Laravel 8.0.1, includes change in route description * move models to App/Models/ as pre defined in the new version of Laravel * sync Lychee-front, fix links in head.blade.php
LycheeOrg · Sep 17, 2020 · dd979ab · dd979ab
1 parent f7a379c
commit dd979ab
Show file tree

Hide file tree

Showing 168 changed files with 2,192 additions and 1,772 deletions.
diff --git a/app/Assets/Helpers.php b/app/Assets/Helpers.php
@@ -2,8 +2,8 @@
 
 namespace App\Assets;
 
-use App\Configs;
 use App\Exceptions\DivideByZeroException;
+use App\Models\Configs;
 use Illuminate\Support\Facades\File;
 use WhichBrowser\Parser as BrowserParser;
 

diff --git a/app/Console/Commands/DecodeGpsLocations.php b/app/Console/Commands/DecodeGpsLocations.php
@@ -2,10 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Metadata\Extractor;
 use App\Metadata\Geodecoder;
-use App\ModelFunctions\PhotoFunctions;
-use App\Photo;
+use App\Models\Photo;
 use Illuminate\Console\Command;
 
 class DecodeGpsLocations extends Command
@@ -24,29 +22,14 @@ class DecodeGpsLocations extends Command
 	 */
 	protected $description = 'Decodes the GPS location data and adds street, city, country, etc. to the tags';
 
-	/**
-	 * @var PhotoFunctions
-	 */
-	private $photoFunctions;
-
-	/**
-	 * @var Extractor
-	 */
-	private $metadataExtractor;
-
 	/**
 	 * Create a new command instance.
 	 *
-	 * @param PhotoFunctions $photoFunctions
-	 *
 	 * @return void
 	 */
-	public function __construct(PhotoFunctions $photoFunctions, Extractor $metadataExtractor)
+	public function __construct()
 	{
 		parent::__construct();
-
-		$this->photoFunctions = $photoFunctions;
-		$this->metadataExtractor = $metadataExtractor;
 	}
 
 	/**
@@ -57,8 +40,7 @@ public function __construct(PhotoFunctions $photoFunctions, Extractor $metadataE
 	public function handle()
 	{
 		$photos = Photo::whereNotNull('latitude')->whereNotNull('longitude')->whereNull('location')
-			->get()
-		;
+			->get();
 
 		if (count($photos) == 0) {
 			$this->line('No photos or videos require processing.');

diff --git a/app/Console/Commands/Diagnostics.php b/app/Console/Commands/Diagnostics.php
@@ -3,41 +3,11 @@
 namespace App\Console\Commands;
 
 use App\Console\Commands\Utilities\Colorize;
-use App\ControllerFunctions\Update\Check as CheckUpdate;
 use App\Http\Controllers\DiagnosticsController;
-use App\Metadata\DiskUsage;
-use App\Metadata\LycheeVersion;
-use App\ModelFunctions\ConfigFunctions;
-use App\ModelFunctions\SessionFunctions;
 use Illuminate\Console\Command;
 
 class Diagnostics extends Command
 {
-	/**
-	 * @var ConfigFunctions
-	 */
-	private $configFunctions;
-
-	/**
-	 * @var LycheeVersion
-	 */
-	private $lycheeVersion;
-
-	/**
-	 * @var SessionFunctions
-	 */
-	private $sessionFunctions;
-
-	/**
-	 * @var DiskUsage
-	 */
-	private $diskUsage;
-
-	/**
-	 * @var CheckUpdate
-	 */
-	private $checkUpdate;
-
 	/**
 	 * Add color to the command line output.
 	 *
@@ -65,20 +35,10 @@ class Diagnostics extends Command
 	 * @return void
 	 */
 	public function __construct(
-		ConfigFunctions $configFunctions,
-		LycheeVersion $lycheeVersion,
-		SessionFunctions $sessionFunctions,
-		DiskUsage $diskUsage,
-		CheckUpdate $checkUpdate,
 		Colorize $colorize
 	) {
 		parent::__construct();
 
-		$this->configFunctions = $configFunctions;
-		$this->lycheeVersion = $lycheeVersion;
-		$this->sessionFunctions = $sessionFunctions;
-		$this->diskUsage = $diskUsage;
-		$this->checkUpdate = $checkUpdate;
 		$this->col = $colorize;
 	}
 
@@ -104,7 +64,7 @@ private function block(string $str, array $array)
 	 */
 	public function handle()
 	{
-		$ctrl = new DiagnosticsController($this->configFunctions, $this->lycheeVersion, $this->sessionFunctions, $this->diskUsage, $this->checkUpdate);
+		$ctrl = resolve(DiagnosticsController::class);
 
 		$this->line('');
 		$this->line('');
@@ -114,4 +74,4 @@ public function handle()
 		$this->line('');
 		$this->block('Config Information', $ctrl->get_config());
 	}
-}
+}
diff --git a/app/Console/Commands/ExifLens.php b/app/Console/Commands/ExifLens.php
@@ -6,7 +6,7 @@
 
 use App\Metadata\Extractor;
 use App\ModelFunctions\PhotoFunctions;
-use App\Photo;
+use App\Models\Photo;
 use Illuminate\Console\Command;
 use Storage;
 

diff --git a/app/Console/Commands/GenerateThumbs.php b/app/Console/Commands/GenerateThumbs.php
@@ -2,9 +2,9 @@
 
 namespace App\Console\Commands;
 
-use App\Configs;
 use App\ModelFunctions\PhotoFunctions;
-use App\Photo;
+use App\Models\Configs;
+use App\Models\Photo;
 use Illuminate\Console\Command;
 
 class GenerateThumbs extends Command
@@ -109,8 +109,8 @@ public function handle()
 				$photo,
 				$type,
 				$maxWidth,
-				$maxHeight)
-			) {
+				$maxHeight
+			)) {
 				$photo->save();
 				$this->line('   ' . $type . ' (' . $photo->{$type} . ') for ' . $photo->title . ' created.');
 			} else {

diff --git a/app/Console/Commands/Ghostbuster.php b/app/Console/Commands/Ghostbuster.php
@@ -3,18 +3,12 @@
 namespace App\Console\Commands;
 
 use App\Console\Commands\Utilities\Colorize;
-use App\ModelFunctions\PhotoFunctions;
-use App\Photo;
+use App\Models\Photo;
 use Illuminate\Console\Command;
 use Storage;
 
 class Ghostbuster extends Command
 {
-	/**
-	 * @var PhotoFunctions
-	 */
-	private $photoFunctions;
-
 	/**
 	 * Add color to the command line output.
 	 *
@@ -39,15 +33,14 @@ class Ghostbuster extends Command
 	/**
 	 * Create a new command instance.
 	 *
-	 * @param PhotoFunctions $photoFunctions
+	 * @param Colorize $colorize
 	 *
 	 * @return void
 	 */
-	public function __construct(PhotoFunctions $photoFunctions, Colorize $colorize)
+	public function __construct(Colorize $colorize)
 	{
 		parent::__construct();
 
-		$this->photoFunctions = $photoFunctions;
 		$this->col = $colorize;
 	}
 

diff --git a/app/Console/Commands/ResetAdmin.php b/app/Console/Commands/ResetAdmin.php
@@ -2,8 +2,8 @@
 
 namespace App\Console\Commands;
 
-use App\Configs;
 use App\Console\Commands\Utilities\Colorize;
+use App\Models\Configs;
 use Illuminate\Console\Command;
 
 class ResetAdmin extends Command
@@ -51,4 +51,4 @@ public function handle()
 		Configs::where('key', '=', 'username')->orWhere('key', '=', 'password')->update(['value' => '']);
 		$this->line($this->col->yellow('Admin username and password reset.'));
 	}
-}
+}
diff --git a/app/Console/Commands/ShowLogs.php b/app/Console/Commands/ShowLogs.php
@@ -3,7 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Console\Commands\Utilities\Colorize;
-use App\Logs;
+use App\Models\Logs;
 use Illuminate\Console\Command;
 
 class ShowLogs extends Command
@@ -101,4 +101,4 @@ private function color_type($type)
 				return $type;
 		}
 	}
-}
+}
diff --git a/app/Console/Commands/Sync.php b/app/Console/Commands/Sync.php
@@ -3,9 +3,6 @@
 namespace App\Console\Commands;
 
 use App\Http\Controllers\ImportController;
-use App\ModelFunctions\AlbumFunctions;
-use App\ModelFunctions\PhotoFunctions;
-use App\ModelFunctions\SessionFunctions;
 use Exception;
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Session;
@@ -26,37 +23,14 @@ class Sync extends Command
 	 */
 	protected $description = 'Sync a directory to lychee';
 
-	/**
-	 * @var AlbumFunctions
-	 */
-	private $albumFunctions;
-
-	/**
-	 * @var PhotoFunctions
-	 */
-	private $photoFunctions;
-
-	/**
-	 * @var SessionFunctions
-	 */
-	private $sessionFunctions;
-
 	/**
 	 * Create a new command instance.
 	 *
-	 * @param PhotoFunctions   $photoFunctions
-	 * @param AlbumFunctions   $albumFunctions
-	 * @param SessionFunctions $sessionFunctions
-	 *
 	 * @return void
 	 */
-	public function __construct(PhotoFunctions $photoFunctions, AlbumFunctions $albumFunctions, SessionFunctions $sessionFunctions)
+	public function __construct()
 	{
 		parent::__construct();
-
-		$this->photoFunctions = $photoFunctions;
-		$this->albumFunctions = $albumFunctions;
-		$this->sessionFunctions = $sessionFunctions;
 	}
 
 	/**
@@ -73,7 +47,7 @@ public function handle()
 		$resync_metadata = $this->option('resync_metadata');
 		$delete_imported = false; // we want to sync -> do not delete imported files
 		$force_skip_duplicates = true;
-		$import_controller = new ImportController($this->photoFunctions, $this->albumFunctions, $this->sessionFunctions);
+		$import_controller = resolve(ImportController::class);
 
 		// Enable CLI formatting of status
 		$import_controller->enableCLIStatus();

diff --git a/app/Console/Commands/Takedate.php b/app/Console/Commands/Takedate.php
@@ -4,7 +4,7 @@
 
 use App\Metadata\Extractor;
 use App\ModelFunctions\PhotoFunctions;
-use App\Photo;
+use App\Models\Photo;
 use Illuminate\Console\Command;
 use Storage;
 

diff --git a/app/Console/Commands/VideoData.php b/app/Console/Commands/VideoData.php
@@ -2,10 +2,10 @@
 
 namespace App\Console\Commands;
 
-use App\Logs;
 use App\Metadata\Extractor;
 use App\ModelFunctions\PhotoFunctions;
-use App\Photo;
+use App\Models\Logs;
+use App\Models\Photo;
 use Illuminate\Console\Command;
 use Storage;
 
@@ -70,8 +70,7 @@ public function handle()
 		$photos = Photo::where('type', 'like', 'video/%')
 			->where('width', '=', 0)
 			->take($this->argument('count'))
-			->get()
-		;
+			->get();
 
 		if (count($photos) == 0) {
 			$this->line('No videos require processing');

diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php
@@ -24,8 +24,7 @@ class Kernel extends ConsoleKernel
 	 */
 	protected function schedule(Schedule $schedule)
 	{
-		// $schedule->command('inspire')
-		//          ->hourly();
+		// $schedule->command('inspire')->hourly();
 	}
 
 	/**

diff --git a/app/ControllerFunctions/Diagnostics/ConfigSanityCheck.php b/app/ControllerFunctions/Diagnostics/ConfigSanityCheck.php
@@ -2,8 +2,8 @@
 
 namespace App\ControllerFunctions\Diagnostics;
 
-use App\Configs;
 use App\ModelFunctions\ConfigFunctions;
+use App\Models\Configs;
 
 class ConfigSanityCheck implements DiagnosticCheckInterface
 {

diff --git a/app/ControllerFunctions/Diagnostics/ImageOptCheck.php b/app/ControllerFunctions/Diagnostics/ImageOptCheck.php
@@ -2,7 +2,7 @@
 
 namespace App\ControllerFunctions\Diagnostics;
 
-use App\Configs;
+use App\Models\Configs;
 use Spatie\ImageOptimizer\Optimizers\Cwebp;
 use Spatie\ImageOptimizer\Optimizers\Gifsicle;
 use Spatie\ImageOptimizer\Optimizers\Jpegoptim;

diff --git a/app/ControllerFunctions/Diagnostics/IniSettingsCheck.php b/app/ControllerFunctions/Diagnostics/IniSettingsCheck.php
@@ -2,7 +2,7 @@
 
 namespace App\ControllerFunctions\Diagnostics;
 
-use App\Configs;
+use App\Models\Configs;
 
 class IniSettingsCheck implements DiagnosticCheckInterface
 {

diff --git a/app/ControllerFunctions/ReadAccessFunctions.php b/app/ControllerFunctions/ReadAccessFunctions.php
@@ -2,12 +2,11 @@
 
 namespace App\ControllerFunctions;
 
-use App\Album;
-use App\Configs;
 use App\Exceptions\AlbumDoesNotExistsException;
 use App\ModelFunctions\SessionFunctions;
-use App\Photo;
-use App\User;
+use App\Models\Album;
+use App\Models\Configs;
+use App\Models\Photo;
 
 class ReadAccessFunctions
 {