Compare commits

..

No commits in common. "master" and "start" have entirely different histories.

3 changed files with 15 additions and 21 deletions

View file

@ -1,7 +1,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html> <html>
<head> <head>
<meta http-equiv="refresh" content="420"> <meta http-equiv="refresh" content="900">
<title>Erik's Playlist</title> <title>Erik's Playlist</title>
<style type="text/css"> <style type="text/css">
body, th, td {font-family:verdana, sans-serif; font-size:70%; line-height:150%} body, th, td {font-family:verdana, sans-serif; font-size:70%; line-height:150%}

View file

@ -1 +1 @@
*/7 * * * * ${HOME}/bin/xmmslist.sh */15 * * * * ${HOME}/bin/xmmslist.sh

View file

@ -46,17 +46,14 @@ playlist=os.path.expanduser('~/bin/playlist.txt')
# The maximum number of songs to keep in the playlist # The maximum number of songs to keep in the playlist
maxsongs=20 maxsongs=20
# The song search tooltip and URL # The song search URL
songtip='Search for the lyrics of this song.'
songsearch='http://www.lyricsstation.com/search.asp?R1=V1&amp;txtSearch=' songsearch='http://www.lyricsstation.com/search.asp?R1=V1&amp;txtSearch='
# The artist search tooltip and URL # The artist search URL
bandtip='Search for this artist on Google.'
bandsearch='"http://www.google.com/search?cat=gwd%2FTop%2FArts%2FMusic&amp;q=' bandsearch='"http://www.google.com/search?cat=gwd%2FTop%2FArts%2FMusic&amp;q='
# The album search tooltip and URL # The album search URL
albumtip='Search for this album on freedb.' albumsearch='http://www.cduniverse.com/sresult.asp?HT_Search=TITLE&amp;HT_Search_Info='
albumsearch='http://www.freedb.org/freedb_search.php?allfields=NO&amp;fields=artist&amp;fields=title&amp;allcats=YES&amp;grouping=cats&amp;words='
if len(sys.argv) > 1: if len(sys.argv) > 1:
@ -66,19 +63,17 @@ if len(sys.argv) > 1:
if m: if m:
try: try:
if (os.path.getsize(playlist) == 0):
time.sleep(1)
f = open(playlist, 'r') f = open(playlist, 'r')
lines = f.readlines() lines = f.readlines()
f.close() f.close()
except IOError: except IOError:
lines = '' lines = ''
song = '<tr valign="top">' song = ''
# Song # Song
if len(m.group(2)) >= 1: if len(m.group(2)) >= 1:
song += '<td><a title="' + songtip + '" href="' + songsearch + urllib.quote_plus(m.group(2)) + '" target="_blank">' + cgi.escape(m.group(2)) + '</a></td>' song += '<tr valign="top"><td><a href="' + songsearch + urllib.quote_plus(m.group(2)) + '" target="_blank">' + cgi.escape(m.group(2)) + '</a></td>'
else: else:
song += '<td><font color="gray">n/a</font></td>' song += '<td><font color="gray">n/a</font></td>'
@ -86,7 +81,7 @@ if len(sys.argv) > 1:
# Artist # Artist
if len(m.group(1)) >= 1: if len(m.group(1)) >= 1:
song += '<td><a title="' + bandtip + '" href=' + bandsearch + urllib.quote_plus('"' + m.group(1) + '"') + '" target="_blank">' + cgi.escape(m.group(1)) + '</a></td>' song += '<td><a href=' + bandsearch + urllib.quote_plus('"' + m.group(1) + '"') + '" target="_blank">' + cgi.escape(m.group(1)) + '</a></td>'
else: else:
song += '<td><font color="gray">n/a</font></td>' song += '<td><font color="gray">n/a</font></td>'
@ -94,27 +89,26 @@ if len(sys.argv) > 1:
# Album # Album
if len(m.group(3)) >= 1: if len(m.group(3)) >= 1:
song += '<td><a title="'+ albumtip + '" href="' + albumsearch + urllib.quote_plus((m.group(1) + ' ' + m.group(3)).replace('(', '').replace(')', '').replace('.', '')) + '" target="_blank">' + cgi.escape(m.group(3)) + '</a></td>' song += '<td><a href="' + albumsearch + urllib.quote_plus(m.group(3)) + '" target="_blank">' + cgi.escape(m.group(3)) + '</a></td>'
else: else:
song += '<td><font color="gray">n/a</font></td>' song += '<td><font color="gray">n/a</font></td>'
song += '</tr>\n' song += '</tr>\n'
plist = song f = open(playlist, 'w')
f.write(song)
stop = len(lines) - 1 stop = len(lines) - 1
if stop > 0: if stop > 0:
i = 1 i = 1
for line in lines: for line in lines:
if song != line: if song != line:
plist += line f.write(line)
i += 1 i += 1
if i >= maxsongs or i > stop: if i >= maxsongs or i > stop:
break break
# Last Update # Last Update
plist += ('<tr><td colspan="3" valign="bottom" align="left"><br><br><small>' + time.strftime('Updated on %B %d, %Y at %H:%M %Z') + '</small></td><td colspan="2" valign="bottom" align="right"><small><a href="http://www.thauvin.net/blog/stories.jsp?id=5#xmmslist" class="small" target="_blank">' + os.path.basename(sys.argv[0]) + '</a> ' + version + '</small></td></tr>\n') f.write('<tr><td colspan="3" valign="bottom" align="left"><br><br><small>' + time.strftime('Updated on %B %d, %Y at %H:%M %Z') + '</small></td><td colspan="2" valign="bottom" align="right"><small><a href="http://www.thauvin.net/blog/stories.jsp?id=5#xmmslist" class="small" target="_blank">' + os.path.basename(sys.argv[0]) + '</a> ' + version + '</small></td></tr>\n')
f = open(playlist, 'w')
f.write(plist)
f.close() f.close()