X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=79960d45422760c24f867238426ee76b8a905af4;hp=0fdd421cbabcf414780353821d753b0805fef1a1;hb=HEAD;hpb=cc5df9ba5625f7e789a30aea769287c2c93bd5ea
diff --git a/geekigeeki.py b/geekigeeki.py
index 0fdd421..79960d4 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -3,7 +3,7 @@
#
# Copyright (C) 1999, 2000 Martin Pool %d hits out of %d pages searched. ' + link_tag(page_name))
- print(' . . . . ' + `count`)
- print(['match', 'matches'][count != 1])
- print(' ' + link_tag(filename) + " \n' % self.h_level
+ result = '¶ \n' % (link, self.h_level)
self.h_level = 0
else:
self.h_level = len(word) - 1
- link = permalink(self.line)
- result = '\n")
+ out = ''
for (count, page_name) in hits:
- print('
")
+ 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
@@ -216,36 +220,31 @@ def handle_titlesearch(query, form):
all_pages = page_list()
hits = list(filter(needle_re.search, all_pages))
- print("")
+ out = ''
for filename in hits:
- print('
")
+ 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()
- pg = Page(form['q'].value)
+def handle_edit(pagename, form):
+ pg = Page(pagename)
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:
@@ -253,16 +252,13 @@ def handle_edit(pagename, 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():
@@ -282,11 +278,7 @@ def _macro_VERSION(*args, **kvargs):
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 {}
@@ -317,13 +309,13 @@ class WikiFormatter:
return '—'
def _tit_repl(self, word):
+ link = permalink(self.line)
if self.h_level:
- result = '
\s*\}\}\}) @@ -540,11 +535,18 @@ class WikiFormatter: print(self._indent_to(0)) print('') +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 @@ -569,14 +571,12 @@ class Page: return True return False - def get_raw_body(self, default=None): + def get_raw_body(self): try: return open(self._filename(), 'rb').read() except IOError, err: if err.errno == errno.ENOENT: - if default is None: - default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name) - return default + return '' if err.errno == errno.EISDIR: return self.format_dir() raise err @@ -589,9 +589,9 @@ class Page: out += '[[' + pathname + '|' + dirname + ']]/' out += ' ==\n' images_out = '\n' - + for filename in page_list(self._filename(), file_re): - if image_re.match(filename): + if image_re.match(filename) or video_re.match(filename): maxwidth = config_get('image_maxwidth', '400') if maxwidth: maxwidth = ' | maxwidth=' + str(maxwidth) @@ -646,10 +646,11 @@ class Page: if title_done: return # HEAD - emit_header(self._mtime()) + emit_header(name and self._mtime()) print('\n') print("%s: %s " % (config_get('site_name', "Unconfigured Wiki"), text)) - print(' ') + print(' ') + print(' ') if not name: print(' ') @@ -663,18 +664,17 @@ class Page: editable = name and self.can_write() and is_privileged() if editable: print(' ' \ - % relative_url('?a=edit&q=' + name, privileged=True)) + % relative_url(name + '?a=edit', privileged=True)) - history = config_get('history_url') - if history is not None: - print(' ' \ - % relative_url(history + '?a=rss')) + if name: + print(' ' \ + % relative_url(name + '?a=atom')) print('') # BODY if editable: - print('') + print('') else: print('') @@ -692,6 +692,7 @@ class Page: else: print(' ' + text + ' ') print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink')) + history = config_get('history_url') if history: print(' | Recent Changes') if name: @@ -701,20 +702,16 @@ class Page: print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink')) if config_get('privileged_url') is not None: if self.can_write(): - print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True)) + print(' | ' + link_tag(name + '?a=edit', 'Edit', cssclass='navlink', privileged=True)) else: - print(' | ' + link_tag(name, 'Login', cssclass='navlink', privileged=True)) - - else: - print(' | Immutable Page') + print(' | ' + link_tag(name, 'Login', cssclass='login', privileged=True)) user = remote_user() if user != 'AnonymousCoward': - print(' | ' + link_tag('User/' + user, user) + '') + print(' | ' + link_tag('user/' + user, user, cssclass='login')) print('
') - def send_footer(self): if config_get('debug_cgi', False): cgi.print_arguments() @@ -723,17 +720,20 @@ class Page: 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("") + print('') def send_naked(self, kvargs=None): if self.can_read(): - WikiFormatter(self.get_raw_body(), kvargs).print_html() + body = self.get_raw_body() + if not body: + body = "//[[%s?a=edit|Describe %s]]//" % (self.page_name, self.page_name) + WikiFormatter(body, kvargs).print_html() else: - send_guru("Read access denied by ACLs", "notice") + send_guru('Read access denied by ACLs', 'notice') - def format(self): + def send(self): #css foo.css value = self.pragma("css", None) if value: @@ -744,6 +744,18 @@ class Page: 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(): @@ -751,7 +763,7 @@ class Page: return if preview is None: - preview = self.get_raw_body(default='') + preview = self.get_raw_body() link_inline("sys/EditPage", kvargs = { 'EDIT_BODY': cgi.escape(preview), @@ -773,7 +785,8 @@ class Page: if 'maxwidth' in args: import subprocess sys.stdout.flush() - subprocess.check_call(['gm', 'convert', self._filename(), + subprocess.check_call(['convert', self._filename(), + '-auto-orient', '-orient', 'TopLeft', '-scale', args['maxwidth'].value + ' >', '-']) else: body = self.get_raw_body() @@ -832,14 +845,9 @@ try: 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()