Added _ScanSourcePathSpec to VolumeScanner helper (#692)

log2timeline · Sep 18, 2022 · a5b4bab · a5b4bab
1 parent 244e72c
commit a5b4bab
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 5 deletions.
diff --git a/config/dpkg/changelog b/config/dpkg/changelog
@@ -1,5 +1,5 @@
-dfvfs (20220831-1) unstable; urgency=low
+dfvfs (20220917-1) unstable; urgency=low
 
   * Auto-generated
 
- -- Log2Timeline maintainers <log2timeline-maintainers@googlegroups.com>  Wed, 31 Aug 2022 21:13:48 +0200
+ -- Log2Timeline maintainers <log2timeline-maintainers@googlegroups.com>  Sat, 17 Sep 2022 18:46:00 +0200
diff --git a/dfvfs/__init__.py b/dfvfs/__init__.py
@@ -6,4 +6,4 @@
 storage media types and file formats.
 """
 
-__version__ = '20220831'
+__version__ = '20220917'
diff --git a/dfvfs/helpers/volume_scanner.py b/dfvfs/helpers/volume_scanner.py
@@ -540,8 +540,27 @@ def _ScanSource(self, source_path):
       raise errors.ScannerError(
           'No such device, file or directory: {0:s}.'.format(source_path))
 
+    source_path_spec = path_spec_factory.Factory.NewPathSpec(
+        definitions.TYPE_INDICATOR_OS, location=source_path)
+
+    return self._ScanSourcePathSpec(source_path_spec)
+
+  def _ScanSourcePathSpec(self, source_path_spec):
+    """Scans the source path specification for supported formats.
+
+    Args:
+      source_path_spec (dfvfs.PathSpec): source path specification.
+
+    Returns:
+      SourceScannerContext: source scanner context.
+
+    Raises:
+      ScannerError: if the source path does not exists, or if the source path
+          is not a file or directory, or if the format of or within the source
+          file is not supported.
+    """
     scan_context = source_scanner.SourceScannerContext()
-    scan_context.OpenSourcePath(source_path)
+    scan_context.AddScanNode(source_path_spec, None)
 
     try:
       self._source_scanner.Scan(scan_context)

diff --git a/dfvfs/resolver_helpers/resolver_helper.py b/dfvfs/resolver_helpers/resolver_helper.py
@@ -57,4 +57,7 @@ def NewFileSystem(self, resolver_context, path_spec):
     Raises:
       NotSupported: if there is no implementation to create a file system.
     """
-    raise errors.NotSupported('Missing implementation to create file system.')
+    # pylint: disable=no-member
+    raise errors.NotSupported(
+        'Missing implementation to create file system: {0:s}.'.format(
+            self.TYPE_INDICATOR))