Promoted --performance-check flag from beta to official, fixed major bug in zipping

- Removed "Beta Mode" label from the --performance-check help text
- Flag is now considered stable and ready for general use
- Removed the memory usage section as it is unreliable and in very low values and is also influenced by other system apps
- Renamed vulnscan folder and items to be bug free, as old name resulted in the files getting zipped
- Found bug in vulnscan that causes a critical crash, will fix in next commit

Signed-off-by: Shahm Najeeb <[email protected]>

Author: DefinetlyNotAI

.gitignore

@@ -319,7 +319,7 @@ $RECYCLE.BIN/
 *.pyc
 /CODE/SysInternal_Suite/.sys.ignore
 /ACCESS/
-/CODE/VulnScan/tools/NN features/
+/CODE/vulnscan/tools/NN features/
 /CODE/logicytics/User_History.json.gz
 /CODE/logicytics/User_History.json
 /CODE/SysInternal_Suite/psfile.exe

.idea/Logicytics.iml

@@ -7,7 +7,6 @@
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from datetime import datetime
 
-import psutil
 from prettytable import PrettyTable
 
 from logicytics import Log, execute, check, get, file_management, flag, DEBUG, DELETE_LOGS, config
@@ -198,54 +197,28 @@ def __performance(self):
             log.warning("Advised to turn on DEBUG logging!!")
 
         execution_times = []
-        memory_usage = []
-        process = psutil.Process(os.getpid())
 
         for file in range(len(self.execution_list)):
             gc.collect()
             start_time = datetime.now()
-            start_memory = process.memory_full_info().uss / 1024 / 1024  # MB
             log.execution(execute.script(self.execution_list[file]))
             end_time = datetime.now()
-            end_memory = process.memory_full_info().uss / 1024 / 1024  # MB
             elapsed_time = end_time - start_time
-            memory_delta = max(0, end_memory - start_memory)  # Clamps negative delta to 0
-            memory_usage.append((self.execution_list[file], f"{memory_delta}"))
             execution_times.append((self.execution_list[file], elapsed_time))
             log.info(f"{self.execution_list[file]} executed in {elapsed_time}")
-            try:
-                if (end_memory - start_memory) < 0:
-                    log.info(
-                        f"{self.execution_list[file]} used {memory_delta:.3f}MB of memory - \033[33mPossible Affected by outside processes\033[0m")
-                else:
-                    log.info(f"{self.execution_list[file]} used {memory_delta:.3f}MB of memory")
-            except Exception as e:
-                log.warning("Failed to log memory usage delta, reason: " + str(e))
-            log.debug(f"Started with {start_memory:.3f}MB of memory and ended with {end_memory:.3f}MB of memory")
 
         table = PrettyTable()
-        table.field_names = ["Script", "Execution Time", "Memory Usage (MB)"]
+        table.field_names = ["Script", "Execution Time"]
         for script, elapsed_time in execution_times:
-            try:
-                memory = f"{float(next(m[1] for m in memory_usage if m[0] == script)):.3f}"
-            except StopIteration:
-                log.warning(f"No memory data found for {script}")
-                memory = "N/A"
-            except Exception as e:
-                log.warning(f"Failed to log memory usage for {script}, reason: " + str(e))
-                memory = "N/A"
-            table.add_row([script, elapsed_time, f"{memory}"])
+            table.add_row([script, elapsed_time])
 
         try:
             with open(
                     f"../ACCESS/LOGS/PERFORMANCE/Performance_Summary_"
                     f"{datetime.now().strftime('%Y-%m-%d_%H-%M-%S')}.txt", "w"
             ) as f:
                 f.write(table.get_string())
-                f.write(
-                    "\nSome values may be negative, Reason may be due to external resources playing with memory usage,\n"
-                    "Close background tasks to get more accurate readings\n\n")
-                f.write("Note: This is not a low-level memory logger, data here isn't 100% accurate!\n")
+                f.write("\nNote: This test only measures execution time.\n")
             log.info("Performance check complete! Performance log found in ACCESS/LOGS/PERFORMANCE")
         except Exception as e:
             log.error(f"Error writing performance log: {e}")
@@ -444,12 +417,12 @@ def handle_sub_action():
     """
     log.info("Completed successfully!")
     log.newline()
-    if ACTION == "performance_check":
-        return  # Do not handle sub actions for performance check
-    if SUB_ACTION == "shutdown":
-        subprocess.call("shutdown /s /t 3", shell=False)
-    elif SUB_ACTION == "reboot":
-        subprocess.call("shutdown /r /t 3", shell=False)
+    # Do not handle sub actions for performance check
+    if ACTION != "performance_check":
+        if SUB_ACTION == "shutdown":
+            subprocess.call("shutdown /s /t 3", shell=False)
+        elif SUB_ACTION == "reboot":
+            subprocess.call("shutdown /r /t 3", shell=False)
 
 
 @log.function

.idea/webResources.xml

@@ -92,7 +92,7 @@ def __get_files_to_zip(path: str) -> list:
             """
             excluded_extensions = (".py", ".exe", ".bat", ".ps1", ".pkl", ".pth")
             excluded_prefixes = ("config.ini", "SysInternal_Suite",
-                                 "__pycache__", "logicytics", "VulnScan")
+                                 "__pycache__", "logicytics", "vulnscan")
 
             return [
                 f for f in os.listdir(path)

CODE/Logicytics.py

@@ -463,13 +463,11 @@ def __available_arguments(cls) -> tuple[argparse.Namespace, argparse.ArgumentPar
             help="Run Logicytics in minimal mode. Just bare essential scraping using only quick scripts",
         )
 
-        # TODO v3.6.0 -> Out of beta
         parser.add_argument(
             "--performance-check",
             action="store_true",
             help="Run's Logicytics default while testing its performance and time, "
                  "this then shows a table with the file names and time to executed. "
-                 f"{cls.__colorify('- Beta Mode -', 'y')}"
         )
 
         parser.add_argument(

CODE/logicytics/FileManagement.py

@@ -185,7 +185,7 @@ async def scan_worker(scan_file):
             "C:\\Program Files",
             "C:\\Program Files (x86)"
         ]
-        vulnscan = VulnScan("vulnscan/Model SenseMini .3n3.pth", "vulnscan/Vectorizer .3n3.pkl")
+        vulnscan = VulnScan("vulnscan/SenseMini.3n3.pth", "vulnscan/vectorizer.3n3.pkl")
         vulnscan.scan_directory(base_paths)
     except KeyboardInterrupt:
         log.warning("User interrupted. Exiting gracefully.")