X-Git-Url: https://codewiz.org/gitweb?p=geekigeeki.git;a=blobdiff_plain;f=geekigeeki.py;h=f6163110b35b15c6b8d313158a8f42d9145303ca;hp=9d443fc6997d5cdf0c39ee774d3c91b3ade82804;hb=344a5723acc80525ac936017a64ad3d69d1950b7;hpb=b5e1317e7a22607f73df90170b74a18898a52709
diff --git a/geekigeeki.py b/geekigeeki.py
index 9d443fc..f616311 100755
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -21,7 +21,7 @@ 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
+video_ext = "ogg|ogv|oga|webm" # Not supported by Firefox 3.6: mkv|mpg|mpeg|mp4|avi|asf|flv|wmv|qt
image_re = re.compile(r".*\.(" + image_ext + "|" + video_ext + ")$", re.IGNORECASE)
video_re = re.compile(r".*\.(" + video_ext + ")$", re.IGNORECASE)
# FIXME: we accept stuff like foo/../bar and we shouldn't
@@ -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,8 @@ 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'))
+ print(' ' \
+ % relative_url(name + '?a=atom'))
print('')
@@ -689,6 +687,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 +780,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()