From bfeeb48f551dcef96819eb124aa72241656c393b Mon Sep 17 00:00:00 2001
From: Raymaekers Luca <raymaekers.luca@gmail.com>
Date: Mon, 11 Mar 2024 11:07:59 +0100
Subject: refactor

---
 bin/common/ytclipo         |  2 +-
 bin/extra/magnet2torrent   |  8 ++++++--
 bin/guiscripts/lh          | 33 +++++++++++++++++++++++++++++++++
 bin/guiscripts/linkhandler | 33 ---------------------------------
 bin/menuscripts/mpass-otp  |  2 +-
 5 files changed, 41 insertions(+), 37 deletions(-)
 create mode 100755 bin/guiscripts/lh
 delete mode 100755 bin/guiscripts/linkhandler

(limited to 'bin')

diff --git a/bin/common/ytclipo b/bin/common/ytclipo
index 1a82df2..b11f84a 100755
--- a/bin/common/ytclipo
+++ b/bin/common/ytclipo
@@ -2,7 +2,7 @@
 
 inp="$(ytlink)"
 >&2 printf "inp: %s\n" "$inp"
-notify-send "ytclipo" "downloading <i>$inp</i>" || :
+notify-send "ytclipo" "$inp" || :
 
 yt-dlp "$inp" \
 	--restrict-filenames \
diff --git a/bin/extra/magnet2torrent b/bin/extra/magnet2torrent
index 0a1f83e..9f7d006 100755
--- a/bin/extra/magnet2torrent
+++ b/bin/extra/magnet2torrent
@@ -21,7 +21,11 @@ fi
 hash="${1##*btih:}"
 hash="${hash%%&*}"
 
+url="$(curl -s "https://torrage.info/torrent.php?h=$hash" |
+    pup '#torrent-operation-link attr{href}')"
+>&2 printf "url: %s\n" "$url"
+
 # Download the torrent file from a torrent website
 torrent_file="${hash}.torrent"
-wget "https://itorrents.org/torrent/${hash}.torrent" -O "$torrent_file"
-echo "Torrent file written to ${torrent_file}"
+curl "$url" -H 'Referer: https://torrage.info/' > tmp.torrent
+echo "$torrent_file"
diff --git a/bin/guiscripts/lh b/bin/guiscripts/lh
new file mode 100755
index 0000000..956b99b
--- /dev/null
+++ b/bin/guiscripts/lh
@@ -0,0 +1,33 @@
+#!/bin/sh
+
+# Feed script a url or file location.
+# If an image, it will view in sxiv,
+# if a video or gif, it will view in mpv
+# if a music file or pdf, it will download,
+# otherwise it opens link in browser.
+
+[ "${url:=$1}" ] || url="$(clipo)"
+notify-send "linkhandler" "$url"
+echo "$url" > ~/file.txt
+
+case "$url" in
+    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 - ;;
+	*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 ;;
+	*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
+esac
diff --git a/bin/guiscripts/linkhandler b/bin/guiscripts/linkhandler
deleted file mode 100755
index 329e267..0000000
--- a/bin/guiscripts/linkhandler
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# Feed script a url or file location.
-# If an image, it will view in sxiv,
-# if a video or gif, it will view in mpv
-# if a music file or pdf, it will download,
-# otherwise it opens link in browser.
-
-test -z "${url:=$1}" &&
-	url="$(xclip -sel c -o)"
-dunstify "linkhandler" "<b>handling</b> $url"
-
-case "$url" in
-    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|*youtube.com/watch*|*youtube.com/playlist*|*youtube.com/shorts*|*youtu.be*|*hooktube.com*|*bitchute.com*|*videos.lukesmith.xyz*|*odysee.com*)
-		setsid -f mpv --quiet --ytdl --ytdl-raw-options="format-sort=res:720" "$url" > /dev/null 2>&1 ;;
-	*png|*jpg|*jpe|*jpeg|*gif)
-		curl -sL "$url" > "/tmp/$(echo "$url" | sed "s/.*\///;s/%20/ /g")" && $IMAGE -a "/tmp/$(echo "$url" | sed "s/.*\///;s/%20/ /g")"  >/dev/null 2>&1 & ;;
-	*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 & ;;
-	*mp3|*flac|*opus|*mp3?source*)
-		mpv "$url" 'curl -LO'  >/dev/null 2>&1 ;;
-	*)
-		if [ -f "$url" ]
-		then setsid -f "$TERMINAL" -e "$EDITOR" "$url" >/dev/null 2>&1
-		else setsid -f "$BROWSER" "$url" >/dev/null 2>&1
-		fi
-esac
diff --git a/bin/menuscripts/mpass-otp b/bin/menuscripts/mpass-otp
index e771f9f..86690d3 100755
--- a/bin/menuscripts/mpass-otp
+++ b/bin/menuscripts/mpass-otp
@@ -4,4 +4,4 @@ pass="$(find "$PASSWORD_STORE_DIR"/keys/otp -name "*.gpg" -printf '%f\n' |
     commander -c)"
 [ "$pass" ] || exit 1
 pass otp -c keys/otp/"$pass"
-notify-send -t 1000 "mpass" "copied <b>$pass</b>"
+notify-send -t 1000 "mpass" "copied $pass"
-- 
cgit v1.2.3