diff --git a/app/service/view.py b/app/service/view.py index ed45527..9779ebc 100644 --- a/app/service/view.py +++ b/app/service/view.py @@ -59,28 +59,28 @@ class ServiceView(FlaskView): stream = server.make_proxy_vod() elif stream_type == constants.StreamType.RELAY: stream = server.make_relay_stream() - stream.output.urls[0] = stream.generate_http_link(constants.HlsType.HLS_PULL, - oid=stream.output.urls[0].id) + stream.output = [stream.generate_http_link(constants.HlsType.HLS_PULL, + oid=stream.output[0].id)] elif stream_type == constants.StreamType.ENCODE: stream = server.make_encode_stream() - stream.output.urls[0] = stream.generate_http_link(constants.HlsType.HLS_PULL, - oid=stream.output.urls[0].id) + stream.output = [stream.generate_http_link(constants.HlsType.HLS_PULL, + oid=stream.output[0].id)] elif stream_type == constants.StreamType.VOD_RELAY: stream = server.make_vod_relay_stream() - stream.output.urls[0] = stream.generate_vod_link(constants.HlsType.HLS_PULL, - oid=stream.output.urls[0].id) + stream.output = [stream.generate_vod_link(constants.HlsType.HLS_PULL, + oid=stream.output[0].id)] elif stream_type == constants.StreamType.VOD_ENCODE: stream = server.make_vod_encode_stream() - stream.output.urls[0] = stream.generate_vod_link(constants.HlsType.HLS_PULL, - oid=stream.output.urls[0].id) + stream.output = [stream.generate_vod_link(constants.HlsType.HLS_PULL, + oid=stream.output[0].id)] elif stream_type == constants.StreamType.COD_RELAY: stream = server.make_cod_relay_stream() - stream.output.urls[0] = stream.generate_cod_link(constants.HlsType.HLS_PULL, - oid=stream.output.urls[0].id) + stream.output = [stream.generate_cod_link(constants.HlsType.HLS_PULL, + oid=stream.output[0].id)] elif stream_type == constants.StreamType.COD_ENCODE: stream = server.make_cod_encode_stream() - stream.output.urls[0] = stream.generate_cod_link(constants.HlsType.HLS_PULL, - oid=stream.output.urls[0].id) + stream.output = [stream.generate_cod_link(constants.HlsType.HLS_PULL, + oid=stream.output[0].id)] elif stream_type == constants.StreamType.CATCHUP: stream = server.make_catchup_stream() else: @@ -88,9 +88,9 @@ class ServiceView(FlaskView): input_url = file['link'] if stream_type == constants.StreamType.PROXY or stream_type == constants.StreamType.VOD_PROXY: - stream.output.urls[0].uri = input_url + stream.output[0].uri = input_url else: - stream.input.urls[0].uri = input_url + stream.input[0].uri = input_url stream.tvg_logo = default_logo_path diff --git a/requirements.txt b/requirements.txt index 3a480ff..382794a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,5 @@ flask>=1.0.0 +flask_wtf>=0.14 flask_socketio>=1.0 flask_pymodm>=0.1.2 flask_login>=0.3.0 diff --git a/scripts/create_provider.py b/scripts/create_provider.py index d656926..d0d4537 100755 --- a/scripts/create_provider.py +++ b/scripts/create_provider.py @@ -22,7 +22,7 @@ if __name__ == '__main__': email = argv.email password = argv.password - connect(mongodb_uri=argv.mongo_uri, alias='default') + connect(mongodb_uri=argv.mongo_uri) new_user = ProviderAdminUser.make_provider(email=email.lower(), password=password, country=argv.country, language=argv.language) new_user.status = ProviderAdminUser.Status.ACTIVE diff --git a/scripts/migrate/xtream/streams.py b/scripts/migrate/xtream/streams.py index a164356..895b1fd 100755 --- a/scripts/migrate/xtream/streams.py +++ b/scripts/migrate/xtream/streams.py @@ -18,7 +18,7 @@ def import_streams_to_server(db, server: ServiceSettings): if not len(urls): continue - stream.output.urls[0].uri = urls[0] + stream.output[0].uri = urls[0] stream.name = sql_entry['stream_display_name'] tvg_logo = sql_entry['stream_icon'] if len(tvg_logo) < constants.MAX_URL_LENGTH: diff --git a/scripts/test_life.py b/scripts/test_life.py index f717508..fd39f9c 100755 --- a/scripts/test_life.py +++ b/scripts/test_life.py @@ -38,7 +38,7 @@ if __name__ == '__main__': m3u_parser.parse() for file in m3u_parser.files: stream = TestLifeStream.make_stream(service_settings) - stream.input.urls[0].uri = file['link'] + stream.input[0].uri = file['link'] stream.name = '{0}({1})'.format(file['tvg-group'], file['title']) service_settings.streams.append(stream)