tomasalias/AstralRinth
1
0
Fork 0
forked from didirus/AstralRinth
Code Pull Requests Activity

Fix auto updater, add failure message, fix modals (#2335)

Browse Source 
* Fix auto updater, add failure message, fix modals

* Fix ads hiding, updater UI

* dummy version, fix gh actions cache

* fix release conf

* actual version bump

* Fix ads hiding sometimes

* Fix event state init

* fix remaining bugs

* Fix lint on linux

* Fix deep linking on Windows

* Fix ad links opening multiple times
This commit is contained in:
Geometrically
2024-08-30 10:42:58 -07:00
committed by GitHub
parent 016c3d779b
commit bd61f5d591
70 changed files with 941 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/app-lib/src/api/jre.rs
View File

@@ -68,7 +68,7 @@ pub async fn auto_install_java(java_version: u32) -> crate::Result<PathBuf> {
pub name: PathBuf,
}
emit_loading(&loading_bar, 0.0, Some("Fetching java version")).await?;
emit_loading(&loading_bar, 0.0, Some("Fetching java version"))?;
let packages = fetch_json::<Vec<Package>>(
Method::GET,
&format!(
@@ -80,7 +80,7 @@ pub async fn auto_install_java(java_version: u32) -> crate::Result<PathBuf> {
&state.fetch_semaphore,
&state.pool,
).await?;
emit_loading(&loading_bar, 10.0, Some("Downloading java version")).await?;
emit_loading(&loading_bar, 10.0, Some("Downloading java version"))?;
if let Some(download) = packages.first() {
let file = fetch_advanced(
@@ -115,13 +115,13 @@ pub async fn auto_install_java(java_version: u32) -> crate::Result<PathBuf> {
}
}
emit_loading(&loading_bar, 0.0, Some("Extracting java")).await?;
emit_loading(&loading_bar, 0.0, Some("Extracting java"))?;
archive.extract(&path).map_err(|_| {
crate::Error::from(crate::ErrorKind::InputError(
"Failed to extract java zip".to_string(),
))
})?;
emit_loading(&loading_bar, 10.0, Some("Done extracting java")).await?;
emit_loading(&loading_bar, 10.0, Some("Done extracting java"))?;
let mut base_path = path.join(
download
.name

2
packages/app-lib/src/api/pack/import/mod.rs
View File

@@ -287,7 +287,7 @@ pub async fn copy_dotminecraft(
fetch::copy(&src_child, &dst_child, io_semaphore).await?;
emit_loading(&loading_bar, 1.0, None).await?;
emit_loading(&loading_bar, 1.0, None)?;
}
Ok(loading_bar)
}

12
packages/app-lib/src/api/pack/install_from.rs
View File

@@ -191,7 +191,7 @@ pub async fn generate_pack_from_version_id(
let state = State::get().await?;
let loading_bar = if let Some(bar) = initialized_loading_bar {
emit_loading(&bar, 0.0, Some("Downloading pack file")).await?;
emit_loading(&bar, 0.0, Some("Downloading pack file"))?;
bar
} else {
init_loading(
@@ -207,7 +207,7 @@ pub async fn generate_pack_from_version_id(
.await?
};
emit_loading(&loading_bar, 0.0, Some("Fetching version")).await?;
emit_loading(&loading_bar, 0.0, Some("Fetching version"))?;
let version = CachedEntry::get_version(
&version_id,
None,
@@ -220,7 +220,7 @@ pub async fn generate_pack_from_version_id(
"Invalid version ID specified!".to_string(),
)
})?;
emit_loading(&loading_bar, 10.0, None).await?;
emit_loading(&loading_bar, 10.0, None)?;
let (url, hash) =
if let Some(file) = version.files.iter().find(|x| x.primary) {
@@ -248,7 +248,7 @@ pub async fn generate_pack_from_version_id(
&state.pool,
)
.await?;
emit_loading(&loading_bar, 0.0, Some("Fetching project metadata")).await?;
emit_loading(&loading_bar, 0.0, Some("Fetching project metadata"))?;
let project = CachedEntry::get_project(
&version.project_id,
@@ -263,7 +263,7 @@ pub async fn generate_pack_from_version_id(
)
})?;
emit_loading(&loading_bar, 10.0, Some("Retrieving icon")).await?;
emit_loading(&loading_bar, 10.0, Some("Retrieving icon"))?;
let icon = if let Some(icon_url) = project.icon_url {
let state = State::get().await?;
let icon_bytes =
@@ -287,7 +287,7 @@ pub async fn generate_pack_from_version_id(
} else {
None
};
emit_loading(&loading_bar, 10.0, None).await?;
emit_loading(&loading_bar, 10.0, None)?;
Ok(CreatePack {
file,

5
packages/app-lib/src/api/pack/install_mrpack.rs
View File

@@ -203,7 +203,7 @@ pub async fn install_zipped_mrpack_files(
)
.await?;
emit_loading(&loading_bar, 0.0, Some("Extracting overrides")).await?;
emit_loading(&loading_bar, 0.0, Some("Extracting overrides"))?;
let mut total_len = 0;
@@ -270,8 +270,7 @@ pub async fn install_zipped_mrpack_files(
"Extracting override {}/{}",
index, total_len
)),
)
.await?;
)?;
}
}

2
packages/app-lib/src/api/profile/mod.rs
View File

@@ -510,7 +510,7 @@ pub async fn export_mrpack(
// Iterate over every file in the folder
// Every file that is NOT in the config file is added to the zip, in overrides
for path in path_list {
emit_loading(&loading_bar, 1.0, None).await?;
emit_loading(&loading_bar, 1.0, None)?;
let relative_path = pack_get_relative_path(&profile_base_path, &path)?;