Refactor

Author: ryuichiueda

src/elements/job.rs

@@ -146,6 +146,34 @@ impl Job {
         }
     }
 
+    pub fn pretty_print(&mut self, indent_num: usize,semicolon: &mut bool, printed: &mut bool, job_end: &str) {
+        let tmp = self.text.clone();
+        let job_text = tmp.trim_ascii();
+
+        if job_text.is_empty() {
+            *semicolon = *printed;
+            return;
+        }
+
+        if *semicolon {
+            println!(";");
+            *semicolon = false;
+        } else if *printed {
+            println!();
+        }
+
+        let tmp = job_end.to_string();
+        let job_end = tmp.trim_ascii_end();
+
+        let text = job_text.to_owned() + job_end;
+
+        for _ in 0..indent_num {
+            print!("    ");
+        }
+        print!("{}", &text);
+        *printed = true;
+    }
+
     pub fn get_one_line_text(&self) -> String {
         let mut ans = String::new();
         for (i, p) in self.pipelines.iter().enumerate() {

src/elements/script.rs

@@ -36,8 +36,11 @@ impl Script {
         let mut semicolon = false;
         let mut printed = false;
         for (i, job) in self.jobs.iter_mut().enumerate() {
+            job.pretty_print(indent_num, &mut semicolon, &mut printed, &self.job_ends[i]);
+            /*
+
             let tmp = job.text.clone();
-            let job_text = tmp.trim_ascii_end();
+            let job_text = tmp.trim_ascii();
 
             if job_text.is_empty() {
                 semicolon = printed;
@@ -61,16 +64,12 @@ impl Script {
             }
             print!("{}", &text);
             printed = true;
+            */
         }
         println!();
     }
 
     pub fn get_one_line_text(&self) -> String {
-        /*
-        pub jobs: Vec<Job>,
-        pub job_ends: Vec<String>,
-            */
-        //self.text.replace("\n", "")
         let mut ans = String::new();
         for (i, j) in self.jobs.iter().enumerate() {
             ans += &j.get_one_line_text();