fix bug & mod manager route

app.py

@@ -205,7 +205,9 @@ class RegexConverter(werkzeug.routing.BaseConverter):
         self.regex = items[0]
         
 app = flask.Flask(__name__, template_folder = './')
+
 app.config['JSON_AS_ASCII'] = False
+app.config['JSONIFY_PRETTYPRINT_REGULAR'] = True
 
 app.logger.setLevel(logging.ERROR)
 
@@ -707,15 +709,15 @@ def user_setting_email_check():
 def user_setting_pw_change():
     return user_setting_pw_change_2(conn)
 
+@app.route('/change/head', methods=['GET', 'POST'])
+def user_setting_head():
+    return user_setting_head_2(conn)
+
 @app.route('/user')
 @app.route('/user/<name>')
 def user_info(name = ''):
     return user_info_2(conn, name)
 
-@app.route('/custom_head', methods=['GET', 'POST'])
-def user_custom_head_view():
-    return user_custom_head_view_2(conn)
-
 @app.route('/count')
 @app.route('/count/<name>')
 def user_count_edit(name = None):
@@ -834,11 +836,7 @@ def api_raw(name = ''):
 
 @app.route('/api/version')
 def api_version():
-    return api_version_2(
-        conn, 
-        version_list['beta']['r_ver'], 
-        version_list['beta']['c_ver']
-    )
+    return api_version_2(conn, version_list)
 
 @app.route('/api/skin_info')
 @app.route('/api/skin_info/<name>')
@@ -926,11 +924,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['beta']['r_ver']
-    )
+    return main_manager_2(conn, num)
 
 @app.route('/image/<everything:name>')
 def main_image_view(name = None):

route/api_version.py

@@ -1,31 +1,17 @@
 from .tool.func import *
 
-def api_version_2(conn, r_ver, c_ver):
+def api_version_2(conn, version_list):
     curs = conn.cursor()
 
-    n_ver = ''
-    data = None
-
     curs.execute(db_change('select data from other where name = "update"'))
     up_data = curs.fetchall()
     up_data = up_data[0][0] if up_data and up_data[0][0] in ['stable', 'beta', 'dev'] else 'stable'
 
-    try:
-        data = urllib.request.urlopen('https://raw.githubusercontent.com/openNAMU/openNAMU/' + up_data + '/version.json')
-    except:
-        data = None
-
-    if data and data.getcode() == 200:
-        try:
-            json_data = json.loads(data.read().decode())
-        except:
-            pass
-
-        if 'beta' in json_data:
-            n_ver = json_data['beta']['r_ver']
-        elif 'master' in json_data:
-            n_ver = json_data['master']['r_ver']
-
-    json_data = { "version" : r_ver, "db_version" : c_ver, "lastest_version" : n_ver  }
+    json_data = {
+        "version" : version_list['beta']['r_ver'], 
+        "db_version" : version_list['beta']['c_ver'],
+        "skin_version" : version_list['beta']['s_ver'],
+        "build" : up_data
+    }
 
     return flask.jsonify(json_data)

route/main_manager.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def main_manager_2(conn, num, r_ver):
+def main_manager_2(conn, num):
     curs = conn.cursor()
 
     title_list = {
@@ -63,13 +63,14 @@ def main_manager_2(conn, num, r_ver):
                     </ul>
                     <h2>3. ''' + load_lang('version') + '''</h2>
                     <ul class="inside_ul">
-                        <li>
-                            <a href="/api/skin_info?all=true">''' + load_lang('skin_info') + '''</a>
-                            <span id="need_skin_update"></span>
-                        </li>
-                        <li>''' + load_lang('version') + ' : ' + r_ver + '''</li>
+                        <li>''' + load_lang('version') + ''' : <span id="ver_send_2"></span></li>
                         <li id="ver_send" style="display: none;">''' + load_lang('lastest') + ''' : </li>
                     </ul>
+                    <h3>3.1. ''' + load_lang('skin_info') + '''</h3>
+                    <ul class="inside_ul">
+                        <li><a href="/api/skin_info?all=true">''' + load_lang('skin_info') + '''</a></li>
+                        <div id="ver_send_3"></div>
+                    </ul>
                 </div>
                 <script>load_ver(); do_skin_ver_check(); simple_render('other_simple_render');</script>
             ''',

route/user_custom_head_view.py

@@ -1,6 +1,6 @@
 from .tool.func import *
 
-def user_custom_head_view_2(conn):
+def user_setting_head_2(conn):
     curs = conn.cursor()
 
     ip = ip_check()
@@ -18,7 +18,7 @@ def user_custom_head_view_2(conn):
 
         flask.session['head'] = get_data
 
-        return redirect('/custom_head')
+        return redirect('/change/head')
     else:
         if ip_or_user(ip) == 0:
             start = ''

route/user_info.py

@@ -36,7 +36,7 @@ def user_info_2(conn, name):
                 <li><a href="/pass_find">''' + load_lang('password_search') + '''</a></li>
             '''
             
-        tool_menu += '<li><a href="/custom_head">' + load_lang('user_head') + '</a></li>'
+        tool_menu += '<li><a href="/change/head">' + load_lang('user_head') + '</a></li>'
             
         login_menu = '<h2>' + load_lang('login') + '</h2><ul class="inside_ul">' + login_menu + '</ul>'
         tool_menu = '<h2>' + load_lang('tool') + '</h2><ul class="inside_ul">' + tool_menu + '</ul>'

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.5.0-beta (stable1) (beta4) (dev6)",
+        "r_ver" : "v3.5.0-beta (stable1) (beta4) (dev7)",
         "c_ver" : "3500101",
         "s_ver" : "3500101"
     }

