Parcourir la source

feat: request.args.get使用type

SongZihuan il y a 2 ans
Parent
commit
c8e95c25d4
5 fichiers modifiés avec 31 ajouts et 25 suppressions
  1. 6 4
      app/api.py
  2. 1 1
      app/archive.py
  3. 2 2
      app/auth.py
  4. 17 15
      app/docx.py
  5. 5 3
      app/msg.py

+ 6 - 4
app/api.py

@@ -29,7 +29,7 @@ def api_say_hello():
 @api.route("/get_introduce")
 @http_auth.login_required
 def api_get_introduce():
-    title = request.args.get("title").lower()
+    title = request.args.get("title", "", type=str).lower()
 
     res = {"status": 200, "introduce": {}}
     have_found = False
@@ -46,7 +46,7 @@ def api_get_introduce():
 @api.route("/find_me")
 @http_auth.login_required
 def api_get_find_me():
-    where = request.args.get("where")
+    where = request.args.get("where", None, type=str)
     if where:
         where = where.lower()
 
@@ -202,11 +202,12 @@ def api_get_comment(comment_id: int):
 @http_auth.login_required
 @api_role_required("ReadMsg", "api get msg list")
 def api_get_not_secret_msg_list(page: int):
-    msg_list = Message.get_message_list(20, (page - 1) * 20, request.args.get("secret", False))
+    msg_list = Message.get_message_list(20, (page - 1) * 20, False)
     res = {"status": 200}
     res_list = []
     for i in msg_list:
         res_list.append({
+            "secret": i.secret,
             "auth": i.auth.id,
             "update_time": datetime.timestamp(i.update_time),
             "id": i.id,
@@ -221,11 +222,12 @@ def api_get_not_secret_msg_list(page: int):
 @api_role_required("ReadMsg", "api get all msg secret list")
 @api_role_required("ReadSecretMsg", "api get all secret list")
 def api_get_secret_msg_list(page: int):
-    msg_list = Message.get_message_list(20, (page - 1) * 20, request.args.get("secret", True))
+    msg_list = Message.get_message_list(20, (page - 1) * 20, request.args.get("secret", 1, type=int) != 0)
     res = {"status": 200}
     res_list = []
     for i in msg_list:
         res_list.append({
+            "secret": i.secret,
             "auth": i.auth.id,
             "update_time": datetime.timestamp(i.update_time),
             "id": i.id,

+ 1 - 1
app/archive.py

@@ -62,7 +62,7 @@ def create_archive_page():
 @login_required
 @app.role_required("DeleteBlog", "delete archive")
 def delete_archive_page():
-    archive_id = int(request.args.get("archive", 1))
+    archive_id = int(request.args.get("archive", 1, type=int))
     if Archive(archive_id).delete():
         app.HBlogFlask.print_sys_opt_success_log(f"Delete archive {archive_id}")
         flash("归档删除成功")

+ 2 - 2
app/auth.py

@@ -154,7 +154,7 @@ def login_page():
         user = User(form.email.data)
         if user.info[2] != -1 and user.check_passwd(form.passwd.data):
             login_user(user, form.remember.data)
-            next_page = request.args.get("next")
+            next_page = request.args.get("next", None, type=str)
             if next_page is None or not next_page.startswith('/'):
                 next_page = url_for('base.index_page')
             flash("登陆成功")
@@ -188,7 +188,7 @@ def register_page():
 
 @auth.route('/user/confirm')
 def confirm_page():
-    token = request.args.get("token", None)
+    token = request.args.get("token", None, type=str)
     if token is None:
         app.HBlogFlask.print_user_opt_fail_log(f"Confirm (bad token)")
         abort(404)

+ 17 - 15
app/docx.py

@@ -121,14 +121,14 @@ def __load_docx_page(page: int, form: WriteBlogForm):
 
 @docx.route('/')
 def docx_page():
-    page = int(request.args.get("page", 1))
+    page = request.args.get("page", 1, type=int)
     return __load_docx_page(page, WriteBlogForm(True))
 
 
 @docx.route('/archive')
 def archive_page():
-    page = int(request.args.get("page", 1))
-    archive = int(request.args.get("archive", 1))
+    page = request.args.get("page", 1, type=int)
+    archive = request.args.get("archive", 1, type=int)
     if page < 1:
         app.HBlogFlask.print_user_opt_fail_log(f"Load archive-docx list with error page({page}) archive: {archive}")
         abort(404)
@@ -176,13 +176,13 @@ def __load_article_page(blog_id: int, form: WriteCommentForm,
 
 @docx.route('/article')
 def article_page():
-    blog_id = int(request.args.get("blog", 1))
+    blog_id = request.args.get("blog", 1, type=int)
     return __load_article_page(blog_id, WriteCommentForm())
 
 
 @docx.route('/article/download')
 def article_down_page():
-    blog_id = int(request.args.get("blog", 1))
+    blog_id = request.args.get("blog", 1, type=int)
     article = BlogArticle(blog_id)
     if article is None:
         app.HBlogFlask.print_user_opt_fail_log(f"Download article with error id({blog_id})")
@@ -197,7 +197,9 @@ def article_down_page():
 
 @docx.route('/article/create', methods=["POST"])
 @login_required
-@app.form_required(WriteBlogForm, "write blog", lambda form: __load_docx_page(int(request.args.get("page", 1)), form))
+@app.form_required(WriteBlogForm,
+                   "write blog",
+                   lambda form: __load_docx_page(request.args.get("page", 1, type=int), form))
 @app.role_required("WriteBlog", "write blog")
 def create_docx_page():
     form: WriteBlogForm = g.form
@@ -239,8 +241,8 @@ def update_docx_page():
 @login_required
 @app.role_required("DeleteBlog", "delete blog")
 def delete_blog_page():
-    blog_id = int(request.args.get("blog", -1))
-    if blog_id == -1:
+    blog_id = request.args.get("blog", None, type=int)
+    if not blog_id:
         return abort(400)
     if BlogArticle(blog_id).delete():
         app.HBlogFlask.print_sys_opt_success_log("delete blog")
@@ -255,9 +257,9 @@ def delete_blog_page():
 @login_required
 @app.role_required("WriteBlog", "set blog top")
 def set_blog_top_page():
-    blog_id = int(request.args.get("blog", -1))
-    top = request.args.get("top", '0') != '0'
-    if blog_id == -1:
+    blog_id = request.args.get("blog", None, type=int)
+    top = request.args.get("top", 0, type=int) != 0
+    if not blog_id:
         return abort(400)
     blog = BlogArticle(blog_id)
     blog.top = top
@@ -278,7 +280,7 @@ def set_blog_top_page():
 def update_archive_page():
     form: UpdateBlogArchiveForm = g.form
     article = BlogArticle(form.blog_id.data)
-    add = request.args.get("add", '0') != '0'
+    add = request.args.get("add", 0, type=int) != 0
     for i in form.archive.data:
         if add:
             article.add_to_archive(i)
@@ -291,10 +293,10 @@ def update_archive_page():
 @docx.route('/comment/create', methods=["POST"])
 @login_required
 @app.form_required(WriteCommentForm, "write comment",
-                   lambda form: __load_article_page(int(request.args.get("blog", 1)), form))
+                   lambda form: __load_article_page(request.args.get("blog", 1, type=int), form))
 @app.role_required("WriteComment", "write comment")
 def comment_page():
-    blog_id = int(request.args.get("blog", 1))
+    blog_id = request.args.get("blog", 1, type=int)
     form: WriteCommentForm = g.form
     content = form.content.data
     if Comment.create(BlogArticle(blog_id), current_user, content):
@@ -310,7 +312,7 @@ def comment_page():
 @login_required
 @app.role_required("DeleteComment", "delete comment")
 def delete_comment_page():
-    comment_id = int(request.args.get("comment", 1))
+    comment_id = request.args.get("comment", 1, type=int)
     if Comment(comment_id).delete():
         app.HBlogFlask.print_sys_opt_success_log("delete comment")
         flash("博文评论成功")

+ 5 - 3
app/msg.py

@@ -48,13 +48,15 @@ def __load_msg_page(page: int, form: WriteForm):
 
 @msg.route('/')
 def msg_page():
-    page = int(request.args.get("page", 1))
+    page = request.args.get("page", 1, type=int)
     return __load_msg_page(page, WriteForm())
 
 
 @msg.route('/create', methods=["POST"])
 @login_required
-@app.form_required(WriteForm, "write msg", lambda form: __load_msg_page(int(request.args.get("page", 1)), form))
+@app.form_required(WriteForm,
+                   "write msg",
+                   lambda form: __load_msg_page(request.args.get("page", 1, type=int), form))
 @app.role_required("WriteMsg", "write msg")
 def write_msg_page():
     form: WriteForm = g.form
@@ -73,7 +75,7 @@ def write_msg_page():
 @login_required
 @app.role_required("DeleteMsg", "delete msg")
 def delete_msg_page():
-    msg_id = int(request.args.get("msg", 1))
+    msg_id = request.args.get("msg", 1, type=int)
     if Message(msg_id).delete():
         app.HBlogFlask.print_user_opt_success_log("delete msg")
         flash("留言删除成功")