From d6f818743b2602500c2b4945588e1e4571aa2c03 Mon Sep 17 00:00:00 2001
From: iAmInAction <83808704+iAmInActions@users.noreply.github.com>
Date: Wed, 20 Jul 2022 09:40:06 +0200
Subject: [PATCH] Added an icon and fixed shuffle on BSD systems.

---
 midify.png | Bin 0 -> 2757 bytes
 midify.sh  |  26 +++++++++++++++++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)
 create mode 100644 midify.png

diff --git a/midify.png b/midify.png
new file mode 100644
index 0000000000000000000000000000000000000000..cbba7d3bf26f18c33538d0feb31e4a77cdc77875
GIT binary patch
literal 2757
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

literal 0
HcmV?d00001

diff --git a/midify.sh b/midify.sh
index c7ed730..dfa14b2 100644
--- a/midify.sh
+++ b/midify.sh
@@ -10,7 +10,8 @@
 # Change the default midi player.
 # 1 = timidity
 # 2 = pioplemidi-cli
-# 3 = custom command
+# 3 = playmidi (OSX Midi player)
+# 4 = custom command
 MIDIPLAYER=1
 
 # Custom MIDI player command (in case 3 is selected):
@@ -39,11 +40,23 @@ mkdir $TEMP
 
 # Define Functions:
 
+# Generate random number in range:
+genrandinrange () {
+  if command -v jot &> /dev/null
+  then
+    jot -w %i -r 1 $1 $(($2 + 1))
+  fi
+  if command -v shuf &> /dev/null
+  then
+    shuf -i $1-$2 -n 1
+  fi
+}
+
 # Get a random line of a file
 # Usage: $(getlineoffile <file>)
 getlineoffile () {
   MAXLINE=$(sed -n '$=' "$1")
-  LINE=$(shuf -i 1-$MAXLINE -n 1)
+  LINE=$(genrandinrange 1 $MAXLINE)
   echo $(sed "${LINE}q;d" "$1")
 }
 
@@ -90,7 +103,7 @@ play_playlist () {
     do
       PLFILE="$MIDIFYLOCAL/lists/$PLIST.mm3u"
       MAXLINE=$(sed -n '$=' "$PLFILE")
-      LINE=$(shuf -i 1-$MAXLINE -n 1)
+      LINE=$(genrandinrange 1 $MAXLINE)
       MFILE=$(sed "${LINE}q;d" "$PLFILE")
       play_song $MIDIFYLOCAL/midi/$MFILE
       sleep 1
@@ -102,7 +115,7 @@ play_playlist () {
     do
       PLFILE=$TEMP/playlist.mm3u
       MAXLINE=$(sed -n '$=' "$PLFILE")
-      LINE=$(shuf -i 1-$MAXLINE -n 1)
+      LINE=$(genrandinrange 1 $MAXLINE)
       MFILE=$(sed "${LINE}q;d" "$PLFILE")
       curl -q $MIDIFYSERVER/midi/$MFILE > $TEMP/$MFILE
       play_song $TEMP/$MFILE
@@ -119,8 +132,11 @@ play_song () {
     timidity -A 50 "$1" >/dev/null
   elif [ "$MIDIPLAYER" = "2" ]
   then
-    pioplemidi-cli "$1" -nl -fp -frb -s
+    playmidi "$1"
   elif [ "$MIDIPLAYER" = "3" ]
+  then
+    pioplemidi-cli "$1" -nl -fp -frb -s
+  elif [ "$MIDIPLAYER" = "4" ]
   then
     $MIDIPROG "$1"
   else