From c235dc64ce1e18eb50cc160cc8d5c0d76d2b9cce Mon Sep 17 00:00:00 2001 From: Jendrik Weise Date: Sat, 20 Jan 2024 08:40:34 +0100 Subject: [PATCH] apply suggestions --- .../Extras/Subtitles/SubtitleFile.cs | 24 ++++++++++++++++++- .../Aggregators/AggregateLanguage.cs | 2 +- .../Aggregators/AggregateQuality.cs | 2 +- .../Aggregators/AggregateReleaseGroup.cs | 2 +- .../Aggregators/AggregateReleaseInfo.cs | 2 +- .../Aggregators/AggregateSubtitleInfo.cs | 2 +- 6 files changed, 28 insertions(+), 6 deletions(-) diff --git a/src/NzbDrone.Core/Extras/Subtitles/SubtitleFile.cs b/src/NzbDrone.Core/Extras/Subtitles/SubtitleFile.cs index 9f9b0f2e4..c3a3b7db1 100644 --- a/src/NzbDrone.Core/Extras/Subtitles/SubtitleFile.cs +++ b/src/NzbDrone.Core/Extras/Subtitles/SubtitleFile.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using System.Text; using NzbDrone.Core.Extras.Files; using NzbDrone.Core.Languages; @@ -25,7 +26,28 @@ namespace NzbDrone.Core.Extras.Subtitles public override string ToString() { - return $"[{Id}] {RelativePath} ({Language}{(Title is not null ? "." : "")}{Title ?? ""}{(LanguageTags.Count > 0 ? "." : "")}{LanguageTagsAsString}{Extension})"; + var stringBuilder = new StringBuilder(); + stringBuilder.AppendFormat("[{0}] ", Id); + stringBuilder.Append(RelativePath); + + stringBuilder.Append(" ("); + stringBuilder.Append(Language); + if (Title is not null) + { + stringBuilder.Append('.'); + stringBuilder.Append(Title); + } + + if (LanguageTags.Count > 0) + { + stringBuilder.Append('.'); + stringBuilder.Append(LanguageTagsAsString); + } + + stringBuilder.Append(Extension); + stringBuilder.Append(')'); + + return stringBuilder.ToString(); } } } diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateLanguage.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateLanguage.cs index 69444bc0b..fade77302 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateLanguage.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateLanguage.cs @@ -10,7 +10,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators { public class AggregateLanguage : IAggregateLocalEpisode { - public int Order => 2; + public int Order => 1; private readonly List _augmentLanguages; private readonly Logger _logger; diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateQuality.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateQuality.cs index bde6b1df0..234568a92 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateQuality.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateQuality.cs @@ -10,7 +10,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators { public class AggregateQuality : IAggregateLocalEpisode { - public int Order => 3; + public int Order => 1; private readonly List _augmentQualities; private readonly Logger _logger; diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateReleaseGroup.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateReleaseGroup.cs index e85bfe3d6..db909a4c7 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateReleaseGroup.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateReleaseGroup.cs @@ -6,7 +6,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators { public class AggregateReleaseGroup : IAggregateLocalEpisode { - public int Order => 5; + public int Order => 1; public LocalEpisode Aggregate(LocalEpisode localEpisode, DownloadClientItem downloadClientItem) { diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateReleaseInfo.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateReleaseInfo.cs index 85619eb4e..c68464049 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateReleaseInfo.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateReleaseInfo.cs @@ -8,7 +8,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators { public class AggregateReleaseInfo : IAggregateLocalEpisode { - public int Order => 4; + public int Order => 1; private readonly IHistoryService _historyService; diff --git a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateSubtitleInfo.cs b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateSubtitleInfo.cs index 442b7db74..5beabf7d5 100644 --- a/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateSubtitleInfo.cs +++ b/src/NzbDrone.Core/MediaFiles/EpisodeImport/Aggregation/Aggregators/AggregateSubtitleInfo.cs @@ -11,7 +11,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Aggregation.Aggregators { public class AggregateSubtitleInfo : IAggregateLocalEpisode { - public int Order => 6; + public int Order => 2; private readonly Logger _logger;