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

Parse WEB at the end of release title.

This commit is contained in:
Taloth Saldono 2020-05-02 23:49:09 +02:00
parent 5d9dfee3c0
commit a2679f64ee
2 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/NzbDrone.Core.Test/ParserTests/QualityParserFixture.cs
View File

@ -226,6 +226,7 @@ namespace NzbDrone.Core.Test.ParserTests
[TestCase("Outlander.S04E03.The.False.Bride.1080p.NF.WEB.DDP5.1.x264-NTb[rartv]", false)] [TestCase("Outlander.S04E03.The.False.Bride.1080p.NF.WEB.DDP5.1.x264-NTb[rartv]", false)]
[TestCase("Legacies.S02E02.This.Year.Will.Be.Different.1080p.AMZN.WEB...", false)] [TestCase("Legacies.S02E02.This.Year.Will.Be.Different.1080p.AMZN.WEB...", false)]
[TestCase("Legacies.S02E02.This.Year.Will.Be.Different.1080p.AMZN.WEB.", false)] [TestCase("Legacies.S02E02.This.Year.Will.Be.Different.1080p.AMZN.WEB.", false)]
[TestCase("Series Title - S01E11 2020 1080p Viva MKV WEB", false)]
public void should_parse_webdl1080p_quality(string title, bool proper) public void should_parse_webdl1080p_quality(string title, bool proper)
{ {
ParseAndVerifyQuality(title, Quality.WEBDL1080p, proper); ParseAndVerifyQuality(title, Quality.WEBDL1080p, proper);

28
src/NzbDrone.Core/Parser/QualityParser.cs
View File

@ -16,7 +16,7 @@ namespace NzbDrone.Core.Parser
private static readonly Regex SourceRegex = new Regex(@"\b(?: private static readonly Regex SourceRegex = new Regex(@"\b(?:
(?<bluray>BluRay|Blu-Ray|HD-?DVD|BD(?!$))| (?<bluray>BluRay|Blu-Ray|HD-?DVD|BD(?!$))|
(?<webdl>WEB[-_. ]DL|WEBDL|AmazonHD|iTunesHD|MaxdomeHD|NetflixU?HD|WebHD|[. ]WEB[. ](?:[xh]26[45]|DDP?5[. ]1)|\d+0p(?:[-. ]AMZN)?[-. ]WEB[-. ]|WEB-DLMux|\b\s\/\sWEB\s\/\s\b|AMZN[. ]WEB[. ])| (?<webdl>WEB[-_. ]DL|WEBDL|AmazonHD|iTunesHD|MaxdomeHD|NetflixU?HD|WebHD|[. ]WEB[. ](?:[xh]26[45]|DDP?5[. ]1)|[. ](?-i:WEB)$|\d+0p(?:[-. ]AMZN)?[-. ]WEB[-. ]|WEB-DLMux|\b\s\/\sWEB\s\/\s\b|AMZN[. ]WEB[. ])|
(?<webrip>WebRip|Web-Rip|WEBMux)| (?<webrip>WebRip|Web-Rip|WEBMux)|
(?<hdtv>HDTV)| (?<hdtv>HDTV)|
(?<bdrip>BDRip)| (?<bdrip>BDRip)|
@ -86,7 +86,7 @@ namespace NzbDrone.Core.Parser
public static QualityModel ParseQualityName(string name) public static QualityModel ParseQualityName(string name)
{ {
var normalizedName = name.Replace('_', ' ').Trim().ToLower(); var normalizedName = name.Replace('_', ' ').Trim();
var result = ParseQualityModifiers(name, normalizedName); var result = ParseQualityModifiers(name, normalizedName);
if (RawHDRegex.IsMatch(normalizedName)) if (RawHDRegex.IsMatch(normalizedName))
@ -253,13 +253,13 @@ namespace NzbDrone.Core.Parser
sourceMatch.Groups["dsr"].Success || sourceMatch.Groups["dsr"].Success ||
sourceMatch.Groups["tvrip"].Success) sourceMatch.Groups["tvrip"].Success)
{ {
if (resolution == Resolution.R1080p || normalizedName.Contains("1080p")) if (resolution == Resolution.R1080p || normalizedName.ContainsIgnoreCase("1080p"))
{ {
result.Quality = Quality.HDTV1080p; result.Quality = Quality.HDTV1080p;
return result; return result;
} }
if (resolution == Resolution.R720p || normalizedName.Contains("720p")) if (resolution == Resolution.R720p || normalizedName.ContainsIgnoreCase("720p"))
{ {
result.Quality = Quality.HDTV720p; result.Quality = Quality.HDTV720p;
return result; return result;
@ -281,19 +281,19 @@ namespace NzbDrone.Core.Parser
if (AnimeBlurayRegex.Match(normalizedName).Success) if (AnimeBlurayRegex.Match(normalizedName).Success)
{ {
if (resolution == Resolution.R360P || resolution == Resolution.R480P || if (resolution == Resolution.R360P || resolution == Resolution.R480P ||
resolution == Resolution.R576p || normalizedName.Contains("480p")) resolution == Resolution.R576p || normalizedName.ContainsIgnoreCase("480p"))
{ {
result.Quality = Quality.DVD; result.Quality = Quality.DVD;
return result; return result;
} }
if (resolution == Resolution.R1080p || normalizedName.Contains("1080p")) if (resolution == Resolution.R1080p || normalizedName.ContainsIgnoreCase("1080p"))
{ {
result.Quality = remuxMatch ? Quality.Bluray1080pRemux : Quality.Bluray1080p; result.Quality = remuxMatch ? Quality.Bluray1080pRemux : Quality.Bluray1080p;
return result; return result;
} }
if (resolution == Resolution.R2160p || normalizedName.Contains("2160p")) if (resolution == Resolution.R2160p || normalizedName.ContainsIgnoreCase("2160p"))
{ {
result.Quality = remuxMatch ? Quality.Bluray2160pRemux : Quality.Bluray2160p; result.Quality = remuxMatch ? Quality.Bluray2160pRemux : Quality.Bluray2160p;
return result; return result;
@ -350,9 +350,9 @@ namespace NzbDrone.Core.Parser
result.Quality = Quality.SDTV; result.Quality = Quality.SDTV;
} }
if (normalizedName.Contains("1280x720")) if (normalizedName.ContainsIgnoreCase("1280x720"))
{ {
if (normalizedName.Contains("bluray")) if (normalizedName.ContainsIgnoreCase("bluray"))
{ {
result.Quality = Quality.Bluray720p; result.Quality = Quality.Bluray720p;
} }
@ -360,9 +360,9 @@ namespace NzbDrone.Core.Parser
result.Quality = Quality.HDTV720p; result.Quality = Quality.HDTV720p;
} }
if (normalizedName.Contains("1920x1080")) if (normalizedName.ContainsIgnoreCase("1920x1080"))
{ {
if (normalizedName.Contains("bluray")) if (normalizedName.ContainsIgnoreCase("bluray"))
{ {
result.Quality = Quality.Bluray1080p; result.Quality = Quality.Bluray1080p;
} }
@ -370,17 +370,17 @@ namespace NzbDrone.Core.Parser
result.Quality = Quality.HDTV1080p; result.Quality = Quality.HDTV1080p;
} }
if (normalizedName.Contains("bluray720p")) if (normalizedName.ContainsIgnoreCase("bluray720p"))
{ {
result.Quality = Quality.Bluray720p; result.Quality = Quality.Bluray720p;
} }
if (normalizedName.Contains("bluray1080p")) if (normalizedName.ContainsIgnoreCase("bluray1080p"))
{ {
result.Quality = Quality.Bluray1080p; result.Quality = Quality.Bluray1080p;
} }
if (normalizedName.Contains("bluray2160p")) if (normalizedName.ContainsIgnoreCase("bluray2160p"))
{ {
result.Quality = Quality.Bluray2160p; result.Quality = Quality.Bluray2160p;
} }