X-Git-Url: https://git.hcoop.net/clinton/abcde.git/blobdiff_plain/cb414c1e73121cc3d1e8c558a592bb3e302b806a..66fd4e44406229db58535d2432fea71b73708316:/abcde diff --git a/abcde b/abcde index d4bd83d..139b353 100755 --- a/abcde +++ b/abcde @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Copyright (c) 1998-2001 Robert Woodcock # Copyright (c) 2003-2005 Jesus Climent # This code is hereby licensed for public consumption under either the @@ -10,8 +10,10 @@ # # Copyright for this work is to expire January 1, 2010, after which it # shall be public domain. +# +# $Id$ -VERSION="2.3.99" +VERSION='2.3.99-$Revision$' usage () { @@ -20,7 +22,8 @@ echo "Usage: abcde [options] [tracks]" echo "Options:" echo "-1 Encode the whole CD in a single file" echo "-a " -echo " Actions to perform (cddb,read,normalize,encode,tag,move,replaygain,playlist,clean)" +echo " Actions to perform:" +echo " cddb,read,normalize,encode,tag,move,replaygain,playlist,clean" #echo "-A Experimental actions (retag, transcode)" echo "-b Enable batch normalization" #echo "-B Disable batch replaygain (do file by file)" @@ -32,7 +35,6 @@ echo "-d " echo " Specify CDROM device to grab (flac uses a single-track flac file)" echo "-D Debugging mode (equivalent to sh -x abcde)" echo "-e Erase encoded track information from status file" -#echo "-E Set the encoding information for the tags" echo "-f Force operations that otherwise are considered harmful. Read \"man abcde\"" echo "-g Use \"lame --nogap\" for MP3 encoding. Disables low disk and pipes flags" echo "-h This help information" @@ -46,7 +48,7 @@ echo "-N Noninteractive. Never prompt for anything" echo "-m Modify playlist to include CRLF endings, to comply with some players" echo "-M Create a CUE file" echo "-o " -echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav). Defaults to vorbis" +echo " Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a). Defaults to vorbis" echo "-p Pad track numbers with 0's (if less than 10 tracks)" echo "-P Use UNIX pipes to read+encode without wav files" echo "-r " @@ -85,9 +87,9 @@ log () BLURB="$1" shift case $BLURB in - error) echo "[ERR] abcde: $@" >&2 ;; - warning) echo "[WAR] $@" >&2 ;; - info) echo "[INF] $@" ;; + error) echo "[ERROR] abcde: $@" >&2 ;; + warning) echo "[WARNING] $@" >&2 ;; + info) echo "[INFO] $@" ;; esac } @@ -105,7 +107,7 @@ f_seq_row () f_seq_line () { i=$1 - if echo i | grep -q "[[:digit:]]" ; then + if echo $i | grep -q "[[:digit:]]" ; then while [ $i -ne `expr $2 + 1` ] do printf $i" " @@ -333,11 +335,6 @@ relpath () # do_getcddbinfo # Finds an specific field from cddbinfo -# -# TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2 -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//') -# TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\]) -# TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')" - do_getcddbinfo() { case $1 in @@ -736,6 +733,9 @@ do_tag () mpc) run_command tagtrack-$OUTPUT-$1 true ;; + m4a) + run_command tagtrack-$OUTPUT-$1 true + ;; wav) run_command tagtrack-$OUTPUT-$1 true ;; @@ -818,6 +818,9 @@ do_encode () mpc) TEMPARG="PIPE_$MPPENCODER" ;; + m4a) + TEMPARG="PIPE_$MPPENCODER" + ;; esac IN="$( eval echo "\$$TEMPARG" )" else @@ -844,20 +847,22 @@ do_encode () if [ -s "$IN" -o X"$USEPIPES" = "Xy" ] ; then for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ) do - if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then - continue - fi case "$OUTPUT" in vorbis|ogg) OUT="$ABCDETEMPDIR/track$1.$OGGOUTPUTCONTAINER" + OUTPUT=$OGGOUTPUTCONTAINER ;; flac) OUT="$ABCDETEMPDIR/track$1.$FLACOUTPUTCONTAINER" + OUTPUT=$FLACOUTPUTCONTAINER ;; *) OUT="$ABCDETEMPDIR/track$1.$OUTPUT" ;; esac + if [ "$NOGAP" = "y" ] && checkstatus encodetrack-$OUTPUT-$1 ; then + continue + fi if [ X"$USEPIPES" = "Xy" ]; then RUN_COMMAND="" # We need a way to store the creation of the files when using PIPES @@ -934,6 +939,15 @@ do_encode () ## FIXME ## to the encoder ends up empty. $RUN_COMMAND nice $ENCNICE $MPPENCODER $MPPENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" "$IN" "$OUT" ;; + m4a) + # Quick hack to avoid tagging Ogg/Speex, since there is no other way to tag than inline tagging + if [ ! "$DOTAG" = "y" ]; then + $RUN_COMMAND nice $ENCNICE $AACENCODER $AACENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --track "$1" --genre "$CDGENRE" --year "$CDYEAR" --comment "$COMMENT" -o "$OUT" "$IN" + + else + $RUN_COMMAND nice $ENCNICE $AACENCODER $AACENCODEROPTS -o "$OUT" "$IN" + fi + ;; wav) # In case of wav output we need nothing. Just keep the wavs. ;; @@ -1279,7 +1293,6 @@ do_playlist () do # Shares some code with do_move since the filenames have to match CDDBTRACKNUM=$(expr $UTRACKNUM - 1) - #TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2 -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//') do_getcddbinfo TRACKNAME splitvarious TRACKFILE="$(mungefilename "$TRACKNAME")" @@ -1337,7 +1350,11 @@ do_discid () if [ "$CDROMREADERSYNTAX" = "flac" ] ; then TRACKINFO=$($METAFLAC $METAFLACOPTS --export-cuesheet-to=- $CDROM | $CUE2DISCID) else - TRACKINFO=$($CDDISCID $CDROM) + case "$CDDBMETHOD" in + cddb) TRACKINFO=$($CDDISCID $CDROM) ;; + # FIXME # musicbrainz needs a cleanup + musicbrainz) TRACKINFO=$($MUSICBRAINZ -c $CDROM ) ;; + esac fi # Make sure there's a CD in there by checking cd-discid's return code if [ ! "$?" = "0" ]; then @@ -1355,6 +1372,7 @@ do_discid () disktool -m ${CDROM#/dev/} fi WEHAVEACD=y + DISCID=$(echo $TRACKINFO | cut -f1 -d' ') else TRACKINFO=$(cat "$WAVOUTPUTDIR/abcde.$DISCID/discid") fi @@ -1386,6 +1404,11 @@ do_discid () TRACKS="$(echo "$CDPARANOIAOUTPUT" | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')" CDPARANOIAAUDIOTRACKS="$TRACKS" else + # Previous versions of abcde would store the tracks on a file, instead of the status record. + if [ -f "$ABCDETEMPDIR/cdparanoia-audio-tracks" ]; then + echo cdparanoia-audio-tracks=$( cat "$ABCDETEMPDIR/cdparanoia-audio-tracks" ) >> "$ABCDETEMPDIR/status" + rm -f "$ABCDETEMPDIR/cdparanoia-audio-tracks" + fi if [ -f "$ABCDETEMPDIR/status" ] && TRACKS=$(checkstatus cdparanoia-audio-tracks); then :; else TRACKS=$(echo $TRACKINFO | cut -f2 -d' ') fi @@ -1472,7 +1495,7 @@ do_discid () exit 1 fi rm -rf "$ABCDETEMPDIR" || exit 1 - mkdir "$ABCDETEMPDIR" + mkdir -p "$ABCDETEMPDIR" if [ "$?" -gt "0" ]; then # Directory already exists or could not be created echo "abcde: Temp directory $ABCDETEMPDIR could not be created." >&2 @@ -1494,13 +1517,15 @@ do_discid () fi else # We are starting from scratch - mkdir "$ABCDETEMPDIR" + mkdir -p "$ABCDETEMPDIR" if [ "$?" -gt "0" ]; then # Directory already exists or could not be created echo "abcde: Temp directory $ABCDETEMPDIR could not be created." >&2 exit 1 fi cat /dev/null > "$ABCDETEMPDIR/status" + # Store the abcde version in the status file. + echo "abcde-version=$VERSION" >> "$ABCDETEMPDIR/status" fi if [ X"$MAKECUEFILE" = "Xy" -a X"$WEHAVEACD" = "Xy" ]; then if checkstatus cuefile > /dev/null 2>&1 ; then :; else @@ -1524,6 +1549,9 @@ do_discid () # Create the discid file echo "$TRACKINFO" > "$ABCDETEMPDIR/discid" + if checkstatus cddbmethod > /dev/null 2>&1 ; then :; else + echo "cddbmethod=$CDDBMETHOD" >> "$ABCDETEMPDIR/status" + fi } # do_cleancue @@ -1632,6 +1660,16 @@ do_localcddb () fi } +do_musicbrainzstat () +{ + : +} + +do_musizbrainz () +{ + : +} + # do_cddbstat do_cddbstat () { @@ -1824,6 +1862,9 @@ do_cddbedit () CHOICE=$(checkstatus cddb-choice) if [ -n "$CHOICE" ] ; then case $CDDBCHOICES in + -1) log error "CDDB query failed!" + exit 1 + ;; 1) cat "$ABCDETEMPDIR/cddbchoices" ;; *) echo "Selected: #$CHOICE" @@ -1847,16 +1888,15 @@ do_cddbedit () echo -n "Which entry would you like abcde to use (0 for none)? [0-$CDDBCHOICES]: " >&2 read CDDBCHOICE [ X"$CDDBCHOICE" = "X" ] && CDDBCHOICE=1 - if echo $CDDBCHOICE | egrep -q "[[:digit:]]+,[[:digit:]]+" ; then + if echo $CDDBCHOICE | egrep -q "[[:space:]]*[[:digit:]]+,[[:digit:]]+[[:space:]]*" ; then if [ ! X"$DIFF" = "X" ]; then - PARSECHOICE1=$(echo $CDDBCHOICE | cut -d"," -f1) - PARSECHOICE2=$(echo $CDDBCHOICE | cut -d"," -f2) + PARSECHOICE1=$(echo $CDDBCHOICE | cut -d"," -f1 | xargs printf %d 2>/dev/null) + PARSECHOICE2=$(echo $CDDBCHOICE | cut -d"," -f2 | xargs printf %d 2>/dev/null) if [ $PARSECHOICE1 -lt 1 ] || [ $PARSECHOICE1 -gt $CDDBCHOICES ] || \ [ $PARSECHOICE2 -lt 1 ] || [ $PARSECHOICE2 -gt $CDDBCHOICES ] || \ [ $PARSECHOICE1 -eq $PARSECHOICE2 ]; then echo "Invalid diff range. Please select two coma-separated numbers between 1 and $CDDBCHOICES" >&2 else - # We parse the 2 choices to diff, store them in temporary files and diff them. for PARSECHOICE in $(echo $CDDBCHOICE | tr , \ ); do do_cddbparse "$ABCDETEMPDIR/cddbread.$PARSECHOICE" > "$ABCDETEMPDIR/cddbread.parsechoice.$PARSECHOICE" @@ -1872,10 +1912,10 @@ do_cddbedit () else echo "The diff program was not found in your path. Please choose a number between 0 and $CDDBCHOICES." >&2 fi - else + elif echo $CDDBCHOICE | egrep -q "[[:space:]]*[[:digit:]]+[[:space:]]*" ; then + # Make sure we get a valid choice + CDCHOICENUM=$(echo $CDDBCHOICE | xargs printf %d 2>/dev/null) if [ $CDCHOICENUM -lt 0 ] || [ $CDCHOICENUM -gt $CDDBCHOICES ]; then - # Make sure we get a valid choice - CDCHOICENUM=$(echo $CDDBCHOICE | xargs printf %d 2>/dev/null) echo "Invalid selection. Please choose a number between 0 and $CDDBCHOICES." >&2 fi fi @@ -2139,12 +2179,11 @@ do_cdread () LASTTRACK=$3 UTRACKNUM=$FIRSTTRACK case "$CDROMREADERSYNTAX" in - ### FIXME ### How are we calculating the tracks in flac mode? flac) READTRACKNUMS="$FIRSTTRACK.1-$(($LASTTRACK + 1)).0" ;; cdparanoia) READTRACKNUMS="$FIRSTTRACK-$LASTTRACK" ;; cdda2wav) READTRACKNUMS="$FIRSTTRACK+$LASTRACK" ;; - *) log error "$CDROMREADERSYNTAX does not support ONETRACK mode" - exit 1 ;; + *) echo "abcde error: $CDROMREADERSYNTAX does not support ONETRACK mode" + exit 1 ;; esac else UTRACKNUM=$1 @@ -2175,7 +2214,6 @@ do_cdread () echo "Grabbing ${PIPE_MESSAGE}tracks $UTRACKNUM - $LASTTRACK as one track ..." >&2 else if [ -r "$CDDBDATA" ]; then - #TRACKNAME=$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | head -n 1 | cut -f2 -d= | tr -d \[:cntrl:\]) do_getcddbinfo TRACKNAME echo "Grabbing ${PIPE_MESSAGE}track $UTRACKNUM: $TRACKNAME..." >&2 else @@ -2188,6 +2226,7 @@ do_cdread () flac) nice $READNICE $FLAC -d --cue=${READTRACKNUMS:-$UTRACKNUM.1-$(($UTRACKNUM + 1)).0} "$FILEARG" "$CDROM" ;; cdparanoia) + echo "nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;;" > /tmp/log nice $READNICE $CDROMREADER -$CDPARANOIACDROMBUS $CDROM ${READTRACKNUMS:-$UTRACKNUM} "$FILEARG" $REDIR ;; cdda2wav) if [ "$OSFLAVOUR" = "OSX" ] ; then @@ -2325,6 +2364,10 @@ post_read () ############################################################################### # Builtin defaults + +# CDDB +# Defaults to FreeDB, but a python musicbrainz can be used +CDDBMETHOD=cddb CDDBURL="http://freedb.freedb.org/~cddb/cddb.cgi" CDDBSUBMIT=freedb-submit@freedb.org CDDBPROTO=5 @@ -2337,7 +2380,7 @@ CDDBUSELOCAL="n" SHOWCDDBFIELDS="year,genre" INTERACTIVE=y -CDROMREADERSYNTAX=cdparanoia +#CDROMREADERSYNTAX=cdparanoia ENCODERSYNTAX=default MP3ENCODERSYNTAX=default @@ -2345,6 +2388,7 @@ OGGENCODERSYNTAX=default FLACENCODERSYNTAX=default SPEEXENCODERSYNTAX=default MPPENCODERSYNTAX=default +AACENCODERSYNTAX=default NORMALIZERSYNTAX=default CUEREADERSYNTAX=default @@ -2396,6 +2440,8 @@ FLAC=flac SPEEXENC=speexenc # mpp (Musepack) MPPENC=mppenc +# m4a +AACENC=faac ID3=id3 ID3V2=id3v2 @@ -2406,6 +2452,7 @@ DAGRAB=dagrab CDDAFS=cp CDDISCID=cd-discid CDDBTOOL=cddb-tool +MUSICBRAINZ=musicbrainz-get-tracks EJECT=eject MD5SUM=md5sum DISTMP3=distmp3 @@ -2439,6 +2486,8 @@ FLACOPTS= SPEEXENCOPTS= # mpc MPPENCOPTS= +# m4a +AACENCOPTS= ID3OPTS= ID3V2OPTS= @@ -2464,10 +2513,13 @@ MAXPROCS=1 # List of actions to perform - by default, run to completion ACTIONS=cddb,read,encode,tag,move,clean +# This option is basicaly for Debian package dependencies: # List of prefered outputs - by default, run with whatever we have in the path -# This option is basicaly for Debian package dependencies DEFAULT_OUTPUT_BINARIES=vorbis:oggenc,flac:flac,mp3:lame,mp3:bladeenc,spx:speex +# List of prefered cdromreaders - by default, run whichever we have in the path +DEFAULT_CDROMREADERS="cdparanoia cdda2wav" + # Asume fetch if under FreeBSD. curl is used for Mac OS X. wget is used for Linux/OpenBSD/NetBSD. # Let's use these checkings to determine the OS flavour, which will be used later if [ X$(uname) = "XFreeBSD" ] ; then @@ -2545,7 +2597,7 @@ if [ "$CDROM" = "" ] ; then fi # Parse command line options -#while getopts 1a:A:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do +#while getopts 1a:bc:C:d:Dehj:klLmMnNo:pPr:Rs:S:t:T:vVxw:W: opt ; do while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do case "$opt" in 1) ONETRACK=y ;; @@ -2554,7 +2606,7 @@ while getopts 1a:bBc:C:d:Defghj:klLmMnNo:pPr:s:S:t:T:uvVxw:W:z opt ; do b) BATCHNORM=y ;; B) NOBATCHREPLAYGAIN=y ;; c) if [ -e "$OPTARG" ] ; then . "$OPTARG" ; else log error "config file \"$OPTARG\" cannot be found." ; exit 1 ; fi ;; - C) DISCID="${OPTARG#abcde.}" ;; + C) DISCID="$( echo ${OPTARG#abcde.} | tr -d /)" ;; d) CDROM="$OPTARG" ;; D) set -x ;; e) ERASEENCODEDSTATUS=y ;; @@ -2618,6 +2670,21 @@ fi # If the user provided a DISCID, disable eject if [ -n "$DISCID" ]; then EJECTCD=n ; fi +# Check the available cd rippers in the system, from the ones we know. +if [ "$CDROMREADERSYNTAX" = "" ]; then + for DEFAULT_CDROMREADER in $DEFAULT_CDROMREADERS; do + if [ -x $( which $DEFAULT_CDROMREADER ) ]; then + CDROMREADERSYNTAX=$DEFAULT_CDROMREADER + break + fi + done + if [ "$CDROMREADERSYNTAX" = "" ]; then + log error "no cdreader found in your PATH" + log error "hints: are all dependencies installed? has the \$PATH been modified?" + exit 1 + fi +fi + # Decide if we can continue. if [ "$ONETRACK" = "y" ]; then # FIXME # remove check as soon as we find out about the other readers @@ -2840,6 +2907,7 @@ if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then flac:*) FLACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; spx:*) SPEEXENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; mpc:*) MPPENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; + m4a:*) AACENCODEROPTSCLI="$( echo $OUTPUT | cut -d: -f2- )" ;; esac done for OUTPUT in "$(echo "$OUTPUTTYPE" | tr , \ )"; do @@ -2849,7 +2917,8 @@ if echo "$OUTPUTTYPE" | grep ":" > /dev/null 2>&1 ; then OUTPUTTYPE="$TEMPOUTPUTTYPE" fi -# If nothing has been specified, use oggenc for oggs and lame for mp3s and flac for flacs and speexenc for speex and mppenc for mpps +# If nothing has been specified, use oggenc for oggs and lame for mp3s and flac +# for flacs and speexenc for speex and mppenc for mpps and faac for m4as # Getting ready for multiple output changes for OUTPUT in $(echo $OUTPUTTYPE | tr , \ ) @@ -2879,6 +2948,9 @@ do [ "$MPPENCODERSYNTAX" = "default" ] && MPPENCODERSYNTAX=mppenc [ "$DOREPLAYGAIN" = "y" ] && NEEDMPPGAIN=y ;; + m4a) + [ "$AACENCODERSYNTAX" = "default" ] && AACENCODERSYNTAX=faac + ;; wav) if [ "$KEEPWAVS" = "y" ]; then vecho "Unsetting the KEEPWAVS option, since the resulting wav files were requested..." @@ -2959,7 +3031,12 @@ case "$MPPENCODERSYNTAX" in MPPENCODER="$MPPENC" ;; esac - +case "$AACENCODERSYNTAX" in + faac) + AACENCODEROPTS="${AACENCODEROPTSCLI:-$AACENCOPTS}" + AACENCODER="$AACENC" + ;; +esac # and which tagger if [ "$ID3TAGV" = "1" ]; then @@ -3017,7 +3094,11 @@ if [ "$EJECTCD" = "y" ]; then NEEDEJECT=y fi if [ ! "$CDDBAVAIL" = "n" ] && [ "$DOCDDB" = "y" ]; then - NEEDHTTPGET=y + if [ "$CDDBMETHOD" = "cddb" ]; then + NEEDHTTPGET=y + elif [ "$CDDBMETHOD" = "musicbrainz" ]; then + : + fi fi if [ "$MAKECUEFILE" = "y" ]; then NEEDCUEREADER=y @@ -3130,7 +3211,14 @@ pre_read # Execute the user-defined pre-read funtion. Close the CD with it. vecho "done." -do_discid # Get ABCDETEMPDIR created and status file initialized +case "$CDDBMETHOD" in + cddb) + do_discid # Get ABCDETEMPDIR created and status file initialized + ;; + musicbrainz) + do_musicbrainz + ;; +esac if [ "$DOCDDB" = "y" ]; then if [ $CDDBUSELOCAL = "y" ]; then @@ -3140,9 +3228,16 @@ if [ "$DOCDDB" = "y" ]; then : else if [ ! "$CDDBLOCALSUCCESS" = "y" ] ; then - do_cddbstat - do_cddbquery - do_cddbread + case "$CDDBMETHOD" in + cddb) + do_cddbstat + do_cddbquery + do_cddbread + ;; + musicbrainz) + do_musicbrainz + ;; + esac fi fi do_cddbedit @@ -3400,10 +3495,8 @@ do TRACKNUM="$FIRSTTRACK" splitvarious else -# TRACKNUM=$(printf %0.${TRACKNUMPADDING}d $(expr ${UTRACKNUM} + 0)) TRACKNUM=$UTRACKNUM CDDBTRACKNUM=$(expr $UTRACKNUM - 1) - #TRACKNAME="$(grep ^TTITLE$CDDBTRACKNUM= "$CDDBDATA" | cut -f2- -d= | tr -d \[:cntrl:\] | sed 's/\ \+$//')" do_getcddbinfo TRACKNAME splitvarious fi @@ -3479,10 +3572,6 @@ if [ "$DOREPLAYGAIN" = "y" ]; then do_replaygain fi -# FIXME # -# Check if all the encoded formats have been actually moved to the final destination -# ... - # Check to see if run_command logged any errors if [ -f "$ABCDETEMPDIR/errors" ]; then log error "The following commands failed to run:" @@ -3498,11 +3587,11 @@ fi if [ "$DOCLEAN" = "y" ] && [ ! "$FORCE" = "y" ]; then ENCODED_FORMATS=$(egrep "^encodetrack-(.{3,6})-(.{1,2})$" "$ABCDETEMPDIR/status" | cut -d"-" -f2 | sort -u | tr '\n' '|') MOVED_FORMATS=$(egrep "^movetrack-output-(.{3,6})$" "$ABCDETEMPDIR/status" | cut -d"-" -f3 | sort -u | tr '\n' '|') - decho [ENCODED_FORMATS] - decho [MOVED_FORMATS] if [ "$ENCODED_FORMATS" != "$MOVED_FORMATS" ]; then - log warning "Not all encoded formats have been requested to be moved." - log warning "Use \"-a clean -f -C $DISCID\" to force the removal of the remaining data." + log warning "The encoded formats does not match with the moved ones" + log warning "Formats encoded: $( echo $ENCODED_FORMATS | tr "|" " " )" + log warning "Formats moved: $( echo $MOVED_FORMATS | tr "|" " " )" + log warning "Use \"abcde -a clean -f -C $DISCID\" to force the removal of the remaining data." DOCLEAN=n fi fi