diff --git a/SrcJyAuto.js b/SrcJyAuto.js index e75b4aa3..c37a3211 100644 --- a/SrcJyAuto.js +++ b/SrcJyAuto.js @@ -510,11 +510,17 @@ var aytmParse = function (vipUrl,parseStr) { obj['rurl'] = rurl; return obj; }; + //清理sort排序文件线程代码 + var sorttask = function(obj) { + + return obj; + }; if(config.testcheck==1){showLoading('√解析列表,检测中')}; - + var cleansort = 0; for (var i=0;i{ - return { - func: parsetask, - param: parse, - id: parse.id - } + if(parse.lx=="cleansort"){ + return { + func: sorttask, + param: parse, + id: 'cleansort' + } + }else{ + return { + func: parsetask, + param: parse, + id: parse.lx+'|'+parse.name + } + } }); be(parses, { func: function(obj, id, error, taskResult) { + obj.ids.push(id); obj.results.push(taskResult); obj.errors.push(error); if (ismulti!=1&&config.testcheck!=1&&contain.test(taskResult.rurl) && !exclude.test(taskResult.rurl)) { @@ -543,18 +563,18 @@ var aytmParse = function (vipUrl,parseStr) { } }, param: { + ids: beids, results: beresults, errors: beerrors } }); - for(let k in beresults){ - log(beresults[k]==null?beerrors[k]:beresults[k]) - parsename = beresults[k].name; - parseurl = beresults[k].rurl; - parselx = beresults[k].lx; + for(let k in beids){ + parsename = beids[k].split('|')[1]; + parselx = beids[k].split('|')[0]; if(config.printlog==1){log("√"+ parsename + ">" + parselx + "解析结果检查")}; if(beerrors[k]==null){ + parseurl = beresults[k].rurl; if(config.jstoweb==1&&parselx=="J"&&parseurl.search(/x5Rule|webRule/)>-1){ //js中跳转x5或web嗅探 if(config.printlog==1){log("√JS中跳转x5|web嗅探,解析逻辑被打断,结果自负")}; @@ -576,6 +596,15 @@ var aytmParse = function (vipUrl,parseStr) { break; } } + for(var j=0;j0){ + sortlist[j].sort = sortlist[j].sort-1; + issort = 1; + } + break; + } + } } else { if(beresults[k].lx=="J" || (beresults[k].lx=="U"&&beresults[k].x5==2)){ //JS解析失败的、非x5嗅探解析,失败排序+1