From 223f04ef4633aecb8cabb8f9fbb62d506690616a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Erik=20Hel=C3=B8?= Date: Thu, 27 Apr 2023 14:26:15 +0200 Subject: [PATCH] Refactor LanguageParser.ParseLanguageTags() to return List<> instead of IEnumerable. Clean up calls to ParseLanguageTags(). --- .../Extras/Subtitles/ExistingSubtitleImporter.cs | 2 +- src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs | 4 ++-- src/NzbDrone.Core/Parser/LanguageParser.cs | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/NzbDrone.Core/Extras/Subtitles/ExistingSubtitleImporter.cs b/src/NzbDrone.Core/Extras/Subtitles/ExistingSubtitleImporter.cs index b3b858c30..b80b356ef 100644 --- a/src/NzbDrone.Core/Extras/Subtitles/ExistingSubtitleImporter.cs +++ b/src/NzbDrone.Core/Extras/Subtitles/ExistingSubtitleImporter.cs @@ -54,7 +54,7 @@ public override IEnumerable ProcessFiles(Movie movie, List fi MovieFileId = movie.MovieFileId, RelativePath = movie.Path.GetRelativePath(possibleSubtitleFile), Language = LanguageParser.ParseSubtitleLanguage(possibleSubtitleFile), - LanguageTags = LanguageParser.ParseLanguageTags(possibleSubtitleFile).ToList(), + LanguageTags = LanguageParser.ParseLanguageTags(possibleSubtitleFile), Extension = extension }; diff --git a/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs b/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs index 9d7fc0020..a6c050794 100644 --- a/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs +++ b/src/NzbDrone.Core/Extras/Subtitles/SubtitleService.cs @@ -185,9 +185,9 @@ public override IEnumerable ImportFiles(LocalMovie localMovie, MovieF var subFile = new SubtitleFile { Language = language, - Extension = extension + Extension = extension, + LanguageTags = languageTags }; - subFile.LanguageTags = languageTags.ToList(); subFile.RelativePath = PathExtensions.GetRelativePath(sourceFolder, file); subtitleFiles.Add(subFile); } diff --git a/src/NzbDrone.Core/Parser/LanguageParser.cs b/src/NzbDrone.Core/Parser/LanguageParser.cs index 301e0e599..e34df35fd 100644 --- a/src/NzbDrone.Core/Parser/LanguageParser.cs +++ b/src/NzbDrone.Core/Parser/LanguageParser.cs @@ -346,7 +346,7 @@ public static List ParseLanguages(string title) return languages.DistinctBy(l => (int)l).ToList(); } - public static IEnumerable ParseLanguageTags(string fileName) + public static List ParseLanguageTags(string fileName) { try { @@ -355,14 +355,14 @@ public static IEnumerable ParseLanguageTags(string fileName) var languageTags = match.Groups["tags"].Captures.Cast() .Where(tag => !tag.Value.Empty()) .Select(tag => tag.Value.ToLower()); - return languageTags; + return languageTags.ToList(); } catch (Exception ex) { Logger.Debug(ex, "Failed parsing language tags from subtitle file: {0}", fileName); } - return Enumerable.Empty(); + return new List(); } public static Language ParseSubtitleLanguage(string fileName)