csolisr/public-scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Correct the loop behavior yet again

Browse source
This commit is contained in:
Carlos Solís 2025-02-10 20:28:15 +00:00
parent 5057478a6f
commit bbc5bc6f33
1 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
friendica-remove-invalid-photos.sh
View file

@ -21,7 +21,9 @@ else
touch "${nfile}" touch "${nfile}"
fi fi
if [[ -f "${nlock}" ]]; then if [[ -f "${nlock}" ]]; then
rm -rf "${nlock}" rm -rf "${nlock}" && touch "${nlock}"
else
touch "${nlock}"
fi fi
#Internal parameters: #Internal parameters:
#Number of invalid avatars found #Number of invalid avatars found
@ -52,15 +54,18 @@ loop() {
r=0 r=0
t_r=$(($(date +%s%N) / 1000000)) t_r=$(($(date +%s%N) / 1000000))
while [[ "${r}" -eq 0 ]]; do while [[ "${r}" -eq 0 ]]; do
#Read data from file, delete lock
if [[ ! -f "${nlock}" ]]; then if [[ ! -f "${nlock}" ]]; then
touch "${nlock}" touch "${nlock}"
fi
if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo 0) -eq "" ]]; then
echo "${id}" >"${nlock}" echo "${id}" >"${nlock}"
if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo 0) -eq "${id}" ]]; then if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo 0) -eq "${id}" ]]; then
read -r n nt <"${nfile}" read -r n_tmp nt_tmp <"${nfile}"
if [[ -n "${n_tmp}" && -n "${nt_tmp}" ]]; then if [[ -n "${n_tmp}" && -n "${nt_tmp}" ]]; then
n="${n_tmp}"
nt="${nt_tmp}"
if [[ -f "${nlock}" ]]; then if [[ -f "${nlock}" ]]; then
rm -rf "${nlock}" echo "" >"${nlock}"
fi fi
r=1 r=1
fi fi
@ -176,14 +181,17 @@ loop() {
fi fi
lastid="${id}" lastid="${id}"
done < <("${dbengine}" "${db}" -B -N -q -e "select \`avatar\`, \`photo\`, \`thumb\`, \`micro\` from \`contact\` where \`id\` = ${id}") done < <("${dbengine}" "${db}" -B -N -q -e "select \`avatar\`, \`photo\`, \`thumb\`, \`micro\` from \`contact\` where \`id\` = ${id}")
else
echo "${n}" "${nt}" "${dbcount}" "${lastid}" "${maxid}" "${result_string}"
fi fi
w=0 w=0
t_w=$(($(date +%s%N) / 1000000)) t_w=$(($(date +%s%N) / 1000000))
while [[ "${w}" -eq 0 ]]; do while [[ "${w}" -eq 0 ]]; do
if [[ ! -f "${nlock}" ]]; then if [[ ! -f "${nlock}" ]]; then
#Write data to file, delete lock
#n is increased only if error_found = 1 #n is increased only if error_found = 1
touch "${nlock}" touch "${nlock}"
fi
if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo 0) -eq "" ]]; then
echo "${id}" >"${nlock}" echo "${id}" >"${nlock}"
if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo 0) -eq "${id}" ]]; then if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo 0) -eq "${id}" ]]; then
read -r n_tmp nt_tmp <"${nfile}" read -r n_tmp nt_tmp <"${nfile}"
@ -193,7 +201,7 @@ loop() {
if [[ $(cat "${nlock}" 2>/dev/null || echo 0) -eq "${id}" ]]; then if [[ $(cat "${nlock}" 2>/dev/null || echo 0) -eq "${id}" ]]; then
echo "${n} ${nt}" >"${nfile}" echo "${n} ${nt}" >"${nfile}"
if [[ -f "${nlock}" ]]; then if [[ -f "${nlock}" ]]; then
rm -rf "${nlock}" echo "" >"${nlock}"
fi fi
w=1 w=1
fi fi
@ -241,28 +249,33 @@ until [[ $((nt + limit)) -ge "${dbcount}" || "${lastid}" -ge "${maxid}" ]]; do
wait -n wait -n
done done
done < <(echo "${c}") done < <(echo "${c}")
wait #Read data before next iteration
#Read current state here, before the loop is restarted rl=0
#Wait until lock no longer exists while [[ "${rl}" -eq 0 ]]; do
r=0
t_r=$(($(date +%s%N) / 1000000))
while [[ "${r}" -eq 0 ]]; do
#Read data from file, delete lock
if [[ ! -f "${nlock}" ]]; then if [[ ! -f "${nlock}" ]]; then
touch "${nlock}" touch "${nlock}"
fi
if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo 0) -eq "" ]]; then
echo "${lastid}" >"${nlock}" echo "${lastid}" >"${nlock}"
if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo 0) -eq "${lastid}" ]]; then if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo 0) -eq "${lastid}" ]]; then
read -r n nt <"${nfile}" read -r n_tmp_l nt_tmp_l <"${nfile}"
if [[ -n "${n_tmp}" && -n "${nt_tmp}" ]]; then if [[ -n "${n_tmp_l}" && -n "${nt_tmp_l}" ]]; then
n="${n_tmp_l}"
nt="${nt_tmp_l}"
if [[ -f "${nlock}" ]]; then if [[ -f "${nlock}" ]]; then
rm -rf "${nlock}" echo "" >"${nlock}"
fi fi
r=1 rl=1
else
sleep 1s
fi fi
else
sleep 1s
fi fi
else
sleep 1s
fi fi
done done
done done
if [[ -f "${nfile}" ]]; then if [[ -f "${nfile}" ]]; then
rm -rf "${nfile}" rm -rf "${nfile}"