mirror of
https://github.com/lidarr/lidarr.git
synced 2025-08-23 06:45:19 -07:00
Patch/onedr0p 3 16 17 (#1200)
* clear localStorage on radarr update.. ya mon * Fix when movie folder is deleted from disk and keeps showing up as downloaded in radarr * Clear all UI localStorage items on update, set pageSize to what it needs to be.
This commit is contained in:
parent
2b1023e768
commit
59c07cc5f3
2 changed files with 22 additions and 5 deletions
|
@ -44,6 +44,7 @@ namespace NzbDrone.Core.MediaFiles
|
||||||
private readonly IMediaFileTableCleanupService _mediaFileTableCleanupService;
|
private readonly IMediaFileTableCleanupService _mediaFileTableCleanupService;
|
||||||
private readonly IEventAggregator _eventAggregator;
|
private readonly IEventAggregator _eventAggregator;
|
||||||
private readonly IMovieService _movieService;
|
private readonly IMovieService _movieService;
|
||||||
|
private readonly IMovieFileRepository _movieFileRepository;
|
||||||
private readonly Logger _logger;
|
private readonly Logger _logger;
|
||||||
|
|
||||||
public DiskScanService(IDiskProvider diskProvider,
|
public DiskScanService(IDiskProvider diskProvider,
|
||||||
|
@ -55,6 +56,7 @@ namespace NzbDrone.Core.MediaFiles
|
||||||
IMediaFileTableCleanupService mediaFileTableCleanupService,
|
IMediaFileTableCleanupService mediaFileTableCleanupService,
|
||||||
IEventAggregator eventAggregator,
|
IEventAggregator eventAggregator,
|
||||||
IMovieService movieService,
|
IMovieService movieService,
|
||||||
|
IMovieFileRepository movieFileRepository,
|
||||||
Logger logger)
|
Logger logger)
|
||||||
{
|
{
|
||||||
_diskProvider = diskProvider;
|
_diskProvider = diskProvider;
|
||||||
|
@ -66,6 +68,7 @@ namespace NzbDrone.Core.MediaFiles
|
||||||
_mediaFileTableCleanupService = mediaFileTableCleanupService;
|
_mediaFileTableCleanupService = mediaFileTableCleanupService;
|
||||||
_eventAggregator = eventAggregator;
|
_eventAggregator = eventAggregator;
|
||||||
_movieService = movieService;
|
_movieService = movieService;
|
||||||
|
_movieFileRepository = movieFileRepository;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -136,14 +139,14 @@ namespace NzbDrone.Core.MediaFiles
|
||||||
|
|
||||||
if (!_diskProvider.FolderExists(rootFolder))
|
if (!_diskProvider.FolderExists(rootFolder))
|
||||||
{
|
{
|
||||||
_logger.Warn("Series' root folder ({0}) doesn't exist.", rootFolder);
|
_logger.Warn("Movies' root folder ({0}) doesn't exist.", rootFolder);
|
||||||
_eventAggregator.PublishEvent(new MovieScanSkippedEvent(movie, MovieScanSkippedReason.RootFolderDoesNotExist));
|
_eventAggregator.PublishEvent(new MovieScanSkippedEvent(movie, MovieScanSkippedReason.RootFolderDoesNotExist));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_diskProvider.GetDirectories(rootFolder).Empty())
|
if (_diskProvider.GetDirectories(rootFolder).Empty())
|
||||||
{
|
{
|
||||||
_logger.Warn("Series' root folder ({0}) is empty.", rootFolder);
|
_logger.Warn("Movies' root folder ({0}) is empty.", rootFolder);
|
||||||
_eventAggregator.PublishEvent(new MovieScanSkippedEvent(movie, MovieScanSkippedReason.RootFolderIsEmpty));
|
_eventAggregator.PublishEvent(new MovieScanSkippedEvent(movie, MovieScanSkippedReason.RootFolderIsEmpty));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -155,13 +158,20 @@ namespace NzbDrone.Core.MediaFiles
|
||||||
if (_configService.CreateEmptySeriesFolders &&
|
if (_configService.CreateEmptySeriesFolders &&
|
||||||
_diskProvider.FolderExists(rootFolder))
|
_diskProvider.FolderExists(rootFolder))
|
||||||
{
|
{
|
||||||
_logger.Debug("Creating missing series folder: {0}", movie.Path);
|
_logger.Debug("Creating missing movies folder: {0}", movie.Path);
|
||||||
_diskProvider.CreateFolder(movie.Path);
|
_diskProvider.CreateFolder(movie.Path);
|
||||||
SetPermissions(movie.Path);
|
SetPermissions(movie.Path);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_logger.Debug("Series folder doesn't exist: {0}", movie.Path);
|
// Delete Movie from MovieFiles
|
||||||
|
_movieFileRepository.Delete(movie.MovieFileId);
|
||||||
|
|
||||||
|
// Update Movie
|
||||||
|
movie.MovieFileId = 0;
|
||||||
|
_movieService.UpdateMovie(movie);
|
||||||
|
|
||||||
|
_logger.Debug("Movies folder doesn't exist: {0}", movie.Path);
|
||||||
}
|
}
|
||||||
|
|
||||||
_eventAggregator.PublishEvent(new MovieScanSkippedEvent(movie, MovieScanSkippedReason.MovieFolderDoesNotExist));
|
_eventAggregator.PublishEvent(new MovieScanSkippedEvent(movie, MovieScanSkippedReason.MovieFolderDoesNotExist));
|
||||||
|
|
|
@ -3,6 +3,7 @@ var AppLayout = require('../AppLayout');
|
||||||
var Marionette = require('marionette');
|
var Marionette = require('marionette');
|
||||||
var NotFoundView = require('./NotFoundView');
|
var NotFoundView = require('./NotFoundView');
|
||||||
var Messenger = require('./Messenger');
|
var Messenger = require('./Messenger');
|
||||||
|
var Config = require('../Config');
|
||||||
|
|
||||||
module.exports = Marionette.AppRouter.extend({
|
module.exports = Marionette.AppRouter.extend({
|
||||||
initialize : function() {
|
initialize : function() {
|
||||||
|
@ -41,7 +42,7 @@ module.exports = Marionette.AppRouter.extend({
|
||||||
var label = window.location.pathname === window.NzbDrone.UrlBase + '/system/updates' ? 'Reload' : 'View Changes';
|
var label = window.location.pathname === window.NzbDrone.UrlBase + '/system/updates' ? 'Reload' : 'View Changes';
|
||||||
|
|
||||||
Messenger.show({
|
Messenger.show({
|
||||||
message : 'Radarr has been updated',
|
message : 'Radarr has been updated, some UI configuration has been reset',
|
||||||
hideAfter : 0,
|
hideAfter : 0,
|
||||||
id : 'sonarrUpdated',
|
id : 'sonarrUpdated',
|
||||||
actions : {
|
actions : {
|
||||||
|
@ -54,6 +55,12 @@ module.exports = Marionette.AppRouter.extend({
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// Only for pre-release development
|
||||||
|
var pageSize = Config.getValue("pageSize");
|
||||||
|
window.localStorage.clear();
|
||||||
|
Config.setValue("pageSize", pageSize);
|
||||||
|
// Remove above when out of pre-release :)
|
||||||
|
|
||||||
this.pendingUpdate = true;
|
this.pendingUpdate = true;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue