Merge pull request #56 from spieglt/mirroring

Folder sending

Author: spieglt

Cargo.lock

@@ -1,9 +1,9 @@
 [package]
 name = "flying-carpet"
-version = "7.1.0"
+version = "8.0.0"
 description = "Encrypted file transfer over ad hoc WiFi between Android, iOS, Linux, macOS, and Windows"
 authors = ["Theron Spiegl"]
-license = "BSD-3-clause"
+license = "GPL-3.0-only"
 repository = "https://github.com/spieglt/flyingcarpet"
 edition = "2021"
 rust-version = "1.57"

Flying Carpet/src-tauri/Cargo.toml

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "FlyingCarpet",
-    "version": "7.1.0"
+    "version": "8.0.0"
   },
   "tauri": {
     "allowlist": {

Flying Carpet/src-tauri/tauri.conf.json

@@ -15,7 +15,7 @@
       <div class="horizontalContainer" style="flex-grow: 0;">
         <div>
           <h1 style="margin-bottom: 0px; padding-bottom: 0px;">Flying Carpet</h1>
-          <small style="margin-top: 0px; padding-top: 0px;">Version 7</small>
+          <small style="margin-top: 0px; padding-top: 0px;">Version 8</small>
           <small style="margin-top: 0px; padding-top: 0px; color: blue; float: right; cursor: pointer;" id="aboutButton">
             About
           </small>

Flying Carpet/src/index.html

@@ -383,7 +383,7 @@ window.modeChange = modeChange;
 window.peerChange = peerChange;
 
 const aboutMessage = `https://flyingcarpet.spiegl.dev
-Version: 7.1
+Version: 8.0
 [email protected]
 Copyright (c) 2023, Theron Spiegl
 All rights reserved.

Flying Carpet/src/main.js

@@ -1,10 +1,10 @@
-## Version 7 supports Android and iOS!
+## Version 8 adds the option to send folders from Android and iOS
 
 Android version is available [here](https://play.google.com/store/apps/details?id=dev.spiegl.flyingcarpet), or if you prefer to sideload, `android_FlyingCarpet.apk` is available on the [releases](https://github.com/spieglt/FlyingCarpet/releases) page.
 
 iOS version [here](https://apps.apple.com/us/app/flying-carpet-file-transfer/id1637377410) or search the App Store for "Flying Carpet File Transfer".
 
-Linux, macOS, and Windows versions available on the [releases](https://github.com/spieglt/FlyingCarpet/releases) page. Installers and standalone executable versions available.
+Linux, macOS, and Windows versions are available on the [releases](https://github.com/spieglt/FlyingCarpet/releases) page. Installers and standalone executable versions available.
 
 # Flying Carpet
 
@@ -44,10 +44,6 @@ Don't have a flash drive? Don't have access to a wireless network? Need to move
 
 + macOS sometimes switches back to a wireless network with internet connectivity during particularly long transfers. I haven't been able to replicate this reliably and am not sure if a fix is possible. Please file an issue if you experience this.
 
-+ Flying Carpet should rejoin you to your previous wireless network after a completed or canceled transfer. This may not happen if the program freezes, crashes, or if the windows is closed during operation.
-
-+ Flying Carpet no longer preserves directory structure when sending a folder. This became too complicated once the mobile versions entered the picture. If this feature is desired, please email me at [email protected] or file an issue. Or, as a workaround, just zip the directory before sending and unzip on the other device.
-
 ## Planned Features
 
 + Add Flying Carpet shortcut to iOS Share menu.

README.md

@@ -1,7 +1,8 @@
 [package]
 name = "flying-carpet-core"
-version = "0.1.0"
+version = "8.0.0"
 edition = "2021"
+license = "GPL-3.0-only"
 
 [dependencies]
 aes-gcm = "0.10"

core/Cargo.toml

@@ -20,7 +20,7 @@ use tokio::{
 };
 
 const CHUNKSIZE: usize = 1_000_000; // 1 MB
-const MAJOR_VERSION: u64 = 7;
+const MAJOR_VERSION: u64 = 8;
 
 pub trait UI: Clone + Send + 'static {
     fn output(&self, msg: &str);
@@ -177,6 +177,17 @@ pub async fn start_transfer<T: UI>(
                     return Some(stream);
                 }
             }
+            // find folder common to all files
+            let mut common_folder = files[0].parent().expect("file has no parent");
+            if files.len() > 1 {
+                for file in &files[1..] {
+                    let current = file.parent().expect("file has no parent");
+                    if current.components().collect::<Vec<_>>().len() < common_folder.components().collect::<Vec<_>>().len() {
+                        common_folder = current;
+                    }
+                }
+            }
+            ui.output(&format!("common folder: {}", common_folder.display()));
             // send files
             for (i, file) in files.iter().enumerate() {
                 let file_name = file
@@ -190,7 +201,7 @@ pub async fn start_transfer<T: UI>(
                     files.len(),
                     file_name
                 ));
-                match sending::send_file(file, &key, &mut stream, ui).await {
+                match sending::send_file(file, common_folder, &key, &mut stream, ui).await {
                     Ok(_) => (),
                     Err(e) => {
                         ui.output(&format!("Error sending file: {}", e));
@@ -372,11 +383,10 @@ async fn confirm_version(
 }
 
 // TODO:
+// folder send check box? or just rely on drag and drop? if so, disable it, store/restore on refresh.
 // fix tests
-// add license to file and cargo.toml
 // code signing for windows?
 // fix bug where multiple start/cancel clicks stack while waiting for transfer to cancel, at least on linux
-// wifi networks not being deleted on linux (when hosting)?
 // update screenshots?
 // show qr code after refresh
 // test pulling wifi card, quitting program, etc.

core/src/lib.rs

@@ -29,19 +29,35 @@ pub async fn receive_file<T: UI>(
 
     // receive file details
     let (filename, file_size) = receive_file_details(stream).await?;
+    // TODO: convert forward slashes to backslashes before receiving if mirroring?
     ui.output(&format!("Filename: {}", filename));
     ui.output(&format!(
         "File size: {}",
         utils::make_size_readable(file_size)
     ));
     let mut bytes_left = file_size;
 
-    // check if file being received already exists. if so, find new filename.
+    // see if we already have the file being sent
     let mut full_path = folder.clone();
     full_path.push(&filename);
+    let need_transfer = check_for_file(&full_path, file_size, stream).await?;
+    if !need_transfer {
+        ui.output("Recipient already has this file, skipping.");
+        return Ok(())
+    }
+
+    // make parent directories if necessary
+    utils::make_parent_directories(&full_path)?;
+
+    // check if file being received already exists. if so, find new filename.
     let mut i = 1;
     while full_path.is_file() {
-        let new_name = format!("({}) ", i) + &filename;
+        let file_name = full_path
+            .file_name()
+            .expect("could not get filename from full path")
+            .to_str()
+            .expect("could not convert filename to str");
+        let new_name = format!("({}) ", i) + file_name;
         full_path.pop();
         full_path.push(new_name);
         i += 1;
@@ -143,3 +159,33 @@ async fn receive_file_details(stream: &mut TcpStream) -> std::io::Result<(String
     let file_size = stream.read_u64().await?;
     Ok((filename, file_size))
 }
+
+// returns Ok(true) if we need to perform the transfer
+async fn check_for_file(filename: &Path, size: u64, stream: &mut TcpStream) -> Result<bool, Box<dyn Error>> {
+    // check if file by this name and size exists
+    if filename.is_file() {
+        // check size
+        let metadata = fs::metadata(filename)?;
+        let local_size = metadata.len();
+        if size == local_size {
+            stream.write_u64(1).await?;
+            let mut hashes_match = true;
+            let local_hash = utils::hash_file(filename)?;
+            let mut peer_hash = vec![0; 32];
+            stream.read_exact(&mut peer_hash).await?;
+            for i in 0..local_hash.len() {
+                if local_hash[i] != peer_hash[i] {
+                    hashes_match = false;
+                }
+            }
+            stream.write_u64(if hashes_match { 1 } else { 0 }).await?;
+            Ok(!hashes_match)
+        } else {
+            stream.write_u64(0).await?;
+            Ok(true)
+        }
+    } else {
+        stream.write_u64(0).await?;
+        Ok(true)
+    }
+}

core/src/receiving.rs

@@ -14,6 +14,7 @@ use tokio::{
 
 pub async fn send_file<T: UI>(
     file: &Path,
+    prefix: &Path,
     key: &[u8],
     stream: &mut TcpStream,
     ui: &T,
@@ -27,16 +28,27 @@ pub async fn send_file<T: UI>(
     ui.output(&format!("File size: {}", utils::make_size_readable(size)));
 
     // send file details
-    let filename = file
-        .file_name()
-        .expect("could not extract filename from path");
+    let mut filename = file
+        .strip_prefix(prefix)?
+        .to_string_lossy()
+        .to_string();
+    if cfg!(windows) {
+        filename = filename.replace("\\", "/");
+    }
     send_file_details(
-        filename.to_str().expect("couldn't convert filename to str"),
+        &filename,
         size,
         stream,
     )
     .await?;
 
+    // check to see if receiving end already has the file
+    let need_transfer = check_for_file(&file, stream).await?;
+    if !need_transfer {
+        ui.output("Recipient already has this file, skipping.");
+        return Ok(())
+    }
+
     // show progress bar
     ui.show_progress_bar();
 
@@ -122,6 +134,21 @@ async fn send_file_details(
     Ok(())
 }
 
+// returns Ok(true) if we need to perform the transfer
+async fn check_for_file(filename: &Path, stream: &mut TcpStream) -> Result<bool, Box<dyn Error>> {
+    let has_file = stream.read_u64().await?;
+    if has_file == 1 {
+        let hash = utils::hash_file(filename)?;
+        stream.write(&hash).await?;
+        let hashes_match = stream.read_u64().await?;
+        Ok(hashes_match != 1) // if hashes match, return false because we don't need transfer
+    } else {
+        Ok(true)
+    }
+}
+
+
+
 /*
 mod tests {
     use tokio::io::AsyncReadExt;

core/src/sending.rs

@@ -1,8 +1,11 @@
 use rand::Rng;
+use sha2::{Sha256, Digest};
 use std::{
+    error::Error,
     ffi::{c_char, CString},
     fs,
-    path::PathBuf,
+    io,
+    path::{PathBuf, Path},
     process,
 };
 
@@ -36,6 +39,20 @@ pub fn expand_dir(dir: PathBuf) -> (Vec<String>, Vec<PathBuf>) {
     (files_found, dirs_to_search)
 }
 
+pub fn make_parent_directories(full_path: &Path) -> io::Result<()> {
+    if let Some(dirs) = full_path.parent() {
+        fs::create_dir_all(dirs)?;
+    }
+    Ok(())
+}
+
+pub fn hash_file(filename: &Path) -> Result<Vec<u8>, Box<dyn Error>> {
+    let mut file = fs::File::open(filename)?;
+    let mut hasher = Sha256::new();
+    io::copy(&mut file, &mut hasher)?;
+    Ok(hasher.finalize().to_vec())
+}
+
 pub fn generate_password() -> String {
     let mut rng = rand::thread_rng();
     let chars: Vec<char> = "23456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ"
@@ -77,8 +94,7 @@ pub fn format_time(seconds: f64) -> String {
 }
 
 pub fn is_compatible(peer_version: u64) -> bool {
-    // for version 7, we will only be compatible with version 7
-    // a future version 8 might be compatible with version 7, and would need to make that decision here.
+    // version 8 is not compatible with previous versions
     peer_version == MAJOR_VERSION
 }