github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 13:10:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

New: mono disk and process provider cleaning

Browse source
This commit is contained in:
Qstick 2021-06-29 22:58:12 -04:00
commit 1a44d53fef
2 changed files with 3 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/NzbDrone.Common/Processes/ProcessProvider.cs
View file

@ -336,16 +336,7 @@ namespace NzbDrone.Common.Processes
private List<Process> GetProcessesByName(string name) private List<Process> GetProcessesByName(string name)
{ {
//TODO: move this to an OS specific class var processes = Process.GetProcessesByName(name).ToList();
var monoProcesses = Process.GetProcessesByName("mono")
.Union(Process.GetProcessesByName("mono-sgen"))
.Where(process =>
process.Modules.Cast<ProcessModule>()
.Any(module =>
module.ModuleName.ToLower() == name.ToLower() + ".exe"));
var processes = Process.GetProcessesByName(name)
.Union(monoProcesses).ToList();
_logger.Debug("Found {0} processes with the name: {1}", processes.Count, name); _logger.Debug("Found {0} processes with the name: {1}", processes.Count, name);

31
src/NzbDrone.Mono/Disk/DiskProvider.cs
View file

@ -329,9 +329,7 @@ namespace NzbDrone.Mono.Disk
// Catch the exception and attempt to handle these edgecases // Catch the exception and attempt to handle these edgecases
// Mono 6.x till 6.10 doesn't properly try use rename first. // Mono 6.x till 6.10 doesn't properly try use rename first.
if (move && if (move && (PlatformInfo.Platform == PlatformType.NetCore))
((PlatformInfo.Platform == PlatformType.Mono && PlatformInfo.GetVersion() < new Version(6, 10)) ||
(PlatformInfo.Platform == PlatformType.NetCore)))
{ {
if (Syscall.lstat(source, out var sourcestat) == 0 && if (Syscall.lstat(source, out var sourcestat) == 0 &&
Syscall.lstat(destination, out var deststat) != 0 && Syscall.lstat(destination, out var deststat) != 0 &&
@ -359,32 +357,7 @@ namespace NzbDrone.Mono.Disk
var dstInfo = new FileInfo(destination); var dstInfo = new FileInfo(destination);
var exists = dstInfo.Exists && srcInfo.Exists; var exists = dstInfo.Exists && srcInfo.Exists;
if (PlatformInfo.Platform == PlatformType.Mono && PlatformInfo.GetVersion() >= new Version(6, 6) && if (PlatformInfo.Platform == PlatformType.NetCore && exists && dstInfo.Length == srcInfo.Length)
exists && dstInfo.Length == 0 && srcInfo.Length != 0)
{
// mono >=6.6 bug: zero length file since chmod happens at the start
_logger.Debug("{3} failed to {2} file likely due to known {3} bug, attempting to {2} directly. '{0}' -> '{1}'", source, destination, move ? "move" : "copy", PlatformInfo.PlatformName);
try
{
_logger.Trace("Copying content from {0} to {1} ({2} bytes)", source, destination, srcInfo.Length);
using (var srcStream = new FileStream(source, FileMode.Open, FileAccess.Read))
using (var dstStream = new FileStream(destination, FileMode.Create, FileAccess.Write))
{
srcStream.CopyTo(dstStream);
}
}
catch
{
// If it fails again then bail
throw;
}
}
else if (((PlatformInfo.Platform == PlatformType.Mono &&
PlatformInfo.GetVersion() >= new Version(6, 0) &&
PlatformInfo.GetVersion() < new Version(6, 6)) ||
PlatformInfo.Platform == PlatformType.NetCore) &&
exists && dstInfo.Length == srcInfo.Length)
{ {
// mono 6.0, mono 6.4 and netcore 3.1 bug: full length file since utime and chmod happens at the end // mono 6.0, mono 6.4 and netcore 3.1 bug: full length file since utime and chmod happens at the end
_logger.Debug("{3} failed to {2} file likely due to known {3} bug, attempting to {2} directly. '{0}' -> '{1}'", source, destination, move ? "move" : "copy", PlatformInfo.PlatformName); _logger.Debug("{3} failed to {2} file likely due to known {3} bug, attempting to {2} directly. '{0}' -> '{1}'", source, destination, move ? "move" : "copy", PlatformInfo.PlatformName);