open-source-mirrors
/
Prowlarr
mirror of https://github.com/Prowlarr/Prowlarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

New: (Cardigann) Bump to v9 (#1551)

Browse Source 
* New: (Cardigann) Add MissingAttributeEqualsNoResults support

(cherry picked from commit 4e8bb37a5c)

* New: (Cardigann) Add AllowEmptyInputs

* New: (Cardigann) Bump to v9

* New: (Cardigann) Add default value for fields
pull/1492/head
Bogdan 2 years ago committed by GitHub
parent 26f700731b
commit bceebc34c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 58 additions and 18 deletions
Show Stats Download Patch File Download Diff File

2
src/NzbDrone.Core/IndexerVersions/IndexerDefinitionUpdateService.cs
Unescape View File

@ -29,7 +29,7 @@ namespace NzbDrone.Core.IndexerVersions
/* Update Service will fall back if version # does not exist for an indexer per Ta */
private const string DEFINITION_BRANCH = "master";
private const int DEFINITION_VERSION = 8;
private const int DEFINITION_VERSION = 9;
// Used when moving yml to C#
private readonly List<string> _definitionBlocklist = new ()

16
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannBase.cs
Unescape View File

@ -825,9 +825,19 @@ namespace NzbDrone.Core.Indexers.Cardigann
protected JArray JsonParseRowsSelector(JToken parsedJson, string rowSelector)
{
var selector = rowSelector.Split(':')[0];
var rowsObj = parsedJson.SelectToken(selector).Value<JArray>();
return new JArray(rowsObj.Where(t =>
JsonParseFieldSelector(t.Value<JObject>(), rowSelector.Remove(0, selector.Length)) != null));
try
{
var rowsObj = parsedJson.SelectToken(selector).Value<JArray>();
return new JArray(rowsObj.Where(t => JsonParseFieldSelector(t.Value<JObject>(), rowSelector.Remove(0, selector.Length)) != null));
}
catch (Exception ex)
{
_logger.Trace(ex, "Failed to parse JSON rows for selector \"{0}\"", rowSelector);
return null;
}
}
private string JsonParseFieldSelector(JToken parsedJson, string rowSelector)

3
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannDefinition.cs
Unescape View File

@ -116,6 +116,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
{
public string Selector { get; set; }
public bool Optional { get; set; }
public string Default { get; set; }
public string Text { get; set; }
public string Attribute { get; set; }
public string Remove { get; set; }
@ -146,6 +147,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
public List<SearchPathBlock> Paths { get; set; }
public Dictionary<string, List<string>> Headers { get; set; }
public List<FilterBlock> Keywordsfilters { get; set; }
public bool AllowEmptyInputs { get; set; }
public Dictionary<string, string> Inputs { get; set; }
public List<ErrorBlock> Error { get; set; }
public List<FilterBlock> Preprocessingfilters { get; set; }
@ -159,6 +161,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
public SelectorBlock Dateheaders { get; set; }
public SelectorBlock Count { get; set; }
public bool Multiple { get; set; }
public bool MissingAttributeEqualsNoResults { get; set; }
}
public class SearchPathBlock : RequestBlock

47
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannParser.cs
Unescape View File

@ -90,8 +90,14 @@ namespace NzbDrone.Core.Indexers.Cardigann
}
var rowsArray = JsonParseRowsSelector(parsedJson, search.Rows.Selector);
if (rowsArray == null)
{
if (search.Rows.MissingAttributeEqualsNoResults)
{
return releases;
}
throw new IndexerException(indexerResponse, "Error Parsing Rows Selector");
}
@ -117,6 +123,7 @@ namespace NzbDrone.Core.Indexers.Cardigann
string value = null;
var variablesKey = ".Result." + fieldName;
var isOptional = OptionalFields.Contains(field.Key) || fieldModifiers.Contains("optional") || field.Value.Optional;
try
{
var parentObj = mulRow;
@ -126,28 +133,35 @@ namespace NzbDrone.Core.Indexers.Cardigann
}
value = HandleJsonSelector(field.Value, parentObj, variables, !isOptional);
if (isOptional && string.IsNullOrWhiteSpace(value))
if (isOptional && value.IsNullOrWhiteSpace())
{
variables[variablesKey] = null;
continue;
var defaultValue = ApplyGoTemplateText(field.Value.Default, variables);
if (defaultValue.IsNullOrWhiteSpace())
{
variables[variablesKey] = null;
continue;
}
value = defaultValue;
}
variables[variablesKey] = ParseFields(value, fieldName, release, fieldModifiers, searchUrlUri);
}
catch (Exception ex)
{
if (!variables.ContainsKey(variablesKey))
if (!variables.ContainsKey(variablesKey) || isOptional)
{
variables[variablesKey] = null;
}
if (isOptional)
{
variables[variablesKey] = null;
continue;
}
throw new CardigannException(string.Format("Error while parsing field={0}, selector={1}, value={2}: {3}", field.Key, field.Value.Selector, value ?? "<null>", ex.Message));
throw new CardigannException($"Error while parsing field={field.Key}, selector={field.Value.Selector}, value={value ?? "<null>"}: {ex.Message}", ex);
}
}
@ -248,34 +262,41 @@ namespace NzbDrone.Core.Indexers.Cardigann
string value = null;
var variablesKey = ".Result." + fieldName;
var isOptional = OptionalFields.Contains(field.Key) || fieldModifiers.Contains("optional") || field.Value.Optional;
try
{
value = HandleSelector(field.Value, row, variables, !isOptional);
if (isOptional && string.IsNullOrWhiteSpace(value))
if (isOptional && value.IsNullOrWhiteSpace())
{
variables[variablesKey] = null;
continue;
var defaultValue = ApplyGoTemplateText(field.Value.Default, variables);
if (defaultValue.IsNullOrWhiteSpace())
{
variables[variablesKey] = null;
continue;
}
value = defaultValue;
}
variables[variablesKey] = ParseFields(value, fieldName, release, fieldModifiers, searchUrlUri);
}
catch (Exception ex)
{
if (!variables.ContainsKey(variablesKey))
if (!variables.ContainsKey(variablesKey) || isOptional)
{
variables[variablesKey] = null;
}
if (OptionalFields.Contains(field.Key) || fieldModifiers.Contains("optional") || field.Value.Optional)
if (isOptional)
{
variables[variablesKey] = null;
continue;
}
if (indexerLogging)
{
_logger.Trace("Error while parsing field={0}, selector={1}, value={2}: {3}", field.Key, field.Value.Selector, value == null ? "<null>" : value, ex.Message);
_logger.Trace(ex, "Error while parsing field={0}, selector={1}, value={2}: {3}", field.Key, field.Value.Selector, value ?? "<null>", ex.Message);
}
}
}

8
src/NzbDrone.Core/Indexers/Definitions/Cardigann/CardigannRequestGenerator.cs
Unescape View File

@ -9,6 +9,7 @@ using AngleSharp.Html.Dom;
using AngleSharp.Html.Parser;
using Newtonsoft.Json.Linq;
using NLog;
using NzbDrone.Common.Extensions;
using NzbDrone.Common.Http;
using NzbDrone.Core.Configuration;
using NzbDrone.Core.Indexers.Definitions.Cardigann;
@ -1119,7 +1120,12 @@ namespace NzbDrone.Core.Indexers.Cardigann
}
else
{
queryCollection.Add(input.Key, ApplyGoTemplateText(input.Value, variables));
var inputValue = ApplyGoTemplateText(input.Value, variables);
if (inputValue.IsNotNullOrWhiteSpace() || search.AllowEmptyInputs)
{
queryCollection.Add(input.Key, inputValue);
}
}
}
}

Write Preview
Loading…
Cancel
Save