Fix: incorrect download ct suffix

Author: WardLordRuby

src/lib.rs

@@ -22,7 +22,7 @@ use crate::{
 use constcat::concat;
 use percent_encoding::{AsciiSet, CONTROLS};
 use reqwest::StatusCode;
-use serde::{Deserialize, Serialize};
+use serde::{Serialize, de::DeserializeOwned};
 use std::{
     borrow::Cow,
     collections::BTreeMap,
@@ -432,7 +432,7 @@ pub fn startup(on_remote: bool) -> Result<Vec<Mod>, Error> {
     Ok(input.mods)
 }
 
-pub(crate) fn read<T: for<'de> Deserialize<'de>>(path: &str) -> Result<T, Error> {
+pub(crate) fn read<T: DeserializeOwned>(path: &str) -> Result<T, Error> {
     let file = File::open(path)?;
     let reader = BufReader::new(file);
     let data = serde_json::from_reader(reader)?;
@@ -460,10 +460,13 @@ fn write_badges(output: BTreeMap<String, ModDetails>, universal_url: &str) -> Re
 
     let encoded_fields = badge_prefs.encoded_fields(universal_url, URL_ENCODE_SET);
 
-    writeln!(writer, "# Shields.io Badges via Nexus Badges")?;
-    writeln!(writer, "Base template: {BADGE_URL}")?;
-    writeln!(writer, "Data source URL: {universal_url}")?;
-    writeln!(writer, "{badge_prefs}")?;
+    writeln!(
+        writer,
+        "# Shields.io Badges via Nexus Badges\n\
+        Base template: {BADGE_URL}\n\
+        Data source URL: {universal_url}\n\n\
+        {badge_prefs}\n"
+    )?;
 
     for (uid, entry) in output.into_iter() {
         let query = format!("$.{uid}.{}", badge_prefs.count.field_name());
@@ -475,9 +478,7 @@ fn write_badges(output: BTreeMap<String, ModDetails>, universal_url: &str) -> Re
             &query,
             &entry.url,
         )?;
-        writeln!(writer)?;
-        writeln!(writer, "Configuration:")?;
-        writeln!(writer, "- Query: {query}")?;
+        writeln!(writer, "\nConfiguration:\n- Query: {query}")?;
         if !entry.url.is_empty() {
             writeln!(writer, "- Link: {}", entry.url)?;
         }

src/models/badge_options.rs

@@ -53,21 +53,24 @@ impl Default for BadgePreferences {
 
 impl Display for BadgePreferences {
     fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        writeln!(f, "Style preferences:")?;
-        writeln!(f, "- Label: {}", self.label)?;
-        writeln!(f, "- Count: {}", self.count)?;
-        writeln!(f, "- Style: {}", self.style)?;
-        writeln!(f, "- Format: {}", self.format)?;
-        writeln!(f, "- Label color: {}", self.label_color)?;
+        writeln!(
+            f,
+            "Style preferences:\n\
+            - Label: {}\n\
+            - Count: {}\n\
+            - Style: {}\n\
+            - Format: {}\n\
+            - Label color: {}",
+            self.label, self.count, self.style, self.format, self.label_color
+        )?;
         if self.label_color_light_mode.is_some() && matches!(self.format, BadgeFormat::GithubHtml) {
             writeln!(
                 f,
                 "- Label color light mode: {}",
                 self.label_color_light_mode
             )?;
         }
-        writeln!(f, "- Color: {}", self.color)?;
-        Ok(())
+        write!(f, "- Color: {}", self.color)
     }
 }
 

src/models/json_data.rs

@@ -43,7 +43,7 @@ fn format_download_ct(count: usize) -> String {
     }
 
     let (delta, suf) = {
-        const CT_SUF: [char; 3] = ['k', 'M', 'T'];
+        const CT_SUF: [char; 3] = ['k', 'M', 'B'];
         const STEP: f64 = 1000.0;
 
         let mut delta = count as f64 / STEP;
@@ -123,8 +123,8 @@ mod test {
         test!(6_156_000, "6.15M");
         test!(45_425_000, "45.4M");
         test!(346_425_000, "346M");
-        test!(3_634_425_000, "3.63T");
-        test!(999_999_999_999, "999T");
+        test!(3_634_425_000, "3.63B");
+        test!(999_999_999_999, "999B");
         test!(5_835_742_000_000, "5.8e12");
         test!(106_634_154_000_000, "1.1e14");
         test!(usize::MAX, "1.8e19");