新增简化去广告rules写法{"name":"非凡","hosts":["vip.ffzy","hd.ffzy"],"regex":["6.666667","6.566667","2.966667","2.433333","-2.266667"]} (正数代表移除第一次出现的切片组,负数代表最后一次出现的切片组);

增加去除广告条数统计提示

app/src/main/java/com/github/tvbox/osc/player/controller/VodController.java

@@ -1300,7 +1300,7 @@ public class VodController extends BaseController {
             listener.startPlayUrl(url, headers);
         } else {
             listener.startPlayUrl(ControlManager.get().getAddress(true) + "proxyM3u8", headers);
-            Toast.makeText(getContext(), "已移除视频广告", Toast.LENGTH_SHORT).show();
+            Toast.makeText(getContext(), "已移除视频广告 "+M3u8.currentAdCount+" 条", Toast.LENGTH_SHORT).show();
         }
     }
 

app/src/main/java/com/github/tvbox/osc/util/DefaultConfig.java

@@ -181,7 +181,7 @@ public class DefaultConfig {
     }
 
     private static final List<String> NO_AD_KEYWORDS = Arrays.asList(
-            "tx", "youku", "qq","qiyi", "letv", "sohu", "mgtv", "bilibili", "优酷", "芒果", "腾讯", "奇艺"
+            "tx", "youku", "qq","qiyi", "letv", "leshi","sohu", "mgtv", "bilibili", "imgo","优酷", "芒果", "腾讯", "奇艺"
     );
 
     public static boolean noAd(String flag) {

app/src/main/java/com/github/tvbox/osc/util/M3u8.java

@@ -25,12 +25,14 @@ public class M3u8 {
     private static final Pattern REGEX_X_DISCONTINUITY = Pattern.compile("#EXT-X-DISCONTINUITY[\\s\\S]*?(?=#EXT-X-DISCONTINUITY|$)");
     private static final Pattern REGEX_MEDIA_DURATION = Pattern.compile(TAG_MEDIA_DURATION + ":([\\d\\.]+)\\b");
     private static final Pattern REGEX_URI = Pattern.compile("URI=\"(.+?)\"");
+    public static int currentAdCount;
 
     public static boolean isAd(String regex) {
         return regex.contains(TAG_DISCONTINUITY) || regex.contains(TAG_MEDIA_DURATION) || regex.contains(TAG_ENDLIST) || regex.contains(TAG_KEY) || M3u8.isDouble(regex);
     }
 
     public static String purify(String tsUrlPre, String m3u8content) {
+        currentAdCount = 0;
         if (null == m3u8content || m3u8content.length() == 0) return null;
         if (!m3u8content.startsWith("#EXTM3U")) return null;
         String result = removeMinorityUrl(tsUrlPre, m3u8content);
@@ -106,6 +108,14 @@ public class M3u8 {
             if (maxPercent(preUrlMap) < 0.8) {
                 return null; //视频非广告片断占比不够大
             }
+            boolean allDomainsExceedThreshold = true;
+            for (Integer count : preUrlMap.values()) {
+                if (count <= 15) {
+                    allDomainsExceedThreshold = false;
+                    break;
+                }
+            }
+            if (allDomainsExceedThreshold) return null;
             domainFiltering = true;
         }
 
@@ -162,6 +172,7 @@ public class M3u8 {
                         lines[i - 1] = "";
                     }
                     lines[i] = "";
+                    currentAdCount+=1;
                 }
             } else {
                 // 域名过滤模式：先转换为绝对 URL
@@ -186,6 +197,7 @@ public class M3u8 {
                         lines[i - 1] = "";
                     }
                     lines[i] = "";
+                    currentAdCount+=1;
                 }
             }
         }
@@ -224,19 +236,47 @@ public class M3u8 {
 
     private static String scan(String line, List<String> ads) {
         Matcher m1 = REGEX_X_DISCONTINUITY.matcher(line);
+        List<String> needRemoveAd = new ArrayList<>();
         while (m1.find()) {
             String group = m1.group();
-            BigDecimal t = BigDecimal.ZERO;
+            String groupCleaned = group.replace(TAG_ENDLIST, "");
             Matcher m2 = REGEX_MEDIA_DURATION.matcher(group);
-            if (m2.find()) t = t.add(new BigDecimal(m2.group(1)));
-            for (String ad : ads) if (t.toString().startsWith(ad)) line = line.replace(group.replace(TAG_ENDLIST, ""), "");
+            BigDecimal ft = BigDecimal.ZERO;
+            BigDecimal lt = BigDecimal.ZERO;
+            int tCount = 0;
+            while (m2.find()) {
+                if (ft.equals(BigDecimal.ZERO))ft = new BigDecimal(m2.group(1));
+                lt = new BigDecimal(m2.group(1));
+                tCount+=1;
+            }
+            String ftStr = ft.toString();
+            String ltStr = lt.toString();
+            for (String ad : ads) {
+                if (ad.startsWith("-")) {
+                    String adClean = ad.substring(1);
+                    if (ltStr.startsWith(adClean)) {
+                        needRemoveAd.add(groupCleaned);
+                        currentAdCount+=tCount;
+                        break;
+                    }
+                } else {
+                    if (ftStr.startsWith(ad)) {
+                        needRemoveAd.add(groupCleaned);
+                        currentAdCount+=tCount;
+                        break;
+                    }
+                }
+            }
+        }
+        for (String rem : needRemoveAd) {
+            line = line.replace(rem, "");
         }
         return line;
     }
 
     private static boolean isDouble(String ad) {
         try {
-            return Double.parseDouble(ad) > 0;
+            return Double.parseDouble(ad) != 0;
         } catch (Exception e) {
             return false;
         }