github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-23 06:45:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

small changes

Browse source
This commit is contained in:
Devin Buhl 2017-02-25 23:16:18 -05:00
commit f9f67873ad
2 changed files with 27 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/NzbDrone.Api/Movies/MovieFileModule.cs
View file

@ -13,77 +13,60 @@ using NzbDrone.SignalR;
namespace NzbDrone.Api.EpisodeFiles namespace NzbDrone.Api.EpisodeFiles
{ {
public class MovieFileModule : NzbDroneRestModuleWithSignalR<MovieFileResource, MovieFile> public class MovieFileModule : NzbDroneRestModuleWithSignalR<MovieFileResource, MovieFile>, IHandle<MovieFileAddedEvent>
//IHandle<EpisodeFileAddedEvent>
{ {
private readonly IMediaFileService _mediaFileService; private readonly IMediaFileService _mediaFileService;
private readonly IRecycleBinProvider _recycleBinProvider; private readonly IRecycleBinProvider _recycleBinProvider;
private readonly IMovieService _seriesService; private readonly IMovieService _movieService;
private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification; private readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
private readonly Logger _logger; private readonly Logger _logger;
public MovieFileModule(IBroadcastSignalRMessage signalRBroadcaster, public MovieFileModule(IBroadcastSignalRMessage signalRBroadcaster,
IMediaFileService mediaFileService, IMediaFileService mediaFileService,
IRecycleBinProvider recycleBinProvider, IRecycleBinProvider recycleBinProvider,
IMovieService seriesService, IMovieService movieService,
IQualityUpgradableSpecification qualityUpgradableSpecification, IQualityUpgradableSpecification qualityUpgradableSpecification,
Logger logger) Logger logger)
: base(signalRBroadcaster) : base(signalRBroadcaster)
{ {
_mediaFileService = mediaFileService; _mediaFileService = mediaFileService;
_recycleBinProvider = recycleBinProvider; _recycleBinProvider = recycleBinProvider;
_seriesService = seriesService; _movieService = movieService;
_qualityUpgradableSpecification = qualityUpgradableSpecification; _qualityUpgradableSpecification = qualityUpgradableSpecification;
_logger = logger; _logger = logger;
GetResourceById = GetMovieFile; GetResourceById = GetMovieFile;
/*GetResourceAll = GetEpisodeFiles;
UpdateResource = SetQuality;*/
UpdateResource = SetQuality; UpdateResource = SetQuality;
DeleteResource = DeleteEpisodeFile; DeleteResource = DeleteMovieFile;
} }
private MovieFileResource GetMovieFile(int id) private MovieFileResource GetMovieFile(int id)
{ {
var episodeFile = _mediaFileService.GetMovie(id); var movie = _mediaFileService.GetMovie(id);
return episodeFile.ToResource(); return movie.ToResource();
} }
/*private List<EpisodeFileResource> GetEpisodeFiles() private void SetQuality(MovieFileResource movieFileResource)
{ {
if (!Request.Query.SeriesId.HasValue) var movieFile = _mediaFileService.GetMovie(movieFileResource.Id);
{ movieFile.Quality = movieFileResource.Quality;
throw new BadRequestException("seriesId is missing"); _mediaFileService.Update(movieFile);
}
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);
} }
private void DeleteEpisodeFile(int id) private void DeleteMovieFile(int id)
{ {
var episodeFile = _mediaFileService.GetMovie(id); var movieFile = _mediaFileService.GetMovie(id);
var series = _seriesService.GetMovie(episodeFile.MovieId); var movie = _movieService.GetMovie(movieFile.MovieId);
var fullPath = Path.Combine(series.Path, episodeFile.RelativePath); 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); _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);
} }
} }
} }

16
src/NzbDrone.Api/Movies/MovieModuleWithSignalR.cs
View file

@ -13,27 +13,27 @@ namespace NzbDrone.Api.Movies
IHandle<MovieGrabbedEvent>, IHandle<MovieGrabbedEvent>,
IHandle<MovieDownloadedEvent> IHandle<MovieDownloadedEvent>
{ {
protected readonly IMovieService _episodeService; protected readonly IMovieService _movieService;
protected readonly IQualityUpgradableSpecification _qualityUpgradableSpecification; protected readonly IQualityUpgradableSpecification _qualityUpgradableSpecification;
protected MovieModuleWithSignalR(IMovieService episodeService, protected MovieModuleWithSignalR(IMovieService movieService,
IQualityUpgradableSpecification qualityUpgradableSpecification, IQualityUpgradableSpecification qualityUpgradableSpecification,
IBroadcastSignalRMessage signalRBroadcaster) IBroadcastSignalRMessage signalRBroadcaster)
: base(signalRBroadcaster) : base(signalRBroadcaster)
{ {
_episodeService = episodeService; _movieService = movieService;
_qualityUpgradableSpecification = qualityUpgradableSpecification; _qualityUpgradableSpecification = qualityUpgradableSpecification;
GetResourceById = GetMovie; GetResourceById = GetMovie;
} }
protected MovieModuleWithSignalR(IMovieService episodeService, protected MovieModuleWithSignalR(IMovieService movieService,
IQualityUpgradableSpecification qualityUpgradableSpecification, IQualityUpgradableSpecification qualityUpgradableSpecification,
IBroadcastSignalRMessage signalRBroadcaster, IBroadcastSignalRMessage signalRBroadcaster,
string resource) string resource)
: base(signalRBroadcaster, resource) : base(signalRBroadcaster, resource)
{ {
_episodeService = episodeService; _movieService = movieService;
_qualityUpgradableSpecification = qualityUpgradableSpecification; _qualityUpgradableSpecification = qualityUpgradableSpecification;
GetResourceById = GetMovie; GetResourceById = GetMovie;
@ -41,8 +41,8 @@ namespace NzbDrone.Api.Movies
protected MovieResource GetMovie(int id) protected MovieResource GetMovie(int id)
{ {
var episode = _episodeService.GetMovie(id); var movie = _movieService.GetMovie(id);
var resource = MapToResource(episode, true); var resource = MapToResource(movie, true);
return resource; return resource;
} }
@ -52,7 +52,7 @@ namespace NzbDrone.Api.Movies
if (includeSeries) if (includeSeries)
{ {
var series = episode ?? _episodeService.GetMovie(episode.Id); var series = episode ?? _movieService.GetMovie(episode.Id);
resource = series.ToResource(); resource = series.ToResource();
} }