diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..a6add44
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,95 @@
+name: build
+
+# 三端出包:
+# Windows → .exe(NSIS 安装包)
+# macOS → .dmg(Intel + Apple Silicon 各一份)
+# Linux → .deb / .AppImage
+#
+# Linux 版和 Windows 版本机就能交叉/原生编译,macOS 必须有苹果的编译链,
+# 所以这里统一交给 GitHub Actions(macos-latest 就是真机 macOS)。
+
+on:
+ workflow_dispatch:
+ push:
+ tags:
+ - 'v*'
+
+jobs:
+ build:
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - platform: macos-latest
+ target: aarch64-apple-darwin
+ label: macOS (Apple Silicon)
+ - platform: macos-latest
+ target: x86_64-apple-darwin
+ label: macOS (Intel)
+ - platform: ubuntu-22.04
+ target: ''
+ label: Linux
+ - platform: windows-latest
+ target: ''
+ label: Windows
+
+ name: ${{ matrix.label }}
+ runs-on: ${{ matrix.platform }}
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - uses: actions/setup-node@v4
+ with:
+ node-version: 20
+
+ - name: 安装 Rust
+ uses: dtolnay/rust-toolchain@stable
+ with:
+ targets: ${{ matrix.platform == 'macos-latest' && 'aarch64-apple-darwin,x86_64-apple-darwin' || '' }}
+
+ - name: 缓存 cargo
+ uses: swatinem/rust-cache@v2
+ with:
+ workspaces: src-tauri
+
+ - name: 安装 Linux 系统依赖
+ if: matrix.platform == 'ubuntu-22.04'
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y --no-install-recommends \
+ libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev \
+ librsvg2-dev libxdo-dev patchelf
+
+ - name: 安装前端依赖
+ run: npm install
+
+ - name: 构建并上传产物
+ uses: tauri-apps/tauri-action@v0
+ env:
+ # 升级签名:把私钥内容存到仓库 Secret(TAURI_SIGNING_PRIVATE_KEY)
+ TAURI_SIGNING_PRIVATE_KEY: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY }}
+ TAURI_SIGNING_PRIVATE_KEY_PASSWORD: ${{ secrets.TAURI_SIGNING_PRIVATE_KEY_PASSWORD }}
+ # macOS 代码签名(没有苹果开发者证书时留空,产物未签名,用户需右键「打开」)
+ APPLE_CERTIFICATE: ${{ secrets.APPLE_CERTIFICATE }}
+ APPLE_CERTIFICATE_PASSWORD: ${{ secrets.APPLE_CERTIFICATE_PASSWORD }}
+ APPLE_SIGNING_IDENTITY: ${{ secrets.APPLE_SIGNING_IDENTITY }}
+ APPLE_ID: ${{ secrets.APPLE_ID }}
+ APPLE_PASSWORD: ${{ secrets.APPLE_PASSWORD }}
+ APPLE_TEAM_ID: ${{ secrets.APPLE_TEAM_ID }}
+ with:
+ args: ${{ matrix.target != '' && format('--target {0}', matrix.target) || '' }}
+
+ - name: 上传构建产物
+ uses: actions/upload-artifact@v4
+ with:
+ name: xiaoyin-markdown-${{ matrix.platform }}${{ matrix.target != '' && format('-{0}', matrix.target) || '' }}
+ path: |
+ src-tauri/target/**/release/bundle/**/*.exe
+ src-tauri/target/**/release/bundle/**/*.msi
+ src-tauri/target/**/release/bundle/**/*.dmg
+ src-tauri/target/**/release/bundle/**/*.deb
+ src-tauri/target/**/release/bundle/**/*.AppImage
+ src-tauri/target/**/release/bundle/**/*.tar.gz
+ src-tauri/target/**/release/bundle/**/*.sig
+ if-no-files-found: warn
diff --git a/README.md b/README.md
index f5bf8ee..f301533 100644
--- a/README.md
+++ b/README.md
@@ -147,6 +147,62 @@ npx electron-packager . XiaoyinMarkdown --platform=win32 --arch=x64 --out=dist ^
打包完成后把 `dist\XiaoyinMarkdown-win32-x64` 整个目录拷到 `%USERPROFILE%\Apps\XiaoyinMarkdown` 覆盖即可(exe 依赖同目录的 dll,不能只拷 exe)。
+## 三端支持(Windows / macOS / Linux)
+
+| 平台 | 产物 | 状态 |
+| --- | --- | --- |
+| Windows 10/11 x64 | `xymd_<版本>.exe`(NSIS 安装包)| ✅ 已发布 |
+| Linux x86_64 | `xymd_<版本>_amd64.AppImage` / `.deb` | ✅ 已发布 |
+| macOS 11+ | `xymd_<版本>_aarch64.dmg` / `_x64.dmg` | ⏳ 需在 macOS 上构建(见下)|
+
+### 平台差异
+
+| 能力 | Windows | macOS | Linux |
+| --- | --- | --- | --- |
+| 「复制文件本身」到剪贴板 | ✅ Win32 CF_HDROP | ⚠️ 退化为复制路径文本 | ⚠️ 退化为复制路径文本 |
+| 在文件管理器中显示 | 资源管理器并选中 | `open -R` | `xdg-open` 打开所在目录 |
+| 打开外部链接 | `explorer` | `open` | `xdg-open` |
+| 文本剪贴板 | `clipboard-win` | `arboard` | `arboard` |
+| 在线升级 | ✅ | ✅(需签名)| ✅(仅 AppImage 形态)|
+
+macOS / Linux 的剪贴板没有跨平台的「文件」格式(要写 NSPasteboard / GTK 私有 target),
+所以这两个平台上「复制文件」会退化成把**路径文本**放进剪贴板。
+
+### 本机构建(Linux / Windows 交叉)
+
+```bash
+# Linux 原生(需要 webkit2gtk-4.1 等系统库)
+sudo apt install libwebkit2gtk-4.1-dev libgtk-3-dev libayatana-appindicator3-dev librsvg2-dev libxdo-dev
+npx tauri build --bundles deb,appimage
+
+# Windows(在 Linux 上交叉编译)
+npx tauri build --target x86_64-pc-windows-gnu --bundles nsis
+```
+
+### macOS
+
+macOS 的包**必须**在 macOS 上构建(需要 Xcode 的命令行工具链,Linux 无法交叉编译):
+仓库里的 `.github/workflows/build.yml` 会同时在 `macos-latest`(Apple Silicon + Intel)、
+`ubuntu-22.04`、`windows-latest` 三个 runner 上出包,产物在 Actions 的 Artifacts 里。
+
+需要在仓库 Secrets 里配:
+- `TAURI_SIGNING_PRIVATE_KEY` / `TAURI_SIGNING_PRIVATE_KEY_PASSWORD` —— 升级签名私钥
+- `APPLE_CERTIFICATE` / `APPLE_CERTIFICATE_PASSWORD` / `APPLE_SIGNING_IDENTITY` —— 苹果开发者证书(可选)
+- `APPLE_ID` / `APPLE_PASSWORD` / `APPLE_TEAM_ID` —— 公证用(可选)
+
+没有苹果开发者证书时产物是**未签名**的,用户首次打开需要「右键 → 打开」,
+或在终端执行 `xattr -dr com.apple.quarantine /Applications/XiaoyinMarkdown.app`。
+
+### 发布
+
+```bash
+python3 tools/release/publish.py --notes-file notes.txt
+```
+
+会自动扫描 `src-tauri/target` 下**存在的**产物(Windows / Linux / macOS 各归各位),
+拷到官网 `download/`,并把对应平台写进 `update/latest.json`(**合并**语义:
+在 Windows 上发版不会把 macOS 那条冲掉)。
+
## 用 Tauri 打包(推荐的安装包)
Tauri 版走系统 WebView2,**不用捆绑运行时**,安装包比 Electron 版小一个数量级。
diff --git a/site/index.html b/site/index.html
index 5b856e4..7755c99 100644
--- a/site/index.html
+++ b/site/index.html
@@ -482,6 +482,26 @@
源码 / 旧版
Gitea · GitHub
@@ -546,13 +566,27 @@
document.querySelectorAll('[data-ver]').forEach((el) => { el.textContent = m.version; });
document.querySelectorAll('[data-notes]').forEach((el) => { el.textContent = m.notes || ''; });
// 下载文件名带版本号:xymd_2.6.2.exe / xymd_2.6.2_portable.exe
- const map = { setup: `xymd_${m.version}.exe`, portable: `xymd_${m.version}_portable.exe` };
+ const map = {
+ setup: `xymd_${m.version}.exe`,
+ portable: `xymd_${m.version}_portable.exe`,
+ 'mac-arm': `xymd_${m.version}_aarch64.dmg`,
+ 'mac-x64': `xymd_${m.version}_x64.dmg`,
+ 'linux-appimage': `xymd_${m.version}_amd64.AppImage`,
+ 'linux-deb': `xymd_${m.version}_amd64.deb`,
+ };
Object.entries(map).forEach(([kind, name]) => {
document.querySelectorAll(`[data-dl="${kind}"]`).forEach((a) => {
a.setAttribute('href', `/download/${name}`);
a.setAttribute('download', name);
});
});
+ // 清单里出现哪个平台,才显示那张下载卡(没构建过就不显示,避免 404)
+ const plats = Object.keys(m.platforms || {});
+ const has = (p) => plats.some((k) => k === p || k.startsWith(p));
+ document.querySelectorAll('[data-plat]').forEach((el) => {
+ const ok = el.dataset.plat === 'mac' ? has('darwin') : has('linux');
+ el.hidden = !ok;
+ });
})
.catch(() => {});
diff --git a/site/update/latest.json b/site/update/latest.json
index 4364371..2f75de0 100644
--- a/site/update/latest.json
+++ b/site/update/latest.json
@@ -1,13 +1,19 @@
{
"version": "2.6.5",
"notes": "① 状态栏右下角显示当前版本号(就在「检查更新」左边)\n② 版本号从程序本身读取,不会和实际版本对不上",
- "pub_date": "2026-11-20T03:03:02Z",
+ "pub_date": "2026-11-20T03:26:59Z",
"platforms": {
"windows-x86_64": {
"signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSWWkrQjVjQnNqN3VxSWFBMjI5Vi9iajIwaVNtWTJlOXJ0Z3B5cGdyWUZsSGVpUXVNbW1aQ2hXazViaUJTWHZ5ZGtUY2NMOUZPMkJZazZZd0ZZa3JFWkZRdDR6RlFSdndZPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk1MTQzNjgwCWZpbGU6WGlhb3lpbk1hcmtkb3duXzIuNi41X3g2NC1zZXR1cC5leGUJdmVyc2lvbjoyLjYuNQpYcjVSbFB3bzdUeTZ2eTVjSlB1Uk41ZE9MaStSeCtxNVFLZ2RlNHF3QVozRUVvNiszaXp1SVRzait3dTM1U3J3RzBsa0ZXVmVnS21ZejBicXZrZndBdz09Cg==",
"url": "https://md.wangjinding.com/download/xymd_2.6.5.exe",
"size": 2324255,
"sha256": "db19986c7497e5409828f76d130b75df1a14f39ce6b24205c06545d9ed003806"
+ },
+ "linux-x86_64": {
+ "signature": "dW50cnVzdGVkIGNvbW1lbnQ6IHNpZ25hdHVyZSBmcm9tIHRhdXJpIHNlY3JldCBrZXkKUlVSWWkrQjVjQnNqN3AyTHlzdUhtSzVrb0VEelJFUk01Y1ZVLzVXNjVtbjd2V2hQelkzeXRvV2IzT2x1WERNdHovMmZSMDlUcUdESm1tWXBGN0R5REdMSk84YTg5QStCUGdFPQp0cnVzdGVkIGNvbW1lbnQ6IHRpbWVzdGFtcDoxNzk1MTQ1MDk1CWZpbGU6WGlhb3lpbk1hcmtkb3duXzIuNi41X2FtZDY0LkFwcEltYWdlCXZlcnNpb246Mi42LjUKckFYTE9WQ2JLdkZLcWd5VGc0YWNJQVBKbDFGd2M4K1dNOU1sVnhwMlJRRlo4dEpacHY3RkNhRHZCdEtETENpOUY2VzN2bzFySVdENkFNMGs1Vjg3QVE9PQo=",
+ "url": "https://md.wangjinding.com/download/xymd_2.6.5_amd64.AppImage",
+ "size": 108648952,
+ "sha256": "cc4b73017ae835b3cc4ba25f338ebfcdf20538c31942e9c607ae52d5dc73ab71"
}
}
}
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 15478ed..c256e50 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -47,6 +47,26 @@ version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
+[[package]]
+name = "arboard"
+version = "3.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "aeb9553e62312c8756a5979254fc6d7da8bbeb5986a1e17037fab932f7037917"
+dependencies = [
+ "clipboard-win",
+ "image",
+ "log",
+ "objc2",
+ "objc2-app-kit",
+ "objc2-core-foundation",
+ "objc2-core-graphics",
+ "objc2-foundation",
+ "parking_lot",
+ "percent-encoding",
+ "windows-sys 0.61.2",
+ "x11rb",
+]
+
[[package]]
name = "async-broadcast"
version = "0.7.2"
@@ -358,6 +378,12 @@ version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+[[package]]
+name = "byteorder-lite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495"
+
[[package]]
name = "bytes"
version = "1.12.2"
@@ -643,6 +669,12 @@ version = "0.8.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a31eee39dddec8330830986fcd7625edb5a24ec90ea038215273bbc3adb08ac6"
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
[[package]]
name = "crypto-common"
version = "0.1.7"
@@ -1042,6 +1074,12 @@ version = "2.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da7c62ceae207dd37ea5b845da6a0696c799f85e97da1ab5b7910be3c1c80223"
+[[package]]
+name = "fax"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf1079563223d5d59d83c85886a56e586cfd5c1a26292e971a0fa266531ac5a"
+
[[package]]
name = "fdeflate"
version = "0.3.7"
@@ -1329,6 +1367,16 @@ dependencies = [
"version_check",
]
+[[package]]
+name = "gethostname"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bd49230192a3797a9a4d6abe9b3eed6f7fa4c8a8a4947977c6f80025f92cbd8"
+dependencies = [
+ "rustix",
+ "windows-link",
+]
+
[[package]]
name = "getrandom"
version = "0.2.17"
@@ -1513,6 +1561,17 @@ dependencies = [
"syn 2.0.119",
]
+[[package]]
+name = "half"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
+dependencies = [
+ "cfg-if",
+ "crunchy",
+ "zerocopy",
+]
+
[[package]]
name = "hashbrown"
version = "0.12.3"
@@ -1822,6 +1881,20 @@ dependencies = [
"icu_properties",
]
+[[package]]
+name = "image"
+version = "0.25.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85ab80394333c02fe689eaf900ab500fbd0c2213da414687ebf995a65d5a6104"
+dependencies = [
+ "bytemuck",
+ "byteorder-lite",
+ "moxcms",
+ "num-traits",
+ "png",
+ "tiff",
+]
+
[[package]]
name = "indexmap"
version = "1.9.3"
@@ -2229,6 +2302,16 @@ dependencies = [
"windows-sys 0.61.2",
]
+[[package]]
+name = "moxcms"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb85c154ba489f01b25c0d36ae69a87e4a1c73a72631fc6c0eb6dde34a73e44b"
+dependencies = [
+ "num-traits",
+ "pxfm",
+]
+
[[package]]
name = "muda"
version = "0.20.0"
@@ -2355,6 +2438,7 @@ dependencies = [
"block2",
"objc2",
"objc2-core-foundation",
+ "objc2-core-graphics",
"objc2-foundation",
"objc2-quartz-core",
]
@@ -2913,6 +2997,18 @@ dependencies = [
"unicode-ident",
]
+[[package]]
+name = "pxfm"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d55d956fa96f5ec02be2e13af0e20391a5aa83d6a074e3ad368959d0fab299ea"
+
+[[package]]
+name = "quick-error"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"
+
[[package]]
name = "quick-xml"
version = "0.42.0"
@@ -4282,6 +4378,20 @@ dependencies = [
"syn 3.0.10",
]
+[[package]]
+name = "tiff"
+version = "0.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b63feaf3343d35b6ca4d50483f94843803b0f51634937cc2ec519fc32232bc52"
+dependencies = [
+ "fax",
+ "flate2",
+ "half",
+ "quick-error",
+ "weezl",
+ "zune-jpeg",
+]
+
[[package]]
name = "time"
version = "0.3.55"
@@ -4929,6 +5039,12 @@ dependencies = [
"windows-core",
]
+[[package]]
+name = "weezl"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28ac98ddc8b9274cb41bb4d9d4d5c425b6020c50c46f25559911905610b4a88"
+
[[package]]
name = "winapi"
version = "0.3.9"
@@ -5358,6 +5474,23 @@ dependencies = [
"pkg-config",
]
+[[package]]
+name = "x11rb"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9993aa5be5a26815fe2c3eacfc1fde061fc1a1f094bf1ad2a18bf9c495dd7414"
+dependencies = [
+ "gethostname",
+ "rustix",
+ "x11rb-protocol",
+]
+
+[[package]]
+name = "x11rb-protocol"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea6fc2961e4ef194dcbfe56bb845534d0dc8098940c7e5c012a258bfec6701bd"
+
[[package]]
name = "xattr"
version = "1.7.0"
@@ -5372,6 +5505,7 @@ dependencies = [
name = "xiaoyin-markdown"
version = "2.6.5"
dependencies = [
+ "arboard",
"chrono",
"clipboard-win",
"serde",
@@ -5478,6 +5612,26 @@ dependencies = [
"serde",
]
+[[package]]
+name = "zerocopy"
+version = "0.8.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5fe1f8f1b06191a00962174c61aa5005e0bb391a6d80d07e24d115c01a92ed8"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.63"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "863ad3ac83293fb4d740aedbfdc9240dd8d1a50c1099acd76ce80ce7c7230c7f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.119",
+]
+
[[package]]
name = "zerofrom"
version = "0.1.8"
@@ -5582,6 +5736,21 @@ version = "1.0.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
+[[package]]
+name = "zune-core"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d56377fd46368984a170bc5aac5567e52ca5da874caa60bea39fcbca78fb658b"
+
+[[package]]
+name = "zune-jpeg"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "27bc9d5b815bc103f142aa054f561d9187d191692ec7c2d1e2b4737f8dbd7296"
+dependencies = [
+ "zune-core",
+]
+
[[package]]
name = "zvariant"
version = "5.15.1"
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index e712e9c..6504caa 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -17,6 +17,9 @@ tauri-plugin-process = "2"
serde = { version = "1", features = ["derive"] }
chrono = "0.4"
serde_json = "1"
+# —— 三端:平台专属依赖各归各的 ——
+# Windows:剪贴板里放「文件本身」要靠 Win32 的 CF_HDROP
+[target.'cfg(windows)'.dependencies]
clipboard-win = "5"
windows-sys = { version = "0.61", features = [
"Win32_Foundation",
@@ -26,6 +29,10 @@ windows-sys = { version = "0.61", features = [
"Win32_UI_WindowsAndMessaging"
] }
+# macOS / Linux:文本剪贴板用 arboard(macOS 走 NSPasteboard,Linux 走 X11/Wayland)
+[target.'cfg(not(windows))'.dependencies]
+arboard = "3"
+
[profile.release]
opt-level = "s"
lto = true
diff --git a/src-tauri/icons/128x128.png b/src-tauri/icons/128x128.png
new file mode 100644
index 0000000..03f3c30
Binary files /dev/null and b/src-tauri/icons/128x128.png differ
diff --git a/src-tauri/icons/128x128@2x.png b/src-tauri/icons/128x128@2x.png
new file mode 100644
index 0000000..bf7f489
Binary files /dev/null and b/src-tauri/icons/128x128@2x.png differ
diff --git a/src-tauri/icons/32x32.png b/src-tauri/icons/32x32.png
new file mode 100644
index 0000000..4fa7826
Binary files /dev/null and b/src-tauri/icons/32x32.png differ
diff --git a/src-tauri/icons/64x64.png b/src-tauri/icons/64x64.png
new file mode 100644
index 0000000..d2205ac
Binary files /dev/null and b/src-tauri/icons/64x64.png differ
diff --git a/src-tauri/icons/Square107x107Logo.png b/src-tauri/icons/Square107x107Logo.png
new file mode 100644
index 0000000..8e091d8
Binary files /dev/null and b/src-tauri/icons/Square107x107Logo.png differ
diff --git a/src-tauri/icons/Square142x142Logo.png b/src-tauri/icons/Square142x142Logo.png
new file mode 100644
index 0000000..55d5101
Binary files /dev/null and b/src-tauri/icons/Square142x142Logo.png differ
diff --git a/src-tauri/icons/Square150x150Logo.png b/src-tauri/icons/Square150x150Logo.png
new file mode 100644
index 0000000..25e0345
Binary files /dev/null and b/src-tauri/icons/Square150x150Logo.png differ
diff --git a/src-tauri/icons/Square284x284Logo.png b/src-tauri/icons/Square284x284Logo.png
new file mode 100644
index 0000000..f492c8a
Binary files /dev/null and b/src-tauri/icons/Square284x284Logo.png differ
diff --git a/src-tauri/icons/Square30x30Logo.png b/src-tauri/icons/Square30x30Logo.png
new file mode 100644
index 0000000..189416d
Binary files /dev/null and b/src-tauri/icons/Square30x30Logo.png differ
diff --git a/src-tauri/icons/Square310x310Logo.png b/src-tauri/icons/Square310x310Logo.png
new file mode 100644
index 0000000..4c9b0d5
Binary files /dev/null and b/src-tauri/icons/Square310x310Logo.png differ
diff --git a/src-tauri/icons/Square44x44Logo.png b/src-tauri/icons/Square44x44Logo.png
new file mode 100644
index 0000000..f63658c
Binary files /dev/null and b/src-tauri/icons/Square44x44Logo.png differ
diff --git a/src-tauri/icons/Square71x71Logo.png b/src-tauri/icons/Square71x71Logo.png
new file mode 100644
index 0000000..0004a7c
Binary files /dev/null and b/src-tauri/icons/Square71x71Logo.png differ
diff --git a/src-tauri/icons/Square89x89Logo.png b/src-tauri/icons/Square89x89Logo.png
new file mode 100644
index 0000000..de2ab78
Binary files /dev/null and b/src-tauri/icons/Square89x89Logo.png differ
diff --git a/src-tauri/icons/StoreLogo.png b/src-tauri/icons/StoreLogo.png
new file mode 100644
index 0000000..7c78780
Binary files /dev/null and b/src-tauri/icons/StoreLogo.png differ
diff --git a/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml b/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 0000000..2ffbf24
--- /dev/null
+++ b/src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 0000000..dc533c4
Binary files /dev/null and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher.png differ
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..16c96f2
Binary files /dev/null and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 0000000..35affff
Binary files /dev/null and b/src-tauri/icons/android/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 0000000..567f827
Binary files /dev/null and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher.png differ
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..0ed8ef1
Binary files /dev/null and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3253735
Binary files /dev/null and b/src-tauri/icons/android/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 0000000..d06b0e6
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher.png differ
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..6c38ac0
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..3c0ecf5
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 0000000..3204569
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..3e33753
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..af2d919
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 0000000..82d6f27
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..f471971
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 0000000..f34e961
Binary files /dev/null and b/src-tauri/icons/android/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/src-tauri/icons/android/values/ic_launcher_background.xml b/src-tauri/icons/android/values/ic_launcher_background.xml
new file mode 100644
index 0000000..16cdd5a
--- /dev/null
+++ b/src-tauri/icons/android/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+
+
+ #FFFFFF
+
\ No newline at end of file
diff --git a/src-tauri/icons/icon.icns b/src-tauri/icons/icon.icns
new file mode 100644
index 0000000..2c3ebf7
Binary files /dev/null and b/src-tauri/icons/icon.icns differ
diff --git a/src-tauri/icons/icon.ico b/src-tauri/icons/icon.ico
index c93ba76..514c05c 100644
Binary files a/src-tauri/icons/icon.ico and b/src-tauri/icons/icon.ico differ
diff --git a/src-tauri/icons/icon.png b/src-tauri/icons/icon.png
new file mode 100644
index 0000000..12cbddc
Binary files /dev/null and b/src-tauri/icons/icon.png differ
diff --git a/src-tauri/icons/ios/AppIcon-20x20@1x.png b/src-tauri/icons/ios/AppIcon-20x20@1x.png
new file mode 100644
index 0000000..5b505a9
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-20x20@1x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x-1.png b/src-tauri/icons/ios/AppIcon-20x20@2x-1.png
new file mode 100644
index 0000000..20e54ce
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-20x20@2x-1.png differ
diff --git a/src-tauri/icons/ios/AppIcon-20x20@2x.png b/src-tauri/icons/ios/AppIcon-20x20@2x.png
new file mode 100644
index 0000000..20e54ce
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-20x20@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-20x20@3x.png b/src-tauri/icons/ios/AppIcon-20x20@3x.png
new file mode 100644
index 0000000..81e363e
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-20x20@3x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-29x29@1x.png b/src-tauri/icons/ios/AppIcon-29x29@1x.png
new file mode 100644
index 0000000..db452e4
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-29x29@1x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x-1.png b/src-tauri/icons/ios/AppIcon-29x29@2x-1.png
new file mode 100644
index 0000000..cadec14
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-29x29@2x-1.png differ
diff --git a/src-tauri/icons/ios/AppIcon-29x29@2x.png b/src-tauri/icons/ios/AppIcon-29x29@2x.png
new file mode 100644
index 0000000..cadec14
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-29x29@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-29x29@3x.png b/src-tauri/icons/ios/AppIcon-29x29@3x.png
new file mode 100644
index 0000000..4faaf7a
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-29x29@3x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-40x40@1x.png b/src-tauri/icons/ios/AppIcon-40x40@1x.png
new file mode 100644
index 0000000..20e54ce
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-40x40@1x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x-1.png b/src-tauri/icons/ios/AppIcon-40x40@2x-1.png
new file mode 100644
index 0000000..1bf28ab
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-40x40@2x-1.png differ
diff --git a/src-tauri/icons/ios/AppIcon-40x40@2x.png b/src-tauri/icons/ios/AppIcon-40x40@2x.png
new file mode 100644
index 0000000..1bf28ab
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-40x40@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-40x40@3x.png b/src-tauri/icons/ios/AppIcon-40x40@3x.png
new file mode 100644
index 0000000..a7b37d0
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-40x40@3x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-512@2x.png b/src-tauri/icons/ios/AppIcon-512@2x.png
new file mode 100644
index 0000000..3ece7b0
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-512@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-60x60@2x.png b/src-tauri/icons/ios/AppIcon-60x60@2x.png
new file mode 100644
index 0000000..a7b37d0
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-60x60@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-60x60@3x.png b/src-tauri/icons/ios/AppIcon-60x60@3x.png
new file mode 100644
index 0000000..7f99052
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-60x60@3x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-76x76@1x.png b/src-tauri/icons/ios/AppIcon-76x76@1x.png
new file mode 100644
index 0000000..3a8edda
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-76x76@1x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-76x76@2x.png b/src-tauri/icons/ios/AppIcon-76x76@2x.png
new file mode 100644
index 0000000..416d244
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-76x76@2x.png differ
diff --git a/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png b/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png
new file mode 100644
index 0000000..45b7a22
Binary files /dev/null and b/src-tauri/icons/ios/AppIcon-83.5x83.5@2x.png differ
diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs
index add857d..d1229f0 100644
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -1,5 +1,6 @@
// 小银 Markdown —— Tauri 2 后端
-#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+// 只在 Windows 上隐藏控制台窗口(macOS/Linux 没有这个概念)
+#![cfg_attr(all(not(debug_assertions), target_os = "windows"), windows_subsystem = "windows")]
use serde::Serialize;
use std::fs;
@@ -254,9 +255,10 @@ fn read_dir(path: String) -> DirResult {
/* ---------------- 剪贴板 ---------------- */
+/// Windows:把「文件本身」放进剪贴板(CF_HDROP),能直接粘到资源管理器 / 微信
+#[cfg(windows)]
#[tauri::command]
fn copy_file_to_clipboard(path: String) -> Result<(), String> {
- // 手写 CF_HDROP:DROPFILES 头 + 双 \0 结尾的 UTF-16 路径列表
use windows_sys::Win32::System::DataExchange::{CloseClipboard, EmptyClipboard, OpenClipboard, SetClipboardData};
use windows_sys::Win32::System::Memory::{GlobalAlloc, GlobalLock, GlobalUnlock, GMEM_MOVEABLE, GMEM_ZEROINIT};
use windows_sys::Win32::UI::Shell::DROPFILES;
@@ -273,10 +275,10 @@ fn copy_file_to_clipboard(path: String) -> Result<(), String> {
}
let mut wide: Vec
= path.encode_utf16().collect();
- wide.push(0); // 路径自身的 \0 终止符
+ wide.push(0);
let header_size = std::mem::size_of::();
- let list_bytes = (wide.len() + 1) * 2; // +1 是列表级双 \0 结束符
+ let list_bytes = (wide.len() + 1) * 2;
let total = header_size + list_bytes;
let h = GlobalAlloc(GMEM_MOVEABLE | GMEM_ZEROINIT, total);
@@ -291,7 +293,7 @@ fn copy_file_to_clipboard(path: String) -> Result<(), String> {
}
let df = locked as *mut DROPFILES;
(*df).pFiles = header_size as u32;
- (*df).fWide = 1; // UTF-16
+ (*df).fWide = 1;
let dst = (locked as *mut u8).add(header_size);
std::ptr::copy_nonoverlapping(wide.as_ptr() as *const u8, dst, wide.len() * 2);
GlobalUnlock(h);
@@ -305,18 +307,42 @@ fn copy_file_to_clipboard(path: String) -> Result<(), String> {
Ok(())
}
+/// macOS / Linux:剪贴板没有跨平台的「文件」格式(要写 GTK/X11 私有 target),
+/// 退化成把路径当文本复制 —— 粘到终端、编辑器、下载框里都还能用。
+#[cfg(not(windows))]
+#[tauri::command]
+fn copy_file_to_clipboard(path: String) -> Result<(), String> {
+ write_clipboard_text(path)
+}
+
+#[cfg(windows)]
#[tauri::command]
fn read_clipboard_text() -> String {
use clipboard_win::formats;
- use clipboard_win::get_clipboard;
- get_clipboard(formats::Unicode).unwrap_or_default()
+ clipboard_win::get_clipboard(formats::Unicode).unwrap_or_default()
}
+#[cfg(not(windows))]
+#[tauri::command]
+fn read_clipboard_text() -> String {
+ arboard::Clipboard::new()
+ .and_then(|mut c| c.get_text())
+ .unwrap_or_default()
+}
+
+#[cfg(windows)]
#[tauri::command]
fn write_clipboard_text(text: String) -> Result<(), String> {
use clipboard_win::formats;
- use clipboard_win::set_clipboard;
- set_clipboard(formats::Unicode, text).map_err(|e| e.to_string())
+ clipboard_win::set_clipboard(formats::Unicode, text).map_err(|e| e.to_string())
+}
+
+#[cfg(not(windows))]
+#[tauri::command]
+fn write_clipboard_text(text: String) -> Result<(), String> {
+ arboard::Clipboard::new()
+ .and_then(|mut c| c.set_text(text))
+ .map_err(|e| e.to_string())
}
/* ---------------- 系统 ---------------- */
@@ -324,18 +350,57 @@ fn write_clipboard_text(text: String) -> Result<(), String> {
#[tauri::command]
fn reveal_in_explorer(path: String) -> Result<(), String> {
let p = PathBuf::from(&path);
- if p.is_file() {
- std::process::Command::new("explorer")
- .arg(format!("/select,{}", p.to_string_lossy()))
+
+ // Windows:资源管理器并选中该文件
+ #[cfg(windows)]
+ {
+ if p.is_file() {
+ std::process::Command::new("explorer")
+ .arg(format!("/select,{}", p.to_string_lossy()))
+ .spawn()
+ .map_err(|e| e.to_string())?;
+ } else {
+ std::process::Command::new("explorer")
+ .arg(&p)
+ .spawn()
+ .map_err(|e| e.to_string())?;
+ }
+ return Ok(());
+ }
+
+ // macOS:Finder 里选中(open -R)
+ #[cfg(target_os = "macos")]
+ {
+ let _ = &p;
+ if p.is_file() {
+ std::process::Command::new("open")
+ .arg("-R")
+ .arg(&p)
+ .spawn()
+ .map_err(|e| e.to_string())?;
+ } else {
+ std::process::Command::new("open")
+ .arg(&p)
+ .spawn()
+ .map_err(|e| e.to_string())?;
+ }
+ return Ok(());
+ }
+
+ // Linux:没有统一的「选中」接口,打开所在目录
+ #[cfg(all(unix, not(target_os = "macos")))]
+ {
+ let dir = if p.is_dir() {
+ p.clone()
+ } else {
+ p.parent().map(|x| x.to_path_buf()).unwrap_or(p.clone())
+ };
+ std::process::Command::new("xdg-open")
+ .arg(&dir)
.spawn()
.map_err(|e| e.to_string())?;
- } else {
- std::process::Command::new("explorer")
- .arg(&p)
- .spawn()
- .map_err(|e| e.to_string())?;
+ return Ok(());
}
- Ok(())
}
#[tauri::command]
@@ -343,11 +408,31 @@ fn open_external(url: String) -> Result<(), String> {
if !url.starts_with("http://") && !url.starts_with("https://") {
return Err("仅允许打开 http/https 链接".into());
}
- std::process::Command::new("explorer")
- .arg(&url)
- .spawn()
- .map_err(|e| e.to_string())?;
- Ok(())
+
+ #[cfg(windows)]
+ {
+ std::process::Command::new("explorer")
+ .arg(&url)
+ .spawn()
+ .map_err(|e| e.to_string())?;
+ return Ok(());
+ }
+ #[cfg(target_os = "macos")]
+ {
+ std::process::Command::new("open")
+ .arg(&url)
+ .spawn()
+ .map_err(|e| e.to_string())?;
+ return Ok(());
+ }
+ #[cfg(all(unix, not(target_os = "macos")))]
+ {
+ std::process::Command::new("xdg-open")
+ .arg(&url)
+ .spawn()
+ .map_err(|e| e.to_string())?;
+ return Ok(());
+ }
}
#[tauri::command]
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 631d1f1..76fd0ee 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -25,10 +25,12 @@
},
"bundle": {
"active": true,
- "targets": [
- "nsis"
- ],
+ "targets": "all",
"icon": [
+ "icons/32x32.png",
+ "icons/128x128.png",
+ "icons/128x128@2x.png",
+ "icons/icon.icns",
"icons/icon.ico"
],
"fileAssociations": [
@@ -68,7 +70,21 @@
"installerHooks": "installer-hooks.nsh"
}
},
- "createUpdaterArtifacts": true
+ "createUpdaterArtifacts": true,
+ "linux": {
+ "deb": {
+ "depends": [
+ "libwebkit2gtk-4.1-0",
+ "libgtk-3-0"
+ ]
+ },
+ "appimage": {
+ "bundleMediaFramework": false
+ }
+ },
+ "macOS": {
+ "minimumSystemVersion": "10.15"
+ }
},
"plugins": {
"updater": {
diff --git a/tools/release/publish.py b/tools/release/publish.py
index 3bcb068..265f020 100644
--- a/tools/release/publish.py
+++ b/tools/release/publish.py
@@ -1,36 +1,39 @@
#!/usr/bin/env python3
-"""把小银 Markdown 的构建产物发布到官网,并生成升级清单。
+"""把三端构建产物发布到官网,并生成/合并升级清单。
用法:
- python3 tools/release/publish.py --notes "更新说明……" # 用当前 tauri.conf.json 的版本
- python3 tools/release/publish.py --notes "……" --dry-run
+ python3 tools/release/publish.py --notes-file notes.txt # 自动扫描全部产物
+ python3 tools/release/publish.py --notes "一句话" --dry-run
-做的事:
- 1. 从 src-tauri/.../bundle/nsis/ 找安装包和 .sig 签名
- 2. 拷安装包到站点 download/(顺便拷一份免安装 exe)
- 3. 写 site/update/latest.json —— 客户端 updater 就拉这个
- 4. 打印最终 URL 与校验值
+自动识别(存在哪些就发哪些,都按平台归位):
+ Windows target/x86_64-pc-windows-gnu/release/bundle/nsis/*x64-setup.exe
+ Linux target/release/bundle/{appimage/*.AppImage, deb/*.deb}
+ macOS target//release/bundle/{macos/*.app.tar.gz, dmg/*.dmg}
-客户端地址:https://md.wangjinding.com/update/latest.json
+升级清单是**合并**的:只更新这次扫到的平台,其它平台的条目原样保留
+(这样在 Windows 上发版不会把 macOS 的那条冲掉)。
+
+客户端拉取:https://md.wangjinding.com/update/latest.json
"""
from __future__ import annotations
import argparse
import hashlib
import json
+import platform as _py_platform
+import re
import shutil
-import subprocess
import sys
from datetime import datetime, timezone
from pathlib import Path
ROOT = Path(__file__).resolve().parents[2]
-TARGET = ROOT / "src-tauri" / "target" / "x86_64-pc-windows-gnu" / "release"
-NSIS_DIR = TARGET / "bundle" / "nsis"
SITE = ROOT / "site"
-SITE_DOWNLOAD = Path("/opt/1panel/www/sites/md.wangjinding.com/index/download")
-SITE_UPDATE = Path("/opt/1panel/www/sites/md.wangjinding.com/index/update")
+SITE_ROOT = Path("/opt/1panel/www/sites/md.wangjinding.com/index")
+SITE_DOWNLOAD = SITE_ROOT / "download"
+SITE_UPDATE = SITE_ROOT / "update"
BASE_URL = "https://md.wangjinding.com"
+TARGETS = ROOT / "src-tauri" / "target"
def conf_version() -> str:
@@ -46,104 +49,148 @@ def sha256(path: Path) -> str:
return h.hexdigest()
+def find_one(patterns: list[str]) -> Path | None:
+ for pat in patterns:
+ hits = sorted(TARGETS.glob(pat), key=lambda p: p.stat().st_mtime, reverse=True)
+ if hits:
+ return hits[0]
+ return None
+
+
+def collect():
+ """返回 [{platform, artifact, sig, dl_name}],只包含本机实际构建出来的。"""
+ found = []
+
+ # ── Windows ──
+ exe = find_one([
+ "x86_64-pc-windows-gnu/release/bundle/nsis/*_x64-setup.exe",
+ "release/bundle/nsis/*_x64-setup.exe",
+ ])
+ if exe:
+ found.append({"platform": "windows-x86_64", "artifact": exe, "sig": Path(str(exe) + ".sig"), "ext": ".exe"})
+
+ # ── Linux(updater 只认 AppImage,deb 额外给人手装)──
+ appimg = find_one(["release/bundle/appimage/*.AppImage", "*/release/bundle/appimage/*.AppImage"])
+ if appimg:
+ found.append({"platform": "linux-x86_64", "artifact": appimg, "sig": Path(str(appimg) + ".sig"), "ext": ".AppImage"})
+ deb = find_one(["release/bundle/deb/*.deb", "*/release/bundle/deb/*.deb"])
+ if deb:
+ found.append({"platform": "linux-deb", "artifact": deb, "sig": None, "ext": ".deb"})
+
+ # ── macOS(Intel / Apple Silicon 各一份)──
+ for triple, key in (("aarch64-apple-darwin", "darwin-aarch64"), ("x86_64-apple-darwin", "darwin-x86_64")):
+ tar = find_one([f"{triple}/release/bundle/macos/*.app.tar.gz",
+ f"*/{triple}/release/bundle/macos/*.app.tar.gz"])
+ if tar:
+ found.append({"platform": key, "artifact": tar, "sig": Path(str(tar) + ".sig"), "ext": ".app.tar.gz"})
+ dmg = find_one([f"{triple}/release/bundle/dmg/*.dmg", f"*/{triple}/release/bundle/dmg/*.dmg"])
+ if dmg:
+ arch = "aarch64" if "aarch64" in triple else "x64"
+ found.append({"platform": f"{key}-dmg", "artifact": dmg, "sig": None, "ext": f"_{arch}.dmg"})
+
+ return found
+
+
def main() -> int:
ap = argparse.ArgumentParser()
- ap.add_argument("--notes", default="", help="更新说明(会显示在客户的升级弹窗里)")
- ap.add_argument("--notes-file", default="", help="从文件读更新说明,多行编号时用,避免命令行转义")
+ ap.add_argument("--notes", default="")
+ ap.add_argument("--notes-file", default="")
ap.add_argument("--dry-run", action="store_true")
args = ap.parse_args()
if args.notes_file:
args.notes = Path(args.notes_file).read_text(encoding="utf-8").strip()
version = conf_version()
- setup = NSIS_DIR / f"XiaoyinMarkdown_{version}_x64-setup.exe"
- sig_file = Path(str(setup) + ".sig")
-
- if not setup.exists():
- print(f"❌ 找不到安装包:{setup}", file=sys.stderr)
- return 1
- if not sig_file.exists():
- print(f"❌ 找不到签名:{sig_file}\n 构建时是否漏了 TAURI_SIGNING_PRIVATE_KEY?", file=sys.stderr)
+ items = collect()
+ if not items:
+ print("❌ 没找到任何构建产物(先跑 `npx tauri build`)", file=sys.stderr)
return 1
- signature = sig_file.read_text(encoding="utf-8").strip()
- size = setup.stat().st_size
- digest = sha256(setup)
- # 下载文件名带版本号:xymd_2.6.2.exe(浏览器另存就是这个名)
- dl_name = f"xymd_{version}.exe"
- url = f"{BASE_URL}/download/{dl_name}"
+ # 现有清单(合并用)
+ manifest_path = SITE_UPDATE / "latest.json"
+ manifest = {"version": version, "notes": args.notes or f"小银 Markdown v{version}",
+ "pub_date": datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"),
+ "platforms": {}}
+ if manifest_path.exists():
+ try:
+ old = json.loads(manifest_path.read_text(encoding="utf-8"))
+ manifest["platforms"] = old.get("platforms", {})
+ except Exception:
+ pass
- manifest = {
- "version": version,
- "notes": args.notes or f"小银 Markdown v{version}",
- "pub_date": datetime.now(timezone.utc).strftime("%Y-%m-%dT%H:%M:%SZ"),
- "platforms": {
- "windows-x86_64": {
- "signature": signature,
+ print(f" 版本: {version}\n")
+ for it in items:
+ art: Path = it["artifact"]
+ size = art.stat().st_size
+ digest = sha256(art)
+
+ # 落地文件名:xymd_<版本>[_arch].
+ if it["platform"] == "windows-x86_64":
+ dl = f"xymd_{version}{it['ext']}"
+ elif it["platform"] == "linux-x86_64":
+ dl = f"xymd_{version}_amd64{it['ext']}"
+ elif it["platform"] == "linux-deb":
+ dl = f"xymd_{version}_amd64{it['ext']}"
+ else:
+ dl = f"xymd_{version}{it['ext']}"
+
+ url = f"{BASE_URL}/download/{dl}"
+ has_updater = it["sig"] is not None and it["sig"].exists()
+
+ if has_updater:
+ entry = {
+ "signature": it["sig"].read_text(encoding="utf-8").strip(),
"url": url,
"size": size,
"sha256": digest,
}
- },
- }
+ key = it["platform"]
+ manifest["platforms"][key] = entry
+ print(f" ✔ {key:18} {art.name} {size/1048576:.2f} MB → /download/{dl}")
+ else:
+ print(f" · {it['platform']:18} {art.name} {size/1048576:.2f} MB → /download/{dl}(不上升级清单)")
- print(f" 版本 : {version}")
- print(f" 安装包 : {setup.name} {size/1048576:.2f} MB")
- print(f" sha256 : {digest[:32]}…")
- print(f" 签名 : {signature[:40]}…")
- print(f" 下载地址 : {url}")
+ if not args.dry_run:
+ SITE_DOWNLOAD.mkdir(parents=True, exist_ok=True)
+ shutil.copy2(art, SITE_DOWNLOAD / dl)
+ (SITE_DOWNLOAD / dl).chmod(0o644)
if args.dry_run:
- print(" [dry-run] 不写入任何文件")
+ print("\n [dry-run] 不写入任何文件")
return 0
- SITE_UPDATE.mkdir(parents=True, exist_ok=True)
- SITE_DOWNLOAD.mkdir(parents=True, exist_ok=True)
-
- # ① 安装包(客户下载 + updater 拉取的是同一个)
- shutil.copy2(setup, SITE_DOWNLOAD / setup.name)
- (SITE_DOWNLOAD / setup.name).chmod(0o644)
-
- # ② 免安装版
- portable = TARGET / "xiaoyin-markdown.exe"
- if portable.exists():
- shutil.copy2(portable, SITE_DOWNLOAD / "XiaoyinMarkdown-portable.exe")
- (SITE_DOWNLOAD / "XiaoyinMarkdown-portable.exe").chmod(0o644)
-
- # ③ 升级清单(站点 + 仓库各存一份,方便回滚)
+ # 写清单:站点 + 仓库各一份
body = json.dumps(manifest, ensure_ascii=False, indent=2) + "\n"
+ SITE_UPDATE.mkdir(parents=True, exist_ok=True)
(SITE_UPDATE / "latest.json").write_text(body, encoding="utf-8")
(SITE / "update").mkdir(parents=True, exist_ok=True)
(SITE / "update" / "latest.json").write_text(body, encoding="utf-8")
- # ④ 带版本号的文件名(浏览器另存为 xymd_<版本>.exe)
- for name, real in ((dl_name, setup.name), (f"xymd_{version}_portable.exe", "XiaoyinMarkdown-portable.exe")):
- link = SITE_DOWNLOAD / name
- if link.is_symlink() or link.exists():
- link.unlink()
- if (SITE_DOWNLOAD / real).exists():
- link.symlink_to(real)
+ # 稳定别名(官网页 JS 会按版本改名,这些是 JS 被禁时的兜底)
+ alias_src = None
+ for it in items:
+ if it["platform"] == "windows-x86_64":
+ alias_src = f"xymd_{version}.exe"
+ if alias_src and (SITE_DOWNLOAD / alias_src).exists():
+ for alias in ("latest-setup.exe",):
+ link = SITE_DOWNLOAD / alias
+ if link.is_symlink() or link.exists():
+ link.unlink()
+ link.symlink_to(alias_src)
- # ⑤ 稳定别名:官网页固定链到 latest-setup.exe,发版不用改 HTML
- for alias, real in (("latest-setup.exe", setup.name), ("latest-portable.exe", "XiaoyinMarkdown-portable.exe")):
- link = SITE_DOWNLOAD / alias
- if link.is_symlink() or link.exists():
- link.unlink()
- link.symlink_to(real)
-
- # ⑤ 官网静态兜底版本号也一起改(正常浏览器会被 latest.json 覆盖,这是给无 JS 情况的)
- import re as _re
+ # 官网静态兜底版本号
idx = SITE / "index.html"
if idx.exists():
html = idx.read_text(encoding="utf-8")
- html2 = _re.sub(r"(data-ver>)\d+\.\d+\.\d+", lambda m: m.group(1) + version, html)
+ html2 = re.sub(r"(data-ver>)\d+\.\d+\.\d+", lambda m: m.group(1) + version, html)
if html2 != html:
idx.write_text(html2, encoding="utf-8")
+ if SITE_ROOT.exists():
+ shutil.copy2(idx, SITE_ROOT / "index.html")
- print(f"\n ✅ 已发布:{BASE_URL}/update/latest.json")
- print(f" ✅ 稳定别名:{BASE_URL}/download/latest-setup.exe")
- print(f" ✅ 版本文件名:{url}")
- print(f" ✅ 安装包:{url}")
+ print(f"\n ✅ 清单已更新:{BASE_URL}/update/latest.json({len(manifest['platforms'])} 个平台)")
+ for k in manifest["platforms"]:
+ print(f" · {k}")
return 0