Merge pull request #102 from WittF/main

优化票ID处理机制

README.md

@@ -61,17 +61,17 @@ Running on local URL:  http://127.0.0.1:xxx
 	<tbody>
 		<tr>
             <td align="center">
-                <a href="https://github.com/mikumifa">
-                    <img src="https://avatars.githubusercontent.com/u/99951454?v=4" width="100;" alt="mikumifa"/>
+                <a href="https://github.com/WittF">
+                    <img src="https://avatars.githubusercontent.com/u/108567138?v=4" width="100;" alt="WittF"/>
                     <br />
-                    <sub><b>mikumifa</b></sub>
+                    <sub><b>W1ttF</b></sub>
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/WittF">
-                    <img src="https://avatars.githubusercontent.com/u/108567138?v=4" width="100;" alt="WittF"/>
+                <a href="https://github.com/mikumifa">
+                    <img src="https://avatars.githubusercontent.com/u/99951454?v=4" width="100;" alt="mikumifa"/>
                     <br />
-                    <sub><b>W1ttF</b></sub>
+                    <sub><b>mikumifa</b></sub>
                 </a>
             </td>
             <td align="center">

tab/settings.py

@@ -5,6 +5,7 @@
 
 from config import cookies_config_path
 from util.bili_request import BiliRequest
+from urllib.parse import urlparse, parse_qs
 
 buyer_value = []
 addr_value = []
@@ -20,14 +21,50 @@ def on_submit_ticket_id(num):
         buyer_value = []
         addr_value = []
         ticket_value = []
-        num = int(num)
+        extracted_id_message = ""
+        if "http" in num or "https" in num:
+            num = extract_id_from_url(num)
+            extracted_id_message = f"已提取URL票ID：{num}"
+        else:
+            try:
+                num = int(num)
+                extracted_id_message = f"票ID：{num}"
+            except ValueError:
+                return [
+                    gr.update(),
+                    gr.update(),
+                    gr.update(),
+                    gr.update(),
+                    gr.update(visible=True),
+                    gr.update(value='输入无效，请输入一个有效的票ID。', visible=True),
+                ]
         bili_request = BiliRequest(cookies_config_path=cookies_config_path)
         res = bili_request.get(
             url=f"https://show.bilibili.com/api/ticket/project/getV2?version=134&id={num}&project_id={num}"
         )
         ret = res.json()
         logger.debug(ret)
 
+        # 检查 errno
+        if ret.get('errno') == 100001:
+            return [
+                gr.update(),
+                gr.update(),
+                gr.update(),
+                gr.update(),
+                gr.update(visible=True),
+                gr.update(value='输入无效，请输入一个有效的票ID。', visible=True),
+            ]
+        elif ret.get('errno') != 0:
+            return [
+                gr.update(),
+                gr.update(),
+                gr.update(),
+                gr.update(),
+                gr.update(visible=True),
+                gr.update(value=ret.get('msg', '未知错误') + '。', visible=True),
+            ]
+
         data = ret["data"]
         ticket_str_list = []
 
@@ -84,7 +121,7 @@ def on_submit_ticket_id(num):
             gr.update(choices=addr_str_list),
             gr.update(visible=True),
             gr.update(
-                value=f"获取票信息成功:\n展会名称：{project_name}\n"
+                value=f"{extracted_id_message}\n获取票信息成功:\n展会名称：{project_name}\n"
                       f"开展时间：{project_start_time} - {project_end_time}\n场馆地址：{venue_name} {venue_address}",
                 visible=True,
             ),
@@ -99,6 +136,11 @@ def on_submit_ticket_id(num):
             gr.update(value=e, visible=True),
         ]
 
+def extract_id_from_url(url):
+    parsed_url = urlparse(url)
+    query_params = parse_qs(parsed_url.query)
+    return query_params.get('id', [None])[0]
+
 
 def on_submit_all(ticket_id, ticket_info, people_indices, people_buyer_index, address_index):
     try:

tab/train.py

@@ -29,7 +29,7 @@ def train_tab():
 | ------------------ | ------------------------------------------------------------ |
 | 手动               | 自己过，速度取决于自己，过程看项目的readme.md的GIF           |
 | 使用打码平台 rrocr | **支持**手动和人工同时使用 <br /> rrocr 提供的 http://www.rrocr.com<br /> 能过验证码，但是抢票没有测试，慎用 <br /> 需要购买对应的key，速度比手动快，价格 一次大概一分钱<br /> |
-| 使用过码服务 CapSolver | **不支持**手动和人工同时使用 <br />  CapSolver的过码方式<br />https://www.capsolver.com/zh <br />https://docs.capsolver.com/guide/captcha/Geetest.html|
+| 使用过码服务 CapSolver | **不支持**手动和人工同时使用<br />自动过码大约**需12秒起** <br />  CapSolver的过码方式<br />https://www.capsolver.com/zh <br />https://docs.capsolver.com/guide/captcha/Geetest.html|
 | .....              | 欢迎Discussion补充                                                     |
     
     """)