shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

[enhancement] Handle optional field without exceptions (#11669)

Browse Source 
In the optional fields parsing, it is no exceptional case that the selector finds nothing.
Return null value instead throwing exception increase the performance.
This commit is contained in:
Alessio Gogna
2021-05-03 21:59:37 +02:00
committed by GitHub
parent 98dad4c169
commit 993116c96f
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Jackett.Common/Indexers/CardigannIndexer.cs
View File

@@ -1129,7 +1129,7 @@ namespace Jackett.Common.Indexers
return Element.QuerySelector(Selector); return Element.QuerySelector(Selector);
} }
protected string handleSelector(selectorBlock Selector, IElement Dom, Dictionary<string, object> variables = null) protected string handleSelector(selectorBlock Selector, IElement Dom, Dictionary<string, object> variables = null, bool required = true)
{ {
if (Selector.Text != null) if (Selector.Text != null)
{ {
@@ -1147,7 +1147,9 @@ namespace Jackett.Common.Indexers
selection = QuerySelector(Dom, Selector.Selector); selection = QuerySelector(Dom, Selector.Selector);
if (selection == null) if (selection == null)
{ {
throw new Exception(string.Format("Selector \"{0}\" didn't match {1}", Selector.Selector, Dom.ToHtmlPretty())); if (required)
throw new Exception(string.Format("Selector \"{0}\" didn't match {1}", Selector.Selector, Dom.ToHtmlPretty()));
return null;
} }
} }
@@ -1170,13 +1172,21 @@ namespace Jackett.Common.Indexers
} }
} }
if (value == null) if (value == null)
throw new Exception(string.Format("None of the case selectors \"{0}\" matched {1}", string.Join(",", Selector.Case), selection.ToHtmlPretty())); {
if (required)
throw new Exception(string.Format("None of the case selectors \"{0}\" matched {1}", string.Join(",", Selector.Case), selection.ToHtmlPretty()));
return null;
}
} }
else if (Selector.Attribute != null) else if (Selector.Attribute != null)
{ {
value = selection.GetAttribute(Selector.Attribute); value = selection.GetAttribute(Selector.Attribute);
if (value == null) if (value == null)
throw new Exception(string.Format("Attribute \"{0}\" is not set for element {1}", Selector.Attribute, selection.ToHtmlPretty())); {
if (required)
throw new Exception(string.Format("Attribute \"{0}\" is not set for element {1}", Selector.Attribute, selection.ToHtmlPretty()));
return null;
}
} }
else else
{ {
@@ -1401,9 +1411,16 @@ namespace Jackett.Common.Indexers
string value = null; string value = null;
var variablesKey = ".Result." + FieldName; var variablesKey = ".Result." + FieldName;
var isOptional = OptionalFields.Contains(Field.Key) || FieldModifiers.Contains("optional") || Field.Value.Optional;
try try
{ {
value = handleSelector(Field.Value, Row, variables); value = handleSelector(Field.Value, Row, variables, !isOptional);
if (isOptional && value == null)
{
variables[variablesKey] = null;
continue;
}
switch (FieldName) switch (FieldName)
{ {
case "download": case "download":
@@ -1560,7 +1577,7 @@ namespace Jackett.Common.Indexers
{ {
if (!variables.ContainsKey(variablesKey)) if (!variables.ContainsKey(variablesKey))
variables[variablesKey] = null; variables[variablesKey] = null;
if (OptionalFields.Contains(Field.Key) || FieldModifiers.Contains("optional") || Field.Value.Optional) if (isOptional)
{ {
variables[variablesKey] = null; variables[variablesKey] = null;
continue; continue;