From 3631480206746a12caefc72714229d6144560ae8 Mon Sep 17 00:00:00 2001 From: danielerl Date: Wed, 10 Jan 2024 11:56:25 +0100 Subject: [PATCH 1/2] findMediaObject: Change title fallback to elif clause This way the media object will not fall back to only matching by title if title and year did not match to anything --- resources/lib/utilities.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/lib/utilities.py b/resources/lib/utilities.py index d625e9e5..f89ee570 100644 --- a/resources/lib/utilities.py +++ b/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[ From b37c807071c1b8f486fc2c9e75266b77167c3b03 Mon Sep 17 00:00:00 2001 From: Razze Date: Thu, 30 May 2024 01:31:59 +0200 Subject: [PATCH 2/2] Align test to changed behavior --- tests/test_utilities.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_utilities.py b/tests/test_utilities.py index 75974fbe..33afe974 100644 --- a/tests/test_utilities.py +++ b/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():