Upgrade nntmux configuration method

NNTmux · Mar 3, 2018 · d5e7ba4 · d5e7ba4
1 parent e091378
commit d5e7ba4
Show file tree

Hide file tree

Showing 76 changed files with 296 additions and 572 deletions.
diff --git a/.env.example b/.env.example
@@ -67,17 +67,5 @@ RECAPTCHA_SECRETKEY=
 MYCELIUM_GATEWAY_ID=
 MYCELIUM_GATEWAY_SECRET=
 
-
-ITEMS_PER_PAGE=50
-ITEMS_PER_COVER_PAGE=20
-MAX_PAGER_RESULTS=125000
-FLOOD_CHECK=false
-FLOOD_WAIT_TIME=5
-FLOOD_MAX_REQUESTS_PER_SECOND=5
-
-ECHOCLI=true
-RENAME_PAR2=true
-RENAME_MUSIC_MEDIAINFO=true
-
 SCOUT_DRIVER=mysql
 SCOUT_QUEUE=false
diff --git a/Blacklight/Backfill.php b/Blacklight/Backfill.php
@@ -77,7 +77,7 @@ public function __construct(array $options = [])
         ];
         $options += $defaults;
 
-        $this->_echoCLI = ($options['Echo'] && env('echocli', true));
+        $this->_echoCLI = ($options['Echo'] && config('nntmux.echocli'));
 
         $this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
         $this->_nntp = (

diff --git a/Blacklight/Binaries.php b/Blacklight/Binaries.php
@@ -249,7 +249,7 @@ public function __construct(array $options = [])
         ];
         $options += $defaults;
 
-        $this->_echoCLI = ($options['Echo'] && env('echocli', true));
+        $this->_echoCLI = ($options['Echo'] && config('nntmux.echocli'));
 
         $this->_pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
         $this->_colorCLI = ($options['ColorCLI'] instanceof ColorCLI ? $options['ColorCLI'] : new ColorCLI());
@@ -1736,7 +1736,7 @@ protected function getMultiGroupPosters()
         }
 
         $poster = MultigroupPoster::query()->get(['poster'])->toArray();
-        $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_SHORT);
+        $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_short'));
         Cache::put('mgrposter', $poster, $expiresAt);
 
         return $poster;

diff --git a/Blacklight/Books.php b/Blacklight/Books.php
@@ -87,7 +87,7 @@ public function __construct(array $options = [])
         ];
         $options += $defaults;
 
-        $this->echooutput = ($options['Echo'] && env('echocli', true));
+        $this->echooutput = ($options['Echo'] && config('nntmux.echocli'));
         $this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
 
         $this->pubkey = Settings::settingValue('APIs..amazonpubkey');
@@ -187,7 +187,7 @@ public function getBookRange($cat, $start, $num, $orderby, array $excludedcats =
                         $order[1],
                         ($start === false ? '' : ' LIMIT '.$num.' OFFSET '.$start)
         );
-        $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_MEDIUM);
+        $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_medium'));
         $bookscache = Cache::get(md5($booksql));
         if ($bookscache !== null) {
             $books = $bookscache;

diff --git a/Blacklight/Console.php b/Blacklight/Console.php
@@ -96,7 +96,7 @@ public function __construct(array $options = [])
         ];
         $options += $defaults;
 
-        $this->echooutput = ($options['Echo'] && env('echocli', true));
+        $this->echooutput = ($options['Echo'] && config('nntmux.echocli'));
         $this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
 
         $this->pubkey = Settings::settingValue('APIs..amazonpubkey');
@@ -201,7 +201,7 @@ public function getConsoleRange($cat, $start, $num, $orderBy, array $excludedcat
             $consoles = $cached;
         } else {
             $consoles = $this->pdo->queryCalc($calcSql);
-            $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_MEDIUM);
+            $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_medium'));
             Cache::put(md5($calcSql), $consoles, $expiresAt);
         }
 
@@ -264,7 +264,7 @@ public function getConsoleRange($cat, $start, $num, $orderBy, array $excludedcat
             $return[0]['_totalcount'] = $consoles['total'] ?? 0;
         }
 
-        $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG);
+        $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_long'));
         Cache::put(md5($sql), $return, $expiresAt);
 
         return $return;

diff --git a/Blacklight/Games.php b/Blacklight/Games.php
@@ -120,7 +120,7 @@ public function __construct(array $options = [])
             'Settings' => null,
         ];
         $options += $defaults;
