open-source-mirrors
/
Radarr
mirror of https://github.com/Radarr/Radarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: ExtraFiles and PendingReleases not deleted correctly

Browse Source
pull/4303/head
Qstick 5 years ago
parent 2d0fdf144b
commit d44f0d23ea
8 changed files with 472 additions and 3 deletions
Show Stats Download Patch File Download Diff File

68
src/NzbDrone.Core.Test/Download/Pending/PendingReleaseRepositoryFixture.cs
Unescape View File

@ -0,0 +1,68 @@
using FizzWare.NBuilder;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Download.Pending;
using NzbDrone.Core.Movies;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.MediaFiles
{
[TestFixture]
public class PendingReleaseRepositoryFixture : DbTest<PendingReleaseRepository, PendingRelease>
{
private Movie _movie1;
private Movie _movie2;
[SetUp]
public void Setup()
{
_movie1 = Builder<Movie>.CreateNew()
.With(s => s.Id = 7)
.Build();
_movie2 = Builder<Movie>.CreateNew()
.With(s => s.Id = 8)
.Build();
}
[Test]
public void should_delete_files_by_movieId()
{
var files = Builder<PendingRelease>.CreateListOfSize(5)
.All()
.With(c => c.Id = 0)
.With(c => c.MovieId = _movie1.Id)
.With(c => c.Release = new ReleaseInfo())
.BuildListOfNew();
Db.InsertMany(files);
Subject.DeleteByMovieId(_movie1.Id);
var remainingFiles = Subject.AllByMovieId(_movie1.Id);
remainingFiles.Should().HaveCount(0);
}
[Test]
public void should_get_files_by_movieId()
{
var files = Builder<PendingRelease>.CreateListOfSize(5)
.All()
.With(c => c.Id = 0)
.With(c => c.MovieId = _movie1.Id)
.With(c => c.Release = new ReleaseInfo())
.Random(2)
.With(c => c.MovieId = _movie2.Id)
.BuildListOfNew();
Db.InsertMany(files);
var remainingFiles = Subject.AllByMovieId(_movie1.Id);
remainingFiles.Should().HaveCount(3);
remainingFiles.Should().OnlyContain(c => c.MovieId == _movie1.Id);
}
}
}

121
src/NzbDrone.Core.Test/Extras/SubtitleFileRepositoryFixture.cs
Unescape View File

@ -0,0 +1,121 @@
using FizzWare.NBuilder;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Extras.Subtitles;
using NzbDrone.Core.Languages;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Movies;
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.MediaFiles
{
[TestFixture]
public class SubtitleFileRepositoryFixture : DbTest<SubtitleFileRepository, SubtitleFile>
{
private Movie _movie;
private MovieFile _movieFile1;
private MovieFile _movieFile2;
[SetUp]
public void Setup()
{
_movie = Builder<Movie>.CreateNew()
.With(s => s.Id = 7)
.Build();
_movieFile1 = Builder<MovieFile>.CreateNew()
.With(s => s.Id = 10)
.With(s => s.MovieId = _movie.Id)
.Build();
_movieFile2 = Builder<MovieFile>.CreateNew()
.With(s => s.Id = 11)
.With(s => s.MovieId = _movie.Id)
.Build();
}
[Test]
public void should_delete_files_by_movieId()
{
var files = Builder<SubtitleFile>.CreateListOfSize(5)
.All()
.With(c => c.Id = 0)
.With(c => c.MovieId = _movie.Id)
.With(c => c.MovieFileId = 11)
.With(c => c.Language = Language.English)
.BuildListOfNew();
Db.InsertMany(files);
Subject.DeleteForMovie(_movie.Id);
var remainingFiles = Subject.GetFilesByMovie(_movie.Id);
remainingFiles.Should().HaveCount(0);
}
[Test]
public void should_delete_files_by_movieFileId()
{
var files = Builder<SubtitleFile>.CreateListOfSize(5)
.All()
.With(c => c.Id = 0)
.With(c => c.MovieId = _movie.Id)
.With(c => c.MovieFileId = _movieFile2.Id)
.With(c => c.Language = Language.English)
.Random(2)
.With(c => c.MovieFileId = _movieFile1.Id)
.BuildListOfNew();
Db.InsertMany(files);
Subject.DeleteForMovieFile(_movieFile2.Id);
var remainingFiles = Subject.GetFilesByMovie(_movie.Id);
remainingFiles.Should().HaveCount(2);
}
[Test]
public void should_get_files_by_movieFileId()
{
var files = Builder<SubtitleFile>.CreateListOfSize(5)
.All()
.With(c => c.Id = 0)
.With(c => c.MovieId = _movie.Id)
.With(c => c.MovieFileId = _movieFile2.Id)
.With(c => c.Language = Language.English)
.Random(2)
.With(c => c.MovieFileId = _movieFile1.Id)
.BuildListOfNew();
Db.InsertMany(files);
var remainingFiles = Subject.GetFilesByMovieFile(_movieFile2.Id);
remainingFiles.Should().HaveCount(3);
remainingFiles.Should().OnlyContain(c => c.MovieFileId == _movieFile2.Id);
}
[Test]
public void should_get_files_by_movieId()
{
var files = Builder<SubtitleFile>.CreateListOfSize(5)
.All()
.With(c => c.Id = 0)
.With(c => c.MovieId = _movie.Id)
.With(c => c.MovieFileId = _movieFile2.Id)
.With(c => c.Language = Language.English)
.Random(2)
.With(c => c.MovieFileId = _movieFile1.Id)
.BuildListOfNew();
Db.InsertMany(files);
var remainingFiles = Subject.GetFilesByMovie(_movie.Id);
remainingFiles.Should().HaveCount(5);
remainingFiles.Should().OnlyContain(c => c.MovieId == _movie.Id);
}
}
}

