X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=00d74ceddf409a7ec29a2c79e80a5f74ffdb3773;hb=397c50a4c4301742ea3fad1dd0f30d596f071bd3;hp=e7d7f7d69e63c915c3c3526b5acdcf1307f20733;hpb=ad79f3880dad5a6fcc8529d682c263f74c959847;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index e7d7f7d..00d74ce 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -25,7 +25,7 @@ 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"\.([^\./]+)$") @@ -120,21 +120,18 @@ def send_guru(msg_text, msg_type): print(cgi.escape(msg_text)) if msg_type == 'error': print '\n Guru Meditation #DEADBEEF.ABADC0DE' - print('' \ + print('' \ % relative_url('sys/GuruMeditation.js')) -def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None): +def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False, mtime=None, navbar="on"): global title_done if title_done: return - # Head + # HEAD emit_header(mtime) - print('') - print('') - + print('\n') print("
\{\{\{|\s*\}\}\}) - | (?P\{\{([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\}\}) + | (?P \{\{[^\}]+\}\}) # Tables | (?P ^\s*\|\|(=|)\s*) @@ -614,8 +604,8 @@ class WikiFormatter: print(' ') else: indent = indent_re.match(self.line) - #3.0: print(self._indent_to(len(indent.group(0))), end=' ') print(self._indent_to(len(indent.group(1)), indent.group(2))) + # Stand back! Here we apply the monster regex that does all the parsing print(re.sub(scan_re, self.replace, self.line)) if self.in_pre: print('') @@ -624,8 +614,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' @@ -668,19 +658,20 @@ class Page: out = '== ' pathname = '' for dirname in self.page_name.strip('/').split('/'): - pathname = (pathname + '/' + dirname) if pathname else dirname + 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__: @@ -723,6 +714,17 @@ class Page: def can_read(self): return self.can("read", True) + def send_footer(mtime=None, footer="sys/footer"): + if config_get('debug_cgi', False): + cgi.print_arguments() + cgi.print_form(form) + cgi.print_environ() + if footer != "off": + link_inline(footer, kvargs = { + 'LAST_MODIFIED': strftime(config_get('datetime_fmt', '%a %d %b %Y %I:%M %p'), localtime(mtime)) + }) + print("") + def send_naked(self, kvargs=None): if self.can_read(): WikiFormatter(self.get_raw_body(), kvargs).print_html() @@ -737,9 +739,10 @@ class Page: 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()) + msg_text=self.msg_text, msg_type=self.msg_type, writable=self.can_write(), mtime=self._mtime(), + navbar=self.pragma("navbar", "on")) self.send_naked() - send_footer(mtime=self._mtime()) + self.send_footer(mtime=self._mtime(), footer=self.pragma("footer", "sys/footer")) def send_editor(self, preview=None): send_title(None, 'Edit ' + self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type) @@ -759,7 +762,7 @@ 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(): @@ -836,6 +839,6 @@ except Exception: send_guru(msg_text, "error") else: send_title(None, msg_text=msg_text) - send_footer() + Page().send_footer() sys.stdout.flush()