-        $this->echoOutput = ($options['Echo'] && env('echocli', true));
+        $this->echoOutput = ($options['Echo'] && config('nntmux.echocli'));
 
         $this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
 
@@ -270,7 +270,7 @@ public function getGamesRange($cat, $start, $num, $orderBy = '', $maxAge = '', a
                         ($start === false ? '' : ' LIMIT '.$num.' OFFSET '.$start)
         );
 
-        $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_MEDIUM);
+        $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_medium'));
         $gamesCache = Cache::get(md5($gamesSql));
         if ($gamesCache !== null) {
             $games = $gamesCache;

diff --git a/Blacklight/Genres.php b/Blacklight/Genres.php
@@ -49,7 +49,7 @@ public function getGenres($type = '', $activeonly = false)
             return $genres;
         }
         $genres = $this->pdo->query($sql);
-        $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG);
+        $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_long'));
         Cache::put(md5($sql), $genres, $expiresAt);
 
         return $genres;
@@ -186,7 +186,7 @@ public function getDisabledIDs()
             $disabled = $cats;
         } else {
             $disabled = Genre::query()->where('disabled', '=', 1)->get(['id']);
-            $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_LONG);
+            $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_long'));
             Cache::put('disabledcats', $disabled, $expiresAt);
         }
 

