Included better parsing of incoming command line arguments.

trparky · Jun 15, 2024 · 0777d36 · 0777d36
1 parent 10d0c65
commit 0777d36
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 17 deletions.
diff --git a/Hasher/Form1.vb b/Hasher/Form1.vb
@@ -855,10 +855,13 @@ Public Class Form1
             namedPipeServer.Read(buffer, 0, 500)
 
             Dim strReceivedMessage As String = System.Text.Encoding.UTF8.GetString(buffer, 0, buffer.Length).Replace(vbNullChar, "").Trim
+            Dim parsedArguments As New Dictionary(Of String, Object)(StringComparer.OrdinalIgnoreCase)
 
-            If strReceivedMessage.StartsWith("--comparefile=", StringComparison.OrdinalIgnoreCase) Then
+            parsedArguments = Newtonsoft.Json.JsonConvert.DeserializeObject(Of Dictionary(Of String, Object))(strReceivedMessage)
+
+            If parsedArguments.ContainsKey("comparefile") Then
                 MyInvoke(Sub()
-                             Dim strFilePathToBeCompared As String = strReceivedMessage.Replace("--comparefile=", "", StringComparison.OrdinalIgnoreCase)
+                             Dim strFilePathToBeCompared As String = parsedArguments("comparefile")
 
                              If String.IsNullOrWhiteSpace(txtFile1.Text) And String.IsNullOrWhiteSpace(txtFile2.Text) Then
                                  txtFile1.Text = strFilePathToBeCompared
@@ -871,8 +874,8 @@ Public Class Form1
                              TabControl1.SelectedIndex = TabNumberCompareFilesTab
                              If Not String.IsNullOrWhiteSpace(txtFile1.Text) AndAlso Not String.IsNullOrWhiteSpace(txtFile2.Text) Then btnCompareFiles.PerformClick()
                          End Sub)
-            ElseIf strReceivedMessage.StartsWith("--addfile=", StringComparison.OrdinalIgnoreCase) Then
-                AddFileOrDirectoryToHashFileList(strReceivedMessage.Replace("--addfile=", "", StringComparison.OrdinalIgnoreCase))
+            ElseIf parsedArguments.ContainsKey("addfile") Then
+                AddFileOrDirectoryToHashFileList(parsedArguments("addfile"))
             End If
 
             namedPipeServer.Dispose()
@@ -884,6 +887,8 @@ Public Class Form1
     End Sub
 
     Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
+        Dim parsedArguments As Dictionary(Of String, Object) = ParseArguments(My.Application.CommandLineArgs)
+
         ' This function returns a Boolean value indicating if the name pipe server was started or not.
         Dim boolNamedPipeServerStarted As Boolean = StartNamedPipeServer()
         Dim commandLineArgument As String
@@ -893,42 +898,42 @@ Public Class Form1
         propInfo?.SetValue(verifyHashesListFiles, True, Nothing)
         propInfo?.SetValue(listFiles, True, Nothing)
 
-        If My.Application.CommandLineArgs.Count = 1 Then
-            commandLineArgument = My.Application.CommandLineArgs(0).Trim
+        If parsedArguments.Count > 0 Then
+            parsedArguments.ContainsKey("comparefile")
 
-            If commandLineArgument.StartsWith("--addfile=", StringComparison.OrdinalIgnoreCase) Or commandLineArgument.StartsWith("--comparefile=", StringComparison.OrdinalIgnoreCase) Then
+            If parsedArguments.ContainsKey("addfile") Or parsedArguments.ContainsKey("comparefile") Then
                 If boolNamedPipeServerStarted Then
                     ' This instance of the program is the first executed instance so it's the host of the named pipe server.
                     ' We still need to process the first incoming file passed to it via command line arguments. After doing
                     ' so, this instance of the program will continue operating as the host of the named pipe server.
-                    If commandLineArgument.StartsWith("--addfile=", StringComparison.OrdinalIgnoreCase) Then
+                    If parsedArguments.ContainsKey("addfile") Then
                         ' We now have to strip off what we don't need.
-                        commandLineArgument = commandLineArgument.Replace("--addfile=", "", StringComparison.OrdinalIgnoreCase).Replace(Chr(34), "")
+                        commandLineArgument = parsedArguments("addfile")
                         MyInvoke(Sub() AddFileOrDirectoryToHashFileList(commandLineArgument))
