wip big download
This commit is contained in:
TIBERGHIEN corentin
@@ -9,6 +9,7 @@ use egui::{
|
||||
Popup, ScrollArea, SidePanel, TextStyle, TopBottomPanel, Ui, ViewportCommand,
|
||||
debug_text::print,
|
||||
};
|
||||
use std::collections::HashSet;
|
||||
use std::{collections::HashMap, fmt::format, io::Seek};
|
||||
|
||||
use std::fs::{File, OpenOptions, create_dir};
|
||||
@@ -48,8 +49,11 @@ pub struct P2PClientApp {
|
||||
show_network_popup: bool, // gérer selon besoin
|
||||
|
||||
error_message: Option<String>, // Some(message) -> afficher, None -> rien
|
||||
//
|
||||
active_server: String,
|
||||
|
||||
current_downloading_file_map: MerkleTree,
|
||||
remaining_chunks: HashSet<[u8; 32]>,
|
||||
root_downloading_file: String,
|
||||
}
|
||||
|
||||
impl P2PClientApp {
|
||||
@@ -57,6 +61,7 @@ impl P2PClientApp {
|
||||
//let (root_hash, tree_content) = MerkleNode::generate_base_tree();
|
||||
|
||||
let mut loaded_fs = HashMap::new();
|
||||
let mut current_downloading_file_map = MerkleTree::new(HashMap::new(), [0; 32]);
|
||||
//let tree = MerkleTree::new(tree_content, root_hash);
|
||||
//loaded_fs.insert("bob".to_string(), tree);
|
||||
|
||||
@@ -78,6 +83,9 @@ impl P2PClientApp {
|
||||
connect_name_input: "bob".to_string(),
|
||||
active_server: "".to_string(),
|
||||
shared_tree: generate_base_tree(),
|
||||
current_downloading_file_map: current_downloading_file_map,
|
||||
root_downloading_file: "".to_string(),
|
||||
remaining_chunks: HashSet::new(),
|
||||
}
|
||||
}
|
||||
pub fn show_error(&mut self, msg: impl Into<String>) {
|
||||
@@ -163,6 +171,7 @@ impl eframe::App for P2PClientApp {
|
||||
NetworkCommand::GetChildren(
|
||||
entry.content_hash,
|
||||
ip.clone(),
|
||||
false,
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -170,7 +179,11 @@ impl eframe::App for P2PClientApp {
|
||||
MerkleNode::BigDirectory(bigd) => {
|
||||
for entry in bigd.children_hashes {
|
||||
let _ = self.network_cmd_tx.send(
|
||||
NetworkCommand::GetChildren(entry, ip.clone()),
|
||||
NetworkCommand::GetChildren(
|
||||
entry,
|
||||
ip.clone(),
|
||||
false,
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -235,7 +248,50 @@ impl eframe::App for P2PClientApp {
|
||||
NetworkEvent::Error(err) => {
|
||||
self.show_error(err);
|
||||
}
|
||||
NetworkEvent::DataReceived(_, merkle_node) => todo!(),
|
||||
NetworkEvent::InitDownload(hash, ip) => {
|
||||
if let Some(addr) = &self.active_peer {
|
||||
if let Some(roottree) = self.loaded_fs.get(addr) {
|
||||
if let Some(root) = roottree.data.get(&hash) {
|
||||
let _ = self
|
||||
.current_downloading_file_map
|
||||
.data
|
||||
.insert(hash, root.clone());
|
||||
let _ = self
|
||||
.network_cmd_tx
|
||||
.send(NetworkCommand::GetChildren(hash, ip, true));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
NetworkEvent::DataReceived(hash, merkle_node, ip) => {
|
||||
let _ = self
|
||||
.current_downloading_file_map
|
||||
.data
|
||||
.insert(hash, merkle_node.clone());
|
||||
|
||||
println!("merkle:{}", merkle_node.get_type_byte());
|
||||
match merkle_node {
|
||||
MerkleNode::Big(bigfile) => {
|
||||
for entry in bigfile.children_hashes {
|
||||
println!("entry: {:?}", entry);
|
||||
let _ = self.network_cmd_tx.send(NetworkCommand::GetChildren(
|
||||
entry,
|
||||
ip.clone(),
|
||||
true,
|
||||
));
|
||||
self.remaining_chunks.insert(entry);
|
||||
}
|
||||
self.remaining_chunks.remove(&hash);
|
||||
}
|
||||
MerkleNode::Chunk(chunk) => {
|
||||
self.remaining_chunks.remove(&hash);
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
if self.remaining_chunks.is_empty() {
|
||||
println!("bigfile téléchargé");
|
||||
}
|
||||
}
|
||||
NetworkEvent::HandshakeFailed() => {}
|
||||
NetworkEvent::ServerHandshakeFailed(err) => {
|
||||
self.active_server = "".to_string();
|
||||
@@ -350,6 +406,11 @@ impl eframe::App for P2PClientApp {
|
||||
error.to_string()
|
||||
);
|
||||
}
|
||||
if let Some(active_peer) = &self.active_peer {
|
||||
if let Some(tree) = self.loaded_fs.get(active_peer) {
|
||||
println!("{}", tree.data.len());
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
@@ -530,7 +591,7 @@ impl P2PClientApp {
|
||||
.on_hover_text("Click to request file chunks...")
|
||||
.clicked()
|
||||
{
|
||||
match create_dir("../Download/") {
|
||||
match create_dir("./Download/") {
|
||||
Ok(_) => println!("Directory created successfully!"),
|
||||
Err(e) => println!("Failed to create directory: {}", e),
|
||||
}
|
||||
@@ -573,25 +634,16 @@ impl P2PClientApp {
|
||||
});
|
||||
}
|
||||
MerkleNode::Big(node) => {
|
||||
/*CollapsingHeader::new(format!("📄 (B) {}", name))
|
||||
.default_open(false)
|
||||
.enabled(true)
|
||||
.show(ui, |ui| {
|
||||
for child in &node.children_hashes {
|
||||
self.draw_file_node(ui, child.clone(), tree, depth + 1, None);
|
||||
}
|
||||
});*/
|
||||
if ui
|
||||
.selectable_label(false, format!("📄 (B) {}", name))
|
||||
.on_hover_text("Click to request file chunks...")
|
||||
.clicked()
|
||||
{
|
||||
/*self.network_cmd_tx.send(NetworkCommand::GetChildren(node.children_hashes, ))*/
|
||||
todo!();
|
||||
// if let Some(peer_id) = active_peer_id.clone() {
|
||||
// let _ = self.network_cmd_tx.send(NetworkCommand::RequestChunk(peer_id, entry_hash.clone()));
|
||||
// // self.status_message = format!("Requested file chunks for: {}...", &entry_hash[..8]);
|
||||
// }
|
||||
if let Some(addr) = &self.active_peer {
|
||||
let _ = self
|
||||
.network_cmd_tx
|
||||
.send(NetworkCommand::InitDownload(to_draw, addr.clone()));
|
||||
}
|
||||
}
|
||||
}
|
||||
MerkleNode::BigDirectory(node) => {
|
||||
|
||||
Reference in New Issue
Block a user