X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=0607006331db081e90b43ceab3430f6bac4726d3;hb=666cc43781cace3f5a662a6403bee97c46a5c3a7;hp=0a441bf5658c4de1ba72199673651ad1d7af0590;hpb=4418a51a22439df095133aef170814fabc597c55;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index 0a441bf..0607006 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" @@ -137,11 +139,10 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'): # Navbar print '
' - print ' ' + site_name + ': ', if name: - print link_tag('?fullsearch=' + name, text, 'navlink') + ' ' + print ' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ' else: - print text + ' ' + print ' ' + text + ' ' print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink') print ' | ' + link_tag('FindPage', 'Find Page', 'navlink') if 'history_url' in globals(): @@ -232,11 +233,11 @@ def handle_edit(pagename): pg.save(form['file'].file.read()) else: pg.save(form['savetext'].value.replace('\r\n', '\n')) - pg.send_page() + pg.format() elif 'cancel' in form: pg.msg_text = 'Editing canceled' pg.msg_type = 'notice' - pg.send_page() + pg.format() else: # preview or edit text = None if 'preview' in form: @@ -263,70 +264,6 @@ def send_footer(name, mod_string=None): print '

last modified %s

' % mod_string print '
' -# ---------------------------------------------------------- -# Macros -def _macro_TitleSearch(*vargs): - return _macro_search("titlesearch") - -def _macro_FullSearch(*vargs): - return _macro_search("fullsearch") - -def _macro_search(type): - default = '' - if 'value' in form: - default = form['value'].value - return """
""" % (type, default) - -def _macro_WordIndex(*vargs): - s = make_index_key() - pages = list(page_list()) - map = {} - word_re = re.compile('[A-Z][a-z]+') - for name in pages: - for word in word_re.findall(name): - try: - map[word].append(name) - except KeyError: - map[word] = [name] - - all_words = map.keys() - all_words.sort() - last_letter = None - # set title - for word in all_words: - letter = word[0].lower() - if letter != last_letter: - s = s + ';

%s

' % (letter, letter) - last_letter = letter - - s = s + '%s' - return s - - -def _macro_TitleIndex(*vargs): - s = make_index_key() - pages = list(page_list()) - pages.sort() - current_letter = None - for name in pages: - letter = name[0].lower() - if letter != current_letter: - s += '

%s

' % (letter, letter) - current_letter = letter - else: - s += '
' - s += Page(name).link_to() - return s - - -# ---------------------------------------------------------- class PageFormatter: """Object that turns Wiki markup into HTML. @@ -336,7 +273,7 @@ class PageFormatter: def __init__(self, raw): self.raw = raw self.h_level = 0 - self.in_pre = self.in_table = False + self.in_pre = self.in_html = self.in_table = self.in_li = False self.in_header = True self.list_indents = [] self.tr_cnt = 0 @@ -360,12 +297,12 @@ class PageFormatter: def _tit_repl(self, word): if self.h_level: - result = '' % self.h_level + result = '

\n' % self.h_level self.h_level = 0 else: self.h_level = len(word) - 1 - abridged = re.sub('[^A-Za-z0-9_]', '', self.line).lower() - result = '¶ ' % (self.h_level, abridged, abridged) + link = permalink(self.line) + result = '\n

