[READ-ONLY] Mirror of https://github.com/probablykasper/ferrum. Music library app for Mac, Linux and Windows
ferrum.kasper.space
electron
linux
macos
music
music-library
music-player
napi
windows
Better error messages
+11
-11
+1
README.md
+1
README.md
···
6
6
7
7
### ToDo
8
8
9
+
- Make removing from playlists work when filter or sorting is used (rn, if you remove the first shown track, it would remove the first track in the playlist)
9
10
- Write tags to files:
10
11
- m4a/aac: https://github.com/Saecki/rust-mp4ameta
11
12
- mp3/mp3: https://github.com/polyfloyd/rust-id3
+5
-5
native/src/page.rs
+5
-5
native/src/page.rs
···
162
162
.trackLists
163
163
.get_mut(&data.open_playlist_id)
164
164
.ok_or(nerr!("Playlist ID not found"))?;
165
+
let playlist = match tracklist {
166
+
TrackList::Playlist(playlist) => playlist,
167
+
TrackList::Folder(_) => return Err(nerr!("Cannot rearrange tracks in folder")),
168
+
TrackList::Special(_) => return Err(nerr!("Cannot rearrange tracks in special playlist")),
169
+
};
165
170
if data.sort_key != "index" || data.sort_desc != true {
166
171
return Err(nerr!("Cannot rearrange when custom sorting is used"));
167
172
}
168
173
if data.filter != "" {
169
174
return Err(nerr!("Cannot rearrange when filter is used"));
170
175
}
171
-
let playlist = match tracklist {
172
-
TrackList::Playlist(playlist) => playlist,
173
-
TrackList::Folder(_) => return Err(nerr!("Cannot rearrange tracks in folder")),
174
-
TrackList::Special(_) => return Err(nerr!("Cannot rearrange tracks in special playlist")),
175
-
};
176
176
let mut start_ids = Vec::new();
177
177
let mut moved_ids = Vec::new();
178
178
let mut end_ids = Vec::new();
+5
-5
native/src/playlists.rs
+5
-5
native/src/playlists.rs
···
43
43
.trackLists
44
44
.get_mut(&data.open_playlist_id)
45
45
.ok_or(nerr!("Playlist ID not found"))?;
46
+
let playlist = match open_playlist {
47
+
TrackList::Playlist(playlist) => playlist,
48
+
TrackList::Folder(_) => return Err(nerr!("Cannot remove track from folder")),
49
+
TrackList::Special(_) => return Err(nerr!("Cannot remove track from special playlist")),
50
+
};
46
51
if data.sort_key != "index" || data.sort_desc != true {
47
52
return Err(nerr!("Cannot remove track when custom sorting is used"));
48
53
}
49
54
if data.filter != "" {
50
55
return Err(nerr!("Cannot remove track when filter is used"));
51
56
}
52
-
let playlist = match open_playlist {
53
-
TrackList::Playlist(playlist) => playlist,
54
-
TrackList::Folder(_) => return Err(nerr!("Cannot remove track from folder")),
55
-
TrackList::Special(_) => return Err(nerr!("Cannot remove track from special playlist")),
56
-
};
57
57
let mut new_list = Vec::new();
58
58
let mut indexes_to_remove = indexes_to_remove.iter();
59
59
let mut next_index = indexes_to_remove.next().map(|n| *n as usize);
-1
src/components/TrackList.svelte
-1
src/components/TrackList.svelte
···
152
152
function dragEndHandler() {
153
153
dragging = false
154
154
if (dragToIndex !== null) {
155
-
console.log(indexes, dragToIndex)
156
155
const newSelection = page.moveTracks(indexes, dragToIndex)
157
156
for (let i = newSelection.from; i <= newSelection.to; i++) {
158
157
selection.add(i)