From: Sebastian Golasch Date: Wed, 19 Jul 2017 19:29:55 +0000 (+0200) Subject: fix(netflix-session): Fix error on nix devices reteieving the esn+ X-Git-Url: http://git.code-monkey.de/?p=plugin.video.netflix.git;a=commitdiff_plain;h=c6e56c0365952da48fa6678c83497fecdb5d73e6 fix(netflix-session): Fix error on nix devices reteieving the esn+ --- diff --git a/addon.xml b/addon.xml index 36678e0..d09e656 100644 --- a/addon.xml +++ b/addon.xml @@ -1,5 +1,5 @@ - + @@ -28,8 +28,11 @@ MIT http://www.kodinerds.net/index.php/Thread/55607-Inputstream-Agile-Betatest-Netflix/ https://github.com/asciidisco/plugin.video.netflix - v0.11.15 (2017-07-19) - - Fix issue with Slovak, Polich & Swedish language filed + v0.11.16 (2017-07-19) + - Fix error on *nix devices + + v0.11.15 (2017-07-19) + - Fix issue with Slovak, Polish & Swedish language files - Add calculation of ESN for Android - Logout in settings now also deletes Manifest data - Add hidden ESN field in config & delete Manifest data if it doesn't fit the public one diff --git a/resources/language/Dutch/strings.po b/resources/language/Dutch/strings.po index 65e2843..8f5e764 100644 --- a/resources/language/Dutch/strings.po +++ b/resources/language/Dutch/strings.po @@ -1,7 +1,7 @@ # Kodi Media Center language file # Addon Name: Netflix # Addon id: plugin.video.netflix -# Addon version: 0.11.15 +# Addon version: 0.11.16 # Addon Provider: libdev + jojo + asciidisco msgid "" msgstr "" diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po index 263290e..6b0af3b 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.11.15 +# Addon version: 0.11.16 # Addon Provider: libdev + jojo + asciidisco msgid "" msgstr "" diff --git a/resources/language/German/strings.po b/resources/language/German/strings.po index 37fba83..d374ea8 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.11.15 +# Addon version: 0.11.16 # Addon Provider: libdev + jojo + asciidisco msgid "" msgstr "" diff --git a/resources/language/Polish/strings.po b/resources/language/Polish/strings.po index 5261bac..36adb01 100644 --- a/resources/language/Polish/strings.po +++ b/resources/language/Polish/strings.po @@ -1,7 +1,7 @@ # Kodi Media Center language file # Addon Name: Netflix # Addon id: plugin.video.netflix -# Addon version: 0.11.15 +# Addon version: 0.11.16 # Addon Provider: libdev + jojo + asciidisco msgid "" msgstr "" diff --git a/resources/language/Portugese/strings.po b/resources/language/Portugese/strings.po index 82f1382..0bdb5ff 100644 --- a/resources/language/Portugese/strings.po +++ b/resources/language/Portugese/strings.po @@ -1,7 +1,7 @@ # Kodi Media Center language file # Addon Name: Netflix # Addon id: plugin.video.netflix -# Addon version: 0.11.15 +# Addon version: 0.11.16 # Addon Provider: libdev + jojo + asciidisco msgid "" msgstr "" diff --git a/resources/language/Slovak/strings.po b/resources/language/Slovak/strings.po index 5886548..dc74ae4 100644 --- a/resources/language/Slovak/strings.po +++ b/resources/language/Slovak/strings.po @@ -1,7 +1,7 @@ # Kodi Media Center language file # Addon Name: Netflix # Addon id: plugin.video.netflix -# Addon version: 0.11.15 +# Addon version: 0.11.16 # Addon Provider: libdev + jojo + asciidisco msgid "" msgstr "" diff --git a/resources/language/Spanish/strings.po b/resources/language/Spanish/strings.po index 03650fa..130105e 100644 --- a/resources/language/Spanish/strings.po +++ b/resources/language/Spanish/strings.po @@ -1,7 +1,7 @@ # Kodi Media Center language file # Addon Name: Netflix # Addon id: plugin.video.netflix -# Addon version: 0.11.15 +# Addon version: 0.11.16 # Addon Provider: libdev + jojo + asciidisco msgid "" msgstr "" diff --git a/resources/language/Swedish/strings.po b/resources/language/Swedish/strings.po index 963699b..2da2ff6 100644 --- a/resources/language/Swedish/strings.po +++ b/resources/language/Swedish/strings.po @@ -1,7 +1,7 @@ # Kodi Media Center language file # Addon Name: Netflix # Addon id: plugin.video.netflix -# Addon version: 0.11.15 +# Addon version: 0.11.16 # Addon Provider: libdev + jojo + asciidisco msgid "" msgstr "" diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py index 9c248d9..f27d6d8 100644 --- a/resources/lib/KodiHelper.py +++ b/resources/lib/KodiHelper.py @@ -204,19 +204,7 @@ class KodiHelper: """ Returns the esn from settings """ - stored_esn = self.get_esn() - hidden_esn = self.get_addon().getSetting('hidden_esn') - if hidden_esn == '' and esn: - self.set_setting('esn', esn) - self.set_setting('hidden_esn', esn) - self.delete_manifest_data() - return esn - - if hidden_esn != stored_esn: - self.set_setting('hidden_esn', stored_esn) - self.delete_manifest_data() - return stored_esn - + stored_esn = self.get_esn() if not stored_esn and esn: self.set_setting('esn', esn) self.delete_manifest_data() diff --git a/resources/lib/NetflixSession.py b/resources/lib/NetflixSession.py index ca4bd5c..69c848f 100644 --- a/resources/lib/NetflixSession.py +++ b/resources/lib/NetflixSession.py @@ -2301,20 +2301,22 @@ class NetflixSession: """ # we generate an esn from device strings for android import subprocess - manufacturer = subprocess.check_output(["/system/bin/getprop", "ro.product.manufacturer"]) - - if manufacturer : - esn = 'NFANDROID1-PRV-' - input = subprocess.check_output(["/system/bin/getprop", "ro.nrdp.modelgroup"]) - if not input: - esn = esn + 'T-L3-' - else: - esn = esn + input.strip(' \t\n\r') + '-' - esn = esn + '{:5}'.format(manufacturer.strip(' \t\n\r').upper()) - input = subprocess.check_output(["/system/bin/getprop" ,"ro.product.model"]) - esn = esn + input.strip(' \t\n\r').replace(' ', '=').upper() - self.log(msg='Android generated ESN:' + esn) - return esn + try: + manufacturer = subprocess.check_output(["/system/bin/getprop", "ro.product.manufacturer"]) + if manufacturer: + esn = 'NFANDROID1-PRV-' + input = subprocess.check_output(["/system/bin/getprop", "ro.nrdp.modelgroup"]) + if not input: + esn = esn + 'T-L3-' + else: + esn = esn + input.strip(' \t\n\r') + '-' + esn = esn + '{:5}'.format(manufacturer.strip(' \t\n\r').upper()) + input = subprocess.check_output(["/system/bin/getprop" ,"ro.product.model"]) + esn = esn + input.strip(' \t\n\r').replace(' ', '=').upper() + self.log(msg='Android generated ESN:' + esn) + return esn + except OSError as e: + self.log(msg='Ignoring exception for non Android devices') # values are accessible via dict (sloppy parsing successfull) if type(netflix_page_data) == dict: