X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=bee5e34693139ce0f7f022a2ad3d815802fa10fa;hb=aaf6442c154b3119e038979d2a223484026893e3;hp=76888601650f52e137b24a9278cbf9c5c12aad04;hpb=dfa7879fd3551cd71fe2977ca3146833189b90cf;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index 7688860..bee5e34 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -28,7 +28,7 @@ from os import path, environ # Regular expression defining a WikiWord # (but this definition is also assumed in other places) -word_re = re.compile(r"^\b((([A-Z][a-z]+){2,}/)*([A-Z][a-z]+){2,})\b$") +word_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$") # FIXME: we accept stuff like foo/../bar and we shouldn't file_re = re.compile(r"^\b([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)\b$") img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg)$", re.IGNORECASE) @@ -70,8 +70,10 @@ def relative_url(pathname, privileged=False): pathname = url + '/' + pathname return pathname -# Formatting stuff -------------------------------------------------- +def permalink(s): + return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip()) +# Formatting stuff -------------------------------------------------- def emit_header(mime_type="text/html"): print "Content-type: " + mime_type + "; charset=utf-8\n" @@ -360,8 +362,8 @@ class PageFormatter: self.h_level = 0 else: self.h_level = len(word) - 1 - abridged = re.sub('[^A-Za-z0-9_]', '', self.line).lower() - result = '\n
\{\{\{|\s*\}\}\})" + + r"|(?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" # Tables + r"|(?P ^\s*\|\|(=|)\s*)"