connection check included

This commit is contained in:
Alexander Bocken 2021-04-08 21:57:51 +02:00
parent 5bca850d03
commit b9ee8741e4
Signed by: Alexander
GPG Key ID: 1D237BE83F9B05E8

View File

@ -10,6 +10,8 @@ TMP_URLFILE=/tmp/4chan_thread_watcher_tmp$$
[ -d "$THREADWATCHER_DIR" ] || mkdir -p "$THREADWATCHER_DIR" [ -d "$THREADWATCHER_DIR" ] || mkdir -p "$THREADWATCHER_DIR"
[ -f "$URLFILE" ] || touch "$URLFILE" [ -f "$URLFILE" ] || touch "$URLFILE"
ping -q -c 1 1.1.1.1 > /dev/null || ping -q -c 1 1.0.0.1 > /dev/null || ping -q -c 1 example.org || { echo "No internet connection detected."; exit ;}
scan(){ scan(){
if [ $(wc -l "$URLFILE"| cut -d ' ' -f1) -gt 0 ]; then if [ $(wc -l "$URLFILE"| cut -d ' ' -f1) -gt 0 ]; then
echo "scanning threads..." echo "scanning threads..."
@ -24,23 +26,18 @@ scan(){
dl_location="$(echo "$line" | cut -f2)" dl_location="$(echo "$line" | cut -f2)"
mkdir -p "$dl_location" mkdir -p "$dl_location"
echo "downloading to $dl_location" echo "downloading to $dl_location"
mkdir -p "$dl_location"
json_url="$(echo "$url" | sed -E 's/boards\.(4chan|4channel)/a.4cdn/; s/$/.json/')" json_url="$(echo "$url" | sed -E 's/boards\.(4chan|4channel)/a.4cdn/; s/$/.json/')"
curl -s -L "$json_url" | jq . > /tmp/content$$ curl -s -L "$json_url" | jq . > /tmp/content$$
#delete archived threads from watchlist
if [ -z "$(</tmp/content$$)" ]; then if [ -z "$(</tmp/content$$)" ]; then
echo "Thread $url not found ($dl_location) deleting from cached list of threads to watch" echo "Thread $url not found ($dl_location) deleting from cached list of threads to watch"
continue continue
else else
echo "$line" >> "$TMP_URLFILE" echo "$line" >> "$TMP_URLFILE"
mkdir -p "$dl_location"
fi fi
files_json="$(jq '.posts[] | if has("filename") then {filename: "\(.no)_\(.filename)\(.ext)", location: "\(.tim)\(.ext)", md5: .md5} else null end ' < /tmp/content$$ | grep -vE '^null$')" files_json="$(jq '.posts[] | if has("filename") then {filename: "\(.no)_\(.filename)\(.ext)", location: "\(.tim)\(.ext)", md5: .md5} else null end ' < /tmp/content$$ | grep -vE '^null$')"
echo "$files_json" | jq '.filename' | tr -d '"' >> /tmp/filename$$ #pastes together a multiline var using process substitution with layout: filename location md5
echo "$files_json" | jq '.location' | tr -d '"' >> /tmp/location$$ files="$(paste <(paste <(echo "$files_json" | jq '.filename' | tr -d '"') <(echo "$files_json" | jq '.location' | tr -d '"')) <(echo "$files_json" | jq '.md5' | tr -d '"'))"
echo "$files_json" | jq '.md5' | tr -d '"' >> /tmp/md5$$
paste /tmp/filename$$ /tmp/location$$ >> /tmp/tmp$$
files="$(paste /tmp/tmp$$ /tmp/md5$$)"
rm /tmp/tmp$$ /tmp/md5$$ /tmp/location$$ /tmp/filename$$ /tmp/content$$
echo "$files" | while read -r file_line; do echo "$files" | while read -r file_line; do
filename="$(echo "$file_line" | cut -f1)" filename="$(echo "$file_line" | cut -f1)"
master_location="$(echo "$file_line" | cut -f2 | tr -d '"')" master_location="$(echo "$file_line" | cut -f2 | tr -d '"')"
@ -105,4 +102,6 @@ case "$1" in
echo "Deleting..." echo "Deleting..."
rm "$URLFILE" rm "$URLFILE"
touch "$URLFILE";; touch "$URLFILE";;
"edit") ${EDITOR:-vim} "$URLFILE";;
*)printf "Incorrect usage.\n\tthreadwatcher [add URL DL_LOCATION] [list] [edit] [clean]\n"; exit 1;;
esac esac