tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-18 21:34:28 -04:00
Code Issues Projects Releases Wiki Activity

New: Lidarr to Readarr

Browse Source
This commit is contained in:
Qstick
2020-02-29 15:51:29 -05:00
parent 7359c2a9fa
commit 3b7eb01918
565 changed files with 1669 additions and 4272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/NzbDrone.Update/Lidarr.Update.csproj → src/NzbDrone.Update/Readarr.Update.csproj
View File

@@ -7,6 +7,6 @@
<PackageReference Include="NLog" Version="4.6.8" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\NzbDrone.Common\Lidarr.Common.csproj" />
<ProjectReference Include="..\NzbDrone.Common\Readarr.Common.csproj" />
</ItemGroup>
</Project>

4
src/NzbDrone.Update/UpdateApp.cs
View File

@@ -33,7 +33,7 @@ namespace NzbDrone.Update
var startupContext = new StartupContext(args);
NzbDroneLogger.Register(startupContext, true, true);
Logger.Info("Starting Lidarr Update Client");
Logger.Info("Starting Readarr Update Client");
_container = UpdateContainerBuilder.Build(startupContext);
_container.Resolve<InitializeLogger>().Initialize();
@@ -101,7 +101,7 @@ namespace NzbDrone.Update
throw new ArgumentOutOfRangeException(nameof(arg), "Invalid process ID");
}
Logger.Debug("Lidarr process ID: {0}", id);
Logger.Debug("Readarr process ID: {0}", id);
return id;
}

2
src/NzbDrone.Update/UpdateContainerBuilder.cs
View File

@@ -15,7 +15,7 @@ namespace NzbDrone.Update
{
var assemblies = new List<string>
{
"Lidarr.Update"
"Readarr.Update"
};
return new UpdateContainerBuilder(startupContext, assemblies).Container;

2
src/NzbDrone.Update/UpdateEngine/DetectApplicationType.cs
View File

@@ -34,7 +34,7 @@ namespace NzbDrone.Update.UpdateEngine
return AppType.Service;
}
if (_processProvider.Exists(ProcessProvider.LIDARR_CONSOLE_PROCESS_NAME))
if (_processProvider.Exists(ProcessProvider.READARR_CONSOLE_PROCESS_NAME))
{
return AppType.Console;
}

2
src/NzbDrone.Update/UpdateEngine/DetectExistingVersion.cs
View File

@@ -22,7 +22,7 @@ namespace NzbDrone.Update.UpdateEngine
{
try
{
var targetExecutable = Path.Combine(targetFolder, "Lidarr.exe");
var targetExecutable = Path.Combine(targetFolder, "Readarr.exe");
if (File.Exists(targetExecutable))
{

20
src/NzbDrone.Update/UpdateEngine/InstallUpdateService.cs
View File

@@ -86,14 +86,14 @@ namespace NzbDrone.Update.UpdateEngine
public void Start(string installationFolder, int processId)
{
_logger.Info("Installation Folder: {0}", installationFolder);
_logger.Info("Updating Lidarr from version {0} to version {1}", _detectExistingVersion.GetExistingVersion(installationFolder), BuildInfo.Version);
_logger.Info("Updating Readarr from version {0} to version {1}", _detectExistingVersion.GetExistingVersion(installationFolder), BuildInfo.Version);
Verify(installationFolder, processId);
var appType = _detectApplicationType.GetAppType();
_processProvider.FindProcessByName(ProcessProvider.LIDARR_CONSOLE_PROCESS_NAME);
_processProvider.FindProcessByName(ProcessProvider.LIDARR_PROCESS_NAME);
_processProvider.FindProcessByName(ProcessProvider.READARR_CONSOLE_PROCESS_NAME);
_processProvider.FindProcessByName(ProcessProvider.READARR_PROCESS_NAME);
if (OsInfo.IsWindows)
{
@@ -107,9 +107,9 @@ namespace NzbDrone.Update.UpdateEngine
if (OsInfo.IsWindows)
{
if (_processProvider.Exists(ProcessProvider.LIDARR_CONSOLE_PROCESS_NAME) || _processProvider.Exists(ProcessProvider.LIDARR_PROCESS_NAME))
if (_processProvider.Exists(ProcessProvider.READARR_CONSOLE_PROCESS_NAME) || _processProvider.Exists(ProcessProvider.READARR_PROCESS_NAME))
{
_logger.Error("Lidarr was restarted prematurely by external process.");
_logger.Error("Readarr was restarted prematurely by external process.");
return;
}
}
@@ -119,10 +119,10 @@ namespace NzbDrone.Update.UpdateEngine
_logger.Info("Copying new files to target folder");
_diskTransferService.MirrorFolder(_appFolderInfo.GetUpdatePackageFolder(), installationFolder);
// Set executable flag on Lidarr app
// Set executable flag on Readarr app
if (OsInfo.IsOsx || (OsInfo.IsLinux && PlatformInfo.IsNetCore))
{
_diskProvider.SetPermissions(Path.Combine(installationFolder, "Lidarr"), "0755", null, null);
_diskProvider.SetPermissions(Path.Combine(installationFolder, "Readarr"), "0755", null, null);
}
}
catch (Exception e)
@@ -147,14 +147,14 @@ namespace NzbDrone.Update.UpdateEngine
{
System.Threading.Thread.Sleep(1000);
if (_processProvider.Exists(ProcessProvider.LIDARR_PROCESS_NAME))
if (_processProvider.Exists(ProcessProvider.READARR_PROCESS_NAME))
{
_logger.Info("Lidarr was restarted by external process.");
_logger.Info("Readarr was restarted by external process.");
break;
}
}
if (!_processProvider.Exists(ProcessProvider.LIDARR_PROCESS_NAME))
if (!_processProvider.Exists(ProcessProvider.READARR_PROCESS_NAME))
{
_startNzbDrone.Start(appType, installationFolder);
}

10
src/NzbDrone.Update/UpdateEngine/StartNzbDrone.cs
View File

@@ -31,7 +31,7 @@ namespace NzbDrone.Update.UpdateEngine
public void Start(AppType appType, string installationFolder)
{
_logger.Info("Starting Lidarr");
_logger.Info("Starting Readarr");
if (appType == AppType.Service)
{
try
@@ -40,7 +40,7 @@ namespace NzbDrone.Update.UpdateEngine
}
catch (InvalidOperationException e)
{
_logger.Warn(e, "Couldn't start Lidarr Service (Most likely due to permission issues). Falling back to console.");
_logger.Warn(e, "Couldn't start Readarr Service (Most likely due to permission issues). Falling back to console.");
StartConsole(installationFolder);
}
}
@@ -56,18 +56,18 @@ namespace NzbDrone.Update.UpdateEngine
private void StartService()
{
_logger.Info("Starting Lidarr service");
_logger.Info("Starting Readarr service");
_serviceProvider.Start(ServiceProvider.SERVICE_NAME);
}
private void StartWinform(string installationFolder)
{
Start(installationFolder, "Lidarr".ProcessNameToExe());
Start(installationFolder, "Readarr".ProcessNameToExe());
}
private void StartConsole(string installationFolder)
{
Start(installationFolder, "Lidarr.Console".ProcessNameToExe());
Start(installationFolder, "Readarr.Console".ProcessNameToExe());
}
private void Start(string installationFolder, string fileName)

8
src/NzbDrone.Update/UpdateEngine/TerminateNzbDrone.cs
View File

@@ -47,15 +47,15 @@ namespace NzbDrone.Update.UpdateEngine
_logger.Info("Killing all running processes");
_processProvider.KillAll(ProcessProvider.LIDARR_CONSOLE_PROCESS_NAME);
_processProvider.KillAll(ProcessProvider.LIDARR_PROCESS_NAME);
_processProvider.KillAll(ProcessProvider.READARR_CONSOLE_PROCESS_NAME);
_processProvider.KillAll(ProcessProvider.READARR_PROCESS_NAME);
}
else
{
_logger.Info("Killing all running processes");
_processProvider.KillAll(ProcessProvider.LIDARR_CONSOLE_PROCESS_NAME);
_processProvider.KillAll(ProcessProvider.LIDARR_PROCESS_NAME);
_processProvider.KillAll(ProcessProvider.READARR_CONSOLE_PROCESS_NAME);
_processProvider.KillAll(ProcessProvider.READARR_PROCESS_NAME);
_processProvider.Kill(processId);
}