Add application file

README.md

@@ -1,6 +1,6 @@
 ---
-title: Eths
-emoji: 📚
+title: eths
+emoji: 🖊️
 colorFrom: blue
 colorTo: yellow
 python_version: 3.9.2

data/config.ini

@@ -0,0 +1,2 @@
+[thread_start_state]
+state = 0

data/ethscriptions_data.db

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d319025bbf787c48a363a383315652695c208852eb9f1c2521aabdcbf0305eda
-size 398127104
+oid sha256:299ff9699e6f7f4a75763b1cd7fa361c3c2820233f6cfa8f8cfc0f4cdf1c4b6a
+size 399089664

data/name_set.db

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:56d1986c2fb2f863758ebe863f3bb0e1314fa1c171455b88ab2a1ba8fa990d0f
-size 1728512
+oid sha256:117d6852105e8ba3543cc6a39daeef6e66c628999ad5299fe87c367835d3d704
+size 2281472

pages/1_🔍_批量查询铭文状态.py

@@ -3,6 +3,9 @@ import re
 import os
 import sqlite3
 import pandas as pd
+import time
+import matplotlib.pyplot as plt
+import random
 
 
 # 获取当前文件目录
@@ -20,14 +23,11 @@ def text_to_hex(text):
     return '0x' + ''.join(format(ord(char), '02x') for char in text)
 
 
-def get_name_set_data(set_choose):
-    global content_set
-    name_set_cursor.execute(f"SELECT data FROM set_data WHERE name='{set_choose}'")
-    content_set = f'{name_set_cursor.fetchone()[0]}'
-
-
 st.set_page_config(page_title="EthPen - 批量查询铭文状态", page_icon="🔍", layout='wide', initial_sidebar_state='auto')
 st.subheader('🔍 EthPen - 批量查询铭文状态', anchor=False, divider='rainbow')
+
+st.write("<style>div.row-widget.stRadio > div{background-color:white;border: 1px solid #e6e9ef;border-radius:8px;padding:10px;box-shadow: 2px 2px 10px #e6e9ef;}</style>", unsafe_allow_html=True)
+
 name_selected_option = st.radio("选择查询的类型：",
                                 ['🔤纯文本', '🪙代币铭文', '🆔.eths', '🆔.eth', '🌲.tree', '🦛.honk', '🔄.etch', '🌐.com', '🥳.club'], index=0,
                                 horizontal=True)
@@ -48,7 +48,7 @@ if name_selected_option == '🪙代币铭文':
             token_str_list.append(token_str.replace('@#', str(token_id)))
     content_set = '\n'.join(token_str_list)
     st.code(token_str_list[0], language="json", line_numbers=False)
-    content = st.text_area('只需简单输入或粘贴您想查询的铭文列表,或是一篇文章,即可轻松查询所有铭文的状态。', value=content_set)
+    content = st.text_area('铭文列表：', value=content_set)
 else:
     token_check = False
 if name_selected_option == '🆔.eths':
@@ -67,132 +67,57 @@ if name_selected_option == '🥳.club':
     check_type = '.club'
 
 if not token_check:
