johrpan/musicus
1
0
Fork 0
mirror of https://github.com/johrpan/musicus.git synced 2025-10-26 11:47:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add tracks editor

Browse source
This commit is contained in:
Elias Projahn 2020-10-31 23:07:25 +01:00
parent 6ddee1d187
commit b8911eafaa
11 changed files with 754 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
res/resources.xml
View file

@ -18,6 +18,8 @@
<file preprocess="xml-stripblanks">ui/recording_selector.ui</file>
<file preprocess="xml-stripblanks">ui/recording_selector_screen.ui</file>
<file preprocess="xml-stripblanks">ui/section_editor.ui</file>
<file preprocess="xml-stripblanks">ui/tracks_editor.ui</file>
<file preprocess="xml-stripblanks">ui/track_editor.ui</file>
<file preprocess="xml-stripblanks">ui/window.ui</file>
<file preprocess="xml-stripblanks">ui/work_editor.ui</file>
<file preprocess="xml-stripblanks">ui/work_screen.ui</file>

69
res/ui/track_editor.ui Normal file
View file

@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.1 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkWindow" id="window">
<property name="can-focus">False</property>
<property name="modal">True</property>
<property name="default-width">350</property>
<property name="default-height">200</property>
<property name="type-hint">dialog</property>
<child>
<object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can-focus">True</property>
<child>
<object class="GtkViewport">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="shadow-type">none</property>
<child>
<object class="GtkListBox" id="list">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="selection-mode">none</property>
<child type="placeholder">
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="label" translatable="yes">Select a recording of a work with multiple parts.</property>
</object>
</child>
</object>
</child>
</object>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="title" translatable="yes">Track</property>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
</object>
</child>
<child>
<object class="GtkButton" id="save_button">
<property name="label" translatable="yes">Save</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<style>
<class name="suggested-action"/>
</style>
</object>
<packing>
<property name="pack-type">end</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</interface>

280
res/ui/tracks_editor.ui Normal file
View file

@ -0,0 +1,280 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.38.1 -->
<interface>
<requires lib="gtk+" version="3.24"/>
<object class="GtkWindow" id="window">
<property name="can-focus">False</property>
<property name="modal">True</property>
<property name="default-width">400</property>
<property name="default-height">300</property>
<property name="type-hint">dialog</property>
<child>
<!-- n-columns=2 n-rows=2 -->
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="border-width">18</property>
<property name="row-spacing">12</property>
<property name="column-spacing">6</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">end</property>
<property name="label" translatable="yes">Recording</property>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="recording_button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<property name="hexpand">True</property>
<child>
<object class="GtkStack" id="recording_stack">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="vhomogeneous">False</property>
<property name="transition-type">crossfade</property>
<property name="interpolate-size">True</property>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Select …</property>
</object>
<packing>
<property name="name">unselected</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="work_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Work</property>
<property name="ellipsize">end</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="performers_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="opacity">0.5</property>
<property name="halign">start</property>
<property name="label" translatable="yes">Performers</property>
<property name="ellipsize">end</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="name">selected</property>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="vexpand">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkScrolledWindow" id="scroll">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="shadow-type">in</property>
<child>
<placeholder/>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="add_track_button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">list-add-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkButton" id="edit_track_button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">edit-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkButton" id="remove_track_button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">list-remove-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkButton" id="move_track_down_button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">go-down-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">4</property>
</packing>
</child>
<child>
<object class="GtkButton" id="move_track_up_button">
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="icon-name">go-up-symbolic</property>
</object>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack-type">end</property>
<property name="position">5</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
<property name="width">2</property>
</packing>
</child>
</object>
</child>
<child type="titlebar">
<object class="GtkHeaderBar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<property name="title" translatable="yes">Tracks</property>
<child>
<object class="GtkButton" id="save_button">
<property name="label" translatable="yes">Save</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
<style>
<class name="suggested-action"/>
</style>
</object>
<packing>
<property name="pack-type">end</property>
</packing>
</child>
<child>
<object class="GtkButton" id="cancel_button">
<property name="label" translatable="yes">Cancel</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">True</property>
</object>
<packing>
<property name="position">1</property>
</packing>
</child>
</object>
</child>
</object>
</interface>

4
res/ui/window.ui
View file

@ -193,6 +193,10 @@
<attribute name="label" translatable="yes">Add recording</attribute>
<attribute name="action">win.add-recording</attribute>
</item>
<item>
<attribute name="label" translatable="yes">Add tracks</attribute>
<attribute name="action">win.add-tracks</attribute>
</item>
</section>
</menu>
</interface>

14
src/backend.rs
View file

@ -2,6 +2,8 @@ use super::database::*;
use anyhow::Result;
use futures_channel::oneshot;
use futures_channel::oneshot::Sender;
use std::cell::RefCell;
use std::path::PathBuf;
enum BackendAction {
UpdatePerson(Person, Sender<Result<()>>),
@ -32,10 +34,11 @@ use BackendAction::*;
pub struct Backend {
action_sender: std::sync::mpsc::Sender<BackendAction>,
music_library_path: RefCell<Option<PathBuf>>,
}
impl Backend {
pub fn new(url: &str) -> Self {
pub fn new(url: &str, music_library_path: PathBuf) -> Self {
let url = url.to_string();
let (action_sender, action_receiver) = std::sync::mpsc::channel::<BackendAction>();
@ -161,6 +164,7 @@ impl Backend {
Backend {
action_sender: action_sender,
music_library_path: RefCell::new(Some(music_library_path)),
}
}
@ -309,4 +313,12 @@ impl Backend {
.send(GetRecordingsForWork(work_id, sender))?;
receiver.await?
}
pub fn set_music_library_path(&self, path: &str) {
self.music_library_path.replace(Some(PathBuf::from(path)));
}
pub fn get_music_library_path(&self) -> Option<PathBuf> {
self.music_library_path.borrow().clone()
}
}

6
src/database/models.rs
View file

@ -181,3 +181,9 @@ impl From<RecordingDescription> for RecordingInsertion {
}
}
}
#[derive(Debug, Clone)]
pub struct Track {
pub work_parts: Vec<usize>,
pub file_name: String,
}

6
src/dialogs/mod.rs
View file

@ -31,6 +31,12 @@ pub use recording_selector::*;
pub mod section_editor;
pub use section_editor::*;
pub mod track_editor;
pub use track_editor::*;
pub mod tracks_editor;
pub use tracks_editor::*;
pub mod work_editor;
pub use work_editor::*;

117
src/dialogs/track_editor.rs Normal file
View file

@ -0,0 +1,117 @@
use crate::database::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use std::cell::RefCell;
use std::convert::TryInto;
use std::rc::Rc;
pub struct TrackEditor {
window: gtk::Window,
}
impl TrackEditor {
pub fn new<W, F>(parent: &W, track: Track, work: WorkDescription, callback: F) -> Self
where
W: IsA<gtk::Window>,
F: Fn(Track) -> () + 'static,
{
let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/track_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::ListBox, list);
window.set_transient_for(Some(parent));
cancel_button.connect_clicked(clone!(@strong window => move |_| {
window.close();
}));
let work = Rc::new(work);
let work_parts = Rc::new(RefCell::new(track.work_parts));
let file_name = track.file_name;
save_button.connect_clicked(clone!(@strong work_parts, @strong window => move |_| {
let mut work_parts = work_parts.borrow_mut();
work_parts.sort();
callback(Track {
work_parts: work_parts.clone(),
file_name: file_name.clone(),
});
window.close();
}));
for (index, part) in work.parts.iter().enumerate() {
let check = gtk::CheckButton::new();
check.set_active(work_parts.borrow().contains(&index));
check.connect_toggled(clone!(@strong check, @strong work_parts => move |_| {
if check.get_active() {
let mut work_parts = work_parts.borrow_mut();
work_parts.push(index);
} else {
let mut work_parts = work_parts.borrow_mut();
if let Some(pos) = work_parts.iter().position(|part| *part == index) {
work_parts.remove(pos);
}
}
}));
let label = gtk::Label::new(Some(&part.title));
label.set_halign(gtk::Align::Start);
label.set_ellipsize(pango::EllipsizeMode::End);
let hbox = gtk::Box::new(gtk::Orientation::Horizontal, 6);
hbox.set_border_width(6);
hbox.add(&check);
hbox.add(&label);
let row = gtk::ListBoxRow::new();
row.add(&hbox);
row.show_all();
list.add(&row);
list.connect_row_activated(
clone!(@strong row, @strong check => move |_, activated_row| {
if *activated_row == row {
check.activate();
}
}),
);
}
let mut section_count = 0;
for section in &work.sections {
let attributes = pango::AttrList::new();
attributes.insert(pango::Attribute::new_weight(pango::Weight::Bold).unwrap());
let label = gtk::Label::new(Some(&section.title));
label.set_halign(gtk::Align::Start);
label.set_ellipsize(pango::EllipsizeMode::End);
label.set_attributes(Some(&attributes));
let wrap = gtk::Box::new(gtk::Orientation::Vertical, 0);
wrap.set_border_width(6);
wrap.add(&label);
let row = gtk::ListBoxRow::new();
row.set_activatable(false);
row.add(&wrap);
row.show_all();
list.insert(
&row,
(section.before_index + section_count).try_into().unwrap(),
);
section_count += 1;
}
Self { window }
}
pub fn show(&self) {
self.window.show();
}
}

