Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UI][Common] Wrap torrent comment and tracker status URLs in HTML (clickable) #460

Closed
wants to merge 1 commit into from
Closed

[UI][Common] Wrap torrent comment and tracker status URLs in HTML (clickable) #460

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions deluge/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'<a href="\g<0>">\g<0></a>'

return re.sub(url_pattern, html_href_pattern, text)


def is_url(url):
"""
A simple test to check if the URL is valid
Expand Down
6 changes: 3 additions & 3 deletions deluge/ui/gtk3/details_tab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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'<a href="{txt}">{txt}</a>')
if 'comment' in widget.status_keys:
widget.obj.set_markup(anchorify_urls(txt))
else:
widget.obj.set_markup(txt)

Expand Down
7 changes: 5 additions & 2 deletions deluge/ui/gtk3/trackers_tab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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():
Expand Down
Loading