Skip to content

Refactor: Apply extract ids for search results #10

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

Closed
glensc wants to merge 4 commits into from
Closed

Refactor: Apply extract ids for search results #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fe88e2d
Extract ids for show search results
glensc Nov 29, 2022
13f78d8
Fix TVShow construct in UserList.get_items
glensc Nov 29, 2022
6efa397
Use extract_ids consistenly in UserList.get_items
glensc Nov 30, 2022
ea690b6
Extract TVEpisode in sync same way as in users
glensc Dec 1, 2022
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
21 changes: 14 additions & 7 deletions trakt/sync.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,19 +288,26 @@ def search_by_id(query, id_type='imdb', media_type=None, slugify_query=False):
if 'episode' in d:
from trakt.tv import TVEpisode
show = d.pop('show')
extract_ids(d['episode'])
results.append(TVEpisode(show.get('title', None),
show_id=show['ids'].get('trakt'),
**d.pop('episode')))
extract_ids(show)
episode = d.pop('episode')
extract_ids(episode)
episode = TVEpisode(show['title'], **episode, show_id=show['trakt'])
results.append(episode)
elif 'movie' in d:
from trakt.movies import Movie
results.append(Movie(**d.pop('movie')))
movie = d.pop('movie')
extract_ids(movie)
results.append(Movie(**movie))
elif 'show' in d:
from trakt.tv import TVShow
results.append(TVShow(**d.pop('show')))
show = d.pop('show')
extract_ids(show)
results.append(TVShow(**show))
elif 'person' in d:
from trakt.people import Person
results.append(Person(**d.pop('person')))
person = d.pop('person')
extract_ids(person)
results.append(Person(**person))
yield results


Expand Down
23 changes: 12 additions & 11 deletions trakt/users.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,27 +132,28 @@ def get_items(self):
item_data = item.pop(item_type)
extract_ids(item_data)
if item_type == 'movie':
self._items.append(Movie(item_data['title'], item_data['year'],
item_data['slug']))
extract_ids(item_data)
movie = Movie(**item_data)
self._items.append(movie)
elif item_type == 'show':
self._items.append(TVShow(item_data['title'],
item_data['slug']))
extract_ids(item_data)
show = TVShow(**item_data)
self._items.append(show)
elif item_type == 'season':
show_data = item.pop('show')
extract_ids(show_data)
season = TVSeason(show_data['title'], item_data['number'],
show_data['slug'])
title = show_data.pop('title')
season = TVSeason(title, item_data['number'], **show_data)
self._items.append(season)
elif item_type == 'episode':
show_data = item.pop('show')
extract_ids(show_data)
episode = TVEpisode(show_data['title'], item_data['season'],
item_data['number'],
show_id=show_data['trakt'])
extract_ids(item_data)
episode = TVEpisode(show_data['title'], **item_data, show_id=show_data['trakt'])
self._items.append(episode)
elif item_type == 'person':
self._items.append(Person(item_data['name'],
item_data['slug']))
extract_ids(item_data)
self._items.append(Person(**item_data))

yield self._items
Copy link
Owner Author

@glensc glensc Dec 1, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that UserList.get_items() has a bug, it always appends items to self._items. IMHO it should reset self._items = [] on each call to get_items().


Expand Down