# Get IP
def _getIP(self):
try:
- myip = urllib2.urlopen('http://whatismyip.org').read()
+ myip = urllib2.urlopen('http://ipecho.net/plain').read()
if re.match("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$", myip):
if self._debugging:
print "IP is " + myip
if 'result' in result and 'SongID' in result['result']:
info = result['result']
if 'CoverArtFilename' in info and info['CoverArtFilename'] != None:
- info['CoverArtFilename'] = THUMB_URL+info['CoverArtFilename'].encode('ascii', 'ignore')
+ info['CoverArtFilename'] = THUMB_URL+info['CoverArtFilename'].encode('utf8', 'ignore')
else:
info['CoverArtFilename'] = 'None'
return info
items = self._callRemote("getSimilarArtists", {"artistID": artistId, "limit": limit})
if 'result' in items:
i = 0
- list = []
+ itemList = []
artists = items['result']['artists']
while(i < len(artists)):
s = artists[i]
- list.append([s['artistName'].encode('ascii', 'ignore'),\
+ itemList.append([s['artistName'].encode('utf8', 'ignore'),\
s['artistID']])
i = i + 1
- return list
+ return itemList
else:
return []
def _parseSongs(self, items, limit=0):
if 'result' in items:
i = 0
- list = []
+ itemList = []
index = ''
l = -1
try:
info = self.getSongsInfo(s['SongID'])
coverart = info['CoverArtFilename']
elif s['CoverArtFilename'] != None:
- coverart = THUMB_URL+s['CoverArtFilename'].encode('ascii', 'ignore')
+ coverart = THUMB_URL+s['CoverArtFilename'].encode('utf8', 'ignore')
else:
coverart = 'None'
if 'Name' in s:
name = s['Name']
else:
name = s['SongName']
- list.append([name.encode('ascii', 'ignore'),\
+ if 'AlbumName' in s:
+ albumName = s['AlbumName']
+ else:
+ albumName = ""
+ itemList.append([name.encode('utf8', 'ignore'),\
s['SongID'],\
- s['AlbumName'].encode('ascii', 'ignore'),\
+ albumName.encode('utf8', 'ignore'),\
s['AlbumID'],\
- s['ArtistName'].encode('ascii', 'ignore'),\
+ s['ArtistName'].encode('utf8', 'ignore'),\
s['ArtistID'],\
coverart])
i = i + 1
- return list
+ return itemList
else:
return []
def _parseArtists(self, items):
if 'result' in items:
i = 0
- list = []
+ itemList = []
artists = items['result']['artists']
while(i < len(artists)):
s = artists[i]
- list.append([s['ArtistName'].encode('ascii', 'ignore'),\
+ itemList.append([s['ArtistName'].encode('utf8', 'ignore'),\
s['ArtistID']])
i = i + 1
- return list
+ return itemList
else:
return []
def _parseAlbums(self, items, limit=0):
if 'result' in items:
i = 0
- list = []
+ itemList = []
try:
albums = items['result']['albums']
except:
l = limit
while(i < l):
s = albums[i]
+ if 'Name' in s:
+ name = s['Name'].encode('utf8', 'ignore')
+ else:
+ name = s['AlbumName'].encode('utf8', 'ignore')
if 'CoverArtFilename' in s and s['CoverArtFilename'] != None:
- coverart = THUMB_URL+s['CoverArtFilename'].encode('ascii', 'ignore')
+ coverart = THUMB_URL+s['CoverArtFilename'].encode('utf8', 'ignore')
else:
coverart = 'None'
- list.append([s['ArtistName'].encode('ascii', 'ignore'),\
+ itemList.append([s['ArtistName'].encode('utf8', 'ignore'),\
s['ArtistID'],\
- s['AlbumName'].encode('ascii', 'ignore'),\
+ name,\
s['AlbumID'],\
coverart])
i = i + 1
- return list
+ return itemList
else:
return []
def _parsePlaylists(self, items):
i = 0
- list = []
+ itemList = []
if 'result' in items:
playlists = items['result']['playlists']
elif len(items) > 0:
while (i < len(playlists)):
s = playlists[i]
- list.append([str(s['PlaylistName']).encode('ascii', 'ignore'), s['PlaylistID']])
+ itemList.append([unicode(s['PlaylistName']).encode('utf8', 'ignore'), s['PlaylistID']])
i = i + 1
- return list
+ return itemList