flow.record 3.21.dev7__tar.gz → 3.21.dev9__tar.gz

{flow_record-3.21.dev7 → flow_record-3.21.dev9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.21.dev7
+Version: 3.21.dev9
 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: Affero General Public License v3

{flow_record-3.21.dev7 → flow_record-3.21.dev9}/flow/record/jsonpacker.py

@@ -97,7 +97,8 @@ class JsonRecordPacker:
                 del obj["_type"]
                 for field_type, field_name in record_descriptor.get_field_tuples():
                     if field_type == "bytes":
-                        obj[field_name] = base64.b64decode(obj[field_name])
+                        value = obj[field_name]
+                        obj[field_name] = base64.b64decode(value) if value is not None else None
                 return record_descriptor.recordType(**obj)
             if _type == "recorddescriptor":
                 data = obj["_data"]

{flow_record-3.21.dev7 → flow_record-3.21.dev9}/flow/record/tools/rdump.py

@@ -330,6 +330,7 @@ def main(argv: list[str] | None = None) -> int:
                 record_writer.__exit__()
             except Exception as e:
                 print_error(e)
+                ret = 1
 
     if (args.list or args.stats) and not args.progress:
         print(f"Processed {count} records", file=sys.stdout if args.list else sys.stderr)

flow_record-3.21.dev9/flow/record/version.py

@@ -0,0 +1,34 @@
+# file generated by setuptools-scm
+# don't change, don't track in version control
+
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
+
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from typing import Tuple
+    from typing import Union
+
+    VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
+else:
+    VERSION_TUPLE = object
+    COMMIT_ID = object
+
+version: str
+__version__: str
+__version_tuple__: VERSION_TUPLE
+version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
+
+__version__ = version = '3.21.dev9'
+__version_tuple__ = version_tuple = (3, 21, 'dev9')
+
+__commit_id__ = commit_id = 'ge2333a654'

{flow_record-3.21.dev7 → flow_record-3.21.dev9}/flow.record.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flow.record
-Version: 3.21.dev7
+Version: 3.21.dev9
 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: Affero General Public License v3

{flow_record-3.21.dev7 → flow_record-3.21.dev9}/tests/adapter/test_sqlite_duckdb.py

@@ -169,11 +169,12 @@ def test_read_from_sqlite(tmp_path: Path, db: Database) -> None:
             """
         )
         for i in range(1, 30):
+            dt_isoformat = datetime(2023, 10, i, 13, 37, tzinfo=timezone.utc).isoformat()
             con.execute(
                 """
                 INSERT INTO 'test/record' VALUES (?, ?, ?, ?)
                 """,
-                (f"record{i}", f"foobar{i}".encode(), datetime(2023, 10, i, 13, 37, tzinfo=timezone.utc), 3.14 + i),
+                (f"record{i}", f"foobar{i}".encode(), dt_isoformat, 3.14 + i),
             )
 
     # Read the SQLite database using flow.record

{flow_record-3.21.dev7 → flow_record-3.21.dev9}/tests/packer/test_json_packer.py

@@ -112,3 +112,29 @@ def test_record_pack_surrogateescape() -> None:
 
     # pack the json string back to a record and make sure it is the same as before
     assert packer.unpack(data) == record
+
+
+def test_json_packer_bytes_type() -> None:
+    TestRecord = RecordDescriptor(
+        "test/bytes",
+        [
+            ("bytes", "data"),
+        ],
+    )
+
+    packer = JsonRecordPacker()
+
+    record = TestRecord(b"hello world")
+    data = packer.pack(record)
+    assert data.startswith('{"data": "aGVsbG8gd29ybGQ="')
+    assert packer.unpack(data) == record
+
+    record = TestRecord(data=None)
+    data = packer.pack(record)
+    assert data.startswith('{"data": null')
+    assert packer.unpack(data) == record
+
+    record = TestRecord(data=b"")
+    data = packer.pack(record)
+    assert data.startswith('{"data": ""')
+    assert packer.unpack(data) == record

flow_record-3.21.dev7/flow/record/version.py

@@ -1,21 +0,0 @@
-# file generated by setuptools-scm
-# don't change, don't track in version control
-
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
-
-TYPE_CHECKING = False
-if TYPE_CHECKING:
-    from typing import Tuple
-    from typing import Union
-
-    VERSION_TUPLE = Tuple[Union[int, str], ...]
-else:
-    VERSION_TUPLE = object
-
-version: str
-__version__: str
-__version_tuple__: VERSION_TUPLE
-version_tuple: VERSION_TUPLE
-
-__version__ = version = '3.21.dev7'
-__version_tuple__ = version_tuple = (3, 21, 'dev7')