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

bug: new_song now works properly

Browse source
This commit is contained in:
Chris Cochrun 2023-05-17 17:16:57 -05:00
parent e87f1094a9
commit 0eef97dcfe
2 changed files with 34 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/qml/presenter/Library.qml
View file

@ -44,7 +44,7 @@ Item {
newItemFunction: (function() { newItemFunction: (function() {
songProxyModel.setFilterRegularExpression(""); songProxyModel.setFilterRegularExpression("");
songProxyModel.songModel.newSong(); songProxyModel.songModel.newSong();
libraryList.currentIndex = songProxyModel.songModel.rowCount() - 1; libraryList.currentIndex = songProxyModel.songModel.count() - 1;
if (!editMode) if (!editMode)
editMode = true; editMode = true;
editSwitch(libraryList.currentIndex, "song"); editSwitch(libraryList.currentIndex, "song");

73
src/rust/song_model.rs
View file

@ -190,55 +190,48 @@ mod song_model {
} }
#[qinvokable] #[qinvokable]
pub fn new_song(self: Pin<&mut Self>) { pub fn new_song(mut self: Pin<&mut Self>) -> bool {
let song_id = self.rust().highest_id + 1; let song_id = self.rust().highest_id + 1;
let song_title = String::from("title"); let song_title = String::from("title");
let db = &mut self.as_mut().get_db();
let song = Song { let song = Song {
id: song_id, id: song_id,
title: song_title, title: song_title.clone(),
..Default::default() ..Default::default()
}; };
self.add_song(song); let result = insert_into(songs)
.values((
id.eq(&song_id),
title.eq(&song_title),
lyrics.eq(&song.lyrics),
author.eq(&song.author),
ccli.eq(&song.ccli),
audio.eq(&song.audio),
verse_order.eq(&song.verse_order),
background.eq(&song.background),
background_type.eq(&song.background_type),
horizontal_text_alignment.eq(&song.horizontal_text_alignment),
vertical_text_alignment.eq(&song.vertical_text_alignment),
font.eq(&song.font),
font_size.eq(&song.font_size),
))
.execute(db);
println!("{:?}", result);
match result {
Ok(_i) => {
self.as_mut().add_song(song);
println!("{:?}", self.as_mut().songs());
true
}
Err(_e) => {
println!("Cannot connect to database");
false
}
}
} }
// fn add_item(
// mut self: Pin<&mut Self>,
// song_id: i32,
// song_title: QString,
// song_path: QString,
// ) -> bool {
// let db = &mut self.as_mut().get_db();
// // println!("{:?}", db);
// let song = self::Song {
// id: song_id,
// title: song_title.clone(),
// path: song_path.clone(),
// };
// println!("{:?}", song);
// let result = insert_into(songs)
// .values((
// id.eq(&song_id),
// title.eq(&song_title.to_string()),
// path.eq(&song_path.to_string()),
// ))
// .execute(db);
// println!("{:?}", result);
// match result {
// Ok(_i) => {
// self.as_mut().add_song(song);
// println!("{:?}", self.as_mut().songs());
// true
// }
// Err(_e) => {
// println!("Cannot connect to database");
// false
// }
// }
// }
fn add_song(mut self: Pin<&mut Self>, song: self::Song) { fn add_song(mut self: Pin<&mut Self>, song: self::Song) {
let index = self.as_ref().songs().len() as i32; let index = self.as_ref().songs().len() as i32;