Skip to content

Commit

Permalink
refactor: defer initial scan (#26)
Browse files Browse the repository at this point in the history
  • Loading branch information
@henry40408
henry40408 authored Nov 18, 2023
1 parent 3e196b0 commit c59bac2
Show file tree
Hide file tree
Showing 4 changed files with 143 additions and 99 deletions.
2 changes: 1 addition & 1 deletion Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "comics"
version = "2.0.0"
version = "2.2.0"
edition = "2021"
authors = ["henry40408 <[email protected]>"]
description = "Simple file server for comic books"
Expand Down
225 changes: 129 additions & 96 deletions src/lib.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,13 @@
rust_2018_idioms
)]
use askama::Template;
use axum::extract::Path;
use axum::Json;
use axum::{
extract::State,
extract::{Path, State},
http::{header, Request},
middleware::{self, Next},
response::{Html, IntoResponse, Redirect},
routing::{get, post},
Router,
Json, Router,
};
use base64::{engine::GeneralPurpose, Engine};
use chrono::{Duration, Utc};
Expand All @@ -97,6 +95,7 @@ use std::{
net::SocketAddr,
path::{self, PathBuf},
sync::{Arc, Mutex},
thread,
};
use thiserror::Error;
use tower_http::trace::{self, TraceLayer};
Expand Down Expand Up @@ -303,7 +302,6 @@ pub fn scan_books<P: AsRef<path::Path>>(path: P) -> MyResult<BookScan> {
}
let scan = BookScan {
books,
data_dir: path.as_ref().to_path_buf(),
pages_map,
scan_duration: Utc::now().signed_duration_since(scanned_at),
scanned_at,
Expand All @@ -313,13 +311,13 @@ pub fn scan_books<P: AsRef<path::Path>>(path: P) -> MyResult<BookScan> {

#[derive(Clone)]
struct AppState {
scan: Arc<Mutex<BookScan>>,
data_dir: OsString,
scan: Arc<Mutex<Option<BookScan>>>,
}

#[derive(Clone)]
#[derive(Clone, Debug)]
pub struct BookScan {
pub books: Vec<Book>,
pub data_dir: PathBuf,
pub pages_map: HashMap<String, Page>,
pub scan_duration: Duration,
pub scanned_at: chrono::DateTime<Utc>,
Expand Down Expand Up @@ -432,24 +430,27 @@ async fn index_route(State(state): State<AppState>) -> impl IntoResponse {
e
})
.ok()
.map(|scan| IndexTemplate {
books: scan.books.clone(),
books_count: scan.books.len(),
scan_duration: scan.scan_duration.num_milliseconds() as f64,
scanned_at: scan.scanned_at.to_rfc2822(),
version: VERSION.to_string(),
})
.map_or(
(StatusCode::INTERNAL_SERVER_ERROR, Html(String::new())),
|t| {
t.render()
.map_err(|e| {
debug!("failed to render index {e:?}");
e
|scan| {
scan.clone()
.map(|scan| IndexTemplate {
books: scan.books.clone(),
books_count: scan.books.len(),
scan_duration: scan.scan_duration.num_milliseconds() as f64,
scanned_at: scan.scanned_at.to_rfc2822(),
version: VERSION.to_string(),
})
.and_then(|t| {
t.render()
.map_err(|e| {
debug!("failed to render index {e:?}");
e
})
.ok()
})
.ok()
.map_or(
(StatusCode::INTERNAL_SERVER_ERROR, Html(String::new())),
(StatusCode::SERVICE_UNAVAILABLE, Html(String::new())),
|rendered| (StatusCode::OK, Html(rendered)),
)
},
Expand All @@ -470,40 +471,45 @@ async fn show_book_route(
.map_or(
(StatusCode::INTERNAL_SERVER_ERROR, Html(String::new())),
|scan| {
scan.books
.iter()
.find(|b| b.id == id)
.map(|book| BookTemplate {
book: book.clone(),
version: VERSION.to_string(),
})
.and_then(|t| {
t.render()
.map_err(|e| {
debug!("failed to render book {e:?}");
e
scan.clone().map_or(
(StatusCode::SERVICE_UNAVAILABLE, Html(String::new())),
|scan| {
scan.books
.iter()
.find(|b| b.id == id)
.map(|book| BookTemplate {
book: book.clone(),
version: VERSION.to_string(),
})
.ok()
})
.map_or(
(StatusCode::NOT_FOUND, Html("not found".to_string())),
|rendered| (StatusCode::OK, Html(rendered)),
)
.and_then(|t| {
t.render()
.map_err(|e| {
debug!("failed to render book {e:?}");
e
})
.ok()
})
.map_or(
(StatusCode::NOT_FOUND, Html("not found".to_string())),
|rendered| (StatusCode::OK, Html(rendered)),
)
},
)
},
)
}

async fn rescan_books_route(State(state): State<AppState>) -> impl IntoResponse {
state.scan.lock().map_or(Redirect::to("/"), |mut scan| {
scan_books(&scan.data_dir)
scan_books(&state.data_dir)
.map(|new_scan| {
info!(
"finished re-scan in {}ms, {} book(s), {} page(s) found",
new_scan.scan_duration.num_milliseconds(),
new_scan.books.len(),
new_scan.pages_map.len()
);
*scan = new_scan;
*scan = Some(new_scan);
Redirect::to("/")
})
.map_err(|e| {
Expand All @@ -517,23 +523,25 @@ async fn rescan_books_route(State(state): State<AppState>) -> impl IntoResponse

async fn shuffle_route(State(state): State<AppState>) -> impl IntoResponse {
state.scan.lock().map_or(Redirect::to("/"), |scan| {
let mut rng = thread_rng();
scan.books
.iter()
.map(|book| {
let name = &book.title;
debug!("book taken: {name}");
book
})
.collect::<Vec<&Book>>()
.choose(&mut rng)
.map_or(Redirect::to("/"), |book| {
let name = &book.title;
debug!("pick {name}");

let id = &book.id;
Redirect::to(&format!("/book/{id}"))
})
scan.clone().map_or(Redirect::to("/"), |scan| {
let mut rng = thread_rng();
scan.books
.iter()
.map(|book| {
let name = &book.title;
debug!("book taken: {name}");
book
})
.collect::<Vec<&Book>>()
.choose(&mut rng)
.map_or(Redirect::to("/"), |book| {
let name = &book.title;
debug!("pick {name}");

let id = &book.id;
Redirect::to(&format!("/book/{id}"))
})
})
})
}

Expand All @@ -542,24 +550,26 @@ async fn shuffle_book_route(
Path(id): Path<String>,
) -> impl IntoResponse {
state.scan.lock().map_or(Redirect::to("/"), |scan| {
let mut rng = thread_rng();
scan.books
.iter()
.filter(|b| b.id != id)
.map(|book| {
let name = &book.title;
debug!("book taken: {name}");
book
})
.collect::<Vec<&Book>>()
.choose(&mut rng)
.map_or(Redirect::to("/"), |book| {
let name = &book.title;
debug!("pick {name}");

let id = &book.id;
Redirect::to(&format!("/book/{id}"))
})
scan.clone().map_or(Redirect::to("/"), |scan| {
let mut rng = thread_rng();
scan.books
.iter()
.filter(|b| b.id != id)
.map(|book| {
let name = &book.title;
debug!("book taken: {name}");
book
})
.collect::<Vec<&Book>>()
.choose(&mut rng)
.map_or(Redirect::to("/"), |book| {
let name = &book.title;
debug!("pick {name}");

let id = &book.id;
Redirect::to(&format!("/book/{id}"))
})
})
})
}

Expand All @@ -576,14 +586,19 @@ async fn show_page_route(
})
.ok()
.and_then(|scan| {
scan.pages_map.get(&id).and_then(|page| {
fs::read(&page.path)
.map_err(|e| {
debug!("failed to read page {e:?}");
e
scan.clone().map(|scan| {
scan.pages_map
.get(&id)
.and_then(|page| {
fs::read(&page.path)
.map_err(|e| {
debug!("failed to read page {e:?}");
e
})
.ok()
.map(|content| (StatusCode::OK, content))
})
.ok()
.map(|content| (StatusCode::OK, content))
.unwrap_or((StatusCode::NOT_FOUND, Vec::new()))
})
})
.unwrap_or((StatusCode::NOT_FOUND, Vec::new()))
Expand All @@ -596,25 +611,27 @@ pub struct Healthz {

async fn healthz_route(State(state): State<AppState>) -> impl IntoResponse {
state.scan.lock().map_or(Json(()).into_response(), |scan| {
Json(Healthz {
scanned_at: scan.scanned_at.timestamp_millis(),
})
.into_response()
scan.clone().map_or(
(StatusCode::SERVICE_UNAVAILABLE, Json(())).into_response(),
|scan| {
Json(Healthz {
scanned_at: scan.scanned_at.timestamp_millis(),
})
.into_response()
},
)
})
}

pub fn init_route(cli: &Cli) -> MyResult<Router> {
let data_dir = &cli.data_dir;
let scan = scan_books(data_dir)?;
info!(
"finished initial scan in {}ms, {} book(s), {} page(s) found",
scan.scan_duration.num_milliseconds(),
&scan.books.len(),
scan.pages_map.len()
);

let state = AppState {
scan: Arc::new(Mutex::new(scan)),
data_dir: data_dir.clone(),
scan: Arc::new(Mutex::new(None)),
};
let state_clone = state.clone();

let router = Router::new()
.route("/book/:id", get(show_book_route))
.route("/rescan", post(rescan_books_route))
Expand All @@ -636,6 +653,22 @@ pub fn init_route(cli: &Cli) -> MyResult<Router> {
.on_response(trace::DefaultOnResponse::new().level(Level::INFO)),
)
.with_state(state);

thread::spawn(move || {
let data_dir = state_clone.data_dir;
let new_scan = scan_books(data_dir).expect("initial scan failed");
info!(
"finished initial scan in {}ms, {} book(s), {} page(s) found",
new_scan.scan_duration.num_milliseconds(),
&new_scan.books.len(),
new_scan.pages_map.len()
);
{
let mut state = state_clone.scan.lock().unwrap();
*state = Some(new_scan);
}
});

Ok(router)
}

Expand Down
13 changes: 12 additions & 1 deletion tests/comics.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,24 @@ struct World {
}

#[given("a comics server")]
fn given_several_comic_books(w: &mut World) {
async fn given_several_comic_books(w: &mut World) {
use std::{thread, time};

std::env::remove_var("AUTH_USERNAME");
std::env::remove_var("AUTH_PASSWORD_HASH");

let cli = Cli::parse_from(["comics", "--data-dir", "./fixtures/data"]);
let router = init_route(&cli).unwrap();
w.server = Some(TestServer::new(router.into_make_service()).unwrap());

for _ in 0..10 {
let s = w.server.as_ref().unwrap();
let res = s.get("/healthz").await;
if res.status_code() == 200 {
break;
}
thread::sleep(time::Duration::from_millis(10));
}
}

#[when("the user visits the front page")]
Expand Down

0 comments on commit c59bac2

Please sign in to comment.