Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix title/year fallback ignoring year #632

Merged
merged 2 commits into from
May 29, 2024
Merged

Fix title/year fallback ignoring year #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3631480
findMediaObject: Change title fallback to elif clause
Jan 10, 2024
b37c807
Align test to changed behavior
razzeee May 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions resources/lib/utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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][
Expand Down Expand Up @@ -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[
Expand Down
4 changes: 2 additions & 2 deletions tests/test_utilities.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand Down
Loading