X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=9c97fe6eda952fd1ffcf660762726138fdbd9dc6;hb=e315413c8d6b325c8424884f2341eb1c535dca09;hp=4a7ffea7e6250f80fe59a09e9053cf11f4128b4e;hpb=e31aacbe31f2dff141354b7c4d97a16bb86978e1;p=geekigeeki.git diff --git a/geekigeeki.py b/geekigeeki.py index 4a7ffea..9c97fe6 100755 --- a/geekigeeki.py +++ b/geekigeeki.py @@ -3,7 +3,7 @@ # # Copyright (C) 1999, 2000 Martin Pool # Copyright (C) 2002 Gerardo Poggiali -# Copyright (C) 2007, 2008, 2009, 2010 Bernie Innocenti +# Copyright (C) 2007, 2008, 2009, 2010, 2011 Bernie Innocenti # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -20,9 +20,9 @@ title_done = False import cgi, sys, os, re, errno, stat, glob -image_ext = 'png|gif|jpg|jpeg|bmp|ico' -video_ext = "ogg|ogv|oga|webm" # Not supported by Firefox 3.5: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt -image_re = re.compile(r".*\.(" + image_ext + "|" + video_ext + ")$", re.IGNORECASE) +image_ext = 'png|gif|jpg|jpeg|svg|bmp|ico' +video_ext = 'avi|webm|mkv|ogv' +image_re = re.compile(r".*\.(" + image_ext + ")$", re.IGNORECASE) video_re = re.compile(r".*\.(" + video_ext + ")$", re.IGNORECASE) # FIXME: we accept stuff like foo/../bar and we shouldn't file_re = re.compile(r"([A-Za-z0-9_\-][A-Za-z0-9_\.\-/ ]*)$") @@ -126,7 +126,7 @@ def send_guru(msg_text, msg_type): print('' \ % relative_url('sys/GuruMeditation.js')) -def send_httperror(status="403 Not Found", query="", trace=False): +def send_httperror(status="404 Not Found", query="", trace=False): print("Status: %s" % status) msg_text = "%s: on query '%s'" % (status, query) if trace: @@ -152,9 +152,9 @@ def link_tag(dest, text=None, privileged=False, **kvargs): text = config_get('nonexist_pfx', '') + text link_class = 'nonexistent' - # Prevent crawlers from following links potentially added by spammers or to generated pages + # Prevent crawlers from following links potentially added by spammers and to autogenerated pages nofollow = '' - if link_class == 'external' or link_class == 'navlink': + if link_class in ('external', 'navlink', 'nonexistent'): nofollow = 'rel="nofollow" ' return '%s' % (link_class, nofollow, relative_url(dest, privileged=privileged), text) @@ -306,13 +306,13 @@ class WikiFormatter: return '—' def _tit_repl(self, word): + link = permalink(self.line) if self.h_level: - result = '

\n' % self.h_level + result = '¶

\n' % (link, self.h_level) self.h_level = 0 else: self.h_level = len(word) - 1 - link = permalink(self.line) - result = '\n

¶ ' % (self.h_level, link, link) + result = '\n

' % (self.h_level, link) return result def _br_repl(self, word): @@ -586,7 +586,7 @@ class Page: out += '[[' + pathname + '|' + dirname + ']]/' out += ' ==\n' images_out = '\n' - + for filename in page_list(self._filename(), file_re): if image_re.match(filename): maxwidth = config_get('image_maxwidth', '400') @@ -646,7 +646,7 @@ class Page: emit_header(name and self._mtime()) print('\n') print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text)) - print(' ') + print(' ') if not name: print(' ') @@ -662,10 +662,9 @@ class Page: print(' ' \ % relative_url(name + '?a=edit', privileged=True)) - history = config_get('history_url') - if history is not None: - print(' ' \ - % relative_url(history + '?a=rss')) + if name: + print(' ' \ + % relative_url(name + '?a=atom')) print('') @@ -689,6 +688,7 @@ class Page: else: print(' ' + text + ' ') print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink')) + history = config_get('history_url') if history: print(' | Recent Changes') if name: @@ -781,7 +781,8 @@ class Page: if 'maxwidth' in args: import subprocess sys.stdout.flush() - subprocess.check_call(['gm', 'convert', self._filename(), + subprocess.check_call(['convert', self._filename(), + '-auto-orient', '-orient', 'TopLeft', '-scale', args['maxwidth'].value + ' >', '-']) else: body = self.get_raw_body()