Skip to content

scripts: ⚡ Bolt: [performance improvement] json_overview_image_info: optimize add_artifact #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ManupaKDU merged 1 commit into from
Aug 14, 2026
+15 −9
Merged

scripts: ⚡ Bolt: [performance improvement] json_overview_image_info: optimize add_artifact #263

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions scripts/json_overview_image_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ def get_initial_output(image_info):
# Pre-compile the regex to improve performance when called repeatedly in loops
arch_regex = re.compile(r".*Linux-([^.]*)\.")

def add_artifact(artifact, prefix="openwrt-"):
files = list(output_dir.glob(f"{prefix}{artifact}-*"))
if len(files):
def add_artifact(artifact, dir_files, prefix="openwrt-"):
prefix_str = f"{prefix}{artifact}-"
files = [f for f in dir_files if f.startswith(prefix_str)]
if files:
output[artifact] = {}
for file in files:
file = str(file.name)
# Optimization: Use pre-compiled regex for ~50% faster matching
arch = arch_regex.match(file)
if arch:
Expand Down Expand Up @@ -106,9 +106,12 @@ def add_artifact(artifact, prefix="openwrt-"):
if git_commit.returncode == 0:
output["git_commit"] = git_commit.stdout.strip()

import os
dir_files = os.listdir(output_dir) if output_dir.is_dir() else []

for artifact in "imagebuilder", "sdk", "toolchain":
filename = add_artifact(artifact)
add_artifact("llvm-bpf", prefix="")
filename = add_artifact(artifact, dir_files)
add_artifact("llvm-bpf", dir_files, prefix="")

output_path.write_text(json.dumps(output, sort_keys=True, separators=(",", ":")))
else:
Expand Down
9 changes: 6 additions & 3 deletions scripts/test_json_overview_image_info.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ def test_add_artifact(self):
(self.module.output_dir / artifact_name1).touch()
(self.module.output_dir / artifact_name2).touch()

self.module.add_artifact("imagebuilder")
dir_files = [f.name for f in self.module.output_dir.iterdir()]
self.module.add_artifact("imagebuilder", dir_files)

self.assertIn("imagebuilder", self.module.output)
self.assertIn("x86_64", self.module.output["imagebuilder"])
Expand All @@ -82,14 +83,16 @@ def test_add_artifact_no_prefix(self):
artifact_name = "llvm-bpf-15.0-Linux-x86_64.tar.xz"
(self.module.output_dir / artifact_name).touch()

self.module.add_artifact("llvm-bpf", prefix="")
dir_files = [f.name for f in self.module.output_dir.iterdir()]
self.module.add_artifact("llvm-bpf", dir_files, prefix="")

self.assertIn("llvm-bpf", self.module.output)
self.assertIn("x86_64", self.module.output["llvm-bpf"])
self.assertEqual(self.module.output["llvm-bpf"]["x86_64"], artifact_name)

def test_add_artifact_no_match(self):
self.module.add_artifact("sdk")
dir_files = [f.name for f in self.module.output_dir.iterdir()]
self.module.add_artifact("sdk", dir_files)
self.assertNotIn("sdk", self.module.output)

if __name__ == '__main__':
Expand Down
Loading