Tahinli/rust-tcp-file-transfer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: file type recognition on the receiver

Browse source
This commit is contained in:
Ahmet Kaan GÜMÜŞ 2023-11-06 02:44:17 +03:00
parent ccc2dbc547
commit 0a6a1efc5f
1 changed files with 88 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

105
src/main.rs
View file

@ -66,10 +66,7 @@ impl FileInfo
} }
fn reading_operations(&mut self, stream:&mut TcpStream, debug_mode:&bool) fn reading_operations(&mut self, stream:&mut TcpStream, debug_mode:&bool)
{ {
//Pathbuf Symlink Metadata match self.location.as_ref()
//Pathbuf is_Symlink
match &self.location
{ {
Some(_) => Some(_) =>
{ {
@ -80,29 +77,35 @@ impl FileInfo
{ {
if Metadata::is_symlink(metadata) if Metadata::is_symlink(metadata)
{ {
//Recursivity Problem //Unix-Windows Problem
println!("\n\tError: Symlink Transfers've not Supported yet\n"); println!("\n\tError: Symlink Transfers've not Supported yet\n");
//return; return;
self.open_file(debug_mode); //self.open_file(debug_mode);
self.send_file(stream, debug_mode); //self.send_file(stream, &(100 as u8),debug_mode);
} }
else if Metadata::is_file(metadata) else if Metadata::is_file(metadata)
{ {
self.open_file(debug_mode); self.open_file(debug_mode);
self.send_file(stream, debug_mode); self.send_file(stream, &(101 as u8),debug_mode);
} }
else else if Metadata::is_dir(metadata)
{ {
//path recognition and creation on the other side //path recognition and creation on the other side
//std:path //std:path
println!("\n\tError: Folder Transfers've not Supported yet\n"); println!("\n\tError: Folder Transfers've not Supported yet\n");
return; return;
//self.open_file(debug_mode);
//self.send_file(stream, &(102 as u8),debug_mode);
}
else
{
println!("Error: Undefined Type -> {}", self.location.as_ref().unwrap());
} }
} }
None => None =>
{ {
println!("Error: Read Metadata -> {:#?}", &self.location); println!("Error: Read Metadata -> {}", self.location.as_ref().unwrap());
} }
} }
} }
@ -179,14 +182,49 @@ impl FileInfo
} }
} }
fn send_file(&mut self, stream:&mut TcpStream, debug_mode:&bool) fn send_file(&mut self, stream:&mut TcpStream, what_type:&u8,debug_mode:&bool)
{ {
self.size_total = self.metadata.as_ref().unwrap().len(); self.size_total = self.metadata.as_ref().unwrap().len();
let mut iteration = (self.size_total/BUFFER_SIZE)+1; let mut iteration = (self.size_total/BUFFER_SIZE)+1;
let total_iteration = iteration; let total_iteration = iteration;
let path_buf = PathBuf::from(Path::new(self.location.as_ref().unwrap())); let path_buf = PathBuf::from(Path::new(self.location.as_ref().unwrap()));
match what_type
{
100 =>
{
if *debug_mode
{
println!("Done: Symlink Detected -> {}", self.location.as_ref().unwrap());
}
self.callback_validation(stream, &String::from("100"), debug_mode);
}
101 =>
{
if *debug_mode
{
println!("Done: File Detected -> {}", self.location.as_ref().unwrap());
}
self.callback_validation(stream, &String::from("101"), debug_mode)
}
102 =>
{
if *debug_mode
{
println!("Done: Folder Detected -> {}", self.location.as_ref().unwrap());
}
self.callback_validation(stream, &String::from("102"), debug_mode)
}
_ =>
{
println!("Error: Undefined Type Detected ->{}", self.location.as_ref().unwrap());
return;
}
}
self.callback_validation(stream, &(self.size_total.to_string()), debug_mode); self.callback_validation(stream, &(self.size_total.to_string()), debug_mode);
self.callback_validation(stream, &path_buf.file_name().unwrap().to_str().unwrap().to_string(), debug_mode); self.callback_validation(stream, &path_buf.file_name().unwrap().to_str().unwrap().to_string(), debug_mode);
self.show_info(&iteration, debug_mode); self.show_info(&iteration, debug_mode);
while iteration != 0 while iteration != 0
{ {
@ -449,11 +487,44 @@ impl FileInfo
} }
fn write_file(&mut self, stream:&mut TcpStream, debug_mode:&bool) fn write_file(&mut self, stream:&mut TcpStream, debug_mode:&bool)
{ {
let size:u64 = self.callback_recv(stream, debug_mode).parse().unwrap(); let what_type:u8 = self.callback_recv(stream, debug_mode).parse().unwrap();
self.size_total = self.callback_recv(stream, debug_mode).parse().unwrap();
let location:String = self.callback_recv(stream, debug_mode); let location:String = self.callback_recv(stream, debug_mode);
self.forge_file(location, debug_mode); match what_type
{
100 =>
{
if *debug_mode
{
println!("Done: Symlink Detected -> {}", self.location.as_ref().unwrap());
}
self.forge_file( location, debug_mode);
return;
}
101 =>
{
if *debug_mode
{
println!("Done: File Detected -> {}", self.location.as_ref().unwrap());
}
self.forge_file(location, debug_mode);
}
102 =>
{
if *debug_mode
{
println!("Done: Folder Detected -> {}", self.location.as_ref().unwrap());
}
self.forge_file(location, debug_mode);
}
_ =>
{
println!("Error: Undefined Type -> {}", self.location.as_ref().unwrap());
return;
}
}
self.open_file(debug_mode); self.open_file(debug_mode);
let mut iteration:u64 = (size/BUFFER_SIZE)+1; let mut iteration:u64 = (&self.size_total/BUFFER_SIZE)+1;
let total_iteration = iteration; let total_iteration = iteration;
self.show_info(&iteration, debug_mode); self.show_info(&iteration, debug_mode);
while iteration != 0 while iteration != 0
@ -467,7 +538,7 @@ impl FileInfo
} }
else else
{ {
self.save_exact(&buffer[..(size%BUFFER_SIZE) as usize], debug_mode); self.save_exact(&buffer[..(&self.size_total%BUFFER_SIZE) as usize], debug_mode);
} }
self.show_progress(iteration, total_iteration); self.show_progress(iteration, total_iteration);
} }
@ -648,7 +719,7 @@ fn take_args(mut user_environment:UserEnvironment) -> Option<UserEnvironment>
} }
"--debug" | "-d" => "--debug" | "-d" =>
{ {
user_environment.debug = false; user_environment.debug = true;
} }
"--help" | "-h" => "--help" | "-h" =>
{ {