From ce0c34c732ff369306ea026e217036c377d67f6b Mon Sep 17 00:00:00 2001
From: "Krom, Robertus" <Robertus.Krom@ing.de>
Date: Mon, 2 Mar 2020 13:55:58 +0100
Subject: [PATCH] Trying to optimize the project-feed.xml to reduce traffic.
 Also applying this to the update-feed.json

---
 project-feed.xml | 10 +++++-----
 update-feed.json | 12 ++++++------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/project-feed.xml b/project-feed.xml
index 47afe178e..24c51ac37 100644
--- a/project-feed.xml
+++ b/project-feed.xml
@@ -3,21 +3,21 @@ permalink: project-feed/
 ---
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0">
-	<channel>
+	<channel>{% assign sorted-releases = site.github.releases | where: 'release.draft', "false" | where "release.prerelease", "false" %}
 		<title>Greenshot</title>
 		<link>https://getgreenshot.org</link>
-		<description>Greenshot update feed</description>{% for release in site.github.releases %}{% if release.draft == false %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' and asset.name contains 'RELEASE'%}
+		<description>Greenshot update feed</description>{% for release in sorted-releases limit:1 %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' and asset.name contains 'RELEASE'%}
 		<item>
 			<title>{{asset.name}}</title>
 			<link>http://sourceforge/projects/greenshot/files/release/Greenshot/{{asset.name}}/download</link>
 			<pubDate>{{asset.created_at | date_to_rfc822}}</pubDate>
 			<description>{{asset.label}}</description>
-		</item>{% break %}{% endif %}{% endfor %}{% endif %}{% endfor %}
-		{% for release in site.github.releases %}{% if release.draft == false %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' and asset.name contains 'RELEASE'%}<item>
+		</item>{% break %}{% endif %}{% endfor %}{% endfor %}
+		{% for release in sorted-releases %}{% for asset in release.assets limit:1 %}{% if asset.name contains 'Greenshot-INSTALLER' and asset.name contains 'RELEASE'%}<item>
 			<title>{{asset.name}}</title>
 			<link>{{asset.browser_download_url}}</link>
 			<pubDate>{{asset.created_at | date_to_rfc822}}</pubDate>
 			<description>{{asset.label}}</description>
-		</item>{% endif %}{% endfor %}{% endif %}{% endfor %}
+		</item>{% break %}{% endif %}{% endfor %}{% endfor %}
 	</channel>
 </rss>
\ No newline at end of file
diff --git a/update-feed.json b/update-feed.json
index 75515441f..10c2075fd 100644
--- a/update-feed.json
+++ b/update-feed.json
@@ -1,17 +1,17 @@
 ---
 permalink: update-feed.json
 ---
-{
-	"releases": [{% for release in site.github.releases limit:2 %}{% if release.draft == false and release.prerelease == false %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' %}{
+{{% assign sorted-releases = site.github.releases | where: 'release.draft', "false" | where "release.prerelease", "false" %}
+	"releases": [{% for release in sorted-releases limit:2 %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' %}{
 			"link": "{{asset.browser_download_url}}",
 			"version": "{{release.tag_name}}",
 			"publishDate": "{{asset.created_at}}"
-		}{% if forloop.last == false%},{% endif %}{% endif %}{% endfor %}{% endif %}{% endfor %}
-	],
-	"betas": [{% for release in site.github.releases limit:2 %}{% if release.draft == false and release.prerelease == true %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' %}{
+		}{% if forloop.last == false%},{% endif %}{% endif %}{% endfor %}{% endfor %}
+	],{% assign sorted-unstables = site.github.releases | where: 'release.draft', "false" | where "release.prerelease", "true" %}
+	"betas": [{% for release in sorted-unstables limit:2 %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' %}{
 			"link": "{{asset.browser_download_url}}",
 			"version": "{{release.tag_name}}",
 			"publishDate": "{{asset.created_at}}"
-		}{% if forloop.last == false%},{% endif %}{% endif %}{% endfor %}{% endif %}{% endfor %}
+		}{% if forloop.last == false%},{% endif %}{% endif %}{% endfor %}{% endfor %}
 	]
 }
\ No newline at end of file