diff --git a/.gitignore b/.gitignore index a89ad7f..61d3ec8 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,5 @@ $* *.db venv/ __pycache__/ -.vscode/ \ No newline at end of file +.vscode/ +file_storage/ \ No newline at end of file diff --git a/src/__init__.py b/src/__init__.py index e45354b..469ce61 100644 --- a/src/__init__.py +++ b/src/__init__.py @@ -13,8 +13,10 @@ def create_app(test_config=None): DATABASE_USER='root', DATABASE_HOST='localhost', DATABASE_PASS='lil0,.lil0', + UPLOADDIR=os.path.join("./file_storage"), ) - + if not os.path.exists(app.config['UPLOADDIR']): + os.mkdir(app.config['UPLOADDIR']) if test_config is None: app.config.from_pyfile('config.py', silent=True) else: diff --git a/src/templates/user/book.html b/src/templates/user/book.html index 0cd3564..1f20b9b 100644 --- a/src/templates/user/book.html +++ b/src/templates/user/book.html @@ -1,102 +1,123 @@ {% extends 'base.html' %} {% block header %} - + {% endblock %} {% block content %} -
-
-
- -
-
-
-
{{book['book_name']}}
- {%if booktype|length > 0 %} -
- 分类标签： - {% for atype in booktype %} - {{atype['type_name']}} - {% endfor %} -
- {%endif%} - {%if book['book_author']%} -
- 作者：{{book['book_author']}} -
- {% endif %} - {%if book['book_publisher']%} -
- 出版社：{{book['book_publisher']}} -
- {% endif %} - {%if book['book_isbn']%} -
- ISBN：{{book['book_isbn']}} -
- {% endif %} - {%if book['book_lang']%} -
- 语言：{{book['book_lang']}} -
- {% endif %} -
+
+
+
+ +
+
+
+
{{book['book_name']}}
+ {%if booktype|length > 0 %} +
+ 分类标签： + {% for atype in booktype %} + {{atype['type_name']}} + {% endfor %} +
+ {%endif%} + {%if book['book_author']%} +
+ 作者：{{book['book_author']}} +
+ {% endif %} + {%if book['book_publisher']%} +
+ 出版社：{{book['book_publisher']}} +
+ {% endif %} + {%if book['book_isbn']%} +
+ ISBN：{{book['book_isbn']}} +
+ {% endif %} + {%if book['book_lang']%} +
+ 语言：{{book['book_lang']}} +
+ {% endif %} +
+
编辑图书信息
+
+
+
+ + +
+
+
+
+ 加一个评论 +
-
-
-
-
文档1
-
- 大小： - 日期： -
- - -
+
+
+
+ + {% for document in documents %} +
+
+
{{document['doc_name']}}
+
+ 大小 {{document['doc_size']}} KB + 日期{{document['doc_date']}} +
+ 下载 + 删除
-
-
- +
+ {% endfor %} +
+
+
+ space
-
- Rendered @ {{cur_time}} -
+
+
+ Rendered @ {{cur_time}}
+
{% endblock %} \ No newline at end of file diff --git a/src/templates/user/result.html b/src/templates/user/result.html index d6970eb..402176d 100644 --- a/src/templates/user/result.html +++ b/src/templates/user/result.html @@ -45,7 +45,11 @@

{{opresult}}

+ {% if ret_url %} +

返回

+ {% else %}

返回