-    options = ["⌨️直接输入", "🔥热门", "🔢数字", "🖊️Emoji", "🔤字母", "📛名字", "💡其他", "📃导入文件"]
-
-    name_set = st.radio("选择系列（生成器）：", options, index=0, disabled=token_check, horizontal=True)
-
-    if name_set:
-        if name_set == "⌨️直接输入":
-            content_set = ''
-        if name_set == "🔥热门":
-            hot_options = ["数字 1K", "稀有 4D", "数字 10K", "数字 100K"]
-            hot_name_set = st.radio("热门系列", hot_options, index=0, disabled=token_check, horizontal=True, label_visibility="collapsed")
-            if hot_name_set == '数字 1K':
-                get_name_set_data(hot_name_set)
-            if hot_name_set == '稀有 4D':
-                get_name_set_data(hot_name_set)
-            if hot_name_set == '数字 10K':
-                get_name_set_data(hot_name_set)
-            if hot_name_set == '数字 100K':
-                get_name_set_data(hot_name_set)
-
-        if name_set == "🔢数字":
-            digit_options = ["数字 1K", "稀有 4D", "数字 10K", "数字 100K"]
-            digit_name_set = st.radio("数字系列", digit_options, index=0, disabled=token_check, horizontal=True, label_visibility="collapsed")
-            if digit_name_set == '数字 1K':
-                get_name_set_data(digit_name_set)
-            if digit_name_set == '稀有 4D':
-                get_name_set_data(digit_name_set)
-            if digit_name_set == '数字 10K':
-                get_name_set_data(digit_name_set)
-            if digit_name_set == '数字 100K':
-                get_name_set_data(digit_name_set)
-
-        if name_set == "🖊️Emoji":
-            emoji_options = ["单个 Emoji", "Emoji 笑脸和人", "Emoji 动物和自然", "Emoji 食物和饮料", "Emoji 活动",
-                             "Emoji 旅行和地点", "Emoji 物体", "Emoji 符号", "Emoji 旗帜", "Emoji99", "Emoji1K", "Emoji10K"]
-            emoji_name_set = st.radio("emoji系列", emoji_options, index=0, disabled=token_check, horizontal=True, label_visibility="collapsed")
-            if emoji_name_set == '单个 Emoji':
-                get_name_set_data(emoji_name_set)
-            if emoji_name_set == 'Emoji 笑脸和人':
-                get_name_set_data(emoji_name_set)
-            if emoji_name_set == 'Emoji 动物和自然':
-                get_name_set_data(emoji_name_set)
-            if emoji_name_set == 'Emoji 食物和饮料':
-                get_name_set_data(emoji_name_set)
-            if emoji_name_set == 'Emoji 活动':
-                get_name_set_data(emoji_name_set)
-            if emoji_name_set == 'Emoji 旅行和地点':
-                get_name_set_data(emoji_name_set)
-            if emoji_name_set == 'Emoji 物体':
-                get_name_set_data(emoji_name_set)
-            if emoji_name_set == 'Emoji 符号':
-                get_name_set_data(emoji_name_set)
-            if emoji_name_set == 'Emoji 旗帜':
-                get_name_set_data(emoji_name_set)
-            if emoji_name_set == 'Emoji99':
-                get_name_set_data(emoji_name_set)
-            if emoji_name_set == 'Emoji1K':
-                get_name_set_data(emoji_name_set)
-            if emoji_name_set == 'Emoji10K':
-                get_name_set_data(emoji_name_set)
-        if name_set == "🔤字母":
-            letter_options = ["四字母单词", "五字母单词", "助记词", "英语名词"]
-            letter_name_set = st.radio("字母系列", letter_options, index=0, disabled=token_check, horizontal=True, label_visibility="collapsed")
-            if letter_name_set == '四字母单词':
-                get_name_set_data(letter_name_set)
-            if letter_name_set == '五字母单词':
-                get_name_set_data(letter_name_set)
-            if letter_name_set == '助记词':
-                get_name_set_data(letter_name_set)
-            if letter_name_set == '英语名词':
-                get_name_set_data(letter_name_set)
-        if name_set == "📛名字":
-            full_name_options = ["全球姓氏", "全球名字", "百家姓", "美国姓氏", "美国男名", "美国女名", "宝可梦第一世代", "宝可梦",
-                           "哈利波特", "星球大战", "魔力宝贝", "我的世界"]
-            full_name_set = st.radio("名字系列", full_name_options, index=0, disabled=token_check, horizontal=True, label_visibility="collapsed")
-            if full_name_set == '全球姓氏':
-                get_name_set_data(full_name_set)
-            if full_name_set == '全球名字':
-                get_name_set_data(full_name_set)
-            if full_name_set == '百家姓':
-                get_name_set_data(full_name_set)
-            if full_name_set == '美国姓氏':
-                get_name_set_data(full_name_set)
-            if full_name_set == '美国男名':
-                get_name_set_data(full_name_set)
-            if full_name_set == '美国女名':
-                get_name_set_data(full_name_set)
-            if full_name_set == '宝可梦第一世代':
-                get_name_set_data(full_name_set)
-            if full_name_set == '宝可梦':
-                get_name_set_data(full_name_set)
-            if full_name_set == '哈利波特':
-                get_name_set_data(full_name_set)
-            if full_name_set == '星球大战':
-                get_name_set_data(full_name_set)
-            if full_name_set == '魔力宝贝':
-                get_name_set_data(full_name_set)
-            if full_name_set == '我的世界':
-                get_name_set_data(full_name_set)
-        if name_set == "💡其他":
-            other_name_options = ["汉字", "24H 计时"]
-            other_name_set = st.radio("其他系列", other_name_options, index=0, disabled=token_check, horizontal=True, label_visibility="collapsed")
-            if other_name_set == '汉字':
-                get_name_set_data(other_name_set)
-            if other_name_set == '24H 计时':
-                get_name_set_data(other_name_set)
-        if name_set == "📃导入文件":
-            uploaded_file = st.file_uploader("上传文件", type=['txt', 'csv', 'xlsx'])
-
-            if uploaded_file is not None:
-                if uploaded_file.type not in ['text/plain', 'text/csv', 'application/vnd.ms-excel']:
-                    st.error('文件类型不支持')
-                else:
-                    # 读取上传的文件内容
-                    uploaded_file_contents = uploaded_file.read().decode('utf-8')
-
-                    # 将文件内容分割成列表，使用空格、换行符和逗号作为分隔符
-                    separators = [' ', '\n', ',']
-                    uploaded_file_contents_list = re.split('|'.join(map(re.escape, separators)), uploaded_file_contents)
-
-                    # 在这里，file_contents_list 包含了分割后的文本元素
-                    # 去除重复元素，将列表转换为集合，然后再转回列表
-                    uploaded_unique_contents_list = list(set(uploaded_file_contents_list))
-                    content_set = ' '.join(uploaded_unique_contents_list)
+    # 执行SQL查询，获取所有表名
+    name_set_cursor.execute("SELECT name FROM sqlite_master WHERE type='table'")
+    # 检索查询结果
+    tables = name_set_cursor.fetchall()
+    name_srt_tables_options = []
+    name_srt_tables_options.append('⌨️ 直接输入')
+    for table in tables:
+        name_srt_tables_options.append(table[0])
+    name_srt_tables_options.append('📃 导入文件')
+    name_set_table = st.radio("选择系列：", name_srt_tables_options, index=0, disabled=token_check, horizontal=True)
+    if name_set_table and name_set_table != '⌨️ 直接输入' and name_set_table != '📃 导入文件':
+        name_set_tables_name_options = []
+        # 执行SQL查询，获取指定表的所有 'name' 列的值
+        name_set_cursor.execute(f"SELECT name FROM {name_set_table}")
+        # 检索查询结果
+        names = name_set_cursor.fetchall()
+        # 打印所有 'name' 列的值
+        for name in names:
+            name_set_tables_name_options.append(name[0])
+        name_set_tables_name_options.sort()
+        name_set_table_name = st.radio("系列", name_set_tables_name_options, index=0, disabled=token_check, horizontal=True,
+                                label_visibility="collapsed")
+        if name_set_table_name:
+            # 执行SQL查询，获取指定表的 'name' 和 'data' 列的值
+            name_set_cursor.execute(f"SELECT data FROM {name_set_table} WHERE name='{name_set_table_name}'")
+            # 检索查询结果
+            all_data = name_set_cursor.fetchall()
+            content_set = f'{all_data[0][0]}'
+    if name_set_table == "⌨️ 直接输入":
+        content_set = ''
+    if name_set_table == "📃 导入文件":
+        uploaded_file = st.file_uploader("上传文件", type=['txt', 'csv', 'xlsx'])
+        if uploaded_file is not None:
+            if uploaded_file.type not in ['text/plain', 'text/csv', 'application/vnd.ms-excel']:
+                st.error('文件类型不支持')
+            else:
+                # 读取上传的文件内容
+                uploaded_file_contents = uploaded_file.read().decode('utf-8')
+
+                # 将文件内容分割成列表，使用空格、换行符和逗号作为分隔符
+                separators = [' ', '\n', ',']
+                uploaded_file_contents_list = re.split('|'.join(map(re.escape, separators)), uploaded_file_contents)
+
+                # 在这里，file_contents_list 包含了分割后的文本元素
+                # 去除重复元素，将列表转换为集合，然后再转回列表
+                uploaded_unique_contents_list = list(set(uploaded_file_contents_list))
+                content_set = ' '.join(uploaded_unique_contents_list)
 
 if not token_check:
