Skip to content

CodexBar 是一个 macOS 菜单栏应用,用于查看本机 Codex 账号状态、额度、Token 用量、详细统计信息

feat: 支持不兼容更新的手动升级引导

Boba4f6708525ed
diff --git a/CodexBar/Resources/Assets.xcassets/GitHub.imageset/Contents.json b/CodexBar/Resources/Assets.xcassets/GitHub.imageset/Contents.json
new file mode 100644
index 0000000..7f4a798
--- /dev/null
+++ b/CodexBar/Resources/Assets.xcassets/GitHub.imageset/Contents.json
@@ -0,0 +1,26 @@
+{
+ "images": [
+ {
+ "filename": "GitHub Black.svg",
+ "idiom": "universal"
+ },
+ {
+ "appearances": [
+ {
+ "appearance": "luminosity",
+ "value": "dark"
+ }
+ ],
+ "filename": "GitHub White.svg",
+ "idiom": "universal"
+ }
+ ],
+ "info": {
+ "author": "xcode",
+ "version": 1
+ },
+ "properties": {
+ "preserves-vector-representation": true,
+ "template-rendering-intent": "original"
+ }
+}
diff --git a/CodexBar/Resources/Assets.xcassets/GitHub.imageset/GitHub Black.svg b/CodexBar/Resources/Assets.xcassets/GitHub.imageset/GitHub Black.svg
new file mode 100644
index 0000000..4eca062
--- /dev/null
+++ b/CodexBar/Resources/Assets.xcassets/GitHub.imageset/GitHub Black.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g fill="#181616"><path fill-rule="evenodd" clip-rule="evenodd" d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"/><path d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"/></g></svg>
\ No newline at end of file
diff --git a/CodexBar/Resources/Assets.xcassets/GitHub.imageset/GitHub White.svg b/CodexBar/Resources/Assets.xcassets/GitHub.imageset/GitHub White.svg
new file mode 100644
index 0000000..627e488
--- /dev/null
+++ b/CodexBar/Resources/Assets.xcassets/GitHub.imageset/GitHub White.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><g fill="#FFFFFF"><path fill-rule="evenodd" clip-rule="evenodd" d="M64 5.103c-33.347 0-60.388 27.035-60.388 60.388 0 26.682 17.303 49.317 41.297 57.303 3.017.56 4.125-1.31 4.125-2.905 0-1.44-.056-6.197-.082-11.243-16.8 3.653-20.345-7.125-20.345-7.125-2.747-6.98-6.705-8.836-6.705-8.836-5.48-3.748.413-3.67.413-3.67 6.063.425 9.257 6.223 9.257 6.223 5.386 9.23 14.127 6.562 17.573 5.02.542-3.903 2.107-6.568 3.834-8.076-13.413-1.525-27.514-6.704-27.514-29.843 0-6.593 2.36-11.98 6.223-16.21-.628-1.52-2.695-7.662.584-15.98 0 0 5.07-1.623 16.61 6.19C53.7 35 58.867 34.327 64 34.304c5.13.023 10.3.694 15.127 2.033 11.526-7.813 16.59-6.19 16.59-6.19 3.287 8.317 1.22 14.46.593 15.98 3.872 4.23 6.215 9.617 6.215 16.21 0 23.194-14.127 28.3-27.574 29.796 2.167 1.874 4.097 5.55 4.097 11.183 0 8.08-.07 14.583-.07 16.572 0 1.607 1.088 3.49 4.148 2.897 23.98-7.994 41.263-30.622 41.263-57.294C124.388 32.14 97.35 5.104 64 5.104z"/><path d="M26.484 91.806c-.133.3-.605.39-1.035.185-.44-.196-.685-.605-.543-.906.13-.31.603-.395 1.04-.188.44.197.69.61.537.91zm2.446 2.729c-.287.267-.85.143-1.232-.28-.396-.42-.47-.983-.177-1.254.298-.266.844-.14 1.24.28.394.426.472.984.17 1.255zM31.312 98.012c-.37.258-.976.017-1.35-.52-.37-.538-.37-1.183.01-1.44.373-.258.97-.025 1.35.507.368.545.368 1.19-.01 1.452zm3.261 3.361c-.33.365-1.036.267-1.552-.23-.527-.487-.674-1.18-.343-1.544.336-.366 1.045-.264 1.564.23.527.486.686 1.18.333 1.543zm4.5 1.951c-.147.473-.825.688-1.51.486-.683-.207-1.13-.76-.99-1.238.14-.477.823-.7 1.512-.485.683.206 1.13.756.988 1.237zm4.943.361c.017.498-.563.91-1.28.92-.723.017-1.308-.387-1.315-.877 0-.503.568-.91 1.29-.924.717-.013 1.306.387 1.306.88zm4.598-.782c.086.485-.413.984-1.126 1.117-.7.13-1.35-.172-1.44-.653-.086-.498.422-.997 1.122-1.126.714-.123 1.354.17 1.444.663zm0 0"/></g></svg>
\ No newline at end of file
diff --git a/CodexBar/Resources/Localizable.xcstrings b/CodexBar/Resources/Localizable.xcstrings
index 5c7a114..524f8e2 100644
--- a/CodexBar/Resources/Localizable.xcstrings
+++ b/CodexBar/Resources/Localizable.xcstrings
@@ -5009,6 +5009,22 @@
}
}
},
+ "settings.about.release-notes" : {
+ "localizations" : {
+ "en" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "CodexBar Release Notes"
+ }
+ },
+ "zh-Hans" : {
+ "stringUnit" : {
+ "state" : "translated",
+ "value" : "CodexBar 更新日志"
+ }
+ }
+ }
+ },
"settings.about.version" : {
"localizations" : {
"en" : {
diff --git a/CodexBar/Views/Settings/AppSettingsView.swift b/CodexBar/Views/Settings/AppSettingsView.swift
index 0236fec..8b0c527 100644
--- a/CodexBar/Views/Settings/AppSettingsView.swift
+++ b/CodexBar/Views/Settings/AppSettingsView.swift
@@ -182,6 +182,7 @@ private extension AppSettingsView {
static let sectionSpacing: CGFloat = 18
static let rowSpacing: CGFloat = 14
static let panelPadding: CGFloat = 12
+ static let githubIconSize: CGFloat = 16
static let surfaceCornerRadius: CGFloat = 16
static let panelCornerRadius: CGFloat = 10
static let tabBarWidth = windowWidth - padding * 2
@@ -205,6 +206,12 @@ private extension AppSettingsView {
static let statusAnimation = Animation.codexStatus
}
+ static let releaseNotesURL: URL = {
+ var components = URLComponents(string: "https://codexbar.zabrian.app/notes")!
+ components.fragment = Bundle.main.shortVersionString
+ return components.url!
+ }()
+
static let githubProjectURL = URL(string: "https://github.com/bob-zebedy/CodexBar")!
// MARK: - 分页骨架
@@ -321,6 +328,8 @@ private extension AppSettingsView {
LiquidGlassDivider()
versionRow
LiquidGlassDivider()
+ releaseNotesRow
+ LiquidGlassDivider()
githubProjectRow
}
.padding(Metrics.panelPadding)
@@ -954,14 +963,25 @@ private extension AppSettingsView {
)
}
+ var releaseNotesRow: some View {
+ externalLinkRow(title: "settings.about.release-notes", icon: Image(systemName: "text.document"), destination: Self.releaseNotesURL)
+ }
+
var githubProjectRow: some View {
- externalLinkRow(title: "settings.about.github-project", icon: "globe", destination: Self.githubProjectURL)
+ externalLinkRow(
+ title: "settings.about.github-project",
+ icon: Image("GitHub")
+ .resizable()
+ .scaledToFit()
+ .frame(width: Metrics.githubIconSize, height: Metrics.githubIconSize),
+ destination: Self.githubProjectURL
+ )
}
- func externalLinkRow(title: LocalizedStringKey, icon: String, destination: URL) -> some View {
+ func externalLinkRow(title: LocalizedStringKey, icon: some View, destination: URL) -> some View {
Link(destination: destination) {
HStack(spacing: SettingsRowMetrics.spacing) {
- Image(systemName: icon)
+ icon
.frame(width: SettingsRowMetrics.iconWidth)
.foregroundStyle(.tint)
diff --git a/Config/Version.xcconfig b/Config/Version.xcconfig
index 48d44d6..9ce87af 100644
--- a/Config/Version.xcconfig
+++ b/Config/Version.xcconfig
@@ -1,2 +1,2 @@
MARKETING_VERSION = 5.0.0
-CURRENT_PROJECT_VERSION = 113
+CURRENT_PROJECT_VERSION = 200
diff --git a/Scripts/appcast.sh b/Scripts/appcast.sh
index dd12b41..3cd24c7 100755
--- a/Scripts/appcast.sh
+++ b/Scripts/appcast.sh
@@ -1,6 +1,10 @@
#!/usr/bin/env bash
set -euo pipefail
+# 已安装版本的构建号低于此值时, 需要手动升级
+# 发布不兼容更新时设为该版本的首个构建号, 后续兼容更新保持不变
+readonly MINIMUM_COMPATIBLE_BUILD=200
+
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
PROJECT_DIR="$(cd "${SCRIPT_DIR}/.." && pwd)"
BUILD_DIR="${BUILD_DIR:-${PROJECT_DIR}/Build}"
@@ -31,6 +35,7 @@ Environment:
Defaults to https://codexbar.zabrian.app/download.
RELEASE_NOTES_BASE_URL Base URL for release notes. The version is appended
as a fragment anchor (BASE#X.Y.Z).
+ Used for both release notes and the browser upgrade link.
Defaults to https://codexbar.zabrian.app/notes.
INCLUDE_RELEASE_NOTES Set to 0 to omit sparkle:releaseNotesLink.
MINIMUM_SYSTEM_VERSION Defaults to 15.0.
@@ -155,6 +160,22 @@ if [[ -z "${SHORT_VERSION}" || -z "${BUILD_VERSION}" ]]; then
exit 1
fi
+if [[ ! "${BUILD_VERSION}" =~ ^[1-9][0-9]*$ || ! "${MINIMUM_COMPATIBLE_BUILD}" =~ ^[1-9][0-9]*$ ]]; then
+ echo "error: CURRENT_PROJECT_VERSION and MINIMUM_COMPATIBLE_BUILD must be positive integer build numbers" >&2
+ echo " configure MINIMUM_COMPATIBLE_BUILD in Scripts/appcast.sh" >&2
+ exit 1
+fi
+if ! perl -e 'exit($ARGV[0] > $ARGV[1] ? 1 : 0)' "${MINIMUM_COMPATIBLE_BUILD}" "${BUILD_VERSION}"; then
+ echo "error: MINIMUM_COMPATIBLE_BUILD must not exceed CURRENT_PROJECT_VERSION" >&2
+ exit 1
+fi
+
+RELEASE_NOTES_URL="${RELEASE_NOTES_BASE_URL%/}#${SHORT_VERSION}"
+if [[ ! "${RELEASE_NOTES_URL}" =~ ^https?://[^/?#[:space:]]+([/?#][^[:space:]]*)?$ ]]; then
+ echo "error: release notes URL must be an absolute HTTP or HTTPS URL without whitespace" >&2
+ exit 1
+fi
+
if [[ -z "${PRODUCT_NAME}" || "${PRODUCT_NAME}" == '$(TARGET_NAME)' ]]; then
PRODUCT_NAME="$(basename "${DMG_PATH}")"
PRODUCT_NAME="${PRODUCT_NAME%%-v*}"
@@ -211,11 +232,11 @@ TITLE="$(printf '%s %s' "${PRODUCT_NAME}" "${SHORT_VERSION}" | xml_escape)"
DOWNLOAD_URL_ESCAPED="$(printf '%s' "${DOWNLOAD_URL}" | xml_escape)"
ED_SIGNATURE_ESCAPED="$(printf '%s' "${ED_SIGNATURE}" | xml_escape)"
MIN_SYSTEM_ESCAPED="$(printf '%s' "${MINIMUM_SYSTEM_VERSION}" | xml_escape)"
+SHORT_VERSION_ESCAPED="$(printf '%s' "${SHORT_VERSION}" | xml_escape)"
+RELEASE_NOTES_URL_ESCAPED="$(printf '%s' "${RELEASE_NOTES_URL}" | xml_escape)"
RELEASE_NOTES_XML=""
if [[ "${INCLUDE_RELEASE_NOTES}" != "0" ]]; then
- RELEASE_NOTES_URL="${RELEASE_NOTES_BASE_URL%/}#${SHORT_VERSION}"
- RELEASE_NOTES_URL_ESCAPED="$(printf '%s' "${RELEASE_NOTES_URL}" | xml_escape)"
RELEASE_NOTES_XML="<sparkle:releaseNotesLink>${RELEASE_NOTES_URL_ESCAPED}</sparkle:releaseNotesLink>
"
fi
@@ -223,8 +244,10 @@ fi
APPCAST_ITEM=" <item>
<title>${TITLE}</title>
<sparkle:version>${BUILD_VERSION}</sparkle:version>
- <sparkle:shortVersionString>${SHORT_VERSION}</sparkle:shortVersionString>
+ <sparkle:shortVersionString>${SHORT_VERSION_ESCAPED}</sparkle:shortVersionString>
<sparkle:minimumSystemVersion>${MIN_SYSTEM_ESCAPED}</sparkle:minimumSystemVersion>
+ <sparkle:informationalUpdate><sparkle:belowVersion>${MINIMUM_COMPATIBLE_BUILD}</sparkle:belowVersion></sparkle:informationalUpdate>
+ <link>${RELEASE_NOTES_URL_ESCAPED}</link>
${RELEASE_NOTES_XML} <pubDate>${PUB_DATE}</pubDate>
<enclosure url=\"${DOWNLOAD_URL_ESCAPED}\" sparkle:edSignature=\"${ED_SIGNATURE_ESCAPED}\" length=\"${ARCHIVE_LENGTH}\" type=\"application/octet-stream\"/>
</item>"
@@ -251,11 +274,10 @@ APPCAST_ITEM="${APPCAST_ITEM}" APPCAST_VERSION="${BUILD_VERSION}" perl -0p -e '
die "Unexpected appcast item count: before=$before after=$after\n";
}
' "${APPCAST_PATH}" > "${APPCAST_TMP}"
-cat "${APPCAST_TMP}" > "${APPCAST_PATH}"
-
if command -v xmllint >/dev/null 2>&1; then
- xmllint --noout "${APPCAST_PATH}"
+ xmllint --noout "${APPCAST_TMP}"
fi
+cat "${APPCAST_TMP}" > "${APPCAST_PATH}"
echo "==> Added ${PRODUCT_NAME} ${SHORT_VERSION} (${BUILD_VERSION})"
echo " ${APPCAST_PATH}"