일부 HTML 추가 지원

app.py

@@ -8,7 +8,7 @@ for i_data in os.listdir("route"):
 
         exec("from route." + f_src + " import *")
 
-version_list = json.loads(open('version.json', encoding='utf-8').read())
+version_list = json.loads(open('version.json').read())
 
 r_ver = version_list['master']['r_ver']
 c_ver = version_list['master']['c_ver']
@@ -19,7 +19,7 @@ print('DB set version : ' + c_ver)
 print('Skin set version : ' + s_ver)
 print('----')
 
-app_var = json.loads(open('data/app_var.json', encoding='utf-8').read())
+app_var = json.loads(open('data/app_var.json').read())
 
 # DB
 while 1:
@@ -30,6 +30,8 @@ while 1:
                 os.remove('data/set.json')
             except:
                 print('Please delete set.json')
+                print('----')
+                raise
         else:
             break
     except:
@@ -42,10 +44,10 @@ while 1:
             break
         else:        
             new_json = ['', '']
+            normal_db_type = ['sqlite', 'mysql']
 
             print('DB type (sqlite, mysql) : ', end = '')
             new_json[0] = str(input())
-            normal_db_type = ['sqlite', 'mysql']
             if new_json[0] == '' or not new_json[0] in normal_db_type:
                 new_json[0] = 'sqlite'
 

route/tool/func.py

@@ -395,7 +395,7 @@ def other2(data):
     
     js_filter = {
         'load_include.js' : '2',
-        'render_html.js' : '2',
+        'render_html.js' : '3',
         'do_open_foot.js' : '4',
         'topic_main_load.js' : '2',
         'topic_plus_load.js' : '2',

version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.4-master-14",
+        "r_ver" : "v3.1.4-master-15",
         "c_ver" : "400004",
         "s_ver" : "5"
     }, "stable" : {

views/main_css/js/render_html.js

@@ -5,18 +5,18 @@ function render_html(name = '') {
         if(document.getElementById(name + 'render_contect_' + String(num))) {
             data = document.getElementById(name + 'render_contect_' + String(num)).innerHTML;
 
-            t_data = ['b', 'i', 's', 'del']
+            var t_data = ['b', 'i', 's', 'del']
             for(var key in t_data) {
                 var patt = new RegExp('<' + t_data[key] + '>((?:(?!<\/' + t_data[key] + '>).)*)<\/' + t_data[key] + '>', 'ig');
                 data = data.replace(patt, '<' + t_data[key] + '>$1</' + t_data[key] + '>');
             }
             
-            src_list = {
+            var src_list = {
                 'www.youtube.com' : '1',
                 'www.google.com' : '1'
             }
-            data = data.replace(/&lt;iframe( (?:(?:(?!&gt;).)+))&gt;&lt;\/iframe&gt;/g, function(full, in_data) {
-                src_data = in_data.match(/ src=['"]https:\/\/([^/'"]+)(?:[^'"]+)['"](?: |$)/);
+            data = data.replace(/&lt;iframe( (?:(?:(?!&gt;).)+))&gt;&lt;\/iframe&gt;/ig, function(full, in_data) {
+                var src_data = in_data.match(/ src=['"]https:\/\/([^/'"]+)(?:[^'"]+)['"](?: |$)/);
                 if(src_data) {
                     if(src_list[src_data[1]]) {
                         return '<iframe' + in_data + '></iframe>';
@@ -25,6 +25,18 @@ function render_html(name = '') {
                     }
                 }
             });
+
+            t_data = ['div', 'span']
+            for(var key in t_data) {
+                patt = new RegExp('&lt;' + t_data[key] + ' style=["\']((?:(?!["\']).)+)["\']&gt;((?:(?!&lt;\/' + t_data[key] + '&gt;).)*)&lt;\/' + t_data[key] + '&gt;', 'ig');
+                data = data.replace(patt, function(full, in_data, in_data_2) {
+                    return '<' + t_data[key] + ' style="' + in_data.replace(/position/ig, '') + '">' + in_data_2 + '</' + t_data[key] + '>'
+                });
+            }
+
+            data = data.replace(/&lt;a href=["\']((?:(?!["\']).)+)["\']&gt;((?:(?!&lt;\/a&gt;).)*)&lt;\/a&gt;/ig, function(full, in_data, in_data_2) {
+                return '<a id="out_link" href="' + in_data.replace(/^javascript/ig, '') + '">' + in_data_2 + '</a>'
+            });
             
             document.getElementById(name + 'render_contect_' + String(num)).innerHTML = data;
         } else {