#
# Copyright 1999, 2000 Martin Pool <mbp@humbug.org.au>
# Copyright 2002 Gerardo Poggiali
-# Copyright 2007, 2008 Bernardo Innocenti <bernie@codewiz.org>
+# Copyright 2007, 2008 Bernie Innocenti <bernie@codewiz.org>
#
# 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
pg.save(form['file'].file.read())
else:
pg.save(form['savetext'].value.replace('\r\n', '\n'))
- pg.send_page()
+ pg.format()
elif 'cancel' in form:
pg.msg_text = 'Editing canceled'
pg.msg_type = 'notice'
- pg.send_page()
+ pg.format()
else: # preview or edit
text = None
if 'preview' in form:
links = map(lambda ch: '<a href="#%s">%s</a>' % (ch, ch), 'abcdefghijklmnopqrstuvwxyz')
return '<p><center>'+ ' | '.join(links) + '</center></p>'
-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):
print '<p class="modified">last modified %s</p>' % mod_string
print '</div></body></html>'
-# Macros ------------------------------------------------------------
-def _macro_HttpGet(argv):
- if argv[1] in form:
- return form[argv[1]].value
- elif len(argv) > 2:
- return argv[2] # default value
- return ''
-
-def _macro_WordIndex(argv):
- s = make_index_key()
- pages = list(page_list())
- map = {}
- word_re = re.compile('[A-Z][a-z]+')
- for name in pages:
- for word in word_re.findall(name):
- try:
- map[word].append(name)
- except KeyError:
- map[word] = [name]
-
- all_words = map.keys()
- all_words.sort()
- last_letter = None
- # set title
- for word in all_words:
- letter = word[0].lower()
- if letter != last_letter:
- s = s + '; <a name="%s"><h3>%s</h3></a>' % (letter, letter)
- last_letter = letter
-
- s = s + '<b>%s</b><ul>' % word
- links = map[word]
- links.sort()
- last_page = None
- for name in links:
- if name == last_page: continue
- s = s + '<li>' + Page(name).link_to()
- s = s + '</ul>'
- return s
-
-def _macro_TitleIndex(argv):
- s = make_index_key()
- pages = list(page_list())
- pages.sort()
- current_letter = None
- for name in pages:
- letter = name[0].lower()
- if letter != current_letter:
- s += '<a name="%s"><h3>%s</h3></a>' % (letter, letter)
- current_letter = letter
- else:
- s += '<br />'
- s += Page(name).link_to()
- return s
-
-class PageFormatter:
+class WikiFormatter:
"""Object that turns Wiki markup into HTML.
All formatting commands can be parsed one line at a time, though
argv = map(str.strip, argv)
macro = globals().get('_macro_' + name)
+ if not macro:
+ execfile("macros/" + name + ".py", globals())
+ macro = globals().get('_macro_' + name)
if macro:
return macro(argv)
else:
+ r"|(?P<hurl>\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])"
# Inline HTML
- + r"|(?P<html><(/|)(div|span|iframe|form|input))"
+ + r"|(?P<html><(/|)(br|hr|div|form|iframe|input|span))"
+ r"|(?P<ent>[<>&])"
# Auto links
- + r"|(?P<img>\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))" # LEGACY
+ + r"|(?P<img>\b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp))" # LEGACY
+ r"|(?P<word>\b(?:[A-Z][a-z]+){2,}\b)" # LEGACY
+ r"|(?P<url>(http|https|ftp|mailto)\:[^\s'\"]+\S)" # LEGACY
+ r"|(?P<email>[-\w._+]+\@[\w.-]+)" # LEGACY
# look for the end of words and the start of a new word and insert a space there
return re.sub('([a-z])([A-Z])', r'\1 \2', self.page_name)
- def _text_filename(self):
+ def _filename(self):
return path.join(data_dir, self.page_name)
def _tmp_filename(self):
def exists(self):
try:
- os.stat(self._text_filename())
+ os.stat(self._filename())
return True
except OSError, er:
if er.errno == errno.ENOENT:
def get_raw_body(self):
try:
- return open(self._text_filename(), 'rb').read()
+ return open(self._filename(), 'rb').read()
except IOError, er:
if er.errno == errno.ENOENT:
return '' # just doesn't exist, use default
if er.errno == errno.EISDIR:
- return 'DIR'
+ return self.format_dir()
raise er
+ def format_dir(self):
+ out = ''
+ for file in page_list(self._filename(), file_re):
+ if img_re.match(file):
+ out += ' * {{' + self.page_name + '/' + file + '}}\n'
+ else:
+ out += ' * [[' + self.page_name + '/' + file + ']]\n'
+ return out
def get_attrs(self):
if 'attrs' in self.__dict__:
return self.attrs
self.attrs = {}
try:
- file = open(self._text_filename(), 'rt')
+ file = open(self._filename(), 'rt')
attr_re = re.compile(r"^#(\S*)(.*)$")
for line in file:
m = attr_re.match(line)
def can_read(self):
return self.can("read", True)
- def send_page(self):
+ def send_naked(self):
+ if self.can_read():
+ WikiFormatter(self.get_raw_body()).print_html()
+ else:
+ send_guru("Read access denied by ACLs", "notice")
+
+ def format(self):
page_name = None
if self.can_write():
page_name = self.page_name
css_url = self.get_attr("css", "").split() + css_url
send_title(page_name, self.split_title(), msg_text=self.msg_text, msg_type=self.msg_type)
- if self.can_read():
- PageFormatter(self.get_raw_body()).print_html()
- else:
- send_guru("Read access denied by ACLs", "notice")
+ self.send_naked()
send_footer(page_name, self._last_modified())
def _last_modified(self):
try:
from time import localtime, strftime
- modtime = localtime(os.stat(self._text_filename())[stat.ST_MTIME])
+ modtime = localtime(os.stat(self._filename())[stat.ST_MTIME])
except OSError, er:
if er.errno != errno.ENOENT:
raise er
print "<p>" + Page('EditingTips').link_to() + "</p>"
if preview:
print "<div class='preview'>"
- PageFormatter(preview).print_html()
+ WikiFormatter(preview).print_html()
print "</div>"
send_footer(self.page_name)
def _write_file(self, data):
tmp_filename = self._tmp_filename()
open(tmp_filename, 'wb').write(data)
- name = self._text_filename()
+ name = self._filename()
if os.name == 'nt':
# Bad Bill! POSIX rename ought to replace. :-(
try:
if file_re.match(query):
if word_re.match(query):
- Page(query).send_page()
+ Page(query).format()
else:
from mimetypes import MimeTypes
type, encoding = MimeTypes().guess_type(query)
projects / geekigeeki.git / blobdiff