Skip to content

Commit 046d6d0

Browse files
committed
feat: recursively resolve dragged folders
1 parent 9bc9c3a commit 046d6d0

2 files changed

Lines changed: 115 additions & 61 deletions

File tree

‎player/src/dnd_resolver.rs‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
use std::sync::Arc;
2+
use std::{fs::read_dir, path::PathBuf};
3+
4+
use futures::future::join_all;
5+
use protocol::Track;
6+
use tokio::sync::RwLock;
7+
8+
use crate::{
9+
gui::{ui_update, UIUpdateEvent},
10+
transmit::AudioInfoReader,
11+
State,
12+
};
13+
14+
pub async fn resolve_dnd(state: Arc<RwLock<State>>, data: String) -> (Vec<Track>, usize) {
15+
let mut frontier: Vec<PathBuf> = data
16+
.split('\n')
17+
.map(|p| PathBuf::from(p.trim().replace("file://", "")))
18+
.filter(|p| p.exists())
19+
.collect();
20+
21+
let mut track_paths: Vec<PathBuf> = vec![];
22+
23+
while !frontier.is_empty() {
24+
let path = frontier.pop().unwrap();
25+
26+
let Ok(metadata) = path.metadata() else { continue };
27+
28+
if metadata.is_symlink() {
29+
continue;
30+
} else if metadata.is_dir() {
31+
let Ok(dir_entries) = read_dir(path) else { continue };
32+
for entry in dir_entries.flatten() {
33+
frontier.push(entry.path());
34+
}
35+
} else {
36+
let extension = path.extension().unwrap_or_default().to_str().unwrap();
37+
if matches!(
38+
extension,
39+
"mp3" | "m4a" | "flac" | "wav" | "ogg" | "wma" | "opus"
40+
) {
41+
track_paths.push(path);
42+
}
43+
}
44+
}
45+
46+
let num_tracks = track_paths.len();
47+
48+
{
49+
let mut s = state.write().await;
50+
s.loading_count += num_tracks;
51+
ui_update!(UIUpdateEvent::Status);
52+
}
53+
54+
let tasks: Vec<tokio::task::JoinHandle<Option<Track>>> = {
55+
let s = state.read().await;
56+
57+
track_paths
58+
.into_iter()
59+
.map(|p| {
60+
let file_string = p.as_os_str().to_string_lossy();
61+
let encrypted_path = s.key.encrypt_path(&file_string.to_string()).unwrap();
62+
let my_id = s.my_id.clone();
63+
64+
tokio::spawn(async move {
65+
match AudioInfoReader::load(&p) {
66+
Ok(mut reader) => match reader.read_info() {
67+
Ok((_, _, metadata)) => {
68+
let track = protocol::Track {
69+
path: encrypted_path,
70+
owner: my_id,
71+
metadata,
72+
};
73+
Some(track)
74+
}
75+
Err(e) => {
76+
println!("errored reading metadata for {:?}: {e}", p);
77+
None
78+
}
79+
},
80+
Err(e) => {
81+
println!("errored loading {:?}: {e}", p);
82+
None
83+
}
84+
}
85+
})
86+
})
87+
.collect()
88+
};
89+
90+
let mut tracks = join_all(tasks)
91+
.await
92+
.into_iter()
93+
.filter_map(|t| match t {
94+
Ok(Some(t)) => Some(t),
95+
_ => None,
96+
})
97+
.collect::<Vec<Track>>();
98+
99+
tracks.sort_by_key(|t| {
100+
let s = t.metadata.track_no.clone().unwrap_or_default();
101+
let n = s
102+
.split('/')
103+
.next()
104+
.unwrap()
105+
.parse::<usize>()
106+
.unwrap_or_default();
107+
(t.metadata.album.clone().unwrap_or_default(), n)
108+
});
109+
110+
(tracks, num_tracks)
111+
}

‎player/src/main.rs‎

Lines changed: 4 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ use std::collections::{HashMap, VecDeque};
22
use std::sync::Arc;
33

44
use connection::{ConnectionActor, ConnectionActorHandle};
5-
use futures::future::join_all;
65
use key::Key;
76
use preferences::Preferences;
87
use tokio::sync::RwLock;
@@ -13,7 +12,7 @@ mod preferences;
1312
use crate::preferences::Server;
1413

1514
mod transmit;
16-
use transmit::{AudioInfoReader, TransmitCommand};
15+
use crate::transmit::TransmitCommand;
1716

1817
mod audio;
1918
use crate::audio::AudioCommand;
@@ -22,6 +21,8 @@ mod gui;
2221
use crate::gui::connection_window::ServerStatus;
2322
use crate::gui::{ui_update, ConnectionDlgEvent, UIEvent, UIThread, UIUpdateEvent};
2423

24+
mod dnd_resolver;
25+
2526
use protocol::{RoomOptions, Track};
2627

2728
async fn maybe_connection_exited(maybe_actor: &Option<ConnectionActorHandle>) -> Option<()> {
@@ -245,65 +246,7 @@ impl MainThread {
245246
UIEvent::DroppedFiles(data) => {
246247
let Some(conn) = self.connection.as_mut() else { continue };
247248

248-
let paths: Vec<std::path::PathBuf> = data
249-
.split('\n')
250-
.map(|p| std::path::PathBuf::from(p.trim().replace("file://", "")))
251-
.filter(|p| p.exists())
252-
.collect();
253-
254-
let num_tracks = paths.len();
255-
256-
let tasks: Vec<tokio::task::JoinHandle<Option<Track>>> = {
257-
let mut s = self.state.write().await;
258-
259-
s.loading_count += num_tracks;
260-
ui_update!(UIUpdateEvent::Status);
261-
262-
paths
263-
.into_iter()
264-
.map(|p| {
265-
let file_string = p.as_os_str().to_string_lossy();
266-
let encrypted_path = s.key.encrypt_path(&file_string.to_string()).unwrap();
267-
let my_id = s.my_id.clone();
268-
269-
tokio::spawn(async move {
270-
match AudioInfoReader::load(&p) {
271-
Ok(mut reader) => {
272-
match reader.read_info() {
273-
Ok((_, _, metadata)) => {
274-
let track = protocol::Track {
275-
path: encrypted_path,
276-
owner: my_id,
277-
metadata
278-
};
279-
Some(track)
280-
}
281-
Err(e) => {
282-
println!("errored reading metadata for {:?}: {e}", p);
283-
None
284-
}
285-
}
286-
}
287-
Err(e) => {
288-
println!("errored loading {:?}: {e}", p);
289-
None
290-
}
291-
}
292-
})
293-
})
294-
.collect()
295-
};
296-
297-
let mut tracks = join_all(tasks).await.into_iter().filter_map(|t| match t {
298-
Ok(Some(t)) => Some(t),
299-
_ => None
300-
}).collect::<Vec<Track>>();
301-
302-
tracks.sort_by_key(|t| {
303-
let s = t.metadata.track_no.clone().unwrap_or_default();
304-
let n = s.split('/').next().unwrap().parse::<usize>().unwrap_or_default();
305-
(t.metadata.album.clone().unwrap_or_default(), n)
306-
});
249+
let (tracks, num_tracks) = dnd_resolver::resolve_dnd(self.state.clone(), data).await;
307250

308251
// TODO: do all at once instead of waiting for each
309252
for t in tracks {

0 commit comments

Comments
 (0)