[lastbash-cvs] SF.net SVN: lastbash: [228] lastbash/lastbash

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

Revision: 228
          http://lastbash.svn.sourceforge.net/lastbash/?rev=228&view=rev
Author:   cstroie
Date:     2007-03-26 08:41:01 -0700 (Mon, 26 Mar 2007)

Log Message:
-----------
Improved the sed stuff regarding html output.

Modified Paths:
--------------
    lastbash/lastbash

Modified: lastbash/lastbash
===================================================================
--- lastbash/lastbash	2007-03-26 15:40:15 UTC (rev 227)
+++ lastbash/lastbash	2007-03-26 15:41:01 UTC (rev 228)
@@ -171,6 +171,8 @@
 		return
 	fi
 
+	local RET
+
 	# Replace the placeholders in template
 	# Placeholders:
 	#   @TITLE@ @COVER_URL@ @ARTIST_URL@ @ARTIST_NAME@ @TRACK_URL@ @LENGTH@
@@ -191,18 +193,21 @@
 	[ "${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@#${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}"
+	sed -e "/<?lastbash [^? \t]\+?>/s|<?lastbash TITLE?>|${ARTIST_NAME} - ${TRACK_NAME}|g;
+	s|<?lastbash COVER_URL?>|${COVER_URL}|g;
+	s|<?lastbash ARTIST_URL?>|${ARTIST_URL}|g;
+	s|<?lastbash ARTIST_NAME?>|${ARTIST_NAME}|g;
+	s|<?lastbash TRACK_URL?>|${TRACK_URL}|g;
+	s|<?lastbash TRACK_NAME?>|${TRACK_NAME}|g;
+	s|<?lastbash ALBUM_URL?>|${ALBUM_URL}|g;
+	s|<?lastbash ALBUM_NAME?>|${ALBUM_NAME}|g;
+	s|<?lastbash STATION_URL?>|${STATION_URL}|g;
+	s|<?lastbash STATION_NAME?>|${STATION_NAME}|g;
+	s|<?lastbash LENGTH?>|${META_MIN_SEC}|g" < "${HTML_TEMPLATE}" > "${HTML_FILE}" &2>/dev/null
+
+	# Get the status code
+	RET=$?
+	return "${RET}"
 }
 
 # Function: Save the history in a CSV formatted file {{{1
@@ -1171,7 +1176,7 @@
 	then
 		set_term_title "${META_ARTIST} - ${META_TRACK}"
 		save_nowplaying "${META_ARTIST} - ${META_TRACK}"
-		save_html "1"
+		save_html "1" || tui_sbar "Error while creating the HTML file."
 	else
 		set_term_title "${PROG_TITLE}: Not streaming"
 		save_nowplaying


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