90
src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedExtraFilesFixture.cs
Unescape View File

@ -0,0 +1,90 @@
using System.Collections.Generic;
using FizzWare.NBuilder;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Extras.Others;
using NzbDrone.Core.Housekeeping.Housekeepers;
using NzbDrone.Core.Languages;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Movies;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
{
[TestFixture]
public class CleanupOrphanedExtraFilesFixture : DbTest<CleanupOrphanedExtraFiles, OtherExtraFile>
{
[Test]
public void should_delete_extra_files_that_dont_have_a_coresponding_movie()
{
var extraFile = Builder<OtherExtraFile>.CreateNew()
.With(m => m.MovieFileId = 0)
.BuildNew();
Db.Insert(extraFile);
Subject.Clean();
AllStoredModels.Should().BeEmpty();
}
[Test]
public void should_not_delete_extra_files_that_have_a_coresponding_movie()
{
var movie = Builder<Movie>.CreateNew()
.BuildNew();
Db.Insert(movie);
var extraFile = Builder<OtherExtraFile>.CreateNew()
.With(m => m.MovieId = movie.Id)
.With(m => m.MovieFileId = 0)
.BuildNew();
Db.Insert(extraFile);
Subject.Clean();
AllStoredModels.Should().HaveCount(1);
}
[Test]
public void should_delete_extra_files_that_dont_have_a_coresponding_movie_file()
{
var movie = Builder<Movie>.CreateNew()
.BuildNew();
Db.Insert(movie);
var extraFile = Builder<OtherExtraFile>.CreateNew()
.With(m => m.MovieId = movie.Id)
.With(m => m.MovieFileId = 10)
.BuildNew();
Db.Insert(extraFile);
Subject.Clean();
AllStoredModels.Should().BeEmpty();
}
[Test]
public void should_not_delete_extra_files_that_have_a_coresponding_movie_file()
{
var movie = Builder<Movie>.CreateNew()
.BuildNew();
var movieFile = Builder<MovieFile>.CreateNew()
.With(h => h.Quality = new QualityModel())
.With(h => h.Languages = new List<Language>())
.BuildNew();
Db.Insert(movie);
Db.Insert(movieFile);
var extraFile = Builder<OtherExtraFile>.CreateNew()
.With(m => m.MovieId = movie.Id)
.With(m => m.MovieFileId = movieFile.Id)
.BuildNew();
Db.Insert(extraFile);
Subject.Clean();
AllStoredModels.Should().HaveCount(1);
}
}
}

94
src/NzbDrone.Core.Test/Housekeeping/Housekeepers/CleanupOrphanedSubtitleFilesFixture.cs
Unescape View File

@ -0,0 +1,94 @@
using System.Collections.Generic;
using FizzWare.NBuilder;
using FluentAssertions;
using NUnit.Framework;
using NzbDrone.Core.Extras.Subtitles;
using NzbDrone.Core.Housekeeping.Housekeepers;
using NzbDrone.Core.Languages;
using NzbDrone.Core.MediaFiles;
using NzbDrone.Core.Movies;
using NzbDrone.Core.Qualities;
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.Housekeeping.Housekeepers
{
[TestFixture]
public class CleanupOrphanedSubtitleFilesFixture : DbTest<CleanupOrphanedSubtitleFiles, SubtitleFile>
{
[Test]
public void should_delete_subtitle_files_that_dont_have_a_coresponding_movie()
{
var subtitleFile = Builder<SubtitleFile>.CreateNew()
.With(m => m.MovieFileId = 0)
.With(m => m.Language = Language.English)
.BuildNew();
Db.Insert(subtitleFile);
Subject.Clean();
AllStoredModels.Should().BeEmpty();
}
[Test]
public void should_not_delete_subtitle_files_that_have_a_coresponding_movie()
{
var movie = Builder<Movie>.CreateNew()
.BuildNew();
Db.Insert(movie);
var subtitleFile = Builder<SubtitleFile>.CreateNew()
.With(m => m.MovieId = movie.Id)
.With(m => m.MovieFileId = 0)
.With(m => m.Language = Language.English)
.BuildNew();
Db.Insert(subtitleFile);
Subject.Clean();
AllStoredModels.Should().HaveCount(1);
}
[Test]
public void should_delete_subtitle_files_that_dont_have_a_coresponding_movie_file()
{
var movie = Builder<Movie>.CreateNew()
.BuildNew();
Db.Insert(movie);
var subtitleFile = Builder<SubtitleFile>.CreateNew()
.With(m => m.MovieId = movie.Id)
.With(m => m.MovieFileId = 10)
.With(m => m.Language = Language.English)
.BuildNew();
Db.Insert(subtitleFile);
Subject.Clean();
AllStoredModels.Should().BeEmpty();
}
[Test]
public void should_not_delete_subtitle_files_that_have_a_coresponding_movie_file()
{
var movie = Builder<Movie>.CreateNew()
.BuildNew();
var movieFile = Builder<MovieFile>.CreateNew()
.With(h => h.Quality = new QualityModel())
.With(h => h.Languages = new List<Language>())
.BuildNew();
Db.Insert(movie);
Db.Insert(movieFile);
var subtitleFile = Builder<SubtitleFile>.CreateNew()
.With(m => m.MovieId = movie.Id)
.With(m => m.MovieFileId = movieFile.Id)
.With(m => m.Language = Language.English)
.BuildNew();
Db.Insert(subtitleFile);
Subject.Clean();
AllStoredModels.Should().HaveCount(1);
}
}
}

