Merge pull request #651 from Guovin/master

feat

.github/ISSUE_TEMPLATE/1_bug.yml

@@ -2,35 +2,46 @@ name: Bug report
 description: Report a bug
 labels: [ bug ]
 body:
+  - type: checkboxes
+    attributes:
+      label: Don't skip these steps
+      description: Carefully complete the following steps before submitting an issue
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
+        - label: I have checked through the search that there are no similar issues that already exist
+          required: true
+        - label: I will not submit any issues that are not related to this project
+          required: true
   - type: checkboxes
     id: checklist
     attributes:
-      label: 发生环境 (Occurrence environment)
+      label: Occurrence environment
       description: |
-        选择该Bug触发于什么环境 (Please select what environment is the Bug triggered in):
+        Please select what environment is the Bug triggered in:
       options:
-        - label: 工作流 (Workflow)
+        - label: Workflow
           required: false
         - label: GUI
           required: false
         - label: Docker
           required: false
-        - label: 命令行 (Command line)
+        - label: Command line
           required: false
   - type: textarea
     id: description
     attributes:
-      label: Bug描述 (Bug description)
-      description: 对于该Bug的具体描述，好的描述将有助于理解与解决 (As for the specific description of the Bug, a good description will help to understand and solve it)
-      placeholder: 提供任何附加信息，任何建议的解决方案，以及尽可能多的上下文和示例 (Provide any additional information, any suggested solutions, and as much context and examples as possible)
+      label: Bug description
+      description: As for the specific description of the Bug, a good description will help to understand and solve it
+      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
     validations:
       required: true
   - type: textarea
     id: log
     attributes:
-      label: 报错日志 (Error log)
-      description: 提供对于该Bug的详细报错日志 (Provides a detailed error log for the Bug)
-      placeholder: 请输入详细的报错日志 (Please enter a detailed error log)
+      label: Error log
+      description: Provides a detailed error log for the Bug
+      placeholder: Please enter a detailed error log
       render: shell
     validations:
-      required: false
+      required: false

.github/ISSUE_TEMPLATE/2_question.yml

@@ -0,0 +1,47 @@
+name: Ask Question
+description: Ask iptv-api related question
+labels: [ question ]
+body:
+  - type: checkboxes
+    attributes:
+      label: Don't skip these steps
+      description: Carefully complete the following steps before submitting an issue
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
+        - label: I have checked through the search that there are no similar issues that already exist
+          required: true
+        - label: I will not submit any issues that are not related to this project
+          required: true
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Occurrence environment
+      description: |
+        Select the context in which the question is located:
+      options:
+        - label: Workflow
+          required: false
+        - label: GUI
+          required: false
+        - label: Docker
+          required: false
+        - label: Command line
+          required: false
+  - type: textarea
+    id: description
+    attributes:
+      label: Question description
+      description: As for the specific description of the Question, a good description will help to understand and solve it
+      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Related log
+      description: Provides detailed log for the question
+      placeholder: Please enter a detailed log
+      render: shell
+    validations:
+      required: false

.github/ISSUE_TEMPLATE/3_enhancement.yml

@@ -0,0 +1,47 @@
+name: Enhancement request
+description: Request a feature enhancement
+labels: [ enhancement ]
+body:
+  - type: checkboxes
+    attributes:
+      label: Don't skip these steps
+      description: Carefully complete the following steps before submitting an issue
+      options:
+        - label: I understand that I will be **blocked** if I *intentionally* remove or skip any mandatory\* field
+          required: true
+        - label: I have checked through the search that there are no similar issues that already exist
+          required: true
+        - label: I will not submit any issues that are not related to this project
+          required: true
+  - type: checkboxes
+    id: checklist
+    attributes:
+      label: Application environment
+      description: |
+        Select the context in which the enhancement is located:
+      options:
+        - label: Workflow
+          required: false
+        - label: GUI
+          required: false
+        - label: Docker
+          required: false
+        - label: Command line
+          required: false
+  - type: textarea
+    id: description
+    attributes:
+      label: Enhancement description
+      description: As for the specific description of the Enhancement, a good description will help to understand and solve it
+      placeholder: Provide any additional information, any suggested solutions, and as much context and examples as possible
+    validations:
+      required: true
+  - type: textarea
+    id: log
+    attributes:
+      label: Related log
+      description: Provides detailed log for the enhancement
+      placeholder: Please enter a detailed log
+      render: shell
+    validations:
+      required: false

config/config.ini

@@ -2,6 +2,8 @@
 open_service = True
 open_update = True
 open_use_old_result = True
+open_use_cache = True
+open_request = False
 source_file = config/demo.txt
 final_file = output/result.txt
 open_online_search = False
