lint fixes

This commit is contained in:
SpikeHD
2022-09-04 14:18:18 -07:00
parent 541352c3fd
commit 1c27ae172e
2 changed files with 14 additions and 17 deletions

View File

@@ -1,6 +1,7 @@
use file_diff::diff; use file_diff::diff;
use std::fs; use std::fs;
use std::io::{Read, Write}; use std::io::{Read, Write};
use std::path::PathBuf;
#[tauri::command] #[tauri::command]
pub fn rename(path: String, new_name: String) { pub fn rename(path: String, new_name: String) {
@@ -35,19 +36,19 @@ pub fn dir_create(path: String) {
#[tauri::command] #[tauri::command]
pub fn dir_exists(path: &str) -> bool { pub fn dir_exists(path: &str) -> bool {
let path_buf = std::path::PathBuf::from(path); let path_buf = PathBuf::from(path);
fs::metadata(path_buf).is_ok() fs::metadata(path_buf).is_ok()
} }
#[tauri::command] #[tauri::command]
pub fn dir_is_empty(path: &str) -> bool { pub fn dir_is_empty(path: &str) -> bool {
let path_buf = std::path::PathBuf::from(path); let path_buf = PathBuf::from(path);
fs::read_dir(path_buf).unwrap().count() == 0 fs::read_dir(path_buf).unwrap().count() == 0
} }
#[tauri::command] #[tauri::command]
pub fn dir_delete(path: &str) { pub fn dir_delete(path: &str) {
let path_buf = std::path::PathBuf::from(path); let path_buf = PathBuf::from(path);
fs::remove_dir_all(path_buf).unwrap(); fs::remove_dir_all(path_buf).unwrap();
} }
@@ -59,11 +60,10 @@ pub fn are_files_identical(path1: &str, path2: &str) -> bool {
#[tauri::command] #[tauri::command]
pub fn copy_file(path: String, new_path: String) -> bool { pub fn copy_file(path: String, new_path: String) -> bool {
let filename = &path.split('/').last().unwrap(); let filename = &path.split('/').last().unwrap();
let mut new_path_buf = std::path::PathBuf::from(&new_path); let path_buf = PathBuf::from(&path);
let path_buf = std::path::PathBuf::from(&path);
// If the new path doesn't exist, create it. // If the new path doesn't exist, create it.
if !dir_exists(std::path::PathBuf::from(&new_path).pop().to_string().as_str()) { if !dir_exists(PathBuf::from(&new_path).pop().to_string().as_str()) {
std::fs::create_dir_all(&new_path).unwrap(); std::fs::create_dir_all(&new_path).unwrap();
} }
@@ -81,11 +81,11 @@ pub fn copy_file(path: String, new_path: String) -> bool {
#[tauri::command] #[tauri::command]
pub fn copy_file_with_new_name(path: String, new_path: String, new_name: String) -> bool { 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 mut new_path_buf = PathBuf::from(&new_path);
let path_buf = std::path::PathBuf::from(&path); let path_buf = PathBuf::from(&path);
// If the new path doesn't exist, create it. // If the new path doesn't exist, create it.
if !dir_exists(std::path::PathBuf::from(&new_path).pop().to_string().as_str()) { if !dir_exists(PathBuf::from(&new_path).pop().to_string().as_str()) {
match std::fs::create_dir_all(&new_path) { match std::fs::create_dir_all(&new_path) {
Ok(_) => {} Ok(_) => {}
Err(e) => { Err(e) => {
@@ -111,7 +111,7 @@ pub fn copy_file_with_new_name(path: String, new_path: String, new_name: String)
#[tauri::command] #[tauri::command]
pub fn delete_file(path: String) -> bool { pub fn delete_file(path: String) -> bool {
let path_buf = std::path::PathBuf::from(&path); let path_buf = PathBuf::from(&path);
match std::fs::remove_file(path_buf) { match std::fs::remove_file(path_buf) {
Ok(_) => true, Ok(_) => true,
@@ -126,7 +126,7 @@ pub fn delete_file(path: String) -> bool {
#[tauri::command] #[tauri::command]
pub fn read_file(path: String) -> String { pub fn read_file(path: String) -> String {
let path_buf = std::path::PathBuf::from(&path); let path_buf = PathBuf::from(&path);
let mut file = match fs::File::open(path_buf) { let mut file = match fs::File::open(path_buf) {
Ok(file) => file, Ok(file) => file,
@@ -144,7 +144,7 @@ pub fn read_file(path: String) -> String {
#[tauri::command] #[tauri::command]
pub fn write_file(path: String, contents: String) { pub fn write_file(path: String, contents: String) {
let path_buf = std::path::PathBuf::from(&path); let path_buf = PathBuf::from(&path);
// Create file if it exists, otherwise just open and rewrite // Create file if it exists, otherwise just open and rewrite
let mut file = match fs::File::create(&path_buf) { let mut file = match fs::File::create(&path_buf) {

View File

@@ -1,7 +1,7 @@
import { invoke } from '@tauri-apps/api' import { invoke } from '@tauri-apps/api'
import { dataDir } from '@tauri-apps/api/path' import { dataDir } from '@tauri-apps/api/path'
import DownloadHandler from './download' import DownloadHandler from './download'
import { getGameDataFolder, getGameExecutable, getGameFolder, getGameVersion } from './game' import { getGameDataFolder } from './game'
export async function patchMetadata() { export async function patchMetadata() {
const metadataExists = await invoke('dir_exists', { const metadataExists = await invoke('dir_exists', {
@@ -177,10 +177,7 @@ export async function getGameMetadataPath() {
return null return null
} }
return (gameData + '\\Managed\\Metadata').replace( return (gameData + '\\Managed\\Metadata').replace(/\\/g, '/')
/\\/g,
'/'
)
} }
export async function getBackupMetadataPath() { export async function getBackupMetadataPath() {