X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=e45a3ba3fef75914c3872cd03ef059aecd383a6f;hb=29de4990aca1e209eb20de44bbde709db7de70be;hp=317e9ca64a78e50649a3a2549b64a9ba201bc07c;hpb=8e6f34588270b805d4151da2a66abf3f2f35c891;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index 317e9ca..e45a3ba 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -25,11 +25,10 @@ video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|a 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_\.\-/]*)$") +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 --------------------------------------------------------- def config_get(key, default=None): return globals().get(key, default) @@ -106,11 +105,12 @@ def url_args(kvargs): 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 @@ -123,80 +123,11 @@ def send_guru(msg_text, msg_type): print('' \ % relative_url('sys/GuruMeditation.js')) -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(mtime) - print('\n') - print("
%d hits out of %d pages searched.
" % (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 - send_title(None, 'Full text search for "' + needle + '"') + Page().send_title(text='Full text search for "' + needle + '"') needle_re = re.compile(needle, re.IGNORECASE) hits = [] @@ -262,35 +191,31 @@ def handle_fullsearch(query, form): 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("' + link_tag(page_name)) - print(' . . . . ' + `count`) - print(['match', 'matches'][count != 1]) - print('
' + link_tag(filename) + "
\{\{\{|\s*\}\}\}) - | (?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\}) + | (?P \{\{[^\}]+\}\}) # Tables | (?P ^\s*\|\|(=|)\s*) @@ -620,8 +531,8 @@ class WikiFormatter: print('') class Page: - def __init__(self, page_name): - self.page_name = page_name + def __init__(self, page_name="Limbo"): + self.page_name = page_name.rstrip('/'); self.msg_text = '' self.msg_type = 'error' @@ -667,16 +578,17 @@ class Page: pathname = (pathname and pathname + '/' ) + dirname out += '[[' + pathname + '|' + dirname + ']]/' out += ' ==\n' + images_out = '\n' for filename in page_list(self._filename(), file_re): if image_re.match(filename): maxwidth = config_get('image_maxwidth', '400') if maxwidth: maxwidth = ' | maxwidth=' + str(maxwidth) - out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n' + images_out += '{{' + self.page_name + '/' + filename + ' | ' + humanlink(filename) + maxwidth + ' | class=thumbleft}}\n' else: out += ' * [[' + self.page_name + '/' + filename + ']]\n' - return out + return out + images_out def pragmas(self): if not '_pragmas' in self.__dict__: @@ -719,6 +631,88 @@ class Page: def can_read(self): return self.can("read", True) + def send_title(self, name=None, text="Limbo", msg_text=None, msg_type='error'): + global title_done + if title_done: return + + # HEAD + emit_header(self._mtime()) + print('\n') + print(" %s: %s " % (config_get('site_name', "Unconfigured Wiki"), text)) + print(' ') + if not name: + print(' ') + + for http_equiv, content in config_get('meta_urls', {}): + print(' ' % (http_equiv, relative_url(content))) + + for link in config_get('link_urls', {}): + rel, href = link + print(' ' % (rel, relative_url(href))) + + editable = name and self.can_write() and is_privileged() + if editable: + print(' ' \ + % relative_url('?a=edit&q=' + name, privileged=True)) + + history = config_get('history_url') + if history is not None: + print(' ' \ + % relative_url(history + '?a=rss')) + + print('') + + # BODY + if editable: + print('') + else: + print('') + + title_done = True + send_guru(msg_text, msg_type) + + if self.pragma("navbar", "on") != "on": + return + + # NAVBAR + print('') + + def send_footer(self): + if config_get('debug_cgi', False): + cgi.print_arguments() + cgi.print_form(form) + cgi.print_environ() + 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())) + }) + print("") + def send_naked(self, kvargs=None): if self.can_read(): WikiFormatter(self.get_raw_body(), kvargs).print_html() @@ -732,13 +726,12 @@ class Page: global link_urls link_urls += [ [ "stylesheet", value ] ] - send_title(self.page_name, self.split_title(), - msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write(), mtime=self._mtime()) + self.send_title(name=self.page_name, text=self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) self.send_naked() - send_footer(mtime=self._mtime()) + self.send_footer() def send_editor(self, preview=None): - send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) + self.send_title(text='Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) if not self.can_write(): send_guru("Write access denied by ACLs", "error") return @@ -755,11 +748,11 @@ class Page: print("") WikiFormatter(preview).print_html() print("") - send_footer() + self.send_footer() def send_raw(self, mimetype='text/plain', args=[]): if not self.can_read(): - send_title(None, msg_text='Read access denied by ACLs', msg_type='notice', mtime=self._mtime()) + self.send_title(msg_text='Read access denied by ACLs', msg_type='notice') return emit_header(self._mtime(), mimetype) @@ -828,10 +821,11 @@ try: except Exception: import traceback msg_text = traceback.format_exc() + page = Page() if title_done: send_guru(msg_text, "error") else: - send_title(None, msg_text=msg_text) - send_footer() + page.send_title(msg_text=msg_text) + page.send_footer() sys.stdout.flush()