Merge branch 'normal' of https://github.com/2DU/openNAMU into normal

mark.py

@@ -191,7 +191,7 @@ def mid_pas(data, fol_num, include):
                 fol_num += 3
             elif(syn):
                 result = syn.groups()
-                data = com.sub('<pre id="syntax"><code class="' + result[0] + '">' + re.sub(' ', '<space>', result[1]) + '</code></pre>', data, 1)
+                data = com.sub('<pre id="syntax"><code class="' + result[0] + '">' + re.sub('\r\n', '<isbr>', re.sub(' ', '<space>', result[1])) + '</code></pre>', data, 1)
             elif(html):
                 result = html.groups()
                 data = com.sub(result[0], data, 1)
@@ -538,13 +538,16 @@ def namumark(title, data):
             
             result = m.groups()
             if(result[0]):
-                yudt = re.search('(?:\?v=(.*)|\/([^/?]*)|^([a-zA-Z0-9]*))$', result[0])
-                if(yudt.groups()[0]):
-                    src = yudt.groups()[0]
-                elif(yudt.groups()[1]):
-                    src = yudt.groups()[1]
-                elif(yudt.groups()[2]):
-                    src = yudt.groups()[2]
+                yudt = re.search('(?:\?v=(.*)|\/([^/?]*)|^([a-zA-Z0-9\-]*))$', result[0])
+                if(yudt):
+                    if(yudt.groups()[0]):
+                        src = yudt.groups()[0]
+                    elif(yudt.groups()[1]):
+                        src = yudt.groups()[1]
+                    elif(yudt.groups()[2]):
+                        src = yudt.groups()[2]
+                else:
+                    src = ''
                     
             if(result[1]):
                 mdata = re.search('width=([0-9]*)', result[1])
@@ -1120,6 +1123,7 @@ def namumark(title, data):
 
     data = re.sub('<\/blockquote>((\r)?\n){2}<blockquote>', '</blockquote><br><blockquote>', data)
     data = re.sub('\n', '<br>', data)
+    data = re.sub('<isbr>', '\r\n', data)
     data = re.sub('^<br>', '', data)
     
     conn.close()

version.md

@@ -92,6 +92,7 @@
 ## 2.1 (진행)
  * 타임아웃 문제 해결
  * 하위 문서 바로가기
+ * app.py 부분 while을 for로 수정
 
 ## 계속
  * 버그 수정
@@ -112,7 +113,7 @@
 
 ----
 ## 기타
- * 최신 버전 - v2.1.1
+ * 최신 버전 - v2.1.2
 
 ----
 ## 개발 이념

views/read.tpl

@@ -26,8 +26,8 @@
         % if(data_none == False and admin == "ACL"):
             <a class="menu-item" href="/acl/{{page}}">ACL</a>
         % end
-        % if(uppage):
-            <a class="menu-item" style="{{style}}" href="/w/{{uppage}}">상위</a>
+        % if(not uppage == False):
+            <a class="menu-item" href="/w/{{uppage}}">상위</a>
         % end
         % if(down == True):
             <a class="menu-item" style="{{down}}" href="/down/{{page}}">하위</a>