fergalmoran/Readarr
1
0
Fork 0
mirror of https://github.com/fergalmoran/Readarr.git synced 2026-01-18 14:44:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Better detection of series in search results

Browse Source
This commit is contained in:
ta264
2021-09-01 21:04:39 +01:00
parent 5f1be9e447
commit 17535bd8d6
2 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/NzbDrone.Core.Test/MetadataSource/Goodreads/GoodreadsProxySearchFixture.cs
View File

@@ -116,5 +116,16 @@ namespace NzbDrone.Core.Test.MetadataSource.Goodreads
link.Series.Value.Title.Should().Be(series);
link.Position.Should().Be(position);
}
[TestCase("Imperium: A Novel of Ancient Rome (Cicero, #1)", "Imperium: A Novel of Ancient Rome", "Cicero", "1")]
[TestCase("Sons of Valor (The Tier One Shared-World Series Book 1)", "Sons of Valor", "Tier One Shared-World", "1")]
public void should_map_series_for_search(string title, string titleWithoutSeries, string series, string position)
{
var result = GoodreadsProxy.MapSearchSeries(title, titleWithoutSeries);
result.Should().HaveCount(1);
result[0].Series.Value.Title.Should().Be(series);
result[0].Position.Should().Be(position);
}
}
}

38
src/NzbDrone.Core/MetadataSource/Goodreads/GoodreadsProxy.cs
View File

@@ -28,8 +28,11 @@ namespace NzbDrone.Core.MetadataSource.Goodreads
private static readonly Regex NoPhotoRegex = new Regex(@"/nophoto/(book|user)/",
RegexOptions.IgnoreCase | RegexOptions.Compiled);
private static readonly Regex SeriesRegex = new Regex(@"\((?<series>[^,]+),\s+#(?<position>[\w\d\.]+)\)$",
RegexOptions.Compiled);
private static readonly List<Regex> SeriesRegex = new List<Regex>
{
new Regex(@"\((?<series>[^,]+),\s+#(?<position>[\w\d\.]+)\)$", RegexOptions.Compiled),
new Regex(@"(The\s+(?<series>.+)\s+Series\s+Book\s+(?<position>[\w\d\.]+)\)$)", RegexOptions.Compiled)
};
private readonly ICachedHttpResponseService _cachedHttpClient;
private readonly Logger _logger;
@@ -841,31 +844,34 @@ namespace NzbDrone.Core.MetadataSource.Goodreads
return book;
}
private static List<SeriesBookLink> MapSearchSeries(string title, string titleWithoutSeries)
public static List<SeriesBookLink> MapSearchSeries(string title, string titleWithoutSeries)
{
if (title != titleWithoutSeries &&
title.Substring(0, titleWithoutSeries.Length) == titleWithoutSeries)
{
var seriesText = title.Substring(titleWithoutSeries.Length);
var match = SeriesRegex.Match(seriesText);
if (match.Success)
foreach (var regex in SeriesRegex)
{
var series = match.Groups["series"].Value;
var position = match.Groups["position"].Value;
var match = regex.Match(seriesText);
return new List<SeriesBookLink>
if (match.Success)
{
new SeriesBookLink
var series = match.Groups["series"].Value;
var position = match.Groups["position"].Value;
return new List<SeriesBookLink>
{
Series = new Series
new SeriesBookLink
{
Title = series
},
Position = position
}
};
Series = new Series
{
Title = series
},
Position = position
}
};
}
}
}