From e8755e4131beff8f387a086efafbbdb33b59cd7e Mon Sep 17 00:00:00 2001
From: Yuukiy <76897913+Yuukiy@users.noreply.github.com>
Date: Thu, 14 Apr 2022 18:40:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=8D=E4=BB=A3=E7=90=86=E5=9C=B0=E5=9D=80?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BB=A5=E5=8F=8A=E4=B8=80=E4=BA=9B=E5=85=B6?=
 =?UTF-8?q?=E4=BB=96=E7=9A=84=E5=B0=8F=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/config.ini |  4 ++--
 web/base.py     |  4 ++--
 web/javlib.py   | 10 +++++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/core/config.ini b/core/config.ini
index af8238c..e46265b 100644
--- a/core/config.ini
+++ b/core/config.ini
@@ -50,9 +50,9 @@ title__chinese_first = yes
 # 各个站点的免代理地址。地址失效时软件会自动尝试获取新地址，你也可以手动设置
 [ProxyFree]
 avsox = https://avsox.monster
-javdb = https://javdb36.com
+javdb = https://javdb39.com
 javbus = https://www.javsee.us
-javlib = https://www.e59f.com
+javlib = https://www.g60y.com
 
 # 配置整理时的命名规则
 # save_dir, nfo_title和filename中可以使用变量来引用影片的数据，支持的变量列表见下面的地址:
diff --git a/web/base.py b/web/base.py
index 5689abc..fbd6e64 100644
--- a/web/base.py
+++ b/web/base.py
@@ -126,7 +126,7 @@ def get_html(url):
     html.make_links_absolute(url, resolve_base_href=True)
     # 清理功能仅应在需要的时候用来调试网页（如prestige），否则可能反过来影响调试（如JavBus）
     # html = cleaner.clean_html(html)
-    # lxml.html.open_in_browser(html, encoding=encoding)  # for develop and debug
+    # lxml.html.open_in_browser(html, encoding='utf-8')  # for develop and debug
     return html
 
 
@@ -211,7 +211,7 @@ def download(url, output_path, desc=None):
 def open_in_chrome(url, new=0, autoraise=True):
     """使用指定的Chrome Profile打开url，便于调试"""
     import subprocess
-    chrome = R'C:\Program Files (x86)\Google\Chrome\Application\chrome.exe'
+    chrome = R'C:\Program Files\Google\Chrome\Application\chrome.exe'
     subprocess.run(f'"{chrome}" --profile-directory="Profile 2" {url}', shell=True)
 
 import webbrowser
diff --git a/web/javlib.py b/web/javlib.py
index 1e61a78..ce7618c 100644
--- a/web/javlib.py
+++ b/web/javlib.py
@@ -3,6 +3,7 @@ import os
 import sys
 import logging
 from urllib.parse import urlsplit
+from requests.exceptions import ConnectionError
 
 
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
@@ -30,9 +31,12 @@ def init_network_cfg():
     for proxies in proxy_cfgs:
         request.proxies = proxies
         for url in urls:
-            resp = request.get(url, delay_raise=True)
-            if resp.status_code == 200:
-                return url
+            try:
+                resp = request.get(url, delay_raise=True)
+                if resp.status_code == 200:
+                    return url
+            except ConnectionError as e:
+                logger.debug(f"Fail to connect to '{url}': {e}")
     logger.warning('无法绕开JavLib的反爬机制')
     return permanent_url