root/clash-verge-rev
1
0
Fork 0
mirror of https://github.com/clash-verge-rev/clash-verge-rev.git synced 2026-01-29 00:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: Nyanpasu Misc

Browse Source
This commit is contained in:
keiko233
2023-11-12 00:09:32 +08:00
parent 3459a16b48
commit 91074bebd6
19 changed files with 41 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src-tauri/src/config/clash.rs
View File

@@ -58,7 +58,7 @@ impl IClashTemp {
help::save_yaml(
&dirs::clash_path()?,
&self.0,
Some("# Generated by Clash Verge"),
Some("# Generated by Clash Nyanpasu"),
)
}

4
src-tauri/src/config/config.rs
View File

@@ -57,7 +57,7 @@ impl Config {
help::save_yaml(
&runtime_path,
&Config::clash().latest().0,
Some("# Clash Verge Runtime"),
Some("# Clash Nyanpasu Runtime"),
)?;
}
}
@@ -78,7 +78,7 @@ impl Config {
.as_ref()
.ok_or(anyhow!("failed to get runtime config"))?;
help::save_yaml(&path, &config, Some("# Generated by Clash Verge"))?;
help::save_yaml(&path, &config, Some("# Generated by Clash Nyanpasu"))?;
Ok(path)
}

2
src-tauri/src/config/profiles.rs
View File

@@ -69,7 +69,7 @@ impl IProfiles {
help::save_yaml(
&dirs::profiles_path()?,
self,
Some("# Profiles Config for Clash Verge"),
Some("# Profiles Config for Clash Nyanpasu"),
)
}

2
src-tauri/src/config/verge.rs
View File

@@ -143,7 +143,7 @@ impl IVerge {
/// Save IVerge App Config
pub fn save_file(&self) -> Result<()> {
help::save_yaml(&dirs::verge_path()?, &self, Some("# Clash Verge Config"))
help::save_yaml(&dirs::verge_path()?, &self, Some("# Clash Nyanpasu Config"))
}
/// patch verge config

2
src-tauri/src/core/manager.rs
View File

@@ -13,7 +13,7 @@ pub fn grant_permission(core: String) -> anyhow::Result<()> {
#[cfg(target_os = "macos")]
let output = {
// the path of clash /Applications/Clash Verge.app/Contents/MacOS/clash
// the path of clash /Applications/Clash Nyanpasu.app/Contents/MacOS/clash
// https://apple.stackexchange.com/questions/82967/problem-with-empty-spaces-when-executing-shell-commands-in-applescript
// let path = escape(&path);
let path = path.replace(' ', "\\\\ ");

2
src-tauri/src/core/sysopt.rs
View File

@@ -158,7 +158,7 @@ impl Sysopt {
#[cfg(target_os = "windows")]
let app_path = format!("\"{app_path}\"");
// use the /Applications/Clash Verge.app path
// use the /Applications/Clash Nyanpasu.app path
#[cfg(target_os = "macos")]
let app_path = (|| -> Option<String> {
let path = std::path::PathBuf::from(&app_path);

12
src-tauri/src/core/win_service.rs
View File

@@ -30,7 +30,7 @@ pub struct JsonResponse {
pub data: Option<ResponseBody>,
}
/// Install the Clash Verge Service
/// Install the Clash Nyanpasu Service
/// 该函数应该在协程或者线程中执行，避免UAC弹窗阻塞主线程
pub async fn install_service() -> Result<()> {
let binary_path = dirs::service_path()?;
@@ -60,7 +60,7 @@ pub async fn install_service() -> Result<()> {
Ok(())
}
/// Uninstall the Clash Verge Service
/// Uninstall the Clash Nyanpasu Service
/// 该函数应该在协程或者线程中执行，避免UAC弹窗阻塞主线程
pub async fn uninstall_service() -> Result<()> {
let binary_path = dirs::service_path()?;
@@ -99,10 +99,10 @@ pub async fn check_service() -> Result<JsonResponse> {
.get(url)
.send()
.await
.context("failed to connect to the Clash Verge Service")?
.context("failed to connect to the Clash Nyanpasu Service")?
.json::<JsonResponse>()
.await
.context("failed to parse the Clash Verge Service response")?;
.context("failed to parse the Clash Nyanpasu Service response")?;
Ok(response)
}
@@ -148,7 +148,7 @@ pub(super) async fn run_core_by_service(config_file: &PathBuf) -> Result<()> {
.await?
.json::<JsonResponse>()
.await
.context("failed to connect to the Clash Verge Service")?;
.context("failed to connect to the Clash Nyanpasu Service")?;
if res.code != 0 {
bail!(res.msg);
@@ -168,7 +168,7 @@ pub(super) async fn stop_core_by_service() -> Result<()> {
.await?
.json::<JsonResponse>()
.await
.context("failed to connect to the Clash Verge Service")?;
.context("failed to connect to the Clash Nyanpasu Service")?;
if res.code != 0 {
bail!(res.msg);

6
src-tauri/src/utils/init.rs
View File

@@ -93,21 +93,21 @@ pub fn init_config() -> Result<()> {
crate::log_err!(dirs::clash_path().map(|path| {
if !path.exists() {
help::save_yaml(&path, &IClashTemp::template().0, Some("# Clash Verge"))?;
help::save_yaml(&path, &IClashTemp::template().0, Some("# Clash Nyanpasuasu"))?;
}
<Result<()>>::Ok(())
}));
crate::log_err!(dirs::verge_path().map(|path| {
if !path.exists() {
help::save_yaml(&path, &IVerge::template(), Some("# Clash Verge"))?;
help::save_yaml(&path, &IVerge::template(), Some("# Clash Nyanpasu"))?;
}
<Result<()>>::Ok(())
}));
crate::log_err!(dirs::profiles_path().map(|path| {
if !path.exists() {
help::save_yaml(&path, &IProfiles::template(), Some("# Clash Verge"))?;
help::save_yaml(&path, &IProfiles::template(), Some("# Clash Nyanpasu"))?;
}
<Result<()>>::Ok(())
}));

2
src-tauri/src/utils/resolve.rs
View File

@@ -59,7 +59,7 @@ pub fn create_window(app_handle: &AppHandle) {
"main".to_string(),
tauri::WindowUrl::App("index.html".into()),
)
.title("Clash Verge")
.title("Clash Nyanpasu")
.fullscreen(false)
.min_inner_size(600.0, 520.0);