X-Git-Url: https://git.hcoop.net/clinton/xbmc-groove.git/blobdiff_plain/5b941088cc1006fa8aa2765300d9dd0e228d663b..7b17af9352fdcabd30e0e405eaa6b86b65a449f1:/resources/lib/GroovesharkAPI.py

diff --git a/resources/lib/GroovesharkAPI.py b/resources/lib/GroovesharkAPI.py
index 43db1ba..9c05ea2 100644
--- a/resources/lib/GroovesharkAPI.py
+++ b/resources/lib/GroovesharkAPI.py
@@ -1,4 +1,21 @@
-import socket, urllib, urllib2, pprint, md5, os, pickle, tempfile, time, re, simplejson, base64
+# Copyright 2011 Stephen Denham
+
+#    This file is part of xbmc-groove.
+#
+#    xbmc-groove is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+#
+#    xbmc-groove is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    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, sys, socket
 from blowfish import Blowfish
 
 SESSION_EXPIRY = 1209600 # 2 weeks
@@ -21,19 +38,22 @@ class GrooveAPI:
 	_sessionID = ''
 	_userID = 0
 	_lastSessionTime = 0
-	_lastStreamKey = ''
-	_lastStreamServerID = ''
 	_key = md5.new(os.path.basename("GroovesharkAPI.py")).hexdigest()
+	_debugging = False
 
 	# Constructor
-	def __init__(self):
+	def __init__(self, debug):
 		
+		self._debugging = debug
 		self.simplejson = simplejson
-		socket.setdefaulttimeout(40)
+		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)
-			print "Made " + self.cacheDir
+			if self._debugging:
+				print "Made " + self.cacheDir
 		self._getSavedSession()
 		# session ids last 2 weeks
 		if self._sessionID == '' or time.time()- self._lastSessionTime >= SESSION_EXPIRY:
@@ -41,7 +61,8 @@ class GrooveAPI:
 			if self._sessionID == '':
 				raise StandardError('Failed to get session id')
 			else:
-				print "New GrooveAPI session id: " + self._sessionID
+				if self._debugging:
+					print "New GrooveAPI session id: " + self._sessionID
 				self._ip = self._getIP()
 				self._country = self._getCountry()
 				self._setSavedSession()
@@ -59,8 +80,9 @@ class GrooveAPI:
 			req = urllib2.Request(url, postData)
 			response = urllib2.urlopen(req)
 			result = response.read()
-			print "Response..."
-			pprint.pprint(result)
+			if self._debugging:
+				print "Response..."
+				pprint.pprint(result)
 			response.close()
 			result = simplejson.loads(result)
 			return result
@@ -86,8 +108,9 @@ class GrooveAPI:
 		req = urllib2.Request(url)
 		response = urllib2.urlopen(req)
 		result = response.read()
-		print "Request..."
-		pprint.pprint(result)
+		if self._debugging:
+			print "Request..."
+			pprint.pprint(result)
 		response.close()
 		try:
 			result = simplejson.loads(result)
@@ -137,26 +160,14 @@ class GrooveAPI:
 		except:
 			print "An error occurred during save session"
 			pass
-
-	def _setParams(self, params):			
-		try:
-			# Create the directory if it doesn't exist.
-			if not os.path.exists(self.cacheDir):
-				os.makedirs(self.cacheDir)
-			path = os.path.join(self.cacheDir, 'params.dmp')
-			f = open(path, 'wb')
-			pickle.dump(params, f, protocol=pickle.HIGHEST_PROTOCOL)
-			f.close()
-		except:
-			print "An error occurred during save params"
-			pass
 	
 	# Get IP
 	def _getIP(self):
 		try:
 			myip = urllib2.urlopen('http://whatismyip.org').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):
-				print "IP is " + myip
+				if self._debugging:
+					print "IP is " + myip
 				return myip
 		except:
 			return '0.0.0.0'
@@ -223,8 +234,6 @@ class GrooveAPI:
 		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:
@@ -256,7 +265,7 @@ class GrooveAPI:
 		
 	# Get artists albums
 	def getArtistAlbums(self, artistID, limit=ALBUM_LIMIT):
-		result = self._callRemote('getArtistAlbums', {'artistID' : artistID})
+		result = self._callRemote('getArtistVerifiedAlbums', {'artistID' : artistID})
 		if 'result' in result:
 			return self._parseAlbums(result, limit)
 		else:
@@ -399,16 +408,37 @@ class GrooveAPI:
 		else:
 			return []		
 	
+	def getDoesArtistExist(self, artistId):
+		response = self._callRemote("getDoesArtistExist", {"artistID": artistId})
+		if 'result' in response and response['result'] == True:
+			return True
+		else:
+			return False
+
+	def getDoesAlbumExist(self, albumId):
+		response = self._callRemote("getDoesAlbumExist", {"albumID": albumId})
+		if 'result' in response and response['result'] == True:
+			return True
+		else:
+			return False
+
+	def getDoesSongExist(self, songId):
+		response = self._callRemote("getDoesSongExist", {"songID": songId})
+		if 'result' in response and response['result'] == True:
+			return True
+		else:
+			return False
+		
 	# After 30s play time
-	def markStreamKeyOver30Secs(self):
-		params = { "streamKey" : self._lastStreamKey, "streamServerID" : self._lastStreamServerID }
+	def markStreamKeyOver30Secs(self, streamKey, streamServerID):
+		params = { "streamKey" : streamKey, "streamServerID" : streamServerID }
 		self._callRemote("markStreamKeyOver30Secs", params)
 
 	# Song complete
-	def markSongComplete(self, songid):		
-		params = { "songID" : songid, "streamKey" : self._lastStreamKey, "streamServerID" : self._lastStreamServerID }
+	def markSongComplete(self, songid, streamKey, streamServerID):		
+		params = { "songID" : songid, "streamKey" : streamKey, "streamServerID" : streamServerID }
 		self._callRemote("markSongComplete", params)
-
+		
 	# Extract song data	
 	def _parseSongs(self, items, limit=0):
 		if 'result' in items:
@@ -454,7 +484,11 @@ class GrooveAPI:
 					coverart = THUMB_URL+s['CoverArtFilename'].encode('ascii', 'ignore')
 				else:
 					coverart = 'None'
-				list.append([s['SongName'].encode('ascii', 'ignore'),\
+				if 'Name' in s:
+					name = s['Name']
+				else:
+					name = s['SongName']
+				list.append([name.encode('ascii', 'ignore'),\
 				s['SongID'],\
 				s['AlbumName'].encode('ascii', 'ignore'),\
 				s['AlbumID'],\