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

trying to find a way to beat the borrow checker

Browse source
This commit is contained in:
Chris Cochrun 2025-03-06 15:20:28 -06:00
parent e63f003181
commit 95fb1d86d8
2 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main.rs
View file

@ -482,7 +482,7 @@ impl cosmic::Application for App {
let task = library.update(
library::Message::UpdateSong(song),
);
task.map(|m| {
task.map(|_m| {
cosmic::app::Message::App(Message::None)
})
} else {

30
src/ui/library.rs
View file

@ -101,24 +101,7 @@ impl<'a> Library {
Task::none()
}
Message::UpdateSong(song) => {
let Some((kind, index)) = self.editing_item else {
error!("Not editing an item");
return Task::none();
};
if kind != LibraryKind::Song {
error!("Not editing a song item");
return Task::none();
}
let db = self.db.clone();
let song_library = self.song_library.clone();
let future = update_song(
song,
index as usize,
db,
song_library,
);
let future = self.update_song(song);
Task::perform(future, |r| {
match r {
Ok(_) => (),
@ -371,11 +354,9 @@ impl<'a> Library {
.into()
}
pub(crate) async fn update_song(
&'a mut self,
pub async fn update_song<'b>(
&'b mut self,
song: Song,
mut db: SqliteConnection,
mut song_library: Model<Song>,
) -> Result<()> {
let Some((kind, index)) = self.editing_item else {
return Err(miette!("Not editing an item"));
@ -384,9 +365,12 @@ impl<'a> Library {
if kind != LibraryKind::Song {
return Err(miette!("Not editing a song item"));
}
let mut db = self.db.acquire().await.expect("foo");
if let Some(_) = self.song_library.items.get(index as usize) {
song_library.update_song(song, index, &mut db).await?;
self.song_library
.update_song(song, index, &mut db)
.await?;
Ok(())
} else {
Err(miette!("Song not found"))