코드 또 정리

route/edit.py

@@ -23,7 +23,7 @@ def edit_2(conn, name):
 
         today = get_time()
         content = flask.request.form.get('content', '').replace('\r\n', '\n')
-        o_content = flask.request.form.get('otent', '').replace('\r\n', '\n')
+        o_content = flask.request.form.get('o_content', '').replace('\r\n', '\n')
 
         if o_content == content:
             return redirect('/w/' + url_pas(name))
@@ -38,11 +38,13 @@ def edit_2(conn, name):
 
         content = savemark(content)
         
-        if old:
-            leng = leng_check(len(o_content), len(content))
-            
+        if old:  
+            o_data = old[0][0].replace('\r\n', '\n')
+
             if section:
-                content = old[0][0].replace('\r\n', '\n').replace(o_content, content)
+                content = o_data.replace(o_content, content)
+
+            leng = leng_check(len(o_data), len(content))
         else:
             leng = '+' + str(len(content))
 
@@ -86,40 +88,46 @@ def edit_2(conn, name):
     else:            
         if old:
             if section:
-                section = int(number_check(section))
-                data = re.sub(
-                    '\n(?P<in>={1,6})', 
-                    '<br>\g<in>', 
-                    html.escape('\n' + old[0][0].replace('\r\n', '\n') + '\n')
-                )
+                section = number_check(section)
+                data = html.escape('\n' + old[0][0].replace('\r\n', '\n') + '\n')
+                
                 i = 1
-
                 while 1:
-                    g_data = re.search('((?:<br>)(?:(?:(?!\n|<br>).)+)(?:\n*(?:(?:(?!<br>).)+\n*)+)?)', data)
-                    if g_data:
-                        if section == i:
-                            data = html.unescape(re.sub('<br>(?P<in>={1,6})', '\n\g<in>', g_data.groups()[0]))
-                            
-                            break
-                        else:
-                            data = re.sub('((?:<br>)(?:(?:(?!\n|<br>).)+)(?:\n*(?:(?:(?!<br>).)+\n*)+)?)', '\n', data, 1)
+                    if re.search('\n(?P<in>={1,6})', data):
+                        data = re.sub(
+                            '\n(?P<in>={1,6})', 
+                            '<br><' + str(i) + '>\g<in>', 
+                            data,
+                            1
+                        )
 
                         i += 1
                     else:
                         break
+
+                section_data = re.search('<br><' + str(section) + '>((?:(?:(?!<br>).)*\n*)*)', data)
+                if section_data:
+                    data = section_data.groups()[0]
+                else:
+                    return redirect('/edit/' + url_pas(name))
             else:
                 data = old[0][0].replace('\r\n', '\n')
         else:
             data = ''
-            
+
         data_old = data
-        get_name = ''
 
-        if not section:
-            get_name = '''
-                <a href="/manager/15?plus=''' + url_pas(name) + '">(' + load_lang('load') + ')</a> <a href="/edit_filter">(' + load_lang('edit_filter_rule') + ''')</a>
-                <hr class=\"main_hr\">
-            '''
+        if section:
+            get_name = '' + \
+                '<a href="/edit_filter">(' + load_lang('edit_filter_rule') + ')</a>' + \
+                '<hr class=\"main_hr\">' + \
+            ''
+        else:
+            get_name = '' + \
+                '<a href="/manager/15?plus=' + url_pas(name) + '">(' + load_lang('load') + ')</a> ' + \
+                '<a href="/edit_filter">(' + load_lang('edit_filter_rule') + ')</a>' + \
+                '<hr class=\"main_hr\">' + \
+            ''
             
         if flask.request.args.get('plus', None):
             curs.execute(db_change("select data from data where title = ?"), [flask.request.args.get('plus', 'test')])
@@ -142,11 +150,16 @@ def edit_2(conn, name):
         else:
             b_text = ''
         
-        cccb_text = ''
         curs.execute(db_change('select data from other where name = "copyright_checkbox_text"'))
         sql_d = curs.fetchall()
         if sql_d and sql_d[0][0] != '':
-            cccb_text = '<hr class=\"wmain_hr\"><input type="checkbox" name="copyright_agreement" value="yes">' + sql_d[0][0] + '<hr class=\"main_hr\">'
+            cccb_text = '' + \
+                '<hr class=\"main_hr\">' + \
+                '<input type="checkbox" name="copyright_agreement" value="yes"> ' + sql_d[0][0] + \
+                '<hr class=\"main_hr\">' + \
+            ''
+        else:
+            cccb_text = ''
 
         curs.execute(db_change('select data from other where name = "edit_help"'))
         sql_d = curs.fetchall()
@@ -155,14 +168,17 @@ def edit_2(conn, name):
         else:
             p_text = load_lang('defalut_edit_help')
 
+        data = re.sub('\n$', '', data)
+        data_old = re.sub('\n$', '', data_old)
+
         return easy_minify(flask.render_template(skin_check(), 
             imp = [name, wiki_set(), custom(), other2([' (' + sub + ')', 0])],
             data =  get_name + '''
                 <form method="post">
                     <script>do_stop_exit();</script>
                     ''' + edit_button() + '''
-                    <textarea rows="25" id="content" placeholder="''' + p_text + '''" name="content">''' + html.escape(re.sub('\n$', '', data)) + '''</textarea>
-                    <textarea id="origin" name="otent">''' + html.escape(re.sub('\n$', '', data_old)) + '''</textarea>
+                    <textarea id="content" placeholder="''' + p_text + '''" name="content">''' + html.escape(data) + '''</textarea>
+                    <textarea id="origin" name="o_content">''' + html.escape(data_old) + '''</textarea>
                     <hr class=\"main_hr\">
                     <input placeholder="''' + load_lang('why') + '''" name="send" type="text">
                     <hr class=\"main_hr\">

route/tool/func.py

@@ -499,7 +499,7 @@ def other2(data):
         data += ['']
 
     req_list = ''
-    main_css_ver = 28
+    main_css_ver = 29
 
     if not 'main_css_load' in flask.session or not 'main_css_ver' in flask.session or flask.session['main_css_ver'] != main_css_ver:
         for i_data in os.listdir(os.path.join("views", "main_css", "css")):

views/main_css/css/main.css

@@ -49,4 +49,5 @@ blockquote { background-image: url(/views/acme/img/quote.png); background-positi
 div#topic_scroll { max-height: 500px; overflow: scroll; -ms-overflow-style: none; scrollbar-width: none; }
 div#topic_scroll::-webkit-scrollbar { display: none; }
 .hidden_link { filter: blur(3px); }
-.hidden_link:hover { filter: none; }
+.hidden_link:hover { filter: none; }
+#content { height: 500px; }