From 0403ca15e685a69f98e23ff0b4c6029bc160132d Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Sun, 17 Sep 2023 00:45:15 +0300
Subject: [PATCH 1/4] Prioritise 64-bit downloads over 32-bit

---
 downloads/templatetags/download_tags.py | 18 ++++++++++++++++++
 templates/downloads/os_list.html        |  5 +++--
 templates/downloads/release_detail.html |  3 ++-
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/downloads/templatetags/download_tags.py b/downloads/templatetags/download_tags.py
index fb3496787..263aa9a5f 100644
--- a/downloads/templatetags/download_tags.py
+++ b/downloads/templatetags/download_tags.py
@@ -14,3 +14,21 @@ def has_sigstore_materials(files):
         f.sigstore_bundle_file or f.sigstore_cert_file or f.sigstore_signature_file
         for f in files
     )
+
+
+@register.filter
+def prioritise_64bit_over_32bit(files):
+    if not files:
+        return files
+
+    # Put 64-bit files before 32-bit
+    new = []
+    previous = files[0]
+    for i, current in enumerate(files):
+        if i >= 1 and '(64-bit)' in current.name and '(32-bit)' in previous.name:
+            new.insert(-1, current)
+        else:
+            new.append(current)
+        previous = current
+
+    return new
diff --git a/templates/downloads/os_list.html b/templates/downloads/os_list.html
index 67db5233f..b4c42c6d9 100644
--- a/templates/downloads/os_list.html
+++ b/templates/downloads/os_list.html
@@ -1,6 +1,7 @@
 {% extends "downloads/base.html" %}
 {% load boxes %}
 {% load sitetree %}
+{% load prioritise_64bit_over_32bit from download_tags %}
 
 {% block body_attributes %}class="python download"{% endblock %}
 
@@ -45,7 +46,7 @@ <h2>Stable Releases</h2>
                             {% endif %}
                         {% endif %}
                         <ul>
-                            {% for f in r.files.all %}
+                            {% for f in r.files.all|prioritise_64bit_over_32bit %}
                                 <li>Download <a href="{{ f.url }}">{{ f.name }}</a></li>
                             {% empty %}
                                 <li>No files for this release.</li>
@@ -63,7 +64,7 @@ <h2>Pre-releases</h2>
                     <li>
                         <a href="{{ r.get_absolute_url }}">{{ r.name }} - {{ r.release_date|date }}</a>
                         <ul>
-                            {% for f in r.files.all %}
+                            {% for f in r.files.all|prioritise_64bit_over_32bit %}
                                 <li>Download <a href="{{ f.url }}">{{ f.name }}</a></li>
                             {% empty %}
                                 <li>No files for this release.</li>
diff --git a/templates/downloads/release_detail.html b/templates/downloads/release_detail.html
index b68b69a66..cfc690879 100644
--- a/templates/downloads/release_detail.html
+++ b/templates/downloads/release_detail.html
@@ -2,6 +2,7 @@
 {% load boxes %}
 {% load sitetree %}
 {% load has_sigstore_materials from download_tags %}
+{% load prioritise_64bit_over_32bit from download_tags %}
 
 {% block body_attributes %}class="python downloads"{% endblock %}
 
@@ -56,7 +57,7 @@ <h1 class="page-title">Files</h1>
             </tr>
           </thead>
           <tbody>
-            {% for f in release_files %}
+            {% for f in release_files|prioritise_64bit_over_32bit %}
               <tr>
                 <td><a href="{{ f.url }}">{{ f.name }}</a></td>
                 <td>{{ f.os.name }}</td>

From 6509e252368026dc44cf1972dd93c45181b915e6 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Sun, 17 Sep 2023 12:20:33 +0300
Subject: [PATCH 2/4] Put Windows embeddable packages at the end

---
 downloads/templatetags/download_tags.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/downloads/templatetags/download_tags.py b/downloads/templatetags/download_tags.py
index 263aa9a5f..586129ca9 100644
--- a/downloads/templatetags/download_tags.py
+++ b/downloads/templatetags/download_tags.py
@@ -31,4 +31,14 @@ def prioritise_64bit_over_32bit(files):
             new.append(current)
         previous = current
 
-    return new
+    # Put embeddable packages at the end
+    embeddable_packages = []
+    others = []
+
+    for file in new:
+        if file.name.startswith('Windows embeddable package'):
+            embeddable_packages.append(file)
+        else:
+            others.append(file)
+
+    return others + embeddable_packages

From dadd9249a3910fd28f992580ad0b92f92495ff75 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Fri, 29 Sep 2023 22:26:24 +0300
Subject: [PATCH 3/4] Define explict preferred order for Windows files

---
 downloads/templatetags/download_tags.py | 46 ++++++++++++++-----------
 templates/downloads/os_list.html        |  6 ++--
 templates/downloads/release_detail.html |  4 +--
 3 files changed, 31 insertions(+), 25 deletions(-)

