from time import clock
start_time = clock()
+title_done = False
import cgi, sys, os, re, errno, stat
-# Regular expression defining a WikiWord
-# (but this definition is also assumed in other places)
-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|bmp|ico|ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)$", re.IGNORECASE)
video_re = re.compile(r"^.*\.(ogm|ogg|mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt)$", re.IGNORECASE)
url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$")
-link_re = re.compile(r"(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})")
ext_re = re.compile(r"\.([^\./]+)$")
-title_done = False
-
# CGI stuff ---------------------------------------------------------
def script_name():
return os.environ.get('SCRIPT_NAME', '')
def permalink(s):
return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip())
+def humanlink(s):
+ return re.search('([^:/\.]+)(?:\.[^/:]+|)$', s).group(1).replace('_', ' ')
+
+# Split arg lists like "blah| blah blah| width=100 | align = center",
+# return a list containing anonymous arguments and a map containing the named arguments
+def parse_args(s):
+ args = []
+ kwargs = {}
+ for arg in s.strip('<[{}]>').split('|'):
+ try:
+ key, val = arg.split('=', 1)
+ kwargs[key.strip()] = val.strip()
+ except ValueError:
+ args.append(arg.strip())
+ return (args, kwargs)
+
+def url_args(kvargs):
+ argv = []
+ for k, v in kvargs.items():
+ argv.append(k + '=' + v)
+ if argv:
+ return '?' + '&'.join(argv)
+ return ''
+
# Formatting stuff --------------------------------------------------
def emit_header(mime_type="text/html"):
- print "Content-type: " + mime_type + "; charset=utf-8\n"
+ print("Content-type: " + mime_type + "; charset=utf-8\n")
def send_guru(msg_text, msg_type):
if not msg_text: return
- print '<pre id="guru" onclick="this.style.display = \'none\'" class="' + msg_type + '">'
+ print('<pre id="guru" onclick="this.style.display = \'none\'" class="' + msg_type + '">')
if msg_type == 'error':
- print ' Software Failure. Press left mouse button to continue.\n'
- print msg_text
+ print(' Software Failure. Press left mouse button to continue.\n')
+ print(msg_text)
if msg_type == 'error':
print '\n Guru Meditation #DEADBEEF.ABADC0DE'
- print '</pre>'
- print '<script language="JavaScript" type="text/javascript" src="%s" defer="defer"></script>' \
- % relative_url('sys/GuruMeditation.js')
+ print('</pre><script language="JavaScript" type="text/javascript" src="%s" defer="defer"></script>' \
+ % relative_url('sys/GuruMeditation.js'))
def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False):
global title_done
# Head
emit_header()
- print '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"'
- print ' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'
- print '<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">'
+ print('<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"')
+ print(' "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">')
+ print('<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">')
- print "<head><title>%s: %s</title>" % (site_name, text)
- print ' <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />'
+ print("<head><title>%s: %s</title>" % (site_name, text))
+ print(' <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=utf-8" />')
if not name:
- print ' <meta name="robots" content="noindex,nofollow" />'
+ print(' <meta name="robots" content="noindex,nofollow" />')
for meta in meta_urls:
http_equiv, content = meta
- print ' <meta http-equiv="%s" content="%s" />' % (http_equiv, relative_url(content))
+ print(' <meta http-equiv="%s" content="%s" />' % (http_equiv, relative_url(content)))
for link in link_urls:
rel, href = link
- print ' <link rel="%s" href="%s" />' % (rel, relative_url(href))
+ print(' <link rel="%s" href="%s" />' % (rel, relative_url(href)))
if name and writable and privileged_url is not None:
- print ' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
- % (privileged_path() + '?edit=' + name)
+ print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
+ % (privileged_path() + '?a=edit&q=' + name))
if history_url is not None:
- print ' <link rel="alternate" type="application/rss+xml" title="RSS" href="%s" />' \
- % relative_url(history_url + '?a=rss')
+ print(' <link rel="alternate" type="application/rss+xml" title="RSS" href="%s" />' \
+ % relative_url(history_url + '?a=rss'))
- print '</head>'
+ print('</head>')
# Body
if name and writable and privileged_url is not None:
- print '<body ondblclick="location.href=\'' + privileged_path() + '?edit=' + name + '\'">'
+ print('<body ondblclick="location.href=\'' + privileged_path() + '?a=edit&q=' + name + '\'">')
else:
- print '<body>'
+ print('<body>')
title_done = True
send_guru(msg_text, msg_type)
# Navbar
- print '<div class="nav">'
+ print('<div class="nav">')
print link_tag('FrontPage', site_icon or 'Home', 'navlink')
if name:
- print ' <b>' + link_tag('?fullsearch=' + name, text, 'navlink') + '</b> '
+ print(' <b>' + link_tag('?fullsearch=' + name, text, 'navlink') + '</b> ')
else:
- print ' <b>' + text + '</b> '
- print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
+ print(' <b>' + text + '</b> ')
+ print(' | ' + link_tag('FindPage', 'Find Page', 'navlink'))
if 'history_url' in globals():
- print ' | <a href="' + relative_url(history_url) + '" class="navlink">Recent Changes</a>'
+ print(' | <a href="' + relative_url(history_url) + '" class="navlink">Recent Changes</a>')
if name:
- print ' | <a href="' + relative_url(history_url + '?a=history;f=' + name) + '" class="navlink">Page History</a>'
+ print(' | <a href="' + relative_url(history_url + '?a=history;f=' + name) + '" class="navlink">Page History</a>')
if name:
- print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')
+ print(' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink'))
if privileged_url is not None:
if writable:
- print ' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True)
+ print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', 'navlink', privileged=True))
else:
- print ' | ' + link_tag(name, 'Login', 'navlink', privileged=True)
+ print(' | ' + link_tag(name, 'Login', 'navlink', privileged=True))
else:
- print ' | <i>Immutable Page</i>'
+ print(' | <i>Immutable Page</i>')
user = remote_user()
if user != 'AnonymousCoward':
- print ' | <span class="login"><i><b>' + link_tag('User/' + user, user) + '</b></i></span>'
+ print(' | <span class="login"><i><b>' + link_tag('User/' + user, user) + '</b></i></span>')
- print '<hr /></div>'
+ print('<hr /></div>')
def send_httperror(status="403 Not Found", query=""):
- print "Status: %s" % status
+ print("Status: %s" % status)
send_title(None, msg_text=("%s: on query '%s'" % (status, query)))
send_footer()
-def link_tag(params, text=None, link_class=None, privileged=False):
+def link_tag(params, text=None, link_class=None, privileged=False, **kvargs):
if text is None:
- text = params # default
+ text = humanlink(params)
elif img_re.match(text):
text = '<img border="0" src="' + relative_url(text) + '" alt="' + text + '" />'
return '<a %shref="%s">%s</a>' % (classattr, relative_url(params, privileged=privileged), text)
-def link_inline(name, descr=None, args=''):
- if not descr: descr = name
+def link_inline(name, descr=None, kvargs={}):
+ if not descr: descr = humanlink(name)
url = relative_url(name)
if video_re.match(name):
- return '<video src="%s">Your browser does not support the HTML5 video tag</video>' % url
+ return '<video controls="1" src="%s">Your browser does not support the HTML5 video tag</video>' % url
elif img_re.match(name):
- return '<a href="%s"><img border="0" src="%s" alt="%s" /></a>' % (url, url + args, descr)
+ return '<a href="%s"><img border="0" src="%s" alt="%s" /></a>' % (url, url + url_args(kvargs), descr)
elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page
return Page(name).send_naked()
else:
# Search ---------------------------------------------------
-def handle_fullsearch(needle):
- send_title(None, 'Full text search for "%s"' % (needle))
+def print_search_stats(hits, searched):
+ print("<p>%d hits out of %d pages searched.</p>" % (hits, searched))
+
+def handle_fullsearch(query, form):
+ needle = form['q'].value
+ send_title(None, 'Full text search for "' + needle + '"')
needle_re = re.compile(needle, re.IGNORECASE)
hits = []
hits.sort()
hits.reverse()
- print "<ul>"
+ print("<ul>")
for (count, page_name) in hits:
- print '<li><p>' + link_tag(page_name)
- print ' . . . . ' + `count`
- print ['match', 'matches'][count != 1]
- print '</p></li>'
- print "</ul>"
+ print('<li><p>' + link_tag(page_name))
+ print(' . . . . ' + `count`)
+ print(['match', 'matches'][count != 1])
+ print('</p></li>')
+ print("</ul>")
print_search_stats(len(hits), len(all_pages))
-def handle_titlesearch(needle):
- # TODO: check needle is legal -- but probably we can just accept any RE
- send_title(None, "Title search for \"" + needle + '"')
+def handle_titlesearch(query, form):
+ needle = form['q'].value
+ send_title(None, 'Title search for "' + needle + '"')
needle_re = re.compile(needle, re.IGNORECASE)
all_pages = page_list()
- hits = filter(needle_re.search, all_pages)
+ hits = list(filter(needle_re.search, all_pages))
- print "<ul>"
+ print("<ul>")
for filename in hits:
- print '<li><p>' + link_tag(filename) + "</p></li>"
- print "</ul>"
+ print('<li><p>' + link_tag(filename) + "</p></li>")
+ print("</ul>")
print_search_stats(len(hits), len(all_pages))
-def print_search_stats(hits, searched):
- print "<p>%d hits out of %d pages searched.</p>" % (hits, searched)
-
-def handle_raw(pagename):
+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):
+def handle_edit(pagename, form):
if not file_re.match(pagename):
send_httperror("403 Forbidden", pagename)
return
- pg = Page(pagename)
+ pg = Page(form['q'].value)
if 'save' in form:
if form['file'].value:
pg.save(form['file'].file.read(), form['changelog'].value)
text = form['savetext'].value
pg.send_editor(text)
+def handle_get(pagename, form):
+ if file_re.match(pagename):
+ # FIMXE: this is all bullshit, MimeTypes bases its guess on the extension!
+ from mimetypes import MimeTypes
+ mimetype, encoding = MimeTypes().guess_type(pagename)
+ if mimetype:
+ Page(pagename).send_raw(mimetype=mimetype, args=form)
+ else:
+ Page(pagename).format()
+ else:
+ send_httperror("403 Forbidden", pagename)
+
# Used by macros/WordIndex and macros/TitleIndex
def make_index_key():
- links = map(lambda ch: '<a href="#%s">%s</a>' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
- return '<p style="text-align: center">'+ ' | '.join(links) + '</p>'
+ links = ['<a href="#%s">%s</a>' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz']
+ return '<p style="text-align: center">' + ' | '.join(links) + '</p>'
-def page_list(dirname = None, re = word_re):
+def page_list(dirname = None, re = None):
+ if re is None:
+ # FIXME: WikiWord is too restrictive now!
+ re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$")
return sorted(filter(re.match, os.listdir(dirname or data_dir)))
def send_footer(mod_string=None):
cgi.print_arguments()
cgi.print_form(form)
cgi.print_environ()
- print '''
+ print('''
<div id="footer"><hr />
<p class="copyright">
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/"><img class="license" alt="Creative Commons License" src="%s" /></a>
<span class="benchmark">generated in %0.3fs</span> by <a href="http://www.codewiz.org/wiki/GeekiGeeki">GeekiGeeki</a> version %s
</p>
-''' % (relative_url('cc-by-sa.png'), clock() - start_time, __version__)
+''' % (relative_url('cc-by-sa.png'), clock() - start_time, __version__))
if mod_string:
- print '<p class="modified">last modified %s</p>' % mod_string
- print '</div></body></html>'
+ print('<p class="modified">last modified %s</p>' % mod_string)
+ print('</div></body></html>')
class WikiFormatter:
"""Object that turns Wiki markup into HTML.
return self._undent() + '\n<hr size="%d" noshade="noshade" />\n' % (len(word) - 2)
def _macro_repl(self, word):
- m = re.compile("\<\<([^\s\|\>]+)(?:\s*\|\s*([^\>]+)|)\>\>").match(word)
- name = m.group(1)
- 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:
- try:
- execfile("macros/" + name + ".py", globals())
- except IOError, err:
- if err.errno == errno.ENOENT: pass
- macro = globals().get('_macro_' + name)
- if macro:
- return macro(argv)
- else:
- msg = '<<' + '|'.join(argv) + '>>'
+ try:
+ args, kwargs = parse_args(word)
+ macro = globals().get('_macro_' + args[0])
+ if not macro:
+ exec(open("macros/" + name + ".py").read(), globals())
+ macro = globals().get('_macro_' + name)
+ return macro(*args, **kwargs)
+ except Exception:
+ msg = cgi.escape(word)
if not self.in_html:
msg = '<strong class="error">' + msg + '</strong>'
return msg
def _hurl_repl(self, word):
- m = link_re.match(word)
- return link_tag(m.group(1), m.group(2))
+ args, kvargs = parse_args(word)
+ return link_tag(*args, **kvargs)
def _inl_repl(self, word):
- (name, descr) = link_re.match(word).groups()
-
- if descr:
- argv = descr.split('|')
- descr = argv.pop(0)
- args = ''
- if argv:
- args = '?' + '&'.join(argv)
-
- # The "extthumb" nonsense works around a limitation of the HTML block model
- return '<div class="extthumb"><div class="thumb">' \
- + link_inline(name, descr, args) \
+ args, kvargs = parse_args(word)
+ name = args.pop(0)
+ if len(args):
+ descr = args.pop(0)
+ # This double div nonsense works around a limitation of the HTML block model
+ return '<div class="' + kvargs.get('class', 'thumb') + '">' \
+ + '<div class="innerthumb">' \
+ + link_inline(name, descr, kvargs) \
+ '<div class="caption">' + descr + '</div></div></div>'
else:
- return link_inline(name, name)
+ return link_inline(name, None, kvargs)
def _html_repl(self, word):
if not self.in_html and word.startswith('<div'): word = '</p>' + word
return res
def replace(self, match):
- for rule, hit in match.groupdict().items():
+ for rule, hit in list(match.groupdict().items()):
if hit:
return getattr(self, '_' + rule + '_repl')(hit)
else:
raise "Can't handle match " + repr(match)
def print_html(self):
- print '<div class="wiki"><p>'
+ print('<div class="wiki"><p>')
scan_re = re.compile(r"""(?:
# Styles and formatting
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
- for self.line in eol_re.split(self.raw.expandtabs()):
+ #3.0: for self.line in eol_re.split(str(self.raw.expandtabs(), 'utf-8')):
+ for self.line in eol_re.split(str(self.raw.expandtabs())):
# Skip pragmas
if self.in_header:
if self.line.startswith('#'):
self.in_header = False
if self.in_pre:
- print re.sub(pre_re, self.replace, self.line)
+ print(re.sub(pre_re, self.replace, self.line))
else:
if self.in_table and not tr_re.match(self.line):
self.in_table = False
- print '</tbody></table><p>'
+ print('</tbody></table><p>')
if blank_re.match(self.line):
- print '</p><p>'
+ print('</p><p>')
else:
indent = indent_re.match(self.line)
- print self._indent_to(len(indent.group(0))) ,
- print re.sub(scan_re, self.replace, self.line)
+ #3.0: print(self._indent_to(len(indent.group(0))), end=' ')
+ print(self._indent_to(len(indent.group(0))))
+ print(re.sub(scan_re, self.replace, self.line))
- if self.in_pre: print '</pre>'
- if self.in_table: print '</tbody></table><p>'
- print self._undent()
- print '</p></div>'
+ if self.in_pre: print('</pre>')
+ if self.in_table: print('</tbody></table><p>')
+ print(self._undent())
+ print('</p></div>')
class Page:
def __init__(self, page_name):
return os.path.join(data_dir, self.page_name)
def _tmp_filename(self):
- return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#'))
+ return os.path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + str(os.getpid()) + '#'))
def exists(self):
try:
os.stat(self._filename())
return True
- except OSError, err:
+ except OSError as err:
if err.errno == errno.ENOENT:
return False
raise err
def get_raw_body(self, default=None):
try:
return open(self._filename(), 'rb').read()
- except IOError, err:
+ except IOError as err:
if err.errno == errno.ENOENT:
if default is None:
- default = '//[[?edit=%s|Describe %s]]//' % (self.page_name, self.page_name)
+ default = '//[[%s|Describe %s|action=edit]]//' % (self.page_name, self.page_name)
return default
if err.errno == errno.EISDIR:
return self.format_dir()
for filename in page_list(self._filename(), file_re):
if img_re.match(filename):
if image_maxwidth:
- maxwidth_arg = '|maxwidth=' + str(image_maxwidth)
- out += '{{' + self.page_name + '/' + filename + '|' + filename + maxwidth_arg + '}}\n'
+ maxwidth_arg = ' | maxwidth=' + str(image_maxwidth)
+ out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth_arg + ' | class=thumbleft}}\n'
else:
out += ' * [[' + self.page_name + '/' + filename + ']]\n'
return out
if not '_pragmas' in self.__dict__:
self._pragmas = {}
try:
- f = open(self._filename(), 'rt')
+ file = open(self._filename(), 'rt')
attr_re = re.compile(r"^#(\S*)(.*)$")
- for line in f:
+ for line in file:
m = attr_re.match(line)
if not m:
break
self._pragmas[m.group(1)] = m.group(2).strip()
- #print "bernie: _pragmas[" + m.group(1) + "] = " + m.group(2) + "<br>\n"
- except IOError, err:
+ #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "<br>\n"
+ except IOError as err:
if err.errno != errno.ENOENT and err.errno != errno.EISDIR:
- raise err
+ raise er
return self._pragmas
def pragma(self, name, default):
try:
from time import localtime, strftime
modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
- except OSError, err:
+ except OSError as err:
if err.errno != errno.ENOENT:
raise err
return None
if 'file' in form:
filename = form['file'].value
- print
('<p><b>Editing ' + self.page_name
+ print
(('<p><b>Editing ' + self.page_name
+ ' for ' + cgi.escape(remote_user())
+ ' from ' + cgi.escape(get_hostname(remote_host()))
- + '</b></p>')
- print '<div class="editor"><form name="editform" method="post" enctype="multipart/form-data" action="%s">' % relative_url(self.page_name)
- print '<input type="hidden" name="edit" value="%s">' % (self.page_name)
- print '<input type="input" id="editor" name="changelog" value="Edit page %s" accesskey="c" /><br />' % (self.page_name)
- print '<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100" accesskey="e">%s</textarea>' \
- % cgi.escape(preview or self.get_raw_body(default=''))
- print '<label for="file" accesskey="u">Or Upload a file:</label> <input type="file" name="file" value="%s" />' % filename
- print """
+ + '</b></p>'))
+ print('<div class="editor"><form name="editform" method="post" enctype="multipart/form-data" action="%s">' % relative_url(self.page_name))
+ print('<input type="hidden" name="edit" value="%s">' % (self.page_name))
+ print('<input type="input" id="editor" name="changelog" value="Edit page %s" accesskey="c" /><br />' % (self.page_name))
+ print('<textarea wrap="off" spellcheck="true" id="editor" name="savetext" rows="17" cols="100" accesskey="e">%s</textarea>' \
+ % cgi.escape(preview or self.get_raw_body(default='')))
+ print('<label for="file" accesskey="u">Or Upload a file:</label> <input type="file" name="file" value="%s" />' % filename)
+ print("""
<br />
<input type="submit" name="save" value="Save" accesskey="s">
<input type="submit" name="preview" value="Preview" accesskey="p" />
document.editform.savetext.focus()
//-->
</script>
- """
- print "<p>" + link_tag('EditingTips') + "</p>"
+ """)
+ print("<p>" + link_tag('EditingTips') + "</p>")
if preview:
- print "<div class='preview'>"
+ print("<div class='preview'>")
WikiFormatter(preview).print_html()
- print "</div>"
+ print("</div>")
send_footer()
def send_raw(self, mimetype='text/plain', args=[]):
else:
body = self.get_raw_body()
emit_header(mimetype)
- print body
+ print(body)
def _write_file(self, data):
tmp_filename = self._tmp_filename()
# Bad Bill! POSIX rename ought to replace. :-(
try:
os.remove(name)
- except OSError, err:
+ except OSError as err:
if err.errno != errno.ENOENT: raise err
os.rename(tmp_filename, name)
self.msg_text = 'Thank you for your contribution. Your attention to detail is appreciated.'
self.msg_type = 'success'
-def main():
- for cmd in form:
- handler = globals().get('handle_' + cmd)
- if handler:
- handler(form[cmd].value)
- break
- else:
- query = query_string()
- if file_re.match(query):
- # FIMXE: this is all bullshit, MimeTypes bases its guess on the extension!
- from mimetypes import MimeTypes
- mimetype, encoding = MimeTypes().guess_type(query)
- if mimetype:
- Page(query).send_raw(mimetype=mimetype, args=form)
- else:
- Page(query).format()
- else:
- send_httperror("403 Forbidden", query)
-
try:
- execfile("geekigeeki.conf.py")
+ exec(open("geekigeeki.conf.py").read())
form = cgi.FieldStorage()
- main()
+ action = form.getvalue('a', 'get')
+ handler = globals().get('handle_' + action)
+ if handler:
+ handler(query_string(), form)
+ else:
+ send_httperror("403 Forbidden", query_string())
+
except Exception:
import traceback
msg_text = traceback.format_exc()
projects / geekigeeki.git / commitdiff