Startseite Erkunden Hilfe
Anmelden
wiki
/
openNAMU__openNAMU
Mirror von https://github.com/openNAMU/openNAMU.git
2
0
Fork 0
Dateien Issues 0 Wiki
Quellcode durchsuchen

야심한 밤의 버그 수정 및 구조 변경

잉여개발기 (SPDV) vor 2 Jahren
Ursprung
0531c423b4
Commit
4151731799
9 geänderte Dateien mit 21 neuen und 40 gelöschten Zeilen
Gesamtansicht Diff-Statistik anzeigen
  1. 11 0
      app.py
  2. 0 11
      emergency_tool.py
  3. 1 0
      route/api_search.py
  4. 0 3
      route/edit.py
  5. 1 4
      route/edit_delete.py
  6. 0 3
      route/edit_move.py
  7. 0 3
      route/edit_upload.py
  8. 1 5
      route/list_please.py
  9. 7 11
      route/tool/func.py

+ 11 - 0
app.py
Datei anzeigen 

@@ -318,6 +318,17 @@ def do_every_day():
 
             
             
             curs.execute(db_change("delete from re_admin where time < ?"), [time_calc])
 
             curs.execute(db_change("delete from re_admin where time < ?"), [time_calc])
 
 
 
+        # 전체 문서 수 재계산
 
+        curs.execute(db_change("select count(*) from data"))
 
+        count_data = curs.fetchall()
 
+        if count_data:
 
+            count_data = count_data[0][0]
 
+        else:
 
+            count_data = 0
 
+
 
+        curs.execute(db_change('delete from other where name = "count_all_title"'))
 
+        curs.execute(db_change('insert into other (name, data, coverage) values ("count_all_title", ?, "")'), [str(count_data)])
 
+
 
         # 사이트맵 생성 관리
 
         # 사이트맵 생성 관리
 
         curs.execute(db_change('select data from other where name = "sitemap_auto_make"'))
 
         curs.execute(db_change('select data from other where name = "sitemap_auto_make"'))
 
         db_data = curs.fetchall()
 
         db_data = curs.fetchall()

+ 0 - 11
emergency_tool.py
Datei anzeigen 

@@ -39,7 +39,6 @@ print('8. Change version')
 
 print('9. Delete set.json')
 
 print('9. Delete set.json')
 
 print('10. Change name')
 
 print('10. Change name')
 
 print('11. Delete mysql.json')
 
 print('11. Delete mysql.json')
 
-print('12. All title count reset')
 
 print('14. Delete Main <HEAD>')
 
 print('14. Delete Main <HEAD>')
 
 print('15. Give owner')
 
 print('15. Give owner')
 
 print('16. Delete 2FA password')
 
 print('16. Delete 2FA password')
 
@@ -159,16 +158,6 @@ elif what_i_do == '10':
 
 elif what_i_do == '11':
 
 elif what_i_do == '11':
 
     if os.path.exists(os.path.join('data', 'mysql.json')):
 
     if os.path.exists(os.path.join('data', 'mysql.json')):
 
         os.remove(os.path.join('data', 'mysql.json'))
 
         os.remove(os.path.join('data', 'mysql.json'))
 
-elif what_i_do == '12':
 
-    curs.execute(db_change("select count(*) from data"))
 
-    count_data = curs.fetchall()
 
-    if count_data:
 
-        count_data = count_data[0][0]
 
-    else:
 
-        count_data = 0
 
-
 
-    curs.execute(db_change('delete from other where name = "count_all_title"'))
 
-    curs.execute(db_change('insert into other (name, data, coverage) values ("count_all_title", ?, "")'), [str(count_data)])
 
 elif what_i_do == '14':
 
 elif what_i_do == '14':
 
     curs.execute(db_change('delete from other where name = "head"'))
 
     curs.execute(db_change('delete from other where name = "head"'))
 
 elif what_i_do == '15':
 
 elif what_i_do == '15':

+ 1 - 0
route/api_search.py
Datei anzeigen 

@@ -7,6 +7,7 @@ def api_search(name = 'Test', num = 10, page = 1):
 
         num = 1 if num > 1000 else num
 
         num = 1 if num > 1000 else num
 
         page = (page * (num - 1)) if page * num > 0 else 0
 
         page = (page * (num - 1)) if page * num > 0 else 0
 
 
 
