diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs index 0c5c4ca05..571760f32 100644 --- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs +++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs @@ -10,6 +10,7 @@ using NzbDrone.Common; using NzbDrone.Common.Disk; using NzbDrone.Common.Extensions; using NzbDrone.Common.Instrumentation.Extensions; +using NzbDrone.Common.Serializer; using NzbDrone.Core.Configuration; using NzbDrone.Core.MediaFiles.Commands; using NzbDrone.Core.MediaFiles.Events; @@ -242,8 +243,8 @@ namespace NzbDrone.Core.MediaFiles var mediaFileList = filesOnDisk.Where(file => MediaFileExtensions.Extensions.Contains(file.Extension)) .ToList(); - _logger.Trace("{0} files were found in {1}", filesOnDisk.Count, path); - _logger.Debug("{0} audio files were found in {1}", mediaFileList.Count, path); + _logger.Trace("{0} files were found in {1}:\n{2}", filesOnDisk.Count, path, filesOnDisk.Select(f => f.FullName).ToJson()); + _logger.Debug("{0} audio files were found in {1}:\n{2}", mediaFileList.Count, path, mediaFileList.Select(f => f.FullName).ToJson()); return mediaFileList.ToArray(); } diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs index c97f0c2be..70dcbf3e5 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileRepository.cs @@ -1,7 +1,9 @@ using System.Collections.Generic; using System.IO; using System.Linq; +using NLog; using NzbDrone.Common; +using NzbDrone.Common.Serializer; using NzbDrone.Core.Datastore; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Music; @@ -23,9 +25,12 @@ namespace NzbDrone.Core.MediaFiles public class MediaFileRepository : BasicRepository, IMediaFileRepository { - public MediaFileRepository(IMainDatabase database, IEventAggregator eventAggregator) + private readonly Logger _logger; + + public MediaFileRepository(IMainDatabase database, IEventAggregator eventAggregator, Logger logger) : base(database, eventAggregator) { + _logger = logger; } // always join with all the other good stuff @@ -134,6 +139,9 @@ namespace NzbDrone.Core.MediaFiles _ = _database.QueryJoined(builder, (file, track) => MapTrack(dict, file, track)).ToList(); var all = dict.Values.ToList(); + _logger.Trace("{0}", paths.ToJson()); + _logger.Trace("{0} tracks were found in db:\n{1}", all.Count, all.Select(f => f.Path).ToJson()); + var joined = all.Join(paths, x => x.Path, x => x, (file, path) => file, PathEqualityComparer.Instance).ToList(); return joined; } diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs index 01fbe3dd2..f757cad0a 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileService.cs @@ -4,6 +4,7 @@ using System.IO.Abstractions; using System.Linq; using NLog; using NzbDrone.Common; +using NzbDrone.Common.Serializer; using NzbDrone.Core.Datastore.Events; using NzbDrone.Core.MediaFiles.Events; using NzbDrone.Core.Messaging.Events; @@ -104,7 +105,7 @@ namespace NzbDrone.Core.MediaFiles return files; } - _logger.Debug($"Filtering {files.Count} files for unchanged files"); + _logger.Debug($"Filtering {files.Count} files for unchanged files:\n{files.Select(x => x.FullName).ToJson()}"); var knownFiles = GetFileWithPath(files.Select(x => x.FullName).ToList()); _logger.Trace($"Got {knownFiles.Count} existing files");