replaced hardcoded Various Artists by new VARIABLE DISKARTISTSFILE

abcde

@@ -574,6 +574,7 @@ do_replaygain()
 				TRACKFILE="$(mungetrackname "$TRACKNAME")"
 				ARTISTFILE="$(mungeartistname "$TRACKARTIST")"
 				ALBUMFILE="$(mungealbumname "$DALBUM")"
+				DISKARTISTFILE="$(mungeartistname "$DARTIST")"
 				GENRE="$(mungegenre "$GENRE")"
 				YEAR=${CDYEAR:-$CDYEAR}
 				gettracknum
@@ -1677,13 +1678,14 @@ do_move ()
 		ALBUMFILE="$(mungealbumname "$DALBUM")"
 		ARTISTFILE="$(mungeartistname "$TRACKARTIST")"
 		TRACKFILE="$(mungetrackname "$TRACKNAME")"
+		DISKARTISTFILE="$(mungeartistname "$DARTIST")"
 		GENRE="$(mungegenre "$GENRE")"
 		YEAR=${CDYEAR:-$CDYEAR}
 		# If we want to start the tracks with a given number, we need to modify
 		# the TRACKNUM value before evaluation
 		gettracknum
 		# Supported variables for OUTPUTFORMAT are GENRE, YEAR, ALBUMFILE,
-		# ARTISTFILE, TRACKFILE, and TRACKNUM.
+		# ARTISTFILE, DISKARTISTFILE, TRACKFILE, and TRACKNUM.
 		if [ "$ONETRACK" = "y" ]; then
 			if [ "$VARIOUSARTISTS" = "y" ]; then
 				OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\")"
@@ -1815,6 +1817,7 @@ do_playlist ()
 		for LASTTRACK in $TRACKQUEUE; do :; done
 		ALBUMFILE="$(mungealbumname "$DALBUM")"
 		ARTISTFILE="$(mungeartistname "$DARTIST")"
+		DISKARTISTFILE="${ARTISTFILE}"
 		GENRE="$(mungegenre "$GENRE")"
 		YEAR=${CDYEAR:-$CDYEAR}
 		if [ "$VARIOUSARTISTS" = "y" ] ; then
@@ -1856,6 +1859,7 @@ do_playlist ()
 				TRACKFILE="$(mungetrackname "$TRACKNAME")"
 				ARTISTFILE="$(mungeartistname "$TRACKARTIST")"
 				ALBUMFILE="$(mungealbumname "$DALBUM")"
+				DISKARTISTFILE="$(mungeartistname "$DARTIST")"
 				# If we want to start the tracks with a given number, we need to modify the
 				# TRACKNUM value before evaluation
 				gettracknum
@@ -2015,6 +2019,7 @@ abcde.mkcue () {
 	TRACKFILE="$(mungetrackname "$TRACKNAME")"
 	ARTISTFILE="$(mungeartistname "$TRACKARTIST")"
 	ALBUMFILE="$(mungealbumname "$DALBUM")"
+	DISKARTISTFILE="$(mungeartistname "$DARTIST")"
 	if [ "$ONETRACK" = "y" ]; then
 		if [ "$VARIOUSARTISTS" = "y" ]; then
 			CUEWAVFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\" | sed -e 's@^.*/@@').$OUTPUT"
@@ -2404,6 +2409,7 @@ do_cleancue()
 					TRACKFILE="$(mungetrackname "$TRACKNAME")"
 					ARTISTFILE="$(mungeartistname "$TRACKARTIST")"
 					ALBUMFILE="$(mungealbumname "$DALBUM")"
+					DISKARTISTFILE="$(mungeartistname "$DARTIST")"
 
 					if [ "$VARIOUSARTISTS" = "y" ]; then
 						OUTPUTFILE="$(eval echo \""$VAONETRACKOUTPUTFORMAT"\" | sed -e 's@^.*/@@').$OUTPUT"
@@ -3216,6 +3222,7 @@ do_getalbumart()
 		# set variables
 		ALBUMFILE="$(mungealbumname "$DALBUM")"
 		ARTISTFILE="$(mungeartistname "$DARTIST")"
+		DISKARTISTFILE="${ARTISTFILE}"
 		GENRE="$(mungegenre "$GENRE")"
 		YEAR=${CDYEAR:-$CDYEAR}
 		# have we got a musicbrainz mbid or amazon asin?
@@ -3366,6 +3373,7 @@ do_embedalbumart()
 	# Set variables:
 	ALBUMFILE="$(mungealbumname "$DALBUM")"
 	ARTISTFILE="$(mungeartistname "$DARTIST")"
+	DISKARTISTFILE="$(mungeartistname "$DARTIST")"
 	GENRE="$(mungegenre "$GENRE")"
 	YEAR=${CDYEAR:-$CDYEAR}
 
@@ -3813,9 +3821,9 @@ CUEREADERSYNTAX=default
 OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
 # Use the following VAOUTPUTFORMAT to revert to 2.0.x VA format:
 #VAOUTPUTFORMAT=${OUTPUTFORMAT}
-VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
+VAOUTPUTFORMAT='${DISKARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
 ONETRACKOUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}'
-VAONETRACKOUTPUTFORMAT='Various-${ALBUMFILE}/${ALBUMFILE}'
+VAONETRACKOUTPUTFORMAT='${DISKARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}'
 PLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}.m3u'
 PLAYLISTDATAPREFIX=''
 VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}.m3u'

abcde.1

@@ -491,23 +491,23 @@ OUTPUTFORMAT='${OUTPUT}/${ARTISTFILE}/${ALBUMFILE}/${TRACKNUM}._${TRACKFILE}'
 .B OUTPUTFORMAT
 Specifies the format for completed Ogg/Vorbis, MP3, FLAC, Ogg/Speex, MPP/MP+
 (Musepack) or M4A filenames. Variables are included using standard shell
-syntax. Allowed variables are GENRE, ALBUMFILE, ARTISTFILE, TRACKFILE,
+syntax. Allowed variables are GENRE, ALBUMFILE, ARTISTFILE, TRACKFILE, DISKARTISTFILE,
 TRACKNUM, and YEAR. Default is \'${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}-${TRACKFILE}\'.
 Make sure to use single quotes around this variable. TRACKNUM is automatically
 zero-padded, when the number of encoded tracks is higher than 9. When lower,
 you can force with '\-p' in the command line.
 .TP
 .B VAOUTPUTFORMAT
 Just like OUTPUTFORMAT but for Various Artists discs. The default is
-\(aqVarious-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
+\(aq${DISKARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
 .TP
 .B ONETRACKOUTPUTFORMAT
 Just like OUTPUTFORMAT but for single-track rips (see option "\-1"). The default
 is '${ARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}'
 .TP
 .B VAONETRACKOUTPUTFORMAT
 Just like ONETRACKOUTPUTFORMAT but for Various Artists discs. The default
-is 'Various-${ALBUMFILE}/${ALBUMFILE}'
+is '${DISKARTISTFILE}-${ALBUMFILE}/${ALBUMFILE}'
 .TP
 .B MAXPROCS
 Defines how many encoders to run at once. This makes for huge speedups

abcde.conf

@@ -414,7 +414,7 @@
 #OUTPUTFORMAT='${ARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${TRACKFILE}'
 
 # Like OUTPUTFORMAT but for Various Artists discs.
-#VAOUTPUTFORMAT='Various-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
+#VAOUTPUTFORMAT='${DISKARTISTFILE}-${ALBUMFILE}/${TRACKNUM}.${ARTISTFILE}-${TRACKFILE}'
 
 # Like OUTPUTFORMAT and VAOUTPUTFORMAT but for the ONEFILE rips.
 #ONETRACKOUTPUTFORMAT=$OUTPUTFORMAT
@@ -446,7 +446,7 @@
 #PLAYLISTDATAPREFIX=''
 
 #Like PLAYLIST{FORMAT,DATAPREFIX} but for Various Artists discs:
-#VAPLAYLISTFORMAT='${ARTISTFILE}-${ALBUMFILE}.${OUTPUT}.m3u'
+#VAPLAYLISTFORMAT='${DISKARTISTFILE}-${ALBUMFILE}.${OUTPUT}.m3u'
 #VAPLAYLISTDATAPREFIX=''
 
 #This will give the playlist CR-LF line-endings, if set to "y".

changelog

@@ -1,5 +1,6 @@
 abcde 2.9.4-DEV
-
+ * Replace hardcoded "Various" in Various Artists handling by the new variable
+   DISKARTISTFILE
  -- Steve McIntyre <93sam@debian.org>  XXXXX
 
 abcde 2.9.3