github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-08 14:10:50 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed #898

Browse source
This commit is contained in:
Jamie.Rees 2017-01-09 08:10:28 +00:00
parent 98a91faf52
commit ba3db7bbae
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Ombi.UI/Modules/Admin/SystemStatusModule.cs
View file

@ -123,17 +123,17 @@ namespace Ombi.UI.Modules.Admin
var url = Request.Form["url"]; var url = Request.Form["url"];
var args = (string)Request.Form["args"].ToString(); var args = (string)Request.Form["args"].ToString();
var lowered = args.ToLower(); var lowered = args.ToLower();
var appPath = Path.Combine(Path.GetDirectoryName(Assembly.GetAssembly(typeof(SystemStatusModule)).Location ?? string.Empty) ?? string.Empty, "PlexRequests.Updater.exe"); var appPath = Path.Combine(Path.GetDirectoryName(Assembly.GetAssembly(typeof(SystemStatusModule)).Location ?? string.Empty) ?? string.Empty, "Ombi.Updater.exe");
if (!string.IsNullOrEmpty(lowered)) if (!string.IsNullOrEmpty(lowered))
{ {
if (lowered.Contains("plexrequests.exe")) if (lowered.Contains("ombi.exe"))
{ {
lowered = lowered.Replace("plexrequests.exe", ""); lowered = lowered.Replace("ombi.exe", "");
} }
} }
var startArgs = string.IsNullOrEmpty(lowered) ? appPath : $"{lowered} Plexrequests.Updater.exe"; var startArgs = string.IsNullOrEmpty(lowered) ? appPath : $"{lowered} Ombi.Updater.exe";
var startInfo = Type.GetType("Mono.Runtime") != null var startInfo = Type.GetType("Mono.Runtime") != null
? new ProcessStartInfo(startArgs) { Arguments = $"{url} {lowered}", } ? new ProcessStartInfo(startArgs) { Arguments = $"{url} {lowered}", }

10
Ombi.Updater/Updater.cs
View file

@ -56,7 +56,7 @@ namespace Ombi.Updater
} }
else else
{ {
if (entry.Name.Contains("PlexRequests.Updater")) if (entry.Name.Contains("Ombi.Updater"))
{ {
entry.ExtractToFile(fullPath + "_Updated", true); entry.ExtractToFile(fullPath + "_Updated", true);
continue; continue;
@ -75,7 +75,7 @@ namespace Ombi.Updater
{ {
BackupCurrentVersion(); BackupCurrentVersion();
var dir = CreateTempPath(); var dir = CreateTempPath();
TempPath = Path.Combine(dir.FullName, "PlexRequestsUpdate.zip"); TempPath = Path.Combine(dir.FullName, "OmbiUpdate.zip");
CheckAndDelete(TempPath); CheckAndDelete(TempPath);
Console.WriteLine("Downloading new version"); Console.WriteLine("Downloading new version");
@ -109,7 +109,7 @@ namespace Ombi.Updater
} }
else else
{ {
if (entry.Name.Contains("PlexRequests.Updater")) if (entry.Name.Contains("Ombi.Updater"))
{ {
entry.ExtractToFile(fullPath + "_Updated", true); entry.ExtractToFile(fullPath + "_Updated", true);
continue; continue;
@ -150,7 +150,7 @@ namespace Ombi.Updater
var dir = Directory.CreateDirectory(Path.Combine(applicationPath, "BackupSystem")); var dir = Directory.CreateDirectory(Path.Combine(applicationPath, "BackupSystem"));
var allfiles = Directory.GetFiles(applicationPath, "*.*", SearchOption.AllDirectories); var allfiles = Directory.GetFiles(applicationPath, "*.*", SearchOption.AllDirectories);
BackupPath = Path.Combine(dir.FullName, "PlexRequestsBackup.zip"); BackupPath = Path.Combine(dir.FullName, "OmbiBackup.zip");
CheckAndDelete(BackupPath); CheckAndDelete(BackupPath);
using (var fileStream = new FileStream(BackupPath, FileMode.CreateNew)) using (var fileStream = new FileStream(BackupPath, FileMode.CreateNew))
@ -202,7 +202,7 @@ namespace Ombi.Updater
private void FinishUpdate(string launchOptions) private void FinishUpdate(string launchOptions)
{ {
var args = Error ? "-u 2" : "-u 1"; var args = Error ? "-u 2" : "-u 1";
var startInfo = new ProcessStartInfo($"{launchOptions}PlexRequests.exe") { Arguments = args, UseShellExecute = true }; var startInfo = new ProcessStartInfo($"{launchOptions}Ombi.exe") { Arguments = args, UseShellExecute = true };
Process.Start(startInfo); Process.Start(startInfo);