diff --git a/src/rust/service_item_model.rs b/src/rust/service_item_model.rs index 6f85795..ae12267 100644 --- a/src/rust/service_item_model.rs +++ b/src/rust/service_item_model.rs @@ -293,6 +293,7 @@ use self::service_item_model::{ ServiceRoles, }; use crate::slide_types::SlideType; +use lumina_core::service_items::ServiceItem as SI; use super::service_item_model::service_item_model::ServiceItemModel; @@ -1227,24 +1228,23 @@ impl service_item_model::ServiceItemModel { } let text = QStringList::from(&text_list); if let Ok(ty) = ty.try_into() { - match ty { - SlideType::Song => { - let song = Song { - title: name.to_string(), - lyrics: text.to_string(), - audio: audio.to_string(), - font: font.to_string(), - background: background.to_string(), - background_type: background_type.to_string(), - ..Default::default() - }; - todo!() - }, - SlideType::Video => todo!(), - SlideType::Image => todo!(), - SlideType::Presentation(_) => todo!(), - SlideType::Content => todo!(), - } + // match ty { + // SlideType::Song => { + // let song = Song { + // title: name.to_string(), + // lyrics: text.to_string(), + // audio: audio.to_string(), + // font: font.to_string(), + // background: background.to_string(), + // background_type: background_type.to_string(), + // ..Default::default() + // }; + // }, + // SlideType::Video => todo!(), + // SlideType::Image => todo!(), + // SlideType::Presentation(_) => todo!(), + // SlideType::Content => todo!(), + // } let service_item = ServiceItem { name, ty, @@ -1292,46 +1292,46 @@ impl service_item_model::ServiceItemModel { } } - fn adding_map(kind: SlideType) -> Result<()> { - match kind { - SlideType::Song => { - let song = get_song(item_model_id)?; - let slides = Slide::slides_from_song(song)?; - slides.iter().for_each(|slide| self.as_mut().insert_slide(slide, index)); - Ok(()) - }, - SlideType::Video => { - let video = video_model::get_video(item_model_id)?; - self.insert_slide(&Slide::slide_from_video(video)?, index); - Ok(()) - }, - SlideType::Image => { - let result = image_model::get_image(item_model_id); - match result { - Ok(image) => self.insert_slide(&Slide::slide_from_image(image)?, index), - Err(e) => { - e.with_note(|| { - format!("This might fail if we are loading the items from a file") - }); - let mut slide = Slide::default(); - slide.image_background = "qrc:/assets/black.jpg".to_owned(); - self.insert_slide(&slide, index); - }, - } - Ok(()) - }, - SlideType::Content => { - todo!(); - Ok(()) - }, - SlideType::Presentation(_) => { - let presentation = presentation_model::get_presentation(item_model_id)?; - let slides = Slide::slides_from_presentation(presentation)?; - slides.iter().for_each(|slide| self.as_mut().insert_slide(slide, slide.slide_index + index)); - Ok(()) - } - } - } + // fn adding_map(kind: SlideType) -> Result<()> { + // match kind { + // SlideType::Song => { + // let song = get_song(item_model_id)?; + // let slides = Slide::slides_from_song(song)?; + // slides.iter().for_each(|slide| self.as_mut().insert_slide(slide, index)); + // Ok(()) + // }, + // SlideType::Video => { + // let video = video_model::get_video(item_model_id)?; + // self.insert_slide(&Slide::slide_from_video(video)?, index); + // Ok(()) + // }, + // SlideType::Image => { + // let result = image_model::get_image(item_model_id); + // match result { + // Ok(image) => self.insert_slide(&Slide::slide_from_image(image)?, index), + // Err(e) => { + // e.with_note(|| { + // format!("This might fail if we are loading the items from a file") + // }); + // let mut slide = Slide::default(); + // slide.image_background = "qrc:/assets/black.jpg".to_owned(); + // self.insert_slide(&slide, index); + // }, + // } + // Ok(()) + // }, + // SlideType::Content => { + // todo!(); + // Ok(()) + // }, + // SlideType::Presentation(_) => { + // let presentation = presentation_model::get_presentation(item_model_id)?; + // let slides = Slide::slides_from_presentation(presentation)?; + // slides.iter().for_each(|slide| self.as_mut().insert_slide(slide, slide.slide_index + index)); + // Ok(()) + // } + // } + // } fn get_indices( self: Pin<&mut Self>,