Simplify opus tagging options
authorAndrew Strong <andrew.david.strong@gmail.com>
Sat, 14 Mar 2015 09:07:32 +0000 (20:07 +1100)
committerAndrew Strong <andrew.david.strong@gmail.com>
Sat, 14 Mar 2015 09:07:32 +0000 (20:07 +1100)
This rectifies Issue 133.

abcde

diff --git a/abcde b/abcde
index cfa901d..36304a0 100755 (executable)
--- a/abcde
+++ b/abcde
@@ -1160,16 +1160,10 @@ do_encode ()
                                %local*%)
                                        case "$OPUSENCODERSYNTAX" in
                                        opusenc)
                                %local*%)
                                        case "$OPUSENCODERSYNTAX" in
                                        opusenc)
-
-                                           if [ "$(eval echo ${COMMENT})" != "" ]; then
-                                               case "$COMMENT" in
-                                                   *=*) ;;
-                                                    *)   COMMENT="COMMENT=$COMMENT" ;;
-                                               esac
-                                           fi
                                            # Tag the file at encode time, as it can't be done after encoding.
                                            if [ "$DOTAG" = "y" ]; then
                                            # Tag the file at encode time, as it can't be done after encoding.
                                            if [ "$DOTAG" = "y" ]; then
-                                              $RUN_COMMAND nice $EFFECTIVE_NICE $OPUSENCODER $OPUSENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" --genre "$CDGENRE" --date "$CDYEAR" --comment TRACKNUMBER="$1" ${COMMENT:+--comment "$COMMENT"} "$IN" "$OUT"
+                                              $RUN_COMMAND nice $EFFECTIVE_NICE $OPUSENCODER $OPUSENCODEROPTS --artist "$TRACKARTIST" --album "$DALBUM" --title "$TRACKNAME" \
+                                              --genre "$CDGENRE" --date "$CDYEAR" --comment TRACKNUMBER="$1" ${COMMENT:+--comment COMMENT="$COMMENT"} "$IN" "$OUT"
                                            else
                                              $RUN_COMMAND nice $EFFECTIVE_NICE $OPUSENCODER $OPUSENCODEROPTS "$IN" "$OUT"
                                            fi
                                            else
                                              $RUN_COMMAND nice $EFFECTIVE_NICE $OPUSENCODER $OPUSENCODEROPTS "$IN" "$OUT"
                                            fi