diff --git a/downloads/templatetags/download_tags.py b/downloads/templatetags/download_tags.py
index 586129ca9..ed536c2e2 100644
--- a/downloads/templatetags/download_tags.py
+++ b/downloads/templatetags/download_tags.py
@@ -17,28 +17,34 @@ def has_sigstore_materials(files):
 
 
 @register.filter
-def prioritise_64bit_over_32bit(files):
+def sort_windows(files):
     if not files:
         return files
 
-    # Put 64-bit files before 32-bit
-    new = []
-    previous = files[0]
-    for i, current in enumerate(files):
-        if i >= 1 and '(64-bit)' in current.name and '(32-bit)' in previous.name:
-            new.insert(-1, current)
+    # Put Windows files in preferred order
+    files = list(files)
+    windows_files = []
+    other_files = []
+    for preferred in (
+        'Windows installer (64-bit)',
+        'Windows installer (32-bit)',
+        'Windows installer (ARM64)',
+        'Windows help file',
+        'Windows embeddable package (64-bit)',
+        'Windows embeddable package (32-bit)',
+        'Windows embeddable package (ARM64)',
+    ):
+        for file in files:
+            if file.name == preferred:
+                windows_files.append(file)
+                files.remove(file)
+                break
+
+    # Then append any remaining Windows files
+    for file in files:
+        if file.name.startswith('Windows'):
+            windows_files.append(file)
         else:
-            new.append(current)
-        previous = current
+            other_files.append(file)
 
-    # Put embeddable packages at the end
-    embeddable_packages = []
-    others = []
-
-    for file in new:
-        if file.name.startswith('Windows embeddable package'):
-            embeddable_packages.append(file)
-        else:
-            others.append(file)
-
-    return others + embeddable_packages
+    return other_files + windows_files
diff --git a/templates/downloads/os_list.html b/templates/downloads/os_list.html
index b4c42c6d9..1e0177dca 100644
--- a/templates/downloads/os_list.html
+++ b/templates/downloads/os_list.html
@@ -1,7 +1,7 @@
 {% extends "downloads/base.html" %}
 {% load boxes %}
 {% load sitetree %}
-{% load prioritise_64bit_over_32bit from download_tags %}
+{% load sort_windows from download_tags %}
 
 {% block body_attributes %}class="python download"{% endblock %}
 
@@ -46,7 +46,7 @@ <h2>Stable Releases</h2>
                             {% endif %}
                         {% endif %}
                         <ul>
-                            {% for f in r.files.all|prioritise_64bit_over_32bit %}
+                            {% for f in r.files.all|sort_windows %}
                                 <li>Download <a href="{{ f.url }}">{{ f.name }}</a></li>
                             {% empty %}
                                 <li>No files for this release.</li>
@@ -64,7 +64,7 @@ <h2>Pre-releases</h2>
                     <li>
                         <a href="{{ r.get_absolute_url }}">{{ r.name }} - {{ r.release_date|date }}</a>
                         <ul>
-                            {% for f in r.files.all|prioritise_64bit_over_32bit %}
+                            {% for f in r.files.all|sort_windows %}
                                 <li>Download <a href="{{ f.url }}">{{ f.name }}</a></li>
                             {% empty %}
                                 <li>No files for this release.</li>
diff --git a/templates/downloads/release_detail.html b/templates/downloads/release_detail.html
index cfc690879..f5c9a67b1 100644
--- a/templates/downloads/release_detail.html
+++ b/templates/downloads/release_detail.html
@@ -2,7 +2,7 @@
 {% load boxes %}
 {% load sitetree %}
 {% load has_sigstore_materials from download_tags %}
-{% load prioritise_64bit_over_32bit from download_tags %}
+{% load sort_windows from download_tags %}
 
 {% block body_attributes %}class="python downloads"{% endblock %}
 
@@ -57,7 +57,7 @@ <h1 class="page-title">Files</h1>
             </tr>
           </thead>
           <tbody>
-            {% for f in release_files|prioritise_64bit_over_32bit %}
+            {% for f in release_files|sort_windows %}
               <tr>
                 <td><a href="{{ f.url }}">{{ f.name }}</a></td>
                 <td>{{ f.os.name }}</td>

From 29a2857d8d957ad1bd3f8ba5992a17438f060321 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Date: Sun, 21 Jan 2024 04:15:58 -0700
Subject: [PATCH 4/4] Fix conflict resolution

---
 downloads/templatetags/download_tags.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/downloads/templatetags/download_tags.py b/downloads/templatetags/download_tags.py
index 51e572794..c72f6d58c 100644
--- a/downloads/templatetags/download_tags.py
+++ b/downloads/templatetags/download_tags.py
@@ -16,6 +16,7 @@ def has_sigstore_materials(files):
     )
 
 
+@register.filter
 def has_sbom(files):
     return any(f.sbom_spdx2_file for f in files)