Cargo fmt

This commit is contained in:
Vivianne 2023-06-11 21:16:57 -07:00
parent 2f59834368
commit 893390feba
5 changed files with 17 additions and 21 deletions

View File

@ -1,4 +1,3 @@
#[derive(Debug)]
pub enum AppMsg {
Close,

View File

@ -2,7 +2,7 @@ use diesel::prelude::*;
use dotenvy::dotenv;
use std::env;
use crate::models::{NewLibrary, Library};
use crate::models::{Library, NewLibrary};
pub mod models;
pub mod schema;

View File

@ -27,8 +27,6 @@ impl FactoryComponent for LibraryListItem {
}
fn init_model(name: Self::Init, _index: &DynamicIndex, _sender: FactorySender<Self>) -> Self {
Self {
name,
}
Self { name }
}
}

View File

@ -1,14 +1,7 @@
use diesel::SelectableHelper;
use diesel::SqliteConnection;
use diesel::QueryDsl;
use diesel::prelude::*;
use gtk::prelude::*;
use gtk::glib::BoxedAnyObject;
use relm4::{
prelude::*,
factory::FactoryVecDeque,
};
use sample_amp::models::Library;
use gtk::prelude::*;
use relm4::{factory::FactoryVecDeque, prelude::*};
use diesel::prelude::*;
use std::cell::Ref;
mod library_list;
@ -17,7 +10,7 @@ mod app_msg;
use app_msg::AppMsg;
use sample_amp::establish_connection;
use sample_amp::schema::libraries;
use sample_amp::models::Library;
struct AppModel {
samples: gtk::MultiSelection,
@ -106,7 +99,6 @@ impl SimpleComponent for AppModel {
window: &Self::Root,
sender: ComponentSender<Self>,
) -> relm4::ComponentParts<Self> {
let factory_name = gtk::SignalListItemFactory::new();
factory_name.connect_bind(move |_factory, item| {
let item = item.downcast_ref::<gtk::ListItem>().unwrap();
@ -138,9 +130,17 @@ impl SimpleComponent for AppModel {
});
let samples = gtk::gio::ListStore::new(gtk::glib::types::Type::OBJECT);
let sample_a = BoxedAnyObject::new(Sample{name: "01 MOOLOO-108 bpm a.wav".to_string(), bpm: 108.0, key: "A".to_string()});
let sample_a = BoxedAnyObject::new(Sample {
name: "01 MOOLOO-108 bpm a.wav".to_string(),
bpm: 108.0,
key: "A".to_string(),
});
samples.append(&sample_a);
let sample_b = BoxedAnyObject::new(Sample{name: "03 FAST AND FURIOUS-144.3 bpm a.wav".to_string(), bpm: 144.3, key: "A".to_string()});
let sample_b = BoxedAnyObject::new(Sample {
name: "03 FAST AND FURIOUS-144.3 bpm a.wav".to_string(),
bpm: 144.3,
key: "A".to_string(),
});
samples.append(&sample_b);
let samples = gtk::MultiSelection::new(Some(samples));
@ -169,7 +169,6 @@ impl SimpleComponent for AppModel {
ComponentParts { model, widgets }
}
fn update(&mut self, message: Self::Input, _sender: ComponentSender<Self>) {
match message {
AppMsg::Close => {

View File

@ -1,5 +1,5 @@
use diesel::prelude::*;
use super::schema::libraries;
use diesel::prelude::*;
#[derive(Queryable, Selectable)]
#[diesel(table_name = libraries)]