mirror of
https://github.com/Radarr/Radarr
synced 2024-12-25 17:27:59 +00:00
More logging for existing file import issue
This commit is contained in:
parent
116913107d
commit
19fc3bad6c
2 changed files with 40 additions and 5 deletions
|
@ -2,6 +2,7 @@
|
||||||
using FizzWare.NBuilder;
|
using FizzWare.NBuilder;
|
||||||
using FluentAssertions;
|
using FluentAssertions;
|
||||||
using Marr.Data;
|
using Marr.Data;
|
||||||
|
using Moq;
|
||||||
using NUnit.Framework;
|
using NUnit.Framework;
|
||||||
using NzbDrone.Core.MediaFiles;
|
using NzbDrone.Core.MediaFiles;
|
||||||
using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
|
using NzbDrone.Core.MediaFiles.EpisodeImport.Specifications;
|
||||||
|
@ -109,5 +110,28 @@ public void should_return_true_if_file_names_are_different()
|
||||||
|
|
||||||
Subject.IsSatisfiedBy(_localEpisode).Should().BeTrue();
|
Subject.IsSatisfiedBy(_localEpisode).Should().BeTrue();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[Test]
|
||||||
|
[Explicit]
|
||||||
|
public void should_return_false_if_exact_path_exists_in_db()
|
||||||
|
{
|
||||||
|
Mocker.GetMock<IMediaFileService>()
|
||||||
|
.Setup(s => s.Exists(It.IsAny<string>()))
|
||||||
|
.Returns(true);
|
||||||
|
|
||||||
|
_localEpisode.Episodes = Builder<Episode>.CreateListOfSize(1)
|
||||||
|
.All()
|
||||||
|
.With(e => e.EpisodeFileId = 1)
|
||||||
|
.With(e => e.EpisodeFile = new LazyLoaded<EpisodeFile>(
|
||||||
|
new EpisodeFile
|
||||||
|
{
|
||||||
|
Path = @"C:\Test\30 Rock\Season 01\30.rock.s01e01.pilot.avi",
|
||||||
|
Size = 100
|
||||||
|
}))
|
||||||
|
.Build()
|
||||||
|
.ToList();
|
||||||
|
|
||||||
|
Subject.IsSatisfiedBy(_localEpisode).Should().BeFalse();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -7,10 +7,12 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Specifications
|
||||||
{
|
{
|
||||||
public class NotExistingFileSpecification : IImportDecisionEngineSpecification
|
public class NotExistingFileSpecification : IImportDecisionEngineSpecification
|
||||||
{
|
{
|
||||||
|
private readonly IMediaFileService _mediaFileService;
|
||||||
private readonly Logger _logger;
|
private readonly Logger _logger;
|
||||||
|
|
||||||
public NotExistingFileSpecification(Logger logger)
|
public NotExistingFileSpecification(IMediaFileService mediaFileService, Logger logger)
|
||||||
{
|
{
|
||||||
|
_mediaFileService = mediaFileService;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -18,16 +20,25 @@ public NotExistingFileSpecification(Logger logger)
|
||||||
|
|
||||||
public bool IsSatisfiedBy(LocalEpisode localEpisode)
|
public bool IsSatisfiedBy(LocalEpisode localEpisode)
|
||||||
{
|
{
|
||||||
var episodeFiles = localEpisode.Episodes.Where(e => e.EpisodeFileId > 0).Select(e => e.EpisodeFile.Value);
|
// if (_mediaFileService.Exists(localEpisode.Path))
|
||||||
|
// {
|
||||||
|
// _logger.Trace("File is a match for an existing episode file: {0}", localEpisode.Path);
|
||||||
|
// return false;
|
||||||
|
// }
|
||||||
|
|
||||||
foreach (var episodeFile in episodeFiles)
|
var existingFiles = localEpisode.Episodes.Where(e => e.EpisodeFileId > 0).Select(e => e.EpisodeFile.Value);
|
||||||
|
|
||||||
|
foreach (var existingFile in existingFiles)
|
||||||
{
|
{
|
||||||
if (Path.GetFileName(episodeFile.Path) == Path.GetFileName(localEpisode.Path) &&
|
if (Path.GetFileName(existingFile.Path) == Path.GetFileName(localEpisode.Path) &&
|
||||||
episodeFile.Size == localEpisode.Size)
|
existingFile.Size == localEpisode.Size)
|
||||||
{
|
{
|
||||||
_logger.Trace("File is a match for an existing episode file: {0}", localEpisode.Path);
|
_logger.Trace("File is a match for an existing episode file: {0}", localEpisode.Path);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_logger.Trace("Existing filename: {0} size: {1}", Path.GetFileName(existingFile.Path), existingFile.Size);
|
||||||
|
_logger.Trace("New filename: {0} size: {1}", Path.GetFileName(localEpisode.Path), localEpisode.Size);
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|
Loading…
Reference in a new issue