add clear

fs-fat-fuse/src/main.rs

@@ -91,12 +91,11 @@ fn easy_fs_pack() -> std::io::Result<()> {
         let mut all_data: Vec<u8> = Vec::new();
         host_file.read_to_end(&mut all_data).unwrap();
         // create a file in easy-fs
-        // todo
         let inode = root_inode.create(app.as_str(), ATTRIBUTE_ARCHIVE);
         // write data to easy-fs
         match inode {
             Some(i) => {i.write_at(0, all_data.as_slice());},
-            None => {},
+            None => {println!("Not create app.")},
         }
 
     }
@@ -107,6 +106,13 @@ fn easy_fs_pack() -> std::io::Result<()> {
     let hello_app = root_inode.find("hello").unwrap();
     hello_app.read_at(0, &mut cache);
     println!("hello app data {:?}", cache);  
+    hello_app.clear();
+    println!("clear hello app");
+    let hello_clear = root_inode.find("hello");
+     match hello_clear {
+            Some(_) => {},
+            None => {println!("can not found hello..")},
+        }
     Ok(())
 }
 

fs-fat/src/vfs.rs

@@ -415,6 +415,22 @@ impl Inode {
 
     }
 
+     pub fn clear(&self){
+        let first_cluster:u32 = self.first_cluster();
+        if self.is_dir() || first_cluster == 0 {
+            return;
+        }
+        self.modify_dir_entry(|short_ent:&mut ShortDirEntry|{
+            short_ent.clear();
+        });
+        let fs = self.fs.lock();
+        let all_clusters = fs
+            .get_fat()
+            .get_all_cluster_of(first_cluster, self.block_device.clone());
+        fs.dealloc_cluster(all_clusters);
+    }
+
+
     // pub fn read_at(&self, offset: usize, buf: &mut [u8]) -> usize {
     //     let _fs = self.fs.lock();
     //     self.read_disk_inode(|disk_inode| {

os/Cargo.toml

@@ -20,4 +20,4 @@ k210-soc = { git = "https://github.com/buguOS/k210-soc" }
 libm = "0.1"
 infrared = "0.13.0"
 nom = { version = "5", default-features = false, features = [] }
-fs-demo = { path = "../fs-demo" }
+fs-fat = { path = "../fs-fat" }

os/src/driver/block/mod.rs

@@ -2,7 +2,7 @@ mod sdcard;
 
 use lazy_static::*;
 use alloc::sync::Arc;
-use fs_demo::BlockDevice;
+use fs_fat::BlockDevice;
 
 type BlockDeviceImpl = sdcard::SDCardWrapper;
 

os/src/fs/inode.rs

@@ -1,5 +1,6 @@
-use fs_demo::{
-    EasyFileSystem,
+use fs_fat::{
+    ATTRIBUTE_ARCHIVE,
+    FatFileSystem,
     Inode,
 };
 use crate::driver::BLOCK_DEVICE;
@@ -55,15 +56,15 @@ impl OSInode {
 
 lazy_static! {
     pub static ref ROOT_INODE: Arc<Inode> = {
-        let efs = EasyFileSystem::open(BLOCK_DEVICE.clone());
-        Arc::new(EasyFileSystem::root_inode(&efs))
+        let efs = FatFileSystem::open(BLOCK_DEVICE.clone());
+        Arc::new(FatFileSystem::root_inode(&efs))
     };
 }
 
 pub fn list_apps() {
     println!("/**** APPS ****");
     for app in ROOT_INODE.ls() {
-        println!("{}", app);
+        println!("{}", app.0);
     }
     println!("**************/");
 }
@@ -105,7 +106,7 @@ pub fn open_file(name: &str, flags: OpenFlags) -> Option<Arc<OSInode>> {
             )))
         } else {
             // create file
-            ROOT_INODE.create(name)
+            ROOT_INODE.create(name, ATTRIBUTE_ARCHIVE)
                 .map(|inode| {
                     Arc::new(OSInode::new(
                         readable,