From 846993dbe0bc8ccdc51306b29eefb5cccd1d7223 Mon Sep 17 00:00:00 2001 From: Artur Lebedev Date: Sat, 6 Jun 2026 00:41:36 +0300 Subject: [PATCH 1/3] little fix --- analyzer/windows/modules/packages/archive.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/analyzer/windows/modules/packages/archive.py b/analyzer/windows/modules/packages/archive.py index 57206b36b94..e9408ef2d22 100644 --- a/analyzer/windows/modules/packages/archive.py +++ b/analyzer/windows/modules/packages/archive.py @@ -120,7 +120,7 @@ def start(self, path): for file in files: file_path = os.path.join(r, file) - if file_path == path or file_path in extracted_files: + if file_path in extracted_files: continue extracted_files.add(file_path) @@ -159,10 +159,10 @@ def start(self, path): # If these values are different, replace all log.warning("Extracted archives:%s", extracted_archives) files_at_root = [ - os.path.relpath(os.path.join(r, f), root) + p.replace(f"{root}\\", "") for r, _, files in os.walk(root) for f in files - if os.path.join(r, f) != path and os.path.join(r, f) not in extracted_archives + if (p := os.path.join(r, f)) not in extracted_archives ] log.debug(files_at_root) file_names = files_at_root From 56bbd855216881f3d5f79e0b36ce42d1e9e7d080 Mon Sep 17 00:00:00 2001 From: Artur Lebedev Date: Sat, 6 Jun 2026 00:46:25 +0300 Subject: [PATCH 2/3] debug exctracted archives --- analyzer/windows/modules/packages/archive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analyzer/windows/modules/packages/archive.py b/analyzer/windows/modules/packages/archive.py index e9408ef2d22..9ffbac4616e 100644 --- a/analyzer/windows/modules/packages/archive.py +++ b/analyzer/windows/modules/packages/archive.py @@ -157,7 +157,7 @@ def start(self, path): # We have the file names according to 7ZIP output (file_names) # We have the file names that were actually extracted (files at root) # If these values are different, replace all - log.warning("Extracted archives:%s", extracted_archives) + log.debug("Extracted archives:%s", extracted_archives) files_at_root = [ p.replace(f"{root}\\", "") for r, _, files in os.walk(root) From 23dcb313dde5dd999b91f84b3ddb5881b98174e6 Mon Sep 17 00:00:00 2001 From: Artur Lebedev Date: Sat, 6 Jun 2026 01:03:47 +0300 Subject: [PATCH 3/3] relpath --- analyzer/windows/modules/packages/archive.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/analyzer/windows/modules/packages/archive.py b/analyzer/windows/modules/packages/archive.py index 9ffbac4616e..562a3511510 100644 --- a/analyzer/windows/modules/packages/archive.py +++ b/analyzer/windows/modules/packages/archive.py @@ -159,7 +159,7 @@ def start(self, path): # If these values are different, replace all log.debug("Extracted archives:%s", extracted_archives) files_at_root = [ - p.replace(f"{root}\\", "") + os.path.relpath(p, root) for r, _, files in os.walk(root) for f in files if (p := os.path.join(r, f)) not in extracted_archives