aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/LiveTv/LiveTvService.cs31
-rw-r--r--MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs32
-rw-r--r--MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs6
-rw-r--r--MediaBrowser.Api/TvShowsService.cs64
4 files changed, 112 insertions, 21 deletions
diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index 2961c920f8..4cd75afca5 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -1,4 +1,5 @@
using System.Threading;
+using System.Threading.Tasks;
using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Model.LiveTv;
using MediaBrowser.Model.Querying;
@@ -82,6 +83,22 @@ namespace MediaBrowser.Api.LiveTv
public string UserId { get; set; }
}
+ [Route("/LiveTv/Recordings/{Id}", "DELETE")]
+ [Api(Description = "Deletes a live tv recording")]
+ public class DeleteRecording : IReturnVoid
+ {
+ [ApiMember(Name = "Id", Description = "Recording Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+ public string Id { get; set; }
+ }
+
+ [Route("/LiveTv/Timers/{Id}", "DELETE")]
+ [Api(Description = "Cancels a live tv timer")]
+ public class CancelTimer : IReturnVoid
+ {
+ [ApiMember(Name = "Id", Description = "Timer Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
+ public string Id { get; set; }
+ }
+
public class LiveTvService : BaseApiService
{
private readonly ILiveTvManager _liveTvManager;
@@ -176,5 +193,19 @@ namespace MediaBrowser.Api.LiveTv
return ToOptimizedResult(result);
}
+
+ public void Delete(DeleteRecording request)
+ {
+ var task = _liveTvManager.DeleteRecording(request.Id);
+
+ Task.WaitAll(task);
+ }
+
+ public void Delete(CancelTimer request)
+ {
+ var task = _liveTvManager.CancelTimer(request.Id);
+
+ Task.WaitAll(task);
+ }
}
} \ No newline at end of file
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
index 2674529e51..d17a38e073 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTaskService.cs
@@ -31,7 +31,8 @@ namespace MediaBrowser.Api.ScheduledTasks
[Api(Description = "Gets scheduled tasks")]
public class GetScheduledTasks : IReturn<List<TaskInfo>>
{
-
+ [ApiMember(Name = "IsHidden", Description = "Optional filter tasks that are hidden, or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
+ public bool? IsHidden { get; set; }
}
/// <summary>
@@ -112,10 +113,33 @@ namespace MediaBrowser.Api.ScheduledTasks
/// <returns>IEnumerable{TaskInfo}.</returns>
public object Get(GetScheduledTasks request)
{
- var result = TaskManager.ScheduledTasks.OrderBy(i => i.Name)
- .Select(ScheduledTaskHelpers.GetTaskInfo).ToList();
+ IEnumerable<IScheduledTaskWorker> result = TaskManager.ScheduledTasks
+ .OrderBy(i => i.Name);
- return ToOptimizedResult(result);
+ if (request.IsHidden.HasValue)
+ {
+ var val = request.IsHidden.Value;
+
+ result = result.Where(i =>
+ {
+ var isHidden = false;
+
+ var configurableTask = i.ScheduledTask as IConfigurableScheduledTask;
+
+ if (configurableTask != null)
+ {
+ isHidden = configurableTask.IsHidden;
+ }
+
+ return isHidden == val;
+ });
+ }
+
+ var infos = result
+ .Select(ScheduledTaskHelpers.GetTaskInfo)
+ .ToList();
+
+ return ToOptimizedResult(infos);
}
/// <summary>
diff --git a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
index 20634301a3..c143635bfa 100644
--- a/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
+++ b/MediaBrowser.Api/ScheduledTasks/ScheduledTasksWebSocketListener.cs
@@ -46,8 +46,10 @@ namespace MediaBrowser.Api.ScheduledTasks
/// <returns>Task{IEnumerable{TaskInfo}}.</returns>
protected override Task<IEnumerable<TaskInfo>> GetDataToSend(object state)
{
- return Task.FromResult(TaskManager.ScheduledTasks.OrderBy(i => i.Name)
- .Select(ScheduledTaskHelpers.GetTaskInfo));
+ return Task.FromResult(TaskManager.ScheduledTasks
+ .OrderBy(i => i.Name)
+ .Select(ScheduledTaskHelpers.GetTaskInfo)
+ .Where(i => !i.IsHidden));
}
}
}
diff --git a/MediaBrowser.Api/TvShowsService.cs b/MediaBrowser.Api/TvShowsService.cs
index 95bde2d283..23b8efa7bd 100644
--- a/MediaBrowser.Api/TvShowsService.cs
+++ b/MediaBrowser.Api/TvShowsService.cs
@@ -81,8 +81,11 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Season", Description = "Optional filter by season number.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET")]
public int? Season { get; set; }
- [ApiMember(Name = "ExcludeLocationTypes", Description = "Optional. If specified, results will be filtered based on LocationType. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
- public string ExcludeLocationTypes { get; set; }
+ [ApiMember(Name = "IsMissing", Description = "Optional filter by items that are missing episodes or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
+ public bool? IsMissing { get; set; }
+
+ [ApiMember(Name = "IsVirtualUnaired", Description = "Optional filter by items that are virtual unaired episodes or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
+ public bool? IsVirtualUnaired { get; set; }
}
[Route("/Shows/{Id}/Seasons", "GET")]
@@ -106,11 +109,14 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Id", Description = "The series id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "GET")]
public Guid Id { get; set; }
- [ApiMember(Name = "ExcludeLocationTypes", Description = "Optional. If specified, results will be filtered based on LocationType. This allows multiple, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
- public string ExcludeLocationTypes { get; set; }
-
[ApiMember(Name = "IsSpecialSeason", Description = "Optional. Filter by special season.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
public bool? IsSpecialSeason { get; set; }
+
+ [ApiMember(Name = "IsMissing", Description = "Optional filter by items that are missing episodes or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
+ public bool? IsMissing { get; set; }
+
+ [ApiMember(Name = "IsVirtualUnaired", Description = "Optional filter by items that are virtual unaired episodes or not.", IsRequired = false, DataType = "bool", ParameterType = "query", Verb = "GET")]
+ public bool? IsVirtualUnaired { get; set; }
}
/// <summary>
@@ -380,12 +386,7 @@ namespace MediaBrowser.Api
}
}
- // ExcludeLocationTypes
- if (!string.IsNullOrEmpty(request.ExcludeLocationTypes))
- {
- var vals = request.ExcludeLocationTypes.Split(',');
- seasons = seasons.Where(f => !vals.Contains(f.LocationType.ToString(), StringComparer.OrdinalIgnoreCase));
- }
+ seasons = FilterVirtualSeasons(request, seasons);
seasons = _libraryManager.Sort(seasons, user, new[] { sortOrder }, SortOrder.Ascending)
.Cast<Season>();
@@ -400,6 +401,34 @@ namespace MediaBrowser.Api
};
}
+ private IEnumerable<Season> FilterVirtualSeasons(GetSeasons request, IEnumerable<Season> items)
+ {
+ if (request.IsMissing.HasValue && request.IsVirtualUnaired.HasValue)
+ {
+ var isMissing = request.IsMissing.Value;
+ var isVirtualUnaired = request.IsVirtualUnaired.Value;
+
+ if (!isMissing && !isVirtualUnaired)
+ {
+ return items.Where(i => !i.IsMissingOrVirtualUnaired);
+ }
+ }
+
+ if (request.IsMissing.HasValue)
+ {
+ var val = request.IsMissing.Value;
+ items = items.Where(i => i.IsMissingSeason == val);
+ }
+
+ if (request.IsVirtualUnaired.HasValue)
+ {
+ var val = request.IsVirtualUnaired.Value;
+ items = items.Where(i => i.IsVirtualUnaired == val);
+ }
+
+ return items;
+ }
+
public object Get(GetEpisodes request)
{
var user = _userManager.GetUserById(request.UserId);
@@ -431,11 +460,16 @@ namespace MediaBrowser.Api
episodes = episodes.Where(i => !i.IsVirtualUnaired);
}
- // ExcludeLocationTypes
- if (!string.IsNullOrEmpty(request.ExcludeLocationTypes))
+ if (request.IsMissing.HasValue)
+ {
+ var val = request.IsMissing.Value;
+ episodes = episodes.Where(i => i.IsMissingEpisode == val);
+ }
+
+ if (request.IsVirtualUnaired.HasValue)
{
- var vals = request.ExcludeLocationTypes.Split(',');
- episodes = episodes.Where(f => !vals.Contains(f.LocationType.ToString(), StringComparer.OrdinalIgnoreCase));
+ var val = request.IsVirtualUnaired.Value;
+ episodes = episodes.Where(i => i.IsVirtualUnaired == val);
}
episodes = _libraryManager.Sort(episodes, user, new[] { sortOrder }, SortOrder.Ascending)
generated by cgit v1.2.3 (git 2.46.0) at 2026-05-03 19:34:18 +0000