From 60d2df043b6aaf054d3fa466ce970f7ff4614583 Mon Sep 17 00:00:00 2001 From: Bogdan Date: Wed, 1 Nov 2023 12:28:14 +0200 Subject: [PATCH] Rename instances of Profile to QualityProfile Closes #9337 --- .../IndexerSearch/ReleaseSearchService.cs | 8 ++++---- src/NzbDrone.Core/Movies/MovieCutoffService.cs | 8 ++++---- ...dator.cs => QualityProfileExistsValidator.cs} | 12 ++++++------ .../ApiTests/MovieEditorFixture.cs | 2 +- .../IntegrationTestBase.cs | 10 +++++----- .../ImportLists/ImportListController.cs | 4 ++-- src/Radarr.Api.V3/Movies/MovieController.cs | 4 ++-- .../Profiles/Quality/QualityProfileController.cs | 16 ++++++++-------- .../Quality/QualityProfileSchemaController.cs | 8 ++++---- 9 files changed, 36 insertions(+), 36 deletions(-) rename src/NzbDrone.Core/Validation/{ProfileExistsValidator.cs => QualityProfileExistsValidator.cs} (52%) diff --git a/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs index e59a9ca2d..a8ec8c6f8 100644 --- a/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs +++ b/src/NzbDrone.Core/IndexerSearch/ReleaseSearchService.cs @@ -27,21 +27,21 @@ namespace NzbDrone.Core.IndexerSearch private readonly IMakeDownloadDecision _makeDownloadDecision; private readonly IMovieService _movieService; private readonly IMovieTranslationService _movieTranslationService; - private readonly IQualityProfileService _profileService; + private readonly IQualityProfileService _qualityProfileService; private readonly Logger _logger; public ReleaseSearchService(IIndexerFactory indexerFactory, IMakeDownloadDecision makeDownloadDecision, IMovieService movieService, IMovieTranslationService movieTranslationService, - IQualityProfileService profileService, + IQualityProfileService qualityProfileService, Logger logger) { _indexerFactory = indexerFactory; _makeDownloadDecision = makeDownloadDecision; _movieService = movieService; _movieTranslationService = movieTranslationService; - _profileService = profileService; + _qualityProfileService = qualityProfileService; _logger = logger; } @@ -75,7 +75,7 @@ namespace NzbDrone.Core.IndexerSearch InteractiveSearch = interactiveSearch }; - var wantedLanguages = _profileService.GetAcceptableLanguages(movie.QualityProfileId); + var wantedLanguages = _qualityProfileService.GetAcceptableLanguages(movie.QualityProfileId); var translations = _movieTranslationService.GetAllTranslationsForMovieMetadata(movie.MovieMetadataId); var queryTranslations = new List diff --git a/src/NzbDrone.Core/Movies/MovieCutoffService.cs b/src/NzbDrone.Core/Movies/MovieCutoffService.cs index c0b28d03b..9f8f3f579 100644 --- a/src/NzbDrone.Core/Movies/MovieCutoffService.cs +++ b/src/NzbDrone.Core/Movies/MovieCutoffService.cs @@ -16,18 +16,18 @@ namespace NzbDrone.Core.Movies public class MovieCutoffService : IMovieCutoffService { private readonly IMovieRepository _movieRepository; - private readonly IQualityProfileService _profileService; + private readonly IQualityProfileService _qualityProfileService; - public MovieCutoffService(IMovieRepository movieRepository, IQualityProfileService profileService, Logger logger) + public MovieCutoffService(IMovieRepository movieRepository, IQualityProfileService qualityProfileService, Logger logger) { _movieRepository = movieRepository; - _profileService = profileService; + _qualityProfileService = qualityProfileService; } public PagingSpec MoviesWhereCutoffUnmet(PagingSpec pagingSpec) { var qualitiesBelowCutoff = new List(); - var profiles = _profileService.All(); + var profiles = _qualityProfileService.All(); // Get all items less than the cutoff foreach (var profile in profiles) diff --git a/src/NzbDrone.Core/Validation/ProfileExistsValidator.cs b/src/NzbDrone.Core/Validation/QualityProfileExistsValidator.cs similarity index 52% rename from src/NzbDrone.Core/Validation/ProfileExistsValidator.cs rename to src/NzbDrone.Core/Validation/QualityProfileExistsValidator.cs index b4041fc01..0bc853a56 100644 --- a/src/NzbDrone.Core/Validation/ProfileExistsValidator.cs +++ b/src/NzbDrone.Core/Validation/QualityProfileExistsValidator.cs @@ -3,16 +3,16 @@ using NzbDrone.Core.Profiles.Qualities; namespace NzbDrone.Core.Validation { - public class ProfileExistsValidator : PropertyValidator + public class QualityProfileExistsValidator : PropertyValidator { - private readonly IQualityProfileService _profileService; + private readonly IQualityProfileService _qualityProfileService; - public ProfileExistsValidator(IQualityProfileService profileService) + public QualityProfileExistsValidator(IQualityProfileService qualityProfileService) { - _profileService = profileService; + _qualityProfileService = qualityProfileService; } - protected override string GetDefaultMessageTemplate() => "QualityProfile does not exist"; + protected override string GetDefaultMessageTemplate() => "Quality Profile does not exist"; protected override bool IsValid(PropertyValidatorContext context) { @@ -21,7 +21,7 @@ namespace NzbDrone.Core.Validation return true; } - return _profileService.Exists((int)context.PropertyValue); + return _qualityProfileService.Exists((int)context.PropertyValue); } } } diff --git a/src/NzbDrone.Integration.Test/ApiTests/MovieEditorFixture.cs b/src/NzbDrone.Integration.Test/ApiTests/MovieEditorFixture.cs index c3f05e5fb..d3af1e03d 100644 --- a/src/NzbDrone.Integration.Test/ApiTests/MovieEditorFixture.cs +++ b/src/NzbDrone.Integration.Test/ApiTests/MovieEditorFixture.cs @@ -11,7 +11,7 @@ namespace NzbDrone.Integration.Test.ApiTests { private void GivenExistingMovie() { - WaitForCompletion(() => Profiles.All().Count > 0); + WaitForCompletion(() => QualityProfiles.All().Count > 0); foreach (var title in new[] { "The Dark Knight", "Pulp Fiction" }) { diff --git a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs index 92b8fec7d..517fa27d2 100644 --- a/src/NzbDrone.Integration.Test/IntegrationTestBase.cs +++ b/src/NzbDrone.Integration.Test/IntegrationTestBase.cs @@ -46,7 +46,7 @@ namespace NzbDrone.Integration.Test public LogsClient Logs; public ClientBase NamingConfig; public NotificationClient Notifications; - public ClientBase Profiles; + public ClientBase QualityProfiles; public ReleaseClient Releases; public ClientBase RootFolders; public MovieClient Movies; @@ -108,7 +108,7 @@ namespace NzbDrone.Integration.Test Logs = new LogsClient(RestClient, ApiKey); NamingConfig = new ClientBase(RestClient, ApiKey, "config/naming"); Notifications = new NotificationClient(RestClient, ApiKey); - Profiles = new ClientBase(RestClient, ApiKey); + QualityProfiles = new ClientBase(RestClient, ApiKey); Releases = new ReleaseClient(RestClient, ApiKey); RootFolders = new ClientBase(RestClient, ApiKey); Movies = new MovieClient(RestClient, ApiKey); @@ -303,10 +303,10 @@ namespace NzbDrone.Integration.Test return result.MovieFile; } - public QualityProfileResource EnsureProfileCutoff(int profileId, Quality cutoff, bool upgradeAllowed) + public QualityProfileResource EnsureQualityProfileCutoff(int profileId, Quality cutoff, bool upgradeAllowed) { var needsUpdate = false; - var profile = Profiles.Get(profileId); + var profile = QualityProfiles.Get(profileId); if (profile.Cutoff != cutoff.Id) { @@ -322,7 +322,7 @@ namespace NzbDrone.Integration.Test if (needsUpdate) { - profile = Profiles.Put(profile); + profile = QualityProfiles.Put(profile); } return profile; diff --git a/src/Radarr.Api.V3/ImportLists/ImportListController.cs b/src/Radarr.Api.V3/ImportLists/ImportListController.cs index 1a5e6821a..4e39eeafb 100644 --- a/src/Radarr.Api.V3/ImportLists/ImportListController.cs +++ b/src/Radarr.Api.V3/ImportLists/ImportListController.cs @@ -12,13 +12,13 @@ namespace Radarr.Api.V3.ImportLists public static readonly ImportListResourceMapper ResourceMapper = new (); public static readonly ImportListBulkResourceMapper BulkResourceMapper = new (); - public ImportListController(IImportListFactory importListFactory, ProfileExistsValidator profileExistsValidator) + public ImportListController(IImportListFactory importListFactory, QualityProfileExistsValidator qualityProfileExistsValidator) : base(importListFactory, "importlist", ResourceMapper, BulkResourceMapper) { SharedValidator.RuleFor(c => c.RootFolderPath).IsValidPath(); SharedValidator.RuleFor(c => c.MinimumAvailability).NotNull(); SharedValidator.RuleFor(c => c.QualityProfileId).ValidId(); - SharedValidator.RuleFor(c => c.QualityProfileId).SetValidator(profileExistsValidator); + SharedValidator.RuleFor(c => c.QualityProfileId).SetValidator(qualityProfileExistsValidator); } } } diff --git a/src/Radarr.Api.V3/Movies/MovieController.cs b/src/Radarr.Api.V3/Movies/MovieController.cs index 8fc92f549..19ba771b2 100644 --- a/src/Radarr.Api.V3/Movies/MovieController.cs +++ b/src/Radarr.Api.V3/Movies/MovieController.cs @@ -66,7 +66,7 @@ namespace Radarr.Api.V3.Movies MovieAncestorValidator moviesAncestorValidator, RecycleBinValidator recycleBinValidator, SystemFolderValidator systemFolderValidator, - ProfileExistsValidator profileExistsValidator, + QualityProfileExistsValidator qualityProfileExistsValidator, MovieFolderAsRootFolderValidator movieFolderAsRootFolderValidator, Logger logger) : base(signalRBroadcaster) @@ -94,7 +94,7 @@ namespace Radarr.Api.V3.Movies .SetValidator(systemFolderValidator) .When(s => !s.Path.IsNullOrWhiteSpace()); - SharedValidator.RuleFor(s => s.QualityProfileId).SetValidator(profileExistsValidator); + SharedValidator.RuleFor(s => s.QualityProfileId).SetValidator(qualityProfileExistsValidator); PostValidator.RuleFor(s => s.Path).IsValidPath().When(s => s.RootFolderPath.IsNullOrWhiteSpace()); PostValidator.RuleFor(s => s.RootFolderPath) diff --git a/src/Radarr.Api.V3/Profiles/Quality/QualityProfileController.cs b/src/Radarr.Api.V3/Profiles/Quality/QualityProfileController.cs index ec11f896b..b7ab9122a 100644 --- a/src/Radarr.Api.V3/Profiles/Quality/QualityProfileController.cs +++ b/src/Radarr.Api.V3/Profiles/Quality/QualityProfileController.cs @@ -14,12 +14,12 @@ namespace Radarr.Api.V3.Profiles.Quality [V3ApiController] public class QualityProfileController : RestController { - private readonly IQualityProfileService _profileService; + private readonly IQualityProfileService _qualityProfileService; private readonly ICustomFormatService _formatService; - public QualityProfileController(IQualityProfileService profileService, ICustomFormatService formatService) + public QualityProfileController(IQualityProfileService qualityProfileService, ICustomFormatService formatService) { - _profileService = profileService; + _qualityProfileService = qualityProfileService; _formatService = formatService; SharedValidator.RuleFor(c => c.Name).NotEmpty(); @@ -50,14 +50,14 @@ namespace Radarr.Api.V3.Profiles.Quality public ActionResult Create(QualityProfileResource resource) { var model = resource.ToModel(); - model = _profileService.Add(model); + model = _qualityProfileService.Add(model); return Created(model.Id); } [RestDeleteById] public void DeleteProfile(int id) { - _profileService.Delete(id); + _qualityProfileService.Delete(id); } [RestPutById] @@ -65,20 +65,20 @@ namespace Radarr.Api.V3.Profiles.Quality { var model = resource.ToModel(); - _profileService.Update(model); + _qualityProfileService.Update(model); return Accepted(model.Id); } protected override QualityProfileResource GetResourceById(int id) { - return _profileService.Get(id).ToResource(); + return _qualityProfileService.Get(id).ToResource(); } [HttpGet] public List GetAll() { - return _profileService.All().ToResource(); + return _qualityProfileService.All().ToResource(); } } } diff --git a/src/Radarr.Api.V3/Profiles/Quality/QualityProfileSchemaController.cs b/src/Radarr.Api.V3/Profiles/Quality/QualityProfileSchemaController.cs index 405676947..4aa218c60 100644 --- a/src/Radarr.Api.V3/Profiles/Quality/QualityProfileSchemaController.cs +++ b/src/Radarr.Api.V3/Profiles/Quality/QualityProfileSchemaController.cs @@ -7,17 +7,17 @@ namespace Radarr.Api.V3.Profiles.Quality [V3ApiController("qualityprofile/schema")] public class QualityProfileSchemaController : Controller { - private readonly IQualityProfileService _profileService; + private readonly IQualityProfileService _qualityProfileService; - public QualityProfileSchemaController(IQualityProfileService profileService) + public QualityProfileSchemaController(IQualityProfileService qualityProfileService) { - _profileService = profileService; + _qualityProfileService = qualityProfileService; } [HttpGet] public QualityProfileResource GetSchema() { - var qualityProfile = _profileService.GetDefaultProfile(string.Empty); + var qualityProfile = _qualityProfileService.GetDefaultProfile(string.Empty); return qualityProfile.ToResource(); }