diff --git a/SrcJySet.js b/SrcJySet.js index 8aeda78a..7bb3e35f 100644 --- a/SrcJySet.js +++ b/SrcJySet.js @@ -52,9 +52,9 @@ function SRCSet() { }); if(getMyVar('guanli', 'jk')=="jk"){ - var filepath = "hiker://files/rules/Src/Juying/jiekou.json"; + var filepath = "hiker://files/rules/Src/Jubox/jiekou.json"; }else if(getMyVar('guanli', 'jk')=="jx"){ - var filepath = "hiker://files/rules/Src/Juying/myjiexi.json"; + var filepath = "hiker://files/rules/Src/Jubox/myjiexi.json"; } var datafile = fetch(filepath); if(datafile != ""){ @@ -110,7 +110,7 @@ function SRCSet() { var dataarr = {name:dataname, url:dataurl, stopfrom:datastopfrom+"", priorfrom:datapriorfrom+""}; if(datalist.header){dataarr['header'] = datalist.header} if(datalist.web){dataarr['web'] = datalist.web} - var filepath = "hiker://files/rules/Src/Juying/myjiexi.json"; + var filepath = "hiker://files/rules/Src/Jubox/myjiexi.json"; } if(datalist.retain){dataarr['retain'] = 1} @@ -697,6 +697,10 @@ function jiekousave(urls) { eval("datalist=" + datafile+ ";"); } + function checkitem(item) { + return urltype==item.type && item.url==urlurl; + } + var num = 0; for (var i in urls) { let urlname = urls[i].name.replace(/(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|\ud83c[\ude32-\ude3a]|\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])|\(XPF\)|\(萝卜\)|\(神马\)|\(切\)|\(聚\)|\(优\)|\(神马\)|\(XB\)|\(SP\)|\(XP\)|[\x00-\x1F\x7F]|┃.*/g,''); @@ -706,10 +710,6 @@ function jiekousave(urls) { let urlgroup = urls[i].group||""; let urlext = urls[i].ext||""; - function checkitem(item) { - return urltype==item.type && item.url==urlurl; - } - if(!datalist.some(checkitem)&&urlname&&urltype){ let arr = { "name": urlname, "url": urlurl, "type": urltype }; if(urlgroup){arr['group'] = urlgroup} @@ -2141,7 +2141,6 @@ function Resourceimport(input,importtype){ urlfile = extfile; }else if(/^http/.test(extfile)){ try{ - log(extfile); let content = fetch(extfile, {timeout:2000}); if (content =='') { urlfile = ''; @@ -2167,7 +2166,7 @@ function Resourceimport(input,importtype){ urls.push({ "name": obj.name, "url": urlfile, "type": "XBPQ", "ext": obj.ext, "group": "新导入"}); }else if(/drpy2/.test(obj.api) && urlfile){ urls.push({ "name": obj.name, "url": urlfile, "type": "drpy", "ext": obj.ext, "group": "新导入"}); - }else if(/csp_XYQHiker/.test(obj.api) && urlfile){ + }else if(/^csp_XYQHiker/.test(obj.api) && urlfile){ urls.push({ "name": obj.name, "url": urlfile, "type": "XYQ", "ext": obj.ext, "group": "新导入"}); } return 1;