2DU 9 лет назад
Родитель
Сommit
766c0b0e78
2 измененных файлов с 23 добавлено и 10 удалено
  1. 18 10
      app.py
  2. 5 0
      templates/index.html

+ 18 - 10
app.py

@@ -44,19 +44,27 @@ def namumark(data):
             a = re.search("(((?!\|).)*)\|(.*)", result[0])
             if(a):
                 results = a.groups()
-                curs.execute("select * from data where title = '" + pymysql.escape_string(results[0]) + "'")
-                rows = curs.fetchall()
-                if(rows):
-                    data = re.sub('\[\[(((?!\]\]).)*)\]\]', '<a href="' + results[0] + '">' + results[2] + '</a>', data, 1)
+                b = re.search("^[Hh][Tt][Tt][Pp]([Ss])?:\/\/", results[0])
+                if(b):
+                    data = re.sub('\[\[(((?!\]\]).)*)\]\]', '<a class="out_link" href="' + results[0] + '">' + results[2] + '</a>', data, 1)
                 else:
-                    data = re.sub('\[\[(((?!\]\]).)*)\]\]', '<a class="not_thing" href="' + results[0] + '">' + results[2] + '</a>', data, 1)
+                    curs.execute("select * from data where title = '" + pymysql.escape_string(results[0]) + "'")
+                    rows = curs.fetchall()
+                    if(rows):
+                        data = re.sub('\[\[(((?!\]\]).)*)\]\]', '<a href="' + results[0] + '">' + results[2] + '</a>', data, 1)
+                    else:
+                        data = re.sub('\[\[(((?!\]\]).)*)\]\]', '<a class="not_thing" href="' + results[0] + '">' + results[2] + '</a>', data, 1)
             else:
-                curs.execute("select * from data where title = '" + pymysql.escape_string(result[0]) + "'")
-                rows = curs.fetchall()
-                if(rows):
-                    data = re.sub('\[\[(((?!\]\]).)*)\]\]', '<a href="' + result[0] + '">' + result[0] + '</a>', data, 1)
+                b = re.search("^[Hh][Tt][Tt][Pp]([Ss])?:\/\/", result[0])
+                if(b):
+                    data = re.sub('\[\[(((?!\]\]).)*)\]\]', '<a class="out_link" href="' + result[0] + '">' + result[0] + '</a>', data, 1)
                 else:
-                    data = re.sub('\[\[(((?!\]\]).)*)\]\]', '<a class="not_thing" href="' + result[0] + '">' + result[0] + '</a>', data, 1)
+                    curs.execute("select * from data where title = '" + pymysql.escape_string(result[0]) + "'")
+                    rows = curs.fetchall()
+                    if(rows):
+                        data = re.sub('\[\[(((?!\]\]).)*)\]\]', '<a href="' + result[0] + '">' + result[0] + '</a>', data, 1)
+                    else:
+                        data = re.sub('\[\[(((?!\]\]).)*)\]\]', '<a class="not_thing" href="' + result[0] + '">' + result[0] + '</a>', data, 1)
         else:
             break
 

+ 5 - 0
templates/index.html

@@ -378,6 +378,11 @@
 				<li>==== 4단계 문단 ====</li>
 				<li>===== 5단계 문단 =====</li>
 				<li>====== 6단계 문단 ======</li>
+                <h2>링크 문법</h2>
+                <li>[[내부 링크]]</li>
+                <li>[[내부 링크|보이는 내용]]</li>
+                <li>[[외부 링크]]</li>
+                <li>[[외부 링크|보이는 내용]]</li>
 			</div>
 			{% elif tn == 18 %}
 			<h1 class="title">{{title}}</h1>