From 762c6ed2258ece20a42b70e0443dd89594db4157 Mon Sep 17 00:00:00 2001
From: Styris <styris@ameliorated.info>
Date: Thu, 6 Apr 2023 22:50:11 -0700
Subject: [PATCH] Add icon, make folder detection more intelligent

---
 Program.cs   |  77 +++++++++++++++++++++++++++++++++++++++------------
 ameck.csproj |   4 +++
 console.ico  | Bin 0 -> 43006 bytes
 3 files changed, 64 insertions(+), 17 deletions(-)
 create mode 100644 console.ico

diff --git a/Program.cs b/Program.cs
index 802ace6..a79c7c9 100644
--- a/Program.cs
+++ b/Program.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -83,11 +84,34 @@ namespace ame_integrity_check
                             if (parentPath.Contains("*")) throw new ArgumentException("Parent directories to a given file filter cannot contain wildcards.");
                             var filter = item.Substring(lastToken + 1);
 
-                            foundItem = Directory.GetDirectories(parentPath, filter).Any();
-                            break;
+                            var foundDirs = Directory.GetDirectories(parentPath, filter);
+                            
+                            foreach (var foundDir in foundDirs)
+                            {
+                                foreach (var file in Directory.GetFiles(foundDir, "*", SearchOption.AllDirectories))
+                                {
+                                    if (!file.ToLower().EndsWith(".mui") && !file.ToLower().EndsWith(".pri") && !file.ToLower().EndsWith(".res"))
+                                    {
+                                        foundItem = true;
+                                    }
+                                }
+                            }
                         }
-                        
-                        foundItem = Directory.Exists(item);
+                        else
+                        {
+
+                            if (Directory.Exists(item))
+                            {
+                                foreach (var file in Directory.GetFiles(item, "*", SearchOption.AllDirectories))
+                                {
+                                    if (!file.ToLower().EndsWith(".mui") && !file.ToLower().EndsWith(".pri") && !file.ToLower().EndsWith(".res"))
+                                    {
+                                        foundItem = true;
+                                    }
+                                }
+                            }
+                        }
+
                         break;
                     case Type.Process:
                         foundItem = Process.GetProcessesByName(item).Any();
@@ -100,7 +124,14 @@ namespace ame_integrity_check
                         break;
                 }
             } catch (Exception e) {
-                errorOverride = true;
+                if (e.GetType().ToString() == "System.UnauthorizedAccessException" || e.GetType().ToString() == "System.Security.SecurityException")
+                {
+                    foundItem = true;
+                }
+                else
+                {
+                    errorOverride = true;
+                }
             }
 
             if (foundItem) found = true;
@@ -152,7 +183,7 @@ namespace ame_integrity_check
         public static int PreviousSizeHeight;
         public static int PreviousSizeWidth;
 
-        public const double Ver = 0.9;
+        public const string Ver = "1.0";
         
         public static void Main(string[] args)
         {
@@ -161,9 +192,15 @@ namespace ame_integrity_check
             PreviousBufferHeight = Console.BufferHeight;
             PreviousBufferWidth = Console.BufferWidth;
 
-            Console.SetWindowSize(80, 26);
-            Console.SetBufferSize(80, 26);
-            Console.SetWindowSize(80, 26);
+            try
+            {
+                Console.SetWindowSize(80, 26);
+                Console.SetBufferSize(80, 26);
+                Console.SetWindowSize(80, 26);
+            } catch (Exception e)
+            {
+
+            }
             
             Console.Clear();
 
@@ -243,7 +280,7 @@ namespace ame_integrity_check
                 scanner.Query(Type.File, "%WINDIR%\\System32\\wuapi.dll", true);
                 
                 scanner.displayTask = scanner.DisplayQuery("Checking Microsoft Edge...", 200);
-                scanner.Query(Type.Directory, "%ProgramFiles(x86)%\\Microsoft\\EdgeCore");
+                scanner.Query(Type.Directory, "%ProgramFiles(x86)%\\Microsoft\\Edge");
                 scanner.Query(Type.Directory, "%WINDIR%\\SystemApps\\*MicrosoftEdge*", true);
                 
                 scanner.displayTask = scanner.DisplayQuery("Checking for Microsoft Store activity...", 200);
@@ -279,11 +316,11 @@ namespace ame_integrity_check
             var posCacheLeft = Console.CursorLeft;
 
             while (Console.KeyAvailable) {
-                Console.ReadKey(false);
+                Console.ReadKey(true);
             }
-            Console.SetCursorPosition(posCacheLeft, posCacheTop);
-            Console.Write("".PadLeft(Console.WindowHeight, ' '));
-            Console.SetCursorPosition(posCacheLeft, posCacheTop);
+            //Console.SetCursorPosition(posCacheLeft, posCacheTop);
+            //Console.Write("".PadLeft(Console.WindowHeight, ' '));
+            //Console.SetCursorPosition(posCacheLeft, posCacheTop);
         }
         private static void Exit(object sender, ConsoleCancelEventArgs args)
         {
@@ -302,9 +339,15 @@ namespace ame_integrity_check
             Console.CursorVisible = true;
             Console.Clear();
             Console.Title = PreviousTitle;
-            
-            Console.SetWindowSize(PreviousSizeWidth, PreviousSizeHeight);
-            Console.SetBufferSize(PreviousBufferWidth, PreviousBufferHeight);
+
+            try
+            {
+                Console.SetWindowSize(PreviousSizeWidth, PreviousSizeHeight);
+                Console.SetBufferSize(PreviousBufferWidth, PreviousBufferHeight);
+            } catch (Exception e)
+            {
+
+            }
         }
     }
 
diff --git a/ameck.csproj b/ameck.csproj
index 71c3a84..e28aa89 100644
--- a/ameck.csproj
+++ b/ameck.csproj
@@ -12,6 +12,7 @@
         <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
         <FileAlignment>512</FileAlignment>
         <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+        <ApplicationIcon>console.ico</ApplicationIcon>
     </PropertyGroup>
     <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
         <PlatformTarget>x64</PlatformTarget>
@@ -113,6 +114,9 @@
       <PackageReference Include="System.Xml.ReaderWriter" Version="4.3.0" />
       <PackageReference Include="System.Xml.XDocument" Version="4.3.0" />
     </ItemGroup>
+    <ItemGroup>
+      <None Include="console.ico" />
+    </ItemGroup>
     <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
          Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/console.ico b/console.ico
new file mode 100644
index 0000000000000000000000000000000000000000..b8a8113fd2af4729a7f7c87bae0a612fb196410d
GIT binary patch
literal 43006
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
IDe%7k13Bj;U;qFB

literal 0
HcmV?d00001