Update report download table (#2364)

Author: jlchilders11

libraries/forms.py

@@ -284,7 +284,7 @@ def cache_key(self):
         report_configuration = self.cleaned_data["report_configuration"]
         return f"release-report-{lib_string}-{report_configuration.version}"
 
-    def get_stats(self):
+    def get_stats(self, base_uri: str = None):
         report_configuration = self.cleaned_data["report_configuration"]
         committee_members = report_configuration.financial_committee_members.all()
         # NOTE TO FUTURE DEVS: remember to account for the fact that a report
@@ -366,7 +366,7 @@ def core_batchable(x):
         )
 
         git_graph_data = get_git_graph_data(prior_version, version)
-        download = get_download_links(version)
+        download = get_download_links(version, base_uri)
         ### completed task handling ###
         (mailinglist_contributor_release_count, mailinglist_contributor_new_count) = (
             mailing_list_contributors_task.get()
@@ -431,7 +431,10 @@ def core_batchable(x):
         }
 
     def generate_context(
-        self, report_configuration: ReportConfiguration, stats_results: dict
+        self,
+        report_configuration: ReportConfiguration,
+        stats_results: dict,
+        base_uri: str = None,
     ):
         committee_members = report_configuration.financial_committee_members.all()
 
@@ -506,7 +509,7 @@ def core_batchable(x):
         )
 
         git_graph_data = get_git_graph_data(prior_version, version)
-        download = get_download_links(version)
+        download = get_download_links(version, base_uri)
 
         return {
             "committee_members": committee_members,
@@ -554,7 +557,7 @@ def core_batchable(x):
     def render_with_stats(self, stats_results, base_uri=None):
         """Render HTML with pre-computed stats results"""
         context = self.generate_context(
-            self.cleaned_data["report_configuration"], stats_results
+            self.cleaned_data["report_configuration"], stats_results, base_uri
         )
         if base_uri:
             context["base_uri"] = base_uri

libraries/tasks.py

@@ -276,7 +276,10 @@ def generate_release_report(user_id, params, base_uri=None, stats_results=None):
         return None
 
     if stats_results:
-        html = form.render_with_stats(stats_results, base_uri=base_uri)
+        html = form.render_with_stats(
+            stats_results,
+            base_uri=base_uri,
+        )
     else:
         html = form.cache_html(base_uri=base_uri)
 

reports/generation.py

@@ -3,16 +3,18 @@
 import json
 import logging
 import random
+import re
 from dataclasses import dataclass, field
 from datetime import timedelta, date
 from functools import cached_property
 from itertools import chain, groupby
-from operator import attrgetter
+from operator import attrgetter, itemgetter
 
 import psycopg2
 from django.conf import settings
 from django.contrib.staticfiles import finders
 from django.db.models import OuterRef, Q, F, Case, When, Value, Sum, Count
+from django.urls import reverse
 from matplotlib import pyplot as plt
 from wordcloud import WordCloud, STOPWORDS
 from algoliasearch.analytics.client import AnalyticsClientSync
@@ -612,15 +614,75 @@ def get_issues_counts(prior_version: Version, version: Version):
     return opened_issues_count, closed_issues_count
 
 
-def get_download_links(version: Version):
-    return {
+def get_download_links(version: Version, base_uri: str = None):
+    from versions.models import OperatingSystems
+
+    r_dict = {
         k: list(v)
         for k, v in groupby(
-            version.downloads.all().order_by("operating_system"),
+            version.downloads.all().order_by("operating_system", "display_name"),
             key=attrgetter("operating_system"),
         )
     }
 
+    # Some Version of Boost have no windows binaries, so we can return
+    win_bin_d = r_dict.get(OperatingSystems.WINDOWS_BIN, None)
+    if not bool(win_bin_d):
+        return r_dict
+
+    # Attempt to match version name, in shape of Boost version - msvc - msvc version - bit.exe
+    # e.g. boost_1_91_0_b1-msvc-14.5-64.exe
+    # and return major and minor msvc version
+
+    v_reg = re.compile(
+        r"^[^-]*-msvc-(?P<major_version>[\d]+)\.(?P<minor_version>[\d]+)-[\d.\w]+$"
+    )
+
+    updated_win_dls = []
+    msvc_versions = []
+    version_files = {}
+
+    # Iterate over our files, group them by major and minor msvc version
+    for dl in win_bin_d:
+        match = v_reg.match(dl.display_name)
+        if not match:
+            # If our regex does not match, we have found an "all" file, so add it to the list
+            updated_win_dls.append(dl)
+            continue
+        msvc_version = (
+            int(match.groupdict().get("major_version")),
+            int(match.groupdict().get("minor_version")),
+        )
+        msvc_versions.append(msvc_version)
+        if msvc_version not in version_files:
+            version_files[msvc_version] = []
+        version_files[msvc_version].append(dl)
+
+    # Remove dupes and sort
+    msvc_versions = list(set(msvc_versions))
+    msvc_versions.sort(key=itemgetter(0, 1))
+
+    # If we somehow didn't generate anyversions, return to avoid an error
+    # This might occure if all versions are "all" versions, or if the regex fails
+    # in the future
+    if not bool(msvc_versions):
+        return r_dict
+
+    selected_version = msvc_versions[-1]
+    updated_win_dls += version_files.get(selected_version, [])
+
+    # If we have passed a base_uri, use it to create a link to the release detail page
+    if base_uri:
+        updated_win_dls.append(
+            {
+                "display_name": "To see other windows versions, click here",
+                "url": f"{base_uri}{reverse("release-detail", kwargs={"version_slug":version.slug})}",
+            }
+        )
+
+    r_dict[OperatingSystems.WINDOWS_BIN] = updated_win_dls
+    return r_dict
+
 
 def get_mailinglist_msg_counts(version: Version) -> tuple[int, int]:
     total_mailinglist_count = EmailData.objects.filter(version=version).aggregate(