From f40305cb044e1fe83d4ade64ef061da2b047d93d Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 6 Nov 2012 16:53:56 -0800 Subject: [PATCH 1/2] Fixed: Issue sorting downloads non-Windows NAS --- NzbDrone.Core/Providers/DiskScanProvider.cs | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/NzbDrone.Core/Providers/DiskScanProvider.cs b/NzbDrone.Core/Providers/DiskScanProvider.cs index 1258a59a5..f51e6e95b 100644 --- a/NzbDrone.Core/Providers/DiskScanProvider.cs +++ b/NzbDrone.Core/Providers/DiskScanProvider.cs @@ -197,8 +197,16 @@ namespace NzbDrone.Core.Providers Logger.Debug("Moving [{0}] > [{1}]", episodeFile.Path, newFile.FullName); _diskProvider.MoveFile(episodeFile.Path, newFile.FullName); - - _diskProvider.InheritFolderPermissions(newFile.FullName); + + //Wrapped in Try/Catch to prevent this from causing issues with remote NAS boxes, the move worked, which is more important. + try + { + _diskProvider.InheritFolderPermissions(newFile.FullName); + } + catch (UnauthorizedAccessException ex) + { + Logger.Debug("Unable to apply folder permissions to: ", newFile.FullName); + } episodeFile.Path = newFile.FullName; _mediaFileProvider.Update(episodeFile); From 171e0cbb31286f6543791c864910d2fc48c5b858 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Tue, 6 Nov 2012 17:06:19 -0800 Subject: [PATCH 2/2] Fixed scripts on DownloadClient settings --- .../Views/Settings/DownloadClient.cshtml | 182 +++++++++--------- 1 file changed, 92 insertions(+), 90 deletions(-) diff --git a/NzbDrone.Web/Views/Settings/DownloadClient.cshtml b/NzbDrone.Web/Views/Settings/DownloadClient.cshtml index 6c7581ccb..5a0b26536 100644 --- a/NzbDrone.Web/Views/Settings/DownloadClient.cshtml +++ b/NzbDrone.Web/Views/Settings/DownloadClient.cshtml @@ -62,98 +62,100 @@
- + +}