Просмотр исходного кода

업데이트 방식 일부 변경

Surplus_Up (2DU) 6 лет назад
Родитель
Сommit
dbf440c21c
3 измененных файлов с 31 добавлено и 19 удалено
  1. 7 13
      app.py
  2. 22 4
      route/tool/func.py
  3. 2 2
      version.json

+ 7 - 13
app.py

@@ -160,12 +160,12 @@ try:
     curs.execute(db_change('select data from other where name = "ver"'))
     curs.execute(db_change('select data from other where name = "ver"'))
     ver_set_data = curs.fetchall()
     ver_set_data = curs.fetchall()
     if not ver_set_data:
     if not ver_set_data:
-        setup_tool = 1
+        setup_tool = 2
     else:
     else:
         if int(version_list['master']['c_ver']) > int(ver_set_data[0][0]):
         if int(version_list['master']['c_ver']) > int(ver_set_data[0][0]):
             setup_tool = 1
             setup_tool = 1
 except:
 except:
-    setup_tool = 1
+    setup_tool = 2
 
 
 if setup_tool != 0:
 if setup_tool != 0:
     create_data['data'] = ['title', 'data']
     create_data['data'] = ['title', 'data']
@@ -204,7 +204,10 @@ if setup_tool != 0:
             except:
             except:
                 pass
                 pass
 
 
-    update()
+    if setup_tool == 1:
+        update(int(ver_set_data[0][0]))
+    else:
+        set_init()
 
 
 curs.execute(db_change('delete from other where name = "ver"'))
 curs.execute(db_change('delete from other where name = "ver"'))
 curs.execute(db_change('insert into other (name, data) values ("ver", ?)'), [version_list['master']['c_ver']])
 curs.execute(db_change('insert into other (name, data) values ("ver", ?)'), [version_list['master']['c_ver']])
@@ -316,20 +319,11 @@ if set_data['db_type'] == 'mysql':
 
 
     mysql_dont_off()
     mysql_dont_off()
 
 
+
 curs.execute(db_change('select data from other where name = "count_all_title"'))
 curs.execute(db_change('select data from other where name = "count_all_title"'))
 if not curs.fetchall():
 if not curs.fetchall():
     curs.execute(db_change('insert into other (name, data) values ("count_all_title", "0")'))
     curs.execute(db_change('insert into other (name, data) values ("count_all_title", "0")'))
 
 
-curs.execute(db_change("select html from html_filter where kind = 'email'"))
-if not curs.fetchall():
-    for i in ['naver.com', 'gmail.com', 'daum.net', 'kakao.com']:
-        curs.execute(db_change("insert into html_filter (html, kind) values (?, 'email')"), [i])
-
-curs.execute(db_change('select data from other where name = "smtp_server" or name = "smtp_port" or name = "smtp_security"'))
-if not curs.fetchall():
-    for i in [['smtp_server', 'imap.google.com'], ['smtp_port', '587'], ['smtp_security', 'tls']]:
-        curs.execute(db_change("insert into other (name, data) values (?, ?)"), [i[0], i[1]])
-
 conn.commit()
 conn.commit()
 
 
 if os.path.exists('custom.py'):
 if os.path.exists('custom.py'):

+ 22 - 4
route/tool/func.py

@@ -180,8 +180,10 @@ def captcha_get():
 
 
     return data
     return data
 
 
-def update():
-    #v3.1.5
+def update(ver_num):
+    print('----')
+    # 업데이트 하위 호환 유지 함수
+    # v3.1.5
     try:
     try:
         num = 1
         num = 1
         curs.execute(db_change('select title, sub from topic where id = "1" order by date asc'))
         curs.execute(db_change('select title, sub from topic where id = "1" order by date asc'))
@@ -191,13 +193,29 @@ def update():
                 curs.execute(db_change("update topic set code = ? where title = ? and sub = ? and id = '1'"), [str(num), i[0], i[1]])
                 curs.execute(db_change("update topic set code = ? where title = ? and sub = ? and id = '1'"), [str(num), i[0], i[1]])
                 num += 1
                 num += 1
 
 
-            print('----')
             print('Add topic code')
             print('Add topic code')
-            print('----')
     except:
     except:
         pass
         pass
 
 
+    if ver_num < 3160027:
+        print('Add init set')
+        set_init()
+
     conn.commit()
     conn.commit()
+    print('Update pass')
+    print('----')
+
+def set_init():
+    # 초기값 설정 함수    
+    curs.execute(db_change("select html from html_filter where kind = 'email'"))
+    if not curs.fetchall():
+        for i in ['naver.com', 'gmail.com', 'daum.net', 'kakao.com']:
+            curs.execute(db_change("insert into html_filter (html, kind) values (?, 'email')"), [i])
+
+    curs.execute(db_change('select data from other where name = "smtp_server" or name = "smtp_port" or name = "smtp_security"'))
+    if not curs.fetchall():
+        for i in [['smtp_server', 'imap.google.com'], ['smtp_port', '587'], ['smtp_security', 'tls']]:
+            curs.execute(db_change("insert into other (name, data) values (?, ?)"), [i[0], i[1]])
 
 
 def topic_change(num):
 def topic_change(num):
     curs.execute(db_change('select title, sub from topic where id = "1" and code = ?'), [str(num)])
     curs.execute(db_change('select title, sub from topic where id = "1" and code = ?'), [str(num)])

+ 2 - 2
version.json

@@ -1,7 +1,7 @@
 {
 {
     "master" : {
     "master" : {
-        "r_ver" : "v3.1.6-master-26",
-        "c_ver" : "400009",
+        "r_ver" : "v3.1.6-master-27",
+        "c_ver" : "3160027",
         "s_ver" : "7"
         "s_ver" : "7"
     }, "stable" : {
     }, "stable" : {
         "r_ver" : "v3.1.5-stable-03",
         "r_ver" : "v3.1.5-stable-03",