diff --git a/Blacklight/Nfo.php b/Blacklight/Nfo.php index 7294c5de2..d778660e1 100755 --- a/Blacklight/Nfo.php +++ b/Blacklight/Nfo.php @@ -73,7 +73,7 @@ class Nfo $this->minSize = (int) Settings::settingValue('..minsizetoprocessnfo'); $this->colorCli = new ColorCLI(); - $this->tmpPath = (string) Settings::settingValue('..tmpunrarpath'); + $this->tmpPath = config('nntmux.tmp_unrar_path'); if (! preg_match('/[\/\\\\]$/', $this->tmpPath)) { $this->tmpPath .= '/'; } diff --git a/Blacklight/processing/post/ProcessAdditional.php b/Blacklight/processing/post/ProcessAdditional.php index 5fe5cdaf8..a32f30de2 100755 --- a/Blacklight/processing/post/ProcessAdditional.php +++ b/Blacklight/processing/post/ProcessAdditional.php @@ -408,7 +408,7 @@ class ProcessAdditional protected function _setMainTempPath(&$guidChar, string &$groupID = ''): void { // Set up the temporary files folder location. - $this->_mainTmpPath = (string) Settings::settingValue('..tmpunrarpath'); + $this->_mainTmpPath = config('nntmux.tmp_unrar_path'); // Check if it ends with a dir separator. if (! preg_match('/[\/\\\\]$/', $this->_mainTmpPath)) { diff --git a/app/Console/Commands/InstallNntmux.php b/app/Console/Commands/InstallNntmux.php index 1e7322e0e..cdc12dc30 100644 --- a/app/Console/Commands/InstallNntmux.php +++ b/app/Console/Commands/InstallNntmux.php @@ -61,7 +61,7 @@ class InstallNntmux extends Command $paths = $this->updatePaths(); if ($paths !== false) { $sql1 = Settings::query()->where('setting', '=', 'nzbpath')->update(['value' => $paths['nzb_path']]); - $sql2 = Settings::query()->where('setting', '=', 'tmpunrarpath')->update(['value' => $paths['unrar_path']]); + $sql2 = Settings::query()->where('setting', '=', 'tmpunrarpath')->update(['value' => config('nntmux.tmp_path')]); $sql3 = Settings::query()->where('setting', '=', 'coverspath')->update(['value' => $paths['covers_path']]); if ($sql1 === null || $sql2 === null || $sql3 === null) { $error = true; diff --git a/config/nntmux.php b/config/nntmux.php index 4b8737487..37804bcd4 100644 --- a/config/nntmux.php +++ b/config/nntmux.php @@ -18,4 +18,6 @@ return [ 'purge_inactive_users' => env('PURGE_INACTIVE_USERS', false), 'elasticsearch_enabled' => env('ELASTICSEARCH_ENABLED', false), 'btcpay_webhook_secret' => env('BTCPAY_SECRET'), + 'tmp_unrar_path' => env('TEMP_UNRAR_PATH', storage_path('tmp/unrar/')), + 'tmp_unzip_path' => env('TEMP_UNZIP_PATH', storage_path('tmp/unzip/')), ];