From 3cf669dfb0dc42bec13830dbd32916d43fbe4bac Mon Sep 17 00:00:00 2001 From: DariusIII Date: Thu, 16 Mar 2023 10:57:27 +0100 Subject: [PATCH] Update nzb and covers paths --- app/Console/Commands/InstallNntmux.php | 6 +++--- app/Http/Controllers/Admin/AdminBookController.php | 2 +- app/Http/Controllers/Admin/AdminConsoleController.php | 2 +- app/Http/Controllers/Admin/AdminMovieController.php | 4 ++-- app/Http/Controllers/Admin/AdminMusicController.php | 2 +- database/fixtures/settings.php | 2 +- database/seeders/SettingsTableSeeder.php | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/Console/Commands/InstallNntmux.php b/app/Console/Commands/InstallNntmux.php index 304597a95..76e452ffe 100644 --- a/app/Console/Commands/InstallNntmux.php +++ b/app/Console/Commands/InstallNntmux.php @@ -93,9 +93,9 @@ class InstallNntmux extends Command */ private function updatePaths() { - $covers_path = base_path().'/resources/covers/'; - $nzb_path = base_path().'/resources/nzb/'; - $tmp_path = base_path().'/resources/tmp/'; + $covers_path = storage_path('covers'); + $nzb_path = storage_path('nzb'); + $tmp_path = resource_path('tmp'); $unrar_path = $tmp_path.'unrar/'; $nzbPathCheck = File::isWritable($nzb_path); diff --git a/app/Http/Controllers/Admin/AdminBookController.php b/app/Http/Controllers/Admin/AdminBookController.php index 1256bc9b4..e29e01d89 100644 --- a/app/Http/Controllers/Admin/AdminBookController.php +++ b/app/Http/Controllers/Admin/AdminBookController.php @@ -53,7 +53,7 @@ class AdminBookController extends BasePageController switch ($action) { case 'submit': - $coverLoc = resource_path().'/covers/book/'.$id.'.jpg'; + $coverLoc = storage_path('covers/book/'.$id.'.jpg'); if ($_FILES['cover']['size'] > 0) { $tmpName = $_FILES['cover']['tmp_name']; diff --git a/app/Http/Controllers/Admin/AdminConsoleController.php b/app/Http/Controllers/Admin/AdminConsoleController.php index 571efad79..55f064bf9 100644 --- a/app/Http/Controllers/Admin/AdminConsoleController.php +++ b/app/Http/Controllers/Admin/AdminConsoleController.php @@ -53,7 +53,7 @@ class AdminConsoleController extends BasePageController switch ($action) { case 'submit': - $coverLoc = resource_path().'/covers/console/'.$id.'.jpg'; + $coverLoc = storage_path('covers/console/'.$id.'.jpg'); if ($_FILES['cover']['size'] > 0) { $tmpName = $_FILES['cover']['tmp_name']; diff --git a/app/Http/Controllers/Admin/AdminMovieController.php b/app/Http/Controllers/Admin/AdminMovieController.php index e6c144902..7176dff53 100644 --- a/app/Http/Controllers/Admin/AdminMovieController.php +++ b/app/Http/Controllers/Admin/AdminMovieController.php @@ -100,8 +100,8 @@ class AdminMovieController extends BasePageController switch ($action) { case 'submit': - $coverLoc = resource_path().'/covers/movies/'.$id.'-cover.jpg'; - $backdropLoc = resource_path().'covers/movies/'.$id.'-backdrop.jpg'; + $coverLoc = storage_path('covers/movies/'.$id.'-cover.jpg'); + $backdropLoc = storage_path('covers/movies/'.$id.'-backdrop.jpg.jpg'); if ($_FILES['cover']['size'] > 0) { $tmpName = $_FILES['cover']['tmp_name']; diff --git a/app/Http/Controllers/Admin/AdminMusicController.php b/app/Http/Controllers/Admin/AdminMusicController.php index ab199500f..1bb01fd3e 100644 --- a/app/Http/Controllers/Admin/AdminMusicController.php +++ b/app/Http/Controllers/Admin/AdminMusicController.php @@ -52,7 +52,7 @@ class AdminMusicController extends BasePageController switch ($action) { case 'submit': - $coverLoc = resource_path().'/covers/music/'.$id.'.jpg'; + $coverLoc = storage_path('covers/music/'.$id.'.jpg'); if ($_FILES['cover']['size'] > 0) { $tmpName = $_FILES['cover']['tmp_name']; diff --git a/database/fixtures/settings.php b/database/fixtures/settings.php index 3f293150c..ae26367e8 100644 --- a/database/fixtures/settings.php +++ b/database/fixtures/settings.php @@ -974,7 +974,7 @@ Default: %Y-%m-%d %T', 'section' => 'site', 'subsection' => 'main', 'name' => 'coverspath', - 'value' => '/home/darius/PhpstormProjects/newznab-tmux/resources/covers/', + 'value' => '/var/www//nntmux/storage/covers/', 'hint' => 'The absolute path to the place covers will be stored.', 'setting' => 'coverspath', ], diff --git a/database/seeders/SettingsTableSeeder.php b/database/seeders/SettingsTableSeeder.php index 66329d6c7..da487f691 100644 --- a/database/seeders/SettingsTableSeeder.php +++ b/database/seeders/SettingsTableSeeder.php @@ -974,7 +974,7 @@ Default: %Y-%m-%d %T', 'section' => 'site', 'subsection' => 'main', 'name' => 'coverspath', - 'value' => '/var/www/NNTmux/resources/covers/', + 'value' => '/var/www/NNTmux/storage/covers/', 'hint' => 'The absolute path to the place covers will be stored.', 'setting' => 'coverspath', ],