From 0e89d3f24b2d03cde421339555ea5558366d54f2 Mon Sep 17 00:00:00 2001 From: TheAMM Date: Wed, 24 May 2017 17:17:15 +0300 Subject: [PATCH 1/4] Show torrent hash on torrent page --- nyaa/templates/view.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nyaa/templates/view.html b/nyaa/templates/view.html index d4b852f..765fb86 100644 --- a/nyaa/templates/view.html +++ b/nyaa/templates/view.html @@ -62,6 +62,10 @@
Completed:
{% if config.ENABLE_SHOW_STATS %}{{ torrent.stats.download_count }}{% else %}Coming soon{% endif %}
+
+
SHA-1 hash:
+
{{ torrent.info_hash_as_hex }}
+
{% if torrent.has_torrent %}Download Torrent or {% endif %}Magnet From 3a4280ccc5101b1924b69cc6f00dfeaf5e6449fa Mon Sep 17 00:00:00 2001 From: TheAMM Date: Wed, 24 May 2017 17:18:44 +0300 Subject: [PATCH 2/4] Redirect searches with an info hash to torrent if found Redirect will not happen on RSS or user page views (/searches). Adds a helper to models.Torrent to search with a hex hash Reformats "special search logic" --- nyaa/models.py | 5 +++++ nyaa/routes.py | 33 ++++++++++++++++++++++-------- nyaa/templates/search_results.html | 6 +++--- 3 files changed, 33 insertions(+), 11 deletions(-) diff --git a/nyaa/models.py b/nyaa/models.py index e91a432..ec1e56a 100755 --- a/nyaa/models.py +++ b/nyaa/models.py @@ -205,6 +205,11 @@ class Torrent(db.Model): def by_info_hash(cls, info_hash): return cls.query.filter_by(info_hash=info_hash).first() + @classmethod + def by_info_hash_hex(cls, info_hash_hex): + info_hash_bytes = bytearray.fromhex(info_hash_hex) + return cls.by_info_hash(info_hash_bytes) + class TorrentNameSearch(FullText, Torrent): __fulltext_columns__ = ('display_name',) diff --git a/nyaa/routes.py b/nyaa/routes.py index 77e9956..ef72010 100644 --- a/nyaa/routes.py +++ b/nyaa/routes.py @@ -182,16 +182,25 @@ def home(rss): flask.abort(404) user_id = user.id - user_query = { + special_results = { 'first_word_user': None, - 'query_sans_user': None + 'query_sans_user': None, + 'infohash_torrent': None } - if search_term: + # Add advanced features to searches (but not RSS or user searches) + if search_term and not render_as_rss and not user_id: + # Check if the first word of the search is an existing user user_word_match = re.match(r'^([a-zA-Z0-9_-]+) *(.*|$)', search_term) if user_word_match: - first_word_username = user_word_match.group(1) - user_query['first_word_user'] = models.User.by_username(first_word_username) - user_query['query_sans_user'] = user_word_match.group(2) + special_results['first_word_user'] = models.User.by_username(user_word_match.group(1)) + special_results['query_sans_user'] = user_word_match.group(2) + + # Check if search is a 40-char torrent hash + infohash_match = re.match(r'(?i)^([a-f0-9]{40})$', search_term) + if infohash_match: + # Check for info hash in database + matched_torrent = models.Torrent.by_info_hash_hex(infohash_match.group(1)) + special_results['infohash_torrent'] = matched_torrent query_args = { 'user': user_id, @@ -210,6 +219,14 @@ def home(rss): if flask.g.user.is_moderator: # God mode query_args['admin'] = True + infohash_torrent = special_results.get('infohash_torrent') + if infohash_torrent: + # infohash_torrent is only set if this is not RSS or userpage search + flask.flash(flask.Markup('You were redirected here because ' + 'the given hash matched this torrent.'), 'info') + # Redirect user from search to the torrent if we found one with the specific info_hash + return flask.redirect(flask.url_for('view_torrent', torrent_id=infohash_torrent.id)) + # If searching, we get results from elastic search use_elastic = app.config.get('USE_ELASTIC_SEARCH') if use_elastic and search_term: @@ -243,7 +260,7 @@ def home(rss): torrent_query=query_results, search=query_args, rss_filter=rss_query_string, - user_query=user_query) + special_results=special_results) else: # If ES is enabled, default to db search for browsing if use_elastic: @@ -265,7 +282,7 @@ def home(rss): torrent_query=query, search=query_args, rss_filter=rss_query_string, - user_query=user_query) + special_results=special_results) @app.route('/user/', methods=['GET', 'POST']) diff --git a/nyaa/templates/search_results.html b/nyaa/templates/search_results.html index df817ef..d903764 100644 --- a/nyaa/templates/search_results.html +++ b/nyaa/templates/search_results.html @@ -9,10 +9,10 @@ {% endmacro %} -{% if user_query is defined %} -{% if user_query.first_word_user and not search.user %} +{% if special_results is defined and not search.user %} +{% if special_results.first_word_user %}
- Click here to see only results uploaded by {{ user_query.first_word_user.username }} + Click here to see only results uploaded by {{ special_results.first_word_user.username }}
{% endif %} {% endif %} From d287aaf974aa894db6249af3fa7d3ee079ceaeb0 Mon Sep 17 00:00:00 2001 From: TheAMM Date: Wed, 24 May 2017 17:20:52 +0300 Subject: [PATCH 3/4] Show "Search 's torrents..." on user pages in search field --- nyaa/templates/layout.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nyaa/templates/layout.html b/nyaa/templates/layout.html index 8cedea2..4230f74 100755 --- a/nyaa/templates/layout.html +++ b/nyaa/templates/layout.html @@ -57,6 +57,7 @@ {{ config.SITE_NAME }}
+ {% set search_placeholder = 'Search {}\'s torrents...'.format(user.username) if user_page else 'Search...' %}