From c22050005c10c1884d2c722fc3d761baed90daf5 Mon Sep 17 00:00:00 2001 From: Johannes Heuel Date: Sun, 2 Oct 2022 13:28:48 +0200 Subject: [PATCH] clean up --- backend/src/bin/add_picture.rs | 2 +- backend/src/lib.rs | 2 +- backend/src/main.rs | 7 ----- common/src/lib.rs | 2 +- frontend/index.html | 2 +- frontend/src/gallery/grid.rs | 26 +++++++++++------ frontend/src/gallery/layout.rs | 37 +++++++++++++----------- frontend/src/main.rs | 52 ++++++++++++++++++---------------- 8 files changed, 71 insertions(+), 59 deletions(-) diff --git a/backend/src/bin/add_picture.rs b/backend/src/bin/add_picture.rs index b0c5cea..90e5aea 100644 --- a/backend/src/bin/add_picture.rs +++ b/backend/src/bin/add_picture.rs @@ -145,7 +145,7 @@ fn main() { let new_picture = NewPicture { filepath: filepath.clone(), - created_at: created_at.clone(), + created_at, focal_length: pe.focal_length.clone(), shutter_speed: pe.shutter_speed.clone(), width: pe.width, diff --git a/backend/src/lib.rs b/backend/src/lib.rs index 960f2b7..6e09b8e 100644 --- a/backend/src/lib.rs +++ b/backend/src/lib.rs @@ -19,7 +19,7 @@ pub fn establish_connection() -> PgConnection { .unwrap_or_else(|_| panic!("Error connecting to {}", database_url)) } -pub fn create_picture<'a>(conn: &PgConnection, new_picture: NewPicture) -> usize { +pub fn create_picture(conn: &PgConnection, new_picture: NewPicture) -> usize { use schema::pictures; diesel::insert_into(pictures::table) diff --git a/backend/src/main.rs b/backend/src/main.rs index 874cb52..2d0d52b 100644 --- a/backend/src/main.rs +++ b/backend/src/main.rs @@ -31,8 +31,6 @@ use common::OutputPicture; type DbPool = r2d2::Pool>; -// type DbError = Box; - #[get("/api/pictures/")] async fn get_pictures(pool: web::Data) -> Result { let conn = pool.get().unwrap(); @@ -91,10 +89,8 @@ async fn main() -> std::io::Result<()> { let port = 8081; log::info!("starting HTTP server at http://{}:{}", host, port); - // Start HTTP server HttpServer::new(move || { App::new() - // set up DB pool to be used with web::Data extractor .app_data(web::Data::new(pool.clone())) .wrap(middleware::Logger::default()) .service(get_pictures) @@ -106,9 +102,6 @@ async fn main() -> std::io::Result<()> { .static_resources_location("./dist") .finish(), ) - // .service(fs::Files::new("/", STATIC_FILES_PATH).index_file("index.html")) - // .service(get_user) - // .service(add_user) }) .bind((host, port))? .run() diff --git a/common/src/lib.rs b/common/src/lib.rs index e090865..0b7df17 100644 --- a/common/src/lib.rs +++ b/common/src/lib.rs @@ -1,6 +1,6 @@ use serde::{Deserialize, Serialize}; -#[derive(Serialize, Deserialize, Debug, Clone, PartialEq)] +#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)] pub struct OutputPicture { pub thumbnail: Option, pub width: u32, diff --git a/frontend/index.html b/frontend/index.html index 8db8090..0cf248a 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -13,7 +13,7 @@ - + diff --git a/frontend/src/gallery/grid.rs b/frontend/src/gallery/grid.rs index b1902e4..a261530 100644 --- a/frontend/src/gallery/grid.rs +++ b/frontend/src/gallery/grid.rs @@ -1,12 +1,10 @@ use crate::gallery::Picture; use common::OutputPicture; -use pathfinding::prelude::dijkstra; -use weblog::console_log; use yew::prelude::*; use yew::{function_component, html}; -use super::layout::*; +use super::layout::{compute_row_layout, Rect}; #[derive(Clone, Debug, Properties, PartialEq)] pub struct GridProps { @@ -20,19 +18,31 @@ pub struct GridProps { pub fn grid(props: &GridProps) -> Html { let target_height = 300; let container_width = if props.width == 0 { 0 } else { props.width - 4 }; - let limit_node_search = find_ideal_node_search(target_height, container_width); let margin = 2; let dimensions = compute_row_layout( container_width, - limit_node_search, target_height, margin, - &props.pictures, + &props + .pictures + .iter() + .map(|p| Rect { + width: p.width, + height: p.height, + }) + .collect(), ); let dimensions = if let Some(d) = dimensions { d } else { - props.pictures.iter().map(|p| (p.width, p.height)).collect() + props + .pictures + .iter() + .map(|p| Rect { + width: p.width, + height: p.height, + }) + .collect() }; html! {
Html { "flex-direction: row;", )}> { props.pictures.iter().zip(dimensions).map(|(p, d)| - html!{} + html!{} ).collect::()}
} diff --git a/frontend/src/gallery/layout.rs b/frontend/src/gallery/layout.rs index 5b62ff4..4a8ba86 100644 --- a/frontend/src/gallery/layout.rs +++ b/frontend/src/gallery/layout.rs @@ -1,8 +1,11 @@ -use common::OutputPicture; use pathfinding::prelude::dijkstra; -use weblog::console_log; -pub fn get_common_height(row: &[OutputPicture], container_width: u32, margin: u32) -> f32 { +pub struct Rect { + pub width: u32, + pub height: u32, +} + +pub fn get_common_height(row: &[Rect], container_width: u32, margin: u32) -> f32 { let row_width: u32 = container_width - row.len() as u32 * (margin * 2); let total_aspect_ratio: f32 = row .iter() @@ -12,7 +15,7 @@ pub fn get_common_height(row: &[OutputPicture], container_width: u32, margin: u3 } pub fn cost( - photos: &[OutputPicture], + photos: &[Rect], i: usize, j: usize, width: u32, @@ -26,14 +29,14 @@ pub fn cost( pub fn make_successors( target_height: u32, container_width: u32, - photos: &Vec, - limit_node_search: usize, + photos: &Vec, + node_search_limit: usize, margin: u32, ) -> Vec> { let mut results = vec![Vec::new(); photos.len()]; (0..photos.len()).for_each(|start| { for j in start + 1..photos.len() + 1 { - if j - start > limit_node_search { + if j - start > node_search_limit { break; } results[start].push(( @@ -45,29 +48,28 @@ pub fn make_successors( results } -pub fn find_ideal_node_search(target_row_height: u32, container_width: u32) -> usize { +pub fn calc_node_search_limit(target_row_height: u32, container_width: u32) -> usize { let row_aspect_ratio = container_width as f32 / target_row_height as f32; (row_aspect_ratio / 1.5) as usize + 8 } pub fn compute_row_layout( container_width: u32, - limit_node_search: usize, target_height: u32, margin: u32, - photos: &Vec, -) -> Option> { - console_log!("compute row layout for width: {}", container_width); - + photos: &Vec, +) -> Option> { if photos.is_empty() { return None; } + let node_search_limit = calc_node_search_limit(target_height, container_width); + let successors = make_successors( target_height, container_width, photos, - limit_node_search, + node_search_limit, margin, ); let path = dijkstra(&0, |p| successors[*p].clone(), |p| *p == photos.len()); @@ -76,13 +78,16 @@ pub fn compute_row_layout( } else { (Vec::new(), 0) }; - let mut dimensions: Vec<(u32, u32)> = Vec::with_capacity(photos.len()); + let mut dimensions: Vec = Vec::with_capacity(photos.len()); for i in 1..path.len() { let row = &photos[path[i - 1]..path[i]]; let height = get_common_height(row, container_width, margin) as u32; (path[i - 1]..path[i]).for_each(|j| { let ratio = photos[j].width as f32 / photos[j].height as f32; - dimensions.push(((height as f32 * ratio) as u32, height)); + dimensions.push(Rect { + width: (height as f32 * ratio) as u32, + height, + }); }); } Some(dimensions) diff --git a/frontend/src/main.rs b/frontend/src/main.rs index ba98610..976dc71 100644 --- a/frontend/src/main.rs +++ b/frontend/src/main.rs @@ -3,18 +3,18 @@ #[global_allocator] static ALLOC: wee_alloc::WeeAlloc = wee_alloc::WeeAlloc::INIT; -mod gallery; - -use common::OutputPicture; use console_error_panic_hook::set_once as set_panic_hook; use gloo_net::http::Request; use wasm_bindgen::prelude::*; use yew_hooks::prelude::*; +// use weblog::console_log; use ybc::NavbarFixed::Top; use ybc::TileCtx::{Ancestor, Child, Parent}; use ybc::TileSize::*; +mod gallery; +use common::OutputPicture; use gallery::Grid; use yew::prelude::*; @@ -47,14 +47,22 @@ fn app() -> Html { } let navbrand = html! { - {"Photos"} + + {"Photos"} + }; let navstart = html! {}; let navend = html! { <> - + {"Photos"} @@ -71,16 +79,22 @@ fn app() -> Html { {navstart} {navend} /> - - - - -
- -
+ + + + +
+ +
+ + - - } @@ -95,15 +109,5 @@ fn main() { set_panic_hook(); snippetTest(); - // Show off some feature flag enabling patterns. - #[cfg(feature = "demo-abc")] - { - // ConsoleService::log("feature `demo-abc` enabled"); - } - #[cfg(feature = "demo-xyz")] - { - // ConsoleService::log("feature `demo-xyz` enabled"); - } - yew::start_app::(); }