]> git.parisson.com Git - teleforma.git/commitdiff
fix video and poster display
authorGuillaume Pellerin <yomguy@parisson.com>
Tue, 24 Nov 2020 17:00:56 +0000 (18:00 +0100)
committerGuillaume Pellerin <yomguy@parisson.com>
Tue, 24 Nov 2020 17:00:56 +0000 (18:00 +0100)
17 files changed:
example/manage.py [changed mode: 0755->0644]
teleforma/static/teleforma/images/1pixelout-player-colour-scheme.png [changed mode: 0755->0644]
teleforma/static/teleforma/js/rainbowvis.js [changed mode: 0755->0644]
teleforma/static/teleforma/swf/1pixeloutplayer.xml [changed mode: 0755->0644]
teleforma/static/teleforma/swf/player.swf [changed mode: 0755->0644]
teleforma/templates/teleforma/inc/media_list.html
tools/dev/fix_svn_authors.sh [deleted file]
tools/dev/make_doc.sh [deleted file]
tools/dev/merge_master_all.sh [deleted file]
tools/dev/merge_master_to.sh [deleted file]
tools/dev/push.sh [deleted file]
tools/dev/pypi.sh [deleted file]
tools/dev/translate.sh [deleted file]
tools/trans/create_thumbs.py [deleted file]
tools/trans/fix_chk_media.py [deleted file]
tools/trans/transcode.py [deleted file]
tools/trans/transcode_preview_alpha.py [deleted file]

old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
old mode 100755 (executable)
new mode 100644 (file)
index 400cc1bae9fbaa32dea6617c4f3c567293fb8b3c..76c2de5ff709878af08c0921fbd5b7907234474f 100644 (file)
@@ -3,9 +3,9 @@
 {% load i18n %}
 
 {% if course.media.all|from_course_type:type|from_period:period %}
-<div class="course_content">
+<div class="course_content content_video">
 <div class="course_subtitle">
-    <h3><img src="{{ STATIC_URL }}telemeta/images/item_title.png" width="10px" alt="" /> {% trans "Passed conferences"%}</h3>
+    <h3><img src="/static/telemeta/images/item_title.png" width="10px" alt="" /> {% trans title %}</h3>
 </div>
     <table class="listing" width="100%">
     <tbody>
               {% if related.title == "preview" %}
                {% thumbnail related.file "168x96" as im %}
                 <div style="background: no-repeat url('{{ im.url }}') 0 1px; background-size: 100%; background-color: #dfdfdf;">
-                 <img src="{{ STATIC_URL }}teleforma/images/play_168.png" width="100%" alt="{% trans 'Click here' %}" />
+                 <img src="/static/teleforma/images/play_168.png" width="100%" alt="{% trans 'Click here' %}" />
                 </div>
                {% endthumbnail %}
+              {% else %}
+               {% trans 'Click here' %}
               {% endif %}
              {% endfor %}
             {% else %}
-              {% trans 'Click here' %}
+              <div>{% trans 'Click here' %}</div>
             {% endif %}
+            <div>{% trans 'Click here' %}</div>
             </a>
             </td>
             <td {% if forloop.first %}class="border-top"{% endif %} width="60%" style="padding-left: 1em;">
             </td>
             <td {% if forloop.first %}class="border-top"{% endif %} width="10%" align="center">
             {% if media.is_published and user.is_staff %}
-             <img src="{{ STATIC_URL }}telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans ' published' %}" />
+             <img src="/static/telemeta/images/ok.png" style="vertical-align:middle" alt="" title="{% trans ' published' %}" />
             {% elif not media.is_published and user.is_staff %}
-             <img src="{{ STATIC_URL }}telemeta/images/delete.png" style="vertical-align:middle" alt="" title="{% trans ' rejected' %}" />
+             <img src="/static/telemeta/images/delete.png" style="vertical-align:middle" alt="" title="{% trans ' rejected' %}" />
             {% endif %}
-            {% if media.item.file %}
-             <a href="{{ MEDIA_URL }}{{ media.item.file }}">
-              <img src="{{ STATIC_URL }}teleforma/images/download_media.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" />
-             </a>
+            {% if media.item.file and media.is_published or user.is_superuser or user.is_staff %}
+                {% if not "video" in media.mime_type or perms.telemeta.can_play_all_items or request.user_agent.os.family == 'iOS' %}
+                    <a href="{% url teleforma-media-download period.id media.id %}">
+                        <img src="/static/teleforma/images/download_media.png" style="vertical-align:middle" alt="" title="{% trans "Download" %}" />
+                    </a>
+                {% endif %}
             {% endif %}
             </td>
             </tr>
