Malin/domnitor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle hotfix updates and stale commit cache

Browse Source 
Treat file-only/hotfix updates (identified by commit SHA) as non-version changes and clear stale commit-cache so the UI no longer reports an available update after a hotfix. UpdateService now clears commits_behind_count and latest_remote_sha when no new commits are found. LayoutHelper and settings view consider installed_commit_sha vs latest_remote_sha and set commitsBehind to 0 when they match. NotificationService detects commit SHAs for the target version and emits a clearer "hotfix {sha}" message for file-only updates.
This commit is contained in:
Hosteroid
2026-02-11 19:24:39 +02:00
parent a7c2ac2e2b
commit 30a139d765
4 changed files with 26 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Helpers/LayoutHelper.php
View File

@@ -204,6 +204,13 @@ class LayoutHelper
$latestVersion = $updateSettings['latest_available_version'] ?? null;
$channel = $updateSettings['update_channel'] ?? 'stable';
$commitsBehind = (int) ($updateSettings['commits_behind_count'] ?? 0);
$installedSha = $updateSettings['installed_commit_sha'] ?? '';
$remoteSha = $updateSettings['latest_remote_sha'] ?? '';
// If installed SHA matches remote SHA, the cached commits_behind is stale
if ($installedSha !== '' && $remoteSha !== '' && str_starts_with($installedSha, $remoteSha)) {
$commitsBehind = 0;
}
$available = false;
$label = '';

9
app/Services/NotificationService.php
View File

@@ -574,7 +574,14 @@ class NotificationService
public function notifySystemUpgrade(int $userId, string $fromVersion, string $toVersion, int $migrationsCount, bool $composerManualRequired = false): void
{
$migrationLabel = $migrationsCount . ' migration' . ($migrationsCount !== 1 ? 's' : '') . ' applied';
if ($fromVersion === $toVersion) {
// Detect if $toVersion is a commit SHA (7-40 hex chars) rather than a semver string
$isCommitSha = (bool) preg_match('/^[a-f0-9]{7,40}$/i', $toVersion);
if ($isCommitSha) {
// Hotfix: file-only update identified by commit SHA
$message = "Domain Monitor v{$fromVersion} has been updated (hotfix {$toVersion}, {$migrationLabel})";
} elseif ($fromVersion === $toVersion) {
// Hotfix: same version, just file updates
$message = "Domain Monitor v{$toVersion} has been updated ({$migrationLabel})";
} else {

5
app/Services/UpdateService.php
View File

@@ -125,6 +125,11 @@ class UpdateService
// Cache commit info
$this->settingModel->setValue('latest_remote_sha', $result['remote_sha'] ?? '');
$this->settingModel->setValue('commits_behind_count', count($commits));
} else {
// No new commits — explicitly clear stale cache so the UI
// doesn't keep showing "update available" after a hotfix was applied.
$this->settingModel->setValue('commits_behind_count', '0');
$this->settingModel->setValue('latest_remote_sha', '');
}
} elseif ($channel === 'latest' && !$localSha) {
$result['commit_tracking_unavailable'] = true;

6
app/Views/settings/index.php
View File

@@ -38,6 +38,12 @@ $currentVer = $appSettings['app_version'] ?? '0';
$latestVer = $updateSettings['latest_available_version'] ?? null;
$updateChannel = $updateSettings['update_channel'] ?? 'stable';
$commitsBehind = (int)($updateSettings['commits_behind_count'] ?? 0);
$installedSha = $updateSettings['installed_commit_sha'] ?? '';
$remoteSha = $updateSettings['latest_remote_sha'] ?? '';
// If installed SHA matches remote SHA, there's no real hotfix — stale cache
if ($installedSha !== '' && $remoteSha !== '' && str_starts_with($installedSha, $remoteSha)) {
$commitsBehind = 0;
}
if ($latestVer && version_compare($latestVer, $currentVer, '>')) {
$cachedUpdateAvailable = true;
$cachedUpdateData = [