shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-28 13:01:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Languages not showing up correctly.

Browse Source
This commit is contained in:
Leonardo Galli
2018-08-07 17:36:50 +02:00
parent b7e35fada8
commit b865103871
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/NzbDrone.Core/DecisionEngine/Specifications/LanguageSpecification.cs
View File

@@ -1,5 +1,6 @@
using NLog; using NLog;
using NzbDrone.Core.IndexerSearch.Definitions; using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Parser;
using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.DecisionEngine.Specifications namespace NzbDrone.Core.DecisionEngine.Specifications
@@ -19,12 +20,12 @@ namespace NzbDrone.Core.DecisionEngine.Specifications
{ {
var wantedLanguage = subject.Movie.Profile.Value.Language; var wantedLanguage = subject.Movie.Profile.Value.Language;
_logger.Debug("Checking if report meets language requirements. {0}", subject.ParsedMovieInfo.Languages); _logger.Debug("Checking if report meets language requirements. {0}", subject.ParsedMovieInfo.Languages.ToExtendedString());
if (!subject.ParsedMovieInfo.Languages.Contains(wantedLanguage)) if (!subject.ParsedMovieInfo.Languages.Contains(wantedLanguage))
{ {
_logger.Debug("Report Language: {0} rejected because it is not wanted, wanted {1}", subject.ParsedMovieInfo.Languages, wantedLanguage); _logger.Debug("Report Language: {0} rejected because it is not wanted, wanted {1}", subject.ParsedMovieInfo.Languages.ToExtendedString(), wantedLanguage);
return Decision.Reject("{0} is wanted, but found {1}", wantedLanguage, subject.ParsedMovieInfo.Languages); return Decision.Reject("{0} is wanted, but found {1}", wantedLanguage, subject.ParsedMovieInfo.Languages.ToExtendedString());
} }
return Decision.Accept(); return Decision.Accept();

13
src/NzbDrone.Core/Parser/Language.cs
View File

@@ -1,4 +1,7 @@
namespace NzbDrone.Core.Parser using System.Collections.Generic;
using System.Linq;
namespace NzbDrone.Core.Parser
{ {
public enum Language public enum Language
{ {
@@ -27,4 +30,12 @@
Hungarian = 22, Hungarian = 22,
Hebrew = 23 Hebrew = 23
} }
public static class LanguageExtensions
{
public static string ToExtendedString(this IEnumerable<Language> languages)
{
return string.Join(", ", languages.Select(l => l.ToString()));
}
}
} }

2
src/NzbDrone.Core/Parser/Parser.cs
View File

@@ -265,7 +265,7 @@ namespace NzbDrone.Core.Parser
var languageTitle = Regex.Replace(title.Replace(".", " "), foundTitle, "A Movie", RegexOptions.IgnoreCase); var languageTitle = Regex.Replace(title.Replace(".", " "), foundTitle, "A Movie", RegexOptions.IgnoreCase);
result.Languages = LanguageParser.ParseLanguages(title); result.Languages = LanguageParser.ParseLanguages(title);
Logger.Debug("Language parsed: {0}", result.Languages); Logger.Debug("Language parsed: {0}", result.Languages.ToExtendedString());
result.Quality = QualityParser.ParseQuality(title); result.Quality = QualityParser.ParseQuality(title);
Logger.Debug("Quality parsed: {0}", result.Quality); Logger.Debug("Quality parsed: {0}", result.Quality);

2
src/NzbDrone.Core/Parser/ParsingService.cs
View File

@@ -79,7 +79,7 @@ namespace NzbDrone.Core.Parser
private ParsedMovieInfo EnhanceMinimalInfo(ParsedMovieInfo minimalInfo, List<object> helpers) private ParsedMovieInfo EnhanceMinimalInfo(ParsedMovieInfo minimalInfo, List<object> helpers)
{ {
minimalInfo.Languages = LanguageParser.ParseLanguages(minimalInfo.SimpleReleaseTitle); minimalInfo.Languages = LanguageParser.ParseLanguages(minimalInfo.SimpleReleaseTitle);
_logger.Debug("Language(s) parsed: {0}", string.Join(", ", minimalInfo.Languages)); _logger.Debug("Language(s) parsed: {0}", string.Join(", ", minimalInfo.Languages.ToExtendedString()));
minimalInfo.Quality = QualityParser.ParseQuality(minimalInfo.SimpleReleaseTitle); minimalInfo.Quality = QualityParser.ParseQuality(minimalInfo.SimpleReleaseTitle);