X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=4a7ffea7e6250f80fe59a09e9053cf11f4128b4e;hb=5280eed375b92de43bb611dd255ec0d360641fa0;hp=e45a3ba3fef75914c3872cd03ef059aecd383a6f;hpb=29de4990aca1e209eb20de44bbde709db7de70be;p=geekigeeki.git

diff --git a/geekigeeki.py b/geekigeeki.py
index e45a3ba..4a7ffea 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -3,7 +3,7 @@
 #
 # Copyright (C) 1999, 2000 Martin Pool <mbp@humbug.org.au>
 # Copyright (C) 2002 Gerardo Poggiali
-# Copyright (C) 2007, 2008, 2009 Bernie Innocenti <bernie@codewiz.org>
+# Copyright (C) 2007, 2008, 2009, 2010 Bernie Innocenti <bernie@codewiz.org>
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
@@ -21,7 +21,7 @@ title_done = False
 import cgi, sys, os, re, errno, stat, glob
 
 image_ext = 'png|gif|jpg|jpeg|bmp|ico'
-video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt
+video_ext = "ogg|ogv|oga|webm" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt
 image_re = re.compile(r".*\.(" + image_ext + "|" +  video_ext + ")$", re.IGNORECASE)
 video_re = re.compile(r".*\.(" + video_ext + ")$", re.IGNORECASE)
 # FIXME: we accept stuff like foo/../bar and we shouldn't
@@ -107,9 +107,12 @@ def url_args(kvargs):
 
 def emit_header(mtime=None, mime_type="text/html"):
     if mtime:
+        # Prevent caching when the wiki engine gets updated
+        mtime = max(mtime, os.stat(__file__).st_mtime)
         print("Last-Modified: " + strftime("%a, %d %b %Y %H:%M:%S GMT", gmtime(mtime)))
-    if mime_type:
-        print("Content-type: " + mime_type + "; charset=utf-8")
+    else:
+        print("Cache-Control: must-revalidate, max-age=0")
+    print("Content-type: " + mime_type + "; charset=utf-8")
     print('')
 
 def send_guru(msg_text, msg_type):
@@ -123,10 +126,14 @@ def send_guru(msg_text, msg_type):
     print('</pre><script type="text/javascript" src="%s" defer="defer"></script>' \
         % relative_url('sys/GuruMeditation.js'))
 
-def send_httperror(status="403 Not Found", query=""):
+def send_httperror(status="403 Not Found", query="", trace=False):
     print("Status: %s" % status)
+    msg_text = "%s: on query '%s'" % (status, query)
+    if trace:
+        import traceback
+        msg_text += '\n\n' + traceback.format_exc()
     page = Page()
-    page.send_title(msg_text=("%s: on query '%s'" % (status, query)))
+    page.send_title(msg_text=msg_text)
     page.send_footer()
 
 def link_tag(dest, text=None, privileged=False, **kvargs):
@@ -169,7 +176,7 @@ def link_inline(name, descr=None, kvargs={}):
 def link_inline_glob(pattern, descr=None, kvargs={}):
     if not url_re.match(pattern) and bool(set(pattern) & set('?*[')):
         s = ''
-        for name in glob.glob(pattern):
+        for name in sorted(glob.glob(pattern), reverse=bool(int(kvargs.get('reverse', '0'))) ):
             s += link_inline(name, descr, kvargs)
         return s
     else:
@@ -218,28 +225,23 @@ def handle_titlesearch(query, form):
     WikiFormatter(out).print_html()
 
 def handle_raw(pagename, form):
-    if not file_re.match(pagename):
-        send_httperror("403 Forbidden", pagename)
-        return
-
     Page(pagename).send_raw()
 
-def handle_edit(pagename, form):
-    if not file_re.match(pagename):
-        send_httperror("403 Forbidden", pagename)
-        return
+def handle_atom(pagename, form):
+    Page(pagename).send_atom()
 
-    pg  = Page(form['q'].value)
+def handle_edit(pagename, form):
+    pg  = Page(pagename)
     if 'save' in form:
         if form['file'].value:
             pg.save(form['file'].file.read(), form['changelog'].value)
         else:
             pg.save(form['savetext'].value.replace('\r\n', '\n'), form['changelog'].value)
