Add overwrite mode

altugbakan · Oct 8, 2023 · 3af429f · 3af429f
1 parent bf7b2a2
commit 3af429f
Show file tree

Hide file tree

Showing 2 changed files with 55 additions and 39 deletions.
diff --git a/src/config.rs b/src/config.rs
@@ -31,6 +31,8 @@ pub struct Config {
     pub read_only: bool,
     /// Duplicate all packets sent from the server. (default: 1)
     pub duplicate_packets: u8,
+    /// Overwrite existing files. (default: false)
+    pub overwrite: bool,
 }
 
 impl Config {
@@ -44,6 +46,7 @@ impl Config {
             single_port: false,
             read_only: false,
             duplicate_packets: 1,
+            overwrite: false,
         };
 
         args.next();
@@ -92,6 +95,7 @@ impl Config {
                     println!("  -s, --single-port\t\tUse a single port for both sending and receiving (default: false)");
                     println!("  -r, --read-only\t\tRefuse all write requests, making the server read-only (default: false)");
                     println!("  --duplicate-packets <NUM>\tDuplicate all packets sent from the server (default: 0)");
+                    println!("  --overwrite\t\t\tOverwrite existing files (default: false)");
                     println!("  -h, --help\t\t\tPrint help information");
                     process::exit(0);
                 }
@@ -111,6 +115,9 @@ impl Config {
                         return Err("Missing duplicate packets after flag".into());
                     }
                 }
+                "--overwrite" => {
+                    config.overwrite = true;
+                }
 
                 invalid => return Err(format!("Invalid flag: {invalid}").into()),
             }

diff --git a/src/server.rs b/src/server.rs
@@ -32,6 +32,7 @@ pub struct Server {
     directory: PathBuf,
     single_port: bool,
     read_only: bool,
+    overwrite: bool,
     duplicate_packets: u8,
     largest_block_size: usize,
     clients: HashMap<SocketAddr, Sender<Packet>>,
@@ -47,6 +48,7 @@ impl Server {
             directory: config.directory.clone(),
             single_port: config.single_port,
             read_only: config.read_only,
+            overwrite: config.overwrite,
             duplicate_packets: config.duplicate_packets,
             largest_block_size: DEFAULT_BLOCK_SIZE,
             clients: HashMap::new(),
@@ -94,7 +96,7 @@ impl Server {
                             {
                                 eprintln!("Could not send error packet");
                             };
-                            eprintln!("Received invalid request");
+                            eprintln!("Received write request while in read-only mode");
                             continue;
                         }
                         println!("Receiving {filename} from {from}");
@@ -194,15 +196,51 @@ impl Server {
         to: &SocketAddr,
     ) -> Result<(), Box<dyn Error>> {
         let file_path = &self.directory.join(file_name);
+        let initialize_write = &mut || -> Result<(), Box<dyn Error>> {
+            let worker_options = parse_options(options, RequestType::Write)?;
+            let mut socket: Box<dyn Socket>;
+
+            if self.single_port {
+                let single_socket = create_single_socket(&self.socket, to)?;
+                self.clients.insert(*to, single_socket.sender());
+                self.largest_block_size = max(self.largest_block_size, worker_options.block_size);
+
+                socket = Box::new(single_socket);
+            } else {
+                socket = Box::new(create_multi_socket(&self.socket.local_addr()?, to)?);
+            }
+
+            socket.set_read_timeout(worker_options.timeout)?;
+            socket.set_write_timeout(worker_options.timeout)?;
+
+            accept_request(&socket, options, RequestType::Write)?;
+
+            let worker = Worker::new(
+                socket,
+                file_path.clone(),
+                worker_options.block_size,
+                worker_options.timeout,
+                worker_options.window_size,
+                self.duplicate_packets,
+            );
+            worker.receive()
+        };
+
         match check_file_exists(file_path, &self.directory) {
-            ErrorCode::FileExists => Socket::send_to(
-                &self.socket,
-                &Packet::Error {
-                    code: ErrorCode::FileExists,
-                    msg: "requested file already exists".to_string(),
-                },
-                to,
-            ),
+            ErrorCode::FileExists => {
+                if self.overwrite {
+                    initialize_write()
+                } else {
+                    Socket::send_to(
+                        &self.socket,
+                        &Packet::Error {
+                            code: ErrorCode::FileExists,
+                            msg: "requested file already exists".to_string(),
+                        },
+                        to,
+                    )
+                }
+            }
             ErrorCode::AccessViolation => Socket::send_to(
                 &self.socket,
                 &Packet::Error {
@@ -211,36 +249,7 @@ impl Server {
                 },
                 to,
             ),
-            ErrorCode::FileNotFound => {
-                let worker_options = parse_options(options, RequestType::Write)?;
-                let mut socket: Box<dyn Socket>;
-
-                if self.single_port {
-                    let single_socket = create_single_socket(&self.socket, to)?;
-                    self.clients.insert(*to, single_socket.sender());
-                    self.largest_block_size =
-                        max(self.largest_block_size, worker_options.block_size);
-
-                    socket = Box::new(single_socket);
-                } else {
-                    socket = Box::new(create_multi_socket(&self.socket.local_addr()?, to)?);
-                }
-
-                socket.set_read_timeout(worker_options.timeout)?;
-                socket.set_write_timeout(worker_options.timeout)?;
-
-                accept_request(&socket, options, RequestType::Write)?;
-
-                let worker = Worker::new(
-                    socket,
-                    file_path.clone(),
-                    worker_options.block_size,
-                    worker_options.timeout,
-                    worker_options.window_size,
-                    self.duplicate_packets,
-                );
-                worker.receive()
-            }
+            ErrorCode::FileNotFound => initialize_write(),
             _ => Err("Unexpected error code when checking file".into()),
         }
     }