Seperate app variables

app.py

@@ -13,7 +13,7 @@ c_ver = '309001'
 
 print('Version : ' + r_ver)
 
-
+APPVAR = json.loads(open('data/app_variables.json', encoding='utf-8').read())
 
 # Start Data Migration Code
 
@@ -24,29 +24,29 @@ print('Version : ' + r_ver)
  * Add OAuth Provider: Discord
 '''
 if os.path.exists('image'):
-    os.rename('image', 'data/images')
+    os.rename('image', APPVAR['PATH_DATA_IMAGES'])
 if os.path.exists('set.json'):
-    os.rename('set.json', 'data/set.json')
+    os.rename('set.json', APPVAR['PATH_SET_JSON'])
 if os.path.exists('oauthsettings.json'):
-    os.rename('oauthsettings.json', 'data/oauthsettings.json')
+    os.rename('oauthsettings.json', APPVAR['PATH_OAUTHSETTINGS'])
 
 try:
     load_oauth('discord')
 except KeyError:
-    old_oauth_data = json.loads(open('data/oauthsettings.json', encoding='utf-8').read())
+    old_oauth_data = json.loads(open(APPVAR['PATH_OAUTHSETTINGS'], encoding='utf-8').read())
 
     if 'discord' not in old_oauth_data['_README']['support']:
         old_oauth_data['_README']['support'] += ['discord']
     old_oauth_data['discord'] = {}
     old_oauth_data['discord']['client_id'] = ''
     old_oauth_data['discord']['client_secret'] = ''
-    with open('data/oauthsettings.json', 'w') as f:
+    with open(APPVAR['PATH_OAUTHSETTINGS'], 'w') as f:
         f.write(json.dumps(old_oauth_data, sort_keys=True, indent=4))
 
 # -> End Data Migration Code
 
 try:
-    set_data = json.loads(open('data/set.json').read())
+    set_data = json.loads(open(APPVAR['PATH_SET_JSON']).read())
 except:
     if os.getenv('NAMU_DB') != None:
         set_data = { "db" : 'data/' + os.getenv('NAMU_DB') }
@@ -57,10 +57,10 @@ except:
         if new_json == '':
             new_json = 'data'
             
-        with open('data/set.json', 'w') as f:
+        with open(APPVAR['PATH_SET_JSON'], 'w') as f:
             f.write('{ "db" : "data/' + new_json + '" }')
             
-        set_data = json.loads(open('data/set.json').read())
+        set_data = json.loads(open(APPVAR['PATH_SET_JSON']).read())
         
 print('DB\'s name : ' + set_data['db'])
             
@@ -189,8 +189,8 @@ if not curs.fetchall():
     curs.execute('delete from alist where name = "owner"')
     curs.execute('insert into alist (name, acl) values ("owner", "owner")')
 
-if not os.path.exists('data/images'):
-    os.makedirs('data/images')
+if not os.path.exists(APPVAR['PATH_DATA_IMAGES']):
+    os.makedirs(APPVAR['PATH_DATA_IMAGES'])
     
 if not os.path.exists('views'):
     os.makedirs('views')
@@ -518,10 +518,10 @@ def oauth_settings():
                 menu = [['other', load_lang('return')]]
             ))
 
-        with open('data/oauthsettings.json', 'r', encoding='utf-8') as f:
+        with open(APPVAR['PATH_OAUTHSETTINGS'], 'r', encoding='utf-8') as f:
             legacy = json.loads(f.read())
 
-        with open('data/oauthsettings.json', 'w', encoding='utf-8') as f:
+        with open(APPVAR['PATH_OAUTHSETTINGS'], 'w', encoding='utf-8') as f:
             f.write("""
                 {
                     "_README" : {
@@ -3287,12 +3287,12 @@ def upload():
             else:
                 lice = '[[user:' + ip + ']]'
             
-        if os.path.exists(os.path.join('data/images', e_data)):
-            os.remove(os.path.join('data/images', e_data))
+        if os.path.exists(os.path.join(APPVAR['PATH_DATA_IMAGES'], e_data)):
+            os.remove(os.path.join(APPVAR['PATH_DATA_IMAGES'], e_data))
             
-            data.save(os.path.join('data/images', e_data))
+            data.save(os.path.join(APPVAR['PATH_DATA_IMAGES'], e_data))
         else:
-            data.save(os.path.join('data/images', e_data))
+            data.save(os.path.join(APPVAR['PATH_DATA_IMAGES'], e_data))
             
         curs.execute("select title from data where title = ?", ['file:' + name])
         if curs.fetchall(): 

data/app_variables.json

@@ -0,0 +1,6 @@
+{
+    "_README" : "DO NOT MODIFY THIS FILE.",
+    "PATH_OAUTHSETTINGS" : "data/oauthsettings.json",
+    "PATH_SET_JSON" : "data/set.json",
+    "PATH_DATA_IMAGES" : "data/images"
+}

route/image_view.py

@@ -1,9 +1,11 @@
 from .tool.func import *
 
+APPVAR = json.loads(open('data/app_variables.json', encoding='utf-8').read())
+
 def image_view_2(conn, name):
     curs = conn.cursor()
     
-    if os.path.exists(os.path.join('data/images', name)):
-        return flask.send_from_directory('./data/images', name)
+    if os.path.exists(os.path.join(APPVAR['PATH_DATA_IMAGES'], name)):
+        return flask.send_from_directory('.'+APPVAR['PATH_DATA_IMAGES'], name)
     else:
         return redirect()

route/tool/func.py

@@ -36,6 +36,8 @@ if sys.version_info < (3, 6):
 from .set_mark.tool import *
 from .mark import *
 
+APPVAR = json.loads(open('data/app_variables.json', encoding='utf-8').read())
+
 def load_conn(data):
     global conn
     global curs
@@ -284,15 +286,15 @@ def load_lang(data, num = 2, safe = 0):
             return load_lang(data, 1, safe)
 
 def load_oauth(provider):
-    oauth = json.loads(open('data/oauthsettings.json', encoding='utf-8').read())
+    oauth = json.loads(open(APPVAR['PATH_OAUTHSETTINGS'], encoding='utf-8').read())
 
     return oauth[provider]
 
 def update_oauth(provider, target, content):
-    oauth = json.loads(open('data/oauthsettings.json', encoding='utf-8').read())
+    oauth = json.loads(open(APPVAR['PATH_OAUTHSETTINGS'], encoding='utf-8').read())
     oauth[provider][target] = content
 
-    with open('data/oauthsettings.json', 'w') as f:
+    with open(APPVAR['PATH_OAUTHSETTINGS'], 'w') as f:
         f.write(json.dumps(oauth, sort_keys=True, indent=4))
 
     return 'Done'