From abe8c90a2ba7d02be2cbfa6e39e7bd58bcf54e36 Mon Sep 17 00:00:00 2001
From: Shawn <45581750+KOP-XIAO@users.noreply.github.com>
Date: Sun, 17 May 2020 12:35:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=81=E9=87=8F=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .DS_Store                  | Bin 12292 -> 14340 bytes
 Scripts/resource-parser.js |  13 +++++++------
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 049a50f332023f2489c1b0d131c7b0d0b6263efc..b79957584f3e3dd9f10d81b894933e3b642b81e8 100644
GIT binary patch
delta 2016
zcmeHIO>7%g5T4JDo865|Hf_58sa>4JQA)6bQz9pB3Q8#MkDzJ^F1Qpm_0J}3yS5Xr
zoeHAL{G@_PsKPuXPDp@ysfs`$;>MjyAW)=U00qIRN2toZjCWhoS|E;Gy3)LP@6F6N
zZ)U%zw{m)AAwooWs$Lu=O7K)-X=&BV!yr+_+k8DZT(k;izEUyidERxifMvj$t3>mg
z_SN-dXY<$6TBp<@!Pk5*xaL)>p2k*sj^Z4xQ;w=spjT*wOftx#+F`R&$eWcsqcIeG
ztasnGKb{c<II_-BWva0*v6wu|(kvZgqzcV3ipjVZBNljFrnxr63q+0kAR~W6X8BMv
zHl%JJuEy)98E}cE%%E{fv!1`R8lf|shEud9xYc%KnK9Ee%}7UBkMN-z#rs2CxwepA
zu0?0Z3fI<3+gi0!)$MNS4DyeuT|czpbaEL5jxlI~k*vE}d)bYf>we;1cd@+Va(6Ou
zJ{DOXO->|Yk<{3@7|||^lzOp4*{1Z0aKAtCl2O#lHDk`ut8!1r5jj)NmGtXdAL>>$
zpB9kR0V!M08;f<L_Nu)rKKE%2+Z@vRCFx`_SJU@bbsmehT^ZDdWHl#cEaNo?M;TUP
zvTDhhvqstR(H>JqCABCYH*<O2bdrrJNlAT1esM{!T1KVpY^Ib+sRuDRTd0&ud`!#P
z-ua|9C8^h>Q?2CB=B(P$1-*PHzc}T8SZwqRl|G{{>1+CiuF<#j9j(((^fPVHFLZ<c
zpqq4y{sf?)3tsrqhkisch+#aAF(fgLeMsW~4&gA4B8w9^iI-7C31uvzie;?e0^Y_u
z_z)lC6MQNbx5dSHAmL6QI4Jh2=fu?ZGh!x~%E{5NqJAaG*EOF%usa$Kt1d~h7qK{7
z+}tV0Ho8X%s~&EOV@-}LirT?lbF7p5*t&)L<5;Jr*-EY7C5!KS_K2n49eKJ954zz)
z03n323qyDWk0ORR7c_ws_F}(X)Il7>3^F*57ch$)3S5}Zg)MMl7HT+;2HwD%cnk01
z5}J4)0w3TbF7ndO)#>e&VfLNnvBKjlUj?1c*^F#4`(JLo`|2h!SJyXyE)nVT2k+9?
zVJ}T?I*DC<!L?}Q#+Fc<&y`IdB7va|4_^awUZ|mn_(B_a!0iXz{$IKMBLW_#D1V7A
x9@6)|w5#jCyG3`bPj0=gr&&mhc?Y~M=T)AtH_TX5#Dk%=-=f2=|Kk3YzW~A4;#U9w

