fix: report hardlinks

Author: KSXGitHub

src/app/sub.rs

@@ -3,7 +3,7 @@ use crate::{
     data_tree::DataTree,
     fs_tree_builder::FsTreeBuilder,
     get_size::GetSize,
-    hardlink::{DeduplicateSharedSize, HardlinkIgnorant, HardlinkListReflection, RecordHardlinks},
+    hardlink::{DeduplicateSharedSize, HardlinkIgnorant, RecordHardlinks},
     json_data::{BinaryVersion, JsonData, JsonDataBody, JsonShared, JsonTree, SchemaVersion},
     os_string_display::OsStringDisplay,
     reporter::ParallelReporter,
@@ -140,13 +140,10 @@ where
                 .into_reflection() // I really want to use std::mem::transmute here but can't.
                 .par_convert_names_to_utf8() // TODO: allow non-UTF8 somehow.
                 .expect("convert all names from raw string to UTF-8");
-            let details = deduplication_record
+            let shared = deduplication_record
                 .map_err(HardlinksHandler::convert_error)?
-                .pipe(HardlinksHandler::serializable_report)?;
-            let shared = JsonShared {
-                details,
-                summary: None, // TODO
-            };
+                .pipe(HardlinksHandler::serializable_report)?
+                .unwrap_or_default();
             let json_tree = JsonTree { tree, shared };
             let json_data = JsonData {
                 schema_version: SchemaVersion,
@@ -184,9 +181,7 @@ pub trait HardlinkSubroutines<Size: size::Size>: DeduplicateSharedSize<Size> {
         bytes_format: Size::DisplayFormat,
     ) -> Result<(), RuntimeError>;
     /// Create a JSON serializable object from the report.
-    fn serializable_report(
-        report: Self::Report,
-    ) -> Result<Option<HardlinkListReflection<Size>>, RuntimeError>;
+    fn serializable_report(report: Self::Report) -> Result<Option<JsonShared<Size>>, RuntimeError>;
 }
 
 impl<Size> HardlinkSubroutines<Size> for HardlinkIgnorant
@@ -202,9 +197,7 @@ where
         Ok(())
     }
 
-    fn serializable_report(
-        (): Self::Report,
-    ) -> Result<Option<HardlinkListReflection<Size>>, RuntimeError> {
+    fn serializable_report((): Self::Report) -> Result<Option<JsonShared<Size>>, RuntimeError> {
         Ok(None)
     }
 }

src/app/sub/unix_ext.rs

@@ -1,6 +1,6 @@
 use super::HardlinkSubroutines;
 use crate::{
-    data_tree::DataTree, hardlink::HardlinkListReflection, os_string_display::OsStringDisplay,
+    data_tree::DataTree, json_data::JsonShared, os_string_display::OsStringDisplay,
     runtime_error::RuntimeError, size,
 };
 use pipe_trait::Pipe;
@@ -25,9 +25,9 @@ where
         Ok(())
     }
 
-    fn serializable_report(
-        report: Self::Report,
-    ) -> Result<Option<HardlinkListReflection<Size>>, RuntimeError> {
-        report.into_reflection().pipe(Some).pipe(Ok)
+    fn serializable_report(report: Self::Report) -> Result<Option<JsonShared<Size>>, RuntimeError> {
+        let summary = report.summarize().pipe(Some);
+        let details = report.into_reflection().pipe(Some);
+        Ok(Some(JsonShared { details, summary }))
     }
 }