diff --git a/README.md b/README.md index 319ddfc852..3887bdb7b4 100644 --- a/README.md +++ b/README.md @@ -170,5 +170,12 @@ docker run -d -p 8000:8000 guovern/tv-requests 或 tv-driver ## 赞赏 -
如果对您有帮助,请赞赏,您的赞赏是我更新的动力~
-赞赏码 +
请我喝杯饮料☕️吧~
+ +| 支付宝 | 微信 | +| ----------------------------------------- | ------------------------------------------- | +| ![支付宝扫码](./static/images/alipay.jpg) | ![微信扫码](./static/images/appreciate.jpg) | + +## 免责声明 + +本项目仅供学习交流用途,接口数据均来源于网络,如有侵权,请联系删除 diff --git a/README_en.md b/README_en.md index 685ae3d39b..92e6385f90 100644 --- a/README_en.md +++ b/README_en.md @@ -170,5 +170,12 @@ For example: docker run -v /etc/docker/config:/tv-requests/config -v /etc/docker ## Appreciate -
If you find it helpful, please give a tip, your support is my motivation to update~
-appreciate code +
Please buy me a drink~~
+ +| Alipay | Wechat | +| ------------------------------------- | ----------------------------------------- | +| ![Alipay](./static/images/alipay.jpg) | ![Wechat](./static/images/appreciate.jpg) | + +## Disclaimer + +This project is for learning and communication purposes only. All interface data comes from the internet. If there is any infringement, please contact us for removal. diff --git a/config/config.ini b/config/config.ini index 4b31bc3885..200f29bdd9 100644 --- a/config/config.ini +++ b/config/config.ini @@ -43,4 +43,5 @@ origin_type_prefer = hotel,multicast,subscribe,online_search hotel_num = 10 multicast_num = 10 subscribe_num = 10 -online_search_num = 10 \ No newline at end of file +online_search_num = 10 +open_url_info = True \ No newline at end of file diff --git a/docs/config.md b/docs/config.md index a76a2592b3..fdbc51863b 100644 --- a/docs/config.md +++ b/docs/config.md @@ -44,3 +44,4 @@ | multicast_num | 10 | 结果中偏好的组播源接口数量 | | subscribe_num | 10 | 结果中偏好的订阅源接口数量 | | online_search_num | 10 | 结果中偏好的在线搜索接口数量 | +| open_url_info | True | 开启显示接口说明信息,用于控制是否显示分辨率、接口协议类型等信息,为$符号后的内容,播放软件使用该信息对接口进行描述 | diff --git a/docs/config_en.md b/docs/config_en.md index 766fedaa23..a57085937d 100644 --- a/docs/config_en.md +++ b/docs/config_en.md @@ -44,3 +44,4 @@ | multicast_num | 10 | The number of preferred multicast source interfaces in the results | | subscribe_num | 10 | The number of preferred subscribe source interfaces in the results | | online_search_num | 10 | The number of preferred online search interfaces in the results | +| open_url_info | True | Enable display of API description information, used to control whether to show resolution, API protocol type, etc., the content after the $ symbol, playback software uses this information to describe the API | diff --git a/static/images/alipay.jpg b/static/images/alipay.jpg new file mode 100644 index 0000000000..445af55d99 Binary files /dev/null and b/static/images/alipay.jpg differ diff --git a/tkinter_ui/about.py b/tkinter_ui/about.py index f18dda66ee..63486b83ef 100644 --- a/tkinter_ui/about.py +++ b/tkinter_ui/about.py @@ -61,14 +61,14 @@ def init_ui(self, root=None, version=None): ) disclaimer_label.pack() - image = Image.open(resource_path("static/images/appreciate.jpg")) + image = Image.open(resource_path("static/images/alipay.jpg")) resized_image = image.resize((250, 250)) photo = ImageTk.PhotoImage(resized_image) image_label = tk.Label(about_window, image=photo) image_label.image = photo image_label.pack() - appreciate_label = tk.Label(about_window, text="您的赞助是我更新的动力") + appreciate_label = tk.Label(about_window, text="请我喝杯饮料☕️吧~") appreciate_label.pack() confirm_button = tk.ttk.Button( diff --git a/utils/tools.py b/utils/tools.py index 51ab890741..0eb34441a5 100644 --- a/utils/tools.py +++ b/utils/tools.py @@ -192,7 +192,13 @@ def get_total_urls_from_info_list(infoList): if len(total_urls) >= urls_limit: break - return list(dict.fromkeys(total_urls))[:urls_limit] + total_urls = list(dict.fromkeys(total_urls))[:urls_limit] + + open_url_info = config.getboolean("Settings", "open_url_info", fallback=True) + if not open_url_info: + return [url.split("$", 1)[0] for url in total_urls] + else: + return total_urls def get_total_urls_from_sorted_data(data):