Mirrors/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2024-11-05 02:22:31 +01:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into backbone

Browse Source
This commit is contained in:
Mark McDowall 2012-11-06 17:15:06 -08:00
commit 44c7a58595
2 changed files with 95 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NzbDrone.Core/Providers/DiskScanProvider.cs
View File

@ -198,7 +198,15 @@ public virtual EpisodeFile MoveEpisodeFile(EpisodeFile episodeFile, bool newDown
Logger.Debug("Moving [{0}] > [{1}]", episodeFile.Path, newFile.FullName);
_diskProvider.MoveFile(episodeFile.Path, 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);

6
NzbDrone.Web/Views/Settings/DownloadClient.cshtml
View File

@ -62,7 +62,8 @@
<div id="result" class="hiddenResult">
</div>
<script type="text/javascript">
@section Scripts{
<script type="text/javascript">
$(document).ready(function () {
$('#downloadClientAccordion').accordion("activate", false);
@ -156,4 +157,5 @@
}
});
});
</script>
</script>
}