aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/ChannelService.cs10
-rw-r--r--MediaBrowser.Api/Images/ImageService.cs20
-rw-r--r--MediaBrowser.Api/Images/RemoteImageService.cs14
-rw-r--r--MediaBrowser.Api/ItemUpdateService.cs11
-rw-r--r--MediaBrowser.Api/LiveTv/LiveTvService.cs14
-rw-r--r--MediaBrowser.Api/VideosService.cs46
6 files changed, 44 insertions, 71 deletions
diff --git a/MediaBrowser.Api/ChannelService.cs b/MediaBrowser.Api/ChannelService.cs
index d64bf7ec7..2e8eb9e07 100644
--- a/MediaBrowser.Api/ChannelService.cs
+++ b/MediaBrowser.Api/ChannelService.cs
@@ -101,7 +101,7 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Fields", Description = "Optional. Specify additional fields of information to return in the output. This allows multiple, comma delimeted. Options: Budget, Chapters, DateCreated, Genres, HomePageUrl, IndexOptions, MediaStreams, Overview, ParentId, Path, People, ProviderIds, PrimaryImageAspectRatio, Revenue, SortName, Studios, Taglines", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string Fields { get; set; }
-
+
/// <summary>
/// Gets the filters.
/// </summary>
@@ -160,7 +160,7 @@ namespace MediaBrowser.Api
[ApiMember(Name = "ChannelIds", Description = "Optional. Specify one or more channel id's, comma delimeted.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
public string ChannelIds { get; set; }
-
+
/// <summary>
/// Gets the filters.
/// </summary>
@@ -177,7 +177,7 @@ namespace MediaBrowser.Api
return val.Split(',').Select(v => (ItemFilter)Enum.Parse(typeof(ItemFilter), v, true));
}
}
-
+
[Route("/Channels/Folder", "GET", Summary = "Gets the users channel folder, along with configured images")]
public class GetChannelFolder : IReturn<BaseItemDto>
{
@@ -209,9 +209,9 @@ namespace MediaBrowser.Api
return ToOptimizedResult(result);
}
- public async Task<object> Get(GetChannelFolder request)
+ public object Get(GetChannelFolder request)
{
- return ToOptimizedResult(await _channelManager.GetChannelFolder(request.UserId, CancellationToken.None).ConfigureAwait(false));
+ return ToOptimizedResult(_channelManager.GetChannelFolder(request.UserId, CancellationToken.None));
}
public async Task<object> Get(GetChannels request)
diff --git a/MediaBrowser.Api/Images/ImageService.cs b/MediaBrowser.Api/Images/ImageService.cs
index f8481517d..72e4fe224 100644
--- a/MediaBrowser.Api/Images/ImageService.cs
+++ b/MediaBrowser.Api/Images/ImageService.cs
@@ -471,9 +471,7 @@ namespace MediaBrowser.Api.Images
var item = _userManager.GetUserById(userId);
- var task = item.DeleteImage(request.Type, request.Index ?? 0);
-
- Task.WaitAll(task);
+ item.DeleteImage(request.Type, request.Index ?? 0);
}
/// <summary>
@@ -484,9 +482,7 @@ namespace MediaBrowser.Api.Images
{
var item = _libraryManager.GetItemById(request.Id);
- var task = item.DeleteImage(request.Type, request.Index ?? 0);
-
- Task.WaitAll(task);
+ item.DeleteImage(request.Type, request.Index ?? 0);
}
/// <summary>
@@ -497,9 +493,7 @@ namespace MediaBrowser.Api.Images
{
var item = _libraryManager.GetItemById(request.Id);
- var task = UpdateItemIndex(item, request.Type, request.Index, request.NewIndex);
-
- Task.WaitAll(task);
+ UpdateItemIndex(item, request.Type, request.Index, request.NewIndex);
}
/// <summary>
@@ -510,9 +504,9 @@ namespace MediaBrowser.Api.Images
/// <param name="currentIndex">Index of the current.</param>
/// <param name="newIndex">The new index.</param>
/// <returns>Task.</returns>
- private Task UpdateItemIndex(IHasMetadata item, ImageType type, int currentIndex, int newIndex)
+ private void UpdateItemIndex(IHasMetadata item, ImageType type, int currentIndex, int newIndex)
{
- return item.SwapImages(type, currentIndex, newIndex);
+ item.SwapImages(type, currentIndex, newIndex);
}
/// <summary>
@@ -558,7 +552,7 @@ namespace MediaBrowser.Api.Images
var supportedImageEnhancers = request.EnableImageEnhancers ? _imageProcessor.GetSupportedEnhancers(item, request.Type) : new List<IImageEnhancer>();
- var cropwhitespace = request.Type == ImageType.Logo ||
+ var cropwhitespace = request.Type == ImageType.Logo ||
request.Type == ImageType.Art
|| (request.Type == ImageType.Primary && item is LiveTvChannel);
@@ -733,7 +727,7 @@ namespace MediaBrowser.Api.Images
await _providerManager.SaveImage(entity, memoryStream, mimeType, imageType, null, CancellationToken.None).ConfigureAwait(false);
- await entity.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None).ConfigureAwait(false);
+ entity.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
}
}
}
diff --git a/MediaBrowser.Api/Images/RemoteImageService.cs b/MediaBrowser.Api/Images/RemoteImageService.cs
index 3512a526b..413762a5c 100644
--- a/MediaBrowser.Api/Images/RemoteImageService.cs
+++ b/MediaBrowser.Api/Images/RemoteImageService.cs
@@ -84,7 +84,7 @@ namespace MediaBrowser.Api.Images
}
[Route("/Items/{Id}/RemoteImages/Download", "POST", Summary = "Downloads a remote image for an item")]
- [Authenticated(Roles="Admin")]
+ [Authenticated(Roles = "Admin")]
public class DownloadRemoteImage : BaseDownloadRemoteImage
{
/// <summary>
@@ -207,7 +207,7 @@ namespace MediaBrowser.Api.Images
{
await _providerManager.SaveImage(item, request.ImageUrl, request.Type, null, CancellationToken.None).ConfigureAwait(false);
- await item.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None).ConfigureAwait(false);
+ item.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
}
/// <summary>
@@ -232,9 +232,9 @@ namespace MediaBrowser.Api.Images
contentPath = _fileSystem.ReadAllText(pointerCachePath);
if (_fileSystem.FileExists(contentPath))
- {
- return await ResultFactory.GetStaticFileResult(Request, contentPath).ConfigureAwait(false);
- }
+ {
+ return await ResultFactory.GetStaticFileResult(Request, contentPath).ConfigureAwait(false);
+ }
}
catch (FileNotFoundException)
{
@@ -273,7 +273,7 @@ namespace MediaBrowser.Api.Images
var fullCachePath = GetFullCachePath(urlHash + "." + ext);
- _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(fullCachePath));
+ _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(fullCachePath));
using (var stream = result.Content)
{
using (var filestream = _fileSystem.GetFileStream(fullCachePath, FileOpenMode.Create, FileAccessMode.Write, FileShareMode.Read, true))
@@ -282,7 +282,7 @@ namespace MediaBrowser.Api.Images
}
}
- _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(pointerCachePath));
+ _fileSystem.CreateDirectory(_fileSystem.GetDirectoryName(pointerCachePath));
_fileSystem.WriteAllText(pointerCachePath, fullCachePath);
}
diff --git a/MediaBrowser.Api/ItemUpdateService.cs b/MediaBrowser.Api/ItemUpdateService.cs
index 53a67ff71..90cf2d1d1 100644
--- a/MediaBrowser.Api/ItemUpdateService.cs
+++ b/MediaBrowser.Api/ItemUpdateService.cs
@@ -194,13 +194,6 @@ namespace MediaBrowser.Api
public void Post(UpdateItem request)
{
- var task = UpdateItem(request);
-
- Task.WaitAll(task);
- }
-
- private async Task UpdateItem(UpdateItem request)
- {
var item = _libraryManager.GetItemById(request.ItemId);
var newLockData = request.LockData ?? false;
@@ -216,7 +209,7 @@ namespace MediaBrowser.Api
item.OnMetadataChanged();
- await item.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
+ item.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
if (isLockedChanged && item.IsFolder)
{
@@ -225,7 +218,7 @@ namespace MediaBrowser.Api
foreach (var child in folder.GetRecursiveChildren())
{
child.IsLocked = newLockData;
- await child.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
+ child.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
}
}
}
diff --git a/MediaBrowser.Api/LiveTv/LiveTvService.cs b/MediaBrowser.Api/LiveTv/LiveTvService.cs
index 36bcee913..f46c3e50f 100644
--- a/MediaBrowser.Api/LiveTv/LiveTvService.cs
+++ b/MediaBrowser.Api/LiveTv/LiveTvService.cs
@@ -892,11 +892,11 @@ namespace MediaBrowser.Api.LiveTv
return ToOptimizedSerializedResultUsingCache(info);
}
- public async Task<object> Get(GetChannels request)
+ public object Get(GetChannels request)
{
var options = GetDtoOptions(_authContext, request);
- var channelResult = await _liveTvManager.GetInternalChannels(new LiveTvChannelQuery
+ var channelResult = _liveTvManager.GetInternalChannels(new LiveTvChannelQuery
{
ChannelType = request.Type,
UserId = request.UserId,
@@ -915,7 +915,7 @@ namespace MediaBrowser.Api.LiveTv
SortOrder = request.SortOrder ?? SortOrder.Ascending,
AddCurrentProgram = request.AddCurrentProgram
- }, options, CancellationToken.None).ConfigureAwait(false);
+ }, options, CancellationToken.None);
var user = string.IsNullOrEmpty(request.UserId) ? null : _userManager.GetUserById(request.UserId);
@@ -958,9 +958,9 @@ namespace MediaBrowser.Api.LiveTv
return ToOptimizedSerializedResultUsingCache(result);
}
- public async Task<object> Get(GetLiveTvFolder request)
+ public object Get(GetLiveTvFolder request)
{
- return ToOptimizedResult(await _liveTvManager.GetLiveTvFolder(request.UserId, CancellationToken.None).ConfigureAwait(false));
+ return ToOptimizedResult(_liveTvManager.GetLiveTvFolder(request.UserId, CancellationToken.None));
}
public async Task<object> Get(GetPrograms request)
@@ -1020,7 +1020,7 @@ namespace MediaBrowser.Api.LiveTv
return ToOptimizedResult(result);
}
- public async Task<object> Get(GetRecommendedPrograms request)
+ public object Get(GetRecommendedPrograms request)
{
var query = new RecommendedProgramQuery
{
@@ -1036,7 +1036,7 @@ namespace MediaBrowser.Api.LiveTv
EnableTotalRecordCount = request.EnableTotalRecordCount
};
- var result = await _liveTvManager.GetRecommendedPrograms(query, GetDtoOptions(_authContext, request), CancellationToken.None).ConfigureAwait(false);
+ var result = _liveTvManager.GetRecommendedPrograms(query, GetDtoOptions(_authContext, request), CancellationToken.None);
return ToOptimizedResult(result);
}
diff --git a/MediaBrowser.Api/VideosService.cs b/MediaBrowser.Api/VideosService.cs
index 3bd0497f7..3f840dbfa 100644
--- a/MediaBrowser.Api/VideosService.cs
+++ b/MediaBrowser.Api/VideosService.cs
@@ -110,35 +110,21 @@ namespace MediaBrowser.Api
public void Delete(DeleteAlternateSources request)
{
- var task = DeleteAsync(request);
-
- Task.WaitAll(task);
- }
-
- public async Task DeleteAsync(DeleteAlternateSources request)
- {
var video = (Video)_libraryManager.GetItemById(request.Id);
foreach (var link in video.GetLinkedAlternateVersions())
{
link.PrimaryVersionId = null;
- await link.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
+ link.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
}
video.LinkedAlternateVersions = Video.EmptyLinkedChildArray;
- await video.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
+ video.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
}
public void Post(MergeVersions request)
{
- var task = PostAsync(request);
-
- Task.WaitAll(task);
- }
-
- public async Task PostAsync(MergeVersions request)
- {
var items = request.Ids.Split(',')
.Select(i => _libraryManager.GetItemById(i))
.OfType<Video>()
@@ -162,19 +148,19 @@ namespace MediaBrowser.Api
if (primaryVersion == null)
{
primaryVersion = items.OrderBy(i =>
- {
- if (i.Video3DFormat.HasValue)
{
- return 1;
- }
-
- if (i.VideoType != Model.Entities.VideoType.VideoFile)
- {
- return 1;
- }
-
- return 0;
- })
+ if (i.Video3DFormat.HasValue)
+ {
+ return 1;
+ }
+
+ if (i.VideoType != Model.Entities.VideoType.VideoFile)
+ {
+ return 1;
+ }
+
+ return 0;
+ })
.ThenByDescending(i =>
{
var stream = i.GetDefaultVideoStream();
@@ -190,7 +176,7 @@ namespace MediaBrowser.Api
{
item.PrimaryVersionId = primaryVersion.Id.ToString("N");
- await item.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
+ item.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
list.Add(new LinkedChild
{
@@ -201,7 +187,7 @@ namespace MediaBrowser.Api
primaryVersion.LinkedAlternateVersions = list.ToArray();
- await primaryVersion.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None).ConfigureAwait(false);
+ primaryVersion.UpdateToRepository(ItemUpdateType.MetadataEdit, CancellationToken.None);
}
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-06 01:19:44 +0000