Merge pull request #815 from Guovin/dev

Fix

README.md

@@ -111,11 +111,11 @@
 - 接口源：
 
 ```bash
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.m3u
+https://raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.m3u
 ```
 
 ```bash
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.txt
+https://raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.txt
 ```
 
 或
@@ -131,7 +131,7 @@ https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/output/result.txt
 - 数据源：
 
 ```bash
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/source.json
+https://raw.githubusercontent.com/Guovin/iptv-api/gd/source.json
 ```
 
 或

README_en.md

@@ -111,11 +111,11 @@
 - Interface source:
 
 ```bash
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.m3u
+https://raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.m3u
 ```
 
 ```bash
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.txt
+https://raw.githubusercontent.com/Guovin/iptv-api/gd/output/result.txt
 ```
 
 or
@@ -131,7 +131,7 @@ https://cdn.jsdelivr.net/gh/Guovin/iptv-api@gd/output/result.txt
 - Data source:
 
 ```bash
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/Guovin/iptv-api/gd/source.json
+https://raw.githubusercontent.com/Guovin/iptv-api/gd/source.json
 ```
 
 or

config/subscribe.txt

@@ -1,19 +1,19 @@
 # 这是订阅源列表，每行一个订阅地址
 # This is a list of subscription sources, with one subscription address per line
-https://iptv.b2og.com/txt/fmml_ipv6.txt
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/suxuang/myIPTV/main/ipv6.m3u
-https://live.zbds.top/tv/iptv6.txt
-https://live.zbds.top/tv/iptv4.txt
-https://live.fanmingming.cn/tv/m3u/ipv6.m3u
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/joevess/IPTV/main/home.m3u8
-https://aktv.top/live.txt
-http://175.178.251.183:6689/live.txt
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/kimwang1978/collect-tv-txt/main/merged_output.txt
-https://m3u.ibert.me/txt/fmml_dv6.txt
-https://m3u.ibert.me/txt/o_cn.txt
-https://m3u.ibert.me/txt/j_iptv.txt
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/xzw832/cmys/main/S_CCTV.txt
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/xzw832/cmys/main/S_weishi.txt
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/l.txt
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/kk.txt
-https://ghproxy.1888866.xyz/raw.githubusercontent.com/yuanzl77/IPTV/master/live.txt
+
+https://raw.githubusercontent.com/suxuang/myIPTV/main/ipv6.m3u
+https://raw.githubusercontent.com/joevess/IPTV/main/home.m3u8
+https://raw.githubusercontent.com/kimwang1978/collect-tv-txt/main/merged_output.txt
+https://raw.githubusercontent.com/xzw832/cmys/main/S_CCTV.txt
+https://raw.githubusercontent.com/xzw832/cmys/main/S_weishi.txt
+https://raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/l.txt
+https://raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/kk.txt
+https://raw.githubusercontent.com/yuanzl77/IPTV/master/live.txt
+https://raw.githubusercontent.com/fanmingming/live/main/tv/m3u/ipv6.m3u
+https://raw.githubusercontent.com/iptv-org/iptv/gh-pages/countries/cn.m3u
+https://raw.githubusercontent.com/iptv-org/iptv/master/streams/cn.m3u
+https://raw.githubusercontent.com/vbskycn/iptv/master/tv/iptv6.txt
+https://raw.githubusercontent.com/vbskycn/iptv/master/tv/iptv4.txt
+https://raw.githubusercontent.com/YueChan/Live/main/APTV.m3u
+https://raw.githubusercontent.com/YanG-1989/m3u/main/Gather.m3u
+https://raw.githubusercontent.com/yuanzl77/IPTV/main/live.txt

utils/tools.py

@@ -220,17 +220,18 @@ def get_total_urls(info_list, ipv_type_prefer, origin_type_prefer):
             else:
                 continue
 
-    ipv_type_total = list(dict.fromkeys(ipv_type_prefer + ["ipv4", "ipv6"]))
-    if len(total_urls) < urls_limit:
-        for origin in origin_type_prefer:
-            if len(total_urls) >= urls_limit:
-                break
-            for ipv_type in ipv_type_total:
+    if config.open_supply:
+        ipv_type_total = list(dict.fromkeys(ipv_type_prefer + ["ipv4", "ipv6"]))
+        if len(total_urls) < urls_limit:
+            for origin in origin_type_prefer:
                 if len(total_urls) >= urls_limit:
                     break
-                extra_urls = categorized_urls[origin][ipv_type][: config.source_limits.get(origin, urls_limit)]
-                total_urls.extend(extra_urls)
-                total_urls = list(dict.fromkeys(total_urls))[:urls_limit]
+                for ipv_type in ipv_type_total:
+                    if len(total_urls) >= urls_limit:
+                        break
+                    extra_urls = categorized_urls[origin][ipv_type][: config.source_limits.get(origin, urls_limit)]
+                    total_urls.extend(extra_urls)
+                    total_urls = list(dict.fromkeys(total_urls))[:urls_limit]
 
     total_urls = list(dict.fromkeys(total_urls))[:urls_limit]