Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-24 02:02:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use MediaTypeNames where possible (#13440)

Browse Source
This commit is contained in:
Bond-009 2025-01-27 05:06:24 +01:00 committed by GitHub
parent 7e9ce78849
commit 7684986fa1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Emby.Server.Implementations/Images/BaseDynamicImageProvider.cs
View File

@ -7,6 +7,7 @@ using System.Collections.Generic;
using System.Globalization; using System.Globalization;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.Mime;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using MediaBrowser.Common.Configuration; using MediaBrowser.Common.Configuration;
@ -116,9 +117,9 @@ namespace Emby.Server.Implementations.Images
var mimeType = MimeTypes.GetMimeType(outputPath); var mimeType = MimeTypes.GetMimeType(outputPath);
if (string.Equals(mimeType, "application/octet-stream", StringComparison.OrdinalIgnoreCase)) if (string.Equals(mimeType, MediaTypeNames.Application.Octet, StringComparison.OrdinalIgnoreCase))
{ {
mimeType = "image/png"; mimeType = MediaTypeNames.Image.Png;
} }
await ProviderManager.SaveImage(item, outputPath, mimeType, imageType, null, false, cancellationToken).ConfigureAwait(false); await ProviderManager.SaveImage(item, outputPath, mimeType, imageType, null, false, cancellationToken).ConfigureAwait(false);

8
MediaBrowser.Model/Drawing/ImageFormatExtensions.cs
View File

@ -17,12 +17,12 @@ public static class ImageFormatExtensions
public static string GetMimeType(this ImageFormat format) public static string GetMimeType(this ImageFormat format)
=> format switch => format switch
{ {
ImageFormat.Bmp => "image/bmp", ImageFormat.Bmp => MediaTypeNames.Image.Bmp,
ImageFormat.Gif => MediaTypeNames.Image.Gif, ImageFormat.Gif => MediaTypeNames.Image.Gif,
ImageFormat.Jpg => MediaTypeNames.Image.Jpeg, ImageFormat.Jpg => MediaTypeNames.Image.Jpeg,
ImageFormat.Png => "image/png", ImageFormat.Png => MediaTypeNames.Image.Png,
ImageFormat.Webp => "image/webp", ImageFormat.Webp => MediaTypeNames.Image.Webp,
ImageFormat.Svg => "image/svg+xml", ImageFormat.Svg => MediaTypeNames.Image.Svg,
_ => throw new InvalidEnumArgumentException(nameof(format), (int)format, typeof(ImageFormat)) _ => throw new InvalidEnumArgumentException(nameof(format), (int)format, typeof(ImageFormat))
}; };

3
MediaBrowser.Model/Net/MimeTypes.cs
View File

@ -6,6 +6,7 @@ using System.Collections.Generic;
using System.Diagnostics.CodeAnalysis; using System.Diagnostics.CodeAnalysis;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Net.Mime;
using Jellyfin.Extensions; using Jellyfin.Extensions;
namespace MediaBrowser.Model.Net namespace MediaBrowser.Model.Net
@ -144,7 +145,7 @@ namespace MediaBrowser.Model.Net
new("video/x-matroska", ".mkv"), new("video/x-matroska", ".mkv"),
}.ToFrozenDictionary(pair => pair.Key, pair => pair.Value, StringComparer.OrdinalIgnoreCase); }.ToFrozenDictionary(pair => pair.Key, pair => pair.Value, StringComparer.OrdinalIgnoreCase);
public static string GetMimeType(string path) => GetMimeType(path, "application/octet-stream"); public static string GetMimeType(string path) => GetMimeType(path, MediaTypeNames.Application.Octet);
/// <summary> /// <summary>
/// Gets the type of the MIME. /// Gets the type of the MIME.

3
tests/Jellyfin.Providers.Tests/Manager/ItemImageProviderTests.cs
View File

@ -5,6 +5,7 @@ using System.IO;
using System.Linq; using System.Linq;
using System.Net; using System.Net;
using System.Net.Http; using System.Net.Http;
using System.Net.Mime;
using System.Text; using System.Text;
using System.Text.RegularExpressions; using System.Text.RegularExpressions;
using System.Threading; using System.Threading;
@ -391,7 +392,7 @@ namespace Jellyfin.Providers.Tests.Manager
{ {
ReasonPhrase = url, ReasonPhrase = url,
StatusCode = HttpStatusCode.OK, StatusCode = HttpStatusCode.OK,
Content = new StringContent(Content, Encoding.UTF8, "image/jpeg") Content = new StringContent(Content, Encoding.UTF8, MediaTypeNames.Image.Jpeg)
}); });
var refreshOptions = fullRefresh var refreshOptions = fullRefresh