-        pg.format()
+        pg.send()
     elif 'cancel' in form:
         pg.msg_text = 'Editing canceled'
         pg.msg_type = 'notice'
-        pg.format()
+        pg.send()
     else: # preview or edit
         text = None
         if 'preview' in form:
@@ -247,16 +249,13 @@ def handle_edit(pagename, form):
         pg.send_editor(text)
 
 def handle_get(pagename, form):
-        if file_re.match(pagename):
-            if not ext_re.search(pagename): # FIXME: no extension guesses a wiki page
-                Page(pagename).format()
-            else:
-                # FIMXE: this is all bullshit, MimeTypes bases its guess on the extension!
-                from mimetypes import MimeTypes
-                mimetype, encoding = MimeTypes().guess_type(pagename)
-                Page(pagename).send_raw(mimetype=mimetype, args=form)
-        else:
-            send_httperror("403 Forbidden", pagename)
+    if not ext_re.search(pagename): # FIXME: no extension guesses a wiki page
+        Page(pagename).send()
+    else:
+        # FIMXE: this is all bullshit, MimeTypes bases its guess on the extension!
+        from mimetypes import MimeTypes
+        mimetype, encoding = MimeTypes().guess_type(pagename)
+        Page(pagename).send_raw(mimetype=mimetype, args=form)
 
 # Used by sys/macros/WordIndex and sys/macros/TitleIndex
 def make_index_key():
@@ -324,14 +323,19 @@ class WikiFormatter:
 
     def _macro_repl(self, word):
         try:
-            args, kvargs = parse_args(word)
+            args, macro_kvargs = parse_args(word)
+            # Is this a parameter given to the current page?
             if args[0] in self.kvargs:
                 return self.kvargs[args[0]]
+            # Is this an internal macro?
             macro = globals().get('_macro_' + args[0])
             if not macro:
+                # Can we load (and cache) an external macro?
                 exec(open("sys/macros/" + args[0] + ".py").read(), globals())
                 macro = globals().get('_macro_' + args[0])
-            return macro(*args, **kvargs)
+            # Invoke macro passing both macro args augmented by page args
+            macro_kvargs.update(self.kvargs)
+            return macro(*args, **macro_kvargs)
         except Exception, e:
             msg = cgi.escape(word) + ": " + cgi.escape(str(e))
             if not self.in_html:
@@ -471,8 +475,8 @@ class WikiFormatter:
             | (?P<hurl>  \[\[[^\]]+\]\])
 
             # Inline HTML
-            | (?P<html>             <(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
-            | (?P<htmle> ( /\s*> | </(br|hr|div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
+            | (?P<html>             <(br|hr|small|div|span|form|iframe|input|textarea|a|img|h[1-5])\b )
+            | (?P<htmle> ( /\s*> | </(br|hr|small|div|span|form|iframe|input|textarea|a|img|h[1-5])> ) )
             | (?P<ent>   [<>&] )
 
             # Auto links (LEGACY)
@@ -490,8 +494,6 @@ class WikiFormatter:
             | (?P<tr>    ^\s*\|\|(=|)\s*)
             | (?P<tre>   \s*\|\|(=|)\s*$)
             | (?P<td>    \s*\|\|(=|)\s*)
-
-            # TODO: highlight search words (look at referrer)
           )""", re.VERBOSE)
         pre_re = re.compile("""(?:
               (?P<pre>\s*\}\}\})
@@ -530,11 +532,18 @@ class WikiFormatter:
         print(self._indent_to(0))
         print('</p></div>')
 
+class HttpException(Exception):
+    def __init__(self, error, query):
+        self.error = error
+        self.query = query
+
 class Page:
     def __init__(self, page_name="Limbo"):
         self.page_name = page_name.rstrip('/');
         self.msg_text = ''
         self.msg_type = 'error'
+        if not file_re.match(self.page_name):
+            raise HttpException("403 Forbidden", self.page_name)
 
     def split_title(self):
         # look for the end of words and the start of a new word and insert a space there
@@ -559,14 +568,12 @@ class Page:
             return True
         return False
 
-    def get_raw_body(self, default=None):
+    def get_raw_body(self):
         try:
             return open(self._filename(), 'rb').read()
         except IOError, err:
             if err.errno == errno.ENOENT:
-                if default is None:
-                    default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name)
-                return default
+                return ''
             if err.errno == errno.EISDIR:
                 return self.format_dir()
             raise err
@@ -636,7 +643,7 @@ class Page:
         if title_done: return
 
         # HEAD
-        emit_header(self._mtime())
+        emit_header(name and self._mtime())
         print('<!doctype html>\n<html lang="en">')
         print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
         print(' <meta charset="UTF-8">')
@@ -653,7 +660,7 @@ class Page:
         editable = name and self.can_write() and is_privileged()
         if editable:
             print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
-                % relative_url('?a=edit&q=' + name, privileged=True))
+                % relative_url(name + '?a=edit', privileged=True))
 
         history = config_get('history_url')
         if history is not None:
