From f5ac68a81c49545d3596db3f7f4d8fdd201a6983 Mon Sep 17 00:00:00 2001 From: yomguy Date: Wed, 25 Jul 2012 01:09:03 +0200 Subject: [PATCH] fix stream types --- teleforma/models.py | 3 ++- teleforma/views.py | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/teleforma/models.py b/teleforma/models.py index a55be252..cb176192 100755 --- a/teleforma/models.py +++ b/teleforma/models.py @@ -258,7 +258,8 @@ class Conference(Model): for stream in streams: data['streams'].append({'host': stream.server.host, 'port': stream.server.port, - 'type': stream.server.type }) + 'server_type': stream.server.type, + 'stream_type': stream.stream_type }) return data class Meta: diff --git a/teleforma/views.py b/teleforma/views.py index 2e6b4c1d..880c4adb 100755 --- a/teleforma/views.py +++ b/teleforma/views.py @@ -458,13 +458,14 @@ class ConferenceRecordView(FormView): for stream in conference['streams']: host = stream['host'] port = stream['port'] - server_type = stream['type'] + server_type = stream['server_type'] + stream_type = stream['stream_type'] site = Site.objects.all() server, c = StreamingServer.objects.get_or_create(host=site[0], port=port, type=server_type) stream = LiveStream(conference=conf, server=server, - stream_type=type, streaming=True) + stream_type=stream_type, streaming=True) stream.save() else: raise 'Error : Bad Conference dictionnary' -- 2.39.5