api+json: Reform JsonData into a struct

Author: KSXGitHub

src/app.rs

@@ -4,7 +4,7 @@ pub use sub::Sub;
 
 use crate::{
     args::{Args, Quantity},
-    json_data::JsonData,
+    json_data::{JsonData, UnitAndTree},
     reporter::{ErrorOnlyReporter, ErrorReport, ProgressAndErrorReporter, ProgressReport},
     runtime_error::RuntimeError,
     size::{Bytes, Size},
@@ -59,9 +59,10 @@ impl App {
             } = self.args;
             let direction = Direction::from_top_down(top_down);
 
-            let json_data = stdin()
+            let unit_and_tree = stdin()
                 .pipe(serde_json::from_reader::<_, JsonData>)
-                .map_err(RuntimeError::DeserializationFailure)?;
+                .map_err(RuntimeError::DeserializationFailure)?
+                .unit_and_tree;
 
             macro_rules! visualize {
                 ($reflection:expr, $bytes_format: expr) => {{
@@ -79,9 +80,9 @@ impl App {
                 }};
             }
 
-            let visualization = match json_data {
-                JsonData::Bytes(reflection) => visualize!(reflection, bytes_format),
-                JsonData::Blocks(reflection) => visualize!(reflection, ()),
+            let visualization = match unit_and_tree {
+                UnitAndTree::Bytes(reflection) => visualize!(reflection, bytes_format),
+                UnitAndTree::Blocks(reflection) => visualize!(reflection, ()),
             };
 
             print!("{}", visualization); // it already ends with "\n", println! isn't needed here.

src/app/sub.rs

@@ -2,7 +2,7 @@ use crate::{
     args::Fraction,
     data_tree::{DataTree, DataTreeReflection},
     fs_tree_builder::FsTreeBuilder,
-    json_data::JsonData,
+    json_data::{JsonData, UnitAndTree},
     os_string_display::OsStringDisplay,
     reporter::ParallelReporter,
     runtime_error::RuntimeError,
@@ -19,7 +19,7 @@ where
     Data: Size + Into<u64> + Serialize + Send + Sync,
     Report: ParallelReporter<Data> + Sync,
     GetData: Fn(&Metadata) -> Data + Copy + Sync,
-    DataTreeReflection<String, Data>: Into<JsonData>,
+    DataTreeReflection<String, Data>: Into<UnitAndTree>,
 {
     /// List of files and/or directories.
     pub files: Vec<PathBuf>,
@@ -48,7 +48,7 @@ where
     Data: Size + Into<u64> + Serialize + Send + Sync,
     Report: ParallelReporter<Data> + Sync,
     GetData: Fn(&Metadata) -> Data + Copy + Sync,
-    DataTreeReflection<String, Data>: Into<JsonData>,
+    DataTreeReflection<String, Data>: Into<UnitAndTree>,
 {
     /// Run the sub program.
     pub fn run(self) -> Result<(), RuntimeError> {
@@ -116,11 +116,12 @@ where
         };
 
         if json_output {
-            let json_data: JsonData = data_tree
+            let unit_and_tree: UnitAndTree = data_tree
                 .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")
                 .into();
+            let json_data = JsonData { unit_and_tree };
             return serde_json::to_writer(stdout(), &json_data)
                 .map_err(RuntimeError::SerializationFailure);
         }

src/json_data.rs

@@ -7,14 +7,23 @@ use derive_more::{From, TryInto};
 #[cfg(feature = "json")]
 use serde::{Deserialize, Serialize};
 
-/// Output of the program with `--json-output` flag as well as
-/// input of the program with `--json-input` flag.
+/// The `"unit"` field and the `"tree"` field of [`JsonData`].
 #[derive(Debug, Clone, From, TryInto)]
 #[cfg_attr(feature = "json", derive(Deserialize, Serialize))]
 #[cfg_attr(feature = "json", serde(tag = "unit", content = "tree"))]
-pub enum JsonData {
+pub enum UnitAndTree {
     /// Tree where data is [bytes](Bytes).
     Bytes(Reflection<String, Bytes>),
     /// Tree where data is [blocks](Blocks).
     Blocks(Reflection<String, Blocks>),
 }
+
+/// Output of the program with `--json-output` flag as well as
+/// input of the program with `--json-input` flag.
+#[derive(Debug, Clone)]
+#[cfg_attr(feature = "json", derive(Deserialize, Serialize))]
+pub struct JsonData {
+    /// The `"unit"` field and the `"tree"` field.
+    #[cfg_attr(feature = "json", serde(flatten))]
+    pub unit_and_tree: UnitAndTree,
+}