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

Merge branch 'master' of git.tfcconnection.org:chris/lumina-iced

Browse source
This commit is contained in:
Chris Cochrun 2025-09-17 09:28:50 -05:00
commit ac00afbfe6
7 changed files with 395 additions and 357 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/model.rs
View file

@ -1,6 +1,6 @@
use std::mem::replace;
use miette::{Result, miette};
use miette::{miette, Result};
use sqlx::{Connection, SqliteConnection};
#[derive(Debug, Clone)]

22
src/main.rs
View file

@ -1,4 +1,4 @@
use clap::{Parser, command};
use clap::{command, Parser};
use core::service_items::ServiceItem;
use core::slide::{
Background, BackgroundKind, Slide, SlideBuilder, TextAlignment,
@ -9,24 +9,24 @@ use cosmic::app::{Core, Settings, Task};
use cosmic::iced::alignment::Vertical;
use cosmic::iced::keyboard::{Key, Modifiers};
use cosmic::iced::window::{Mode, Position};
use cosmic::iced::{self, Length, Point, event, window};
use cosmic::iced::{self, event, window, Length, Point};
use cosmic::iced_futures::Subscription;
use cosmic::iced_widget::{column, row, stack};
use cosmic::theme;
use cosmic::widget::Container;
use cosmic::widget::dnd_destination::dnd_destination;
use cosmic::widget::nav_bar::nav_bar_style;
use cosmic::widget::text;
use cosmic::widget::tooltip::Position as TPosition;
use cosmic::widget::Container;
use cosmic::widget::{
Space, button, horizontal_space, mouse_area, nav_bar,
search_input, tooltip, vertical_space,
button, horizontal_space, mouse_area, nav_bar, search_input,
tooltip, vertical_space, Space,
};
use cosmic::widget::{container, text};
use cosmic::widget::{icon, slider};
use cosmic::{Application, ApplicationExt, Element, executor};
use cosmic::{executor, Application, ApplicationExt, Element};
use crisp::types::Value;
use lisp::parse_lisp;
use miette::{Result, miette};
use miette::{miette, Result};
use rayon::prelude::*;
use resvg::usvg::fontdb;
use std::fs::read_to_string;
@ -35,10 +35,10 @@ use std::sync::Arc;
use tracing::{debug, level_filters::LevelFilter};
use tracing::{error, warn};
use tracing_subscriber::EnvFilter;
use ui::EditorMode;
use ui::library::{self, Library};
use ui::presenter::{self, Presenter};
use ui::song_editor::{self, SongEditor};
use ui::EditorMode;
use crate::core::kinds::ServiceItemKind;
use crate::ui::text_svg::{self};
@ -1115,7 +1115,9 @@ impl cosmic::Application for App {
];
if let Some(_editor) = &self.editor_mode {
Element::from(song_editor)
container(song_editor)
.padding(cosmic::theme::spacing().space_xxl)
.into()
} else {
Element::from(column)
}

34
src/ui/library.rs
View file

@ -19,7 +19,7 @@ use cosmic::{
};
use miette::{IntoDiagnostic, Result};
use rapidfuzz::distance::levenshtein;
use sqlx::{pool::PoolConnection, Sqlite, SqlitePool};
use sqlx::{migrate, pool::PoolConnection, Sqlite, SqlitePool};
use tracing::{debug, error, warn};
use crate::core::{
@ -33,7 +33,7 @@ use crate::core::{
};
#[derive(Debug, Clone)]
pub(crate) struct Library {
pub struct Library {
song_library: Model<Song>,
image_library: Model<Image>,
video_library: Model<Video>,
@ -42,7 +42,6 @@ pub(crate) struct Library {
library_hovered: Option<LibraryKind>,
selected_item: Option<(LibraryKind, i32)>,
hovered_item: Option<(LibraryKind, i32)>,
pub dragged_item: Option<(LibraryKind, i32)>,
editing_item: Option<(LibraryKind, i32)>,
db: SqlitePool,
menu_keys: std::collections::HashMap<menu::KeyBind, MenuMessage>,
@ -70,7 +69,7 @@ impl MenuAction for MenuMessage {
}
}
pub(crate) enum Action {
pub enum Action {
OpenItem(Option<(LibraryKind, i32)>),
DraggedItem(ServiceItem),
Task(Task<Message>),
@ -103,6 +102,9 @@ pub(crate) enum Message {
impl<'a> Library {
pub async fn new() -> Self {
let mut db = add_db().await.expect("probs");
if let Err(e) = migrate!("./migrations").run(&db).await {
error!(?e)
}
Self {
song_library: Model::new_song_model(&mut db).await,
image_library: Model::new_image_model(&mut db).await,
@ -115,7 +117,6 @@ impl<'a> Library {
library_hovered: None,
selected_item: None,
hovered_item: None,
dragged_item: None,
editing_item: None,
db,
menu_keys: HashMap::new(),
@ -298,6 +299,27 @@ impl<'a> Library {
}
};
}
Message::AddItem => {
let kind =
self.library_open.unwrap_or(LibraryKind::Song);
let item = match kind {
LibraryKind::Song => {
let song = Song::default();
self.song_library
.add_item(song)
.map(|_| {
let index =
self.song_library.items.len();
(LibraryKind::Song, index as i32)
})
.ok()
}
LibraryKind::Video => todo!(),
LibraryKind::Image => todo!(),
LibraryKind::Presentation => todo!(),
};
return self.update(Message::OpenItem(item));
}
Message::OpenItem(item) => {
debug!(?item);
self.editing_item = item;
@ -600,7 +622,7 @@ impl<'a> Library {
if index == context_id as usize {
let context_menu = context_menu(
mouse_area,
self.context_menu.map_or_else(|| None, |id| {
self.context_menu.map_or_else(|| None, |_| {
Some(menu::items(&self.menu_keys,
vec![menu::Item::Button("Delete", None, MenuMessage::Delete((model.kind, index as i32)))]))
})

31
src/ui/presenter.rs
View file

@ -21,7 +21,7 @@ use cosmic::{
Task,
};
use iced_video_player::{gst_pbutils, Position, Video, VideoPlayer};
use rodio::{Decoder, OutputStream, Sink};
use rodio::{Decoder, OutputStream, OutputStreamBuilder, Sink};
use tracing::{debug, error, info, warn};
use url::Url;
@ -44,7 +44,7 @@ pub(crate) struct Presenter {
pub video: Option<Video>,
pub video_position: f32,
pub audio: Option<PathBuf>,
sink: (OutputStream, Arc<Sink>),
sink: (Arc<Sink>, OutputStream),
hovered_slide: Option<(usize, usize)>,
scroll_id: Id,
current_font: Font,
@ -159,11 +159,14 @@ impl Presenter {
video_position: 0.0,
hovered_slide: None,
sink: {
let (stream, stream_handle) =
OutputStream::try_default().unwrap();
let stream_handle =
OutputStreamBuilder::open_default_stream()
.expect("Can't open default rodio stream");
(
stream,
Arc::new(Sink::try_new(&stream_handle).unwrap()),
Arc::new(Sink::connect_new(
&stream_handle.mixer(),
)),
stream_handle,
)
},
scroll_id: Id::unique(),
@ -385,7 +388,7 @@ impl Presenter {
return Action::Task(self.start_audio());
}
Message::EndAudio => {
self.sink.1.stop();
self.sink.0.stop();
}
Message::None => debug!("Presenter Message::None"),
Message::Error(error) => {
@ -397,9 +400,8 @@ impl Presenter {
pub fn view(&self) -> Element<Message> {
slide_view(
&self.current_slide,
self.current_slide.clone(),
&self.video,
self.current_font,
false,
true,
)
@ -407,9 +409,8 @@ impl Presenter {
pub fn view_preview(&self) -> Element<Message> {
slide_view(
&self.current_slide,
self.current_slide.clone(),
&self.video,
self.current_font,
false,
false,
)
@ -443,9 +444,8 @@ impl Presenter {
);
let container = slide_view(
slide,
slide.clone(),
&self.video,
font,
true,
false,
);
@ -663,7 +663,7 @@ impl Presenter {
debug!(?audio, "This is where audio should be changing");
let audio = audio.clone();
Task::perform(
start_audio(Arc::clone(&self.sink.1), audio),
start_audio(Arc::clone(&self.sink.0), audio),
|()| Message::None,
)
} else {
@ -705,9 +705,8 @@ fn scale_font(font_size: f32, width: f32) -> f32 {
}
pub(crate) fn slide_view<'a>(
slide: &'a Slide,
slide: Slide,
video: &'a Option<Video>,
font: Font,
delegate: bool,
hide_mouse: bool,
) -> Element<'a, Message> {

96
src/ui/song_editor.rs
View file

@ -1,27 +1,28 @@
use std::{io, path::PathBuf, sync::Arc};
use cosmic::{
Element, Task,
dialog::file_chooser::open::Dialog,
iced::{
Font, Length,
font::{Family, Stretch, Style, Weight},
Font, Length,
},
iced_wgpu::graphics::text::cosmic_text::fontdb,
iced_widget::row,
theme,
widget::{
button, column, combo_box, container, horizontal_space, icon,
text, text_editor, text_input,
scrollable, text, text_editor, text_input,
},
Element, Task,
};
use dirs::font_dir;
use iced_video_player::Video;
use tracing::{debug, error};
use crate::{
Background, BackgroundKind, core::songs::Song,
ui::slide_editor::SlideEditor,
core::{service_items::ServiceTrait, songs::Song},
ui::{presenter::slide_view, slide_editor::SlideEditor},
Background, BackgroundKind,
};
#[derive(Debug)]
@ -282,49 +283,48 @@ impl SongEditor {
}
fn slide_preview(&self) -> Element<Message> {
// if let Some(song) = &self.song {
// if let Ok(slides) = song.to_slides() {
// let slides = slides
// .iter()
// .enumerate()
// .map(|(index, slide)| {
// container(
// slide_view(
// slide.clone(),
// if index == 0 {
// &self.video
// } else {
// &None
// },
// self.current_font,
// false,
// false,
// )
// .map(|_| Message::None),
// )
// .height(250)
// .center_x(Length::Fill)
// .padding([0, 20])
// .clip(true)
// .into()
// })
// .collect();
// scrollable(
// column::with_children(slides)
// .spacing(theme::active().cosmic().space_l()),
// )
// .height(Length::Fill)
// .width(Length::Fill)
// .into()
// } else {
// horizontal_space().into()
// }
// } else {
// horizontal_space().into()
// }
self.slide_state
.view(Font::with_name("Quicksand Bold"))
.map(|_s| Message::None)
if let Some(song) = &self.song {
if let Ok(slides) = song.to_slides() {
let slides: Vec<Element<Message>> = slides
.into_iter()
.enumerate()
.map(|(index, slide)| {
container(
slide_view(
slide,
if index == 0 {
&self.video
} else {
&None
},
false,
false,
)
.map(|_| Message::None),
)
.height(250)
.center_x(Length::Fill)
.padding([0, 20])
.clip(true)
.into()
})
.collect();
scrollable(
column::with_children(slides)
.spacing(theme::active().cosmic().space_l()),
)
.height(Length::Fill)
.width(Length::Fill)
.into()
} else {
horizontal_space().into()
}
} else {
horizontal_space().into()
}
// self.slide_state
// .view(Font::with_name("Quicksand Bold"))
// .map(|_s| Message::None)
}
fn left_column(&self) -> Element<Message> {