fix bug

app.py

@@ -2,13 +2,30 @@
 import os
 import re
 
+from route.tool.func import *
+# from route import *
+
 for i_data in os.listdir("route"):
     f_src = re.search(r"(.+)\.py$", i_data)
-    if f_src:
-        exec("from route." + f_src.group(1) + " import *")
+    f_src = f_src.group(1) if f_src else ""
+    
+    if not f_src in ('', '__init__'):
+        try:
+            exec(
+                "from route." + f_src + " " + 
+                "import " + f_src
+            )
+        except:
+            exec(
+                "from route." + f_src + " " + 
+                "import " + f_src + "_2"
+            )
 
 # Init-Version
-version_list = json.loads(open('version.json', encoding = 'utf8').read())
+version_list = json.loads(open(
+    'version.json', 
+    encoding = 'utf8'
+).read())
 
 # Init-DB
 if os.path.exists(os.path.join('data', 'set.json')):
@@ -347,44 +364,44 @@ if os.path.exists('custom.py'):
     
 # Func
 # Func-inter_wiki
-app.route('/inter_wiki', defaults = { 'tool' : 'inter_wiki' })(inter_wiki)
-app.route('/inter_wiki/del/<name>', defaults = { 'tool' : 'del_inter_wiki' })(inter_wiki_del)
-app.route('/inter_wiki/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_inter_wiki' })(inter_wiki_add)
-app.route('/inter_wiki/add/<name>', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_inter_wiki' })(inter_wiki_add)
+app.route('/inter_wiki', defaults = { 'tool' : 'inter_wiki' })(filter_inter_wiki)
+app.route('/inter_wiki/del/<name>', defaults = { 'tool' : 'del_inter_wiki' })(filter_inter_wiki_delete)
+app.route('/inter_wiki/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_inter_wiki' })(filter_inter_wiki_add)
+app.route('/inter_wiki/add/<name>', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_inter_wiki' })(filter_inter_wiki_add)
 
 app.route('/filter/document/list')(filter_document)
 app.route('/filter/document/add/<name>', methods = ['POST', 'GET'])(filter_document_add)
 app.route('/filter/document/add', methods = ['POST', 'GET'])(filter_document_add)
-app.route('/filter/document/del/<name>')(filter_document_del)
+app.route('/filter/document/del/<name>')(filter_document_delete)
 
-app.route('/edit_top', defaults = { 'tool' : 'edit_top' })(inter_wiki)
-app.route('/edit_top/del/<name>', defaults = { 'tool' : 'del_edit_top' })(inter_wiki_del)
-app.route('/edit_top/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_edit_top' })(inter_wiki_add)
+app.route('/edit_top', defaults = { 'tool' : 'edit_top' })(filter_inter_wiki)
+app.route('/edit_top/del/<name>', defaults = { 'tool' : 'del_edit_top' })(filter_inter_wiki_delete)
+app.route('/edit_top/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_edit_top' })(filter_inter_wiki_add)
 
-app.route('/image_license', defaults = { 'tool' : 'image_license' })(inter_wiki)
-app.route('/image_license/del/<name>', defaults = { 'tool' : 'del_image_license' })(inter_wiki_del)
-app.route('/image_license/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_image_license' })(inter_wiki_add)
+app.route('/image_license', defaults = { 'tool' : 'image_license' })(filter_inter_wiki)
+app.route('/image_license/del/<name>', defaults = { 'tool' : 'del_image_license' })(filter_inter_wiki_delete)
+app.route('/image_license/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_image_license' })(filter_inter_wiki_add)
 
-app.route('/edit_filter', defaults = { 'tool' : 'edit_filter' })(inter_wiki)
-app.route('/edit_filter/del/<name>', defaults = { 'tool' : 'del_edit_filter' })(inter_wiki_del)
-app.route('/edit_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_edit_filter' })(inter_wiki_add)
-app.route('/edit_filter/add/<name>', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_edit_filter' })(inter_wiki_add)
+app.route('/edit_filter', defaults = { 'tool' : 'edit_filter' })(filter_inter_wiki)
+app.route('/edit_filter/del/<name>', defaults = { 'tool' : 'del_edit_filter' })(filter_inter_wiki_delete)
+app.route('/edit_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_edit_filter' })(filter_inter_wiki_add)
+app.route('/edit_filter/add/<name>', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_edit_filter' })(filter_inter_wiki_add)
 
-app.route('/email_filter', defaults = { 'tool' : 'email_filter' })(inter_wiki)
-app.route('/email_filter/del/<name>', defaults = { 'tool' : 'del_email_filter' })(inter_wiki_del)
-app.route('/email_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_email_filter' })(inter_wiki_add)
+app.route('/email_filter', defaults = { 'tool' : 'email_filter' })(filter_inter_wiki)
+app.route('/email_filter/del/<name>', defaults = { 'tool' : 'del_email_filter' })(filter_inter_wiki_delete)
+app.route('/email_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_email_filter' })(filter_inter_wiki_add)
 
