dumbgoy/soulseek-rs-modded
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

chore: formatting

Browse Source
This commit is contained in:
Michel de Graaf
2026-01-04 20:37:03 +01:00
parent 94b33d4bd6
commit dfe6f532fa
22 changed files with 582 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soulseek-rs-lib/src/actor/mod.rs
+5 -2
View File
@@ -1,5 +1,5 @@
use std::sync::mpsc::{channel, Receiver, Sender};
use std::sync::Arc;
use std::sync::mpsc::{Receiver, Sender, channel};
use std::time::{Duration, Instant};
use crate::trace;
@@ -161,7 +161,10 @@ impl ActorSystem {
}
}
}
trace!("[actor_system] run_actor_loop ENDED - processed {} messages, {} ticks", message_count, tick_count);
trace!(
"[actor_system] run_actor_loop ENDED - processed {} messages, {} ticks",
message_count, tick_count
);
}
}
soulseek-rs-lib/src/actor/peer_actor.rs
+15 -10
View File
@@ -159,9 +159,12 @@ impl PeerActor {
if let Some(ref handle) = self.self_handle
&& let Err(e) =
handle.send(PeerMessage::SendMessage(transfer_response))
{
error!("[peer:{}] Failed to send TransferResponse message: {}", username, e);
}
{
error!(
"[peer:{}] Failed to send TransferResponse message: {}",
username, e
);
}
}
PeerMessage::TransferResponse {
token,
@@ -177,15 +180,15 @@ impl PeerActor {
if !allowed {
if let Some(reason_text) = reason {
debug!(
"[peer:{}] Transfer rejected: {} - token {}, waiting for TransferRequest...",
username, reason_text, token
);
"[peer:{}] Transfer rejected: {} - token {}, waiting for TransferRequest...",
username, reason_text, token
);
}
} else {
debug!(
"[peer:{}] Transfer allowed, ready to connect with token {:}",
username, token
);
"[peer:{}] Transfer allowed, ready to connect with token {:}",
username, token
);
self.client_channel
.send(ClientOperation::DownloadFromPeer(
token,
@@ -258,7 +261,9 @@ impl PeerActor {
let username = self.peer.read().unwrap().username.clone();
error!(
"[peer:{}] Error reading from peer: {} (kind: {:?}). Disconnecting.",
username, e, e.kind()
username,
e,
e.kind()
);
self.disconnect_with_error(e);
return;
soulseek-rs-lib/src/actor/server_actor.rs
+28 -20
View File
@@ -24,7 +24,7 @@ use std::sync::mpsc::{Receiver, Sender};
use std::sync::{Arc, RwLock};
use std::time::{Duration, Instant};
use crate::{debug, error, info, trace, warn, SoulseekRs};
use crate::{SoulseekRs, debug, error, info, trace, warn};
#[derive(Debug, Clone)]
pub struct PeerAddress {
@@ -483,8 +483,8 @@ impl ServerActor {
obfuscated_port,
} => {
debug!(
"[server] Received GetPeerAddress response for {}: {}:{} (obf_type: {}, obf_port: {})"
, username, host, port, obfuscation_type, obfuscated_port
"[server] Received GetPeerAddress response for {}: {}:{} (obf_type: {}, obf_port: {})",
username, host, port, obfuscation_type, obfuscated_port
);
if let Err(e) = self.client_channel.send(
@@ -496,7 +496,10 @@ impl ServerActor {
obfuscated_port,
},
) {
error!("[server] Error forwarding GetPeerAddress response to client: {}", e);
error!(
"[server] Error forwarding GetPeerAddress response to client: {}",
e
);
}
}
ServerMessage::ProcessRead => {
@@ -515,23 +518,27 @@ impl ServerActor {
let timeout = Duration::from_secs(5);
let context = self.context.clone();
std::thread::spawn(move || loop {
if start.elapsed() >= timeout {
let _ = response.send(Err(SoulseekRs::Timeout));
break;
}
std::thread::spawn(move || {
loop {
if start.elapsed() >= timeout {
let _ = response.send(Err(SoulseekRs::Timeout));
break;
}
if let Some(logged_in) = context.read().unwrap().logged_in {
let result = if logged_in {
Ok(true)
} else {
Err(SoulseekRs::AuthenticationFailed)
};
let _ = response.send(result);
break;
}
if let Some(logged_in) =
context.read().unwrap().logged_in
{
let result = if logged_in {
Ok(true)
} else {
Err(SoulseekRs::AuthenticationFailed)
};
let _ = response.send(result);
break;
}
std::thread::sleep(Duration::from_millis(100));
std::thread::sleep(Duration::from_millis(100));
}
});
}
ServerMessage::FileSearch { token, query } => {
@@ -560,7 +567,8 @@ impl ServerActor {
Err(e) => {
error!(
"[server] Error reading from server: {} (kind: {:?}). Disconnecting.",
e, e.kind()
e,
e.kind()
);
self.disconnect_with_error(e);
return;