[Mypyspace-developer] SF.net SVN: mypyspace:[335] musicGrabber/branches/webserv-branch

[<ku...@us...>]

Revision: 335
          http://mypyspace.svn.sourceforge.net/mypyspace/?rev=335&view=rev
Author:   kurtjx
Date:     2009-03-09 19:14:15 +0000 (Mon, 09 Mar 2009)

Log Message:
-----------
some bugs getting artistID and playlistID fixed - if you dont find a playlistID dont try to use it duh - wonder why foaf:knows isnt still included in all rdf

Modified Paths:
--------------
    musicGrabber/branches/webserv-branch/myspace2rdf.py
    musicGrabber/branches/webserv-branch/myspaceuris.py

Modified: musicGrabber/branches/webserv-branch/myspace2rdf.py
===================================================================
--- musicGrabber/branches/webserv-branch/myspace2rdf.py	2009-03-08 12:04:23 UTC (rev 334)
+++ musicGrabber/branches/webserv-branch/myspace2rdf.py	2009-03-09 19:14:15 UTC (rev 335)
@@ -43,6 +43,7 @@
 	def __init__(self, uid=""):
 		self.uid = uid
 		self.mi = mopy.MusicInfo()
+		self.playlistID = False
 		
 	def getPage(self):
 		'''just grab the web page'''
@@ -92,6 +93,10 @@
 
 				if artist==False:
 					self.subject.knows.add(friend)
+				
+				# self.subject.knows.add(friend)
+				# since when did this happen??? mopy wont take foaf:knows as a prop of mo:MusicArtist
+				
 				self.subject.topFriend.add(friend)
 				self.mi.add(friend)
 				
@@ -163,27 +168,27 @@
 			# self.subject.sameAs.set(thing2)
 			# self.mi.add(thing2)
 			
+		if self.playlistID and self.artistID and self.uid:
+			xmlPage = try_open(mediaBase[0] + str(self.artistID) + mediaBase[1] + str(self.playlistID) + mediaBase[2] + str(self.uid) + mediaBase[3])
+			#print mediaBase[0] + str(self.artistID) + mediaBase[1] + str(self.playlistID) + mediaBase[2] + str(self.uid) + mediaBase[3]
 		
-		xmlPage = try_open(mediaBase[0] + str(self.artistID) + mediaBase[1] + str(self.playlistID) + mediaBase[2] + str(self.uid) + mediaBase[3])
-		#print mediaBase[0] + str(self.artistID) + mediaBase[1] + str(self.playlistID) + mediaBase[2] + str(self.uid) + mediaBase[3]
-		
-		if xmlPage:
-			self.xmlStruct = dom.parseString(''.join(xmlPage.readlines()))
-			songList = self.xmlStruct.getElementsByTagName('song')
-			for song in songList:
-				# using ben's mpsSong class
-				thisSong = mpsSong(self, song, 'downloadprefix')
-				thisSong.getUri()
+			if xmlPage:
+				self.xmlStruct = dom.parseString(''.join(xmlPage.readlines()))
+				songList = self.xmlStruct.getElementsByTagName('song')
+				for song in songList:
+					# using ben's mpsSong class
+					thisSong = mpsSong(self, song, 'downloadprefix')
+					thisSong.getUri()
 				
-				track = mopy.mo.Track()
-				track.title.set(thisSong.title)
-				availableAs = thisSong.uri
-				if availableAs:
-					avas = mopy.mo.MusicalItem(availableAs)
-					track.available_as.set(avas)
-					self.mi.add(avas)
-				self.subject.made.add(track)
-				self.mi.add(track)
+					track = mopy.mo.Track()
+					track.title.set(thisSong.title)
+					availableAs = thisSong.uri
+					if availableAs:
+						avas = mopy.mo.MusicalItem(availableAs)
+						track.available_as.set(avas)
+						self.mi.add(avas)
+					self.subject.made.add(track)
+					self.mi.add(track)
 				
 		
 		self.createCommonRDF()

Modified: musicGrabber/branches/webserv-branch/myspaceuris.py
===================================================================
--- musicGrabber/branches/webserv-branch/myspaceuris.py	2009-03-08 12:04:23 UTC (rev 334)
+++ musicGrabber/branches/webserv-branch/myspaceuris.py	2009-03-09 19:14:15 UTC (rev 335)
@@ -41,9 +41,9 @@
 #these two tag scraps are provisional for grabbing the ArtistID and playlist number, which are now nessecary to grab audio
 #both of these should be terminated by a comma
 playlistIDtag = """plid=""", '''&'''
-artistIDtag = """artid=""",'''&'''
+#artistIDtag = """artid=""",'''&'''
+artistIDtag = '''"DisplayFriendId":''',''','''
 
-
 #########################################################################################################
 
 # myspace uri for downloads  ----this has gotten a bit more complicated in the roll out of myspace's new media player


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.