From 3b87337c71b6b5bfb02365190ad1276606ddae51 Mon Sep 17 00:00:00 2001
From: sharkykh <sharkykh@gmail.com>
Date: Sun, 14 May 2017 09:21:47 +0300
Subject: [PATCH 1/5] RSS: Add elements & refactor

description, size, seeders, leechers, downloads
---
 nyaa/templates/rss.xml | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/nyaa/templates/rss.xml b/nyaa/templates/rss.xml
index e1787d2..c6fdcdd 100644
--- a/nyaa/templates/rss.xml
+++ b/nyaa/templates/rss.xml
@@ -5,33 +5,31 @@
 		<link>{{ url_for('home', _external=True) }}</link>
 		<atom:link href="{{ url_for('home', page='rss', _external=True) }}" rel="self" type="application/rss+xml" />
 		{% for torrent in torrent_query %}
-		{% if torrent.has_torrent %}
 		<item>
 			<title>{{ torrent.display_name }}</title>
+			<description>{{ torrent.description }}</description>
 			{% if use_elastic %}
-			<link>{{ url_for('download_torrent', torrent_id=torrent.meta.id, _external=True) }}</link>
-			<guid isPermaLink="true">{{ url_for('view_torrent', torrent_id=torrent.meta.id, _external=True) }}</guid>
-			<pubDate>{{ torrent.created_time|rfc822_es }}</pubDate>
+				{% if torrent.has_torrent %}
+				<link>{{ url_for('download_torrent', torrent_id=torrent.meta.id, _external=True) }}</link>
+				{% else %}
+				<link>{{ create_magnet_from_info(torrent.display_name, torrent.info_hash) }}</link>
+				{% endif %}
+				<guid isPermaLink="true">{{ url_for('view_torrent', torrent_id=torrent.meta.id, _external=True) }}</guid>
+				<pubDate>{{ torrent.created_time|rfc822_es }}</pubDate>
 			{% else %}
-			<link>{{ url_for('download_torrent', torrent_id=torrent.id, _external=True) }}</link>
-			<guid isPermaLink="true">{{ url_for('view_torrent', torrent_id=torrent.id, _external=True) }}</guid>
-			<pubDate>{{ torrent.created_time|rfc822 }}</pubDate>
-			{% endif %}			
-		</item>
-		{% else %}
-		<item>
-			<title>{{ torrent.display_name }}</title>
-			{% if use_elastic %}
-			<link>{{ create_magnet_from_info(torrent.display_name, torrent.info_hash) }}</link>
-			<guid isPermaLink="true">{{ url_for('view_torrent', torrent_id=torrent.meta.id, _external=True) }}</guid>
-			<pubDate>{{ torrent.created_time|rfc822_es }}</pubDate>
-			{% else %}
-			<link>{{ torrent.magnet_uri }}</link>
-			<guid isPermaLink="true">{{ url_for('view_torrent', torrent_id=torrent.id, _external=True) }}</guid>
-			<pubDate>{{ torrent.created_time|rfc822 }}</pubDate>
+				{% if torrent.has_torrent %}
+				<link>{{ url_for('download_torrent', torrent_id=torrent.id, _external=True) }}</link>
+				{% else %}
+				<link>{{ torrent.magnet_uri }}</link>
+				{% endif %}
+				<guid isPermaLink="true">{{ url_for('view_torrent', torrent_id=torrent.id, _external=True) }}</guid>
+				<pubDate>{{ torrent.created_time|rfc822 }}</pubDate>
 			{% endif %}
+			<size>{{ torrent.filesize }}</size>
+			<seeders>{{ torrent.stats.seed_count }}</seeders>
+			<leechers>{{ torrent.stats.leech_count }}</leechers>
+			<downloads>{{ torrent.stats.download_count }}</downloads>
 		</item>
-		{% endif %}
 		{% endfor %}
 	</channel>
 </rss>

From d4621a23a7a10378ac7eac94947e3ba78e6b41fe Mon Sep 17 00:00:00 2001
From: sharkykh <sharkykh@gmail.com>
Date: Sun, 14 May 2017 09:23:30 +0300
Subject: [PATCH 2/5] Add bare torrent hash

lambda is probably not the best way to go,
suggestions for improvement are welcome!
---
 nyaa/routes.py         | 1 +
 nyaa/templates/rss.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/nyaa/routes.py b/nyaa/routes.py
