优化脚本

2025-12-20 16:54:47 +08:00 · 2025-02-13 16:25:44 +08:00
parent d008f0b2f6
commit e0eb4e7f6b
4 changed files with 368 additions and 196 deletions
--- a/tieba.py
+++ b/tieba.py
@@ -7,6 +7,7 @@ import os
 import time
 from requests import session
 from hashlib import md5
+from concurrent.futures import ThreadPoolExecutor, as_completed

 try:
    from sendNotify import send
@@ -14,6 +15,11 @@ except ImportError:
    print("加载通知服务失败")

 class Tieba():
+    # 将配置项提取为类变量
+    MAX_RETRY = 10  # 最大重试次数
+    REQUEST_TIMEOUT = 30  # 请求超时时间
+    SLEEP_TIME = 10  # 退出前等待时间
+
    Tieba_BDUSS = os.getenv("Tieba_BDUSS")

    def __init__(self, STOKEN):
@@ -40,43 +46,54 @@ class Tieba():
        self.session.cookies.update({'BDUSS': self.BDUSS, 'STOKEN': self.STOKEN})

    def fetch_tbs(self):
-        r = self.session.get('http://tieba.baidu.com/dc/common/tbs').json()
-        if r['is_login'] == 1:
-            self.tbs = r['tbs']
-        else:
-            raise Exception('获取tbs错误！以下为返回数据：' + str(r))
+        try:
+            r = self.session.get('http://tieba.baidu.com/dc/common/tbs').json()
+            if r['is_login'] == 1:
+                self.tbs = r['tbs']
+            else:
+                raise Exception('获取tbs错误！以下为返回数据：' + str(r))
+        except Exception as e:
+            raise Exception(f'获取tbs时发生异常：{str(e)}')

    def fetch_likes(self):
-        self.rest = set()
-        self.already = set()
-        r = self.session.get('https://tieba.baidu.com/mo/q/newmoindex?').json()
-        if r['no'] == 0:
-            for forum in r['data']['like_forum']:
-                if forum['is_sign'] == 1:
-                    self.already.add(forum['forum_name'])
-                else:
-                    self.rest.add(forum['forum_name'])
-        else:
-            raise Exception('获取关注贴吧错误！以下为返回数据：' + str(r))
+        try:
+            self.rest = set()
+            self.already = set()
+            r = self.session.get('https://tieba.baidu.com/mo/q/newmoindex?').json()
+            if r['no'] == 0:
+                for forum in r['data']['like_forum']:
+                    if forum['is_sign'] == 1:
+                        self.already.add(forum['forum_name'])
+                    else:
+                        self.rest.add(forum['forum_name'])
+            else:
+                raise Exception('获取关注贴吧错误！以下为返回数据：' + str(r))
+        except Exception as e:
+            raise Exception(f'获取关注贴吧时发生异常：{str(e)}')

    def sign(self, forum_name):
-        data = {
-            'kw': forum_name,
-            'tbs': self.tbs,
-            'sign': md5(f'kw={forum_name}tbs={self.tbs}tiebaclient!!!'.encode('utf8')).hexdigest()
-        }
-        r = self.session.post('http://c.tieba.baidu.com/c/c/forum/sign', data).json()
-        if r['error_code'] == '160002':
-            print(f'"{forum_name}"已签到')
-            self.sign_list.append(forum_name)
-            return True
-        elif r['error_code'] == '0':
-            print(f'"{forum_name}">>>>>>>签到成功，您是第{r["user_info"]["user_sign_rank"]}个签到的用户！')
-            self.result[forum_name] = r
-            self.success_list.append(forum_name)
-            return True
-        else:
-            print(f'"{forum_name}"签到失败！以下为返回数据：{str(r)}')
+        try:
+            data = {
+                'kw': forum_name,
+                'tbs': self.tbs,
+                'sign': md5(f'kw={forum_name}tbs={self.tbs}tiebaclient!!!'.encode('utf8')).hexdigest()
+            }
+            r = self.session.post('http://c.tieba.baidu.com/c/c/forum/sign', data, timeout=self.REQUEST_TIMEOUT).json()
+            if r['error_code'] == '160002':
+                print(f'"{forum_name}"已签到')
+                self.sign_list.append(forum_name)
+                return True
+            elif r['error_code'] == '0':
+                print(f'"{forum_name}">>>>>>>签到成功，您是第{r["user_info"]["user_sign_rank"]}个签到的用户！')
+                self.result[forum_name] = r
+                self.success_list.append(forum_name)
+                return True
+            else:
+                print(f'"{forum_name}"签到失败！以下为返回数据：{str(r)}')
+                self.fail_list.append(forum_name)
+                return False
+        except Exception as e:
+            print(f'"{forum_name}"签到时发生异常：{str(e)}')
            self.fail_list.append(forum_name)
            return False

