Skip to content

Fix: Prefer trakt id for TVShow api requests over title #9

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

Merged
glensc merged 3 commits into from
Nov 30, 2022
Merged

Fix: Prefer trakt id for TVShow api requests over title #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
34f60ff
Fix Game of Thrones trakt id
glensc Nov 30, 2022
6c517e4
Use trakt_id for slug in TVShow ext property if available
glensc Nov 29, 2022
bc5499b
Update test data to use trakt id for shows
glensc Nov 30, 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
2 changes: 1 addition & 1 deletion tests/mock_data/seasons.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@
{"number":4,"ids":{"trakt":5,"tvdb":522882,"tmdb":3628,"tvrage":null},"rating":9.0,"votes":111,"episode_count":10,"aired_episodes":10,"overview":"Season 4 overview."}
]
},
"shows/game-of-thrones/seasons?extended=episodes": {
"shows/1390/seasons?extended=episodes": {
"GET": [
{"number":0,"ids":{"trakt":2145,"tvdb":137481,"tmdb":3627,"tvrage":null},
"episodes":[
Expand Down
34 changes: 17 additions & 17 deletions tests/mock_data/shows.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
{"title":"The Walking Dead","year":2010,"ids":{"trakt":2,"slug":"the-walking-dead","tvdb":153021,"imdb":"tt1520211","tmdb":1402,"tvrage":25056}},
{"title":"Dexter","year":2006,"ids":{"trakt":19,"slug":"dexter","tvdb":79349,"imdb":"tt0773262","tmdb":1405,"tvrage":null}},
{"title":"The Simpsons","year":1989,"ids":{"trakt":91,"slug":"the-simpsons","tvdb":71663,"imdb":"tt0096697","tmdb":456,"tvrage":6190}},
{"title":"Game of Thrones","year":2011,"ids":{"trakt":353,"slug":"game-of-thrones","tvdb":121361,"imdb":"tt0944947","tmdb":1399,"tvrage":24493}},
{"title":"Game of Thrones","year":2011,"ids":{"trakt":1390,"slug":"game-of-thrones","tvdb":121361,"imdb":"tt0944947","tmdb":1399,"tvrage":24493}},
{"title":"Lost","year":2004,"ids":{"trakt":511,"slug":"lost","tvdb":73739,"imdb":"tt0411008","tmdb":4607,"tvrage":null}},
{"title":"24","year":2001,"ids":{"trakt":460,"slug":"24","tvdb":76290,"imdb":"tt0285331","tmdb":1973,"tvrage":2445}},
{"title":"Battlestar Galactica","year":2005,"ids":{"trakt":331,"slug":"battlestar-galactica","tvdb":73545,"imdb":"tt0407362","tmdb":1972,"tvrage":null}},
Expand Down Expand Up @@ -81,31 +81,31 @@
{"updated_at":"2014-09-23T21:56:03.000Z","show":{"title":"The Walking Dead","year":2010,"ids":{"trakt":2,"slug":"the-walking-dead","tvdb":153021,"imdb":"tt1520211","tmdb":1402,"tvrage":25056}}}
]
},
"shows/game-of-thrones?extended=images": {
"shows/1390?extended=images": {
"GET": {
"title":"Game of Thrones","year":2011,"ids":{"trakt":353,"slug":"game-of-thrones","tvdb":121361,"imdb":"tt0944947","tmdb":1399,"tvrage":24493},"images":{"fanart":{"full":"https://walter.trakt.us/images/shows/000/000/353/fanarts/original/5a13b51164.jpg?1409353811","medium":"https://walter.trakt.us/images/shows/000/000/353/fanarts/medium/5a13b51164.jpg?1409353811","thumb":"https://walter.trakt.us/images/shows/000/000/353/fanarts/thumb/5a13b51164.jpg?1409353811"},"poster":{"full":"https://walter.trakt.us/images/shows/000/000/353/posters/original/46cafaec1f.jpg?1409353810","medium":"https://walter.trakt.us/images/shows/000/000/353/posters/medium/46cafaec1f.jpg?1409353810","thumb":"https://walter.trakt.us/images/shows/000/000/353/posters/thumb/46cafaec1f.jpg?1409353810"},"logo":{"full":"https://walter.trakt.us/images/shows/000/000/353/logos/original/13b614ad43.png?1409353812"},"clearart":{"full":"https://walter.trakt.us/images/shows/000/000/353/cleararts/original/5cbde9e647.png?1409353813"},"banner":{"full":"https://walter.trakt.us/images/shows/000/000/353/banners/original/9fefff703d.jpg?1409353813"},"thumb":{"full":"https://walter.trakt.us/images/shows/000/000/353/thumbs/original/607f27fade.jpg?1409353814"}}
"title":"Game of Thrones","year":2011,"ids":{"trakt":1390,"slug":"game-of-thrones","tvdb":121361,"imdb":"tt0944947","tmdb":1399,"tvrage":24493},"images":{"fanart":{"full":"https://walter.trakt.us/images/shows/000/000/3962/fanarts/original/5a13b51164.jpg?14093962811","medium":"https://walter.trakt.us/images/shows/000/000/3962/fanarts/medium/5a13b51164.jpg?14093962811","thumb":"https://walter.trakt.us/images/shows/000/000/3962/fanarts/thumb/5a13b51164.jpg?14093962811"},"poster":{"full":"https://walter.trakt.us/images/shows/000/000/3962/posters/original/46cafaec1f.jpg?14093962810","medium":"https://walter.trakt.us/images/shows/000/000/3962/posters/medium/46cafaec1f.jpg?14093962810","thumb":"https://walter.trakt.us/images/shows/000/000/3962/posters/thumb/46cafaec1f.jpg?14093962810"},"logo":{"full":"https://walter.trakt.us/images/shows/000/000/3962/logos/original/13b614ad43.png?14093962812"},"clearart":{"full":"https://walter.trakt.us/images/shows/000/000/3962/cleararts/original/5cbde9e647.png?14093962813"},"banner":{"full":"https://walter.trakt.us/images/shows/000/000/3962/banners/original/9fefff703d.jpg?14093962813"},"thumb":{"full":"https://walter.trakt.us/images/shows/000/000/3962/thumbs/original/607f27fade.jpg?14093962814"}}
}
},
"shows/game-of-thrones/last_episode?extended=full": {
"shows/1390/last_episode?extended=full": {
"GET": {"season":0,"number":2,"title":"Wedding Day","ids":{"trakt":73477,"tvdb":3859791,"imdb":null,"tmdb":62133,"tvrage":0},"number_abs":null,"overview":"Walt and Hank have a talk before Hank gets married.","rating":8.32258,"votes":93,"first_aired":"2009-02-18T02:00:00.000Z","updated_at":"2016-04-04T04:08:12.000Z","available_translations":[]}
},
"shows/game-of-thrones/next_episode?extended=full": {
"shows/1390/next_episode?extended=full": {
"GET": {"season":0,"number":2,"title":"Wedding Day","ids":{"trakt":73477,"tvdb":3859791,"imdb":null,"tmdb":62133,"tvrage":0},"number_abs":null,"overview":"Walt and Hank have a talk before Hank gets married.","rating":8.32258,"votes":93,"first_aired":"2009-02-18T02:00:00.000Z","updated_at":"2016-04-04T04:08:12.000Z","available_translations":[]}
},
"shows/game-of-thrones?extended=full": {
"GET": {"title":"Game of Thrones","year":2011,"ids":{"trakt":353,"slug":"game-of-thrones","tvdb":121361,"imdb":"tt0944947","tmdb":1399,"tvrage":24493},"overview":"Game of Thrones is an American fantasy drama television series created for HBO by David Benioff and D. B. Weiss. It is an adaptation of A Song of Ice and Fire, George R. R. Martin's series of fantasy novels, the first of which is titled A Game of Thrones.\n\nThe series, set on the fictional continents of Westeros and Essos at the end of a decade-long summer, interweaves several plot lines. The first follows the members of several noble houses in a civil war for the Iron Throne of the Seven Kingdoms; the second covers the rising threat of the impending winter and the mythical creatures of the North; the third chronicles the attempts of the exiled last scion of the realm's deposed dynasty to reclaim the throne. Through its morally ambiguous characters, the series explores the issues of social hierarchy, religion, loyalty, corruption, sexuality, civil war, crime, and punishment.","first_aired":"2011-04-18T01:00:00.000Z","airs":{"day":"Sunday","time":"21:00","timezone":"America/New_York"},"runtime":60,"certification":"TV-MA","network":"HBO","country":"us","updated_at":"2014-08-22T08:32:06.000Z","trailer":null,"homepage":"http://www.hbo.com/game-of-thrones/index.html","status":"returning series","rating":9.0,"votes":111,"language":"en","available_translations":["en","tr","sk","de","ru","fr","hu","zh","el","pt","es","bg","ro","it","ko","he","nl","pl"],"genres":["drama","fantasy"],"aired_episodes":50}
"GET": {"title":"Game of Thrones","year":2011,"ids":{"trakt":1390,"slug":"game-of-thrones","tvdb":121361,"imdb":"tt0944947","tmdb":1399,"tvrage":24493},"overview":"Game of Thrones is an American fantasy drama television series created for HBO by David Benioff and D. B. Weiss. It is an adaptation of A Song of Ice and Fire, George R. R. Martin's series of fantasy novels, the first of which is titled A Game of Thrones.\n\nThe series, set on the fictional continents of Westeros and Essos at the end of a decade-long summer, interweaves several plot lines. The first follows the members of several noble houses in a civil war for the Iron Throne of the Seven Kingdoms; the second covers the rising threat of the impending winter and the mythical creatures of the North; the third chronicles the attempts of the exiled last scion of the realm's deposed dynasty to reclaim the throne. Through its morally ambiguous characters, the series explores the issues of social hierarchy, religion, loyalty, corruption, sexuality, civil war, crime, and punishment.","first_aired":"2011-04-18T01:00:00.000Z","airs":{"day":"Sunday","time":"21:00","timezone":"America/New_York"},"runtime":60,"certification":"TV-MA","network":"HBO","country":"us","updated_at":"2014-08-22T08:32:06.000Z","trailer":null,"homepage":"http://www.hbo.com/game-of-thrones/index.html","status":"returning series","rating":9.0,"votes":111,"language":"en","available_translations":["en","tr","sk","de","ru","fr","hu","zh","el","pt","es","bg","ro","it","ko","he","nl","pl"],"genres":["drama","fantasy"],"aired_episodes":50}
},
"shows/game-of-thrones/aliases": {
"shows/1390/aliases": {
"GET": []
},
"shows/game-of-thrones/translations/es": {
"shows/1390/translations/es": {
"GET": [
{"title":"Breaking Bad","overview":"Breaking Bad is an American crime drama television series created and produced by Vince Gilligan. Set and produced in Albuquerque, New Mexico, Breaking Bad is the story of Walter White, a struggling high school chemistry teacher who is diagnosed with inoperable lung cancer at the beginning of the series. He turns to a life of crime, producing and selling methamphetamine, in order to secure his family's financial future before he dies, teaming with his former student, Jesse Pinkman. Heavily serialized, the series is known for positioning its characters in seemingly inextricable corners and has been labeled a contemporary western by its creator.","language":"en"},
{"title":"Breaking Bad","overview":"...","language":"tr"},
{"title":"Perníkový tatko","overview":"","language":"sk"}
]
},
"shows/game-of-thrones/comments": {
"shows/1390/comments": {
"GET": [
{ "id":8,
"parent_id":0,
Expand All @@ -120,16 +120,16 @@
"user":{"username":"sean","private":false,"name":"Sean Rudford","vip":true,"vip_ep":false}}
]
},
"shows/game-of-thrones/people": {
"shows/1390/people": {
"GET": {"cast":[{"character":"Tyrion Lannister","person":{"name":"Peter Dinklage","ids":{"trakt":639,"slug":"peter-dinklage","imdb":"nm0227759","tmdb":22970,"tvrage":34516}}},{"character":"Jaime Lannister","person":{"name":"Nikolaj Coster-Waldau","ids":{"trakt":640,"slug":"nikolaj-coster-waldau","imdb":"nm0182666","tmdb":12795,"tvrage":180684}}},{"character":"Cersei Baratheon","person":{"name":"Lena Headey","ids":{"trakt":641,"slug":"lena-headey","imdb":"nm0372176","tmdb":17286,"tvrage":98569}}},{"character":"Daenerys Targaryen","person":{"name":"Emilia Clarke","ids":{"trakt":642,"slug":"emilia-clarke","imdb":"nm3592338","tmdb":1223786,"tvrage":null}}},{"character":"Jon Snow","person":{"name":"Kit Harington","ids":{"trakt":643,"slug":"kit-harington","imdb":"nm3229685","tmdb":239019,"tvrage":null}}},{"character":"Tywin Lannister","person":{"name":"Charles Dance","ids":{"trakt":644,"slug":"charles-dance","imdb":"nm0001097","tmdb":4391,"tvrage":81300}}},{"character":"Margaery Tyrell","person":{"name":"Natalie Dormer","ids":{"trakt":645,"slug":"natalie-dormer","imdb":"nm1754059","tmdb":58502,"tvrage":173448}}},{"character":"Joffrey Baratheon","person":{"name":"Jack Gleeson","ids":{"trakt":138,"slug":"jack-gleeson","imdb":"nm0322416","tmdb":489467,"tvrage":null}}},{"character":"Sansa Stark","person":{"name":"Sophie Turner","ids":{"trakt":646,"slug":"sophie-turner","imdb":"nm3849842","tmdb":1001657,"tvrage":null}}},{"character":"Arya Stark","person":{"name":"Maisie Williams","ids":{"trakt":647,"slug":"maisie-williams","imdb":"nm3586035","tmdb":1181313,"tvrage":null}}},{"character":"Samwell Tarly","person":{"name":"John Bradley-West","ids":{"trakt":648,"slug":"john-bradley-west","imdb":"","tmdb":1223788,"tvrage":null}}},{"character":"Ygritte","person":{"name":"Rose Leslie","ids":{"trakt":649,"slug":"rose-leslie","imdb":"nm3310211","tmdb":1223793,"tvrage":342808}}},{"character":"Tormund Giantsbane","person":{"name":"Kristofer Hivju","ids":{"trakt":650,"slug":"kristofer-hivju","imdb":"nm1970465","tmdb":571418,"tvrage":null}}},{"character":"Sandor Clegane","person":{"name":"Rory McCann","ids":{"trakt":651,"slug":"rory-mccann","imdb":"nm0564920","tmdb":3075,"tvrage":92391}}},{"character":"Brienne of Tarth","person":{"name":"Gwendoline Christie","ids":{"trakt":525,"slug":"gwendoline-christie","imdb":"nm3729225","tmdb":1011904,"tvrage":null}}},{"character":"Bronn","person":{"name":"Jerome Flynn","ids":{"trakt":652,"slug":"jerome-flynn","imdb":"nm0283492","tmdb":195930,"tvrage":65682}}},{"character":"Shae","person":{"name":"Sibel Kekilli","ids":{"trakt":653,"slug":"sibel-kekilli","imdb":"nm1402546","tmdb":5118,"tvrage":null}}},{"character":"Jorah Mormont","person":{"name":"Iain Glen","ids":{"trakt":654,"slug":"iain-glen","imdb":"nm0322513","tmdb":20508,"tvrage":105767}}},{"character":"Petyr Baelish","person":{"name":"Aidan Gillen","ids":{"trakt":655,"slug":"aidan-gillen","imdb":"nm0318821","tmdb":49735,"tvrage":36542}}},{"character":"Davos Seaworth","person":{"name":"Liam Cunningham","ids":{"trakt":656,"slug":"liam-cunningham","imdb":"nm0192377","tmdb":15498,"tvrage":null}}},{"character":"Stannis Baratheon","person":{"name":"Stephen Dillane","ids":{"trakt":657,"slug":"stephen-dillane","imdb":"nm0226820","tmdb":8435,"tvrage":152454}}},{"character":"Melisandre","person":{"name":"Carice van Houten","ids":{"trakt":658,"slug":"carice-van-houten","imdb":"nm0396924","tmdb":23229,"tvrage":230892}}},{"character":"Bran Stark","person":{"name":"Isaac Hempstead Wright","ids":{"trakt":659,"slug":"isaac-hempstead-wright","imdb":"nm3652842","tmdb":239020,"tvrage":null}}},{"character":"Theon Greyjoy","person":{"name":"Alfie Allen","ids":{"trakt":660,"slug":"alfie-allen","imdb":"nm0654295","tmdb":71586,"tvrage":128136}}},{"character":"Lord Varys","person":{"name":"Conleth Hill","ids":{"trakt":661,"slug":"conleth-hill","imdb":"nm0384152","tmdb":84423,"tvrage":null}}},{"character":"Ramsay Snow","person":{"name":"Iwan Rheon","ids":{"trakt":662,"slug":"iwan-rheon","imdb":"nm3701064","tmdb":221978,"tvrage":336010}}},{"character":"Roose Bolton","person":{"name":"Michael McElhatton","ids":{"trakt":663,"slug":"michael-mcelhatton","imdb":"nm0568385","tmdb":73288,"tvrage":null}}}],"crew":{"production":[{"job":"Executive Producer","person":{"name":"David Benioff","ids":{"trakt":664,"slug":"david-benioff","imdb":"nm1125275","tmdb":9813,"tvrage":null}}},{"job":"Executive Producer","person":{"name":"D. B. Weiss","ids":{"trakt":665,"slug":"d-b-weiss","imdb":"nm1888967","tmdb":1223783,"tvrage":null}}},{"job":"Producer","person":{"name":"Mark Huffam","ids":{"trakt":666,"slug":"mark-huffam","imdb":"nm0400240","tmdb":8401,"tvrage":null}}},{"job":"Producer","person":{"name":"Frank Doelger","ids":{"trakt":667,"slug":"frank-doelger","imdb":"nm0230361","tmdb":1223796,"tvrage":69927}}},{"job":"Producer","person":{"name":"George R. R. Martin","ids":{"trakt":668,"slug":"george-r-r-martin","imdb":"nm0552333","tmdb":1222463,"tvrage":79951}}},{"job":"Producer","person":{"name":"Vince Gerardis","ids":{"trakt":669,"slug":"vince-gerardis","imdb":"nm1136210","tmdb":54268,"tvrage":null}}},{"job":"Producer","person":{"name":"Ralph Vicinanza","ids":{"trakt":670,"slug":"ralph-vicinanza","imdb":"nm2088223","tmdb":54269,"tvrage":null}}},{"job":"Producer","person":{"name":"Guymon Casady","ids":{"trakt":671,"slug":"guymon-casady","imdb":"nm0143939","tmdb":53758,"tvrage":121700}}},{"job":"Executive Producer","person":{"name":"Carolyn Strauss","ids":{"trakt":672,"slug":"carolyn-strauss","imdb":"nm1865467","tmdb":1223797,"tvrage":null}}},{"job":"Executive Producer","person":{"name":"Frank Doelger","ids":{"trakt":667,"slug":"frank-doelger","imdb":"nm0230361","tmdb":1223796,"tvrage":69927}}},{"job":"Executive Producer","person":{"name":"Bernadette Caulfield","ids":{"trakt":673,"slug":"bernadette-caulfield","imdb":"nm0146529","tmdb":1223798,"tvrage":null}}},{"job":"Producer","person":{"name":"Bernadette Caulfield","ids":{"trakt":673,"slug":"bernadette-caulfield","imdb":"nm0146529","tmdb":1223798,"tvrage":null}}},{"job":"Producer","person":{"name":"Vanessa Taylor","ids":{"trakt":674,"slug":"vanessa-taylor","imdb":"nm0961827","tmdb":1223785,"tvrage":8043}}},{"job":"Producer","person":{"name":"Greg Spence","ids":{"trakt":675,"slug":"greg-spence","imdb":"nm0817770","tmdb":56746,"tvrage":null}}},{"job":"Producer","person":{"name":"Chris Newman","ids":{"trakt":676,"slug":"chris-newman","imdb":"nm0628040","tmdb":1223799,"tvrage":null}}}]}}
},
"shows/game-of-thrones/ratings": {
"shows/1390/ratings": {
"GET": {"rating":9.0,"votes":3,"distribution":{"1":0,"2":0,"3":0,"4":0,"5":0,"6":0,"7":0,"8":0,"9":1,"10":2}}
},
"shows/game-of-thrones/related": {
"shows/1390/related": {
"GET": [
{"title":"Battlestar Galactica","year":2005,"ids":{"trakt":331,"slug":"battlestar-galactica","tvdb":73545,"imdb":"tt0407362","tmdb":1972,"tvrage":null}},
{"title":"Game of Thrones","year":2011,"ids":{"trakt":353,"slug":"game-of-thrones","tvdb":121361,"imdb":"tt0944947","tmdb":1399,"tvrage":24493}},
{"title":"Game of Thrones","year":2011,"ids":{"trakt":1390,"slug":"game-of-thrones","tvdb":121361,"imdb":"tt0944947","tmdb":1399,"tvrage":24493}},
{"title":"Firefly","year":2002,"ids":{"trakt":329,"slug":"firefly","tvdb":78874,"imdb":"tt0303461","tmdb":1437,"tvrage":null}},
{"title":"The Newsroom","year":2012,"ids":{"trakt":497,"slug":"the-newsroom","tvdb":256227,"imdb":"tt1870479","tmdb":15621,"tvrage":null}},
{"title":"Dollhouse","year":2009,"ids":{"trakt":395,"slug":"dollhouse","tvdb":82046,"imdb":"tt1135300","tmdb":14956,"tvrage":null}},
Expand All @@ -140,16 +140,16 @@
{"title":"The Shield","year":2002,"ids":{"trakt":486,"slug":"the-shield","tvdb":78261,"imdb":"tt0286486","tmdb":1414,"tvrage":null}}
]
},
"shows/game-of-thrones/stats": {
"shows/1390/stats": {
"GET": {"watchers":30521,"plays":37986,"collectors":12899,"collected_episodes":87991,"comments":115,"lists":309,"votes":25655}
},
"shows/game-of-thrones/watching": {
"shows/1390/watching": {
"GET": [
{"username":"justin","private":false,"name":"Justin Nemeth","vip":true,"vip_ep":false},
{"username":"sean","private":false,"name":"Sean Rudford","vip":true,"vip_ep":false}
]
},
"shows/game-of-thrones/progress/collection": {
"shows/1390/progress/collection": {
"GET": {
"aired": 2,
"completed": 2,
Expand Down Expand Up @@ -190,7 +190,7 @@
}
}
},
"shows/game-of-thrones/progress/watched": {
"shows/1390/progress/watched": {
"GET": {
"aired": 2,
"completed": 0,
Expand Down
2 changes: 1 addition & 1 deletion trakt/tv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ def _build(self, data):

@property
def ext(self):
return 'shows/{slug}'.format(slug=self.slug)
return 'shows/{slug}'.format(slug=self.trakt or self.slug)

@property
def ext_full(self):
Expand Down