aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-26 21:43:18 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2013-05-26 21:43:18 -0400
commit16e9a7e42fa4be2d82d059a898a1b8a753b8b1ea (patch)
treedefcb10ba91c292b036389228c8468af023bd6ae
parent911a60971f6accb94351ccc581e8f1d86d59c1b5 (diff)
fixed user collections not getting populated
-rw-r--r--MediaBrowser.Controller/IO/FileData.cs15
-rw-r--r--MediaBrowser.Controller/IO/FileSystem.cs2
2 files changed, 15 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs
index 79ba0a64f..6d18070ad 100644
--- a/MediaBrowser.Controller/IO/FileData.cs
+++ b/MediaBrowser.Controller/IO/FileData.cs
@@ -50,7 +50,20 @@ namespace MediaBrowser.Controller.IO
var data = FileSystem.GetFileSystemInfo(newPath);
- dict[data.FullName] = data;
+ if (data.Exists)
+ {
+ // Find out if the shortcut is pointing to a directory or file
+ if (data.Attributes.HasFlag(FileAttributes.Directory))
+ {
+ // add to our physical locations
+ if (args != null)
+ {
+ args.AddAdditionalLocation(newPath);
+ }
+ }
+
+ dict[data.FullName] = data;
+ }
}
else if (flattenFolderDepth > 0 && isDirectory)
{
diff --git a/MediaBrowser.Controller/IO/FileSystem.cs b/MediaBrowser.Controller/IO/FileSystem.cs
index 04eefd4a1..e5f80533a 100644
--- a/MediaBrowser.Controller/IO/FileSystem.cs
+++ b/MediaBrowser.Controller/IO/FileSystem.cs
@@ -34,7 +34,7 @@ namespace MediaBrowser.Controller.IO
{
var fileInfo = new DirectoryInfo(path);
- if (fileInfo.Exists || path.EndsWith(":\\", StringComparison.OrdinalIgnoreCase))
+ if (fileInfo.Exists)
{
return fileInfo;
}