From 3a4c6fe36457c35ebd927bd6113e15bb54844794 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 8 Oct 2017 16:25:29 -0400 Subject: [PATCH] Remove Core.TV references in preperation for Cleanup --- .../IndexerSearch/NzbSearchService.cs | 1 - .../MediaCover/MediaCoversUpdatedEvent.cs | 1 - src/NzbDrone.Core/MediaFiles/DiskScanService.cs | 1 - .../MediaFiles/MediaFileTableCleanupService.cs | 5 ++--- .../MediaFiles/TrackFileMovingService.cs | 1 - .../MetadataSource/SkyHook/SkyHookProxy.cs | 1 - src/NzbDrone.Core/Music/AddArtistOptions.cs | 1 - src/NzbDrone.Core/Notifications/Email/Email.cs | 3 +-- src/NzbDrone.Core/Notifications/Growl/Growl.cs | 3 +-- src/NzbDrone.Core/Notifications/Plex/PlexClient.cs | 3 +-- .../Notifications/Plex/PlexHomeTheater.cs | 3 +-- src/NzbDrone.Core/Notifications/Prowl/Prowl.cs | 3 +-- .../Notifications/Pushalot/Pushalot.cs | 3 +-- src/NzbDrone.Core/Organizer/FileNameBuilder.cs | 1 - .../Profiles/Languages/LanguageProfileService.cs | 14 +++++++------- src/NzbDrone.Core/Queue/Queue.cs | 2 -- 16 files changed, 15 insertions(+), 31 deletions(-) diff --git a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs b/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs index 9a318ea1a..7cd886fcb 100644 --- a/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/NzbSearchService.cs @@ -9,7 +9,6 @@ using NzbDrone.Core.DecisionEngine; using NzbDrone.Core.IndexerSearch.Definitions; using NzbDrone.Core.Indexers; using NzbDrone.Core.Parser.Model; -using NzbDrone.Core.Tv; using System.Linq; using NzbDrone.Common.TPL; using NzbDrone.Core.Music; diff --git a/src/NzbDrone.Core/MediaCover/MediaCoversUpdatedEvent.cs b/src/NzbDrone.Core/MediaCover/MediaCoversUpdatedEvent.cs index 364a74ff1..65ce089a1 100644 --- a/src/NzbDrone.Core/MediaCover/MediaCoversUpdatedEvent.cs +++ b/src/NzbDrone.Core/MediaCover/MediaCoversUpdatedEvent.cs @@ -1,5 +1,4 @@ using NzbDrone.Common.Messaging; -using NzbDrone.Core.Tv; using NzbDrone.Core.Music; namespace NzbDrone.Core.MediaCover diff --git a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs index 1ceb26d3a..92c566904 100644 --- a/src/NzbDrone.Core/MediaFiles/DiskScanService.cs +++ b/src/NzbDrone.Core/MediaFiles/DiskScanService.cs @@ -13,7 +13,6 @@ using NzbDrone.Core.MediaFiles.Commands; using NzbDrone.Core.MediaFiles.Events; using NzbDrone.Core.Messaging.Commands; using NzbDrone.Core.Messaging.Events; -using NzbDrone.Core.Tv; using NzbDrone.Core.Music; using NzbDrone.Core.Music.Events; using NzbDrone.Core.MediaFiles.TrackImport; diff --git a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs index 70cc1fdde..39b3ee700 100644 --- a/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs +++ b/src/NzbDrone.Core/MediaFiles/MediaFileTableCleanupService.cs @@ -1,10 +1,9 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using NLog; using NzbDrone.Common; using NzbDrone.Common.Extensions; -using NzbDrone.Core.Tv; using NzbDrone.Core.Music; namespace NzbDrone.Core.MediaFiles @@ -77,4 +76,4 @@ namespace NzbDrone.Core.MediaFiles } } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Core/MediaFiles/TrackFileMovingService.cs b/src/NzbDrone.Core/MediaFiles/TrackFileMovingService.cs index 2107fcd79..bf25c5d88 100644 --- a/src/NzbDrone.Core/MediaFiles/TrackFileMovingService.cs +++ b/src/NzbDrone.Core/MediaFiles/TrackFileMovingService.cs @@ -8,7 +8,6 @@ using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Music; using NzbDrone.Core.Organizer; using NzbDrone.Core.Parser.Model; -using NzbDrone.Core.Tv; using System; using System.Collections.Generic; using System.IO; diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index 6bd2f7db2..270b8ab0e 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -9,7 +9,6 @@ using NzbDrone.Common.Http; using NzbDrone.Core.Exceptions; using NzbDrone.Core.MediaCover; using NzbDrone.Core.MetadataSource.SkyHook.Resource; -using NzbDrone.Core.Tv; using Newtonsoft.Json.Linq; using NzbDrone.Core.Music; using Newtonsoft.Json; diff --git a/src/NzbDrone.Core/Music/AddArtistOptions.cs b/src/NzbDrone.Core/Music/AddArtistOptions.cs index 5f83e1c72..2e2c198c1 100644 --- a/src/NzbDrone.Core/Music/AddArtistOptions.cs +++ b/src/NzbDrone.Core/Music/AddArtistOptions.cs @@ -1,4 +1,3 @@ -using NzbDrone.Core.Tv; using System; using System.Collections.Generic; using System.Linq; diff --git a/src/NzbDrone.Core/Notifications/Email/Email.cs b/src/NzbDrone.Core/Notifications/Email/Email.cs index 414cbf366..69158599b 100644 --- a/src/NzbDrone.Core/Notifications/Email/Email.cs +++ b/src/NzbDrone.Core/Notifications/Email/Email.cs @@ -1,7 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; using FluentValidation.Results; using NzbDrone.Common.Extensions; -using NzbDrone.Core.Tv; namespace NzbDrone.Core.Notifications.Email { diff --git a/src/NzbDrone.Core/Notifications/Growl/Growl.cs b/src/NzbDrone.Core/Notifications/Growl/Growl.cs index f1236fe84..e6ff72463 100644 --- a/src/NzbDrone.Core/Notifications/Growl/Growl.cs +++ b/src/NzbDrone.Core/Notifications/Growl/Growl.cs @@ -1,7 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; using FluentValidation.Results; using NzbDrone.Common.Extensions; -using NzbDrone.Core.Tv; namespace NzbDrone.Core.Notifications.Growl { diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs b/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs index 6e1999004..3641ed416 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexClient.cs @@ -1,7 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; using FluentValidation.Results; using NzbDrone.Common.Extensions; -using NzbDrone.Core.Tv; namespace NzbDrone.Core.Notifications.Plex { diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs b/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs index 4f779bf83..c0ca2766a 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexHomeTheater.cs @@ -1,10 +1,9 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Net.Sockets; using FluentValidation.Results; using NLog; using NzbDrone.Common.Extensions; using NzbDrone.Core.Notifications.Xbmc; -using NzbDrone.Core.Tv; namespace NzbDrone.Core.Notifications.Plex { diff --git a/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs b/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs index 01911f2e6..6d2876d4e 100644 --- a/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs +++ b/src/NzbDrone.Core/Notifications/Prowl/Prowl.cs @@ -1,7 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; using FluentValidation.Results; using NzbDrone.Common.Extensions; -using NzbDrone.Core.Tv; using Prowlin; namespace NzbDrone.Core.Notifications.Prowl diff --git a/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs b/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs index 0d888c5f8..aa5985dd2 100644 --- a/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs +++ b/src/NzbDrone.Core/Notifications/Pushalot/Pushalot.cs @@ -1,7 +1,6 @@ -using System.Collections.Generic; +using System.Collections.Generic; using FluentValidation.Results; using NzbDrone.Common.Extensions; -using NzbDrone.Core.Tv; namespace NzbDrone.Core.Notifications.Pushalot { diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs index dd1c4f8e6..b834726e8 100644 --- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs +++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs @@ -11,7 +11,6 @@ using NzbDrone.Common.Extensions; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.MediaFiles.MediaInfo; using NzbDrone.Core.Qualities; -using NzbDrone.Core.Tv; using NzbDrone.Core.Music; namespace NzbDrone.Core.Organizer diff --git a/src/NzbDrone.Core/Profiles/Languages/LanguageProfileService.cs b/src/NzbDrone.Core/Profiles/Languages/LanguageProfileService.cs index a26e75270..dfab045bd 100644 --- a/src/NzbDrone.Core/Profiles/Languages/LanguageProfileService.cs +++ b/src/NzbDrone.Core/Profiles/Languages/LanguageProfileService.cs @@ -1,10 +1,10 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Linq; using NLog; using NzbDrone.Core.Lifecycle; using NzbDrone.Core.Messaging.Events; using NzbDrone.Core.Languages; -using NzbDrone.Core.Tv; +using NzbDrone.Core.Music; namespace NzbDrone.Core.Profiles.Languages { @@ -21,13 +21,13 @@ namespace NzbDrone.Core.Profiles.Languages public class LanguageProfileService : ILanguageProfileService, IHandle { private readonly ILanguageProfileRepository _profileRepository; - private readonly ISeriesService _seriesService; + private readonly IArtistService _artistService; private readonly Logger _logger; - public LanguageProfileService(ILanguageProfileRepository profileRepository, ISeriesService seriesService, Logger logger) + public LanguageProfileService(ILanguageProfileRepository profileRepository, IArtistService artistService, Logger logger) { _profileRepository = profileRepository; - _seriesService = seriesService; + _artistService = artistService; _logger = logger; } @@ -43,7 +43,7 @@ namespace NzbDrone.Core.Profiles.Languages public void Delete(int id) { - if (_seriesService.GetAllSeries().Any(c => c.LanguageProfileId == id)) + if (_artistService.GetAllArtists().Any(c => c.LanguageProfileId == id)) { throw new LanguageProfileInUseException(id); } @@ -92,4 +92,4 @@ namespace NzbDrone.Core.Profiles.Languages AddDefaultProfile("English", Language.English, Language.English); } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Core/Queue/Queue.cs b/src/NzbDrone.Core/Queue/Queue.cs index f2ed3d679..2bdddbe22 100644 --- a/src/NzbDrone.Core/Queue/Queue.cs +++ b/src/NzbDrone.Core/Queue/Queue.cs @@ -5,7 +5,6 @@ using NzbDrone.Core.Download.TrackedDownloads; using NzbDrone.Core.Indexers; using NzbDrone.Core.Parser.Model; using NzbDrone.Core.Qualities; -using NzbDrone.Core.Tv; using NzbDrone.Core.Music; namespace NzbDrone.Core.Queue @@ -14,7 +13,6 @@ namespace NzbDrone.Core.Queue { public Artist Artist { get; set; } public Album Album { get; set; } - public Episode Episode { get; set; } public QualityModel Quality { get; set; } public decimal Size { get; set; } public string Title { get; set; }