README.md

@@ -4,7 +4,7 @@ sx-open is an attempt to implement a saner alternative to xdg-open.
 
 ## Installation
 
-Clone the repo, drop sx-open.cfg into your $HOME/.config and set it up to do what you want. There are no built-in defaults, it's all in the config.
+Clone the repo, drop sx-open.cfg into your $HOME/.config.
 As this thing is meant to replace xdg-open, you will probably want to link sx-open into xdg-open somewhere in your $PATH as to override the default one.
 
 ## Usage

sx-open

@@ -19,8 +19,6 @@ act() {
 	return 0
 }
 
-urldecode() { : "${*//+/ }"; printf '%b\n' "${_//%/\\x}"; }
-
 # cfg foo bool = [true|1]
 # cfg foo [string] = 'bar'
 # cfg foo
@@ -110,7 +108,6 @@ handle_target() {
 	declare -n result=$1
 	declare h cmd regex target_is_file target target_left cmd_is_template
 		cmd_append_target=1
-		match=0
 		target=$2
 		target_left=$target
 
@@ -119,12 +116,9 @@ handle_target() {
 
 		[[ "$target" =~ ^/.* ]] || { target="${PWD}/${target}"; } # Turn relative paths to absolute ones.
 
-		IFS=';' read target_mimetype _ <<< $( file -ib "$target" )
+		IFS=';' read target_mimetype charset <<< $( file -ib "$target" )
 		target_left=$target_mimetype
 
-		[[ $target_mimetype == 'inode/symlink' ]] && \
-			IFS=';' read target_mimetype_true _ <<< $( file -ibL "$target" )
-
 		set -- "${mime_handlers[@]}"
 	elif is_uri "$target"; then
 		set -- "${uri_handlers[@]}"
@@ -136,22 +130,13 @@ handle_target() {
 		cmd_str=$1 regex=$2
 		cmd=()
 
-		# Fix the regex
-		[[ $regex =~ \^?([^\$]+)\$? ]] && regex="^${BASH_REMATCH[1]}$"
-
 		if [[ $cmd_str == *'%target%'* ]]; then
 			cmd=( ${cmd_str//%target%/$target} )
 		else
 			cmd=( $cmd_str "$target" )
 		fi
 
-		if [[ $target_left =~ $regex ]]; then
-			match=1
-		elif [[ $target_mimetype_true ]]; then
-			[[ $target_mimetype_true =~ $regex ]] && match=1
-		fi
-
-		if (( match )); then
+		if [[ "$target_left" =~ $regex ]]; then
 			act "${cmd[@]}"; result=$?
 			(( result )) && return 1
 
@@ -185,7 +170,7 @@ scheme() {
 	declare r handler=$1; shift
 
 	for s in "$@"; do
-		uri_handlers+=( "$handler" "$s:.+" )
+		uri_handlers+=( "$handler" "^$s:" )
 	done
 }
 
@@ -223,7 +208,6 @@ main() {
 	done
 
 	target=$1; [[ "$target" ]] || { usage; exit; }
-#	target=$(urldecode "$target") # No idea why I thought this was necessary.
 
 	cfg dryrun && {
 		printf 'Dry run: not actually running the handler\n' >&2

sx-open.cfg

@@ -1,7 +1,6 @@
 #!syntax bash
 # Configuration file for sx-open
 # Note that as sx-open checks the regexes in order, they should be placed in order from specific to less so.
-# Regexes imply '^$'
 
 # Disable desktop notifications
 #cfg notify false
@@ -16,7 +15,7 @@
 # %target% — The first argument to this script.
 #            If not found, target is appended to the end of <cmd>
 # example:
-#uri 'browser %target% --profile=work' 'https://.+\.?workdomain\.tld\..*'
+#uri 'browser %target% --profile=work' '^https://.+\.?workdomain.tld.*'
 
 # scheme <cmd> <scheme>[ <scheme> ...]
 #scheme browser http https
@@ -24,10 +23,10 @@
 
 # Or you can specify a regex for the entire uri:
 # uri <cmd>         <regex>[ <regex> ...]
-#uri steam          'steam:.+'
-#uri browser        '(https?|ftp):.+'
+#uri steam          '^steam:'
+#uri browser        '^(https?|ftp):'
 
 # Mime types for filesystem targets:
 # mime <cmd>        <regex>[ <regex> ...]
-#mime sxiv          'image/.+'
-#mime libreoffice   'application/msword'
+#mime sxiv          '^image/'
+#mime libreoffice   '^application/msword$'