add delete to multi-select

2 files changed, 100 insertions, 16 deletions

diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 319bc13fd..b7066a36d 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -162,6 +162,14 @@ namespace MediaBrowser.Api.Library
         public string Id { get; set; }
     }
 
+    [Route("/Items", "DELETE", Summary = "Deletes an item from the library and file system")]
+    [Authenticated]
+    public class DeleteItems : IReturnVoid
+    {
+        [ApiMember(Name = "Ids", Description = "Ids", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "DELETE")]
+        public string Ids { get; set; }
+    }
+
     [Route("/Items/Counts", "GET")]
     [Authenticated]
     public class GetItemCounts : IReturn<ItemCounts>
@@ -715,27 +723,49 @@ namespace MediaBrowser.Api.Library
         /// Deletes the specified request.
         /// </summary>
         /// <param name="request">The request.</param>
-        public void Delete(DeleteItem request)
+        public void Delete(DeleteItems request)
         {
-            var item = _libraryManager.GetItemById(request.Id);
-            var auth = _authContext.GetAuthorizationInfo(Request);
-            var user = _userManager.GetUserById(auth.UserId);
+            var ids = string.IsNullOrWhiteSpace(request.Ids)
+             ? new string[] { }
+             : request.Ids.Split(',');
 
-            if (!item.CanDelete(user))
+            var tasks = ids.Select(i =>
             {
-                throw new SecurityException("Unauthorized access");
-            }
+                var item = _libraryManager.GetItemById(i);
+                var auth = _authContext.GetAuthorizationInfo(Request);
+                var user = _userManager.GetUserById(auth.UserId);
 
-            if (item is ILiveTvRecording)
-            {
-                var task = _liveTv.DeleteRecording(request.Id);
-                Task.WaitAll(task);
-            }
-            else
+                if (!item.CanDelete(user))
+                {
+                    if (ids.Length > 1)
+                    {
+                        throw new SecurityException("Unauthorized access");
+                    }
+
+                    return Task.FromResult(true);
+                }
+
+                if (item is ILiveTvRecording)
+                {
+                    return _liveTv.DeleteRecording(i);
+                }
+
+                return _libraryManager.DeleteItem(item);
+            }).ToArray();
+
+            Task.WaitAll(tasks);
+        }
+
+        /// <summary>
+        /// Deletes the specified request.
+        /// </summary>
+        /// <param name="request">The request.</param>
+        public void Delete(DeleteItem request)
+        {
+            Delete(new DeleteItems
             {
-                var task = _libraryManager.DeleteItem(item);
-                Task.WaitAll(task);
-            }
+                Ids = request.Id
+            });
         }
 
         /// <summary>
diff --git a/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp.cs b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp.cs
new file mode 100644
index 000000000..ecd2864c5
--- /dev/null
+++ b/MediaBrowser.Server.Implementations/LiveTv/TunerHosts/SatIp.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Configuration;
+using MediaBrowser.Controller.LiveTv;
+using MediaBrowser.Controller.MediaEncoding;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.LiveTv;
+using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Serialization;
+
+namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts
+{
+    public class SatIp : BaseTunerHost
+    {
+        public SatIp(IConfigurationManager config, ILogger logger, IJsonSerializer jsonSerializer, IMediaEncoder mediaEncoder)
+            : base(config, logger, jsonSerializer, mediaEncoder)
+        {
+        }
+
+        protected override Task<IEnumerable<ChannelInfo>> GetChannelsInternal(TunerHostInfo tuner, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        public override string Type
+        {
+            get { return "SatIp"; }
+        }
+
+        protected override Task<List<MediaSourceInfo>> GetChannelStreamMediaSources(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override Task<MediaSourceInfo> GetChannelStream(TunerHostInfo tuner, string channelId, string streamId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override Task<bool> IsAvailableInternal(TunerHostInfo tuner, string channelId, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+
+        protected override bool IsValidChannelId(string channelId)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}