diff --git a/Blacklight/IRCScraper.php b/Blacklight/IRCScraper.php
@@ -72,9 +72,9 @@ class IRCScraper extends IRCClient
      */
     public function __construct(&$silent, &$debug)
     {
-        if (defined('SCRAPE_IRC_SOURCE_IGNORE')) {
+        if (config('irc_settings.scrape_irc_source_ignore')) {
             $this->_ignoredChannels = unserialize(
-                SCRAPE_IRC_SOURCE_IGNORE,
+                config('irc_settings.scrape_irc_source_ignore'),
                 ['allowed_classes' => ['#a.b.cd.image',
                                                                                   '#a.b.console.ps3',
                                                                                   '#a.b.dvd',
@@ -124,12 +124,12 @@ public function __construct(&$silent, &$debug)
         }
 
         $this->_categoryIgnoreRegex = false;
-        if (defined('SCRAPE_IRC_CATEGORY_IGNORE') && SCRAPE_IRC_CATEGORY_IGNORE !== '') {
-            $this->_categoryIgnoreRegex = SCRAPE_IRC_CATEGORY_IGNORE;
+        if (config('irc_settings.scrape_irc_category_ignore') !== '') {
+            $this->_categoryIgnoreRegex = config('irc_settings.scrape_irc_category_ignore');
         }
 
         $this->_titleIgnoreRegex = false;
-        if (defined('SCRAPE_IRC_TITLE_IGNORE') && SCRAPE_IRC_TITLE_IGNORE !== '') {
+        if (config('irc_settings.scrape_irc_title_ignore') !== '') {
             $this->_titleIgnoreRegex = SCRAPE_IRC_TITLE_IGNORE;
         }
 
@@ -153,40 +153,40 @@ protected function _startScraping()
     {
 
         // Connect to IRC.
-        if ($this->connect(SCRAPE_IRC_SERVER, SCRAPE_IRC_PORT, SCRAPE_IRC_TLS) === false) {
+        if ($this->connect(config('irc_settings.scrape_irc_server'), config('irc_settings.scrape_irc_port'), config('irc_settings.scrape_irc_tls')) === false) {
             exit(
                 'Error connecting to ('.
-                SCRAPE_IRC_SERVER.
+                config('irc_settings.scrape_irc_server').
                 ':'.
-                SCRAPE_IRC_PORT.
+                config('irc_settings.scrape_irc_port').
                 '). Please verify your server information and try again.'.
                 PHP_EOL
             );
         }
 
         // Login to IRC.
-        if ($this->login(SCRAPE_IRC_NICKNAME, SCRAPE_IRC_REALNAME, SCRAPE_IRC_USERNAME, SCRAPE_IRC_PASSWORD) === false) {
+        if ($this->login(config('irc_settings.scrape_irc_nickname'), config('irc_settings.scrape_irc_realname'), config('irc_settings.scrape_irc_username'), config('irc_settings.scrape_irc_password')) === false) {
             exit('Error logging in to: ('.
-                SCRAPE_IRC_SERVER.':'.SCRAPE_IRC_PORT.') nickname: ('.SCRAPE_IRC_NICKNAME.
+                config('irc_settings.scrape_irc_server').':'.config('irc_settings.scrape_irc_port').') nickname: ('.config('irc_settings.scrape_irc_nickname').
                 '). Verify your connection information, you might also be banned from this server or there might have been a connection issue.'.
                 PHP_EOL
             );
         }
 
         // Join channels.
-        $channels = defined('SCRAPE_IRC_CHANNELS') ? unserialize(SCRAPE_IRC_CHANNELS, ['allowed_classes' => ['#PreNNTmux', '#nZEDbPRE']]) : ['#PreNNTmux' => null];
+        $channels = config('irc_settings.scrape_irc_channels') ? unserialize(config('irc_settings.scrape_irc_channels'), ['allowed_classes' => ['#PreNNTmux', '#nZEDbPRE']]) : ['#PreNNTmux' => null];
         $this->joinChannels($channels);
 
         if (! $this->_silent) {
             echo
                 '['.
                 date('r').
                 '] [Scraping of IRC channels for ('.
-                SCRAPE_IRC_SERVER.
+                config('irc_settings.scrape_irc_server').
                 ':'.
-                SCRAPE_IRC_PORT.
+                config('irc_settings.scrape_irc_port').
                 ') ('.
-                SCRAPE_IRC_NICKNAME.
+                config('irc_settings.scrape_irc_nickname').
                 ') started.]'.
                 PHP_EOL;
         }

diff --git a/Blacklight/MiscSorter.php b/Blacklight/MiscSorter.php
@@ -65,7 +65,7 @@ class MiscSorter
      */
     public function __construct($echooutput = false, &$pdo)
     {
-        $this->echooutput = (env('echocli', true) && $echooutput);
+        $this->echooutput = (config('nntmux.echocli') && $echooutput);
 
         $this->pdo = ($pdo instanceof DB ? $pdo : new DB());
         $this->movie = new Movie(['Echo' => $this->echooutput, 'Settings' => $this->pdo]);

diff --git a/Blacklight/Movie.php b/Blacklight/Movie.php
@@ -244,7 +244,7 @@ public function __construct(array $options = [])
         $this->searchEngines = true;
         $this->showPasswords = Releases::showPasswords();
 
-        $this->echooutput = ($options['Echo'] && env('echocli', true) && $this->pdo->cli);
+        $this->echooutput = ($options['Echo'] && config('nntmux.echocli') && $this->pdo->cli);
         $this->imgSavePath = NN_COVERS.'movies'.DS;
         $this->service = '';
     }
@@ -279,7 +279,7 @@ public function getMovieRange($cat, $start, $num, $orderBy, $maxAge = -1, array
         }
 
         $order = $this->getMovieOrder($orderBy);
-        $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_MEDIUM);
+        $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_medium'));
 
         $moviesSql =
                 sprintf(

diff --git a/Blacklight/Music.php b/Blacklight/Music.php
@@ -86,7 +86,7 @@ public function __construct(array $options = [])
         ];
         $options += $defaults;
 
-        $this->echooutput = ($options['Echo'] && env('echocli', true));
+        $this->echooutput = ($options['Echo'] && config('nntmux.echocli'));
 
         $this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
         $this->pubkey = Settings::settingValue('APIs..amazonpubkey');
@@ -162,7 +162,7 @@ public function getMusicRange($cat, $start, $num, $orderby, array $excludedcats
         }
 
         $order = $this->getMusicOrder($orderby);
-        $expiresAt = Carbon::now()->addSeconds(NN_CACHE_EXPIRY_MEDIUM);
+        $expiresAt = Carbon::now()->addSeconds(config('nntmux.cache_expiry_medium'));
 
         $musicSql =
                 sprintf(

diff --git a/Blacklight/NNTP.php b/Blacklight/NNTP.php
@@ -98,7 +98,7 @@ public function __construct(array $options = [])
 
         parent::__construct();
 
-        $this->_echo = ($options['Echo'] && env('echocli', true));
+        $this->_echo = ($options['Echo'] && config('nntmux.echocli'));
 
         $this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
 

diff --git a/Blacklight/NZBContents.php b/Blacklight/NZBContents.php
@@ -82,7 +82,7 @@ public function __construct(array $options = [])
         ];
         $options += $defaults;
 
-        $this->echooutput = ($options['Echo'] && env('echocli', true));
+        $this->echooutput = ($options['Echo'] && config('nntmux.echocli'));
         $this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
         $this->nntp = ($options['NNTP'] instanceof NNTP ? $options['NNTP'] : new NNTP(['Echo' => $this->echooutput, 'Settings' => $this->pdo]));
         $this->nfo = ($options['Nfo'] instanceof Nfo ? $options['Nfo'] : new Nfo());

diff --git a/Blacklight/NZBExport.php b/Blacklight/NZBExport.php
@@ -58,7 +58,7 @@ public function __construct(array $options = [])
         $options += $defaults;
 
         $this->browser = $options['Browser'];
-        $this->echoCLI = (! $this->browser && env('echocli', true) && $options['Echo']);
+        $this->echoCLI = (! $this->browser && config('nntmux.echocli') && $options['Echo']);
         $this->pdo = ($options['Settings'] instanceof DB ? $options['Setting'] : new DB());
         $this->releases = ($options['Releases'] instanceof Releases ? $options['Releases'] : new Releases(['Settings' => $this->pdo]));
         $this->nzb = ($options['NZB'] instanceof NZB ? $options['NZB'] : new NZB());

diff --git a/Blacklight/NZBImport.php b/Blacklight/NZBImport.php
@@ -108,7 +108,7 @@ public function __construct(array $options = [])
         ];
         $options += $defaults;
 
-        $this->echoCLI = (! $this->browser && env('echocli', true) && $options['Echo']);
+        $this->echoCLI = (! $this->browser && config('nntmux.echocli') && $options['Echo']);
         $this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
         $this->binaries = ($options['Binaries'] instanceof Binaries ? $options['Binaries'] : new Binaries(['Settings' => $this->pdo, 'Echo' => $this->echoCLI]));
         $this->category = ($options['Categorize'] instanceof Categorize ? $options['Categorize'] : new Categorize(['Settings' => $this->pdo]));

diff --git a/Blacklight/NameFixer.php b/Blacklight/NameFixer.php
@@ -159,7 +159,7 @@ public function __construct(array $options = [])
         ];
         $options += $defaults;
 
-        $this->echooutput = ($options['Echo'] && env('echocli', true));
+        $this->echooutput = ($options['Echo'] && config('nntmux.echocli'));
         $this->relid = $this->fixed = $this->checked = 0;
         $this->pdo = ($options['Settings'] instanceof DB ? $options['Settings'] : new DB());
         $this->othercats = implode(',', Category::OTHERS_GROUP);

diff --git a/Blacklight/Nfo.php b/Blacklight/Nfo.php
@@ -64,7 +64,7 @@ class Nfo
      */
     public function __construct()
     {
-        $this->echo = env('echocli', true);
+        $this->echo = config('nntmux.echocli');
         $this->nzbs = Settings::settingValue('..maxnfoprocessed') !== '' ? (int) Settings::settingValue('..maxnfoprocessed') : 100;
         $this->maxRetries = (int) Settings::settingValue('..maxnforetries') >= 0 ? -((int) Settings::settingValue('..maxnforetries') + 1) : self::NFO_UNPROC;
         $this->maxRetries = $this->maxRetries < -8 ? -8 : $this->maxRetries;

diff --git a/Blacklight/Regexes.php b/Blacklight/Regexes.php
@@ -326,7 +326,7 @@ public function tryRegex($subject, $groupName): string
     protected function _fetchRegex($groupName): void
     {
         // Check if we need to do an initial cache or refresh our cache.
-        if (isset($this->_regexCache[$groupName]['ttl']) && (time() - $this->_regexCache[$groupName]['ttl']) < NN_CACHE_EXPIRY_LONG) {
+        if (isset($this->_regexCache[$groupName]['ttl']) && (time() - $this->_regexCache[$groupName]['ttl']) < config('nntmux.cache_expiry_long')) {
             return;
         }
 
@@ -339,7 +339,7 @@ protected function _fetchRegex($groupName): void
                 $this->pdo->escapeString($groupName)
             ),
             true,
-            NN_CACHE_EXPIRY_LONG
+            config('nntmux.cache_expiry_long')
         );
         // Set the TTL.
         $this->_regexCache[$groupName]['ttl'] = time();

diff --git a/Blacklight/ReleaseRemover.php b/Blacklight/ReleaseRemover.php
@@ -143,7 +143,7 @@ public function __construct(array $options = [])
         $this->error = '';
         $this->ignoreUserCheck = false;
         $this->browser = $options['Browser'];
-        $this->echoCLI = (! $this->browser && env('echocli', true) && $options['Echo']);
+        $this->echoCLI = (! $this->browser && config('nntmux.echocli') && $options['Echo']);
     }
 
     /**