Added Unzip Functionality and guards for Execption errors

ivanjrt · ivanjrt · commit 654b9580e76c · 2023-12-07T23:54:49.000-06:00
Added.

* Added a reference to System.IO.Compression.FileSystem assembly to the solution
* Installed the System.IO.Compression package via NuGet
diff --git a/MainWindow.xaml b/MainWindow.xaml
@@ -26,7 +26,7 @@
             <RowDefinition Height="143*"/>
             <RowDefinition Height="14*"/>
         </Grid.RowDefinitions>
-        <TextBlock Text="Drag and drop your logs folder:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="16,109,0,0" FontFamily="Segoe UI" FontWeight="Bold" FontSize="14" Foreground="#FF99BCD6" Width="324"/>
+        <TextBlock Text="Drag and drop your logs folder or Zip File:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="16,109,0,0" FontFamily="Segoe UI" FontWeight="Bold" FontSize="14" Foreground="#FF99BCD6" Width="324"/>
 
         <ListBox AllowDrop="True" Name="FolderListBox" HorizontalAlignment="Left" VerticalAlignment="Top" Width="407" Height="59" Margin="14,133,0,0" Drop="FolderListBox_Drop" Background="#FF203746" Foreground="#FF99BCD6" FontWeight="Bold" FontStyle="Italic" SelectionChanged="FolderListBox_SelectionChanged" RenderTransformOrigin="0.5,0.5">
             <ListBox.RenderTransform>
@@ -52,7 +52,7 @@
         <Button Content="Search" Click="Search_Click" HorizontalAlignment="Left" VerticalAlignment="Top" Width="75" Height="24" Margin="620,218,0,0" Background="#FF3F82F1" BorderBrush="Transparent" FontSize="14" Foreground="White" />
         <Button Content="Clear" Click="Clear_Click" HorizontalAlignment="Left" VerticalAlignment="Top" Width="74" Height="25" Margin="700,218,0,0" Background="{DynamicResource {x:Static SystemColors.HotTrackBrushKey}}" BorderBrush="Transparent" FontSize="14" Foreground="White" />
         <ProgressBar Name="SearchProgressBar" IsIndeterminate="True" Visibility="Collapsed" HorizontalAlignment="Left" VerticalAlignment="Top" Width="100" Height="10" Margin="680,86,0,0"/>
-        <TextBlock Name="ResultCountTextBlock" HorizontalAlignment="Left" Margin="10,133,0,0" VerticalAlignment="Top" FontFamily="Segoe UI" FontWeight="Bold" FontSize="14" Width="168" Grid.Row="2" Foreground="#FF99BCD6"/>
+        <TextBlock Name="ResultCountTextBlock" HorizontalAlignment="Left" Margin="10,133,0,0" VerticalAlignment="Top" FontFamily="Segoe UI" FontWeight="Bold" FontSize="14" Width="289" Grid.Row="2" Foreground="#FF99BCD6"/>
 
         <ListView x:Name="ResultListView" HorizontalAlignment="Left" VerticalAlignment="Top" Width="770" Height="264" Margin="10,247,0,0" Grid.RowSpan="3">
             <ListView.View>
@@ -69,12 +69,19 @@
                 Margin="10,10,543,0"
                 FontSize="28" Foreground="White"/>
 
-            <Button Content="❕" HorizontalAlignment="Right" 
+            <Button Content="!" HorizontalAlignment="Right" 
                 VerticalAlignment="Top"
                 Margin="0,10,10,0" 
                 Background="Transparent" BorderBrush="White"
                 Foreground="White" FontSize="16" 
                 Click="About_Click" />
+
+            <Button Content="?" HorizontalAlignment="Right" 
+                VerticalAlignment="Top"
+                Margin="0,10,24,0" 
+                Background="Transparent" BorderBrush="White"
+                Foreground="White" FontSize="16" 
+                Click="Help_Click" />
         </Grid>
     </Grid>
 </Window>
