375ae8a956
macOS 上点「选择文件」直接退出: panicked at objc2-app-kit-0.3.2/.../NSOpenPanel.rs:127: unexpected NULL returned from +[NSOpenPanel openPanel] rfd 在 openPanel 返回 NULL 时直接 panic,整个进程随之结束——用户只是 想选个文件,窗口就没了。三层处理,从"不该崩"到"不该发生": 1. 不该崩:pick_files/pick_folder/pick_file 全部包进 catch_unwind。 文件对话框失败是可以恢复的情况,不该终止程序;失败时在状态栏说明 并提示改用拖拽。 2. 提供不依赖对话框的路径:支持把文件直接拖进窗口。拖拽不经过 NSOpenPanel,对话框失效时照样能用,而且本来就是桌面端更顺手的交互。 悬停时给出"松手即可加入待发送列表"的提示。 3. 消除诱因:package.sh 在 macOS 上额外产出 QFT.app。AppKit 的若干行为 依赖应用被正确注册为 GUI 程序,直接跑裸二进制正是这个 NULL 的高发场景。 Info.plist 含 NSHighResolutionCapable,Retina 下不会被拉伸。 顺带修复 package.sh 的校验和步骤:此前 `sha256sum ./*` 会把 .app 目录 一起喂进去并报错,改为 find -type f 只处理普通文件。 验证:cargo test 35/35;package.sh 完整跑通并实际 open 了生成的 .app, 确认能启动存活;plutil 校验 Info.plist 通过。
96 lines
3.6 KiB
Bash
Executable File
96 lines
3.6 KiB
Bash
Executable File
#!/usr/bin/env sh
|
|
set -eu
|
|
|
|
QFT_ROOT=$(CDPATH= cd -- "$(dirname -- "$0")" && pwd)
|
|
cd "$QFT_ROOT"
|
|
|
|
echo "== QFT Rust one-click package =="
|
|
if ! command -v cargo >/dev/null 2>&1; then
|
|
# rustup 装在 keg-only 目录里时不会自动进 PATH,这里兜一下,
|
|
# 避免用户明明装了工具链却被告知"没装"。
|
|
for QFT_CANDIDATE in "/opt/homebrew/opt/rustup/bin" "$HOME/.cargo/bin"; do
|
|
if [ -x "$QFT_CANDIDATE/cargo" ]; then
|
|
PATH="$QFT_CANDIDATE:$PATH"
|
|
export PATH
|
|
break
|
|
fi
|
|
done
|
|
fi
|
|
command -v cargo >/dev/null 2>&1 || {
|
|
echo "ERROR: Rust cargo was not found in PATH." >&2
|
|
echo " brew 安装:brew install rustup && rustup default stable" >&2
|
|
echo " 并把 /opt/homebrew/opt/rustup/bin 加入 PATH" >&2
|
|
exit 1
|
|
}
|
|
|
|
echo "[1/3] Testing and building the Rust desktop release..."
|
|
(
|
|
cd desktop
|
|
cargo test
|
|
cargo build --release
|
|
)
|
|
|
|
QFT_VERSION=$(awk -F'"' '/^\[package\]/{package=1; next} package && /^version[[:space:]]*=/{print $2; exit} /^\[/{package=0}' desktop/Cargo.toml)
|
|
[ -n "$QFT_VERSION" ] || QFT_VERSION=unknown
|
|
QFT_STAMP=$(date '+%Y%m%d-%H%M%S')
|
|
QFT_PLATFORM=$(uname -s | tr '[:upper:]' '[:lower:]')
|
|
QFT_PACKAGE="QFT-Rust-${QFT_VERSION}-${QFT_STAMP}-${QFT_PLATFORM}"
|
|
QFT_PACKAGE_DIR="$QFT_ROOT/dist/$QFT_PACKAGE"
|
|
|
|
echo "[2/3] Collecting Rust artifacts..."
|
|
mkdir -p "$QFT_PACKAGE_DIR"
|
|
if [ -f "desktop/target/release/qft-desktop.exe" ]; then
|
|
cp "desktop/target/release/qft-desktop.exe" "$QFT_PACKAGE_DIR/QFT-Windows.exe"
|
|
elif [ -f "desktop/target/release/qft-desktop" ]; then
|
|
cp "desktop/target/release/qft-desktop" "$QFT_PACKAGE_DIR/QFT-Desktop"
|
|
# macOS 上额外产出 .app 包。AppKit 的若干行为(其中就包括
|
|
# NSOpenPanel)依赖应用被正确注册为 GUI 程序,直接跑裸二进制时
|
|
# openPanel 会偶发返回 NULL 并导致崩溃。
|
|
if [ "$QFT_PLATFORM" = "darwin" ]; then
|
|
QFT_APP="$QFT_PACKAGE_DIR/QFT.app"
|
|
mkdir -p "$QFT_APP/Contents/MacOS"
|
|
cp "desktop/target/release/qft-desktop" "$QFT_APP/Contents/MacOS/QFT"
|
|
chmod +x "$QFT_APP/Contents/MacOS/QFT"
|
|
cat > "$QFT_APP/Contents/Info.plist" <<'PLIST'
|
|
<?xml version="1.0" encoding="UTF-8"?>
|
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
<plist version="1.0">
|
|
<dict>
|
|
<key>CFBundleName</key><string>QFT</string>
|
|
<key>CFBundleDisplayName</key><string>QFT 超速文件传输</string>
|
|
<key>CFBundleIdentifier</key><string>com.qft.desktop</string>
|
|
<key>CFBundleExecutable</key><string>QFT</string>
|
|
<key>CFBundlePackageType</key><string>APPL</string>
|
|
<key>CFBundleShortVersionString</key><string>0.5.0</string>
|
|
<key>CFBundleVersion</key><string>1</string>
|
|
<key>NSHighResolutionCapable</key><true/>
|
|
<key>LSMinimumSystemVersion</key><string>11.0</string>
|
|
</dict>
|
|
</plist>
|
|
PLIST
|
|
echo " 已生成 QFT.app(推荐用它启动,比裸二进制稳定)"
|
|
fi
|
|
else
|
|
echo "ERROR: desktop release binary was not produced." >&2
|
|
exit 1
|
|
fi
|
|
cp README.md TEST_REPORT.md "$QFT_PACKAGE_DIR/"
|
|
cp docs/PROTOCOL.md "$QFT_PACKAGE_DIR/PROTOCOL.md"
|
|
|
|
echo "[3/3] Writing SHA-256 checksums and archive..."
|
|
(
|
|
cd "$QFT_PACKAGE_DIR"
|
|
# 只对普通文件求校验和:.app 是目录,直接喂给 sha256sum 会报错
|
|
if command -v sha256sum >/dev/null 2>&1; then
|
|
find . -type f ! -name SHA256SUMS.txt | sort | xargs sha256sum > SHA256SUMS.txt
|
|
else
|
|
find . -type f ! -name SHA256SUMS.txt | sort | xargs shasum -a 256 > SHA256SUMS.txt
|
|
fi
|
|
)
|
|
tar -C "$QFT_ROOT/dist" -czf "$QFT_PACKAGE_DIR.tar.gz" "$QFT_PACKAGE"
|
|
|
|
echo
|
|
echo "PACKAGE COMPLETE"
|
|
echo "Folder: $QFT_PACKAGE_DIR"
|
|
echo "Archive: $QFT_PACKAGE_DIR.tar.gz"
|