Key Improvements - Added Modular Functions like validate_mode_input and validate_directory_input for better code organization. Improved error handling with more specific messages and logging. Added more logging details to help debug issues. Validated user inputs for mode and directory path.

Author: mnestorov

main.py

@@ -4,7 +4,7 @@
 import shutil
 from concurrent.futures import ThreadPoolExecutor
 from tqdm import tqdm
-from config import (log_filename, YELLOW, BLUE, GREEN, RED, RESET, YAKPRO)
+from config import log_filename, YELLOW, BLUE, GREEN, RED, RESET, YAKPRO
 from subprocess import call
 
 # Configure logging
@@ -54,11 +54,7 @@ def obfuscate_file(args):
     obfuscate_php(input_file, obfuscation_options, create_backup, output_directory)
 
 def process_directory(directory, obfuscation_options, exclude_list, create_backup, output_directory, max_workers=4):
-    total_files = 0
-    for root, _, files in os.walk(directory):
-        for file in files:
-            if file.lower().endswith(".php"):
-                total_files += 1
+    total_files = sum([len(files) for r, d, files in os.walk(directory) if any(f.lower().endswith('.php') for f in files)])
 
     progress_bar = tqdm(total=total_files, desc="Obfuscating", unit="file")
 
@@ -82,15 +78,28 @@ def process_directory(directory, obfuscation_options, exclude_list, create_backu
 
     progress_bar.close()
 
+def validate_mode_input(mode):
+    try:
+        mode = int(mode)
+        if mode not in [1, 2, 3]:
+            raise ValueError
+        return mode
+    except ValueError:
+        logging.error("Invalid mode input. Please enter 1, 2, or 3.")
+        print(f"{RED}Invalid mode. Choose from: 1, 2, or 3{RESET}")
+        sys.exit(1)
+
+def validate_directory_input(directory_path):
+    if not os.path.isdir(directory_path):
+        logging.error(f"Invalid directory path: {directory_path}")
+        print(f"{RED}Invalid directory path{RESET}")
+        sys.exit(1)
+
 def main():
     print(f"{GREEN}Welcome to the PHP Obfuscator!{RESET}")
     print(f"{GREEN}Follow the prompts to obfuscate your PHP files.\n{RESET}")
 
-    print(f"{GREEN}Choose the mode for obfuscating your PHP files:{RESET}")
-    print(f"{BLUE}1: Single file{RESET}")
-    print(f"{BLUE}2: Multiple files{RESET}")
-    print(f"{BLUE}3: Entire project directory{RESET}")
-    mode = input(f"{GREEN}Enter the mode number (1/2/3): {RESET}")
+    mode = validate_mode_input(input(f"{GREEN}Enter the mode number (1/2/3): {RESET}"))
 
     output_directory = input(f"{GREEN}Enter the output directory path: {RESET}")
     if not os.path.exists(output_directory):
@@ -99,23 +108,21 @@ def main():
     exclude_input = input(f"{GREEN}Enter file or directory paths to exclude (separated by a space) (you can skip this step): {RESET}")
     exclude_list = [os.path.abspath(exclude.strip()) for exclude in exclude_input.split()]
 
-    backup_input = input(f"{GREEN}Create backups of original PHP files? (y/n): {RESET}").lower()
-    create_backup = backup_input == 'y'
+    create_backup = input(f"{GREEN}Create backups of original PHP files? (y/n): {RESET}").lower() == 'y'
 
     obfuscation_options = get_obfuscation_options()
 
-    if mode == '1':
+    if mode == 1:
         input_file = input(f"{GREEN}Enter the PHP file path: {RESET}")
         if not input_file.lower().endswith(".php") or not os.path.isfile(input_file):
             logging.warning("Invalid PHP file path")
             print(f"{RED}Invalid PHP file path{RESET}")
             sys.exit(1)
-        # Checking for exclusions should be inside this mode '1' block
         if any(os.path.commonpath([input_file, exclude]) == os.path.abspath(exclude) for exclude in exclude_list):
             logging.info(f"Skipping {input_file}: excluded")
         else:
             obfuscate_php(input_file, obfuscation_options, create_backup, output_directory)
-    if mode == '2':
+    elif mode == 2:
         file_paths = input(f"{GREEN}Enter the PHP file paths separated by a space: {RESET}")
         files = file_paths.split()
 
@@ -125,12 +132,9 @@ def main():
                 print(f"{RED}Skipping {input_file}: not a valid PHP file{RESET}")
                 continue
             obfuscate_php(input_file, obfuscation_options, create_backup, output_directory)
-    elif mode == '3':
+    elif mode == 3:
         input_directory = input(f"{GREEN}Enter the project directory path: {RESET}")
-        if not os.path.isdir(input_directory):
-            logging.warning("Invalid directory path")
-            print(f"{RED}Invalid directory path{RESET}")
-            sys.exit(1)
+        validate_directory_input(input_directory)
         process_directory(input_directory, obfuscation_options, exclude_list, create_backup, output_directory)
     else:
         logging.warning("Invalid mode. Choose from: 1, 2, or 3")