Show vidoes inline in directory view

[geekigeeki.git] / geekigeeki.py

diff --git a/geekigeeki.py b/geekigeeki.py
index 4a7ffea7e6250f80fe59a09e9053cf11f4128b4e..79960d45422760c24f867238426ee76b8a905af4 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -3,7 +3,7 @@
 #
 # Copyright (C) 1999, 2000 Martin Pool <mbp@humbug.org.au>
 # Copyright (C) 2002 Gerardo Poggiali
-# Copyright (C) 2007, 2008, 2009, 2010 Bernie Innocenti <bernie@codewiz.org>
+# Copyright (C) 2007, 2008, 2009, 2010, 2011 Bernie Innocenti <bernie@codewiz.org>
 #
 # 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('</pre><script type="text/javascript" src="%s" defer="defer"></script>' \
         % 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 '<a class="%s" %shref="%s">%s</a>' % (link_class, nofollow, relative_url(dest, privileged=privileged), text)
@@ -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
@@ -306,13 +309,13 @@ class WikiFormatter:
         return '&mdash;'
 
     def _tit_repl(self, word):
+        link = permalink(self.line)
         if self.h_level:
-            result = '</h%d><p>\n' % self.h_level
+            result = '<a class="heading" href="#%s">¶</a></h%d><p>\n' % (link, self.h_level)
             self.h_level = 0
         else:
             self.h_level = len(word) - 1
-            link = permalink(self.line)
-            result = '\n</p><h%d id="%s"><a class="heading" href="#%s">¶</a> ' % (self.h_level, link, link)
+            result = '\n</p><h%d id="%s">' % (self.h_level, link)
         return result
 
     def _br_repl(self, word):
@@ -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()