일부 수정

app.py

@@ -21,8 +21,7 @@ r_ver = 'v3.0.0 Beta'
 print('Version : ' + r_ver)
 
 from func import *
-from set_mark.mid_pas import mid_pas
-from set_mark.macro import savemark
+from set_mark.tool import savemark
 
 # set.json 설정 확인
 try:
@@ -1592,9 +1591,12 @@ def preview(name = None):
     if can == 1:
         return re_error(conn, '/ban')
          
-    newdata = request.form['content']
-    newdata = re.sub('^#(?:redirect|넘겨주기) (?P<in>[^\n]*)', ' * [[\g<in>]] 문서로 넘겨주기', newdata)
-    enddata = namumark(conn, name, newdata, 0, 0, 1)
+    new_data = request.form['content']
+    new_data = re.sub('\r\n#(?:redirect|넘겨주기) (?P<in>(?:(?!\r\n).)+)\r\n', ' * [[\g<in>]] 문서로 넘겨주기', '\r\n' + new_data + '\r\n')
+    new_data = re.sub('^\r\n', '', new_data)
+    new_data = re.sub('\r\n$', '', new_data)
+    
+    end_data = namumark(conn, name, new_data, 0, 0, 1)
 
     if request.args.get('section', None):
         action = '?section=' + request.args.get('section', None)
@@ -1610,7 +1612,7 @@ def preview(name = None):
                     ' + captcha_get(conn) + ' \
                     <button id="save" type="submit">저장</button> \
                     <button id="preview" type="submit" formaction="/preview/' + url_pas(name) + action + '">미리보기</button> \
-                </form><hr>' + enddata,
+                </form><hr>' + end_data,
         menu = [['w/' + url_pas(name), '문서']]
     ))
         
@@ -2892,7 +2894,7 @@ def read_view(name = None):
                     curs.execute("select data from data where title = ?", [data[0]])
                     db_data = curs.fetchall()
                     if db_data:
-                        cat_data = re.sub("\[\[(분류:(?:(?:(?!\]\]|#include).)+))\]\]", "", mid_pas(db_data[0][0], 0, 1, 0, 0)[0])
+#                        cat_data = re.sub("\[\[(분류:(?:(?:(?!\]\]|#include).)+))\]\]", "", mid_pas(db_data[0][0], 0, 1, 0, 0)[0])
                         if re.search('\[\[' + name + '|include]]', cat_data):
                             div += ' * [[' + data[0] + ']]\r\n * [[wiki:xref/' + url_pas(data[0]) + '|' + data[0] + ']] (역링크)\r\n'
                         else:
@@ -2913,11 +2915,11 @@ def read_view(name = None):
         curs.execute("select title, data from data where title = ?", [name])
     data = curs.fetchall()
     if data:
-        elsedata = data[0][1]
+        else_data = data[0][1]
     else:
         data_none = 1
         response.status = 404
-        elsedata = ''
+        else_data = ''
 
     if not num:
         curs.execute("select dec from acl where title = ?", [name])
@@ -2960,9 +2962,11 @@ def read_view(name = None):
                 acl += ' (가입자)'
             
     if request.args.get('froms', None):
-        elsedata = re.sub("^#(?:redirect|넘겨주기) (?P<in>[^\n]*)", " * [[\g<in>]] 문서로 넘겨주기", elsedata)
+        else_data = re.sub('\r\n#(?:redirect|넘겨주기) (?P<in>(?:(?!\r\n).)+)\r\n', ' * [[\g<in>]] 문서로 넘겨주기', '\r\n' + else_data + '\r\n')
+        else_data = re.sub('^\r\n', '', else_data)
+        else_data = re.sub('\r\n$', '', else_data)
             
