m/shell-scripting-templates
1
0
Fork 0
mirror of https://github.com/natelandau/shell-scripting-templates.git synced 2025-11-09 13:43:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug with concatenating files

Browse Source
This commit is contained in:
Nathaniel Landau
2016-01-13 10:58:58 -05:00
parent 6382d98739
commit e18d2cd46b
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
bin/convertMedia
View File

@@ -3,7 +3,7 @@
# ################################################## # ##################################################
# My Generic BASH script template # My Generic BASH script template
# #
version="2.1.0" # Sets version variable for this script version="2.1.1" # Sets version variable for this script
# #
scriptTemplateVersion="1.5.0" # Version of scriptTemplate.sh that this script is based on scriptTemplateVersion="1.5.0" # Version of scriptTemplate.sh that this script is based on
# #
@@ -24,7 +24,7 @@ scriptTemplateVersion="1.5.0" # Version of scriptTemplate.sh that this script is
# * 2016-01-09 - v2.1.0 - Support for audiobooks with .m4b # * 2016-01-09 - v2.1.0 - Support for audiobooks with .m4b
# - Support for concatenating multiple audio files # - Support for concatenating multiple audio files
# - Support for --probe function to output ffprobe data in JSON # - Support for --probe function to output ffprobe data in JSON
# # * 2016-01-13 - v2.1.1 - Fixed bug with concatenating files
# #
# ################################################## # ##################################################
@@ -240,9 +240,9 @@ function mainScript() {
} }
function concatFiles() { function concatFiles() {
if ${concatFiles}; then if ${concat}; then
# Create variable for ffmpeg to concacenate the files # Create variable for ffmpeg to concacenate the files
concatConvert="concat:$(join "|" ${filesToConvert[@]})" concatConvert="concat:$(join "|" "${filesToConvert[@]}")"
# Create the variable for the deleteOriginalFile function # Create the variable for the deleteOriginalFile function
concatDelete="$(join " " ${filesToConvert[@]})" concatDelete="$(join " " ${filesToConvert[@]})"
@@ -357,9 +357,9 @@ function mainScript() {
supportedAudioCodecs=(aac ac3 eac3) supportedAudioCodecs=(aac ac3 eac3)
if [[ "${supportedAudioCodecs[*]}" =~ "${audioCodec}" ]]; then if [[ "${supportedAudioCodecs[*]}" =~ "${audioCodec}" ]]; then
videoAudioCommand="-c:a copy" && verbose "videoAudioCommand set to -c:a copy" videoAudioCommand="-c:a copy"
else else
videoAudioCommand="-c:a ${aacEncoder} -b:a 160k" && verbose "videoAudioCommand set to -c:a ${aacEncoder} -b:a 160k" videoAudioCommand="-c:a ${aacEncoder} -b:a 160k"
fi fi
# SET VIDEO INFORMATION # SET VIDEO INFORMATION
@@ -632,7 +632,7 @@ function mainScript() {
fi fi
# When concatenating files, we need a different $file variable # When concatenating files, we need a different $file variable
if ${concatFiles}; then if ${concat}; then
file="${concatConvert}" file="${concatConvert}"
fi fi
@@ -682,7 +682,7 @@ function mainScript() {
# first, ensure we don't delete the originals if we're in a safe rune # first, ensure we don't delete the originals if we're in a safe rune
if [[ "${safeRun}" == "0" ]]; then if [[ "${safeRun}" == "0" ]]; then
if ${deleteOriginal}; then if ${deleteOriginal}; then
if ${concatFiles}; then if ${concat}; then
for fileToDelete in "${filesToConvert[@]}"; do for fileToDelete in "${filesToConvert[@]}"; do
rm -f ${v} "${fileToDelete}" rm -f ${v} "${fileToDelete}"
done done
@@ -696,7 +696,7 @@ function mainScript() {
fi fi
# break the loop if we're concatenating files. # break the loop if we're concatenating files.
if ${concatFiles}; then if ${concat}; then
break break
fi fi
} }