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

fix: Correct the lockfiles, again

Browse source
This commit is contained in:
Carlos Solís 2025-02-10 18:04:00 +00:00
parent 370305bf3b
commit 28b706af4e
1 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -55,13 +55,15 @@ loop() {
#Read data from file, delete lock #Read data from file, delete lock
if [[ ! -f "${nlock}" ]]; then if [[ ! -f "${nlock}" ]]; then
touch "${nlock}" touch "${nlock}"
echo "${id}" >"${nlock}" || break 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}" || break read -r n nt <"${nfile}"
if [[ -f "${nlock}" ]]; then if [[ -n "${n_tmp}" && -n "${nt_tmp}" ]]; then
rm -rf "${nlock}" if [[ -f "${nlock}" ]]; then
rm -rf "${nlock}"
fi
r=1
fi fi
r=1
fi fi
fi fi
done done
@ -184,15 +186,17 @@ loop() {
touch "${nlock}" touch "${nlock}"
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}" || break read -r n_tmp nt_tmp <"${nfile}"
n=$((n_tmp + error_found)) if [[ -n "${n_tmp}" && -n "${nt_tmp}" ]]; then
nt=$((nt_tmp + 1)) n=$((n_tmp + error_found))
if [[ $(cat "${nlock}" 2>/dev/null || echo 0) -eq "${id}" ]]; then nt=$((nt_tmp + 1))
echo "${n} ${nt}" >"${nfile}" || break if [[ $(cat "${nlock}" 2>/dev/null || echo 0) -eq "${id}" ]]; then
if [[ -f "${nlock}" ]]; then echo "${n} ${nt}" >"${nfile}"
rm -rf "${nlock}" if [[ -f "${nlock}" ]]; then
rm -rf "${nlock}"
fi
w=1
fi fi
w=1
fi fi
fi fi
fi fi
@ -219,7 +223,7 @@ loop() {
#Go to the Friendica installation #Go to the Friendica installation
cd "${folder}" || exit cd "${folder}" || exit
echo "${n} ${nt}" >"${nfile}" echo "${n} ${nt}" >"${nfile}"
until [[ "${nt}" -ge "${dbcount}" ]]; do until [[ "${nt}" -ge "${dbcount}" || "${lastid}" -ge "${maxid}" ]]; do
c="" c=""
if [[ "${intense_optimizations}" -gt 0 ]]; then if [[ "${intense_optimizations}" -gt 0 ]]; then
c=$("${dbengine}" "${db}" -B -N -q -e "select \`id\` from \`contact\` where \`id\` > ${lastid} and (\`photo\` like \"https:\/\/${url}/avatar/%\" or \`photo\` like \"\") order by id limit ${limit}") c=$("${dbengine}" "${db}" -B -N -q -e "select \`id\` from \`contact\` where \`id\` > ${lastid} and (\`photo\` like \"https:\/\/${url}/avatar/%\" or \`photo\` like \"\") order by id limit ${limit}")
@ -238,6 +242,27 @@ until [[ "${nt}" -ge "${dbcount}" ]]; do
done done
done < <(echo "${c}") done < <(echo "${c}")
wait wait
#Read current state here, before the loop is restarted
#Wait until lock no longer exists
r=0
t_r=$(($(date +%s%N) / 1000000))
while [[ "${r}" -eq 0 ]]; do
#Read data from file, delete lock
if [[ ! -f "${nlock}" ]]; then
touch "${nlock}"
echo "${lastid}" >"${nlock}"
if [[ -f "${nlock}" && $(cat "${nlock}" 2>/dev/null || echo 0) -eq "${lastid}" ]]; then
read -r n nt <"${nfile}"
if [[ -n "${n_tmp}" && -n "${nt_tmp}" ]]; then
if [[ -f "${nlock}" ]]; then
rm -rf "${nlock}"
fi
r=1
fi
fi
fi
done
done done
if [[ -f "${nfile}" ]]; then if [[ -f "${nfile}" ]]; then
rm -rf "${nfile}" rm -rf "${nfile}"