Fix video player URL against X-Accel, allow not download extension, disable media...

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index a1775b6e8f2b523d8097ddc87a2a521d3e5f4c07..f5f806e27bbb2f20efc2c7b65e293a68956d9694 100644 (file)
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -32,6 +32,7 @@ python $manage bower_install -- --allow-root
 # telemeta setup
 python $manage telemeta-create-admin-user
 python $manage telemeta-create-boilerplate
+python $manage telemeta-setup-enumerations
 
 # Delete Timeside database if it exists
 cat /srv/src/telemeta/scripts/sql/drop_timeside.sql | python $manage dbshell
@@ -41,7 +42,7 @@ if [ $REINDEX = "True" ]; then
 fi
 
 # fix media access rights
-find $media -path ${media}import -prune -o -type d -not -user www-data -exec chown www-data:www-data {} \;
+# find $media -path ${media}import -prune -o -type d -not -user www-data -exec chown www-data:www-data {} \;
 
 # choose dev or prod mode
 if [ "$1" = "--runserver" ]; then

diff --git a/telemeta/templates/telemeta/inc/mediaitem_video.html b/telemeta/templates/telemeta/inc/mediaitem_video.html
index 3b43cdd5f583103334dabddc5b15552ec205ac85..8596062e998d2e77d91bb099a44f096d13e89951 100644 (file)
--- a/telemeta/templates/telemeta/inc/mediaitem_video.html
+++ b/telemeta/templates/telemeta/inc/mediaitem_video.html
@@ -8,7 +8,7 @@
       <source src="{{ MEDIA_URL }}{{ transcoded.file }}#t=0" type="{{ transcoded.mime_type }}" />
      {% endif %}
     {% endfor %}
-      <source src="{{ MEDIA_URL }}{{ item.file }}#t=0" type="{{ mime_type }}" />
+      <source src="{% url "telemeta-item-export" item.public_id '' %}" type="{{ mime_type }}" />
 </video>
 </div>
 

diff --git a/telemeta/views/item.py b/telemeta/views/item.py
index fccc2d881344689e5325aca6a6e5da2598162f04..56210b2adc850b291385cadb2ded489bc6694e57 100644 (file)
--- a/telemeta/views/item.py
+++ b/telemeta/views/item.py
@@ -395,6 +395,9 @@ class ItemView(ItemBaseMixin):
         item = MediaItem.objects.get(public_id=public_id)
         public_access = get_item_access(item, request.user)
 
+        if not extension:
+            extension = item.file.path.split('.')[-1]
+
         if (not public_access == 'full' or not extension in settings.TELEMETA_STREAMING_FORMATS) and \
                 not (request.user.has_perm('telemeta.can_play_all_items') or request.user.is_superuser):
             mess = ugettext('Access not allowed')