dmpayton / KUSC Player / changeset / 0f075381c6e9

Up to file-list kusc.py:

@@ -121,19 +121,37 @@ class SysTrayIcon(QtGui.QSystemTrayIcon)
         ## Parse out the currently playing song...
         soup = BeautifulSoup(response)
         onnowtext = soup.findAll('p', {'id': 'onnowtext'})[0]
         program = unescape(onnowtext.findAll('span')[1].contents[0])
         song = unescape(onnowtext.findAll('span')[2].contents[0])
         now_playing = []
         ## Try to get the program name...
         try:
             now_playing.append(unescape(onnowtext.findAll('span')[1].contents[0]))
         except Exception:
             pass
         ## Try to get the song name...
         try:
             now_playing.append(unescape(onnowtext.findAll('span')[2].contents[0]))
         except Exception:
             pass
         ## Couldn't get either? Bummer... Try again in a few minutes
         if not now_playing:
             self.showMessage('Error', 'Could not get currently playing song from KUSC.org', self.Warning)
             QtCore.QTimer.singleShot(180000, self.now_playing)
             return
         now_playing = '\n'.join(now_playing)
         ## If it's a new song, set it
-        if song == self.current_song:
+        if now_playing == self.current_song:
             ## Check again in 1 minute
             print '\told song, try again in 1 minute'
             QtCore.QTimer.singleShot(60000, self.now_playing)
         else:
             ## Set the new song, and dont check again for 5 minutes
             print '\tnew song, check again in 5 minutes'
             self.current_song = song
             now_playing = '\n'.join((program, song))
             self.current_song = now_playing
             self.setToolTip(now_playing)
             self.showMessage('Now Playing on KUSC:', now_playing)
             QtCore.QTimer.singleShot(300000, self.now_playing)

commit 2:	0f075381c6e9
parent 1:	9e896eaa1beb
branch:	default

dmpayton / KUSC Player (http://bitbucket.org/dmpayton/kusc-player/wiki/Home)