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

Fixed: Refresh movie failing.

This commit is contained in:
Leonardo Galli 2017-08-27 18:55:55 +02:00
parent ba531fff4d
commit fc805e5078
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/NzbDrone.Core/Parser/IsoLanguage.cs
View File

@ -1,9 +1,13 @@
namespace NzbDrone.Core.Parser using System.Collections.Generic;
using System.Linq;
namespace NzbDrone.Core.Parser
{ {
public class IsoLanguage public class IsoLanguage
{ {
public string TwoLetterCode { get; set; } public string TwoLetterCode { get; set; }
public string ThreeLetterCode { get; set; } public string ThreeLetterCode { get; set; }
public List<string> AltCodes = new List<string>();
public Language Language { get; set; } public Language Language { get; set; }
public IsoLanguage(string twoLetterCode, string threeLetterCode, Language language) public IsoLanguage(string twoLetterCode, string threeLetterCode, Language language)
@ -13,5 +17,14 @@
Language = language; Language = language;
} }
public IsoLanguage(List<string> twoLetterCodes, string threeLetterCode, Language language)
{
TwoLetterCode = twoLetterCodes.First();
twoLetterCodes.RemoveAt(0);
ThreeLetterCode = threeLetterCode;
Language = language;
AltCodes.AddRange(twoLetterCodes);
}
} }
} }

6
src/NzbDrone.Core/Parser/IsoLanguages.cs
View File

@ -7,9 +7,7 @@ namespace NzbDrone.Core.Parser
{ {
private static readonly HashSet<IsoLanguage> All = new HashSet<IsoLanguage> private static readonly HashSet<IsoLanguage> All = new HashSet<IsoLanguage>
{ {
new IsoLanguage("en", "eng", Language.English), new IsoLanguage(new List<string> {"en", "us", "uk"}, "eng", Language.English),
new IsoLanguage("us", "usa", Language.English), //For tmdb mapping
new IsoLanguage("uk", "brit", Language.English), //For tmdb mapping too.
new IsoLanguage("fr", "fra", Language.French), new IsoLanguage("fr", "fra", Language.French),
new IsoLanguage("es", "spa", Language.Spanish), new IsoLanguage("es", "spa", Language.Spanish),
new IsoLanguage("de", "deu", Language.German), new IsoLanguage("de", "deu", Language.German),
@ -39,7 +37,7 @@ namespace NzbDrone.Core.Parser
if (isoCode.Length == 2) if (isoCode.Length == 2)
{ {
//Lookup ISO639-1 code //Lookup ISO639-1 code
return All.SingleOrDefault(l => l.TwoLetterCode == isoCode); return All.SingleOrDefault(l => l.TwoLetterCode == isoCode) ?? All.SingleOrDefault(l => l.AltCodes.Contains(isoCode));
} }
else if (isoCode.Length == 3) else if (isoCode.Length == 3)
{ {