2
src/NzbDrone.Core/Download/Pending/PendingReleaseRepository.cs
Unescape View File

@ -20,7 +20,7 @@ namespace NzbDrone.Core.Download.Pending
public void DeleteByMovieId(int movieId)
{
Delete(movieId);
Delete(x => x.MovieId == movieId);
}
public List<PendingRelease> AllByMovieId(int movieId)

4
src/NzbDrone.Core/Extras/Files/ExtraFileRepository.cs
Unescape View File

@ -25,12 +25,12 @@ namespace NzbDrone.Core.Extras.Files
public void DeleteForMovie(int movieId)
{
Delete(movieId);
Delete(x => x.MovieId == movieId);
}
public void DeleteForMovieFile(int movieFileId)
{
Delete(c => c.MovieFileId == movieFileId);
Delete(x => x.MovieFileId == movieFileId);
}
public List<TExtraFile> GetFilesByMovie(int movieId)

48
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedExtraFiles.cs
Unescape View File

@ -0,0 +1,48 @@
using Dapper;
using NzbDrone.Core.Datastore;
namespace NzbDrone.Core.Housekeeping.Housekeepers
{
public class CleanupOrphanedExtraFiles : IHousekeepingTask
{
private readonly IMainDatabase _database;
public CleanupOrphanedExtraFiles(IMainDatabase database)
{
_database = database;
}
public void Clean()
{
DeleteOrphanedByMovie();
DeleteOrphanedByMovieFile();
}
private void DeleteOrphanedByMovie()
{
using (var mapper = _database.OpenConnection())
{
mapper.Execute(@"DELETE FROM ExtraFiles
WHERE Id IN (
SELECT ExtraFiles.Id FROM ExtraFiles
LEFT OUTER JOIN Movies
ON ExtraFiles.MovieId = Movies.Id
WHERE Movies.Id IS NULL)");
}
}
private void DeleteOrphanedByMovieFile()
{
using (var mapper = _database.OpenConnection())
{
mapper.Execute(@"DELETE FROM ExtraFiles
WHERE Id IN (
SELECT ExtraFiles.Id FROM ExtraFiles
LEFT OUTER JOIN MovieFiles
ON ExtraFiles.MovieFileId = MovieFiles.Id
WHERE ExtraFiles.MovieFileId > 0
AND MovieFiles.Id IS NULL)");
}
}
}
}

48
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedSubtitleFiles.cs
Unescape View File

@ -0,0 +1,48 @@
using Dapper;
using NzbDrone.Core.Datastore;
namespace NzbDrone.Core.Housekeeping.Housekeepers
{
public class CleanupOrphanedSubtitleFiles : IHousekeepingTask
{
private readonly IMainDatabase _database;
public CleanupOrphanedSubtitleFiles(IMainDatabase database)
{
_database = database;
}
public void Clean()
{
DeleteOrphanedByMovie();
DeleteOrphanedByMovieFile();
}
private void DeleteOrphanedByMovie()
{
using (var mapper = _database.OpenConnection())
{
mapper.Execute(@"DELETE FROM SubtitleFiles
WHERE Id IN (
SELECT SubtitleFiles.Id FROM SubtitleFiles
LEFT OUTER JOIN Movies
ON SubtitleFiles.MovieId = Movies.Id
WHERE Movies.Id IS NULL)");
}
}
private void DeleteOrphanedByMovieFile()
{
using (var mapper = _database.OpenConnection())
{
mapper.Execute(@"DELETE FROM SubtitleFiles
WHERE Id IN (
SELECT SubtitleFiles.Id FROM SubtitleFiles
LEFT OUTER JOIN MovieFiles
ON SubtitleFiles.MovieFileId = MovieFiles.Id
WHERE SubtitleFiles.MovieFileId > 0
AND MovieFiles.Id IS NULL)");
}
}
}
}
Write Preview
Loading…
Cancel
Save