mix(feat, fix): modify something important

- 新增  排除 Tag 筛选选项
- 新增 自动清理搜索缓存
- 修复 登录持久化问题
- 修复 可能的登录失败问题
- 修复 其他细节问题

Author: txperl

.gitignore

@@ -1,6 +1,8 @@
 # Created by https://www.gitignore.io/api/linux,macos,python,windows
 
-cache/
+### Biu ###
+usr/.token
+usr/cache/
 
 ### Linux ###
 *~

app/config/biu_default.yml

@@ -47,6 +47,9 @@ biu.search.loadCacheFirst: true
   # 搜索时优先加载本地缓存
   # true 为开启；false 为关闭
 
+biu.search.maxCacheSizeMiB: 512
+  # 搜索缓存的最大容量（MB），达到后程序会自动清理
+
 
 ## 下载相关 ##
 biu.download.mode: "dl-single"
@@ -112,7 +115,7 @@ biu.download.whatsUgoira: "webp"
   # 可选 webp, gif
 
 biu.download.imageHost: ""
-  # 下载时使用的 Pixiv 图片服务器
+  # 后端程序下载时使用的 Pixiv 图片服务器
   # 留空则程序自动判断
   # 可参考地址
   # - https://i.pximg.net 官方图片服务器（需代理）

app/config/language/en.yml

@@ -15,12 +15,13 @@ app.core.biu:
     press_to_use_old: "Press any key to continue using this old version..."
   network:
     hint_in_check: "Checking network status..."
-    fail_pixiv_and_use_bypass: "Cannot connect to Pixiv, enable bypassSNI route"
+    fail_pixiv_and_use_bypass: "Cannot connect to Pixiv, enable bypassSNI route (may not be available temporarily)"
   loginHelper:
     hint_token_only: "Since Pixiv disables password login, you can only use Token to login for now"
     hint_before_start: "Network detection is about to start, this process can reduce the probability of not being able to use PixivBiu due to network problems"
     fail_to_get_token_due_to_network: "Your network is not working properly for Pixiv Token login, please adjust it and try again."
     fail_to_get_token_anyway: "There was an error getting the Token, please try again."
+    fail_by_cloudflare_captcha: "Encountered Cloudflare protection when logging in, it may be caused by network environment issues. You can try to get the token again, or wait a while and log in again"
     is_need_to_get_token: "Continue? (y / n): "
   ready:
     hint_run: "Run"
@@ -32,7 +33,7 @@ app.core.biu:
     hint_program_path: "Program Directory"
     done_init: "Initialization completed"
   others:
-    hint_in_update_token: "Update token"
+    hint_in_update_token: "Trying to update token"
 
 app.common.loginHelper:
   network:

app/config/language/zh.yml

@@ -15,12 +15,13 @@ app.core.biu:
     press_to_use_old: "按任意键以继续使用旧版本..."
   network:
     hint_in_check: "检测网络状态..."
-    fail_pixiv_and_use_bypass: "无法访问 Pixiv，启用 bypassSNI 线路"
+    fail_pixiv_and_use_bypass: "无法访问 Pixiv，启用 bypassSNI 线路 (暂时可能无法正常使用)"
   loginHelper:
     hint_token_only: "由于 Pixiv 禁止了账号密码登陆方式，暂时只能使用 Token 进行登录"
     hint_before_start: "即将开始进行网络检测，此过程可以减少因网络问题导致的无法正常使用 PixivBiu 的概率"
     fail_to_get_token_due_to_network: "您的网络无法正常进行 Pixiv Token 登陆，请调整后重试。"
     fail_to_get_token_anyway: "获取 Token 时出错，请重试。"
+    fail_by_cloudflare_captcha: "登录时遇到 Cloudflare 保护，可能是网络环境问题导致。您可以尝试重新获取 Token，或稍等片刻后再次登录"
     is_need_to_get_token: "是否继续? (y / n): "
   ready:
     hint_run: "运行"
@@ -32,7 +33,7 @@ app.core.biu:
     hint_program_path: "程序目录"
     done_init: "初始化完成"
   others:
-    hint_in_update_token: "更新 Token"
+    hint_in_update_token: "尝试 Token 更新"
 
 app.common.loginHelper:
   network:

app/lib/common/login_helper/main.py

@@ -1,7 +1,7 @@
 import requests
 
 from altfe.interface.root import interRoot
-from app.lib.common.login_helper.token import tokenGetter
+from app.lib.common.login_helper.token import TokenGetter
 
 
 @interRoot.bind("loginHelper", "LIB_COMMON")
@@ -15,9 +15,9 @@ def __init__(self):
         self.lang = self.INS.i18n.get_bundle("app.common.loginHelper", func=True)
         self.requests = requests.Session()
         self.requests.mount("https://", CustomAdapter())
-        self.tokenG = tokenGetter(lang=self.lang, requests=self.requests)
+        self.token_getter = TokenGetter(lang=self.lang, requests=self.requests)
         self.proxy = ""
-        self.authTokenURL = ""
+        self.auth_token_url = ""
 
     def check_network(self, URLS=None, silent=False, proxy_="auto"):
         """
@@ -30,10 +30,11 @@ def check_network(self, URLS=None, silent=False, proxy_="auto"):
         URLS = (
             "https://public-api.secure.pixiv.net",
             "https://1.0.0.1/dns-query",
-            "https://1.1.1.1/dns-query",
-            "https://doh.dns.sb/dns-query",
-            "https://cloudflare-dns.com/dns-query",
+            # "https://1.1.1.1/dns-query",
+            # "https://doh.dns.sb/dns-query",
+            # "https://cloudflare-dns.com/dns-query",
         ) if URLS is None else URLS
+
         proxy = self.STATIC.util.get_system_proxy() if proxy_ == "auto" else proxy_
         if silent is False:
             self.STATIC.localMsger.msg(self.lang("network.hint_in_check"), header="Login Helper")
@@ -43,36 +44,33 @@ def check_network(self, URLS=None, silent=False, proxy_="auto"):
             else:
                 if input(self.lang("network.hint_detect_proxy") % proxy) == "y":
                     proxy = input(self.lang("network.press_need_to_type_proxy"))
-
         self.proxy = proxy
-        self.authTokenURL = URLS[0]
-
-        isCanConn = [self._get(url, proxy=self.proxy, silent=silent) for url in URLS]
 
-        if isCanConn[0] is True:
+        self.auth_token_url = URLS[0]
+        is_conn = [self._get(url, proxy=self.proxy, silent=silent) for url in URLS]
+        if is_conn[0] is True:
             return True
 
         for i in range(len(URLS)):
-            if isCanConn[i]:
-                finalIP = self._get_host_ip(hostname=URLS[0], url=URLS[i])
-                if finalIP is not False:
-                    self.authTokenURL = finalIP
+            if is_conn[i]:
+                final_ip = self._get_host_ip(hostname=URLS[0], url=URLS[i])
+                if final_ip is not False:
+                    self.auth_token_url = final_ip
                     return True
-
         return False
 
     def login(self):
         """
         登陆操作。
-        :return: bool
+        :return: tuple(access token, refresh token, user id) || tuple(false, false, false)
         """
         kw = (
             {"proxies": {"http": self.proxy, "https": self.proxy}}
             if self.proxy != ""
             else {}
         )
         try:
-            return self.tokenG.login(host=self.authTokenURL, newCode=True, kw=kw)
+            return self.token_getter.login(host=self.auth_token_url, newCode=True, kw=kw)
         except Exception as e:
             err = str(e)
             if "'code': 918" in err:
@@ -81,24 +79,27 @@ def login(self):
                 self.STATIC.localMsger.red(self.lang("login.fail_code_1508"))
             else:
                 self.STATIC.localMsger.error(e, header=False)
-        return False
+        return False, False, False
 
     def refresh(self, refresh_token):
         """
         Token 刷新操作。
         :param refresh_token: 目前已有的 refresh token
-        :return: bool
+        :return: tuple(access token, refresh token, user id) || tuple(false, false, false)
         """
         kw = (
             {"proxies": {"http": self.proxy, "https": self.proxy}}
             if self.proxy != ""
             else {}
         )
         try:
-            return self.tokenG.refresh(refresh_token=refresh_token, host=self.authTokenURL, **kw)
+            return self.token_getter.refresh(refresh_token=refresh_token, host=self.auth_token_url, kw=kw)
         except Exception as e:
-            self.STATIC.localMsger.error(e, header=False)
-            return False
+            if "Invalid refresh token" in str(e):
+                self.STATIC.localMsger.red("Common.LoginHelper.refresh: invalid refresh token")
+            else:
+                self.STATIC.localMsger.error(e, header=False)
+        return False, False, False
 
     def _get_host_ip(self, hostname, timeout=5, url="https://1.0.0.1/dns-query"):
         """

app/lib/common/login_helper/token.py

@@ -16,7 +16,7 @@
 HASH_SECRET = "28c1fdd170a5204386cb1313c7077b34f83e4aaf4aa829ce78c231e05b0bae2c"
 
 
-class tokenGetter(object):
+class TokenGetter(object):
     def __init__(self, lang, requests=requests):
         self.lang = lang
         self.code = ""
@@ -47,7 +47,7 @@ def login(self, host=AUTH_TOKEN_URL_HOST, kw={}, newCode=False):
         :param host: token api 的主机域
         :param kw: requests 请求的额外参数
         :param newCode: 是否继承使用 code
-        :return: str: refresh token | except: raise error
+        :return: tuple(access token, refresh token, user id) || except: raise error
         """
         if newCode is False and self.code != "":
             code = self.code
@@ -80,19 +80,17 @@ def login(self, host=AUTH_TOKEN_URL_HOST, kw={}, newCode=False):
             **kw,
         )
         rst = response.json()
-
-        if "refresh_token" in rst:
-            return rst["refresh_token"]
-        else:
-            raise Exception("Request Error.\nResponse: " + str(rst))
+        if "access_token" in rst and "refresh_token" in rst:
+            return rst["access_token"], rst["refresh_token"], rst["user"]["id"]
+        raise Exception("Request Error.\nResponse: " + str(rst))
 
     def refresh(self, refresh_token, host=AUTH_TOKEN_URL_HOST, kw={}):
         """
         刷新 refresh token。
         :param refresh_token: 目前可用的 refresh token
         :param host: token api 的主机域
         :param kw: requests 请求的额外参数
-        :return: 新 refresh token | except: raise error
+        :return: tuple(access token, refresh token, user id) || except: raise error
         """
         response = self.requests.post(
             "%s/auth/token" % host,
@@ -110,11 +108,9 @@ def refresh(self, refresh_token, host=AUTH_TOKEN_URL_HOST, kw={}):
         )
 
         rst = response.json()
-
-        if "refresh_token" in rst:
-            return rst["refresh_token"]
-        else:
-            raise Exception("Request Error.\nResponse: " + str(rst))
+        if "access_token" in rst and "refresh_token" in rst:
+            return rst["access_token"], rst["refresh_token"], rst["user"]["id"]
+        raise Exception("Request Error.\nResponse: " + str(rst))
 
     @staticmethod
     def get_header(headers={}):