ntfsdump 3.3.0__tar.gz → 3.3.1__tar.gz

{ntfsdump-3.3.0 → ntfsdump-3.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ntfsdump
-Version: 3.3.0
+Version: 3.3.1
 Summary: A command-line tool for efficiently extracting files, directories, and alternate data streams directly from NTFS image files.
 Project-URL: Homepage, https://github.com/sumeshi/ntfsdump
 Project-URL: Repository, https://github.com/sumeshi/ntfsdump

ntfsdump-3.3.1/src/ntfsdump/__about__.py

@@ -0,0 +1,2 @@
+# coding: utf-8
+__version__ = "3.3.1"

{ntfsdump-3.3.0 → ntfsdump-3.3.1}/src/ntfsdump/cli.py

@@ -241,6 +241,7 @@ def _run(args) -> None:
         snapshot=args.snapshot,
         disk=args.disk,
         flat=args.flat,
+        quiet=args.quiet,
     )
 
 
@@ -248,7 +249,6 @@ def main(argv: Optional[Iterable[str]] = None) -> int:
     parser = create_parser()
     args = parser.parse_args(argv)
 
-    MetaData.quiet = args.quiet
     configure_logging(args.log)
 
     try:

{ntfsdump-3.3.0 → ntfsdump-3.3.1}/src/ntfsdump/core.py

@@ -3,6 +3,7 @@ from pathlib import Path
 from typing import Optional, Union
 
 from ntfsdump.image import ImageFile
+from ntfsdump.logger import MetaData
 
 
 def ntfsdump(
@@ -14,6 +15,7 @@ def ntfsdump(
     snapshot=None,
     disk: Optional[int] = None,
     flat: bool = False,
+    quiet: bool = False,
 ) -> None:
     """A tool for extracting files from an NTFS volume on a disk image.
 
@@ -27,7 +29,10 @@ def ntfsdump(
         snapshot (optional): VMware snapshot ID to read. Defaults to None.
         disk (Optional[int], optional): VMware virtual disk ID to read. Defaults to None.
         flat (bool, optional): reconstruct directory tree or not. Defaults to False.
+        quiet (bool, optional): suppress progress lines on stdout.
+            Errors are still written to stderr. Defaults to False.
     """
+    MetaData.quiet = quiet
     img = ImageFile(
         source,
         volume=volume,

ntfsdump-3.3.1/tests/ntfsdump/test_core.py

@@ -0,0 +1,45 @@
+# coding: utf-8
+import pytest
+
+from ntfsdump import core
+from ntfsdump.logger import MetaData
+
+
+def test_ntfsdump_resets_leaked_quiet_state(tmp_path, monkeypatch):
+    # A previous ntfsfind(verbose=True) call may leave MetaData.quiet=True
+    # in the same process; core.ntfsdump() must reset it explicitly.
+    monkeypatch.setattr(MetaData, 'quiet', True)
+
+    with pytest.raises(Exception):
+        core.ntfsdump(source=str(tmp_path), paths=['/$MFT'])
+
+    assert MetaData.quiet is False
+
+
+def test_ntfsdump_quiet_flag_is_applied(tmp_path, monkeypatch):
+    monkeypatch.setattr(MetaData, 'quiet', False)
+
+    with pytest.raises(Exception):
+        core.ntfsdump(source=str(tmp_path), paths=['/$MFT'], quiet=True)
+
+    assert MetaData.quiet is True
+
+
+def test_cli_passes_quiet_to_core(monkeypatch):
+    from ntfsdump import cli
+
+    captured = {}
+
+    def fake_ntfsdump(**kwargs):
+        captured.update(kwargs)
+
+    monkeypatch.setattr(cli, 'ntfsdump', fake_ntfsdump)
+    monkeypatch.setattr(
+        cli.SourceResolver,
+        'resolve',
+        lambda self, source, **kwargs: object(),
+    )
+
+    cli.main([str('/nonexistent'), '/$MFT', '--quiet'])
+
+    assert captured['quiet'] is True

ntfsdump-3.3.0/src/ntfsdump/__about__.py

@@ -1,2 +0,0 @@
-# coding: utf-8
-__version__ = "3.3.0"