Преглед на файлове

Some small print statements

AvariceLHubris преди 1 година
родител
ревизия
1038d21cdd
променени са 3 файла, в които са добавени 12 реда и са изтрити 9 реда
  1. 0 5
      src/hufftree/canonical.rs
  2. 12 0
      src/main.rs
  3. 0 4
      src/storage.rs

+ 0 - 5
src/hufftree/canonical.rs

@@ -210,11 +210,6 @@ impl CanonicalHufftree {
             }
         }
 
-        println!("Decoded text: {}", decoded_text);
-        println!("Buff: {:?}", buffer);
-
-        println!("\nSelf:\n{:?}\n\n", self.characters_and_codes);
-
         if !buffer.is_empty() {
             Err("Text was not decoded properly (trailing bits).")
         } else {

+ 12 - 0
src/main.rs

@@ -18,22 +18,34 @@ fn main() -> Result<(), std::io::Error> {
 
     match mode {
         cli::Mode::Extract => {
+            println!("Reading file...");
             let inputf = std::fs::read(inputf)?;
+            println!("Done.");
+            println!("Decoding text...");
             let decoded_text = huffman::storage::read_tree_and_text(&mut &inputf[..]);
+            println!("Decoded!");
 
+
+            println!("Storing...");
             outputf.write_all(decoded_text.as_bytes()).unwrap();
+            println!("Stored!");
         }
 
         cli::Mode::Compress => {
+            println!("Reading file...");
             let inputf = std::fs::read_to_string(inputf)?;
+            println!("Done.");
             let char_f = huffman::hufftree::base::get_char_frequencies(&inputf);
 
             println!("Creating Huffman Tree...");
             let base_tree = huffman::hufftree::base::Hufftree::new(char_f);
             let canonical_tree = hufftree::canonical::CanonicalHufftree::from_tree(base_tree);
+            println!("Created!");
 
+            println!("Storing...");
             storage::store_tree_and_text(canonical_tree, &mut outputf, &inputf)
                 .expect("Could not store the tree and text.");
+            println!("Stored!");
         }
     }
 

+ 0 - 4
src/storage.rs

@@ -133,8 +133,6 @@ pub fn read_tree_and_text<F: Read>(reader: &mut F) -> String {
     // println!("Bit vec: {:?}", rest_of_encoded_text);
     encoded_text.append(&mut rest_of_encoded_text);
     encoded_text.split_off(length_of_file_in_bits as usize);
-    println!("Encoded text: {:?}\n", encoded_text);
-    println!("Working vec: {:?}", working_vec);
 
     let can_tree = CanonicalHufftree::from_vec(working_vec);
     can_tree.decode_text(encoded_text).unwrap()
@@ -238,12 +236,10 @@ mod test {
         let mut virtual_buffer = Vec::new();
         store_tree_and_text(canonical, &mut virtual_buffer, &input_text).unwrap();
 
-        println!("Virtual buffer: {:?}", virtual_buffer);
 
         let decoded_text = read_tree_and_text(&mut &virtual_buffer[0..virtual_buffer.len()]);
 
         assert_eq!(decoded_text, input_text);
-        println!("Decoded text: {}\nInput text:{}", decoded_text, input_text);
     }
 
     #[test]