checkpoint

2 files changed, 55 insertions, 42 deletions

diff --git a/bin/menuscripts/mmedia b/bin/menuscripts/mmedia
index 3141c3b..f4e6e3c 100755
--- a/bin/menuscripts/mmedia
+++ b/bin/menuscripts/mmedia
@@ -6,52 +6,65 @@ dirs="$HOME/dl"
 
 concat_path() { sed "s#^$HOME#\~#;s#\([^/]\)[^/]*/#\1/#g"; }
 
-case "$1" in 
-	"video") 
-		regex='^.\+\.\(webm\|mp4\|mpeg\|mkv\)$' 
-		dirs="$dirs $HOME/vids"
-		viewer() { $PLAYER "$1"; } ;;
-	"pdf") 
-		regex='^.\+\.\(pdf\)$' 
-		dirs="$dirs $HOME/docs"
-		viewer() { $VIEWER "$1"; } ;;
-	"image")
-		regex='^.\+\.\(png\|avif\|jpg\)$' 
-		dirs="$dirs $HOME/pics"
-		viewer() { $IMAGE "$1"; } ;;
-	"cursus")
-		regex='^.*/[cC]ursus/index.html$'
-		dirs="$HOME/docs/school/Vakken"
-		concat_path() { sed "s#$dirs/##;s#/[cC]ursus/index.html##"; }
-		viewer() { $BROWSER "$1"; } ;;
-	"schoolpdf")
-		regex='^.\+\.\(pdf\)$' 
-		dirs="$HOME/docs/school/Vakken"
-		concat_path() { sed "s#$dirs/##;s#/[cC]ursus/index.html##;s#/Cursus/viewer/files/#: #"; }
-		viewer() { $VIEWER "$1"; } ;;
-	*) 
-		choice="$(cat <<-EOF | dmenu -g 5 -l 1 -c
-		video
-		pdf
-		image
-		cursus
-		schoolpdf
+case "$1" in
+"video")
+	regex='^.\+\.\(webm\|mp4\|mpeg\|mkv\)$'
+	dirs="$dirs $HOME/vids"
+	viewer() { $PLAYER "$1"; }
+	;;
+"pdf")
+	regex='^.\+\.\(pdf\)$'
+	dirs="$dirs $HOME/docs"
+	viewer() { $VIEWER "$1"; }
+	;;
+"image")
+	regex='^.\+\.\(png\|avif\|jpg\)$'
+	dirs="$dirs $HOME/pics"
+	viewer() { $IMAGE "$1"; }
+	;;
+"cursus")
+	regex='^.*/[cC]ursus/index.html$'
+	dirs="$HOME/docs/school/Vakken"
+	concat_path() { sed "s#$dirs/##;s#/[cC]ursus/index.html##"; }
+	viewer() { $BROWSER "$1"; }
+	;;
+"schoolpdf")
+	regex='^.\+\.\(pdf\)$'
+	dirs="$HOME/docs/school/Vakken"
+	concat_path() { sed "s#$dirs/##;s#/[cC]ursus/index.html##;s#/Cursus/viewer/files/#: #"; }
+	viewer() { $VIEWER "$1"; }
+	;;
+"lecture")
+	dmfm $HOME/docs/lecture
+	exit
+	;;
+*)
+	choice="$(
+		cat <<-EOF | dmenu -g 6 -l 1 -c
+			video
+			pdf
+			image
+			cursus
+			schoolpdf
+			lecture
 		EOF
-		)"
-		[ "$choice" ] || exit 1
-		"$0" "$choice"
-		exit ;;
+	)"
+	[ "$choice" ] || exit 1
+	"$0" "$choice"
+	exit
+	;;
 esac
 
 shift
 [ "$1" ] && dirs="$1"
 
 choice="$(
-	find -L $dirs 2> /dev/null |
-	grep "$regex" |
-	sort | tee "$tmp" |
-	concat_path |
-	dmenu -px -c -i -l 10 -g 1 -x)"
+	find -L $dirs 2>/dev/null |
+		grep -i "$regex" |
+		sort | tee "$tmp" |
+		concat_path |
+		dmenu -px -c -i -l 10 -g 1 -x
+)"
 
 file="$(sed -n "${choice}p" "$tmp")"
 [ -r "$file" ] || exit 1
diff --git a/bin/menuscripts/tsh b/bin/menuscripts/tsh
index 0c57ee0..72670f2 100755
--- a/bin/menuscripts/tsh
+++ b/bin/menuscripts/tsh
@@ -170,8 +170,11 @@ then
 
 	# Get results
 	rm -f "$results" "$links"
+
 	# shellcheck source=/usr/local/lib/$PROG/nyaa.sh disable=SC1091
 	. "$MODULES_PATH/$module"
+	get_torrents
+
 	[ -f "$results" ] || die "No results."
 
 	# Save which module was used
@@ -180,9 +183,6 @@ else
 	module="$(tail -n 1 "$links")"
 fi
 
-# acquire get_magnet function
-# shellcheck source=/usr/local/lib/$PROG/nyaa.sh disable=SC1091
-getfunctions=1 . "$MODULES_PATH/$module"
 
 # select result from "$results"
 for choice in $(select_result | xargs)