Merge branch 'workflow' of github.com:KaringX/ACL4SSR into workflow

.github/workflows/run.yml

@@ -44,6 +44,30 @@ jobs:
           chmod 755 sing-box ACL4SSR/convert_srs.sh && ./ACL4SSR/convert_srs.sh ../sing-box
           rm -rf sing-box* LICENSE README.md ACL4SSR/convert_*
 
+      - name: Checkout meta-rules-dat
+        uses: actions/checkout@v4
+        with:
+          repository: MetaCubeX/meta-rules-dat
+          path: meta-rules-dat
+          ref: sing
+
+      - name: Checkout Iran-sing-box-rules
+        uses: actions/checkout@v4
+        with:
+          repository: Chocolate4U/Iran-sing-box-rules
+          path: Iran-sing-box-rules
+          ref: rule-set
+
+      - name: copy geo rules
+        env:
+          NO_SKIP: true
+        run: |
+          cd sing-rule || exit 1
+          cp -r ../meta-rules-dat/geo ./
+          cp -r ../Iran-sing-box-rules/geoip-ir.srs ./geo/geoip/ir.srs
+          cp -r ../Iran-sing-box-rules/geosite*ir.srs ./geo/geosite/
+          cd ./geo/geosite/ && find ./ -type f -name "geosite-*ir.srs" -exec bash -c 'mv "$1" "${1/geosite-/}"' _ {} \;
+
       - name: Git push assets to "sing-rule" branch
         run: |
           cd sing-rule || exit 1
@@ -58,11 +82,17 @@ jobs:
           git remote add origin "https://${{ github.actor }}:${{ secrets.GH_TOKEN }}@github.com/${{ github.repository }}"
           git push -f -u origin sing
 
-
       - name: Purge jsdelivr CDN
+        # find . -type f \( -name "*.json" -o -name "*.srs" \) -printf "%P\n" | while read file; do
+        #   curl -i -Ls "https://purge.jsdelivr.net/gh/${{ github.repository }}@sing/${file}"
+        #   echo -e "\t${file} PURGE...\n"
+        # done
         run: |
-          cd sing-rule || exit 1
-          find . -type f \( -name "*.json" -o -name "*.srs" \) -printf "%P\n" | while read file; do
-            curl -i -Ls "https://purge.jsdelivr.net/gh/${{ github.repository }}@sing/${file}"
-            echo -e "\t${file} PURGE...\n"
+          cd sing-rule/ACL4SSR || exit 1
+          for file in $(ls); do
+            curl -i "https://purge.jsdelivr.net/gh/${{ github.repository }}@sing/ACL4SSR/${file}"
           done
+          curl -i -Ls "https://purge.jsdelivr.net/gh/KaringX/karing-ruleset@sing/ACL4SSR/Ruleset"
+          curl -i -Ls "https://purge.jsdelivr.net/gh/KaringX/karing-ruleset@sing/geo/geoip"
+          curl -i -Ls "https://purge.jsdelivr.net/gh/KaringX/karing-ruleset@sing/geo/geosite"
+

README.md

@@ -1,24 +1,61 @@
-# ACL4SSR规则碎片 sing-box rule-set版本
-- fork from https://github.com/ACL4SSR/ACL4SSR
-- 基于clash规则源文件生成的json和srs规则文件
+# rule-set collection for sing-box/karing
+
+## Thanks to
+- [meta-rules-dat](https://github.com/MetaCubeX/meta-rules-dat/raw/sing/geo)
+- [Chocolate4U-Iran](https://github.com/Chocolate4U/Iran-sing-box-rules/tree/rule-set?tab=readme-ov-file)
+- [ACL4SSR](https://github.com/ACL4SSR/ACL4SSR)
+
+
+# GeoIP/GeoSite
+- The source files of Iran come from **Chocolate4U**
+```
+│
+├──geoip
+│  └── ir.srs
+│
+└── geosite
+    ├── ir.srs
+    ├── category-ads-ir.srs
+    ├── category-bank-ir.srs
+    ├── category-bourse-ir.srs
+    ├── category-education-ir.srs
+    ├── category-forums-ir.srs
+    ├── category-gov-ir.srs
+    ├── category-insurance-ir.srs
+    ├── category-ir.srs
+    ├── category-media-ir.srs
+    ├── category-news-ir.srs
+    ├── category-payment-ir.srs
+    ├── category-scholar-ir.srs
+    ├── category-shopping-ir.srs
+    ├── category-social-media-ir.srs
+    ├── category-tech-ir.srs
+    └── category-travel-ir.srs
+
+```
+
+
+
+# sing-box/karing rule-set规则碎片
+- 基于ACL4SSR和geoip、geosite规则源文件生成的json和srs规则文件
     - 推荐配合[karing](https://github.com/KaringX/karing)食用更佳
 
 ## 下载链接
 ### 方案1 github
 - 比如需要国内IP直连, 对应文件为 `ChinaIp.srs`
 - 访问链接:
-https://raw.githubusercontent.com/KaringX/ACL4SSR/sing/ChinaIp.srs
+https://raw.githubusercontent.com/KaringX/karing-ruleset/sing/ACL4SSR/ChinaIp.srs
 
 ### 方案2 CDN:jsdelivr
 - 比如需要去广告功能, 对应文件为 `BanAD.srs`
 - 访问链接:
-https://fastly.jsdelivr.net/gh/karingX/ACL4SSR@sing/BanAD.srs
+https://fastly.jsdelivr.net/gh/karingX/karing-ruleset@sing/ACL4SSR/BanAD.srs
 
 ## 规则碎片
 
-- 主要文件在**sing分支**根目录和*Ruleset*文件夹下，可以配合一些订阅转换或者代理工具进行使用。
+- 主要文件在**sing分支**根目录和*ACL4SSR/Ruleset*文件夹下，可以配合一些订阅转换或者代理工具进行使用。
 
-- 下面是部分文件的注释，所有文件列表查看 [sing分支目录](https://github.com/KaringX/ACL4SSR/tree/sing)
+- 下面是部分文件的注释，所有文件列表查看 [sing分支目录](https://github.com/KaringX/karing-ruleset/tree/sing)
 
 | 文件                   | 类型                 | 解释                                                         |
 | ---------------------- | -------------------- | ------------------------------------------------------------ |