X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=d7e1a5a9e0d28a466e8f40b5704df5d4ea77148f;hb=ff74de7a49cc2bfa936503a4b37fc5c8a650a5fc;hp=a81ac72da5d6c09c54297162822ce98879db9a28;hpb=44aff46c69f5a6faf0960891481c5295d70d940a;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index a81ac72..d7e1a5a 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 @@ -33,6 +33,7 @@ word_re = re.compile(r"^\b((([A-Z][a-z0-9]+){2,}/)*([A-Z][a-z0-9]+){2,})\b$") 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) url_re = re.compile(r"^[a-z]{3,8}://[^\s'\"]+\S$") +link_re = re.compile("(?:\[\[|{{)([^\s\|]+)(?:\s*\|\s*([^\]]+)|)(?:\]\]|}})") title_done = False @@ -248,8 +249,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 +343,36 @@ 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) + if m.group(2) is None: + descr = name + elif img_re.match(m.group(2)): + descr = '' + else: + descr = m.group(2) + + 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
%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 '
%s
%s
' \ + % (name, name + args, descr, descr) + else: + return '' % (name, name + args) def _email_repl(self, word): return '%s' % (word, word) @@ -467,7 +485,7 @@ class WikiFormatter: + 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 @@ -527,7 +545,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): @@ -535,7 +553,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: @@ -551,20 +569,36 @@ 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 = '== ' + path = '' + for dir in self.page_name.split('/'): + path = (path + '/' + dir) if path else dir + out += '[[' + path + '|' + dir + ']]/' + out += ' ==\n' + + for file in page_list(self._filename(), file_re): + if img_re.match(file): + if image_maxwidth: + maxwidth_arg = '|maxwidth=' + str(image_maxwidth) + out += '{{' + self.page_name + '/' + file + '|' + file + maxwidth_arg + '}}\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) @@ -623,7 +657,7 @@ class Page: 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 @@ -671,10 +705,20 @@ class Page: else: send_title(None, msg_text='Read access denied by ACLs', msg_type='notice') + def send_image(self, mimetype, args=[]): + if 'maxwidth' in args: + import subprocess + emit_header(mimetype) + sys.stdout.flush() + subprocess.check_call(['gm', 'convert', self._filename(), + '-scale', args['maxwidth'].value + ' >', '-']) + else: + self.send_raw(mimetype) + 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: @@ -733,8 +777,15 @@ try: else: from mimetypes import MimeTypes type, encoding = MimeTypes().guess_type(query) - type = type or 'text/plain' - Page(query).send_raw(mimetype=type) + #type = type or 'text/plain' + #Page(query).send_raw(mimetype=type) + if type: + if type.startswith('image/'): + Page(query).send_image(mimetype=type,args=form) + else: + Page(query).send_raw(mimetype=type) + else: + Page(query).format() else: print "Status: 404 Not Found" send_title(None, msg_text='Can\'t work out query: ' + query)