버그 수정, 이머전시 툴 기능 추가

app.py

@@ -34,12 +34,12 @@ except:
         if new_json == '':
             new_json = 'data'
             
-        with open('set.json', 'w') as f:
+        with open('data/set.json', 'w') as f:
             f.write('{ "db" : "' + new_json + '" }')
             
         set_data = json.loads(open('data/set.json').read())
         
-print('DB\'s name : ' + set_data['db'])
+print('DB name : ' + set_data['db'])
 db_name = set_data['db']
             
 if os.path.exists(db_name + '.db'):

emergency_tool.py

@@ -1,31 +1,25 @@
 from route.tool.func import *
 from route.tool.mark import load_conn2, namumark
 
-all_src = []
-for i_data in os.listdir("."):
-    f_src = re.search("(.+)\.db$", i_data)
-    if f_src:
-        all_src += [f_src.groups()[0]]
-
-if len(all_src) == 0:
-    exit()
-elif len(all_src) > 1:
-    db_num = 1
-
-    for i_data in all_src:
-        print(str(db_num) + ' : ' + i_data)
+try:
+    set_data = json.loads(open('data/set.json').read())
+except:
+    if os.getenv('NAMU_DB') != None:
+        set_data = { "db" : os.getenv('NAMU_DB') }
+    else:
+        print('DB name (data) : ', end = '')
         
-        db_num += 1
-
-    print('----')
-    print('Number : ', end = '')    
-    db_name = all_src[int(number_check(input())) - 1]
-else:
-    db_name = all_src[0]
-
-if len(all_src) == 1:
-    print('----')
-    print('DB\'s name : ' + db_name)
+        new_json = str(input())
+        if new_json == '':
+            new_json = 'data'
+            
+        with open('data/set.json', 'w') as f:
+            f.write('{ "db" : "' + new_json + '" }')
+            
+        set_data = json.loads(open('data/set.json').read())
+        
+print('DB name : ' + set_data['db'])
+db_name = set_data['db']
 
 conn = sqlite3.connect(db_name + '.db', check_same_thread = False)
 curs = conn.cursor()
@@ -42,6 +36,7 @@ print('6. Change skin')
 print('7. Change password')
 print('8. Reset version')
 print('9. New DB create')
+print('10. Delete set.json')
 
 print('----')
 print('Select : ', end = '')
@@ -135,7 +130,7 @@ elif what_i_do == '7':
     curs.execute("update user set pw = ? where id = ?", [hashed, user_name])
 elif what_i_do == '8':
     curs.execute("update other set data = '00000' where name = 'ver'")
-else:
+elif what_i_do == '9':
     print('----')
     print('DB name (data) : ', end = '')
     
@@ -144,6 +139,11 @@ else:
         db_name = 'data'
 
     sqlite3.connect(db_name + '.db', check_same_thread = False)
+elif what_i_do == '10':
+    try:
+        os.remove('data/set.json')
+    except:
+        pass
 
 conn.commit()
 

route/tool/set_mark/namu.py

@@ -259,7 +259,7 @@ def middle_parser(data, fol_num, syntax_num, folding_num):
                                                         if folding_num == 0:
                                                             folding_num = 1
                                                         
-                                                        data = re.sub('{{{#!folding ?((?:(?!\n).)*)\n?', '<div>' + str(folding_data[0]) + ' <div style="display: inline-block;"><a href="javascript:void(0);" onclick="folding(' + str(fol_num) + ');">[+]</a></div_end><div id="folding_' + str(fol_num) + '" style="display: none;"><div id="wiki_div" style="">', data, 1)
+                                                        data = re.sub('{{{#!folding ?((?:(?!\n).)*)\n?', '<div>' + str(folding_data[0]) + ' <div style="display: inline-block;"><a href="javascript:void(0);" onclick="folding(' + str(fol_num) + ');">[+]</a></div_end><div id="folding_' + str(fol_num) + '" style="display: none;"><div id="wiki_div" style="">\n', data, 1)
                                                         
                                                         fol_num += 1
                                                     else: