修复了无法设置长度的bug

This commit is contained in:
MarkusJoe
2022-02-18 20:18:38 +08:00
parent 124ef6c596
commit d889e92976
3 files changed
+14 -9

No files matched your search

+9 -8
View File
@@ -37,13 +37,14 @@ def build_page(name: str, length: int, theme: str) -> list[bool or Response] or
"""
count = fetch_data(name)
if len(str(count)) > length: # 判断在数据库内的长度是否超过了设定的(或预设的)长度
print('sdadada')
return [False, ErrorProcess().too_lang_to_count(name)]
if 7 <= length <= 10: # 判断设定的长度是否超过阈值
zero_count = '0' * (length - len(str(count))) + str(count)
status, template = view_template(theme, length, name, zero_count)
if status:
if status is True:
return [True, template]
else:
elif status == 'BadTheme':
return [False, 'BadTheme']
else:
return [False, 'BadLength']
@@ -56,7 +57,7 @@ def requests_log() -> None:
:return:
"""
if request.path != '/favicon.ico': # 不记录favicon.ico的请求记录
logger.info(f'{request.host} {request.method} {request.path}')
logger.info(f'{request.host} {request.method} {request.full_path}')
file_list = os.listdir('./static/cache')
file_list.remove('.gitkeep')
@@ -105,17 +106,17 @@ def main() -> Response or str:
"""
args = request.args
name = str(args.get('name')).replace('None', 'null')
length = args.get('length')
theme = args.get('theme')
length = args.get('length')
try:
length = int(length)
except ValueError:
return ErrorProcess().error_length(length)
if theme == 'ls':
return ErrorProcess().get_theme_list()
if name and name != 'null':
if not length:
length = 7
elif type(length) is not int:
return ErrorProcess().error_length(length)
else:
length = int(length) # 将类型转换为整型
if not theme:
theme = 'lewd'
build_page_result = build_page(name, length, theme) # 开始处理整体页面
+5 -1
View File
@@ -7,11 +7,13 @@
import sqlite3
from typing import Tuple
from flask import render_template
from db.sqlite import fetch_style_data
from db.sqlite import fetch_table
def view_template(style: str, length: int, name: str, count: str) -> tuple[bool, bool] or tuple[bool, str]:
def view_template(style: str, length: int, name: str, count: str) -> str or tuple[bool, bool] or tuple[bool, str]:
"""
渲染模板
:param count:
@@ -20,6 +22,8 @@ def view_template(style: str, length: int, name: str, count: str) -> tuple[bool,
:param style:
:return:
"""
if style not in fetch_table():
return 'BadLength'
try:
origin_data = fetch_style_data(style) # 获取数据库内的文件
except sqlite3.OperationalError:
BIN
View File
Binary file not shown.