-    if st.checkbox(f'自定义前后缀'):
+    custom_suffix = st.toggle('自定义前后缀')
+    if custom_suffix:
         col1, col2 = st.columns(2)
         with col1:
             custom_prefix = st.text_input("自定义前缀")
@@ -206,7 +131,8 @@ if not token_check:
         custom_prefix, custom_suffix = '', ''
 
 if not token_check:
-    if st.checkbox(f'过滤器'):
+    filter = st.toggle('过滤器')
+    if filter:
         col1, col2, col3, col4, col5, col6 = st.columns(6)
         with col1:
             start_with = st.text_input("以*开头", key='过滤器（可选）1')
@@ -246,14 +172,17 @@ if not token_check:
         content_set = ' '.join(filtered_list)
 
 if not token_check:
-    content = st.text_area('只需简单输入或粘贴您想查询的铭文列表,或是一篇文章,即可轻松查询所有铭文的状态。', value=content_set)
+    content = st.text_area('铭文列表：', value=content_set)
+
 
-if st.checkbox('隐藏已题写'):
+hide_inscribed = st.toggle('隐藏已题写')
+if hide_inscribed:
     hide_inscribed = True
 else:
     hide_inscribed = False
 
 if st.button('🔎 查询', key='🔎 查询'):
+    st.markdown(f'## 📄 查询结果')
     all_items = []
     names = []
     if token_check:
