fix: sun cmd session bug

Author: francis-du

.github/workflows/cargo_fmt.yml

@@ -14,5 +14,6 @@ jobs:
       - name: Install Rust
         run: rustup update stable && rustup default stable && rustup component add rustfmt
       - run: |
+          cargo fmt --all
           cargo fmt -- --check
           cargo clippy

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "iotdb-cli"
-version = "0.0.2"
+version = "0.0.3-alpha"
 edition = "2021"
 license = "Apache-2.0"
 readme = "README.md"

src/cmd.rs

@@ -58,33 +58,33 @@ pub fn run() {
         std::process::exit(0);
     }
 
-    // open session
-    let prompt = format!("IOTDB#({})> ", conf.endpoint.to_string());
-    let mut session = open_session(conf.clone());
-
-    // sub command
+    // No session sub command
     match sub_cmd {
         None => {
+            // open session
+            let prompt = format!("IOTDB#({})> ", conf.endpoint.to_string());
+            let mut session = open_session(conf);
+
             if let Some(sql) = sql {
                 session.sql(sql.as_str()).unwrap().show()
             } else {
                 readline(session, prompt)
             }
         }
-        Some(sub_cmd) => match sub_cmd {
-            // exec batch
-            SubCmd::File { file_path } => {
-                if let Some(file_path) = file_path {
-                    exec_batch_from_file(conf, &file_path);
+        Some(sub_cmd) => {
+            match sub_cmd {
+                // exec sql form file
+                SubCmd::File { file_path } => {
+                    if let Some(file_path) = file_path {
+                        exec_batch_from_file(conf, &file_path);
+                    }
                 }
+                SubCmd::Usage => print_usage_info(),
+                SubCmd::Update => update(),
+                SubCmd::Csv { .. } => {}
+                SubCmd::Load => {}
             }
-            SubCmd::Usage => {
-                print_usage_info();
-            }
-            SubCmd::Update => {
-                update();
-            }
-        },
+        }
     }
 }
 
@@ -100,7 +100,7 @@ fn readline(mut session: Session, prompt: String) {
         "{}\nAuthor: {}\nVersion: {} v{}\nUsage:\n{}\
         1. Print usage info: `?` or `help` \n{}\
         2. Exec system command on OS: `!ps`\n{}\
-        3. Exit: `exit` or `quit` or `Ctrl-C` or `Ctrl-D`",
+        3. Exit: `exit` or `quit` or `Ctrl-C` or `Ctrl-D`\n",
         ASCII_NAME, AUTHORS, PKG_NAME, VERSION, fore_space, fore_space, fore_space
     );
     let his_file: PathBuf = dirs::home_dir()
@@ -158,7 +158,7 @@ fn readline(mut session: Session, prompt: String) {
                         }
                     } else {
                         sql = format!("{}{}", tmp_sql, sql);
-                        println!("```sql\n{}\n```", sql);
+                        println!("```\n{}\n```", sql);
                         if let Ok(mut ds) = session.sql(sql.as_str()) {
                             ds.show()
                         }

src/opt.rs

@@ -1,7 +1,7 @@
 use crate::{ASCII_NAME, AUTHORS, PKG_NAME};
 use structopt::StructOpt;
 
-#[derive(StructOpt, Debug)]
+#[derive(Debug, Clone, StructOpt)]
 #[structopt(name = format ! ("{}\nAuthor: {}\nVersion: {}", ASCII_NAME, AUTHORS, PKG_NAME))]
 pub struct Cli {
     /// Execute single sql, eg: `iotdb "show storage group"`
@@ -44,11 +44,23 @@ pub struct Cli {
     pub sub_cmd: Option<SubCmd>,
 }
 
-#[derive(Debug, StructOpt)]
+#[derive(Debug, Clone, StructOpt)]
 pub enum SubCmd {
     /// Execute batch form sql file, eg: `iotdb file ddl.sql`
     File { file_path: Option<String> },
 
+    /// Csv util(TODO)
+    Csv {
+        #[structopt(short, long)]
+        import: Option<String>,
+
+        #[structopt(short, long)]
+        export: Option<String>,
+    },
+
+    /// Load TsFile util(TODO)
+    Load,
+
     /// Print usage info
     Usage,
 

src/sub_cmd.rs

@@ -1,3 +1,4 @@
+use crate::VERSION;
 use std::fs;
 use std::io;
 use std::io::BufRead;
@@ -40,7 +41,7 @@ pub fn sql_file_reader(file_path: &str) -> Vec<String> {
 
 #[allow(dead_code)]
 pub fn update() {
-    todo!()
+    println!("Update to {:?}", VERSION)
 }
 
 #[allow(dead_code)]