fix: Do not create extra output directory, if nothing was extracted

The output path is printed in the previous commit, so depending on the caller having to look at well known paths is no longer needed.
onekey-sec · Nov 27, 2024 · f5f8ba5 · f5f8ba5
1 parent 579e6a7
commit f5f8ba5
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 5 deletions.
diff --git a/...ut__/offset_malformed.ar_extract/.gitkeep → .../archive/rar/password/__output__/.gitkeep b/...ut__/offset_malformed.ar_extract/.gitkeep → .../archive/rar/password/__output__/.gitkeep
diff --git a/...ut__/cherry_password.rar_extract/.gitkeep → ...archive/zip/encrypted/__output__/.gitkeep b/...ut__/cherry_password.rar_extract/.gitkeep → ...archive/zip/encrypted/__output__/.gitkeep
diff --git a/tests/integration/archive/zip/encrypted/__output__/apple_encrypted.zip_extract/.gitkeep b/tests/integration/archive/zip/encrypted/__output__/apple_encrypted.zip_extract/.gitkeep
diff --git a/...t__/truncated-header.tar_extract/.gitkeep → .../zip/partly_encrypted/__output__/.gitkeep b/...t__/truncated-header.tar_extract/.gitkeep → .../zip/partly_encrypted/__output__/.gitkeep
diff --git a/tests/integration/archive/zip/partly_encrypted/__output__/kaki1_aes.zip_extract/.gitkeep b/tests/integration/archive/zip/partly_encrypted/__output__/kaki1_aes.zip_extract/.gitkeep
diff --git a/tests/integration/compression/lzma/__output__/lorem.txt.small_size.lzma_extract/.gitkeep b/tests/integration/compression/lzma/__output__/lorem.txt.small_size.lzma_extract/.gitkeep
diff --git a/...ation/compression/lzma/__output__/lorem.txt.smaller_than_compressed.lzma_extract/.gitkeep b/...ation/compression/lzma/__output__/lorem.txt.smaller_than_compressed.lzma_extract/.gitkeep
diff --git a/tests/integration/compression/zstd/__output__/lorem.truncated.zstd_extract/.gitkeep b/tests/integration/compression/zstd/__output__/lorem.truncated.zstd_extract/.gitkeep
diff --git a/tests/integration/compression/zstd/__output__/truncated.dos.zstd_extract/.gitkeep b/tests/integration/compression/zstd/__output__/truncated.dos.zstd_extract/.gitkeep
diff --git a/tests/integration/executable/elf/elf32/__output__/sample_32_prg_end.elf_extract/.gitkeep b/tests/integration/executable/elf/elf32/__output__/sample_32_prg_end.elf_extract/.gitkeep
diff --git a/tests/integration/executable/elf/elf64/__output__/hellomod.sha1.ko_extract/.gitkeep b/tests/integration/executable/elf/elf64/__output__/hellomod.sha1.ko_extract/.gitkeep
diff --git a/...s/integration/executable/elf/elf64/__output__/hellomod.sha1.nonsigned.ko_extract/.gitkeep b/...s/integration/executable/elf/elf64/__output__/hellomod.sha1.nonsigned.ko_extract/.gitkeep
diff --git a/tests/integration/executable/elf/elf64/__output__/hellomod.sha256.ko_extract/.gitkeep b/tests/integration/executable/elf/elf64/__output__/hellomod.sha256.ko_extract/.gitkeep
diff --git a/tests/integration/executable/elf/elf64/__output__/hellomod.sha384.ko_extract/.gitkeep b/tests/integration/executable/elf/elf64/__output__/hellomod.sha384.ko_extract/.gitkeep
diff --git a/tests/integration/executable/elf/elf64/__output__/hellomod.sha512.ko_extract/.gitkeep b/tests/integration/executable/elf/elf64/__output__/hellomod.sha512.ko_extract/.gitkeep
diff --git a/tests/test_cli.py b/tests/test_cli.py
@@ -314,7 +314,7 @@ def test_keep_extracted_chunks(
     [
         pytest.param([], 5, id="skip-extension-empty"),
         pytest.param([""], 5, id="skip-zip-extension-empty-suffix"),
-        pytest.param([".zip"], 1, id="skip-extension-zip"),
+        pytest.param([".zip"], 0, id="skip-extension-zip"),
         pytest.param([".rlib"], 5, id="skip-extension-rlib"),
     ],
 )

diff --git a/unblob/processing.py b/unblob/processing.py
@@ -149,10 +149,6 @@ def process_file(
 
     process_result = _process_task(config, task)
 
-    if not config.skip_extraction and not carve_dir.exists():
-        # ensure that the root extraction directory is created even for empty extractions
-        extract_dir.mkdir(parents=True, exist_ok=True)
-
     if report_file:
         write_json_report(report_file, process_result)