rustdesk/hbb_common
1
0
Fork 0
mirror of https://github.com/rustdesk/hbb_common.git synced 2025-07-03 08:25:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

refact, reload peers

Browse Source 
Signed-off-by: fufesou <linlong1266@gmail.com>
This commit is contained in:
fufesou 2025-02-20 07:57:11 +08:00
parent 0d7f746291
commit e608898d08
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
protos/message.proto
View File

@ -78,7 +78,7 @@ message LoginRequest {
oneof union { oneof union {
FileTransfer file_transfer = 7; FileTransfer file_transfer = 7;
PortForward port_forward = 8; PortForward port_forward = 8;
ViewCamera view_camera = 9; ViewCamera view_camera = 15;
} }
bool video_ack_required = 9; bool video_ack_required = 9;
uint64 session_id = 10; uint64 session_id = 10;

20
src/config.rs
View File

@ -1273,14 +1273,11 @@ impl PeerConfig {
Config::with_extension(Config::path(path)) Config::with_extension(Config::path(path))
} }
#[inline]
// The number of peers to load in the first round when showing the peers card list in the main window. // The number of peers to load in the first round when showing the peers card list in the main window.
// When there're too many peers, loading all of them at once will take a long time. // When there're too many peers, loading all of them at once will take a long time.
// We can load them in two rouds, the first round loads the first 100 peers, and the second round loads the rest. // We can load them in two rouds, the first round loads the first 100 peers, and the second round loads the rest.
// Then the UI will show the first 100 peers first, and the rest will be loaded and shown later. // Then the UI will show the first 100 peers first, and the rest will be loaded and shown later.
pub fn get_loading_batch_count() -> usize { pub const BATCH_LOADING_COUNT: usize = 100;
100
}
pub fn get_vec_id_modified_time_path( pub fn get_vec_id_modified_time_path(
id_filters: &Option<Vec<String>>, id_filters: &Option<Vec<String>>,
@ -1344,12 +1341,11 @@ impl PeerConfig {
async fn preload_peers_async() { async fn preload_peers_async() {
let now = std::time::Instant::now(); let now = std::time::Instant::now();
let vec_id_modified_time_path = Self::get_vec_id_modified_time_path(&None); let vec_id_modified_time_path = Self::get_vec_id_modified_time_path(&None);
let batch_count = 300;
let total_count = vec_id_modified_time_path.len(); let total_count = vec_id_modified_time_path.len();
let mut futs = vec![]; let mut futs = vec![];
for (_, _, path) in vec_id_modified_time_path.into_iter() { for (_, _, path) in vec_id_modified_time_path.into_iter() {
futs.push(Self::preload_file_async(path)); futs.push(Self::preload_file_async(path));
if futs.len() >= batch_count { if futs.len() >= Self::BATCH_LOADING_COUNT {
futures::future::join_all(futs).await; futures::future::join_all(futs).await;
futs = vec![]; futs = vec![];
} }
@ -1360,7 +1356,7 @@ impl PeerConfig {
log::info!( log::info!(
"Preload peers done in {:?}, batch_count: {}, total: {}", "Preload peers done in {:?}, batch_count: {}, total: {}",
now.elapsed(), now.elapsed(),
batch_count, Self::BATCH_LOADING_COUNT,
total_count total_count
); );
} }
@ -1397,12 +1393,14 @@ impl PeerConfig {
let to = match to { let to = match to {
Some(to) => to.min(all.len()), Some(to) => to.min(all.len()),
None => { None => (from + Self::BATCH_LOADING_COUNT).min(all.len()),
let batch_count = Self::get_loading_batch_count();
(from + batch_count).min(all.len())
}
}; };
// to <= from is unexpected, but we can just return an empty vec in this case.
if to <= from {
return (vec![], from);
}
let peers: Vec<_> = all[from..to] let peers: Vec<_> = all[from..to]
.iter() .iter()
.map(|(id, t, p)| { .map(|(id, t, p)| {