From f3623158d7051ef792bf3f3243ebee90fba794e9 Mon Sep 17 00:00:00 2001
From: Will Miles <will@willmiles.net>
Date: Sun, 25 May 2025 08:33:27 -0400
Subject: [PATCH] Usermod script cleanup

Fix whitespace and remove unused imports
---
 pio-scripts/load_usermods.py    |  8 +++-----
 pio-scripts/validate_modules.py | 11 ++++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/pio-scripts/load_usermods.py b/pio-scripts/load_usermods.py
index 31e211fc0..146cb1f87 100644
--- a/pio-scripts/load_usermods.py
+++ b/pio-scripts/load_usermods.py
@@ -1,11 +1,9 @@
 Import('env')
-import os.path
 from collections import deque
 from pathlib import Path   # For OS-agnostic path manipulation
 from click import secho
 from SCons.Script import Exit
 from platformio.builder.tools.piolib import LibBuilderBase
-from platformio.package.manager.library import LibraryPackageManager
 
 usermod_dir = Path(env["PROJECT_DIR"]).resolve() / "usermods"
 
@@ -21,7 +19,7 @@ def find_usermod(mod: str) -> Path:
     return mp
   mp = usermod_dir / f"{mod}_v2"
   if mp.exists():
-    return mp  
+    return mp
   mp = usermod_dir / f"usermod_v2_{mod}"
   if mp.exists():
     return mp
@@ -50,7 +48,7 @@ if usermods:
 # Utility function for assembling usermod include paths
 def cached_add_includes(dep, dep_cache: set, includes: deque):
   """ Add dep's include paths to includes if it's not in the cache """
-  if dep not in dep_cache:   
+  if dep not in dep_cache:
     dep_cache.add(dep)
     for include in dep.get_include_dirs():
       if include not in includes:
@@ -96,7 +94,7 @@ def wrapped_ConfigureProjectLibBuilder(xenv):
     secho(
       f"ERROR: libArchive=false is missing on usermod(s) {' '.join(broken_usermods)} -- modules will not compile in correctly",
       fg="red",
-      err=True)    
+      err=True)
     Exit(1)
 
   return result
diff --git a/pio-scripts/validate_modules.py b/pio-scripts/validate_modules.py
index eb6ebb446..f8c9a599d 100644
--- a/pio-scripts/validate_modules.py
+++ b/pio-scripts/validate_modules.py
@@ -1,10 +1,8 @@
 import re
-import sys
 from pathlib import Path   # For OS-agnostic path manipulation
 from typing import Iterable
 from click import secho
 from SCons.Script import Action, Exit
-from platformio import util
 from platformio.builder.tools.piolib import LibBuilderBase
 
 
@@ -56,8 +54,8 @@ def validate_map_file(source, target, env):
         Exit(1)
 
     # Identify the WLED module source directories
-    module_lib_builders = [builder for builder in env.GetLibBuilders() if is_wled_module(env, builder)]    
-    
+    module_lib_builders = [builder for builder in env.GetLibBuilders() if is_wled_module(env, builder)]
+
     if env.GetProjectOption("custom_usermods","") == "*":
         # All usermods build; filter non-platform-OK modules
         module_lib_builders = [builder for builder in module_lib_builders if env.IsCompatibleLibBuilder(builder)]
@@ -68,8 +66,7 @@ def validate_map_file(source, target, env):
                 f"ERROR: Modules {[b.name for b in incompatible_builders]} are not compatible with this platform!",
                 fg="red",
                 err=True)
-            Exit(1)            
-        pass
+            Exit(1)
 
     # Extract the values we care about
     modules = {Path(builder.build_dir).name: builder.name for builder in module_lib_builders}
@@ -77,7 +74,7 @@ def validate_map_file(source, target, env):
 
     # Now parse the map file
     map_file_contents = read_lines(map_file_path)
-    usermod_object_count = count_usermod_objects(map_file_contents)   
+    usermod_object_count = count_usermod_objects(map_file_contents)
     secho(f"INFO: {usermod_object_count} usermod object entries")
 
     confirmed_modules = check_map_file_objects(map_file_contents, modules.keys())