codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
jxxghp 2023-10-12 21:30:35 +08:00
parent f20c81efae
commit b5cba64227
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/modules/douban/__init__.py
View File

@ -421,6 +421,10 @@ class DoubanModule(_ModuleBase):
logger.info(f"开始使用IMDBID {imdbid} 查询豆瓣信息 ...") logger.info(f"开始使用IMDBID {imdbid} 查询豆瓣信息 ...")
result = self.doubanapi.imdbid(imdbid) result = self.doubanapi.imdbid(imdbid)
if result: if result:
doubanid = result.get("id")
if doubanid and not str(doubanid).isdigit():
doubanid = re.search(r"\d+", doubanid).group(0)
result["id"] = doubanid
return result return result
# 搜索 # 搜索
logger.info(f"开始使用名称 {name} 查询豆瓣信息 ...") logger.info(f"开始使用名称 {name} 查询豆瓣信息 ...")
@ -489,10 +493,7 @@ class DoubanModule(_ModuleBase):
logger.warn(f"未找到 {mediainfo.title} 的豆瓣信息") logger.warn(f"未找到 {mediainfo.title} 的豆瓣信息")
return return
# 查询豆瓣详情 # 查询豆瓣详情
doubanid = doubaninfo.get("id") doubaninfo = self.douban_info(doubaninfo.get("id"))
if not str(doubanid).isdigit():
doubanid = re.search(r"\d+", doubanid).group(0)
doubaninfo = self.douban_info(doubanid)
# 刮削路径 # 刮削路径
scrape_path = path / path.name scrape_path = path / path.name
self.scraper.gen_scraper_files(meta=meta, self.scraper.gen_scraper_files(meta=meta,
@ -518,10 +519,7 @@ class DoubanModule(_ModuleBase):
logger.warn(f"未找到 {mediainfo.title} 的豆瓣信息") logger.warn(f"未找到 {mediainfo.title} 的豆瓣信息")
break break
# 查询豆瓣详情 # 查询豆瓣详情
doubanid = doubaninfo.get("id") doubaninfo = self.douban_info(doubaninfo.get("id"))
if not str(doubanid).isdigit():
doubanid = re.search(r"\d+", doubanid).group(0)
doubaninfo = self.douban_info(doubanid)
# 刮削 # 刮削
self.scraper.gen_scraper_files(meta=meta, self.scraper.gen_scraper_files(meta=meta,
mediainfo=MediaInfo(douban_info=doubaninfo), mediainfo=MediaInfo(douban_info=doubaninfo),

6
app/plugins/personmeta/__init__.py
View File

@ -593,11 +593,7 @@ class PersonMeta(_PluginBase):
season=season) season=season)
# 豆瓣演员 # 豆瓣演员
if doubaninfo: if doubaninfo:
doubanid = doubaninfo.get("id") doubanitem = self.chain.douban_info(doubaninfo.get("id")) or {}
if not str(doubanid).isdigit():
# 从https://api.douban.com/movie/35561680中提取出字
doubanid = re.search(r"\d+", doubanid).group(0)
doubanitem = self.chain.douban_info(doubanid) or {}
return (doubanitem.get("actors") or []) + (doubanitem.get("directors") or []) return (doubanitem.get("actors") or []) + (doubanitem.get("directors") or [])
else: else:
logger.warn(f"未找到豆瓣信息：{mediainfo.title_year}") logger.warn(f"未找到豆瓣信息：{mediainfo.title_year}")