X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=1891fdd8c5842cea4357d5339009ad40f90134d6;hp=494118661918794e5726000858eabe9db891023d;hb=ba86d6242b2d2ff713f3db4725adcabbfb9f1cce;hpb=fe9e24ac252d4e400fd800102451ff165bd179b3
diff --git a/geekigeeki.py b/geekigeeki.py
index 4941186..1891fdd 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -3,7 +3,7 @@
#
# Copyright (C) 1999, 2000 Martin Pool
# Copyright (C) 2002 Gerardo Poggiali
-# Copyright (C) 2007, 2008, 2009 Bernie Innocenti
+# Copyright (C) 2007, 2008, 2009, 2010 Bernie Innocenti
#
# 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.6: 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
@@ -29,7 +29,6 @@ file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/ ]*)$")
url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S$")
ext_re = re.compile(r"\.([^\./]+)$")
-# CGI stuff ---------------------------------------------------------
def config_get(key, default=None):
return globals().get(key, default)
@@ -106,11 +105,14 @@ def url_args(kvargs):
return '?' + '&'.join(argv)
return ''
-# Formatting stuff --------------------------------------------------
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)))
- print("Content-type: " + mime_type + "; charset=utf-8\n")
+ if mime_type:
+ print("Content-type: " + mime_type + "; charset=utf-8")
+ print('')
def send_guru(msg_text, msg_type):
if not msg_text: return
@@ -123,80 +125,15 @@ def send_guru(msg_text, msg_type):
print('' \
% relative_url('sys/GuruMeditation.js'))
-def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None):
- global title_done
- if title_done: return
-
- # HEAD
- emit_header(mtime)
- print('\n')
- print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text))
- print(' ')
- if not name:
- print(' ')
-
- for http_equiv, content in config_get('meta_urls', {}):
- print(' ' % (http_equiv, relative_url(content)))
-
- for link in config_get('link_urls', {}):
- rel, href = link
- print(' ' % (rel, relative_url(href)))
-
- editable = name and writable and is_privileged()
- if editable:
- print(' ' \
- % relative_url('?a=edit&q=' + name, privileged=True))
-
- history = config_get('history_url')
- if history is not None:
- print(' ' \
- % relative_url(history + '?a=rss'))
-
- print('')
-
- # BODY
- if editable:
- print('')
- else:
- print('')
-
- title_done = True
- send_guru(msg_text, msg_type)
-
- # NAVBAR
- print('')
-
-def send_httperror(status="403 Not Found", query=""):
+def send_httperror(status="403 Not Found", query="", trace=False):
print("Status: %s" % status)
- send_title(None, msg_text=("%s: on query '%s'" % (status, query)))
- send_footer()
+ 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=msg_text)
+ page.send_footer()
def link_tag(dest, text=None, privileged=False, **kvargs):
if text is None:
@@ -238,20 +175,18 @@ 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:
return link_inline(pattern, descr, kvargs)
-# Search ---------------------------------------------------
-
-def print_search_stats(hits, searched):
- print("
%d hits out of %d pages searched.
" % (hits, searched))
+def search_stats(hits, searched):
+ return "%d hits out of %d pages searched.\n" % (hits, searched)
def handle_fullsearch(query, form):
needle = form['q'].value
- send_title(None, 'Full text search for "' + needle + '"')
+ Page().send_title(text='Full text search for "' + needle + '"')
needle_re = re.compile(needle, re.IGNORECASE)
hits = []
@@ -262,59 +197,50 @@ def handle_fullsearch(query, form):
if count:
hits.append((count, page_name))
- # The default comparison for tuples compares elements in order,
- # so this sorts by number of hits
+ # The default comparison for tuples compares elements in order, so this sorts by number of hits
hits.sort()
hits.reverse()
- print("
")
+ out = ''
for (count, page_name) in hits:
- print('