From a92f3599e25b061c7083d04ec76f079169bd16e8 Mon Sep 17 00:00:00 2001
From: Nikita Podvirnyi <krypt0nn@vk.com>
Date: Sat, 3 Aug 2024 10:49:47 +0200
Subject: [PATCH] feat: removed p7zip dependency

---
 CHANGELOG.md                     |  4 ++++
 Cargo.lock                       |  8 ++++----
 Cargo.toml                       |  2 +-
 src/ui/about.rs                  | 26 +-------------------------
 src/ui/first_run/dependencies.rs | 22 +++-------------------
 src/ui/first_run/tos_warning.rs  |  3 +--
 6 files changed, 14 insertions(+), 51 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43f1889..6122bcd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Removed
+
+- Removed `p7zip` dependency
+
 ## [1.7.0] - 02.08.2024
 
 ### Added
diff --git a/Cargo.lock b/Cargo.lock
index 4421f9a..a823bb3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -57,8 +57,8 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"
 
 [[package]]
 name = "anime-game-core"
-version = "1.22.1"
-source = "git+https://github.com/an-anime-team/anime-game-core?tag=1.22.1#c9a186da515663e880097de358b0c53fab0f5237"
+version = "1.22.2"
+source = "git+https://github.com/an-anime-team/anime-game-core?tag=1.22.2#e3f2c3361bd986e60c8b8e11b0921ac46d6473b8"
 dependencies = [
  "anyhow",
  "bzip2",
@@ -82,8 +82,8 @@ dependencies = [
 
 [[package]]
 name = "anime-launcher-sdk"
-version = "1.17.2"
-source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.17.2#7911abbdf907b31c0af0a1e735610d85151d8515"
+version = "1.17.3"
+source = "git+https://github.com/an-anime-team/anime-launcher-sdk?tag=1.17.3#1797ac466d1c8815e9ceae528043de66d033368c"
 dependencies = [
  "anime-game-core",
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index f3e3a04..1c9db78 100644
--- 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.17.2"
+tag = "1.17.3"
 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
index f30d57e..dc422f8 100644
--- a/src/ui/about.rs
+++ b/src/ui/about.rs
@@ -100,34 +100,10 @@ impl SimpleComponent for AboutDialog {
 
             set_release_notes_version: &APP_VERSION,
             set_release_notes: &[
-                "<p>Added</p>",
-
-                "<ul>",
-                    "<li>Added \"Indonesia\" wine language option</li>",
-                    "<li>Added writing of the game's output to the \"game.log\" file in the launcher's folder</li>",
-                    "<li>Respect root \".version\" file for game version parsing</li>",
-                    "<li>Added 2.4.0 voiceovers sizes</li>",
-                "</ul>",
-
-                "<p>Fixed</p>",
-
-                "<ul>",
-                    "<li>Fixed \"dwebp\" package name for fedora during initial setup</li>",
-                    "<li>Fixed Discord RPC updates</li>",
-                "</ul>",
-
-                "<p>Changed</p>",
-
-                "<ul>",
-                    "<li>Changed background images processing logic</li>",
-                    "<li>Prioritize parsed game version over the API response</li>",
-                "</ul>",
-
                 "<p>Removed</p>",
 
                 "<ul>",
-                    "<li>Removed \"xdelta3\" dependency</li>",
-                    "<li>Removed migrate installation feature</li>",
+                    "<li>Removed \"p7zip\" dependency</li>",
                 "</ul>"
             ].join("\n"),
 
diff --git a/src/ui/first_run/dependencies.rs b/src/ui/first_run/dependencies.rs
index f90a861..d9d217b 100644
--- a/src/ui/first_run/dependencies.rs
+++ b/src/ui/first_run/dependencies.rs
@@ -68,7 +68,7 @@ impl SimpleAsyncComponent for DependenciesApp {
                         },
 
                         gtk::Entry {
-                            set_text: "sudo pacman -Syu git p7zip libwebp",
+                            set_text: "sudo pacman -Syu git libwebp",
                             set_editable: false
                         }
                     },
@@ -85,7 +85,7 @@ impl SimpleAsyncComponent for DependenciesApp {
                         },
 
                         gtk::Entry {
-                            set_text: "sudo apt install git p7zip-full webp",
+                            set_text: "sudo apt install git webp",
                             set_editable: false
                         }
                     },
@@ -102,7 +102,7 @@ impl SimpleAsyncComponent for DependenciesApp {
                         },
 
                         gtk::Entry {
-                            set_text: "sudo dnf install git p7zip libwebp-tools",
+                            set_text: "sudo dnf install git libwebp-tools",
                             set_editable: false
                         }
                     },
@@ -119,10 +119,6 @@ impl SimpleAsyncComponent for DependenciesApp {
                                 set_title: "git"
                             },
 
-                            adw::ActionRow {
-                                set_title: "p7zip"
-                            },
-
                             adw::ActionRow {
                                 set_title: "libwebp"
                             }
@@ -206,18 +202,6 @@ 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);
             }
 
diff --git a/src/ui/first_run/tos_warning.rs b/src/ui/first_run/tos_warning.rs
index 6d79d86..cd6c0d0 100644
--- a/src/ui/first_run/tos_warning.rs
+++ b/src/ui/first_run/tos_warning.rs
@@ -105,8 +105,7 @@ impl SimpleAsyncComponent for TosWarningApp {
                         "continue" => {
                             let installed =
                                 is_available("git") &&
-                                is_available("dwebp") &&
-                                (is_available("7z") || is_available("7za"));
+                                is_available("dwebp");
 
                             if installed {
                                 sender.output(Self::Output::ScrollToDefaultPaths);