Change cdparanoia-tracks to = in the status file

git-svn-id: http://abcde.googlecode.com/svn/trunk@125 a0fa61bc-5347-0410-a1a9-7f54aa4e1825

diff --git a/TODO b/TODO
index d33ad02..88544e0 100644 (file)
--- a/TODO
+++ b/TODO
@@ -1,8 +1,5 @@
 TODO:
 ----
-* Change cdparanoia-tracks to = in the status file
-
-* ReplyGain support
 * flacdecode (to extract files from a -1 flac file)
 
 * Get the echo instances to behave consistently
@@ -44,8 +41,6 @@ TODO:
 
   Abcde should halt when a problem occurs, so it can be manually resolved.
 
-* Support UTF-8
-
 * AAC support (faac should be free?)
 
 * I used abcde to rip a cd in batch normalizing mode to mp3 (mp2

diff --git a/abcde b/abcde
index 9ce94ce..09938a3 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -1287,11 +1287,11 @@ do_discid ()
                                                if [ ! "$RET" = "0" ];then
                                                        echo "Warning: Something went wrong while querying the CD... Maybe a DATA CD?"
                                                fi
-                                               TRACKS="$( echo "$CDPARANOIAOUTPUT" | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ' )"
+                                               TRACKS="$(echo "$CDPARANOIAOUTPUT" | egrep '^[[:space:]]+[[:digit:]]' | tail -n 1 | get_first | tr -d "." | tr '\n' ' ')"
                                                CDPARANOIAAUDIOTRACKS="$TRACKS"
                                        else
                                                if [ -f "$ABCDETEMPDIR/status" ] && checkstatus cdparanoia-audio-tracks ; then
-                                                       TRACKS=$( cat "$ABCDETEMPDIR/cdparanoia-audio-tracks" )
+                                                       TRACKS=$(checkstatus cdparanoia-audio-tracks)
                                                else
                                                        TRACKS=$(echo $TRACKINFO | cut -f2 -d' ')
                                                fi
@@ -1424,9 +1424,7 @@ do_discid ()
        # If we got the CDPARANOIA status and it is not recorded, save it now
        if [ -n "$CDPARANOIAAUDIOTRACKS" ]; then
                if checkstatus cdparanoia-audio-tracks; then :; else
-                       if echo "$CDPARANOIAAUDIOTRACKS" >> "$ABCDETEMPDIR/cdparanoia-audio-tracks"; then
-                               echo "cdparanoia-audio-tracks" >> "$ABCDETEMPDIR/status"
-                       fi
+                       echo cdparanoia-audio-tracks=$CDPARANOIAAUDIOTRACKS >> "$ABCDETEMPDIR/status"
                fi
        fi
        

diff --git a/debian/changelog b/debian/changelog
index 23314e7..fd04fa4 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,17 +3,20 @@ abcde (2.3.99-1) unstable; urgency=low
   * Added diff choice to CDDB entries ("1,4").
   * Added SHOWCDDBFIELDS to allow the user to show YEAR and GENRE in the
     parsed CDDB output.
+  * Changed cdparanoia-audio-tracks to use the status file to save the data.
 
- -- Jesus Climent <jesus.climent@hispalinux.es>  Sat, 13 Aug 2005 03:26:59 +0300
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Sat,  3 Sep 2005 19:26:44 +0300
 
 abcde (2.3.4-1) unstable; urgency=low
 
   * Some patches from Tom Spindler <dogcow () babymeat ! com>
     - Added some quoting to the md5sum checkings, since the variables could be
-      null. 
+      null.
     - NetBSD bits to use ftp instead on anything else to fetch stuff.
+  * do_playlist needs to convert the OUTPUT to the CONTAINERS to avoid ending
+    with playlists pointing to .vorbis files (Closes: #326487).
 
- -- Jesus Climent <jesus.climent@hispalinux.es>  Mon, 22 Aug 2005 12:14:54 +0300
+ -- Jesus Climent <jesus.climent@hispalinux.es>  Sat,  3 Sep 2005 16:50:07 +0300
 
 abcde (2.3.3-1) unstable; urgency=low