Merge pull request #94 from Guovin/dev

Release: v1.0.8
Guovin · Apr 24, 2024 · 17707fb · 17707fb
2 parents b28435c + d7d4641
commit 17707fb
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # 更新日志（Changelog）
 
+## v1.0.8
+
+### 2024/4/24
+
+- 跟进某个节点检索频道名称参数变更（#91）（Follow up on the parameter change of channel name retrieval for a certain node (#91)）
+- 调整默认运行配置（Adjust the default running configuration）
+
 ## v1.0.7
 
 ### 2024/4/19

diff --git a/README-EN.md b/README-EN.md
@@ -10,7 +10,7 @@ Customize channel menus and automatically obtain and update the latest live sour
 - Interface validation to filter out invalid interfaces
 - Comprehensive sorting based on response time and resolution
 - Scheduled execution, updates every day at 8:00 am Beijing time
-- The maximum number of channels that can be updated in the workflow is 150, while there is no limit when running locally
+- The maximum number of channels that can be updated in the workflow is 200, while there is no limit when running locally
 - Set up key focus channels and configure the number of pages fetched separately
 - Pagination results retrieval (configurable number of pages and interfaces)
 - Ensure update timeliness, configure to retrieve interfaces updated within a recent time range
@@ -24,8 +24,8 @@ Customize channel menus and automatically obtain and update the latest live sour
 | source_file            | "demo.txt"         | Template file name                                                                                                 |
 | final_file             | "result.txt"       | Generated file name                                                                                                |
 | favorite_list          | ["CCTV1","CCTV13"] | List of favorite channel names (used only to distinguish from regular channels, custom page retrieval quantity)    |
-| favorite_page_num      | 3                  | Page retrieval quantity for favorite channels                                                                      |
-| default_page_num       | 2                  | Page retrieval quantity for regular channels                                                                       |
+| favorite_page_num      | 5                  | Page retrieval quantity for favorite channels                                                                      |
+| default_page_num       | 3                  | Page retrieval quantity for regular channels                                                                       |
 | urls_limit             | 10                 | Number of interfaces per channel                                                                                   |
 | response_time_weight   | 0.5                | Response time weight value (the sum of all weight values should be 1)                                              |
 | resolution_weight      | 0.5                | Resolution weight value (the sum of all weight values should be 1)                                                 |

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@
 - 接口验效，过滤无效接口
 - 按响应时间、分辨率综合权衡排序
 - 定时执行，北京时间每日 8:00 执行更新一次
-- 工作流更新频道数量上限 150 个，本地运行无限制
+- 工作流更新频道数量上限 200 个，本地运行无限制
 - 可设置重点关注频道，单独配置获取分页的数量
 - 分页结果获取（可配置页数、接口数量）
 - 保证更新时效性，配置获取最近时间范围内更新的接口
@@ -24,8 +24,8 @@
 | source_file            | "demo.txt"         | 模板文件名称                                                       |
 | final_file             | "result.txt"       | 生成文件名称                                                       |
 | favorite_list          | ["CCTV1","CCTV13"] | 关注频道名称列表（仅用于与常规频道区分，自定义获取分页数量）       |
-| favorite_page_num      | 3                  | 关注频道获取分页数量                                               |
-| default_page_num       | 2                  | 常规频道获取分页数量                                               |
+| favorite_page_num      | 5                  | 关注频道获取分页数量                                               |
+| default_page_num       | 3                  | 常规频道获取分页数量                                               |
 | urls_limit             | 10                 | 单个频道接口数量                                                   |
 | response_time_weight   | 0.5                | 响应时间权重值（所有权重值总和应为 1）                             |
 | resolution_weight      | 0.5                | 分辨率权重值 （所有权重值总和应为 1）                              |

diff --git a/config.py b/config.py
@@ -15,8 +15,8 @@
     "湖南卫视",
     "翡翠台",
 ]
-favorite_page_num = 3
-default_page_num = 2
+favorite_page_num = 5
+default_page_num = 3
 urls_limit = 10
 response_time_weight = 0.5
 resolution_weight = 0.5

diff --git a/docs/tutorial-EN.md b/docs/tutorial-EN.md
@@ -62,8 +62,8 @@ Adjust the configuration as needed. Below is the default configuration explanati
 | source_file            | "demo.txt"         | Template file name                                                                                                 |
 | final_file             | "result.txt"       | Generated file name                                                                                                |
 | favorite_list          | ["CCTV1","CCTV13"] | List of favorite channel names (used only to distinguish from regular channels, custom page retrieval quantity)    |
-| favorite_page_num      | 3                  | Page retrieval quantity for favorite channels                                                                      |
-| default_page_num       | 2                  | Page retrieval quantity for regular channels                                                                       |
+| favorite_page_num      | 5                  | Page retrieval quantity for favorite channels                                                                      |
+| default_page_num       | 3                  | Page retrieval quantity for regular channels                                                                       |
 | urls_limit             | 10                 | Number of interfaces per channel                                                                                   |
 | response_time_weight   | 0.5                | Response time weight value (the sum of all weight values should be 1)                                              |
 | resolution_weight      | 0.5                | Resolution weight value (the sum of all weight values should be 1)                                                 |

diff --git a/docs/tutorial.md b/docs/tutorial.md
@@ -61,8 +61,8 @@
 | source_file | "demo.txt" | 模板文件名称 |
 | final_file | "result.txt" | 生成文件名称 |
 | favorite_list | ["CCTV1","CCTV13"] | 关注频道名称列表（仅用于与常规频道区分，自定义获取分页数量） |
-| favorite_page_num | 3 | 关注频道获取分页数量 |
-| default_page_num | 2 | 常规频道获取分页数量 |
+| favorite_page_num | 5 | 关注频道获取分页数量 |
+| default_page_num | 3 | 常规频道获取分页数量 |
 | urls_limit | 10 | 单个频道接口数量 |
 | response_time_weight | 0.5 | 响应时间权重值（所有权重值总和应为 1） |
 | resolution_weight | 0.5 | 分辨率权重值 （所有权重值总和应为 1） |

diff --git a/main.py b/main.py
@@ -111,7 +111,7 @@ async def visitPage(self, channelItems):
                 try:
                     github_actions = os.environ.get("GITHUB_ACTIONS")
                     if not github_actions or (
-                        pbar.n <= 150 and github_actions == "true"
+                        pbar.n <= 200 and github_actions == "true"
                     ):
                         sorted_data = await compareSpeedAndResolution(infoList)
                         if sorted_data:

diff --git a/utils.py b/utils.py
@@ -272,4 +272,4 @@ async def useAccessibleUrl():
     if speed1 < speed2:
         return {"url": baseUrl1, "name": "s"}
     else:
-        return {"url": baseUrl2, "name": "tx"}
+        return {"url": baseUrl2, "name": "tv"}
diff --git a/version.json b/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "1.0.7"
+  "version": "1.0.8"
 }