Rationalize report initialization

Author: Lazza

acquisition/abstract.py

@@ -564,6 +564,14 @@ def _write_report(self, report: Report) -> None:
             ):
                 output.write(line + "\n")
 
+    def _initialize_report(self, params: Parameters) -> Report:
+        report = Report(params, self, start_time=datetime.now())
+        report.path_details = self._gather_path_info(params.source)
+        report.hardware_info = self._gather_hardware_info()
+        # Preliminary report
+        self._write_report(report)
+        return report
+
     def _pack_and_hash(self, report: Report, format=OutputFormat.DMG) -> Report:
         if not self.temporary_image:
             return report
@@ -579,7 +587,7 @@ def _pack_and_hash(self, report: Report, format=OutputFormat.DMG) -> Report:
         report.result = self._compute_hashes(self.output_path)
         report.success = True
         report.end_time = datetime.now()
-
+        # Final report
         self._write_report(report)
 
         print("\nAcquisition completed!")

acquisition/asr.py

@@ -9,9 +9,7 @@ class AsrMethod(AcquisitionMethod):
 
     def execute(self, params: Parameters) -> Report:
         # Prepare report
-        report = Report(params, self, start_time=datetime.now())
-        report.path_details = self._gather_path_info(params.source)
-        report.hardware_info = self._gather_hardware_info()
+        report = self._initialize_report(params)
 
         temporary_image = self._create_temporary_image(report)
         if not temporary_image:

acquisition/ditto.py

@@ -17,9 +17,7 @@ def available(self) -> bool:
 
     def execute(self, params: Parameters) -> Report:
         # Prepare report
-        report = Report(params, self, start_time=datetime.now())
-        report.path_details = self._gather_path_info(params.source)
-        report.hardware_info = self._gather_hardware_info()
+        report = self._initialize_report(params)
 
         temporary_image = self._create_temporary_image(report)
         if not temporary_image:

acquisition/rsync.py

@@ -41,9 +41,7 @@ def _compute_exclusions(self, params: Parameters) -> List[Path]:
 
     def execute(self, params: Parameters) -> Report:
         # Prepare report
-        report = Report(params, self, start_time=datetime.now())
-        report.path_details = self._gather_path_info(params.source)
-        report.hardware_info = self._gather_hardware_info()
+        report = self._initialize_report(params)
 
         print("Computing exclusions...")
         exclusions = self._compute_exclusions(params)

acquisition/sysdiagnose.py

@@ -51,11 +51,7 @@ def _convert_logs(self, logarchive: Path, temporary_image: SparseInfo) -> int:
 
     def execute(self, params: Parameters) -> Report:
         # Prepare report
-        report = Report(params, self, start_time=datetime.now())
-        report.path_details = self._gather_path_info(params.source)
-        report.hardware_info = self._gather_hardware_info()
-        # Write preliminary report
-        self._write_report(report)
+        report = self._initialize_report(params)
 
         temporary_image = self._create_temporary_image(report)
         if not temporary_image: