Merge pull request #555 from Guovin/dev

Dev

README.md

@@ -21,7 +21,11 @@
   </div>
   <br>
   <div>
-  🏠广东频道: 广东珠江, 广东体育, 广东新闻, 广东民生, 广东卫视, 大湾区卫视, 广州综合, 广州影视, 广州竞赛, 江门综合, 江门侨乡生活, 佛山综合, 深圳卫视, 汕头综合, 汕头经济, 汕头文旅, 茂名综合, 茂名公共
+  ☘️广东频道: 广东珠江, 广东体育, 广东新闻, 广东民生, 广东卫视, 大湾区卫视, 广州综合, 广州影视, 广州竞赛, 江门综合, 江门侨乡生活, 佛山综合, 深圳卫视, 汕头综合, 汕头经济, 汕头文旅, 茂名综合, 茂名公共
+  </div>
+  <br>
+  <div>
+  ☘️各省份地方台
   </div>
   <br>
   <div>
@@ -152,37 +156,46 @@ pipenv run ui
 建议都试用一次，选择自己合适的版本
 
 1. 拉取镜像：
+
 - driver：
+
 ```bash
 docker pull guovern/tv-driver:latest
 ```
 
 - requests：
+
 ```bash
 docker pull guovern/tv-requests:latest
 ```
 
 2. 运行容器：
+
 - driver：
+
 ```bash
 docker run -d -p 8000:8000 guovern/tv-driver
 ```
 
 - requests：
+
 ```bash
 docker run -d -p 8000:8000 guovern/tv-requests
 ```
 
 卷挂载参数（可选）：
 实现宿主机文件与容器文件同步，修改模板、配置、获取更新结果文件可直接在宿主机文件夹下操作
 
-以宿主机路径/etc/docker为例：
+以宿主机路径/etc/docker 为例：
+
 - driver：
+
 ```bash
 docker run -v /etc/docker/config:/tv-driver/config -v /etc/docker/output:/tv-driver/output -d -p 8000:8000 guovern/tv-driver
 ```
 
 - requests：
+
 ```bash
 docker run -v /etc/docker/config:/tv-requests/config -v /etc/docker/output:/tv-requests/output -d -p 8000:8000 guovern/tv-requests
 ```

README_en.md

@@ -21,7 +21,11 @@
   </div>
   <br>
   <div>
-  🏠Guangdong Channel: 广东珠江, 广东体育, 广东新闻, 广东民生, 广东卫视, 大湾区卫视, 广州综合, 广州影视, 广州竞赛, 江门综合, 江门侨乡生活, 佛山综合, 深圳卫视, 汕头综合, 汕头经济, 汕头文旅, 茂名综合, 茂名公共
+  ☘️Guangdong Channel: 广东珠江, 广东体育, 广东新闻, 广东民生, 广东卫视, 大湾区卫视, 广州综合, 广州影视, 广州竞赛, 江门综合, 江门侨乡生活, 佛山综合, 深圳卫视, 汕头综合, 汕头经济, 汕头文旅, 茂名综合, 茂名公共
+  </div>
+  <br>
+  <div>
+  ☘️Local channels in each province
   </div>
   <br>
   <div>
@@ -152,23 +156,29 @@ pipenv run ui
 It's recommended to try each one and choose the version that suits you
 
 1. Pull the image:
+
 - driver
+
 ```bash
 docker pull guovern/tv-driver:latest
 ```
 
 - requests
+
 ```bash
 docker pull guovern/tv-requests:latest
 ```
 
 2. Run the container:
+
 - driver
+
 ```bash
 docker run -d -p 8000:8000 guovern/tv-driver
 ```
 
 - requests
+
 ```bash
 docker run -d -p 8000:8000 guovern/tv-requests
 ```
@@ -179,14 +189,16 @@ This allows synchronization of files between the host machine and the container.
 Taking the host path /etc/docker as an example:
 
 - driver：
+
 ```bash
 docker run -v /etc/docker/config:/tv-driver/config -v /etc/docker/output:/tv-driver/output -d -p 8000:8000 guovern/tv-driver
 ```
 
 - requests：
+
 ```bash
 docker run -v /etc/docker/config:/tv-requests/config -v /etc/docker/output:/tv-requests/output -d -p 8000:8000 guovern/tv-requests
-````
+```
 
 3. Update results:
 - API address: ip:8000

config/config.ini

@@ -5,8 +5,8 @@ open_use_old_result = True
 source_file = config/demo.txt
 final_file = output/result.txt
 open_online_search = False
-online_search_page_num = 3
-urls_limit = 30
+online_search_page_num = 1
+urls_limit = 10
 open_keep_all = False
 open_sort = True
 sort_timeout = 10
@@ -18,9 +18,9 @@ resolution_weight = 0.5
 recent_days = 30
 ipv_type = 全部
 ipv_type_prefer = 自动
-ipv4_num = 15
-ipv6_num = 15
-domain_blacklist = epg.pw,skype.serv00.net,iptv.yjxfz.com,live-hls-web-ajb.getaj.net,live.goodiptv.club,hc73k3dhwo5gfkt.wcetv.com,stream1.freetv.fun
+ipv4_num = 5
+ipv6_num = 5
+domain_blacklist = epg.pw,skype.serv00.net,iptv.yjxfz.com,live-hls-web-ajb.getaj.net,live.goodiptv.club,hc73k3dhwo5gfkt.wcetv.com,stream1.freetv.fun,zw9999.cnstream.top
 open_m3u_result = True
 url_keywords_blacklist = 
 open_subscribe = True
@@ -40,9 +40,9 @@ hotel_page_num = 1
 open_update_time = True
 request_timeout = 10
 origin_type_prefer = hotel,multicast,subscribe,online_search
-hotel_num = 10
-multicast_num = 10
-subscribe_num = 10
+hotel_num = 4
+multicast_num = 3
+subscribe_num = 3
 online_search_num = 0
 open_url_info = True
-open_empty_category = True
+open_empty_category = False