Added strict option

[lace] / lace

diff --git a/lace b/lace
old mode 100644 (file)
new mode 100755 (executable)
index 951a0f8..d97f0bb
--- a/lace
+++ b/lace
@@ -4,6 +4,11 @@
 # https://raw.githubusercontent.com/frrobert2/lace/main/lace
 # Shows both how many days ago and date
 # Modified to work with Debian running Sed 3.7
+# connectto is a timeout variable in seconds 
+# it is the time lace will wait to connect to a site before it stops the connection
+#  default is 30 seconds you can change it what you want
+connectto=30
+set -o pipefail
 if [ -z "$XDG_CONFIG_HOME" ];then
        config_place="$HOME/.config/lace"
 else
@@ -16,6 +21,12 @@ red="[31m"
 blue="[34m"
 nc="[m"
 esc=$(echo -e "\033")
+       if [[ "$1" == "strict" ]] || [[ "$1" == "--strict" ]] || [[ "$1" == "-strict" ]] || [[ "$1" == "-s" ]];then
+               red=""
+               blue=""
+               nc=""
+               esc=""
+       fi
 tmpfile=$(mktemp /tmp/lace.XXXXXX)
 tmpfile2=$(mktemp /tmp/lace.XXXXXX)
 function reldate() {
@@ -78,12 +89,15 @@ function timeline() {
                                url="$url/"
                        fi
                        domain=$(sed 's/\/.*$//' <<< "$domain")
-                       fav=$(openssl s_client -crlf -quiet -connect "$domain:1965" <<<"gemini://$domain/favicon.txt" 2>/dev/null | sed -e '1d')
+                       fav=$(timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"gemini://$domain/favicon.txt" 2>/dev/null | sed -e '1d')
+                       timeoutstatus=${PIPESTATUS[0]}
+                       if [ $timeoutstatus -ne 124 ];then
                        if [ ! -z "$fav" ];then
                                user="$fav $user"
                        fi
-                       openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null | sed -e '1d' | sed -n '/##/,$p' | sed -e "s/^\(## .*\)$/\1\n${esc}$red$user${esc}$nc ($domain)/g" >> $tmpfile
+                       timeout $connectto openssl s_client -crlf -quiet -connect "$domain:1965" <<<"$url" 2>/dev/null | sed -e '1d' | sed -n '/##/,$p' | sed -e "s/^\(## .*\)$/\1\n${esc}$red$user${esc}$nc ($domain)/g" >> $tmpfile
                        [[ ! -z $(sed -n '$p' $tmpfile) ]] && echo "" >> $tmpfile
+                       fi
                done <"$subsfile"
                cat $tmpfile | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sed -rn '/^## .*/p' | sed -e 's/\v/\n/g' | sed -e "s/^## \(.*\)/date -d '\1' +%s/e" | sed -r ':r;/(^|\n)$/!{$!{N;br}};s/\n/\v/g' | sort -r | sed -e 's/\v/\n/g'  > $tmpfile
 
@@ -126,7 +140,7 @@ elif [[ "$1" == "unsub" ]];then
 elif [[ "$1" == "subs" ]];then
        awk '{print $2" ("$1")"}' $subsfile 
 elif [[ "$1" == "update" ]];then
-       curl https://gitlab.com/uoou/dotfiles/-/raw/master/stow/bin/home/drew/.local/bin/lace > "${BASH_SOURCE[0]}"
+       curl https://raw.githubusercontent.com/frrobert2/lace/main/lace > "${BASH_SOURCE[0]}"
 else
        now_unix="$(date +'%s')"
        if [[ "$1" == "nope" ]];then