mod init and fix bug

app.py

@@ -1,104 +1,92 @@
-# Load
+# Init
 from route import *
 
-# Version
-version_list = json.loads(open('version.json', encoding = 'utf8').read())
-
-print('Version : ' + version_list['beta']['r_ver'])
-print('DB set version : ' + version_list['beta']['c_ver'])
-print('Skin set version : ' + version_list['beta']['s_ver'])
-print('----')
-
-# DB
-while 1:
-    try:
-        set_data = json.loads(open('data/set.json', encoding = 'utf8').read())
-        if not 'db_type' in set_data:
-            try:
-                os.remove('data/set.json')
-            except:
-                print('Please delete set.json')
-                print('----')
-                raise
-        else:
-            print('DB name : ' + set_data['db'])
-            print('DB type : ' + set_data['db_type'])
-
-            break
-    except:
-        if os.getenv('NAMU_DB') != None or os.getenv('NAMU_DB_TYPE') != None:
-            set_data = {
-                "db" : os.getenv('NAMU_DB') if os.getenv('NAMU_DB') else 'data',
-                "db_type" : os.getenv('NAMU_DB_TYPE') if os.getenv('NAMU_DB_TYPE') else 'sqlite'
-            }
-
-            print('DB name : ' + set_data['db'])
-            print('DB type : ' + set_data['db_type'])
-
-            break
-        else:
-            new_json = ['', '']
-            normal_db_type = ['sqlite', 'mysql']
-
-            print('DB type (sqlite) [sqlite, mysql] : ', end = '')
-            new_json[0] = str(input())
-            if new_json[0] == '' or not new_json[0] in normal_db_type:
-                new_json[0] = 'sqlite'
-
-            all_src = []
-            for i_data in os.listdir("."):
-                f_src = re.search(r"(.+)\.db$", i_data)
-                if f_src:
-                    all_src += [f_src.group(1)]
+# 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())
+    for i in db_set_list:
+        if not i in set_data:
+            print('Please delete set.json')
+            print('----')
+            raise
+
+    print('DB name : ' + set_data['db'])
+    print('DB type : ' + set_data['db_type'])
+elif os.getenv('NAMU_DB') or os.getenv('NAMU_DB_TYPE'):
+    set_data = {}
+
+    if os.getenv('NAMU_DB'):
+        set_data['db'] = os.getenv('NAMU_DB')
+    else:
+        set_data['db'] = 'data'
 
-            if all_src != [] and new_json[0] != 'mysql':
-                print('DB name (data) [' + ', '.join(all_src) + '] : ', end = '')
-            else:
-                print('DB name (data) : ', end = '')
+    if os.getenv('NAMU_DB_TYPE'):
+        set_data['db'] = os.getenv('NAMU_DB_TYPE')
+    else:
+        set_data['db'] = 'sqlite'
 
-            new_json[1] = str(input())
-            if new_json[1] == '':
-                new_json[1] = 'data'
+    print('DB name : ' + set_data['db'])
+    print('DB type : ' + set_data['db_type'])
+else:
+    set_data = {}
+    normal_db_type = ['sqlite', 'mysql']
 
-            with open('data/set.json', 'w', encoding = 'utf8') as f:
-                f.write('{ "db" : "' + new_json[1] + '", "db_type" : "' + new_json[0] + '" }')
+    print('DB type (' + normal_db_type[0] + ') [' + ', '.join(normal_db_type) + '] : ', end = '')
+    data_get = str(input())
+    if data_get == '' or not data_get in normal_db_type:
+        set_data['db_type'] = 'sqlite'
+    else:
+        set_data['db_type'] = data_get
 
-            set_data = json.loads(open('data/set.json', encoding = 'utf8').read())
+    all_src = []
+    if set_data['db_type'] == 'sqlite':
+        for i_data in os.listdir("."):
+            f_src = re.search(r"(.+)\.db$", i_data)
+            if f_src:
+                all_src += [f_src.group(1)]
 
-            break
+    print('DB name (data) [' + ', '.join(all_src) + '] : ', end = '')
+    
+    data_get = str(input())
+    if data_get == '':
+        set_data['db'] = 'data'
+    else:
+        set_data['db'] = data_get
+        
+    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'])
 
 if set_data['db_type'] == 'mysql':
-    try:
-        set_data_mysql = json.loads(open('data/mysql.json', encoding = 'utf8').read())
-    except:
-        new_json = {}
-
-        while 1:
-            print('DB user ID : ', end = '')
-            new_json['user'] = str(input())
-            if new_json['user'] != '':
-                break
-
-        while 1:
-            print('DB password : ', end = '')
-            new_json['password'] = str(input())
-            if new_json['password'] != '':
-                break
+    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())
+        for i in db_set_list:
+            if not i in set_data:
+                print('Please delete mysql.json')
+                print('----')
+                raise
+
+        print('DB user ID : ', end = '')
+        set_data_mysql['user'] = str(input())
+
+        print('DB password : ', end = '')
+        set_data_mysql['password'] = str(input())
                 
         print('DB host (localhost) : ', end = '')
-        new_json['host'] = str(input())
-        new_json['host'] = 'localhost' if new_json['host'] == '' else new_json['host']
+        set_data_mysql['host'] = str(input())
+        if set_data_mysql['host'] == '':
+            set_data_mysql['host'] = 'localhost'
 
         print('DB port (3306) : ', end = '')
