X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=d63850fb57b8e55494930871cc8f4f23271b3b5c;hb=5a2e445da1711b54343334087b760b86935fb876;hp=9a05b85ecfa8834fba0636a338e6542966e1c83b;hpb=aec3ecd7af2dcf1f757c1594f0c006d2ac57c551;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 9a05b85..d63850f 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -1,16 +1,16 @@
#!/usr/bin/python
# -*- coding: utf-8 -*-
#
-# Copyright 1999, 2000 Martin Pool
-# Copyright 2002 Gerardo Poggiali
-# Copyright 2007, 2008, 2009 Bernie Innocenti
+# Copyright (C) 1999, 2000 Martin Pool
+# Copyright (C) 2002 Gerardo Poggiali
+# 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 General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version. You should have received a copy
-# of the GNU General Public License along with this program.
-# If not, see .
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+# You should have received a copy of the GNU Affero General Public License
+# along with this program. If not, see .
__version__ = '4.0-' + '$Id$'[4:11]
@@ -22,20 +22,20 @@ 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
-image_re = re.compile(r".*\.(" + image_ext + "|" + video_ext + ")", re.IGNORECASE)
-video_re = re.compile(r".*\.(" + video_ext + ")", re.IGNORECASE)
+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
-file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)")
-url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S")
+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)
def script_name():
return os.environ.get('SCRIPT_NAME', '')
+#TODO: move post-edit hook into wiki, then kill this
def script_path():
return os.path.split(os.environ.get('SCRIPT_FILENAME', ''))[0]
@@ -46,8 +46,9 @@ def query_string():
else:
return os.environ.get('QUERY_STRING', '') or 'FrontPage'
-def privileged_path():
- return config_get('privileged_url') or script_name()
+def is_privileged():
+ purl = config_get('privileged_url')
+ return (purl is not None) and os.environ.get('SCRIPT_URI', '').startswith(purl)
def remote_user():
user = os.environ.get('REMOTE_USER', '')
@@ -71,7 +72,7 @@ def is_external_url(pathname):
def relative_url(pathname, privileged=False):
if not is_external_url(pathname):
if privileged:
- url = privileged_path()
+ url = config_get('privileged_url') or script_name()
else:
url = script_name()
pathname = url + '/' + pathname
@@ -104,11 +105,12 @@ def url_args(kvargs):
return '?' + '&'.join(argv)
return ''
-# Formatting stuff --------------------------------------------------
def emit_header(mtime=None, mime_type="text/html"):
if 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
@@ -118,92 +120,24 @@ def send_guru(msg_text, msg_type):
print(cgi.escape(msg_text))
if msg_type == 'error':
print '\n Guru Meditation #DEADBEEF.ABADC0DE'
- print('' \
+ 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('')
- print('')
-
- 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 config_get('privileged_url') is not None
- 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:
text = humanlink(dest)
elif image_re.match(text):
- text = ''
+ text = ''
link_class = kvargs.get('class', kvargs.get('cssclass', None))
if not link_class:
@@ -245,14 +179,12 @@ def link_inline_glob(pattern, descr=None, kvargs={}):
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 = []
@@ -263,59 +195,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('
^\s*\|\|(=|)\s*)
@@ -594,7 +494,7 @@ class WikiFormatter:
| (?P[<>&])"
)""", re.VERBOSE)
blank_re = re.compile(r"^\s*$")
- indent_re = re.compile(r"^\s*")
+ indent_re = re.compile(r"^(\s*)(\*|\#|)")
tr_re = re.compile(r"^\s*\|\|")
eol_re = re.compile(r"\r?\n")
# For each line, we scan through looking for magic strings, outputting verbatim any intervening text
@@ -617,20 +517,27 @@ class WikiFormatter:
print('
')
else:
indent = indent_re.match(self.line)
- #3.0: print(self._indent_to(len(indent.group(0))), end=' ')
- print(self._indent_to(len(indent.group(0))))
+ print(self._indent_to(len(indent.group(1)), indent.group(2)))
+ # Stand back! Here we apply the monster regex that does all the parsing
print(re.sub(scan_re, self.replace, self.line))
if self.in_pre: print('')
if self.in_table: print('