From 008f50efd7db71bb63c4545008de63fb6bcf1d0c Mon Sep 17 00:00:00 2001 From: Lucien Greathouse Date: Fri, 24 Aug 2018 23:46:04 -0700 Subject: [PATCH] Add Debug, remove prints --- server/src/session.rs | 2 -- server/src/vfs.rs | 15 ++++----------- 2 files changed, 4 insertions(+), 13 deletions(-) diff --git a/server/src/session.rs b/server/src/session.rs index 483162be..b1e9c7c8 100644 --- a/server/src/session.rs +++ b/server/src/session.rs @@ -87,8 +87,6 @@ impl Session { loop { match watch_rx.recv() { Ok(event) => { - println!("Event: {:?}", event); - match event { DebouncedEvent::Create(path) | DebouncedEvent::Write(path) => { let mut vfs = vfs.lock().unwrap(); diff --git a/server/src/vfs.rs b/server/src/vfs.rs index 70e02c04..7ac6e0f4 100644 --- a/server/src/vfs.rs +++ b/server/src/vfs.rs @@ -5,6 +5,7 @@ use std::{ io, }; +#[derive(Debug)] pub struct Vfs { contents: HashMap>, items: HashMap, @@ -79,26 +80,18 @@ impl Vfs { } } +#[derive(Debug)] pub struct VfsFile { path: PathBuf, } -impl VfsFile { - pub fn read_contents<'file, 'vfs>(&'file self, vfs: &'vfs mut Vfs) -> io::Result<&'vfs [u8]> { - if !vfs.contents.contains_key(&self.path) { - let contents = fs::read(&self.path)?; - vfs.contents.insert(self.path.clone(), contents); - } - - Ok(vfs.contents.get(&self.path).unwrap()) - } -} - +#[derive(Debug)] pub struct VfsDirectory { path: PathBuf, children: HashSet, } +#[derive(Debug)] pub enum VfsItem { File(VfsFile), Directory(VfsDirectory),