추가

app.py

@@ -6,6 +6,7 @@ import bcrypt
 import os
 import difflib
 from css_html_js_minify import html_minify
+from multiprocessing import Process
 
 try:
     json_data = open('set.json').read()
@@ -688,24 +689,6 @@ def give_log(num = 1):
             )
         )
     )
-        
-@route('/back_reset')
-def back_reset():
-    if(admin_check(None, 'back_reset') == 1):        
-        curs.execute("delete from back")
-        curs.execute("delete from cat")
-        conn.commit()
-        
-        curs.execute("select title, data from data")
-        data = curs.fetchall()
-        for end in data:
-            print(end[0])
-            
-            namumark(end[0], end[1], 1, 0, 0)
-        
-        return(redirect('/'))
-    else:
-        return(redirect('/error/3'))
 
 @route('/indexing')
 def indexing():
@@ -748,9 +731,9 @@ def xref(name = None, num = 1):
         if(data[1]):
             div += ' (' + data[1] + ')'
         
-        div += '</li></ul>'
+        div += '</li>'
     else:        
-        div += '<br><a href="/xref/' + url_pas(name) + '/n/' + str(num - 1) + '">(이전)</a> <a href="/xref/' + url_pas(name) + '/n/' + str(num + 1) + '">(이후)</a>'
+        div += '</ul><br><a href="/xref/' + url_pas(name) + '/n/' + str(num - 1) + '">(이전)</a> <a href="/xref/' + url_pas(name) + '/n/' + str(num + 1) + '">(이후)</a>'
     
     return(
         html_minify(

back_reset.py

@@ -0,0 +1,43 @@
+import json
+import sqlite3
+from multiprocessing import Process
+from func import *
+
+json_data = open('set.json').read()
+set_data = json.loads(json_data)
+
+conn = sqlite3.connect(set_data['db'] + '.db')
+curs = conn.cursor()
+
+curs.execute("delete from back")
+curs.execute("delete from cat")
+conn.commit()
+
+def go_namu(data):
+    for end in data:
+        print(end[0])
+        namumark(end[0], end[1], 1, 0, 0)
+
+curs.execute("select title, data from data")
+data = curs.fetchall()
+print(int(len(data) / 4))
+l = int(len(data) / 4)
+
+d1 = data[:l]
+d2 = data[l:l * 2]
+d3 = data[l * 2:l * 3]
+d4 = data[l * 3:]
+
+if(__name__=='__main__'):
+    p1 = Process(target = go_namu, args = [d1])
+    p2 = Process(target = go_namu, args = [d2])
+    p3 = Process(target = go_namu, args = [d3])
+    p4 = Process(target = go_namu, args = [d4])
+    p1.start()
+    p2.start()
+    p3.start()
+    p4.start()
+    p1.join()
+    p2.join()
+    p3.join()
+    p4.join()

mark.py

@@ -31,13 +31,16 @@ def get_time():
     
 def ip_check():
     session = request.environ.get('beaker.session')
-    if(session.get('Now') == 1):
-        ip = format(session['DREAMER'])
-    else:
-        if(request.environ.get('HTTP_X_FORWARDED_FOR')):
-            ip = request.environ.get('HTTP_X_FORWARDED_FOR')
+    try:
+        if(session.get('Now') == 1):
+            ip = format(session['DREAMER'])
         else:
-            ip = request.environ.get('REMOTE_ADDR')
+            if(request.environ.get('HTTP_X_FORWARDED_FOR')):
+                ip = request.environ.get('HTTP_X_FORWARDED_FOR')
+            else:
+                ip = request.environ.get('REMOTE_ADDR')
+    except:
+        ip = 'None'
 
     return(ip)
 

update_mysql.py

@@ -1,126 +0,0 @@
-import sqlite3
-import pymysql
-import json
-import re
-
-json_data = open('set.json').read()
-set_data = json.loads(json_data)
-
-conn2 = sqlite3.connect(set_data['db'] + '.db')
-curs2 = conn2.cursor()
-
-conn = pymysql.connect(
-    user = set_data['user'], 
-    password = set_data['pw'], 
-    charset = 'utf8mb4', 
-    db = set_data['db']
-)
-curs = conn.cursor(pymysql.cursors.DictCursor)   
-
-r_ver = '2.3.2'
-
-curs2.execute("create table data(title text, data text, acl text)")
-curs2.execute("create table history(id text, title text, data text, date text, ip text, send text, leng text)")
-curs2.execute("create table rd(title text, sub text, date text)")
-curs2.execute("create table user(id text, pw text, acl text)")
-curs2.execute("create table ban(block text, end text, why text, band text)")
-curs2.execute("create table topic(id text, title text, sub text, data text, date text, ip text, block text, top text)")
-curs2.execute("create table stop(title text, sub text, close text)")
-curs2.execute("create table rb(block text, end text, today text, blocker text, why text)")
-curs2.execute("create table login(user text, ip text, today text)")
-curs2.execute("create table back(title text, link text, type text)")
-curs2.execute("create table cat(title text, cat text)")
-curs2.execute("create table hidhi(title text, re text)")
-curs2.execute("create table agreedis(title text, sub text)")
-curs2.execute("create table custom(user text, css text)")
-curs2.execute("create table other(name text, data text)")
-curs2.execute("create table alist(name text, acl text)")
-
-curs2.execute("insert into other (name, data) values ('version', ?)", [r_ver])
-
-curs2.execute('insert into other (name, data) values ("name", ?)', [set_data['name']])
-curs2.execute('insert into other (name, data) values ("frontpage", ?)', [set_data['frontpage']])
-curs2.execute('insert into other (name, data) values ("license", ?)', [set_data['license']])
-curs2.execute('insert into other (name, data) values ("upload", ?)', [set_data['upload']])
-
-conn2.commit()
-
-curs.execute("select * from data")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into data (title, data, acl) values (?, ?, ?)", [data2['title'], data2['data'], data2['acl']])
-
-curs.execute("select * from history")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into history (id, title, data, date, ip, send, leng) values (?, ?, ?, ?, ?, ?, ?)", [data2['id'], data2['title'], data2['data'], data2['date'], data2['ip'], data2['send'], data2['leng']])
-
-curs.execute("select * from rd")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into rd (title, sub, date) values (?, ?, ?)", [data2['title'], data2['sub'], data2['date']])
-
-curs.execute("select * from user")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into user (id, pw, acl) values (?, ?, ?)", [data2['id'], data2['pw'], data2['acl']])
-
-curs.execute("select * from ban")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into ban (block, end, why, band) values (?, ?, ?, ?)", [data2['block'], data2['end'], data2['why'], data2['band']])
-
-curs.execute("select * from topic")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into topic (id, title, sub, data, date, ip, block, top) values (?, ?, ?, ?, ?, ?, ?, ?)", [data2['id'], data2['title'], data2['sub'], data2['data'], data2['date'], data2['ip'], data2['block'], data2['top']])
-
-curs.execute("select * from stop")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into stop (title, sub, close) values (?, ?, ?)", [data2['title'], data2['sub'], data2['close']])
-
-curs.execute("select * from rb")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into rb (block, end, today, blocker, why) values (?, ?, ?, ?, ?)", [data2['block'], data2['end'], data2['today'], data2['blocker'], data2['why']])
-
-curs.execute("select * from login")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into login (user, ip, today) values (?, ?, ?)", [data2['user'], data2['ip'], data2['today']])
-
-curs.execute("select * from cat")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into cat (title, cat) values (?, ?)", [data2['title'], data2['cat']])
-
-curs.execute("select * from back")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into back (title, link, type) values (?, ?, ?)", [data2['title'], data2['link'], data2['type']])
-
-curs.execute("select * from hidhi")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into hidhi (title, re) values (?, ?)", [data2['title'], data2['re']])
-
-curs.execute("select * from agreedis")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into agreedis (title, sub) values (?, ?)", [data2['title'], data2['sub']])
-
-curs.execute("select * from custom")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into custom (user, css) values (?, ?)", [data2['user'], data2['css']])
-
-curs.execute("select * from alist")
-data = curs.fetchall()
-for data2 in data:
-    curs2.execute("insert into alist (name, acl) values (?, ?)", [data2['name'], data2['acl']])
-
-conn2.commit()
-
-print('종료 하려면 아무 키나 누르시오.')
-a = input()