Compare commits

..

No commits in common. "f38bd73bf81298d218fc470676d8119a44fdef77" and "af0e32eb68cd83c26356c547f9a0b10a3991a54d" have entirely different histories.

2 changed files with 74 additions and 96 deletions

View file

@ -2,22 +2,10 @@
IFS=" IFS="
" "
#Set your parameters here #Set your parameters here
#Name of the database folder=/var/www/friendica
db=friendica storagefolder=storage
#User of the database
user=root
#Folder with the storage files to check
storagefolder=/var/www/friendica/storage
#The folder storage name, with slashes escaped to work through sed
folderescaped=${storagefolder////\\/}
loop_1() { loop_1() {
ks=$(echo "${p}" | sed -e "s/${folderescaped}//g" -e "s/\///g")
e=$(sudo -u "${user}" mariadb "${db}" -N -B -q -e "select \`backend-ref\` from photo where \`backend-ref\` = '${ks}'")
#If the file was not found in the database, but still exists in the filesystem, delete it
if [[ -z "${e}" && -f "${p}" ]]; then
sudo rm -rfv "${p}" #&> /dev/null
else
t=$(file "${p}") t=$(file "${p}")
if [[ "${t}" =~ JPEG ]]; then if [[ "${t}" =~ JPEG ]]; then
nice -n 10 jpegoptim -m 76 "${p}" #&> /dev/null nice -n 10 jpegoptim -m 76 "${p}" #&> /dev/null
@ -40,10 +28,9 @@ loop_1() {
size_new=$(stat -c%s "${tmppic}" 2>/dev/null || echo 0) size_new=$(stat -c%s "${tmppic}" 2>/dev/null || echo 0)
size_original=$(stat -c%s "${p}" 2>/dev/null || echo 0) size_original=$(stat -c%s "${p}" 2>/dev/null || echo 0)
if [[ "${size_original}" -gt "${size_new}" ]]; then if [[ "${size_original}" -gt "${size_new}" ]]; then
mv -v "${tmppic}" "${p}" #&> /dev/null mv "${tmppic}" "${p}" #&> /dev/null
else else
rm -v "${tmppic}" #&> /dev/null rm "${tmppic}" #&> /dev/null
fi
fi fi
fi fi
fi fi
@ -51,11 +38,7 @@ loop_1() {
fi fi
} }
#Generate an index to make searches faster find "${folder}/${storagefolder}" -depth -mindepth 2 -type f -size +50k -atime -8 -not -iname "index.html" | (
echo "Generating photo index..." #&> /dev/null
sudo mariadb "${db}" -e "alter table photo add index if not exists backend_index (\`backend-ref\`)" #&> /dev/null
echo "Generating list of files..." #&> /dev/null
find "${storagefolder}" -depth -mindepth 2 -type f -size +50k -mtime -8 -not -iname "index.html" | (
while read -r p; do while read -r p; do
loop_1 "${p}" & loop_1 "${p}" &
until [[ $(jobs -r -p | wc -l) -lt $(($(getconf _NPROCESSORS_ONLN) / 2)) ]]; do until [[ $(jobs -r -p | wc -l) -lt $(($(getconf _NPROCESSORS_ONLN) / 2)) ]]; do
@ -64,5 +47,3 @@ find "${storagefolder}" -depth -mindepth 2 -type f -size +50k -mtime -8 -not -in
done done
) )
wait wait
#Drop the index in the end to save storage
sudo mariadb "${db}" -e "alter table photo drop index backend_index" #&> /dev/null

View file

@ -63,12 +63,9 @@ url="https://www.youtube.com/@${channel}"
if [[ "${channel}" = "subscriptions" ]]; then if [[ "${channel}" = "subscriptions" ]]; then
url="https://www.youtube.com/feed/subscriptions" url="https://www.youtube.com/feed/subscriptions"
fi fi
#for section_url in "${url}/videos" "${url}/shorts" "${url}/streams"; do for full_url in "${url}/videos" "${url}/shorts" "${url}/streams"; do
#Via https://github.com/yt-dlp/yt-dlp/issues/13573#issuecomment-3020152141 echo "${full_url}"
full_url=$(yt-dlp -I0 --print "playlist:https://www.youtube.com/playlist?list=UU%(channel_id.2:)s" "${url}") if [[ -f "${cookies}" || "${channel}" = "subscriptions" ]]; then
#full_url=$(curl "${url}" | tr -d "\n\r" | xmlstarlet fo -R -n -H 2>/dev/null | xmlstarlet sel -t -v "/html" -n | grep "/channel/UC" | sed -e "s/var .* = //g" -e "s/\};/\}/g" -e "s/channel\/UC/playlist\?list=UU/g" | jq -r ".metadata .channelMetadataRenderer .channelUrl")
echo "${url} = ${full_url}"
if [[ -f "${cookies}" || "${channel}" = "subscriptions" ]]; then
#If available, you can use the cookies from your browser directly. Substitute #If available, you can use the cookies from your browser directly. Substitute
# --cookies "${cookies}" # --cookies "${cookies}"
#for the below, substituting for your browser of choice: #for the below, substituting for your browser of choice:
@ -82,9 +79,9 @@ if [[ -f "${cookies}" || "${channel}" = "subscriptions" ]]; then
#including the backslash so the multiline command keeps working. #including the backslash so the multiline command keeps working.
"${python}" "${ytdl}" "${full_url}" \ "${python}" "${ytdl}" "${full_url}" \
--cookies "${cookies}" \ --cookies "${cookies}" \
--extractor-args "youtubetab:approximate_date" \
--skip-download --download-archive "${archive}" \ --skip-download --download-archive "${archive}" \
--dateafter "${breaktime}" \ --dateafter "${breaktime}" \
--extractor-args "youtubetab:approximate_date,youtubetab:skip=webpage" \
--break-on-reject --lazy-playlist --write-info-json \ --break-on-reject --lazy-playlist --write-info-json \
--sleep-requests "${sleeptime}" \ --sleep-requests "${sleeptime}" \
--parse-metadata "video::(?P<formats>)" \ --parse-metadata "video::(?P<formats>)" \
@ -95,11 +92,11 @@ if [[ -f "${cookies}" || "${channel}" = "subscriptions" ]]; then
--parse-metadata "video::(?P<heatmap>)" \ --parse-metadata "video::(?P<heatmap>)" \
--parse-metadata "video::(?P<tags>)" \ --parse-metadata "video::(?P<tags>)" \
--parse-metadata "video::(?P<categories>)" --parse-metadata "video::(?P<categories>)"
else else
"${python}" "${ytdl}" "${full_url}" \ "${python}" "${ytdl}" "${full_url}" \
--extractor-args "youtubetab:approximate_date" \
--skip-download --download-archive "${archive}" \ --skip-download --download-archive "${archive}" \
--dateafter "${breaktime}" \ --dateafter "${breaktime}" \
--extractor-args "youtubetab:approximate_date,youtubetab:skip=webpage" \
--break-on-reject --lazy-playlist --write-info-json \ --break-on-reject --lazy-playlist --write-info-json \
--sleep-requests "${sleeptime}" \ --sleep-requests "${sleeptime}" \
--parse-metadata "video::(?P<formats>)" \ --parse-metadata "video::(?P<formats>)" \
@ -110,8 +107,8 @@ else
--parse-metadata "video::(?P<heatmap>)" \ --parse-metadata "video::(?P<heatmap>)" \
--parse-metadata "video::(?P<tags>)" \ --parse-metadata "video::(?P<tags>)" \
--parse-metadata "video::(?P<categories>)" --parse-metadata "video::(?P<categories>)"
fi fi
#done done
if [[ ${enablecsv} = 1 ]]; then if [[ ${enablecsv} = 1 ]]; then
if [[ -f "${tmpcsv}" ]]; then if [[ -f "${tmpcsv}" ]]; then
rm -rf "${tmpcsv}" rm -rf "${tmpcsv}"