X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=854c715dc50d834529bc76f164c34c1cc83323cd;hb=8bfb01a3223d8ab205a28968703831fc17fba04a;hp=3b66445ab80b4665304db00481b344b31b4376e1;hpb=ec3e42d01c1a77dff06032e35983b0e9933302c8;p=geekigeeki.git

diff --git a/geekigeeki.py b/geekigeeki.py
index 3b66445..854c715 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -3,7 +3,7 @@
 #
 # Copyright 1999, 2000 Martin Pool <mbp@humbug.org.au>
 # Copyright 2002 Gerardo Poggiali
-# Copyright 2007, 2008 Bernardo Innocenti <bernie@codewiz.org>
+# Copyright 2007, 2008 Bernie Innocenti <bernie@codewiz.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -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)
@@ -233,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:
@@ -248,8 +248,8 @@ def make_index_key():
     links = map(lambda ch: '<a href="#%s">%s</a>' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
     return '<p><center>'+ ' | '.join(links) + '</center></p>'
 
-def page_list():
-    return filter(word_re.match, os.listdir(data_dir))
+def page_list(dir = None, re = word_re):
+    return filter(re.match, os.listdir(dir or data_dir))
 
 def send_footer(name, mod_string=None):
     if globals().get('debug_cgi', False):
@@ -264,68 +264,7 @@ def send_footer(name, mod_string=None):
         print '<p class="modified">last modified %s</p>' % mod_string
     print '</div></body></html>'
 
-# 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 """<form method="get"><input name="%s" size="30" value="%s" /><input type="submit" value="Search" /></form>""" % (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 + '; <a name="%s"><h3>%s</h3></a>' % (letter, letter)
-            last_letter = letter
-
-        s = s + '<b>%s</b><ul>' % word
-        links = map[word]
-        links.sort()
-        last_page = None
-        for name in links:
-            if name == last_page: continue
-            s = s + '<li>' + Page(name).link_to()
-        s = s + '</ul>'
-    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 += '<a name="%s"><h3>%s</h3></a>' % (letter, letter)
-            current_letter = letter
-        else:
-            s += '<br />'
-        s += Page(name).link_to()
-    return s
-
-class PageFormatter:
+class WikiFormatter:
     """Object that turns Wiki markup into HTML.
 
     All formatting commands can be parsed one line at a time, though
@@ -334,7 +273,7 @@ class PageFormatter:
     def __init__(self, raw):
         self.raw = raw
         self.h_level = 0
-        self.in_pre = self.in_table = self.in_li = 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
@@ -385,15 +324,29 @@ class PageFormatter:
         else:
             return '<a href="%s" rel="nofollow" class="external">%s</a>' % (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 '<strong class="error">&lt;&lt;' + '|'.join(argv) + '&gt;&gt;</strong>'
+
+    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 '<div class="extthumb"><div class="thumb"><a href="%s"><img border="0" src="%s" alt="%s" /></a><div class="caption">%s</div></div></div>' % (name, name, descr, descr)
@@ -407,9 +360,13 @@ class PageFormatter:
         return '<a href="mailto:%s">%s</a>' % (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 {'&': '&amp;',
                 '<': '&lt;',
                 '>': '&gt;'}[s]
@@ -499,20 +456,26 @@ class PageFormatter:
             + r"|(?P<tit>\={2,6})"
             + r"|(?P<br>\\\\)"
             + r"|(?P<rule>^-{3,})"
-            + r"|(?P<html><(/|)(div|span|iframe)[^<>]*>)"
-            + r"|(?P<ent>[<>&])"
             + r"|(?P<hi>\b(FIXME|TODO|DONE)\b)"
 
             # Links
-            + r"|(?P<img>\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))"
-            + r"|(?P<word>\b(?:[A-Z][a-z]+){2,}\b)"
-            + r"|(?P<hurl>\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
-            + r"|(?P<url>(http|https|ftp|mailto)\:[^\s'\"]+\S)"
-            + r"|(?P<email>[-\w._+]+\@[\w.-]+)"
+            + r"|(?P<macro>\<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>)"
+            + r"|(?P<hurl>\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
+
+            # Inline HTML
+            + r"|(?P<html><(/|)(br|hr|div|form|iframe|input|span))"
+            + r"|(?P<ent>[<>&])"
+
+            # Auto links
+            + r"|(?P<img>\b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp))" # LEGACY
+            + r"|(?P<word>\b(?:[A-Z][a-z]+){2,}\b)" # LEGACY
+            + r"|(?P<url>(http|https|ftp|mailto)\:[^\s'\"]+\S)" # LEGACY
+            + r"|(?P<email>[-\w._+]+\@[\w.-]+)" # LEGACY
 
             # Lists, divs, spans
             + r"|(?P<li>^\s+[\*#] +)"
             + r"|(?P<pre>\{\{\{|\s*\}\}\})"
+            + r"|(?P<inl>\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\})" #TODO
 
             # Tables
             + r"|(?P<tr>^\s*\|\|(=|)\s*)"
@@ -564,7 +527,7 @@ class Page:
         # look for the end of words and the start of a new word and insert a space there
         return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name)
 
-    def _text_filename(self):
+    def _filename(self):
         return path.join(data_dir, self.page_name)
 
     def _tmp_filename(self):
@@ -572,7 +535,7 @@ class Page:
 
     def exists(self):
         try:
-            os.stat(self._text_filename())
+            os.stat(self._filename())
             return True
         except OSError, er:
             if er.errno == errno.ENOENT:
@@ -588,20 +551,28 @@ class Page:
 
     def get_raw_body(self):
         try:
-            return open(self._text_filename(), 'rb').read()
+            return open(self._filename(), 'rb').read()
         except IOError, er:
             if er.errno == errno.ENOENT:
                 return '' # just doesn't exist, use default
             if er.errno == errno.EISDIR:
-                return 'DIR'
+                return self.format_dir()
             raise er
 
+    def format_dir(self):
+        out = ''
+        for file in page_list(self._filename(), file_re):
+            if img_re.match(file):
+                out += ' * {{' + self.page_name + '/' + file + '}}\n'
+            else:
+                out += ' * [[' + self.page_name + '/' + file + ']]\n'
+        return out
     def get_attrs(self):
         if 'attrs' in self.__dict__:
             return self.attrs
         self.attrs = {}
         try:
-            file = open(self._text_filename(), 'rt')
+            file = open(self._filename(), 'rt')
             attr_re = re.compile(r"^#(\S*)(.*)$")
             for line in file:
                 m = attr_re.match(line)
@@ -638,7 +609,13 @@ class Page:
     def can_read(self):
         return self.can("read", True)
 
-    def send_page(self):
+    def send_naked(self):
+        if self.can_read():
+            WikiFormatter(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
@@ -648,16 +625,13 @@ 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):
         try:
             from time import localtime, strftime
-            modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME])
+            modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
         except OSError, er:
             if er.errno != errno.ENOENT:
                 raise er
@@ -693,7 +667,7 @@ class Page:
         print "<p>" + Page('EditingTips').link_to() + "</p>"
         if preview:
             print "<div class='preview'>"
-            PageFormatter(preview).print_html()
+            WikiFormatter(preview).print_html()
             print "</div>"
         send_footer(self.page_name)
 
@@ -708,7 +682,7 @@ class Page:
     def _write_file(self, data):
         tmp_filename = self._tmp_filename()
         open(tmp_filename, 'wb').write(data)
-        name = self._text_filename()
+        name = self._filename()
         if os.name == 'nt':
             # Bad Bill!  POSIX rename ought to replace. :-(
             try:
@@ -763,7 +737,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)