fix(netflix-session): Fix error on nix devices reteieving the esn+

diff --git a/addon.xml b/addon.xml
index 36678e01208d34cc063af2acdfcd4b9308952c25..d09e656bd22da07364ab3e4dcffa209ec9bb7cb3 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.11.15" provider-name="libdev + jojo + asciidisco">
+<addon id="plugin.video.netflix" name="Netflix" version="0.11.16" provider-name="libdev + jojo + asciidisco">
   <requires>
     <import addon="xbmc.python" version="2.24.0"/>
     <import addon="script.module.beautifulsoup4" version="4.3.2"/>
@@ -28,8 +28,11 @@
     <license>MIT</license>
     <forum>http://www.kodinerds.net/index.php/Thread/55607-Inputstream-Agile-Betatest-Netflix/</forum>
     <source>https://github.com/asciidisco/plugin.video.netflix</source>
-    <news>v0.11.15 (2017-07-19)
-    - Fix issue with Slovak, Polich &amp; Swedish language filed
+    <news>v0.11.16 (2017-07-19)
+    - Fix error on *nix devices
+    
+    v0.11.15 (2017-07-19)
+    - Fix issue with Slovak, Polish &amp; Swedish language files
     - Add calculation of ESN for Android
     - Logout in settings now also deletes Manifest data
     - Add hidden ESN field in config &amp; 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 65e2843b0ed549e7ae7a75dda07b6e904b0818b5..8f5e764ea8e587080d3ba1b5b871235755219d54 100644 (file)
--- 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 263290eacd8728379e38b112ab270d04b09b20f0..6b0af3b89727b94f4206c9597223addc26e6461e 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.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 37fba83d64a7dea6de3ec4fcee191007f80261ef..d374ea8e43eee073df2859894cd7b1cb128c85a1 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.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 5261bac5433d219af03c2e5e92e8a7b93f0b8b80..36adb014a92cdcab6cc2f1f4b29235b0e6c413ca 100644 (file)
--- 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 82f1382b50a9c13335087d8a5d91592924ec1f12..0bdb5ff15c549bfb9fd6ac29f191caa81e9e89cd 100644 (file)
--- 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 5886548327cdd44990367ac368daf0f24b54d34b..dc74ae43acc3b2ad07f1aeb6afb146f8bad20706 100644 (file)
--- 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 03650fa95745f83ac9488c0fbf47bab8d6fdd52f..130105e6eff436cf05967f1b03a17b6e46f5ef12 100644 (file)
--- 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 963699bd21b4ec1c5a33baa858b3db0ec9eb55f7..2da2ff6690393c3e6df99df4eb01c11e81cf98e8 100644 (file)
--- 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 9c248d9c293a078cba301963054048d47d7de843..f27d6d813060e0e7b2eabab35ced903c29729cf4 100644 (file)
--- 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 ca4bd5cc0272449d88bfaaf71a96ce508b17acb4..69c848f666f1761e14cc6c501321cd1faae39182 100644 (file)
--- 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: