X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/b82e2042ef602b1e5d21504af6deb18c075d3735..fd34b28b11bcc1d0bdc45956b86d7195dff66be6:/abcde

diff --git a/abcde b/abcde
index 53540da..2390440 100755
--- a/abcde
+++ b/abcde
@@ -61,7 +61,8 @@ echo "       Add a comment to the CD tracks"
 echo "-W <#> Contatenate CDs: -T #01 -w \"CD #\"" 
 echo ""
 echo "Tracks is a space-delimited list of tracks to grab."
-echo "Ranges specified with hyphens are allowed."
+echo "Ranges specified with hyphens are allowed (i.e., 1-5)."
+echo ""
 #echo "Double hyphens are used to concatenate tracks"
 }
 
@@ -698,7 +699,7 @@ do_encode ()
 				case "$2" in
 	                        %local*%)
 					case "$FLACENCODERSYNTAX" in
-					flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER  $FLACENCODEROPTS -o "$OUT" "$IN" ;; 
+					flac) $RUN_COMMAND nice $ENCNICE $FLACENCODER $FLACENCODEROPTS -o "$OUT" "$IN" ;; 
 				        esac
 					;;
 	
@@ -973,7 +974,21 @@ do_move ()
 			if [ -r "$ABCDETEMPDIR/$CUEFILE" ]; then
 				if checkstatus movecue-$OUTPUT; then :; else
 					vecho "Copying cue file to its destination directory..."
-					run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTFILEDIR/"
+					if checkstatus onetrack >/dev/null ; then
+						case $OUTPUT in
+							# NOTE: Creating a cue file with the 3-char-extension files is to comply with
+							# http://brianvictor.tripod.com/mp3cue.htm#details
+							[a-z0-9][a-z0-9][a-z0-9])
+								run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.cue"
+								;;
+							*)
+								run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTDIR/$OUTPUTFILE.$OUTPUT.cue"
+								;;
+						esac
+					else
+						run_command movecue-$OUTPUT cp "$ABCDETEMPDIR/$CUEFILE" "$OUTPUTFILEDIR/$CUEFILE"
+					fi
+					echo movecue-$OUTPUT >> "$ABCDETEMPDIR/status"
 				fi
 			fi
 		fi
@@ -1693,8 +1708,12 @@ do_cddbedit ()
 		# If that fails, check for a vi
 		elif which vi >/dev/null 2>&1; then
 			vi "$CDDBDATA"
+		elif [ -x /usr/bin/vim ]; then
+			/usr/bin/vim "$CDDBDATA"
 		elif [ -x /usr/bin/vi ]; then
 			/usr/bin/vi "$CDDBDATA"
+		elif [ -x /bin/vi ]; then
+			/bin/vi "$CDDBDATA"
 		# nano should be on all (modern, i.e., sarge) debian systems
 		elif which nano >/dev/null 2>&1 ; then
 			nano "$CDDBDATA"
@@ -1949,6 +1968,9 @@ do_cdread ()
 			echo readencodetrack-$UTRACKNUM >> "$ABCDETEMPDIR/status"
 		else
 			echo readtrack-$UTRACKNUM >> "$ABCDETEMPDIR/status"
+			if [ "$1" = "onetrack" ]; then
+				echo onetrack >> "$ABCDETEMPDIR/status"
+			fi
 		fi
 	fi
 }
@@ -2093,7 +2115,7 @@ MP3ENCOPTS=
 VORBIZEOPTS=
 OGGENCOPTS=
 # flac
-FLACOPTS=
+FLACOPTS="-f"
 # speex
 SPEEXENCOPTS=
 # mpc
@@ -2605,7 +2627,7 @@ if [ "$USEPIPES" = "y" ]; then
 		vorbis|ogg)
 			PIPEENCODERSVARCHECK="PIPE_$OGGENCODERSYNTAX" ;;
 		flac)
-			PIPEENCODERSVARCHECK="PIPE_$FLACENCODERSYTNAX" ;;
+			PIPEENCODERSVARCHECK="PIPE_$FLACENCODERSYNTAX" ;;
 		spx)
 			PIPEENCODERSVARCHECK="PIPE_$SPEEXENCODER" ;;
 		mpc)