diff --git a/src/api.rs b/src/api.rs index 00d2cb6..fa61625 100644 --- a/src/api.rs +++ b/src/api.rs @@ -4,7 +4,6 @@ use std::io; use std::path::*; use std::ops::Deref; use std::sync::Arc; -use std::sync::Mutex; use iron::prelude::*; use iron::headers::CookiePair; @@ -46,14 +45,13 @@ impl From for IronError { } } -pub fn get_api_handler(collection: Arc>) -> Mount { +pub fn get_api_handler(collection: Arc) -> Mount { let mut api_handler = Mount::new(); { let collection = collection.clone(); api_handler.mount("/auth/", move |request: &mut Request| { - let acquired_collection = collection.deref().lock().unwrap(); - self::auth(request, acquired_collection.deref()) + self::auth(request, collection.deref()) }); } @@ -62,22 +60,19 @@ pub fn get_api_handler(collection: Arc>) -> Mount { { let collection = collection.clone(); auth_api_mount.mount("/browse/", move |request: &mut Request| { - let acquired_collection = collection.deref().lock().unwrap(); - self::browse(request, acquired_collection.deref()) + self::browse(request, collection.deref()) }); } { let collection = collection.clone(); auth_api_mount.mount("/flatten/", move |request: &mut Request| { - let acquired_collection = collection.deref().lock().unwrap(); - self::flatten(request, acquired_collection.deref()) + self::flatten(request, collection.deref()) }); } { let collection = collection.clone(); auth_api_mount.mount("/serve/", move |request: &mut Request| { - let acquired_collection = collection.deref().lock().unwrap(); - self::serve(request, acquired_collection.deref()) + self::serve(request, collection.deref()) }); } diff --git a/src/main.rs b/src/main.rs index 8e466da..ab3e70d 100644 --- a/src/main.rs +++ b/src/main.rs @@ -30,7 +30,6 @@ use mount::Mount; use staticfile::Static; use std::path; use std::sync::Arc; -use std::sync::Mutex; mod api; mod collection; @@ -69,7 +68,7 @@ fn main() { { let mut collection = collection::Collection::new(); collection.load_config(&config).unwrap(); - let collection = Arc::new(Mutex::new(collection)); + let collection = Arc::new(collection); api_handler = api::get_api_handler(collection); } api_chain = Chain::new(api_handler);