fix(desktop): 选择文件不再让程序崩溃;新增拖拽;macOS 产出 .app
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 通过。
This commit is contained in:
@@ -18,6 +18,24 @@ v0.4.7 提供两套互不依赖的传输方式:
|
|||||||
|
|
||||||
## v0.5-m1:电脑 ↔ 电脑互传(新增)
|
## v0.5-m1:电脑 ↔ 电脑互传(新增)
|
||||||
|
|
||||||
|
### macOS:请用 QFT.app 启动,不要直接跑裸二进制
|
||||||
|
|
||||||
|
`./package.sh` 在 macOS 上会同时产出 `QFT-Desktop`(裸二进制)和 `QFT.app`,
|
||||||
|
**推荐用 `QFT.app`**。
|
||||||
|
|
||||||
|
直接运行裸二进制时,AppKit 的部分行为会不稳定——最典型的是点「选择文件」时
|
||||||
|
`+[NSOpenPanel openPanel]` 返回 NULL:
|
||||||
|
|
||||||
|
```
|
||||||
|
panicked at objc2-app-kit/src/generated/NSOpenPanel.rs:
|
||||||
|
unexpected NULL returned from +[NSOpenPanel openPanel]
|
||||||
|
```
|
||||||
|
|
||||||
|
程序侧已经兜住了这个 panic(不会再崩溃,只提示"对话框没有返回结果"),
|
||||||
|
但要彻底避免,用 `.app` 启动即可。
|
||||||
|
|
||||||
|
任何情况下都可以**直接把文件拖进窗口**——拖拽不经过系统文件对话框。
|
||||||
|
|
||||||
### Windows 构建报 `os error 5 拒绝访问`
|
### Windows 构建报 `os error 5 拒绝访问`
|
||||||
|
|
||||||
```
|
```
|
||||||
|
|||||||
+68
-7
@@ -539,7 +539,7 @@ impl QftApp {
|
|||||||
ui.heading("1 · 保存位置");
|
ui.heading("1 · 保存位置");
|
||||||
ui.horizontal_wrapped(|ui| {
|
ui.horizontal_wrapped(|ui| {
|
||||||
if ui.add_enabled(!running, egui::Button::new("选择接收文件夹")).clicked() {
|
if ui.add_enabled(!running, egui::Button::new("选择接收文件夹")).clicked() {
|
||||||
if let Some(dir) = rfd::FileDialog::new().pick_folder() {
|
if let Some(dir) = pick_folder_safely() {
|
||||||
self.receive.save_dir = Some(dir);
|
self.receive.save_dir = Some(dir);
|
||||||
self.receive.status = "保存位置已选择,可以启动接收。".into();
|
self.receive.status = "保存位置已选择,可以启动接收。".into();
|
||||||
}
|
}
|
||||||
@@ -640,7 +640,7 @@ impl QftApp {
|
|||||||
ui.heading("1 · 选择发送文件");
|
ui.heading("1 · 选择发送文件");
|
||||||
ui.horizontal_wrapped(|ui| {
|
ui.horizontal_wrapped(|ui| {
|
||||||
if ui.add_enabled(!running, egui::Button::new("选择文件")).clicked() {
|
if ui.add_enabled(!running, egui::Button::new("选择文件")).clicked() {
|
||||||
if let Some(path) = rfd::FileDialog::new().pick_file() {
|
if let Some(path) = pick_file_safely() {
|
||||||
match TransferSource::open(&path, DEFAULT_CHUNK_SIZE) {
|
match TransferSource::open(&path, DEFAULT_CHUNK_SIZE) {
|
||||||
Ok(source) => {
|
Ok(source) => {
|
||||||
self.send.file_size = source.manifest.file_size;
|
self.send.file_size = source.manifest.file_size;
|
||||||
@@ -709,7 +709,7 @@ impl QftApp {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn optical_pick_file(&mut self, ctx: &egui::Context) {
|
fn optical_pick_file(&mut self, ctx: &egui::Context) {
|
||||||
let Some(path) = rfd::FileDialog::new().pick_file() else { return };
|
let Some(path) = pick_file_safely() else { return };
|
||||||
match TransferSource::open(&path, DEFAULT_CHUNK_SIZE) {
|
match TransferSource::open(&path, DEFAULT_CHUNK_SIZE) {
|
||||||
Ok(source) => {
|
Ok(source) => {
|
||||||
self.optical.source = Some(Arc::new(source));
|
self.optical.source = Some(Arc::new(source));
|
||||||
@@ -1027,8 +1027,10 @@ impl QftApp {
|
|||||||
ui.heading("接收设置");
|
ui.heading("接收设置");
|
||||||
ui.horizontal_wrapped(|ui| {
|
ui.horizontal_wrapped(|ui| {
|
||||||
if ui.button("选择保存文件夹").clicked() {
|
if ui.button("选择保存文件夹").clicked() {
|
||||||
if let Some(dir) = rfd::FileDialog::new().pick_folder() {
|
match pick_folder_safely() {
|
||||||
self.pc.save_dir = Some(dir);
|
Some(dir) => self.pc.save_dir = Some(dir),
|
||||||
|
None => self.pc.status =
|
||||||
|
"系统文件夹对话框没有返回结果。当前仍使用上方显示的目录。".into(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
match self.pc.save_dir.as_ref() {
|
match self.pc.save_dir.as_ref() {
|
||||||
@@ -1197,13 +1199,32 @@ impl QftApp {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// 拖进窗口的文件直接进待发列表。拖拽不依赖系统文件对话框,
|
||||||
|
// 因此在 NSOpenPanel 失效时仍然可用。
|
||||||
|
let dropped = dropped_paths(ui.ctx());
|
||||||
|
if !dropped.is_empty() {
|
||||||
|
for path in dropped {
|
||||||
|
if path.is_file() && !self.pc.files.contains(&path) {
|
||||||
|
self.pc.files.push(path);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
self.pc.status = format!("已加入 {} 个文件。", self.pc.files.len());
|
||||||
|
}
|
||||||
|
|
||||||
ui.add_space(12.0);
|
ui.add_space(12.0);
|
||||||
ui.group(|ui| {
|
ui.group(|ui| {
|
||||||
ui.heading("2 · 选择文件并发送");
|
ui.heading("2 · 选择文件并发送");
|
||||||
|
if is_hovering_files(ui.ctx()) {
|
||||||
|
ui.colored_label(egui::Color32::from_rgb(80, 200, 120), "松手即可加入待发送列表");
|
||||||
|
} else {
|
||||||
|
ui.small("可以直接把文件拖进这个窗口。");
|
||||||
|
}
|
||||||
ui.horizontal_wrapped(|ui| {
|
ui.horizontal_wrapped(|ui| {
|
||||||
if ui.button("选择文件").clicked() {
|
if ui.button("选择文件").clicked() {
|
||||||
if let Some(files) = rfd::FileDialog::new().pick_files() {
|
match pick_files_safely() {
|
||||||
self.pc.files = files;
|
Some(files) => self.pc.files = files,
|
||||||
|
None => self.pc.status =
|
||||||
|
"系统文件对话框没有返回结果。可以直接把文件拖进窗口。".into(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ui.add_enabled(!self.pc.files.is_empty(), egui::Button::new("清空")).clicked() {
|
if ui.add_enabled(!self.pc.files.is_empty(), egui::Button::new("清空")).clicked() {
|
||||||
@@ -1561,6 +1582,46 @@ fn snap_to_physical(points: f32, pixels_per_point: f32) -> f32 {
|
|||||||
((points * pixels_per_point).round() / pixels_per_point).max(1.0)
|
((points * pixels_per_point).round() / pixels_per_point).max(1.0)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/// 文件对话框的安全包装。
|
||||||
|
///
|
||||||
|
/// macOS 上 `+[NSOpenPanel openPanel]` 会偶发返回 NULL,rfd 遇到就直接 panic,
|
||||||
|
/// 整个程序随之退出——用户只是想选个文件,结果窗口没了。
|
||||||
|
/// 不管根因是什么,**选文件失败都不该终止程序**,所以在这里兜住。
|
||||||
|
///
|
||||||
|
/// 直接跑裸二进制(不是 .app 包)时更容易触发:AppKit 的若干行为依赖
|
||||||
|
/// 应用被正确注册为 GUI 程序。package.sh 现在会在 macOS 上额外产出 .app。
|
||||||
|
fn pick_files_safely() -> Option<Vec<PathBuf>> {
|
||||||
|
std::panic::catch_unwind(|| rfd::FileDialog::new().pick_files()).unwrap_or(None)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn pick_folder_safely() -> Option<PathBuf> {
|
||||||
|
std::panic::catch_unwind(|| rfd::FileDialog::new().pick_folder()).unwrap_or(None)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn pick_file_safely() -> Option<PathBuf> {
|
||||||
|
std::panic::catch_unwind(|| rfd::FileDialog::new().pick_file()).unwrap_or(None)
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 取出本帧被拖进窗口的文件。
|
||||||
|
///
|
||||||
|
/// 拖拽不经过 NSOpenPanel,因此在文件对话框失效时仍然可用,
|
||||||
|
/// 同时它本来就是桌面端更顺手的交互。
|
||||||
|
fn dropped_paths(ctx: &egui::Context) -> Vec<PathBuf> {
|
||||||
|
ctx.input(|i| {
|
||||||
|
i.raw
|
||||||
|
.dropped_files
|
||||||
|
.iter()
|
||||||
|
.filter_map(|file| file.path.clone())
|
||||||
|
.collect()
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
/// 是否正有文件悬停在窗口上,用于给出放置提示。
|
||||||
|
fn is_hovering_files(ctx: &egui::Context) -> bool {
|
||||||
|
ctx.input(|i| !i.raw.hovered_files.is_empty())
|
||||||
|
}
|
||||||
|
|
||||||
fn human_bytes(v: u64) -> String {
|
fn human_bytes(v: u64) -> String {
|
||||||
const UNITS: [&str; 5] = ["B", "KB", "MB", "GB", "TB"];
|
const UNITS: [&str; 5] = ["B", "KB", "MB", "GB", "TB"];
|
||||||
let mut n = v as f64;
|
let mut n = v as f64;
|
||||||
|
|||||||
+30
-2
@@ -43,6 +43,33 @@ if [ -f "desktop/target/release/qft-desktop.exe" ]; then
|
|||||||
cp "desktop/target/release/qft-desktop.exe" "$QFT_PACKAGE_DIR/QFT-Windows.exe"
|
cp "desktop/target/release/qft-desktop.exe" "$QFT_PACKAGE_DIR/QFT-Windows.exe"
|
||||||
elif [ -f "desktop/target/release/qft-desktop" ]; then
|
elif [ -f "desktop/target/release/qft-desktop" ]; then
|
||||||
cp "desktop/target/release/qft-desktop" "$QFT_PACKAGE_DIR/QFT-Desktop"
|
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
|
else
|
||||||
echo "ERROR: desktop release binary was not produced." >&2
|
echo "ERROR: desktop release binary was not produced." >&2
|
||||||
exit 1
|
exit 1
|
||||||
@@ -53,10 +80,11 @@ cp docs/PROTOCOL.md "$QFT_PACKAGE_DIR/PROTOCOL.md"
|
|||||||
echo "[3/3] Writing SHA-256 checksums and archive..."
|
echo "[3/3] Writing SHA-256 checksums and archive..."
|
||||||
(
|
(
|
||||||
cd "$QFT_PACKAGE_DIR"
|
cd "$QFT_PACKAGE_DIR"
|
||||||
|
# 只对普通文件求校验和:.app 是目录,直接喂给 sha256sum 会报错
|
||||||
if command -v sha256sum >/dev/null 2>&1; then
|
if command -v sha256sum >/dev/null 2>&1; then
|
||||||
sha256sum ./* > SHA256SUMS.txt
|
find . -type f ! -name SHA256SUMS.txt | sort | xargs sha256sum > SHA256SUMS.txt
|
||||||
else
|
else
|
||||||
shasum -a 256 ./* > SHA256SUMS.txt
|
find . -type f ! -name SHA256SUMS.txt | sort | xargs shasum -a 256 > SHA256SUMS.txt
|
||||||
fi
|
fi
|
||||||
)
|
)
|
||||||
tar -C "$QFT_ROOT/dist" -czf "$QFT_PACKAGE_DIR.tar.gz" "$QFT_PACKAGE"
|
tar -C "$QFT_ROOT/dist" -czf "$QFT_PACKAGE_DIR.tar.gz" "$QFT_PACKAGE"
|
||||||
|
|||||||
Reference in New Issue
Block a user