From: Sebastian Golasch Date: Sun, 2 Jul 2017 19:24:26 +0000 (+0200) Subject: fix(esn): Fixes unicode problems X-Git-Url: http://git.code-monkey.de/?p=plugin.video.netflix.git;a=commitdiff_plain;h=0b40c0a42d38965219d8d4c63fe40053b037841f fix(esn): Fixes unicode problems --- diff --git a/addon.xml b/addon.xml index 492844f..8f3b40a 100644 --- a/addon.xml +++ b/addon.xml @@ -28,9 +28,10 @@ MIT http://www.kodinerds.net/index.php/Thread/55607-Inputstream-Agile-Betatest-Netflix/ https://github.com/asciidisco/plugin.video.netflix - v0.11.12 (2017-6-29) + v0.11.12 (2017-07-02) - Fix missing isFirstUse inline setting - Fix dynamic ESN loading for widevine + - Fix unicode decoding problems v0.11.11 (2017-4-10) - Portugese translations diff --git a/resources/lib/KodiHelper.py b/resources/lib/KodiHelper.py index a40c5d8..a75f2e7 100644 --- a/resources/lib/KodiHelper.py +++ b/resources/lib/KodiHelper.py @@ -775,7 +775,9 @@ class KodiHelper: if 'mpaa' in entry_keys: infos.update({'mpaa': entry['mpaa']}) else: - infos.update({'mpaa': str(entry['maturity']['board']) + '-' + str(entry['maturity']['value'])}) + if entry.get('maturity', None) is not None: + if entry['maturity']['board'] is not None and entry['maturity']['value'] is not None: + infos.update({'mpaa': str(entry['maturity']['board'].encode('utf-8')) + '-' + str(entry['maturity']['value'].encode('utf-8'))}) if 'rating' in entry_keys: infos.update({'rating': int(entry['rating']) * 2}) if 'synopsis' in entry_keys: diff --git a/resources/lib/NetflixSession.py b/resources/lib/NetflixSession.py index 09938af..e5d3219 100644 --- a/resources/lib/NetflixSession.py +++ b/resources/lib/NetflixSession.py @@ -1250,7 +1250,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']) + ' ' + str(episode['maturity']['rating']['value']), + 'mpaa': str(episode['maturity']['rating']['board']).encode('utf-8') + ' ' + str(episode['maturity']['rating']['value']).encode('utf-8'), '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),