tedkulp/Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2026-04-27 23:16:58 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a few parser issues. Also added some tests.

Browse Source 
Fixes #549
This commit is contained in:
Leonardo Galli
2017-02-10 19:00:16 +01:00
parent 4e8089dd42
commit bc1a47ff5a
2 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Parser/Parser.cs
+32 -2
View File
@@ -33,6 +33,11 @@ namespace NzbDrone.Core.Parser
//That did not work? Maybe some tool uses [] for years. Who would do that?
new Regex(@"^(?<title>(?![(\[]).+?)?(?:(?:[-_\W](?<![)!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\W\d+)))+(\W+|_|$)(?!\\)",
RegexOptions.IgnoreCase | RegexOptions.Compiled),
//As a last resort for movies that have ( or [ in their title.
new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(19|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)",
RegexOptions.IgnoreCase | RegexOptions.Compiled),
};
private static readonly Regex[] ReportMovieTitleFolderRegex = new[]
@@ -357,7 +362,7 @@ namespace NzbDrone.Core.Parser
{
if (!ValidateBeforeParsing(title)) return null;
title = title.Replace(" ", "."); //TODO: Determine if this breaks something. However, it shouldn't.
//title = title.Replace(" ", "."); //TODO: Determine if this breaks something. However, it shouldn't.
Logger.Debug("Parsing string '{0}'", title);
@@ -704,9 +709,34 @@ namespace NzbDrone.Core.Parser
}
var seriesName = matchCollection[0].Groups["title"].Value.Replace('.', ' ').Replace('_', ' ');
var seriesName = matchCollection[0].Groups["title"].Value./*Replace('.', ' ').*/Replace('_', ' ');
seriesName = RequestInfoRegex.Replace(seriesName, "").Trim(' ');
var parts = seriesName.Split('.');
seriesName = "";
int n;
bool previousAcronym = false;
foreach (var part in parts)
{
if (part.Length == 1 && part.ToLower() != "a" && !int.TryParse(part, out n))
{
seriesName += part + ".";
previousAcronym = true;
}
else
{
if (previousAcronym)
{
seriesName += " ";
previousAcronym = false;
}
seriesName += part + " ";
}
}
seriesName = seriesName.Trim(' ');
int airYear;
int.TryParse(matchCollection[0].Groups["year"].Value, out airYear);