+ {% endif %}
Rendered @ {{cur_time}} diff --git a/src/user.py b/src/user.py index 1f383cf..b1500c7 100644 --- a/src/user.py +++ b/src/user.py @@ -1,10 +1,8 @@ from flask import ( - Blueprint, flash, g, redirect, render_template, request, url_for + Blueprint, flash, g, redirect, render_template, request, url_for, send_file, current_app, ) -import re -from werkzeug.exceptions import abort -from werkzeug.security import generate_password_hash +import os from src.auth import login_required from src.db import get_db import pymysql @@ -211,8 +209,10 @@ def book(id): book = cur.fetchone() cur.execute("select * from v_book_to_types where book_id=%s", (book['book_id'], )) booktype = cur.fetchall() + cur.execute("select * from document where book_id=%s", (book['book_id'], )) + documents = cur.fetchall() return render_template("/user/book.html", - book=book, booktype=booktype, + book=book, booktype=booktype, documents=documents, cur_time=datetime.datetime.now()) @bp.route("/book/update//", methods=("GET", "POST")) @@ -292,4 +292,96 @@ def book_update(id): booktypestr += k['type_name'] + ';' return render_template("/user/updatebook.html", book=bookinfo, booktype=booktypestr, typelist=typelist, - cur_time=datetime.datetime.now()) \ No newline at end of file + cur_time=datetime.datetime.now()) + + +@bp.route("/doc/upload//", methods=("POST",)) +@login_required +def doc_upload(id): + db = get_db() + cur = db.cursor() + assert(request.method=="POST") + fileobj = request.files['file'] + error = None + if fileobj and fileobj.filename: + _, filename = os.path.split(fileobj.filename) + filepath = os.path.join(current_app.config['UPLOADDIR'], filename + f'.{int(datetime.datetime.timestamp(datetime.datetime.now()))}') + fileobj.save(filepath) + filesz = os.stat(filepath).st_size // 1024 # original in bytes + filetype = fileobj.mimetype + print(filetype) + print(filesz) + try: + cur.execute( + "insert into document (`doc_name`,`doc_url`,`doc_size`,`doc_type`,`book_id`,`user_id`)" + "values (%s,%s,%s,%s,%s,%s)", + (filename, filepath, filesz, filetype, id, g.user['user_id']) + ) + db.commit() + except pymysql.Error as _e: + error = "未知错误 %s" % (_e) + db.rollback() + else: + error = "未收到有效的文件" + cur.close() + if error is not None: + return render_template("/user/result.html", + opname="上传文件失败", opresult=error, + cur_time=datetime.datetime.now()) + return redirect(url_for("user.book", id=id)) + +@bp.route("/doc/download//", methods=("GET",)) +@login_required +def doc_download(docid): + db = get_db() + cur = db.cursor() + error = None + cur.execute("select * from document where doc_id=%s", (docid,)) + document = cur.fetchone() + + if document is None: + error = "文件不存在" + else: + docpath = os.path.join(os.getcwd(),document['doc_url']) + if os.path.exists(docpath): + return send_file(docpath, download_name=document['doc_name'], mimetype=document['doc_type']) + else: + error = "文件已被删除，严重的数据不一致，请联系管理员" + return render_template("/user/result.html", + opname="下载文件失败", opresult=error, + cur_time=datetime.datetime.now()) + +@bp.route("/doc/delete//", methods=("GET",)) +@login_required +def doc_delete(docid): + db = get_db() + cur = db.cursor() + error = None + warning = None + cur.execute("select * from document where doc_id=%s", (docid,)) + document = cur.fetchone() + + if document is None: + error = "文件不存在" + else: + docpath = os.path.join(os.getcwd(),document['doc_url']) + if os.path.exists(docpath): + os.remove(docpath) + else: + warning = "文件已经删除，但是数据库记录仍存在" + if error is None: + try: + cur.execute("delete from document where `doc_id`=%s", (docid)) + db.commit() + except pymysql.Error as _e: + error = "严重错误：%s。\n请联系管理员解决问题" % (_e) + cur.close() + if error is not None: + return render_template("/user/result.html", + opname="删除文件失败", opresult=error, + cur_time=datetime.datetime.now()) + elif warning is not None: + return render_template("/user/result.html", + opname="删除文件出现了一些意外", opresult=warning, + cur_time=datetime.datetime.now(), ret_url=url_for("user.book", id=document['book_id'])) + return redirect(url_for("user.book", id=document['book_id']))