erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-10-30 01:37:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merge pull request #13128 from keymanapp/feat/windows/13119/handle-reset-downloading

Browse source 
feat(windows): handle a hard windows reset occurring while downloading updated keyman files
This commit is contained in:
rc-swag 2025-02-12 10:48:27 +10:00 • committed by GitHub
commit 4176c3bf38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 52 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

60
windows/src/desktop/kmshell/main/Keyman.System.UpdateStateMachine.pas
View file

@ -118,6 +118,7 @@ uses
GlobalProxySettings,
kmint,
keymanapi_TLB,
KeymanMutex,
Keyman.System.KeymanSentryClient,
Keyman.System.DownloadUpdate,
Keyman.System.RemoteUpdateCheck,
@ -131,6 +132,7 @@ const
SPackageUpgradeFilename = 'upgrade_packages.inf';
kmShellContinue = 0;
kmShellExit = 1;
KeymanDownloadMutexName = 'KeymanDownloading';
{ State Class Memebers }
@ -753,18 +755,29 @@ procedure DownloadingState.Enter;
var
DownloadResult: Boolean;
RetryCount: Integer;
FMutex: TKeymanMutex;
begin
// Enter DownloadingState
bucStateContext.SetRegistryState(usDownloading);
RetryCount := 0;
DownloadResult := False;
FMutex := TKeymanMutex.Create(KeymanDownloadMutexName);
while (not DownloadResult) and (RetryCount < 3) do
begin
DownloadResult := DownloadUpdatesBackground;
if not DownloadResult then
try
// Should be impossible but just exit anyway and let the process current
// downloading process finish.
if not FMutex.TakeOwnership then
begin
Exit;
end;
RetryCount := 0;
repeat
DownloadResult := DownloadUpdatesBackground;
Inc(RetryCount);
until DownloadResult or (RetryCount >= 3);
FMutex.ReleaseOwnership;
finally
FreeAndNil(FMutex);
end;
if (not DownloadResult) then
@ -805,14 +818,45 @@ begin
end;
function DownloadingState.HandleKmShell;
var
FMutex: TKeymanMutex;
begin
// Downloading state, in other process, so continue
// Whether already downloading in another process or download has failed and
// this function has clean up and force a restart, kmshell should continue processing
Result := kmShellContinue;
// Check to ensure a download process is running if not
// clean up return to the the idle state and check for updates
FMutex := TKeymanMutex.Create(KeymanDownloadMutexName);
try
if FMutex.TakeOwnership then
begin
bucStateContext.RemoveCachedFiles;
FMutex.ReleaseOwnership; // Mutex must be freed before changing state
ChangeState(IdleState);
bucStateContext.CurrentState.HandleCheck;
end;
finally
FreeAndNil(FMutex);
end;
end;
procedure DownloadingState.HandleDownload;
var
FMutex: TKeymanMutex;
begin
// Enter Already Downloading
// If downloading process is not running clean files and return to idle
FMutex := TKeymanMutex.Create(KeymanDownloadMutexName);
try
if FMutex.TakeOwnership then
begin
bucStateContext.RemoveCachedFiles;
FMutex.ReleaseOwnership; // Mutex must be freed before changing state
ChangeState(IdleState);
bucStateContext.CurrentState.HandleCheck;
end;
finally
FreeAndNil(FMutex);
end;
end;
procedure DownloadingState.HandleAbort;