From 8416be9e6d04a977eeb70522c2400fa2143f3da9 Mon Sep 17 00:00:00 2001
From: Sebastian Golasch <sebastian.golasch@telekom.de>
Date: Sun, 2 Jul 2017 23:47:33 +0200
Subject: [PATCH] fix(netflix.api): Fixes further unicode decoding problems

---
 addon.xml                               | 9 ++++++---
 resources/language/Dutch/strings.po     | 2 +-
 resources/language/English/strings.po   | 2 +-
 resources/language/German/strings.po    | 2 +-
 resources/language/Polish/strings.po    | 2 +-
 resources/language/Portugese/strings.po | 2 +-
 resources/language/Slovak/strings.po    | 2 +-
 resources/language/Spanish/strings.po   | 2 +-
 resources/language/Swedish/strings.po   | 2 +-
 resources/lib/NetflixSession.py         | 9 ++++++---
 10 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/addon.xml b/addon.xml
index 626f898..6fb3a89 100644
--- 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.13" provider-name="libdev + jojo + asciidisco">
+<addon id="plugin.video.netflix" name="Netflix" version="0.11.14" provider-name="libdev + jojo + asciidisco">
   <requires>
     <import addon="xbmc.python" version="2.24.0"/>
     <import addon="script.module.beautifulsoup4" version="4.3.2"/>
@@ -28,9 +28,12 @@
     <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.13 (2017-07-02)
+    <news>v0.11.14 (2017-07-02)
+    - Fix issue with Unicode escaping
+
+    v0.11.13 (2017-07-02)
     - Update number of requested list items (see https://github.com/asciidisco/plugin.video.netflix/issues/42 for details)
-    
+
     v0.11.12 (2017-07-02)
     - Fix missing isFirstUse inline setting
     - Fix dynamic ESN loading for widevine
diff --git a/resources/language/Dutch/strings.po b/resources/language/Dutch/strings.po
index 3cc76cf..962d907 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.12
+# Addon version: 0.11.14
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index 51ad4f5..6779545 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.12
+# Addon version: 0.11.14
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/German/strings.po b/resources/language/German/strings.po
index 3cf40ad..76decf5 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.12
+# Addon version: 0.11.14
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/Polish/strings.po b/resources/language/Polish/strings.po
index 03e4d51..4ac70c8 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.12
+# Addon version: 0.11.14
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/Portugese/strings.po b/resources/language/Portugese/strings.po
index f652897..0bca0c4 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.12
+# Addon version: 0.11.14
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/Slovak/strings.po b/resources/language/Slovak/strings.po
index d8f513f..cf87ce2 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.12
+# Addon version: 0.11.14
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/Spanish/strings.po b/resources/language/Spanish/strings.po
index 2deda61..d019e8a 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.12
+# Addon version: 0.11.14
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/language/Swedish/strings.po b/resources/language/Swedish/strings.po
index ffbdeee..540fc1d 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.12
+# Addon version: 0.11.14
 # Addon Provider: libdev + jojo + asciidisco
 msgid ""
 msgstr ""
diff --git a/resources/lib/NetflixSession.py b/resources/lib/NetflixSession.py
index eed11b3..d2be1cd 100644
--- a/resources/lib/NetflixSession.py
+++ b/resources/lib/NetflixSession.py
@@ -150,8 +150,6 @@ class NetflixSession:
                 List of all the serialized data pulled out of the pagws <script/> tags
         """
         scripts = page_soup.find_all('script', attrs={'src': None})
-        self.log(msg='Debug output for HTML contents:')
-        self.log(msg=page_soup)
         self.log(msg='Trying sloppy inline data parser')
         inline_data = self._sloppy_parse_inline_data(scripts=scripts)
         if self._verfify_auth_and_profiles_data(data=inline_data) != False:
@@ -1242,6 +1240,11 @@ class NetflixSession:
           },
         }
         """
+        mpaa = ''
+        if episode.get('maturity', None) is not None:
+            if episode['maturity'].get('board', None) is not None and episode['maturity'].get('value', None) is not None:
+                mpaa = str(episode['maturity'].get('board', '').encode('utf-8')) + '-' + str(episode['maturity'].get('value', '').encode('utf-8'))
+
         return {
             episode['summary']['id']: {
                 'id': episode['summary']['id'],
@@ -1252,7 +1255,7 @@ class NetflixSession:
                 'title': episode['info']['title'],
                 'year': episode['info']['releaseYear'],
                 'genres': self.parse_genres_for_video(video=episode, genres=genres),
-                'mpaa': str(episode['maturity']['rating']['board']).encode('utf-8') + ' ' + str(episode['maturity']['rating']['value']).encode('utf-8'),
+                'mpaa': mpaa,
                 'maturity': episode['maturity'],
                 'playcount': (0, 1)[episode['watched']],
                 'rating': episode['userRating'].get('average', 0) if episode['userRating'].get('average', None) != None else episode['userRating'].get('predicted', 0),
-- 
2.30.2