chris/lumina
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

verse editing and slide creation is more streamlined

Browse source
This commit is contained in:
Chris Cochrun 2026-02-06 07:05:20 -06:00
parent bb4f402803
commit c3de2aced4
3 changed files with 39 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

34
src/core/songs.rs
View file

@ -264,32 +264,18 @@ impl ServiceTrait for Song {
fn to_slides(&self) -> Result<Vec<Slide>> {
// let lyrics = self.get_lyrics()?;
let lyrics: Vec<String> = if let Some(verses) =
self.verses.as_ref()
&& let Some(map) = self.verse_map.as_ref()
{
verses
.iter()
.filter_map(|verse| {
map.get(verse).map(|lyric| {
let lyric =
lyric.to_owned().trim().to_string();
let multi_lyric = lyric.split("\n\n");
let lyric: Vec<String> = multi_lyric
.map(|lyric| lyric.trim().to_string())
.collect();
lyric
})
})
.flatten()
.collect()
} else {
vec![]
};
let lyrics: Vec<String> = self
.verses
.as_ref()
.ok_or(miette!("There are no verses assigned yet."))?
.iter()
.filter_map(|verse| self.get_lyric(verse))
.collect();
debug!(?lyrics);
let slides: Vec<Slide> = lyrics
.iter()
.map(|l| {
.filter_map(|l| {
SlideBuilder::new()
.background(
self.background.clone().unwrap_or_default(),
@ -305,7 +291,7 @@ impl ServiceTrait for Song {
.video_end_time(0.0)
.text(l)
.build()
.unwrap_or_default()
.ok()
})
.collect();