@@ -24,16 +26,16 @@ ipv6_num = 5
 open_m3u_result = True
 url_keywords_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,zsntlqj.xicp.net
 open_subscribe = True
-subscribe_urls = https://live.zbds.top/tv/iptv6.txt,https://live.zbds.top/tv/iptv4.txt,https://live.fanmingming.com/tv/m3u/ipv6.m3u,https://ghp.ci/https://raw.githubusercontent.com/joevess/IPTV/main/home.m3u8,https://aktv.top/live.txt,http://175.178.251.183:6689/live.txt,https://ghp.ci/https://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://ghp.ci/https://raw.githubusercontent.com/xzw832/cmys/main/S_CCTV.txt,https://ghp.ci/https://raw.githubusercontent.com/xzw832/cmys/main/S_weishi.txt,http://itv.22m.top/ITVBox/tv/tvonline.txt,https://ghp.ci//https://raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/l.txt,https://ghp.ci//https://raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/kk.txt
+subscribe_urls = https://iptv.b2og.com/txt/fmml_ipv6.txt,https://ghp.ci/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.com/tv/m3u/ipv6.m3u,https://ghp.ci/https://raw.githubusercontent.com/joevess/IPTV/main/home.m3u8,https://aktv.top/live.txt,http://175.178.251.183:6689/live.txt,https://ghp.ci/https://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://ghp.ci/https://raw.githubusercontent.com/xzw832/cmys/main/S_CCTV.txt,https://ghp.ci/https://raw.githubusercontent.com/xzw832/cmys/main/S_weishi.txt,http://itv.22m.top/ITVBox/tv/tvonline.txt,https://ghp.ci//https://raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/l.txt,https://ghp.ci//https://raw.githubusercontent.com/asdjkl6/tv/tv/.m3u/整套直播源/测试/整套直播源/kk.txt
 open_multicast = True
-open_multicast_foodie = False
+open_multicast_foodie = True
 open_multicast_fofa = True
 multicast_region_list = 全部
 multicast_page_num = 1
 open_proxy = False
 open_driver = False
 open_hotel = True
-open_hotel_foodie = False
+open_hotel_foodie = True
 open_hotel_fofa = True
 hotel_region_list = 全部
 hotel_page_num = 1

docs/config.md

@@ -3,6 +3,8 @@
 | open_service           | True                                    | 开启页面服务，用于控制是否启动结果页面服务；如果使用青龙等平台部署，有专门设定的定时任务，需要更新完成后停止运行，可以关闭该功能                          |
 | open_update            | True                                    | 开启更新，用于控制是否更新接口，若关闭则所有工作模式（获取接口和测速）均停止                                                    |
 | open_use_old_result    | True                                    | 开启使用历史更新结果（包含模板与结果文件的接口），合并至本次更新中                                                         |
+| open_use_cache         | True                                    | 开启使用本地缓存数据，适用于查询请求失败场景                                                                    |
+| open_request           | False                                   | 开启查询请求，数据来源于网络                                                                            |
 | open_driver            | True                                    | 开启浏览器运行，若更新无数据可开启此模式，较消耗性能                                                                |
 | open_proxy             | False                                   | 开启代理，自动获取免费可用代理，若更新无数据可开启此模式                                                              |
 | source_file            | config/demo.txt                         | 模板文件路径                                                                                    |

docs/config_en.md

@@ -3,6 +3,8 @@
 | open_service           | True                                       | Enable page service, used to control whether to start the result page service; if deployed on platforms like Qinglong with dedicated scheduled tasks, the function can be turned off after updates are completed and the task is stopped                                                                                                                                       |
 | open_update            | True                                       | Enable updates, if disabled then only the result page service is run                                                                                                                                                                                                                                                                                                           |
 | open_use_old_result    | True                                       | Enable the use of historical update results (including the interface for template and result files) and merge them into the current update                                                                                                                                                                                                                                     |
+| open_use_cache         | True                                       | Enable the use of local cache data, applicable to the query request failure scenario                                                                                                                                                                                                                                                                                           |
+| open_request           | False                                      | Enable query request, the data is obtained from the network                                                                                                                                                                                                                                                                                                                    |
 | open_driver            | True                                       | Enable browser execution, If there are no updates, this mode can be enabled, which consumes more performance                                                                                                                                                                                                                                                                   |
 | open_proxy             | False                                      | Enable proxy, automatically obtains free available proxies, If there are no updates, this mode can be enabled                                                                                                                                                                                                                                                                  |
 | source_file            | config/demo.txt                            | Template file path                                                                                                                                                                                                                                                                                                                                                             |