Skip to content

armgit / peach

Public Imported from GitHub
0

Peach: Local-first video metadata scraper and media manager.

fix(release): Sparkle 更新源上传后绕过公开缓存核对

longmeidaobe23bcb7a225
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 456f25e06..d80e057d0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -483,7 +483,8 @@ jobs:
feed="$folder/macos-$arch.xml"
mkdir -p "$folder"
gh release download "$GITHUB_REF_NAME" --pattern "Peach-$version-macos-$arch.dmg" --dir "$folder"
- status="$(curl -sS -o "$feed" -w '%{http_code}' "$PEACH_R2_PUBLIC_BASE/sparkle/macos-$arch.xml")"
+ # 带上本次运行号绕过公开入口的缓存:取到最新一份,首发时的 404 也不会缓存在裸地址上。
+ status="$(curl -sS -o "$feed" -w '%{http_code}' "$PEACH_R2_PUBLIC_BASE/sparkle/macos-$arch.xml?run=$GITHUB_RUN_ID-$GITHUB_RUN_ATTEMPT")"
case "$status" in
200) ;;
404) rm -f "$feed" ;;
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b0d472de..b72c34964 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@ Removed / Fixed / Security。
### 修复
- **界面**:后台任务成批写账本之后第一次打开页面不再那么慢:统计页、作品列表、艺人与标签索引重算时不再把所有文件名重新解析一遍,JAV 新作不再对同一批演员和厂牌反复查库;搜索推荐几分钟内复用同一池,不再每开一页都在服务端现凑。
+- **更新**:macOS 独立包的应用内更新能收到新版本了。0.54.0、0.55.0 发布时更新源没有完整发出去,装了这两版的 Mac 在应用里可能看不到新版;0.55.1 发布后检查更新就会提示,也可以照旧下载 DMG 升级。
## [0.55.0] - 2026-11-05
diff --git a/scripts/sparkle_appcast.py b/scripts/sparkle_appcast.py
index 988419875..382d1d27c 100644
--- a/scripts/sparkle_appcast.py
+++ b/scripts/sparkle_appcast.py
@@ -98,7 +98,8 @@ def publish(feeds: list[Path]) -> list[dict]:
"--header-upload", "Cache-Control: public, max-age=60"], env=environment, check=True)
item = {"name": feed.name, "size": feed.stat().st_size,
"sha256": hashlib.sha256(feed.read_bytes()).hexdigest()}
- verify_download(f"{base}/sparkle/{feed.name}", item)
+ # 公开入口缓存一分钟,裸地址可能还是上传前的旧文件或 404:带上本次摘要,取回刚写进 R2 的那份。
+ verify_download(f"{base}/sparkle/{feed.name}?sha256={item['sha256']}", item)
published.append(item)
return published
diff --git a/tests/test_macos_standalone.py b/tests/test_macos_standalone.py
index af9124e37..ba12d300b 100644
--- a/tests/test_macos_standalone.py
+++ b/tests/test_macos_standalone.py
@@ -454,6 +454,23 @@ class SparkleUpdateTests(TestCase):
with self.assertRaisesRegex(ValueError, "大小"):
tool.verify(feed, version="0.53.0", dmg=dmg, url_prefix="https://example.test/v0.53.0/", head=50)
+ def test_publish_checks_the_uploaded_feed_past_the_public_cache(self):
+ """公开入口缓存一分钟:核对要取回刚上传的那份,不能读到裸地址上缓存的旧文件或首发前的 404。"""
+ tool = load_script("sparkle_appcast")
+ feeds = []
+ for arch in ("arm64", "x86_64"):
+ feed = self.root / f"macos-{arch}.xml"
+ feed.write_text(f"<rss>{arch}</rss>", encoding="utf-8")
+ feeds.append(feed)
+ release_r2 = SimpleNamespace(verify_download=mock.Mock(), rclone_environment=lambda: {
+ "PEACH_RCLONE": "rclone", "PEACH_R2_BUCKET": "bucket", "PEACH_R2_PUBLIC_BASE": "https://downloads.example.test/"})
+ with mock.patch.dict(sys.modules, {"release_r2": release_r2}), mock.patch.object(tool.subprocess, "run"):
+ published = tool.publish(feeds)
+ self.assertEqual([item["name"] for item in published], ["macos-arm64.xml", "macos-x86_64.xml"])
+ urls = [call.args[0] for call in release_r2.verify_download.call_args_list]
+ self.assertEqual(urls, [f"https://downloads.example.test/sparkle/{item['name']}?sha256={item['sha256']}"
+ for item in published])
+
@skipUnless(sys.platform == "darwin", "pyobjc 是 macOS 专属")
def test_delegate_declares_bool_returns_and_lets_sparkle_choose_when_nothing_blocks(self):
from peach import sparkle_update