mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

cardigann: Convert to the GoTemplate standard the Range with Index statement.

This commit is contained in:
Garfield69 2022-06-27 19:54:35 +12:00
parent d3c9328575
commit 6f33f34f46
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -457,7 +457,7 @@ namespace Jackett.Common.Indexers
}
// handle range expression
var RangeRegex = new Regex(@"{{\s*range\s*(.+?)\s*}}(.*?){{\.}}(.*?){{end}}");
var RangeRegex = new Regex(@"{{\s*range\s*(((?<index>\$.+?),)((\s*(?<element>.+?)\s*(:=)\s*)))?(?<variable>.+?)\s*}}(?<prefix>.*?){{\.}}(?<postfix>.*?){{end}}");
var RangeRegexMatches = RangeRegex.Match(template);
while (RangeRegexMatches.Success)
@ -465,25 +465,29 @@ namespace Jackett.Common.Indexers
var expanded = string.Empty;
var all = RangeRegexMatches.Groups[0].Value;
var variable = RangeRegexMatches.Groups[1].Value;
var prefix = RangeRegexMatches.Groups[2].Value;
var postfix = RangeRegexMatches.Groups[3].Value;
var hasArrayIndex = prefix.Contains("[*]");
var arrayIndex = -1;
if (hasArrayIndex)
prefix = prefix.Replace("[*]", "[-1]");
var index = RangeRegexMatches.Groups["index"].Value;
var variable = RangeRegexMatches.Groups["variable"].Value;
var prefix = RangeRegexMatches.Groups["prefix"].Value;
var postfix = RangeRegexMatches.Groups["postfix"].Value;
var arrayIndex = 0;
var indexReplace = "{{" + index + "}}";
foreach (var value in (ICollection<string>)variables[variable])
{
var newvalue = value;
if (modifier != null)
newvalue = modifier(newvalue);
if (hasArrayIndex)
var indexValue = arrayIndex++;
if (index != null)
{
prefix = prefix.Replace("[" + arrayIndex.ToString() + "]", "[" + (arrayIndex + 1).ToString() + "]");
arrayIndex++;
expanded += prefix.Replace(indexReplace, indexValue.ToString()) + newvalue + postfix.Replace(indexReplace, indexValue.ToString());
}
else
{
expanded += prefix + newvalue + postfix;
}
expanded += prefix + newvalue + postfix;
}
template = template.Replace(all, expanded);
RangeRegexMatches = RangeRegexMatches.NextMatch();