[lastbash-cvs] lastbash lastbash,1.118,1.119

[Costin S. <cs...@us...>]

Update of /cvsroot/lastbash/lastbash
In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv24598

Modified Files:
	lastbash 
Log Message:
Improved the support for html output and csv file.

Index: lastbash
===================================================================
RCS file: /cvsroot/lastbash/lastbash/lastbash,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- lastbash	7 Feb 2007 13:09:44 -0000	1.118
+++ lastbash	8 Feb 2007 17:14:41 -0000	1.119
@@ -176,22 +176,32 @@
 	#   @TITLE@ @COVER_URL@ @ARTIST_URL@ @ARTIST_NAME@ @TRACK_URL@ @LENGTH@
 	#   @TRACK_NAME@ @ALBUM_URL@ @ALBUM_NAME@ @STATION_URL@ @STATION_NAME@
 
-	local META_COVER
+	local COVER_URL ARTIST_URL ARTIST_NAME TRACK_URL LENGTH TRACK_NAME ALBUM_URL ALBUM_NAME STATION_URL STATION_NAME
 
-	# Some checks
+	# Some safety checks
 	[ "${META_COVER}" ] && COVER_URL="${META_COVER}" || COVER_URL="http://static.last.fm/depth/catalogue/noimage/cover_large.gif"
 
+	ARTIST_NAME="${META_ARTIST//&/\&}"
+	TRACK_NAME="${META_TRACK//&/\&}"
+	ALBUM_NAME="${META_ALBUM//&/\&}"
+	STATION_NAME="${META_STATION//&/\&}"
+
+	[ "${META_ARTIST_URL}" ] && ARTIST_URL="${META_ARTIST_URL}" || ARTIST_URL="#"
+	[ "${META_TRACK_URL}" ] && TRACK_URL="${META_TRACK_URL}" || ARTIST_URL="#"
+	[ "${META_ALBUM_URL}" ] && ALBUM_URL="${META_ALBUM_URL}" || ARTIST_URL="#"
+	[ "${META_STATION_URL}" ] && STATION_URL="${META_STATION_URL}" || ARTIST_URL="#"
+
 	cat "${HTML_TEMPLATE}" | \
-	sed -e "/@TITLE@/s#@TITLE@#${META_ARTIST} - ${META_TRACK}#g" | \
-	sed -e "/@COVER_URL@/s#@COVER_URL@#${META_COVER}#g" | \
-	sed -e "/@ARTIST_URL@/s#@ARTIST_URL@#${META_ARTIST_URL}#g" | \
-	sed -e "/@ARTIST_NAME@/s#@ARTIST_NAME@#${META_ARTIST}#g" | \
-	sed -e "/@TRACK_URL@/s#@TRACK_URL@#${META_TRACK_URL}#g" | \
-	sed -e "/@TRACK_NAME@/s#@TRACK_NAME@#${META_TRACK}#g" | \
-	sed -e "/@ALBUM_URL@/s#@ALBUM_URL@#${META_ALBUM_URL}#g" | \
-	sed -e "/@ALBUM_NAME@/s#@ALBUM_NAME@#${META_ALBUM}#g" | \
-	sed -e "/@STATION_URL@/s#@STATION_URL@#${META_STATION}#g" | \
-	sed -e "/@STATION_NAME@/s#@STATION_NAME@#${META_STATION}#g" | \
+	sed -e "/@TITLE@/s#@TITLE@#${ARTIST_NAME} - ${TRACK_NAME}#g" | \
+	sed -e "/@COVER_URL@/s#@COVER_URL@#${COVER_URL}#g" | \
+	sed -e "/@ARTIST_URL@/s#@ARTIST_URL@#${ARTIST_URL}#g" | \
+	sed -e "/@ARTIST_NAME@/s#@ARTIST_NAME@#${ARTIST_NAME}#g" | \
+	sed -e "/@TRACK_URL@/s#@TRACK_URL@#${TRACK_URL}#g" | \
+	sed -e "/@TRACK_NAME@/s#@TRACK_NAME@#${TRACK_NAME}#g" | \
+	sed -e "/@ALBUM_URL@/s#@ALBUM_URL@#${ALBUM_URL}#g" | \
+	sed -e "/@ALBUM_NAME@/s#@ALBUM_NAME@#${ALBUM_NAME}#g" | \
+	sed -e "/@STATION_URL@/s#@STATION_URL@#${STATION_URL}#g" | \
+	sed -e "/@STATION_NAME@/s#@STATION_NAME@#${STATION_NAME}#g" | \
 	sed -e "/@LENGTH@/s#@LENGTH@#${META_MIN_SEC}#g" > "${HTML_FILE}"
 }
 
@@ -213,8 +223,17 @@
 	# The first row contains the columns titles
 	[ -f "${HISTORY_CVS_FILE}" ] || echo "\"Artist\",\"Album\",\"Track\",\"Length\",\"Action\"" > "${HISTORY_CVS_FILE}"
 
+	local ARTIST ALBUM TRACK DURATION ACTION
+
+	# Safety stuff
+	ARTIST="${HISTORY_ARTIST[$1]//\"/\"\"}"
+	ALBUM="${HISTORY_ALBUM[$1]//\"/\"\"}"
+	TRACK="${HISTORY_TRACK[$1]//\"/\"\"}"
+	DURATION="${HISTORY_DURATION[$1]//\"/\"\"}"
+	ACTION="${HISTORY_ACTION[$1]//\"/\"\"}"
+
 	# Save the history items
-	echo "\"${HISTORY_ARTIST[$1]}\",\"${HISTORY_ALBUM[$1]}\",\"${HISTORY_TRACK[$1]}\",\"${HISTORY_DURATION[$1]}\",\"${HISTORY_ACTION[$1]}\"" >> "${HISTORY_CVS_FILE}"
+	echo "\"${ARTIST}\",\"${ALBUM}\",\"${TRACK}\",\"${DURATION}\",\"${ACTION}\"" >> "${HISTORY_CVS_FILE}"
 }
 
 # Function: Print usage summary {{{1