Merge branch 'dev'

NNTmux · Jul 14, 2020 · 460559c · 460559c
2 parents dc850a7 + 42d9b70
commit 460559c
Show file tree

Hide file tree

Showing 147 changed files with 24,656 additions and 16,490 deletions.
diff --git a/Blacklight/ElasticSearchSiteSearch.php b/Blacklight/ElasticSearchSiteSearch.php
@@ -60,7 +60,7 @@ public function indexSearch($phrases, int $limit)
                     'scroll_id' => $scroll_id,  //...using our previously obtained _scroll_id
                     'scroll' => '30s',        // and the same timeout window
                 ]
-                );
+            );
             }
 
             return $searchResult;
@@ -384,14 +384,15 @@ private function sanitize($phrases): string
         } else {
             $wordArray = $phrases;
         }
+
         $keywords = [];
+        $tempWords = [];
         foreach ($wordArray as $words) {
-            $tempWords = [];
             $words = preg_split('/\s+/', $words);
             foreach ($words as $st) {
-                if (Str::startsWith($st, ['!', '+', '-', '?', '*'])) {
+                if (Str::startsWith($st, ['!', '+', '-', '?', '*']) && Str::length($st) > 1 && ! preg_match('/(!|\+|\?|-|\*){2,}/', $st)) {
                     $str = $st;
-                } elseif (Str::endsWith($st, ['+', '-', '?', '*'])) {
+                } elseif (Str::endsWith($st, ['+', '-', '?', '*']) && Str::length($st) > 1 && ! preg_match('/(!|\+|\?|-|\*){2,}/', $st)) {
                     $str = $st;
                 } else {
                     $str = Sanitizer::escape($st);

diff --git a/Blacklight/Movie.php b/Blacklight/Movie.php
@@ -683,7 +683,7 @@ public function updateMovieInfo($imdbId): bool
 
         if (! empty($imdb['language'])) {
             $mov['language'] = \is_array($imdb['language']) ? implode(', ', array_unique($imdb['language'])) : $imdb['language'];
-        } elseif (! empty($omdb['language'])) {
+        } elseif (! empty($omdb['language']) && ! is_bool($omdb['language'])) {
             $mov['language'] = \is_array($imdb['language']) ? implode(', ', array_unique($omdb['language'])) : $omdb['language'];
         }
 

diff --git a/Blacklight/NZBImport.php b/Blacklight/NZBImport.php
@@ -6,6 +6,7 @@
 use App\Models\Settings;
 use App\Models\UsenetGroup;
 use Blacklight\utility\Utility;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\File;
 
 /**
@@ -134,7 +135,7 @@ public function beginImport($filesToProcess, $useNzbName = false, $delete = true
             return false;
         }
 
-        $start = date('Y-m-d H:i:s');
+        $start = now()->toImmutable()->format('Y-m-d H:i:s');
         $nzbsImported = $nzbsSkipped = 0;
 
         // Loop over the file names.
@@ -222,8 +223,7 @@ public function beginImport($filesToProcess, $useNzbName = false, $delete = true
             'Proccessed '.
             $nzbsImported.
             ' NZBs in '.
-            (strtotime(date('Y-m-d H:i:s')) - strtotime($start)).
-            ' seconds, '.
+            now()->diffForHumans($start).
             $nzbsSkipped.
             ' NZBs were skipped.'
         );
@@ -261,7 +261,7 @@ protected function scanNZBFile(&$nzbXML, $useNzbName = false): bool
                 $posterName = (string) $file->attributes()->poster;
             }
             if ($postDate === false) {
-                $postDate = date('Y-m-d H:i:s', (string) $file->attributes()->date);
+                $postDate = Carbon::createFromTimestamp((string) $file->attributes()->date)->format('Y-m-d H:i:s');
             }
 
             // Make a fake message array to use to check the blacklist.
@@ -346,7 +346,7 @@ protected function scanNZBFile(&$nzbXML, $useNzbName = false): bool
             [
                 'subject'    => $firstName,
                 'useFName'   => $useNzbName,
-                'postDate'   => empty($postDate) ? date('Y-m-d H:i:s') : $postDate,
+                'postDate'   => empty($postDate) ? now()->format('Y-m-d H:i:s') : $postDate,
                 'from'       => empty($posterName) ? '' : $posterName,
                 'groups_id'   => $groupID,
                 'groupName'  => $groupName,
@@ -401,7 +401,7 @@ protected function insertNZB($nzbDetails): bool
             $relID = Release::insertRelease(
                 [
                     'name'            => $escapedSubject,
-                    'searchname'    => $escapedSearchName,
+                    'searchname'    => $escapedSearchName ?? $escapedSubject,
                     'totalpart'        => $nzbDetails['totalFiles'],
                     'groups_id'        => $nzbDetails['groups_id'],
                     'guid'            => $this->relGuid,

diff --git a/Blacklight/NameFixer.php b/Blacklight/NameFixer.php
@@ -1019,11 +1019,11 @@ public function updateRelease($release, $name, $method, $echo, $type, int $nameS
                         $updateColumns = [
                             'videos_id' => 0,
                             'tv_episodes_id' => 0,
-                            'imdbid' => null,
-                            'musicinfo_id' => null,
-                            'consoleinfo_id' => null,
-                            'bookinfo_id' => null,
-                            'anidbid' => null,
+                            'imdbid' => '',
+                            'musicinfo_id' => '',
+                            'consoleinfo_id' => '',
+                            'bookinfo_id' => '',
+                            'anidbid' => '',
                             'predb_id' => $preId,
                             'searchname' => $newTitle,
                             'categories_id' => $determinedCategory['categories_id'],
@@ -1035,8 +1035,10 @@ public function updateRelease($release, $name, $method, $echo, $type, int $nameS
                             }
                         }
 
-                        $taggedRelease->update($updateColumns);
-                        $taggedRelease->retag($determinedCategory['tags']);
+                        if ($taggedRelease !== null) {
+                            $taggedRelease->update($updateColumns);
+                            $taggedRelease->retag($determinedCategory['tags']);
+                        }
                         if (config('nntmux.elasticsearch_enabled') === true) {
                             $this->elasticsearch->updateRelease($release->releases_id);
                         } else {
@@ -1060,7 +1062,9 @@ public function updateRelease($release, $name, $method, $echo, $type, int $nameS
                                     'iscategorized' => 1,
                                 ]
                             );
-                        $taggedRelease->retag($determinedCategory['tags']);
+                        if ($taggedRelease !== null) {
+                            $taggedRelease->retag($determinedCategory['tags']);
+                        }
                         if (config('nntmux.elasticsearch_enabled') === true) {
                             $this->elasticsearch->updateRelease($release->_releases_id);
                         } else {

diff --git a/Blacklight/Releases.php b/Blacklight/Releases.php
@@ -6,6 +6,7 @@
 use App\Models\Release;
 use App\Models\Settings;
 use App\Models\UsenetGroup;
+use Elasticsearch\Common\Exceptions\Missing404Exception;
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Facades\Cache;
@@ -168,9 +169,11 @@ public function showPasswords()
         $setting = $show ?? 0;
         switch ($setting) {
             case 1: // Shows everything.
+
                     return '<= '.self::PASSWD_RAR;
             case 0:
             default:// Hide releases with a password.
+
                 return '= '.self::PASSWD_NONE;
         }
     }
@@ -460,7 +463,11 @@ public function deleteSingle($identifiers, NZB $nzb, ReleaseImage $releaseImage)
                     'id' => $identifiers['i'],
                 ];
 
-                \Elasticsearch::delete($params);
+                try {
+                    \Elasticsearch::delete($params);
+                } catch (Missing404Exception $e) {
+                    //we do nothing here just catch the error, we don't care if release is missing from ES, we are deleting it anyway
+                }
             }
         } else {
             // Delete from sphinx.

diff --git a/Blacklight/Tmux.php b/Blacklight/Tmux.php
@@ -4,6 +4,7 @@
 
 use App\Models\Category;
 use App\Models\Settings;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\DB;
 
 /**
@@ -326,28 +327,9 @@ public function rand_bool($loop, $chance = 60): bool
      */
     public function relativeTime($_time): string
     {
-        $d = [];
-        $d[0] = [1, 'sec'];
-        $d[1] = [60, 'min'];
-        $d[2] = [3600, 'hr'];
-        $d[3] = [86400, 'day'];
-        $d[4] = [31104000, 'yr'];
-
-        $w = [];
-
-        $return = '';
-        $now = time();
-        $secondsLeft = $now - ($_time >= $now ? $_time - 1 : $_time);
-
-        for ($i = 4; $i > -1; $i--) {
-            $w[$i] = (int) ($secondsLeft / $d[$i][0]);
-            $secondsLeft -= ($w[$i] * $d[$i][0]);
-            if ($w[$i] !== 0) {
-                $return .= $w[$i].' '.$d[$i][1].(($w[$i] > 1) ? 's' : '').' ';
-            }
-        }
+        $time = Carbon::createFromTimestamp($_time);
 
-        return $return;
+        return $time->ago();
     }
 
     /**

diff --git a/Blacklight/TmuxOutput.php b/Blacklight/TmuxOutput.php
@@ -176,7 +176,7 @@ protected function _getHeader(): string
             $this->tmpMasks[1],
             'Release Added:',
             sprintf(
-                '%s ago',
+                '%s',
                 (isset($this->runVar['timers']['newOld']['newestrelease'])
                     ? $this->relativeTime($this->runVar['timers']['newOld']['newestrelease'])
                     : 0)
@@ -186,7 +186,7 @@ protected function _getHeader(): string
             $this->tmpMasks[1],
             'Predb Updated:',
             sprintf(
-                '%s ago',
+                '%s',
                 (isset($this->runVar['timers']['newOld']['newestpre'])
                     ? $this->relativeTime($this->runVar['timers']['newOld']['newestpre'])
                     : 0)
@@ -199,7 +199,7 @@ protected function _getHeader(): string
                 $this->runVar['constants']['delaytime']
             ),
             sprintf(
-                '%s ago',
+                '%s',
                 (isset($this->runVar['timers']['newOld']['oldestcollection'])
                     ? $this->relativeTime($this->runVar['timers']['newOld']['oldestcollection'])
                     : 0)

diff --git a/Blacklight/processing/post/ProcessAdditional.php b/Blacklight/processing/post/ProcessAdditional.php
@@ -1783,6 +1783,8 @@ protected function _getAudioInfo($fileLocation, $fileExtension): bool
                     }
                 } catch (\RuntimeException $e) {
                     Log::debug($e->getMessage());
+                } catch (\TypeError $e) {
+                    Log::debug($e->getMessage());
                 }
             }
 
@@ -2103,7 +2105,7 @@ protected function _getMediaInfo($fileLocation): bool
         // Look for the video file.
         if (File::isFile($fileLocation)) {
             try {
-                $xmlArray = $this->mediaInfo->getInfo($fileLocation, false);
+                $xmlArray = $this->mediaInfo->getInfo($fileLocation, true);
 
                 // Check if we got it.
 
@@ -2123,6 +2125,10 @@ protected function _getMediaInfo($fileLocation): bool
             } catch (\RuntimeException $e) {
                 Log::debug($e->getMessage());
 
+                return false;
+            } catch (\TypeError $e) {
+                Log::debug($e->getMessage());
+
                 return false;
             }
         }

diff --git a/Blacklight/processing/tv/TVDB.php b/Blacklight/processing/tv/TVDB.php
@@ -394,8 +394,12 @@ protected function formatShowInfo($show): array
             $this->colorCli->notice('Fanart image not found on TVDB', true);
         }
 
-        $imdbid = $this->client->series()->getById($show->id);
-        preg_match('/tt(?P<imdbid>\d{6,7})$/i', $imdbid->imdbId, $imdb);
+        try {
+            $imdbid = $this->client->series()->getById($show->id);
+            preg_match('/tt(?P<imdbid>\d{6,7})$/i', $imdbid->imdbId, $imdb);
+        } catch (ResourceNotFoundException $e) {
+            $this->colorCli->notice('Show ID not found on TVDB', true);
+        }
 
         return [
             'type'      => parent::TYPE_TV,

diff --git a/Blacklight/processing/tv/TraktTv.php b/Blacklight/processing/tv/TraktTv.php
@@ -287,20 +287,22 @@ public function getShowInfo($name)
 
         if (\is_array($response)) {
             foreach ($response as $show) {
+                if (! is_bool($show)) {
 
-                // Check for exact title match first and then terminate if found
-                if ($show['show']['title'] === $name) {
-                    $highest = $show;
-                    break;
-                }
+                    // Check for exact title match first and then terminate if found
+                    if ($show['show']['title'] === $name) {
+                        $highest = $show;
+                        break;
+                    }
 
-                // Check each show title for similarity and then find the highest similar value
-                $matchPercent = $this->checkMatch($show['show']['title'], $name, self::MATCH_PROBABILITY);
+                    // Check each show title for similarity and then find the highest similar value
+                    $matchPercent = $this->checkMatch($show['show']['title'], $name, self::MATCH_PROBABILITY);
 
-                // If new match has a higher percentage, set as new matched title
-                if ($matchPercent > $highestMatch) {
-                    $highestMatch = $matchPercent;
-                    $highest = $show;
+                    // If new match has a higher percentage, set as new matched title
+                    if ($matchPercent > $highestMatch) {
+                        $highestMatch = $matchPercent;
+                        $highest = $show;
+                    }
                 }
             }
             if ($highest !== null) {

diff --git a/app/Http/Controllers/Api/ApiInformController.php b/app/Http/Controllers/Api/ApiInformController.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use App\Http\Controllers\Controller;
+use App\Models\Release;
+use App\Models\ReleaseInform;
+use App\Models\User;
+use Blacklight\NameFixer;
+use Illuminate\Http\Request;
+
+class ApiInformController extends Controller
+{
+    /**
+     * http://sitename/api/inform/release?api_token=xxxxx&relo=xxx&relp=xxx.
+     *
+     * @param \Illuminate\Http\Request $request
+     * @return \Illuminate\Http\JsonResponse
+     * @throws \Exception
+     */
+    public function release(Request $request)
+    {
+        $releaseObName = $request->has('relo') && ! empty($request->input('relo')) ? $request->input('relo') : '';
+        $releasePrName = $request->has('relp') && ! empty($request->input('relp')) ? $request->input('relp') : '';
+        $apiToken = $request->has('api_token') && ! empty($request->input('api_token')) ? $request->input('api_token') : '';
+        $user = User::query()->where('api_token', $request->input('api_token'))->first();
+        if (! $user) {
+            return response()->json(['message' => 'Indexer inform error, wrong api key!'], 404);
+        }
+
+        if (! empty($releaseObName) && ! empty($releasePrName) && ! empty($apiToken)) {
+            ReleaseInform::insertOrIgnore(['relOName' => $releaseObName, 'relPName' => $releasePrName, 'api_token' => $apiToken, 'created_at' => now(), 'updated_at' => now()]);
+            $release = Release::whereSearchname($releaseObName)->first();
+            if (! empty($release)) {
+                (new NameFixer())->updateRelease($release, $releasePrName, 'Release Inform API', true, 'Filenames, ', 1, true);
+            }
+
+            return response()->json(['message' => 'Release Information Added!'], 200);
+        }
+
+        return response()->json(['message' => 'Indexer inform error, wrong data supplied!'], 404);
+    }
+}
diff --git a/app/Http/Controllers/DetailsController.php b/app/Http/Controllers/DetailsController.php
@@ -43,7 +43,10 @@ public function show($guid)
             $user = User::find(Auth::id());
             $cpapi = $user['cp_api'];
             $cpurl = $user['cp_url'];
-            $releaseRegex = ReleaseRegex::query()->where('releases_id', '=', $data['id'])->first();
+            $releaseRegex = '';
+            if (! empty($data)) {
+                $releaseRegex = ReleaseRegex::query()->where('releases_id', '=', $data['id'])->first();
+            }
 
             if (! $data) {
                 return redirect()->back();

diff --git a/app/Models/ReleaseInform.php b/app/Models/ReleaseInform.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ReleaseInform extends Model
+{
+    //
+}
diff --git a/cli/data/predb_import_daily_batch.php b/cli/data/predb_import_daily_batch.php
@@ -86,13 +86,13 @@
     foreach ($files as $file) {
         if (preg_match("#^https://raw\.githubusercontent\.com/nZEDb/nZEDbPre_Dumps/master/dumps/$dir/$filePattern$#", $file['download_url'])) {
             if (preg_match("#^$filePattern$#", $file['name'], $match)) {
-                $timematch = $progress['last'];
+                $timeMatch = max($progress['last'], $argv[1]);
 
                 // Skip patches the user does not want.
-                if ($match[1] < $timematch) {
+                if ($match[1] < $timeMatch) {
                     echo 'Skipping dump '.$match[2].
                         ', as your minimum unix time argument is '.
-                        $timematch.PHP_EOL;
+                        $timeMatch.PHP_EOL;
                     $total--;
                     continue;
                 }