diff --git a/tools/dev/fix_svn_authors.sh b/tools/dev/fix_svn_authors.sh
deleted file mode 100755 (executable)
index 2f47a97..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-
-git filter-branch -f --commit-filter '
-        if [ "$GIT_COMMITTER_EMAIL" = "<>" ];
-        then
-                GIT_COMMITTER_NAME="<yomguy>";
-                GIT_AUTHOR_NAME="<yomguy>";
-                GIT_COMMITTER_EMAIL="<yomguy@parisson.com>";
-                GIT_AUTHOR_EMAIL="<yomguy@parisson.com>";
-                git commit-tree "$@";
-        else
-                git commit-tree "$@";
-        fi' HEAD
diff --git a/tools/dev/make_doc.sh b/tools/dev/make_doc.sh
deleted file mode 100755 (executable)
index 4f843ad..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-# needs epydoc
-
-app="telemeta"
-dir=/home/$USER/dev/$app/doc/
-server="doc.parisson.com"
-
-epydoc -n $app -u https://github.com/yomguy/DeeFuzzer -o $dir $app/
-rsync -a $dir $server:/var/www/files/doc/$app/
-
diff --git a/tools/dev/merge_master_all.sh b/tools/dev/merge_master_all.sh
deleted file mode 100755 (executable)
index b1d5216..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-git branch | tr -d \* | while read line
-do
-    branch=${line/#\ }
-
-    if [[ ! $branch == *master* ]]; then
-     echo "Merge master to $branch:"
-     git checkout $branch
-     git merge master
-     git checkout master
-    fi
-done
-
-echo "Done !"
diff --git a/tools/dev/merge_master_to.sh b/tools/dev/merge_master_to.sh
deleted file mode 100755 (executable)
index e6e1cf7..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-git checkout $1
-git merge master
-git checkout master
-
diff --git a/tools/dev/push.sh b/tools/dev/push.sh
deleted file mode 100755 (executable)
index 2c68e2f..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-git branch | tr -d \* | while read line
-do
-    branch=${line/#\ }
-
-    echo "Push $branch to origin:"
-    git push origin $branch
-
-done
-
-git push --tags
-
-ssh vcs.parisson.com "cd /var/git/teleforma.git; git update-server-info"
-
-echo "Update sandbox @ angus.parisson.com:"
-ssh angus.parisson.com "cd /var/teleforma/teleforma-dev; git pull origin dev; \
-                        cd /var/teleforma/sandbox/; ./manage.py migrate --delete-ghost-migrations; \
-                        ./manage.py collectstatic --ignore archives --ignore Pre-Barreau --ignore cache "
-
-echo "Done !"
diff --git a/tools/dev/pypi.sh b/tools/dev/pypi.sh
deleted file mode 100755 (executable)
index 12be642..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-python setup.py register
-python setup.py sdist upload
-
diff --git a/tools/dev/translate.sh b/tools/dev/translate.sh
deleted file mode 100755 (executable)
index 73f6d02..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-cd teleforma
-django-admin makemessages -a
-django-admin makemessages -d djangojs -a
-django-admin compilemessages
-cd ..
diff --git a/tools/trans/create_thumbs.py b/tools/trans/create_thumbs.py
deleted file mode 100644 (file)
index dc3fd20..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/usr/bin/python
-
-import os, sys, string
-import logging
-
-class Logger:
-    """A logging object"""
-
-    def __init__(self, file):
-        self.logger = logging.getLogger('myapp')
-        self.hdlr = logging.FileHandler(file)
-        self.formatter = logging.Formatter('%(message)s')
-        self.hdlr.setFormatter(self.formatter)
-        self.logger.addHandler(self.hdlr)
-        self.logger.setLevel(logging.INFO)
-
-log_file = 'thumbs.log'
-logger = Logger(log_file)
-root_dir = sys.argv[-1]
-args = sys.argv[1:-1]
-source_format = 'webm'
-done = []
-preview_tc = '00:00:05'
-
-if os.path.exists(log_file):
-    f = open(log_file, 'r')
-    for line in f.readlines():
-        done.append(line[:-1])
-    f.close()
-
-for root, dirs, files in os.walk(root_dir):
-    for file in files:
-        path = os.path.abspath(root + os.sep + file)
-        name, ext = os.path.splitext(file)
-        if ext[1:] == source_format:
-            dest = os.path.abspath(root + os.sep + name + '.png')
-            if not dest in done or '--force' in args:
-                command = 'ffmpeg -ss '+ preview_tc + ' -i ' + path + '  -y ' + dest
-                os.system(command)
-                logger.logger.info(dest)
-
-print "DONE!"
diff --git a/tools/trans/fix_chk_media.py b/tools/trans/fix_chk_media.py
deleted file mode 100644 (file)
index 45b9dd9..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-#!/usr/bin/python
-
-import os, sys, psutil
-import datetime
-
-class FixCheckMedia(object):
-
-    def __init__(self, dir):
-        self.dir = dir
-        self.tmp_dir = '/home/telecaster/tmp/'
-        if not os.path.exists(self.tmp_dir):
-            os.makedirs(self.tmp_dir)
-
-    def process(self):
-        for root, dirs, files in os.walk(self.dir):
-            for filename in files:
-                path = root + os.sep + filename
-                name = os.path.splitext(filename)[0]
-                ext = os.path.splitext(filename)[1][1:]
-                dir_files = os.listdir(root)
-
-                fixed_log = 'mp3.fixed'
-                tofix_log = 'mp3.tofix'
-
-                if ext == 'mp3' and tofix_log in dir_files and not fixed_log in dir_files:
-                    print path
-                    for file in dir_files:
-                        source_ext = os.path.splitext(file)[1][1:]
-                        if source_ext == 'webm':
-                            source = root + os.sep + file
-                            if os.path.getsize(source):
-                                self.fix_mp3(source, path)
-                                os.system('touch ' + root + os.sep + fixed_log)
-                                os.system('rm ' + root + os.sep + tofix_log)
-                            break
-                            #pass
-
-                fixed_log = 'webm.fixed'
-                tofix_log = 'webm.tofix'
-
-                if ext == 'webm' and not fixed_log in dir_files:
-                    print path
-                    if os.path.getsize(path):
-                        self.fix_webm(path)
-                        os.system('touch ' + root + os.sep + fixed_log)
-                        #pass
-
-                #if ext == 'webm' and tofix_log in dir_files:
-                #    print path
-                #    os.system('touch ' + root + os.sep + fixed_log)
-                #    os.system('rm ' + root + os.sep + tofix_log)
-                #    if os.path.getsize(path):
-                #        self.hard_fix_webm(path)
-                        #pass
-
-
-    def hard_fix_webm(self, path):
-        try:
-            tmp_file = self.tmp_dir + 'out.webm '
-            command = 'ffmpeg -loglevel 0 -i '+ path + ' -vcodec libvpx -vb 500k -acodec libvorbis -aq 7 -f webm -y ' + tmp_file + ' > /dev/null'
-            print command
-            os.system(command)
-            command = 'mv '  + tmp_file + path
-            os.system(command)
-        except:
-            pass
-
-
-    def fix_webm(self, path):
-        try:
-            tmp_file = self.tmp_dir + 'out.webm '
-            command = 'ffmpeg -loglevel 0 -i '+ path + ' -vcodec copy -acodec copy -f webm -y ' + tmp_file + ' > /dev/null'
-            print command
-            os.system(command)
-            command = 'mv '  + tmp_file + path
-            os.system(command)
-        except:
-            pass
-
-    def fix_mp3(self, source, path):
-        try:
-            command = 'ffmpeg -loglevel 0 -i '+ source + ' -aq 6 -y ' + path + ' > /dev/null'
-            print command
-            os.system(command)
-        except:
-            pass
-
-def get_pids(name, args=None):
-    """Get a process pid filtered by arguments and uid"""
-    pids = []
-    for proc in psutil.process_iter():
-        if proc.cmdline:
-            if name == proc.name:
-                if args:
-                    if args in proc.cmdline:
-                        pids.append(proc.pid)
-                else:
-                    pids.append(proc.pid)
-    return pids
-
-dir = sys.argv[-1]
-
-path =  os.path.abspath(__file__)
-pids = get_pids('python2.6',args=path)
-
-print datetime.datetime.now()
-if len(pids) <= 1:
-    print 'starting process...'
-    f = FixCheckMedia(dir)
-    f.process()
-    print 'process finished.\n'
-else:
-    print 'already started !\n'
diff --git a/tools/trans/transcode.py b/tools/trans/transcode.py
deleted file mode 100755 (executable)
index 2abc712..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/python
-
-import os, sys, string
-import logging
-
-class Logger:
-    """A logging object"""
-
-    def __init__(self, file):
-        self.logger = logging.getLogger('myapp')
-        self.hdlr = logging.FileHandler(file)
-        self.formatter = logging.Formatter('%(message)s')
-        self.hdlr.setFormatter(self.formatter)
-        self.logger.addHandler(self.hdlr)
-        self.logger.setLevel(logging.INFO)
-
-log_file = 'transcoding.log'
-logger = Logger(log_file)
-root_dir = sys.argv[-1]
-args = sys.argv[1:-1]
-source_format = 'webm'
-done = []
-ffmpeg_args = {'mp3' : ' -vn -acodec libmp3lame -aq 6 -ac 1 ',
-               'ogg' : ' -vn -acodec copy ',
-               'mp4' : ' -vcodec libx264 -r 24 -b 512k -threads 6 -acodec libfaac -ar 48000 -ab 96k -ac 1 ',
-              }
-
-if os.path.exists(log_file):
-    f = open(log_file, 'r')
-    for line in f.readlines():
-        done.append(line[:-1])
-    f.close()
-
-for root, dirs, files in os.walk(root_dir):
-    for file in files:
-        path = os.path.abspath(root + os.sep + file)
-        name, ext = os.path.splitext(file)
-        if ext[1:] == source_format:
-            for format in ffmpeg_args.keys():
-                dest = os.path.abspath(root + os.sep + name + '.' + format)
-                if not dest in done or '--force' in args:
-                    command = 'ffmpeg -i ' + path + ffmpeg_args[format] + ' -y ' + dest
-                    os.system(command)
-                    logger.logger.info(dest)
-
-print "DONE!"
diff --git a/tools/trans/transcode_preview_alpha.py b/tools/trans/transcode_preview_alpha.py
deleted file mode 100644 (file)
index 9efbf7c..0000000
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/python
-
-import os, sys, string
-import logging
-
-class Logger:
-    """A logging object"""
-
-    def __init__(self, file):
-        self.logger = logging.getLogger('myapp')
-        self.hdlr = logging.FileHandler(file)
-        self.formatter = logging.Formatter('%(message)s')
-        self.hdlr.setFormatter(self.formatter)
-        self.logger.addHandler(self.hdlr)
-        self.logger.setLevel(logging.INFO)
-
-log_file = 'preview.log'
-logger = Logger(log_file)
-root_dir = sys.argv[-1]
-args = sys.argv[1:-1]
-source_format = ['webm', 'mp4', 'ogg', 'mp3']
-done = []
-preview_tc_in = '00:00:00'
-preview_tc_out = '00:03:00'
-vfilter = "fade=out:4270:50"
-preview_dir = 'preview'
-ffmpeg_args = {'mp3' : ' -vn -acodec libmp3lame -aq 6 -ac 1 ',
-               'ogg' : ' -vn -acodec copy ',
-               'mp4' : ' -vcodec libx264 -r 24 -b 512k -threads 6 -acodec libfaac -ar 48000 -ab 96k -ac 1 ',
-              }
-
-if os.path.exists(log_file):
-    f = open(log_file, 'r')
-    for line in f.readlines():
-        done.append(line[:-1])
-    f.close()
-
-for root, dirs, files in os.walk(root_dir):
-    for file in files:
-        path = os.path.abspath(root + os.sep + file)
-        name, ext = os.path.splitext(file)
-        if ext[1:] in source_format and not preview_dir in root:
-            dest_dir = root + os.sep + preview_dir
-            if not os.path.exists(dest_dir):
-                os.mkdir(dest_dir)
-            dest = os.path.abspath(dest_dir + os.sep + name + '.preview' + ext)
-            if not dest in done or '--force' in args:
-                command = 'ffmpeg -ss '+ preview_tc_in + ' -t ' + preview_tc_out + \
-                          ' -i ' + path + ' -vcodec copy -acodec copy -y ' + dest
-                os.system(command)
-                logger.logger.info(dest)
-
-print "DONE!"