Navis
- 2.7
+ 2.7.1
Быстрый клиент · Naive · Hy2 · AWG · Xray
@@ -938,7 +950,18 @@
const updCheckBtn = $("updCheckBtn");
const updateBanner = $("updateBanner");
const updateBtn = $("updateBtn");
+ const skipUpdateBtn = $("skipUpdateBtn");
const verLabel = $("verLabel");
+ const SKIP_UPDATE_KEY = "navis.skipUpdateVersion";
+ function skippedVersion() {
+ try { return localStorage.getItem(SKIP_UPDATE_KEY) || ""; } catch (_) { return ""; }
+ }
+ function setSkippedVersion(v) {
+ try {
+ if (v) localStorage.setItem(SKIP_UPDATE_KEY, String(v));
+ else localStorage.removeItem(SKIP_UPDATE_KEY);
+ } catch (_) {}
+ }
const quitBtn = $("quitBtn");
if (window.__navisHttp && quitBtn) {
quitBtn.hidden = false;
@@ -1173,10 +1196,17 @@
updateBanner.classList.remove("show");
return;
}
+ const latest = (u.latest || "").toString();
+ const skip = skippedVersion();
+ if (u.available && latest && skip === latest) {
+ updateBanner.classList.remove("show");
+ return;
+ }
if (u.available) {
updateBanner.classList.add("show");
- $("updateTitle").textContent = "Обновление " + u.latest;
- $("updateNotes").textContent = u.notes || ("Текущая версия " + u.current);
+ $("updateTitle").textContent = "Доступно обновление " + latest;
+ $("updateNotes").textContent = u.notes || ("У вас " + (u.current || version || "?") + ". Обновление только по кнопке.");
+ updateBanner.dataset.latest = latest;
} else {
updateBanner.classList.remove("show");
}
@@ -1279,7 +1309,7 @@
}
function paintButtonsLocked(locked) {
- [btn, coreBtn, saveBtn, addBtn, delBtn, profile, pingBtn, bestBtn, updCheckBtn, updateBtn, subBtn, subUrl].forEach((b) => {
+ [btn, coreBtn, saveBtn, addBtn, delBtn, profile, pingBtn, bestBtn, updCheckBtn, updateBtn, skipUpdateBtn, subBtn, subUrl].forEach((b) => {
if (b) b.disabled = locked;
});
}
@@ -1444,6 +1474,13 @@
} catch (e) { setMeta(String(e), "err"); }
}));
+ skipUpdateBtn.addEventListener("click", () => {
+ const latest = updateBanner.dataset.latest || "";
+ if (latest) setSkippedVersion(latest);
+ updateBanner.classList.remove("show");
+ setMeta("Версия " + (latest || "?") + " пропущена. Следующую предложим.", "ok");
+ });
+
(async () => {
try {
await refresh({ syncForm: true });
diff --git a/internal/update/update.go b/internal/update/update.go
index d278be1..2dc77fc 100644
--- a/internal/update/update.go
+++ b/internal/update/update.go
@@ -16,12 +16,27 @@ import (
"time"
)
-// CurrentVersion is the shipped client version.
-const CurrentVersion = "2.7.1"
+// CurrentVersion is the product/semver used for update eligibility (feed "version").
+// Keep major.minor.patch only — no build suffix here.
+const CurrentVersion = "2.7.2"
+
+// BuildNumber is the monotonic build within CurrentVersion (Windows FileVersion 4th part,
+// macOS CFBundleVersion suffix, Android versionCode low digits). Bump on every release build.
+const BuildNumber = 1
// DefaultManifestURL is the update feed (hosted in the project git repo).
const DefaultManifestURL = "https://git.evilfox.cc/test2/navi/raw/branch/main/dist/update.json"
+// DisplayVersion is shown in the UI (product + build), e.g. "2.7.2+1".
+func DisplayVersion() string {
+ return fmt.Sprintf("%s+%d", CurrentVersion, BuildNumber)
+}
+
+// FileVersionDots is Major.Minor.Patch.Build for Windows resources / CFBundleVersion.
+func FileVersionDots() string {
+ return fmt.Sprintf("%s.%d", CurrentVersion, BuildNumber)
+}
+
// PlatformAsset is one OS/arch binary in the feed.
type PlatformAsset struct {
URL string `json:"url"`
@@ -90,7 +105,7 @@ func Check(ctx context.Context, manifestURL string) (Status, error) {
manifestURL = DefaultManifestURL
}
key := PlatformKey()
- st := Status{Current: CurrentVersion, ManifestURL: manifestURL, Platform: key}
+ st := Status{Current: DisplayVersion(), ManifestURL: manifestURL, Platform: key}
m, err := fetchManifest(ctx, manifestURL)
if err != nil {
@@ -109,38 +124,46 @@ func Check(ctx context.Context, manifestURL string) (Status, error) {
}
st.URL = url
st.SHA256 = sha
+ // Product-only compare: build numbers must not keep offering an update after install
+ // when feed version equals CurrentVersion (e.g. 2.7.2 vs local 2.7.2+1).
st.Available = Compare(st.Latest, CurrentVersion) > 0 && url != ""
return st, nil
}
-// Compare returns 1 if a>b, -1 if a