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

parse address and replace variables

Browse Source
This commit is contained in:
Pascal Schedel
2024-11-25 10:53:01 +01:00
parent 734ee20030
commit 3d4f088b36
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -126,7 +126,7 @@ public class UpdateClient(string updateUrl, AppVersion currentVersion, AppChanne
// Download zip package // Download zip package
using var zipFile = new FileStream(zipPath, FileMode.Create, FileAccess.ReadWrite); using var zipFile = new FileStream(zipPath, FileMode.Create, FileAccess.ReadWrite);
using var zipStream = await WebClient.GetStreamAsync(package.Address); using var zipStream = await WebClient.GetStreamAsync(package.GetAddress());
await zipStream.CopyToAsync(zipFile); await zipStream.CopyToAsync(zipFile);
// Remember path to package directory // Remember path to package directory
@@ -138,7 +138,7 @@ public class UpdateClient(string updateUrl, AppVersion currentVersion, AppChanne
} }
} }
else if (package.AddressType == PackageAddressType.Local) else if (package.AddressType == PackageAddressType.Local)
dicPackagePaths.Add(package, package.Address); dicPackagePaths.Add(package, package.GetAddress());
else else
return false; return false;

13
Pilz.Updating/UpdatePackageInfo.cs
View File

@@ -27,5 +27,16 @@ public class UpdatePackageInfo(AppVersion version, string address)
public UpdateType UpdateType { get; set; } public UpdateType UpdateType { get; set; }
[Obsolete, JsonProperty] [Obsolete, JsonProperty]
private string Packagelink => Address; private string Packagelink => GetAddress();
public string GetAddress()
{
return Address
.Replace("{appversion}", Version.ToString())
.Replace("{version}", Version.Version.ToString())
.Replace("{channelstr}", Version.Channel.ToString())
.Replace("{channel}", ((int)Version.Channel).ToString())
.Replace("{build}", Version.Build.ToString())
;
}
} }