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

[cmd_export] Improved git annex error handling

Browse source
This commit is contained in:
ayakael 2019-04-08 15:18:12 -04:00
parent d24ebc669f
commit 976ee8f44a
Signed by untrusted user who does not match committer: forge
GPG key ID: D62A472A4AA7D541
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/cmd_export
View file

@ -64,6 +64,8 @@ cmd_export() {
local COUNT=0 local COUNT=0
for imageid in ${exportableidList[@]}; do for imageid in ${exportableidList[@]}; do
local CP_ERR=false
local GIT_GET=false
local COUNT=$(( ${COUNT} + 1 )) local COUNT=$(( ${COUNT} + 1 ))
echo "[ ${COUNT} / ${#exportableidList[@]} ] Deploying ${imageid}" echo "[ ${COUNT} / ${#exportableidList[@]} ] Deploying ${imageid}"
# Processes deployableids (IMAGEIDs that have TRACKIDs that are not present in target, but are selected) # Processes deployableids (IMAGEIDs that have TRACKIDs that are not present in target, but are selected)
@ -73,9 +75,16 @@ cmd_export() {
git -C "${GIT_DIR}" annex get "${imageid}.flac" >${STDERR} 2>&1 git -C "${GIT_DIR}" annex get "${imageid}.flac" >${STDERR} 2>&1
local ERROR=$? local ERROR=$?
local GIT_GET=true local GIT_GET=true
[[ ${ERROR} -eq 255 ]] && git -C "${GIT_DIR}" annex get "${imageid}.flac" >/dev/null 2>&1 if [[ $ERROR -ne 0 ]] && [[ ${ERROR} -ne 255 ]]; then
local ERROR=$? _ansi up 2
[[ $ERROR -ne 0 ]] && { _ansi up 2; echo -en '\033[K'; echo "[ ${COUNT} / ${#exportableidList[@]} ] ${imageid} could not be downloaded from server"; cat ${STDERR}; local ERR=true; continue; } || { if ${_DEBUG}; then cat ${STDERR}; fi; } echo -en '\033[K'
echo "[ ${COUNT} / ${#exportableidList[@]} ] ${imageid} could not be downloaded from server"
cat ${STDERR}
local ERR=true
continue
else
if ${_DEBUG}; then cat ${STDERR}; fi;
fi
fi fi
export_cp "${GIT_DIR}" "${TARGET}" "${DB_FILE}" ${imageid} > ${STDERR} 2>&1 export_cp "${GIT_DIR}" "${TARGET}" "${DB_FILE}" ${imageid} > ${STDERR} 2>&1
local EXIT=$? local EXIT=$?