1
0
Fork 0
mirror of https://gitlab.com/SIGBUS/nyaa.git synced 2024-12-22 14:30:01 +00:00

Format information into a link if possible

Fixes issue #24 (am I doing this right?)
Supports HTTP(S) and IRC channels (#channel@server.com)
This commit is contained in:
TheAMM 2017-05-13 23:40:53 +03:00
parent 03bac92088
commit 00a0327b19
2 changed files with 26 additions and 1 deletions

View file

@ -7,6 +7,10 @@ from sqlalchemy_utils import ChoiceType, EmailType, PasswordType
from werkzeug.security import generate_password_hash, check_password_hash from werkzeug.security import generate_password_hash, check_password_hash
from sqlalchemy_fulltext import FullText from sqlalchemy_fulltext import FullText
import re
from markupsafe import escape as escape_markup
from urllib.parse import unquote as unquote_url
if app.config['USE_MYSQL']: if app.config['USE_MYSQL']:
from sqlalchemy.dialects import mysql from sqlalchemy.dialects import mysql
BinaryType = mysql.BINARY BinaryType = mysql.BINARY
@ -94,6 +98,27 @@ class Torrent(db.Model):
''' Returns a UTC POSIX timestamp, as seconds ''' ''' Returns a UTC POSIX timestamp, as seconds '''
return (self.created_time - UTC_EPOCH).total_seconds() return (self.created_time - UTC_EPOCH).total_seconds()
@property
def information_as_link(self):
''' Formats the .information into an IRC or HTTP(S) <a> if possible,
otherwise escapes it. '''
irc_match = re.match(r'^#([a-zA-Z0-9-_]+)@([a-zA-Z0-9-_.:]+)$', self.information)
if irc_match:
# Return a formatted IRC uri
return '<a href="irc://{1}/{0}">#{0}@{1}</a>'.format(*irc_match.groups())
url_match = re.match(r'^(https?:\/\/.+?)$', self.information)
if url_match:
url = url_match.group(1)
invalid_url_characters = '<>"'
# Check if url contains invalid characters
if not any(c in url for c in invalid_url_characters):
return '<a href="{0}">{1}</a>'.format(url, escape_markup(unquote_url(url)))
# Escaped
return escape_markup(self.information)
@property @property
def magnet_uri(self): def magnet_uri(self):
return create_magnet(self) return create_magnet(self)

View file

@ -34,7 +34,7 @@
<div class="col-md-1">Information:</div> <div class="col-md-1">Information:</div>
<div class="col-md-5"> <div class="col-md-5">
{% if torrent.information %} {% if torrent.information %}
{{ torrent.information | escape }} {{ torrent.information_as_link | safe }}
{% else %} {% else %}
No information. No information.
{% endif%} {% endif%}