-                    ElseIf commandLineArgument.StartsWith("--comparefile=", StringComparison.OrdinalIgnoreCase) Then
+                    ElseIf parsedArguments.ContainsKey("comparefile") Then
                         ' We now have to strip off what we don't need.
-                        commandLineArgument = commandLineArgument.Replace("--comparefile=", "", StringComparison.OrdinalIgnoreCase).Replace(Chr(34), "")
+                        commandLineArgument = parsedArguments("comparefile")
                         txtFile1.Text = commandLineArgument
                     End If
                 Else
                     ' This instance of the program isn't the first running instance, this instance is a secondary instance
                     ' for the lack of a better word. However, this instance has received data from Windows Explorer so we
                     ' need to do something with it, namely pass that data to the first running instance via the named
                     ' pipe and then terminate itself.
-                    SendToIPCNamedPipeServer(commandLineArgument) ' This passes the data to the named pipe server.
+                    SendToIPCNamedPipeServer(Newtonsoft.Json.JsonConvert.SerializeObject(parsedArguments)) ' This passes the data to the named pipe server.
                     Process.GetCurrentProcess.Kill() ' This terminates the process.
                 End If
-            ElseIf commandLineArgument.StartsWith("--hashfile=", StringComparison.OrdinalIgnoreCase) Then
-                commandLineArgument = commandLineArgument.Replace("--hashfile=", "", StringComparison.OrdinalIgnoreCase).Replace(Chr(34), "")
+            ElseIf parsedArguments.ContainsKey("hashfile") Then
+                commandLineArgument = parsedArguments("hashfile")
 
                 If IO.File.Exists(commandLineArgument) Then
                     TabControl1.SelectTab(TabNumberVerifySavedHashesTab)
                     btnOpenExistingHashFile.Text = "Abort Processing"
                     verifyHashesListFiles.Rows.Clear()
                     ProcessExistingHashFile(commandLineArgument)
                 End If
-            ElseIf commandLineArgument.StartsWith("--knownhashfile=", StringComparison.OrdinalIgnoreCase) Then
-                commandLineArgument = commandLineArgument.Replace("--knownhashfile=", "", StringComparison.OrdinalIgnoreCase).Replace(Chr(34), "")
+            ElseIf parsedArguments.ContainsKey("knownhashfile") Then
+                commandLineArgument = parsedArguments("knownhashfile")
                 TabControl1.SelectTab(TabNumberCompareFileAgainstKnownHashTab)
                 txtFileForKnownHash.Text = commandLineArgument
                 txtKnownHash.Select()

diff --git a/Hasher/Program Modules/Globals.vb b/Hasher/Program Modules/Globals.vb
@@ -1,4 +1,5 @@
-Imports System.Security.Principal
+Imports System.Collections.ObjectModel
+Imports System.Security.Principal
 
 Public Module Globals
     ''' <summary>These two variables, longAllReadBytes and longAllBytes, and used to track overall hashing progress of all files to be processed.</summary>
@@ -12,6 +13,31 @@ Public Module Globals
     Public boolAbortThread As Boolean = False
     Public strEXEPath As String = Process.GetCurrentProcess.MainModule.FileName
 
+    Public Function ParseArguments(args As ReadOnlyCollection(Of String)) As Dictionary(Of String, Object)
+        Dim parsedArguments As New Dictionary(Of String, Object)(StringComparer.OrdinalIgnoreCase)
+        Dim strValue As String
+
+        For Each strArgument As String In args
+            If strArgument.StartsWith("--") Then
+                Dim splitArg As String() = strArgument.Substring(2).Split(New Char() {"="c}, 2)
+                Dim key As String = splitArg(0)
+
+                If splitArg.Length = 2 Then
+                    ' Argument with a value
+                    strValue = splitArg(1)
+                    parsedArguments(key) = strValue
+                Else
+                    ' Boolean flag
+                    parsedArguments(key) = True
+                End If
+            Else
+                Console.WriteLine($"Unrecognized argument format: {strArgument}")
+            End If
+        Next
+
+        Return parsedArguments
+    End Function
+
     Public Sub SelectFileInWindowsExplorer(strFullPath As String)
         If Not String.IsNullOrEmpty(strFullPath) AndAlso IO.File.Exists(strFullPath) Then
             Dim pidlList As IntPtr = NativeMethod.NativeMethods.ILCreateFromPathW(strFullPath)