flow.record 3.22.dev1__tar.gz → 3.22.dev2__tar.gz

{flow_record-3.22.dev1 → flow_record-3.22.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.22.dev1
+Version: 3.22.dev2
 Summary: A library for defining and creating structured data (called records) that can be streamed to disk or piped to other tools that use flow.record
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{flow_record-3.22.dev1 → flow_record-3.22.dev2}/flow/record/fieldtypes/__init__.py

@@ -28,6 +28,7 @@ except ImportError:
 from flow.record.base import FieldType, Record
 
 RE_NORMALIZE_PATH = re.compile(r"[\\/]+")
+RE_WINDOWS_PATH = re.compile(r"^[a-zA-Z]:[\\/]")
 
 UTC = timezone.utc
 
@@ -602,6 +603,10 @@ def _is_posixlike_path(path: Any) -> bool:
     if isinstance(path, pathlib.PurePath):
         obj = getattr(path, "parser", None) or path._flavour
         return "\\" not in (obj.sep, obj.altsep)
+    if isinstance(path, str):
+        if RE_WINDOWS_PATH.match(path):
+            return False
+        return "/" in path and "\\" not in path
     return False
 
 
@@ -609,6 +614,10 @@ def _is_windowslike_path(path: Any) -> bool:
     if isinstance(path, pathlib.PurePath):
         obj = getattr(path, "parser", None) or path._flavour
         return "\\" in (obj.sep, obj.altsep)
+    if isinstance(path, str):
+        if RE_WINDOWS_PATH.match(path):
+            return True
+        return "\\" in path
     return False
 
 

{flow_record-3.22.dev1 → flow_record-3.22.dev2}/flow/record/version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '3.22.dev1'
-__version_tuple__ = version_tuple = (3, 22, 'dev1')
+__version__ = version = '3.22.dev2'
+__version_tuple__ = version_tuple = (3, 22, 'dev2')
 
-__commit_id__ = commit_id = 'gf3a1c5fa4'
+__commit_id__ = commit_id = 'gcd69cf171'

{flow_record-3.22.dev1 → flow_record-3.22.dev2}/flow.record.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.22.dev1
+Version: 3.22.dev2
 Summary: A library for defining and creating structured data (called records) that can be streamed to disk or piped to other tools that use flow.record
 Author-email: Dissect Team <dissect@fox-it.com>
 License-Expression: AGPL-3.0-or-later

{flow_record-3.22.dev1 → flow_record-3.22.dev2}/tests/fieldtypes/test_fieldtypes.py

@@ -578,7 +578,10 @@ def custom_pure_path(sep: str, altsep: str) -> pathlib.PurePath:
         (custom_pure_path(sep="/", altsep="")("/foo/bar"), True),
         (custom_pure_path(sep="\\", altsep="/")(r"C:\foo\bar"), False),
         (custom_pure_path(sep=":", altsep="\\")(r"C:\foo\bar"), False),
-        ("/foo/bar", False),
+        ("/foo/bar", True),
+        (r"C:\foo\bar", False),
+        (r"C:/foo/bar", False),
+        (r"\??\C:\Windows\System32\calc.exe", False),
     ],
 )
 def test__is_posixlike_path(path_: pathlib.PurePath | str, is_posix: bool) -> None:
@@ -594,6 +597,9 @@ def test__is_posixlike_path(path_: pathlib.PurePath | str, is_posix: bool) -> No
         (custom_pure_path(sep="\\", altsep="/")(r"C:\foo\bar"), True),
         (custom_pure_path(sep=":", altsep="\\")(r"C:\foo\bar"), True),
         ("/foo/bar", False),
+        (r"C:\foo\bar", True),
+        (r"C:/foo/bar", True),
+        (r"\??\C:\Windows\System32\calc.exe", True),
     ],
 )
 def test__is_windowslike_path(path_: pathlib.PurePath, is_windows: bool) -> None:
@@ -677,7 +683,7 @@ def test_path() -> None:
         ),
         (
             ("/some/path", pathlib.PureWindowsPath("win/path"), pathlib.PurePosixPath("pos/path")),
-            flow.record.fieldtypes.windows_path,
+            flow.record.fieldtypes.posix_path,
         ),
         (
             (pathlib.PurePosixPath("pos/path"), pathlib.PureWindowsPath("win/path")),