tedkulp/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr.git synced 2026-04-24 22:35:39 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: Search Criteria parsing returns bad results (Abba/Black Sabbath)

Browse Source
This commit is contained in:
Qstick
2017-12-21 23:16:36 -05:00
parent 882e8a575e
commit 66d3fd17e9
2 changed files with 79 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Parser/Parser.cs
+38 -22
View File
@@ -346,32 +346,48 @@ namespace NzbDrone.Core.Parser
simpleTitle = CleanTorrentSuffixRegex.Replace(simpleTitle, string.Empty);
var result = new ParsedAlbumInfo();
var releaseRegex = new Regex(@"\b(?<artist>" + artist.Name + @")\b.*\b(?<album>"+ string.Join("|",album.Select(s=>s.Title).ToList()) + @")\b",
RegexOptions.IgnoreCase | RegexOptions.Compiled);
if (simpleTitle.ToLowerInvariant().Contains(artist.Name.ToLowerInvariant()))
var match = releaseRegex.Matches(simpleTitle);
if (match.Count != 0)
{
result.ArtistName = artist.Name;
var artistRegex = new Regex(Regex.Escape(artist.Name.ToLowerInvariant()));
var albumReleaseString = artistRegex.Replace(simpleTitle.ToLowerInvariant(), string.Empty, 1);
var selectedAlbum = album.FirstOrDefault(s => albumReleaseString.Contains(s.Title.ToLowerInvariant()));
if (selectedAlbum != null)
try
{
result.AlbumTitle = selectedAlbum.Title;
var result = ParseAlbumMatchCollection(match);
if (result != null)
{
result.Language = LanguageParser.ParseLanguage(releaseTitle);
Logger.Debug("Language parsed: {0}", result.Language);
result.Quality = QualityParser.ParseQuality(title, null, 0);
Logger.Debug("Quality parsed: {0}", result.Quality);
result.ReleaseGroup = ParseReleaseGroup(releaseTitle);
var subGroup = GetSubGroup(match);
if (!subGroup.IsNullOrWhiteSpace())
{
result.ReleaseGroup = subGroup;
}
Logger.Debug("Release Group parsed: {0}", result.ReleaseGroup);
result.ReleaseHash = GetReleaseHash(match);
if (!result.ReleaseHash.IsNullOrWhiteSpace())
{
Logger.Debug("Release Hash parsed: {0}", result.ReleaseHash);
}
return result;
}
}
catch (InvalidDateException ex)
{
Logger.Debug(ex, ex.Message);
}
result.Language = LanguageParser.ParseLanguage(releaseTitle);
Logger.Debug("Language parsed: {0}", result.Language);
result.Quality = QualityParser.ParseQuality(title, null, 0);
Logger.Debug("Quality parsed: {0}", result.Quality);
result.ReleaseGroup = ParseReleaseGroup(releaseTitle);
Logger.Debug("Release Group parsed: {0}", result.ReleaseGroup);
return result;
}
}
catch (Exception e)