about: 区分 Squirrel(上游)更新 与 TriFecta 更新;Sparkle 更新源改为 TriFecta - #6
Closed
thesadbee wants to merge 5 commits into
Closed
about: 区分 Squirrel(上游)更新 与 TriFecta 更新;Sparkle 更新源改为 TriFecta#6thesadbee wants to merge 5 commits into
thesadbee wants to merge 5 commits into
Conversation
…quirrel overwrite)
…for migrating from other Rime IMEs
… place custom_phrase.txt + redeploy (fix invalid patch)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
摘要
修正「关于」页里更新检查的混乱:把上游 Squirrel(引擎)更新与 TriFecta(项目)更新两件事清晰分开。
背景/问题
设置面板「关于」页只有一个含糊的「检查更新」。实际存在两个不同的更新源:
rime.github.io/release/squirrel/appcast.xml(上游 Rime/Squirrel 仓库)。因此会弹出「鼠鬚管 1.1.2 可下载」——这是上游引擎版本,与 TriFecta 仓库无关(TriFecta 最新是 v1.1.1)。github.com/thesadbee/TriFecta/releases(TriFecta 仓库),但文案没写清楚。变更内容
仅修改设置面板「关于」页(
settings/Sources/TriFectaSettings/Pages/AboutPage.swift):当前 1.1.1 → 上游最新 x的前后版本号;附「打开上游 Releases」按钮(实时从api.github.com/repos/rime/squirrel/releases/latest取tag_name)。v1.1.1形式),实时从api.github.com/repos/thesadbee/TriFecta/releases/latest取最新 tag;显示当前 → 最新并在有新版本时提示「(有新版本)」;提供「检查 TriFecta 更新」按钮(点击重新拉取)。测试
bash settings/scripts/build-app.sh release编译通过(无新增 warning/error)。说明 / 建议(非本次改动)
主程序(Squirrel.app)的 Sparkle 更新源仍为
rime.github.io(上游),这意味着用户仍会收到「鼠鬚管上游 1.1.2」的自动更新提示。若 TriFecta 不希望用户被引导去装上游 Squirrel(可能覆盖本项目定制),建议后续把resources/Info.plist的SUFeedURL改为 TriFecta 自己的更新源或关闭自动检查。本 PR 先只做设置面板的展示区分。附:Sparkle 更新源改为 TriFecta(本次第 2 个提交)
问题:主程序(Squirrel.app)的 Sparkle 更新源原本是
rime.github.io(上游 Rime/Squirrel)。这会自动弹出「鼠鬚管 1.1.2 可下载」,且用户点「安装更新」可能用上游 Squirrel 覆盖掉 TriFecta 的定制。改动(
resources/Info.plist+ 新增appcast.xml):SUEnableAutomaticChecks→false:关闭 Sparkle 自动检查,不再自动弹上游更新提示(杜绝覆盖风险)。SUFeedURL→ TriFecta 自己的源:https://raw.githubusercontent.com/thesadbee/TriFecta/main/appcast.xml。appcast.xml:作为 TriFecta 更新源的占位/参考,指向 thesadbee/TriFecta 的 Release。说明:
sparkle:edSignature并把 appcast 放到公网位置(本次仅做指向 + 关闭自动检查,未搭签名流水线)。附:同步页新增「导入/导出个人配置」(本次第 3 个提交)
需求:用户从其它 Rime 系输入法(如薄荷输入法 oh-my-rime)迁移个人词库时,希望能导入/导出 Rime 个人词库配置格式。
改动(
settings/.../Pages/SyncPage.swift):*.custom.yaml、user.yaml、custom_phrase.txt、用户*.dict.yaml)打包成 zip,保存到用户指定路径。.zip:解压并入~/Library/Rime,随后自动重新部署。custom_phrase.txt:拷入~/Library/Rime/custom_phrase.txt,并自动为luna_pinyin_simp/luna_pinyin补上custom_phrase翻译器(table_translator@custom_phrase+user_dict: custom_phrase),使其直接生效。*.dict.yaml:拷入~/Library/Rime作为自定义词典。Deployer.reload)。说明:
userdb与具体 schema 强相关,跨输入法不可靠,故不纳入导出。