change convert cover in vorbis

diff --git a/albentohandy b/albentohandy
index c0f9f3b3293e10d132f0fe7d47bf4ee7dda4b8d3..fc9a202493f1d15ccde3727c092a2bf092faf9b4 100755 (executable)
--- a/albentohandy
+++ b/albentohandy
@@ -171,8 +171,7 @@ convert_process()
        "mp3") convert_flac_to_mp3 "$workdir" ;;
        "flac") picture_to_flac "$workdir" ;;
        "opus") convert_flac_to_opus "$workdir" ;;
-       *) convert_cover_to_metadata "$workdir" \
-               && convert_flac_to_ogg "$workdir" ;;
+       *) convert_flac_to_ogg "$workdir" ;;
        esac
 
        cleanup_cover "$workdir"

diff --git a/libs/voribs.sh b/libs/voribs.sh
index ed20fc66f296f5fe2f6c1ae32cd07dfc6b6ee8ff..903a95656a896faba8b1939962ee127bd7647cb8 100644 (file)
--- a/libs/voribs.sh
+++ b/libs/voribs.sh
@@ -34,19 +34,6 @@ flac_to_vorbis()
        read_flac_to_ogg_tags "$inputfile" "$outputfile"
 }
 
-convert_flac_to_ogg()
-{
-       local workdir="$1"
-
-       export -f flac_to_vorbis
-       export -f encoding_flac_to_ogg
-       export -f read_flac_to_ogg_tags
-       find $workdir -name '*.flac' \
-               | sort \
-               | parallel --will-cite --ungroup --eta --progress \
-               flac_to_vorbis "{}"
-}
-
 cover_to_metadata()
 {
        local inputfile="$1"
@@ -75,13 +62,20 @@ cover_to_metadata()
        cat $inputfile >> $outputfile
 }
 
-convert_cover_to_metadata()
+convert_flac_to_ogg()
 {
        local workdir="$1"
-       local covers=$(find $workdir -name '*.jpg' | sort)
 
-       local cover=
-       for cover in $covers; do
-               cover_to_metadata "$cover"
-       done
+       export -f flac_to_vorbis
+       export -f encoding_flac_to_ogg
+       export -f read_flac_to_ogg_tags
+       export -f cover_to_metadata
+       find $workdir -name '*.jpg' \
+               | sort \
+               | parallel --will-cite --ungroup \
+               cover_to_metadata {}
+       find $workdir -name '*.flac' \
+               | sort \
+               | parallel --will-cite --ungroup --eta --progress \
+               flac_to_vorbis "{}"
 }