Merge remote-tracking branch 'giskard/master'

[geekigeeki.git] / geekigeeki.py
diff --git a/geekigeeki.py b/geekigeeki.py

index 9d443fc6997d5cdf0c39ee774d3c91b3ade82804..f6163110b35b15c6b8d313158a8f42d9145303ca 100755 (executable)
--- 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('<!doctype html>\n<html lang="en">')
          print("<head><title>%s: %s</title>" % (config_get('site_name', "Unconfigured Wiki"), text))
-        print(' <meta charset="UTF-8">')
+        print(' <meta charset="utf-8">')
          if not name:
              print(' <meta name="robots" content="noindex,nofollow" />')
  
@@ -662,10 +662,8 @@ class Page:
              print(' <link rel="alternate" type="application/x-wiki" title="Edit this page" href="%s" />' \
                  % relative_url(name + '?a=edit', privileged=True))
  
-        history = config_get('history_url')
-        if history is not None:
-            print(' <link rel="alternate" type="application/rss+xml" title="RSS" href="%s" />' \
-                % relative_url(history + '?a=rss'))
+        print(' <link rel="alternate" type="application/atom+xml" title="Atom feed" href="%s" />' \
+            % relative_url(name + '?a=atom'))
  
          print('</head>')
  
@@ -689,6 +687,7 @@ class Page:
          else:
              print('  <b>' + text + '</b> ')
          print(' | ' + link_tag('FindPage', 'Find Page', cssclass='navlink'))
+        history = config_get('history_url')
          if history:
              print(' | <a href="' + relative_url(history) + '" class="navlink">Recent Changes</a>')
              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()