Revert "fix conflict"

This reverts commit 1588bee5a3, reversing
changes made to 75b79d0202.

src-tauri/src/file_helpers.rs

@@ -1,156 +1,164 @@
-use file_diff::diff;
-use std::fs;
-use std::io::{Read, Write};
-
-#[tauri::command]
-pub fn rename(path: String, new_name: String) {
-  let mut new_path = path.clone();
-
-  // Check if file/folder to replace exists
-  if fs::metadata(&path).is_err() {
-    return;
-  }
-
-  // Check if path uses forward or back slashes
-  if new_path.contains('\\') {
-    new_path = path.replace('\\', "/");
-  }
-
-  let path_replaced = &path.replace(&new_path.split('/').last().unwrap(), &new_name);
-
-  fs::rename(path, &path_replaced).unwrap();
-}
-
-#[tauri::command]
-pub fn dir_create(path: String) {
-  fs::create_dir_all(path).unwrap();
-}
-
-#[tauri::command]
-pub fn dir_exists(path: &str) -> bool {
-  let path_buf = std::path::PathBuf::from(path);
-  fs::metadata(path_buf).is_ok()
-}
-
-#[tauri::command]
-pub fn dir_is_empty(path: &str) -> bool {
-  let path_buf = std::path::PathBuf::from(path);
-  fs::read_dir(path_buf).unwrap().count() == 0
-}
-
-#[tauri::command]
-pub fn dir_delete(path: &str) {
-  let path_buf = std::path::PathBuf::from(path);
-  fs::remove_dir_all(path_buf).unwrap();
-}
-
-#[tauri::command]
-pub fn are_files_identical(path1: &str, path2: &str) -> bool {
-  diff(path1, path2)
-}
-
-#[tauri::command]
-pub fn copy_file(path: String, new_path: String) -> bool {
-  let filename = &path.split('/').last().unwrap();
-  let mut new_path_buf = std::path::PathBuf::from(&new_path);
-  let path_buf = std::path::PathBuf::from(&path);
-
-  // If the new path doesn't exist, create it.
-  if !dir_exists(new_path_buf.pop().to_string().as_str()) {
-    std::fs::create_dir_all(&new_path).unwrap();
-  }
-
-  // Copy old to new
-  match std::fs::copy(&path_buf, format!("{}/{}", new_path, filename)) {
-    Ok(_) => true,
-    Err(e) => {
-      println!("Failed to copy file: {}", e);
-      println!("Path: {}", path);
-      println!("New Path: {}", new_path);
-      false
-    }
-  }
-}
-
-#[tauri::command]
-pub fn copy_file_with_new_name(path: String, new_path: String, new_name: String) -> bool {
-  let mut new_path_buf = std::path::PathBuf::from(&new_path);
-  let path_buf = std::path::PathBuf::from(&path);
-
-  // If the new path doesn't exist, create it.
-  if !dir_exists(new_path_buf.pop().to_string().as_str()) {
-    match std::fs::create_dir_all(&new_path) {
-      Ok(_) => {}
-      Err(e) => {
-        println!("Failed to create directory: {}", e);
-        return false;
-      }
-    };
-  }
-
-  // Copy old to new
-  match std::fs::copy(&path_buf, format!("{}/{}", new_path, new_name)) {
-    Ok(_) => true,
-    Err(e) => {
-      println!("Failed to copy file: {}", e);
-      println!("Path: {}", path);
-      println!("New Path: {}", new_path);
-      false
-    }
-  }
-}
-
-#[tauri::command]
-pub fn delete_file(path: String) -> bool {
-  let path_buf = std::path::PathBuf::from(&path);
-
-  match std::fs::remove_file(path_buf) {
-    Ok(_) => true,
-    Err(e) => {
-      println!("Failed to delete file: {}", e);
-      false
-    }
-  };
-
-  false
-}
-
-#[tauri::command]
-pub fn read_file(path: String) -> String {
-  let path_buf = std::path::PathBuf::from(&path);
-
-  let mut file = match fs::File::open(path_buf) {
-    Ok(file) => file,
-    Err(e) => {
-      println!("Failed to open file: {}", e);
-      return String::new();
-    }
-  };
-
-  let mut contents = String::new();
-  file.read_to_string(&mut contents).unwrap();
-
-  contents
-}
-
-#[tauri::command]
-pub fn write_file(path: String, contents: String) {
-  let path_buf = std::path::PathBuf::from(&path);
-
-  // Create file if it exists, otherwise just open and rewrite
-  let mut file = match fs::File::create(&path_buf) {
-    Ok(file) => file,
-    Err(e) => {
-      println!("Failed to open file: {}", e);
-      return;
-    }
-  };
-
-  // Write contents to file
-  match file.write_all(contents.as_bytes()) {
-    Ok(_) => (),
-    Err(e) => {
-      println!("Failed to write to file: {}", e);
-    }
-  }
-}
+use file_diff::diff;
+use std::fs;
+use std::io::{Read, Write};
+
+#[tauri::command]
+pub fn rename(path: String, new_name: String) {
+  let mut new_path = path.clone();
+
+  // Check if file/folder to replace exists
+  if fs::metadata(&path).is_err() {
+    return;
+  }
+
+  // Check if path uses forward or back slashes
+  if new_path.contains('\\') {
+    new_path = path.replace('\\', "/");
+  }
+
+  let path_replaced = &path.replace(&new_path.split('/').last().unwrap(), &new_name);
+
+  fs::rename(path, &path_replaced).unwrap();
+}
+
+#[tauri::command]
+pub fn dir_create(path: String) {
+  fs::create_dir_all(path).unwrap();
+}
+
+#[tauri::command]
+pub fn dir_exists(path: &str) -> bool {
+  let path_buf = std::path::PathBuf::from(path);
+  fs::metadata(path_buf).is_ok()
+}
+
+#[tauri::command]
+pub fn dir_is_empty(path: &str) -> bool {
+  let path_buf = std::path::PathBuf::from(path);
+  fs::read_dir(path_buf).unwrap().count() == 0
+}
+
+#[tauri::command]
+pub fn dir_delete(path: &str) {
+  let path_buf = std::path::PathBuf::from(path);
+  fs::remove_dir_all(path_buf).unwrap();
+}
+
+#[tauri::command]
+pub fn are_files_identical(path1: &str, path2: &str) -> bool {
+  diff(path1, path2)
+}
+
+#[tauri::command]
+pub fn copy_file(path: String, new_path: String) -> bool {
+  let filename = &path.split('/').last().unwrap();
+  let mut new_path_buf = std::path::PathBuf::from(&new_path);
+  let path_buf = std::path::PathBuf::from(&path);
+
+  // If the new path doesn't exist, create it.
+  if !dir_exists(new_path_buf.pop().to_string().as_str()) {
+    std::fs::create_dir_all(&new_path).unwrap();
+  }
+
+  // Copy old to new
+  match std::fs::copy(&path_buf, format!("{}/{}", new_path, filename)) {
+    Ok(_) => true,
+    Err(e) => {
+      println!("Failed to copy file: {}", e);
+      println!("Path: {}", path);
+      println!("New Path: {}", new_path);
+      false
+    }
+  }
+}
+
+#[tauri::command]
+pub fn copy_file_with_new_name(path: String, new_path: String, new_name: String) -> bool {
+  let mut new_path_buf = std::path::PathBuf::from(&new_path);
+  let path_buf = std::path::PathBuf::from(&path);
+
+  // If the new path doesn't exist, create it.
+  if !dir_exists(new_path_buf.pop().to_string().as_str()) {
+    match std::fs::create_dir_all(&new_path) {
+      Ok(_) => {}
+      Err(e) => {
+        println!("Failed to create directory: {}", e);
+        return false;
+      }
+    };
+  }
+
+  // Copy old to new
+  match std::fs::copy(&path_buf, format!("{}/{}", new_path, new_name)) {
+    Ok(_) => true,
+    Err(e) => {
+      println!("Failed to copy file: {}", e);
+      println!("Path: {}", path);
+      println!("New Path: {}", new_path);
+      false
+    }
+  }
+}
+
+#[tauri::command]
+pub fn delete_file(path: String) -> bool {
+  let path_buf = std::path::PathBuf::from(&path);
+
+  match std::fs::remove_file(path_buf) {
+    Ok(_) => true,
+    Err(e) => {
+      println!("Failed to delete file: {}", e);
+      false
+    }
+  };
+
+  false
+}
+
+#[tauri::command]
+pub fn read_file(path: String) -> String {
+  let path_buf = std::path::PathBuf::from(&path);
+
+  let mut file = match fs::File::open(path_buf) {
+    Ok(file) => file,
+    Err(e) => {
+      println!("Failed to open file: {}", e);
+      return String::new();
+    }
+  };
+
+  let mut contents = String::new();
+  file.read_to_string(&mut contents).unwrap();
+
+  contents
+}
+
+#[tauri::command]
+pub fn write_file(path: String, contents: String) {
+  let path_buf = std::path::PathBuf::from(&path);
+
+  // Create file if it exists, otherwise just open and rewrite
+  let mut file = match fs::File::options().write(true).truncate(true).open(&path_buf) {
+    Ok(file) => file,
+    Err(e) => {
+      println!("Failed to open file: {}", e);
+
+      // attempt to create file. otherwise return
+      match fs::File::create(&path_buf) {
+        Ok(file) => file,
+        Err(e) => {
+          println!("Failed to create file: {}", e);
+          return;
+        }
+      }
+    }
+  };
+
+  // Write contents to file
+  match file.write_all(contents.as_bytes()) {
+    Ok(_) => (),
+    Err(e) => {
+      println!("Failed to write to file: {}", e);
+    }
+  }
+}