Fix TV shows lookups

NNTmux · Mar 5, 2018 · d40425b · d40425b
1 parent eb2b160
commit d40425b
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 121 deletions.
diff --git a/Blacklight/config/ircscraper_settings_example.php b/Blacklight/config/ircscraper_settings_example.php
diff --git a/Blacklight/processing/Videos.php b/Blacklight/processing/Videos.php
@@ -124,8 +124,9 @@ protected function getLocalZoneFromVideoID($videoID): string
      */
     protected function getVideoIDFromSiteID($siteColumn, $siteID)
     {
+        $result = null;
         if (\in_array($siteColumn, self::$sites, false)) {
-            $result = Video::query()->where($siteColumn, '=', $siteID)->first(['id']);
+            $result = Video::query()->where($siteColumn, $siteID)->first(['id']);
         }
 
         return $result !== null ? $result->id : false;

diff --git a/Blacklight/processing/tv/TV.php b/Blacklight/processing/tv/TV.php
@@ -220,14 +220,14 @@ public function add(array $show = []): int
             if ($show[$column] > 0) {
                 $videoId = $this->getVideoIDFromSiteID($column, $show[$column]);
             }
-            if ($videoId !== null) {
+            if ($videoId !== false) {
                 break;
             }
         }
 
-        if ($videoId === null) {
+        if ($videoId === false) {
             // Insert the Show
-            $videoId = Video::create(
+            $videoId = Video::query()->insertGetId(
                 [
                     'type' => $show['type'],
                     'title' => $show['title'],
@@ -241,7 +241,7 @@ public function add(array $show = []): int
                     'imdb' => $show['imdb'],
                     'tmdb' => $show['tmdb'],
                 ]
-            )->id;
+            );
             // Insert the supplementary show info
             TvInfo::query()
                 ->insert(

diff --git a/Blacklight/processing/tv/TVMaze.php b/Blacklight/processing/tv/TVMaze.php
@@ -28,9 +28,11 @@ class TVMaze extends TV
     public $posterUrl;
 
     /**
-     * Construct. Instantiate TVMaze Client Class.
+     * TVMaze constructor.
      *
-     * @param array $options Class instances.
+     * @param array $options
+     *
+     * @throws \Exception
      */
     public function __construct(array $options = [])
     {
@@ -263,7 +265,7 @@ protected function getShowInfo($cleanName)
      *
      * @return array|bool
      */
-    private function matchShowInfo($shows, $cleanName)
+    private function matchShowInfo(array $shows, $cleanName)
     {
         $return = false;
         $highestMatch = 0;

diff --git a/Changelog b/Changelog
@@ -1,4 +1,5 @@
 2018-03-05 DariusIII
+	* Fix: Fix TV shows lookups
 	* Chg: Add irc server setting to env.example file
 	* Chg: Update ssl and irc settings handling
 	* Chg: Update config settings handling