Przeglądaj źródła

이전에 쓰던 방식으로 회귀

Surplus_Up (2DU) 6 lat temu
rodzic
commit
bc7157b780
4 zmienionych plików z 22 dodań i 31 usunięć
  1. 1 0
      .gitignore
  2. 19 29
      app.py
  3. 1 1
      emergency_tool.py
  4. 1 1
      version.json

+ 1 - 0
.gitignore

@@ -1,5 +1,6 @@
 __pycache__
 /app_session
+data/set.json
 .vscode
 
 *.db

+ 19 - 29
app.py

@@ -22,35 +22,25 @@ print('----')
 app_var = json.loads(open('data/app_var.json', encoding='utf-8').read())
 
 # DB
-all_src = []
-for i_data in os.listdir("."):
-    f_src = re.search("(.+)\.db$", i_data)
-    if f_src:
-        all_src += [f_src.groups()[0]]
-
-if len(all_src) == 0:
-    print('DB name (data) : ', end = '')
-    
-    db_name = input()
-    if db_name == '':
-        db_name = 'data'
-elif len(all_src) > 1:
-    db_num = 1
-
-    for i_data in all_src:
-        print(str(db_num) + ' : ' + i_data)
-
-        db_num += 1
-
-    print('----')
-    print('Number : ', end = '')
-    db_name = all_src[int(number_check(input())) - 1]
-    print('----')
-else:
-    db_name = all_src[0]
-
-if len(all_src) == 1:
-    print('DB\'s name : ' + db_name)
+try:
+    set_data = json.loads(open('data/set.json').read())
+except:
+    if os.getenv('NAMU_DB') != None:
+        set_data = { "db" : os.getenv('NAMU_DB') }
+    else:
+        print('DB name (data) : ', end = '')
+        
+        new_json = str(input())
+        if new_json == '':
+            new_json = 'data'
+            
+        with open('set.json', 'w') as f:
+            f.write('{ "db" : "' + new_json + '" }')
+            
+        set_data = json.loads(open('data/set.json').read())
+        
+print('DB\'s name : ' + set_data['db'])
+db_name = set_data['db']
             
 if os.path.exists(db_name + '.db'):
     setup_tool = 0

+ 1 - 1
emergency_tool.py

@@ -137,7 +137,7 @@ elif what_i_do == '8':
     curs.execute("update other set data = '00000' where name = 'ver'")
 else:
     print('----')
-    print('DB\'s name (data) : ', end = '')
+    print('DB name (data) : ', end = '')
     
     db_name = input()
     if db_name == '':

+ 1 - 1
version.json

@@ -1,6 +1,6 @@
 {
     "master" : {
-        "r_ver" : "v3.1.3-master-05",
+        "r_ver" : "v3.1.3-master-06",
         "c_ver" : "400003",
         "s_ver" : "2"
     }, "stable" : {