Show vidoes inline in directory view

diff --git a/geekigeeki.py b/geekigeeki.py
index 4cb7b43c018c39e109b52fe50cdf4372f38d9b55..79960d45422760c24f867238426ee76b8a905af4 100755 (executable)
--- a/geekigeeki.py
+++ b/geekigeeki.py
@@ -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):
     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
     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


@@ -588,7 +591,7 @@ class Page:
         images_out = '\n'
 
         for filename in page_list(self._filename(), file_re):
         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)
                 maxwidth = config_get('image_maxwidth', '400')
                 if maxwidth:
                     maxwidth = ' | maxwidth=' + str(maxwidth)