Merge pull request #1005 from MediaBrowser/dev

3.0.5518.0

2 files changed, 9 insertions, 26 deletions

diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
index b3066b460..f1bb5c13a 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -229,6 +229,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 ServerId = _appHost.SystemId
             };
 
+            dto.CanDelete = user == null
+                ? recording.CanDelete()
+                : recording.CanDelete(user);
+            
             dto.MediaStreams = dto.MediaSources.SelectMany(i => i.MediaStreams).ToList();
 
             if (info.Status == RecordingStatus.InProgress)
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 96498563e..33c3b97dc 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -147,7 +147,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
                 var currentUser = user;
 
                 channels = channels
-                    .Where(i => i.IsParentalAllowed(currentUser))
+                    .Where(i => i.IsVisible(currentUser))
                     .OrderBy(i =>
                     {
                         double number = 0;
@@ -436,40 +436,19 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
         private async Task<LiveTvChannel> GetChannel(ChannelInfo channelInfo, string serviceName, CancellationToken cancellationToken)
         {
-            var path = Path.Combine(_config.ApplicationPaths.ItemsByNamePath, "tvchannels", _fileSystem.GetValidFilename(channelInfo.Name));
-
-            var fileInfo = new DirectoryInfo(path);
-
             var isNew = false;
 
-            if (!fileInfo.Exists)
-            {
-                _logger.Debug("Creating directory {0}", path);
-
-                Directory.CreateDirectory(path);
-                fileInfo = new DirectoryInfo(path);
-
-                if (!fileInfo.Exists)
-                {
-                    throw new IOException("Path not created: " + path);
-                }
-
-                isNew = true;
-            }
-
             var id = _tvDtoService.GetInternalChannelId(serviceName, channelInfo.Id);
 
             var item = _itemRepo.RetrieveItem(id) as LiveTvChannel;
 
-            if (item == null || !string.Equals(item.Path, path, StringComparison.OrdinalIgnoreCase))
+            if (item == null)
             {
                 item = new LiveTvChannel
                 {
                     Name = channelInfo.Name,
                     Id = id,
-                    DateCreated = _fileSystem.GetCreationTimeUtc(fileInfo),
-                    DateModified = _fileSystem.GetLastWriteTimeUtc(fileInfo),
-                    Path = path
+                    DateCreated = DateTime.UtcNow,
                 };
 
                 isNew = true;
@@ -700,7 +679,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             {
                 // Avoid implicitly captured closure
                 var currentUser = user;
-                programs = programs.Where(i => i.IsParentalAllowed(currentUser));
+                programs = programs.Where(i => i.IsVisible(currentUser));
             }
 
             var programList = programs.ToList();
@@ -735,7 +714,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
 
             // Avoid implicitly captured closure
             var currentUser = user;
-            programs = programs.Where(i => i.IsParentalAllowed(currentUser));
+            programs = programs.Where(i => i.IsVisible(currentUser));
 
             if (query.IsAiring.HasValue)
             {