Alez/Babylonia-terminal
1
0
Fork 0
mirror of https://github.com/ALEZ-DEV/Babylonia-terminal.git synced 2026-03-21 21:58:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

can now use a progress when insatlling fonts

Browse Source
This commit is contained in:
ALEZ-DEV 2024-06-01 18:50:12 +02:00
parent 75374aff38
commit 18158187a1
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
babylonia-terminal-cli/src/main.rs
View File

@ -1,4 +1,4 @@
use std::{path::PathBuf, str::FromStr}; use std::{path::PathBuf, str::FromStr, sync::Arc};
use babylonia_terminal_sdk::{ use babylonia_terminal_sdk::{
components::{ components::{
@ -110,7 +110,7 @@ async fn main() {
} }
GameState::FontNotInstalled => { GameState::FontNotInstalled => {
info!("Fonts not installed, installing it..."); info!("Fonts not installed, installing it...");
GameManager::install_font(&proton.clone().unwrap()) GameManager::install_font(&proton.clone().unwrap(), None::<Arc<DownloadReporter>>)
.await .await
.expect("Failed to install fonts"); .expect("Failed to install fonts");
info!("Fonts installed"); info!("Fonts installed");

40
babylonia-terminal-sdk/src/game_manager.rs
View File

@ -59,43 +59,49 @@ impl GameManager {
Ok(()) Ok(())
} }
pub async fn install_font(proton: &Proton) -> anyhow::Result<()> { pub async fn install_font<P>(proton: &Proton, progress: Option<Arc<P>>) -> anyhow::Result<()>
where
P: Reporter + 'static,
{
let wine_with_proton_prefix = proton // wine take the data/wine/pfx prefix, but we want the data/wine prefix let wine_with_proton_prefix = proton // wine take the data/wine/pfx prefix, but we want the data/wine prefix
.wine() .wine()
.clone() .clone()
.with_prefix(proton.wine().prefix.parent().unwrap()); .with_prefix(proton.wine().prefix.parent().unwrap());
if let Some(p) = &progress {
p.setup(Some(10), "");
}
info!("0/10 font installed"); notify_fonts_progress(0, &progress);
wine_with_proton_prefix.install_font(Font::Arial)?; wine_with_proton_prefix.install_font(Font::Arial)?;
info!("1/10 font installed"); notify_fonts_progress(1, &progress);
wine_with_proton_prefix.install_font(Font::Andale)?; wine_with_proton_prefix.install_font(Font::Andale)?;
info!("2/10 font installed"); notify_fonts_progress(2, &progress);
wine_with_proton_prefix.install_font(Font::Courier)?; wine_with_proton_prefix.install_font(Font::Courier)?;
info!("3/10 font installed"); notify_fonts_progress(3, &progress);
wine_with_proton_prefix.install_font(Font::ComicSans)?; wine_with_proton_prefix.install_font(Font::ComicSans)?;
info!("4/10 font installed"); notify_fonts_progress(4, &progress);
wine_with_proton_prefix.install_font(Font::Georgia)?; wine_with_proton_prefix.install_font(Font::Georgia)?;
info!("5/10 font installed"); notify_fonts_progress(5, &progress);
wine_with_proton_prefix.install_font(Font::Impact)?; wine_with_proton_prefix.install_font(Font::Impact)?;
info!("6/10 font installed"); notify_fonts_progress(6, &progress);
wine_with_proton_prefix.install_font(Font::Times)?; wine_with_proton_prefix.install_font(Font::Times)?;
info!("7/10 font installed"); notify_fonts_progress(7, &progress);
wine_with_proton_prefix.install_font(Font::Trebuchet)?; wine_with_proton_prefix.install_font(Font::Trebuchet)?;
info!("8/10 font installed"); notify_fonts_progress(8, &progress);
wine_with_proton_prefix.install_font(Font::Verdana)?; wine_with_proton_prefix.install_font(Font::Verdana)?;
info!("9/10 font installed"); notify_fonts_progress(9, &progress);
wine_with_proton_prefix.install_font(Font::Webdings)?; wine_with_proton_prefix.install_font(Font::Webdings)?;
info!("10/10 font installed"); notify_fonts_progress(10, &progress);
let mut config = GameState::get_config().await; let mut config = GameState::get_config().await;
config.is_font_installed = true; config.is_font_installed = true;
@ -170,3 +176,13 @@ impl GameManager {
child.wait().expect("The game failed to run"); child.wait().expect("The game failed to run");
} }
} }
fn notify_fonts_progress<P>(nbr: u64, progress: &Option<Arc<P>>)
where
P: Reporter + 'static,
{
info!("{}", format!("{}/10 font installed", nbr));
if let Some(p) = progress {
p.progress(nbr);
}
}