Show vidoes inline in directory view

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

index 9d443fc6997d5cdf0c39ee774d3c91b3ade82804..79960d45422760c24f867238426ee76b8a905af4 100755 (executable)
--- 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_\.\-/ ]*)$")
@@ -163,7 +163,10 @@ def link_inline(name, descr=None, kvargs={}):
      if not descr: descr = humanlink(name)
      url = relative_url(name)
      if video_re.match(name):
-        return '<video controls="1" src="%s">Your browser does not support HTML5 video</video>' % url
+        args = ''
+        if 'maxwidth' in kvargs:
+            args += 'width=' + kvargs['maxwidth']
+        return '<video controls="1" src="%s" %s/>' % (url, args)
      elif image_re.match(name):
          return '<a href="%s"><img border="0" src="%s" alt="%s" /></a>' % (url, url + url_args(kvargs), descr)
      elif file_re.match(name) and not ext_re.search(name): # FIXME: this guesses a wiki page
@@ -586,9 +589,9 @@ class Page:
              out += '[[' + pathname + '|' + dirname + ']]/'
          out += ' ==\n'
          images_out = '\n'
- 
+
          for filename in page_list(self._filename(), file_re):
-            if image_re.match(filename):
+            if image_re.match(filename) or video_re.match(filename):
                  maxwidth = config_get('image_maxwidth', '400')
                  if maxwidth:
                      maxwidth = ' | maxwidth=' + str(maxwidth)
@@ -646,7 +649,8 @@ 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">')
+        print(' <meta name="viewport" content="width=device-width, initial-scale=1.0">')
          if not name:
              print(' <meta name="robots" content="noindex,nofollow" />')
  
@@ -662,10 +666,9 @@ 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'))
+        if name:
+            print(' <link rel="alternate" type="application/atom+xml" title="Atom feed" href="%s" />' \
+                % relative_url(name + '?a=atom'))
  
          print('</head>')
  
@@ -689,6 +692,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 +785,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()