3 files changed, 36 insertions, 26 deletions
diff --git a/bin/menuscripts/mmedia b/bin/menuscripts/mmedia
new file mode 100755
index 0000000..f071742
--- /dev/null
+++ b/bin/menuscripts/mmedia
@@ -0,0 +1,36 @@
+#!/usr/bin/env sh
+
+tmp="/tmp/mmedia"
+
+dirs="$HOME/dl"
+
+case "$1" in 
+	"video") 
+		regex='^.\+\.\(webm\|mp4\|mpeg\|mkv\)$' 
+		dirs="$dirs $HOME/vids"
+		viewer() { mpv "$1"; } ;;
+	"pdf") 
+		regex='^.\+\.\(pdf\)$' 
+		dirs="$dirs $HOME/docs"
+		viewer() { zathura "$1"; } ;;
+	*) 
+		choice="$(cat <<-EOF | commander -d -c
+		video
+		pdf
+		EOF
+		)"
+		[ "$choice" ] || exit 1
+		"$0" "$choice"
+		exit 1 ;;
+esac
+
+choice="$(find -L $dirs 2> /dev/null |
+	grep "$regex" |
+	sort | tee "$tmp" |
+	sed "s#^$HOME#\~#;s#\([^/]\)[^/]*/#\1/#g" |
+	commander -c -d -n -x)"
+
+file="$(sed -n "${choice}p" "$tmp")"
+[ -r "$file" ] || exit 1
+
+viewer "$file"
diff --git a/bin/menuscripts/mpdf b/bin/menuscripts/mpdf
deleted file mode 100755
index 85debfb..0000000
--- a/bin/menuscripts/mpdf
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-tmp="/tmp/mpdf"
-choice="$(find ${1:-$HOME/docs $HOME/dl} -iname "*.pdf" 2> /dev/null | sort |
-	tee "$tmp" |
-	sed "s|^$HOME|\~| ; s|\([^/]\)[^/]*/|\1/|g" |
-	commander -x -n)"
-file="$(sed -n "${choice}p" "$tmp")"
-[ -r "$file" ] || exit 1
-zathura "$file" &
diff --git a/bin/menuscripts/mvid b/bin/menuscripts/mvid
deleted file mode 100755
index 85187cb..0000000
--- a/bin/menuscripts/mvid
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env sh
-
-tmp="/tmp/dmvids"
-
-dirs="${1:-$HOME/vids $HOME/dl}"
-
-choice="$(find -L $dirs 2> /dev/null |
-	grep '^.\+\.\(webm\|mp4\|mpeg\|mkv\)$' |
-	sort | tee "$tmp" |
-	sed "s#^$HOME#\~#;s#\([^/]\)[^/]*/#\1/#g" |
-	commander -d -n -x)"
-
-file="$(sed -n "${choice}p" "$tmp")"
-[ -r "$file" ] || exit 1
-
-mpv "$file"