Merge pull request #57 from ArcanaFramework/extra-testing

added binary testing formats

Author: tclose

fileformats/core/fileset.py

@@ -137,17 +137,14 @@ def _validate_properties(self):
             getattr(self, check)()
 
     def __eq__(self, other) -> bool:
-        return (
-            isinstance(other, FileSet)
-            and self.mime_like == other.mime_like
-            and self.fspaths == other.fspaths
-        )
+        return type(self) is type(other) and self.fspaths == other.fspaths
 
     def __ne__(self, other) -> bool:
         return not self.__eq__(other)
 
     def __hash__(self) -> int:
-        return hash((self.mime_like, self.fspaths))
+        tp = type(self)
+        return hash((tp.__module__, tp.__name__, self.fspaths))
 
     def __repr__(self) -> str:
         return f"{self.type_name}('" + "', '".join(str(p) for p in self.fspaths) + "')"

fileformats/testing/__init__.py

@@ -8,6 +8,10 @@
     MyFormatGz,
     MyFormatGzX,
     MyFormatX,
+    MyBinaryFormat,
+    MyHeader,
+    MyBinaryFormatX,
+    MyOtherBinaryFormatX,
     YourFormat,
     SeparateHeader,
     ImageWithHeader,

fileformats/testing/headers.py

@@ -1,6 +1,6 @@
 from fileformats.generic import File
 from fileformats.application import Json
-from fileformats.core.mixin import WithSideCars, WithSeparateHeader
+from fileformats.core.mixin import WithSideCars, WithSeparateHeader, WithMagicNumber
 
 
 class YFile(File):
@@ -36,6 +36,25 @@ class MyFormatX(WithSideCars, MyFormat):
     side_car_types = (Json,)
 
 
+class MyBinaryFormat(WithMagicNumber, File):
+    ext = ".my"
+    magic_number = b"MYFORMAT"
+
+
+class MyHeader(File):
+    ext = ".myhdr"
+
+
+class MyBinaryFormatX(WithSeparateHeader, MyFormat):
+    header_type = MyHeader
+
+
+class MyOtherBinaryFormatX(WithMagicNumber, WithSeparateHeader, File):
+    magic_number = b"MYFORMAT"
+    ext = ".my"
+    header_type = MyHeader
+
+
 class YourFormat(File):
 
     ext = ".yr"