mirrors/Remotely
3
0
Fork 0
mirror of https://github.com/immense/Remotely.git synced 2025-10-26 11:27:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change how files are extracted.

Browse Source
This commit is contained in:
Jared Goodwin 2020-02-22 14:12:38 -08:00
parent 0ca98374fa
commit 9e126b8be1
1 changed files with 55 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
Agent.Installer.Win/Services/InstallerService.cs
View File

@ -43,7 +43,9 @@ namespace Remotely.Agent.Installer.Win.Services
StopService();
BackupOrCreateDirectory();
await StopProcesses();
BackupDirectory();
var connectionInfo = GetConnectionInfo(organizationId, serverUrl);
@ -87,16 +89,7 @@ namespace Remotely.Agent.Installer.Win.Services
ProcessWrapper.StartHidden("cmd.exe", "/c sc delete Remotely_Service").WaitForExit();
ProgressMessageChanged?.Invoke(this, "Stopping Remotely processes.");
var procs = Process.GetProcessesByName("Remotely_Agent").Concat(Process.GetProcessesByName("Remotely_ScreenCast"));
foreach (var proc in procs)
{
proc.Kill();
}
await Task.Delay(500);
await StopProcesses();
ProgressMessageChanged?.Invoke(this, "Deleting files.");
ClearInstallDirectory();
@ -116,6 +109,19 @@ namespace Remotely.Agent.Installer.Win.Services
}
}
private async Task StopProcesses()
{
ProgressMessageChanged?.Invoke(this, "Stopping Remotely processes.");
var procs = Process.GetProcessesByName("Remotely_Agent").Concat(Process.GetProcessesByName("Remotely_ScreenCast"));
foreach (var proc in procs)
{
proc.Kill();
}
await Task.Delay(500);
}
private void AddFirewallRule()
{
var screenCastPath = Path.Combine(InstallPath, "ScreenCast", "Remotely_ScreenCast.exe");
@ -123,7 +129,7 @@ namespace Remotely.Agent.Installer.Win.Services
ProcessWrapper.StartHidden("netsh", $"advfirewall firewall add rule name=\"Remotely ScreenCast\" program=\"{screenCastPath}\" protocol=any dir=in enable=yes action=allow profile=Private,Domain description=\"The agent that allows screen sharing and remote control for Remotely.\"").WaitForExit();
}
private void BackupOrCreateDirectory()
private void BackupDirectory()
{
if (Directory.Exists(InstallPath))
{
@ -136,10 +142,6 @@ namespace Remotely.Agent.Installer.Win.Services
}
ZipFile.CreateFromDirectory(InstallPath, backupPath, CompressionLevel.Fastest, false);
}
else
{
Directory.CreateDirectory(InstallPath);
}
}
private bool CheckIsAdministrator()
@ -220,7 +222,43 @@ namespace Remotely.Agent.Installer.Win.Services
ProgressMessageChanged.Invoke(this, "Extracting Remotely files.");
ProgressValueChanged?.Invoke(this, 0);
await Task.Run(() => { ZipFile.ExtractToDirectory(targetFile, InstallPath); });
var tempDir = Path.Combine(Path.GetTempPath(), "RemotelyUpdate");
if (Directory.Exists(tempDir))
{
Directory.Delete(tempDir, true);
}
Directory.CreateDirectory(InstallPath);
while (!Directory.Exists(InstallPath))
{
await Task.Delay(10);
}
ZipFile.ExtractToDirectory(targetFile, tempDir);
var fileSystemEntries = Directory.GetFileSystemEntries(tempDir);
for (var i = 0; i < fileSystemEntries.Length; i++)
{
try
{
ProgressValueChanged?.Invoke(this, (int)((double)i / (double)fileSystemEntries.Length * 100d));
var entry = fileSystemEntries[i];
if (File.Exists(entry))
{
File.Copy(entry, Path.Combine(InstallPath, Path.GetFileName(entry)), true);
}
else if (Directory.Exists(entry))
{
Directory.Move(entry, Path.Combine(InstallPath, new DirectoryInfo(entry).Name));
}
await Task.Delay(1);
}
catch (Exception ex)
{
Logger.Write(ex);
}
}
ProgressValueChanged?.Invoke(this, 0);
}
private ConnectionInfo GetConnectionInfo(string organizationId, string serverUrl)