diff --git a/app/modules/douban/__init__.py b/app/modules/douban/__init__.py index 3ea37602..33162f28 100644 --- a/app/modules/douban/__init__.py +++ b/app/modules/douban/__init__.py @@ -421,6 +421,10 @@ class DoubanModule(_ModuleBase): logger.info(f"开始使用IMDBID {imdbid} 查询豆瓣信息 ...") result = self.doubanapi.imdbid(imdbid) 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 # 搜索 logger.info(f"开始使用名称 {name} 查询豆瓣信息 ...") @@ -489,10 +493,7 @@ class DoubanModule(_ModuleBase): logger.warn(f"未找到 {mediainfo.title} 的豆瓣信息") return # 查询豆瓣详情 - doubanid = doubaninfo.get("id") - if not str(doubanid).isdigit(): - doubanid = re.search(r"\d+", doubanid).group(0) - doubaninfo = self.douban_info(doubanid) + doubaninfo = self.douban_info(doubaninfo.get("id")) # 刮削路径 scrape_path = path / path.name self.scraper.gen_scraper_files(meta=meta, @@ -518,10 +519,7 @@ class DoubanModule(_ModuleBase): logger.warn(f"未找到 {mediainfo.title} 的豆瓣信息") break # 查询豆瓣详情 - doubanid = doubaninfo.get("id") - if not str(doubanid).isdigit(): - doubanid = re.search(r"\d+", doubanid).group(0) - doubaninfo = self.douban_info(doubanid) + doubaninfo = self.douban_info(doubaninfo.get("id")) # 刮削 self.scraper.gen_scraper_files(meta=meta, mediainfo=MediaInfo(douban_info=doubaninfo), diff --git a/app/plugins/personmeta/__init__.py b/app/plugins/personmeta/__init__.py index a6349fdd..debff1ff 100644 --- a/app/plugins/personmeta/__init__.py +++ b/app/plugins/personmeta/__init__.py @@ -593,11 +593,7 @@ class PersonMeta(_PluginBase): season=season) # 豆瓣演员 if doubaninfo: - doubanid = doubaninfo.get("id") - 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 {} + doubanitem = self.chain.douban_info(doubaninfo.get("id")) or {} return (doubanitem.get("actors") or []) + (doubanitem.get("directors") or []) else: logger.warn(f"未找到豆瓣信息:{mediainfo.title_year}")