Pilz.NET/Pilz.Updating
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Pilzinsel64
2024-09-04 08:01:40 +02:00
parent aa3cc8d166
commit ad45f53e1d
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Pilz.Updating.Client/UpdateClient.cs
View File

@@ -58,7 +58,7 @@ public class UpdateClient(string updateUrl, AppVersion currentVersion, AppChanne
public async Task UpdateInteractive(UpdatePackageInfo package) public async Task UpdateInteractive(UpdatePackageInfo package)
{ {
if (await DownloadPackageAsync(package)) if (await DownloadPackageAsync(package))
await InstallPackageAsync(package); await InstallPackageAsync(package, HostApplicationPath);
} }
// F e a t u r e s // F e a t u r e s
@@ -148,9 +148,9 @@ public class UpdateClient(string updateUrl, AppVersion currentVersion, AppChanne
return true; return true;
} }
public void InstallPackage(UpdatePackageInfo package) public void InstallPackage(UpdatePackageInfo package, string? localInstallPath)
{ {
if (string.IsNullOrWhiteSpace(HostApplicationPath) || !dicPackagePaths.TryGetValue(package, out var packagePath)) if (string.IsNullOrWhiteSpace(localInstallPath) || !dicPackagePaths.TryGetValue(package, out var packagePath))
{ {
RaiseStatusChanged(UpdateStatus.Failed); RaiseStatusChanged(UpdateStatus.Failed);
return; return;
@@ -182,8 +182,8 @@ public class UpdateClient(string updateUrl, AppVersion currentVersion, AppChanne
// Install Package // Install Package
RaiseStatusChanged(UpdateStatus.Copying, UpdateStatusEvent.PreEvent); RaiseStatusChanged(UpdateStatus.Copying, UpdateStatusEvent.PreEvent);
var dataPathDir = new DirectoryInfo(dataPath); var dataPathDir = Directory.CreateDirectory(dataPath);
var destDir = new DirectoryInfo(HostApplicationPath); var destDir = Directory.CreateDirectory(localInstallPath);
Utils.CopyFiles(dataPathDir, destDir); Utils.CopyFiles(dataPathDir, destDir);
RaiseStatusChanged(UpdateStatus.Copying, UpdateStatusEvent.PostEvent); RaiseStatusChanged(UpdateStatus.Copying, UpdateStatusEvent.PostEvent);
@@ -200,8 +200,8 @@ public class UpdateClient(string updateUrl, AppVersion currentVersion, AppChanne
RaiseStatusChanged(UpdateStatus.Done, UpdateStatusEvent.Default); RaiseStatusChanged(UpdateStatus.Done, UpdateStatusEvent.Default);
} }
public Task InstallPackageAsync(UpdatePackageInfo package) public Task InstallPackageAsync(UpdatePackageInfo package, string? localInstallPath)
{ {
return Task.Run(() => InstallPackage(package)); return Task.Run(() => InstallPackage(package, localInstallPath));
} }
} }