HCoop
/
clinton
/
abcde.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Small changes
[clinton/abcde.git]
/
abcde
diff --git
a/abcde
b/abcde
index
60aca3f
..
f78666c
100755
(executable)
--- a/
abcde
+++ b/
abcde
@@
-360,6
+360,13
@@
checkexec ()
if [ "$(which $X)" = "" ]; then
log error "$X is not in your path." >&2
log info "Define the full path to the executable if it exists on your system." >&2
if [ "$(which $X)" = "" ]; then
log error "$X is not in your path." >&2
log info "Define the full path to the executable if it exists on your system." >&2
+ if [ -e /etc/debian_release ] ; then
+ case $X in
+ oggenc) MISSING_PACKAGE=vorbis-tools ;;
+ lame|flac) MISSING_PACKAGE=$X ;;
+ esac
+ log info "Hint: apt-get install $MISSING_PACKAGE" >&2
+ fi
exit 1
elif [ ! -x "$(which $X)" ]; then
log error "$X is not executable." >&2
exit 1
elif [ ! -x "$(which $X)" ]; then
log error "$X is not executable." >&2
@@
-510,6
+517,8
@@
do_replaygain()
TRACKFILE="$(mungefilename "$TRACKNAME")"
ARTISTFILE="$(mungefilename "$TRACKARTIST")"
ALBUMFILE="$(mungefilename "$DALBUM")"
TRACKFILE="$(mungefilename "$TRACKNAME")"
ARTISTFILE="$(mungefilename "$TRACKARTIST")"
ALBUMFILE="$(mungefilename "$DALBUM")"
+ GENRE="$(mungegenre "$GENRE")"
+ YEAR=${CDYEAR:-$CDYEAR}
gettracknum
if [ "$ONETRACK" = "y" ]; then
if [ "$VARIOUSARTISTS" = "y" ]; then
gettracknum
if [ "$ONETRACK" = "y" ]; then
if [ "$VARIOUSARTISTS" = "y" ]; then
@@
-838,6
+847,9
@@
do_tag ()
echo GENRE="$CDGENRE"
fi
echo TRACKNUMBER=${TRACKNUM:-$1}
echo GENRE="$CDGENRE"
fi
echo TRACKNUMBER=${TRACKNUM:-$1}
+ if [ -n "$DISCNUMBER" ]; then
+ echo DISCNUMBER="$DISCNUMBER"
+ fi
echo CDDB=$CDDBDISCID
if [ "$(eval echo ${COMMENT})" != "" ]; then
case "$COMMENTOUTPUT" in
echo CDDB=$CDDBDISCID
if [ "$(eval echo ${COMMENT})" != "" ]; then
case "$COMMENTOUTPUT" in
@@
-870,6
+882,9
@@
do_tag ()
echo GENRE="$CDGENRE"
fi
echo TRACKNUMBER="${TRACKNUM:-$1}"
echo GENRE="$CDGENRE"
fi
echo TRACKNUMBER="${TRACKNUM:-$1}"
+ if [ -n "$DISCNUMBER" ]; then
+ echo DISCNUMBER="$DISCNUMBER"
+ fi
echo CDDB="$CDDBDISCID"
if [ "$(eval echo ${COMMENT})" != "" ]; then
case "$COMMENTOUTPUT" in
echo CDDB="$CDDBDISCID"
if [ "$(eval echo ${COMMENT})" != "" ]; then
case "$COMMENTOUTPUT" in
@@
-1451,6
+1466,7
@@
do_playlist ()
read ERASEPLAYLIST
case $ERASEPLAYLIST in
e|E|a|A|k|K) DONE=y ;;
read ERASEPLAYLIST
case $ERASEPLAYLIST in
e|E|a|A|k|K) DONE=y ;;
+ "") ERASEPLAYLIST=e ; DONE=y ;;
*) ;;
esac
done
*) ;;
esac
done
@@
-2941,6
+2957,10
@@
AACENC=faac
ID3=id3
ID3V2=id3v2
EYED3=eyeD3
ID3=id3
ID3V2=id3v2
EYED3=eyeD3
+VORBISCOMMENT=vorbiscomment
+METAFLAC=metaflac
+AACTAG=faac
+
CDPARANOIA=cdparanoia
CDDA2WAV=cdda2wav
DAGRAB=dagrab
CDPARANOIA=cdparanoia
CDDA2WAV=cdda2wav
DAGRAB=dagrab
@@
-2951,8
+2971,6
@@
MUSICBRAINZ=musicbrainz-get-tracks
EJECT=eject
MD5SUM=md5sum
DISTMP3=distmp3
EJECT=eject
MD5SUM=md5sum
DISTMP3=distmp3
-VORBISCOMMENT=vorbiscomment
-METAFLAC=metaflac
NORMALIZE=normalize-audio
CDSPEED=eject
VORBISGAIN=vorbisgain
NORMALIZE=normalize-audio
CDSPEED=eject
VORBISGAIN=vorbisgain
@@
-3160,7
+3178,10
@@
while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:UvVxX:w:W:z opt ; do
X) CUE2DISCID="$OPTARG" ;;
w) COMMENT="$OPTARG" ;;
W) if echo $OPTARG | grep "[[:digit:]]" > /dev/null 2>&1 ; then
X) CUE2DISCID="$OPTARG" ;;
w) COMMENT="$OPTARG" ;;
W) if echo $OPTARG | grep "[[:digit:]]" > /dev/null 2>&1 ; then
- STARTTRACKNUMBER="${OPTARG}01" ; STARTTRACKNUMBERTAG="y" ; COMMENT="CD${OPTARG}"
+ STARTTRACKNUMBER="${OPTARG}01"
+ STARTTRACKNUMBERTAG="y"
+ COMMENT="CD${OPTARG}"
+ DISCNUMBER="${OPTARG}"
else
log error "argument of -W must be integer"
exit 1
else
log error "argument of -W must be integer"
exit 1
@@
-3382,7
+3403,7
@@
if [ "$BATCHNORM" = "y" ] && [ "$DONORMALIZE" = "n" ]; then
BATCHNORM=n
fi
BATCHNORM=n
fi
-# Check the encoding format from the ones available in the system, if nothing has been configured
in the system
.
+# Check the encoding format from the ones available in the system, if nothing has been configured.
if [ X"$OUTPUTTYPE" = "X" ]; then
for DEFAULT_OUTPUT in $( echo "$DEFAULT_OUTPUT_BINARIES" | tr , \ ); do
DEFAULT_OUTPUT_FORMAT="$(echo $DEFAULT_OUTPUT | cut -d ":" -f 1)"
if [ X"$OUTPUTTYPE" = "X" ]; then
for DEFAULT_OUTPUT in $( echo "$DEFAULT_OUTPUT_BINARIES" | tr , \ ); do
DEFAULT_OUTPUT_FORMAT="$(echo $DEFAULT_OUTPUT | cut -d ":" -f 1)"