email, skin 분리 준비

app.py

@@ -16,11 +16,15 @@ import logging
 import random
 import sys
 
+# 주의. user 테이블에서 email, skin 이전
+# user_set 테이블로 이동바람
+# 기타 설비로 이동 해야함
+
 # 나머지 불러오기
 from func import *
 
 # 버전 표기
-r_ver = 'v3.0.6-Master-01'
+r_ver = 'v3.0.6-Master-02'
 c_ver = ''.join(re.findall('[0-9]', r_ver))
 
 print('Version : ' + r_ver)
@@ -77,6 +81,7 @@ app.url_map.converters['everything'] = EverythingConverter
 
 # 셋업 부분
 curs.execute('create table if not exists data(test text)')
+curs.execute('create table if not exists cache_data(test text)')
 curs.execute('create table if not exists history(test text)')
 curs.execute('create table if not exists rd(test text)')
 curs.execute('create table if not exists user(test text)')
@@ -112,13 +117,37 @@ if setup_tool != 0:
     # create table
     create_data = {}
 
-    create_data['all_data'] = ['data', 'history', 'rd', 'user', 'ban', 'topic', 'stop', 'rb', 'back', 'agreedis', 'custom', 'other', 'alist', 're_admin', 'alarm', 'ua_d', 'filter', 'scan', 'acl', 'inter', 'html_filter']
+    create_data['all_data'] = [
+        'data', 
+        'cache_data', 
+        'history', 
+        'rd', 
+        'user', 
+        'ban', 
+        'topic', 
+        'stop', 
+        'rb', 
+        'back', 
+        'agreedis', 
+        'custom', 
+        'other', 
+        'alist', 
+        're_admin', 
+        'alarm', 
+        'ua_d', 
+        'filter', 
+        'scan', 
+        'acl', 
+        'inter', 
+        'html_filter'
+    ]
 
     create_data['data'] = ['title', 'data']
+    create_data['cache_data'] = ['title', 'data']
     create_data['history'] = ['id', 'title', 'data', 'date', 'ip', 'send', 'leng', 'hide']
     create_data['rd'] = ['title', 'sub', 'date', 'band']
-    create_data['user'] = ['id', 'pw', 'acl', 'date', 'email', 'skin']
-    create_data['user_set'] = ['name', 'data']
+    create_data['user'] = ['id', 'pw', 'acl', 'date']
+    create_data['user_set'] = ['name', 'id', 'data']
     create_data['ban'] = ['block', 'end', 'why', 'band', 'login']
     create_data['topic'] = ['id', 'title', 'sub', 'data', 'date', 'ip', 'block', 'top']
     create_data['stop'] = ['title', 'sub', 'close']
@@ -2788,7 +2817,7 @@ def register():
         conn.commit()
         
         if first == 0:
-            return redirect('/user')
+            return redirect('/change')
         else:
             return redirect('/setting/1')
     else:        

func.py

@@ -59,43 +59,9 @@ def captcha_get():
 
     return data
 
+# 호환성 설정
 def update():
-    # 호환성 설정
-    try:        
-        curs.execute('select title, re from hidhi')
-        for rep in curs.fetchall():
-            curs.execute("update history set hide = 'O' where title = ? and id = ?", [rep[0], rep[1]])
-
-        curs.execute("drop table if exists hidhi")
-
-        print('move table hidhi')
-    except:
-        pass
-
-    try:
-        curs.execute("select title, acl from data where acl != ''")
-        for rep in curs.fetchall():
-            curs.execute("insert into acl (title, dec, dis, why) values (?, ?, '', '')", [rep[0], rep[1]])
-
-        curs.execute("alter table data drop acl")
-
-        print('data table delete column acl')
-    except:
-        pass
-
-    try:
-        curs.execute('select name, sub from filter where sub != "X" and sub != ""')
-        filter_name = curs.fetchall()
-        if filter_name:
-            for filter_delete in filter_name:
-                if filter_delete[1] != '' or filter_delete[1] != 'X':
-                    curs.execute("update filter set sub = '' where name = ?", [filter_delete[0]])
-
-            print('filter data fix')
-    except:
-        pass
-
-    # 3.0.5 사용자 문서, 파일 문서, 분류 문서 영어화
+    # v3.0.5 사용자 문서, 파일 문서, 분류 문서 영어화
     try:
         all_rep = [['사용자:', 'user:'], ['파일:', 'file:'], ['분류:', 'category:']]
         all_rep2 = ['data', 'history', 'acl', 'topic', 'back']
@@ -133,6 +99,13 @@ def update():
     except:
         pass
 
+    # v3.0.6 사용자 설정 분리
+    # try:
+    #     curs.execute("alter table user drop email")
+    #     curs.execute("alter table user drop skin")
+    # except:
+    #    pass
+
 def captcha_post(re_data, num = 1):
     if num == 1:
         if custom()[2] == 0 and captcha_get() != '':