@@ -664,7 +671,7 @@ class Page:
 
         # BODY
         if editable:
-            print('<body ondblclick="location.href=\'' + relative_url('?a=edit&q=' + name, privileged=True) + '\'">')
+            print('<body ondblclick="location.href=\'' + relative_url(name + '?a=edit', privileged=True) + '\'">')
         else:
             print('<body>')
 
@@ -691,13 +698,13 @@ class Page:
             print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink'))
             if config_get('privileged_url') is not None:
                 if self.can_write():
-                    print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True))
+                    print(' | ' + link_tag(name + '?a=edit', 'Edit', cssclass='navlink', privileged=True))
                 else:
-                    print(' | ' + link_tag(name, 'Login', cssclass='navlink', privileged=True))
+                    print(' | ' + link_tag(name, 'Login', cssclass='login', privileged=True))
 
         user = remote_user()
         if user != 'AnonymousCoward':
-            print(' | <span class="login"><i><b>' + link_tag('User/' + user, user) + '</b></i></span>')
+            print(' | ' + link_tag('user/' + user, user, cssclass='login'))
 
         print('<hr /></div></nav>')
 
@@ -709,17 +716,20 @@ class Page:
         footer = self.pragma("footer", "sys/footer")
         if footer != "off":
             link_inline(footer, kvargs = {
-                'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a %d %b %Y %I:%M %p'), localtime(self._mtime()))
+                'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%Y-%m-%dT%I:%M:%S%p'), localtime(self._mtime()))
             })
-        print("</body></html>")
+        print('</body></html>')
 
     def send_naked(self, kvargs=None):
         if self.can_read():
-            WikiFormatter(self.get_raw_body(), kvargs).print_html()
+            body = self.get_raw_body()
+            if not body:
+                body = "//[[%s?a=edit|Describe %s]]//" % (self.page_name, self.page_name)
+            WikiFormatter(body, kvargs).print_html()
         else:
-            send_guru("Read access denied by ACLs", "notice")
+            send_guru('Read access denied by ACLs', 'notice')
 
-    def format(self):
+    def send(self):
         #css foo.css
         value = self.pragma("css", None)
         if value:
@@ -730,6 +740,18 @@ class Page:
         self.send_naked()
         self.send_footer()
 
+    def send_atom(self):
+        emit_header(self._mtime(), 'application/atom+xml')
+        self.in_html = True
+        link_inline("sys/atom_header", kvargs = {
+            'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a, %d %b %Y %I:%M:%S %p'), localtime(self._mtime()))
+        })
+        self.in_html = False
+        self.send_naked()
+        self.in_html = True
+        link_inline("sys/atom_footer")
+        self.in_html = False
+
     def send_editor(self, preview=None):
         self.send_title(text='Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
         if not self.can_write():
@@ -737,7 +759,7 @@ class Page:
             return
 
         if preview is None:
-            preview = self.get_raw_body(default='')
+            preview = self.get_raw_body()
 
         link_inline("sys/EditPage", kvargs = {
             'EDIT_BODY': cgi.escape(preview),
@@ -818,14 +840,9 @@ try:
     else:
         send_httperror("403 Forbidden", query_string())
 
+except HttpException, e:
+    send_httperror(e.error, query=e.query)
 except Exception:
-    import traceback
-    msg_text = traceback.format_exc()
-    page = Page()
-    if title_done:
-        send_guru(msg_text, "error")
-    else:
-        page.send_title(msg_text=msg_text)
-    page.send_footer()
+    send_httperror("500 Internal Server Error", query=query_string(), trace=True)
 
 sys.stdout.flush()