1.7

app.py

@@ -1,11 +1,28 @@
 import io
 
 import gradio as gr
-from PIL import Image
 
 from login import catch_qr, get_uid_key
 from nft import up_card
 
+sid_map = {
+    "SHN48荣耀时刻": 1,
+    "无": 2,
+    "无2": 3,
+    "胶囊计划": 4,
+    "天官赐福": 5,
+    "A - AKB48TSH四周年": 6,
+    "B - AKB48TSH四周年": 7,
+    "C - AKB48TSH四周年": 8,
+    "D - AKB48TSH四周年": 9,
+    "E - AKB48TSH四周年": 10,
+    "F - AKB48TSH四周年": 11,
+    "G - AKB48TSH四周年": 12,
+    "H - AKB48TSH四周年": 13,
+    "三体动画": 14
+}
+card_type_choices = list(sid_map.keys())
+
 
 def qr(ava_image):
     if ava_image is not None:
@@ -14,14 +31,15 @@ def qr(ava_image):
     return {image_qr: None, login_info: None}
 
 
-def login_up_nft(ava_image, info):
+def login_up_nft(ava_image, info, sid):
     if info is not None:
         result, uid, key, code = get_uid_key(info)
         if result:
             bytes_object = io.BytesIO()
             ava_image.save(bytes_object, format='PNG')
             img_data = bytes_object.getvalue()
-            result, code = up_card(uid, key, img_data)
+            sid_id = sid_map[sid]
+            result, code = up_card(uid, key, img_data, sid_id)
             return code
         else:
             return code
@@ -51,8 +69,10 @@ with gr.Blocks() as demo:
         gr.Markdown("第三步:")
         with gr.Row():
             gr.Markdown(
-                """第二步完成后，3-15s内点击按钮<验证登录并提交头像>等待任务完成显示结果(成功可能需要时间审核)""")
-            text_button = gr.Button("验证登录并提交头像")
+                """第二步完成后，选择拥有卡组(三体的不用选择),3-15s内点击按钮<验证并提交头像>等待完成显示结果(成功可能需要时间审核)""")
+            with gr.Row():
+                sid_drop = gr.Dropdown(label="卡组", choices=card_type_choices, value="三体动画")
+                text_button = gr.Button("验证并提交头像")
             code_output = gr.Textbox(placeholder="提交结果")
 
     with gr.Accordion("代码引用及郑重提醒"):
@@ -62,6 +82,6 @@ with gr.Blocks() as demo:
         gr.Markdown("本软件纯属娱乐，不得用于其他用途，秋后算账别怨我！")
 
     image_ava.change(qr, inputs=[image_ava], outputs=[image_qr, login_info])
-    text_button.click(login_up_nft, inputs=[image_ava, login_info], outputs=[code_output])
+    text_button.click(login_up_nft, inputs=[image_ava, login_info, sid_drop], outputs=[code_output])
 
 demo.launch()

login.py

@@ -1,4 +1,3 @@
-import numpy as np
 import qrcode
 import time, requests, urllib, hashlib
 
@@ -54,7 +53,7 @@ def get_uid_key(login_info):
     login_data = {}
     code = "连接超时"
     attempt = 0
-    while not result and attempt < 3:
+    while not result and attempt < 2:
         try:
             result, login_data = catch_code()
             if result:
@@ -63,6 +62,6 @@ def get_uid_key(login_info):
             else:
                 time.sleep(1)
                 attempt += 1
-        except Exception:
-            return result, "0", "0", Exception.args[0]
+        except Exception as e:
+            return result, "0", "0", e.args[0]
     return result, "0", "0", code

nft.py

@@ -51,12 +51,12 @@ def get_image_type(file_path):
     return imghdr.what(None, data)
 
 
