custom 테이블 통합

app.py

@@ -142,7 +142,6 @@ create_data['user_application'] = ['id', 'pw', 'date', 'encode', 'question', 'an
 create_data['topic'] = ['id', 'data', 'date', 'ip', 'block', 'top', 'code']
 create_data['rb'] = ['block', 'end', 'today', 'blocker', 'why', 'band', 'login', 'ongoing']
 create_data['back'] = ['title', 'link', 'type']
-create_data['custom'] = ['user', 'css']
 create_data['other'] = ['name', 'data', 'coverage']
 create_data['alist'] = ['name', 'acl']
 create_data['re_admin'] = ['who', 'what', 'time']

route/tool/func.py

@@ -290,9 +290,17 @@ def update(ver_num, set_data):
                 i[2]
             ])
 
+    if ver_num < 3203400:
+        curs.execute(db_change("select user, css from custom"))
+        for i in curs.fetchall():
+            curs.execute(db_change("insert into user_set (name, id, data) values ('custom_css', ?, ?)"), [
+                re.sub(r' \(head\)$', '', i[0]), 
+                i[1]
+            ])
+
     conn.commit()
 
-    print('Update pass')
+    print('Update completed')
 
 def set_init():
     # 초기값 설정 함수    

route/user_custom_head_view.py

@@ -8,11 +8,11 @@ def user_custom_head_view_2(conn):
     if flask.request.method == 'POST':
         get_data = flask.request.form.get('content', '')
         if ip_or_user(ip) == 0:
-            curs.execute(db_change("select user from custom where user = ?"), [ip + ' (head)'])
+            curs.execute(db_change("select id from user_set where id = ? and name = 'custom_css'"), [ip])
             if curs.fetchall():
-                curs.execute(db_change("update custom set css = ? where user = ?"), [get_data, ip + ' (head)'])
+                curs.execute(db_change("update user_set set data = ? where id = ? and name = 'custom_css'"), [get_data, ip])
             else:
-                curs.execute(db_change("insert into custom (user, css) values (?, ?)"), [ip + ' (head)', get_data])
+                curs.execute(db_change("insert into user_set (id, name, data) values (?, 'custom_css', ?)"), [ip, get_data])
 
             conn.commit()
 
@@ -23,30 +23,33 @@ def user_custom_head_view_2(conn):
         if ip_or_user(ip) == 0:
             start = ''
 
-            curs.execute(db_change("select css from custom where user = ?"), [ip + ' (head)'])
+            curs.execute(db_change("select data from user_set where id = ? and name = 'custom_css'"), [ip])
             head_data = curs.fetchall()
-            if head_data:
-                data = head_data[0][0]
-            else:
-                data = ''
+            data = head_data[0][0] if head_data else ''
         else:
-            start = '<span>' + load_lang('user_head_warring') + '</span><hr class=\"main_hr\">'
-
-            if 'head' in flask.session:
-                data = flask.session['head']
-            else:
-                data = ''
-
-        start += '<span>&lt;style&gt;CSS&lt;/style&gt;<br>&lt;script&gt;JS&lt;/script&gt;</span><hr class=\"main_hr\">'
+            start = '' + \
+                '<span>' + load_lang('user_head_warring') + '</span>' + \
+                '<hr class="main_hr">' + \
+            ''
+            data = flask.session['head'] if 'head' in flask.session else ''
+
+        start += '' + \
+            '<span>' + \
+                '&lt;style&gt;CSS&lt;/style&gt;' + \
+                '<br>' + \
+                '&lt;script&gt;JS&lt;/script&gt;' + \
+            '</span>' + \
+            '<hr class="main_hr">' + \
+        ''
 
         return easy_minify(flask.render_template(skin_check(),
             imp = [load_lang(data = 'user_head', safe = 1), wiki_set(), custom(), other2([0, 0])],
-            data =  start + '''
-                    <form method="post">
-                        <textarea rows="25" cols="100" name="content">''' + data + '''</textarea>
-                        <hr class=\"main_hr\">
-                        <button id="save" type="submit">''' + load_lang('save') + '''</button>
-                    </form>
-                    ''',
+            data = start + '''
+                <form method="post">
+                    <textarea rows="25" cols="100" name="content">''' + data + '''</textarea>
+                    <hr class="main_hr">
+                    <button id="save" type="submit">''' + load_lang('save') + '''</button>
+                </form>
+            ''',
             menu = [['user', load_lang('return')]]
         ))

version.json

@@ -1,7 +1,7 @@
 {
     "beta" : {
-        "r_ver" : "v3.2.0-stable-13 (beta-33) (dev-2020-09-10-01)",
-        "c_ver" : "3202600",
+        "r_ver" : "v3.2.0-stable-13 (beta-34) (dev-2020-09-13-01)",
+        "c_ver" : "3203400",
         "s_ver" : "10"
     }
 }