Merge pull request #171 from TwintailTeam/master

TukanDev · web-flow · commit ecdc681792d9 · 2026-01-25T20:01:07.000Z
1.1.15 hotfix for 1.1.14
diff --git a/.github/workflows/update-aur-bin.yml b/.github/workflows/update-aur-bin.yml
@@ -43,7 +43,8 @@ jobs:
           arch=('x86_64')
           url="https://github.com/TwintailTeam/TwintailLauncher"
           license=('GPL-3.0-only')
-          depends=('cairo' 'desktop-file-utils' 'gdk-pixbuf2' 'glib2' 'gtk3' 'hicolor-icon-theme' 'pango' 'webkit2gtk-4.1' 'libappindicator-gtk3' 'libayatana-appindicator' 'mangohud' 'gamemode')
+          depends=('cairo' 'desktop-file-utils' 'gdk-pixbuf2' 'glib2' 'gtk3' 'hicolor-icon-theme' 'pango' 'webkit2gtk-4.1' 'libappindicator-gtk3' 'libayatana-appindicator' 'mangohud')
+          optdepends=('gamemode: Feral Interactive gamemode utility')
           options=('!debug')
           provides=("twintaillauncher-bin")
           conflicts=("twintaillauncher-git" "twintaillauncher")
diff --git a/.github/workflows/update-aur-stable-src.yml b/.github/workflows/update-aur-stable-src.yml
@@ -32,16 +32,17 @@ jobs:
           pkgname=twintaillauncher
           pkgver=${PKGV}
           pkgrel=1
-          _dirname="TwintailLauncher-ttl-v${pkgver}"
+          _dirname="TwintailLauncher-ttl-v\${pkgver}"
           pkgdesc='A multi-platform launcher for your anime games'
           arch=('x86_64')
           license=('GPL-3.0-only')
           url=https://github.com/TwintailTeam/TwintailLauncher
-          depends=('cairo' 'desktop-file-utils' 'gdk-pixbuf2' 'glib2' 'gtk3' 'hicolor-icon-theme' 'pango' 'webkit2gtk-4.1' 'libappindicator-gtk3' 'libayatana-appindicator' 'mangohud' 'gamemode')
+          depends=('cairo' 'desktop-file-utils' 'gdk-pixbuf2' 'glib2' 'gtk3' 'hicolor-icon-theme' 'pango' 'webkit2gtk-4.1' 'libappindicator-gtk3' 'libayatana-appindicator' 'mangohud')
+          optdepends=('gamemode: Feral Interactive gamemode utility')
           makedepends=('git' 'openssl' 'appmenu-gtk-module' 'libappindicator-gtk3' 'librsvg' 'cargo' 'pnpm' 'nodejs')
           provides=("twintaillauncher")
           conflicts=("twintaillauncher-git" "twintaillauncher-bin")
-          source=("${pkgname}.tar.gz::\${url}/archive/refs/tags/ttl-v\${pkgver}.tar.gz")
+          source=("\${pkgname}-\${pkgver}.tar.gz::\${url}/archive/refs/tags/ttl-v\${pkgver}.tar.gz")
           sha256sums=('SKIP')
           options=('!lto' '!debug')
           
@@ -56,28 +57,17 @@ jobs:
           }
   
           package() {
-            install -Dm644 $_dirname/LICENSE -t "\$pkgdir/usr/share/licenses/$pkgname"
-            install -Dm755 $_dirname/src-tauri/target/release/resources/hpatchz -t "\$pkgdir/usr/lib/twintaillauncher/resources/"
-            install -Dm755 $_dirname/src-tauri/target/release/resources/reaper -t "\$pkgdir/usr/lib/twintaillauncher/resources/"
-            install -Dm644 $_dirname/src-tauri/target/release/resources/hkrpg_patch.dll -t "\$pkgdir/usr/lib/twintaillauncher/resources/"
-            install -Dm755 $_dirname/src-tauri/target/release/twintaillauncher -t "\$pkgdir/usr/bin"
-            install -Dm644 $_dirname/twintaillauncher.desktop -t "\$pkgdir/usr/share/applications"
-            install -Dm644 $_dirname/src-tauri/icons/32x32.png "\$pkgdir/usr/share/icons/hicolor/32x32/apps/\$pkgname.png"
-            install -Dm644 $_dirname/src-tauri/icons/128x128.png "\$pkgdir/usr/share/icons/hicolor/128x128/apps/\$pkgname.png"
-            install -Dm644 $_dirname/src-tauri/icons/128x128@2x.png "\$pkgdir/usr/share/icons/hicolor/266x256@2/apps/\$pkgname.png"
+            install -Dm644 "\$_dirname/LICENSE" -t "\$pkgdir/usr/share/licenses/$pkgname"
+            install -Dm755 "\$_dirname/src-tauri/target/release/resources/hpatchz" -t "\$pkgdir/usr/lib/twintaillauncher/resources/"
+            install -Dm755 "\$_dirname/src-tauri/target/release/resources/reaper" -t "\$pkgdir/usr/lib/twintaillauncher/resources/"
+            install -Dm644 "\$_dirname/src-tauri/target/release/resources/hkrpg_patch.dll" -t "\$pkgdir/usr/lib/twintaillauncher/resources/"
+            install -Dm755 "\$_dirname/src-tauri/target/release/twintaillauncher" -t "\$pkgdir/usr/bin"
+            install -Dm644 "\$_dirname/twintaillauncher.desktop" -t "\$pkgdir/usr/share/applications"
+            install -Dm644 "\$_dirname/src-tauri/icons/32x32.png" "\$pkgdir/usr/share/icons/hicolor/32x32/apps/\$pkgname.png"
+            install -Dm644 "\$_dirname/src-tauri/icons/128x128.png" "\$pkgdir/usr/share/icons/hicolor/128x128/apps/\$pkgname.png"
+            install -Dm644 "\$_dirname/src-tauri/icons/128x128@2x.png" "\$pkgdir/usr/share/icons/hicolor/266x256@2/apps/\$pkgname.png"
           }
           EOF
-      - name: Test PKGBUILD
-        uses: KSXGitHub/github-actions-deploy-aur@v4.1.1
-        with:
-          pkgname: twintaillauncher
-          pkgbuild: ./PKGBUILD
-          test: true
-          commit_username: ${{ secrets.GIT_USER }}
-          commit_email: ${{ secrets.GIT_EMAIL }}
-          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
-          commit_message: "Update to version ${{ env.VERSION }}"
-          ssh_keyscan_types: rsa,ecdsa,ed25519
       - name: Publish AUR package
         if: success()
         uses: KSXGitHub/github-actions-deploy-aur@v4.1.1
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "twintaillauncher",
     "private": true,
-    "version": "1.1.14",
+    "version": "1.1.15",
     "type": "module",
     "scripts": {
         "dev": "vite --mode master",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "twintaillauncher"
-version = "1.1.14"
+version = "1.1.15"
 description = "A multi-platform launcher for your anime games"
 authors = ["TukanDev"]
 edition = "2024"
diff --git a/src-tauri/src/commands/install.rs b/src-tauri/src/commands/install.rs
@@ -903,8 +903,8 @@ pub fn get_download_sizes(app: AppHandle, biz: String, version: String, lang: St
         }
 
         let p = PathBuf::from(&path);
-        let ap = if cfg!(target_os = "linux") { match p.canonicalize() { Ok(resolved) => resolved, Err(_) => match p.parent() { Some(parent) => parent.canonicalize().unwrap_or(p.clone()), None => p.clone(), } } } else { p };
-        let a = available(ap);
+        //let ap = if cfg!(target_os = "linux") { match p.canonicalize() { Ok(resolved) => resolved, Err(_) => match p.parent() { Some(parent) => parent.canonicalize().unwrap_or(p.clone()), None => p.clone(), } } } else { p };
+        let a = available(p);
         let stringified;
         
         if a.is_some() {
diff --git a/src-tauri/src/downloading/misc.rs b/src-tauri/src/downloading/misc.rs
@@ -215,6 +215,7 @@ pub fn download_or_update_extra(app: &AppHandle, path: PathBuf, package_id: Stri
                             });
                         return;
                     } else {
+                        let ap = if package_type.as_str() == "xxmi" || package_id.as_str() == "jadeite" || package_id == "keqingunlock" { path.clone() } else { path.join(&package_type) };
                         let ver_path = if package_id == "keqingunlock" || package_id == "jadeite" || package_type == "xxmi" { path.join("VERSION.txt") } else { path.join(package_type.clone()).join("VERSION.txt") };
                         if !ver_path.exists() { return; }
                         let pkg_type = if package_id == "keqingunlock" || package_id == "jadeite" { package_id.as_str() } else { package_type.as_str() };
@@ -230,21 +231,22 @@ pub fn download_or_update_extra(app: &AppHandle, path: PathBuf, package_id: Stri
                                             let f_path = path.join(file);
                                             if f_path.exists() { let _ = fs::remove_file(f_path); }
                                         }
-                                    } else { let ap = path.join(package_type.clone()); empty_dir(&ap).unwrap(); }
+                                    } else { empty_dir(&ap).unwrap(); }
                                     prevent_exit(&app, true);
                                     let dl = run_async_command(async {
-                                        let needs_extract = if package_type.as_str() == "keqing_unlock" { false } else { true };
+                                        let needs_extract = if package_type.as_str() == "keqing_unlock" || package_type.as_str() == "xxmi" { false } else { true };
                                         let needs_append = if package_type.as_str() == "gimi" || package_type.as_str() == "srmi" || package_type.as_str() == "zzmi" || package_type.as_str() == "himi" || package_type.as_str() == "wwmi" { true } else { false };
-                                        Extras::download_extra_package(package_id.clone(), package_type.clone(), needs_extract, false, needs_append, path.as_path().to_str().unwrap().parse().unwrap(), |_current, _total| {}).await
+                                        Extras::download_extra_package(package_id.clone(), package_type.clone(), needs_extract, false, needs_append, ap.as_path().to_str().unwrap().parse().unwrap(), |_current, _total| {}).await
                                     });
                                     if dl {
                                         if package_type.as_str() == "gimi" || package_type.as_str() == "srmi" || package_type.as_str() == "zzmi" || package_type.as_str() == "himi" || package_type.as_str() == "wwmi" {
                                             for mi in ["gimi", "srmi", "zzmi", "wwmi", "himi"] {
                                                 for lib in ["d3d11.dll", "d3dcompiler_47.dll"] {
                                                     let linkedpath = path.join(mi).join(lib);
+                                                    let _ = fs::remove_file(&linkedpath);
                                                     if !linkedpath.exists() {
                                                         #[cfg(target_os = "linux")]
-                                                        if !linkedpath.exists() { std::os::unix::fs::symlink(path.join(lib), linkedpath).unwrap(); }
+                                                        std::os::unix::fs::symlink(path.join(lib), linkedpath).unwrap();
                                                         #[cfg(target_os = "windows")]
                                                         fs::copy(path.join(lib), linkedpath).unwrap();
                                                     }
@@ -285,10 +287,11 @@ pub fn download_or_update_extra(app: &AppHandle, path: PathBuf, package_id: Stri
                 app.emit("download_progress", dlpayload.clone()).unwrap();
                 prevent_exit(&app, true);
 
+                if !ap.exists() { let _ = fs::create_dir_all(&ap); }
                 let dl = run_async_command(async {
-                    let needs_extract = if package_type.as_str() == "keqing_unlock" { false } else { true };
+                    let needs_extract = if package_type.as_str() == "keqing_unlock" || package_type.as_str() == "xxmi" { false } else { true };
                     let needs_append = if package_type.as_str() == "gimi" || package_type.as_str() == "srmi" || package_type.as_str() == "zzmi" || package_type.as_str() == "himi" || package_type.as_str() == "wwmi" { true } else { false };
-                    Extras::download_extra_package(package_id.clone(), package_type.clone(), needs_extract, false, needs_append, path.as_path().to_str().unwrap().parse().unwrap(), {
+                    Extras::download_extra_package(package_id.clone(), package_type.clone(), needs_extract, false, needs_append, ap.as_path().to_str().unwrap().parse().unwrap(), {
                         let app = app.clone();
                         let pkg_id = package_id.clone();
                         let dlpayload = dlpayload.clone();
@@ -306,9 +309,10 @@ pub fn download_or_update_extra(app: &AppHandle, path: PathBuf, package_id: Stri
                         for mi in ["gimi", "srmi", "zzmi", "wwmi", "himi"] {
                             for lib in ["d3d11.dll", "d3dcompiler_47.dll"] {
                                 let linkedpath = path.join(mi).join(lib);
+                                let _ = fs::remove_file(&linkedpath);
                                 if !linkedpath.exists() {
                                     #[cfg(target_os = "linux")]
-                                    if !linkedpath.exists() { std::os::unix::fs::symlink(path.join(lib), linkedpath).unwrap(); }
+                                    std::os::unix::fs::symlink(path.join(lib), linkedpath).unwrap();
                                     #[cfg(target_os = "windows")]
                                     fs::copy(path.join(lib), linkedpath).unwrap();
                                 }
diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs
@@ -85,8 +85,8 @@ pub fn run() {
                     std::process::exit(0);
                 }
 
-                let res_dir = if cfg!(target_os = "linux") { app.path().resource_dir().unwrap().canonicalize().unwrap() } else { app.path().resource_dir().unwrap() };
-                let data_dir = if cfg!(target_os = "linux") { app.path().app_data_dir().unwrap().canonicalize().unwrap() } else { app.path().app_data_dir().unwrap() };
+                let res_dir = app.path().resource_dir().unwrap();
+                let data_dir = app.path().app_data_dir().unwrap();
                 setup_or_fix_default_paths(handle, data_dir.clone(), true);
                 sync_install_backgrounds(handle);
                 check_extras_update(handle);
diff --git a/src-tauri/src/utils/mod.rs b/src-tauri/src/utils/mod.rs
@@ -566,6 +566,10 @@ pub fn apply_xxmi_tweaks(package: PathBuf, mut data: Json<XXMISettings>) -> Json
             let f = ini.load(&cfg);
             match f {
                 Ok(_) => {
+                    // Why is ini parser fucking these lines?? Explicitly set them back...
+                    ini.set("Include", "exclude_recursive", Some("DISABLED*".to_string()));
+
+                    // Apply edits
                     ini.set("Hunting", "hunting", Some(data.hunting_mode.to_string()));
                     let actions = if data.dump_shaders { "clipboard hlsl asm regex" } else { "clipboard" };
                     ini.set("Hunting", "marking_actions", Some(actions.to_string()));
@@ -672,7 +676,7 @@ pub fn is_using_overriden_runner(installed_runner: String, override_runner: Stri
 
 #[allow(dead_code)]
 pub fn empty_dir<P: AsRef<Path>>(dir: P) -> io::Result<()> {
-    const EXCEPTIONS: &[&str] = &["Mods/", "ShaderCache/", "d3dx_user.ini"];
+    const EXCEPTIONS: &[&str] = &["Mods/", "ShaderCache/", "d3dx_user.ini", "gimi/", "srmi/", "zzmi/", "himi/", "wwmi/"];
     if dir.as_ref().exists() {
         for entry in fs::read_dir(dir.as_ref())? {
             let entry = entry?;
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
@@ -1,7 +1,7 @@
 {
     "$schema": "https://schema.tauri.app/config/2",
     "productName": "twintaillauncher",
-    "version": "1.1.14",
+    "version": "1.1.15",
     "identifier": "twintaillauncher",
     "build": {
         "beforeDevCommand": "pnpm dev",

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "twintaillauncher",`
`3`	`3`	`"private": true,`
`4`		`- "version": "1.1.14",`
	`4`	`+ "version": "1.1.15",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`
`7`	`7`	`"dev": "vite --mode master",`
Original file line number	Diff line number	Diff line change
`@@ -903,8 +903,8 @@ pub fn get_download_sizes(app: AppHandle, biz: String, version: String, lang: St`
`903`	`903`	`}`
`904`	`904`
`905`	`905`	`let p = PathBuf::from(&path);`
`906`		`- let ap = if cfg!(target_os = "linux") { match p.canonicalize() { Ok(resolved) => resolved, Err(_) => match p.parent() { Some(parent) => parent.canonicalize().unwrap_or(p.clone()), None => p.clone(), } } } else { p };`
`907`		`- let a = available(ap);`
	`906`	`+ //let ap = if cfg!(target_os = "linux") { match p.canonicalize() { Ok(resolved) => resolved, Err(_) => match p.parent() { Some(parent) => parent.canonicalize().unwrap_or(p.clone()), None => p.clone(), } } } else { p };`
	`907`	`+ let a = available(p);`
`908`	`908`	`let stringified;`
`909`	`909`
`910`	`910`	`if a.is_some() {`