ww-manager 2.3.2__tar.gz → 2.3.4__tar.gz

{ww_manager-2.3.2 → ww_manager-2.3.4}/.github/generate-pkgbuild.sh

@@ -10,11 +10,15 @@ URL="https://github.com/$REPO/archive/refs/tags/v$VERSION.tar.gz"
 curl --fail --location "$URL" -o source.tar.gz
 SHA256=$(sha256sum source.tar.gz | cut -d ' ' -f 1)
 
+# pkgrel：新上游版本发 tag 时固定为 1；纯打包修正（版本号不变）由
+# aur-republish 工作流传入 2、3…，让已装旧 pkgrel 的用户能被 pacman 升级
+PKGREL="${PKGREL:-1}"
+
 # 生成 PKGBUILD
 cat <<EOF >PKGBUILD
 pkgname=ww-manager
 pkgver=$VERSION
-pkgrel=1
+pkgrel=$PKGREL
 pkgdesc="ww-manager (A Wuthering Waves CLI Manager)"
 arch=('any')
 url="https://github.com/$REPO"
@@ -22,10 +26,11 @@ license=('MIT')
 depends=(
   'python'
   'python-typer'
-'python-rich'
-'python-requests'
-'python-certifi'
+  'python-rich'
+  'python-requests'
+  'python-certifi'
   'python-typing_extensions'
+  'python-prompt_toolkit'
 )
 makedepends=('python-build' 'python-installer' 'python-hatchling')
 source=("\$pkgname-\$pkgver.tar.gz::$URL")

{ww_manager-2.3.2 → ww_manager-2.3.4}/.github/workflows/aur-publish.yml

@@ -1,10 +1,11 @@
 name: Publish to AUR
 
+# 发新版本 tag 时自动发布，pkgrel 固定为 1。
+# 版本号不变的纯打包修正请用 aur-republish.yml（手动触发，pkgrel 递增）。
 on:
   push:
     tags:
       - 'v*'
-  workflow_dispatch:
 
 jobs:
   aur-publish:

ww_manager-2.3.4/.github/workflows/aur-republish.yml

@@ -0,0 +1,38 @@
+name: Republish to AUR (pkgrel bump)
+
+# 仅手动触发：版本号不变、只改打包内容（依赖、安装路径、启动参数等）时用。
+# pkgrel 递增后 AUR 上的版本从 X.Y.Z-1 变成 X.Y.Z-2，已安装旧包的用户
+# 才能通过 pacman/yay 升级拿到修正。
+on:
+  workflow_dispatch:
+    inputs:
+      pkgrel:
+        description: 'pkgrel（纯打包修正请递增，例如 2、3…）'
+        required: true
+        default: '2'
+      reason:
+        description: '本次重新打包的原因（写入 commit message）'
+        required: false
+        default: ''
+
+jobs:
+  aur-republish:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Generate PKGBUILD
+        env:
+          PKGREL: ${{ inputs.pkgrel }}
+        run: bash .github/generate-pkgbuild.sh
+
+      - name: Publish AUR package
+        uses: KSXGitHub/github-actions-deploy-aur@master
+        with:
+          pkgname: ww-manager
+          pkgbuild: ./PKGBUILD
+          commit_username: ${{ github.repository_owner }}
+          commit_email: ${{ github.repository_owner }}@users.noreply.github.com
+          ssh_private_key: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+          commit_message: "Repackage ${{ github.ref_name }}: pkgrel ${{ inputs.pkgrel }}${{ inputs.reason && format(' - {0}', inputs.reason) || '' }}"
+          ssh_keyscan_types: rsa,ecdsa,ed25519

{ww_manager-2.3.2 → ww_manager-2.3.4}/.github/workflows/ci.yml

@@ -19,7 +19,9 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@a26af69be951a213d495a4c3e4e4022e16d87065 # v5
         with:
