From f9f67873add8c7471a022993429f07e22d1c8944 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Sat, 25 Feb 2017 23:16:18 -0500 Subject: [PATCH] small changes --- src/NzbDrone.Api/Movies/MovieFileModule.cs | 55 +++++++------------ .../Movies/MovieModuleWithSignalR.cs | 16 +++--- 2 files changed, 27 insertions(+), 44 deletions(-) diff --git a/src/NzbDrone.Api/Movies/MovieFileModule.cs b/src/NzbDrone.Api/Movies/MovieFileModule.cs index f8108a45c..5d37ac911 100644 --- a/src/NzbDrone.Api/Movies/MovieFileModule.cs +++ b/src/NzbDrone.Api/Movies/MovieFileModule.cs @@ -13,77 +13,60 @@ using NzbDrone.SignalR; namespace NzbDrone.Api.EpisodeFiles { - public class MovieFileModule : NzbDroneRestModuleWithSignalR - //IHandle + public class MovieFileModule : NzbDroneRestModuleWithSignalR, IHandle { private readonly IMediaFileService _mediaFileService; private readonly IRecycleBinProvider _recycleBinProvider; - private readonly IMovieService _seriesService; + private readonly IMovieService _movieService; private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification; private readonly Logger _logger; public MovieFileModule(IBroadcastSignalRMessage signalRBroadcaster, IMediaFileService mediaFileService, IRecycleBinProvider recycleBinProvider, - IMovieService seriesService, + IMovieService movieService, IQualityUpgradableSpecification qualityUpgradableSpecification, Logger logger) : base(signalRBroadcaster) { _mediaFileService = mediaFileService; _recycleBinProvider = recycleBinProvider; - _seriesService = seriesService; + _movieService = movieService; _qualityUpgradableSpecification = qualityUpgradableSpecification; _logger = logger; GetResourceById = GetMovieFile; - /*GetResourceAll = GetEpisodeFiles; - UpdateResource = SetQuality;*/ UpdateResource = SetQuality; - DeleteResource = DeleteEpisodeFile; + DeleteResource = DeleteMovieFile; } private MovieFileResource GetMovieFile(int id) { - var episodeFile = _mediaFileService.GetMovie(id); + var movie = _mediaFileService.GetMovie(id); - return episodeFile.ToResource(); + return movie.ToResource(); } - /*private List GetEpisodeFiles() + private void SetQuality(MovieFileResource movieFileResource) { - if (!Request.Query.SeriesId.HasValue) - { - throw new BadRequestException("seriesId is missing"); - } - - var seriesId = (int)Request.Query.SeriesId; - - var series = _seriesService.GetSeries(seriesId); - - return _mediaFileService.GetFilesBySeries(seriesId).ConvertAll(f => f.ToResource(series, _qualityUpgradableSpecification)); - } - */ - private void SetQuality(MovieFileResource episodeFileResource) - { - var episodeFile = _mediaFileService.GetMovie(episodeFileResource.Id); - episodeFile.Quality = episodeFileResource.Quality; - _mediaFileService.Update(episodeFile); + var movieFile = _mediaFileService.GetMovie(movieFileResource.Id); + movieFile.Quality = movieFileResource.Quality; + _mediaFileService.Update(movieFile); } - private void DeleteEpisodeFile(int id) + private void DeleteMovieFile(int id) { - var episodeFile = _mediaFileService.GetMovie(id); - var series = _seriesService.GetMovie(episodeFile.MovieId); - var fullPath = Path.Combine(series.Path, episodeFile.RelativePath); + var movieFile = _mediaFileService.GetMovie(id); + var movie = _movieService.GetMovie(movieFile.MovieId); + var fullPath = Path.Combine(movie.Path, movieFile.RelativePath); - _logger.Info("Deleting episode file: {0}", fullPath); + _logger.Info("Deleting movie file: {0}", fullPath); _recycleBinProvider.DeleteFile(fullPath); - _mediaFileService.Delete(episodeFile, DeleteMediaFileReason.Manual); + _mediaFileService.Delete(movieFile, DeleteMediaFileReason.Manual); } - public void Handle(EpisodeFileAddedEvent message) + public void Handle(MovieFileAddedEvent message) { - BroadcastResourceChange(ModelAction.Updated, message.EpisodeFile.Id); + BroadcastResourceChange(ModelAction.Updated, message.MovieFile.Id); } } } \ No newline at end of file diff --git a/src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs b/src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs index 84e5a4b61..e03b37418 100644 --- a/src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs +++ b/src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs @@ -13,27 +13,27 @@ namespace NzbDrone.Api.Movies IHandle, IHandle { - protected readonly IMovieService _episodeService; + protected readonly IMovieService _movieService; protected readonly IQualityUpgradableSpecification _qualityUpgradableSpecification; - protected MovieModuleWithSignalR(IMovieService episodeService, + protected MovieModuleWithSignalR(IMovieService movieService, IQualityUpgradableSpecification qualityUpgradableSpecification, IBroadcastSignalRMessage signalRBroadcaster) : base(signalRBroadcaster) { - _episodeService = episodeService; + _movieService = movieService; _qualityUpgradableSpecification = qualityUpgradableSpecification; GetResourceById = GetMovie; } - protected MovieModuleWithSignalR(IMovieService episodeService, + protected MovieModuleWithSignalR(IMovieService movieService, IQualityUpgradableSpecification qualityUpgradableSpecification, IBroadcastSignalRMessage signalRBroadcaster, string resource) : base(signalRBroadcaster, resource) { - _episodeService = episodeService; + _movieService = movieService; _qualityUpgradableSpecification = qualityUpgradableSpecification; GetResourceById = GetMovie; @@ -41,8 +41,8 @@ namespace NzbDrone.Api.Movies protected MovieResource GetMovie(int id) { - var episode = _episodeService.GetMovie(id); - var resource = MapToResource(episode, true); + var movie = _movieService.GetMovie(id); + var resource = MapToResource(movie, true); return resource; } @@ -52,7 +52,7 @@ namespace NzbDrone.Api.Movies if (includeSeries) { - var series = episode ?? _episodeService.GetMovie(episode.Id); + var series = episode ?? _movieService.GetMovie(episode.Id); resource = series.ToResource(); }