@@ -284,7 +213,8 @@ if st.button('🔎 查询', key='🔎 查询'):
     ethscriptions_conn = sqlite3.connect(ethscrptions_db_file)
 
     ethscriptions_cursor = ethscriptions_conn.cursor()
-
+    names_total = len(names)
+    name_not_yet_total = 0
     result = []
     for index in range(len(names)):
         ethscriptions_cursor.execute("SELECT * FROM data WHERE data=?", (all_items[index],))
@@ -292,13 +222,15 @@ if st.button('🔎 查询', key='🔎 查询'):
         if hide_inscribed:
             if not row:
                 result.append({"铭文": names[index], "状态": "未题写", "十六进制数据": all_items[index]})
+                name_not_yet_total += 1
         else:
             if row:
                 result.append({"铭文": names[index], "状态": "已题写", "十六进制数据": all_items[index]})
             else:
                 result.append({"铭文": names[index], "状态": "未题写", "十六进制数据": all_items[index]})
-
-    if result == []:
+                name_not_yet_total += 1
+    st.progress(name_not_yet_total / names_total, f'题写进度（{name_not_yet_total / names_total * 100:.0f}%）：')
+    if not result:
         st.markdown(f'## ☹️ 你来迟了~')
     else:
         # 将结果转换为Pandas DataFrame
@@ -308,11 +240,10 @@ if st.button('🔎 查询', key='🔎 查询'):
         csv_export = result_df.to_csv(index=False, encoding='utf-8')
         # Add a download button for the DataFrame
         st.download_button(
-            label="下载搜索结果",
+            label="⏬ 下载搜索结果",
             data=csv_export,
             file_name="ethpen_result_data.csv",
             mime="text/csv"
         )
 
 
