From 2303b04e7920078160b922b316ba73a8542cd994 Mon Sep 17 00:00:00 2001 From: steveokard Date: Tue, 8 Nov 2022 18:34:13 -0500 Subject: [PATCH 01/10] fixed formatting --- .gitignore | 1 + config/.ssh/config | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index b76e8cf..c06902b 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ log/ *.zwc.old prezto/ tmux/t-theme/ +.directory diff --git a/config/.ssh/config b/config/.ssh/config index 4f3198b..b5312e3 100644 --- a/config/.ssh/config +++ b/config/.ssh/config @@ -1,18 +1,18 @@ Host * - IdentitiesOnly=yes + IdentitiesOnly yes AddKeysToAgent yes Host pete HostName phoward.mooo.com User stev - IdentityFile ~/.ssh/pete_key + IdentityFile ~/.ssh/pete_key Host ymca HostName cymca.mooo.com User stev - IdentityFile ~/.ssh/ymca_key + IdentityFile ~/.ssh/ymca_key Host github.com - Hostname github.com - User git - IdentityFile ~/.ssh/github_rsa + Hostname github.com + User git + IdentityFile ~/.ssh/github_rsa Host router Hostname 192.168.1.1 User root From b5d51fb79c0edc53cd8187b1323d4aa3194a480f Mon Sep 17 00:00:00 2001 From: steveokard Date: Sat, 26 Nov 2022 17:38:29 -0500 Subject: [PATCH 02/10] server scripts --- scripts/server_bin/db_maint.sh | 6 ++++++ scripts/server_bin/rescan_disk.sh | 6 ++++++ scripts/server_bin/update_fa.sh | 11 +++++++++++ scripts/server_bin/update_insta.sh | 8 ++++++++ scripts/server_bin/update_itaku.sh | 8 ++++++++ scripts/server_bin/update_twitter.sh | 15 +++++++++++++++ scripts/server_bin/yc_bak.sh | 2 ++ 7 files changed, 56 insertions(+) create mode 100755 scripts/server_bin/db_maint.sh create mode 100755 scripts/server_bin/rescan_disk.sh create mode 100755 scripts/server_bin/update_fa.sh create mode 100755 scripts/server_bin/update_insta.sh create mode 100755 scripts/server_bin/update_itaku.sh create mode 100755 scripts/server_bin/update_twitter.sh create mode 100755 scripts/server_bin/yc_bak.sh diff --git a/scripts/server_bin/db_maint.sh b/scripts/server_bin/db_maint.sh new file mode 100755 index 0000000..8e2c20c --- /dev/null +++ b/scripts/server_bin/db_maint.sh @@ -0,0 +1,6 @@ +#!/bin/bash +#maintenance +echo "--- DATABASE MAINTENANCE ---" +cd $HOME/gallery-dl +sqlite3 archive.sqlite3 'VACUUM;' +echo "--- MAINTENANCE COMPLETE ---" diff --git a/scripts/server_bin/rescan_disk.sh b/scripts/server_bin/rescan_disk.sh new file mode 100755 index 0000000..f268113 --- /dev/null +++ b/scripts/server_bin/rescan_disk.sh @@ -0,0 +1,6 @@ +#!/bin/bash +#systematically rescans all scsi hosts for change in drives +[ "$UID" -eq 0 ] || exec sudo bash "$0" "$@" +for i in /sys/class/scsi_host/*; do + echo "- - -" | sudo tee > $i/scan +done diff --git a/scripts/server_bin/update_fa.sh b/scripts/server_bin/update_fa.sh new file mode 100755 index 0000000..9629dc6 --- /dev/null +++ b/scripts/server_bin/update_fa.sh @@ -0,0 +1,11 @@ +#!/bin/bash +N=2 +cd $HOME/gallery-dl/furaffinity +for i in */; do + echo ">> $i" + (gallery-dl --abort 3 --sleep 0-1 https://www.furaffinity.net/user/$i) & + if [[ $(jobs -r -p | wc -l) -ge $N ]]; then + wait -n + fi +done +wait diff --git a/scripts/server_bin/update_insta.sh b/scripts/server_bin/update_insta.sh new file mode 100755 index 0000000..23ff26c --- /dev/null +++ b/scripts/server_bin/update_insta.sh @@ -0,0 +1,8 @@ +#!/bin/bash +cd $HOME/gallery-dl/instagram +for i in */; do + echo ">> $i" + gallery-dl --sleep 2-3 --abort 3 https://www.instagram.com/$i + sleep 15 +done + diff --git a/scripts/server_bin/update_itaku.sh b/scripts/server_bin/update_itaku.sh new file mode 100755 index 0000000..7aff7ac --- /dev/null +++ b/scripts/server_bin/update_itaku.sh @@ -0,0 +1,8 @@ +#!/bin/bash +cd $HOME/gallery-dl/itaku +for i in *; do + echo ">> $i" + gallery-dl --abort 3 --sleep 2 https://itaku.ee/profile/$i/gallery + sleep 15 +done + diff --git a/scripts/server_bin/update_twitter.sh b/scripts/server_bin/update_twitter.sh new file mode 100755 index 0000000..d5b12d2 --- /dev/null +++ b/scripts/server_bin/update_twitter.sh @@ -0,0 +1,15 @@ +#!/bin/bash +N=2 +cd $HOME/gallery-dl/twitter +for i in */; do + echo ">> $i" + (gallery-dl --sleep 0-1 --abort 3 "https://twitter.com/$i" || echo "Problem with $i gallery!" >> ~/twit_error.txt) & + if [[ $(jobs -r -p | wc -l) -ge $N ]]; then + wait -n + fi +done +echo ">>> Updating Retweets" +gallery-dl --abort 3 -o retweets=true "https://twitter.com/stefenauris" +gallery-dl --abort 3 -o retweets=true "https://twitter.com/DaybreakHero" +#de-dup? +wait diff --git a/scripts/server_bin/yc_bak.sh b/scripts/server_bin/yc_bak.sh new file mode 100755 index 0000000..ecfcad6 --- /dev/null +++ b/scripts/server_bin/yc_bak.sh @@ -0,0 +1,2 @@ +#!/bin/bash +rsync -hav --progress --delete --compress yc:/home/stev/backup /home/stev/storage/yc-backup From 5f11c45ed71b03369d5030920f03cd3552a41598 Mon Sep 17 00:00:00 2001 From: steveokard Date: Sat, 26 Nov 2022 17:45:55 -0500 Subject: [PATCH 03/10] parallel-ized --- scripts/server_bin/update_itaku.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/scripts/server_bin/update_itaku.sh b/scripts/server_bin/update_itaku.sh index 7aff7ac..78b8406 100755 --- a/scripts/server_bin/update_itaku.sh +++ b/scripts/server_bin/update_itaku.sh @@ -1,8 +1,11 @@ #!/bin/bash +N=2 cd $HOME/gallery-dl/itaku for i in *; do echo ">> $i" - gallery-dl --abort 3 --sleep 2 https://itaku.ee/profile/$i/gallery - sleep 15 + (gallery-dl --abort 3 --sleep 2 https://itaku.ee/profile/$i/gallery) & + if [[ $(jobs -r -p | wc -l) -ge $N ]]; then + wait -n + fi done From 19182f3d4c1cce5fe7ebb5f986def35b168b6a80 Mon Sep 17 00:00:00 2001 From: steveokard Date: Sat, 26 Nov 2022 17:46:08 -0500 Subject: [PATCH 04/10] line 2 description --- scripts/server_bin/db_maint.sh | 2 +- scripts/server_bin/yc_bak.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/server_bin/db_maint.sh b/scripts/server_bin/db_maint.sh index 8e2c20c..3d24c06 100755 --- a/scripts/server_bin/db_maint.sh +++ b/scripts/server_bin/db_maint.sh @@ -1,5 +1,5 @@ #!/bin/bash -#maintenance +#vaccum the database echo "--- DATABASE MAINTENANCE ---" cd $HOME/gallery-dl sqlite3 archive.sqlite3 'VACUUM;' diff --git a/scripts/server_bin/yc_bak.sh b/scripts/server_bin/yc_bak.sh index ecfcad6..3f2c811 100755 --- a/scripts/server_bin/yc_bak.sh +++ b/scripts/server_bin/yc_bak.sh @@ -1,2 +1,3 @@ #!/bin/bash +# pull backup from remote server rsync -hav --progress --delete --compress yc:/home/stev/backup /home/stev/storage/yc-backup From 75c6765312fb3b3ceb5df2e4ef9cf973e445fa2c Mon Sep 17 00:00:00 2001 From: steveokard Date: Sun, 4 Dec 2022 15:53:04 -0500 Subject: [PATCH 05/10] speed up! --- scripts/server_bin/update_twitter.sh | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/server_bin/update_twitter.sh b/scripts/server_bin/update_twitter.sh index d5b12d2..7b934a1 100755 --- a/scripts/server_bin/update_twitter.sh +++ b/scripts/server_bin/update_twitter.sh @@ -1,15 +1,14 @@ #!/bin/bash -N=2 +N=4 cd $HOME/gallery-dl/twitter for i in */; do echo ">> $i" - (gallery-dl --sleep 0-1 --abort 3 "https://twitter.com/$i" || echo "Problem with $i gallery!" >> ~/twit_error.txt) & + (gallery-dl --sleep 0-1 --abort 3 "https://twitter.com/$i" || echo "Problem with gallery at https://twitter.com/$i" >> ~/twit_error.txt) & if [[ $(jobs -r -p | wc -l) -ge $N ]]; then wait -n fi done echo ">>> Updating Retweets" -gallery-dl --abort 3 -o retweets=true "https://twitter.com/stefenauris" -gallery-dl --abort 3 -o retweets=true "https://twitter.com/DaybreakHero" -#de-dup? +gallery-dl --abort 3 --sleep 0-1 -o retweets=true "https://twitter.com/stefenauris" +gallery-dl --abort 3 --sleep 0-1 -o retweets=true "https://twitter.com/DaybreakHero" wait From cada747e05866500f95079b8ba4674bd764fb11f Mon Sep 17 00:00:00 2001 From: steveokard Date: Sun, 4 Dec 2022 15:56:11 -0500 Subject: [PATCH 06/10] increase sleep time --- scripts/server_bin/update_insta.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/server_bin/update_insta.sh b/scripts/server_bin/update_insta.sh index 23ff26c..79b1617 100755 --- a/scripts/server_bin/update_insta.sh +++ b/scripts/server_bin/update_insta.sh @@ -2,7 +2,7 @@ cd $HOME/gallery-dl/instagram for i in */; do echo ">> $i" - gallery-dl --sleep 2-3 --abort 3 https://www.instagram.com/$i + gallery-dl --sleep 3-4 --abort 3 https://www.instagram.com/$i sleep 15 done From cc2cfa513fdd53931d1fbf23005ef59032880a46 Mon Sep 17 00:00:00 2001 From: steveokard Date: Mon, 5 Dec 2022 02:16:40 -0500 Subject: [PATCH 07/10] new scripts --- scripts/server_bin/dedup.sh | 4 ++++ scripts/server_bin/update_mastodon.sh | 9 +++++++++ scripts/server_bin/update_twitter.sh | 3 ++- 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100755 scripts/server_bin/dedup.sh create mode 100755 scripts/server_bin/update_mastodon.sh diff --git a/scripts/server_bin/dedup.sh b/scripts/server_bin/dedup.sh new file mode 100755 index 0000000..e7faa2e --- /dev/null +++ b/scripts/server_bin/dedup.sh @@ -0,0 +1,4 @@ +#!/bin/bash +duf >! ~/fs.txt +jdupes -rB ~/gallery-dl/twitter +cat ~/fs.txt && duf diff --git a/scripts/server_bin/update_mastodon.sh b/scripts/server_bin/update_mastodon.sh new file mode 100755 index 0000000..a788485 --- /dev/null +++ b/scripts/server_bin/update_mastodon.sh @@ -0,0 +1,9 @@ +#!/bin/bash +gallery-dl --sleep 8-16 --abort 2 "mastodon:https://yiff.life/@kokirimuscle@mastodon.lol" +echo "wait" +sleep 60 +gallery-dl --sleep 8-16 --abort 2 "mastodon:https://yiff.life/@PupShadowNH@woof.group" +echo "wait" +sleep 60 + +echo "done!" diff --git a/scripts/server_bin/update_twitter.sh b/scripts/server_bin/update_twitter.sh index 7b934a1..dd7c3f1 100755 --- a/scripts/server_bin/update_twitter.sh +++ b/scripts/server_bin/update_twitter.sh @@ -1,5 +1,6 @@ #!/bin/bash -N=4 +N=3 +rm ~/twit_error.txt cd $HOME/gallery-dl/twitter for i in */; do echo ">> $i" From 1405d9d061b595ea589f3cf7293c921560428a68 Mon Sep 17 00:00:00 2001 From: steveokard Date: Tue, 6 Dec 2022 00:57:03 -0500 Subject: [PATCH 08/10] removed redundancies --- tmux/.tmux.conf | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index 513be11..5c79e8d 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -10,7 +10,8 @@ set -g @plugin 'jaclu/tmux-menus' # -- general set -g xterm-keys on -set -g default-terminal "screen-256color" +# set -g default-terminal "screen-256color" + # provided by tmux-sensible # remap prefix to Control + a set -g prefix C-a unbind C-b @@ -36,8 +37,6 @@ setw -g automatic-rename on set -g renumber-windows on set -g set-titles on set -g display-panes-time 800 -set -g display-time 1000 -set -g status-interval 10 # set mouse on with prefix m bind m \ @@ -58,8 +57,8 @@ run-shell "$HOME/.tmux/plugins/tmux-power/tmux-power.tmux" #Pain Control run-shell "$HOME/.tmux/plugins/tmux-pain-control/pain_control.tmux" -##File for Local Overrides, if needed -if-shell "[ -f ~/.tmux_local.conf ]" 'source ~/.tmux_local.conf' - #init tmux plugin manager (keep this line at the very bottom of tmux.conf) run '~/.tmux/plugins/tpm/tpm' + +##File for Local Overrides, if needed +if-shell "[ -f ~/.tmux_local.conf ]" 'source ~/.tmux_local.conf' From 53ae212526cba5fe1578e68d8668802d559d7ed1 Mon Sep 17 00:00:00 2001 From: steveokard Date: Wed, 7 Dec 2022 00:22:11 -0500 Subject: [PATCH 09/10] twitch scripted --- scripts/server_bin/twitch_archive.sh | 5 +++++ 1 file changed, 5 insertions(+) create mode 100755 scripts/server_bin/twitch_archive.sh diff --git a/scripts/server_bin/twitch_archive.sh b/scripts/server_bin/twitch_archive.sh new file mode 100755 index 0000000..1b05d33 --- /dev/null +++ b/scripts/server_bin/twitch_archive.sh @@ -0,0 +1,5 @@ +#!/bin/bash +cd /home/stev/Videos/Twitch/spaceyeen +yt-dlp -f 720p60 https://www.twitch.tv/spaceyeen/videos +cd /home/stev/Videos/Twitch/Kodykins +yt-dlp -f 720p60 https://www.twitch.tv/curlykody/videos From 7d4d75fdb06ca8e2a848b1ddd7b7f44c3e4227e5 Mon Sep 17 00:00:00 2001 From: steveokard Date: Wed, 7 Dec 2022 00:30:28 -0500 Subject: [PATCH 10/10] split between two scripts --- scripts/server_bin/twitch_kody.sh | 3 +++ scripts/server_bin/{twitch_archive.sh => twitch_spacey.sh} | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) create mode 100755 scripts/server_bin/twitch_kody.sh rename scripts/server_bin/{twitch_archive.sh => twitch_spacey.sh} (53%) diff --git a/scripts/server_bin/twitch_kody.sh b/scripts/server_bin/twitch_kody.sh new file mode 100755 index 0000000..eb42c7b --- /dev/null +++ b/scripts/server_bin/twitch_kody.sh @@ -0,0 +1,3 @@ +#!/bin/bash +cd /home/stev/Videos/Twitch/Kodykins +yt-dlp -f 720p60 https://www.twitch.tv/curlykody/videos diff --git a/scripts/server_bin/twitch_archive.sh b/scripts/server_bin/twitch_spacey.sh similarity index 53% rename from scripts/server_bin/twitch_archive.sh rename to scripts/server_bin/twitch_spacey.sh index 1b05d33..b41084f 100755 --- a/scripts/server_bin/twitch_archive.sh +++ b/scripts/server_bin/twitch_spacey.sh @@ -1,5 +1,3 @@ #!/bin/bash cd /home/stev/Videos/Twitch/spaceyeen yt-dlp -f 720p60 https://www.twitch.tv/spaceyeen/videos -cd /home/stev/Videos/Twitch/Kodykins -yt-dlp -f 720p60 https://www.twitch.tv/curlykody/videos