-def get_one_card_id(UID, ACCESS_KEY):
+def get_one_card_id(UID, ACCESS_KEY, sid):
     url = "https://api.bilibili.com/x/vas/nftcard/cardlist"
     params = SingableDict(
         {
             "access_key": ACCESS_KEY,
-            "act_id": "14",  # 这里默认已经是三体数字藏品卡14，github下载的默认是4，也就是胶囊卡
+            "act_id": sid,  # 这里默认已经是三体数字藏品卡14，github下载的默认是4，也就是胶囊卡
             "appkey": "4409e2ce8ffd12b8",
             "disable_rcmd": "0",
             "ruid": UID,
@@ -70,30 +70,27 @@ def get_one_card_id(UID, ACCESS_KEY):
         print(f"获取卡片信息出错，下面是 api 返回：\n{data}")
         return
     # print(data)  # 查询已添加无需再填
-    with CARD_INFO_PATH.open("w", encoding="utf8") as f:
-        json.dump(data, f, indent=4, ensure_ascii=False)
-        print(f"已将卡片信息写入 {CARD_INFO_PATH}")
-        for round in data['data']['round_list']:
-            for card in round['card_list']:
-                if card['card_type'] == 2 and card['card_id_list']:
-                    print(card['card_id_list'][0]['card_id'])
+    for round in data['data']['round_list']:
+        for card in round['card_list']:
+            if card['card_type'] == 2 and card['card_id_list']:
+                print(card['card_id_list'][0]['card_id'])
+                print("=================================")
+                print(f"找到付费卡 card_id: {card['card_id_list'][0]['card_id']}\n这个id属于{card['card_name']}")
+                print("=================================")
+                return card['card_id_list'][0]['card_id']
+    print('没有付费卡片')
+    for i in data["data"]["pre_list"]:
+        if card_id_list := i.get("card_id_list"):
+            for j in card_id_list:
+                if card_id := j.get("card_id"):
                     print("=================================")
-                    print(f"找到三体卡 card_id: {card['card_id_list'][0]['card_id']}\n这个id属于付费R级别胶囊计划")
+                    print(f"找到预约卡card_id: {card_id}\n这个 id 属于{i.get('card_name')}")
                     print("=================================")
-                    return card['card_id_list'][0]['card_id']
-        print('没有R级别胶囊计划的卡片')
-        for i in data["data"]["pre_list"]:
-            if card_id_list := i.get("card_id_list"):
-                for j in card_id_list:
-                    if card_id := j.get("card_id"):
-                        print("=================================")
-                        print(f"找到预约三体卡card_id: {card_id}\n这个 id 属于 {i.get('card_name')}")
-                        print("=================================")
-                        return card_id
-                    else:
-                        print()  # 有值的 card_id_list 中没找到 card_id ，可能是没领三体卡吧
-            else:
-                print()  # 卡片信息中没找到有值的 card_id_list ，可能是没有这张三体卡吧
+                    return card_id
+                else:
+                    print()  # 有值的 card_id_list 中没找到 card_id ，可能是没领三体卡吧
+        else:
+            print()  # 卡片信息中没找到有值的 card_id_list ，可能是没有这张三体卡吧
 
 
 def set_face(card_id, ACCESS_KEY, img_data):
@@ -128,17 +125,18 @@ def set_face(card_id, ACCESS_KEY, img_data):
     return True, '设置头像成功, 请等待审核'
 
 
-def up_card(uid, key, img_data):
+def up_card(uid, key, img_data, sid):
     UID = int(uid)
-    ACCESS_KEY = str(key)
+    access_key = str(key)
+    sid = str(sid)
     result = False
-    CODE = "超时"
+    code = "超时"
 
-    card_id = get_one_card_id(UID, ACCESS_KEY)  # 根据你所取得的卡card_id进行更改
+    card_id = get_one_card_id(UID, access_key, sid)  # 根据你所取得的卡card_id进行更改
     if not card_id:
-        CODE = "没找到 card_id ,请确认是否已经领取卡片"
+        code = "没找到 card_id ,请确认是否已经领取卡片"
     # img_url = upload_image(BG_PATH)
     # set_bg_img(img_url, card_id)
     else:
-        result, CODE = set_face(card_id, ACCESS_KEY, img_data)
-    return result, CODE
+        result, code = set_face(card_id, access_key, img_data)
+    return result, code

test.py

@@ -0,0 +1,6 @@
+
+try:
+    raise Exception('二维码已失效')
+except Exception as e:
+    print(type(e.args[0]))
+    print(e.args[0])