diff --git a/MainWindow.xaml.cs b/MainWindow.xaml.cs
@@ -8,6 +8,8 @@
 using System.Windows.Controls;
 using System.Windows.Input;
 using evtxToXml;
+using System.IO.Compression;
+
 
 namespace LogSearchApp
 {
@@ -49,20 +51,54 @@ private void CopySelectedItemToClipboard()
                 }
             }
         }
-
-        private void FolderListBox_Drop(object sender, DragEventArgs e)
+        private async void FolderListBox_Drop(object sender, DragEventArgs e)
         {
             if (e.Data.GetDataPresent(DataFormats.FileDrop))
             {
-                string[] folders = (string[])e.Data.GetData(DataFormats.FileDrop);
-                if (folders.Length > 0)
+                string[] droppedItems = (string[])e.Data.GetData(DataFormats.FileDrop);
+                if (droppedItems.Length > 0)
                 {
+                    string path = droppedItems[0];
+
+                    // Check if the dropped item is a zip file
+                    if (Path.GetExtension(path).Equals(".zip", StringComparison.OrdinalIgnoreCase))
+                    {
+                        // Display message and activate progress bar during uncompressing
+                        ResultCountTextBlock.Text = "Uncompressing...";
+                        SearchProgressBar.Visibility = Visibility.Visible;
+
+                        try
+                        {
+                            // Extract the contents of the zip file to a folder with the same path
+                            string extractPath = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(path));
+                            await Task.Run(() => ZipFile.ExtractToDirectory(path, extractPath));
+
+                            // Update the log path to the extracted folder
+                            path = extractPath;
+
+                            // Hide progress bar/results after uncompressing
+                            SearchProgressBar.Visibility = Visibility.Collapsed;
+                            ResultCountTextBlock.Text = "File Uncompressed and Ready to Search";
+                        }
+                        catch (Exception ex)
+                        {
+                            // Handle the exception (display or log the error)
+                            MessageBox.Show($"Error opening file with Notepad: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
+
+                            // Reset UI state
+                            ResultCountTextBlock.Text = "Error during extraction";
+                            SearchProgressBar.Visibility = Visibility.Collapsed;
+                            return;
+                        }
+                    }
+
                     FolderListBox.Items.Clear();
-                    FolderListBox.Items.Add(folders[0]);
+                    FolderListBox.Items.Add(path);
                 }
             }
         }
 
+
         private async void Search_Click(object sender, RoutedEventArgs e)
         {
             string logPath = FolderListBox.Items.Count > 0 ? FolderListBox.Items[0] as string : null;
@@ -184,5 +220,11 @@ private void FolderListBox_SelectionChanged(object sender, SelectionChangedEvent
         {
 
         }
+
+        private void Help_Click(object sender, RoutedEventArgs e)
+        {
+            MessageBox.Show("If extracting a Zip file, ensure that the extracted content does not reside in the same location with an identical name as the " +
+                "original Zip file","Help", MessageBoxButton.OK, MessageBoxImage.Information);
+        }
     }
 }
diff --git a/SearchFilesTool.csproj b/SearchFilesTool.csproj
@@ -40,6 +40,12 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.IO.Compression, Version=4.1.2.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>packages\System.IO.Compression.4.3.0\lib\net46\System.IO.Compression.dll</HintPath>
+      <Private>True</Private>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="System.IO.Compression.FileSystem" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
@@ -90,6 +96,7 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
diff --git a/packages.config b/packages.config
@@ -0,0 +1,4 @@
+﻿<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="System.IO.Compression" version="4.3.0" targetFramework="net472" />
+</packages>

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,8 @@`
`8`	`8`	`using System.Windows.Controls;`
`9`	`9`	`using System.Windows.Input;`
`10`	`10`	`using evtxToXml;`
	`11`	`+using System.IO.Compression;`
	`12`	`+`
`11`	`13`
`12`	`14`	`namespace LogSearchApp`
`13`	`15`	`{`
`@@ -49,20 +51,54 @@ private void CopySelectedItemToClipboard()`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`	`}`
`52`		`-`
`53`		`- private void FolderListBox_Drop(object sender, DragEventArgs e)`
	`54`	`+ private async void FolderListBox_Drop(object sender, DragEventArgs e)`
`54`	`55`	`{`
`55`	`56`	`if (e.Data.GetDataPresent(DataFormats.FileDrop))`
`56`	`57`	`{`
`57`		`- string[] folders = (string[])e.Data.GetData(DataFormats.FileDrop);`
`58`		`- if (folders.Length > 0)`
	`58`	`+ string[] droppedItems = (string[])e.Data.GetData(DataFormats.FileDrop);`
	`59`	`+ if (droppedItems.Length > 0)`
`59`	`60`	`{`
	`61`	`+ string path = droppedItems[0];`
	`62`	`+`
	`63`	`+ // Check if the dropped item is a zip file`
	`64`	`+ if (Path.GetExtension(path).Equals(".zip", StringComparison.OrdinalIgnoreCase))`
	`65`	`+ {`
	`66`	`+ // Display message and activate progress bar during uncompressing`
	`67`	`+ ResultCountTextBlock.Text = "Uncompressing...";`
	`68`	`+ SearchProgressBar.Visibility = Visibility.Visible;`
	`69`	`+`
	`70`	`+ try`
	`71`	`+ {`
	`72`	`+ // Extract the contents of the zip file to a folder with the same path`
	`73`	`+ string extractPath = Path.Combine(Path.GetDirectoryName(path), Path.GetFileNameWithoutExtension(path));`
	`74`	`+ await Task.Run(() => ZipFile.ExtractToDirectory(path, extractPath));`
	`75`	`+`
	`76`	`+ // Update the log path to the extracted folder`
	`77`	`+ path = extractPath;`
	`78`	`+`
	`79`	`+ // Hide progress bar/results after uncompressing`
	`80`	`+ SearchProgressBar.Visibility = Visibility.Collapsed;`
	`81`	`+ ResultCountTextBlock.Text = "File Uncompressed and Ready to Search";`
	`82`	`+ }`
	`83`	`+ catch (Exception ex)`
	`84`	`+ {`
	`85`	`+ // Handle the exception (display or log the error)`
	`86`	`+ MessageBox.Show($"Error opening file with Notepad: {ex.Message}", "Error", MessageBoxButton.OK, MessageBoxImage.Error);`
	`87`	`+`
	`88`	`+ // Reset UI state`
	`89`	`+ ResultCountTextBlock.Text = "Error during extraction";`
	`90`	`+ SearchProgressBar.Visibility = Visibility.Collapsed;`
	`91`	`+ return;`
	`92`	`+ }`
	`93`	`+ }`
	`94`	`+`
`60`	`95`	`FolderListBox.Items.Clear();`
`61`		`- FolderListBox.Items.Add(folders[0]);`
	`96`	`+ FolderListBox.Items.Add(path);`
`62`	`97`	`}`
`63`	`98`	`}`
`64`	`99`	`}`
`65`	`100`
	`101`	`+`
`66`	`102`	`private async void Search_Click(object sender, RoutedEventArgs e)`
`67`	`103`	`{`
`68`	`104`	`string logPath = FolderListBox.Items.Count > 0 ? FolderListBox.Items[0] as string : null;`
`@@ -184,5 +220,11 @@ private void FolderListBox_SelectionChanged(object sender, SelectionChangedEvent`
`184`	`220`	`{`
`185`	`221`
`186`	`222`	`}`
	`223`	`+`
	`224`	`+ private void Help_Click(object sender, RoutedEventArgs e)`
	`225`	`+ {`
	`226`	`+ MessageBox.Show("If extracting a Zip file, ensure that the extracted content does not reside in the same location with an identical name as the " +`
	`227`	`+ "original Zip file","Help", MessageBoxButton.OK, MessageBoxImage.Information);`
	`228`	`+ }`
`187`	`229`	`}`
`188`	`230`	`}`