225
src/dialogs/tracks_editor.rs Normal file
View file

@ -0,0 +1,225 @@
use super::*;
use crate::backend::*;
use crate::database::*;
use crate::widgets::*;
use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use std::cell::RefCell;
use std::rc::Rc;
pub struct TracksEditor {
window: gtk::Window,
}
impl TracksEditor {
pub fn new<F: Fn() -> () + 'static, P: IsA<gtk::Window>>(
backend: Rc<Backend>,
parent: &P,
callback: F,
) -> Self {
let builder = gtk::Builder::from_resource("/de/johrpan/musicus_editor/ui/tracks_editor.ui");
get_widget!(builder, gtk::Window, window);
get_widget!(builder, gtk::Button, cancel_button);
get_widget!(builder, gtk::Button, save_button);
get_widget!(builder, gtk::Button, recording_button);
get_widget!(builder, gtk::Stack, recording_stack);
get_widget!(builder, gtk::Label, work_label);
get_widget!(builder, gtk::Label, performers_label);
get_widget!(builder, gtk::ScrolledWindow, scroll);
get_widget!(builder, gtk::Button, add_track_button);
get_widget!(builder, gtk::Button, edit_track_button);
get_widget!(builder, gtk::Button, remove_track_button);
get_widget!(builder, gtk::Button, move_track_up_button);
get_widget!(builder, gtk::Button, move_track_down_button);
window.set_transient_for(Some(parent));
cancel_button.connect_clicked(clone!(@strong window => move |_| {
window.close();
}));
let recording = Rc::new(RefCell::new(None::<RecordingDescription>));
let tracks = Rc::new(RefCell::new(Vec::<Track>::new()));
let track_list = List::new(
clone!(@strong recording => move |track: &Track| {
let mut title_parts = Vec::<String>::new();
for part in &track.work_parts {
if let Some(recording) = &*recording.borrow() {
title_parts.push(recording.work.parts[*part].title.clone());
}
}
let title = if title_parts.is_empty() {
String::from("Unknown")
} else {
title_parts.join(", ")
};
let title_label = gtk::Label::new(Some(&title));
title_label.set_ellipsize(pango::EllipsizeMode::End);
title_label.set_halign(gtk::Align::Start);
let file_name_label = gtk::Label::new(Some(&track.file_name));
file_name_label.set_ellipsize(pango::EllipsizeMode::End);
file_name_label.set_opacity(0.5);
file_name_label.set_halign(gtk::Align::Start);
let vbox = gtk::Box::new(gtk::Orientation::Vertical, 0);
vbox.add(&title_label);
vbox.add(&file_name_label);
vbox.upcast()
}),
|_| true,
"Add some tracks.",
);
let autofill_parts = Rc::new(clone!(@strong recording, @strong tracks, @strong track_list => move || {
if let Some(recording) = &*recording.borrow() {
let mut tracks = tracks.borrow_mut();
for (index, _) in recording.work.parts.iter().enumerate() {
if let Some(mut track) = tracks.get_mut(index) {
track.work_parts = vec!(index);
} else {
break;
}
}
track_list.show_items(tracks.clone());
}
}));
recording_button.connect_clicked(clone!(
@strong backend,
@strong window,
@strong save_button,
@strong work_label,
@strong performers_label,
@strong recording_stack,
@strong recording,
@strong autofill_parts => move |_| {
RecordingSelector::new(
backend.clone(),
&window,
clone!(
@strong save_button,
@strong work_label,
@strong performers_label,
@strong recording_stack,
@strong recording,
@strong autofill_parts => move |r| {
work_label.set_text(&r.work.get_title());
performers_label.set_text(&r.get_performers());
recording_stack.set_visible_child_name("selected");
recording.replace(Some(r));
save_button.set_sensitive(true);
autofill_parts();
}
)).show();
}
));
save_button.connect_clicked(clone!(@strong window => move |_| {
window.close();
callback();
}));
add_track_button.connect_clicked(clone!(@strong window, @strong tracks, @strong track_list, @strong autofill_parts => move |_| {
let music_library_path = backend.get_music_library_path().unwrap();
let dialog = gtk::FileChooserNative::new(Some("Select audio files"), Some(&window), gtk::FileChooserAction::Open, None, None);
dialog.set_select_multiple(true);
dialog.set_current_folder(&music_library_path);
if let gtk::ResponseType::Accept = dialog.run() {
let mut index = match track_list.get_selected_index() {
Some(index) => index + 1,
None => tracks.borrow().len(),
};
{
let mut tracks = tracks.borrow_mut();
for file_name in dialog.get_filenames() {
let file_name = file_name.strip_prefix(&music_library_path).unwrap();
tracks.insert(index, Track {
work_parts: Vec::new(),
file_name: String::from(file_name.to_str().unwrap()),
});
index += 1;
}
}
track_list.show_items(tracks.borrow().clone());
autofill_parts();
track_list.select_index(index);
}
}));
remove_track_button.connect_clicked(
clone!(@strong tracks, @strong track_list => move |_| {
match track_list.get_selected_index() {
Some(index) => {
tracks.borrow_mut().remove(index);
track_list.show_items(tracks.borrow().clone());
track_list.select_index(index);
}
None => (),
}
}),
);
move_track_up_button.connect_clicked(
clone!(@strong tracks, @strong track_list => move |_| {
match track_list.get_selected_index() {
Some(index) => {
if index > 0 {
tracks.borrow_mut().swap(index - 1, index);
track_list.show_items(tracks.borrow().clone());
track_list.select_index(index - 1);
}
}
None => (),
}
}),
);
move_track_down_button.connect_clicked(
clone!(@strong tracks, @strong track_list => move |_| {
match track_list.get_selected_index() {
Some(index) => {
if index < tracks.borrow().len() - 1 {
tracks.borrow_mut().swap(index, index + 1);
track_list.show_items(tracks.borrow().clone());
track_list.select_index(index + 1);
}
}
None => (),
}
}),
);
edit_track_button.connect_clicked(clone!(@strong window, @strong tracks, @strong track_list, @strong recording => move |_| {
if let Some(index) = track_list.get_selected_index() {
if let Some(recording) = &*recording.borrow() {
TrackEditor::new(&window, tracks.borrow()[index].clone(), recording.work.clone(), clone!(@strong tracks, @strong track_list => move |track| {
let mut tracks = tracks.borrow_mut();
tracks[index] = track;
track_list.show_items(tracks.clone());
track_list.select_index(index);
})).show();
}
}
}));
scroll.add(&track_list.widget);
Self { window }
}
pub fn show(&self) {
self.window.show();
}
}

21
src/widgets/list.rs
View file

@ -70,6 +70,27 @@ where
self.selected.replace(Some(Box::new(selected)));
}
pub fn get_selected_index(&self) -> Option<usize> {
match self.widget.get_selected_rows().first() {
Some(row) => match row.get_child() {
Some(child) => Some(
child
.downcast::<SelectorRow>()
.unwrap()
.get_index()
.try_into()
.unwrap(),
),
None => None,
},
None => None,
}
}
pub fn select_index(&self, index: usize) {
self.widget.select_row(self.widget.get_row_at_index(index.try_into().unwrap()).as_ref());
}
pub fn show_items(&self, items: Vec<T>) {
self.items.replace(items);

12
src/window.rs
View file

@ -27,7 +27,7 @@ impl Window {
get_widget!(builder, gtk::Box, sidebar_box);
get_widget!(builder, gtk::Box, empty_screen);
let backend = Rc::new(Backend::new("test.sqlite"));
let backend = Rc::new(Backend::new("test.sqlite", std::env::current_dir().unwrap()));
let poe_list = PoeList::new(backend.clone());
let navigator = Navigator::new(&empty_screen);
@ -110,6 +110,16 @@ impl Window {
})
);
action!(
result.window,
"add-tracks",
clone!(@strong result => move |_, _| {
TracksEditor::new(result.backend.clone(), &result.window, clone!(@strong result => move || {
result.reload();
})).show();
})
);
action!(
result.window,
"edit-person",