-app.route('/file_filter', defaults = { 'tool' : 'file_filter' })(inter_wiki)
-app.route('/file_filter/del/<name>', defaults = { 'tool' : 'del_file_filter' })(inter_wiki_del)
-app.route('/file_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_file_filter' })(inter_wiki_add)
+app.route('/file_filter', defaults = { 'tool' : 'file_filter' })(filter_inter_wiki)
+app.route('/file_filter/del/<name>', defaults = { 'tool' : 'del_file_filter' })(filter_inter_wiki_delete)
+app.route('/file_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_file_filter' })(filter_inter_wiki_add)
 
-app.route('/name_filter', defaults = { 'tool' : 'name_filter' })(inter_wiki)
-app.route('/name_filter/del/<name>', defaults = { 'tool' : 'del_name_filter' })(inter_wiki_del)
-app.route('/name_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_name_filter' })(inter_wiki_add)
+app.route('/name_filter', defaults = { 'tool' : 'name_filter' })(filter_inter_wiki)
+app.route('/name_filter/del/<name>', defaults = { 'tool' : 'del_name_filter' })(filter_inter_wiki_delete)
+app.route('/name_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_name_filter' })(filter_inter_wiki_add)
 
-app.route('/extension_filter', defaults = { 'tool' : 'extension_filter' })(inter_wiki)
-app.route('/extension_filter/del/<name>', defaults = { 'tool' : 'del_extension_filter' })(inter_wiki_del)
-app.route('/extension_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_extension_filter' })(inter_wiki_add)
+app.route('/extension_filter', defaults = { 'tool' : 'extension_filter' })(filter_inter_wiki)
+app.route('/extension_filter/del/<name>', defaults = { 'tool' : 'del_extension_filter' })(filter_inter_wiki_delete)
+app.route('/extension_filter/add', methods = ['POST', 'GET'], defaults = { 'tool' : 'plus_extension_filter' })(filter_inter_wiki_add)
 
 # Func-list
 # /list/document/old
@@ -844,7 +861,7 @@ app.route('/restart', methods = ['POST', 'GET'])(main_sys_restart)
 app.route('/update', methods = ['POST', 'GET'])(main_sys_update)
 
 app.errorhandler(404)(main_error_404)
-    
+
 if __name__ == "__main__":
     waitress.serve(
         app,

route/filter_document_delete.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def filter_document_del(name = ''):
+def filter_document_delete(name = ''):
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/filter_inter_wiki.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def inter_wiki(tool):
+def filter_inter_wiki(tool):
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/filter_inter_wiki_add.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def inter_wiki_add(tool, name = None):
+def filter_inter_wiki_add(tool, name = None):
     with get_db_connect() as conn:
         curs = conn.cursor()
 

route/filter_inter_wiki_delete.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def inter_wiki_del(tool, name = 'Test'):
+def filter_inter_wiki_delete(tool, name = 'Test'):
     with get_db_connect() as conn:
         curs = conn.cursor()
         

route/login_login.py

@@ -26,9 +26,12 @@ def login_login_2(conn):
         sql_data = curs.fetchall()
         if not sql_data:
             return re_error('/error/2')
-        else:
-            for i in sql_data:
-                user_data[i[0]] = i[1]
+
+        for i in sql_data:
+            user_data[i[0]] = i[1]
+                
+        if len(user_data) < 2:
+            return re_error('/error/2')
 
         if pw_check(
             flask.request.form.get('pw', ''),

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.3 (stable1) (beta14) (dev28)",
+        "r_ver" : "v3.4.3 (stable1) (beta14) (dev29)",
         "c_ver" : "3500101",
         "s_ver" : "3500110"
     }

views/main_css/js/render_onmark.js

@@ -146,7 +146,7 @@ function do_onmark_heading_render(
     name_doc, 
     name_include
 ) {
-    var heading_re = /\n(={1,6})(#)? ?([^\n]+) ?#?(?:={6}|={5}|={4}|={3}|={2}|={6})\n/;
+    var heading_re = /\n(={1,6})(#)? ?([^\n]+) ?#?={1,6}\n/;
     var heading_level_all = [0, 0, 0, 0, 0, 0];
     var toc_data = '';
     var toc_n = 0;
@@ -184,8 +184,10 @@ function do_onmark_heading_render(
         }
         
         var heading_level_string_no_end = heading_level_string.replace(/\.$/, '');
-        var heading_data_text = heading_data[3].replace(/ #$/, '');
-        heading_data_text = heading_data_text.replace(/ $/, '');
+        
+        var heading_data_text = heading_data[3].replace(/=+$/, '');
+        heading_data_text = heading_data_text.replace(/#$/, '');
+        ading_data_text = heading_data_text.replace(/ $/, '');
         
         toc_data += '' +
             '<span style="margin-left: ' + String((heading_level_string.match(/\./g).length - 1) * 10) + 'px;">' +