HCoop
/
clinton
/
xbmc-groove.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace md5 with hashlib.
[clinton/xbmc-groove.git]
/
resources
/
lib
/
GroovesharkAPI.py
diff --git
a/resources/lib/GroovesharkAPI.py
b/resources/lib/GroovesharkAPI.py
index
64e2504
..
fd09c16
100644
(file)
--- a/
resources/lib/GroovesharkAPI.py
+++ b/
resources/lib/GroovesharkAPI.py
@@
-15,7
+15,7
@@
# You should have received a copy of the GNU General Public License
# along with xbmc-groove. If not, see <http://www.gnu.org/licenses/>.
# You should have received a copy of the GNU General Public License
# along with xbmc-groove. If not, see <http://www.gnu.org/licenses/>.
-import urllib2, pprint,
md5, os, pickle, tempfile, time, re, simplejson, base64
+import urllib2, pprint,
os, pickle, tempfile, time, re, simplejson, base64, sys, socket, hashlib
from blowfish import Blowfish
SESSION_EXPIRY = 1209600 # 2 weeks
from blowfish import Blowfish
SESSION_EXPIRY = 1209600 # 2 weeks
@@
-38,19
+38,21
@@
class GrooveAPI:
_sessionID = ''
_userID = 0
_lastSessionTime = 0
_sessionID = ''
_userID = 0
_lastSessionTime = 0
- _lastStreamKey = ''
- _lastStreamServerID = ''
- _key = md5.new(os.path.basename("GroovesharkAPI.py")).hexdigest()
- _apiDebug = False
+ _key = hashlib.md5(os.path.basename("GroovesharkAPI.py")).hexdigest()
+ _debugging = False
# Constructor
# Constructor
- def __init__(self):
+ def __init__(self
, debug
):
+ self._debugging = debug
self.simplejson = simplejson
self.simplejson = simplejson
+ if "linux" in sys.platform.lower():
+ socket.setdefaulttimeout(30)
+
self.cacheDir = os.path.join(tempfile.gettempdir(), 'groovesharkapi')
if os.path.isdir(self.cacheDir) == False:
os.makedirs(self.cacheDir)
self.cacheDir = os.path.join(tempfile.gettempdir(), 'groovesharkapi')
if os.path.isdir(self.cacheDir) == False:
os.makedirs(self.cacheDir)
- if self._
apiDebu
g:
+ if self._
debuggin
g:
print "Made " + self.cacheDir
self._getSavedSession()
# session ids last 2 weeks
print "Made " + self.cacheDir
self._getSavedSession()
# session ids last 2 weeks
@@
-59,7
+61,7
@@
class GrooveAPI:
if self._sessionID == '':
raise StandardError('Failed to get session id')
else:
if self._sessionID == '':
raise StandardError('Failed to get session id')
else:
- if self._
apiDebu
g:
+ if self._
debuggin
g:
print "New GrooveAPI session id: " + self._sessionID
self._ip = self._getIP()
self._country = self._getCountry()
print "New GrooveAPI session id: " + self._sessionID
self._ip = self._getIP()
self._country = self._getCountry()
@@
-78,7
+80,7
@@
class GrooveAPI:
req = urllib2.Request(url, postData)
response = urllib2.urlopen(req)
result = response.read()
req = urllib2.Request(url, postData)
response = urllib2.urlopen(req)
result = response.read()
- if self._
apiDebu
g:
+ if self._
debuggin
g:
print "Response..."
pprint.pprint(result)
response.close()
print "Response..."
pprint.pprint(result)
response.close()
@@
-106,7
+108,7
@@
class GrooveAPI:
req = urllib2.Request(url)
response = urllib2.urlopen(req)
result = response.read()
req = urllib2.Request(url)
response = urllib2.urlopen(req)
result = response.read()
- if self._
apiDebu
g:
+ if self._
debuggin
g:
print "Request..."
pprint.pprint(result)
response.close()
print "Request..."
pprint.pprint(result)
response.close()
@@
-162,9
+164,9
@@
class GrooveAPI:
# Get IP
def _getIP(self):
try:
# 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 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._
apiDebu
g:
+ if self._
debuggin
g:
print "IP is " + myip
return myip
except:
print "IP is " + myip
return myip
except:
@@
-186,7
+188,7
@@
class GrooveAPI:
# Authenticates the user for current API session
def _authenticate(self, login, password):
# Authenticates the user for current API session
def _authenticate(self, login, password):
- md5pwd =
md5.new
(password).hexdigest()
+ md5pwd =
hashlib.md5
(password).hexdigest()
params = {'login': login, 'password': md5pwd}
result = self._callRemote('authenticate', params)
params = {'login': login, 'password': md5pwd}
result = self._callRemote('authenticate', params)
@@
-232,8
+234,6
@@
class GrooveAPI:
params = { "songID": songID, "country": self._country }
response = self._callRemote("getSubscriberStreamKey", params)
try:
params = { "songID": songID, "country": self._country }
response = self._callRemote("getSubscriberStreamKey", params)
try:
- self._lastStreamKey = response["result"]["StreamKey"]
- self._lastStreamServerID = response["result"]["StreamServerID"]
res = response["result"]
return res
except:
res = response["result"]
return res
except:
@@
-312,7
+312,7
@@
class GrooveAPI:
if 'result' in result and 'SongID' in result['result']:
info = result['result']
if 'CoverArtFilename' in info and info['CoverArtFilename'] != None:
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
else:
info['CoverArtFilename'] = 'None'
return info
@@
-397,14
+397,14
@@
class GrooveAPI:
items = self._callRemote("getSimilarArtists", {"artistID": artistId, "limit": limit})
if 'result' in items:
i = 0
items = self._callRemote("getSimilarArtists", {"artistID": artistId, "limit": limit})
if 'result' in items:
i = 0
-
l
ist = []
+
itemL
ist = []
artists = items['result']['artists']
while(i < len(artists)):
s = artists[i]
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
s['artistID']])
i = i + 1
- return
l
ist
+ return
itemL
ist
else:
return []
else:
return []
@@
-430,27
+430,20
@@
class GrooveAPI:
return False
# After 30s play time
return False
# After 30s play time
- def markStreamKeyOver30Secs(self):
- params = { "streamKey" : s
elf._lastStreamKey, "streamServerID" : self._lastS
treamServerID }
+ def markStreamKeyOver30Secs(self
, streamKey, streamServerID
):
+ params = { "streamKey" : s
treamKey, "streamServerID" : s
treamServerID }
self._callRemote("markStreamKeyOver30Secs", params)
# Song complete
self._callRemote("markStreamKeyOver30Secs", params)
# Song complete
- def markSongComplete(self, songid
):
- params = { "songID" : songid, "streamKey" : s
elf._lastStreamKey, "streamServerID" : self._lastS
treamServerID }
+ def markSongComplete(self, songid
, streamKey, streamServerID):
+ params = { "songID" : songid, "streamKey" : s
treamKey, "streamServerID" : s
treamServerID }
self._callRemote("markSongComplete", params)
self._callRemote("markSongComplete", params)
-
- # Debug on off
- def setDebug(self, state):
- self._apiDebug = state
- if (self._apiDebug):
- print "API debug is on"
-
# Extract song data
def _parseSongs(self, items, limit=0):
if 'result' in items:
i = 0
# Extract song data
def _parseSongs(self, items, limit=0):
if 'result' in items:
i = 0
-
l
ist = []
+
itemL
ist = []
index = ''
l = -1
try:
index = ''
l = -1
try:
@@
-488,18
+481,26
@@
class GrooveAPI:
info = self.getSongsInfo(s['SongID'])
coverart = info['CoverArtFilename']
elif s['CoverArtFilename'] != None:
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'
else:
coverart = 'None'
- list.append([s['SongName'].encode('ascii', 'ignore'),\
+ if 'Name' in s:
+ name = s['Name']
+ else:
+ name = s['SongName']
+ if 'AlbumName' in s:
+ albumName = s['AlbumName']
+ else:
+ albumName = ""
+ itemList.append([name.encode('utf8', 'ignore'),\
s['SongID'],\
s['SongID'],\
-
s['AlbumName'].encode('ascii
', 'ignore'),\
+
albumName.encode('utf8
', 'ignore'),\
s['AlbumID'],\
s['AlbumID'],\
- s['ArtistName'].encode('
ascii
', 'ignore'),\
+ s['ArtistName'].encode('
utf8
', 'ignore'),\
s['ArtistID'],\
coverart])
i = i + 1
s['ArtistID'],\
coverart])
i = i + 1
- return
l
ist
+ return
itemL
ist
else:
return []
else:
return []
@@
-507,14
+508,14
@@
class GrooveAPI:
def _parseArtists(self, items):
if 'result' in items:
i = 0
def _parseArtists(self, items):
if 'result' in items:
i = 0
-
l
ist = []
+
itemL
ist = []
artists = items['result']['artists']
while(i < len(artists)):
s = artists[i]
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
s['ArtistID']])
i = i + 1
- return
l
ist
+ return
itemL
ist
else:
return []
else:
return []
@@
-522,7
+523,7
@@
class GrooveAPI:
def _parseAlbums(self, items, limit=0):
if 'result' in items:
i = 0
def _parseAlbums(self, items, limit=0):
if 'result' in items:
i = 0
-
l
ist = []
+
itemL
ist = []
try:
albums = items['result']['albums']
except:
try:
albums = items['result']['albums']
except:
@@
-533,23
+534,27
@@
class GrooveAPI:
l = limit
while(i < l):
s = albums[i]
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:
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'
else:
coverart = 'None'
-
list.append([s['ArtistName'].encode('ascii
', 'ignore'),\
+
itemList.append([s['ArtistName'].encode('utf8
', 'ignore'),\
s['ArtistID'],\
s['ArtistID'],\
-
s['AlbumName'].encode('ascii', 'ignore')
,\
+
name
,\
s['AlbumID'],\
coverart])
i = i + 1
s['AlbumID'],\
coverart])
i = i + 1
- return
l
ist
+ return
itemL
ist
else:
return []
def _parsePlaylists(self, items):
i = 0
else:
return []
def _parsePlaylists(self, items):
i = 0
-
l
ist = []
+
itemL
ist = []
if 'result' in items:
playlists = items['result']['playlists']
elif len(items) > 0:
if 'result' in items:
playlists = items['result']['playlists']
elif len(items) > 0:
@@
-559,6
+564,6
@@
class GrooveAPI:
while (i < len(playlists)):
s = playlists[i]
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
i = i + 1
- return
l
ist
+ return
itemL
ist