feat(esn): Adds ESN setting

diff --git a/addon.xml b/addon.xml
index d4da0c084a1c65b8a7eafaf1f83a6c1ef72180b3..c1f2dd73b73d121da04eed2277fce8376301da1b 100644 (file)
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.netflix" name="Netflix" version="0.9.8" provider-name="libdev + jojo + asciidisco">
+<addon id="plugin.video.netflix" name="Netflix" version="0.9.9" provider-name="libdev + jojo + asciidisco">
   <requires>
     <import addon="xbmc.python" version="2.24.0"/>
     <import addon="script.module.beautifulsoup4" version="4.3.2"/>

diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index 78df567f713206742a0baaef8587cde23efdaaf1..ddbcf7141f037cc41c25e8c2ed68b24cca610014 100644 (file)
--- 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 ced3e57dc6e3089f5105f78c8f175a69401658bb..2a2fd63f1983861f21d2078ad9ec17f8f5fa2e0c 100644 (file)
--- 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 8288cb5b0342d016c8cc2cda25d81081ac939d5f..94516caf1868718b68f920efa3e572d7594d334a 100644 (file)
--- 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 30c7d4845ce668e2fa54ccc14985046aab05fead..362b080b395b64e1333e263ea8355c5439fafac1 100644 (file)
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -1,19 +1,20 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes"?>
 <settings>
   <category label="30014">
-    <setting id="email" type="text" label="30005" default="" />
-    <setting id="password" type="text" option="hidden" label="30004" default="" />
+    <setting id="email" type="text" label="30005" default=""/>
+    <setting id="password" type="text" option="hidden" label="30004" default=""/>
     <setting id="logout" type="action" label="30017" action="RunPlugin(plugin://plugin.video.netflix/?action=logout)" option="close"/>
   </category>
   <category label="30025">
-    <setting id="enablelibraryfolder" type="bool" label="30026" default="false" />
-    <setting id="customlibraryfolder" type="folder" label="30027" enable="eq(-1,true)" default="special://profile/addon_data/plugin.video.netflix" source="auto" option="writeable" subsetting="true" />
+    <setting id="enablelibraryfolder" type="bool" label="30026" default="false"/>
+    <setting id="customlibraryfolder" type="folder" label="30027" enable="eq(-1,true)" default="special://profile/addon_data/plugin.video.netflix" source="auto" option="writeable" subsetting="true"/>
   </category>
   <category label="30023">
     <setting id="enable_dolby_sound" type="bool" label="30033" default="true"/>
     <setting id="ssl_verification" type="bool" label="30024" default="true"/>
     <setting id="enable_tracking" type="bool" label="30032" default="true"/>
-    <setting id="" value="tracking_id" visible="false"/>
+    <setting id="esn" type="text" label="30034" value="" default=""/>    
+    <setting id="tracking_id" value="" visible="false"/>
     <setting id="msl_service_port" value="8000" visible="false"/>
   </category>
 </settings>