add error handling when resolving shortcuts
This commit is contained in:
parent
ae76e1c725
commit
1a1fbec334
|
@ -60,22 +60,29 @@ namespace MediaBrowser.Controller.IO
|
||||||
|
|
||||||
if (resolveShortcuts && fileSystem.IsShortcut(fullName))
|
if (resolveShortcuts && fileSystem.IsShortcut(fullName))
|
||||||
{
|
{
|
||||||
var newPath = fileSystem.ResolveShortcut(fullName);
|
try
|
||||||
|
|
||||||
if (string.IsNullOrWhiteSpace(newPath))
|
|
||||||
{
|
{
|
||||||
//invalid shortcut - could be old or target could just be unavailable
|
var newPath = fileSystem.ResolveShortcut(fullName);
|
||||||
logger.Warn("Encountered invalid shortcut: " + fullName);
|
|
||||||
continue;
|
if (string.IsNullOrWhiteSpace(newPath))
|
||||||
|
{
|
||||||
|
//invalid shortcut - could be old or target could just be unavailable
|
||||||
|
logger.Warn("Encountered invalid shortcut: " + fullName);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Don't check if it exists here because that could return false for network shares.
|
||||||
|
var data = fileSystem.GetDirectoryInfo(newPath);
|
||||||
|
|
||||||
|
// add to our physical locations
|
||||||
|
args.AddAdditionalLocation(newPath);
|
||||||
|
|
||||||
|
dict[newPath] = data;
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
logger.ErrorException("Error resolving shortcut from {0}", ex, fullName);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Don't check if it exists here because that could return false for network shares.
|
|
||||||
var data = fileSystem.GetDirectoryInfo(newPath);
|
|
||||||
|
|
||||||
// add to our physical locations
|
|
||||||
args.AddAdditionalLocation(newPath);
|
|
||||||
|
|
||||||
dict[newPath] = data;
|
|
||||||
}
|
}
|
||||||
else if (flattenFolderDepth > 0 && isDirectory)
|
else if (flattenFolderDepth > 0 && isDirectory)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user