자동 인덱스 되도록 수정

app.py

@@ -215,6 +215,11 @@ if setup_tool != 0:
                 curs.execute(db_change('select ' + create + ' from ' + create_table + ' limit 1'))
             except:
                 curs.execute(db_change("alter table " + create_table + " add " + create + " longtext default ''"))
+                
+            try:    
+                curs.execute(db_change('create index index_' + create_table + '_' + create + ' on ' + create_table + '(' + create + ')'))
+            except:
+                pass
 
     update()
 
@@ -329,7 +334,7 @@ all_title = curs.fetchall()
 if not all_title:
     curs.execute(db_change('insert into other (name, data) values ("count_all_title", "0")'))
 
-count_all_title()  
+# count_all_title()  
 
 # Func
 @app.route('/del_alarm')
@@ -394,10 +399,6 @@ def list_admin_use():
 def list_give():
     return list_give_2(conn)
 
-@app.route('/indexing', methods=['POST', 'GET'])
-def server_indexing():
-    return server_indexing_2(conn, set_data['db_type'])       
-
 @app.route('/restart', methods=['POST', 'GET'])
 def server_restart():
     return server_restart_2(conn)
@@ -476,7 +477,7 @@ def main_other():
 @app.route('/manager', methods=['POST', 'GET'])
 @app.route('/manager/<int:num>', methods=['POST', 'GET'])
 def main_manager(num = 1):
-    return main_manager_2(conn, num, version_list['master']['r_ver'], set_data['db_type'])
+    return main_manager_2(conn, num, version_list['master']['r_ver'])
         
 @app.route('/title_index')
 def list_title_index():

emergency_tool.py

@@ -53,7 +53,7 @@ while 1:
             break
         
 print('DB name : ' + set_data['db'])
-db_name = set_data['db']
+print('DB type : ' + set_data['db_type'])
 
 db_data_get(set_data['db_type'])
 
@@ -89,13 +89,13 @@ if set_data['db_type'] == 'mysql':
     curs = conn.cursor()
 
     try:
-        curs.execute(db_change('create database ? default character set utf8mb4;')%pymysql.escape_string(db_name))
+        curs.execute(db_change('create database ? default character set utf8mb4;')%pymysql.escape_string(set_data['db']))
     except:
         pass
 
-    curs.execute(db_change('use ?')%pymysql.escape_string(db_name))
+    curs.execute(db_change('use ?')%pymysql.escape_string(set_data['db']))
 else:
-    conn = sqlite3.connect(db_name + '.db', check_same_thread = False)
+    conn = sqlite3.connect(set_data['db'] + '.db', check_same_thread = False)
     curs = conn.cursor()
 
 load_conn(conn)

route/main_manager.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def main_manager_2(conn, num, r_ver, db_type):
+def main_manager_2(conn, num, r_ver):
     curs = conn.cursor()
     
     title_list = {
@@ -51,7 +51,6 @@ def main_manager_2(conn, num, r_ver, db_type):
                     <br>
                     <h2>''' + load_lang('server') + '''</h2>
                     <ul>
-                        ''' + (('<li><a href="/indexing">' + load_lang('indexing') + '</a></li>') if db_type == 'sqlite' else '') + '''
                         <li><a href="/restart">''' + load_lang('wiki_restart') + '''</a></li>
                         <li><a href="/update">''' + load_lang('update') + '''</a></li>
                         <li><a href="/oauth_setting">''' + load_lang('oauth_setting') + '''</a></li>

route/server_indexing.py

@@ -1,63 +0,0 @@
-from .tool.func import *
-
-def server_indexing_2(conn, db_type):
-    curs = conn.cursor()
-
-    if db_type == 'sqlite':
-        if admin_check() != 1:
-            return re_error('/error/3')
-
-        if flask.request.method == 'POST':
-            admin_check(None, 'indexing')
-
-            curs.execute(db_change("select name from sqlite_master where type = 'index'"))
-            data = curs.fetchall()
-            if data:
-                for delete_index in data:
-                    print('Delete : ' + delete_index[0])
-
-                    sql = 'drop index if exists ' + delete_index[0]
-                    
-                    try:
-                        curs.execute(db_change(sql))
-                    except:
-                        pass
-            else:
-                curs.execute(db_change("select name from sqlite_master where type in ('table', 'view') and name not like 'sqlite_%' union all select name from sqlite_temp_master where type in ('table', 'view') order by 1;"))
-                for table in curs.fetchall():            
-                    curs.execute(db_change('select sql from sqlite_master where name = ?'), [table[0]])
-                    cul = curs.fetchall()
-                    
-                    r_cul = re.findall('(?:([^ (]*) text)', str(cul[0]))
-                    
-                    for n_cul in r_cul:
-                        print('Create : index_' + table[0] + '_' + n_cul)
-
-                        sql = 'create index index_' + table[0] + '_' + n_cul + ' on ' + table[0] + '(' + n_cul + ')'
-                        try:
-                            curs.execute(db_change(sql))
-                        except:
-                            pass
-
-            conn.commit()
-            
-            return redirect()  
-        else:
-            curs.execute(db_change("select name from sqlite_master where type = 'index'"))
-            data = curs.fetchall()
-            if data:
-                b_data = load_lang('delete')
-            else:
-                b_data = load_lang('create')
-
-            return easy_minify(flask.render_template(skin_check(), 
-                imp = [load_lang('indexing'), wiki_set(), custom(), other2([0, 0])],
-                data =  '''
-                        <form method="post">
-                            <button type="submit">''' + b_data + '''</button>
-                        </form>
-                        ''',
-                menu = [['manager', load_lang('return')]]
-            ))   
-    else:
-        return redirect('/')

version.json

@@ -1,7 +1,7 @@
 {
     "master" : {
-        "r_ver" : "v3.1.5-master-16",
-        "c_ver" : "400005",
+        "r_ver" : "v3.1.5-master-17",
+        "c_ver" : "400006",
         "s_ver" : "6"
     }, "stable" : {
         "r_ver" : "v3.1.4-stable-03",