-

pages/4_💹️_铭文数据分析.py

@@ -7,6 +7,7 @@ import time
 from datetime import datetime, timezone
 import threading
 import base64
+import configparser
 
 # 使用你的Ethereum节点的RPC地址
 w3 = Web3(Web3.HTTPProvider("https://mainnet.infura.io/v3/9bbc614b8a1d49d59869e97d0ee3bf61"))
@@ -17,6 +18,8 @@ parent_dir = os.path.dirname(current_dir)
 # 构造数据库文件路径
 eths_db_file = os.path.join(parent_dir, 'data', 'eths_data.db')
 ethscrptions_db_file = os.path.join(parent_dir, 'data', 'ethscriptions_data.db')
+config_ini_file = os.path.join(parent_dir, 'data', 'config.ini')
+
 
 ethscriptions_con = sqlite3.connect(ethscrptions_db_file)
 ethscriptions_cur = ethscriptions_con.cursor()
@@ -185,8 +188,11 @@ if eths_data:
         eths_stakers = st.metric(label='ETHS TVL', value=f'${eths_data[0][8]:,.0f}')
 
 
-# index_status = st.empty()
-# # st.markdown(f'*EthPen Ethscriptions Index Status: {processed_block}/{latest_block_number}*')
+# with st.expander('🆕新铭文题写', expanded=True):
+#
+#
+
+
 ethscriptions_cur.execute("SELECT block_number FROM process_blocks")
 index_result = ethscriptions_cur.fetchone()
 index_processed_block = index_result[0]
@@ -207,25 +213,24 @@ if download:
         mime='application/octet-stream'
     )
 
-# 查询state列的值
-ethscriptions_cur.execute("SELECT state FROM thread_start_state")
-state_value = ethscriptions_cur.fetchone()[0]
-if state_value == "0":
-    # 修改状态值
-    new_state = "1"
-    ethscriptions_cur.execute("UPDATE thread_start_state SET state = ?", (new_state,))
-    ethscriptions_con.commit()
-    ethscriptions_con.close()
-    # index_status_thread = threading.Thread(target=get_index_status, args=(index_status,))
+config = configparser.ConfigParser()
+config.read(config_ini_file)
+thread_start_state_value = config['thread_start_state']['state']
+if thread_start_state_value == '0':
+    print('线程未启动。')
+    config['thread_start_state']['state'] = '1'
+    with open(config_ini_file, 'w') as configfile:
+        config.write(configfile)
+
     eths_thread = threading.Thread(target=get_eths_data)
     ethscriptions_thread = threading.Thread(target=get_ethscriptions_data)
 
     # 启动线程
-    # index_status_thread.start()
     eths_thread.start()
     ethscriptions_thread.start()
 
     # 等待线程结束
     eths_thread.join()
     ethscriptions_thread.join()
-    # index_status_thread.join()
+else:
+    print('线程已经启动。')

🖊️EthPen-以太之笔.py

@@ -1126,7 +1126,7 @@ def get_eths_staking():
     return {}  # 返回一个空字典作为默认值
 
 
