Fixed a couple of bugs

GyulyVGC · Apr 25, 2023 · ec71cd5 · ec71cd5
1 parent e9434d9
commit ec71cd5
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/src/gui/components/footer.rs b/src/gui/components/footer.rs
@@ -28,6 +28,8 @@ pub fn footer(
     let release_details_row =
         get_release_details(language, style, font_footer, newer_release_available);
 
+    let symbols_font = get_symbols_font();
+
     let footer_row = Row::new()
         .width(Length::Fill)
         .padding([0, 20])
@@ -47,8 +49,11 @@ pub fn footer(
                 .push(
                     Text::new("❤")
                         .width(Length::Fixed(14.0))
-                        .size(FONT_SIZE_FOOTER + 4.0)
-                        .font(get_symbols_font())
+                        .size(FONT_SIZE_FOOTER + match symbols_font {
+                            Font::Default => 0.0,
+                            _ => 4.0
+                        })
+                        .font(symbols_font)
                 )
                 .push(
                     Text::new(" by Giuliano Bellini")

diff --git a/src/gui/styles/fonts.rs b/src/gui/styles/fonts.rs
@@ -1,7 +1,8 @@
 use iced::Font;
 use once_cell::sync::OnceCell;
-use std::collections::HashMap;
 use plotters::style::RGBColor;
+use std::collections::HashMap;
+
 use crate::translations::types::language::Language;
 
 pub type FontsMap = HashMap<&'static str, Font>;
@@ -27,17 +28,20 @@ const FONT_METADATA: [FontMetadata; 9] = [
 
 async fn download_font(base_url: &str, metadata: &FontMetadata) -> Result<Font, reqwest::Error> {
     let url = format!("{}/{}", base_url, metadata.file);
-    let response = reqwest::get(url).await?;
+    let client = reqwest::Client::builder().redirect(reqwest::redirect::Policy::none()).build()?;
+    let response = client.get(url).send().await?;
+    let content_type = response.headers().get(reqwest::header::CONTENT_TYPE).map(|ct| ct.to_str().unwrap_or("")).unwrap_or("");
 
-    if response.status() == reqwest::StatusCode::NOT_FOUND {
+    if response.status() != reqwest::StatusCode::OK
+    || content_type != "application/octet-stream" {
         return Ok(Font::Default);
     }
 
     let bytes = response.bytes().await?;
     let font_data = Box::new(bytes);
     let font = Font::External {
         name: metadata.name,
-        bytes: &*Box::leak(font_data),
+        bytes: &*Box::leak(font_data)
     };
     Ok(font)
 }

diff --git a/src/utils/formatted_strings.rs b/src/utils/formatted_strings.rs
@@ -209,7 +209,9 @@ pub fn get_open_report_tooltip(language: Language) -> String {
 }
 
 pub fn print_cli_welcome_message() {
-    print!(
+    let ver = format!("{:<8}", APP_VERSION);
+
+    println!(
         r"
  ╔════════════════════════════════════════════════════════════════════╗
  ║  ███████╗███╗   ██╗██╗███████╗███████╗███╗   ██╗███████╗████████╗  ║
@@ -221,12 +223,11 @@ pub fn print_cli_welcome_message() {
  ║                ▁▁▁▁▁▁▁▁▁▁▁▁▁                                       ║
  ║               ┃┌───────────┐┃                                      ║
  ║               ┃│ $ ver     │┃                                      ║
- ║               ┃│ v{APP_VERSION}    │┃                                      ║
+ ║               ┃│ v{ver} │┃                                      ║
  ║               ┃└───────────┘┃________________________              ║
  ║               / ▭▭▭▭▭▭▭▭▭ ▣ \   by Giuliano Bellini  )             ║
  ║              / ◻◻◻◻◻◻◻◻◻◻◻◻◻ \                      /              ║
  ║             (▁▁▁▁▁▁▁▭▭▭▁▁▁▁▁▁▁)                 =D-'               ║
- ╚════════════════════════════════════════════════════════════════════╝
-    "
+ ╚════════════════════════════════════════════════════════════════════╝"
     );
 }