잉여개발기 (SPDV) 6 лет назад
Родитель
Сommit
94fbfaab84
3 измененных файлов с 36 добавлено и 56 удалено
  1. 23 27
      app.py
  2. 13 27
      emergency_tool.py
  3. 0 2
      route/tool/func.py

+ 23 - 27
app.py

@@ -74,6 +74,7 @@ while 1:
             break
         
 print('DB name : ' + set_data['db'])
+print('DB type : ' + set_data['db_type'])
 db_name = set_data['db']
 
 db_data_get(set_data['db_type'])
@@ -101,36 +102,20 @@ if set_data['db_type'] == 'mysql':
                 
         set_data_mysql = json.loads(open('data/mysql.json').read())
 
+    conn = pymysql.connect(
+        host = 'localhost', 
+        user = set_data_mysql['user'], 
+        password = set_data_mysql['password'],
+        charset = 'utf8mb4'
+    )
+    curs = conn.cursor()
+
     try:
-        conn = pymysql.connect(
-            host = 'localhost', 
-            user = set_data_mysql['user'], 
-            password = set_data_mysql['password'],
-            db = db_name, 
-            charset = 'utf8mb4'
-        )
+        curs.execute(db_change('create database ? default character set utf8mb4;')%pymysql.escape_string(db_name))
     except:
-        conn = pymysql.connect(
-            host = 'localhost', 
-            user = set_data_mysql['user'], 
-            password = set_data_mysql['password'],
-            db = db_name, 
-            charset = 'utf8mb4'
-        )
-        curs = conn.cursor()
-
-        curs.execute(db_change('create database ? default character set utf8mb4;'), [db_name])
-        conn.close()
-
-        conn = pymysql.connect(
-            host = 'localhost', 
-            user = set_data_mysql['user'], 
-            password = set_data_mysql['password'],
-            db = db_name, 
-            charset = 'utf8mb4'
-        )
+        pass
 
-    curs = conn.cursor()
+    curs.execute(db_change('use ?')%pymysql.escape_string(db_name))
 else:
     conn = sqlite3.connect(db_name + '.db', check_same_thread = False)
     curs = conn.cursor()
@@ -316,6 +301,17 @@ if back_time != 0:
 else:
     print('Back up state : Turn off')
 
+if set_data['db_type'] == 'mysql':
+    def mysql_dont_off():
+        try:
+            urllib.request.urlopen('http://localhost:' + str(server_set['port']) + '/')
+        except:
+            pass
+
+        threading.Timer(60 * 60 * 6, mysql_dont_off).start()
+
+    mysql_dont_off()
+
 conn.commit()
 
 def count_all_title():

+ 13 - 27
emergency_tool.py

@@ -1,5 +1,6 @@
 from route.tool.func import *
 
+# DB
 while 1:
     try:
         set_data = json.loads(open('data/set.json').read())
@@ -79,42 +80,27 @@ if set_data['db_type'] == 'mysql':
                 
         set_data_mysql = json.loads(open('data/mysql.json').read())
 
+    conn = pymysql.connect(
+        host = 'localhost', 
+        user = set_data_mysql['user'], 
+        password = set_data_mysql['password'],
+        charset = 'utf8mb4'
+    )
+    curs = conn.cursor()
+
     try:
-        conn = pymysql.connect(
-            host = 'localhost', 
-            user = set_data_mysql['user'], 
-            password = set_data_mysql['password'],
-            db = db_name, 
-            charset = 'utf8mb4'
-        )
+        curs.execute(db_change('create database ? default character set utf8mb4;')%pymysql.escape_string(db_name))
     except:
-        conn = pymysql.connect(
-            host = 'localhost', 
-            user = set_data_mysql['user'], 
-            password = set_data_mysql['password'],
-            db = db_name, 
-            charset = 'utf8mb4'
-        )
-        curs = conn.cursor()
-
-        curs.execute(db_change('create database ? default character set utf8mb4;'), [db_name])
-        conn.close()
-
-        conn = pymysql.connect(
-            host = 'localhost', 
-            user = set_data_mysql['user'], 
-            password = set_data_mysql['password'],
-            db = db_name, 
-            charset = 'utf8mb4'
-        )
+        pass
 
-    curs = conn.cursor()
+    curs.execute(db_change('use ?')%pymysql.escape_string(db_name))
 else:
     conn = sqlite3.connect(db_name + '.db', check_same_thread = False)
     curs = conn.cursor()
 
 load_conn(conn)
 
+# Main
 print('----')
 print('1. Backlink reset')
 print('2. reCAPTCHA delete')

+ 0 - 2
route/tool/func.py

@@ -422,8 +422,6 @@ def other2(data):
         <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/9.12.0/highlight.min.js"></script>
     ''' + req_list] + data[2:]
 
-    print(data[2:])
-
     return data
 
 def cut_100(data):