-st.set_page_config(page_title="EthPen - 以太之笔", page_icon="🖊", layout='wide', initial_sidebar_state='auto')
+st.set_page_config(page_title="EthPen - 以太之笔", page_icon="🖊", layout='wide', initial_sidebar_state='collapsed')
 
 # 首页
 st.markdown(
@@ -1263,48 +1263,59 @@ if search_rune_expander.button('🔍 查询', key='批量查询铭文'):
     table_data.drop(columns=['sort_helper'], inplace=True)
 
     # 定义样式和生成带有专门类名的HTML表格
-    table_style = """
-    <style>
-        .styled_table {
-            width: 100%;
-            border-collapse: collapse;
-            border-radius: 8px;
-            overflow: hidden;  /* Ensures border-radius applies to table */
-        }
-        .styled_table th, .styled_table td {
-            border: 1px solid #ddd;
-            padding: 8px;
-            text-align: left;
-        }
-        .styled_table th {
-            background-color: #f2f2f2;
-            color: black;
-        }
-        .styled_table tr:hover {
-            background-color: #f5f5f5;
-        }
-        .styled_table td[status="已题写"] {
-            background-color: #f2dede;  /* Reddish */
-        }
-        .styled_table td[status="未题写"] {
-            background-color: #dff0d8;  /* Greenish */
-        }
-    </style>
-    """
-    search_rune_expander.markdown(table_style, unsafe_allow_html=True)
-    table_html = table_data.to_html(index=False, classes='styled_table', border=0, escape=False,
-                                    formatters=dict(状态=lambda x: f'<td status="{x}">{x}</td>'))
-
-    # 生成HTML表格但不为状态列添加特殊格式
-    table_html = table_data.to_html(index=False, classes='styled_table', border=0, escape=False)
-
-    # 使用字符串替换为状态列添加特定属性
-    table_html = table_html.replace('<td>已题写</td>', '<td status="已题写">已题写</td>')
-    table_html = table_html.replace('<td>未题写</td>', '<td status="未题写">未题写</td>')
-
-    # 使用st.write输出带样式的HTML表格
-    search_rune_expander.write(table_html, unsafe_allow_html=True)
-    search_rune_expander.markdown('')
+    # table_style = """
+    # <style>
+    #     .styled_table {
+    #         width: 100%;
+    #         border-collapse: collapse;
+    #         border-radius: 8px;
+    #         overflow: hidden;  /* Ensures border-radius applies to table */
+    #     }
+    #     .styled_table th, .styled_table td {
+    #         border: 1px solid #ddd;
+    #         padding: 8px;
+    #         text-align: left;
+    #     }
+    #     .styled_table th {
+    #         background-color: #f2f2f2;
+    #         color: black;
+    #     }
+    #     .styled_table tr:hover {
+    #         background-color: #f5f5f5;
+    #     }
+    #     .styled_table td[status="已题写"] {
+    #         background-color: #f2dede;  /* Reddish */
+    #     }
+    #     .styled_table td[status="未题写"] {
+    #         background-color: #dff0d8;  /* Greenish */
+    #     }
+    # </style>
+    # """
+    # search_rune_expander.markdown(table_style, unsafe_allow_html=True)
+    # table_html = table_data.to_html(index=False, classes='styled_table', border=0, escape=False,
+    #                                 formatters=dict(状态=lambda x: f'<td status="{x}">{x}</td>'))
+    #
+    # # 生成HTML表格但不为状态列添加特殊格式
+    # table_html = table_data.to_html(index=False, classes='styled_table', border=0, escape=False)
+    #
+    # # 使用字符串替换为状态列添加特定属性
+    # table_html = table_html.replace('<td>已题写</td>', '<td status="已题写">已题写</td>')
+    # table_html = table_html.replace('<td>未题写</td>', '<td status="未题写">未题写</td>')
+    #
+    # # 使用st.write输出带样式的HTML表格
+    # search_rune_expander.write(table_html, unsafe_allow_html=True)
+    # search_rune_expander.markdown('')
+    result_df = pd.DataFrame(table_data)
+    search_rune_expander.dataframe(result_df, use_container_width=True, hide_index=True)
+    # Convert DataFrame to CSV with proper encoding
+    csv_export = result_df.to_csv(index=False, encoding='utf-8')
+    # Add a download button for the DataFrame
+    search_rune_expander.download_button(
+        label="下载搜索结果",
+        data=csv_export,
+        file_name="ethpen_result_data.csv",
+        mime="text/csv"
+    )
 
 # 题写铭文页面
 create_rune_expander.markdown("##### 文本转换到十六进制")