From a259684916869e6c633a0a2f90013f872777ab95 Mon Sep 17 00:00:00 2001 From: bakerboy448 <55419169+bakerboy448@users.noreply.github.com> Date: Fri, 19 Jan 2024 23:30:24 -0600 Subject: [PATCH] Improve Release Title Custom Format debugging (cherry picked from commit ec40bc6eea1eb282cb804b8dd5461bf5ade332e9) Closes #3235 --- .../CustomFormatCalculationService.cs | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs b/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs index 91ea9deb2..f14e65572 100644 --- a/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs +++ b/src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs @@ -1,6 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using NLog; using NzbDrone.Common.Extensions; using NzbDrone.Core.Blocklisting; using NzbDrone.Core.Books; @@ -23,10 +24,12 @@ namespace NzbDrone.Core.CustomFormats public class CustomFormatCalculationService : ICustomFormatCalculationService { private readonly ICustomFormatService _formatService; + private readonly Logger _logger; - public CustomFormatCalculationService(ICustomFormatService formatService) + public CustomFormatCalculationService(ICustomFormatService formatService, Logger logger) { _formatService = formatService; + _logger = logger; } public List ParseCustomFormat(RemoteBook remoteBook, long size) @@ -145,26 +148,30 @@ namespace NzbDrone.Core.CustomFormats return matches.OrderBy(x => x.Name).ToList(); } - private static List ParseCustomFormat(BookFile bookFile, Author author, List allCustomFormats) + private List ParseCustomFormat(BookFile bookFile, Author author, List allCustomFormats) { - var sceneName = string.Empty; + var releaseTitle = string.Empty; + if (bookFile.SceneName.IsNotNullOrWhiteSpace()) { - sceneName = bookFile.SceneName; + _logger.Trace("Using scene name for release title: {0}", bookFile.SceneName); + releaseTitle = bookFile.SceneName; } else if (bookFile.OriginalFilePath.IsNotNullOrWhiteSpace()) { - sceneName = bookFile.OriginalFilePath; + _logger.Trace("Using original file path for release title: {0}", bookFile.OriginalFilePath); + releaseTitle = bookFile.OriginalFilePath; } else if (bookFile.Path.IsNotNullOrWhiteSpace()) { - sceneName = Path.GetFileName(bookFile.Path); + _logger.Trace("Using path for release title: {0}", Path.GetFileName(bookFile.Path)); + releaseTitle = Path.GetFileName(bookFile.Path); } var bookInfo = new ParsedBookInfo { AuthorName = author.Name, - ReleaseTitle = sceneName, + ReleaseTitle = releaseTitle, Quality = bookFile.Quality, ReleaseGroup = bookFile.ReleaseGroup };