correct release asset charts

Author: mProjectsCode

data-lib/src/release/data_array.rs

@@ -209,12 +209,12 @@ impl ReleaseDataArray {
 
         self.raw_data
             .iter()
-            .flat_map(|release| release.assets.iter())
-            .group_by(|asset| get_asset_cpu_instruction_set(&asset.name))
+            .flat_map(|release| release.assets.iter().map(move |asset| (release, asset)))
+            .group_by(|(release, asset)| get_asset_cpu_instruction_set(release, asset))
             .map(|(instruction_set, assets)| {
                 let downloads: u64 = assets
                     .iter()
-                    .map(|asset| *asset.downloads.values().max().unwrap_or(&0) as u64)
+                    .map(|(_, asset)| *asset.downloads.values().max().unwrap_or(&0) as u64)
                     .sum();
 
                 StackedNamedDataPoint {

data-lib/src/release/mod.rs

@@ -113,11 +113,18 @@ pub fn get_asset_release_file_type(file_name: &str) -> Option<String> {
     }
 }
 
-pub fn get_asset_cpu_instruction_set(file_name: &str) -> Option<&'static str> {
-    if file_name.ends_with(".dmg") {
-        Some("both (.dmg)")
-    } else if file_name.contains("arm64") {
-        Some("arm64")
+pub fn get_asset_cpu_instruction_set(
+    release_info: &GithubReleaseInfo,
+    asset: &GithubAssetInfo,
+) -> Option<&'static str> {
+    let is_dmg = asset.name.ends_with(".dmg");
+    let is_combined_exe =
+        asset.name.ends_with(".exe") && release_info.version >= Version::new(1, 6, 0, None);
+
+    if is_dmg || is_combined_exe {
+        Some("Both")
+    } else if asset.name.contains("arm64") {
+        Some("ARM")
     } else {
         Some("x86")
     }

website/README.md

@@ -1,3 +1,3 @@
 # Obsidian Stats Website
 
-See readme in the repo root.
+See readme in the repo root.

website/src/pages/releasestats/assets.astro

@@ -29,18 +29,19 @@ const assetInstructionSet = dataArray.get_asset_instruction_set_percentages();
 
 	<p>
 		The next graph shows the evolution of asset sizes over time. The data is split by asset type. Note that gaps may appear, as not every asset type is included
-		in every release.
+		in every release. The macOS <code>.dmg</code> assets are about twice as large as others, as they include both an x86 and an ARM version of the app. The <code
+			>.exe</code
+		> assets after version <code>1.6.0</code> are even larger, as they contain an x86, a 32 bit x86, and an ARM version of the app in a singe installer.
 	</p>
 
 	<p><AssetSizeChart dataPoints={assetSize} client:only="svelte" /></p>
 
 	<p>
 		This graph shows the split between downloads of assets for different instruction sets. The instruction set is the type of CPU architecture that the asset is
-		built for, such as x86 or ARM. From this we can see that downloads for ARM make up only {
-			assetInstructionSet.find(x => x.layer === 'arm64')?.value?.toFixed(1)
-		}% of the total downloads. The macOS <code>.dmg</code> assets make up the <code>both (.dmg)</code> category with {
-			assetInstructionSet.find(x => x.layer === 'both (.dmg)')?.value?.toFixed(1)
-		}%, as they can be used on both x86 and ARM Macs.
+		built for, such as x86 or ARM. From this we can see that downloads for only-ARM assets make up only {
+			assetInstructionSet.find(x => x.layer === 'ARM')?.value?.toFixed(1)
+		}% of the total downloads. The Windows <code>.exe</code> assets for version <code>1.6.0</code> and later and the macOS <code>.dmg</code> assets are combined
+		installers that include both x86 and ARM versions, and are thus labeled as "Both".
 	</p>
 
 	<p><StackedXBarChart dataPoints={assetInstructionSet} percentages client:only="svelte" /></p>