Handle folder filtering in IINA instead of sending to mpv, and interc…

…ept mpv shuffle arg & convert it to playlist-shuffle command. Fixes regression where folder filtering was broken, while still supporting shuffle via cmd-line
iina · Aug 8, 2023 · 956a789 · 956a789
1 parent 1af17db
commit 956a789
Showing 1 changed file with 21 additions and 6 deletions.
diff --git a/iina/AppDelegate.swift b/iina/AppDelegate.swift
@@ -214,7 +214,7 @@ class AppDelegate: NSObject, NSApplicationDelegate, SPUUpdaterDelegate {
     var iinaArgFilenames: [String] = []
     var dropNextArg = false
 
-    Logger.log("Got arguments \(arguments)")
+    Logger.log("Command-line args: \(arguments)")
     for arg in arguments {
       if dropNextArg {
         dropNextArg = false
@@ -238,9 +238,9 @@ class AppDelegate: NSObject, NSApplicationDelegate, SPUUpdaterDelegate {
       }
     }
 
-    Logger.log("IINA arguments: \(iinaArgs)")
-    Logger.log("Filenames from arguments: \(iinaArgFilenames)")
     commandLineStatus.parseArguments(iinaArgs)
+    Logger.log("Filenames from args: \(iinaArgFilenames)")
+    Logger.log("Derived mpv properties from args: \(commandLineStatus.mpvArguments)")
 
     print("IINA \(version) Build \(build)")
 
@@ -330,6 +330,10 @@ class AppDelegate: NSObject, NSApplicationDelegate, SPUUpdaterDelegate {
       }
 
       if let pc = lastPlayerCore {
+        if commandLineStatus.shufflePlaylist {
+          pc.toggleShuffle()
+        }
+
         if commandLineStatus.enterMusicMode {
           if commandLineStatus.enterPIP {
             // PiP is not supported in music mode. Combining these options is not permitted and is
@@ -880,6 +884,7 @@ struct CommandLineStatus {
   var openSeparateWindows = false
   var enterMusicMode = false
   var enterPIP = false
+  var shufflePlaylist = false
   var mpvArguments: [(String, String)] = []
   var iinaArguments: [(String, String)] = []
   var filenames: [String] = []
@@ -895,10 +900,20 @@ struct CommandLineStatus {
         let strippedName = String(name.dropFirst(4))
         if strippedName == "-" {
           isStdin = true
-        } else if splitted.count <= 1 {
-          mpvArguments.append((strippedName, "yes"))
         } else {
-          mpvArguments.append((strippedName, String(splitted[1])))
+          let argPair: (String, String)
+          if splitted.count <= 1 {
+            argPair = (strippedName, "yes")
+          } else {
+            argPair = (strippedName, String(splitted[1]))
+          }
+
+          if argPair.0 == "shuffle" && argPair.1 == "yes" {
+            Logger.log("Found shuffle request in command-line args. Will convert it to \"playlist-shuffle\" command")
+            shufflePlaylist = true
+          } else {
+            mpvArguments.append(argPair)
+          }
         }
       } else {
         // other args