X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=a5ba6a2d388565ae9ac3f5dff29ca48f8126fb50;hp=07365fdef0e0c1ffdf6aaa3d2c3660cbc4c569cc;hb=49c44a83e5e434114dd90c1672579cf66ee46e86;hpb=8572b870b28b6ecaba354ab47a4dc016ad889c03
diff --git a/geekigeeki.py b/geekigeeki.py
index 07365fd..a5ba6a2 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -1,20 +1,20 @@
#!/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 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]
-from time import clock
+from time import clock, localtime, gmtime, strftime
start_time = clock()
title_done = False
@@ -22,11 +22,11 @@ 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 ---------------------------------------------------------
@@ -36,6 +36,10 @@ def config_get(key, default=None):
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]
+
def query_string():
path_info = os.environ.get('PATH_INFO', '')
if len(path_info) and path_info[0] == '/':
@@ -43,8 +47,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', '')
@@ -68,7 +73,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
@@ -102,7 +107,9 @@ def url_args(kvargs):
return ''
# Formatting stuff --------------------------------------------------
-def emit_header(mime_type="text/html"):
+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")
def send_guru(msg_text, msg_type):
@@ -113,21 +120,18 @@ 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):
+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()
- print('')
- print('')
-
+ # HEAD
+ emit_header(mtime)
+ print('\n')
print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text))
- print(' ')
+ print(' ')
if not name:
print(' ')
@@ -138,10 +142,10 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
rel, href = link
print(' ' % (rel, relative_url(href)))
- editable = name and writable and config_get('privileged_url') is not None
+ editable = name and writable and is_privileged()
if editable:
print(' ' \
- % (privileged_path() + '?a=edit&q=' + name))
+ % relative_url('?a=edit&q=' + name, privileged=True))
history = config_get('history_url')
if history is not None:
@@ -150,17 +154,17 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal
print('')
- # Body
+ # BODY
if editable:
- print('')
+ print('')
else:
print('')
title_done = True
send_guru(msg_text, msg_type)
- # Navbar
- print('
')
+ # NAVBAR
+ print('
')
def send_httperror(status="403 Not Found", query=""):
print("Status: %s" % status)
@@ -198,7 +202,7 @@ 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:
@@ -232,10 +236,13 @@ def link_inline(name, descr=None, kvargs={}):
% (url, url, name)
def link_inline_glob(pattern, descr=None, kvargs={}):
- s = ''
- for name in glob.glob(pattern):
- s += link_inline(name, descr, kvargs)
- return s
+ if not url_re.match(pattern) and bool(set(pattern) & set('?*[')):
+ s = ''
+ for name in glob.glob(pattern):
+ s += link_inline(name, descr, kvargs)
+ return s
+ else:
+ return link_inline(pattern, descr, kvargs)
# Search ---------------------------------------------------
@@ -337,12 +344,14 @@ def page_list(dirname=None, search_re=None):
search_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$")
return sorted(filter(search_re.match, os.listdir(dirname or '.')))
-def send_footer(mod_string=None):
+def send_footer(mtime=None):
if config_get('debug_cgi', False):
cgi.print_arguments()
cgi.print_form(form)
cgi.print_environ()
- link_inline("sys/footer", kvargs = { 'LAST_MODIFIED': mod_string })
+ link_inline("sys/footer", kvargs = {
+ 'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a %d %b %Y %I:%M %p'), localtime(mtime))
+ })
print("")
def _macro_ELAPSED_TIME(*args, **kvargs):
@@ -363,7 +372,7 @@ class WikiFormatter:
self.h_level = 0
self.in_pre = self.in_html = self.in_table = self.in_li = False
self.in_header = True
- self.list_indents = []
+ self.list_indents = [] # a list of pairs (indent_level, list_type) to track nested lists
self.tr_cnt = 0
self.styles = {
#wiki html enabled?
@@ -376,7 +385,6 @@ class WikiFormatter:
",,": ["sub", False],
"''": ["em", False], # LEGACY
"'''": ["b", False], # LEGACY
- "``": ["tt", False], # LEGACY
}
def _b_repl(self, word):
@@ -401,7 +409,7 @@ class WikiFormatter:
return ' '
def _rule_repl(self, word):
- return self._undent() + '\n\n' % (len(word) - 2)
+ return '\n\n' % (len(word) - 2)
def _macro_repl(self, word):
try:
@@ -414,7 +422,7 @@ class WikiFormatter:
macro = globals().get('_macro_' + args[0])
return macro(*args, **kvargs)
except Exception, e:
- msg = cgi.escape(word) + ": " + cgi.escape(e.message)
+ msg = cgi.escape(word) + ": " + cgi.escape(str(e))
if not self.in_html:
msg = '' + msg + ''
return msg
@@ -508,31 +516,26 @@ class WikiFormatter:
return ''
def _indent_level(self):
- return len(self.list_indents) and self.list_indents[-1]
+ return len(self.list_indents) and self.list_indents[-1][0]
- def _indent_to(self, new_level):
+ def _indent_to(self, new_level, list_type=''):
if self._indent_level() == new_level:
return ''
s = '
'
while self._indent_level() > new_level:
- del(self.list_indents[-1])
if self.in_li:
s += ''
self.in_li = False # FIXME
- s += '\n'
+ s += '' + self.list_indents[-1][1] + '>\n'
+ del(self.list_indents[-1])
+
+ list_type = ('ul', 'ol')[list_type == '#']
while self._indent_level() < new_level:
- self.list_indents.append(new_level)
- s += '
\n'
+ self.list_indents.append((new_level, list_type))
+ s += '<' + list_type + '>\n'
s += '
'
return s
- def _undent(self):
- res = '
'
- res += '
' * len(self.list_indents)
- res += '
'
- self.list_indents = []
- return res
-
def replace(self, match):
for rule, hit in list(match.groupdict().items()):
if hit:
@@ -545,7 +548,7 @@ class WikiFormatter:
scan_re = re.compile(r"""(?:
# Styles and formatting ("--" must cling to a word to disambiguate it from the dash)
- (?P \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' | `` )
+ (?P \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' )
| (?P \={2,6})
| (?P \\\\)
| (?P ^-{3,})
@@ -584,7 +587,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
@@ -607,18 +610,18 @@ 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('