From 054b6145ff51bb7a28064384ffbfe009ba4294af Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Thu, 7 Mar 2019 23:40:33 +0100 Subject: [PATCH] No sub directory for stream server, use settings to define stream servers --- teleforma/models/core.py | 4 ++-- teleforma/views/core.py | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/teleforma/models/core.py b/teleforma/models/core.py index c091edee..b8ad93a8 100644 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -236,7 +236,7 @@ class Course(Model): """ periods = [ p['id'] for p in self.periods.values('id') ] return not periods or period.id in periods - + class Meta(MetaCore): db_table = app_label + '_' + 'course' verbose_name = _('course') @@ -499,7 +499,7 @@ class LiveStream(Model): @property def mount_point(self): - mount_point = self.server.type + # mount_point = self.server.type if self.server.type == 'stream-m': mount_point += '/consume/' + self.slug else: diff --git a/teleforma/views/core.py b/teleforma/views/core.py index de08839b..3ae415e9 100644 --- a/teleforma/views/core.py +++ b/teleforma/views/core.py @@ -759,9 +759,12 @@ class ConferenceRecordView(FormView): for stream in conf_dict['streams']: host = getattr(settings, "TELECASTER_LIVE_STREAMING_SERVER", stream['host']) - port = getattr(settings, "TELECASTER_LIVE_STREAMING_PORT", stream['port']) server_type = stream['server_type'] stream_type = stream['stream_type'] + if server_type == 'icecast': + port = getattr(settings, "TELECASTER_LIVE_ICECAST_STREAMING_PORT", stream['port']) + elif server_type == 'stream-m': + port = getattr(settings, "TELECASTER_LIVE_STREAM_M_STREAMING_PORT", stream['port']) #site = Site.objects.all()[0] server, c = StreamingServer.objects.get_or_create(host=host, port=port, -- 2.39.5