Refactor print_mode code

Author: nvinson

meson.build

@@ -57,13 +57,19 @@ lib_refivar = static_library(
       lib_refivar_efi_guids_list_path_rs
     ],
     {
+      'print_mode': [
+        'src/lib/efivar/print_mode/decimal.rs',
+        'src/lib/efivar/print_mode/mod.rs',
+        'src/lib/efivar/print_mode/verbose.rs',
+      ],
       'types': [
         'src/lib/efivar/types/efi_guid_error.rs',
         'src/lib/efivar/types/efi_guid_list_entry.rs',
         'src/lib/efivar/types/efi_guid.rs',
         'src/lib/efivar/types/efi_variable_attribute.rs',
         'src/lib/efivar/types/efi_variable.rs',
-        'src/lib/efivar/types/mod.rs'
+        'src/lib/efivar/types/mod.rs',
+        'src/lib/efivar/types/print_mode.rs',
       ],
     }
   ),

src/lib/efivar/efi_guids.rs

@@ -1,11 +1,11 @@
+use crate::efi_guids_list_path;
 use crate::types::EfiGuid;
 use crate::types::EfiGuidListEntry;
 use serde::Deserialize;
 use std::collections::HashMap;
 use std::fs::File;
 use std::io::{BufReader, Error};
 use std::str::FromStr;
-use crate::efi_guids_list_path;
 
 pub const DEFAULT_GUIDS_LIST_PATH: &'static str = efi_guids_list_path::VALUE;
 
@@ -28,7 +28,7 @@ struct JsonEfiGuidListEntry {
 
 impl Default for EfiGuidList {
     fn default() -> Self {
-        EfiGuidList { guids_map: None }
+        return EfiGuidList { guids_map: None };
     }
 }
 

src/lib/efivar/mod.rs

@@ -1,5 +1,6 @@
 pub mod efi_guids;
 pub mod efivar_display;
+pub mod print_mode;
 pub mod types;
 
 mod efi_guids_list_path;

src/lib/efivar/print_mode/decimal.rs

@@ -0,0 +1,20 @@
+use crate::types::EfiVariable;
+use std::fmt;
+
+pub struct Decimal<'a>(pub &'a EfiVariable<'a>);
+
+impl fmt::Display for Decimal<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        for (i, b) in self.0.data.iter().enumerate() {
+            if (i > 0) && (i % 16 == 0) {
+                f.write_str("  ")?;
+            }
+            if i % 16 < 8 {
+                f.write_str(&format!("{} ", b))?;
+            } else {
+                f.write_str(&format!(" {}", b))?;
+            }
+        }
+        return Ok(());
+    }
+}

src/lib/efivar/print_mode/mod.rs

@@ -0,0 +1,5 @@
+mod decimal;
+mod verbose;
+
+pub use self::decimal::Decimal;
+pub use self::verbose::Verbose;

src/lib/efivar/print_mode/verbose.rs

@@ -0,0 +1,49 @@
+use crate::types::{EfiVariable, EfiVariableAttribute};
+use std::fmt;
+
+pub struct Verbose<'a>(pub &'a EfiVariable<'a>);
+
+impl fmt::Display for Verbose<'_> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.write_str(&format!("GUID: {}\n", self.0.guid))?;
+        f.write_str(&format!("Name: \"{}\"\n", self.0.name))?;
+        f.write_str("Attributes:\n")?;
+        let mut sorted_attrs: Vec<&EfiVariableAttribute> =
+            self.0.attributes.clone().into_iter().collect();
+        sorted_attrs.sort_unstable_by(|a1, a2| <u32>::from(*a1).cmp(&<u32>::from(*a2)));
+        for a in sorted_attrs.iter() {
+            f.write_str(&format!("\t{}\n", String::from(*a)))?;
+        }
+
+        f.write_str("Value:\n")?;
+        for i in (0..self.0.data.len()).step_by(16) {
+            f.write_str(&format!("{:08x}  ", i))?;
+
+            let mut decode: [u8; 16] = [0; 16];
+            let mut line_iter = self.0.data.iter().skip(i);
+            for j in i..i + 16 {
+                match line_iter.next() {
+                    Some(c) => {
+                        if (0x20 < *c) && (*c < 0x7e) {
+                            decode[j - i] = u32::from(*c) as u8;
+                        } else {
+                            decode[j - i] = u32::from('.') as u8;
+                        }
+                        if j < i + 8 {
+                            f.write_str(&format!("{:02x} ", u8::from(*c)))?;
+                        } else {
+                            f.write_str(&format!(" {:02x}", u8::from(*c)))?;
+                        }
+                    }
+                    None => {
+                        decode[j - i] = u32::from(' ') as u8;
+                        f.write_str("   ")?;
+                    }
+                };
+            }
+            f.write_str(&format!("  |{}|\n", std::str::from_utf8(&decode).unwrap()))?;
+        }
+        f.write_str(&format!("{:08x}\n", self.0.data.len()))?;
+        return Ok(());
+    }
+}

src/lib/efivar/types/mod.rs

@@ -3,9 +3,11 @@ mod efi_guid_error;
 mod efi_guid_list_entry;
 mod efi_variable;
 mod efi_variable_attribute;
+mod print_mode;
 
 pub use self::efi_guid::EfiGuid;
 pub use self::efi_guid_error::EfiGuidError;
 pub use self::efi_guid_list_entry::EfiGuidListEntry;
 pub use self::efi_variable::EfiVariable;
 pub use self::efi_variable_attribute::EfiVariableAttribute;
+pub use self::print_mode::PrintMode;

src/lib/efivar/types/print_mode.rs

@@ -0,0 +1,4 @@
+pub enum PrintMode {
+    VERBOSE,
+    DECIMAL,
+}