X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=geekigeeki.py;h=4cb7b43c018c39e109b52fe50cdf4372f38d9b55;hb=425f8f9c7238697964956324b3809fc6a97e0378;hp=9d443fc6997d5cdf0c39ee774d3c91b3ade82804;hpb=799b890d2a48b494346a1334393fb7c0198b446d;p=geekigeeki.git
diff --git a/geekigeeki.py b/geekigeeki.py
index 9d443fc..4cb7b43 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -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_\.\-/ ]*)$")
@@ -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,8 @@ class Page:
emit_header(name and self._mtime())
print('\n')
print("%s: %s" % (config_get('site_name', "Unconfigured Wiki"), text))
- print(' ')
+ print(' ')
+ print(' ')
if not name:
print(' ')
@@ -662,10 +663,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 +689,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 +782,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()