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

Improve the fuzzy matching (#522)

Browse Source 
* Fixed: improve track matching

* Deal with tracks sequentially numbered across discs
This commit is contained in:
ta264
2018-11-16 17:46:46 +00:00
committed by Qstick
parent 8320508688
commit e260a29b57
19 changed files with 767 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Parser/Parser.cs
+27 -4
View File
@@ -208,6 +208,14 @@ namespace NzbDrone.Core.Parser
new Regex(@"(\[|\()*\b((featuring|feat.|feat|ft|ft.)\s{1}){1}\s*.*(\]|\))*", RegexOptions.IgnoreCase | RegexOptions.Compiled),
new Regex(@"(?:\(|\[)(?:[^\(\[]*)(?:version|limited|deluxe|single|clean|album|special|bonus|promo|remastered)(?:[^\)\]]*)(?:\)|\])", RegexOptions.IgnoreCase | RegexOptions.Compiled)
};
private static readonly Regex[] BracketRegex = new Regex[]
{
new Regex(@"\(.*\)", RegexOptions.Compiled),
new Regex(@"\[.*\]", RegexOptions.Compiled)
};
private static readonly Regex AfterDashRegex = new Regex(@"[-:].*", RegexOptions.Compiled);
public static ParsedTrackInfo ParseMusicPath(string path)
{
@@ -528,14 +536,13 @@ namespace NzbDrone.Core.Parser
return NormalizeRegex.Replace(name, string.Empty).ToLower().RemoveAccent();
}
public static string NormalizeTrackTitle(string title)
public static string NormalizeTrackTitle(this string title)
{
title = SpecialEpisodeWordRegex.Replace(title, string.Empty);
title = PunctuationRegex.Replace(title, " ");
title = DuplicateSpacesRegex.Replace(title, " ");
return title.Trim()
.ToLower();
return title.Trim().ToLower();
}
public static string NormalizeTitle(string title)
@@ -601,6 +608,22 @@ namespace NzbDrone.Core.Parser
return CommonTagRegex[1].Replace(album, string.Empty).Trim();
}
public static string RemoveBracketsAndContents(this string album)
{
var intermediate = album;
foreach (var regex in BracketRegex)
{
intermediate = regex.Replace(intermediate, string.Empty).Trim();
}
return intermediate;
}
public static string RemoveAfterDash(this string text)
{
return AfterDashRegex.Replace(text, string.Empty).Trim();
}
public static string CleanTrackTitle(string title)
{
var intermediateTitle = title;
@@ -619,7 +642,7 @@ namespace NzbDrone.Core.Parser
var trackNumber = file.Tag.Track;
var trackTitle = file.Tag.Title;
var discNumber = (file.Tag.Disc > 0) ? Convert.ToInt32(file.Tag.Disc) : 1;
var discNumber = (int)file.Tag.Disc;
var artist = file.Tag.FirstAlbumArtist;