update

Author: rnbguy

Cargo.lock

@@ -10,10 +10,10 @@ description = "easy file transfer on same network"
 [dependencies]
 anyhow = "1.0.59"
 clap = { version = "3.2.16", features = ["derive", "cargo"] }
-env_logger = "0.9.0"
 if-addrs = "0.7.0"
-indicatif = "0.17.0"
-log = "0.4.17"
+indicatif = { version = "0.17.0", features = ["tokio"] }
 mdns-sd = "0.5.5"
 names = { version = "0.14.0", default-features = false }
 tokio = { version = "1.20.1", features = ["full", "rt-multi-thread", "net"] }
+tracing = "0.1"
+tracing-subscriber = "0.3.15"

Cargo.toml

@@ -14,12 +14,13 @@ $ cargo install --git https://github.com/rnbguy/rope
 # Send
 
 ```
-$ rope send <FILE>
-MAGIC -> blistering-barnacles
+$ rope send video.mp4
+MAGIC: blistering-barnacles
 ```
 
 # Receive
 
 ```
 $ rope recv blistering-barnacles
+$ ls video.mp4
 ```

README.md

@@ -1,7 +1,12 @@
+use std::fs::metadata;
+use std::path::{Path, PathBuf};
+
 use crate::AResult;
+use anyhow::anyhow;
 use clap::Parser;
 use clap::{crate_authors, crate_description, crate_name, crate_version};
 use tokio::sync::oneshot;
+use tracing::{debug, info};
 
 use crate::{generate_magic_string, recv_file, recv_msg, send_file, send_msg};
 
@@ -10,38 +15,68 @@ use crate::{generate_magic_string, recv_file, recv_msg, send_file, send_msg};
 pub enum App {
     Send {
         file_path: String,
-        opt_magic_string: Option<String>,
+        magic_string: Option<String>,
     },
     Recv {
         magic_string: String,
+        save_dir: Option<PathBuf>,
     },
 }
 
 impl App {
     pub async fn run(&self) -> AResult<()> {
+        debug!("{self:?}");
         match self {
             App::Send {
-                opt_magic_string,
+                magic_string,
                 file_path,
             } => {
-                let magic_string = opt_magic_string
+                let magic_string = magic_string
                     .to_owned()
                     .unwrap_or_else(generate_magic_string);
-                println!("MAGIC -> {magic_string}");
+
+                println!("MAGIC: {magic_string}");
+
+                info!("MAGIC: {magic_string}");
 
                 let (tx, rx) = oneshot::channel();
-                let port = send_file(file_path, tx).await?;
+
+                let file_size = metadata(file_path)?.len();
+
+                let port = send_file(file_path, file_size, tx).await?;
+
                 send_msg(
                     &magic_string,
                     port,
-                    [("name".into(), file_path.into())].into(),
-                    rx,
-                )
-                .await?;
+                    [
+                        ("name".into(), file_path.into()),
+                        ("size".into(), file_size.to_string()),
+                    ]
+                    .into(),
+                )?;
+
+                rx.await?;
             }
-            App::Recv { magic_string } => {
+            App::Recv {
+                magic_string,
+                save_dir,
+            } => {
                 let (addrs, port, data) = recv_msg(magic_string)?;
-                recv_file(addrs.iter().next().unwrap(), port, &data["name"]).await?;
+                let name = Path::new(&data["name"])
+                    .file_name()
+                    .and_then(|x| x.to_str())
+                    .ok_or_else(|| anyhow!("Error while read filename"))?;
+                let path = save_dir.clone().unwrap_or_else(PathBuf::new).join(name);
+                for addr in &addrs {
+                    debug!("Trying {addr}");
+                    if recv_file(addr, port, &path, data["size"].parse()?)
+                        .await
+                        .is_ok()
+                    {
+                        debug!("File is received. Breaking loop");
+                        break;
+                    }
+                }
             }
         }
         Ok(())