deon/photo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix scanall, was only scanning one dir. Default route is now /home. Fix 500 error for when displaying an image that doesnt exist

Browse Source
This commit is contained in:
Deon George 2024-09-17 23:07:00 +10:00
parent 86dceac617
commit 10a1aceeb3
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Console/Commands/CatalogScanAll.php
View File

@ -112,8 +112,6 @@ class CatalogScanAll extends Command
$c++; $c++;
} }
} }
break;
} }
Log::info('Checking for missing files'); Log::info('Checking for missing files');

3
app/Models/Photo.php
View File

@ -235,6 +235,9 @@ class Photo extends Abstracted\Catalog
*/ */
public function image(): ?string public function image(): ?string
{ {
if (! $this->o)
return NULL;
$imo = clone($this->o); $imo = clone($this->o);
return $imo ? $this->rotate($imo) : NULL; return $imo ? $this->rotate($imo) : NULL;

1
composer.json
View File

@ -9,7 +9,6 @@
"ext-fileinfo": "*", "ext-fileinfo": "*",
"ext-pdo": "*", "ext-pdo": "*",
"ext-imagick": "*", "ext-imagick": "*",
"ext-pgsql": "*",
"laravel/framework": "^11.0", "laravel/framework": "^11.0",
"laravel/ui": "^4.5", "laravel/ui": "^4.5",
"leenooks/laravel": "^11.1", "leenooks/laravel": "^11.1",

2
routes/web.php
View File

@ -39,7 +39,7 @@ Route::post('/p/undelete/{o}',[PhotoController::class,'undelete'])
Route::post('/v/undelete/{o}',[VideoController::class,'undelete']) Route::post('/v/undelete/{o}',[VideoController::class,'undelete'])
->where('o','[0-9]+'); ->where('o','[0-9]+');
Route::redirect('/','login'); Route::redirect('/','home');
Route::get('/login',[LoginController::class,'showLoginForm']) Route::get('/login',[LoginController::class,'showLoginForm'])
->name('login'); ->name('login');