mod some 2

app.py

@@ -502,17 +502,9 @@ app.route('/revert/<everything:name>', methods = ['POST', 'GET'])(edit_revert)
 app.route('/move/<everything:name>', methods = ['POST', 'GET'])(edit_move)
 
 # Func-topic
-@app.route('/recent_discuss')
-def recent_discuss():
-    return recent_discuss_2(load_db.db_get(), 'normal')
-
-@app.route('/recent_discuss/close')
-def recent_discuss_close():
-    return recent_discuss_2(load_db.db_get(), 'close')
-
-@app.route('/recent_discuss/open')
-def recent_discuss_open():
-    return recent_discuss_2(load_db.db_get(), 'open')
+app.route('/recent_discuss', defaults = { 'tool' : 'normal' })(recent_discuss)
+app.route('/recent_discuss/close', defaults = { 'tool' : 'close' })(recent_discuss)
+app.route('/recent_discuss/open', defaults = { 'tool' : 'open' })(recent_discuss)
 
 app.route('/thread/<int:topic_num>', methods = ['POST', 'GET'])(topic)
 app.route('/topic/<everything:name>', methods = ['POST', 'GET'])(topic_list)

route/recent_discuss.py

@@ -1,56 +1,57 @@
 from .tool.func import *
 
-def recent_discuss_2(conn, tool):
-    curs = conn.cursor()
-
-    div = ''
-
-    if tool == 'normal':
-        div += '<a href="/recent_discuss/close">(' + load_lang('close_discussion') + ')</a> '
-        div += '<a href="/recent_discuss/open">(' + load_lang('open_discussion_list') + ')</a>'
-
-        m_sub = 0
-    elif tool == 'close':
-        div += '<a href="/recent_discuss">(' + load_lang('normal') + ')</a>'
-
-        m_sub = ' (' + load_lang('closed') + ')'
-    else:
-        div += '<a href="/recent_discuss">(' + load_lang('normal') + ')</a>'
-        
-        m_sub = ' (' + load_lang('open_discussion_list') + ')'
-
-    div +=  '''
-            <hr class="main_hr">
-            <table id="main_table_set">
-                <tbody>
-                    <tr id="main_table_top_tr">
-                        <td id="main_table_width_half">''' + load_lang('discussion_name') + '''</td>
-                        <td id="main_table_width_half">''' + load_lang('time') + '''</td>
-                    </tr>
-            '''
-
-    if tool == 'normal':
-        curs.execute(db_change("select title, sub, date, code from rd where not stop = 'O' order by date desc limit 50"))
-    elif tool == 'close':
-        curs.execute(db_change("select title, sub, date, code from rd where stop = 'O' order by date desc limit 50"))
-    else:
-        curs.execute(db_change('select title, sub, date, code from rd where stop != "O" order by date asc limit 50'))
-
-    for data in curs.fetchall():
-        div += '' + \
-            '<tr>' + \
-                '<td>' + \
-                    '<a href="/thread/' + data[3] + '">' + html.escape(data[1]) + '</a> ' + \
-                    '<a href="/topic/' + url_pas(data[0]) + '">(' + html.escape(data[0]) + ')</a>' + \
-                '</td>' + \
-                '<td>' + data[2] + '</td>' + \
-            '</tr>' + \
-        ''
-
-    div += '</tbody></table>'
-
-    return easy_minify(flask.render_template(skin_check(),
-        imp = [load_lang('recent_discussion'), wiki_set(), wiki_custom(), wiki_css([m_sub, 0])],
-        data = div,
-        menu = 0
-    ))
+def recent_discuss(tool):
+    with get_db_connect() as conn:
+        curs = conn.cursor()
+
+        div = ''
+
+        if tool == 'normal':
+            div += '<a href="/recent_discuss/close">(' + load_lang('close_discussion') + ')</a> '
+            div += '<a href="/recent_discuss/open">(' + load_lang('open_discussion_list') + ')</a>'
+
+            m_sub = 0
+        elif tool == 'close':
+            div += '<a href="/recent_discuss">(' + load_lang('normal') + ')</a>'
+
+            m_sub = ' (' + load_lang('closed') + ')'
+        else:
+            div += '<a href="/recent_discuss">(' + load_lang('normal') + ')</a>'
+
+            m_sub = ' (' + load_lang('open_discussion_list') + ')'
+
+        div +=  '''
+                <hr class="main_hr">
+                <table id="main_table_set">
+                    <tbody>
+                        <tr id="main_table_top_tr">
+                            <td id="main_table_width_half">''' + load_lang('discussion_name') + '''</td>
+                            <td id="main_table_width_half">''' + load_lang('time') + '''</td>
+                        </tr>
+                '''
+
+        if tool == 'normal':
+            curs.execute(db_change("select title, sub, date, code from rd where not stop = 'O' order by date desc limit 50"))
+        elif tool == 'close':
+            curs.execute(db_change("select title, sub, date, code from rd where stop = 'O' order by date desc limit 50"))
+        else:
+            curs.execute(db_change('select title, sub, date, code from rd where stop != "O" order by date asc limit 50'))
+
+        for data in curs.fetchall():
+            div += '' + \
+                '<tr>' + \
+                    '<td>' + \
+                        '<a href="/thread/' + data[3] + '">' + html.escape(data[1]) + '</a> ' + \
+                        '<a href="/topic/' + url_pas(data[0]) + '">(' + html.escape(data[0]) + ')</a>' + \
+                    '</td>' + \
+                    '<td>' + data[2] + '</td>' + \
+                '</tr>' + \
+            ''
+
+        div += '</tbody></table>'
+
+        return easy_minify(flask.render_template(skin_check(),
+            imp = [load_lang('recent_discussion'), wiki_set(), wiki_custom(), wiki_css([m_sub, 0])],
+            data = div,
+            menu = 0
+        ))