-          python-version: "3.9"
+          # ubuntu-latest 已切到 26.04，其预构建版本里没有 3.9；
+          # 项目仍声明 >=3.9，这里只需一个能装上的版本跑检查。
+          python-version: "3.13"
 
       - name: Install dependencies
         run: pip install ruff -e .

{ww_manager-2.3.2 → ww_manager-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: ww-manager
-Version: 2.3.2
+Version: 2.3.4
 Summary: 鸣潮命令行管理器
 License-File: LICENSE
 Requires-Python: >=3.9
@@ -15,7 +15,7 @@ Description-Content-Type: text/markdown
 <div align="center">
   <h1>WutheringWaves CLI Manager</h1>
   <h3>鸣潮命令行管理器</h3>
-  <a href="https://python.org"><img src="https://img.shields.io/badge/Python-3.9%2B-blue.svg" alt="Python 3.9+"></a>&nbsp;<a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/badge/Tool-uv-purple.svg" alt="uv"></a>&nbsp;<img src="https://img.shields.io/badge/Version-2.3.2-brightgreen.svg" alt="version 2.3.2">
+  <a href="https://python.org"><img src="https://img.shields.io/badge/Python-3.9%2B-blue.svg" alt="Python 3.9+"></a>&nbsp;<a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/badge/Tool-uv-purple.svg" alt="uv"></a>&nbsp;<img src="https://img.shields.io/badge/Version-2.3.4-brightgreen.svg" alt="version 2.3.4">
 </div>
 
 <p align="center">
@@ -117,7 +117,7 @@ ww status
 
 | 档位 | 启动参数 |
 |---|---|
-| SD · 标清 | `-krqlv=sd` |
+| SD · 流畅 | `-krqlv=sd` |
 | HD · 高清 | `-krqlv=hd` |
 | UHD · 极致 | `-krqlv=uhd` |
 

{ww_manager-2.3.2 → ww_manager-2.3.4}/README.md

@@ -1,7 +1,7 @@
 <div align="center">
   <h1>WutheringWaves CLI Manager</h1>
   <h3>鸣潮命令行管理器</h3>
-  <a href="https://python.org"><img src="https://img.shields.io/badge/Python-3.9%2B-blue.svg" alt="Python 3.9+"></a>&nbsp;<a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/badge/Tool-uv-purple.svg" alt="uv"></a>&nbsp;<img src="https://img.shields.io/badge/Version-2.3.2-brightgreen.svg" alt="version 2.3.2">
+  <a href="https://python.org"><img src="https://img.shields.io/badge/Python-3.9%2B-blue.svg" alt="Python 3.9+"></a>&nbsp;<a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/badge/Tool-uv-purple.svg" alt="uv"></a>&nbsp;<img src="https://img.shields.io/badge/Version-2.3.4-brightgreen.svg" alt="version 2.3.4">
 </div>
 
 <p align="center">
@@ -103,7 +103,7 @@ ww status
 
 | 档位 | 启动参数 |
 |---|---|
-| SD · 标清 | `-krqlv=sd` |
+| SD · 流畅 | `-krqlv=sd` |
 | HD · 高清 | `-krqlv=hd` |
 | UHD · 极致 | `-krqlv=uhd` |
 

{ww_manager-2.3.2 → ww_manager-2.3.4}/docs/README.en.md

@@ -1,7 +1,7 @@
 <div align="center">
   <h1>WutheringWaves CLI Manager</h1>
   <h3>Command-line manager for Wuthering Waves</h3>
-  <a href="https://python.org"><img src="https://img.shields.io/badge/Python-3.9%2B-blue.svg" alt="Python 3.9+"></a>&nbsp;<a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/badge/Tool-uv-purple.svg" alt="uv"></a>&nbsp;<img src="https://img.shields.io/badge/Version-2.3.2-brightgreen.svg" alt="version 2.3.2">
+  <a href="https://python.org"><img src="https://img.shields.io/badge/Python-3.9%2B-blue.svg" alt="Python 3.9+"></a>&nbsp;<a href="https://github.com/astral-sh/uv"><img src="https://img.shields.io/badge/Tool-uv-purple.svg" alt="uv"></a>&nbsp;<img src="https://img.shields.io/badge/Version-2.3.4-brightgreen.svg" alt="version 2.3.4">
 </div>
 
 <p align="center">
@@ -103,7 +103,7 @@ Pass the launch argument for an installed quality tier:
 
 | Tier | Launch argument |
 |---|---|
-| SD · Standard | `-krqlv=sd` |
+| SD · Smooth | `-krqlv=sd` |
 | HD · High | `-krqlv=hd` |
 | UHD · Ultra | `-krqlv=uhd` |
 

{ww_manager-2.3.2 → ww_manager-2.3.4}/docs/linux.md

@@ -10,11 +10,11 @@
 
 | 档位 | 参数 |
 |---|---|
-| SD · 标清 | `-krqlv=sd` |
+| SD · 流畅 | `-krqlv=sd` |
 | HD · 高清 | `-krqlv=hd` |
 | UHD · 极致 | `-krqlv=uhd` |
 
-只指定一个档位。可以用 `ww status` 查看工具当前默认档位，但工具不会自动修改 Steam 或其他启动器中的启动参数。
+只指定一个档位。可以用 `ww status` 查看工具当前默认档位，但工具不会自动修改 Steam 或其他启动器中的启动参数。下面是一些启动游戏的参考：
 
 ## Steam + Proton
 
@@ -29,7 +29,35 @@
    -krqlv=hd
    ```
 
-也可以使用 Lutris，或参考仓库中的 `run_ww.sh` 自行配置启动方式，并保持档位参数一致。
+也可以使用 Lutris，或直接调用 DWProton 自带 Wine（见下节）。
+
+## 一键安装（DWProton + 独立 prefix）
+
+不想经过 Steam 或 Lutris 时，用仓库里的一键部署环境脚本（实验性，仅在 Archlinux + niri 图形环境下测试可用）：
+
+```bash
+// 不带参数时默认读 ww-cli 的安装目录
+scripts/setup-linux.sh --game-dir ~/Games/WutheringWaves
+```
+
+脚本依次完成：下载并校验 DWProton、准备 riched20 UTF-8 补丁组件（修复登录协议正文乱码）、建立独立 prefix（DXVK、vkd3d-proton、dxvk-nvapi、NVIDIA 的 NGX 运行时、ICU、字体、DLL 覆盖），初始化后逐项自检并补装缺项，最后把启动器装到 `~/.local/bin/run_ww`，并写入桌面启动器入口 `ww.desktop`（图标从游戏自带启动器里提取）。
+
+常用开关：
+
+| 开关 | 作用 |
+|---|---|
+| `-y` | 不询问，缺失的系统包直接装 |
+| `--no-install` | 不装任何系统包，只提示 |
+| `--check` | 只检查路径与档位，不启动游戏 |
+| `--rebuild` | 忽略仓库内的预编译组件，从源码重编 riched20 |
+
+安装时检查 gamemode（启动时默认启用，实测对帧率有提升）与 PE 交叉工具链（仅重编组件时需要，mingw-w64 或 clang+lld 任一即可），缺失则询问是否安装；选择跳过则不打补丁，登录协议等文本可能乱码，但游戏仍可正常启动。MangoHud 属可选项，默认不装。脚本支持断点续传，并会复用其它安装根里已下载的归档；下载长期失败时可设 `https_proxy` 重试，或用 `WW_WINE_SOURCE_URL`、`WW_DWPROTON_URL` 换镜像源。
+
+已存在的 DWProton（`$DWPROTON`、`~/.local/share/dwproton/`、Lutris/Steam 目录等）和已有 prefix 会被直接复用，不重复下载也不移动。
+
+安装后用 `run_ww` 启动（或点桌面图标），默认经 gamemoderun 启动（`WW_GAMEMODE=0` 关闭）。脚本的画质档位自动读取游戏目录的 `wwm_resource_state.json`，`run_ww --check` 只检查路径和档位。日志在 `~/.local/share/ww-linux/logs/game.log`。
+
+已知问题：`bilibili` 服在登录的 webview 框会固定弹出**网络请求失败，请重试**，但是不影响验证码登录，忽略即可。
 
 ### 安装额外的 Proton 版本
 - [dwproton](https://dawn.wine/dawn-winery/dwproton/releases)

{ww_manager-2.3.2 → ww_manager-2.3.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ww-manager"
-version = "2.3.2"
+version = "2.3.4"
 description = "鸣潮命令行管理器"
 readme = "README.md"
 requires-python = ">=3.9"

{ww_manager-2.3.2 → ww_manager-2.3.4}/scripts/demo_cli_menus.py

@@ -24,7 +24,7 @@ from ww_manager.download import format_bytes, space_shortage
 
 GIB = 1024**3
 SIZES = {"sd": 12 * GIB, "hd": 24 * GIB, "uhd": 48 * GIB}
-NAMES = {"sd": "标清", "hd": "高清", "uhd": "极致"}
+NAMES = {"sd": "流畅", "hd": "高清", "uhd": "极致"}
 VERSION = "3.7.1"
 
 

{ww_manager-2.3.2 → ww_manager-2.3.4}/scripts/demo_resource_menu.py

@@ -14,7 +14,7 @@ from ww_manager.menu import MenuOption, build_selection_menu
 GIB = 1024**3
 # 所有体积均为展示交互而虚构，不代表真实客户端下载大小。
 DEMO_CHOICES = (
-    ("sd", "标清", 12 * GIB, 12 * GIB),
+    ("sd", "流畅", 12 * GIB, 12 * GIB),
     ("hd", "高清", 24 * GIB, 0),
     ("uhd", "极致", 48 * GIB, 48 * GIB),
 )

ww_manager-2.3.4/scripts/extract-icon.py

@@ -0,0 +1,146 @@
+#!/usr/bin/env python3
+"""从 Windows PE 可执行文件提取最大尺寸的图标。
+
+用法：extract-icon.py <exe> <输出目录> [尺寸...]
+
+把图标写成 <输出目录>/<尺寸>/apps/ww.png。没有 ImageMagick 时只写 256x256。
+"""
+
+import os
+import pathlib
+import shutil
+import struct
+import subprocess
+import sys
+
+
+def u16(buf, off):
+    return struct.unpack_from("<H", buf, off)[0]
+
+
+def u32(buf, off):
+    return struct.unpack_from("<I", buf, off)[0]
+
+
+def read_pe_resources(path):
+    data = pathlib.Path(path).read_bytes()
+    pe = u32(data, 0x3C)
+    if data[pe : pe + 4] != b"PE\0\0":
+        raise SystemExit("不是 PE 文件")
+    coff = pe + 4
+    opt = coff + 20
+    ndd = opt + (96 if u16(data, opt) == 0x10B else 112)
+    rsrc_rva = u32(data, ndd + 16)
+
+    sections = []
+    for i in range(u16(data, coff + 2)):
+        base = opt + u16(data, coff + 16) + i * 40
+        vaddr = u32(data, base + 12)
+        vsize = max(u32(data, base + 8), u32(data, base + 16))
+        sections.append((vaddr, vsize, u32(data, base + 20)))
+
+    def rva2off(rva):
+        for vaddr, vsize, raw in sections:
+            if vaddr <= rva < vaddr + vsize:
+                return raw + rva - vaddr
+        raise SystemExit("资源段地址映射失败")
+
+    def entries(dir_off):
+        named, ids = u16(data, dir_off + 12), u16(data, dir_off + 14)
+        out = []
+        for i in range(named + ids):
+            e = dir_off + 16 + i * 8
+            out.append((u32(data, e), u32(data, e + 4)))
+        return out
+
+    rsrc = rva2off(rsrc_rva)
+
+    def leaf(off):
+        """目录下第一个语言条目的数据位置与长度。"""
+        _name, target = entries(off)[0]
+        pos = rsrc + (target & 0x7FFFFFFF)
+        return rva2off(u32(data, pos)), u32(data, pos + 4)
+
+    return data, rsrc, entries, leaf
+
+
+def largest_icon(path):
+    data, rsrc, entries, leaf = read_pe_resources(path)
+    types = {name: i for i, (name, _t) in enumerate(entries(rsrc))}
+    if 3 not in types or 14 not in types:
+        raise SystemExit("文件里没有图标资源")
+
+    images = {}
+    _name, target = entries(rsrc)[types[3]]
+    for name, sub in entries(rsrc + (target & 0x7FFFFFFF)):
+        off, size = leaf(rsrc + (sub & 0x7FFFFFFF))
+        images[name] = data[off : off + size]
+
+    best, best_width = None, -1
+    _name, target = entries(rsrc)[types[14]]
+    for _gname, sub in entries(rsrc + (target & 0x7FFFFFFF)):
+        off, size = leaf(rsrc + (sub & 0x7FFFFFFF))
+        group = data[off : off + size]
+        count = u16(group, 4)
+        items = [struct.unpack_from("<BBBBHHIH", group, 6 + i * 14) for i in range(count)]
+        width = max(int(item[0]) or 256 for item in items)
+        if width > best_width:
+            best, best_width = items, width
+
+    # 256x256 条目在 ICO 内以 PNG 存储，可直接作为图片使用。
+    if not best:
+        raise SystemExit("找不到图标条目")
+    for item in best:
+        width, _height, _colors, _res, _planes, _bpp, _size, image_id = item
+        if (int(width) or 256) >= 256 and image_id in images:
+            return images[image_id]
+    raise SystemExit("找不到 256x256 图标")
+
+
+def write_ico(png, path):
+    header = struct.pack("<HHH", 0, 1, 1)
+    entry = struct.pack("<BBBBHHII", 0, 0, 0, 0, 1, 32, len(png), 6 + 16)
+    path.write_bytes(header + entry + png)
+
+
+def write_png(data, dest):
+    tmp = dest.with_name(f".{dest.name}.tmp")
+    tmp.write_bytes(data)
+    os.replace(tmp, dest)
+
+
+def main():
+    exe, out_dir, *sizes = sys.argv[1:]
+    sizes = sizes or ["256x256"]
+    png = largest_icon(exe)
+    have_magick = shutil.which("magick") is not None
+
+    icon_file = pathlib.Path("/tmp") / f"ww-icon-{os.getpid()}.ico"
+    write_ico(png, icon_file)
+    try:
+        for size in sizes:
+            if size != "256x256" and not have_magick:
+                continue
+            dest = pathlib.Path(out_dir) / size / "apps" / "ww.png"
+            dest.parent.mkdir(parents=True, exist_ok=True)
+            if have_magick:
+                tmp = dest.with_name(f".{dest.name}.tmp.png")
+                try:
+                    subprocess.run(
+                        ["magick", str(icon_file), "-resize", size, f"PNG:{tmp}"],
+                        check=True,
+                        capture_output=True,
+                    )
+                    os.replace(tmp, dest)
+                except (subprocess.CalledProcessError, OSError) as exc:
+                    tmp.unlink(missing_ok=True)
+                    print(f"警告：ImageMagick 缩放 {size} 失败（{exc}），改用原图。", file=sys.stderr)
+                    write_png(png, dest)
+            else:
+                write_png(png, dest)
+    finally:
+        icon_file.unlink(missing_ok=True)
+
+
+if __name__ == "__main__":
+    main()