Explorar o código

함수로 대체

잉여개발기 (SPDV) %!s(int64=5) %!d(string=hai) anos
pai
achega
047c24764d
Modificáronse 3 ficheiros con 4 adicións e 38 borrados
  1. 0 1
      requirements.txt
  2. 3 37
      route/edit_many_delete.py
  3. 1 0
      route/tool/func.py

+ 0 - 1
requirements.txt

@@ -1,4 +1,3 @@
-tornado
 flask
 flask-Reggie
 requests

+ 3 - 37
route/edit_many_delete.py

@@ -1,4 +1,5 @@
 from .tool.func import *
+from . import edit_delete
 
 def edit_many_delete_2(conn, app_var):
     curs = conn.cursor()
@@ -10,44 +11,9 @@ def edit_many_delete_2(conn, app_var):
     if flask.request.method == 'POST':
         all_title = re.findall(r'([^\n]+)\n', flask.request.form.get('content', '').replace('\r\n', '\n') + '\n')
         for name in all_title:
-            curs.execute(db_change("select data from data where title = ?"), [name])
-            data = curs.fetchall()
-            if data:
-                today = get_time()
-                leng = '-' + str(len(data[0][0]))
+            edit_delete.edit_delete_2(conn, name, app_var)
 
-                history_plus(
-                    name,
-                    '',
-                    today,
-                    ip,
-                    flask.request.form.get('send', ''),
-                    leng,
-                    'delete'
-                )
-
-                curs.execute(db_change("select title, link from back where title = ? and not type = 'cat' and not type = 'no'"), [name])
-                for data in curs.fetchall():
-                    curs.execute(db_change("insert into back (title, link, type) values (?, ?, 'no')"), [data[0], data[1]])
-
-                curs.execute(db_change("delete from back where link = ?"), [name])
-                curs.execute(db_change("delete from data where title = ?"), [name])
-                conn.commit()
-
-            file_check = re.search(r'^file:(.+)\.(.+)$', name)
-            if file_check:
-                file_check = file_check.groups()
-                file_directory = os.path.join(
-                    app_var['path_data_image'], 
-                    sha224_replace(file_check[0]) + '.' + file_check[1]
-                )
-                if os.path.exists(file_directory):
-                    os.remove(file_directory)
-
-            curs.execute(db_change('select data from other where name = "count_all_title"'))
-            curs.execute(db_change("update other set data = ? where name = 'count_all_title'"), [str(int(curs.fetchall()[0][0]) - 1)])
-
-        return redirect('/recent_changes')
+            return redirect('/recent_changes')
     else:
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang('many_delete'), wiki_set(), custom(), other2([0, 0])],

+ 1 - 0
route/tool/func.py

@@ -11,6 +11,7 @@ for i in range(0, 2):
         import wsgiref.simple_server
         import urllib.request
         import email.mime.text
+        import requests
         import sqlite3
         import pymysql
         import hashlib