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

Compare commits

base: csolisr:f6503dbe780ff221df182505af47f7557e2ee255
Branches Tags
csolisr:main
...
compare: csolisr:1ee6c0dfadb5d8b9e22c5dc620a7bd6aa60f1544
Branches Tags
csolisr:main

3 commits
f6503dbe78 ... 1ee6c0dfad

Author SHA1 Message Date
Carlos Solís
1ee6c0dfad feat: Greatly optimize loop, add benchmarks, correct printing 2025-02-09 02:31:07 +00:00
Carlos Solís
303ef0be9f feat: Optimize loop 2025-02-09 02:30:01 +00:00
Carlos Solís
7456eb97a1 fix: Correct permissions and frame amount counter 2025-02-09 02:29:19 +00:00
3 changed files with 101 additions and 137 deletions
Show stats Expand all files Collapse all files

7
friendica-fix-avatar-permissions.sh
View file

@ -5,7 +5,7 @@ IFS="
site=friendica.example.net site=friendica.example.net
user=friendica user=friendica
group=www-data group=www-data
fileperm=640 fileperm=660
folderperm=770 folderperm=770
folder=/var/www/friendica folder=/var/www/friendica
folderescaped=${folder////\\/} folderescaped=${folder////\\/}
@ -19,7 +19,7 @@ loop_1() {
nice -n 10 gifsicle --batch -O3 --lossy=80 --colors=255 "${p}" #&> /dev/null nice -n 10 gifsicle --batch -O3 --lossy=80 --colors=255 "${p}" #&> /dev/null
#Specific compression for large GIF files #Specific compression for large GIF files
while [[ $(stat -c%s "${p}" || 0) -ge 512000 ]]; do while [[ $(stat -c%s "${p}" || 0) -ge 512000 ]]; do
frameamount=$(exiftool -b -FrameCount "${p}" || 1) frameamount=$(($(exiftool -b -FrameCount "${p}" || 1) - 1))
nice -n 10 gifsicle "${p}" $(seq -f "#%g" 0 2 "${frameamount}") -O3 --lossy=80 --colors=255 -o "${p}" #&> /dev/null nice -n 10 gifsicle "${p}" $(seq -f "#%g" 0 2 "${frameamount}") -O3 --lossy=80 --colors=255 -o "${p}" #&> /dev/null
done done
elif [[ "${p}" =~ .png ]]; then elif [[ "${p}" =~ .png ]]; then
@ -43,7 +43,8 @@ loop_1() {
cd "${folder}" || exit cd "${folder}" || exit
if [[ ! -f "${tmpfile}" ]]; then if [[ ! -f "${tmpfile}" ]]; then
sudo -u "${user}" bin/console movetoavatarcache | sudo tee "${tmpfile}" #&> /dev/null #sudo -u "${user}" bin/console movetoavatarcache | sudo tee "${tmpfile}" #&> /dev/null
sudo bin/console movetoavatarcache | sudo tee "${tmpfile}" #&> /dev/null
fi fi
grep -e "https://${site}/${avatarfolder}/" "${tmpfile}" | sed -e "s/.*${site}/${folderescaped}/g" -e "s/?ts=.*//g" | ( grep -e "https://${site}/${avatarfolder}/" "${tmpfile}" | sed -e "s/.*${site}/${folderescaped}/g" -e "s/?ts=.*//g" | (
while read -r i; do while read -r i; do

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

@ -4,14 +4,13 @@ url=friendica.example.net
user=friendica user=friendica
group=www-data group=www-data
fileperm=660 fileperm=660
folderperm=770
db=friendica db=friendica
folder=/var/www/friendica folder=/var/www/friendica
#Internal parameters: #Internal parameters:
#Amount of times the internal loop has run #Amount of times the internal loop has run
batch=0 batch=0
#Number of invalid avatars found. Set to 1 initially so we can run the loop at least once #Number of invalid avatars found.
n=1 n=0
#Number of entries processed this loop #Number of entries processed this loop
nx=0 nx=0
#Total number of entries processed #Total number of entries processed
@ -22,80 +21,46 @@ lastid=0
maxid=$(mariadb "${db}" -B -N -q -e "select max(\`id\`) from contact") maxid=$(mariadb "${db}" -B -N -q -e "select max(\`id\`) from contact")
#Limit per batch #Limit per batch
limit=$(((maxid / 1000) + 1)) limit=$(((maxid / 1000) + 1))
if [[ -f /tmp/lastid ]]; then #https:// = 8 characters | /avatar/ = 8 characters
rm /tmp/lastid && touch /tmp/lastid #indexlength=$(("${#url}" + 16))
else #mariadb "${db}" -e "alter table contact add index if not exists photo_index (photo(${indexlength}))"
touch /tmp/lastid
fi
#Go to the Friendica installation #Go to the Friendica installation
cd "${folder}" || exit cd "${folder}" || exit
#Add to the loop, reset values #Add to the loop, reset values
maxid=$(mariadb "${db}" -B -N -q -e "select max(\`id\`) from contact")
#dbcount=$(mariadb "${db}" -B -N -q -e "select count(\`id\`) from contact where photo like 'https:\/\/${url}/avatar/%' and (id in (select cid from \`user-contact\`) or id in (select \`uid\` from \`user\`) or \`id\` in (select \`contact-id\` from \`group_member\`))") #dbcount=$(mariadb "${db}" -B -N -q -e "select count(\`id\`) from contact where photo like 'https:\/\/${url}/avatar/%' and (id in (select cid from \`user-contact\`) or id in (select \`uid\` from \`user\`) or \`id\` in (select \`contact-id\` from \`group_member\`))")
dbcount=$(mariadb "${db}" -B -N -q -e "select count(\`id\`) from contact where photo like 'https:\/\/${url}/avatar/%' or photo like ''") dbcount=$(mariadb "${db}" -B -N -q -e "select count(\`id\`) from contact where photo like 'https:\/\/${url}/avatar/%'")
echo "${n} ${nt} ${lastid}" >/tmp/lastid until [[ $((nt + limit)) -gt "${dbcount}" ]]; do
until [[ $((nt + limit)) -gt ${dbcount} ]]; do
nx=0 nx=0
maxid=$(mariadb "${db}" -B -N -q -e "select max(\`id\`) from contact")
batch=$(("${batch}" + 1)) batch=$(("${batch}" + 1))
#Read lastid outside of the loop with a temporary file
if [[ -f /tmp/lastid && -s /tmp/lastid ]]; then
while read -r n_i nt_i lastid_i; do
if [[ -s "${n_i}" ]]; then
n="${n_i}"
fi
if [[ -s "${nt_i}" ]]; then
nt="${nt_i}"
fi
if [[ -s "${lastid_i}" ]]; then
lastid="${lastid_i}"
fi
done </tmp/lastid
fi
#dboutput=$(mariadb "${db}" -B -N -q -e "select \`id\`, \`photo\`, \`thumb\`, \`micro\` from \`contact\` where \`id\` > ${lastid} and \`photo\` like \"https:\/\/${url}/avatar/%\" and (\`id\` in (select \`cid\` from \`user-contact\`) or \`id\` in (select \`uid\` from \`user\`) or \`id\` in (select \`contact-id\` from \`group_member\`)) order by id limit ${limit}")
#dboutput=$(mariadb "${db}" -B -N -q -e "select \`id\`, \`photo\`, \`thumb\`, \`micro\` from \`contact\` where \`id\` > ${lastid} and (\`photo\` like \"https:\/\/${url}/avatar/%\" or \`photo\` like \"\") order by id limit ${limit}")
dbid=$(mariadb "${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}")
while read -r id; do while read -r id; do
result_string="" result_string=""
nl=0
nx=$(("${nx}" + 1)) nx=$(("${nx}" + 1))
nt=$(("${nt}" + 1)) nt=$(("${nt}" + 1))
error_found=0 error_found=0
dboutput=$(mariadb "${db}" -B -N -q -e "select \`photo\`, \`thumb\`, \`micro\` from \`contact\` where \`id\` = ${id}") t_id=$(($(date +%s%N) / 1000000))
#echo "$id"
if [[ -n "${id}" ]]; then if [[ -n "${id}" ]]; then
while read -r photo thumb micro; do while read -r photo thumb micro; do
#echo "$photo $thumb $micro"
if [[ -n "${photo}" && -n "${thumb}" && -n "${micro}" ]]; then if [[ -n "${photo}" && -n "${thumb}" && -n "${micro}" ]]; then
#If there is a photo
folderescaped=${folder////\\/} folderescaped=${folder////\\/}
#Substitute the URL path with the folder path so we can search for it in the local file system #Substitute the URL path with the folder path so we can search for it in the local file system
#Photo is nominally 320px, actually 300px #Photo is nominally 320px, actually 300px
k_photo=$(echo "${photo}" | sed -e "s/https:\/\/${url}/${folderescaped}/g" -e "s/\?ts=.*//g") k_photo=$(sed -e "s/https:\/\/${url}/${folderescaped}/g" -e "s/\?ts=.*//g" <<<"${photo}")
#Thumb is 80px #Thumb is 80px
k_thumb=$(echo "${thumb}" | sed -e "s/https:\/\/${url}/${folderescaped}/g" -e "s/\?ts=.*//g") k_thumb=$(sed -e "s/https:\/\/${url}/${folderescaped}/g" -e "s/\?ts=.*//g" <<<"${thumb}")
#Micro is 48px #Micro is 48px
k_micro=$(echo "${micro}" | sed -e "s/https:\/\/${url}/${folderescaped}/g" -e "s/\?ts=.*//g") k_micro=$(sed -e "s/https:\/\/${url}/${folderescaped}/g" -e "s/\?ts=.*//g" <<<"${micro}")
#If fetching any of the images causes an error
if curl -s "${photo}" | file - | grep -q -e "text" -e "empty" -e "symbolic link" -e "directory" ||
curl -s "${thumb}" | file - | grep -q -e "text" -e "empty" -e "symbolic link" -e "directory" ||
curl -s "${micro}" | file - | grep -q -e "text" -e "empty" -e "symbolic link" -e "directory"; then
#Request the user data to be regenerated in the system through the database
mariadb "${db}" -N -B -q -e "update contact set avatar= \"\", photo = \"\", thumb = \"\", micro = \"\" where id = \"${id}\""
if [[ $(mariadb "${db}" -N -B -q -e "select count(*) from workerqueue where command = \"UpdateContact\" and parameter = \"[${id}]\" and done = 0") -eq 0 ]]; then
mariadb "${db}" -N -B -q -e "insert ignore into workerqueue (command, parameter, priority, created) values (\"UpdateContact\", \"[${id}]\", 20, CURTIME());" &
result_string=$(printf "%s (added)" "${result_string}")
else
result_string=$(printf "%s (already added)" "${result_string}")
fi
result_string=$(printf "${result_string} Fetch error: %s %s\n" "${id}" "${photo}")
error_found=1
fi
#If any of the images is not found in the filesystem #If any of the images is not found in the filesystem
if [[ ! -e "${k_photo}" || ! -e "${k_thumb}" || ! -e "${k_micro}" ]]; then if [[ ! -e "${k_photo}" || ! -e "${k_thumb}" || ! -e "${k_micro}" ]]; then
#If the avatar uses the standard fallback picture or is local, we cannot use it as a base #If the avatar uses the standard fallback picture or is local, we cannot use it as a base
t=$(($(date +%s%N) / 1000000))
avatar=$(mariadb "${db}" -B -N -q -e "select avatar from contact where id = \"${id}\" and not avatar like \"%${url}\" and not avatar like \"%images/person%\"") avatar=$(mariadb "${db}" -B -N -q -e "select avatar from contact where id = \"${id}\" and not avatar like \"%${url}\" and not avatar like \"%images/person%\"")
result_string=$(printf "%s %d ms" "${result_string}" $(($(($(date +%s%N) / 1000000)) - t)))
#If we have a remote avatar as a fallback, download it #If we have a remote avatar as a fallback, download it
if [[ -n "${avatar}" ]]; then if [[ "$!" -eq 0 && -n "${avatar}" ]]; then
result_string=$(printf "${result_string} Remote avatar: %s %s\n" "${id}" "${avatar}") result_string=$(printf "%s Remote %s" "${result_string}" "${avatar}")
nl=1
sudo -u "${user}" curl "${avatar}" -s -o "${k_photo}" sudo -u "${user}" curl "${avatar}" -s -o "${k_photo}"
#If the file is a valid picture (not empty, not text) #If the file is a valid picture (not empty, not text)
if file "${k_photo}" | grep -q -v -e "text" -e "empty" -e "symbolic link" -e "directory"; then if file "${k_photo}" | grep -q -v -e "text" -e "empty" -e "symbolic link" -e "directory"; then
@ -105,47 +70,46 @@ until [[ $((nt + limit)) -gt ${dbcount} ]]; do
(convert "${k_photo}" -resize 48x48 -depth 16 "${k_micro}" && chmod "${fileperm}" "${k_micro}" && chown "${user}:${group}" "${k_micro}") & (convert "${k_photo}" -resize 48x48 -depth 16 "${k_micro}" && chmod "${fileperm}" "${k_micro}" && chown "${user}:${group}" "${k_micro}") &
(convert "${k_photo}" -resize 300x300 -depth 16 "${k_photo}" && chmod "${fileperm}" "${k_photo}" && chown "${user}:${group}" "${k_photo}") & (convert "${k_photo}" -resize 300x300 -depth 16 "${k_photo}" && chmod "${fileperm}" "${k_photo}" && chown "${user}:${group}" "${k_photo}") &
result_string=$(printf "%s (generated)" "${result_string}") result_string=$(printf "%s (generated)" "${result_string}")
error_found=1
else else
#If the avatar is not valid, set it as blank in the database #If the avatar is not valid, set it as blank in the database
mariadb "${db}" -N -B -q -e "update contact set avatar= \"\", photo = \"\", thumb = \"\", micro = \"\" where id = \"${id}\"" & mariadb "${db}" -N -B -q -e "update contact set avatar= \"\", photo = \"\", thumb = \"\", micro = \"\" where id = \"${id}\"" &
rm -rf "${k_photo}" & rm -rf "${k_photo}" "${k_thumb}" "${k_micro}" &
result_string=$(printf "%s (blanked)" "${result_string}") result_string=$(printf "%s (blanked)" "${result_string}")
fi error_found=1
#Request the user data to be regenerated in the system through the database
if [[ $(mariadb "${db}" -N -B -q -e "select count(*) from workerqueue where command = \"UpdateContact\" and parameter = \"[${id}]\" and done = 0") -eq 0 ]]; then
mariadb "${db}" -N -B -q -e "insert ignore into workerqueue (command, parameter, priority, created) values (\"UpdateContact\", \"[${id}]\", 20, CURTIME());" &
result_string=$(printf "%s (added)" "${result_string}")
else
result_string=$(printf "%s (already added)" "${result_string}")
fi fi
else else
result_string=$(printf "${result_string} No remote avatar: %s" "${id}") result_string=$(printf "%s No remote avatar" "${result_string}")
#If no remote avatar is found, then we blank the photo/thumb/micro and let the avatar cache process fix them later #If no remote avatar is found, then we blank the photo/thumb/micro and let the avatar cache process fix them later
mariadb "${db}" -e "update contact set photo = \"\", thumb = \"\", micro = \"\" where id = \"${id}\"" & mariadb "${db}" -e "update contact set photo = \"\", thumb = \"\", micro = \"\" where id = \"${id}\"" &
#Request the user data to be regenerated in the system through the database error_found=1
if [[ $(mariadb "${db}" -N -B -q -e "select count(*) from workerqueue where command = \"UpdateContact\" and parameter = \"[${id}]\" and done = 0") -eq 0 ]]; then
mariadb "${db}" -N -B -q -e "insert ignore into workerqueue (command, parameter, priority, created) values (\"UpdateContact\", \"[${id}]\", 20, CURTIME());" &
result_string=$(printf "%s (added)" "${result_string}")
else
result_string=$(printf "%s (already added)" "${result_string}")
fi
fi fi
error_found=1
k_photo_delta="${photo//.*?ts=//}"
#k_photo_delta=$(echo "${photo}" | sed -e "s/.*?ts=//g")
else else
#k_photo_original_time=$(echo "${photo}" | sed -e "s/.*?ts=//g") #If the images are all found in the filesystem, but fetching any of the images causes an error
k_photo_original_time="${photo//.*?ts=//}" if curl -s "${photo}" | file - | grep -q -e "text" -e "empty" -e "symbolic link" -e "directory" ||
k_photo_found_time=$(stat -c%W "${k_photo}") curl -s "${thumb}" | file - | grep -q -e "text" -e "empty" -e "symbolic link" -e "directory" ||
k_photo_delta=$((k_photo_found_time - k_photo_original_time)) curl -s "${micro}" | file - | grep -q -e "text" -e "empty" -e "symbolic link" -e "directory"; then
result_string=$(printf "${result_string} Fetch error: %s" "${photo}")
mariadb "${db}" -N -B -q -e "update contact set avatar= \"\", photo = \"\", thumb = \"\", micro = \"\" where id = \"${id}\"" &
result_string=$(printf "%s (blanked)" "${result_string}")
nl=1
error_found=1
else
result_string=$(printf "%s (FOUND)" "${result_string}")
error_found=0
fi
fi fi
else else
result_string=$(printf "${result_string} No local photo: %s" "${id}") #If there is no photo
result_string=$(printf "%s No local" "${result_string}")
#If the avatar uses the standard fallback picture or is local, we cannot use it as a base #If the avatar uses the standard fallback picture or is local, we cannot use it as a base
t=$(($(date +%s%N) / 1000000))
avatar=$(mariadb "${db}" -B -N -q -e "select avatar from contact where id = \"${id}\" and not avatar like \"%${url}\" and not avatar like \"%images/person%\"") avatar=$(mariadb "${db}" -B -N -q -e "select avatar from contact where id = \"${id}\" and not avatar like \"%${url}\" and not avatar like \"%images/person%\"")
result_string=$(printf "%s %d ms" "${result_string}" $(($(($(date +%s%N) / 1000000)) - t)))
#If we have a remote avatar as a fallback, download it #If we have a remote avatar as a fallback, download it
if [[ $! -eq 0 && -n ${avatar} ]]; then if [[ "$!" -eq 0 && -n "${avatar}" ]]; then
result_string=$(printf "${result_string} Remote avatar: %s %s\n" "${id}" "${avatar}") result_string=$(printf "${result_string} Remote %s" "${avatar}")
nl=1
sudo -u "${user}" curl "${avatar}" -s -o "${k_photo}" sudo -u "${user}" curl "${avatar}" -s -o "${k_photo}"
#If the file is a valid picture (not empty, not text) #If the file is a valid picture (not empty, not text)
if file "${k_photo}" | grep -q -v -e "text" -e "empty" -e "symbolic link" -e "directory"; then if file "${k_photo}" | grep -q -v -e "text" -e "empty" -e "symbolic link" -e "directory"; then
@ -155,54 +119,58 @@ until [[ $((nt + limit)) -gt ${dbcount} ]]; do
(convert "${k_photo}" -resize 48x48 -depth 16 "${k_micro}" && chmod "${fileperm}" "${k_micro}" && chown "${user}:${group}" "${k_micro}") & (convert "${k_photo}" -resize 48x48 -depth 16 "${k_micro}" && chmod "${fileperm}" "${k_micro}" && chown "${user}:${group}" "${k_micro}") &
(convert "${k_photo}" -resize 300x300 -depth 16 "${k_photo}" && chmod "${fileperm}" "${k_photo}" && chown "${user}:${group}" "${k_photo}") & (convert "${k_photo}" -resize 300x300 -depth 16 "${k_photo}" && chmod "${fileperm}" "${k_photo}" && chown "${user}:${group}" "${k_photo}") &
result_string=$(printf "%s (generated)" "${result_string}") result_string=$(printf "%s (generated)" "${result_string}")
error_found=1
else else
#If the avatar is not valid, set it as blank in the database #If the avatar is not valid, set it as blank in the database
mariadb "${db}" -N -B -q -e "update contact set avatar= \"\", photo = \"\", thumb = \"\", micro = \"\" where id = \"${id}\"" & mariadb "${db}" -N -B -q -e "update contact set avatar= \"\", photo = \"\", thumb = \"\", micro = \"\" where id = \"${id}\"" &
rm -rf "${k_photo}" & rm -rf "${k_photo}" "${k_thumb}" "{k_micro}" &
result_string=$(printf "%s (blanked)" "${result_string}") result_string=$(printf "%s (blanked)" "${result_string}")
fi error_found=1
#Request the user data to be regenerated in the system through the database
if [[ $(mariadb "${db}" -N -B -q -e "select count(*) from workerqueue where command = \"UpdateContact\" and parameter = \"[${id}]\" and done = 0") -eq 0 ]]; then
mariadb "${db}" -N -B -q -e "insert ignore into workerqueue (command, parameter, priority, created) values (\"UpdateContact\", \"[${id}]\", 20, CURTIME());" &
result_string=$(printf "%s (added)" "${result_string}")
else
result_string=$(printf "%s (already added)" "${result_string}")
fi fi
else else
result_string=$(printf "${result_string} No remote avatar: %s" "${id}") result_string=$(printf "%s No remote" "${result_string}")
#Request the user data to be regenerated in the system through the database #If no remote avatar is found, we would blank the photo/thumb/micro and let the avatar cache process fix them later, but it's empty already here
if [[ $(mariadb "${db}" -N -B -q -e "select count(*) from workerqueue where command = \"UpdateContact\" and parameter = \"[${id}]\" and done = 0") -eq 0 ]]; then error_found=1
mariadb "${db}" -N -B -q -e "insert ignore into workerqueue (command, parameter, priority, created) values (\"UpdateContact\", \"[${id}]\", 20, CURTIME());" &
result_string=$(printf "%s (added)" "${result_string}")
else
result_string=$(printf "%s (already added)" "${result_string}")
fi
fi fi
error_found=1
k_photo_delta=0
#k_photo_delta=$(echo "${photo}" | sed -e "s/.*?ts=//g")
fi fi
if [[ "${error_found}" -gt 0 ]]; then if [[ "${error_found}" -gt 0 ]]; then
#Request the user data to be regenerated in the system through the database
#if [[ $(mariadb "${db}" -N -B -q -e "insert ignore into workerqueue (command, parameter, priority, created) \
#select \"UpdateContact\" as command, \"[${id}]\" as parameter, 20 as priority, concat(curdate(), \" \", curtime()) as created \
#from workerqueue where (select count(*) from workerqueue \
#where command = \"UpdateContact\" and parameter = \"[${id}]\" and done = 0) = 0; \
#select row_count();") -gt 0 ]]; then
#result_string=$(printf "%s (added)" "${result_string}")
#nl=1
#else
#result_string=$(printf "%s (already)" "${result_string}")
#fi
mariadb "${db}" -N -B -q -e "insert ignore into workerqueue (command, parameter, priority, created) \
values (\"UpdateContact\", \"[${id}]\", 20, concat(curdate(), \" \", curtime()));" &
result_string=$(printf "%s (added)" "${result_string}")
nl=1
n=$((n + 1)) n=$((n + 1))
fi fi
lastid="${id}" lastid="${id}"
touch /tmp/lastid done < <(mariadb "${db}" -B -N -q -e "select \`photo\`, \`thumb\`, \`micro\` from \`contact\` where \`id\` = ${id}")
echo "${n} ${nt} ${lastid}" >/tmp/lastid
done < <(echo "${dboutput}")
fi fi
printf "\rFound %8d/%8d Total %8d/%8d Delta %6d %s " "${n}" "${nt}" "${lastid}" "${maxid}" "${k_photo_delta}" "${result_string}" result_string=$(printf "%s %d ms" "${result_string}" $(($(($(date +%s%N) / 1000000)) - t_id)))
#Line clearance final_string=$(printf "E%8d F%8d/%8d T%8d/%8d %s" "${n}" "${nt}" "${dbcount}" "${lastid}" "${maxid}" "${result_string}")
printf "\r" final_string_length="${#final_string}"
for ((count = 0; count < "${COLUMNS}"; count++)); do #Previous line clearance
printf "\b" #Measure length of string, blank only the excess
blank_string=""
blank_string_length=$((COLUMNS - final_string_length))
for ((count = 0; count < "${blank_string_length}"; count++)); do
blank_string=$(printf "%s " "${blank_string}")
done done
done < <(echo "${dbid}") final_string=$(printf "%s%s" "${final_string}" "${blank_string}")
#Add a new line only when necessary
if [[ "${nl}" -eq 1 ]]; then
final_string=$(printf "%s\n\r\n" "${final_string}")
fi
printf "%s\r" "${final_string}"
done < <(mariadb "${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}")
done done
printf "\nFixing folders and moving to avatar cache...\n" #mariadb "${db}" -e "alter table contact drop index photo_index"
#sudo -u "${user}" bin/console movetoavatarcache #&> /dev/null #printf "\nFixing folders and moving to avatar cache...\n"
"${folder}"/bin/console movetoavatarcache #&> /dev/null
find ./avatar -depth -not -user "${user}" -or -not -group "${group}" -exec chown -v "${user}:${group}" {} \;
find ./avatar -depth -type f -and -not -type d -and -not -perm "${fileperm}" -exec chmod -v "${fileperm}" {} \;
find ./avatar -depth -type d -and -not -perm "${folderperm}" -exec chmod -v "${folderperm}" {} \;
chown -R "${user}:${group}" ./avatar
rm /tmp/lastid

33
friendica-remove-old-photos-parallel.sh
View file

@ -12,7 +12,7 @@ loop() {
ky=$(echo "${y}" | sed -e "s/${folderescaped}/https:\/\/${url}/g" -e "s/-[0-9]*\..*\$//g") ky=$(echo "${y}" | sed -e "s/${folderescaped}/https:\/\/${url}/g" -e "s/-[0-9]*\..*\$//g")
f=$(mariadb "${db}" -N -B -q -e "select photo from contact where photo like '${ky}%' limit 1") f=$(mariadb "${db}" -N -B -q -e "select photo from contact where photo like '${ky}%' limit 1")
if [[ $? -eq 0 && -z ${f} && -f ${y} ]]; then if [[ $? -eq 0 && -z ${f} && -f ${y} ]]; then
(ls -lh "${y}" && rm -rf "${y}") & rm -rvf "${y}" &
if [[ $(jobs -r -p | wc -l) -ge $(($(getconf _NPROCESSORS_ONLN) * 2)) ]]; then if [[ $(jobs -r -p | wc -l) -ge $(($(getconf _NPROCESSORS_ONLN) * 2)) ]]; then
wait -n wait -n
fi fi
@ -27,28 +27,23 @@ loop() {
date date
#Go to the Friendica installation #Go to the Friendica installation
cd "${folderavatar}" || exit cd "${folderavatar}" || exit
indexlength=$((49 + ${#url})) #indexlength=$((49 + ${#url}))
mariadb "${db}" -e "alter table contact add index if not exists photo_index (photo(${indexlength}))" #mariadb "${db}" -e "alter table contact add index if not exists photo_index (photo(${indexlength}))"
n=0 n=0
d=0 d=0
find "${folderavatar}" -depth -mindepth 1 -maxdepth 1 -type d | while read -r x; do while read -r x; do
n=$((n + 1)) n=$((n + 1))
#If the directory still exists #If the directory still exists
if [[ -d "${x}" ]]; then if [[ -d "${x}" ]]; then
folderescaped=${folder////\\/} m=0
#kx=$(echo "${x}" | sed -e "s/${folderescaped}/https:\/\/${url}/g" -e "s/-[0-9]*\..*\$//g") while read -r y; do
if [[ -d ${x} ]]; then m=$((m + 1))
m=0 loop "${x}" "${m}" "${n}" "${d}" "${y}" &
while read -r y; do if [[ $(jobs -r -p | wc -l) -ge $(($(getconf _NPROCESSORS_ONLN) * 2)) ]]; then
m=$((m + 1)) wait -n
loop "${x}" "${m}" "${n}" "${d}" & fi
if [[ $(jobs -r -p | wc -l) -ge $(($(getconf _NPROCESSORS_ONLN) * 2)) ]]; then done < <(find "${x}" -type f)
wait -n
fi
#done < <(find "${x}" -type f -mtime -8)
done < <(find "${x}" -type f)
fi
fi fi
done done < <(find "${folderavatar}" -depth -mindepth 1 -maxdepth 1 -type d)
mariadb "${db}" -e "alter table contact drop index photo_index" #mariadb "${db}" -e "alter table contact drop index photo_index"
date date