+        # 개편 예정
 
         curs.execute(db_change('select data from other where name = "count_all_title"'))
 
         curs.execute(db_change('select data from other where name = "count_all_title"'))
 
         if int(curs.fetchall()[0][0]) < 30000:
 
         if int(curs.fetchall()[0][0]) < 30000:
 
             curs.execute(db_change("" + \
 
             curs.execute(db_change("" + \

+ 0 - 3
route/edit.py
Datei anzeigen 

@@ -194,9 +194,6 @@ def edit(name = 'Test', section = 0, do_type = ''):
 
             else:    
             else:    
                 curs.execute(db_change("insert into data (title, data) values (?, ?)"), [name, content])
 
                 curs.execute(db_change("insert into data (title, data) values (?, ?)"), [name, content])
 
     
     
-                curs.execute(db_change('select data from other where name = "count_all_title"'))
 
-                curs.execute(db_change("update other set data = ? where name = 'count_all_title'"), [str(int(curs.fetchall()[0][0]) + 1)])
 
-    
             curs.execute(db_change("select user from scan where title = ? and type = ''"), [name])
 
             curs.execute(db_change("select user from scan where title = ? and type = ''"), [name])
 
             for scan_user in curs.fetchall():
 
             for scan_user in curs.fetchall():
 
                 add_alarm(scan_user[0], ip, '<a href="/w/' + url_pas(name) + '">' + html.escape(name) + '</a>')
 
                 add_alarm(scan_user[0], ip, '<a href="/w/' + url_pas(name) + '">' + html.escape(name) + '</a>')

+ 1 - 4
route/edit_delete.py
Datei anzeigen 

@@ -53,11 +53,8 @@ def edit_delete(name):
 
 
 
                 curs.execute(db_change("delete from back where link = ?"), [name])
 
                 curs.execute(db_change("delete from back where link = ?"), [name])
 
                 curs.execute(db_change("delete from data where title = ?"), [name])
 
                 curs.execute(db_change("delete from data where title = ?"), [name])
 
-                
-                conn.commit()
 
 
 
-            curs.execute(db_change('select data from other where name = "count_all_title"'))
 
-            curs.execute(db_change("update other set data = ? where name = 'count_all_title'"), [str(int(curs.fetchall()[0][0]) - 1)])
 
+                conn.commit()
 
 
 
             return redirect('/w/' + url_pas(name))
 
             return redirect('/w/' + url_pas(name))
 
         else:            
         else:

+ 0 - 3
route/edit_move.py
Datei anzeigen 

@@ -68,9 +68,6 @@ def edit_move(name):
 
                     curs.execute(db_change("delete from back where title = ? and type = 'no'"), [move_title])
 
                     curs.execute(db_change("delete from back where title = ? and type = 'no'"), [move_title])
 
                     # 역링크 E
 
                     # 역링크 E
 
 
 
-                    curs.execute(db_change('select data from other where name = "count_all_title"'))
 
-                    curs.execute(db_change("update other set data = ? where name = 'count_all_title'"), [str(int(curs.fetchall()[0][0]) - 1)])
 
-
 
                     curs.execute(db_change("select id from history where title = ? order by id + 0 desc limit 1"), [move_title])
 
                     curs.execute(db_change("select id from history where title = ? order by id + 0 desc limit 1"), [move_title])
 
                     num = curs.fetchall()[0][0]
 
                     num = curs.fetchall()[0][0]

+ 0 - 3
route/edit_upload.py
Datei anzeigen 

@@ -92,9 +92,6 @@ def edit_upload():
 
 
 
                 curs.execute(db_change("insert into data (title, data) values (?, ?)"), ['file:' + name, file_d])
 
                 curs.execute(db_change("insert into data (title, data) values (?, ?)"), ['file:' + name, file_d])
 
 
 
-                curs.execute(db_change('select data from other where name = "count_all_title"'))
 
-                curs.execute(db_change("update other set data = ? where name = 'count_all_title'"), [str(int(curs.fetchall()[0][0]) + 1)])
 
-
 
                 render_set(
 
                 render_set(
 
                     doc_name = 'file:' + name,
 
                     doc_name = 'file:' + name,
 
                     doc_data = file_d,
 
                     doc_data = file_d,

+ 1 - 5
route/list_please.py
Datei anzeigen 

@@ -6,13 +6,9 @@ def list_please(arg_num = 1):
 
 
 
         sql_num = (arg_num * 50 - 50) if arg_num * 50 > 0 else 0
 
         sql_num = (arg_num * 50 - 50) if arg_num * 50 > 0 else 0
 
 
 
-        curs.execute(db_change('select data from other where name = "count_all_title"'))
 
-        if int(curs.fetchall()[0][0]) > 30000:
 
-            return re_error('/error/25')
 
-
 
         div = '<ul class="opennamu_ul">'
 
         div = '<ul class="opennamu_ul">'
 
 
 
-        curs.execute(db_change("select distinct title, link from back where type = 'no' order by title asc limit ?, 50"), [sql_num])
 
+        curs.execute(db_change("select distinct title, link from back where type = 'no' limit ?, 50"), [sql_num])
 
         data_list = curs.fetchall()
 
         data_list = curs.fetchall()
 
         for data in data_list:
 
         for data in data_list:
 
             div += '' + \
 
             div += '' + \

+ 7 - 11
route/tool/func.py
Datei anzeigen 

@@ -2490,19 +2490,15 @@ def history_plus(title, data, date, ip, send, leng, t_check = '', mode = ''):
 
             history_plus_rc_max(curs, mode)
 
             history_plus_rc_max(curs, mode)
 
             curs.execute(db_change("insert into rc (id, title, date, type) values (?, ?, ?, ?)"), [id_data, title, date, mode])
 
             curs.execute(db_change("insert into rc (id, title, date, type) values (?, ?, ?, ?)"), [id_data, title, date, mode])
 
 
 
-            data_set_exist = '' if t_check != 'delete' else '1'
 
+            data_set_exist = '' if t_check != 'delete' else 'not_exist'
 
 
 
-            curs.execute(db_change("select doc_name from data_set where doc_name = ? and set_name = 'last_edit'"), [title])
 
-            if curs.fetchall():
 
-                curs.execute(db_change("update data_set set set_data = ?, doc_rev = ? where doc_name = ? and set_name = 'last_edit'"), [date, data_set_exist, title])
 
-            else:
 
-                curs.execute(db_change("insert into data_set (doc_name, doc_rev, set_name, set_data) values (?, ?, 'last_edit', ?)"), [title, data_set_exist, date])
 
+            curs.execute(db_change('delete from data_set where doc_name = ? and set_name = "last_edit"'), [title])
 
+            curs.execute(db_change("insert into data_set (doc_name, doc_rev, set_name, set_data) values (?, '', 'last_edit', ?)"), [title, date])
 
 
 
-            curs.execute(db_change("select doc_name from data_set where doc_name = ? and set_name = 'length'"), [title])
 
-            if curs.fetchall():
 
-                curs.execute(db_change("update data_set set set_data = ?, doc_rev = ? where doc_name = ? and set_name = 'length'"), [len(data), data_set_exist, title])
 
-            else:
 
-                curs.execute(db_change("insert into data_set (doc_name, doc_rev, set_name, set_data) values (?, ?, 'length', ?)"), [title, data_set_exist, len(data)])
 
+            curs.execute(db_change('delete from data_set where doc_name = ? and set_name = "length"'), [title])
 
+            curs.execute(db_change("insert into data_set (doc_name, doc_rev, set_name, set_data) values (?, '', 'length', ?)"), [title, len(data)])
 
+
 
+            curs.execute(db_change("update data_set set doc_rev = ? where doc_name = ? and (doc_rev = '' or doc_rev = 'not_exist')"), [data_set_exist, title])
 
 
 
         curs.execute(db_change("insert into history (id, title, data, date, ip, send, leng, hide, type) values (?, ?, ?, ?, ?, ?, ?, '', ?)"), [id_data, title, data, date, ip, send, leng, mode])
 
         curs.execute(db_change("insert into history (id, title, data, date, ip, send, leng, hide, type) values (?, ?, ?, ?, ?, ?, ?, '', ?)"), [id_data, title, data, date, ip, send, leng, mode])