player args save double args as string

close #314
MLBAMGames · Jul 3, 2021 · f0c31ee · f0c31ee
1 parent fa8876a
commit f0c31ee
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 20 deletions.
diff --git a/NHLGames/NHLGamesMetro.vb b/NHLGames/NHLGamesMetro.vb
@@ -270,12 +270,7 @@ Public Class NHLGamesMetro
     Private Sub txtPlayerArgs_TextChanged(sender As Object, e As EventArgs) Handles txtPlayerArgs.TextChanged
         Dim playerType = Player.GetPlayerType(FormInstance)
         Dim args = txtPlayerArgs.Text.Split(New String() {" "}, StringSplitOptions.RemoveEmptyEntries)
-        GameWatchArguments.SavedPlayerArgs(playerType) = New Dictionary(Of String, String)()
-        For Each arg As String In args
-            Dim parts = arg.Split(New String() {"="}, StringSplitOptions.RemoveEmptyEntries)
-            If parts.Length <> 2 Then Return
-            GameWatchArguments.SavedPlayerArgs(playerType).Add(parts(0), parts(1))
-        Next
+        GameWatchArguments.SavedPlayerArgs(playerType) = args
         Player.RenewArgs()
         _writeToConsoleSettingsChanged(lblPlayerArgs.Text, txtPlayerArgs.Text)
     End Sub
@@ -441,7 +436,7 @@ Public Class NHLGamesMetro
     Public Sub SetPlayerDefaultArgs(form As NHLGamesMetro, Optional overwrite As Boolean = False)
         If form Is Nothing Then Return
         Dim gameArgs = SettingsExtensions.ReadGameWatchArgs()
-        Dim defaultPlayerArgs = New Dictionary(Of String, String)()
+        Dim defaultPlayerArgs = New String() {}
         Select Case gameArgs.PlayerType
             Case PlayerTypeEnum.Vlc
                 defaultPlayerArgs = GameWatchArguments.SavedPlayerArgs(PlayerTypeEnum.Vlc)
@@ -451,7 +446,7 @@ Public Class NHLGamesMetro
                 defaultPlayerArgs = GameWatchArguments.SavedPlayerArgs(PlayerTypeEnum.Mpc)
         End Select
 
-        SetDefaultArgs(defaultPlayerArgs, form.txtPlayerArgs, overwrite)
+        SetDefaultArgs(defaultPlayerArgs.ToDictionary(Function(x) x.Split("=").First(), Function(y) y.Substring(y.IndexOf("=") + 1)), form.txtPlayerArgs, overwrite)
     End Sub
 
     Private Sub SetDefaultArgs(args As Dictionary(Of String, String), txt As TextBox, Optional overwrite As Boolean = False)

diff --git a/NHLGames/Objects/GameWatchArguments.vb b/NHLGames/Objects/GameWatchArguments.vb
@@ -35,18 +35,11 @@ Namespace Objects
         Public Shared ReadOnly VlcDefaultArgs As Dictionary(Of String, String) = New Dictionary(Of String, String)() From {
             {"--file-caching", "10000"}, {"--network-caching", "10000"}}
 
-        Public Shared DefaultPlayerArgs As Dictionary(Of PlayerTypeEnum, Dictionary(Of String, String)) = New Dictionary(Of PlayerTypeEnum, Dictionary(Of String, String))() From {
-            {PlayerTypeEnum.Mpc, New Dictionary(Of String, String)()},
-            {PlayerTypeEnum.Vlc, VlcDefaultArgs},
-            {PlayerTypeEnum.Mpv, MpvDefaultArgs},
-            {PlayerTypeEnum.None, New Dictionary(Of String, String)()}
-        }
-
-        Public Shared SavedPlayerArgs As Dictionary(Of PlayerTypeEnum, Dictionary(Of String, String)) = New Dictionary(Of PlayerTypeEnum, Dictionary(Of String, String))() From {
-            {PlayerTypeEnum.Mpc, New Dictionary(Of String, String)()},
-            {PlayerTypeEnum.Vlc, VlcDefaultArgs},
-            {PlayerTypeEnum.Mpv, MpvDefaultArgs},
-            {PlayerTypeEnum.None, New Dictionary(Of String, String)()}
+        Public Shared SavedPlayerArgs As Dictionary(Of PlayerTypeEnum, String()) = New Dictionary(Of PlayerTypeEnum, String())() From {
+            {PlayerTypeEnum.Mpc, {}},
+            {PlayerTypeEnum.Vlc, VlcDefaultArgs.Select(Function(kvp) $"{kvp.Key}={kvp.Value}").ToArray()},
+            {PlayerTypeEnum.Mpv, MpvDefaultArgs.Select(Function(kvp) $"{kvp.Key}={kvp.Value}").ToArray()},
+            {PlayerTypeEnum.None, {}}
         }
 
         Public Overrides Function ToString() As String