X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;ds=sidebyside;f=geekigeeki.py;h=5340646c63101b24629d96a26ff2adea8e66a3b7;hb=61f00a0d333aeb1cb45e98ab4c1902ff1981ad6a;hp=ad4fc5dd0683fd99b62fd6a5df85903cb4fa1da9;hpb=9ba86215f478f6ec624522d42e9aeb9f1eb9eb30;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index ad4fc5d..5340646 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -1,8 +1,9 @@
-#! /usr/bin/env python
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
#
# Copyright 1999, 2000 Martin Pool
# Copyright 2002 Gerardo Poggiali
-# Copyright 2007 Bernardo Innocenti
+# Copyright 2007, 2008 Bernardo 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
@@ -27,8 +28,8 @@ from os import path, environ
# Regular expression defining a WikiWord
# (but this definition is also assumed in other places)
-file_re = re.compile(r"^\b([A-Za-z0-9_\.\-]+)\b$")
-word_re = re.compile(r"^\b([A-Z][a-z]+){2,}\b$")
+file_re = re.compile(r"^\b([A-Za-z0-9_\.\-/]+)\b$")
+word_re = re.compile(r"^\b((([A-Z][a-z]+){2,}/)*([A-Z][a-z]+){2,})\b$")
img_re = re.compile(r"^.*\.(png|gif|jpg|jpeg)$", re.IGNORECASE)
url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$")
@@ -59,6 +60,15 @@ def get_hostname(addr):
except:
return addr
+def relative_url(path, privileged=False):
+ if not (url_re.match(path) or path.startswith('/')):
+ if privileged:
+ url = privileged_path()
+ else:
+ url = script_name()
+ path = url + '/' + path
+ return path
+
# Formatting stuff --------------------------------------------------
def emit_header(type="text/html"):
@@ -103,16 +113,17 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'):
# Head
emit_header()
- print """
-
-"""
+ print ''
+ print ''
+
+ site_name = globals().get('site_name', 'Unconfigured Site')
print "%s: %s " % (site_name, text)
print ' '
if not name:
print ' '
- if css_url:
- print ' ' % css_url
+ for css in css_url:
+ print ' ' % relative_url(css)
print ''
# Body
@@ -128,18 +139,20 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'):
print ''
print '
' + site_name + ': ',
if name:
- print link_tag('?fullsearch=' + name, text) + ' '
+ print link_tag('?fullsearch=' + name, text, 'navlink') + ' '
else:
print text + ' '
print ' | ' + link_tag('FrontPage', 'Front Page', 'navlink')
print ' | ' + link_tag('FindPage', 'Find Page', 'navlink')
- print ' |
Recent Changes '
+ if globals().has_key('history_url'):
+ print ' |
Recent Changes '
+ if name:
+ print ' |
Page History '
if name:
- print ' |
Page History '
print ' | ' + link_tag('?raw=' + name, 'Raw Text', 'navlink')
if privileged_url is not None:
- print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', authentication=True)
+ print ' | ' + link_tag('?edit=' + name, 'Edit Page', 'navlink', privileged=True)
else:
print ' |
Immutable Page '
@@ -149,7 +162,7 @@ def send_title(name, text="Limbo", msg=None, msg_type='error'):
print '
'
-def link_tag(params, text=None, ss_class=None, authentication=False):
+def link_tag(params, text=None, ss_class=None, privileged=False):
if text is None:
text = params # default
classattr = ''
@@ -158,11 +171,9 @@ def link_tag(params, text=None, ss_class=None, authentication=False):
# Prevent crawlers from following links potentially added by spammers or to generated pages
if ss_class == 'external' or ss_class == 'navlink':
classattr += 'rel="nofollow" '
- if authentication:
- path = privileged_path()
- else:
- path = script_name()
- return '%s ' % (classattr, path, params, text)
+ elif url_re.match(params):
+ classattr += 'rel="nofollow" '
+ return '%s ' % (classattr, relative_url(params, privileged=privileged), text)
# Search ---------------------------------------------------
@@ -187,7 +198,7 @@ def do_fullsearch(needle):
for (count, page_name) in hits:
print '' + Page(page_name).link_to()
print ' . . . . ' + `count`
- print ['match', 'matches'][count <> 1]
+ print ['match', 'matches'][count != 1]
print '
'
print ""
@@ -211,6 +222,7 @@ def do_titlesearch(needle):
def print_search_stats(hits, searched):
print "%d hits out of %d pages searched.
" % (hits, searched)
+#TODO: merge into do_savepage()
def do_edit(pagename):
Page(pagename).send_editor()
@@ -241,10 +253,10 @@ def make_index_key():
return s
def page_list():
- return filter(word_re.match, os.listdir(text_dir))
+ return filter(word_re.match, os.listdir(data_dir))
def send_footer(name, mod_string=None):
- if debug_cgi:
+ if globals().get('debug_cgi', False):
cgi.print_arguments()
cgi.print_form(cgi.FieldStorage())
cgi.print_environ()
@@ -290,7 +302,7 @@ def _macro_WordIndex(*vargs):
# set title
for word in all_words:
letter = string.lower(word[0])
- if letter <> last_letter:
+ if letter != last_letter:
s = s + '; %s ' % (letter, letter)
last_letter = letter
@@ -312,12 +324,12 @@ def _macro_TitleIndex(*vargs):
current_letter = None
for name in pages:
letter = string.lower(name[0])
- if letter <> current_letter:
- s = s + '%s ' % (letter, letter)
+ if letter != current_letter:
+ s += '%s ' % (letter, letter)
current_letter = letter
else:
- s = s + ' '
- s = s + Page(name).link_to()
+ s += ' '
+ s += Page(name).link_to()
return s
@@ -330,23 +342,28 @@ class PageFormatter:
"""
def __init__(self, raw):
self.raw = raw
- self.is_em = self.is_b = 0
self.h_level = 0
- self.h_count = 0
- self.list_indents = []
- self.in_pre = False
- self.in_table = False
- self.tr_cnt = 0
- self.in_var = False
+ self.in_pre = self.in_table = False
self.in_header = True
+ self.list_indents = []
+ self.tr_cnt = self.h_cnt = 0
+ self.styles = {
+ #wiki html enabled?
+ "//": ["em", False],
+ "''": ["em", False],
+ "**": ["b", False],
+ "'''": ["b", False],
+ "##": ["tt", False],
+ "``": ["tt", False],
+ "__": ["u", False],
+ "^^": ["sup", False],
+ ",,": ["sub", False]
+ }
- def _emph_repl(self, word):
- if len(word) == 3:
- self.is_b = not self.is_b
- return ['', ''][self.is_b]
- else:
- self.is_em = not self.is_em
- return ['', ''][self.is_em]
+ def _b_repl(self, word):
+ style = self.styles[word]
+ style[1] = not style[1]
+ return ['','<'][style[1]] + style[0] + '>'
def _tit_repl(self, word):
if self.h_level:
@@ -354,10 +371,14 @@ class PageFormatter:
self.h_level = 0
else:
self.h_level = len(word) - 1
- self.h_count += 1
- result = '* ' % (self.h_level, self.h_count, self.h_count)
+ self.h_cnt += 1
+ #abridged = re.sub('[^a-z_]', '', word.lower().replace(' ', '_'))
+ result = '¶ ' % (self.h_level, self.h_cnt, self.h_cnt)
return result
+ def _br_repl(self, word):
+ return ' '
+
def _rule_repl(self, word):
return self._undent() + '\n \n' % (len(word) - 2)
@@ -365,7 +386,7 @@ class PageFormatter:
return Page(word).link_to()
def _img_repl(self, word):
- path = script_name() + '/' + word;
+ path = relative_url(word)
return ' ' % (path, path)
def _url_repl(self, word):
@@ -375,21 +396,22 @@ class PageFormatter:
return '%s ' % (word, word)
def _hurl_repl(self, word):
- m = re.compile("\[\[(\S+)([^\]]*)\]\]").match(word)
+ m = re.compile("\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\]").match(word)
name = m.group(1)
- descr = m.group(2).strip() or name
+ descr = m.group(2) or name
macro = globals().get('_macro_' + name)
if macro:
return apply(macro, (name, descr))
elif img_re.match(name):
- return ' ' % (name, name, descr)
- elif url_re.match(name):
- return '%s ' % (name, descr)
- elif name.startswith('/'):
- return '%s ' % (name, descr)
+ name = relative_url(name)
+ # The "extthumb" nonsense works around a limitation of the HTML block model
+ return '%s
' % (name, name, descr, descr)
else:
- return link_tag(name, descr)
+ if img_re.match(descr):
+ descr = ' '
+
+ return link_tag(name, descr, 'wikilink')
def _email_repl(self, word):
return '%s ' % (word, word)
@@ -415,22 +437,7 @@ class PageFormatter:
return ''
def _hi_repl(self, word):
- if word == 'FIXME':
- cl = 'error'
- elif word == 'DONE':
- cl = 'success'
- elif word == 'TODO':
- cl = 'notice'
- return '' + word + ' '
-
- def _var_repl(self, word):
- if word == '{{' and not self.in_var:
- self.in_var = True
- return ''
- elif self.in_var:
- self.in_var = False
- return '
'
- return ''
+ return '' + word + ' '
def _tr_repl(self, word):
out = ''
@@ -439,16 +446,17 @@ class PageFormatter:
self.tr_cnt = 0
out = '
\n'
self.tr_cnt += 1
- return out + ''
+ out = out + ' '
+ return out + ['', ' '][word.strip() == '||=']
- def _tre_repl(self, word):
+ def _td_repl(self, word):
if self.in_table:
- return ' '
+ return ['', ' '][word.strip() == '||=']
return ''
- def _td_repl(self, word):
+ def _tre_repl(self, word):
if self.in_table:
- return ' '
+ return [' ', ''][word.strip() == '||=']
return ''
def _indent_level(self):
@@ -490,8 +498,9 @@ class PageFormatter:
scan_re = re.compile(
r"(?:"
# Formatting
- + r"(?P'{2,3})"
+ + r"(?P\*\*|'''|//|''|##|``|__|\^\^|,,)"
+ r"|(?P\={2,6})"
+ + r"|(?P \\\\)"
+ r"|(?P^-{3,})"
+ r"|(?P<(/|)(div|span|iframe)[^<>]*>)"
+ r"|(?P[<>&])"
@@ -500,23 +509,23 @@ class PageFormatter:
# Links
+ r"|(?P \b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))"
+ r"|(?P\b(?:[A-Z][a-z]+){2,}\b)"
- + r"|(?P\[\[\S+[^\]]*\]\])"
+ + r"|(?P\[\[([^ \t\n\r\f\v\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
+ r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)"
+ r"|(?P[-\w._+]+\@[\w.-]+)"
# Lists, divs, spans
- + r"|(?P^\s+\*)"
- + r"|(?P(\{\{\{|\s*\}\}\}))"
- + r"|(?P(\{\{|\}\}))"
+ + r"|(?P^\s+[\*#] +)"
+ + r"|(?P\{\{\{|\s*\}\}\})"
# Tables
- + r"|(?P^\s*\|\|\s*)"
- + r"|(?P\s*\|\|\s*$)"
- + r"|(?P\s*\|\|\s*)"
+ + r"|(?P ^\s*\|\|(=|)\s*)"
+ + r"|(?P\s*\|\|(=|)\s*$)"
+ + r"|(?P\s*\|\|(=|)\s*)"
+ r")")
pre_re = re.compile(
r"(?:"
+ r"(?P\s*\}\}\})"
+ + r"|(?P[<>&])"
+ r")")
blank_re = re.compile(r"^\s*$")
indent_re = re.compile(r"^\s*")
@@ -555,7 +564,6 @@ class Page:
self.page_name = page_name
self.msg = ''
self.msg_type = 'error'
- self.attrs = {}
def split_title(self):
# look for the end of words and the start of a new word,
@@ -563,20 +571,19 @@ class Page:
return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name)
def _text_filename(self):
- return path.join(text_dir, self.page_name)
+ return path.join(data_dir, self.page_name)
def _tmp_filename(self):
- return path.join(text_dir, ('#' + self.page_name + '.' + `os.getpid()` + '#'))
+ return path.join(data_dir, ('#' + self.page_name.replace('/','_') + '.' + `os.getpid()` + '#'))
def exists(self):
try:
os.stat(self._text_filename())
- return 1
+ return True
except OSError, er:
if er.errno == errno.ENOENT:
- return 0
- else:
- raise er
+ return False
+ raise er
def link_to(self):
word = self.page_name
@@ -590,14 +597,13 @@ class Page:
return open(self._text_filename(), 'rt').read()
except IOError, er:
if er.errno == errno.ENOENT:
- # just doesn't exist, use default
- return 'Describe %s here.' % self.page_name
- else:
- raise er
+ return '' # just doesn't exist, use default
+ raise er
def get_attrs(self):
- if self.attrs:
+ if self.__dict__.has_key('attrs'):
return self.attrs
+ self.attrs = {}
try:
file = open(self._text_filename(), 'rt')
attr_re = re.compile(r"^#(\S*)(.*)$")
@@ -612,18 +618,17 @@ class Page:
raise er
return self.attrs
+ def get_attr(self, name, default):
+ return self.get_attrs().get(name, default)
+
def can(self, action, default=True):
- attrs = self.get_attrs()
try:
- # SomeUser:read,write All:read
- acl = attrs["acl"]
+ #acl SomeUser:read,write All:read
+ acl = self.get_attr("acl", None)
for rule in acl.split():
(user,perms) = rule.split(':')
if user == remote_user() or user == "All":
- if action in perms.split(','):
- return True
- else:
- return False
+ return action in perms.split(',')
return False
except Exception, er:
pass
@@ -639,6 +644,12 @@ class Page:
page_name = None
if self.can_write():
page_name = self.page_name
+
+ #FIXME: are there security implications?
+ #css foo.css bar.css
+ global css_url
+ css_url = css_url + self.get_attr("css", "").split()
+
send_title(page_name, self.split_title(), msg=self.msg, msg_type=self.msg_type)
if self.can_read():
PageFormatter(self.get_raw_body()).print_html()
@@ -647,10 +658,13 @@ class Page:
send_footer(page_name, self._last_modified())
def _last_modified(self):
- if not self.exists():
+ try:
+ from time import localtime, strftime
+ modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME])
+ except OSError, er:
+ if er.errno != errno.ENOENT:
+ raise er
return None
- from time import localtime, strftime
- modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME])
return strftime(datetime_fmt, modtime)
def send_editor(self, preview=None):
@@ -663,9 +677,9 @@ class Page:
+ ' for ' + cgi.escape(remote_user())
+ ' from ' + cgi.escape(get_hostname(remote_host()))
+ '')
- print '