alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-03-26 20:16:33 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

made dtoservice synchronous

Browse Source
This commit is contained in:
Luke Pulverenti
2013-09-16 22:44:06 -04:00
parent 1007f24200
commit 85d7eb917f
26 changed files with 226 additions and 187 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@@ -19,7 +19,6 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
namespace MediaBrowser.Server.Implementations.Dto
{
@@ -49,7 +48,7 @@ namespace MediaBrowser.Server.Implementations.Dto
/// <param name="owner">The owner.</param>
/// <returns>Task{DtoBaseItem}.</returns>
/// <exception cref="System.ArgumentNullException">item</exception>
public async Task<BaseItemDto> GetBaseItemDto(BaseItem item, List<ItemFields> fields, User user = null, BaseItem owner = null)
public BaseItemDto GetBaseItemDto(BaseItem item, List<ItemFields> fields, User user = null, BaseItem owner = null)
{
if (item == null)
{
@@ -72,7 +71,7 @@ namespace MediaBrowser.Server.Implementations.Dto
{
try
{
await AttachPrimaryImageAspectRatio(dto, item).ConfigureAwait(false);
AttachPrimaryImageAspectRatio(dto, item);
}
catch (Exception ex)
{
@@ -189,7 +188,7 @@ namespace MediaBrowser.Server.Implementations.Dto
}
}
public async Task<UserDto> GetUserDto(User user)
public UserDto GetUserDto(User user)
{
if (user == null)
{
@@ -214,7 +213,7 @@ namespace MediaBrowser.Server.Implementations.Dto
try
{
await AttachPrimaryImageAspectRatio(dto, user).ConfigureAwait(false);
AttachPrimaryImageAspectRatio(dto, user);
}
catch (Exception ex)
{
@@ -1132,9 +1131,8 @@ namespace MediaBrowser.Server.Implementations.Dto
/// </summary>
/// <param name="dto">The dto.</param>
/// <param name="item">The item.</param>
/// <param name="logger">The _logger.</param>
/// <returns>Task.</returns>
private async Task AttachPrimaryImageAspectRatio(IItemDto dto, BaseItem item)
private void AttachPrimaryImageAspectRatio(IItemDto dto, BaseItem item)
{
var path = item.PrimaryImagePath;
@@ -1152,7 +1150,7 @@ namespace MediaBrowser.Server.Implementations.Dto
try
{
size = await Kernel.Instance.ImageManager.GetImageSize(path, dateModified).ConfigureAwait(false);
size = Kernel.Instance.ImageManager.GetImageSize(path, dateModified);
}
catch (FileNotFoundException)
{

6
MediaBrowser.Server.Implementations/EntryPoints/WebSocketEvents.cs
View File

@@ -44,7 +44,7 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
private readonly ITaskManager _taskManager;
private readonly IDtoService _dtoService;
/// <summary>
/// Initializes a new instance of the <see cref="WebSocketEvents" /> class.
/// </summary>
@@ -134,9 +134,9 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
/// </summary>
/// <param name="sender">The sender.</param>
/// <param name="e">The e.</param>
async void userManager_UserUpdated(object sender, GenericEventArgs<User> e)
void userManager_UserUpdated(object sender, GenericEventArgs<User> e)
{
var dto = await _dtoService.GetUserDto(e.Argument).ConfigureAwait(false);
var dto = _dtoService.GetUserDto(e.Argument);
_serverManager.SendWebSocketMessage("UserUpdated", dto);
}

2
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@@ -824,7 +824,7 @@ namespace MediaBrowser.Server.Implementations.Library
/// <returns>Task.</returns>
public async Task ValidatePeople(CancellationToken cancellationToken, IProgress<double> progress)
{
const int maxTasks = 5;
const int maxTasks = 3;
var tasks = new List<Task>();

2
MediaBrowser.Server.Implementations/Library/Validators/ArtistsValidator.cs
View File

@@ -202,7 +202,7 @@ namespace MediaBrowser.Server.Implementations.Library.Validators
.Distinct(StringComparer.OrdinalIgnoreCase)
.ToList();
const int maxTasks = 5;
const int maxTasks = 3;
var tasks = new List<Task>();