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

basic origin: implementation

This commit is contained in:
Jacob 2019-06-11 20:39:30 -05:00 committed by Taloth Saldono
parent a4086fd161
commit ef6dcc86c1
5 changed files with 74 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/NzbDrone.Core/DecisionEngine/Specifications/ReleaseRestrictionsSpecification.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Reflection;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
@ -16,6 +17,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
private readonly IReleaseProfileService _releaseProfileService;
private readonly ITermMatcherService _termMatcherService;
private static readonly Regex keyValueRegex = new Regex(@"^([^:]+):([^:]+)$");
public ReleaseRestrictionsSpecification(ITermMatcherService termMatcherService, IReleaseProfileService releaseProfileService, Logger logger)
{
_logger = logger;
@ -36,8 +39,6 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
var required = releaseProfiles.Where(r => r.Required.IsNotNullOrWhiteSpace());
var ignored = releaseProfiles.Where(r => r.Ignored.IsNotNullOrWhiteSpace());
var keyValueRegex = new Regex(@"\b\w+:\w+\b");
foreach (var r in required)
{
var requiredTerms = r.Required.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
@ -50,33 +51,8 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
var foundTerms = ContainsAny(reqTitleTerms, title);
// check key-value terms
foreach (var kv in reqKeyValues)
{
var key = kv.Split(':')[0];
var value = kv.Split(':')[1];
foundTerms.AddRange(ContainsAnyKeyValues(reqKeyValues, subject));
switch (key)
{
case "origin":
var origin = subject.Release.Origin;
if (origin.IsNotNullOrWhiteSpace())
{
if (string.Equals(origin, value, StringComparison.InvariantCultureIgnoreCase))
{
foundTerms.Add(kv);
}
}
else
{
_logger.Debug("{0} not found in release", key);
}
break;
default:
_logger.Debug("{0} is not a supported key", key);
break;
}
}
if (foundTerms.Empty())
{
@ -91,7 +67,16 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
{
var ignoredTerms = r.Ignored.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).ToList();
var foundTerms = ContainsAny(ignoredTerms, title);
// separate key-value terms and normal terms
var ignKeyValues = ignoredTerms.Where(kv => keyValueRegex.IsMatch(kv)).ToList();
var ignTitleTerms = ignoredTerms.Where(t => !keyValueRegex.IsMatch(t)).ToList();
// check title terms
var foundTerms = ContainsAny(ignTitleTerms, title);
// check key-value terms
foundTerms.AddRange(ContainsAnyKeyValues(ignKeyValues, subject));
if (foundTerms.Any())
{
var terms = string.Join(", ", foundTerms);
@ -107,5 +92,34 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
{
return terms.Where(t => _termMatcherService.IsMatch(t, title)).ToList();
}
private List<string> ContainsAnyKeyValues(List<string> terms, RemoteEpisode subject)
{
var foundTerms = new List<string>();
foreach (var kv in terms)
{
var match = keyValueRegex.Match(kv);
var key = match.Groups[1].Value;
var value = match.Groups[2].Value;
try
{
IReleaseFilter releaseFilter = Assembly.GetExecutingAssembly().
CreateInstance("NzbDrone.Core.Profiles.Releases." + key + "ReleaseFilter", true) as IReleaseFilter;
if (releaseFilter.Matches(value, subject))
{
foundTerms.Add(kv);
}
}
catch (NullReferenceException)
{
_logger.Debug("Unsupported key {0}", key);
}
}
return foundTerms;
}
}
}

2
src/NzbDrone.Core/NzbDrone.Core.csproj
View File

@ -1170,6 +1170,8 @@
<Compile Include="Queue\Queue.cs" />
<Compile Include="Queue\QueueService.cs" />
<Compile Include="Queue\QueueUpdatedEvent.cs" />
<Compile Include="Profiles\Releases\ReleaseFilters\IReleaseFilter.cs" />
<Compile Include="Profiles\Releases\ReleaseFilters\OriginReleaseFilter.cs" />
<Compile Include="Profiles\Releases\PerlRegexFactory.cs" />
<Compile Include="Profiles\Releases\ReleaseProfile.cs" />
<Compile Include="Profiles\Releases\ReleaseProfileRepository.cs" />

13
src/NzbDrone.Core/Profiles/Releases/ReleaseFilters/IReleaseFilter.cs Normal file
View File

@ -0,0 +1,13 @@
using System.Collections.Generic;
using System;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.Profiles.Releases
{
public interface IReleaseFilter
{
string Key { get; }
bool Matches(string filterValue, RemoteEpisode subject);
//List<string> SuggestAutoComplete(string filterValue, int indexerId);
}
}

15
src/NzbDrone.Core/Profiles/Releases/ReleaseFilters/OriginReleaseFilter.cs Normal file
View File

@ -0,0 +1,15 @@
using System;
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.Profiles.Releases
{
public class OriginReleaseFilter : IReleaseFilter
{
public string Key => "Origin";
public bool Matches(string filterValue, RemoteEpisode subject)
{
return filterValue.Equals(subject.Release.Origin, StringComparison.InvariantCultureIgnoreCase);
}
}
}

2
src/NzbDrone.Core/Profiles/Releases/ReleaseProfileService.cs
View File

@ -47,7 +47,7 @@ namespace NzbDrone.Core.Profiles.Releases
{
return (List<ReleaseProfile>)AllForTags(tagIds)
.Where(r => r.Enabled)
.Where(r => r.IndexerId == indexerId || r.IndexerId == 0);
.Where(r => r.IndexerId == indexerId || r.IndexerId == 0).ToList();
}
public ReleaseProfile Get(int id)