p/pukram-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Connection handling not a method of context anymore

Browse Source
This commit is contained in:
p11 2023-09-16 16:34:53 +02:00
parent 337ca0149e
commit 34b8307426
1 changed files with 103 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main.rs
View File

@ -52,7 +52,7 @@ fn main() {
} }
} }
context.handle_connection(&path, stream, &pool); handle_connection(&mut context, &path, stream, &pool);
} }
} }
@ -133,8 +133,7 @@ struct Context {
infos: HashMap<Box<str>, Arc<Mutex<SiteInfo>>>, infos: HashMap<Box<str>, Arc<Mutex<SiteInfo>>>,
} }
impl Context { fn handle_connection(context: &mut Context, path: &Path, mut stream: TcpStream, pool: &ThreadPool) {
fn handle_connection(&mut self, path: &Path, mut stream: TcpStream, pool: &ThreadPool) {
let Some(request) = Request::from(&stream) else { let Some(request) = Request::from(&stream) else {
eprintln!("Invalid request!"); eprintln!("Invalid request!");
return; return;
@ -211,7 +210,7 @@ impl Context {
} }
use Entry::*; use Entry::*;
let info = match self.infos.entry(relative_path.clone().into_boxed_str()) { let info = match context.infos.entry(relative_path.clone().into_boxed_str()) {
Occupied(o) => o.get().clone(), Occupied(o) => o.get().clone(),
Vacant(v) => v Vacant(v) => v
.insert(Arc::new(Mutex::new( .insert(Arc::new(Mutex::new(
@ -238,7 +237,6 @@ impl Context {
start_level, start_level,
) )
}); });
}
} }
fn reply_image(mut stream: TcpStream, relative_path: &str, mut path: PathBuf) { fn reply_image(mut stream: TcpStream, relative_path: &str, mut path: PathBuf) {