add logo and more

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-yarn pretty-quick --staged
+#yarn pretty-quick --staged

package.json

@@ -1,6 +1,6 @@
 {
   "name": "clash-verge",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "license": "GPL-3.0",
   "scripts": {
     "dev": "tauri dev",
@@ -39,7 +39,8 @@
     "react-virtuoso": "^3.1.3",
     "recoil": "^0.7.6",
     "snarkdown": "^2.0.0",
-    "swr": "^1.3.0"
+    "swr": "^1.3.0",
+    "yarn": "^1.22.19"
   },
   "devDependencies": {
     "@actions/github": "^5.0.3",

src-tauri/src/config/clash.rs

@@ -26,7 +26,7 @@ impl IClashTemp {
 
         map.insert("mixed-port".into(), 7890.into());
         map.insert("log-level".into(), "info".into());
-        map.insert("allow-lan".into(), false.into());
+        map.insert("allow-lan".into(), true.into());
         map.insert("mode".into(), "rule".into());
         map.insert("external-controller".into(), "127.0.0.1:9090".into());
         map.insert("secret".into(), "".into());

src-tauri/src/config/prfitem.rs

@@ -5,6 +5,9 @@ use serde::{Deserialize, Serialize};
 use serde_yaml::Mapping;
 use std::fs;
 use sysproxy::Sysproxy;
+// use std::collections::HashMap;
+use tauri::regex::Regex;
+
 
 use super::Config;
 
@@ -276,10 +279,21 @@ impl PrfItem {
             },
             None => None,
         };
+        let re=Regex::new(r"(\?|&)name=([^&]*)(&|$)").unwrap();
+        let mut defname="Remote Profile";
+        match re.captures(url) {
+            Some(caps) => {
+                defname = caps.get(2).unwrap().as_str();        
+            }
+            None => {
+                // The regex did not match. Deal with it here!
+            }
+        }
+        
 
         let uid = help::get_uid("r");
         let file = format!("{uid}.yaml");
-        let name = name.unwrap_or(filename.unwrap_or("Remote File".into()));
+        let name = name.unwrap_or(filename.unwrap_or(defname.into()));
         let data = resp.text_with_charset("utf-8").await?;
 
         // check the data whether the valid yaml format

src-tauri/src/config/verge.rs

@@ -102,14 +102,8 @@ impl IVerge {
 
     pub fn template() -> Self {
         Self {
-            clash_core: match cfg!(feature = "default-meta") {
-                false => Some("clash".into()),
-                true => Some("clash-meta".into()),
-            },
-            language: match cfg!(feature = "default-meta") {
-                false => Some("en".into()),
-                true => Some("zh".into()),
-            },
+            clash_core: Some("clash-meta".into()),
+            language: Some("en".into()),
             theme_mode: Some("system".into()),
             theme_blur: Some(false),
             traffic_graph: Some(true),

src-tauri/src/core/core.rs

@@ -57,7 +57,7 @@ impl CoreManager {
         let config_path = dirs::path_to_str(&config_path)?;
 
         let clash_core = { Config::verge().latest().clash_core.clone() };
-        let clash_core = clash_core.unwrap_or("clash".into());
+        let clash_core = clash_core.unwrap_or("clash-meta".into());
 
         let app_dir = dirs::app_home_dir()?;
         let app_dir = dirs::path_to_str(&app_dir)?;
@@ -135,7 +135,7 @@ impl CoreManager {
         let app_dir = dirs::path_to_str(&app_dir)?;
 
         let clash_core = { Config::verge().latest().clash_core.clone() };
-        let clash_core = clash_core.unwrap_or("clash".into());
+        let clash_core = clash_core.unwrap_or("clash-meta".into());
 
         let config_path = dirs::path_to_str(&config_path)?;
 

src-tauri/src/core/win_service.rs

@@ -117,7 +117,7 @@ pub(super) async fn run_core_by_service(config_file: &PathBuf) -> Result<()> {
     }
 
     let clash_core = { Config::verge().latest().clash_core.clone() };
-    let clash_core = clash_core.unwrap_or("clash".into());
+    let clash_core = clash_core.unwrap_or("clash-meta".into());
 
     let clash_bin = format!("{clash_core}.exe");
     let bin_path = current_exe()?.with_file_name(clash_bin);

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "package": {
     "productName": "Clash Verge",
-    "version": "1.2.0"
+    "version": "1.2.1"
   },
   "build": {
     "distDir": "../dist",

src/components/setting/mods/core-switch.tsx

@@ -19,7 +19,7 @@ export const CoreSwitch = () => {
   const [anchorEl, setAnchorEl] = useState<any>(null);
   const [position, setPosition] = useState({ left: 0, top: 0 });
 
-  const { clash_core = "clash" } = verge ?? {};
+  const { clash_core = "clash-meta" } = verge ?? {};
 
   const onCoreChange = useLockFn(async (core: string) => {
     if (core === clash_core) return;

src/components/setting/setting-clash.tsx

@@ -110,7 +110,7 @@ const SettingClash = ({ onError }: Props) => {
         />
       </SettingItem>
 
-      <SettingItem label={t("External")}>
+      {/* <SettingItem label={t("External")}>
         <IconButton
           color="inherit"
           size="small"
@@ -141,7 +141,7 @@ const SettingClash = ({ onError }: Props) => {
         >
           <ArrowForward />
         </IconButton>
-      </SettingItem>
+      </SettingItem> */}
 
       <SettingItem label={t("Clash Core")} extra={<CoreSwitch />}>
         <Typography sx={{ py: "7px", pr: 1 }}>{version}</Typography>

src/pages/profiles.tsx

@@ -104,21 +104,22 @@ const ProfilePage = () => {
 
   const onImport = async () => {
     if (!url) return;
-    setUrl("");
+    
     setDisabled(true);
 
     try {
       await importProfile(url);
       Notice.success("Successfully import profile.");
-
+      setUrl("");
       getProfiles().then((newProfiles) => {
         mutate("getProfiles", newProfiles);
-
-        const remoteItem = newProfiles.items?.find((e) => e.type === "remote");
-        if (!newProfiles.current && remoteItem) {
-          const current = remoteItem.uid;
+        if (newProfiles.items && newProfiles.items.length>0){
+          const lastItem = newProfiles.items[newProfiles.items.length-1];
+          const current = lastItem.uid;
           patchProfiles({ current });
           mutateLogs();
+          closeAllConnections();
+          Notice.success("Refresh clash config", 1000);
         }
       });
     } catch (err: any) {