X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=854c715dc50d834529bc76f164c34c1cc83323cd;hb=8bfb01a3223d8ab205a28968703831fc17fba04a;hp=ca59dcc8a150d690b92ca4c1f43ff68b25e15666;hpb=4b7dd02a651033602a4e092a981a973dd20573e7;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index ca59dcc..854c715 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 @@ -233,11 +233,11 @@ def handle_edit(pagename): 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: @@ -248,8 +248,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): @@ -264,62 +264,7 @@ def send_footer(name, mod_string=None): print '

last modified %s

' % mod_string print '' -# 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 + ';

%s

' % (letter, letter) - last_letter = letter - - s = s + '%s
    ' % word - links = map[word] - links.sort() - last_page = None - for name in links: - if name == last_page: continue - s = s + '
  • ' + Page(name).link_to() - s = s + '
' - 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 += '

%s

' % (letter, letter) - current_letter = letter - else: - s += '
' - 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 @@ -388,6 +333,9 @@ class PageFormatter: 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: @@ -515,11 +463,11 @@ class PageFormatter: + r"|(?P\[\[([^\s\|]+)(?:\s*\|\s*([^\]]+)|)\]\])" # Inline HTML - + r"|(?P<(/|)(div|span|iframe|form|input))" + + r"|(?P<(/|)(br|hr|div|form|iframe|input|span))" + r"|(?P[<>&])" # Auto links - + r"|(?P\b[a-zA-Z0-9_-]+\.(png|gif|jpg|jpeg|bmp))" # LEGACY + + r"|(?P\b[a-zA-Z0-9_/-]+\.(png|gif|jpg|jpeg|bmp))" # LEGACY + r"|(?P\b(?:[A-Z][a-z]+){2,}\b)" # LEGACY + r"|(?P(http|https|ftp|mailto)\:[^\s'\"]+\S)" # LEGACY + r"|(?P[-\w._+]+\@[\w.-]+)" # LEGACY @@ -579,7 +527,7 @@ class Page: # 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): @@ -587,7 +535,7 @@ class Page: def exists(self): try: - os.stat(self._text_filename()) + os.stat(self._filename()) return True except OSError, er: if er.errno == errno.ENOENT: @@ -603,20 +551,28 @@ class Page: 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) @@ -653,7 +609,13 @@ class Page: 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 @@ -663,16 +625,13 @@ class Page: 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 @@ -708,7 +667,7 @@ class Page: print "

" + Page('EditingTips').link_to() + "

" if preview: print "
" - PageFormatter(preview).print_html() + WikiFormatter(preview).print_html() print "
" send_footer(self.page_name) @@ -723,7 +682,7 @@ class Page: 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: @@ -778,7 +737,7 @@ 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)