From d452ed43938b00e420ebe32091597102aad5be22 Mon Sep 17 00:00:00 2001 From: Sebastian Golasch Date: Mon, 6 Mar 2017 14:08:19 +0100 Subject: [PATCH] feat(esn): Adds ESN setting --- addon.xml | 2 +- resources/language/English/strings.po | 6 +++++- resources/language/German/strings.po | 6 +++++- resources/lib/KodiHelper.py | 7 +++++-- resources/settings.xml | 11 ++++++----- 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/addon.xml b/addon.xml index d4da0c0..c1f2dd7 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 78df567..ddbcf71 100644 --- a/resources/language/English/strings.po +++ b/resources/language/English/strings.po @@ -1,7 +1,7 @@ # Kodi Media Center language file # Addon Name: Netflix # Addon id: plugin.video.netflix -# Addon version: 0.9.8 +# Addon version: 0.9.9 # Addon Provider: libdev + jojo + asciidisco msgid "" msgstr "" @@ -152,3 +152,7 @@ msgstr "" msgctxt "#30033" msgid "Use Dolby Sound" msgstr "" + +msgctxt "#30034" +msgid "ESN (set automatically, can be changed manually)" +msgstr "" diff --git a/resources/language/German/strings.po b/resources/language/German/strings.po index ced3e57..2a2fd63 100644 --- a/resources/language/German/strings.po +++ b/resources/language/German/strings.po @@ -1,7 +1,7 @@ # Kodi Media Center language file # Addon Name: Netflix # Addon id: plugin.video.netflix -# Addon version: 0.9.8 +# Addon version: 0.9.9 # Addon Provider: libdev + jojo + asciidisco msgid "" msgstr "" @@ -152,3 +152,7 @@ msgstr "Tracking" msgctxt "#30033" msgid "Use Dolby Sound" msgstr "Benutze Dolby Ton" + +msgctxt "#30034" +msgid "ESN (set automatically, can be changed manually)" +msgstr "ESN (änderbar, wird auto. gesetzt)" diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py index 8288cb5..94516ca 100644 --- a/resources/lib/KodiHelper.py +++ b/resources/lib/KodiHelper.py @@ -649,6 +649,11 @@ class KodiHelper: # track play event self.track_event('playVideo') + # check esn in settings + settings_esn = str(self.addon.getSetting('esn')) + if len(settings_esn) == 0: + self.addon.setSetting('esn', str(esn)) + # inputstream addon properties msl_service_url = 'http://localhost:' + str(self.addon.getSetting('msl_service_port')) play_item = xbmcgui.ListItem(path=msl_service_url + '/manifest?id=' + video_id) @@ -656,8 +661,6 @@ class KodiHelper: play_item.setProperty(inputstream_addon + '.manifest_type', 'mpd') play_item.setProperty(inputstream_addon + '.license_key', msl_service_url + '/license?id=' + video_id + '||b{SSM}!b{SID}|') play_item.setProperty(inputstream_addon + '.server_certificate', 'Cr0CCAMSEOVEukALwQ8307Y2+LVP+0MYh/HPkwUijgIwggEKAoIBAQDm875btoWUbGqQD8eAGuBlGY+Pxo8YF1LQR+Ex0pDONMet8EHslcZRBKNQ/09RZFTP0vrYimyYiBmk9GG+S0wB3CRITgweNE15cD33MQYyS3zpBd4z+sCJam2+jj1ZA4uijE2dxGC+gRBRnw9WoPyw7D8RuhGSJ95OEtzg3Ho+mEsxuE5xg9LM4+Zuro/9msz2bFgJUjQUVHo5j+k4qLWu4ObugFmc9DLIAohL58UR5k0XnvizulOHbMMxdzna9lwTw/4SALadEV/CZXBmswUtBgATDKNqjXwokohncpdsWSauH6vfS6FXwizQoZJ9TdjSGC60rUB2t+aYDm74cIuxAgMBAAE6EHRlc3QubmV0ZmxpeC5jb20SgAOE0y8yWw2Win6M2/bw7+aqVuQPwzS/YG5ySYvwCGQd0Dltr3hpik98WijUODUr6PxMn1ZYXOLo3eED6xYGM7Riza8XskRdCfF8xjj7L7/THPbixyn4mULsttSmWFhexzXnSeKqQHuoKmerqu0nu39iW3pcxDV/K7E6aaSr5ID0SCi7KRcL9BCUCz1g9c43sNj46BhMCWJSm0mx1XFDcoKZWhpj5FAgU4Q4e6f+S8eX39nf6D6SJRb4ap7Znzn7preIvmS93xWjm75I6UBVQGo6pn4qWNCgLYlGGCQCUm5tg566j+/g5jvYZkTJvbiZFwtjMW5njbSRwB3W4CrKoyxw4qsJNSaZRTKAvSjTKdqVDXV/U5HK7SaBA6iJ981/aforXbd2vZlRXO/2S+Maa2mHULzsD+S5l4/YGpSt7PnkCe25F+nAovtl/ogZgjMeEdFyd/9YMYjOS4krYmwp3yJ7m9ZzYCQ6I8RQN4x/yLlHG5RH/+WNLNUs6JAZ0fFdCmw=') - # TODO: Change when Kodi can handle/trnsfer defaults in hidden values in settings - #play_item.setProperty(inputstream_addon + '.server_certificate', self.addon.getSetting('msl_service_certificate')) play_item.setProperty('inputstreamaddon', inputstream_addon) # check if we have a bookmark e.g. start offset position diff --git a/resources/settings.xml b/resources/settings.xml index 30c7d48..362b080 100644 --- a/resources/settings.xml +++ b/resources/settings.xml @@ -1,19 +1,20 @@ - - + + - - + + - + + -- 2.30.2