From 7a7c5f8bfdd4c41d36f98a4d92494d678dd185f4 Mon Sep 17 00:00:00 2001 From: Hekuran Date: Mon, 30 Nov 2020 20:45:38 +0100 Subject: [PATCH 1/2] fixed not being able to copy URL with a dash in it --- config.h | 10 ++++++---- st-urlhandler | 24 ++++++++++++++++++++---- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/config.h b/config.h index a6c70ac..feabb62 100644 --- a/config.h +++ b/config.h @@ -234,11 +234,13 @@ MouseKey mkeys[] = { { Button5, TERMMOD, zoom, {.f = -1} }, }; -static char *openurlcmd[] = { "/bin/sh", "-c", "st-urlhandler", "externalpipe", NULL }; +static char *openurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -o", "externalpipe", NULL }; -static char *copyurlcmd[] = { "/bin/sh", "-c", - "tmp=$(sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$#=_-~]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)' | uniq | sed 's/^www./http:\\/\\/www\\./g' ); IFS=; [ ! -z $tmp ] && echo $tmp | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard", - "externalpipe", NULL }; +static char *copyurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -c", "externalpipe", NULL }; + +/* static char *copyurlcmd[] = { "/bin/sh", "-c", */ +/* "tmp=$(sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$#=_-~]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)' | uniq | sed 's/^www./http:\\/\\/www\\./g' ); IFS=; [ ! -z $tmp ] && echo $tmp | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard", */ +/* "externalpipe", NULL }; */ static char *copyoutput[] = { "/bin/sh", "-c", "st-copyout", "externalpipe", NULL }; 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 +} -chosen="$(echo "$urls" | dmenu -i -p 'Follow which url?' -l 10)" +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 & +} -setsid xdg-open "$chosen" >/dev/null 2>&1 & +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 +} + +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 From dcaad2ceba5b8fe5d65875da29a2eb08f5ea5b42 Mon Sep 17 00:00:00 2001 From: Luke Smith Date: Mon, 30 Nov 2020 15:23:31 -0500 Subject: [PATCH 2/2] copy/open url use same regex. slimming. --- config.h | 6 ------ st-urlhandler | 29 ++++++++--------------------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/config.h b/config.h index feabb62..ef2e323 100644 --- a/config.h +++ b/config.h @@ -235,13 +235,7 @@ MouseKey mkeys[] = { }; static char *openurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -o", "externalpipe", NULL }; - static char *copyurlcmd[] = { "/bin/sh", "-c", "st-urlhandler -c", "externalpipe", NULL }; - -/* static char *copyurlcmd[] = { "/bin/sh", "-c", */ -/* "tmp=$(sed 's/.*│//g' | tr -d '\n' | grep -aEo '(((http|https|gopher|gemini|ftp|ftps|git)://|www\\.)[a-zA-Z0-9.]*[:]?[a-zA-Z0-9./@$&%?$#=_-~]*)|((magnet:\\?xt=urn:btih:)[a-zA-Z0-9]*)' | uniq | sed 's/^www./http:\\/\\/www\\./g' ); IFS=; [ ! -z $tmp ] && echo $tmp | dmenu -i -p 'Copy which url?' -l 10 | tr -d '\n' | xclip -selection clipboard", */ -/* "externalpipe", NULL }; */ - static char *copyoutput[] = { "/bin/sh", "-c", "st-copyout", "externalpipe", NULL }; static Shortcut shortcuts[] = { 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')" + sed 's/^www./http:\/\/www\./g')" # xdg-open will not detect url without http:// -[ -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 & -} - -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