Many bug fixes went into this update:

 * abcde
   - Playlist creation more or less working ;)
   - mungefile change to remove the stars
 * abcde.conf
   - mungefile modified to contain the star change
 * FAQ
   - new entry with Amaya's problem
   - s.cdset.setcd.
   - version 2.2 includes MPP/MP+
   - 2.2 also includes some check to avoid reading data tracks
 * README
   - added the playlist support description

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

diff --git a/FAQ b/FAQ
index a62c2fe..f8caadf 100644 (file)
--- a/FAQ
+++ b/FAQ
@@ -14,8 +14,8 @@ A. That is not possible, since abcde gets the information from CDDB database.
    You can create a template and fill it with the option "-n".
 
 Q. What formats can I encode my music to?
    You can create a template and fill it with the option "-n".
 
 Q. What formats can I encode my music to?

-A. As for version 2.1.7, abcde includes support for MP3, Ogg/Vorbis, 
-   Ogg/Speex and Flac.
+A. As for version 2.2, abcde includes support for MP3, Ogg/Vorbis, 
+   Ogg/Speex, Flac and MPP/MP+(Musepack).

 
 Q. I have a CD with a data track, and abcde complaints it cannot read/encode
    it.
 
 Q. I have a CD with a data track, and abcde complaints it cannot read/encode
    it.


@@ -24,6 +24,8 @@ A. It is not easy to find a data track on a CD. Right now, I can only think
    a "data" track name is found. But the solution is far from been optimal.
    For now, if you find a "data" track and you know the number, restart abcde
    specifying the tracks to be encoded, leaving out the data one.
    a "data" track name is found. But the solution is far from been optimal.
    For now, if you find a "data" track and you know the number, restart abcde
    specifying the tracks to be encoded, leaving out the data one.

+   Version 2.2 includes some checkings with cdparanoia, to try to get this
+   right.

 
 Q. How can I separate the different output files I get using multiple-output
    support?
 
 Q. How can I separate the different output files I get using multiple-output
    support?


@@ -83,8 +85,9 @@ A. Try using "-m" when creating the playlists, or setting DOSPLAYLIST as an
 Q. I am requested to have eject when setting the speed although I do not use
    for anything.
 A. If you do not use cdparanoia, eject is used for setting the speed of the 
 Q. I am requested to have eject when setting the speed although I do not use
    for anything.
 A. If you do not use cdparanoia, eject is used for setting the speed of the 

-   cdrom drive. You can substitute it for "cdset" with "-x" as the argument,
-   but you have to install it manually.
+   cdrom drive. You can substitute it for "setcd" with "-x" as the argument,
+   but you have to install it manually (setcd is, at least, available in 
+   Debian).

    Another way to get the same results is using the pre_read function, defined
    in your /etc/abcde.conf file.
 
    Another way to get the same results is using the pre_read function, defined
    in your /etc/abcde.conf file.
 


@@ -100,6 +103,12 @@ A. Patches are welcome! ;)
    source/free software, it should be fairly easy to integrate. Support for
    AAC (m4p) should be the next one to be introduced.
 
    source/free software, it should be fairly easy to integrate. Support for
    AAC (m4p) should be the next one to be introduced.
 

+Q. (Thanks to Amaya) Where are those options and settings defined? Why dont
+   you include a proper abcde.conf as an example?
+A. I do. It should be installed under /etc/abcde.conf and contains more or
+   less all the defaults abcde uses. You can use $(HOME)/.abcde.conf to 
+   override those defaults.
+

 OBSOLETE
 --------
 Q. I set KEEPWAVS to "y" but abcde insists on erasing my directory, along
 OBSOLETE
 --------
 Q. I set KEEPWAVS to "y" but abcde insists on erasing my directory, along

diff --git a/KNOWN.BUGS b/KNOWN.BUGS
index c31d62b..a45b148 100644 (file)
--- a/KNOWN.BUGS
+++ b/KNOWN.BUGS
@@ -1 +1 @@
-* If the some info contains a * (star) the directory creation fails. Being addressed
+No serious ones ;)

