From 7a7c5f8bfdd4c41d36f98a4d92494d678dd185f4 Mon Sep 17 00:00:00 2001 From: Hekuran Date: Mon, 30 Nov 2020 20:45:38 +0100 Subject: fixed not being able to copy URL with a dash in it --- st-urlhandler | 24 ++++++++++++++++++++---- 1 file changed, 20 insertions(+), 4 deletions(-) (limited to 'st-urlhandler') diff --git a/st-urlhandler b/st-urlhandler index 0d39dd5..a73a5bc 100755 --- a/st-urlhandler +++ b/st-urlhandler @@ -1,7 +1,6 @@ #!/bin/sh -urlregex="(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)" - +geturl() { # First remove linebreaks and mutt sidebars: urls="$(sed 's/.*│//g' | tr -d '\n' | grep -aEo "$urlregex" | # grep only urls as defined above. @@ -9,7 +8,24 @@ urls="$(sed 's/.*│//g' | tr -d '\n' | sed 's/^www./http:\/\/www\./g')" [ -z "$urls" ] && exit +} + +openurl() { + urlregex="(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)" + geturl + chosen="$(echo "$urls" | dmenu -i -p 'Follow which url?' -l 10)" + setsid xdg-open "$chosen" >/dev/null 2>&1 & +} -chosen="$(echo "$urls" | dmenu -i -p 'Follow which url?' -l 10)" +copyurl() { + urlregex="(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)" + geturl + echo $urls | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard +} -setsid xdg-open "$chosen" >/dev/null 2>&1 & +while getopts "hoc" o; do case "${o}" in + h) printf "Optional arguments for custom use:\\n -c: copy\\n -o: xdg-open\\n -h: Show this message\\n" && exit 1 ;; + o) openurl ;; + c) copyurl ;; + *) printf "Invalid option: -%s\\n" "$OPTARG" && exit 1 ;; +esac done -- cgit v1.2.3-18-g5258 From dcaad2ceba5b8fe5d65875da29a2eb08f5ea5b42 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 30 Nov 2020 15:23:31 -0500 Subject: copy/open url use same regex. slimming. --- st-urlhandler | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) (limited to 'st-urlhandler') diff --git a/st-urlhandler b/st-urlhandler index a73a5bc..b8f9787 100755 --- a/st-urlhandler +++ b/st-urlhandler @@ -1,31 +1,18 @@ #!/bin/sh -geturl() { -# First remove linebreaks and mutt sidebars: -urls="$(sed 's/.*│//g' | tr -d '\n' | +urlregex="(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)" + +urls="$(sed 's/.*│//g' | tr -d '\n' | # First remove linebreaks and mutt sidebars: grep -aEo "$urlregex" | # grep only urls as defined above. uniq | # Ignore neighboring duplicates. - sed 's/^www./http:\/\/www\./g')" - -[ -z "$urls" ] && exit -} - -openurl() { - urlregex="(((http|https)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)" - geturl - chosen="$(echo "$urls" | dmenu -i -p 'Follow which url?' -l 10)" - setsid xdg-open "$chosen" >/dev/null 2>&1 & -} + sed 's/^www./http:\/\/www\./g')" # xdg-open will not detect url without http:// -copyurl() { - urlregex="(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$\#=_~-]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)" - geturl - echo $urls | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard -} +[ -z "$urls" ] && exit 1 while getopts "hoc" o; do case "${o}" in h) printf "Optional arguments for custom use:\\n -c: copy\\n -o: xdg-open\\n -h: Show this message\\n" && exit 1 ;; - o) openurl ;; - c) copyurl ;; + o) chosen="$(echo "$urls" | dmenu -i -p 'Follow which url?' -l 10)" + setsid xdg-open "$chosen" >/dev/null 2>&1 & ;; + c) echo "$urls" | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard ;; *) printf "Invalid option: -%s\\n" "$OPTARG" && exit 1 ;; esac done -- cgit v1.2.3-18-g5258