From 001caf7f6e9c3bff3b778de8ded752744c72a121 Mon Sep 17 00:00:00 2001
From: Shawn <45581750+KOP-XIAO@users.noreply.github.com>
Date: Wed, 17 Jun 2020 13:58:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=AD=97=E6=AE=B5=E2=98=A0?=
 =?UTF-8?q?=EF=B8=8F=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81=E7=9B=B4=E6=8E=A5?=
 =?UTF-8?q?=E7=94=A8.=E8=BF=9E=E6=8E=A5=E5=A4=9A=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                  | Bin 14340 -> 14340 bytes
 Scripts/resource-parser.js |  19 +++++++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 6b60ec969665bbfa680efb07b78710eefae3e3f7..4cdf296ebc195b8aa3b216cfa7dccbb879c1b9a8 100644
GIT binary patch
delta 1214
zcmeIx&r6eW90%~v`$^sN-D-X3vONx_V^70HOP?)QVy>+viu6m&BBQX8qn2(Cwz9U?
zR!C8Kdzhe9LWd%{l&em4s30(?OVO`Obnp`9p-ZQrr#(>6$v?pF?Zf-@e)0Z}r^ZwF
zyKI<KyKTkwQZDCLyiQ+WOWy0u`TPOxXbUL$JQHnhU$EzB;%qi|E`NSXU9>e~S~W|f
zW~r;&*mE#`Y&5wqo{g!+brI_z=cm%KzSu}K6F(j6jAmkKmAmSg99F3E)K@$t2s5h5
zvQS_gBvL)OsFgaXmj-Bv#%O{{G)cGU9zCWf^pf7tTY66)=p%ilZ?r()X_0=S3N<i5
zgar;Xpb;KyL<<!7(2fwcBZ3{+g+BCSKMr6J#}UU#3?qX)inxG_xF%s5*Kq?kaR(1D
zi!vVKDW2nnTB?=Rd3%f5t`%%rQbEVxg6z}ERp!;)QfpmP*C2bmzRg?1YQm}(nizj1
za=cq>lj`km`vy_uLgg?v+ZD#6B443rn~VXG4>4Y?r)|b|#?y>f>1ogy68TQXYxFc?
z>|_>UhH(<*utzuUPev0l_8)EGpY2_mrDvM!XZk|(n&}VClQc^+q>7~rGTdm^Jbmz^
z6+vu6STp@2x*L1Yivb+MVI0w1PiU^g7(o(aID;&5n(rlC#uZ$}1WK61l+G;RcDcjx
jS}2>Gd&TM$WhkvGTsAE)NdF?s3tHNO=7h3A`DOSGj3X8+

delta 1367
zcmeH`%}W$v9LJyU`u5Dzi{m1*yR~DhuB_RLudSLAhGs>H8oT*QG44z?<c{mkXfGm5
zwP8>MI)_d{b%+iIk<_J*K|);uPesuo@LJS0?3o?uZ|LA02Il*j-}5}b&-^Br&ZVFC
z`Rt|0Vri^-AsU)*inTXJLmdZO?MQ8lUFJ6+*+b%;Ec3GR;W^#ZC#ST;WnHx{jw)tS
zGgRHUFs7@TVd>{}EhCf__6u=CNoni5c9)8hPYO`6nvTp)>NB&tbv2)|pj07<FX@D;
zSX%$I>Qt)k`$4IS(s3v6$!PrU#;hhQMFdfyaZ|tMuFUFKR1i%een~gBY8zM+6;&ZI
zrA%s5?sBaxM#YoD@SK)0^=ZQmJ6I<zLsS?^PN!1*;HDcNmb$69M$bB%pHfU~Agvky
zj^&Yh?ZN8svbQ3;LSB$J<Q-Wf@5u-9k$fVb$rtjKY>*%1C;3Hw17O&Jo$#X)RS2U7
zb!b5=VrWAbj-n68aRLJv!6?Qt0Tn42m_Y{f$l(?iaU1vX5RdQ}D|m)ic#XFte|ca(
z@b0xY_B24Yzj?nGCwTkX6}vLv&x$2ZS9D$S`2+hxvMf67xQ{|uW?Z<CXSHF@JX<7M
z&q)DS>$0Y1CW}SfqFWbhV@xdMnqAu2#c44Y>eB8boD%1Y3$(i1R?2(F$R>(V3LgRp
zLPiB5*pCB<qMmo(jt(3`Pu{>W4B|B6NZ<_4K|zvR(71&(w_w7;0<yS{8@P$PxQ8Vy
t+neR}t4aB(XH^Id(E^K@cB2^Do=*Og1-GZunfd=<I-ht}OB(-_`~@e<Lka)@

diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js
index c768571..36425de 100644
--- a/Scripts/resource-parser.js
+++ b/Scripts/resource-parser.js
@@ -1,5 +1,5 @@
 /** 
-☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2020-06-16 11:59⟧
+☑️ 资源解析器 ©𝐒𝐡𝐚𝐰𝐧 ⟦2020-06-17 13:59⟧
 ----------------------------------------------------------
 🚫 发现𝐁𝐔𝐆请反馈: @Shawn_KOP_bot
 ⛳️ 关注tg相关频道: https://t.me/QuanX_API
@@ -26,7 +26,7 @@ B. rewrite(重写) /filter(分流) 的转换&筛选
 ⦿ in, out, 分别为 保留/删除 节点, 多参数用 "+" 连接(逻辑"或"), 逻辑"与"用 "." 连接;
   ∎ 可直接用中文, 空格用 "%20" 代替
   ∎ 如 "in=香港.IPLC.04+台湾&out=香港%20BGP"
-⦿ rename 重命名、删除字段, "旧名@新名", "删除字段☠️", 以及 "前缀@", "@后缀",用 "+" 连接多个参数;
+⦿ rename 重命名、删除字段, "旧名@新名", "删除字段1.删除字段2☠️", 以及 "前缀@", "@后缀",用 "+" 连接多个参数;
   ∎ 如 "rename=香港@HK+[SS]@+@[1X]+倍率☠️"
 ⦿ sort=1, -1, 排序参数, 分别根据节点名 正序/逆序 排列;
 
@@ -781,9 +781,6 @@ function Rename(str){
 			if(oname&&nname){
 				var rn=escapeRegExp(oname)
 				name=name.replace(new RegExp(rn,"gm"),nname)
-//				while(name.indexOf(oname)!=-1){
-//					name=name.replace(oname,nname)
-//				}
 				}else if(oname && oname.indexOf("☠️")==-1){//前缀
 					var nemoji=emoji_del(name)
 						if(Pemoji==1 || Pemoji==2){
@@ -791,11 +788,13 @@ function Rename(str){
 					}else { name=oname+name}
 				}else if(nname){//后缀
 					name=name+nname
-				}else if(oname && oname.indexOf("☠️")!=-1){ //删除特定字符
-				//$notify(oname)
-				var nn=escapeRegExp(oname.split("☠️")[0])
-					var del=new RegExp(nn,"gm");
-					name=name.replace(del,"")
+				}else if(oname && oname.indexOf("☠️")!=-1){ //删除特定字符，多字符用.连接
+					hh=oname.split("☠️")[0].split(".")
+					for(j=0;j<hh.length;j++){
+						var nn=escapeRegExp(hh[j])
+						var del=new RegExp(nn,"gm");
+						name=name.replace(del,"")
+					}
 				}else(name=name)	
 			nserver=hd+"tag="+name
 		}