live tv stream adjustments, add additional dlna params

1 files changed, 7 insertions, 23 deletions

diff --git a/MediaBrowser.Controller/Providers/DirectoryService.cs b/MediaBrowser.Controller/Providers/DirectoryService.cs
index 751de9fb4..9d41b6d25 100644
--- a/MediaBrowser.Controller/Providers/DirectoryService.cs
+++ b/MediaBrowser.Controller/Providers/DirectoryService.cs
@@ -1,6 +1,6 @@
-using System.Collections.Concurrent;
-using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Logging;
 using System;
+using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -10,10 +10,8 @@ namespace MediaBrowser.Controller.Providers
     public interface IDirectoryService
     {
         List<FileSystemInfo> GetFileSystemEntries(string path);
-        IEnumerable<FileInfo> GetFiles(string path);
-        IEnumerable<DirectoryInfo> GetDirectories(string path);
-        FileInfo GetFile(string path);
-        DirectoryInfo GetDirectory(string path);
+        IEnumerable<FileSystemInfo> GetFiles(string path);
+        FileSystemInfo GetFile(string path);
     }
 
     public class DirectoryService : IDirectoryService
@@ -50,31 +48,17 @@ namespace MediaBrowser.Controller.Providers
             return entries;
         }
 
-        public IEnumerable<FileInfo> GetFiles(string path)
+        public IEnumerable<FileSystemInfo> GetFiles(string path)
         {
-            return GetFileSystemEntries(path).OfType<FileInfo>();
+            return GetFileSystemEntries(path).Where(i => (i.Attributes & FileAttributes.Directory) != FileAttributes.Directory);
         }
 
-        public IEnumerable<DirectoryInfo> GetDirectories(string path)
-        {
-            return GetFileSystemEntries(path).OfType<DirectoryInfo>();
-        }
-
-        public FileInfo GetFile(string path)
+        public FileSystemInfo GetFile(string path)
         {
             var directory = Path.GetDirectoryName(path);
             var filename = Path.GetFileName(path);
 
             return GetFiles(directory).FirstOrDefault(i => string.Equals(i.Name, filename, StringComparison.OrdinalIgnoreCase));
         }
-
-
-        public DirectoryInfo GetDirectory(string path)
-        {
-            var directory = Path.GetDirectoryName(path);
-            var name = Path.GetFileName(path);
-
-            return GetDirectories(directory).FirstOrDefault(i => string.Equals(i.Name, name, StringComparison.OrdinalIgnoreCase));
-        }
     }
 }