优化过滤信息输出, 添加来源和网页链接

Author: Nriver

QBRssManager.py

@@ -411,11 +411,24 @@ def load_type_hints(self, row):
                     self.text_browser.append('通过api获取feed')
                     rss_feeds = qb_client.rss_items(include_feed_data=True)
                     article_titles = []
+                    article_details = []
                     for x in rss_feeds:
                         if rss_feeds[x]['url'] in feed_list:
                             for article in rss_feeds[x]['articles']:
+                                url = ''
+                                # feed的链接, 有点在url里面, 有的在link里面
+                                if 'url' in article:
+                                    url = article['url']
+                                elif 'link' in article:
+                                    url = article['link']
                                 article_titles.append(article['title'])
+                                article_details.append({
+                                    'title': article['title'],
+                                    'url': url,
+                                    'source_name': x,
+                                })
                     self.tableWidget.type_hints = article_titles
+                    self.tableWidget.article_details = article_details
                     # 数据太多可能会导致卡顿 这里尽量不要输出
                     # logger.info(self.tableWidget.type_hints)
                     return True

ui/custom_qtext_browser.py

@@ -1,29 +1,45 @@
+from PyQt5.QtCore import QUrl
+from PyQt5.QtGui import QDesktopServices
 from PyQt5.QtWidgets import QTextBrowser
 
 import g
 from utils.string_util import wildcard_match_check
 
 
+def handle_links(url):
+    if not url.scheme():
+        url = QUrl.fromLocalFile(url.toString())
+    QDesktopServices.openUrl(url)
+
+
 class CustomQTextBrowser(QTextBrowser):
 
     def __init__(self, parent_app):
         super().__init__(parent_app)
         self.parent_app = parent_app
 
+        # 设置使用外部程序打开链接
+        self.setOpenLinks(False)
+        self.anchorClicked.connect(handle_links)
+
     def filter_type_hint(self):
         # 过滤输入提示
         include_text = g.data_list[self.parent_app.tableWidget.currentItem().row()][2]
         exclude_text = g.data_list[self.parent_app.tableWidget.currentItem().row()][3]
         type_hints = self.parent_app.tableWidget.type_hints
+        article_details = self.parent_app.tableWidget.article_details
         # 清空
         self.parent_app.text_browser.clear()
         if include_text.strip() == '' and exclude_text.strip() == '':
             # 特殊处理 为空则匹配所有
-            self.parent_app.text_browser.append('\n'.join(type_hints))
+            # self.parent_app.text_browser.append('<br/>'.join(type_hints))
+            for x in article_details:
+                self.parent_app.text_browser.append(
+                    f"""<a style="color:#00a3a3">{x['source_name']}</a> {x['title']} <a href="{x['url']} alt="{x['url']}"">链接</a>""")
         else:
             # 保留匹配的
             filtered_hints = []
-            for type_hint in type_hints:
+            for i, type_hint in enumerate(type_hints):
                 # 包含关键字
                 flag1 = False
                 # 不包含关键字
@@ -35,8 +51,13 @@ def filter_type_hint(self):
                     # flag2 = all(x.lower() in type_hint.lower() for x in exclude_text.split(' '))
                     flag2 = wildcard_match_check(type_hint, exclude_text)
                 if flag1 and not flag2:
-                    filtered_hints.append(type_hint)
+                    # filtered_hints.append(type_hint)
+                    filtered_hints.append(i)
             if filtered_hints:
-                self.parent_app.text_browser.append('\n'.join(filtered_hints))
+                for i in filtered_hints:
+                    x = article_details[i]
+                    self.parent_app.text_browser.append(
+                        f"""<a style="color:#00a3a3">{x['source_name']}</a> {x['title']} <a href="{x['url']}" alt="{x['url']}">链接</a>""")
+
             else:
-                self.parent_app.text_browser.append('暂时没有找到相关的feed')
+                self.parent_app.text_browser.append('<p>暂时没有找到相关的feed</p>')