Sfoglia il codice sorgente

Dockerizing (4) #607 - Add Data Migration Code Group

hoparkgo9ma 7 anni fa
parent
commit
a3ad411184
2 ha cambiato i file con 35 aggiunte e 5 eliminazioni
  1. 32 2
      app.py
  2. 3 3
      route/tool/func.py

+ 32 - 2
app.py

@@ -13,6 +13,38 @@ c_ver = '309001'
 
 
 print('Version : ' + r_ver)
 print('Version : ' + r_ver)
 
 
+
+
+# Start Data Migration Code
+
+'''
+3.0.9-master-004 -> next release
+
+ * Dockerizing
+ * Add OAuth Provider: Discord
+'''
+if os.path.exists('image'):
+    os.rename('image', 'data/images')
+if os.path.exists('set.json'):
+    os.rename('set.json', 'data/set.json')
+if os.path.exists('oauthsettings.json'):
+    os.rename('oauthsettings.json', 'data/oauthsettings.json')
+
+try:
+    load_oauth('discord')
+except KeyError:
+    old_oauth_data = json.loads(open('data/oauthsettings.json', 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:
+        f.write(json.dumps(old_oauth_data, sort_keys=True, indent=4))
+
+# -> End Data Migration Code
+
 try:
 try:
     set_data = json.loads(open('data/set.json').read())
     set_data = json.loads(open('data/set.json').read())
 except:
 except:
@@ -157,8 +189,6 @@ if not curs.fetchall():
     curs.execute('delete from alist where name = "owner"')
     curs.execute('delete from alist where name = "owner"')
     curs.execute('insert into alist (name, acl) values ("owner", "owner")')
     curs.execute('insert into alist (name, acl) values ("owner", "owner")')
 
 
-if os.path.exists('image'): # Data Migration Code
-    os.rename('image', 'data/images')
 if not os.path.exists('data/images'):
 if not os.path.exists('data/images'):
     os.makedirs('data/images')
     os.makedirs('data/images')
     
     

+ 3 - 3
route/tool/func.py

@@ -289,11 +289,11 @@ def load_oauth(provider):
     return oauth[provider]
     return oauth[provider]
 
 
 def update_oauth(provider, target, content):
 def update_oauth(provider, target, content):
-    oauth = json.loads(open('data/oauthsettings.json', encoding='utf-8').read())    
+    oauth = json.loads(open('data/oauthsettings.json', encoding='utf-8').read())
     oauth[provider][target] = content
     oauth[provider][target] = content
 
 
-    with open('data/oauthsettings.json', 'w', encoding='utf-8') as f:
-        json.dump(oauth, f)
+    with open('data/oauthsettings.json', 'w') as f:
+        f.write(json.dumps(oauth, sort_keys=True, indent=4))
 
 
     return 'Done'
     return 'Done'