Merge pull request #182 from an-anime-team/next

Release 1.8.2
an-anime-team · Sep 11, 2024 · faa5611 · faa5611
2 parents 8a66d46 + 5f1ac9d
commit faa5611
Show file tree

Hide file tree

Showing 6 changed files with 78 additions and 70 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- Added support for new game installation format
+- Added 7z binary requirement
+
 ## [1.8.1] - 02.09.2024
 
 ### Fixed

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ glib-build-tools = "0.20"
 
 [dependencies.anime-launcher-sdk]
 git = "https://github.com/an-anime-team/anime-launcher-sdk"
-tag = "1.20.3"
+tag = "1.21.0"
 features = ["all", "star-rail", "star-rail-patch"]
 
 # path = "../anime-launcher-sdk" # ! for dev purposes only

diff --git a/src/ui/about.rs b/src/ui/about.rs
@@ -100,10 +100,11 @@ impl SimpleComponent for AboutDialog {
 
             set_release_notes_version: &APP_VERSION,
             set_release_notes: &[
-                "<p>Fixed</p>",
+                "<p>Added</p>",
 
                 "<ul>",
-                    "<li>Fixed gamescope config file layout</li>",
+                    "<li>Added support for new game installation format</li>",
+                    "<li>Added 7z binary requirement</li>",
                 "</ul>"
             ].join("\n"),
 

diff --git a/src/ui/first_run/dependencies.rs b/src/ui/first_run/dependencies.rs
@@ -41,7 +41,7 @@ impl SimpleAsyncComponent for DependenciesApp {
 
                 gtk::Label {
                     set_label: &tr!("missing-dependencies-message"),
-    
+
                     set_justify: gtk::Justification::Center,
                     set_wrap: true,
                     set_margin_top: 32
@@ -68,7 +68,7 @@ impl SimpleAsyncComponent for DependenciesApp {
                         },
 
                         gtk::Entry {
-                            set_text: "sudo pacman -Syu git libwebp",
+                            set_text: "sudo pacman -Syu git p7zip libwebp",
                             set_editable: false
                         }
                     },
@@ -85,7 +85,7 @@ impl SimpleAsyncComponent for DependenciesApp {
                         },
 
                         gtk::Entry {
-                            set_text: "sudo apt install git webp",
+                            set_text: "sudo apt install git p7zip-full webp",
                             set_editable: false
                         }
                     },
@@ -102,7 +102,7 @@ impl SimpleAsyncComponent for DependenciesApp {
                         },
 
                         gtk::Entry {
-                            set_text: "sudo dnf install git libwebp-tools",
+                            set_text: "sudo dnf install git p7zip libwebp-tools",
                             set_editable: false
                         }
                     },
@@ -119,6 +119,10 @@ impl SimpleAsyncComponent for DependenciesApp {
                                 set_title: "git"
                             },
 
+                            adw::ActionRow {
+                                set_title: "p7zip"
+                            },
+
                             adw::ActionRow {
                                 set_title: "libwebp"
                             }
@@ -130,7 +134,7 @@ impl SimpleAsyncComponent for DependenciesApp {
             add = &adw::PreferencesGroup {
                 set_valign: gtk::Align::Center,
                 set_vexpand: true,
-    
+
                 gtk::Box {
                     set_orientation: gtk::Orientation::Horizontal,
                     set_halign: gtk::Align::Center,
@@ -202,6 +206,18 @@ impl SimpleAsyncComponent for DependenciesApp {
                     }
                 }
 
+                // 7z sometimes has different binaries
+                if !is_available("7z") && !is_available("7za") {
+                    sender.output(Self::Output::Toast {
+                        title: tr!("package-not-available", {
+                            "package" = "7z"
+                        }),
+                        description: None
+                    });
+
+                    return;
+                }
+
                 sender.output(Self::Output::ScrollToDefaultPaths);
             }