Skip to content
Snippets Groups Projects
Commit a6f1f6a4 authored by Benoît Harrault's avatar Benoît Harrault
Browse files

Fix encoding in title and artist name

parent 9a6ca42c
No related branches found
No related tags found
1 merge request!21Resolve "Fix encoding in track data"
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="script.spotify.screensaver" <addon id="script.spotify.screensaver"
name="Spotify Screensaver" name="Spotify Screensaver"
version="0.0.15" version="0.0.16"
provider-name="Benoît Harrault"> provider-name="Benoît Harrault">
<requires> <requires>
<import addon="xbmc.python" version="2.25.0"/> <import addon="xbmc.python" version="2.25.0"/>
......
...@@ -172,6 +172,9 @@ class GUI(xbmcgui.WindowXMLDialog): ...@@ -172,6 +172,9 @@ class GUI(xbmcgui.WindowXMLDialog):
self.PanelItems = self.getControl(101) self.PanelItems = self.getControl(101)
self.PanelItems.reset() self.PanelItems.reset()
def _fix_encoding(self, string):
return string.encode('utf-8')
def _get_track_data(self, track_id, try_count=1): def _get_track_data(self, track_id, try_count=1):
self.log('track_id: [' + str(track_id) + ']') self.log('track_id: [' + str(track_id) + ']')
self.log('(try: ' + str(try_count) + ')') self.log('(try: ' + str(try_count) + ')')
...@@ -191,7 +194,7 @@ class GUI(xbmcgui.WindowXMLDialog): ...@@ -191,7 +194,7 @@ class GUI(xbmcgui.WindowXMLDialog):
) )
data = response.json() data = response.json()
track_data['track_name'] = data.get('name', '') track_data['track_name'] = self._fix_encoding(data.get('name', ''))
track_data['track_artists'] = [] track_data['track_artists'] = []
# album/track image # album/track image
...@@ -229,7 +232,7 @@ class GUI(xbmcgui.WindowXMLDialog): ...@@ -229,7 +232,7 @@ class GUI(xbmcgui.WindowXMLDialog):
self.log('ok got artist_name from API') self.log('ok got artist_name from API')
self.log(json.dumps(artist_name)) self.log(json.dumps(artist_name))
track_data['track_artists'].append(artist_name) track_data['track_artists'].append(self._fix_encoding(artist_name))
# get images # get images
images = album.get('images') images = album.get('images')
...@@ -257,7 +260,7 @@ class GUI(xbmcgui.WindowXMLDialog): ...@@ -257,7 +260,7 @@ class GUI(xbmcgui.WindowXMLDialog):
self.log(track_image_url) self.log(track_image_url)
track_data['track_image_url'] = track_image_url track_data['track_image_url'] = track_image_url
except Exception as e: except Exception as e:
self.log('failed to get track data ' + str(e), xbmc.LOGERROR) self.log('failed to get track data: ' + str(e), xbmc.LOGERROR)
return track_data return track_data
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment