alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-17 11:43:44 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix a bug in Emby.Notifications and clean up

Browse Source
This commit is contained in:
Patrick Barron
2020-05-26 23:08:27 -04:00
parent eef7cfd912
commit 31f725fdbf
3 changed files with 15 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
MediaBrowser.Api/Images/ImageService.cs
View File

@@ -477,7 +477,7 @@ namespace MediaBrowser.Api.Images
}
catch (IOException e)
{
// TODO: Log this
Logger.LogError(e, "Error deleting user profile image:");
}
user.ProfileImage = null;
@@ -820,14 +820,14 @@ namespace MediaBrowser.Api.Images
/// <param name="request">The request.</param>
/// <param name="item">The item.</param>
/// <returns>System.String.</returns>
private ItemImageInfo GetImageInfo(ImageRequest request, BaseItem item)
private static ItemImageInfo GetImageInfo(ImageRequest request, BaseItem item)
{
var index = request.Index ?? 0;
return item.GetImageInfo(request.Type, index);
}
private ItemImageInfo GetImageInfo(ImageRequest request, User user)
private static ItemImageInfo GetImageInfo(ImageRequest request, User user)
{
var info = new ItemImageInfo
{
@@ -859,15 +859,7 @@ namespace MediaBrowser.Api.Images
/// <returns>Task.</returns>
public async Task PostImage(BaseItem entity, Stream inputStream, ImageType imageType, string mimeType)
{
using var reader = new StreamReader(inputStream);
var text = await reader.ReadToEndAsync().ConfigureAwait(false);
var bytes = Convert.FromBase64String(text);
var memoryStream = new MemoryStream(bytes)
{
Position = 0
};
var memoryStream = await GetMemoryStream(inputStream);
// Handle image/png; charset=utf-8
mimeType = mimeType.Split(';').FirstOrDefault();
@@ -877,16 +869,21 @@ namespace MediaBrowser.Api.Images
entity.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
}
public async Task PostImage(User user, Stream inputStream, string mimeType)
private static async Task<MemoryStream> GetMemoryStream(Stream inputStream)
{
using var reader = new StreamReader(inputStream);
var text = await reader.ReadToEndAsync().ConfigureAwait(false);
var bytes = Convert.FromBase64String(text);
var memoryStream = new MemoryStream(bytes)
return new MemoryStream(bytes)
{
Position = 0
};
}
private async Task PostImage(User user, Stream inputStream, string mimeType)
{
var memoryStream = await GetMemoryStream(inputStream);
// Handle image/png; charset=utf-8
mimeType = mimeType.Split(';').FirstOrDefault();