aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/Images/ImageService.cs6
-rw-r--r--MediaBrowser.Api/Images/RemoteImageService.cs6
-rw-r--r--MediaBrowser.Api/ItemLookupService.cs2
-rw-r--r--MediaBrowser.Api/ItemRefreshService.cs2
-rw-r--r--MediaBrowser.Api/ItemUpdateService.cs2
-rw-r--r--MediaBrowser.Api/Library/LibraryService.cs12
-rw-r--r--MediaBrowser.Api/Music/InstantMixService.cs8
-rw-r--r--MediaBrowser.Api/NotificationsService.cs45
-rw-r--r--MediaBrowser.Api/Playback/BaseStreamingService.cs4
-rw-r--r--MediaBrowser.Api/SimilarItemsHelper.cs2
-rw-r--r--MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs4
-rw-r--r--MediaBrowser.Api/UserLibrary/ItemsService.cs6
-rw-r--r--MediaBrowser.Api/UserLibrary/UserLibraryService.cs16
-rw-r--r--MediaBrowser.Api/VideosService.cs4
14 files changed, 57 insertions, 62 deletions
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index 562da40ee..e85a5a680 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -358,7 +358,7 @@ namespace MediaBrowser.Api.Images
/// <returns>System.Object.</returns>
public object Get(GetItemImageInfos request)
{
- var item = _dtoService.GetItemByDtoId(request.Id);
+ var item = _libraryManager.GetItemById(request.Id);
var result = GetItemImageInfos(item);
@@ -493,7 +493,9 @@ namespace MediaBrowser.Api.Images
/// <returns>System.Object.</returns>
public object Get(GetItemImage request)
{
- var item = string.IsNullOrEmpty(request.Id) ? _libraryManager.RootFolder : _dtoService.GetItemByDtoId(request.Id);
+ var item = string.IsNullOrEmpty(request.Id) ?
+ _libraryManager.RootFolder :
+ _libraryManager.GetItemById(request.Id);
return GetImage(request, item);
}
diff --git a/MediaBrowser.Api/Images/RemoteImageService.cs b/MediaBrowser.Api/Images/RemoteImageService.cs
index 36b509c74..c76506357 100644
--- a/MediaBrowser.Api/Images/RemoteImageService.cs
+++ b/MediaBrowser.Api/Images/RemoteImageService.cs
@@ -175,7 +175,7 @@ namespace MediaBrowser.Api.Images
public object Get(GetRemoteImageProviders request)
{
- var item = _dtoService.GetItemByDtoId(request.Id);
+ var item = _libraryManager.GetItemById(request.Id);
var result = GetImageProviders(item);
@@ -201,7 +201,7 @@ namespace MediaBrowser.Api.Images
public object Get(GetRemoteImages request)
{
- var item = _dtoService.GetItemByDtoId(request.Id);
+ var item = _libraryManager.GetItemById(request.Id);
var result = GetRemoteImageResult(item, request);
@@ -269,7 +269,7 @@ namespace MediaBrowser.Api.Images
/// <param name="request">The request.</param>
public void Post(DownloadRemoteImage request)
{
- var item = _dtoService.GetItemByDtoId(request.Id);
+ var item = _libraryManager.GetItemById(request.Id);
var task = DownloadRemoteImage(item, request);
diff --git a/MediaBrowser.Api/ItemLookupService.cs b/MediaBrowser.Api/ItemLookupService.cs
index 62596287e..b600c3b46 100644
--- a/MediaBrowser.Api/ItemLookupService.cs
+++ b/MediaBrowser.Api/ItemLookupService.cs
@@ -124,7 +124,7 @@ namespace MediaBrowser.Api
public object Get(GetExternalIdInfos request)
{
- var item = _dtoService.GetItemByDtoId(request.Id);
+ var item = _libraryManager.GetItemById(request.Id);
var infos = _providerManager.GetExternalIdInfos(item).ToList();
diff --git a/MediaBrowser.Api/ItemRefreshService.cs b/MediaBrowser.Api/ItemRefreshService.cs
index 97e43f018..3816332b2 100644
--- a/MediaBrowser.Api/ItemRefreshService.cs
+++ b/MediaBrowser.Api/ItemRefreshService.cs
@@ -250,7 +250,7 @@ namespace MediaBrowser.Api
/// <returns>Task.</returns>
private async Task RefreshItem(RefreshItem request)
{
- var item = _dtoService.GetItemByDtoId(request.Id);
+ var item = _libraryManager.GetItemById(request.Id);
var options = GetRefreshOptions(request);
diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs
index 8bc06b657..5f05fdc3f 100644
--- a/MediaBrowser.Api/ItemUpdateService.cs
+++ b/MediaBrowser.Api/ItemUpdateService.cs
@@ -91,7 +91,7 @@ namespace MediaBrowser.Api
private async Task UpdateItem(UpdateItem request)
{
- var item = _dtoService.GetItemByDtoId(request.ItemId);
+ var item = _libraryManager.GetItemById(request.ItemId);
var newLockData = request.LockData ?? false;
var dontFetchMetaChanged = item.IsLocked != newLockData;
diff --git a/MediaBrowser.Api/Library/LibraryService.cs b/MediaBrowser.Api/Library/LibraryService.cs
index 967bc1fba..0599b45d5 100644
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@@ -284,7 +284,7 @@ namespace MediaBrowser.Api.Library
public object Get(GetFile request)
{
- var item = _dtoService.GetItemByDtoId(request.Id);
+ var item = _libraryManager.GetItemById(request.Id);
var locationType = item.LocationType;
if (locationType == LocationType.Remote || locationType == LocationType.Virtual)
{
@@ -350,7 +350,7 @@ namespace MediaBrowser.Api.Library
/// <returns>Task{BaseItemDto[]}.</returns>
public List<BaseItemDto> GetAncestors(GetAncestors request)
{
- var item = _dtoService.GetItemByDtoId(request.Id);
+ var item = _libraryManager.GetItemById(request.Id);
var baseItemDtos = new List<BaseItemDto>();
@@ -504,7 +504,7 @@ namespace MediaBrowser.Api.Library
private Task DeleteItem(DeleteItem request)
{
- var item = _dtoService.GetItemByDtoId(request.Id);
+ var item = _libraryManager.GetItemById(request.Id);
var session = GetSession(_sessionManager);
@@ -593,7 +593,7 @@ namespace MediaBrowser.Api.Library
? (request.UserId.HasValue
? user.RootFolder
: (Folder)_libraryManager.RootFolder)
- : _dtoService.GetItemByDtoId(request.Id, request.UserId);
+ : _libraryManager.GetItemById(request.Id);
var originalItem = item;
@@ -661,7 +661,7 @@ namespace MediaBrowser.Api.Library
? (request.UserId.HasValue
? user.RootFolder
: (Folder)_libraryManager.RootFolder)
- : _dtoService.GetItemByDtoId(request.Id, request.UserId);
+ : _libraryManager.GetItemById(request.Id);
var originalItem = item;
@@ -771,7 +771,7 @@ namespace MediaBrowser.Api.Library
? (userId.HasValue
? user.RootFolder
: (Folder)_libraryManager.RootFolder)
- : _dtoService.GetItemByDtoId(id, userId);
+ : _libraryManager.GetItemById(id);
// Get everything
var fields = Enum.GetNames(typeof(ItemFields))
diff --git a/MediaBrowser.Api/Music/InstantMixService.cs b/MediaBrowser.Api/Music/InstantMixService.cs
index c39811bb6..f50c87f47 100644
--- a/MediaBrowser.Api/Music/InstantMixService.cs
+++ b/MediaBrowser.Api/Music/InstantMixService.cs
@@ -38,18 +38,20 @@ namespace MediaBrowser.Api.Music
private readonly IUserManager _userManager;
private readonly IDtoService _dtoService;
+ private readonly ILibraryManager _libraryManager;
private readonly IMusicManager _musicManager;
- public InstantMixService(IUserManager userManager, IDtoService dtoService, IMusicManager musicManager)
+ public InstantMixService(IUserManager userManager, IDtoService dtoService, IMusicManager musicManager, ILibraryManager libraryManager)
{
_userManager = userManager;
_dtoService = dtoService;
_musicManager = musicManager;
+ _libraryManager = libraryManager;
}
public object Get(GetInstantMixFromSong request)
{
- var item = (Audio)_dtoService.GetItemByDtoId(request.Id);
+ var item = (Audio)_libraryManager.GetItemById(request.Id);
var user = _userManager.GetUserById(request.UserId.Value);
@@ -60,7 +62,7 @@ namespace MediaBrowser.Api.Music
public object Get(GetInstantMixFromAlbum request)
{
- var album = (MusicAlbum)_dtoService.GetItemByDtoId(request.Id);
+ var album = (MusicAlbum)_libraryManager.GetItemById(request.Id);
var user = _userManager.GetUserById(request.UserId.Value);
diff --git a/MediaBrowser.Api/NotificationsService.cs b/MediaBrowser.Api/NotificationsService.cs
index a71a85395..796fcdab1 100644
--- a/MediaBrowser.Api/NotificationsService.cs
+++ b/MediaBrowser.Api/NotificationsService.cs
@@ -2,7 +2,7 @@
using MediaBrowser.Model.Notifications;
using ServiceStack;
using System;
-using System.Linq;
+using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
@@ -28,17 +28,17 @@ namespace MediaBrowser.Api
public class GetNotificationsSummary : IReturn<NotificationsSummary>
{
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "GET")]
- public Guid UserId { get; set; }
+ public string UserId { get; set; }
}
[Route("/Notifications/{UserId}", "POST", Summary = "Adds a notifications")]
- public class AddUserNotification : IReturn<Notification>
+ public class AddUserNotification : IReturnVoid
{
[ApiMember(Name = "Id", Description = "The Id of the new notification. If unspecified one will be provided.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
- public Guid? Id { get; set; }
+ public string Id { get; set; }
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
- public Guid UserId { get; set; }
+ public string UserId { get; set; }
[ApiMember(Name = "Name", Description = "The notification's name", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
public string Name { get; set; }
@@ -49,12 +49,6 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Url", Description = "The notification's info url", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
public string Url { get; set; }
- [ApiMember(Name = "Category", Description = "The notification's category", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
- public string Category { get; set; }
-
- [ApiMember(Name = "RelatedId", Description = "The notification's related id (item)", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
- public string RelatedId { get; set; }
-
[ApiMember(Name = "Level", Description = "The notification level", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")]
public NotificationLevel Level { get; set; }
}
@@ -63,7 +57,7 @@ namespace MediaBrowser.Api
public class MarkRead : IReturnVoid
{
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
- public Guid UserId { get; set; }
+ public string UserId { get; set; }
[ApiMember(Name = "Ids", Description = "A list of notification ids, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
public string Ids { get; set; }
@@ -73,7 +67,7 @@ namespace MediaBrowser.Api
public class MarkUnread : IReturnVoid
{
[ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
- public Guid UserId { get; set; }
+ public string UserId { get; set; }
[ApiMember(Name = "Ids", Description = "A list of notification ids, comma delimited", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST", AllowMultiple = true)]
public string Ids { get; set; }
@@ -82,17 +76,19 @@ namespace MediaBrowser.Api
public class NotificationsService : BaseApiService
{
private readonly INotificationsRepository _notificationsRepo;
+ private readonly INotificationManager _notificationManager;
- public NotificationsService(INotificationsRepository notificationsRepo)
+ public NotificationsService(INotificationsRepository notificationsRepo, INotificationManager notificationManager)
{
_notificationsRepo = notificationsRepo;
+ _notificationManager = notificationManager;
}
- public object Post(AddUserNotification request)
+ public void Post(AddUserNotification request)
{
var task = AddNotification(request);
- return ToOptimizedResult(task.Result);
+ Task.WaitAll(task);
}
public object Get(GetNotificationsSummary request)
@@ -102,24 +98,19 @@ namespace MediaBrowser.Api
return result;
}
- private async Task<Notification> AddNotification(AddUserNotification request)
+ private async Task AddNotification(AddUserNotification request)
{
- var notification = new Notification
+ var notification = new NotificationRequest
{
- Id = request.Id ?? Guid.NewGuid(),
Date = DateTime.UtcNow,
Description = request.Description,
Level = request.Level,
Name = request.Name,
Url = request.Url,
- UserId = request.UserId,
- Category = request.Category,
- RelatedId = request.RelatedId
+ UserIds = new List<string> { request.UserId }
};
- await _notificationsRepo.AddNotification(notification, CancellationToken.None).ConfigureAwait(false);
-
- return notification;
+ await _notificationManager.SendNotification(notification, CancellationToken.None).ConfigureAwait(false);
}
public void Post(MarkRead request)
@@ -136,9 +127,9 @@ namespace MediaBrowser.Api
Task.WaitAll(task);
}
- private Task MarkRead(string idList, Guid userId, bool read)
+ private Task MarkRead(string idList, string userId, bool read)
{
- var ids = idList.Split(',').Select(i => new Guid(i));
+ var ids = idList.Split(',');
return _notificationsRepo.MarkRead(ids, userId, read, CancellationToken.None);
}
diff --git a/MediaBrowser.Api/Playback/BaseStreamingService.cs b/MediaBrowser.Api/Playback/BaseStreamingService.cs
index aafda7812..3fd171416 100644
--- a/MediaBrowser.Api/Playback/BaseStreamingService.cs
+++ b/MediaBrowser.Api/Playback/BaseStreamingService.cs
@@ -1336,8 +1336,8 @@ namespace MediaBrowser.Api.Playback
}
var item = string.IsNullOrEmpty(request.MediaSourceId) ?
- DtoService.GetItemByDtoId(request.Id) :
- DtoService.GetItemByDtoId(request.MediaSourceId);
+ LibraryManager.GetItemById(request.Id) :
+ LibraryManager.GetItemById(request.MediaSourceId);
if (user != null && item.GetPlayAccess(user) != PlayAccess.Full)
{
diff --git a/MediaBrowser.Api/SimilarItemsHelper.cs b/MediaBrowser.Api/SimilarItemsHelper.cs
index 1f02a63a0..664a344ce 100644
--- a/MediaBrowser.Api/SimilarItemsHelper.cs
+++ b/MediaBrowser.Api/SimilarItemsHelper.cs
@@ -73,7 +73,7 @@ namespace MediaBrowser.Api
var item = string.IsNullOrEmpty(request.Id) ?
(request.UserId.HasValue ? user.RootFolder :
- libraryManager.RootFolder) : dtoService.GetItemByDtoId(request.Id, request.UserId);
+ libraryManager.RootFolder) : libraryManager.GetItemById(request.Id);
var fields = request.GetItemFields().ToList();
diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
index d21014dfe..c2b8069cb 100644
--- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
@@ -61,14 +61,14 @@ namespace MediaBrowser.Api.UserLibrary
if (request.UserId.HasValue)
{
user = UserManager.GetUserById(request.UserId.Value);
- item = string.IsNullOrEmpty(request.ParentId) ? user.RootFolder : DtoService.GetItemByDtoId(request.ParentId, user.Id);
+ item = string.IsNullOrEmpty(request.ParentId) ? user.RootFolder : LibraryManager.GetItemById(request.ParentId);
libraryItems = user.RootFolder.GetRecursiveChildren(user).ToList();
}
else
{
- item = string.IsNullOrEmpty(request.ParentId) ? LibraryManager.RootFolder : DtoService.GetItemByDtoId(request.ParentId);
+ item = string.IsNullOrEmpty(request.ParentId) ? LibraryManager.RootFolder : LibraryManager.GetItemById(request.ParentId);
libraryItems = LibraryManager.RootFolder.RecursiveChildren.ToList();
}
diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs
index 74ce4a0a7..f1b8b2d52 100644
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@@ -373,11 +373,9 @@ namespace MediaBrowser.Api.UserLibrary
/// <exception cref="System.InvalidOperationException"></exception>
private IEnumerable<BaseItem> GetItemsToSerialize(GetItems request, User user)
{
- var userId = user == null ? (Guid?)null : user.Id;
-
var item = string.IsNullOrEmpty(request.ParentId) ?
user == null ? _libraryManager.RootFolder : user.RootFolder :
- _dtoService.GetItemByDtoId(request.ParentId, userId);
+ _libraryManager.GetItemById(request.ParentId);
// Default list type = children
IEnumerable<BaseItem> items;
@@ -386,7 +384,7 @@ namespace MediaBrowser.Api.UserLibrary
{
var idList = request.Ids.Split(',').ToList();
- items = idList.Select(i => _dtoService.GetItemByDtoId(i, userId));
+ items = idList.Select(i => _libraryManager.GetItemById(i));
}
else if (request.Recursive)
diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
index 649f2ae02..d145dd054 100644
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@@ -463,7 +463,9 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = _userManager.GetUserById(request.UserId);
- var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _dtoService.GetItemByDtoId(request.Id, user.Id);
+ var item = string.IsNullOrEmpty(request.Id) ?
+ user.RootFolder :
+ _libraryManager.GetItemById(request.Id);
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
@@ -529,7 +531,7 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = _userManager.GetUserById(request.UserId);
- var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _dtoService.GetItemByDtoId(request.Id, user.Id);
+ var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _libraryManager.GetItemById(request.Id);
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
@@ -559,7 +561,7 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = _userManager.GetUserById(request.UserId);
- var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _dtoService.GetItemByDtoId(request.Id, user.Id);
+ var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _libraryManager.GetItemById(request.Id);
// Get everything
var fields = Enum.GetNames(typeof(ItemFields)).Select(i => (ItemFields)Enum.Parse(typeof(ItemFields), i, true)).ToList();
@@ -597,7 +599,7 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = _userManager.GetUserById(request.UserId);
- var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _dtoService.GetItemByDtoId(request.Id, user.Id);
+ var item = string.IsNullOrEmpty(request.Id) ? user.RootFolder : _libraryManager.GetItemById(request.Id);
var items = _libraryManager.GetIntros(item, user);
@@ -651,7 +653,7 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = _userManager.GetUserById(userId);
- var item = string.IsNullOrEmpty(itemId) ? user.RootFolder : _dtoService.GetItemByDtoId(itemId, user.Id);
+ var item = string.IsNullOrEmpty(itemId) ? user.RootFolder : _libraryManager.GetItemById(itemId);
var key = item.GetUserDataKey();
@@ -701,7 +703,7 @@ namespace MediaBrowser.Api.UserLibrary
{
var user = _userManager.GetUserById(userId);
- var item = string.IsNullOrEmpty(itemId) ? user.RootFolder : _dtoService.GetItemByDtoId(itemId, user.Id);
+ var item = string.IsNullOrEmpty(itemId) ? user.RootFolder : _libraryManager.GetItemById(itemId);
var key = item.GetUserDataKey();
@@ -871,7 +873,7 @@ namespace MediaBrowser.Api.UserLibrary
/// <returns>Task.</returns>
private async Task<UserItemDataDto> UpdatePlayedStatus(User user, string itemId, bool wasPlayed, DateTime? datePlayed)
{
- var item = _dtoService.GetItemByDtoId(itemId, user.Id);
+ var item = _libraryManager.GetItemById(itemId);
if (wasPlayed)
{
diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs
index 940c82540..f62e37f79 100644
--- a/MediaBrowser.Api/VideosService.cs
+++ b/MediaBrowser.Api/VideosService.cs
@@ -73,7 +73,7 @@ namespace MediaBrowser.Api
? (request.UserId.HasValue
? user.RootFolder
: _libraryManager.RootFolder)
- : _dtoService.GetItemByDtoId(request.Id, request.UserId);
+ : _libraryManager.GetItemById(request.Id);
// Get everything
var fields = Enum.GetNames(typeof(ItemFields))
@@ -104,7 +104,7 @@ namespace MediaBrowser.Api
private async Task RemoveAlternateVersions(DeleteAlternateSources request)
{
- var video = (Video)_dtoService.GetItemByDtoId(request.Id);
+ var video = (Video)_libraryManager.GetItemById(request.Id);
foreach (var link in video.GetLinkedAlternateVersions())
{
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-07 09:38:20 +0000