fixup! first shot at pattern auto-identification

unblob/models.py

@@ -148,6 +148,27 @@ def as_report(self, entropy: Optional[EntropyReport]) -> UnknownChunkReport:
         )
 
 
+@attr.define(repr=False)
+class PaddingChunk(Chunk):
+    r"""Gaps between valid chunks or otherwise unknown chunks.
+
+    Important for manual analysis, and analytical certanity: for example
+    entropy, other chunks inside it, metadata, etc.
+
+    These are not extracted, just logged for information purposes and further analysis,
+    like most common bytes (like \x00 and \xFF), ASCII strings, high entropy, etc.
+    """
+
+    def as_report(self, entropy: Optional[EntropyReport]) -> PaddingChunkReport:
+        return PaddingChunkReport(
+            chunk_id=self.id,
+            start_offset=self.start_offset,
+            end_offset=self.end_offset,
+            size=self.size,
+            entropy=entropy,
+        )
+
+
 @attrs.define
 class MultiFile(Blob):
     name: str = attr.field(kw_only=True)
@@ -171,26 +192,6 @@ def as_report(self, extraction_reports: List[Report]) -> MultiFileReport:
 ReportType = TypeVar("ReportType", bound=Report)
 
 
-@attr.define(repr=False)
-class PaddingChunk(Chunk):
-    r"""Gaps between valid chunks or otherwise unknown chunks.
-
-    Important for manual analysis, and analytical certanity: for example
-    entropy, other chunks inside it, metadata, etc.
-
-    These are not extracted, just logged for information purposes and further analysis,
-    like most common bytes (like \x00 and \xFF), ASCII strings, high entropy, etc.
-    """
-
-    def as_report(self) -> PaddingChunkReport:
-        return PaddingChunkReport(
-            chunk_id=self.id,
-            start_offset=self.start_offset,
-            end_offset=self.end_offset,
-            size=self.size,
-        )
-
-
 @attr.define
 class TaskResult:
     task: Task

unblob/report.py

@@ -236,6 +236,16 @@ class UnknownChunkReport(Report):
     entropy: Optional[EntropyReport]
 
 
+@final
+@attr.define(kw_only=True, frozen=True)
+class PaddingChunkReport(Report):
+    chunk_id: str
+    start_offset: int
+    end_offset: int
+    size: int
+    entropy: Optional[EntropyReport]
+
+
 @final
 @attr.define(kw_only=True, frozen=True)
 class MultiFileReport(Report):
@@ -300,12 +310,3 @@ class SpecialFileExtractionProblem(ExtractionProblem):
 
     def log_with(self, logger):
         logger.warning(self.log_msg, path=self.path, mode=self.mode, device=self.device)
-
-
-@final
-@attr.define(kw_only=True)
-class PaddingChunkReport(Report):
-    chunk_id: str
-    start_offset: int
-    end_offset: int
-    size: int