diff options
| author | Luke <luke.pulverenti@gmail.com> | 2015-11-12 15:54:31 -0500 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2015-11-12 15:54:31 -0500 |
| commit | 1051745fd12fdf6f999b7b3f89a7494655294cb0 (patch) | |
| tree | 477a1889419505a57a77985a2563ac085fe314b2 /MediaBrowser.Controller | |
| parent | bccd26808143ddb2a873a3edca4291bf4a74babc (diff) | |
| parent | c6ce8342163a5665f29122aef02ce8068b349f16 (diff) | |
Merge pull request #1265 from MediaBrowser/master
update use of FileAttributes
Diffstat (limited to 'MediaBrowser.Controller')
| -rw-r--r-- | MediaBrowser.Controller/IO/FileData.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Library/ItemResolveArgs.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/DirectoryService.cs | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/MediaBrowser.Controller/IO/FileData.cs b/MediaBrowser.Controller/IO/FileData.cs index 20dfc425e3..e2bdb28e34 100644 --- a/MediaBrowser.Controller/IO/FileData.cs +++ b/MediaBrowser.Controller/IO/FileData.cs @@ -54,7 +54,7 @@ namespace MediaBrowser.Controller.IO foreach (var entry in entries) { - var isDirectory = (entry.Attributes & FileAttributes.Directory) == FileAttributes.Directory; + var isDirectory = entry.IsDirectory; var fullName = entry.FullName; diff --git a/MediaBrowser.Controller/Library/ItemResolveArgs.cs b/MediaBrowser.Controller/Library/ItemResolveArgs.cs index cd20da35a9..9084ea56bb 100644 --- a/MediaBrowser.Controller/Library/ItemResolveArgs.cs +++ b/MediaBrowser.Controller/Library/ItemResolveArgs.cs @@ -84,7 +84,7 @@ namespace MediaBrowser.Controller.Library { get { - return (FileInfo.Attributes & FileAttributes.Directory) == FileAttributes.Directory; + return FileInfo.IsDirectory; } } diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs index cf1c3d286d..36ef6ca1f0 100644 --- a/MediaBrowser.Controller/Providers/DirectoryService.cs +++ b/MediaBrowser.Controller/Providers/DirectoryService.cs @@ -95,7 +95,7 @@ namespace MediaBrowser.Controller.Providers public IEnumerable<FileSystemMetadata> GetFiles(string path, bool clearCache) { - return GetFileSystemEntries(path, clearCache).Where(i => (i.Attributes & FileAttributes.Directory) != FileAttributes.Directory); + return GetFileSystemEntries(path, clearCache).Where(i => !i.IsDirectory); } public FileSystemMetadata GetFile(string path) @@ -112,7 +112,7 @@ namespace MediaBrowser.Controller.Providers public IEnumerable<FileSystemMetadata> GetDirectories(string path) { - return GetFileSystemEntries(path, false).Where(i => (i.Attributes & FileAttributes.Directory) == FileAttributes.Directory); + return GetFileSystemEntries(path, false).Where(i => i.IsDirectory); } } } |