delta 1064
zcma)*TTE0}6o%K&aM|Z@+c0t%E`x)^0Jfvf$i%9sg@M)>rI0`?#ugcvBOaX#!wg!g
zhNLm3sie(h2NR8&v`wnSCq(<CNvlcIG)-S5y}dMTYMS_9qc8OG;yR3}nD)V)tbJMk
zIeYE>t-Vf-pBio>B7`TSL84Zk3O0L`CET4R@)Yy9qS?C0rdHKCcmlRsHl9nOvDjF!
ze>52%&!&9Y7N;_#R70NH`BYbt3WV}MDHa0d3(az(K>4dbQcEqJs?0S}tnV7MMw5wt
z>m5@aXbP)rW0iW?=+wL&0p6OM`dW5R%d+xPquQtu(klihN37JOm6=+!y?VXTpvfEJ
z&1fWJ_9Ua$LCcITD@MJsMu`2kziYzeKIhhbMvEpRVj#^Sb6dQi`!$)?298*XC%<mc
zgF;5N*JF_pGqxyu?eHOelaRZ$y+_T7w3STcVr<ddMFsrYAm2Q0CNk-qdxy~><X2+I
z4!$Rn&h(C(iKoZvRvWx^)0zbHuAwy)qHWYi`zT7sXohC#EPYH@=`*@XU(&a9m%gL#
z=?D6Sex={&9zCEX`jh^qe;`nSN;t6^tyqf};YSc#(T?rdfiCPp4|>suH*f&M7{Mrx
zAcIM~jVZi~GcL^F1AK@}xQr{9!ve137H;E?nyvJzd$obmS9j`7|C=25zsb>lEGaE3
zmlc)HRaFh%R)26)dxwfU_o~0@woEtq+`0tkMq4zhT{UZcZnw-6VtKJ{J!=k5Lr&Y+
zrn_YU6VItHZPs;}&nd~N+qSb>$n3>pO|{F=!+N(?k>8_965bB`xpEswMB=8l66o|Z
zMCa%leZe$;qMw=JeR@PoAQYkm1{&aj7ftYCJp$N>HiVer%jiUSnd58A9QR>A-og;m
zJcPrDA&vx&G0WpPfs;6m_wYW>Fw|L`#W|cu(FI(@r?{$8&0ZC8&&+4OaX?quX4k@?
z=l4Qow%iT#!5w5#oW`Q*(bz~b86*9_uaUnhu<yvVY1iW`E9-MU^@l^1hZ?K$Sn;q8
lv)PsTIUA|YP+bYH?7FqR0d**pT?qQh^6c=<?0k;!j{yRt=uiLv

diff --git a/Scripts/resource-parser.js b/Scripts/resource-parser.js
index 5fdef9a..bb20385 100644
--- a/Scripts/resource-parser.js
+++ b/Scripts/resource-parser.js
@@ -1,5 +1,5 @@
 /** 
-# Quantumult X 资源解析器 (2020-05-16: 16:59 )
+# Quantumult X 资源解析器 (2020-05-17: 12:59 )
 
 本资源解析器作者: Shawn(请勿私聊问怎么用)，有bug请反馈: @Shawn_KOP_bot
 更新请关注tg频道: https://t.me/QuanX_API
@@ -68,19 +68,20 @@ var subinfo=$resource.info;
 var subtag=$resource.tag;
 if(Pinfo==1 && subinfo){
 	var sinfo=subinfo.replace(/ /g,"").toLowerCase();
-	var total="总流量: "+(parseFloat(sinfo.split("total=")[1].split(",")[0])/(1024**3)).toFixed(2)+"GB, ";
+	var total="总流量: "+(parseFloat(sinfo.split("total=")[1].split(",")[0])/(1024**3)).toFixed(2)+"GB";
 	var usd="已用流量: "+((parseFloat(sinfo.split("upload=")[1].split(",")[0])+parseFloat(sinfo.split("download=")[1].split(",")[0]))/(1024**3)).toFixed(2)+"GB"
+	var left="剩余流量: "+((parseFloat(sinfo.split("total=")[1].split(",")[0])/(1024**3))-((parseFloat(sinfo.split("upload=")[1].split(",")[0])+parseFloat(sinfo.split("download=")[1].split(",")[0]))/(1024**3))).toFixed(2)+"GB"
 	if(sinfo.indexOf("expire=")!=-1){
 		var epr= new Date(parseFloat(sinfo.split("expire=")[1].split(",")[0])*1000);
 		var year=epr.getFullYear();  // 获取完整的年份(4位,1970)
 		var mth=epr.getMonth()+1 < 10 ? '0'+(epr.getMonth()+1):(epr.getMonth()+1);  // 获取月份(0-11,0代表1月,用的时候记得加上1)
 		var day=epr.getDate()<10 ? "0"+(epr.getDate()):epr.getDate(); 
-		epr=year+"-"+mth+"-"+day
+		epr="过期时间: "+year+"-"+mth+"-"+day
 		} else{
-			epr=""
+			epr="订阅链接: "+para.split("#")[0] //没过期时间的显示订阅链接
 		}
-	var message=total+usd;
-	$notify("流量信息: "+subtag,"过期时间: "+epr, message)
+	var message=total+"\n"+usd+", "+left;
+	$notify("流量信息: "+subtag, epr, message)
 }
 
 if(type0=="Subs-B64Encode"){