dissect.target 3.23.dev37__tar.gz → 3.23.dev39__tar.gz

{dissect_target-3.23.dev37 → dissect_target-3.23.dev39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.23.dev37
+Version: 3.23.dev39
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect_target-3.23.dev37 → dissect_target-3.23.dev39}/dissect/target/container.py

@@ -39,7 +39,7 @@ class Container(io.IOBase):
     __type__: str = None
     """A short string identifying the type of container."""
 
-    def __init__(self, fh: BinaryIO | Path, size: int, vs: VolumeSystem = None):
+    def __init__(self, fh: BinaryIO | Path, size: int, vs: VolumeSystem | None = None):
         self.fh = fh
         self.size = size
 
@@ -50,7 +50,7 @@ class Container(io.IOBase):
             raise NotImplementedError(f"{self.__class__.__name__} must define __type__")
 
     def __repr__(self) -> str:
-        return f"<{self.__class__.__name__} size={self.size} vs={self.vs}>"
+        return f"<Container type={self.__type__} size={self.size} vs={self.vs.__type__ if self.vs else None}>"
 
     @classmethod
     def detect(cls, item: list | BinaryIO | Path) -> bool:

{dissect_target-3.23.dev37 → dissect_target-3.23.dev39}/dissect/target/filesystem.py

@@ -66,7 +66,7 @@ class Filesystem:
             raise NotImplementedError(f"{self.__class__.__name__} must define __type__")
 
     def __repr__(self) -> str:
-        return f"<{self.__class__.__name__}>"
+        return f"<Filesystem type={self.__type__}>"
 
     def path(self, *args) -> fsutil.TargetPath:
         """Instantiate a new path-like object on this filesystem."""

{dissect_target-3.23.dev37 → dissect_target-3.23.dev39}/dissect/target/tools/info.py

@@ -133,7 +133,7 @@ def print_target_info(target: Target) -> None:
                 continue
             print(f"\n{name.capitalize()}")
             for i in value:
-                values = " ".join([f'{k}="{v}"' for k, v in i.items()])
+                values = " ".join([f"{k}={v!r}" for k, v in i.items()])
                 print(f"- <{name.capitalize()[:-1].replace('re', '')} {values}>")
             continue
 
@@ -150,15 +150,15 @@ def print_target_info(target: Target) -> None:
 
 
 def get_disks_info(target: Target) -> list[dict[str, str | int]]:
-    return [{"type": d.__class__.__name__, "size": d.size} for d in target.disks]
+    return [{"type": d.__type__, "size": d.size} for d in target.disks]
 
 
-def get_volumes_info(target: Target) -> list[dict[str, str | int]]:
-    return [{"name": v.name, "size": v.size, "fs": v.fs.__class__.__name__} for v in target.volumes]
+def get_volumes_info(target: Target) -> list[dict[str, str | int | None]]:
+    return [{"name": v.name, "size": v.size, "fs": v.fs.__type__ if v.fs else None} for v in target.volumes]
 
 
-def get_mounts_info(target: Target) -> list:
-    return [{"fs": fs.__class__.__name__, "path": path} for path, fs in target.fs.mounts.items()]
+def get_mounts_info(target: Target) -> list[dict[str, str | None]]:
+    return [{"fs": fs.__type__, "path": path} for path, fs in target.fs.mounts.items()]
 
 
 def get_children_info(target: Target) -> list[dict[str, str]]:

{dissect_target-3.23.dev37 → dissect_target-3.23.dev39}/dissect/target/tools/shell.py

@@ -128,7 +128,7 @@ class AnsiColors(StrEnum):
 
 
 # ANSI color escape sequences for readline prompt
-ANSI_COLORS = readline_escape(AnsiColors.as_dict())
+ANSI_COLORS = readline_escape(AnsiColors.as_dict()) if readline else AnsiColors.as_dict()
 
 
 class ExtendedCmd(cmd.Cmd):
@@ -721,7 +721,7 @@ class TargetCli(TargetCmd):
     def do_mounts(self, line: str) -> bool:
         """print target mounts"""
         for mount, fs in self.target.fs.mounts.items():
-            print(f"<Mount path={mount!r} fs={fs!r}>")
+            print(f"<Mount fs={fs.__type__!r} path={mount!r}>")
         return False
 
     def do_info(self, line: str) -> bool:

{dissect_target-3.23.dev37 → dissect_target-3.23.dev39}/dissect/target/volume.py

@@ -77,7 +77,7 @@ class VolumeSystem:
             raise NotImplementedError(f"{self.__class__.__name__} must define __type__")
 
     def __repr__(self) -> str:
-        return f"<{self.__class__.__name__} serial={self.serial}>"
+        return f"<VolumeSystem type={self.__type__} serial={self.serial}>"
 
     @classmethod
     def detect(cls, fh: BinaryIO) -> bool:
@@ -285,7 +285,7 @@ class Volume(io.IOBase):
         self.seek(0)
 
     def __repr__(self) -> str:
-        return f"<Volume name={self.name!r} size={self.size!r} fs={self.fs!r}>"
+        return f"<Volume name={self.name!r} size={self.size!r} fs={self.fs.__type__ if self.fs else None!r}>"
 
     def read(self, length: int = -1) -> bytes:
         """Read a ``length`` of bytes from this ``Volume``."""

