fix strange album issues

master
Casey Link 2011-02-05 14:33:39 -05:00
parent 93c39b3f28
commit c703c03c61
1 changed files with 6 additions and 3 deletions

View File

@ -109,7 +109,10 @@ def now_playing(phenny, input):
track = tags['name'].text.strip() track = tags['name'].text.strip()
artist = tags['artist'].text.strip() artist = tags['artist'].text.strip()
album = tags['album'].text.strip()
album = "unknown"
if tags['album'].text:
album = tags['album'].text
date = None date = None
stamp = None stamp = None
@ -119,11 +122,11 @@ def now_playing(phenny, input):
if now: if now:
present = get_verb(nick)[1] present = get_verb(nick)[1]
phenny.say("%s %s \"%s\" by %s-%s" %(user.strip(), present.strip(), track, artist, album)) phenny.say("%s %s \"%s\" by %s on %s" %(user.strip(), present.strip(), track, artist, album ))
return return
else: else:
past = get_verb(nick)[0] past = get_verb(nick)[0]
phenny.say("%s %s \"%s\" by %s-%s %s ago" %(user.strip(), past.strip(), track, artist, album, pretty_date(stamp))) phenny.say("%s %s \"%s\" by %s on %s %s ago" %(user.strip(), past.strip(), track, artist, album, pretty_date(stamp)))
now_playing.commands = ['np'] now_playing.commands = ['np']