From d252a8b232b0aeec34981ec2fb7a23dc57a96823 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 10 Jan 2017 12:39:28 -0500 Subject: [PATCH 1/2] Fixes #100 - When adding a movie, monitored toggle doesn't apply and always defaults to being monitored --- src/UI/AddMovies/SearchResultView.js | 41 ++----------------- src/UI/AddMovies/SearchResultViewTemplate.hbs | 6 +-- 2 files changed, 7 insertions(+), 40 deletions(-) diff --git a/src/UI/AddMovies/SearchResultView.js b/src/UI/AddMovies/SearchResultView.js index 3d50e1030..abeaf5016 100644 --- a/src/UI/AddMovies/SearchResultView.js +++ b/src/UI/AddMovies/SearchResultView.js @@ -58,7 +58,7 @@ var view = Marionette.ItemView.extend({ var defaultProfile = Config.getValue(Config.Keys.DefaultProfileId); var defaultRoot = Config.getValue(Config.Keys.DefaultRootFolderId); var useSeasonFolder = Config.getValueBoolean(Config.Keys.UseSeasonFolder, true); - var defaultMonitorEpisodes = Config.getValue(Config.Keys.MonitorEpisodes, 'missing'); + var defaultMonitorEpisodes = Config.getValue(Config.Keys.MonitorEpisodes, 'all'); if (Profiles.get(defaultProfile)) { this.ui.profile.val(defaultProfile); @@ -169,6 +169,7 @@ var view = Marionette.ItemView.extend({ var profile = this.ui.profile.val(); var rootFolderPath = this.ui.rootFolder.children(':selected').text(); + var monitor = this.ui.monitor.val(); var options = this._getAddMoviesOptions(); options.searchForMovie = searchForMovie; @@ -178,7 +179,7 @@ var view = Marionette.ItemView.extend({ profileId : profile, rootFolderPath : rootFolderPath, addOptions : options, - monitored : true + monitored : (monitor === 'all' ? true : false) }, { silent : true }); var self = this; @@ -229,44 +230,10 @@ var view = Marionette.ItemView.extend({ }, _getAddMoviesOptions : function() { - var monitor = this.ui.monitor.val(); - - var options = { + return { ignoreEpisodesWithFiles : false, ignoreEpisodesWithoutFiles : false }; - - if (monitor === 'all') { - return options; - } - - else if (monitor === 'future') { - options.ignoreEpisodesWithFiles = true; - options.ignoreEpisodesWithoutFiles = true; - } - - // else if (monitor === 'latest') { - // this.model.setSeasonPass(lastSeason.seasonNumber); - // } - - // else if (monitor === 'first') { - // this.model.setSeasonPass(lastSeason.seasonNumber + 1); - // this.model.setSeasonMonitored(firstSeason.seasonNumber); - // } - - else if (monitor === 'missing') { - options.ignoreEpisodesWithFiles = true; - } - - else if (monitor === 'existing') { - options.ignoreEpisodesWithoutFiles = true; - } - - // else if (monitor === 'none') { - // this.model.setSeasonPass(lastSeason.seasonNumber + 1); - // } - - return options; } }); diff --git a/src/UI/AddMovies/SearchResultViewTemplate.hbs b/src/UI/AddMovies/SearchResultViewTemplate.hbs index 35d213adb..069c140b3 100644 --- a/src/UI/AddMovies/SearchResultViewTemplate.hbs +++ b/src/UI/AddMovies/SearchResultViewTemplate.hbs @@ -41,9 +41,9 @@
From 125f46fbec3d79c9b217c9f797806ff86bf4c71f Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Tue, 10 Jan 2017 13:21:54 -0500 Subject: [PATCH 2/2] Fixes #104 - Backup/update fail Access to the path "/tmp/nzbdrone_backup/config.xml" is denied --- src/NzbDrone.Api/Frontend/Mappers/BackupFileMapper.cs | 2 +- src/NzbDrone.Core/Backup/BackupService.cs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/NzbDrone.Api/Frontend/Mappers/BackupFileMapper.cs b/src/NzbDrone.Api/Frontend/Mappers/BackupFileMapper.cs index 9e4912524..8e8393ef6 100644 --- a/src/NzbDrone.Api/Frontend/Mappers/BackupFileMapper.cs +++ b/src/NzbDrone.Api/Frontend/Mappers/BackupFileMapper.cs @@ -25,7 +25,7 @@ namespace NzbDrone.Api.Frontend.Mappers public override bool CanHandle(string resourceUrl) { - return resourceUrl.StartsWith("/backup/") && resourceUrl.ContainsIgnoreCase("nzbdrone_backup_") && resourceUrl.EndsWith(".zip"); + return resourceUrl.StartsWith("/backup/") && resourceUrl.ContainsIgnoreCase("radarr_backup_") && resourceUrl.EndsWith(".zip"); } } } \ No newline at end of file diff --git a/src/NzbDrone.Core/Backup/BackupService.cs b/src/NzbDrone.Core/Backup/BackupService.cs index 8cc89d87b..39130703f 100644 --- a/src/NzbDrone.Core/Backup/BackupService.cs +++ b/src/NzbDrone.Core/Backup/BackupService.cs @@ -33,7 +33,7 @@ namespace NzbDrone.Core.Backup private string _backupTempFolder; - private static readonly Regex BackupFileRegex = new Regex(@"nzbdrone_backup_[._0-9]+\.zip", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex BackupFileRegex = new Regex(@"radarr_backup_[._0-9]+\.zip", RegexOptions.Compiled | RegexOptions.IgnoreCase); public BackupService(IMainDatabase maindDb, IDiskTransferService diskTransferService, @@ -49,7 +49,7 @@ namespace NzbDrone.Core.Backup _archiveService = archiveService; _logger = logger; - _backupTempFolder = Path.Combine(_appFolderInfo.TempFolder, "nzbdrone_backup"); + _backupTempFolder = Path.Combine(_appFolderInfo.TempFolder, "radarr_backup"); } public void Backup(BackupType backupType) @@ -59,7 +59,7 @@ namespace NzbDrone.Core.Backup _diskProvider.EnsureFolder(_backupTempFolder); _diskProvider.EnsureFolder(GetBackupFolder(backupType)); - var backupFilename = string.Format("nzbdrone_backup_{0:yyyy.MM.dd_HH.mm.ss}.zip", DateTime.Now); + var backupFilename = string.Format("radarr_backup_{0:yyyy.MM.dd_HH.mm.ss}.zip", DateTime.Now); var backupPath = Path.Combine(GetBackupFolder(backupType), backupFilename); Cleanup();