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

Store source track index in track

Browse source
This commit is contained in:
Elias Projahn 2021-04-15 18:19:17 +02:00
parent 622f1312fb
commit d410be75dc
6 changed files with 15 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
musicus/src/import/import_screen.rs
View file

@ -7,7 +7,6 @@ use glib::clone;
use gtk::prelude::*;
use gtk_macros::get_widget;
use libadwaita::prelude::*;
use log::debug;
use musicus_backend::Error;
use musicus_backend::db::Medium;
use musicus_backend::import::ImportSession;

1
musicus/src/import/medium_editor.rs
View file

@ -142,6 +142,7 @@ impl MediumEditor {
let track = Track {
recording: track_set_data.recording.clone(),
work_parts: track_data.work_parts.clone(),
source_index: track_data.track_source,
path: String::new(),
};

8
musicus/src/import/medium_preview.rs
View file

@ -64,6 +64,8 @@ impl Screen<(Arc<ImportSession>, Medium), ()> for MediumPreview {
let mut last_recording_id = "";
let mut last_list = None::<gtk::ListBox>;
let import_tracks = this.session.tracks();
for track in &this.medium.tracks {
if track.recording.id != last_recording_id {
last_recording_id = &track.recording.id;
@ -109,7 +111,7 @@ impl Screen<(Arc<ImportSession>, Medium), ()> for MediumPreview {
let row = libadwaita::ActionRowBuilder::new()
.activatable(false)
.title(&title)
.subtitle(&track.path)
.subtitle(&import_tracks[track.source_index].name)
.margin_start(12)
.build();
@ -170,12 +172,12 @@ impl MediumPreview {
let mut tracks = Vec::new();
let import_tracks = self.session.tracks();
for (index, track) in self.medium.tracks.iter().enumerate() {
for track in &self.medium.tracks {
let mut track = track.clone();
// Set the track path to the new audio file location.
let import_track = &import_tracks[index];
let import_track = &import_tracks[track.source_index];
let track_path = directory.join(import_track.path.file_name().unwrap());
track.path = track_path.to_str().unwrap().to_owned();