X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=0b8e422c199a3cd4230e42859e0ed981e3776df9;hp=b8aeee89402cddc8bfe65b947e63c12d550cad27;hb=692a3638ba5d82ad1e13ae1d9b703bfbcfa834d1;hpb=3089b2bdb284cce0870999cfa21c060759b94ae4 diff --git a/geekigeeki.py b/geekigeeki.py index b8aeee8..0b8e422 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -27,10 +27,11 @@ title_done = False import cgi, sys, os, re, errno, stat # FIXME: we accept stuff like foo/../bar and we shouldn't -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$") +file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/]*)") +video_ext = "ogg|ogv|oga" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt +img_re = re.compile(r".*\.(png|gif|jpg|jpeg|bmp|ico|" + video_ext + ")", re.IGNORECASE) +video_re = re.compile(r".*\.(" + video_ext + ")", re.IGNORECASE) +url_re = re.compile(r"[a-z]{3,8}://[^\s'\"]+\S") ext_re = re.compile(r"\.([^\./]+)$") # CGI stuff --------------------------------------------------------- @@ -79,7 +80,7 @@ def permalink(s): return re.sub(' ', '-', re.sub('[^a-z0-9_ ]', '', s.lower()).strip()) def humanlink(s): - return re.search('([^:/\.]+)(?:\.[^/:]+|)$', s).group(1).replace('_', ' ') + return re.sub(r'(?:.*[/:]|)([^:/\.]+)(?:\.[^/:]+|)$', r'\1', s.replace('_', ' ')) # Split arg lists like "blah| blah blah| width=100 | align = center", # return a list containing anonymous arguments and a map containing the named arguments @@ -87,10 +88,10 @@ 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: + m = re.match('\s*(\w+)\s*=\s*(.+)\s*', arg) + if m is not None: + kwargs[m.group(1)] = m.group(2) + else: args.append(arg.strip()) return (args, kwargs) @@ -161,24 +162,24 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=Fal # Navbar print('
') - print link_tag('FrontPage', site_icon or 'Home', 'navlink') + print link_tag('FrontPage', site_icon or 'Home', cssclass='navlink') if name: - print(' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' ') + print(' ' + link_tag('?fullsearch=' + name, text, cssclass='navlink') + ' ') else: print(' ' + text + ' ') - print(' | ' + link_tag('FindPage', 'Find Page', 'navlink')) + print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink')) if 'history_url' in globals(): print(' | Recent Changes') if name: print(' | Page History') if name: - print(' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')) + print(' | ' + link_tag(name + '?a=raw', 'Raw Text', cssclass='navlink')) if privileged_url is not None: if writable: - print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', 'navlink', privileged=True)) + print(' | ' + link_tag('?a=edit&q=' + name, 'Edit', cssclass='navlink', privileged=True)) else: - print(' | ' + link_tag(name, 'Login', 'navlink', privileged=True)) + print(' | ' + link_tag(name, 'Login', cssclass='navlink', privileged=True)) else: print(' | Immutable Page') @@ -194,33 +195,34 @@ 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, **kvargs): +def link_tag(dest, text=None, privileged=False, **kvargs): if text is None: - text = humanlink(params) + text = humanlink(dest) elif img_re.match(text): text = '' + text + '' + link_class = kvargs.get('class', kvargs.get('cssclass', None)) if not link_class: - if is_external_url(params): + if is_external_url(dest): link_class = 'external' - elif file_re.match(params) and Page(params).exists(): + elif file_re.match(dest) and Page(dest).exists(): link_class = 'wikilink' else: - params = nonexist_pfx + params + text = nonexist_pfx + text link_class = 'nonexistent' - classattr = 'class="%s" ' % link_class # Prevent crawlers from following links potentially added by spammers or to generated pages + nofollow = '' if link_class == 'external' or link_class == 'navlink': - classattr += 'rel="nofollow"' + nofollow = 'rel="nofollow" ' - return '%s' % (classattr, relative_url(params, privileged=privileged), text) + return '%s' % (link_class, nofollow, relative_url(dest, privileged=privileged), text) def link_inline(name, descr=None, kvargs={}): if not descr: descr = humanlink(name) url = relative_url(name) if video_re.match(name): - return '' % url + return '' % url elif img_re.match(name): return '%s' % (url, url + url_args(kvargs), descr) elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page @@ -323,7 +325,7 @@ def make_index_key(): links = ['%s' % (ch, ch) for ch in 'abcdefghijklmnopqrstuvwxyz'] return '

' + ' | '.join(links) + '

' -def page_list(dirname = None, re = None): +def page_list(dirname=None, re=None): if re is None: # FIXME: WikiWord is too restrictive now! re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$") @@ -622,7 +624,7 @@ class Page: try: os.stat(self._filename()) return True - except OSError as err: + except OSError, err: if err.errno == errno.ENOENT: return False raise err @@ -630,10 +632,10 @@ class Page: def get_raw_body(self, default=None): try: return open(self._filename(), 'rb').read() - except IOError as err: + except IOError, err: if err.errno == errno.ENOENT: if default is None: - default = '//[[%s|Describe %s|action=edit]]//' % (self.page_name, self.page_name) + default = '//[[?a=edit&q=%s|Describe %s]]//' % (self.page_name, self.page_name) return default if err.errno == errno.EISDIR: return self.format_dir() @@ -668,7 +670,7 @@ class Page: break self._pragmas[m.group(1)] = m.group(2).strip() #print "bernie: pragmas[" + m.group(1) + "] = " + m.group(2) + "
\n" - except IOError as err: + except IOError, err: if err.errno != errno.ENOENT and err.errno != errno.EISDIR: raise er return self._pragmas @@ -719,7 +721,7 @@ class Page: try: from time import localtime, strftime modtime = localtime(os.stat(self._filename())[stat.ST_MTIME]) - except OSError as err: + except OSError, err: if err.errno != errno.ENOENT: raise err return None @@ -740,7 +742,7 @@ class Page: + ' from ' + cgi.escape(get_hostname(remote_host())) + '

')) print('
' % relative_url(self.page_name)) - print('' % (self.page_name)) + print('') print('
' % (self.page_name)) print('' \ % cgi.escape(preview or self.get_raw_body(default=''))) @@ -790,7 +792,7 @@ class Page: # Bad Bill! POSIX rename ought to replace. :-( try: os.remove(name) - except OSError as err: + except OSError, err: if err.errno != errno.ENOENT: raise err os.rename(tmp_filename, name)