-    enddata = namumark(conn, name, elsedata, 0, 0, 1)
+    end_data = namumark(conn, name, else_data, 0, 0, 1)
 
     if data_none == 1:
         menu = [['edit/' + url_pas(name), '생성'], ['topic/' + url_pas(name), topic], \
@@ -2977,8 +2981,8 @@ def read_view(name = None):
 
     if request.args.get('froms', None):
         menu += [['w/' + url_pas(name), '넘기기']]
-        enddata = '<ul id="redirect"><li><a href="/w/' + url_pas(request.args.get('froms', None)) + \
-                    '?froms=' + url_pas(name) + '">' + request.args.get('froms', None) + '</a>에서 넘어 왔습니다.</li></ul><br>' + enddata
+        end_data = '<ul id="redirect"><li><a href="/w/' + url_pas(request.args.get('froms', None)) + \
+                    '?froms=' + url_pas(name) + '">' + request.args.get('froms', None) + '</a>에서 넘어 왔습니다.</li></ul><br>' + end_data
 
     if uppage != 0:
         menu += [['w/' + url_pas(uppage), '상위']]
@@ -2999,10 +3003,10 @@ def read_view(name = None):
         else:
             r_date = 0
 
-    if div != '' and enddata != '':
-        div = enddata + '<br>' + namumark(conn, name, div, 0, 0, 0)
+    if div != '' and end_data != '':
+        div = end_data + '<br>' + namumark(conn, name, div, 0, 0, 0)
     else:
-        div = enddata + namumark(conn, name, div, 0, 0, 0)
+        div = end_data + namumark(conn, name, div, 0, 0, 0)
 
     return html_minify(template('index', 
         imp = [name, wiki_set(conn, 1), custom(conn), other2([sub + acl, r_date])],

func.py

@@ -13,11 +13,11 @@ from css_html_js_minify import html_minify, js_minify, css_minify
 import time
 import os
 
-from set_mark.macro import get_time
-from set_mark.macro import ip_check
+from set_mark.tool import get_time
+from set_mark.tool import ip_check
+from set_mark.tool import url_pas
+from set_mark.tool import sha224
 from mark import *
-from set_mark.link import url_pas
-from set_mark.link import sha224
 
 def captcha_get(conn):
     curs = conn.cursor()

mark.py

@@ -28,7 +28,7 @@ def plusing(conn, name, link, backtype):
         curs.execute("insert into back (title, link, type) values (?, ?, ?)", [link, name, backtype])
 
 def namumark(conn, title, data, num, in_c, toc_y):
-    data = start(data)
+    data = start(data, title)
 
     data += '<script>function folding(num, test = 0) { var fol = document.getElementById(\'folding_\' + num); if(fol.style.display == \'inline-block\' || fol.style.display == \'block\') { fol.style.display = \'none\'; } else { if(num % 3 == 0 && test != 1) { fol.style.display = \'block\'; } else { fol.style.display = \'inline-block\'; } } } </script>'
     

set_mark/start.py

@@ -1,5 +1,102 @@
-def start(data):
-    data = re.sub('\'\'(?P<in>(?:(?!\'\').)+)\'\'', '<b>\g<in></b>')
-    data = re.sub('\'\'\'(?P<in>(?:(?!\'\'\').)+)\'\'\'', '<b>\g<in></b>')
+from . import tool
+
+import re
+
+def start(data, title):
+    # 맨 앞과 끝에 개행 문자 추가
+    data = '\r\n' + data + '\r\n'
+
+    # 텍스트 꾸미기 문법
+    data = re.sub('\'\'\'(?P<in>(?:(?!\'\'\').)+)\'\'\'', '<b>\g<in></b>', data)
+    data = re.sub('\'\'(?P<in>(?:(?!\'\').)+)\'\'', '<i>\g<in></i>', data)
+
+    data = re.sub('~~(?P<in>(?:(?!~~).)+)~~', '<s>\g<in></s>', data)
+    data = re.sub('--(?P<in>(?:(?!~~).)+)--', '<s>\g<in></s>', data)
+
+    data = re.sub('__(?P<in>(?:(?!__).)+)__', '<u>\g<in></u>', data)
+    
+    data = re.sub('^^(?P<in>(?:(?!^^).)+)^^', '<sup>\g<in></sup>', data)
+    data = re.sub(',,(?P<in>(?:(?!,,).)+),,', '<sub>\g<in></sub>', data)
+
+    # 넘겨주기 변환
+    data = re.sub('\r\n#(?:redirect|넘겨주기) (?P<in>(?:(?!\r\n).)+)\r\n', '<meta http-equiv="refresh" content="0; url=/w/\g<in>?froms=' + tool.url_pas(title) + '">', data)
+
+    # 문단 문법
+    toc_full = 0
+    toc_stack = [0, 0, 0, 0, 0, 0]
+    while 1:
+        toc = re.search('\r\n(={1,6}) ?((?:(?!=).)+) ?={1,6}\r\n', data)
+        if toc:
+            toc = toc.groups()
+            toc_number = len(toc[0])
+
+            # 더 크면 그 전 스택은 초기화
+            if toc_full > toc_number:
+                for i in range(toc_number, 6):
+                    toc_stack[i] = 0
+                    
+            toc_full = toc_number        
+            toc_stack[toc_number - 1] += 1
+            toc_number = str(toc_number)
+            all_stack = ''
+
+            # 스택 합치기
+            for i in range(0, 6):
+                all_stack += str(toc_stack[i]) + '.'
+
+            all_stack = re.sub('0.', '', all_stack)
+            
+            data = re.sub('\r\n(={1,6}) ?((?:(?!=).)+) ?={1,6}\r\n', '<h' + toc_number + '><a href="">' + all_stack + '</a> ' + toc[1] + '</h' + toc_number + '>\r\n', data, 1)
+        else:
+            break
+
+    while 1:
+        hr = re.search('\r\n-{4,9}\r\n', data)
+        if hr:
+            data = re.sub('\r\n-{4,9}\r\n', '<hr>', data, 1)
+        else:
+            break
+
+    # 리스트 구현
+    while 1:
+        li = re.search('(\r\n(?:(?: *)\* ?(?:(?:(?!\r\n).)+)\r\n)+)', data)
+        if li:
+            li = li.groups()[0]
+
+            while 1:
+                sub_li = re.search('\r\n(?:( *)\* ?((?:(?!\r\n).)+))', li)
+                if sub_li:
+                    sub_li = sub_li.groups()
+
+                    # 앞의 공백 만큼 margin 먹임
+                    if len(sub_li[0]) == 0:
+                        margin = 20
+                    else:
+                        margin = len(sub_li[0]) * 20
+
+                    li = re.sub('\r\n(?:( *)\* ?((?:(?!\r\n).)+))', '<li style="margin-left: ' + str(margin) + 'px">' + sub_li[1] + '</li>', li, 1)
+                else:
+                    break
+
+            data = re.sub('(\r\n(?:(?: *)\* ?(?:(?:(?!\r\n).)+)\r\n)+)', '<ul>' + li + '</ul>', data, 1)
+        else:
+            break
+
+    # 들여쓰기 구현
+    while 1:
+        indent = re.search('\r\n( +)', data)
+        if indent:
+            indent = len(indent.groups()[0])
+            
+            # 앞에 공백 만큼 margin 먹임
+            margin = '<span style="margin-left: 20px;"></span>' * indent
+
+            data = re.sub('\r\n( +)', '\r\n' + margin, data, 1)
+        else:
+            break
+    
+    # 마지막 처리
+    data = re.sub('(?P<in><\/h[1-6]>)\r\n', '\g<in>', data)
+    data = re.sub('\r\n', '<br>', data)
 
     return data

set_mark/tool.py

@@ -0,0 +1,43 @@
+from flask import session, request
+
+from urllib import parse
+import time
+import datetime
+import re
+import json
+import hashlib
+
+def get_time():
+    now = time.localtime()
+    date = "%04d-%02d-%02d %02d:%02d:%02d" % (now.tm_year, now.tm_mon, now.tm_mday, now.tm_hour, now.tm_min, now.tm_sec)
+
+    return date
+    
+def ip_check():
+    if session and ('Now' and 'DREAMER') in session and session['Now'] == 1:
+        ip = session['DREAMER']
+    else:
+        try:
+            ip = request.environ.get('HTTP_X_REAL_IP', request.remote_addr)
+        except:
+            ip = 'None'
+
+    return str(ip)
+
+def savemark(data):
+    data = re.sub("\[date\(now\)\]", get_time(), data)
+    
+    if not re.search("\.", ip_check()):
+        name = '[[사용자:' + ip_check() + '|' + ip_check() + ']]'
+    else:
+        name = ip_check()
+        
+    data = re.sub("\[name\]", name, data)
+
+    return data
+
+def url_pas(data):
+    return parse.quote(data).replace('/','%2F')
+
+def sha224(data):
+    return hashlib.sha224(bytes(data, 'utf-8')).hexdigest()