#
# 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
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)
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
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):
else:
return link_inline(pattern, descr, kvargs)
-# Search ---------------------------------------------------
-
-def print_search_stats(hits, searched):
- print("<p>%d hits out of %d pages searched.</p>" % (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
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("<ul>")
+ out = ''
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>")
+ out += ' * [[' + page_name + ']] . . . ' + str(count) + ' ' + ['match', 'matches'][count != 1] + '\n'
- print_search_stats(len(hits), len(all_pages))
+ out += search_stats(len(hits), len(all_pages))
+ WikiFormatter(out).print_html()
def handle_titlesearch(query, form):
needle = form['q'].value
all_pages = page_list()
hits = list(filter(needle_re.search, all_pages))
- print("<ul>")
+ out = ''
for filename in hits:
- print('<li><p>' + link_tag(filename) + "</p></li>")
- print("</ul>")
+ out += ' * [[' + filename + ']]\n'
- print_search_stats(len(hits), len(all_pages))
+ out += search_stats(len(hits), len(all_pages))
+ 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()
+def handle_edit(pagename, form):
pg = Page(form['q'].value)
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:
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)
+ 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():
return __version__
class WikiFormatter:
- """Object that turns Wiki markup into HTML.
-
- All formatting commands can be parsed one line at a time, though
- some state is carried over between lines.
- """
+ """Object that turns Wiki markup into HTML."""
def __init__(self, raw, kvargs=None):
self.raw = raw
self.kvargs = kvargs or {}
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
else:
print(' | ' + link_tag(name, 'Login', cssclass='navlink', privileged=True))
- else:
- 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('<hr /></div></nav>')
-
def send_footer(self):
if config_get('debug_cgi', False):
cgi.print_arguments()
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>")
else:
send_guru("Read access denied by ACLs", "notice")
- def format(self):
+ def send(self):
#css foo.css
value = self.pragma("css", None)
if value:
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():
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()
projects / geekigeeki.git / blobdiff