Alexander/threadwatcher
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

add timeouts to internet checks to speed up failure

Browse Source
This commit is contained in:
Alexander Bocken 2021-11-15 19:23:34 +01:00
parent 517aada501
commit 54a2a055b0
Signed by: Alexander
GPG Key ID: 1D237BE83F9B05E8
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
threadwatcher
View File

@ -70,7 +70,7 @@ scan(){
done done
#Create lock file to stop override of URLFILE #Create lock file to stop override of URLFILE
touch /tmp/threadwatcher.lock touch /tmp/threadwatcher.lock
ping -q -c 1 4channel.org > /dev/null|| { echo "Cannot connect to 4chan."; exit 1;} ping -q -c 1 -W 2 4channel.org > /dev/null|| { echo "Cannot connect to 4chan."; exit 1;}
if [ "$(wc -l < "$URLFILE")" -gt 0 ]; then if [ "$(wc -l < "$URLFILE")" -gt 0 ]; then
echo "Scanning threads..." echo "Scanning threads..."
else else
@ -91,7 +91,7 @@ scan(){
echo "$url ($thread_title) $(echo "$dl_location" | sed "s|$HOME|~|")" echo "$url ($thread_title) $(echo "$dl_location" | sed "s|$HOME|~|")"
if [ -z "$(</tmp/content$$)" ]; then if [ -z "$(</tmp/content$$)" ]; then
#check for internet again, in case something has changed during the download process #check for internet again, in case something has changed during the download process
if ping -q -c 1 4channel.org > /dev/null if ping -q -c 1 -W 2 4channel.org > /dev/null
then then
if [ "$AUTOPRUNE" = "true" ]; then if [ "$AUTOPRUNE" = "true" ]; then
echo "Thread $url not found ($dl_location) pruning from cached list of threads to watch" echo "Thread $url not found ($dl_location) pruning from cached list of threads to watch"
@ -161,7 +161,7 @@ prune(){
done done
#Create lock file to stop override of URLFILE #Create lock file to stop override of URLFILE
touch /tmp/threadwatcher.lock touch /tmp/threadwatcher.lock
ping -q -c 1 4channel.org > /dev/null|| { echo "Cannot connect to 4chan."; cleanup && exit 1;} ping -q -c 1 -W 2 4channel.org > /dev/null|| { echo "Cannot connect to 4chan."; cleanup && exit 1;}
if [ "$(wc -l < "$URLFILE")" -gt 0 ]; then if [ "$(wc -l < "$URLFILE")" -gt 0 ]; then
echo "Pruning threads..." echo "Pruning threads..."
else else
@ -180,7 +180,7 @@ prune(){
echo "$url ($thread_title) $(echo "$dl_location" | sed "s|$HOME|~|")" echo "$url ($thread_title) $(echo "$dl_location" | sed "s|$HOME|~|")"
if [ -z "$(</tmp/content$$)" ]; then if [ -z "$(</tmp/content$$)" ]; then
#check for internet again, in case something has changed during the download process #check for internet again, in case something has changed during the download process
if ping -q -c 1 4channel.org > /dev/null if ping -q -c 1 -W 2 4channel.org > /dev/null
then then
echo "Thread $url not found ($dl_location) pruning from cached list of threads to watch" echo "Thread $url not found ($dl_location) pruning from cached list of threads to watch"
# shellcheck disable=SC2001 # shellcheck disable=SC2001
@ -259,7 +259,7 @@ add() {
fi fi
## Move already downloaded files to new location ## Move already downloaded files to new location
ping -q -c 1 1.1.1.1 > /dev/null || ping -q -c 1 1.0.0.1 > /dev/null || ping -q -c 1 4channel.org > /dev/null || { echo "No internet connection detected."; exit ;} ping -q -c 1 -W 2 1.1.1.1 > /dev/null || ping -q -c -W 2 1 1.0.0.1 > /dev/null || ping -q -c 1 -W 2 4channel.org > /dev/null || { echo "No internet connection detected."; exit ;}
mkdir -p "$new_location" mkdir -p "$new_location"
url="$1" url="$1"
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/')"