feat: supports change config dir

This commit is contained in:
GyDi 2022-04-12 23:09:32 +08:00
parent 2f284cfdc9
commit f726e8a7b3
No known key found for this signature in database
GPG Key ID: 1C95E0D3467B3084
2 changed files with 40 additions and 6 deletions

View File

@ -10,7 +10,7 @@ mod utils;
use crate::{ use crate::{
core::VergeConfig, core::VergeConfig,
utils::{resolve, server}, utils::{dirs, resolve, server},
}; };
use tauri::{ use tauri::{
api, CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, SystemTrayMenuItem, api, CustomMenuItem, Manager, SystemTray, SystemTrayEvent, SystemTrayMenu, SystemTrayMenuItem,
@ -22,6 +22,11 @@ fn main() -> std::io::Result<()> {
return Ok(()); return Ok(());
} }
#[cfg(target_os = "windows")]
unsafe {
dirs::init_portable_flag();
}
let tray_menu = SystemTrayMenu::new() let tray_menu = SystemTrayMenu::new()
.add_item(CustomMenuItem::new("open_window", "Show")) .add_item(CustomMenuItem::new("open_window", "Show"))
.add_item(CustomMenuItem::new("system_proxy", "System Proxy")) .add_item(CustomMenuItem::new("system_proxy", "System Proxy"))

View File

@ -1,5 +1,6 @@
use std::env::temp_dir; use std::env::temp_dir;
use std::path::{Path, PathBuf}; use std::path::PathBuf;
use tauri::utils::platform::current_exe;
use tauri::{ use tauri::{
api::path::{home_dir, resource_dir}, api::path::{home_dir, resource_dir},
Env, PackageInfo, Env, PackageInfo,
@ -15,12 +16,40 @@ static VERGE_CONFIG: &str = "verge.yaml";
static PROFILE_YAML: &str = "profiles.yaml"; static PROFILE_YAML: &str = "profiles.yaml";
static PROFILE_TEMP: &str = "clash-verge-runtime.yaml"; static PROFILE_TEMP: &str = "clash-verge-runtime.yaml";
/// portable flag
#[allow(unused)]
static mut PORTABLE_FLAG: bool = false;
/// initialize portable flag
pub unsafe fn init_portable_flag() {
#[cfg(target_os = "windows")]
{
let exe = current_exe().unwrap();
let dir = exe.parent().unwrap();
let dir = PathBuf::from(dir).join(".config/PORTABLE");
if dir.exists() {
PORTABLE_FLAG = true;
}
}
}
/// get the verge app home dir /// get the verge app home dir
pub fn app_home_dir() -> PathBuf { pub fn app_home_dir() -> PathBuf {
home_dir() #[cfg(target_os = "windows")]
.unwrap() unsafe {
.join(Path::new(".config")) if !PORTABLE_FLAG {
.join(Path::new(APP_DIR)) home_dir().unwrap().join(".config").join(APP_DIR)
} else {
let app_exe = current_exe().unwrap();
let app_exe = dunce::canonicalize(app_exe).unwrap();
let app_dir = app_exe.parent().unwrap();
PathBuf::from(app_dir).join(".config").join(APP_DIR)
}
}
#[cfg(not(target_os = "windows"))]
home_dir().unwrap().join(".config").join(APP_DIR)
} }
/// get the resources dir /// get the resources dir