diff --git a/pleroma-cli.sh b/pleroma-cli.sh index 89210f4..517c988 100755 --- a/pleroma-cli.sh +++ b/pleroma-cli.sh @@ -799,6 +799,7 @@ statuses_auto_update() sleep 3 done echo "Sleeping..." + ./utils/statuses_archiver.sh sleep 30 done } diff --git a/utils/extract_fields_statuses.sh b/utils/extract_fields_statuses.sh index a660f37..0687a79 100755 --- a/utils/extract_fields_statuses.sh +++ b/utils/extract_fields_statuses.sh @@ -11,6 +11,7 @@ for i in $ids; do # Fields content=$(echo "$json" | jj "#[id=$i].content" | "$main_basedir"/utils/html_to_txt_render) + echo "$json" | jj -D "#[id=$i].content" status_media_attachments=$(echo "$json" | jj -l "#[id=$i].media_attachments.#.url" | tr -d '"\v') reblog=$(echo "$json" | jj -l "#[id=$i].reblog.id") diff --git a/utils/html_to_txt_render b/utils/html_to_txt_render index aa34354..1a65b30 100755 --- a/utils/html_to_txt_render +++ b/utils/html_to_txt_render @@ -1,3 +1,2 @@ #!/bin/sh -sed -e "s/]*>/\n/g ; s/]*>/\n/g ; s/<[^>]*>//g ; s/>*/>/g ; s/<*/ "$main_basedir"/all_statuses/$instance/$i/acct mkdir -m 711 -p "$main_basedir"/statuses/$instance/$acct - old_check=$(date +'%s' -r "$main_basedir"/all_statuses/$instance/$i/$i.json) - if [ $old_check -lt $unixtime_offset ]; then - 7z a -sdel "$main_basedir"/archives/$instance.7z "$main_basedir"/all_statuses/$instance/$i - echo "Olded status $i $(date -d "@$old_check") moved to archive" - ids=$(echo "$ids" | sed -E "s/.?$i.?//g") - continue - fi if [ -n "$status_id" ]; then ln -v -s -r "$main_basedir"/all_statuses/$instance/$status_id "$main_basedir"/statuses/$instance/$acct/$status_id diff --git a/utils/statuses_archiver.sh b/utils/statuses_archiver.sh new file mode 100755 index 0000000..5b29640 --- /dev/null +++ b/utils/statuses_archiver.sh @@ -0,0 +1,13 @@ +#!/bin/sh + +mkdir -p "$main_basedir/archives/" +unixtime_offset=$(expr $(date "+%s") - 86400) + +for i in "$main_basedir"/all_statuses/$instance/*; do + + old_check=$(date +'%s' -r "$i"/*.json) + if [ $old_check -lt $unixtime_offset ]; then + 7z a -sdel "$main_basedir"/archives/$instance.7z $i + echo "[Archiver] Olded status $i $(date -d "@$old_check") moved to archive" + fi +done