X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=8de46ab91cbf4d2b14e4ce25753a0848545c311c;hb=fbc4d6639e75dd726fdcadc1129ae0900468e9d2;hp=a81ac72da5d6c09c54297162822ce98879db9a28;hpb=44aff46c69f5a6faf0960891481c5295d70d940a;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index a81ac72..8de46ab 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -3,7 +3,7 @@
#
# Copyright 1999, 2000 Martin Pool
# Copyright 2002 Gerardo Poggiali
-# Copyright 2007, 2008 Bernardo Innocenti
+# Copyright 2007, 2008 Bernie Innocenti
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -31,8 +31,9 @@ from os import path, environ
word_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$")
# 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)$", re.IGNORECASE)
+img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg|bmp|ico)$", re.IGNORECASE)
url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$")
+link_re = re.compile("(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})")
title_done = False
@@ -109,7 +110,7 @@ def send_guru(msg_text, msg_type):
}
"""
-def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
+def send_title(name, text="Limbo", msg_text=None, msg_type='error', writable=False):
global title_done
if title_done: return
@@ -124,12 +125,23 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
print ' '
if not name:
print ' '
- for css in css_url:
- print ' ' % relative_url(css)
+
+ for link in link_urls:
+ rel, href = link
+ print ' ' % (rel, relative_url(href))
+
+ if name and writable and privileged_url is not None:
+ print ' ' \
+ % (privileged_path() + '?edit=' + name)
+
+ if history_url is not None:
+ print ' ' \
+ % relative_url(history_url + '?a=rss')
+
print ''
# Body
- if name and privileged_url is not None:
+ if name and writable and privileged_url is not None:
print ''
else:
print ''
@@ -143,17 +155,21 @@ def send_title(name, text="Limbo", msg_text=None, msg_type='error'):
print ' ' + link_tag('?fullsearch=' + name, text, 'navlink') + ' '
else:
print ' ' + text + ' '
- print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink')
+ print ' | ' + link_tag('FrontPage', 'Home', 'navlink')
print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
if 'history_url' in globals():
- print ' | Recent Changes'
+ print ' | Recent Changes'
if name:
- print ' | Page History'
+ print ' | Page History'
if name:
print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')
if privileged_url is not None:
- print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', privileged=True)
+ if writable:
+ print ' | ' + link_tag('?edit=' + name, 'Edit', 'navlink', privileged=True)
+ else:
+ print ' | ' + link_tag(name, 'Login', 'navlink', privileged=True)
+
else:
print ' | Immutable Page'
@@ -248,8 +264,8 @@ def make_index_key():
links = map(lambda ch: '%s' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
return '
'+ ' | '.join(links) + '
'
-def page_list():
- return filter(word_re.match, os.listdir(data_dir))
+def page_list(dir = None, re = word_re):
+ return filter(re.match, os.listdir(dir or data_dir))
def send_footer(name, mod_string=None):
if globals().get('debug_cgi', False):
@@ -342,19 +358,35 @@ class WikiFormatter:
return '<<' + '|'.join(argv) + '>>'
def _hurl_repl(self, word):
- m = re.compile("\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\]").match(word)
+ m = link_re.match(word)
+ name = m.group(1)
+ descr = m.group(2)
+ if descr is None:
+ descr = name
+ elif img_re.match(m.group(2)):
+ descr = ''
+
+ return link_tag(name, descr, 'wikilink')
+
+ def _inl_repl(self, word):
+ m = link_re.match(word)
name = m.group(1)
descr = m.group(2) or name
+ name = relative_url(name)
+ argv = descr.split('|')
+ descr = argv.pop(0)
- if img_re.match(name):
- name = relative_url(name)
- # The "extthumb" nonsense works around a limitation of the HTML block model
- return '
%s
' % (name, name, descr, descr)
+ if argv:
+ args = '?' + '&'.join(argv)
else:
- if img_re.match(descr):
- descr = ''
+ args = ''
- return link_tag(name, descr, 'wikilink')
+ if descr:
+ # The "extthumb" nonsense works around a limitation of the HTML block model
+ return '