1.9

README.md

@@ -1,10 +1,10 @@
 ---
 title: NFT Avatar
-emoji: 📈
+emoji: 💎
 colorFrom: indigo
 colorTo: yellow
 sdk: gradio
-sdk_version: 3.16.1
+sdk_version: 3.16.1b1
 app_file: app.py
 pinned: false
 license: cc-by-3.0

app.py

@@ -1,9 +1,11 @@
-import io
-
 import gradio as gr
 
+import io
+import datetime
+from pytz import timezone
+
 from login import catch_qr, get_uid_key
-from nft import up_card
+from nft import having_card_id_list, card_id_set_ava
 
 sid_map = {
     "SHN48荣耀时刻": 1,
@@ -24,29 +26,81 @@ sid_map = {
 
 
 def qr(ava_image):
-    if ava_image is not None:
+    if ava_image:
         qr_img, info = catch_qr(ava_image)
         return {image_qr: qr_img, login_info: info}
     return {image_qr: None, login_info: None}
 
 
-def login_up_nft(ava_image, info, sid):
-    if info is not None:
-        result, uid, key, code = get_uid_key(info)
-        if result:
+def verify_login(info, u_verify, u_id, u_key, sid):
+    sid_num = sid_map[sid]
+    code = "请刷新页面并重新扫码登录"
+    if not u_verify:
+        result, u_id, u_key, code = get_uid_key(info)
+        if not result:
+            return False, "", "", sid_num, code
+        else:
+            u_verify = True
+    return u_verify, u_id, u_key, sid_num, code
+
+
+def back_card_id_list(info, u_verify, u_id, u_key, sid):
+    if info:
+        u_verify, u_id, u_key, sid_num, code = verify_login(info, u_verify, u_id, u_key, sid)
+        if u_verify:
+            result, had_card_id_list, code = having_card_id_list(u_id, u_key, sid_num)
+            if result:
+                print("获取卡牌列表成功")
+                card_name_list = list(had_card_id_list.keys())
+                return {verify: u_verify, uid: u_id, key: u_key, card_id_list: had_card_id_list,
+                        card_list_drop: gr.update(choices=card_name_list, value=card_name_list[0]), code_output: code}
+            else:
+                print("获取卡牌列表失败")
+                return {verify: u_verify, uid: u_id, key: u_key, card_list_drop: gr.update(choices=[]),
+                        code_output: code}
+    else:
+        return {code_output: "请先上传头像和扫码登录"}
+
+
+def name_get_card_id(card_id_list_dict, card_list_drop_name):
+    if card_id_list_dict and card_list_drop_name:
+        for card_name in card_id_list_dict.keys():
+            if card_name == card_list_drop_name:
+                cid = card_id_list_dict[card_name]
+                return {card_id: cid}
+    return {card_id: ""}
+
+
+def login_up_nft(info, u_verify, u_id, u_key, sid, cid, ava_image):
+    if info and ava_image:
+        u_verify, u_id, u_key, sid_num, code = verify_login(info, u_verify, u_id, u_key, sid)
+        if u_verify:
+            if not cid:
+                result, had_card_id_list, code = having_card_id_list(u_id, u_key, sid_num)
+                if had_card_id_list:
+                    cid = list(had_card_id_list.values())[0]
             bytes_object = io.BytesIO()
             ava_image.save(bytes_object, format='PNG')
             img_data = bytes_object.getvalue()
-            sid_id = sid_map[sid]
-            result, code = up_card(uid, key, img_data, sid_id)
-            return code
+            result, code = card_id_set_ava(cid, u_key, img_data)
+
+            tz = timezone('Asia/Shanghai')
+            now = datetime.datetime.now(tz)
+            print("提交完成:", now)
+
+            return {verify: u_verify, uid: u_id, key: u_key, code_output: code}
         else:
-            return code
+            return {verify: u_verify, uid: u_id, key: u_key, code_output: code}
     return "请先上传头像和扫码登录"
 
 
 with gr.Blocks() as demo:
     login_info = gr.State([])
+    card_id_list = gr.State({})
+    card_id = gr.State("")
+    verify = gr.State(False)
+    key = gr.State("")
+    uid = gr.State("")
     with gr.Tab("bili_NFT自定义头像"):
         gr.Markdown("30秒自定义钻石头像(NFT),一站式操作仅三步,无需下载安装,代码开源免费,拿我项目收费的都是骗子")
         gr.Markdown("""
@@ -62,17 +116,20 @@ with gr.Blocks() as demo:
         with gr.Row():
             with gr.Column():
                 gr.Markdown(
-                    "确保第一步领取三体数字藏品后，上传新头像,头像尽量为正方形并小于1024*1024像素，然后等待生成二维码并扫码登录进行授权(左上传头像，右扫码登录))")
+                    """确保第一步领取三体数字藏品后，上传新头像,头像尽量为正方形并长宽小于1024像素,右上角画笔按钮可裁剪,
+                    然后等待生成二维码并扫码登录进行授权(左上传头像，右扫码登录))""")
             image_ava = gr.Image(type="pil", label="上传头像")
             image_qr = gr.Image(type="pil", label="b站客户端扫码登录")
         gr.Markdown("第三步:")
         with gr.Row():
             gr.Markdown(
-                """第二步完成后，选择拥有卡组(三体的不用选择),3-15s内点击按钮<验证并提交头像>等待完成显示结果(成功可能需要时间审核)""")
+                """第二步完成后，选择拥有的卡组,并等待加载出所拥有的卡,再指定底卡,不选默认随机三体卡,
+                最后���击按钮<验证并提交头像>等待完成显示结果(成功可能需要时间审核)""")
             with gr.Row():
                 sid_drop = gr.Dropdown(label="卡组", choices=list(sid_map.keys()), value="三体动画")
-                text_button = gr.Button("验证并提交头像")
-            code_output = gr.Textbox(placeholder="提交结果")
+                card_list_drop = gr.Dropdown(label="指定已有底卡")
+                set_button = gr.Button("验证并提交头像")
+            code_output = gr.Textbox(label="提交结果", placeholder="请先点击提交按钮")
 
     with gr.Accordion("代码引用及郑重提醒"):
         gr.Markdown("https://github.com/wdvipa/custom_bilibili_nft")
@@ -81,6 +138,10 @@ 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, sid_drop], outputs=[code_output])
+    sid_drop.change(back_card_id_list, inputs=[login_info, verify, uid, key, sid_drop],
+                    outputs=[card_id_list, verify, uid, key, card_list_drop, code_output])
+    card_list_drop.change(name_get_card_id, inputs=[card_id_list, card_list_drop], outputs=[card_id])
+    set_button.click(login_up_nft, inputs=[login_info, verify, uid, key, sid_drop, card_id, image_ava],
+                     outputs=[verify, uid, key, code_output])
 
 demo.launch()

nft.py

@@ -1,6 +1,4 @@
 import time
-import json
-from pathlib import Path
 import requests
 from hashlib import md5
 from typing import Union
@@ -8,8 +6,6 @@ from urllib.parse import urlencode
 from requests_toolbelt.multipart.encoder import MultipartEncoder
 import imghdr
 
-CARD_INFO_PATH = Path(__file__).parent / "bili.json"  # 不要动
-
 
 class Crypto:
     APPKEY = '4409e2ce8ffd12b8'
@@ -51,7 +47,7 @@ def get_image_type(file_path):
     return imghdr.what(None, data)
 
 
-def get_one_card_id(UID, ACCESS_KEY, sid):
+def get_have_card_id_list(UID, ACCESS_KEY, sid):
     url = "https://api.bilibili.com/x/vas/nftcard/cardlist"
     params = SingableDict(
         {
@@ -70,27 +66,29 @@ def get_one_card_id(UID, ACCESS_KEY, sid):
         print(f"获取卡片信息出错，下面是 api 返回：\n{data}")
         return
     # print(data)  # 查询已添加无需再填
-    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_id}\n这个 id 属于{i.get('card_name')}")
-                    print("=================================")
-                    return card_id
-                else:
-                    print()  # 有值的 card_id_list 中没找到 card_id ，可能是没领三体卡吧
-        else:
-            print()  # 卡片信息中没找到有值的 card_id_list ，可能是没有这张三体卡吧
+    have_card_id_list = {}
+    try:
+        for round in data['data']['round_list']:
+            for card in round['card_list']:
+                if card['card_id_list']:
+                    print(f"找到付费卡 card_id: {card['card_id_list'][0]['card_id']}\n这个id属于{card['card_name']}")
+                    have_card_id_list.update({card['card_name']: card['card_id_list'][0]['card_id']})
+        if data["data"]["pre_list"]:
+            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(f"找到预约卡card_id: {card_id}\n这个 id 属于{i.get('card_name')}")
+                            have_card_id_list.update({i.get('card_name'): card_id})
+    except Exception as e:
+        print(f"处理卡牌列表出错{e.args[0]}，下面是 api 返回：\n{data}")
+        return {}
+    if have_card_id_list:
+        print(f"已经找到卡片")
+        return have_card_id_list
+    else:
+        print("没有找到可用的卡片")
+        return {}
 
 
 def set_face(card_id, ACCESS_KEY, img_data):
@@ -125,18 +123,18 @@ def set_face(card_id, ACCESS_KEY, img_data):
     return True, '设置头像成功, 请等待审核'
 
 
-def up_card(uid, key, img_data, sid):
-    UID = int(uid)
+def having_card_id_list(uid, key, sid):
+    uid = int(uid)
     access_key = str(key)
     sid = str(sid)
-    result = False
-    code = "超时"
-
-    card_id = get_one_card_id(UID, access_key, sid)  # 根据你所取得的卡card_id进行更改
-    if not 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)
+
+    had_card_id_list = get_have_card_id_list(uid, access_key, sid)  # 根据你所取得的卡card_id进行更改
+    if had_card_id_list:
+        return True, had_card_id_list, "已找到拥有卡牌"
+    return False, {}, "没找到任何card_id ,请确认当前卡组已拥有卡片"
+
+
+def card_id_set_ava(card_id, key, img_data):
+    access_key = str(key)
+    result, code = set_face(card_id, access_key, img_data)
     return result, code

requirements.txt

@@ -1,5 +1,5 @@
 numpy
-gradio
+gradio==3.16.1b1
 qrcode[pil]
 requests
 requests_toolbelt