views/main_css/js/load_shortcut.js

@@ -24,7 +24,7 @@ document.onkeypress = function(e) {
 
         if(window.location.pathname.match(doc_shortcut)) {
             let doc_href = window.location.pathname.replace(doc_shortcut, '');
-            doc_href = doc_href.replace(/(?:%2F|\/)(doc_from|doc_rev)(?:%2F|\/)(?:((?!%2F|\/).)+)$/, '');
+            doc_href = doc_href.replace(/(?:%2F|\/)(?:doc_from|doc_rev)(?:%2F|\/)(?:((?!%2F|\/).)+)$/, '');
             
             if(shortcut_key_list['w'] === 1) {
                 window.location.pathname = '/w/' + doc_href;

views/main_css/js/load_something.js

@@ -15,12 +15,24 @@ function load_ver() {
     var url = "/api/version";
     var xhr = new XMLHttpRequest();
     xhr.open("GET", url, true);
-    xhr.send(null);
+    xhr.send();
 
     xhr.onreadystatechange = function() {
         if(this.readyState === 4 && this.status === 200) {
-            document.getElementById('ver_send').innerHTML += JSON.parse(this.responseText)['lastest_version'];
-            document.getElementById('ver_send').style.display = "list-item";
+            let get_data = JSON.parse(this.responseText);
+            document.getElementById('ver_send_2').innerHTML = get_data['version'];
+            
+            let url_2 = 'https://raw.githubusercontent.com/openNAMU/openNAMU/' + get_data['build'] + '/version.json';
+            var xhr_2 = new XMLHttpRequest();
+            xhr_2.open("GET", url_2, true);
+            xhr_2.send();
+            
+            xhr_2.onreadystatechange = function() {
+                if(this.readyState === 4 && this.status === 200) {
+                    document.getElementById('ver_send').innerHTML += JSON.parse(this.responseText)['beta']['r_ver'];
+                    document.getElementById('ver_send').style.display = "list-item";
+                }
+            }
         }
     }
 }
@@ -29,25 +41,16 @@ function do_skin_ver_check() {
     var url = "/api/skin_info?all=true";
     var xhr = new XMLHttpRequest();
     xhr.open("GET", url, true);
-    xhr.send(null);
+    xhr.send();
 
     xhr.onreadystatechange = function() {
         if(this.readyState === 4 && this.status === 200) {
             var json_data = JSON.parse(this.responseText);
-            var all_need_update = [];
-            for(var key in json_data) {
-                if(json_data[key]['lastest_version']) {
-                    var new_skin_ver = json_data[key]['lastest_version']['skin_ver'];
-                    var old_skin_ver = json_data[key]['skin_ver'];
-                    var skin_name = json_data[key]['name'];
-                    if(new_skin_ver !== old_skin_ver) {
-                        all_need_update.push(skin_name);
-                    }
-                }
-            }
-            
-            if(all_need_update.length !== 0) {
-                document.getElementById('need_skin_update').innerHTML += ' (' + (all_need_update.join(', ')) + ')';
+            for(var key in json_data) {                
+                document.getElementById('ver_send_3').innerHTML += '<li>' +
+                    json_data[key]['name'] + ' : ' + json_data[key]['skin_ver'] +
+                    (json_data[key]['lastest_version'] ? ' (' + json_data[key]['lastest_version']['skin_ver'] + ')' : '') +
+                '</li>'
             }
         }
     }

views/main_css/js/render_onmark.js

@@ -796,8 +796,6 @@ function do_onmark_last_render(data, name_include, data_category) {
     data = data.replace(/\n?<start_point>/g, '');
     data = data.replace(/<end_point>\n?/g, '');
     
-    console.log(data);
-    
     // br 마지막 처리
     data = data.replace(/^(\n| )+/, '');
     data = do_end_br_replace(data);
@@ -1279,18 +1277,18 @@ function do_onmark_render(
 ) {
     let data_wiki_set = {};
 	if(test_mode === 'normal') {
-        var data = '<end_point>\n' + 
+        var data = '\n' + 
             document.getElementById(name_id + '_load').innerHTML.replace(/\r/g, '') + 
-        '\n<start_point>';
+        '\n';
         data_wiki_set = JSON.parse(document.getElementById(name_id + '_set').innerHTML);
     } else if(test_mode === 'manual') { 
-        var data = '<end_point>\n' + 
+        var data = '\n' + 
             doc_data.replace(/\r/g, '') + 
-        '\n<start_point>';
+        '\n';
     } else {
-    	var data = '<end_point>\n' + (
+    	var data = '\n' + (
 ``
-        ).replace(/\r/g, '') + '\n<start_point>';
+        ).replace(/\r/g, '') + '\n';
     }
     var data_js = '';
     var data_backlink = [];