Просмотр исходного кода

fix bug and add func and fix code

https://github.com/openNAMU/openNAMU/issues/1779
잉여개발기 (SPDV) 3 лет назад
Родитель
Сommit
53ef7cab22
3 измененных файлов с 20 добавлено и 11 удалено
  1. 17 9
      route/edit_delete_file.py
  2. 2 2
      route/edit_delete_multiple.py
  3. 1 0
      route/tool/func.py

+ 17 - 9
route/edit_delete_file.py

@@ -1,32 +1,38 @@
 from .tool.func import *
+from .edit_delete import edit_delete
 
-def edit_delete_file(name = 'test.jpg'):
+# 처음으로 차세대 코드 방법론 적용
+# 앞으로 다 이렇게 작성할 예정
+def edit_delete_file(name : str = 'test.jpg') -> str:
     with get_db_connect() as conn:
-        curs = conn.cursor()
+        curs : typing.Union[sqlite3.dbapi2.Cursor, pymysql.cursors.Cursor, None] = conn.cursor()
 
-        ip = ip_check()
+        ip : str = ip_check()
         if admin_check() == 0:
             return re_error('/ban')
 
-        mime_type = re.search(r'([^.]+)$', name)
+        mime_type : typing.Union[re.Match, None] = re.search(r'([^.]+)$', name)
         if mime_type:
             mime_type = mime_type.group(1).lower()
         else:
             mime_type = 'jpg'
 
-        file_name = re.sub(r'\.([^.]+)$', '', name)
+        file_name : str = re.sub(r'\.([^.]+)$', '', name)
         file_name = re.sub(r'^file:', '', file_name)
 
-        file_all_name = sha224_replace(file_name) + '.' + mime_type
-        file_directory = os.path.join(load_image_url(), file_all_name)
+        file_all_name : str = sha224_replace(file_name) + '.' + mime_type
+        file_directory : str = os.path.join(load_image_url(), file_all_name)
 
-        if not os.path.exists(file_directory):
+        if(not os.path.exists(file_directory)):
             return redirect('/w/' + url_pas(name))
 
-        if flask.request.method == 'POST':
+        if(flask.request.method == 'POST'):
             admin_check(None, 'file del (' + name + ')')
             os.remove(file_directory)
 
+            if(flask.request.form.get('with_doc', '') != ''):
+                edit_delete(name)
+
             return redirect('/w/' + url_pas(name))
         else:
             return easy_minify(flask.render_template(skin_check(),
@@ -37,6 +43,8 @@ def edit_delete_file(name = 'test.jpg'):
                         <hr class="main_hr">
                         <a href="/image/''' + url_pas(file_all_name) + '''">/image/''' + url_pas(file_all_name) + '''</a>
                         <hr class="main_hr">
+                        <input name="with_doc" type="checkbox" checked> ''' + load_lang('file_delete_with_document') + '''
+                        <hr class="main_hr">
                         <button type="submit">''' + load_lang('file_delete') + '''</button>
                     </form>
                 ''',

+ 2 - 2
route/edit_delete_multiple.py

@@ -1,5 +1,5 @@
 from .tool.func import *
-from . import edit_delete
+from .edit_delete import edit_delete
 
 def edit_delete_multiple():
     with get_db_connect() as conn:
@@ -21,7 +21,7 @@ def edit_delete_multiple():
             
             all_title = re.findall(r'([^\n]+)\n', flask.request.form.get('content', '').replace('\r', '') + '\n')
             for name in all_title:
-                edit_delete.edit_delete(name)
+                edit_delete(name)
 
             return redirect('/recent_change')
         else:

+ 1 - 0
route/tool/func.py

@@ -8,6 +8,7 @@ import zipfile
 import shutil
 import logging
 import random
+import typing
 import ipaddress
 
 import email.mime.text