mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-02-07 23:33:52 +00:00
Code Issues Releases Wiki Activity

Fixed: Better language parsing of releases

Browse source 
#ND-120 fixed
This commit is contained in:
Mark McDowall 2012-12-31 11:27:45 -08:00
parent 2235b83809
commit c738a32162
3 changed files with 23 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
NzbDrone.Core.Test/ParserFixture/ParserTest.cs
View file

@ -319,6 +319,9 @@ public void parse_series_name(string postTitle, string title)
[TestCase("Castle.2009.S01E14.Turkish.HDTV.XviD-LOL", LanguageType.Turkish)] [TestCase("Castle.2009.S01E14.Turkish.HDTV.XviD-LOL", LanguageType.Turkish)]
[TestCase("Castle.2009.S01E14.Portuguese.HDTV.XviD-LOL", LanguageType.Portuguese)] [TestCase("Castle.2009.S01E14.Portuguese.HDTV.XviD-LOL", LanguageType.Portuguese)]
[TestCase("Castle.2009.S01E14.HDTV.XviD-LOL", LanguageType.English)] [TestCase("Castle.2009.S01E14.HDTV.XviD-LOL", LanguageType.English)]
[TestCase("person.of.interest.1x19.ita.720p.bdmux.x264-novarip", LanguageType.Italian)]
[TestCase("Salamander.S01E01.FLEMISH.HDTV.x264-BRiGAND", LanguageType.Flemish)]
[TestCase("H.Polukatoikia.S03E13.Greek.PDTV.XviD-Ouzo", LanguageType.Greek)]
public void parse_language(string postTitle, LanguageType language) public void parse_language(string postTitle, LanguageType language)
{ {
var result = Parser.ParseLanguage(postTitle); var result = Parser.ParseLanguage(postTitle);

4
NzbDrone.Core/Model/LanguageType.cs
View file

@ -20,6 +20,8 @@ public enum LanguageType
Norwegian = 15, Norwegian = 15,
Finnish = 16, Finnish = 16,
Turkish = 17, Turkish = 17,
Portuguese = 18 Portuguese = 18,
Flemish = 19,
Greek = 20
} }
} }

28
NzbDrone.Core/Parser.cs
View file

@ -1,4 +1,4 @@
using System;  using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
@ -85,6 +85,8 @@ public static class Parser
private static readonly Regex MultiPartCleanupRegex = new Regex(@"\(\d+\)$", RegexOptions.Compiled); private static readonly Regex MultiPartCleanupRegex = new Regex(@"\(\d+\)$", RegexOptions.Compiled);
private static readonly Regex LanguageRegex = new Regex(@"(?:\W|_)(?<italian>ita|italian)|(?<german>german\b)|(?<flemish>flemish)|(?<greek>greek)(?:\W|_)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
internal static EpisodeParseResult ParsePath(string path) internal static EpisodeParseResult ParsePath(string path)
{ {
var fileInfo = new FileInfo(path); var fileInfo = new FileInfo(path);
@ -388,16 +390,6 @@ internal static LanguageType ParseLanguage(string title)
if (lowerTitle.Contains("spanish")) if (lowerTitle.Contains("spanish"))
return LanguageType.Spanish; return LanguageType.Spanish;
if (lowerTitle.Contains("german"))
{
//Make sure it doesn't contain Germany (Since we're not using REGEX for all this)
if (!lowerTitle.Contains("germany"))
return LanguageType.German;
}
if (lowerTitle.Contains("italian"))
return LanguageType.Italian;
if (lowerTitle.Contains("danish")) if (lowerTitle.Contains("danish"))
return LanguageType.Danish; return LanguageType.Danish;
@ -440,6 +432,20 @@ internal static LanguageType ParseLanguage(string title)
if (lowerTitle.Contains("portuguese")) if (lowerTitle.Contains("portuguese"))
return LanguageType.Portuguese; return LanguageType.Portuguese;
var match = LanguageRegex.Match(title);
if (match.Groups["italian"].Captures.Cast<Capture>().Any())
return LanguageType.Italian;
if (match.Groups["german"].Captures.Cast<Capture>().Any())
return LanguageType.German;
if (match.Groups["flemish"].Captures.Cast<Capture>().Any())
return LanguageType.Flemish;
if (match.Groups["greek"].Captures.Cast<Capture>().Any())
return LanguageType.Greek;
return LanguageType.English; return LanguageType.English;
} }