Itmens/lib.itmens
Itmens/lib.itmens
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix edge case

Browse source
This commit is contained in:
Your Name 2024-07-23 10:46:31 -04:00 • committed by Henri Dickson
parent a06eccf827
commit 34f14128b8
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
catalog/sites/imdb.py
View file

@ -32,11 +32,7 @@ class IMDB(AbstractSite):
return "https://www.imdb.com/title/" + id_value + "/"
def scrape(self):
res_data = {}
try:
res_data = search_tmdb_by_imdb_id(self.id_value)
except:
pass
res_data = search_tmdb_by_imdb_id(self.id_value)
url = None
pd = None
@ -91,15 +87,15 @@ class IMDB(AbstractSite):
"genre": (
[x["text"] for x in d["genres"]["genres"]] if d.get("genres") else []
),
"brief": (
d["plot"].get("plotText").get("plainText") if d.get("plot") else None
),
"brief": d.get("plot", {}).get("plotText", {}).get("plainText", ""),
"cover_image_url": (
d["primaryImage"].get("url") if d.get("primaryImage") else None
),
}
data["localized_title"] = [{"lang": "en", "text": data["title"]}]
data["localized_description"] = [{"lang": "en", "text": data["brief"]}]
data["localized_description"] = (
[{"lang": "en", "text": data["brief"]}] if data["brief"] else []
)
if d.get("series"):
episode_info = d["series"].get("episodeNumber")
if episode_info:

24
catalog/sites/tmdb.py
View file

@ -37,11 +37,11 @@ def _get_language_code():
def _get_preferred_languages():
langs = {}
for l in PREFERRED_LANGUAGES:
if l == "zh":
for lang in PREFERRED_LANGUAGES:
if lang == "zh":
langs.update({"zh-cn": "zh-CN", "zh-tw": "zh-TW", "zh-hk": "zh-HK"})
else:
langs[l] = l
langs[lang] = lang
return langs
@ -50,9 +50,13 @@ TMDB_PREFERRED_LANGS = _get_preferred_languages()
def search_tmdb_by_imdb_id(imdb_id):
if not settings.TMDB_API3_KEY or settings.TMDB_API3_KEY == "TESTONLY":
return {}
tmdb_api_url = f"https://api.themoviedb.org/3/find/{imdb_id}?api_key={settings.TMDB_API3_KEY}&language={TMDB_DEFAULT_LANG}&external_source=imdb_id"
res_data = BasicDownloader(tmdb_api_url).download().json()
return res_data
try:
return BasicDownloader(tmdb_api_url).download().json()
except Exception:
return {}
def query_tmdb_tv_episode(tv, season, episode):
@ -126,7 +130,7 @@ class TMDB_Movie(AbstractSite):
actor = list(map(lambda x: x["name"], res_data["credits"]["cast"]))
area = []
other_info = {}
# other_info = {}
# other_info['TMDB评分'] = res_data['vote_average']
# other_info['分级'] = res_data['contentRating']
# other_info['Metacritic评分'] = res_data['metacriticRating']
@ -233,9 +237,9 @@ class TMDB_TV(AbstractSite):
)
actor = list(map(lambda x: x["name"], res_data["credits"]["cast"]))
area = []
other_info = {}
other_info["Seasons"] = res_data["number_of_seasons"]
other_info["Episodes"] = res_data["number_of_episodes"]
# other_info = {}
# other_info["Seasons"] = res_data["number_of_seasons"]
# other_info["Episodes"] = res_data["number_of_episodes"]
# TODO: use GET /configuration to get base url
img_url = (
("https://image.tmdb.org/t/p/original/" + res_data["poster_path"])
@ -446,7 +450,7 @@ class TMDB_TVEpisode(AbstractSite):
season_id = v[1]
episode_id = v[2]
site = TMDB_TV(TMDB_TV.id_to_url(show_id))
show_resource = site.get_resource_ready(auto_create=False, auto_link=False)
site.get_resource_ready(auto_create=False, auto_link=False)
api_url = f"https://api.themoviedb.org/3/tv/{show_id}/season/{season_id}/episode/{episode_id}?api_key={settings.TMDB_API3_KEY}&language={TMDB_DEFAULT_LANG}&append_to_response=external_ids,credits"
d = BasicDownloader(api_url).download().json()
if not d.get("id"):