index 48c8428..27d2dfb 100644
--- a/nyaa/routes.py
+++ b/nyaa/routes.py
@@ -303,6 +303,7 @@ def render_rss(label, query, use_elastic):
                                     use_elastic=use_elastic,
                                     term=label,
                                     site_url=flask.request.url_root,
+                                    compute_hash=lambda x: base64.b32encode(x).decode('utf-8'),
                                     torrent_query=query)
     response = flask.make_response(rss_xml)
     response.headers['Content-Type'] = 'application/xml'
diff --git a/nyaa/templates/rss.xml b/nyaa/templates/rss.xml
index c6fdcdd..91da605 100644
--- a/nyaa/templates/rss.xml
+++ b/nyaa/templates/rss.xml
@@ -29,6 +29,7 @@
 			<seeders>{{ torrent.stats.seed_count }}</seeders>
 			<leechers>{{ torrent.stats.leech_count }}</leechers>
 			<downloads>{{ torrent.stats.download_count }}</downloads>
+			<infoHash>{{ compute_hash(torrent.info_hash) }}</infoHash>
 		</item>
 		{% endfor %}
 	</channel>

From e2eb3fb33c4ea28807e1860bc40f9c17130547b0 Mon Sep 17 00:00:00 2001
From: sharkykh <sharkykh@gmail.com>
Date: Sun, 14 May 2017 10:18:45 +0300
Subject: [PATCH 3/5] Category (main+sub)

---
 nyaa/templates/rss.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nyaa/templates/rss.xml b/nyaa/templates/rss.xml
index 91da605..f962a0b 100644
--- a/nyaa/templates/rss.xml
+++ b/nyaa/templates/rss.xml
@@ -25,6 +25,7 @@
 				<guid isPermaLink="true">{{ url_for('view_torrent', torrent_id=torrent.id, _external=True) }}</guid>
 				<pubDate>{{ torrent.created_time|rfc822 }}</pubDate>
 			{% endif %}
+			<category>{{ torrent.main_category.name }} - {{ torrent.sub_category.name }}</category>
 			<size>{{ torrent.filesize }}</size>
 			<seeders>{{ torrent.stats.seed_count }}</seeders>
 			<leechers>{{ torrent.stats.leech_count }}</leechers>

From 837ecde795186480975df20959a09a5345b4381f Mon Sep 17 00:00:00 2001
From: sharkykh <sharkykh@gmail.com>
Date: Sun, 14 May 2017 11:02:07 +0300
Subject: [PATCH 4/5] Wrap description in a CDATA tag

---
 nyaa/templates/rss.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nyaa/templates/rss.xml b/nyaa/templates/rss.xml
index f962a0b..97eaba7 100644
--- a/nyaa/templates/rss.xml
+++ b/nyaa/templates/rss.xml
@@ -7,7 +7,7 @@
 		{% for torrent in torrent_query %}
 		<item>
 			<title>{{ torrent.display_name }}</title>
-			<description>{{ torrent.description }}</description>
+			<description><![CDATA[{{ torrent.description }}]]></description>
 			{% if use_elastic %}
 				{% if torrent.has_torrent %}
 				<link>{{ url_for('download_torrent', torrent_id=torrent.meta.id, _external=True) }}</link>

From c691087730f52345cfdbf4c72b056625b70cb5a4 Mon Sep 17 00:00:00 2001
From: Kfir Hadas <sharkykh@gmail.com>
Date: Sun, 14 May 2017 18:57:57 +0300
Subject: [PATCH 5/5] Use formatted file size

since that what was used by Nyaa.
---
 nyaa/templates/rss.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nyaa/templates/rss.xml b/nyaa/templates/rss.xml
index 97eaba7..839e55a 100644
--- a/nyaa/templates/rss.xml
+++ b/nyaa/templates/rss.xml
@@ -26,7 +26,7 @@
 				<pubDate>{{ torrent.created_time|rfc822 }}</pubDate>
 			{% endif %}
 			<category>{{ torrent.main_category.name }} - {{ torrent.sub_category.name }}</category>
-			<size>{{ torrent.filesize }}</size>
+			<size>{{ torrent.filesize | filesizeformat(True) }}</size>
 			<seeders>{{ torrent.stats.seed_count }}</seeders>
 			<leechers>{{ torrent.stats.leech_count }}</leechers>
 			<downloads>{{ torrent.stats.download_count }}</downloads>