¶ ' % (self.h_level, link, link) return result def _br_repl(self, word): @@ -387,15 +324,29 @@ class PageFormatter: else: return '%s' % (word, word) - def _hurl_repl(self, word): - m = re.compile("\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\]").match(word) + def _macro_repl(self, word): + m = re.compile("\<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>").match(word) name = m.group(1) - descr = m.group(2) or name + argv = [name] + if m.group(2): + argv.extend(m.group(2).split('|')) + argv = map(str.strip, argv) macro = globals().get('_macro_' + name) + if not macro: + execfile("macros/" + name + ".py", globals()) + macro = globals().get('_macro_' + name) if macro: - return macro(name, descr) - elif img_re.match(name): + return macro(argv) + else: + return '<<' + '|'.join(argv) + '>>' + + def _hurl_repl(self, word): + m = re.compile("\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\]").match(word) + name = m.group(1) + descr = m.group(2) or name + + if img_re.match(name): name = relative_url(name) # The "extthumb" nonsense works around a limitation of the HTML block model return '
%s
%s
' % (name, name, descr, descr) @@ -409,15 +360,23 @@ class PageFormatter: return '%s' % (word, word) def _html_repl(self, word): + self.in_html += 1 return word; # Pass through def _ent_repl(self, s): + if self.in_html and s == '>': + self.in_html -= 1 + return '>' return {'&': '&', '<': '<', '>': '>'}[s] def _li_repl(self, match): - return '
  • ' + if self.in_li: + return '
  • ' + else: + self.in_li = True + return '
  • ' def _pre_repl(self, word): if word == '{{{' and not self.in_pre: @@ -460,6 +419,9 @@ class PageFormatter: s = '

    ' while self._indent_level() > new_level: del(self.list_indents[-1]) + if self.in_li: + s += '
    • ' + self.in_li = False # FIXME s += '\n' while self._indent_level() < new_level: self.list_indents.append(new_level) @@ -494,20 +456,26 @@ class PageFormatter: + r"|(?P\={2,6})" + r"|(?P
    \\\\)" + r"|(?P^-{3,})" - + r"|(?P<(/|)(div|span|iframe)[^<>]*>)" - + r"|(?P[<>&])" + r"|(?P\b(FIXME|TODO|DONE)\b)" # Links - + r"|(?P\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))" - + r"|(?P\b(?:[A-Z][a-z]+){2,}\b)" - + r"|(?P\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\])" - + r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)" - + r"|(?P[-\w._+]+\@[\w.-]+)" + + r"|(?P\<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>)" + + r"|(?P\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])" + + # Inline HTML + + r"|(?P<(/|)(br|hr|div|form|iframe|input|span))" + + r"|(?P[<>&])" + + # Auto links + + r"|(?P\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))" # LEGACY + + r"|(?P\b(?:[A-Z][a-z]+){2,}\b)" # LEGACY + + r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)" # LEGACY + + r"|(?P[-\w._+]+\@[\w.-]+)" # LEGACY # Lists, divs, spans + r"|(?P
  • ^\s+[\*#] +)" + r"|(?P
    \{\{\{|\s*\}\}\})"
+            + r"|(?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" #TODO
 
             # Tables
             + r"|(?P^\s*\|\|(=|)\s*)"
@@ -549,7 +517,6 @@ class PageFormatter:
         print self._undent()
         print '
    '
 
-# ----------------------------------------------------------
 class Page:
     def __init__(self, page_name):
         self.page_name = page_name
@@ -614,6 +581,7 @@ class Page:
         return self.get_attrs().get(name, default)
 
     def can(self, action, default=True):
+        acl = None
         try:
             #acl SomeUser:read,write All:read
             acl = self.get_attr("acl", None)
@@ -633,7 +601,13 @@ class Page:
     def can_read(self):
         return self.can("read", True)
 
-    def send_page(self):
+    def send_naked(self):
+        if self.can_read():
+            PageFormatter(self.get_raw_body()).print_html()
+        else:
+            send_guru("Read access denied by ACLs", "notice")
+
+    def format(self):
         page_name = None
         if self.can_write():
             page_name = self.page_name
@@ -643,10 +617,7 @@ class Page:
         css_url = self.get_attr("css", "").split() + css_url
 
         send_title(page_name, self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
-        if self.can_read():
-            PageFormatter(self.get_raw_body()).print_html()
-        else:
-            send_guru("Read access denied by ACLs", "notice")
+        self.send_naked()
         send_footer(page_name, self._last_modified())
 
     def _last_modified(self):
@@ -758,7 +729,7 @@ try:
 
         if file_re.match(query):
             if word_re.match(query):
-                Page(query).send_page()
+                Page(query).format()
             else:
                 from mimetypes import MimeTypes
                 type, encoding = MimeTypes().guess_type(query)