From 5de6f0aa484f9a0d206e2a1a5e0def886ce92fb7 Mon Sep 17 00:00:00 2001
From: Observer KRypt0n_ <suimin.tu.mu.ga.mi@gmail.com>
Date: Mon, 6 Mar 2023 20:20:03 +0200
Subject: [PATCH] feat: added commit hashes to core/sdk versions in about

SDK and core library were updated. Now "no free space available" error message
will have prettified measurements for users simplicity
---
 Cargo.lock                        |  4 ++--
 anime-launcher-sdk                |  2 +-
 src/main.rs                       |  4 ----
 src/prettify_bytes.rs             | 18 ------------------
 src/ui/about.rs                   | 16 ++++++++++++----
 src/ui/components/progress_bar.rs |  2 +-
 6 files changed, 16 insertions(+), 30 deletions(-)
 delete mode 100644 src/prettify_bytes.rs

diff --git a/Cargo.lock b/Cargo.lock
index 5c2c625..551f35f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -31,7 +31,7 @@ dependencies = [
 
 [[package]]
 name = "anime-game-core"
-version = "1.3.8"
+version = "1.3.9"
 dependencies = [
  "anyhow",
  "bzip2",
@@ -76,7 +76,7 @@ dependencies = [
 
 [[package]]
 name = "anime-launcher-sdk"
-version = "0.3.0"
+version = "0.3.1"
 dependencies = [
  "anime-game-core",
  "anyhow",
diff --git a/anime-launcher-sdk b/anime-launcher-sdk
index 42b738d..35565d0 160000
--- a/anime-launcher-sdk
+++ b/anime-launcher-sdk
@@ -1 +1 @@
-Subproject commit 42b738dc1ec5be8e6ced48501604622b8d0ab91e
+Subproject commit 35565d07c252a8655df23d6d99bb315e29eef318
diff --git a/src/main.rs b/src/main.rs
index fdc38de..deb6c33 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,10 +19,6 @@ pub mod background;
 use ui::main::*;
 use ui::first_run::main::*;
 
-mod prettify_bytes;
-
-pub use prettify_bytes::prettify_bytes;
-
 pub const APP_ID: &str = "moe.launcher.an-anime-game-launcher";
 pub const APP_VERSION: &str = env!("CARGO_PKG_VERSION");
 pub const APP_DEBUG: bool = cfg!(debug_assertions);
diff --git a/src/prettify_bytes.rs b/src/prettify_bytes.rs
deleted file mode 100644
index 3f55bd4..0000000
--- a/src/prettify_bytes.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-#[inline]
-pub fn prettify_bytes(bytes: u64) -> String {
-    if bytes > 1024 * 1024 * 1024 {
-        format!("{:.2} GB", bytes as f64 / 1024.0 / 1024.0 / 1024.0)
-    }
-
-    else if bytes > 1024 * 1024 {
-        format!("{:.2} MB", bytes as f64 / 1024.0 / 1024.0)
-    }
-
-    else if bytes > 1024 {
-        format!("{:.2} KB", bytes as f64 / 1024.0)
-    }
-
-    else {
-        format!("{:.2} B", bytes)
-    }
-}
diff --git a/src/ui/about.rs b/src/ui/about.rs
index e5be900..3ab4b5f 100644
--- a/src/ui/about.rs
+++ b/src/ui/about.rs
@@ -2,8 +2,16 @@ use relm4::prelude::*;
 
 use gtk::prelude::*;
 
-use anime_launcher_sdk::VERSION as SDK_VERSION;
-use anime_launcher_sdk::anime_game_core::{VERSION as CORE_VERSION, curl_sys};
+use anime_launcher_sdk::{
+    VERSION as SDK_VERSION,
+    COMMIT_HASH as SDK_COMMIT_HASH
+};
+
+use anime_launcher_sdk::anime_game_core::{
+    VERSION as CORE_VERSION,
+    COMMIT_HASH as CORE_COMMIT_HASH,
+    curl_sys
+};
 
 use crate::*;
 
@@ -70,8 +78,8 @@ impl SimpleComponent for AboutDialog {
             ].join("\n"),
 
             set_debug_info: &[
-                format!("Anime Launcher SDK: {SDK_VERSION}"),
-                format!("Anime Game Core: {CORE_VERSION}"),
+                format!("Anime Launcher SDK: {SDK_VERSION}-{}", &SDK_COMMIT_HASH[..6]),
+                format!("Anime Game Core: {CORE_VERSION}-{}", &CORE_COMMIT_HASH[..6]),
                 String::new(),
                 format!("curl: {}", CURL_INFO.version()),
                 format!("SSL: {}", CURL_INFO.ssl_version().unwrap_or("?")),
diff --git a/src/ui/components/progress_bar.rs b/src/ui/components/progress_bar.rs
index 046e290..2d86ddf 100644
--- a/src/ui/components/progress_bar.rs
+++ b/src/ui/components/progress_bar.rs
@@ -4,8 +4,8 @@ use relm4::component::*;
 use adw::prelude::*;
 
 use anime_launcher_sdk::anime_game_core::installer::installer::Update as InstallerUpdate;
+use anime_launcher_sdk::anime_game_core::prettify_bytes::prettify_bytes;
 
-use crate::prettify_bytes;
 use crate::i18n::*;
 
 pub struct ProgressBarInit {