diff --git a/db/file.py b/db/file.py index 28df532..5069495 100644 --- a/db/file.py +++ b/db/file.py @@ -46,12 +46,17 @@ def new(filename: str, pagenumber:int): # 获取文件元数据 -def getMetadata(form: int, num: int): +def getMetadata(form: int, num: int, search:str = None): conn = util.getConn() c = conn.cursor() - cursor = c.execute( - "SELECT * FROM Metadata ORDER BY num desc LIMIT ?, ?", (form, num) - ) + if search is None: + cursor = c.execute( + "SELECT * FROM Metadata ORDER BY num desc LIMIT ?, ?", (form, num) + ) + else: + cursor = c.execute( + "SELECT * FROM Metadata WHERE filename LIKE ? ORDER BY num desc LIMIT ?, ?", (f"%{search}%", form, num) + ) out = [] for row in cursor: out.append(list(row)) diff --git a/templates/overview.html b/templates/overview.html index 638b69a..771d5dc 100644 --- a/templates/overview.html +++ b/templates/overview.html @@ -66,6 +66,11 @@ +
+ + +
+
{% for item in list %}
diff --git a/web/page.py b/web/page.py index ee3301c..7cca1e4 100644 --- a/web/page.py +++ b/web/page.py @@ -10,9 +10,9 @@ conf = app_conf.conf() @page_bp.route("/overview/") def overview(page): # 概览 page = int(page) - if request.cookies.get("islogin") is None: - return redirect("/") - metaDataList = db.file.getMetadata((page - 1) * 20, page * 20) + if request.cookies.get("islogin") is None: #验证登录状态 + return redirect("/") + metaDataList = db.file.getMetadata((page - 1) * 20, page * 20, request.args.get("search")) for item in metaDataList: item[2] = item[2][:-4] #去除文件扩展名 if page <= 3: @@ -31,8 +31,8 @@ def overview(page): # 概览 @page_bp.route("/book/") def book(bookid): # 接口 - if request.cookies.get("islogin") is None: - return abort(403) + if request.cookies.get("islogin") is None: #验证登录状态 + return redirect("/") data = db.file.searchByid(bookid) if len(data) == 0: return abort(404) @@ -50,8 +50,8 @@ def book(bookid): # 接口 @page_bp.route("/view/") def view(bookid): # 接口 - if request.cookies.get("islogin") is None: - return abort(403) + if request.cookies.get("islogin") is None: #验证登录状态 + return redirect("/") data = db.file.searchByid(bookid) if len(data) == 0: return abort(404) @@ -60,6 +60,8 @@ def view(bookid): # 接口 @page_bp.route("/upload", methods=["GET", "POST"]) # 文件上传 def upload_file(): + if request.cookies.get("islogin") is None: #验证登录状态 + return redirect("/") if request.method == "GET": return render_template("upload.html") uploaded_file = request.files.getlist("files[]") # 获取上传的文件列表