diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 7b47abbdd..b87c98531 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,8 @@ + true + AnyCPU true win-x64;osx-x64;linux-x64 diff --git a/src/NzbDrone.Api/Movies/AlternativeTitleResource.cs b/src/NzbDrone.Api/Movies/AlternativeTitleResource.cs index 36ead9dbe..95016fec2 100644 --- a/src/NzbDrone.Api/Movies/AlternativeTitleResource.cs +++ b/src/NzbDrone.Api/Movies/AlternativeTitleResource.cs @@ -41,8 +41,6 @@ namespace NzbDrone.Api.Movies { if (model == null) return null; - AlternativeTitleResource resource = null; - return new AlternativeTitleResource { Id = model.Id, diff --git a/src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateQualityFixture.cs b/src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateQualityFixture.cs index f71ab5272..653f2193d 100644 --- a/src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateQualityFixture.cs +++ b/src/NzbDrone.Core.Test/MediaFiles/MovieImport/Aggregation/Aggregators/AggregateQualityFixture.cs @@ -19,8 +19,6 @@ namespace NzbDrone.Core.Test.MediaFiles.MovieImport.Aggregation.Aggregators private Mock _fileExtensionAugmenter; private Mock _nameAugmenter; - private IEnumerable _qualityAugmenters; - [SetUp] public void Setup() { diff --git a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentMovieInfoFixture.cs b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentMovieInfoFixture.cs index 00115d632..84e78ecf4 100644 --- a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentMovieInfoFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentMovieInfoFixture.cs @@ -10,8 +10,9 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests.AugmentersTests public abstract class AugmentMovieInfoFixture : CoreTest where TAugmenter : class, IAugmentParsedMovieInfo { protected ParsedMovieInfo MovieInfo; + [SetUp] - public void Setup() + public virtual void Setup() { MovieInfo = new ParsedMovieInfo { diff --git a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithHistoryFixture.cs b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithHistoryFixture.cs index 8ec4d9bdb..ac21a5ebd 100644 --- a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithHistoryFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithHistoryFixture.cs @@ -1,14 +1,12 @@ using System; using System.Collections.Generic; using FluentAssertions; -using FluentAssertions.Equivalency; using Moq; using NUnit.Framework; using NzbDrone.Core.History; using NzbDrone.Core.Indexers; using NzbDrone.Core.Indexers.Rarbg; using NzbDrone.Core.Languages; -using NzbDrone.Core.Parser; using NzbDrone.Core.Parser.Augmenters; using NzbDrone.Core.Parser.Model; @@ -20,8 +18,9 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests.AugmentersTests private AugmentWithHistory _customSubject { get; set; } [SetUp] - public void Setup() + public override void Setup() { + base.Setup(); //Add multi indexer GivenIndexerSettings(new RarbgSettings { diff --git a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithReleaseInfoFixture.cs b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithReleaseInfoFixture.cs index 39c3986bf..384a48c5f 100644 --- a/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithReleaseInfoFixture.cs +++ b/src/NzbDrone.Core.Test/ParserTests/ParsingServiceTests/AugmentersTests/AugmentWithReleaseInfoFixture.cs @@ -1,13 +1,9 @@ -using System; -using System.Collections.Generic; using System.Linq; using FluentAssertions; using NUnit.Framework; using NzbDrone.Core.Indexers; using NzbDrone.Core.Indexers.Rarbg; -using NzbDrone.Core.Indexers.TorrentRss; using NzbDrone.Core.Languages; -using NzbDrone.Core.Parser; using NzbDrone.Core.Parser.Augmenters; using NzbDrone.Core.Parser.Model; @@ -18,12 +14,6 @@ namespace NzbDrone.Core.Test.ParserTests.ParsingServiceTests.AugmentersTests { private IndexerDefinition _indexerDefinition; - [SetUp] - public void Setup() - { - - } - private ReleaseInfo ReleaseInfoWithLanguages(params Language[] languages) { _indexerDefinition = new IndexerDefinition diff --git a/src/NzbDrone.Core/CustomFormats/CustomFormat.cs b/src/NzbDrone.Core/CustomFormats/CustomFormat.cs index 1cd176400..3aa08fda7 100644 --- a/src/NzbDrone.Core/CustomFormats/CustomFormat.cs +++ b/src/NzbDrone.Core/CustomFormats/CustomFormat.cs @@ -46,7 +46,7 @@ namespace NzbDrone.Core.CustomFormats public override int GetHashCode() { - return (Id != null ? Id.GetHashCode() : 0); + return Id.GetHashCode(); } } diff --git a/src/NzbDrone.Core/CustomFormats/CustomFormatService.cs b/src/NzbDrone.Core/CustomFormats/CustomFormatService.cs index 0624b4baf..3eb733af5 100644 --- a/src/NzbDrone.Core/CustomFormats/CustomFormatService.cs +++ b/src/NzbDrone.Core/CustomFormats/CustomFormatService.cs @@ -6,7 +6,6 @@ using NzbDrone.Common.Cache; using NzbDrone.Common.Composition; using NzbDrone.Core.Blacklisting; using NzbDrone.Core.Datastore; -using NzbDrone.Core.Download.Pending; using NzbDrone.Core.History; using NzbDrone.Core.Lifecycle; using NzbDrone.Core.MediaFiles; @@ -29,10 +28,7 @@ namespace NzbDrone.Core.CustomFormats { private readonly ICustomFormatRepository _formatRepository; private IProfileService _profileService; - private readonly IMediaFileService _mediaFileService; - private readonly IBlacklistService _blacklistService; private readonly IHistoryService _historyService; - private readonly IPendingReleaseService _pendingReleaseService; public IProfileService ProfileService { @@ -54,17 +50,12 @@ namespace NzbDrone.Core.CustomFormats public static Dictionary AllCustomFormats; public CustomFormatService(ICustomFormatRepository formatRepository, ICacheManager cacheManager, - IContainer container, IHistoryService historyService,/*IMediaFileService mediaFileService, IBlacklistService blacklistService, - IHistoryService historyService, IPendingReleaseService pendingReleaseService,*/ + IContainer container, IHistoryService historyService, Logger logger) { _formatRepository = formatRepository; _container = container; _cache = cacheManager.GetCache>(typeof(CustomFormat), "formats"); - /*_mediaFileService = mediaFileService; - _blacklistService = blacklistService; - _historyService = historyService; - _pendingReleaseService = pendingReleaseService;*/ _historyService = historyService; _logger = logger; } diff --git a/src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenProxy.cs b/src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenProxy.cs index 545e1330d..a2a706d1e 100644 --- a/src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenProxy.cs +++ b/src/NzbDrone.Core/Download/Clients/Hadouken/HadoukenProxy.cs @@ -21,7 +21,6 @@ namespace NzbDrone.Core.Download.Clients.Hadouken public class HadoukenProxy : IHadoukenProxy { - private static int _callId; private readonly IHttpClient _httpClient; private readonly Logger _logger; @@ -175,4 +174,4 @@ namespace NzbDrone.Core.Download.Clients.Hadouken return HadoukenTorrentState.Unknown; } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs b/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs index 96013e845..d39d788da 100644 --- a/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs +++ b/src/NzbDrone.Core/Instrumentation/DatabaseTarget.cs @@ -13,8 +13,6 @@ namespace NzbDrone.Core.Instrumentation { public class DatabaseTarget : TargetWithLayout, IHandle { - private readonly SQLiteConnection _connection; - private readonly IConnectionStringFactory _connectionStringFactory; const string INSERT_COMMAND = "INSERT INTO [Logs]([Message],[Time],[Logger],[Exception],[ExceptionType],[Level]) " + @@ -120,4 +118,4 @@ namespace NzbDrone.Core.Instrumentation } } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs index d1834a9a3..c45408b29 100644 --- a/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs +++ b/src/NzbDrone.Core/MediaFiles/RenameMovieFileService.cs @@ -156,13 +156,13 @@ namespace NzbDrone.Core.MediaFiles _diskProvider.MoveFolder(oldFolder, movie.Path); - if (false) - { - var movieFiles = _mediaFileService.GetFilesByMovie(movie.Id); - _logger.ProgressInfo("Renaming movie files for {0}", movie.Title); - RenameFiles(movieFiles, movie, oldFolder); - _logger.ProgressInfo("All movie files renamed for {0}", movie.Title); - } + // if (false) + // { + // var movieFiles = _mediaFileService.GetFilesByMovie(movie.Id); + // _logger.ProgressInfo("Renaming movie files for {0}", movie.Title); + // RenameFiles(movieFiles, movie, oldFolder); + // _logger.ProgressInfo("All movie files renamed for {0}", movie.Title); + // } _movieService.UpdateMovie(movie); diff --git a/src/NzbDrone.Core/MetadataSource/PreDB/PreDBService.cs b/src/NzbDrone.Core/MetadataSource/PreDB/PreDBService.cs index 244430144..cb3e9cd14 100644 --- a/src/NzbDrone.Core/MetadataSource/PreDB/PreDBService.cs +++ b/src/NzbDrone.Core/MetadataSource/PreDB/PreDBService.cs @@ -63,6 +63,8 @@ namespace NzbDrone.Core.MetadataSource.PreDB private List GetResults(string category = "", string search = "") { return new List(); + + /* PreDB is blocked var builder = new HttpRequestBuilder("http://predb.me").AddQueryParam("rss", "1"); if (category.IsNotNullOrWhiteSpace()) { @@ -110,7 +112,7 @@ namespace NzbDrone.Core.MetadataSource.PreDB _logger.Error(ex, "Error while searching PreDB."); } - return new List(); + return new List(); */ } private List FindMatchesToResults(List results) diff --git a/src/NzbDrone.Core/Movies/AlternativeTitles/AlternativeTitle.cs b/src/NzbDrone.Core/Movies/AlternativeTitles/AlternativeTitle.cs index 2f277e646..c16826bd7 100644 --- a/src/NzbDrone.Core/Movies/AlternativeTitles/AlternativeTitle.cs +++ b/src/NzbDrone.Core/Movies/AlternativeTitles/AlternativeTitle.cs @@ -56,6 +56,11 @@ namespace NzbDrone.Core.Movies.AlternativeTitles return item.CleanTitle == this.CleanTitle; } + public override int GetHashCode() + { + return CleanTitle.GetHashCode(); + } + public override String ToString() { return Title; diff --git a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs index 40812ee3f..2a5ff2d64 100644 --- a/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs +++ b/src/NzbDrone.Core/NetImport/CouchPotato/CouchPotatoParser.cs @@ -3,8 +3,6 @@ using NzbDrone.Core.NetImport.Exceptions; using System.Collections.Generic; using System.Linq; using System.Net; -using System.Text.RegularExpressions; -using NLog; using NzbDrone.Common.Extensions; namespace NzbDrone.Core.NetImport.CouchPotato @@ -13,7 +11,6 @@ namespace NzbDrone.Core.NetImport.CouchPotato { private readonly CouchPotatoSettings _settings; private NetImportResponse _importResponse; - private readonly Logger _logger; public CouchPotatoParser(CouchPotatoSettings settings) { diff --git a/src/NzbDrone.Core/NetImport/NetImportDefinition.cs b/src/NzbDrone.Core/NetImport/NetImportDefinition.cs index 176db1773..d08b71b7f 100644 --- a/src/NzbDrone.Core/NetImport/NetImportDefinition.cs +++ b/src/NzbDrone.Core/NetImport/NetImportDefinition.cs @@ -21,6 +21,5 @@ namespace NzbDrone.Core.NetImport public LazyLoaded Profile { get; set; } public string RootFolderPath { get; set; } public override bool Enable => Enabled; - public HashSet Tags { get; set; } } } diff --git a/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs b/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs index bc5a5b89a..b5e16c57c 100644 --- a/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs +++ b/src/NzbDrone.Core/NetImport/RSSImport/RSSImport.cs @@ -53,7 +53,7 @@ namespace NzbDrone.Core.NetImport.RSSImport public override IParseNetImportResponse GetParser() { - return new RSSImportParser(Settings); + return new RSSImportParser(Settings, _logger); } } } diff --git a/src/NzbDrone.Core/NetImport/RSSImport/RSSImportParser.cs b/src/NzbDrone.Core/NetImport/RSSImport/RSSImportParser.cs index 0a0d21e44..3aa2ba9ea 100644 --- a/src/NzbDrone.Core/NetImport/RSSImport/RSSImportParser.cs +++ b/src/NzbDrone.Core/NetImport/RSSImport/RSSImportParser.cs @@ -19,14 +19,16 @@ namespace NzbDrone.Core.NetImport.RSSImport public class RSSImportParser : IParseNetImportResponse { private readonly RSSImportSettings _settings; - private NetImportResponse _importResponse; private readonly Logger _logger; + private NetImportResponse _importResponse; private static readonly Regex ReplaceEntities = new Regex("&[a-z]+;", RegexOptions.Compiled | RegexOptions.IgnoreCase); - public RSSImportParser(RSSImportSettings settings) + public RSSImportParser(RSSImportSettings settings, + Logger logger) { _settings = settings; + _logger = logger; } public virtual IList ParseResponse(NetImportResponse importResponse) diff --git a/src/NzbDrone.Core/NetImport/Radarr/RadarrLists.cs b/src/NzbDrone.Core/NetImport/Radarr/RadarrLists.cs index e048b9400..f5b734792 100644 --- a/src/NzbDrone.Core/NetImport/Radarr/RadarrLists.cs +++ b/src/NzbDrone.Core/NetImport/Radarr/RadarrLists.cs @@ -15,8 +15,6 @@ namespace NzbDrone.Core.NetImport.Radarr public override bool Enabled => true; public override bool EnableAuto => false; - private readonly IHttpClient _httpClient; - private readonly Logger _logger; private readonly ISearchForNewMovie _skyhookProxy; public RadarrLists(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, ISearchForNewMovie skyhookProxy, @@ -24,8 +22,6 @@ namespace NzbDrone.Core.NetImport.Radarr : base(httpClient, configService, parsingService, logger) { _skyhookProxy = skyhookProxy; - _logger = logger; - _httpClient = httpClient; } public override IEnumerable DefaultDefinitions diff --git a/src/NzbDrone.Core/NetImport/Radarr/RadarrParser.cs b/src/NzbDrone.Core/NetImport/Radarr/RadarrParser.cs index 8d8924e5d..005282b9f 100644 --- a/src/NzbDrone.Core/NetImport/Radarr/RadarrParser.cs +++ b/src/NzbDrone.Core/NetImport/Radarr/RadarrParser.cs @@ -1,9 +1,5 @@ using Newtonsoft.Json; -using NzbDrone.Core.NetImport.Exceptions; -using System; using System.Collections.Generic; -using System.Net; -using NLog; using NzbDrone.Common.Extensions; using NzbDrone.Core.MetadataSource.SkyHook.Resource; using NzbDrone.Core.MetadataSource; @@ -17,7 +13,6 @@ namespace NzbDrone.Core.NetImport.Radarr private readonly RadarrSettings _settings; private NetImportResponse _importResponse; private readonly ISearchForNewMovie _skyhookProxy; - private readonly Logger _logger; public RadarrParser(RadarrSettings settings, ISearchForNewMovie skyhookProxy) { @@ -75,4 +70,4 @@ namespace NzbDrone.Core.NetImport.Radarr } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs index e719056e9..f05c3391e 100644 --- a/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs +++ b/src/NzbDrone.Core/NetImport/StevenLu/StevenLuParser.cs @@ -11,7 +11,6 @@ namespace NzbDrone.Core.NetImport.StevenLu { private readonly StevenLuSettings _settings; private NetImportResponse _importResponse; - private readonly Logger _logger; public StevenLuParser(StevenLuSettings settings) { diff --git a/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs b/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs index d6ef58f7e..53af40df1 100644 --- a/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs +++ b/src/NzbDrone.Core/NetImport/TMDb/TMDbImport.cs @@ -13,16 +13,12 @@ namespace NzbDrone.Core.NetImport.TMDb public override bool Enabled => true; public override bool EnableAuto => false; - private readonly IHttpClient _httpClient; - private readonly Logger _logger; private readonly ISearchForNewMovie _skyhookProxy; public TMDbImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, ISearchForNewMovie skyhookProxy, Logger logger) : base(httpClient, configService, parsingService, logger) { - _logger = logger; - _httpClient = httpClient; _skyhookProxy = skyhookProxy; } @@ -41,4 +37,4 @@ namespace NzbDrone.Core.NetImport.TMDb return new TMDbParser(Settings, _skyhookProxy); } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Core/NetImport/TMDb/TMDbParser.cs b/src/NzbDrone.Core/NetImport/TMDb/TMDbParser.cs index c103f18f1..b0832b86b 100644 --- a/src/NzbDrone.Core/NetImport/TMDb/TMDbParser.cs +++ b/src/NzbDrone.Core/NetImport/TMDb/TMDbParser.cs @@ -1,13 +1,10 @@ using Newtonsoft.Json; using NzbDrone.Core.NetImport.Exceptions; -using System; using System.Collections.Generic; using System.Net; -using NLog; using NzbDrone.Common.Extensions; using NzbDrone.Core.MetadataSource.SkyHook.Resource; using NzbDrone.Core.MetadataSource; -using TinyIoC; namespace NzbDrone.Core.NetImport.TMDb { @@ -16,7 +13,6 @@ namespace NzbDrone.Core.NetImport.TMDb private readonly TMDbSettings _settings; private NetImportResponse _importResponse; private readonly ISearchForNewMovie _skyhookProxy; - private readonly Logger _logger; public TMDbParser(TMDbSettings settings, ISearchForNewMovie skyhookProxy) { @@ -96,4 +92,4 @@ namespace NzbDrone.Core.NetImport.TMDb } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs b/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs index 22dd15770..754d8bea9 100644 --- a/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs +++ b/src/NzbDrone.Core/NetImport/Trakt/TraktImport.cs @@ -11,14 +11,9 @@ namespace NzbDrone.Core.NetImport.Trakt public override bool Enabled => true; public override bool EnableAuto => false; - private readonly IHttpClient _httpClient; - public IConfigService _configService; - public TraktImport(IHttpClient httpClient, IConfigService configService, IParsingService parsingService, Logger logger) : base(httpClient, configService, parsingService, logger) { - _configService = configService; - _httpClient = httpClient; } public override INetImportRequestGenerator GetRequestGenerator() diff --git a/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs b/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs index 0918e61ba..6e415a7be 100644 --- a/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs +++ b/src/NzbDrone.Core/NetImport/Trakt/TraktParser.cs @@ -11,7 +11,6 @@ namespace NzbDrone.Core.NetImport.Trakt { private readonly TraktSettings _settings; private NetImportResponse _importResponse; - private readonly Logger _logger; public TraktParser(TraktSettings settings) { diff --git a/src/NzbDrone.Host/ApplicationServer.cs b/src/NzbDrone.Host/ApplicationServer.cs index 4aa85cb56..b3f581a37 100644 --- a/src/NzbDrone.Host/ApplicationServer.cs +++ b/src/NzbDrone.Host/ApplicationServer.cs @@ -62,7 +62,7 @@ namespace Radarr.Host private readonly IBrowserService _browserService; private readonly IContainer _container; private readonly Logger _logger; - private CancelHandler _cancelHandler; + // private CancelHandler _cancelHandler; public NzbDroneConsoleFactory(IConfigFileProvider configFileProvider, IHostController hostController, diff --git a/src/NzbDrone.Integration.Test/Client/CommandClient.cs b/src/NzbDrone.Integration.Test/Client/CommandClient.cs index 59becc84d..d344fdb8c 100644 --- a/src/NzbDrone.Integration.Test/Client/CommandClient.cs +++ b/src/NzbDrone.Integration.Test/Client/CommandClient.cs @@ -40,7 +40,7 @@ namespace NzbDrone.Integration.Test.Client public SimpleCommandResource PostAndWait(T command) where T : Command, new() { var request = BuildRequest(); - request.AddBody(command); + request.AddJsonBody(command); var result = Post(request); result.Id.Should().NotBe(0); diff --git a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs index 07132b132..d981b0e25 100644 --- a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs +++ b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs @@ -215,7 +215,7 @@ namespace NzbDrone.Integration.Test connected = true; break; } - catch (Exception e) + catch (Exception) { if (retryCount > 25) { diff --git a/src/Radarr.Api.V2/MovieFiles/MovieFileModule.cs b/src/Radarr.Api.V2/MovieFiles/MovieFileModule.cs index b3b64a97e..4c505ecd2 100644 --- a/src/Radarr.Api.V2/MovieFiles/MovieFileModule.cs +++ b/src/Radarr.Api.V2/MovieFiles/MovieFileModule.cs @@ -29,13 +29,15 @@ namespace Radarr.Api.V2.MovieFiles private readonly Logger _logger; public MovieFileModule(IBroadcastSignalRMessage signalRBroadcaster, - IMediaFileService mediaFileService, - IMovieService movieService, - IUpgradableSpecification qualityUpgradableSpecification, - Logger logger) + IMediaFileService mediaFileService, + IRecycleBinProvider recycleBinProvider, + IMovieService movieService, + IUpgradableSpecification qualityUpgradableSpecification, + Logger logger) : base(signalRBroadcaster) { _mediaFileService = mediaFileService; + _recycleBinProvider = recycleBinProvider; _movieService = movieService; _qualityUpgradableSpecification = qualityUpgradableSpecification; _logger = logger; diff --git a/src/Radarr.Api.V2/Movies/AlternativeTitleResource.cs b/src/Radarr.Api.V2/Movies/AlternativeTitleResource.cs index 505c2d52b..8493f5336 100644 --- a/src/Radarr.Api.V2/Movies/AlternativeTitleResource.cs +++ b/src/Radarr.Api.V2/Movies/AlternativeTitleResource.cs @@ -36,8 +36,6 @@ namespace Radarr.Api.V2.Movies { if (model == null) return null; - AlternativeTitleResource resource = null; - return new AlternativeTitleResource { Id = model.Id, diff --git a/src/Radarr.Http/Frontend/Mappers/BackupFileMapper.cs b/src/Radarr.Http/Frontend/Mappers/BackupFileMapper.cs index 0a0afa951..adc08c319 100644 --- a/src/Radarr.Http/Frontend/Mappers/BackupFileMapper.cs +++ b/src/Radarr.Http/Frontend/Mappers/BackupFileMapper.cs @@ -1,7 +1,6 @@ using System.IO; using NLog; using NzbDrone.Common.Disk; -using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Core.Backup; namespace Radarr.Http.Frontend.Mappers @@ -9,7 +8,6 @@ namespace Radarr.Http.Frontend.Mappers public class BackupFileMapper : StaticResourceMapperBase { private readonly IBackupService _backupService; - private readonly IAppFolderInfo _appFolderInfo; public BackupFileMapper(IBackupService backupService, IDiskProvider diskProvider, Logger logger) : base(diskProvider, logger)