X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=6170d7394ca6bb7b91d3fdb195d0d2ba6a5b4503;hb=cd285df131b7e5fe14ba69d7160586694c5f9d5e;hp=d208bb723fa672890c99155a6791d93d921c29da;hpb=3f737b8a960486cd16aaa4acacc83acb24c7d42f;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index d208bb7..6170d73 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -1,4 +1,4 @@ -#!/usr/bin/python3.0 +#!/usr/bin/python # -*- coding: utf-8 -*- # # Copyright 1999, 2000 Martin Pool @@ -33,7 +33,6 @@ 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 @@ -83,6 +82,27 @@ def relative_url(pathname, privileged=False): def permalink(s): return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip()) +# 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") @@ -123,7 +143,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal if name and writable and privileged_url is not None: print(' ' \ - % (privileged_path() + '?edit=' + name)) + % (privileged_path() + '?a=edit&q=' + name)) if history_url is not None: print(' ' \ @@ -133,7 +153,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal # Body if name and writable and privileged_url is not None: - print('') + print('') else: print('') @@ -157,7 +177,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal 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)) @@ -175,7 +195,7 @@ def send_httperror(status="403 Not Found", query=""): 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 elif img_re.match(text): @@ -197,13 +217,13 @@ def link_tag(params, text=None, link_class=None, privileged=False): return '%s' % (classattr, relative_url(params, privileged=privileged), text) -def link_inline(name, descr=None, args=''): +def link_inline(name, descr=None, kvargs={}): if not descr: descr = name url = relative_url(name) if video_re.match(name): return '

' % url elif img_re.match(name): - return '

' % (url, url + args, descr) + return '

' % (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: @@ -212,8 +232,12 @@ def link_inline(name, descr=None, args=''): # Search --------------------------------------------------- -def handle_fullsearch(needle): - send_title(None, 'Full text search for "%s"' % (needle)) +def print_search_stats(hits, searched): + print("

%d hits out of %d pages searched.

" % (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 = [] @@ -239,9 +263,10 @@ def handle_fullsearch(needle): print_search_stats(len(hits), len(all_pages)) -def handle_titlesearch(needle): +def handle_titlesearch(query, form): # TODO: check needle is legal -- but probably we can just accept any RE - send_title(None, "Title search for \"" + needle + '"') + needle = form['q'].value + send_title(None, 'Title search for "' + needle + '"') needle_re = re.compile(needle, re.IGNORECASE) all_pages = page_list() @@ -254,22 +279,19 @@ def handle_titlesearch(needle): print_search_stats(len(hits), len(all_pages)) -def print_search_stats(hits, searched): - print("

%d hits out of %d pages searched.

" % (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) @@ -286,6 +308,18 @@ def handle_edit(pagename): 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 = ['%s' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz'] @@ -358,48 +392,34 @@ class WikiFormatter: return self._undent() + '\n

\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 = list(map(str.strip, argv)) - - macro = globals().get('_macro_' + name) - if not macro: - try: + try: + args, kwargs = parse_args(word) + macro = globals().get('_macro_' + args[0]) + if not macro: exec(open("macros/" + name + ".py").read(), globals()) - except IOError as err: - if err.errno == errno.ENOENT: pass - macro = globals().get('_macro_' + name) - if macro: - return macro(argv) - else: - msg = '<<' + '|'.join(argv) + '>>' + macro = globals().get('_macro_' + name) + return macro(*args, **kwargs) + except Exception: + msg = cgi.escape(word) if not self.in_html: msg = '' + msg + '' 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) - + args, kvargs = parse_args(word) + name = args.pop(0) + if len(args): + descr = args.pop(0) # The "extthumb" nonsense works around a limitation of the HTML block model return '

' \ - + link_inline(name, descr, args) \ + + link_inline(name, descr, kvargs) \ + '

' + descr + '

' 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('

') else: indent = indent_re.match(self.line) - print(self._indent_to(len(indent.group(0))), end=' ') + #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('') @@ -609,7 +631,7 @@ class Page: 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() @@ -792,29 +814,16 @@ class Page: 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: 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()