Backup_Repos/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-12-15 21:03:27 +01:00
Code Issues Projects Releases Wiki Activity

Fixed: Don't reimport the same file from the same release unless grabbed again

Browse source 
(cherry picked from commit 0274778679a8fd485a651eea9d293463528244fd)

Closes #9055
This commit is contained in:
Mark McDowall 2023-08-19 21:49:17 -07:00 committed by Bogdan
parent 1350ccb236
commit d626f0487d
2 changed files with 139 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

121
src/NzbDrone.Core.Test/MediaFiles/MovieImport/Specifications/AlreadyImportedSpecificationFixture.cs Normal file
View file

@ -0,0 +1,121 @@
using System;
using System.Collections.Generic;
using System.Linq;
using FizzWare.NBuilder;
using FluentAssertions;
using Moq;
using NUnit.Framework;
using NzbDrone.Core.Download;
using NzbDrone.Core.History;
using NzbDrone.Core.MediaFiles.MovieImport.Specifications;
using NzbDrone.Core.Movies;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework;
using NzbDrone.Test.Common;
namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Specifications
{
[TestFixture]
public class AlreadyImportedSpecificationFixture : CoreTest<AlreadyImportedSpecification>
{
private Movie _movie;
private LocalMovie _localMovie;
private DownloadClientItem _downloadClientItem;
[SetUp]
public void Setup()
{
_movie = Builder<Movie>.CreateNew()
.With(s => s.Path = @"C:\Test\Movies\Casablanca".AsOsAgnostic())
.Build();
_localMovie = new LocalMovie
{
Path = @"C:\Test\Unsorted\Casablanca\Casablanca.1942.avi".AsOsAgnostic(),
Movie = _movie
};
_downloadClientItem = Builder<DownloadClientItem>.CreateNew()
.Build();
}
private void GivenHistory(List<MovieHistory> history)
{
Mocker.GetMock<IHistoryService>()
.Setup(s => s.GetByMovieId(It.IsAny<int>(), null))
.Returns(history);
}
[Test]
public void should_accepted_if_download_client_item_is_null()
{
Subject.IsSatisfiedBy(_localMovie, null).Accepted.Should().BeTrue();
}
[Test]
public void should_accept_if_episode_does_not_have_file()
{
_movie.MovieFileId = 0;
Subject.IsSatisfiedBy(_localMovie, _downloadClientItem).Accepted.Should().BeTrue();
}
[Test]
public void should_accept_if_episode_has_not_been_imported()
{
var history = Builder<MovieHistory>.CreateListOfSize(1)
.All()
.With(h => h.MovieId = _movie.Id)
.With(h => h.EventType = MovieHistoryEventType.Grabbed)
.Build()
.ToList();
GivenHistory(history);
Subject.IsSatisfiedBy(_localMovie, _downloadClientItem).Accepted.Should().BeTrue();
}
[Test]
public void should_accept_if_episode_was_grabbed_after_being_imported()
{
var history = Builder<MovieHistory>.CreateListOfSize(3)
.All()
.With(h => h.MovieId = _movie.Id)
.TheFirst(1)
.With(h => h.EventType = MovieHistoryEventType.Grabbed)
.With(h => h.Date = DateTime.UtcNow)
.TheNext(1)
.With(h => h.EventType = MovieHistoryEventType.DownloadFolderImported)
.With(h => h.Date = DateTime.UtcNow.AddDays(-1))
.TheNext(1)
.With(h => h.EventType = MovieHistoryEventType.Grabbed)
.With(h => h.Date = DateTime.UtcNow.AddDays(-2))
.Build()
.ToList();
GivenHistory(history);
Subject.IsSatisfiedBy(_localMovie, _downloadClientItem).Accepted.Should().BeTrue();
}
[Test]
public void should_reject_if_episode_imported_after_being_grabbed()
{
var history = Builder<MovieHistory>.CreateListOfSize(2)
.All()
.With(h => h.MovieId = _movie.Id)
.TheFirst(1)
.With(h => h.EventType = MovieHistoryEventType.DownloadFolderImported)
.With(h => h.Date = DateTime.UtcNow.AddDays(-1))
.TheNext(1)
.With(h => h.EventType = MovieHistoryEventType.Grabbed)
.With(h => h.Date = DateTime.UtcNow.AddDays(-2))
.Build()
.ToList();
GivenHistory(history);
Subject.IsSatisfiedBy(_localMovie, _downloadClientItem).Accepted.Should().BeTrue();
}
}
}

29
src/NzbDrone.Core/MediaFiles/MovieImport/Specifications/AlreadyImportedSpecification.cs
View file

@ -39,8 +39,11 @@ public Decision IsSatisfiedBy(LocalMovie localMovie, DownloadClientItem download
}
var movieImportedHistory = _historyService.GetByMovieId(movie.Id, null);
var lastImported = movieImportedHistory.FirstOrDefault(h => h.EventType == MovieHistoryEventType.DownloadFolderImported);
var lastGrabbed = movieImportedHistory.FirstOrDefault(h => h.EventType == MovieHistoryEventType.Grabbed);
var lastImported = movieImportedHistory.FirstOrDefault(h =>
h.DownloadId == downloadClientItem.DownloadId &&
h.EventType == MovieHistoryEventType.DownloadFolderImported);
var lastGrabbed = movieImportedHistory.FirstOrDefault(h =>
h.DownloadId == downloadClientItem.DownloadId && h.EventType == MovieHistoryEventType.Grabbed);
if (lastImported == null)
{
@ -48,17 +51,21 @@ public Decision IsSatisfiedBy(LocalMovie localMovie, DownloadClientItem download
return Decision.Accept();
}
// If the release was grabbed again after importing don't reject it
if (lastGrabbed != null && lastGrabbed.Date.After(lastImported.Date))
if (lastGrabbed != null)
{
_logger.Trace("Movie file was grabbed again after importing");
return Decision.Accept();
}
// If the release was grabbed again after importing don't reject it
if (lastGrabbed.Date.After(lastImported.Date))
{
_logger.Trace("Movie file was grabbed again after importing");
return Decision.Accept();
}
if (lastImported.DownloadId == downloadClientItem.DownloadId)
{
_logger.Debug("Movie file previously imported at {0}", lastImported.Date);
return Decision.Reject("Movie file already imported at {0}", lastImported.Date.ToLocalTime());
// If the release was imported after the last grab reject it
if (lastImported.Date.After(lastGrabbed.Date))
{
_logger.Debug("Movie file previously imported at {0}", lastImported.Date);
return Decision.Reject("Movie file already imported at {0}", lastImported.Date.ToLocalTime());
}
}
return Decision.Accept();