[feature] better socket address fetching logic
This commit is contained in:
Tiago Batista Cardoso
@@ -453,92 +453,103 @@ impl eframe::App for P2PClientApp {
|
||||
});
|
||||
|
||||
ui.separator();
|
||||
ScrollArea::vertical().show(ui, |ui| {
|
||||
if self.known_peers.is_empty() {
|
||||
ui.add_space(10.0);
|
||||
ui.label("No active peers.");
|
||||
} else {
|
||||
for peer in &self.known_peers {
|
||||
let is_active =
|
||||
self.active_peer.as_ref().map_or(false, |id| id == &peer.0); // if peer.id == self.active_peer_id
|
||||
ScrollArea::vertical()
|
||||
.auto_shrink([false; 2])
|
||||
.show(ui, |ui| {
|
||||
ui.style_mut().visuals.widgets.inactive.bg_fill =
|
||||
ui.style().visuals.widgets.inactive.bg_fill; // no-op to get mutable borrow
|
||||
if self.known_peers.is_empty() {
|
||||
ui.add_space(10.0);
|
||||
ui.label("No active peers.");
|
||||
} else {
|
||||
for peer in &self.known_peers {
|
||||
let is_active =
|
||||
self.active_peer.as_ref().map_or(false, |id| id == &peer.0); // if peer.id == self.active_peer_id
|
||||
|
||||
let selectable: Response;
|
||||
// if &self.active_server == &peer.0 {
|
||||
// // Create a frame with green background and render the selectable inside it.
|
||||
// // Adjust rounding, padding and stroke as desired.
|
||||
// let frame = Frame {
|
||||
// fill: Color32::DARK_BLUE,
|
||||
// stroke: Stroke::default(),
|
||||
// corner_radius: CornerRadius::from(0.5),
|
||||
// ..Default::default()
|
||||
// };
|
||||
// let internal = frame.show(ui, |ui| {
|
||||
// // horizontal row: label on the left, spinner on the right
|
||||
// ui.horizontal(|ui| {
|
||||
// // let selectable label take remaining space
|
||||
// ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
|
||||
// ui.add_space(0.0); // ensure layout established
|
||||
// return ui.selectable_label(
|
||||
// is_active,
|
||||
// format!("{}", peer.0),
|
||||
// );
|
||||
// })
|
||||
// .inner // return Response from the inner closure if your egui version does so
|
||||
// })
|
||||
// });
|
||||
// selectable = internal.inner.inner;
|
||||
// } else {
|
||||
// selectable = ui.selectable_label(is_active, format!("{}", peer.0));
|
||||
// }
|
||||
let selectable: Response;
|
||||
// if &self.active_server == &peer.0 {
|
||||
// // Create a frame with green background and render the selectable inside it.
|
||||
// // Adjust rounding, padding and stroke as desired.
|
||||
// let frame = Frame {
|
||||
// fill: Color32::DARK_BLUE,
|
||||
// stroke: Stroke::default(),
|
||||
// corner_radius: CornerRadius::from(0.5),
|
||||
// ..Default::default()
|
||||
// };
|
||||
// let internal = frame.show(ui, |ui| {
|
||||
// // horizontal row: label on the left, spinner on the right
|
||||
// ui.horizontal(|ui| {
|
||||
// // let selectable label take remaining space
|
||||
// ui.with_layout(Layout::left_to_right(Align::Center), |ui| {
|
||||
// ui.add_space(0.0); // ensure layout established
|
||||
// return ui.selectable_label(
|
||||
// is_active,
|
||||
// format!("{}", peer.0),
|
||||
// );
|
||||
// })
|
||||
// .inner // return Response from the inner closure if your egui version does so
|
||||
// })
|
||||
// });
|
||||
// selectable = internal.inner.inner;
|
||||
// } else {
|
||||
// selectable = ui.selectable_label(is_active, format!("{}", peer.0));
|
||||
// }
|
||||
|
||||
// place spinner to the right of the label
|
||||
ui.horizontal(|ui| {
|
||||
// Use same width for the label widget as the selectable we already created:
|
||||
// Recreate selectable inline so both label and spinner share the same row.
|
||||
let resp = if &self.active_server == &peer.0 {
|
||||
// draw with frame inline
|
||||
let frame = Frame {
|
||||
fill: Color32::DARK_BLUE,
|
||||
stroke: Stroke::default(),
|
||||
corner_radius: CornerRadius::from(0.5),
|
||||
..Default::default()
|
||||
// place spinner to the right of the label
|
||||
ui.horizontal(|ui| {
|
||||
// Use same width for the label widget as the selectable we already created:
|
||||
// Recreate selectable inline so both label and spinner share the same row.
|
||||
let resp = if &self.active_server == &peer.0 {
|
||||
// draw with frame inline
|
||||
let frame = Frame {
|
||||
fill: Color32::DARK_BLUE,
|
||||
stroke: Stroke::default(),
|
||||
corner_radius: CornerRadius::from(0.5),
|
||||
..Default::default()
|
||||
};
|
||||
frame
|
||||
.show(ui, |ui| {
|
||||
ui.selectable_label(
|
||||
is_active,
|
||||
format!("{}", peer.0),
|
||||
)
|
||||
})
|
||||
.inner
|
||||
} else {
|
||||
ui.selectable_label(is_active, format!("{}", peer.0))
|
||||
};
|
||||
frame
|
||||
.show(ui, |ui| {
|
||||
ui.selectable_label(is_active, format!("{}", peer.0))
|
||||
})
|
||||
.inner
|
||||
} else {
|
||||
ui.selectable_label(is_active, format!("{}", peer.0))
|
||||
};
|
||||
|
||||
ui.add_space(4.0); // small gap
|
||||
ui.add_space(4.0); // small gap
|
||||
|
||||
if self.loading_peers.contains(&peer.0) {
|
||||
// push spinner to right by expanding a spacer before it
|
||||
ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
|
||||
ui.spinner();
|
||||
});
|
||||
}
|
||||
|
||||
// use resp (click handling etc.)
|
||||
if resp.clicked() {
|
||||
// switch to displaying this peer's tree
|
||||
self.active_peer = Some(peer.0.clone());
|
||||
// Request root content if not loaded
|
||||
if !self
|
||||
.loaded_fs
|
||||
.contains_key(self.active_peer.as_ref().unwrap())
|
||||
{
|
||||
//todo!();
|
||||
let _ = self.network_cmd_tx.send(NetworkCommand::Discover(
|
||||
peer.0.clone(),
|
||||
"root".to_string(),
|
||||
self.connected_address.clone(),
|
||||
));
|
||||
if self.loading_peers.contains(&peer.0) {
|
||||
// push spinner to right by expanding a spacer before it
|
||||
ui.with_layout(
|
||||
Layout::right_to_left(Align::Center),
|
||||
|ui| {
|
||||
ui.spinner();
|
||||
},
|
||||
);
|
||||
}
|
||||
}
|
||||
resp.context_menu(|ui| {
|
||||
|
||||
// use resp (click handling etc.)
|
||||
if resp.clicked() {
|
||||
// switch to displaying this peer's tree
|
||||
self.active_peer = Some(peer.0.clone());
|
||||
// Request root content if not loaded
|
||||
if !self
|
||||
.loaded_fs
|
||||
.contains_key(self.active_peer.as_ref().unwrap())
|
||||
{
|
||||
//todo!();
|
||||
let _ =
|
||||
self.network_cmd_tx.send(NetworkCommand::Discover(
|
||||
peer.0.clone(),
|
||||
"root".to_string(),
|
||||
self.connected_address.clone(),
|
||||
));
|
||||
}
|
||||
}
|
||||
resp.context_menu(|ui| {
|
||||
// ... action
|
||||
match self.server_status {
|
||||
ServerStatus::Connected => {
|
||||
@@ -589,78 +600,78 @@ impl eframe::App for P2PClientApp {
|
||||
|
||||
// ... autres boutons
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
// if self.loading_peers.contains(&peer.0) {
|
||||
// ui.spinner();
|
||||
// }
|
||||
// if self.loading_peers.contains(&peer.0) {
|
||||
// ui.spinner();
|
||||
// }
|
||||
|
||||
//if selectable.clicked() {
|
||||
// switch to displaying this peer's tree
|
||||
//self.active_peer = Some(peer.0.clone());
|
||||
//// Request root content if not loaded
|
||||
//if !self
|
||||
// .loaded_fs
|
||||
// .contains_key(self.active_peer.as_ref().unwrap())
|
||||
//{
|
||||
// //todo!();
|
||||
// let _ = self.network_cmd_tx.send(NetworkCommand::Discover(
|
||||
// peer.0.clone(),
|
||||
// "root".to_string(),
|
||||
// self.connected_address.clone(),
|
||||
// ));
|
||||
//}
|
||||
//}
|
||||
//selectable.context_menu(|ui| {
|
||||
// // ... action
|
||||
// match self.server_status {
|
||||
// ServerStatus::Connected => {
|
||||
// if ui
|
||||
// .button("Utiliser le peer en tant que serveur")
|
||||
// .clicked()
|
||||
// {
|
||||
// self.active_server = peer.0.to_string();
|
||||
// let res = self.network_cmd_tx.send(
|
||||
// NetworkCommand::ServerHandshake(
|
||||
// peer.0.to_string(),
|
||||
// self.connected_address.clone(),
|
||||
// ),
|
||||
// );
|
||||
// }
|
||||
// }
|
||||
// _ => {}
|
||||
// }
|
||||
// if ui.button("Send Ping").clicked() {
|
||||
// let res = self.network_cmd_tx.send(NetworkCommand::Ping(
|
||||
// peer.0.to_string(),
|
||||
// self.connected_address.clone(),
|
||||
// ));
|
||||
//if selectable.clicked() {
|
||||
// switch to displaying this peer's tree
|
||||
//self.active_peer = Some(peer.0.clone());
|
||||
//// Request root content if not loaded
|
||||
//if !self
|
||||
// .loaded_fs
|
||||
// .contains_key(self.active_peer.as_ref().unwrap())
|
||||
//{
|
||||
// //todo!();
|
||||
// let _ = self.network_cmd_tx.send(NetworkCommand::Discover(
|
||||
// peer.0.clone(),
|
||||
// "root".to_string(),
|
||||
// self.connected_address.clone(),
|
||||
// ));
|
||||
//}
|
||||
//}
|
||||
//selectable.context_menu(|ui| {
|
||||
// // ... action
|
||||
// match self.server_status {
|
||||
// ServerStatus::Connected => {
|
||||
// if ui
|
||||
// .button("Utiliser le peer en tant que serveur")
|
||||
// .clicked()
|
||||
// {
|
||||
// self.active_server = peer.0.to_string();
|
||||
// let res = self.network_cmd_tx.send(
|
||||
// NetworkCommand::ServerHandshake(
|
||||
// peer.0.to_string(),
|
||||
// self.connected_address.clone(),
|
||||
// ),
|
||||
// );
|
||||
// }
|
||||
// }
|
||||
// _ => {}
|
||||
// }
|
||||
// if ui.button("Send Ping").clicked() {
|
||||
// let res = self.network_cmd_tx.send(NetworkCommand::Ping(
|
||||
// peer.0.to_string(),
|
||||
// self.connected_address.clone(),
|
||||
// ));
|
||||
|
||||
// self.loading_peers.push(peer.0.to_owned());
|
||||
// }
|
||||
// if ui.button("Send Nat Traversal Request").clicked() {
|
||||
// match self.network_cmd_tx.send(NetworkCommand::NatTraversal(
|
||||
// peer.0.to_string(),
|
||||
// self.connected_address.clone(),
|
||||
// )) {
|
||||
// Ok(_) => {
|
||||
// print!("[+] successfully sent nat traversal request")
|
||||
// }
|
||||
// Err(_) => {
|
||||
// print!("[-] failed to send nat traversal request")
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// if ui.button("Infos").clicked() {
|
||||
// // action 3
|
||||
// ui.close();
|
||||
// }
|
||||
// self.loading_peers.push(peer.0.to_owned());
|
||||
// }
|
||||
// if ui.button("Send Nat Traversal Request").clicked() {
|
||||
// match self.network_cmd_tx.send(NetworkCommand::NatTraversal(
|
||||
// peer.0.to_string(),
|
||||
// self.connected_address.clone(),
|
||||
// )) {
|
||||
// Ok(_) => {
|
||||
// print!("[+] successfully sent nat traversal request")
|
||||
// }
|
||||
// Err(_) => {
|
||||
// print!("[-] failed to send nat traversal request")
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
// if ui.button("Infos").clicked() {
|
||||
// // action 3
|
||||
// ui.close();
|
||||
// }
|
||||
|
||||
// // ... autres boutons
|
||||
//});
|
||||
// // ... autres boutons
|
||||
//});
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
CentralPanel::default().show(ctx, |ui| {
|
||||
@@ -680,7 +691,11 @@ impl eframe::App for P2PClientApp {
|
||||
self.draw_file_tree(ui, tree);
|
||||
});
|
||||
} else {
|
||||
ui.label(format!("Loading root for peer: {}", active_peer));
|
||||
ui.horizontal(|ui| {
|
||||
ui.label(format!("Loading root for peer: {}", active_peer));
|
||||
ui.add_space(8.0);
|
||||
ui.spinner(); // or conditional: if is_loading { ui.spinner(); }
|
||||
});
|
||||
}
|
||||
} else {
|
||||
ui.label("Connect to a peer to view a file tree.");
|
||||
|
||||
Reference in New Issue
Block a user