{dissect_target-3.23.dev37 → dissect_target-3.23.dev39}/dissect.target.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dissect.target
-Version: 3.23.dev37
+Version: 3.23.dev39
 Summary: This module ties all other Dissect modules together, it provides a programming API and command line tools which allow easy access to various data sources inside disk images or file collections (a.k.a. targets)
 Author-email: Dissect Team <dissect@fox-it.com>
 License: Affero General Public License v3

{dissect_target-3.23.dev37 → dissect_target-3.23.dev39}/tests/helpers/test_loaderutil.py

@@ -57,7 +57,7 @@ def test_extract_path_info(
             None,
             False,
             [
-                "Opened NTFS filesystem from <VirtualFilesystem> but could not find $MFT, skipping",
+                "Opened NTFS filesystem from <Filesystem type=virtual> but could not find $MFT, skipping",
             ],
         ),
         (None, True, []),
@@ -65,38 +65,38 @@ def test_extract_path_info(
             False,
             None,
             [
-                "Failed to load NTFS filesystem from <VirtualFilesystem>, retrying without $Boot file",
-                "Opened NTFS filesystem from <VirtualFilesystem> but could not find $MFT, skipping",
+                "Failed to load NTFS filesystem from <Filesystem type=virtual>, retrying without $Boot file",
+                "Opened NTFS filesystem from <Filesystem type=virtual> but could not find $MFT, skipping",
             ],
         ),
         (
             False,
             False,
             [
-                "Failed to load NTFS filesystem from <VirtualFilesystem>, retrying without $Boot file",
-                "Failed to load NTFS filesystem from <VirtualFilesystem> without $Boot file, skipping",
+                "Failed to load NTFS filesystem from <Filesystem type=virtual>, retrying without $Boot file",
+                "Failed to load NTFS filesystem from <Filesystem type=virtual> without $Boot file, skipping",
             ],
         ),
         (
             False,
             True,
             [
-                "Failed to load NTFS filesystem from <VirtualFilesystem>, retrying without $Boot file",
+                "Failed to load NTFS filesystem from <Filesystem type=virtual>, retrying without $Boot file",
             ],
         ),
         (
             True,
             None,
             [
-                "Opened NTFS filesystem from <VirtualFilesystem> but could not find $MFT, skipping",
+                "Opened NTFS filesystem from <Filesystem type=virtual> but could not find $MFT, skipping",
             ],
         ),
         (
             True,
             False,
             [
-                "Failed to load NTFS filesystem from <VirtualFilesystem>, retrying without $Boot file",
-                "Failed to load NTFS filesystem from <VirtualFilesystem> without $Boot file, skipping",
+                "Failed to load NTFS filesystem from <Filesystem type=virtual>, retrying without $Boot file",
+                "Failed to load NTFS filesystem from <Filesystem type=virtual> without $Boot file, skipping",
             ],
         ),
         (True, True, []),

{dissect_target-3.23.dev37 → dissect_target-3.23.dev39}/tests/test_container.py

@@ -120,7 +120,7 @@ def test_registration(tmp_path: Path) -> None:
                 super().__init__(fh, 20, *args, **kwargs)
 
             def __repr__(self) -> str:
-                return f"<{self.__class__.__name__} size={self.size} vs={self.vs}>"
+                return f"<Container type={self.__type__} size={self.size} vs={self.vs.__type__ if self.vs else None}>"
 
             @staticmethod
             def _detect_fh(fh: BinaryIO, original: list[BinaryIO] | BinaryIO) -> bool:

{dissect_target-3.23.dev37 → dissect_target-3.23.dev39}/tests/tools/test_info.py

@@ -37,13 +37,13 @@ def test_target_info(
                 "timezone": "Europe/Amsterdam",
                 "install_date": "2024-07-02 12:00:56+00:00",
                 "last_activity": None,
-                "mounts": [{"fs": "VirtualFilesystem", "path": "/"}],
+                "mounts": [{"fs": "virtual", "path": "/"}],
             }
 
         elif output_type == "record":
             assert (
                 stdout
-                == "<target/info hostname='ubuntu' domain=None last_activity=None install_date=2024-07-02 12:00:56+00:00 ips=[net.ipaddress('1.2.3.4')] os_family='linux' os_version='Ubuntu 22.04.4 LTS (Jammy Jellyfish)' architecture=None language=[] timezone='Europe/Amsterdam' disks=[] volumes=[] mounts=[\"{'fs': 'VirtualFilesystem', 'path': '/'}\"] children=[]>\n"  # noqa: E501
+                == "<target/info hostname='ubuntu' domain=None last_activity=None install_date=2024-07-02 12:00:56+00:00 ips=[net.ipaddress('1.2.3.4')] os_family='linux' os_version='Ubuntu 22.04.4 LTS (Jammy Jellyfish)' architecture=None language=[] timezone='Europe/Amsterdam' disks=[] volumes=[] mounts=[\"{'fs': 'virtual', 'path': '/'}\"] children=[]>\n"  # noqa: E501
             )
 
         else: