diff --git a/src/core/slide.rs b/src/core/slide.rs index 70e60c1..9ed1a3d 100644 --- a/src/core/slide.rs +++ b/src/core/slide.rs @@ -19,7 +19,7 @@ use super::songs::Song; )] pub struct Slide { id: i32, - background: Background, + pub(crate) background: Background, text: String, font: String, font_size: i32, @@ -708,7 +708,7 @@ mod test { background: Background::try_from("~/pics/frodo.jpg") .unwrap(), font: "Quicksand".to_string(), - font_size: 70, + font_size: 140, ..Default::default() } } diff --git a/src/lisp.rs b/src/lisp.rs index 5effa4c..b120fb6 100644 --- a/src/lisp.rs +++ b/src/lisp.rs @@ -39,12 +39,13 @@ pub fn parse_lisp(value: Value) -> Vec { mod test { use std::{fs::read_to_string, path::PathBuf}; - use crate::{ - Background, TextAlignment, - core::{ - images::Image, kinds::ServiceItemKind, - service_items::ServiceTrait, songs::Song, videos::Video, - }, + use crate::core::{ + images::Image, + kinds::ServiceItemKind, + service_items::ServiceTrait, + slide::{Background, Slide, SlideBuilder, TextAlignment}, + songs::Song, + videos::Video, }; use super::*; @@ -115,11 +116,16 @@ mod test { ServiceItem { title: "This is frodo".to_string(), kind: ServiceItemKind::Content(slide.clone()), + slides: vec![slide], ..Default::default() } } fn service_item_2() -> ServiceItem { + let video = Video::from(PathBuf::from( + "~/vids/test/camprules2024.mp4", + )); + let slide = &video.to_slides().unwrap()[0]; ServiceItem { title: "camprules2024.mp4".to_string(), kind: ServiceItemKind::Video(Video { @@ -130,6 +136,7 @@ mod test { looping: false, ..Default::default() }), + slides: vec![slide.clone()], ..Default::default() } }