fix bug

emergency_tool.py

@@ -12,7 +12,10 @@ if data_db_load == 'Y':
     # Init-DB
     if os.path.exists(os.path.join('data', 'set.json')):
         db_set_list = ['db', 'db_type']
-        set_data = json.loads(open(os.path.join('data', 'set.json'), encoding = 'utf8').read())
+        set_data = json.loads(open(
+            os.path.join('data', 'set.json'), 
+            encoding = 'utf8'
+        ).read())
         for i in db_set_list:
             if not i in set_data:
                 print('Please delete set.json')
@@ -65,15 +68,19 @@ if data_db_load == 'Y':
         with open(os.path.join('data', 'set.json'), 'w', encoding = 'utf8') as f:
             f.write(json.dumps(set_data))
 
-    db_data_get(set_data['db_type'])
+    data_db_set = {}
+    data_db_set['name'] = set_data['db']
+    data_db_set['type'] = set_data['db_type']
 
-    if set_data['db_type'] == 'mysql':
+    if data_db_set['type'] == 'mysql':
         if not os.path.exists(os.path.join('data', 'mysql.json')):
             db_set_list = ['user', 'password', 'host', 'port']
-            set_data = json.loads(open(
-                os.path.join('data', 'mysql.json'), 
-                encoding = 'utf8'
-            ).read())
+            set_data = json.loads(
+                open(
+                    os.path.join('data', 'mysql.json'),
+                    encoding = 'utf8'
+                ).read()
+            )
             for i in db_set_list:
                 if not i in set_data:
                     print('Please delete mysql.json')
@@ -96,29 +103,28 @@ if data_db_load == 'Y':
             if set_data_mysql['port'] == '':
                 set_data_mysql['port'] = '3306'
 
-            with open(os.path.join('data', 'mysql.json'), 'w', encoding = 'utf8') as f:
+            with open(
+                os.path.join('data', 'mysql.json'), 
+                'w', 
+                encoding = 'utf8'
+            ) as f:
                 f.write(json.dumps(set_data_mysql))
 
-        conn = pymysql.connect(
-            host = set_data_mysql['host'] if 'host' in set_data_mysql else 'localhost',
-            user = set_data_mysql['user'],
-            password = set_data_mysql['password'],
-            charset = 'utf8mb4',
-            port = int(set_data_mysql['port']) if 'port' in set_data_mysql else 3306
-        )
-        curs = conn.cursor()
-
-        try:
-            curs.execute(db_change('create database ' + set_data['db'] + ' default character set utf8mb4;'))
-        except:
-            pass
-
-        conn.select_db(set_data['db'])
-    else:
-        conn = sqlite3.connect(set_data['db'] + '.db')
-        curs = conn.cursor()
+        data_db_set['mysql_user'] = set_data_mysql['user']
+        data_db_set['mysql_pw'] = set_data_mysql['password']
+        if 'host' in set_data_mysql:
+            data_db_set['mysql_host'] = set_data_mysql['host']
+        else:
+            data_db_set['mysql_host'] = 'localhost'
+
+        if 'port' in set_data_mysql:
+            data_db_set['mysql_port'] = set_data_mysql['port']
+        else:
+            data_db_set['mysql_port'] = '3306'
 
-    load_conn(conn)
+    db_data_get(data_db_set['type'])
+    conn = get_conn(data_db_set)
+    curs = conn.cursor()
 else:
     print('----')
     print('You can use [9, 11]')

route/tool/func.py

@@ -84,7 +84,7 @@ global_wiki_set = {}
 
 global_db_set = ''
 
-data_css_ver = '112'
+data_css_ver = '113'
 data_css = ''
 
 conn = ''

route/view_read.py

@@ -29,7 +29,7 @@ def view_read_2(conn, name, doc_rev, doc_from):
                 category_doc += '<li><a href="/w/' + url_pas(data[0]) + '">' + data[0] + '</a> <a id="inside" href="/xref/' + url_pas(data[0]) + '">(' + load_lang('backlink') + ')</a></li>'
 
         if category_doc != '':
-            category_doc += '<h2 id="cate_normal">' + load_lang('category_title') + '</h2><ul class="inside_ul">' + category_doc + '</ul>'
+            category_doc = '<h2 id="cate_normal">' + load_lang('category_title') + '</h2><ul class="inside_ul">' + category_doc + '</ul>'
 
         if category_sub != '':
             category_doc += '<h2 id="cate_under">' + load_lang('under_category') + '</h2><ul class="inside_ul">' + category_sub + '</ul>'

views/main_css/js/render_onmark.js

@@ -539,7 +539,7 @@ function do_onmark_footnote_render(data, name_include) {
 function do_onmark_macro_render(data, data_js) {
     data = data.replace(/\[([^[\](]+)\(((?:(?!\)\]).)+)\)\]/g, function(x, x_1, x_2) {
         x_1 = x_1.toLowerCase();
-        if(x_1 === 'youtube' || x_1 === 'kakaotv' || x_1 === 'nicovideo') {
+        if(x_1 === 'youtube' || x_1 === 'kakaotv' || x_1 === 'nicovideo' || x_1 === 'navertv') {
             var video_code = x_2.match(/^([^,]+)/);
             video_code = video_code ? video_code[1] : '';
             
@@ -562,9 +562,11 @@ function do_onmark_macro_render(data, data_js) {
                 video_code = video_code.replace(/^http:\/\/tv\.kakao\.com\/v\//, '');
                 
                 var video_src = 'https://tv.kakao.com/embed/player/cliplink/' + video_code +'?service=kakao_tv'
-            } else {
+            } else if(x_1 === 'nicovideo') {
                 var video_src = 'https://embed.nicovideo.jp/watch/' + video_code
-            }
+            } else {
+				var video_src = 'https://tv.naver.com/embed/' + video_code
+			}
             
             return '<iframe style="width: ' + video_width + '; height: ' + video_height + ';" src="' + video_src + '" frameborder="0" allowfullscreen></iframe>';
         } else if(x_1 === 'anchor') {
@@ -1004,7 +1006,7 @@ function do_onmark_table_render_sub(data, data_col) {
 }
 
 function do_onmark_table_render_main(data) {
-    var table_re = /\n((?:(?:(?:(?:\|\|)+)|(?:\|[^|]+\|(?:\|\|)*))(?!\n)(?:(?:(?!\|\|).)+))(?:(?:\|\||\|\|\n|(?:\|\|)+(?!\n)(?:(?:(?!\|\|).)+))*)\|\|)\n/gs;
+    var table_re = /\n((?:(?:(?:(?:\|\|)+)|(?:\|[^|]+\|(?:\|\|)*))\n?(?:(?:(?!\|\|).)+))(?:(?:\|\||\|\|\n|(?:\|\|)+(?!\n)(?:(?:(?!\|\|).)+)\n*)*)\|\|)\n/gs;
     data = data.replace(table_re, function(x, x_1) {
         var table_cel_re = /((?:\|\|)+)((?:(?!\|\|).)*)/gs;
         var table_data = '';