일부 걷어내기

route/n_bbs_in.py

@@ -15,15 +15,15 @@ async def bbs_in(bbs_num = 1, page = 1):
     
         bbs_name = db_data[0][0]
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [bbs_name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('bbs') + ') (' + str(page) + ')', 0])],
-            data = '' + \
-                '<div id="opennamu_bbs_in"></div>' + \
-                '<script defer src="/views/main_css/js/route/bbs_in.js' + cache_v() + '"></script>' + \
-                '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_bbs_in(); });</script>' + \
-            '',
-            menu = [['bbs/main', await get_lang('return')], ['bbs/edit/' + bbs_num_str, await get_lang('add')], ['bbs/set/' + bbs_num_str, await get_lang('bbs_set')]]
-        ))
+    return easy_minify(flask.render_template(await skin_check(),
+        imp = [bbs_name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('bbs') + ') (' + str(page) + ')', 0])],
+        data = '' + \
+            '<div id="opennamu_bbs_in"></div>' + \
+            '<script defer src="/views/main_css/js/route/bbs_in.js' + cache_v() + '"></script>' + \
+            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_bbs_in(); });</script>' + \
+        '',
+        menu = [['bbs/main', await get_lang('return')], ['bbs/edit/' + bbs_num_str, await get_lang('add')], ['bbs/set/' + bbs_num_str, await get_lang('bbs_set')]]
+    ))
 
 '''
 async def bbs_in(bbs_num = 1, page = 1):

route/n_bbs_main.py

@@ -1,13 +1,12 @@
 from .tool.func import *
 
 async def bbs_main():
-    with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('bbs_main'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = '' + \
-                '<div id="opennamu_bbs_main"></div>' + \
-                '<script defer src="/views/main_css/js/route/bbs_main.js' + cache_v() + '"></script>' + \
-                '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_bbs_main(); });</script>' + \
-            '',
-            menu = [['other', await get_lang('other_tool')], ['bbs/make', await get_lang('add')]]
-        ))
+    return easy_minify(flask.render_template(await skin_check(),
+        imp = [await get_lang('bbs_main'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
+        data = '' + \
+            '<div id="opennamu_bbs_main"></div>' + \
+            '<script defer src="/views/main_css/js/route/bbs_main.js' + cache_v() + '"></script>' + \
+            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_bbs_main(); });</script>' + \
+        '',
+        menu = [['other', await get_lang('other_tool')], ['bbs/make', await get_lang('add')]]
+    ))

route/n_bbs_w_set.py

@@ -1,24 +1,23 @@
 from .tool.func import *
 
 async def bbs_w_set(bbs_num = ''):
-    with get_db_connect() as conn:
-        curs = conn.cursor()
+    curs = conn.cursor()
 
-        curs.execute(db_change('select set_data from bbs_set where set_id = ? and set_name = "bbs_name"'), [bbs_num])
-        db_data = curs.fetchall()
-        if not db_data:
-            return redirect(conn, '/bbs/main')
-        else:
-            bbs_name = db_data[0][0]
+    curs.execute(db_change('select set_data from bbs_set where set_id = ? and set_name = "bbs_name"'), [bbs_num])
+    db_data = curs.fetchall()
+    if not db_data:
+        return redirect(conn, '/bbs/main')
+    else:
+        bbs_name = db_data[0][0]
 
-        bbs_num_str = str(bbs_num)
+    bbs_num_str = str(bbs_num)
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('bbs_set'), await wiki_set(), await wiki_custom(), wiki_css(['(' + bbs_name + ')', 0])],
-            data = '' + \
-                '<div id="opennamu_bbs_w_set"></div>' + \
-                '<script defer src="/views/main_css/js/route/bbs_w_set.js' + cache_v() + '"></script>' + \
-                '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_bbs_w_set(); });</script>' + \
-            '',
-            menu = [['bbs/in/' + bbs_num_str, await get_lang('return')]]
-        ))
+    return easy_minify(flask.render_template(await skin_check(),
+        imp = [await get_lang('bbs_set'), await wiki_set(), await wiki_custom(), wiki_css(['(' + bbs_name + ')', 0])],
+        data = '' + \
+            '<div id="opennamu_bbs_w_set"></div>' + \
+            '<script defer src="/views/main_css/js/route/bbs_w_set.js' + cache_v() + '"></script>' + \
+            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_bbs_w_set(); });</script>' + \
+        '',
+        menu = [['bbs/in/' + bbs_num_str, await get_lang('return')]]
+    ))

route/n_edit_move_all.py

@@ -1,13 +1,12 @@
 from .tool.func import *
 
 async def edit_move_all():
-    with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('multiple_move'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
-            data = '' + \
-                '<div id="opennamu_edit_move_all"></div>' + \
-                '<script defer src="/views/main_css/js/route/edit_move_all.js' + cache_v() + '"></script>' + \
-                '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_edit_move_all(); });</script>' + \
-            '',
-            menu = [['other', await get_lang('return')]]
-        ))
+    return easy_minify(flask.render_template(await skin_check(),
+        imp = [await get_lang('multiple_move'), await wiki_set(), await wiki_custom(), wiki_css([0, 0])],
+        data = '' + \
+            '<div id="opennamu_edit_move_all"></div>' + \
+            '<script defer src="/views/main_css/js/route/edit_move_all.js' + cache_v() + '"></script>' + \
+            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_edit_move_all(); });</script>' + \
+        '',
+        menu = [['other', await get_lang('return')]]
+    ))

route/n_give_auth.py

@@ -1,19 +1,18 @@
 from .tool.func import *
 
 async def give_auth(user_name = ''):
-    with get_db_connect() as conn:
-        if user_name == '':
-            user_name = await get_lang('authorize')
-            sub = 0
-        else:
-            sub = '(' + await get_lang('authorize') + ')'
+    if user_name == '':
+        user_name = await get_lang('authorize')
+        sub = 0
+    else:
+        sub = '(' + await get_lang('authorize') + ')'
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [user_name, await wiki_set(), await wiki_custom(), wiki_css([sub, 0])],
-            data = '' + \
-                '<div id="opennamu_give_auth"></div>' + \
-                '<script defer src="/views/main_css/js/route/give_auth.js' + cache_v() + '"></script>' + \
-                '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_give_auth(); });</script>' + \
-            '',
-            menu = [['manager', await get_lang('return')]]
-        ))
+    return easy_minify(flask.render_template(await skin_check(),
+        imp = [user_name, await wiki_set(), await wiki_custom(), wiki_css([sub, 0])],
+        data = '' + \
+            '<div id="opennamu_give_auth"></div>' + \
+            '<script defer src="/views/main_css/js/route/give_auth.js' + cache_v() + '"></script>' + \
+            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_give_auth(); });</script>' + \
+        '',
+        menu = [['manager', await get_lang('return')]]
+    ))

route/n_list_recent_block.py

@@ -1,27 +1,26 @@
 from .tool.func import *
 
 async def list_recent_block(user_name = 'Test', tool = 'all', num = 1, why = ''):
-    with get_db_connect() as conn:
-        sub = 0
-        if tool == 'ongoing':
-            sub = '(' + await get_lang('in_progress') + ')'
-        elif tool == 'regex':
-            sub = '(' + await get_lang('regex') + ')'
-        elif tool == 'user':
-            sub = '(' + await get_lang('blocked') + ')'
-        elif tool == 'cidr':
-            sub = '(' + await get_lang('cidr') + ')'
-        elif tool == 'private':
-            sub = '(' + await get_lang('private') + ')'
-        elif tool == 'admin':
-            sub = '(' + await get_lang('admin') + ')'
+    sub = 0
+    if tool == 'ongoing':
+        sub = '(' + await get_lang('in_progress') + ')'
+    elif tool == 'regex':
+        sub = '(' + await get_lang('regex') + ')'
+    elif tool == 'user':
+        sub = '(' + await get_lang('blocked') + ')'
+    elif tool == 'cidr':
+        sub = '(' + await get_lang('cidr') + ')'
+    elif tool == 'private':
+        sub = '(' + await get_lang('private') + ')'
+    elif tool == 'admin':
+        sub = '(' + await get_lang('admin') + ')'
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('recent_ban'), await wiki_set(), await wiki_custom(), wiki_css([sub, 0])],
-            data = '' + \
-                '<div id="opennamu_list_recent_block"></div>' + \
-                '<script defer src="/views/main_css/js/route/list_recent_block.js' + cache_v() + '"></script>' + \
-                '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_recent_block(); });</script>' + \
-            '',
-            menu = [['other', await get_lang('return')]]
-        ))
+    return easy_minify(flask.render_template(await skin_check(),
+        imp = [await get_lang('recent_ban'), await wiki_set(), await wiki_custom(), wiki_css([sub, 0])],
+        data = '' + \
+            '<div id="opennamu_list_recent_block"></div>' + \
+            '<script defer src="/views/main_css/js/route/list_recent_block.js' + cache_v() + '"></script>' + \
+            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_recent_block(); });</script>' + \
+        '',
+        menu = [['other', await get_lang('return')]]
+    ))

route/n_list_recent_discuss.py

@@ -1,19 +1,18 @@
 from .tool.func import *
 
 async def list_recent_discuss(num = 1, tool = 'normal'):
-    with get_db_connect() as conn:
-        m_sub = 0
-        if tool == 'close':
-            m_sub = '(' + await get_lang('close_discussion') + ')'
-        elif tool == 'open':
-            m_sub = '(' + await get_lang('open_discussion') + ')'
+    m_sub = 0
+    if tool == 'close':
+        m_sub = '(' + await get_lang('close_discussion') + ')'
+    elif tool == 'open':
+        m_sub = '(' + await get_lang('open_discussion') + ')'
 
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [await get_lang('recent_discussion'), await wiki_set(), await wiki_custom(), wiki_css([m_sub, 0])],
-            data = '' + \
-                '<div id="opennamu_list_recent_discuss"></div>' + \
-                '<script defer src="/views/main_css/js/route/list_recent_discuss.js' + cache_v() + '"></script>' + \
-                '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_recent_discuss(); });</script>' + \
-            '',
-            menu = [['other', await get_lang('return')]]
-        ))
+    return easy_minify(flask.render_template(await skin_check(),
+        imp = [await get_lang('recent_discussion'), await wiki_set(), await wiki_custom(), wiki_css([m_sub, 0])],
+        data = '' + \
+            '<div id="opennamu_list_recent_discuss"></div>' + \
+            '<script defer src="/views/main_css/js/route/list_recent_discuss.js' + cache_v() + '"></script>' + \
+            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_recent_discuss(); });</script>' + \
+        '',
+        menu = [['other', await get_lang('return')]]
+    ))

route/n_list_user_check_submit.py

@@ -1,13 +1,12 @@
 from .tool.func import *
 
 async def list_user_check_submit(name = 'Test'):
-    with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('check') + ')', 0])],
-            data = '' + \
-                '<div id="opennamu_list_user_check_submit"></div>' + \
-                '<script defer src="/views/main_css/js/route/list_user_check_submit.js' + cache_v() + '"></script>' + \
-                '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_user_check_submit(); });</script>' + \
-            '',
-            menu = [['setting', await get_lang('return')]]
-        ))
+    return easy_minify(flask.render_template(await skin_check(),
+        imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('check') + ')', 0])],
+        data = '' + \
+            '<div id="opennamu_list_user_check_submit"></div>' + \
+            '<script defer src="/views/main_css/js/route/list_user_check_submit.js' + cache_v() + '"></script>' + \
+            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_list_user_check_submit(); });</script>' + \
+        '',
+        menu = [['setting', await get_lang('return')]]
+    ))

route/n_topic_list.py

@@ -1,13 +1,12 @@
 from .tool.func import *
 
 async def topic_list(page = 1, name = 'Test'):
-    with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('discussion_list') + ')', 0])],
-            data = '' + \
-                '<div id="opennamu_topic_list"></div>' + \
-                '<script defer src="/views/main_css/js/route/topic_list.js' + cache_v() + '"></script>' + \
-                '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_topic_list(); });</script>' + \
-            '',
-            menu = [['w/' + url_pas(name), await get_lang('document')]]
-        ))
+    return easy_minify(flask.render_template(await skin_check(),
+        imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang('discussion_list') + ')', 0])],
+        data = '' + \
+            '<div id="opennamu_topic_list"></div>' + \
+            '<script defer src="/views/main_css/js/route/topic_list.js' + cache_v() + '"></script>' + \
+            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_topic_list(); });</script>' + \
+        '',
+        menu = [['w/' + url_pas(name), await get_lang('document')]]
+    ))

route/n_w_watch_list.py

@@ -1,13 +1,12 @@
 from .tool.func import *
 
 async def w_watch_list(name, num = 1, do_type = 'watch_list'):
-    with get_db_connect() as conn:
-        return easy_minify(flask.render_template(await skin_check(),
-            imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang(do_type if do_type == 'star_doc' else 'watchlist') + ')', 0])],
-            data = '' + \
-                '<div id="opennamu_w_watch_list"></div>' + \
-                '<script defer src="/views/main_css/js/route/w_watch_list.js' + cache_v() + '"></script>' + \
-                '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_w_watch_list(); });</script>' + \
-            '',
-            menu = [['w/' + url_pas(name), await get_lang('return')]]
-        ))
+    return easy_minify(flask.render_template(await skin_check(),
+        imp = [name, await wiki_set(), await wiki_custom(), wiki_css(['(' + await get_lang(do_type if do_type == 'star_doc' else 'watchlist') + ')', 0])],
+        data = '' + \
+            '<div id="opennamu_w_watch_list"></div>' + \
+            '<script defer src="/views/main_css/js/route/w_watch_list.js' + cache_v() + '"></script>' + \
+            '<script>window.addEventListener("DOMContentLoaded", function() { opennamu_w_watch_list(); });</script>' + \
+        '',
+        menu = [['w/' + url_pas(name), await get_lang('return')]]
+    ))