diff --git a/README b/README
index 68447e4..4341fa4 100644 (file)
--- a/README
+++ b/README
@@ -58,6 +58,9 @@ Changes in 2.2-pre2:
   under the GPL...
 * New "-s <number>" option for starting the numbering of the output files at 
   a given starting number. Ideal for albums with more than one CD.
   under the GPL...
 * New "-s <number>" option for starting the numbering of the output files at 
   a given starting number. Ideal for albums with more than one CD.

+* Support for keeping an existing playlist (and not add new entries to it),
+  erase the existing one (overwrite) or append new entries to the existing
+  one.

 
 Changes in 2.2-pre1:
 
 
 Changes in 2.2-pre1:
 

diff --git a/TODO b/TODO
index e960cde..0a5783a 100644 (file)
--- a/TODO
+++ b/TODO
@@ -29,9 +29,3 @@ TODO:
   since abcde sees the encoding already finished. Same with tags and moves.
 
 * Support UTF-8 tags
   since abcde sees the encoding already finished. Same with tags and moves.
 
 * Support UTF-8 tags

-
-DONE:
-----
-* FLAC support (http://flac.sourceforge.net/)
-* Multiple ogg/mp3/flac output during the same session
-* Track padding problem with single songs.

diff --git a/abcde b/abcde
index 48490bc..ea84e47 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -725,7 +725,11 @@ do_playlist ()
                                echo e >&2
                                ERASEPLAYLIST=e
                        fi
                                echo e >&2
                                ERASEPLAYLIST=e
                        fi

-                       [ "$ERASEPLAYLIST" = "e" -o "$ERASEPLAYLIST" = "E" ] && rm -f "$OUTPUTDIR/$PLAYLISTFILE"
+                       # Once we erase the playlist, we use append to create the new one.
+                       [ "$ERASEPLAYLIST" = "e" -o "$ERASEPLAYLIST" = "E" ] && rm -f "$OUTPUTDIR/$PLAYLISTFILE" && ERASEPLAYLIST=a
+               else
+                       # The playlist does not exist, so we can safelly use append to create the new list
+                       ERASEPLAYLIST=a

                fi
                if [ "$ERASEPLAYLIST" = "a" -o "$ERASEPLAYLIST" = "A" ]; then
                        touch "$OUTPUTDIR/$PLAYLISTFILE"
                fi
                if [ "$ERASEPLAYLIST" = "a" -o "$ERASEPLAYLIST" = "A" ]; then
                        touch "$OUTPUTDIR/$PLAYLISTFILE"


@@ -1760,7 +1764,7 @@ ACTIONS=cddb,read,encode,tag,move,clean
 # Custom filename munging:
 mungefilename ()
 {
 # Custom filename munging:
 mungefilename ()
 {

-       echo "$@" | sed s,:,\ -,g | sed 's,*,-,g' | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
+       echo "$@" | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]

 }
 
 # pre_read
 }
 
 # pre_read

diff --git a/abcde.conf b/abcde.conf
index 6c2fff5..16da18e 100644 (file)
--- a/abcde.conf
+++ b/abcde.conf
@@ -229,7 +229,7 @@
 # as $1 and outputs it on stdout.
 #mungefilename ()
 #{
 # as $1 and outputs it on stdout.
 #mungefilename ()
 #{

-#      echo "$@" | sed s,:,\ -,g | tr \ / __ | tr -d \'\"\?\[:cntrl:\]
+#      echo "$@" | sed s,:,\ -,g | tr \ /\* __+ | tr -d \'\"\?\[:cntrl:\]

 #}
 
 # Custom pre-read function
 #}
 
 # Custom pre-read function

diff --git a/debian/files b/debian/files
index ffa3dbc..e5b3b73 100644 (file)
--- a/debian/files
+++ b/debian/files
@@ -1 +1 @@
-abcde_2.1.0-3_all.deb sound optional
+abcde_2.1.20-2.2pre2-1_all.deb sound optional