diff options
| author | ebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com> | 2012-09-18 16:07:17 -0400 |
|---|---|---|
| committer | ebr11 Eric Reed spam <ebr11 Eric Reed spam@reedsplace.com> | 2012-09-18 16:07:17 -0400 |
| commit | 0adc77209cd2c43fcc637124683f80a60bad9474 (patch) | |
| tree | 6d34474ba6cf403fe877316bb1b21536afee6daa | |
| parent | 0f078d8098e60804c4f9b13c82566286362a83f2 (diff) | |
Oops - still resolving metadata folder
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Resolvers/FolderResolver.cs | 2 |
2 files changed, 1 insertions, 6 deletions
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs index ab2f07ecf..7a09139fe 100644 --- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs +++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs @@ -60,11 +60,6 @@ namespace MediaBrowser.Controller.Resolvers // Ignore any folders containing a file called .ignore
resolve = false;
}
- else if (args.FileInfo.cFileName.Equals("metadata", StringComparison.OrdinalIgnoreCase))
- {
- // Ignore metadata folders
- resolve = false;
- }
return resolve;
}
diff --git a/MediaBrowser.Controller/Resolvers/FolderResolver.cs b/MediaBrowser.Controller/Resolvers/FolderResolver.cs index 408e513d4..3c6083c5d 100644 --- a/MediaBrowser.Controller/Resolvers/FolderResolver.cs +++ b/MediaBrowser.Controller/Resolvers/FolderResolver.cs @@ -14,7 +14,7 @@ namespace MediaBrowser.Controller.Resolvers protected override Folder Resolve(ItemResolveEventArgs args)
{
- if (args.IsDirectory)
+ if (args.IsDirectory && !args.FileInfo.cFileName.Equals("metadata",System.StringComparison.OrdinalIgnoreCase))
{
return new Folder() { PhysicalLocations = args.PhysicalLocations };
}
|