From 18040d211b4067bb7aef519009a1d70c9fd133df Mon Sep 17 00:00:00 2001
From: moeyuki <47294433+moexiyuki@users.noreply.github.com>
Date: Sun, 8 Dec 2024 22:22:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=AD=A3=E6=AD=A3=E5=88=99=E8=A1=A8?=
 =?UTF-8?q?=E8=BE=BE=E5=BC=8F=EF=BC=8C=E4=BB=A5=E5=88=A0=E9=99=A4package.l?=
 =?UTF-8?q?ist.cfg=E6=97=A0=E7=94=A8=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0gid=E6=94=AF=E6=8C=81=20(#169)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 添加Gid支持，简化配置内容
* 更正正则表达式，以移除package.list.cfg无用字段，并添加package.list.cfg的gid支持
---
 box/package.list.cfg | 59 ++++++++++++++++++++++++++++----------------
 box/settings.ini     | 14 +++++++----
 2 files changed, 47 insertions(+), 26 deletions(-)

diff --git a/box/package.list.cfg b/box/package.list.cfg
index b867247..caab22f 100644
--- a/box/package.list.cfg
+++ b/box/package.list.cfg
@@ -1,26 +1,43 @@
-# 黑/白名单模式;black/white list mode.
-mode:white
-# 你可以在这里写注释;,但是要确保格式正确:"pkg 包名"
-# You can write notes here,
-# But make sure you write in the correct format.
-# example : pkg $pkgname
+# 黑/白 名单模式;black/white list mode.
+# 如果需要清除名单配置直接删除本文件即可
+# Simply delete this file if you need to clear the list configuration
+mode:whitelist
+# 格式/format:
+# package_name
+# gid
+# 多开用户标识符/Double Open User Identifier.
+# userid+gid
+# example:999+gid
 
 # Tiktok
-pkg com.zhiliaoapp.musically
+com.zhiliaoapp.musically
 # Magisk
-pkg com.topjohnwu.magisk
+com.topjohnwu.magisk
 # Via
-pkg mark.via
-pkg com.android.shell
-pkg xyz.blueskyweb.app
-pkg com.pikcloud.pikpak
-pkg com.termux
-pkg com.android.vending
-pkg com.google.android.gms
-pkg com.github.android
-pkg ceui.lisa.pixiv
-pkg com.google.android.gsf
-pkg com.android.chrome
+mark.via
+# Lsposed
+com.android.shell
+# Bluesky
+xyz.blueskyweb.app
+# Pikpak
+com.pikcloud.pikpak
+# Termux
+com.termux
+# Playstore
+com.android.vending
+# Gms
+com.google.android.gms
+# Github
+com.github.android
+# Shaft
+ceui.lisa.pixiv
+# Gsf
+com.google.android.gsf
+# Chrome
+com.android.chrome
 
-# gid $gid 画饼，暂未考虑;Painted cake, not considered yet
-# 😂
+# Gid
+
+# Alook
+#10450 alook
+#99910450 999_alook
diff --git a/box/settings.ini b/box/settings.ini
index d16ebc3..89f5e98 100755
--- a/box/settings.ini
+++ b/box/settings.ini
@@ -116,15 +116,19 @@ pkg_config=$(dirname "$settings")/package.list.cfg
 # check pkg config file
 [ -d ${pkg_config} ]&&rm -rf ${pkg_config}
 [ ! -f ${pkg_config} ]&&cat>${pkg_config}<<init
-# mode black/whitelist
+# 黑/白 名单模式;black/white list mode.
 mode:whitelist
-# example : pkg pkgname
+# 格式/format:
+# package_name ▼
+#com.topjohnwu.magisk
+# Gid ▼
+#10450 alook
+#99910450 999_alook
 init
-
-packages_list=($(sed -n 's/^pkg \([^ ]*\).*/\1/p' ${pkg_config}))
-
 # blacklist / whitelist
 proxy_mode=$(sed -n 's/^mode:\([^ ]*\).*/\1/p' ${pkg_config})
+packages_list=($(sed -n '/^[^#]/s/^\([^ ]*\.[^ ]*\).*/\1/p' ${pkg_config}))
+gid_list=($(sed -n '/^[^#]/s/^\([0-9]\{1,8\}\).*/\1/p' ${pkg_config}))
 
 # eg: notify $title $content
 notify() {