refactor

2 files changed, 24 insertions, 14 deletions

diff --git a/bin/guiscripts/lh b/bin/guiscripts/lh
index 956b99b..ed5af47 100755
--- a/bin/guiscripts/lh
+++ b/bin/guiscripts/lh
@@ -11,23 +11,33 @@ notify-send "linkhandler" "$url"
 echo "$url" > ~/file.txt
 
 case "$url" in
-    file://*) file="${url##file:/}"
+    file://*) 
+        file="${url##file:/}"
         case "$(file -bi "$file" | cut -f1 -d'/')" in
-            audio|video) mpv "$file" ;;
-            image) imv "$file" ;;
-	    *) xdg-open "$file" ;;
-        esac ;;
-	*mkv|*webm|*mp4|*bitchute.com*|*odysee.com*) mpv "$url" ;;
-	*youtube.com/watch*|*youtube.com/playlist*|*youtube.com/shorts*|*youtu.be*|*hooktube.com*) mpv "$(ytlink "$url")" ;;
-	*png|*jpg|*jpe|*jpeg|*gif) curl -sL "$url" | imv - ;;
+            "audio"|"video") mpv "$file" ;;
+            "image") imv "$file" ;;
+            *) xdg-open "$file" ;;
+        esac 
+        ;;
+
+	*mkv|*webm|*mp4|*bitchute.com*|*odysee.com*) 
+        mpv "$url" ;;
+
+	*youtube.com/watch*|*youtube.com/playlist*|*youtube.com/shorts*|*youtu.be*|*hooktube.com*)
+        mpv "$(ytlink "$url")" ;;
+
+	*png|*jpg|*jpe|*jpeg|*gif) 
+        curl -sL "$url" | imv - ;;
+
 	*pdf|*cbz|*cbr)
 		curl -sL "$url" > "/tmp/$(echo "$url" | sed "s/.*\///;s/%20/ /g")"
-        $VIEWER "/tmp/$(echo "$url" | sed "s/.*\///;s/%20/ /g")"  >/dev/null 2>&1 ;;
+        $VIEWER "/tmp/$(echo "$url" | sed "s/.*\///;s/%20/ /g")"
+        ;;
+
 	*mp3|*flac|*opus|*mp3?source*)
 		mpv "$url" ;;
+
 	*)
-		if [ -f "$url" ]
-		then setsid -f "$TERMINAL" -e "$EDITOR" "$url" >/dev/null 2>&1
-		else setsid -f "$BROWSER" "$url" >/dev/null 2>&1
-		fi
+		"$BROWSER" "$url"
+        ;;
 esac
diff --git a/bin/guiscripts/sturl b/bin/guiscripts/sturl
index 27a8f47..2712d92 100755
--- a/bin/guiscripts/sturl
+++ b/bin/guiscripts/sturl
@@ -6,6 +6,6 @@ url="$(tr -d '\n' | grep -Eo "$regex" | commander -xcl)"
 
 case $1 in
 	'c') printf '%s' "$url" | clipp ;;
-	'o') linkhandler "$url" ;;
+	'o') lh "$url" ;;
 	*) echo "no option" ;;
 esac