fix http urls for streaming, avoid fileresponse by django

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 063a4b0e892ae45d6cd618cd371c7387c4233d77..acb35b9250025841076d82ddc723e5f4086c2168 100644 (file)
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -418,11 +418,11 @@ class LiveStream(Model):
 
     @property
     def mount_point(self):
-        mount_point = self.server.type
+        mount_point = ''
         if self.server.type == 'stream-m':
-            mount_point += '/consume/' + self.slug
+            mount_point += 'consume/' + self.slug
         else:
-            mount_point += '/' + self.slug + '.' + self.stream_type
+            mount_point += self.slug + '.' + self.stream_type
         return mount_point
 
     @property
@@ -435,7 +435,7 @@ class LiveStream(Model):
 
     @property
     def url(self):
-        return '//' + self.server.host + ':' + self.server.port + '/' + self.mount_point
+        return 'http://' + self.server.host + ':' + self.server.port + '/' + self.mount_point
 
     def __unicode__(self):
         if self.conference:

diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 1f2e925641c8caa6453e2f87f618f8af35fdbf90..f60da0be73a2ff8c75e5de954ce0016f607efedc 100644 (file)
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -46,7 +46,7 @@ from django.utils.decorators import method_decorator
 from django.contrib.auth import authenticate, login, get_backends
 from django.template import RequestContext, loader
 from django import template
-from django.http import HttpResponse, HttpResponseRedirect, FileResponse, Http404
+from django.http import HttpResponse, HttpResponseRedirect, Http404
 from django.shortcuts import render_to_response, redirect, get_object_or_404
 from django.views.generic import *
 from django.views.generic.base import *
@@ -176,7 +176,8 @@ def serve_media(media_path, content_type="", buffering=True, streaming=False):
                                  buffering=buffering, streaming=streaming)
     else:
         try:
-            response = FileResponse(open(media_path, 'rb'))
+            pass
+            #response = FileResponse(open(media_path, 'rb'))
         except:    
             response = StreamingHttpResponse(stream_from_file(media_path), content_type=content_type)
         filename = os.path.basename(media_path)