-        new_json['port'] = str(input())
-        new_json['port'] = '3306' if new_json['port'] == '' else new_json['port']
-
-        with open('data/mysql.json', 'w', encoding = 'utf8') as f:
-            f.write(json.dumps(new_json))
+        set_data_mysql['port'] = str(input())
+        if set_data_mysql['port'] == '':
+            set_data_mysql['port'] = '3306'
 
-        set_data_mysql = new_json
+        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',
@@ -121,7 +109,7 @@ else:
 
 load_conn(conn)
 
-# DB init
+# Init-Create_DB
 create_data = {}
 create_data['data'] = ['title', 'data', 'type']
 create_data['history'] = ['id', 'title', 'data', 'date', 'ip', 'send', 'leng', 'hide', 'type']
@@ -183,7 +171,7 @@ curs.execute(db_change('delete from other where name = "ver"'))
 curs.execute(db_change('insert into other (name, data) values ("ver", ?)'), [version_list['beta']['c_ver']])
 conn.commit()
 
-# Init
+# Init-Route
 logging.basicConfig(level = logging.ERROR)
 
 app = flask.Flask(__name__, template_folder = './')
@@ -265,9 +253,8 @@ if set_data['db_type'] == 'sqlite':
 
     curs.execute(db_change('select data from other where name = "back_up"'))
     back_time = curs.fetchall()
-    if back_time:
-        back_time = int(number_check(back_time[0][0]))
-
+    back_time = int(number_check(back_time[0][0])) if back_time else 0
+    if back_time != 0:
         curs.execute(db_change('select data from other where name = "backup_where"'))
         back_up_where = curs.fetchall()
         if back_up_where and back_up_where[0][0] != '':

data/version.json

@@ -0,0 +1 @@
+v3.3.0-stable-01b (beta-05b) (dev-2021-06-07-02)

route/tool/func.py

@@ -17,17 +17,39 @@ import wsgiref.simple_server
         
 import urllib.request
 
-if platform.system() == 'Linux' or platform.system() == 'Windows':
-    os.system(
-        'python' + ('3' if platform.system() != 'Windows' else '') + ' ' + \
-        '-m pip install --upgrade --user -r requirements.txt'
-    )
-else:
-    print('Error : automatic installation is not supported.')
-    print('Help : try "python3 -m pip install -r requirements.txt"')
+# Init-Version
+version_list = json.loads(open('version.json', encoding = 'utf8').read())
 
+print('Version : ' + version_list['beta']['r_ver'])
+print('DB set version : ' + version_list['beta']['c_ver'])
+print('Skin set version : ' + version_list['beta']['s_ver'])
 print('----')
 
+# Init-PIP_Install
+data_up_date = 0
+if not os.path.exists(os.path.join('data', 'version.json')):
+    data_up_date = 1
+else:
+    data_load_ver = open(os.path.join('data', 'version.json'), encoding = 'utf8').read()
+    if data_load_ver != version_list['beta']['r_ver']:
+        data_up_date = 1
+    
+if data_up_date == 1:
+    with open(os.path.join('data', 'version.json'), 'w', encoding = 'utf8') as f:
+        f.write(version_list['beta']['r_ver'])
+    
+    if platform.system() == 'Linux' or platform.system() == 'Windows':
+        os.system(
+            'python' + ('3' if platform.system() != 'Windows' else '') + ' ' + \
+            '-m pip install --upgrade --user -r requirements.txt'
+        )
+    else:
+        print('Error : automatic installation is not supported.')
+        print('Help : try "python3 -m pip install -r requirements.txt"')
+        
+    print('----')
+
+# Init-Load
 from .func_mark import *
 
 from diff_match_patch import diff_match_patch
@@ -46,7 +68,8 @@ import PIL
 
 if sys.version_info < (3, 6):
     import sha3
-        
+   
+# Init-Global
 global_lang = {}
 
 data_css_ver = '92'
@@ -1111,11 +1134,12 @@ def ip_pas(raw_ip, type_d = 0):
         is_this_ip = ip_or_user(raw_ip)
         if is_this_ip != 0 and ip_view != '':
             ip = re.sub(r'\.([^.]*)\.([^.]*)$', '.*.*', raw_ip)
-            ip = re.sub(r':([^:]*):([^:]*)$', ':*:*', raw_ip)
+            ip = re.sub(r':([^:]*):([^:]*)$', ':*:*', ip)
                 
             change_ip = 1
-                
-        ip = raw_ip
+        else:     
+            ip = raw_ip
+            
         if type_d == 0:
             if is_this_ip == 0:
                 ip = '<a href="/w/' + url_pas('user:' + raw_ip) + '">' + raw_ip + '</a>'

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.3.0-stable-01b (beta-05b) (dev-2021-06-06-01)",
+        "r_ver" : "v3.3.0-stable-01b (beta-05b) (dev-2021-06-07-02)",
         "c_ver" : "3300301",
         "s_ver" : "12"
     }

views/main_css/js/render_onmark.js

@@ -1,6 +1,5 @@
 // 인터위키
 // 표 캡션
-// pagecount
 // Tool
 function do_url_change(data) {
     return encodeURIComponent(data);