diff --git a/.gitignore b/.gitignore index 74c74d8e2a..3ff1cee2f5 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,5 @@ RELEASE-VERSION # used by setuptools to cache downloaded eggs /.eggs _pytest_temp/ +.idea +*.iml diff --git a/deluge/common.py b/deluge/common.py index be655447fd..256f1f7831 100644 --- a/deluge/common.py +++ b/deluge/common.py @@ -720,6 +720,16 @@ def parse_human_size(size): raise InvalidSize(msg % (size, tokens)) +def anchorify_urls(text: str) -> str: + """ + Wrap all occurrences of text URLs with HTML + """ + url_pattern = r'((htt)|(ft)|(ud))ps?://\S+' + html_href_pattern = r'\g<0>' + + return re.sub(url_pattern, html_href_pattern, text) + + def is_url(url): """ A simple test to check if the URL is valid diff --git a/deluge/ui/gtk3/details_tab.py b/deluge/ui/gtk3/details_tab.py index 04a5eabfe0..95b4ab8e36 100644 --- a/deluge/ui/gtk3/details_tab.py +++ b/deluge/ui/gtk3/details_tab.py @@ -10,7 +10,7 @@ from xml.sax.saxutils import escape as xml_escape import deluge.component as component -from deluge.common import decode_bytes, fdate, fsize, is_url +from deluge.common import anchorify_urls, decode_bytes, fdate, fsize from .tab_data_funcs import fdate_or_dash, fpieces_num_size from .torrentdetails import Tab @@ -61,8 +61,8 @@ def _on_get_torrent_status(self, status): for widget in self.tab_widgets.values(): txt = xml_escape(self.widget_status_as_fstr(widget, status)) if decode_bytes(widget.obj.get_text()) != txt: - if 'comment' in widget.status_keys and is_url(txt): - widget.obj.set_markup(f'{txt}') + if 'comment' in widget.status_keys: + widget.obj.set_markup(anchorify_urls(txt)) else: widget.obj.set_markup(txt) diff --git a/deluge/ui/gtk3/trackers_tab.py b/deluge/ui/gtk3/trackers_tab.py index d671471b02..5fad631e4f 100644 --- a/deluge/ui/gtk3/trackers_tab.py +++ b/deluge/ui/gtk3/trackers_tab.py @@ -9,7 +9,7 @@ import logging import deluge.component as component -from deluge.common import ftime +from deluge.common import anchorify_urls, ftime from .tab_data_funcs import fcount, ftranslate, fyes_no from .torrentdetails import Tab @@ -54,7 +54,10 @@ def _on_get_torrent_status(self, status): for widget in self.tab_widgets.values(): txt = self.widget_status_as_fstr(widget, status) if widget.obj.get_text() != txt: - widget.obj.set_text(txt) + if 'tracker_status' in widget.status_keys: + widget.obj.set_markup(anchorify_urls(txt)) + else: + widget.obj.set_text(txt) def clear(self): for widget in self.tab_widgets.values():