fix: use if let instead (#309)

* fix(ci): daily task skipping commit while no changes

* fix: use if let instead

.github/workflows/daily.yml

@@ -28,12 +28,19 @@ jobs:
         run: pnpm generate:manifest
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # if nothing changed, skip commit
+      - name: Check for changes
+        id: git-check
+        run: echo ::set-output name=has-changes::$(if git diff --quiet; then echo "false"; else echo "true"; fi)
       - uses: oleksiyrudenko/gha-git-credentials@v2-latest
+        if: steps.git-check.outputs.has-changes == 'true'
         with:
           token: "${{ secrets.GITHUB_TOKEN }}"
           name: "github-actions[bot]"
           email: "41898282+github-actions[bot]@users.noreply.github.com"
+
       - name: Commit Manifest
+        if: steps.git-check.outputs.has-changes == 'true'
         run: |
           git add .
           git commit -m "chore(manifest): update manifest [skip ci]"
@@ -62,12 +69,19 @@ jobs:
         run: pnpm generate:manifest
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      # if nothing changed, skip commit
+      - name: Check for changes
+        id: git-check
+        run: echo ::set-output name=has-changes::$(if git diff --quiet; then echo "false"; else echo "true"; fi)
       - uses: oleksiyrudenko/gha-git-credentials@v2-latest
+        if: steps.git-check.outputs.has-changes == 'true'
         with:
           token: "${{ secrets.GITHUB_TOKEN }}"
           name: "github-actions[bot]"
           email: "41898282+github-actions[bot]@users.noreply.github.com"
+
       - name: Commit Manifest
+        if: steps.git-check.outputs.has-changes == 'true'
         run: |
           git add .
           git commit -m "chore(manifest): update manifest [skip ci]"

backend/tauri/src/config/prfitem.rs

@@ -195,21 +195,18 @@ impl PrfItem {
         }
         // 使用系统代理
         else if with_proxy {
-            match Sysproxy::get_system_proxy() {
-                Ok(p @ Sysproxy { enable: true, .. }) => {
-                    let proxy_scheme = format!("http://{}:{}", p.host, p.port);
-
-                    if let Ok(proxy) = reqwest::Proxy::http(&proxy_scheme) {
-                        builder = builder.proxy(proxy);
-                    }
-                    if let Ok(proxy) = reqwest::Proxy::https(&proxy_scheme) {
-                        builder = builder.proxy(proxy);
-                    }
-                    if let Ok(proxy) = reqwest::Proxy::all(&proxy_scheme) {
-                        builder = builder.proxy(proxy);
-                    }
+            if let Ok(p @ Sysproxy { enable: true, .. }) = Sysproxy::get_system_proxy() {
+                let proxy_scheme = format!("http://{}:{}", p.host, p.port);
+
+                if let Ok(proxy) = reqwest::Proxy::http(&proxy_scheme) {
+                    builder = builder.proxy(proxy);
+                }
+                if let Ok(proxy) = reqwest::Proxy::https(&proxy_scheme) {
+                    builder = builder.proxy(proxy);
+                }
+                if let Ok(proxy) = reqwest::Proxy::all(&proxy_scheme) {
+                    builder = builder.proxy(proxy);
                 }
-                _ => todo!(),
             };
         }
 

backend/tauri/src/enhance/mod.rs

@@ -96,16 +96,15 @@ pub fn enhance() -> (Mapping, Vec<String>, HashMap<String, ResultLog>) {
             .for_each(|item| {
                 log::debug!(target: "app", "run builtin script {}", item.uid);
 
-                match item.data {
-                    ChainType::Script(script) => match use_script(script, config.to_owned()) {
+                if let ChainType::Script(script) = item.data {
+                    match use_script(script, config.to_owned()) {
                         Ok((res_config, _)) => {
                             config = use_filter(res_config, &clash_fields, enable_filter);
                         }
                         Err(err) => {
                             log::error!(target: "app", "builtin script error `{err}`");
                         }
-                    },
-                    ChainType::Merge(_) => todo!(),
+                    }
                 }
             });
     }