Browse Source

some init remove

2du 4 năm trước cách đây
mục cha
commit
ae2d9dd0a2
3 tập tin đã thay đổi với 59 bổ sung86 xóa
  1. 57 16
      app.py
  2. 0 68
      route/tool/func.py
  3. 2 2
      route/user_setting.py

+ 57 - 16
app.py

@@ -231,24 +231,65 @@ app.secret_key = sql_data[0][0]
 print('----')
 
 # Init-DB_Data
-dislay_set_key = ['Host', 'Port', 'Language', 'Markup', 'Encryption method']
-server_set_key = ['host', 'port', 'language', 'markup', 'encode']
 server_set = {}
-
-server_init = server_init()
-for i in range(len(server_set_key)):
-    curs.execute(db_change('select data from other where name = ?'), [server_set_key[i]])
+server_set_var = {
+    'host' : {
+        'display' : 'Host',
+        'require' : 'conv',
+        'default' : '0.0.0.0'
+    }, 'port' : {
+        'display' : 'Port',
+        'require' : 'conv',
+        'default' : '3000'
+    }, 'language' : {
+        'display' : 'Language',
+        'require' : 'select',
+        'default' : 'ko-KR',
+        'list' : ['ko-KR', 'en-US']
+    }, 'markup' : {
+        'display' : 'Markup',
+        'require' : 'select',
+        'default' : 'namumark',
+        'list' : ['namumark', 'custom', 'raw']
+    }, 'encode' : {
+        'display' : 'Encryption method',
+        'require' : 'select',
+        'default' : 'sha3',
+        'list' : ['sha3', 'sha256']
+    }
+}
+server_set_env = {
+    'host' : os.getenv('NAMU_HOST'),
+    'port' : os.getenv('NAMU_PORT'),
+    'language' : os.getenv('NAMU_LANG'),
+    'markup' : os.getenv('NAMU_MARKUP'),
+    'encode' : os.getenv('NAMU_ENCRYPT')
+}
+for i in server_set_var:
+    curs.execute(db_change('select data from other where name = ?'), [i])
     server_set_val = curs.fetchall()
-    if not server_set_val:
-        server_set_val = server_init.init(server_set_key[i])
-
-        curs.execute(db_change('insert into other (name, data) values (?, ?)'), [server_set_key[i], server_set_val])
-    else:
+    if server_set_val:
         server_set_val = server_set_val[0][0]
-
-    print(dislay_set_key[i] + ' : ' + server_set_val)
-
-    server_set[server_set_key[i]] = server_set_val
+    elif server_set_env[i] != None:
+        server_set_val = server_set_env[i]
+    else:
+        if 'list' in server_set_var[i]:
+            print(server_set_var[i]['display'] + ' (' + server_set_var[i]['default'] + ') [' + ', '.join(server_set_var[i]['list']) + ']' + ' : ', end = '')
+        else:
+            print(server_set_var[i]['display'] + ' (' + server_set_var[i]['default'] + ') : ', end = '')
+            
+        server_set_val = input()
+        if server_set_val == '':
+            server_set_val = server_set_var[i]['default']
+        elif server_set_var[i]['require'] == 'select':
+            if not server_set_val in server_set_var[i]['list']:
+                server_set_val = server_set_var[i]['default']
+                
+        curs.execute(db_change('insert into other (name, data) values (?, ?)'), [i, server_set_val])
+        
+    print(server_set_var[i]['display'] + ' : ' + server_set_val)
+    
+    server_set[i] = server_set_val
 
 print('----')
     
@@ -619,7 +660,7 @@ def user_tool(name = None):
 
 @app.route('/change', methods = ['POST', 'GET'])
 def user_setting():
-    return user_setting_2(conn, server_init)
+    return user_setting_2(conn, server_set_var)
 
 @app.route('/change/email', methods = ['POST', 'GET'])
 def user_setting_email():

+ 0 - 68
route/tool/func.py

@@ -102,74 +102,6 @@ def load_conn(data):
     load_conn2(data)
     
 # Func-init
-class server_init:
-    def __init__(self):
-        self.env_dict = {
-            'host' : os.getenv('NAMU_HOST'),
-            'port' : os.getenv('NAMU_PORT'),
-            'language' : os.getenv('NAMU_LANG'),
-            'markup' : os.getenv('NAMU_MARKUP'),
-            'encode' : os.getenv('NAMU_ENCRYPT')
-        }
-
-        self.server_set_var = {
-            'host' : {
-                'display' : 'Host',
-                'require' : 'conv',
-                'default' : '0.0.0.0'
-            }, 'port' : {
-                'display' : 'Port',
-                'require' : 'conv',
-                'default' : '3000'
-            }, 'language' : {
-                'display' : 'Language',
-                'require' : 'select',
-                'default' : 'ko-KR',
-                'list' : ['ko-KR', 'en-US']
-            }, 'markup' : {
-                'display' : 'Markup',
-                'require' : 'select',
-                'default' : 'namumark',
-                'list' : ['namumark', 'custom', 'raw']
-            }, 'encode' : {
-                'display' : 'Encryption method',
-                'require' : 'select',
-                'default' : 'sha3',
-                'list' : ['sha3', 'sha256']
-            }
-        }
-        
-    def server_init(self):
-        return self.server_set_var
-    
-    def init(self, key):
-        if self.env_dict[key] != None:
-            return self.env_dict[key]
-        else:
-            while 1:
-                if self.server_set_var[key]['require'] == 'select':
-                    list_ = '[' + ', '.join(self.server_set_var[key]['list']) + ']'
-                else:
-                    list_ = ''
-
-                print('{} ({}) {} : '.format(
-                    self.server_set_var[key]['display'],
-                    self.server_set_var[key]['default'],
-                    list_
-                ), end = '')
-
-                server_set_val = input()
-                if server_set_val:
-                    if self.server_set_var[key]['require'] == 'select':
-                        if server_set_val not in self.server_set_var[key]['list']:
-                            pass
-                        else:
-                            return server_set_val
-                    else:
-                        return server_set_val
-                else:
-                    return self.server_set_var[key]['default']
-
 def get_conn(db_set = ''):
     global global_db_set
     if db_set != '':

+ 2 - 2
route/user_setting.py

@@ -1,9 +1,9 @@
 from .tool.func import *
 
-def user_setting_2(conn, server_init):
+def user_setting_2(conn, server_set_var):
     curs = conn.cursor()
 
-    support_language = ['default'] + server_init.server_init()['language']['list']
+    support_language = ['default'] + server_set_var['language']['list']
     ip = ip_check()
 
     if ban_check() == 1: