mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-20 05:13:18 -07:00
This commit is contained in:
parent
706fc94eb3
commit
f7f66d4c11
22 changed files with 789 additions and 41 deletions
|
@ -22,8 +22,7 @@ namespace Ombi.Updater
|
|||
return AppType.Normal;
|
||||
}
|
||||
|
||||
if (_serviceProvider.ServiceExist(ServiceProvider.OmbiServiceName)
|
||||
)
|
||||
if (_serviceProvider.ServiceExist(ServiceProvider.OmbiServiceName))
|
||||
{
|
||||
return AppType.Service;
|
||||
}
|
||||
|
|
|
@ -25,7 +25,14 @@
|
|||
// ************************************************************************/
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using System.IO.Compression;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Reflection;
|
||||
using System.Windows.Forms;
|
||||
using NLog;
|
||||
using Ombi.Common;
|
||||
using Ombi.Common.EnvironmentInfo;
|
||||
using Ombi.Common.Processes;
|
||||
|
@ -34,24 +41,249 @@ namespace Ombi.Updater
|
|||
{
|
||||
public class InstallService
|
||||
{
|
||||
public void Start(string installFolder)
|
||||
private static readonly Logger Logger = LogManager.GetCurrentClassLogger();
|
||||
private readonly IProcessProvider _processProvider = new ProcessProvider();
|
||||
private string BackupPath { get; set; }
|
||||
private string TempPath { get; set; }
|
||||
public void Start(UpdateStartupContext ctx)
|
||||
{
|
||||
var dector = new DetectApplicationType();
|
||||
var processProvider = new ProcessProvider();
|
||||
|
||||
var processId = processProvider.FindProcessByName(ProcessProvider.OmbiProcessName)?.FirstOrDefault()?.Id ?? -1;
|
||||
var processId = _processProvider.FindProcessByName(ProcessProvider.OmbiProcessName)?.FirstOrDefault()?.Id ?? -1;
|
||||
|
||||
// Log if process is -1
|
||||
|
||||
var appType = dector.GetAppType();
|
||||
processProvider.FindProcessByName(ProcessProvider.OmbiProcessName);
|
||||
var dir = CreateTempPath();
|
||||
TempPath = Path.Combine(dir.FullName, "OmbiUpdate.zip");
|
||||
using (var client = new WebClient())
|
||||
{
|
||||
client.DownloadProgressChanged += (s, e) =>
|
||||
{
|
||||
Console.WriteLine($"{e.ProgressPercentage}%");
|
||||
};
|
||||
client.DownloadFile(ctx.DownloadPath, TempPath);
|
||||
}
|
||||
|
||||
var appType = dector.GetAppType();
|
||||
_processProvider.FindProcessByName(ProcessProvider.OmbiProcessName);
|
||||
var installationFolder = GetInstallationDirectory(ctx);
|
||||
var terminator = new TerminateOmbi(new ServiceProvider(_processProvider), _processProvider);
|
||||
if (OsInfo.IsWindows)
|
||||
{
|
||||
var terminator = new TerminateOmbi(new ServiceProvider(processProvider), processProvider);
|
||||
terminator.Terminate(processId);
|
||||
}
|
||||
try
|
||||
{
|
||||
BackupCurrentVersion();
|
||||
EmptyInstallationFolder();
|
||||
|
||||
using (var archive = ZipFile.OpenRead(TempPath))
|
||||
{
|
||||
foreach (var entry in archive.Entries)
|
||||
{
|
||||
var fullname = string.Empty;
|
||||
if (entry.FullName.Contains("Release/")) // Don't extract the release folder, we are already in there
|
||||
{
|
||||
fullname = entry.FullName.Replace("Release/", string.Empty);
|
||||
}
|
||||
if (entry.Name.Contains("UpdateService"))
|
||||
{
|
||||
fullname = entry.FullName.Replace("UpdateService", "UpdateService_New");
|
||||
}
|
||||
|
||||
var fullPath = Path.Combine(PathUp(Path.GetDirectoryName(Application.ExecutablePath),1),fullname);
|
||||
|
||||
|
||||
|
||||
if (string.IsNullOrEmpty(entry.Name))
|
||||
{
|
||||
Directory.CreateDirectory(fullPath);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (entry.Name.Contains("Updater"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
entry.ExtractToFile(fullPath, true);
|
||||
Console.WriteLine("Restored {0}", entry.FullName);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Need to install here
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Console.WriteLine(e);
|
||||
RestoreBackup();
|
||||
throw;
|
||||
}
|
||||
finally
|
||||
{
|
||||
var startOmbi = new StartOmbi(new ServiceProvider(_processProvider), _processProvider);
|
||||
if (OsInfo.IsWindows)
|
||||
{
|
||||
startOmbi.Start(appType, installationFolder);
|
||||
}
|
||||
else
|
||||
{
|
||||
terminator.Terminate(processId);
|
||||
|
||||
Logger.Info("Waiting for external auto-restart.");
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
System.Threading.Thread.Sleep(1000);
|
||||
|
||||
if (_processProvider.Exists(ProcessProvider.OmbiProcessName))
|
||||
{
|
||||
Logger.Info("Ombi was restarted by external process.");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!_processProvider.Exists(ProcessProvider.OmbiProcessName))
|
||||
{
|
||||
startOmbi.Start(appType, installationFolder, ctx.StartupArgs);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private DirectoryInfo CreateTempPath()
|
||||
{
|
||||
try
|
||||
{
|
||||
var location = Path.GetDirectoryName(Assembly.GetAssembly(typeof(Updater)).Location ?? string.Empty);
|
||||
var path = Path.Combine(location, "UpdateTemp");
|
||||
return Directory.CreateDirectory(path);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Console.WriteLine(e.Message);
|
||||
Console.WriteLine();
|
||||
Environment.Exit(1);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
public void RestoreBackup()
|
||||
{
|
||||
Console.WriteLine("Update failed, restoring backup");
|
||||
using (var archive = ZipFile.OpenRead(BackupPath))
|
||||
{
|
||||
foreach (var entry in archive.Entries)
|
||||
{
|
||||
var fullPath = Path.Combine(Path.Combine(Path.GetDirectoryName(Application.ExecutablePath)), entry.FullName);
|
||||
|
||||
if (string.IsNullOrEmpty(entry.Name))
|
||||
{
|
||||
Directory.CreateDirectory(fullPath);
|
||||
}
|
||||
if (entry.Name.Contains("UpdateService"))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (entry.Name.Contains("Ombi.Updater"))
|
||||
{
|
||||
entry.ExtractToFile(fullPath + "_Updated", true);
|
||||
continue;
|
||||
}
|
||||
|
||||
entry.ExtractToFile(fullPath, true);
|
||||
Console.WriteLine("Update failed, restoring backup");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
private string GetInstallationDirectory(UpdateStartupContext startupContext)
|
||||
{
|
||||
|
||||
Logger.Debug("Using process ID to find installation directory: {0}", startupContext.ProcessId);
|
||||
var exeFileInfo = new FileInfo(_processProvider.GetProcessById(startupContext.ProcessId).StartPath);
|
||||
Logger.Debug("Executable location: {0}", exeFileInfo.FullName);
|
||||
|
||||
return exeFileInfo.DirectoryName;
|
||||
|
||||
|
||||
}
|
||||
|
||||
private void BackupCurrentVersion()
|
||||
{
|
||||
Console.WriteLine("Backing up the current version");
|
||||
try
|
||||
{
|
||||
var applicationPath = Path.GetDirectoryName(Assembly.GetAssembly(typeof(InstallService)).Location ?? string.Empty) ?? string.Empty;
|
||||
|
||||
var dir = Directory.CreateDirectory(Path.Combine(applicationPath, "BackupSystem"));
|
||||
|
||||
var allfiles = Directory.GetFiles(applicationPath, "*.*", SearchOption.AllDirectories);
|
||||
BackupPath = Path.Combine(dir.FullName, "OmbiBackup.zip");
|
||||
|
||||
CheckAndDelete(BackupPath);
|
||||
using (var fileStream = new FileStream(BackupPath, FileMode.CreateNew))
|
||||
using (var archive = new ZipArchive(fileStream, ZipArchiveMode.Create, true))
|
||||
{
|
||||
foreach (var file in allfiles)
|
||||
{
|
||||
if (file.Contains("BackupSystem"))
|
||||
continue;
|
||||
var info = Path.GetFileName(file);
|
||||
archive.CreateEntryFromFile(file, info);
|
||||
}
|
||||
}
|
||||
Console.WriteLine("All backed up!");
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Console.WriteLine(e.Message);
|
||||
Console.WriteLine();
|
||||
Environment.Exit(1);
|
||||
}
|
||||
}
|
||||
private void CheckAndDelete(string filePath)
|
||||
{
|
||||
if (File.Exists(filePath))
|
||||
{
|
||||
File.Delete(filePath);
|
||||
}
|
||||
}
|
||||
|
||||
private void EmptyInstallationFolder()
|
||||
{
|
||||
var applicationPath = PathUp(Path.GetDirectoryName(Assembly.GetAssembly(typeof(InstallService)).Location ?? string.Empty) ?? string.Empty,1);
|
||||
var allfiles = Directory.GetFiles(applicationPath, "*.*", SearchOption.AllDirectories);
|
||||
|
||||
foreach (var file in allfiles)
|
||||
{
|
||||
if(file.Contains("BackupSystem") || file.Contains("UpdateService") || file.Contains(".sqlite")) continue;
|
||||
CheckAndDelete(file);
|
||||
}
|
||||
}
|
||||
static string PathUp(string path, int up)
|
||||
{
|
||||
if (up == 0)
|
||||
return path;
|
||||
for (int i = path.Length - 1; i >= 0; i--)
|
||||
{
|
||||
if (path[i] == Path.DirectorySeparatorChar)
|
||||
{
|
||||
up--;
|
||||
if (up == 0)
|
||||
return path.Substring(0, i);
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
public class UpdateStartupContext
|
||||
{
|
||||
public int ProcessId { get; set; }
|
||||
public string DownloadPath { get; set; }
|
||||
public string StartupArgs { get; set; }
|
||||
}
|
||||
}
|
|
@ -13,7 +13,7 @@
|
|||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\Updater\</OutputPath>
|
||||
<OutputPath>bin\Debug\UpdateService\</OutputPath>
|
||||
<DefineConstants>DEBUG;</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
|
@ -31,10 +31,6 @@
|
|||
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\NLog.4.3.6\lib\net45\NLog.dll</HintPath>
|
||||
</Reference>
|
||||
<Reference Include="Polly, Version=4.3.0.0, Culture=neutral, PublicKeyToken=c8a3ffc3f8f825cc, processorArchitecture=MSIL">
|
||||
<HintPath>..\packages\Polly-Signed.4.3.0\lib\net45\Polly.dll</HintPath>
|
||||
<Private>True</Private>
|
||||
</Reference>
|
||||
<Reference Include="System" />
|
||||
<Reference Include="System.IO.Compression" />
|
||||
<Reference Include="System.IO.Compression.FileSystem" />
|
||||
|
@ -46,7 +42,9 @@
|
|||
<Compile Include="InstallService.cs" />
|
||||
<Compile Include="Program.cs" />
|
||||
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||
<Compile Include="StartOmbi.cs" />
|
||||
<Compile Include="TerminateOmbi.cs" />
|
||||
<Compile Include="UpdateEngine\BackupAndRestore.cs" />
|
||||
<Compile Include="Updater.cs" />
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
|
||||
|
@ -55,17 +53,13 @@
|
|||
<Project>{bfd45569-90cf-47ca-b575-c7b0ff97f67b}</Project>
|
||||
<Name>Ombi.Common</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Ombi.Core\Ombi.Core.csproj">
|
||||
<Project>{DD7DC444-D3BF-4027-8AB9-EFC71F5EC581}</Project>
|
||||
<Name>Ombi.Core</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\Ombi.Helpers\Ombi.Helpers.csproj">
|
||||
<Project>{1252336D-42A3-482A-804C-836E60173DFA}</Project>
|
||||
<Name>Ombi.Helpers</Name>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="app.config" />
|
||||
<None Include="packages.config" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<PostBuildEvent>(ROBOCOPY "$(ProjectDir)bin\$(ConfigurationName)\UpdateService" "$(SolutionDir)Ombi.UI\bin\$(ConfigurationName)\UpdateService" "*")^& IF %25ERRORLEVEL%25 GEQ 16 exit 1
|
||||
exit 0</PostBuildEvent>
|
||||
</PropertyGroup>
|
||||
</Project>
|
|
@ -1,4 +1,7 @@
|
|||
using System;
|
||||
using System.Linq;
|
||||
using System.Windows.Forms;
|
||||
using Ombi.Common.Processes;
|
||||
|
||||
namespace Ombi.Updater
|
||||
{
|
||||
|
@ -6,16 +9,32 @@ namespace Ombi.Updater
|
|||
{
|
||||
public static void Main (string[] args)
|
||||
{
|
||||
Console.WriteLine ("Starting PlexRequests .Net updater");
|
||||
var s = new Updater();
|
||||
if (args.Length >= 2)
|
||||
{
|
||||
s.Start(args[0], args[1]);
|
||||
}
|
||||
else
|
||||
{
|
||||
s.Start(args[0], string.Empty);
|
||||
}
|
||||
var i = new InstallService();
|
||||
var context = ParseArgs(args);
|
||||
i.Start(context);
|
||||
//Console.WriteLine ("Starting Ombi updater");
|
||||
// var s = new Updater();
|
||||
// if (args.Length >= 2)
|
||||
// {
|
||||
// s.Start(args[0], args[1]);
|
||||
// }
|
||||
// else
|
||||
// {
|
||||
// s.Start(args[0], string.Empty);
|
||||
// }
|
||||
}
|
||||
|
||||
private static UpdateStartupContext ParseArgs(string[] args)
|
||||
{
|
||||
|
||||
var proc = new ProcessProvider();
|
||||
var ombiProc = proc.FindProcessByName("Ombi").FirstOrDefault().Id;
|
||||
return new UpdateStartupContext
|
||||
{
|
||||
DownloadPath = args[0],
|
||||
ProcessId = ombiProc,
|
||||
StartupArgs = args.Length > 1 ? args[1] : string.Empty
|
||||
};
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
99
Ombi.Updater/StartOmbi.cs
Normal file
99
Ombi.Updater/StartOmbi.cs
Normal file
|
@ -0,0 +1,99 @@
|
|||
#region Copyright
|
||||
// /************************************************************************
|
||||
// Copyright (c) 2017 Jamie Rees
|
||||
// File: StartOmbi.cs
|
||||
// Created By: Jamie Rees
|
||||
//
|
||||
// Permission is hereby granted, free of charge, to any person obtaining
|
||||
// a copy of this software and associated documentation files (the
|
||||
// "Software"), to deal in the Software without restriction, including
|
||||
// without limitation the rights to use, copy, modify, merge, publish,
|
||||
// distribute, sublicense, and/or sell copies of the Software, and to
|
||||
// permit persons to whom the Software is furnished to do so, subject to
|
||||
// the following conditions:
|
||||
//
|
||||
// The above copyright notice and this permission notice shall be
|
||||
// included in all copies or substantial portions of the Software.
|
||||
//
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
||||
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
|
||||
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
|
||||
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
|
||||
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
// ************************************************************************/
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.IO;
|
||||
using NLog;
|
||||
using Ombi.Common;
|
||||
using Ombi.Common.Processes;
|
||||
using IServiceProvider = Ombi.Common.IServiceProvider;
|
||||
|
||||
namespace Ombi.Updater
|
||||
{
|
||||
public interface IStartOmbi
|
||||
{
|
||||
void Start(AppType appType, string installationFolder, string args);
|
||||
void Start(AppType app, string installationFolder);
|
||||
|
||||
}
|
||||
public class StartOmbi : IStartOmbi
|
||||
{
|
||||
private readonly IServiceProvider _serviceProvider;
|
||||
private readonly IProcessProvider _processProvider;
|
||||
private readonly Logger _logger = LogManager.GetCurrentClassLogger();
|
||||
public StartOmbi(IServiceProvider serviceProvider, IProcessProvider processProvider)
|
||||
{
|
||||
_serviceProvider = serviceProvider;
|
||||
_processProvider = processProvider;
|
||||
}
|
||||
|
||||
public void Start(AppType app, string installationFolder)
|
||||
{
|
||||
Start(app, installationFolder, string.Empty);
|
||||
}
|
||||
|
||||
public void Start(AppType appType, string installationFolder, string args)
|
||||
{
|
||||
_logger.Info("Starting Ombi");
|
||||
if (appType == AppType.Service)
|
||||
{
|
||||
try
|
||||
{
|
||||
StartService();
|
||||
|
||||
}
|
||||
catch (InvalidOperationException e)
|
||||
{
|
||||
_logger.Warn(e, "Couldn't start Ombi Service (Most likely due to permission issues). falling back to console.");
|
||||
StartConsole(installationFolder, args);
|
||||
}
|
||||
}
|
||||
else if (appType == AppType.Console)
|
||||
{
|
||||
StartConsole(installationFolder, args);
|
||||
}
|
||||
}
|
||||
|
||||
private void StartService()
|
||||
{
|
||||
_logger.Info("Starting Ombi service");
|
||||
_serviceProvider.Start(ServiceProvider.OmbiServiceName);
|
||||
}
|
||||
|
||||
private void StartConsole(string installationFolder, string args)
|
||||
{
|
||||
Start(installationFolder, "Ombi.exe", args);
|
||||
}
|
||||
|
||||
private void Start(string installationFolder, string fileName, string args)
|
||||
{
|
||||
_logger.Info("Starting {0}", fileName);
|
||||
var path = Path.Combine(installationFolder, fileName);
|
||||
_processProvider.SpawnNewProcess(path);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -62,7 +62,7 @@ namespace Ombi.Updater
|
|||
{
|
||||
try
|
||||
{
|
||||
_logger.Info("NzbDrone Service is installed and running");
|
||||
_logger.Info("Ombi Service is installed and running");
|
||||
_serviceProvider.Stop(ServiceProvider.OmbiServiceName);
|
||||
}
|
||||
catch (Exception e)
|
||||
|
|
37
Ombi.Updater/UpdateEngine/BackupAndRestore.cs
Normal file
37
Ombi.Updater/UpdateEngine/BackupAndRestore.cs
Normal file
|
@ -0,0 +1,37 @@
|
|||
//using NLog;
|
||||
|
||||
//namespace Ombi.Updater.UpdateEngine
|
||||
//{
|
||||
// public interface IBackupAndRestore
|
||||
// {
|
||||
// void Backup(string source);
|
||||
// void Restore(string target);
|
||||
// }
|
||||
|
||||
// public class BackupAndRestore : IBackupAndRestore
|
||||
// {
|
||||
// private readonly IDiskTransferService _diskTransferService;
|
||||
// private readonly IAppFolderInfo _appFolderInfo;
|
||||
// private readonly Logger _logger;
|
||||
|
||||
// public BackupAndRestore(IDiskTransferService diskTransferService, IAppFolderInfo appFolderInfo, Logger logger)
|
||||
// {
|
||||
// _diskTransferService = diskTransferService;
|
||||
// _appFolderInfo = appFolderInfo;
|
||||
// _logger = logger;
|
||||
// }
|
||||
|
||||
// public void Backup(string source)
|
||||
// {
|
||||
// _logger.Info("Creating backup of existing installation");
|
||||
// _diskTransferService.MirrorFolder(source, _appFolderInfo.GetUpdateBackUpFolder());
|
||||
// }
|
||||
|
||||
// public void Restore(string target)
|
||||
// {
|
||||
// _logger.Info("Attempting to rollback upgrade");
|
||||
// var count = _diskTransferService.MirrorFolder(_appFolderInfo.GetUpdateBackUpFolder(), target);
|
||||
// _logger.Info("Rolled back {0} files", count);
|
||||
// }
|
||||
// }
|
||||
//}
|
|
@ -184,8 +184,7 @@ namespace Ombi.Updater
|
|||
|
||||
private DirectoryInfo CreateTempPath()
|
||||
{
|
||||
try
|
||||
{
|
||||
try {
|
||||
var location = Path.GetDirectoryName(Assembly.GetAssembly(typeof(Updater)).Location ?? string.Empty);
|
||||
var path = Path.Combine(location, "UpdateTemp");
|
||||
return Directory.CreateDirectory(path);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue