Skip to content

Commit 16a1947

Browse files
committed
Avoid duplicate extensions in the destination filenames.
1 parent a78ff5e commit 16a1947

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

Diff for: chromecastize.sh

+8-4
Original file line numberDiff line numberDiff line change
@@ -96,11 +96,12 @@ mark_as_good() {
9696
on_success() {
9797
echo ""
9898
FILENAME="$1"
99-
BASENAME=`basename "$FILENAME"`
100-
echo "- conversion succeeded; file '$FILENAME.$OUTPUT_GFORMAT' saved"
101-
mark_as_good "$FILENAME.$OUTPUT_GFORMAT"
99+
DESTINATION_FILENAME="$2"
100+
echo "- conversion succeeded; file '$DESTINATION_FILENAME' saved"
102101
echo "- renaming original file as '$FILENAME.bak'"
103102
mv "$FILENAME" "$FILENAME.bak"
103+
mv "$FILENAME.$OUTPUT_GFORMAT" "$DESTINATION_FILENAME"
104+
mark_as_good "$DESTINATION_FILENAME"
104105
}
105106

106107
on_failure() {
@@ -168,7 +169,10 @@ process_file() {
168169
if [ "$OUTPUT_GFORMAT" = "ok" ]; then
169170
OUTPUT_GFORMAT=$EXTENSION
170171
fi
171-
$FFMPEG -loglevel error -stats -i "$FILENAME" -map 0 -scodec copy -vcodec "$OUTPUT_VCODEC" -acodec "$OUTPUT_ACODEC" "$FILENAME.$OUTPUT_GFORMAT" && on_success "$FILENAME" || on_failure "$FILENAME"
172+
173+
# Define the destination filename, stripping the original extension.
174+
DESTINATION_FILENAME=${FILENAME%.$EXTENSION}.$OUTPUT_GFORMAT
175+
$FFMPEG -loglevel error -stats -i "$FILENAME" -map 0 -scodec copy -vcodec "$OUTPUT_VCODEC" -acodec "$OUTPUT_ACODEC" "$FILENAME.$OUTPUT_GFORMAT" && on_success "$FILENAME" "$DESTINATION_FILENAME" || on_failure "$FILENAME"
172176
echo ""
173177
fi
174178
}

0 commit comments

Comments
 (0)