Select CDDBMETHOD from the command line

Allow selection of either cddb or musicbrainz from the command line:

 -Q   Select CDDBMETHOD from the command line. Choice is cddb or musicbrainz.

Command line letters are fast running out but the 'Q' option quite neatly
stands for 'Query'!

diff --git a/abcde b/abcde
index fef4c51..44bd94e 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -51,6 +51,7 @@ echo "-o <type1[,type2]...>"
 echo "       Output file type(s) (vorbis,mp3,flac,spx,mpc,wav,m4a,opus,mka,wv,ape,mp2,tta,aiff). 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 "-Q     Select CDDBMETHOD from the command line. Choice is cddb or musicbrainz".
 echo "-r <host1[,host2]...>"
 echo "       Also encode on these remote hosts"
 echo "-s <field>"
@@ -4006,7 +4007,7 @@ case "$EXTRAVERBOSE" in
 esac
 
 # Parse command line options
-while getopts 1a:bBc:C:d:DefgGhj:klLmMnNo:pPr:s:S:t:T:UvVxX:w:W:z opt ; do
+while getopts 1a:bBc:C:d:DefgGhj:klLmMnNo:pP:Q:r:s:S:t:T:UvVxX:w:W:z opt ; do
        case "$opt" in
                1) ONETRACK=y ;;
                a) ACTIONS="$OPTARG" ;;
@@ -4035,6 +4036,7 @@ while getopts 1a:bBc:C:d:DefgGhj:klLmMnNo:pPr:s:S:t:T:UvVxX:w:W:z opt ; do
                o) OUTPUTTYPE="$OPTARG" ;;
                p) PADTRACKS=y ;;
                P) USEPIPES=y ;;
+               Q) CDDBMETHOD="$OPTARG" ;;
                r) REMOTEHOSTS="$OPTARG" ;;
                R) CDDBLOCALRECURSIVE=y ;;
                s) SHOWCDDBFIELDS="$OPTARG" ;;

diff --git a/changelog b/changelog
index f4772bd..edf7fb4 100644 (file)
--- a/changelog
+++ b/changelog
@@ -25,6 +25,12 @@ abcde 2.8.2
  * Support added for encoding with Audio Interchange File Format (AIFF). 
    Thanks to Massimo Villa for the feature request. FFmpeg is required
    for the encoding, the container and suffix are 'aiff'.
+ * Allow selection of either cddb or musicbrainz from the command line:
+ 
+  -Q   Select CDDBMETHOD from the command line. Choice is cddb or musicbrainz.
+  
+   Command line letters are fast running out but the 'Q' option quite neatly
+   stands for 'Query'!
    
 abcde 2.8.1.