view 부분 조금 수정

route/tool/func.py

@@ -155,7 +155,10 @@ def render_set(title = '', data = '', num = 0, s_data = 0):
     elif s_data == 1:
         return data
     else:
-        return namumark(title, data, num)
+        if data != None:
+            return namumark(title, data, num)
+        else:
+            return 'HTTP Request 404'
 
 def captcha_get():
     data = ''

route/tool/mark.py

@@ -40,32 +40,29 @@ def plusing(data):
             curs.execute("insert into back (title, link, type) values (?, ?, ?)", [data_in[1], data_in[0], data_in[2]])
 
 def namumark(title = '', data = None, num = 0):
-    if data != None:
-        curs.execute('select data from other where name = "markup"')
-        rep_data = curs.fetchall()
-        if rep_data[0][0] == 'namumark':
-            data = namu(conn, data, title, num)
-        else:
-            data = ['', '', []]
+    curs.execute('select data from other where name = "markup"')
+    rep_data = curs.fetchall()
+    if rep_data[0][0] == 'namumark':
+        data = namu(conn, data, title, num)
+    else:
+        data = ['', '', []]
 
-        if num == 1:
-            data_num = len(data[2]) 
-            data_in_num = int(data_num / multiprocessing.cpu_count())
-            data_in = []
+    if num == 1:
+        data_num = len(data[2]) 
+        data_in_num = int(data_num / multiprocessing.cpu_count())
+        data_in = []
 
-            for i in range(multiprocessing.cpu_count()):
-                if i != multiprocessing.cpu_count() - 1:
-                    data_in += [data[2][data_in_num * i:data_in_num * (i + 1)]]
-                else:
-                    data_in += [data[2][data_in_num * i:]]
+        for i in range(multiprocessing.cpu_count()):
+            if i != multiprocessing.cpu_count() - 1:
+                data_in += [data[2][data_in_num * i:data_in_num * (i + 1)]]
+            else:
+                data_in += [data[2][data_in_num * i:]]
 
-            for data_in_for in data_in:
-                thread_start = threading.Thread(target = plusing, args = [data_in_for])
-                thread_start.start()
-                thread_start.join()
-            
-            conn.commit()
-            
-        return data[0] + data[1]
-    else:
-        return 'HTTP Request 404'
+        for data_in_for in data_in:
+            thread_start = threading.Thread(target = plusing, args = [data_in_for])
+            thread_start.start()
+            thread_start.join()
+        
+        conn.commit()
+        
+    return data[0] + data[1]

route/view_read.py

@@ -3,7 +3,6 @@ from .tool.func import *
 def view_read_2(conn, name):
     curs = conn.cursor()
 
-    data_none = 0
     sub = ''
     acl = ''
     div = ''
@@ -75,10 +74,7 @@ def view_read_2(conn, name):
     data = curs.fetchall()
     if data:
         else_data = data[0][1]
-        response_data = 200
     else:
-        data_none = 1
-        response_data = 404
         else_data = None
 
     m = re.search("^user:([^/]*)", name)
@@ -111,9 +107,10 @@ def view_read_2(conn, name):
 
     if end_data == 'HTTP Request 401.3':
         response_data = 401
-        end_return_401 = 1
+    elif end_data == 'HTTP Request 404':
+        response_data = 404
     else:
-        end_return_401 = 0
+        response_data = 200
     
     if num:
         menu = [['history/' + url_pas(name), load_lang('history')]]
@@ -121,7 +118,7 @@ def view_read_2(conn, name):
         acl = ''
         r_date = 0
     else:
-        if data_none == 1:
+        if response_data == 404:
             menu = [['edit/' + url_pas(name), load_lang('create')]]
         else:
             menu = [['edit/' + url_pas(name), load_lang('edit')]]
@@ -169,7 +166,7 @@ def view_read_2(conn, name):
     
     div = adsense_code + '<div>' + div + '</div>'
     
-    if end_return_401 == 1:
+    if response_data == 401:
         return re_error('/error/3')
     else:
         return easy_minify(flask.render_template(skin_check(),