fix error two

Author: zhangzijie-pro

command/src/commands/command.rs

@@ -302,25 +302,18 @@ pub fn cat(file: &str) -> Result<(usize,String),Error>{
         return Ok(empty_file());
     }
     let mut buffer = String::new();
-    let file_size = max_size_file(file);
-    match file_size{
-        Ok(_) =>{
-            let f = fs::File::open(Path::new(file)); 
-            let _ = f.unwrap().read_to_string(&mut buffer);
-        },
-        Err(err) =>{
-            return Ok((ERR_CODE,err.to_string()));
-        }
-    }
+    let f = fs::File::open(Path::new(file)); 
+    let _ = f.unwrap().read_to_string(&mut buffer);
+
     Ok((STATUE_CODE,buffer))
 }
 
 
 use crate::commands::download::{download_package, find_package};
 use crate::priority::get_priority;
-use crate::set::set::{file_create_time, max_size_file};
+use crate::set::set::file_create_time;
 use crate::run::run;
-use crate::state_code::{empty_dir, empty_file, missing_pattern, ERR_CODE, STATUE_CODE};
+use crate::state_code::{empty_dir, empty_file, missing_pattern, STATUE_CODE};
 use super::download::update;
 use crate::root::SessionContext;
 
@@ -551,7 +544,6 @@ pub fn priority_run(command:Vec<String>,session_context: &mut SessionContext){
     }
 
     save_command.sort_by_key(|c| -(get_priority(&c[0]).as_number() as i32));
-    println!("{:?}",save_command);
 
     for c in save_command{
         run(c, session_context)

command/src/priority/mod.rs

@@ -4,14 +4,16 @@ pub enum CommandPriority {
     Low,
     Medium,
     High,
+    Unknow,
 }
 
 impl CommandPriority{
     pub fn as_number(&self) -> u8 {
         match *self {
-            CommandPriority::Low => 0,
-            CommandPriority::Medium => 1,
-            CommandPriority::High => 2,
+            CommandPriority::Unknow => 0,
+            CommandPriority::Low => 1,
+            CommandPriority::Medium => 2,
+            CommandPriority::High => 3,
         }
     }
 }
@@ -28,6 +30,6 @@ pub fn get_priority(command: &str) -> CommandPriority{
         "pwd"|"ls"|"mkdir"|"touch"|"whoami"|"exit" => CommandPriority::Low,
         "cd"|"rm"|"cat"|"python"|"html"|"web"|"rn"|"mv"|"tar"|"grep"|"pd"|"root"|"apt"|"history" => CommandPriority::Medium,
         "sleep"|"kill"|"ps"=> CommandPriority::High,
-        _ => CommandPriority::Low
+        _ => CommandPriority::Unknow
     }
 }

command/src/process/process.rs

@@ -53,6 +53,16 @@ pub struct ProcessManager {
     pub processes: Vec<Process>,
 }
 
+#[allow(dropping_references)]
+impl Drop for ProcessManager{
+    fn drop(&mut self) {
+        for i in self.processes.iter_mut(){
+            drop(&i);
+            i.stop()
+        }
+    }
+}
+
 impl ProcessManager {
     pub fn new() -> Self {
         ProcessManager {

command/src/process/thread.rs

@@ -56,6 +56,16 @@ pub struct ThreadControlBlock {
 }
 
 
+#[allow(dropping_references)]
+impl Drop for ThreadControlBlock{
+    fn drop(&mut self) {
+        for i in self.threads.iter_mut(){
+            drop(&i);
+            i.stop()
+        }
+    }
+}
+
 impl ThreadControlBlock {
     pub fn new() -> ThreadControlBlock {
         ThreadControlBlock {

command/src/set/set.rs

@@ -134,47 +134,4 @@ pub fn error_log(err: String){
         return;
     }
     // error.log -> $HOME/.Tiks/error.log -> [time]: [Error]
-}
-
-
-pub const MB:f64 = 1024.0*1024.0;
-
-use std::fs::metadata;
-use std::io;
-
-fn get_file_size(file:&str) -> f64{
-    let mut size = 0;
-    if let Ok(s) = metadata(file){
-        size = s.len();
-    }
-
-    size as f64
-}
-
-type MB = f64;
-
-fn byte_to_mb(size: f64) -> MB{
-    let new_size = size/MB;
-    new_size
-}
-
-pub fn max_size_file(path: &str) -> Result<(),&'static str>{
-    let size = get_file_size(path);
-    let mb = byte_to_mb(size); // MB
-
-    if mb > 128_f64{
-        loop {
-            let mut choice = String::new();
-            println!("This file is more than 256MB, Do you want to read? [y/n]");
-            io::stdout().flush().unwrap();
-            io::stdin().read_line(&mut choice).unwrap();
-            if choice.as_str() == "y"{
-                break;
-            }else{
-                return Err("Canel read");
-            }
-        }
-    }
-
-    Ok(())
 }