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

small code refactoring

Browse Source
This commit is contained in:
Schedel Pascal
2024-06-19 08:10:16 +02:00
parent 20770bed31
commit c9216ac79b
93 changed files with 2753 additions and 5835 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Pilz.Updating.UpdateInstaller.Lib/Pilz.Updating.UpdateInstaller.Lib.csproj
View File

@@ -1,14 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net6.0-windows;net8.0-windows</TargetFrameworks>
<TargetFrameworks>net8.0-windows</TargetFrameworks>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>
<PropertyGroup>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>2.0.0</Version>
</PropertyGroup>

314
Pilz.Updating.UpdateInstaller.Lib/UpdateInstaller.cs
View File

@@ -1,173 +1,167 @@
using System;
using Microsoft.VisualBasic.CompilerServices;
using System.Diagnostics;
using System.IO;
using System.IO.Compression;
using System.Linq;
using System.Reflection;
using System.Threading.Tasks;
using Microsoft.VisualBasic.CompilerServices;
namespace Pilz.Updating.UpdateInstaller.Lib
namespace Pilz.Updating.UpdateInstaller.Lib;
public class UpdateInstaller
{
public class UpdateInstaller
// E v e n t s
public delegate void UpdateInstallerEventHandler(object sender, UpdateInstallerEventArgs e);
public delegate void UpdateInstallerStepEventHandler(object sender, UpdateInstallerStepEventArgs e);
public delegate void StatusChangesEventHandler(object sender, UpdateInstallerStatusChangedEventArgs e);
public event StatusChangesEventHandler StatusChanges;
public event UpdateInstallerStepEventHandler OnStep;
// F i e l d s
private string dataPath = string.Empty;
// P r o p e r t i e s
public UpdateInstallerConfig Configuration { get; private set; }
// C o n s t r c u t o r s
public UpdateInstaller(UpdateInstallerConfig config)
{
// E v e n t s
Configuration = config;
}
public delegate void UpdateInstallerEventHandler(object sender, UpdateInstallerEventArgs e);
public delegate void UpdateInstallerStepEventHandler(object sender, UpdateInstallerStepEventArgs e);
public delegate void StatusChangesEventHandler(object sender, UpdateInstallerStatusChangedEventArgs e);
// F e a t u r e s
public event StatusChangesEventHandler StatusChanges;
public event UpdateInstallerStepEventHandler OnStep;
private void ChangeStep(UpdateInstallerStep step, UpdateInstallerStepState state)
{
OnStep?.Invoke(this, new UpdateInstallerStepEventArgs(this, step, state));
}
// F i e l d s
private void ChangeStatus(UpdateInstallerStatus newStatus)
{
StatusChanges?.Invoke(this, new UpdateInstallerStatusChangedEventArgs(newStatus));
}
private string dataPath = string.Empty;
// P r o p e r t i e s
public UpdateInstallerConfig Configuration { get; private set; }
// C o n s t r c u t o r s
public UpdateInstaller(UpdateInstallerConfig config)
public void StartHostApplication()
{
if (!string.IsNullOrEmpty(Conversions.ToString(Configuration.RestartHostApplication)) && File.Exists(Configuration.HostApplicationProcessPath))
{
Configuration = config;
}
// F e a t u r e s
private void ChangeStep(UpdateInstallerStep step, UpdateInstallerStepState state)
{
OnStep?.Invoke(this, new UpdateInstallerStepEventArgs(this, step, state));
}
private void ChangeStatus(UpdateInstallerStatus newStatus)
{
StatusChanges?.Invoke(this, new UpdateInstallerStatusChangedEventArgs(newStatus));
}
public void StartHostApplication()
{
if (!string.IsNullOrEmpty(Conversions.ToString(Configuration.RestartHostApplication)) && File.Exists(Configuration.HostApplicationProcessPath))
{
Process.Start(Configuration.HostApplicationProcessPath, Configuration.RestartHostApplicationArguments);
}
}
public void InstallUpdate()
{
ChangeStep(UpdateInstallerStep.Startup, UpdateInstallerStepState.Default);
// Extract Package
ChangeStatus(UpdateInstallerStatus.Extracting);
ChangeStep(UpdateInstallerStep.ExtractPackage, UpdateInstallerStepState.PreEvent);
ExtractPackage();
ChangeStep(UpdateInstallerStep.ExtractPackage, UpdateInstallerStepState.PostEvent);
// Install Package
ChangeStatus(UpdateInstallerStatus.CopyingFiles);
ChangeStep(UpdateInstallerStep.CopyFiles, UpdateInstallerStepState.PreEvent);
CopyFiles();
ChangeStep(UpdateInstallerStep.CopyFiles, UpdateInstallerStepState.PostEvent);
// Delete Package
ChangeStatus(UpdateInstallerStatus.RemovingFiles);
ChangeStep(UpdateInstallerStep.DeletePackage, UpdateInstallerStepState.PreEvent);
DeletePackage();
ChangeStep(UpdateInstallerStep.DeletePackage, UpdateInstallerStepState.PostEvent);
// Finish
ChangeStatus(UpdateInstallerStatus.Done);
ChangeStep(UpdateInstallerStep.Finish, UpdateInstallerStepState.Default);
}
public void WaitForHostApplication()
{
bool forcedKill = false;
bool enabled = true;
var stw = new Stopwatch();
stw.Start();
Process[] getProcesses() => Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Configuration.HostApplicationProcessPath));
while (enabled)
{
if (getProcesses().Any())
{
if (stw.ElapsedMilliseconds >= Configuration.MillisecondsToWaitForHostApplicationToClose)
{
if (!forcedKill && Configuration.ForceClosingHostApplication)
{
foreach (Process p in getProcesses())
p.Kill();
stw.Reset();
forcedKill = true;
}
else
{
stw.Stop();
enabled = false;
}
}
}
else
{
enabled = false;
}
}
}
private void ExtractPackage()
{
string packagePath = Configuration.PackagePath;
string zipPath = Path.Combine(packagePath, PackageFileNameDefinations.ZIP_PACKAGE_FILENAME);
dataPath = Path.Combine(packagePath, Path.GetFileNameWithoutExtension(PackageFileNameDefinations.ZIP_PACKAGE_FILENAME));
var dataPathDir = new DirectoryInfo(dataPath);
if (dataPathDir.Exists)
{
dataPathDir.Delete(true);
Task.Delay(100);
}
ZipFile.ExtractToDirectory(zipPath, dataPath);
}
private void CopyFiles()
{
var sourceDir = new DirectoryInfo(Path.Combine(dataPath, PackageFileNameDefinations.ZIP_APP_DATA_FILES_DIRECTORY));
var destDir = new DirectoryInfo(Configuration.HostApplicationPath);
CopyFiles(sourceDir, destDir);
}
private void CopyFiles(DirectoryInfo sourceDir, DirectoryInfo destinationDir)
{
if (!destinationDir.Exists)
{
destinationDir.Create();
}
foreach (FileInfo sFile in sourceDir.EnumerateFiles("*", SearchOption.TopDirectoryOnly))
{
var dFile = new FileInfo(Path.Combine(destinationDir.FullName, sFile.Name));
try
{
sFile.CopyTo(dFile.FullName, true);
}
catch (Exception)
{
}
}
foreach (DirectoryInfo sDir in sourceDir.EnumerateDirectories("*", SearchOption.TopDirectoryOnly))
{
var dDir = destinationDir.CreateSubdirectory(sDir.Name);
CopyFiles(sDir, dDir);
}
}
private void DeletePackage()
{
Directory.Delete(Configuration.PackagePath, true);
Process.Start(Configuration.HostApplicationProcessPath, Configuration.RestartHostApplicationArguments);
}
}
public void InstallUpdate()
{
ChangeStep(UpdateInstallerStep.Startup, UpdateInstallerStepState.Default);
// Extract Package
ChangeStatus(UpdateInstallerStatus.Extracting);
ChangeStep(UpdateInstallerStep.ExtractPackage, UpdateInstallerStepState.PreEvent);
ExtractPackage();
ChangeStep(UpdateInstallerStep.ExtractPackage, UpdateInstallerStepState.PostEvent);
// Install Package
ChangeStatus(UpdateInstallerStatus.CopyingFiles);
ChangeStep(UpdateInstallerStep.CopyFiles, UpdateInstallerStepState.PreEvent);
CopyFiles();
ChangeStep(UpdateInstallerStep.CopyFiles, UpdateInstallerStepState.PostEvent);
// Delete Package
ChangeStatus(UpdateInstallerStatus.RemovingFiles);
ChangeStep(UpdateInstallerStep.DeletePackage, UpdateInstallerStepState.PreEvent);
DeletePackage();
ChangeStep(UpdateInstallerStep.DeletePackage, UpdateInstallerStepState.PostEvent);
// Finish
ChangeStatus(UpdateInstallerStatus.Done);
ChangeStep(UpdateInstallerStep.Finish, UpdateInstallerStepState.Default);
}
public void WaitForHostApplication()
{
bool forcedKill = false;
bool enabled = true;
var stw = new Stopwatch();
stw.Start();
Process[] getProcesses() => Process.GetProcessesByName(Path.GetFileNameWithoutExtension(Configuration.HostApplicationProcessPath));
while (enabled)
{
if (getProcesses().Any())
{
if (stw.ElapsedMilliseconds >= Configuration.MillisecondsToWaitForHostApplicationToClose)
{
if (!forcedKill && Configuration.ForceClosingHostApplication)
{
foreach (Process p in getProcesses())
p.Kill();
stw.Reset();
forcedKill = true;
}
else
{
stw.Stop();
enabled = false;
}
}
}
else
{
enabled = false;
}
}
}
private void ExtractPackage()
{
string packagePath = Configuration.PackagePath;
string zipPath = Path.Combine(packagePath, PackageFileNameDefinations.ZIP_PACKAGE_FILENAME);
dataPath = Path.Combine(packagePath, Path.GetFileNameWithoutExtension(PackageFileNameDefinations.ZIP_PACKAGE_FILENAME));
var dataPathDir = new DirectoryInfo(dataPath);
if (dataPathDir.Exists)
{
dataPathDir.Delete(true);
Task.Delay(100);
}
ZipFile.ExtractToDirectory(zipPath, dataPath);
}
private void CopyFiles()
{
var sourceDir = new DirectoryInfo(Path.Combine(dataPath, PackageFileNameDefinations.ZIP_APP_DATA_FILES_DIRECTORY));
var destDir = new DirectoryInfo(Configuration.HostApplicationPath);
CopyFiles(sourceDir, destDir);
}
private void CopyFiles(DirectoryInfo sourceDir, DirectoryInfo destinationDir)
{
if (!destinationDir.Exists)
{
destinationDir.Create();
}
foreach (FileInfo sFile in sourceDir.EnumerateFiles("*", SearchOption.TopDirectoryOnly))
{
var dFile = new FileInfo(Path.Combine(destinationDir.FullName, sFile.Name));
try
{
sFile.CopyTo(dFile.FullName, true);
}
catch (Exception)
{
}
}
foreach (DirectoryInfo sDir in sourceDir.EnumerateDirectories("*", SearchOption.TopDirectoryOnly))
{
var dDir = destinationDir.CreateSubdirectory(sDir.Name);
CopyFiles(sDir, dDir);
}
}
private void DeletePackage()
{
Directory.Delete(Configuration.PackagePath, true);
}
}

19
Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerEventArgs.cs
View File

@@ -1,18 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Updating.UpdateInstaller.Lib;
namespace Pilz.Updating.UpdateInstaller.Lib
public class UpdateInstallerEventArgs : EventArgs
{
public class UpdateInstallerEventArgs : EventArgs
{
public UpdateInstaller UpdateInstaller { get; init; }
public UpdateInstaller UpdateInstaller { get; init; }
public UpdateInstallerEventArgs(UpdateInstaller updateInstaller)
{
UpdateInstaller = updateInstaller;
}
public UpdateInstallerEventArgs(UpdateInstaller updateInstaller)
{
UpdateInstaller = updateInstaller;
}
}

17
Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStatus.cs
View File

@@ -1,12 +1,11 @@
namespace Pilz.Updating.UpdateInstaller.Lib
namespace Pilz.Updating.UpdateInstaller.Lib;
public enum UpdateInstallerStatus
{
public enum UpdateInstallerStatus
{
Waiting,
Extracting,
CopyingFiles,
RemovingFiles,
Done
}
Waiting,
Extracting,
CopyingFiles,
RemovingFiles,
Done
}

15
Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStatusChangedEventArgs.cs
View File

@@ -1,14 +1,11 @@
using System;
namespace Pilz.Updating.UpdateInstaller.Lib;
namespace Pilz.Updating.UpdateInstaller.Lib
public class UpdateInstallerStatusChangedEventArgs : EventArgs
{
public class UpdateInstallerStatusChangedEventArgs : EventArgs
{
public UpdateInstallerStatus NewStatus { get; private set; }
public UpdateInstallerStatus NewStatus { get; private set; }
public UpdateInstallerStatusChangedEventArgs(UpdateInstallerStatus newStatus) : base()
{
NewStatus = newStatus;
}
public UpdateInstallerStatusChangedEventArgs(UpdateInstallerStatus newStatus) : base()
{
NewStatus = newStatus;
}
}

21
Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStep.cs
View File

@@ -1,17 +1,10 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Updating.UpdateInstaller.Lib;
namespace Pilz.Updating.UpdateInstaller.Lib
public enum UpdateInstallerStep
{
public enum UpdateInstallerStep
{
Startup,
ExtractPackage,
CopyFiles,
DeletePackage,
Finish
}
Startup,
ExtractPackage,
CopyFiles,
DeletePackage,
Finish
}

23
Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStepEventArgs.cs
View File

@@ -1,20 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Updating.UpdateInstaller.Lib;
namespace Pilz.Updating.UpdateInstaller.Lib
public class UpdateInstallerStepEventArgs : UpdateInstallerEventArgs
{
public class UpdateInstallerStepEventArgs : UpdateInstallerEventArgs
{
public UpdateInstallerStep Step { get; init; }
public UpdateInstallerStepState State { get; init; }
public UpdateInstallerStep Step { get; init; }
public UpdateInstallerStepState State { get; init; }
public UpdateInstallerStepEventArgs(UpdateInstaller updateInstaller, UpdateInstallerStep step, UpdateInstallerStepState state) : base(updateInstaller)
{
Step = step;
State = state;
}
public UpdateInstallerStepEventArgs(UpdateInstaller updateInstaller, UpdateInstallerStep step, UpdateInstallerStepState state) : base(updateInstaller)
{
Step = step;
State = state;
}
}

17
Pilz.Updating.UpdateInstaller.Lib/UpdateInstallerStepState.cs
View File

@@ -1,15 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Pilz.Updating.UpdateInstaller.Lib;
namespace Pilz.Updating.UpdateInstaller.Lib
public enum UpdateInstallerStepState
{
public enum UpdateInstallerStepState
{
Default,
PreEvent,
PostEvent
}
Default,
PreEvent,
PostEvent
}