fix get version

Author: zhangzijie-pro

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "command"
-version = "1.0.2"
+version = "1.0.3"
 edition = "2021" 
 authors = ["Zhangzijie <[email protected]>"]
 repository = "https://github.com/zhangzijie-pro/Tiks.git"

command/Cargo.toml

@@ -64,8 +64,8 @@ async fn download(link: &str, filename: &str) -> Result<(),Box<dyn std::error::E
 
 // apt update new
 
-const _GITHUB_RELEASE_LINUX: &str = "https://github.com/zhangzijie-pro/Tiks/releases/download/1.0.1/tiks";
-const _GITHUB_RELEASE_WINDOW: &str = "https://github.com/zhangzijie-pro/Tiks/releases/download/1.0.1/tiks.exe";
+const _GITHUB_RELEASE_LINUX: &str = "https://github.com/zhangzijie-pro/Tiks/releases/download/1.0.3/tiks";
+const _GITHUB_RELEASE_WINDOW: &str = "https://github.com/zhangzijie-pro/Tiks/releases/download/1.0.3/tiks.exe";
 
 // upload soon
 #[allow(unused_must_use)]

command/src/commands/download.rs renamed to command/src/commands/apt.rs

@@ -1,5 +1,6 @@
 use crate::set::set::get_similar;
 use crate::root::{decryption, SessionContext};
+use crate::set::version;
 use crate::state_code::{missing_pattern, not_found};
 
 use super::code::*;
@@ -83,7 +84,17 @@ pub fn command_match(commands: Commands,session_context: &mut SessionContext) ->
 #[allow(unused_assignments)]
 pub fn execute_command(command: &str, option: &str, arg: &Vec<String>, session_context: &mut SessionContext) -> Result<(usize,String), std::io::Error> {
     match command {
-        "version" => Ok((0,"Tiks-version: 1.0.2".to_string())),
+        "version" => match option{
+            "-n"|"now" => {
+                version::get_version_now()
+            },
+            "-l"|"-list" => {
+                version::get_version_list()
+            },
+            _ =>{
+                Ok((0,"help:\n  -n|now: Get version now\n  -l|list: Get all version".to_string()))
+            }
+        },
         "sudo" => match arg.is_empty(){
             true => {
                 let output = sudo(session_context);

command/src/commands/arg.rs

@@ -310,12 +310,12 @@ pub fn cat(file: &str) -> Result<(usize,String),Error>{
 }
 
 
-use crate::commands::download::{download_package, find_package};
+use crate::commands::apt::{download_package, find_package};
 use crate::priority::get_priority;
 use crate::set::set::file_create_time;
 use crate::run::run;
 use crate::state_code::{empty_dir, empty_file, env, missing_pattern, STATUE_CODE};
-use super::download::{update, update_last};
+use super::apt::{update, update_last};
 use crate::root::SessionContext;
 
 
@@ -600,9 +600,9 @@ pub fn echo_print<T: std::fmt::Display + From<String>>(output: T) -> (usize,T){
     let var = format!("{}", output);
     if var.contains("$") {
         let val = get_env(var);
-        return (0, val.into());
+        return (STATUE_CODE, val.into());
     }else{
-        (0, output)
+        (STATUE_CODE, output)
     }
 }
 
@@ -623,9 +623,4 @@ pub fn test_c(){
     unsafe{
         hello()
     }
-}
-/*
-    fn vim(){
-        
-    }
-*/
+}

command/src/commands/command.rs

@@ -1,4 +1,4 @@
 pub mod arg;
 mod code;
-pub mod download;
+pub mod apt;
 pub mod command;

command/src/commands/mod.rs

@@ -1 +1,21 @@
-pub mod set;
+pub mod set;
+
+
+pub mod version{
+    use std::io::{self, Read};
+
+    use crate::state_code::STATUE_CODE;
+
+    pub fn get_version_list() -> io::Result<(usize,String)>{
+        let mut s = String::new();
+        let mut res = std::fs::File::open("command/test/version").unwrap();
+        let _ = res.read_to_string(&mut s);
+
+        Ok((STATUE_CODE,s))
+    }
+
+    pub fn get_version_now() -> io::Result<(usize,String)>{
+        let s = env!("CARGO_PKG_VERSION").parse::<String>().unwrap();
+        Ok((STATUE_CODE,s))
+    }
+}

command/src/set/mod.rs

@@ -0,0 +1,4 @@
+1.0.0
+1.0.1
+1.0.2
+1.0.3