Merge pull request #632 from ZelKami/fix-title-year-matching

Fix title/year fallback ignoring year

Author: razzeee

resources/lib/utilities.py

@@ -128,7 +128,7 @@ def findMediaObject(mediaObjectToMatch, listToSearch, matchByTitleAndYear):
                 year=mediaObjectToMatch["year"],
             )
         # match only by title, as some items don't have a year on trakt
-        if result is None and "title" in mediaObjectToMatch:
+        elif result is None and "title" in mediaObjectToMatch:
             result = __findInList(listToSearch, title=mediaObjectToMatch["title"])
 
     return result
@@ -521,11 +521,11 @@ def compareEpisodes(
                                             in season_col2[season][ep]["ids"]
                                         ):
                                             if "ids" in eps:
-                                                eps[ep]["ids"][
-                                                    "episodeid"
-                                                ] = season_col2[season][ep]["ids"][
-                                                    "episodeid"
-                                                ]
+                                                eps[ep]["ids"]["episodeid"] = (
+                                                    season_col2[season][ep]["ids"][
+                                                        "episodeid"
+                                                    ]
+                                                )
                                             else:
                                                 eps[ep]["ids"] = {
                                                     "episodeid": season_col2[season][
@@ -558,11 +558,11 @@ def compareEpisodes(
                                             in collectedSeasons[season][ep]["ids"]
                                         ):
                                             if "ids" in eps:
-                                                eps[ep]["ids"][
-                                                    "episodeid"
-                                                ] = collectedSeasons[season][ep]["ids"][
-                                                    "episodeid"
-                                                ]
+                                                eps[ep]["ids"]["episodeid"] = (
+                                                    collectedSeasons[season][ep]["ids"][
+                                                        "episodeid"
+                                                    ]
+                                                )
                                             else:
                                                 eps[ep]["ids"] = {
                                                     "episodeid": collectedSeasons[

tests/test_utilities.py

@@ -511,11 +511,11 @@ def test_findMediaObject_not_matchByTitleAndYear_add_collection_same_year_title_
     assert utilities.findMediaObject(data1, data2, False) is None
 
 
-def test_findMediaObject_match_by_title_should_match():
+def test_findMediaObject_matchByTitleAndYear_should_not_match():
     data1 = load_params_from_json("tests/fixtures/movies_local_blind.json")
     data2 = load_params_from_json("tests/fixtures/movies_remote_blind_no_match.json")
 
-    assert utilities.findMediaObject(data1, data2, True) == data2[0]
+    assert utilities.findMediaObject(data1, data2, True) is None
 
 
 def test_findMediaObject_matchByTitleAndYear_should_match():