forge/dam
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity Actions

[chk_deployed_ids] Improved error handling, and fixed issue with long flacList generation

Browse source
This commit is contained in:
ayakael 2019-04-09 18:43:14 -04:00
parent 6190983149
commit c014f7ee2b
Signed by untrusted user who does not match committer: forge
GPG key ID: D62A472A4AA7D541
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/chk_deployed_ids
View file

@ -16,7 +16,7 @@ chk_deployed_ids() {
local TARGET="${1}" local TARGET="${1}"
local DB_FILE="${2}" local DB_FILE="${2}"
local flacList=($(find "${TARGET}" -name '*.flac' -not -path '*/\.*' -printf "%P\n")) local flacList=($(find "${TARGET}"/* -name '*.flac' -printf "%p\n"))
local COUNT=0 local COUNT=0
for flac in ${flacList[@]}; do for flac in ${flacList[@]}; do
@ -27,10 +27,11 @@ chk_deployed_ids() {
local IMAGEID=$(awk 'BEGIN{RS=";";FS="="}{if($1=="IMAGEID"){print $2}}' <<< ${METADATA}) local IMAGEID=$(awk 'BEGIN{RS=";";FS="="}{if($1=="IMAGEID"){print $2}}' <<< ${METADATA})
local TRACKID=$(awk 'BEGIN{RS=";";FS="="}{if($1=="TRACKID"){print $2}}' <<< ${METADATA}) local TRACKID=$(awk 'BEGIN{RS=";";FS="="}{if($1=="TRACKID"){print $2}}' <<< ${METADATA})
if [[ -z "${IMAGEID+x}" ]] || [[ -z "${TRACKID+x}" ]]; then echo "${flac} does not contain IMAGEID or TRACKID metadata" > ${STDERR}; local ERR=true; fi if [[ -z "${IMAGEID+x}" ]] || [[ -z "${TRACKID+x}" ]]; then
[[ "${ERR}" == "true" ]] && { cat ${STDERR}; continue; } _ansi up 2; echo -en '\033[K'; echo "[ ${COUNT} / ${#flacList[@]} ] ${flac} does not contain IMAGEID or TRACKID metadata"
local ERR=true
continue
fi
if [[ -z "$(awk -v imageid=${IMAGEID} -v trackid=${TRACKID} 'BEGIN{FS="\t"}{if($2==imageid && $3==trackid){print $0}}' ${DB_FILE})" ]]; then if [[ -z "$(awk -v imageid=${IMAGEID} -v trackid=${TRACKID} 'BEGIN{FS="\t"}{if($2==imageid && $3==trackid){print $0}}' ${DB_FILE})" ]]; then
local ERR=true local ERR=true
echo "Fixing accounting for ${flac}" > ${STDERR} echo "Fixing accounting for ${flac}" > ${STDERR}
@ -40,9 +41,8 @@ chk_deployed_ids() {
echo "Fixing path for ${flac}" > ${STDERR} echo "Fixing path for ${flac}" > ${STDERR}
gawk -i inplace -v imageid=${IMAGEID} -v trackid=${TRACKID} 'BEGIN{FS="\t"}{if($2==imageid && $3==trackid){$4=path}{print $0}}' ${DB_FILE} gawk -i inplace -v imageid=${IMAGEID} -v trackid=${TRACKID} 'BEGIN{FS="\t"}{if($2==imageid && $3==trackid){$4=path}{print $0}}' ${DB_FILE}
fi fi
[[ "${ERR}" == "true" ]] && cat ${STDERR} [[ "${ERR}" == "true" ]] && return 1 || return 0
done done
} }