fix: 订阅搜索报错

linyuan0213 · Jul 13, 2024 · 551050b · 551050b
1 parent 379c8f2
commit 551050b
Show file tree

Hide file tree

Showing 11 changed files with 13 additions and 3 deletions.
diff --git a/app/indexer/client/_spider.py b/app/indexer/client/_spider.py
@@ -267,6 +267,7 @@ def download_midware(self, request):
         else:
             chrome = DrissionPageHelper()
             tries = 3
+            html_text = ''
             if chrome.get_status():
                 while tries > 0:
                     try:

diff --git a/app/plugins/modules/_autosignin/btschool.py b/app/plugins/modules/_autosignin/btschool.py
@@ -102,6 +102,7 @@ def signin(self, site_info: dict):
 
     def __chrome_visit(self, chrome, url, ua, site_cookie, proxy, site):
         tries = 3
+        html_text = ''
         while tries > 0:
             try:
                 html_text = chrome.get_page_html(url=url, ua=ua, cookies=site_cookie, proxies=proxy)

diff --git a/app/plugins/modules/_autosignin/tjupt.py b/app/plugins/modules/_autosignin/tjupt.py
@@ -192,6 +192,7 @@ def signin(self, site_info: dict):
         image_search_url = f"https://lens.google.com/uploadbyurl?url={img_url}"
         chrome = DrissionPageHelper()
         tries = 3
+        html_text = ''
         while tries > 0:
             try:
                 html_text = chrome.get_page_html(url=image_search_url, ua=ua, proxies=Config().get_proxies() if proxy else None)

diff --git a/app/plugins/modules/autosignin.py b/app/plugins/modules/autosignin.py
@@ -466,6 +466,7 @@ def __signin_base(self, site_info):
                 if "1ptba" in home_url:
                     home_url = f"{home_url}/index.php"
                 tries = 3
+                html_text = ''
                 while tries > 0:
                     try:
                         html_text = chrome.get_page_html(url=home_url, ua=ua, cookies=site_cookie, proxies=site_info.get("proxy"))
@@ -500,6 +501,7 @@ def __signin_base(self, site_info):
                 # 开始仿真
                 try:
                     tries = 3
+                    html_text = ''
                     while tries > 0:
                         try:
                             html_text = chrome.get_page_html(url=home_url,

diff --git a/app/plugins/modules/opensubtitles.py b/app/plugins/modules/opensubtitles.py
@@ -215,6 +215,7 @@ def __parse_opensubtitles_results(cls, url):
             return []
         # 源码
         tries = 3
+        html_text = ''
         while tries > 0:
             try:
                 html_text = chrome.get_page_html(url=url)

diff --git a/app/searcher.py b/app/searcher.py
@@ -174,7 +174,7 @@ def search_one_media(self, media_info,
         unique_media_list = []
         media_seen = set()
         for d in media_list:
-            org_string = StringUtils.md5_hash(d.org_string + d.site + d.description)
+            org_string = StringUtils.md5_hash(f'{d.org_string}{d.site}{d.description or ""}')
             if org_string not in media_seen:
                 unique_media_list.append(d)
                 media_seen.add(org_string)

diff --git a/app/sites/site_userinfo.py b/app/sites/site_userinfo.py
@@ -71,13 +71,14 @@ def build(self, url, site_id, site_name,
         chrome = DrissionPageHelper()
         if emulate:
             tries = 3
+            html_text = ''
             while tries > 0:
                 try:
                     html_text = chrome.get_page_html(url=url, ua=ua, cookies=site_cookie, proxies=Config().get_proxies() if proxy else None)
                     if html_text:
                         break
                 except Exception as e:
-                    self.debug(f'获取网页HTML失败： {str(e)} 重试中...')
+                    log.debug(f'获取网页HTML失败： {str(e)} 重试中...')
                 finally:
                     tries -= 1
                     sleep(2)

diff --git a/app/sites/siteconf.py b/app/sites/siteconf.py
@@ -265,6 +265,7 @@ def __get_site_page_html(url, cookie, ua, headers=None, render=False, proxy=Fals
         if render and chrome.get_status():
             # 开渲染
             tries = 3
+            html_text = ''
             while tries > 0:
                 try:
                     html_text = chrome.get_page_html(url=url, cookies=cookie, ua=ua, proxies=proxy)

diff --git a/app/sites/sites.py b/app/sites/sites.py
@@ -307,6 +307,7 @@ def test_connection(self, site_id):
             chrome = DrissionPageHelper()
             start_time = datetime.now()
             tries = 3
+            html_text = ''
             while tries > 0:
                 try:
                     html_text = chrome.get_page_html(url=site_url, ua=ua, cookies=site_cookie, proxies=Config().get_proxies() if site_info.get("proxy") else None)

diff --git a/app/sites/siteuserinfo/_base.py b/app/sites/siteuserinfo/_base.py
@@ -260,6 +260,7 @@ def _get_page_content(self, url, params=None, headers=None):
                 chrome = DrissionPageHelper()
                 if self._emulate and chrome.get_status():
                     tries = 3
+                    html_text = ''
                     while tries > 0:
                         try:
                             html_text = chrome.get_page_html(url=url, ua=self._ua, cookies=self._site_cookie, proxies=proxies)

diff --git a/web/backend/search_torrents.py b/web/backend/search_torrents.py
@@ -163,7 +163,7 @@ def search_medias_for_web(content, ident_flag=True, filters=None, tmdbid=None, m
     unique_media_list = []
     media_seen = set()
     for d in media_list:
-        org_string = StringUtils.md5_hash(d.org_string + d.site + d.description)
+        org_string = StringUtils.md5_hash(f'{d.org_string}{d.site}{d.description or ""}')
         if org_string not in media_seen:
             unique_media_list.append(d)
             media_seen.add(org_string)