임시로 메인 화면 변경

app.py

@@ -524,7 +524,7 @@ app.route('/vote/list/close/<int:num>', defaults = { 'list_type' : 'close' })(vo
 app.route('/vote/add', methods = ['POST', 'GET'])(vote_add)
 
 # Func-bbs
-app.route('/bbs/main')(bbs_main)
+app.route('/bbs/main', defaults = { 'tool' : 'main' })(bbs_w)
 app.route('/bbs/make', methods = ['POST', 'GET'])(bbs_make)
 # app.route('/bbs/main/set')
 app.route('/bbs/w/<int:bbs_num>')(bbs_w)

route/__init__.py

@@ -18,7 +18,6 @@ from route.api_bbs_w_comment import api_bbs_w_comment
 from route.api_bbs_w_comment_one import api_bbs_w_comment_one
 
 from route.bbs_w_edit import bbs_w_edit
-from route.bbs_main import bbs_main
 from route.bbs_make import bbs_make
 from route.bbs_w import bbs_w
 from route.bbs_w_post import bbs_w_post

route/bbs_main.py

@@ -1,42 +0,0 @@
-from .tool.func import *
-
-def bbs_main():
-    with get_db_connect() as conn:
-        curs = conn.cursor()
-
-        curs.execute(db_change('select set_data, set_id from bbs_set where set_name = "bbs_name"'))
-        db_data = curs.fetchall()
-        
-        data = ''
-
-        if db_data:
-            data += '<ul class="opennamu_ul">'
-            for for_a in db_data:
-                curs.execute(db_change('select set_data from bbs_set where set_name = "bbs_type" and set_id = ?'), [for_a[1]])
-                db_data_2 = curs.fetchall()
-                bbs_type = db_data_2[0][0] if db_data_2 else 'comment'
-
-                if bbs_type == 'thread':
-                    bbs_type = load_lang('thread_base')
-                else:
-                    bbs_type = load_lang('comment_base')
-                
-                curs.execute(db_change('select set_data from bbs_data where set_id = ? and set_name = "date" order by set_code + 0 desc limit 1'), [for_a[1]])
-                db_data_2 = curs.fetchall()
-                last_date = ('(' + db_data_2[0][0] + ')') if db_data_2 else ''
-
-                data += '<li><a href="/bbs/w/' + for_a[1] + '">' + html.escape(for_a[0]) + ' (' + bbs_type + ') ' + last_date + '</a></li>'
-                # data += '<li></li>'
-
-            data += '</ul>'
-
-        if admin_check() == 1:
-            menu = [['bbs/make', load_lang('add')]]
-        else:
-            menu = []
-
-        return easy_minify(flask.render_template(skin_check(),
-            imp = [load_lang('bbs_main'), wiki_set(), wiki_custom(), wiki_css([0, 0])],
-            data = data,
-            menu = [['other', load_lang('return')]] + menu
-        ))

route/bbs_w.py

@@ -1,18 +1,51 @@
 from .tool.func import *
 
-def bbs_w(bbs_num = ''):
+def bbs_w(bbs_num = '', tool = 'bbs'):
     with get_db_connect() as conn:
         curs = conn.cursor()
+        
+        data = ''
+        title_name = ''
 
-        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('/bbs/main')
+        if tool == 'bbs':
+            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('/bbs/main')
         
-        bbs_name = db_data[0][0]
-        bbs_num_str = str(bbs_num)
+            bbs_name = db_data[0][0]
+            bbs_num_str = str(bbs_num)
+
+            title_name = bbs_name
+            menu = [['bbs/main', load_lang('return')], ['bbs/edit/' + bbs_num_str, load_lang('add')], ['bbs/set/' + bbs_num_str, load_lang('bbs_set')]]
+        else:
+            curs.execute(db_change('select set_data, set_id from bbs_set where set_name = "bbs_name"'))
+            db_data = curs.fetchall()
+            if db_data:
+                data += '<ul class="opennamu_ul">'
+                for for_a in db_data:
+                    curs.execute(db_change('select set_data from bbs_set where set_name = "bbs_type" and set_id = ?'), [for_a[1]])
+                    db_data_2 = curs.fetchall()
+                    bbs_type = db_data_2[0][0] if db_data_2 else 'comment'
+
+                    if bbs_type == 'thread':
+                        bbs_type = load_lang('thread_base')
+                    else:
+                        bbs_type = load_lang('comment_base')
+                    
+                    curs.execute(db_change('select set_data from bbs_data where set_id = ? and set_name = "date" order by set_code + 0 desc limit 1'), [for_a[1]])
+                    db_data_2 = curs.fetchall()
+                    last_date = ('(' + db_data_2[0][0] + ')') if db_data_2 else ''
+
+                    data += '<li><a href="/bbs/w/' + for_a[1] + '">' + html.escape(for_a[0]) + ' (' + bbs_type + ') ' + last_date + '</a></li>'
+
+                data += '</ul>'
+            
+            data += '<hr class="main_hr">'
+
+            title_name = load_lang('bbs_main')
+            menu = [['other', load_lang('return')]] + ([['bbs/make', load_lang('add')]] if admin_check() == 1 else [])
 
-        data = ''
         data += '''
             <table id="main_table_set">
                 <tr id="main_table_top_tr">
@@ -25,44 +58,52 @@ def bbs_w(bbs_num = ''):
         temp_id = ''
         temp_dict = {}
 
-        curs.execute(db_change('select set_name, set_data, set_code, set_id from bbs_data where set_id like ? order by set_code + 0 desc'), [bbs_num])
+        if tool == 'bbs':
+            curs.execute(db_change('select set_code, set_id from bbs_data where set_name = "title" and set_id like ? order by set_code + 0 desc'), [bbs_num])
+        else:
+            curs.execute(db_change('select set_code, set_id from bbs_data where set_name = "title" order by set_code + 0 desc limit 50'))
+        
         db_data = curs.fetchall()
         db_data = list(db_data) if db_data else []
+        
+        for for_b in db_data:
+            curs.execute(db_change('select set_name, set_data, set_code, set_id from bbs_data where set_code = ? and set_id = ?'), [for_b[0], for_b[1]])
+            db_data = curs.fetchall()
+            for for_a in db_data + [['', '', '']]:
+                bbs_num_str = for_a[1]
+                if temp_id != for_a[2]:
+                    if temp_id != '':
+                        curs.execute(db_change('select count(*) from bbs_data where set_name = "comment_date" and (set_id = ? or set_id like ?) order by set_code + 0 desc'), [bbs_num_str + '-' + temp_dict['code'], bbs_num_str + '-' + temp_dict['code'] + '-%'])
+                        db_data = curs.fetchall()
+                        comment_count = str(db_data[0][0]) if db_data else '0'
 
-        for for_a in db_data + [['', '', '']]:
-            if temp_id != for_a[2]:
-                if temp_id != '':
-                    curs.execute(db_change('select count(*) from bbs_data where set_name = "comment_date" and (set_id = ? or set_id like ?) order by set_code + 0 desc'), [bbs_num_str + '-' + temp_dict['code'], bbs_num_str + '-' + temp_dict['code'] + '-%'])
-                    db_data = curs.fetchall()
-                    comment_count = str(db_data[0][0]) if db_data else '0'
-
-                    curs.execute(db_change('select set_data from bbs_data where set_name = "comment_date" and (set_id = ? or set_id like ?) order by set_data desc limit 1'), [bbs_num_str + '-' + temp_dict['code'], bbs_num_str + '-' + temp_dict['code'] + '-%'])
-                    db_data = curs.fetchall()
-                    last_comment_date = db_data[0][0] if db_data else '0'
+                        curs.execute(db_change('select set_data from bbs_data where set_name = "comment_date" and (set_id = ? or set_id like ?) order by set_data desc limit 1'), [bbs_num_str + '-' + temp_dict['code'], bbs_num_str + '-' + temp_dict['code'] + '-%'])
+                        db_data = curs.fetchall()
+                        last_comment_date = db_data[0][0] if db_data else '0'
 
-                    data += '''
-                        <tr>
-                            <td>''' + ip_pas(temp_dict['user_id']) + '''</td>
-                            <td>''' + temp_dict['date'] + '''</td>
-                            <td>''' + last_comment_date + '''</td>
-                        </tr>
-                        <tr>
-                            <td colspan="3">
-                                <a href="/bbs/w/''' + bbs_num_str + '/' + temp_dict['code'] + '">' + html.escape(temp_dict['title']) + '''</a> 
-                                (''' + comment_count + ''') 
-                            </td>
-                        </tr>
-                    '''
+                        data += '''
+                            <tr>
+                                <td>''' + ip_pas(temp_dict['user_id']) + '''</td>
+                                <td>''' + temp_dict['date'] + '''</td>
+                                <td>''' + last_comment_date + '''</td>
+                            </tr>
+                            <tr>
+                                <td colspan="3">
+                                    <a href="/bbs/w/''' + bbs_num_str + '/' + temp_dict['code'] + '">' + html.escape(temp_dict['title']) + '''</a> 
+                                    (''' + comment_count + ''') 
+                                </td>
+                            </tr>
+                        '''
 
-                temp_id = for_a[2]
-                temp_dict['code'] = for_a[2]
+                    temp_id = for_a[2]
+                    temp_dict['code'] = for_a[2]
 
-            temp_dict[for_a[0]] = for_a[1]
+                temp_dict[for_a[0]] = for_a[1]
 
         data += '</table>'
 
         return easy_minify(flask.render_template(skin_check(),
-            imp = [bbs_name, wiki_set(), wiki_custom(), wiki_css(['(' + load_lang('bbs') + ')', 0])],
+            imp = [title_name, wiki_set(), wiki_custom(), wiki_css(['(' + load_lang('bbs') + ')', 0])],
             data = data,
-            menu = [['bbs/main', load_lang('return')], ['bbs/edit/' + bbs_num_str, load_lang('add')], ['bbs/set/' + bbs_num_str, load_lang('bbs_set')]]
+            menu = menu
         ))

version.json

@@ -1,6 +1,6 @@
 {
     "beta" : {
-        "r_ver" : "v3.4.6-RC5-dev21",
+        "r_ver" : "v3.4.6-RC5-dev22",
         "c_ver" : "3500373",
         "s_ver" : "3500112"
     }