alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-15 02:33:33 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into register-services-correctly

Browse Source
This commit is contained in:
Mark Monteiro
2020-04-13 17:06:24 -04:00
parent 17e8813378 9a0a4575ad
commit 9728aa8b0a
58 changed files with 1062 additions and 1264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -657,7 +657,7 @@ namespace MediaBrowser.Api.Images
if (!string.IsNullOrWhiteSpace(request.Format)
&& Enum.TryParse(request.Format, true, out ImageFormat format))
{
return new ImageFormat[] { format };
return new[] { format };
}
return GetClientSupportedFormats();
@@ -750,24 +750,22 @@ 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))
using var reader = new StreamReader(inputStream);
var text = await reader.ReadToEndAsync().ConfigureAwait(false);
var bytes = Convert.FromBase64String(text);
var memoryStream = new MemoryStream(bytes)
{
var text = await reader.ReadToEndAsync().ConfigureAwait(false);
Position = 0
};
var bytes = Convert.FromBase64String(text);
// Handle image/png; charset=utf-8
mimeType = mimeType.Split(';').FirstOrDefault();
var memoryStream = new MemoryStream(bytes)
{
Position = 0
};
await _providerManager.SaveImage(entity, memoryStream, mimeType, imageType, null, CancellationToken.None).ConfigureAwait(false);
// Handle image/png; charset=utf-8
mimeType = mimeType.Split(';').FirstOrDefault();
await _providerManager.SaveImage(entity, memoryStream, mimeType, imageType, null, CancellationToken.None).ConfigureAwait(false);
entity.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
}
entity.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
}
}
}