更新 'SrcJyPublic.js'

SrcJyPublic.js

@@ -1271,26 +1271,53 @@ function subResource() {
     })
     setResult(d);
 }
-// 执行导入资源码内容
+
-function importResource(pastedata, mode) {
+// 更新同步订阅资源
-    let jknum = 0;
+function updateResource(it,refresh) {
-    let jxnum = 0;
+    if(!it){
-    let ypnum = 0;
+        let resources = Juconfig['subResource'] || [];
+        for (let i = 0; i < resources.length; i++) {
+            if (resources[i].auto) {
+                it = item;
+                break;
+            }
+        }
+        let playSet = Juconfig['playSet'] || {};
+        if(playSet['clearM3u8Ad']){
+            let m3u8Ad = fc(config.依赖.replace(/[^/]*$/,'') + "plugins/m3u8_ad_rule.json", 72);
+            if(m3u8Ad){
+                writeFile("hiker://files/rules/m3u8_ad_rule.json", m3u8Ad);
+            }
+        }
+    }
+    if(!it){
+        log("自动同步取消，没有可执行的订阅源");
+        return "hiker://empty";
+    }
+    try{
+        let pasteget = JSON.parse(request('https://pasteme.tyrantg.com/api/getContent/'+it.path,{
+            "content-type": "application/json;charset=UTF-8"
+        }));
+        if(pasteget.result_code=="SUCCESS"){
+            require(config.依赖.replace(/[^/]*$/,'') + 'SrcJySet.js');
+            let textcontent = globalMap0.getVar('Jy_gmParams').unzip(pasteget.data);
+            let pastedata = JSON.parse(textcontent);
+            let jknum = 0, jxnum = 0, ypnum = 0, tvnum = 0, sm = '';
             let options = [];
             let jkdatalist = pastedata.接口||[];
             if(jkdatalist.length>0){
-        jknum = jiekousave(jkdatalist, mode==2?2:1);
+                jknum = jiekousave(jkdatalist, it.mode==2?2:1);
                 options.push('接口');
             }
             let jxdatalist = pastedata.解析||[];
             if(jxdatalist.length>0){
-        jxnum = jiexisave(jxdatalist, mode==2?2:1);
+                jxnum = jiexisave(jxdatalist, it.mode==2?2:1);
                 options.push('解析');
             }
             if(pastedata.直播){
                 let livefilepath = globalMap0.getVar('Jy_gmParams').rulepath + "liveconfig.json";
                 let liveconfig = pastedata.直播;
-        if(mode!=2){
+                if(it.mode!=2){
                     let livefile = fetch(livefilepath);
                     if(livefile){
                         try{
@@ -1299,12 +1326,12 @@ function importResource(pastedata, mode) {
                             newdata.forEach(tv=>{
                                 if(!olddata.some(item => tv.url==item.url)){
                                     olddata.push(tv);
+                                    tvnum++;
                                 }
                             })
                             liveconfig.data = olddata;
                             options.push('直播');
                             writeFile(livefilepath, JSON.stringify(liveconfig));
-                    var sm = "，直播订阅已同步"
                         }catch(e){
                             //log("增量导入直播失败>"+e.message);
                         }
@@ -1312,7 +1339,7 @@ function importResource(pastedata, mode) {
                 }else if(liveconfig.data){
                     options.push('直播');
                     writeFile(livefilepath, JSON.stringify(liveconfig));
-            var sm = "，直播订阅已同步"
+                    sm = "，直播订阅已同步"
                 }
             }
             let ypdatalist = pastedata.云盘||[];
@@ -1322,7 +1349,7 @@ function importResource(pastedata, mode) {
             }
             let ghproxy = pastedata.ghproxy||[];
             if(ghproxy.length>0){
-        if(mode!=2){
+                if(it.mode!=2){
                     oldproxy = Juconfig['ghproxy'] || [];
                     ghproxy.forEach(gh=>{
                         if(!oldproxy.some(item => gh.url==item.url)){
@@ -1344,39 +1371,7 @@ function importResource(pastedata, mode) {
             }
             Juconfig['subResource'] = resources;
             writeFile(cfgfile, JSON.stringify(Juconfig));
-    log("更新同步订阅资源完成；接口："+jknum+"，解析："+jxnum+(sm?sm:"")+"，云盘："+ypnum);
+            log("更新同步订阅资源完成；接口："+jknum+"，解析："+jxnum+"，云盘："+ypnum+(sm||("，直播："+tvnum)));
-}
-// 更新同步订阅资源
-function updateResource(it,refresh) {
-    if(!it){
-        let resources = Juconfig['subResource'] || [];
-        for (let i = 0; i < resources.length; i++) {
-            if (resources[i].auto) {
-                it = item;
-                break;
-            }
-        }
-        let playSet = Juconfig['playSet'] || {};
-        if(playSet['clearM3u8Ad']){
-            let m3u8Ad = fc(config.依赖.replace(/[^/]*$/,'') + "plugins/m3u8_ad_rule.json", 72);
-            if(m3u8Ad){
-                writeFile("hiker://files/rules/m3u8_ad_rule.json", m3u8Ad);
-            }
-        }
-    }
-    if(!it){
-        log("自动同步取消，没有可执行的订阅源");
-        return "hiker://empty";
-    }
-    try{
-        let pasteget = JSON.parse(request('https://pasteme.tyrantg.com/api/getContent/'+it.path,{
-            "content-type": "application/json;charset=UTF-8"
-        }));
-        if(pasteget.result_code=="SUCCESS"){
-            require(config.依赖.replace(/[^/]*$/,'') + 'SrcJySet.js');
-            let textcontent = globalMap0.getVar('Jy_gmParams').unzip(pdata);
-            let pastedata = JSON.parse(textcontent);
-            importResource(pastedata,it.mode);
             if(refresh){
                 refreshPage(false);
             }