[import_images][import_src][import_strack] Now puts "img" in front of file extensions (i.e flac now img.flac) in .import folder

This commit is contained in:
ayakael 2018-12-27 15:20:47 -05:00
parent a16d9e85a6
commit 41080ccb13
No known key found for this signature in database
GPG key ID: 575626A4AE5F4026
3 changed files with 15 additions and 15 deletions

View file

@ -60,8 +60,8 @@ import_images() {
mkdir -p "${GIT_DIR}/.import/${SOURCE}/${discidList}" mkdir -p "${GIT_DIR}/.import/${SOURCE}/${discidList}"
for path in ${pathList[@]}; do for path in ${pathList[@]}; do
case $(sed 's|.*\.||' <<< ${path}) in case $(sed 's|.*\.||' <<< ${path}) in
(jpg) echo "Copying cover image"; convert "${path}" "${GIT_DIR}/.import/${SOURCE}/${discidList}/png" ;; (jpg) echo "Copying cover image"; convert "${path}" "${GIT_DIR}/.import/${SOURCE}/${discidList}/img.png" ;;
(*) local DEST="${GIT_DIR}/.import/${SOURCE}/${discidList}/$(sed 's|.*\.||' <<< ${path})"; echo "Copying ${path} to ${DEST}"; cp --no-preserve=mode "${path}" "${DEST}" ;; (*) local DEST="${GIT_DIR}/.import/${SOURCE}/${discidList}/img.$(sed 's|.*\.||' <<< ${path})"; echo "Copying ${path} to ${DEST}"; cp --no-preserve=mode "${path}" "${DEST}" ;;
esac esac
done done
} }

View file

@ -32,12 +32,12 @@ import_src() {
FLAC) FLAC)
med_integrity ${fileList[@]} >${STDERR} 2>&1 med_integrity ${fileList[@]} >${STDERR} 2>&1
[[ $? -eq 0 ]] || return 4 [[ $? -eq 0 ]] || return 4
gen_image "${TRACK_DIR}/flac" $(printf "%s\t" ${fileList[@]}) gen_image "${TRACK_DIR}/img.flac" $(printf "%s\t" ${fileList[@]})
local EXIT="$?" local EXIT="$?"
[[ $? -eq 0 ]] || return 3 [[ $? -eq 0 ]] || return 3
;; ;;
CUETOOLS|EAC) CUETOOLS|EAC)
med_integrity "${TRACK_DIR}/flac" >${STDERR} 2>&1 med_integrity "${TRACK_DIR}/img.flac" >${STDERR} 2>&1
[[ $? -eq 0 ]] || return 4 [[ $? -eq 0 ]] || return 4
;; ;;
esac esac
@ -46,9 +46,9 @@ import_src() {
# Generates IMAGEID # Generates IMAGEID
echo "Generating IMAGEID" echo "Generating IMAGEID"
local DISCID="${SOURCE}" local DISCID="${SOURCE}"
[[ "${SOURCE}" == "CUETOOLS" ]] && local DISCID=$(grep "CTDB TOCID:" ${TRACK_DIR}/accurip | cut -d' ' -f3 | sed 's|-]||') [[ "${SOURCE}" == "CUETOOLS" ]] && local DISCID=$(grep "CTDB TOCID:" ${TRACK_DIR}/img.accurip | cut -d' ' -f3 | sed 's|-]||')
[[ "${SOURCE}" == "EAC" ]] && local DISCID="$(grep "REM DISCID" ${TRACK_DIR}/cue | cut -d' ' -f3)" [[ "${SOURCE}" == "EAC" ]] && local DISCID="$(grep "REM DISCID" ${TRACK_DIR}/img.cue | cut -d' ' -f3)"
local IMAGEID="SHA256-${DISCID}--$(sha256sum "${TRACK_DIR}/flac" | cut -d' ' -f1)" local IMAGEID="SHA256-${DISCID}--$(sha256sum "${TRACK_DIR}/img.flac" | cut -d' ' -f1)"
# Generate addmetaList and trackmetaList # Generate addmetaList and trackmetaList
echo "Generating metadata" echo "Generating metadata"
@ -60,8 +60,8 @@ import_src() {
;; ;;
CUETOOLS|EAC) CUETOOLS|EAC)
local trackList=($(grep -o TRACK ${TRACK_DIR}/cue )) local trackList=($(grep -o TRACK ${TRACK_DIR}/cue ))
local addmetaList=($(gen_metatrack -c "${TRACK_DIR}/cue" "${TRACK_DIR}/flac" )) local addmetaList=($(gen_metatrack -c "${TRACK_DIR}/img.cue" "${TRACK_DIR}/img.flac" ))
local trackmetaList=($(print_meta_cue ${TRACK_DIR}/cue)) local trackmetaList=($(print_meta_cue ${TRACK_DIR}/img.cue))
;; ;;
esac esac
local COUNT=0 local COUNT=0
@ -81,7 +81,7 @@ import_src() {
local EXIT=$? local EXIT=$?
;; ;;
EAC|CUETOOLS) EAC|CUETOOLS)
awk "!/FILE/{print} /FILE/{print \"FILE ${IMAGEID}.flac WAVE\"}" "${TRACK_DIR}/cue" > "${GIT_DIR}/${IMAGEID}.cue" awk "!/FILE/{print} /FILE/{print \"FILE ${IMAGEID}.flac WAVE\"}" "${TRACK_DIR}/img.cue" > "${GIT_DIR}/${IMAGEID}.cue"
local EXIT=$? local EXIT=$?
;; ;;
esac esac
@ -96,10 +96,10 @@ import_src() {
# Move joined.flac to GIT_DIR # Move joined.flac to GIT_DIR
cp "${TRACK_DIR}/flac" "${GIT_DIR}/${IMAGEID}.flac" cp "${TRACK_DIR}/img.flac" "${GIT_DIR}/${IMAGEID}.flac"
# Generate cover images # Generate cover images
gen_cover "${TRACK_DIR}/png" > ${GIT_DIR}/${IMAGEID}.png gen_cover "${TRACK_DIR}/img.png" > ${GIT_DIR}/${IMAGEID}.png
gen_small_cover "${TRACK_DIR}/png" > ${GIT_DIR}/${IMAGEID}.jpg gen_small_cover "${TRACK_DIR}/img.png" > ${GIT_DIR}/${IMAGEID}.jpg
return 0 return 0
} }

View file

@ -39,8 +39,8 @@ import_track() {
# Moving cover to TRACK_DIR # Moving cover to TRACK_DIR
if [[ ${#coverList[@]} -eq 1 ]] && [[ ! -f "${TRACK_DIR}/png" ]]; then if [[ ${#coverList[@]} -eq 1 ]] && [[ ! -f "${TRACK_DIR}/img.png" ]]; then
convert ${coverList[@]} "${TRACK_DIR}/png" convert ${coverList[@]} "${TRACK_DIR}/img.png"
fi fi
# Converting to FLAC if need me # Converting to FLAC if need me