Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Parsing of SABnzbd develop version

This commit is contained in:
Mark McDowall 2017-01-12 00:38:56 -08:00
parent 2e36d35815
commit 68ea8a551c
1 changed files with 70 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

147
src/NzbDrone.Core/Download/Clients/Sabnzbd/Sabnzbd.cs
View File

@ -30,7 +30,7 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
} }
// patch can be a number (releases) or 'x' (git) // patch can be a number (releases) or 'x' (git)
private static readonly Regex VersionRegex = new Regex(@"(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+|x)(?<candidate>.*)", RegexOptions.Compiled); private static readonly Regex VersionRegex = new Regex(@"(?<major>\d+)\.(?<minor>\d+)\.(?<patch>\d+|x)", RegexOptions.Compiled);
protected override string AddFromNzbFile(RemoteEpisode remoteEpisode, string filename, byte[] fileContent) protected override string AddFromNzbFile(RemoteEpisode remoteEpisode, string filename, byte[] fileContent)
{ {
@ -269,110 +269,103 @@ namespace NzbDrone.Core.Download.Clients.Sabnzbd
failures.AddIfNotNull(TestCategory()); failures.AddIfNotNull(TestCategory());
} }
private bool HasVersion(int major, int minor, int patch = 0, string candidate = null) private bool HasVersion(int major, int minor, int patch = 0)
{ {
candidate = candidate ?? string.Empty; var rawVersion = _proxy.GetVersion(Settings);
var version = ParseVersion(rawVersion);
var version = _proxy.GetVersion(Settings); if (version == null)
{
return false;
}
if (version.Major > major)
{
return true;
}
else if (version.Major < major)
{
return false;
}
if (version.Minor > minor)
{
return true;
}
else if (version.Minor < minor)
{
return false;
}
if (version.Build > patch)
{
return true;
}
else if (version.Build < patch)
{
return false;
}
return true;
}
private Version ParseVersion(string version)
{
var parsed = VersionRegex.Match(version); var parsed = VersionRegex.Match(version);
int actualMajor; int major;
int actualMinor; int minor;
int actualPatch; int patch;
string actualCandidate;
if (!parsed.Success) if (parsed.Success)
{
major = Convert.ToInt32(parsed.Groups["major"].Value);
minor = Convert.ToInt32(parsed.Groups["minor"].Value);
patch = Convert.ToInt32(parsed.Groups["patch"].Value.Replace("x", "0"));
}
else
{ {
if (!version.Equals("develop", StringComparison.InvariantCultureIgnoreCase)) if (!version.Equals("develop", StringComparison.InvariantCultureIgnoreCase))
{ {
return false; return null;
} }
actualMajor = 1; major = 1;
actualMinor = 1; minor = 1;
actualPatch = 0; patch = 0;
actualCandidate = null;
} }
else return new Version(major, minor, patch);
{
actualMajor = Convert.ToInt32(parsed.Groups["major"].Value);
actualMinor = Convert.ToInt32(parsed.Groups["minor"].Value);
actualPatch = Convert.ToInt32(parsed.Groups["patch"].Value.Replace("x", ""));
actualCandidate = parsed.Groups["candidate"].Value.ToUpper();
}
if (actualMajor > major)
{
return true;
}
else if (actualMajor < major)
{
return false;
}
if (actualMinor > minor)
{
return true;
}
else if (actualMinor < minor)
{
return false;
}
if (actualPatch > patch)
{
return true;
}
else if (actualPatch < patch)
{
return false;
}
if (actualCandidate.IsNullOrWhiteSpace())
{
return true;
}
else if (candidate.IsNullOrWhiteSpace())
{
return false;
}
else
{
return actualCandidate.CompareTo(candidate) > 0;
}
} }
private ValidationFailure TestConnectionAndVersion() private ValidationFailure TestConnectionAndVersion()
{ {
try try
{ {
var version = _proxy.GetVersion(Settings); var rawVersion = _proxy.GetVersion(Settings);
var parsed = VersionRegex.Match(version); var version = ParseVersion(rawVersion);
if (!parsed.Success) if (version == null)
{ {
if (version.Equals("develop", StringComparison.InvariantCultureIgnoreCase))
{
return new NzbDroneValidationFailure("Version", "Sabnzbd develop version, assuming version 1.1.0 or higher.")
{
IsWarning = true,
DetailedDescription = "Sonarr may not be able to support new features added to SABnzbd when running develop versions."
};
}
return new ValidationFailure("Version", "Unknown Version: " + version); return new ValidationFailure("Version", "Unknown Version: " + version);
} }
var major = Convert.ToInt32(parsed.Groups["major"].Value); if (rawVersion.Equals("develop", StringComparison.InvariantCultureIgnoreCase))
var minor = Convert.ToInt32(parsed.Groups["minor"].Value); {
return new NzbDroneValidationFailure("Version", "Sabnzbd develop version, assuming version 1.1.0 or higher.")
{
IsWarning = true,
DetailedDescription = "Sonarr may not be able to support new features added to SABnzbd when running develop versions."
};
}
if (major >= 1) if (version.Major >= 1)
{ {
return null; return null;
} }
if (minor >= 7) if (version.Minor >= 7)
{ {
return null; return null;
} }