@@ -84,12 +101,19 @@ class Tieba():
        print(f'* 开始第{n}轮签到 *')
        rest = set()
        self.fetch_tbs()
-        for forum_name in self.rest:
-            flag = self.sign(forum_name)
-            if not flag:
-                rest.add(forum_name)
+        # 使用线程池并发签到
+        with ThreadPoolExecutor(max_workers=5) as executor:
+            futures = {executor.submit(self.sign, forum_name): forum_name for forum_name in self.rest}
+            for future in as_completed(futures):
+                forum_name = futures[future]
+                try:
+                    if not future.result():
+                        rest.add(forum_name)
+                except Exception as e:
+                    print(f'"{forum_name}"签到异常：{str(e)}')
+                    rest.add(forum_name)
        self.rest = rest
-        if n >= 10:  # 最大重试次数
+        if n >= self.MAX_RETRY:  # 使用类变量
            self.rest = set()

    def main(self, max):
@@ -114,28 +138,32 @@ class Tieba():
        self.send_notification_message()

    def send_notification_message(self):
-        msg = "贴吧签到结果：\n"
+        try:
+            msg = "贴吧签到结果：\n"

-        if self.success_list:
-            msg += "- **签到成功贴吧**：\n"
-            for forum in self.success_list:
-                sign_rank = self.result[forum]['user_info']['user_sign_rank']
-                msg += f"    {forum}  （签到成功，第{sign_rank}个签到）\n"
+            if self.success_list:
+                msg += "- **签到成功贴吧**：\n"
+                for forum in self.success_list:
+                    sign_rank = self.result[forum]['user_info']['user_sign_rank']
+                    msg += f"    {forum}  （签到成功，第{sign_rank}个签到）\n"

-        if self.sign_list:
-            msg += "- **已经签到的贴吧**：\n"
-            msg += "    " + "\n    ".join(self.sign_list) + "\n"
+            if self.sign_list:
+                msg += "- **已经签到的贴吧**：\n"
+                msg += "    " + ", ".join(self.sign_list)  # 去掉末尾的换行符

-        msg += f"\n共关注了{len(self.already) + len(self.success_list)}个贴吧，"
-        msg += f"本次成功签到了{len(self.success_list)}个，"
-        msg += f"失败了{len(self.fail_list)}个，"
-        msg += f"有{len(self.sign_list)}个贴吧已经签到。"
+            # 直接拼接统计信息，去掉前面的空行
+            msg += f"\n共关注了{len(self.already) + len(self.success_list)}个贴吧，"
+            msg += f"本次成功签到了{len(self.success_list)}个，"
+            msg += f"失败了{len(self.fail_list)}个，"
+            msg += f"有{len(self.sign_list)}个贴吧已经签到。"

-        # 发送通知
-        send('Tieba_Sign', msg)
+            # 发送通知
+            send('Tieba_Sign', msg)

-        # Add a 10-second delay before exiting
-        time.sleep(10)
+            # 使用类变量
+            time.sleep(self.SLEEP_TIME)
+        except Exception as e:
+            print(f'发送通知时发生异常：{str(e)}')

 if __name__ == "__main__":
    BDUSS_values = os.getenv("Tieba_BDUSS")