%s: %s

X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=54802f40e31930c1840b48461f297835b95d9053;hb=6ae7c474be7cd0e1a92a0c2caa3be79167e7a8f6;hp=b6e802c8277f9e67be9e118c0a3eaef9cdc25fc7;hpb=62337efb7bd140125c890b843c428a9f13c4aaf7;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index b6e802c..54802f4 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -22,11 +22,11 @@ import cgi, sys, os, re, errno, stat, glob image_ext = 'png|gif|jpg|jpeg|bmp|ico' video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt -image_re = re.compile(r".*\.(" + image_ext + "|" + video_ext + ")", re.IGNORECASE) -video_re = re.compile(r".*\.(" + video_ext + ")", re.IGNORECASE) +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_\.\-/]*)") -url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S") +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 --------------------------------------------------------- @@ -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): global title_done if title_done: return - # Head + # HEAD emit_header(mtime) - print('') - print('') - + print('\n') print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text)) - print(' ') + print(' ') if not name: print(' ') @@ -157,7 +154,7 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal print('') - # Body + # BODY if editable: print('') else: @@ -166,8 +163,8 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal title_done = True send_guru(msg_text, msg_type) - # Navbar - print('

') + # NAVBAR + print('

') def send_httperror(status="403 Not Found", query=""): print("Status: %s" % status) @@ -205,7 +202,7 @@ def link_tag(dest, text=None, privileged=False, **kvargs): if text is None: text = humanlink(dest) elif image_re.match(text): - text = ' ' + text + '

' + text = ' ' + text + '

' link_class = kvargs.get('class', kvargs.get('cssclass', None)) if not link_class: @@ -388,7 +385,6 @@ class WikiFormatter: ",,": ["sub", False], "''": ["em", False], # LEGACY "'''": ["b", False], # LEGACY - "``": ["tt", False], # LEGACY } def _b_repl(self, word): @@ -552,7 +548,7 @@ class WikiFormatter: scan_re = re.compile(r"""(?: # Styles and formatting ("--" must cling to a word to disambiguate it from the dash) - (?P \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' | `` ) + (?P \*\* | // | \#\# | __ | --\b | \b-- | \^\^ | ,, | ''' | '' ) | (?P \={2,6}) | (?P
\\\\) | (?P ^-{3,}) @@ -614,8 +610,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('') @@ -625,7 +621,7 @@ class WikiFormatter: class Page: def __init__(self, page_name): - self.page_name = page_name + self.page_name = page_name.rstrip('/'); self.msg_text = '' self.msg_type = 'error' @@ -668,7 +664,7 @@ 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'