mirror of
https://github.com/wled/WLED.git
synced 2025-07-26 04:06:37 +00:00
Usermod script cleanup
Fix whitespace and remove unused imports
This commit is contained in:
parent
e80a7c6b75
commit
f3623158d7
@ -1,11 +1,9 @@
|
|||||||
Import('env')
|
Import('env')
|
||||||
import os.path
|
|
||||||
from collections import deque
|
from collections import deque
|
||||||
from pathlib import Path # For OS-agnostic path manipulation
|
from pathlib import Path # For OS-agnostic path manipulation
|
||||||
from click import secho
|
from click import secho
|
||||||
from SCons.Script import Exit
|
from SCons.Script import Exit
|
||||||
from platformio.builder.tools.piolib import LibBuilderBase
|
from platformio.builder.tools.piolib import LibBuilderBase
|
||||||
from platformio.package.manager.library import LibraryPackageManager
|
|
||||||
|
|
||||||
usermod_dir = Path(env["PROJECT_DIR"]).resolve() / "usermods"
|
usermod_dir = Path(env["PROJECT_DIR"]).resolve() / "usermods"
|
||||||
|
|
||||||
@ -21,7 +19,7 @@ def find_usermod(mod: str) -> Path:
|
|||||||
return mp
|
return mp
|
||||||
mp = usermod_dir / f"{mod}_v2"
|
mp = usermod_dir / f"{mod}_v2"
|
||||||
if mp.exists():
|
if mp.exists():
|
||||||
return mp
|
return mp
|
||||||
mp = usermod_dir / f"usermod_v2_{mod}"
|
mp = usermod_dir / f"usermod_v2_{mod}"
|
||||||
if mp.exists():
|
if mp.exists():
|
||||||
return mp
|
return mp
|
||||||
@ -50,7 +48,7 @@ if usermods:
|
|||||||
# Utility function for assembling usermod include paths
|
# Utility function for assembling usermod include paths
|
||||||
def cached_add_includes(dep, dep_cache: set, includes: deque):
|
def cached_add_includes(dep, dep_cache: set, includes: deque):
|
||||||
""" Add dep's include paths to includes if it's not in the cache """
|
""" 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)
|
dep_cache.add(dep)
|
||||||
for include in dep.get_include_dirs():
|
for include in dep.get_include_dirs():
|
||||||
if include not in includes:
|
if include not in includes:
|
||||||
@ -96,7 +94,7 @@ def wrapped_ConfigureProjectLibBuilder(xenv):
|
|||||||
secho(
|
secho(
|
||||||
f"ERROR: libArchive=false is missing on usermod(s) {' '.join(broken_usermods)} -- modules will not compile in correctly",
|
f"ERROR: libArchive=false is missing on usermod(s) {' '.join(broken_usermods)} -- modules will not compile in correctly",
|
||||||
fg="red",
|
fg="red",
|
||||||
err=True)
|
err=True)
|
||||||
Exit(1)
|
Exit(1)
|
||||||
|
|
||||||
return result
|
return result
|
||||||
|
@ -1,10 +1,8 @@
|
|||||||
import re
|
import re
|
||||||
import sys
|
|
||||||
from pathlib import Path # For OS-agnostic path manipulation
|
from pathlib import Path # For OS-agnostic path manipulation
|
||||||
from typing import Iterable
|
from typing import Iterable
|
||||||
from click import secho
|
from click import secho
|
||||||
from SCons.Script import Action, Exit
|
from SCons.Script import Action, Exit
|
||||||
from platformio import util
|
|
||||||
from platformio.builder.tools.piolib import LibBuilderBase
|
from platformio.builder.tools.piolib import LibBuilderBase
|
||||||
|
|
||||||
|
|
||||||
@ -56,8 +54,8 @@ def validate_map_file(source, target, env):
|
|||||||
Exit(1)
|
Exit(1)
|
||||||
|
|
||||||
# Identify the WLED module source directories
|
# 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","") == "*":
|
if env.GetProjectOption("custom_usermods","") == "*":
|
||||||
# All usermods build; filter non-platform-OK modules
|
# All usermods build; filter non-platform-OK modules
|
||||||
module_lib_builders = [builder for builder in module_lib_builders if env.IsCompatibleLibBuilder(builder)]
|
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!",
|
f"ERROR: Modules {[b.name for b in incompatible_builders]} are not compatible with this platform!",
|
||||||
fg="red",
|
fg="red",
|
||||||
err=True)
|
err=True)
|
||||||
Exit(1)
|
Exit(1)
|
||||||
pass
|
|
||||||
|
|
||||||
# Extract the values we care about
|
# Extract the values we care about
|
||||||
modules = {Path(builder.build_dir).name: builder.name for builder in module_lib_builders}
|
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
|
# Now parse the map file
|
||||||
map_file_contents = read_lines(map_file_path)
|
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")
|
secho(f"INFO: {usermod_object_count} usermod object entries")
|
||||||
|
|
||||||
confirmed_modules = check_map_file_objects(map_file_contents, modules.keys())
|
confirmed_modules = check_map_file_objects(map_file_contents, modules.keys())
|
||||||
|
Loading…
x
Reference in New Issue
Block a user