From: yomguy <yomguy@parisson.com>
Date: Thu, 21 Feb 2013 08:51:11 +0000 (+0100)
Subject: add TELECASTER_MASTER_STREAMING bool to trigger external streaming
X-Git-Tag: 1.3-TC~46^2~3
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=9bfe1192faf35aaa7768e5c9ef05537c12d56032;p=teleforma.git

add TELECASTER_MASTER_STREAMING bool to trigger external streaming
---

diff --git a/teleforma/models/core.py b/teleforma/models/core.py
index 4031b5ee..27ce1e25 100644
--- a/teleforma/models/core.py
+++ b/teleforma/models/core.py
@@ -255,9 +255,8 @@ class Conference(Model):
         return self.description
 
     def save(self, **kwargs):
-        self.course.save()
         super(Conference, self).save(**kwargs)
-
+        self.course.save()
 
     def to_dict(self):
         dict = [{'id':'public_id','value': self.public_id, 'class':'', 'label': 'public_id'},
@@ -270,7 +269,7 @@ class Conference(Model):
                 ]
         return dict
 
-    def to_json_dict(self):
+    def to_json_dict(self, streaming=True):
         data = {'id': self.public_id,
                 'course_code': self.course.code,
                 'course_type': self.course_type.name,
@@ -286,7 +285,7 @@ class Conference(Model):
             data['organization'] = self.room.organization.name
 
         streams = self.livestream.all()
-        if streams:
+        if streams and streaming:
             for stream in streams:
                 data['streams'].append({'host': stream.server.host,
                                         'port': stream.server.port,
@@ -522,11 +521,12 @@ class Media(MediaBase):
             return self.item.file
 
     def save(self, **kwargs):
+        super(Media, self).save(**kwargs)
         if self.course:
             self.course.save()
         elif self.conference:
             self.conference.course.save()
-        super(Media, self).save(**kwargs)
+
 
 
     class Meta(MetaCore):
diff --git a/teleforma/views/core.py b/teleforma/views/core.py
index 4d2fd39f..3eea6852 100644
--- a/teleforma/views/core.py
+++ b/teleforma/views/core.py
@@ -527,7 +527,6 @@ class ConferenceRecordView(FormView):
                 conf.period, c = Period.objects.get_or_create(name=conference['period'])
                 conf.department, c = Department.objects.get_or_create(name=conference['department'])
                 conf.save()
-                course.save()
                 for stream in conference['streams']:
                     host = stream['host']
                     port = stream['port']
@@ -546,7 +545,11 @@ class ConferenceRecordView(FormView):
     def push(self, conference):
         url = 'http://' + conference.department.domain + '/json/'
         s = ServiceProxy(url)
-        s.teleforma.create_conference(conference.to_json_dict())
+        try:
+            streaming = settings.TELECASTER_MASTER_STREAMING
+        except:
+            streaming = True
+        s.teleforma.create_conference(conference.to_json_dict(streaming=streaming))
 
 
 class HelpView(TemplateView):