mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-11-04 03:27:21 -05:00
5fc1b1c862
* Translate the ISO-639-2/B codes to ISO-639-2/T. This enables 19 additional languages to be displayed correctly. * Convert the 2-dimensional array to a dictionary * Added the French language to the list of ISO-639-2/B codes * Don't change the property, use a local variable instead. * When creating the MediaStream in the MediaStreamRepository ensure that the ISO 639-2/T (f.e. deu) code is used for the language as that is the one the .NET culture info knows. The other code is most likely the ISO 639-2/B code (f.e. ger) which is unknown to the .NET culture info and will result in just displaying the code instead of the display name. * Move the substitution of ISO 639-2/B to /T to the localization manager. Some language (like Chinese) have multiple entries in the iso6392.txt file (f.e. zho|chi|zh|..., zho|chi|zh-tw|...) but the conversation between /T and /B is the same so use .TryAdd. * Change the method definition from GetISO6392TFromB to TryGetISO6392TFromB and return true if a case was found. * Add unit tests for TryGetISO6392TFromB.
228 lines
8.3 KiB
C#
228 lines
8.3 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Collections.Immutable;
|
|
using System.Linq;
|
|
using System.Threading;
|
|
using Jellyfin.Database.Implementations;
|
|
using Jellyfin.Database.Implementations.Entities;
|
|
using MediaBrowser.Controller;
|
|
using MediaBrowser.Controller.Persistence;
|
|
using MediaBrowser.Model.Entities;
|
|
using MediaBrowser.Model.Globalization;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace Jellyfin.Server.Implementations.Item;
|
|
|
|
/// <summary>
|
|
/// Repository for obtaining MediaStreams.
|
|
/// </summary>
|
|
public class MediaStreamRepository : IMediaStreamRepository
|
|
{
|
|
private readonly IDbContextFactory<JellyfinDbContext> _dbProvider;
|
|
private readonly IServerApplicationHost _serverApplicationHost;
|
|
private readonly ILocalizationManager _localization;
|
|
|
|
/// <summary>
|
|
/// Initializes a new instance of the <see cref="MediaStreamRepository"/> class.
|
|
/// </summary>
|
|
/// <param name="dbProvider">The EFCore db factory.</param>
|
|
/// <param name="serverApplicationHost">The Application host.</param>
|
|
/// <param name="localization">The Localisation Provider.</param>
|
|
public MediaStreamRepository(IDbContextFactory<JellyfinDbContext> dbProvider, IServerApplicationHost serverApplicationHost, ILocalizationManager localization)
|
|
{
|
|
_dbProvider = dbProvider;
|
|
_serverApplicationHost = serverApplicationHost;
|
|
_localization = localization;
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public void SaveMediaStreams(Guid id, IReadOnlyList<MediaStream> streams, CancellationToken cancellationToken)
|
|
{
|
|
using var context = _dbProvider.CreateDbContext();
|
|
using var transaction = context.Database.BeginTransaction();
|
|
|
|
context.MediaStreamInfos.Where(e => e.ItemId.Equals(id)).ExecuteDelete();
|
|
context.MediaStreamInfos.AddRange(streams.Select(f => Map(f, id)));
|
|
context.SaveChanges();
|
|
|
|
transaction.Commit();
|
|
}
|
|
|
|
/// <inheritdoc />
|
|
public IReadOnlyList<MediaStream> GetMediaStreams(MediaStreamQuery filter)
|
|
{
|
|
using var context = _dbProvider.CreateDbContext();
|
|
return TranslateQuery(context.MediaStreamInfos.AsNoTracking(), filter).AsEnumerable().Select(Map).ToArray();
|
|
}
|
|
|
|
private string? GetPathToSave(string? path)
|
|
{
|
|
if (path is null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
return _serverApplicationHost.ReverseVirtualPath(path);
|
|
}
|
|
|
|
private string? RestorePath(string? path)
|
|
{
|
|
if (path is null)
|
|
{
|
|
return null;
|
|
}
|
|
|
|
return _serverApplicationHost.ExpandVirtualPath(path);
|
|
}
|
|
|
|
private IQueryable<MediaStreamInfo> TranslateQuery(IQueryable<MediaStreamInfo> query, MediaStreamQuery filter)
|
|
{
|
|
query = query.Where(e => e.ItemId.Equals(filter.ItemId));
|
|
if (filter.Index.HasValue)
|
|
{
|
|
query = query.Where(e => e.StreamIndex == filter.Index);
|
|
}
|
|
|
|
if (filter.Type.HasValue)
|
|
{
|
|
var typeValue = (MediaStreamTypeEntity)filter.Type.Value;
|
|
query = query.Where(e => e.StreamType == typeValue);
|
|
}
|
|
|
|
return query.OrderBy(e => e.StreamIndex);
|
|
}
|
|
|
|
private MediaStream Map(MediaStreamInfo entity)
|
|
{
|
|
var dto = new MediaStream();
|
|
dto.Index = entity.StreamIndex;
|
|
dto.Type = (MediaStreamType)entity.StreamType;
|
|
|
|
dto.IsAVC = entity.IsAvc;
|
|
dto.Codec = entity.Codec;
|
|
|
|
var language = entity.Language;
|
|
|
|
// Check if the language has multiple three letter ISO codes
|
|
// if yes choose the first as that is the ISO 639-2/T code we're needing
|
|
if (language != null && _localization.TryGetISO6392TFromB(language, out string? isoT))
|
|
{
|
|
language = isoT;
|
|
}
|
|
|
|
dto.Language = language;
|
|
|
|
dto.ChannelLayout = entity.ChannelLayout;
|
|
dto.Profile = entity.Profile;
|
|
dto.AspectRatio = entity.AspectRatio;
|
|
dto.Path = RestorePath(entity.Path);
|
|
dto.IsInterlaced = entity.IsInterlaced.GetValueOrDefault();
|
|
dto.BitRate = entity.BitRate;
|
|
dto.Channels = entity.Channels;
|
|
dto.SampleRate = entity.SampleRate;
|
|
dto.IsDefault = entity.IsDefault;
|
|
dto.IsForced = entity.IsForced;
|
|
dto.IsExternal = entity.IsExternal;
|
|
dto.Height = entity.Height;
|
|
dto.Width = entity.Width;
|
|
dto.AverageFrameRate = entity.AverageFrameRate;
|
|
dto.RealFrameRate = entity.RealFrameRate;
|
|
dto.Level = entity.Level;
|
|
dto.PixelFormat = entity.PixelFormat;
|
|
dto.BitDepth = entity.BitDepth;
|
|
dto.IsAnamorphic = entity.IsAnamorphic;
|
|
dto.RefFrames = entity.RefFrames;
|
|
dto.CodecTag = entity.CodecTag;
|
|
dto.Comment = entity.Comment;
|
|
dto.NalLengthSize = entity.NalLengthSize;
|
|
dto.Title = entity.Title;
|
|
dto.TimeBase = entity.TimeBase;
|
|
dto.CodecTimeBase = entity.CodecTimeBase;
|
|
dto.ColorPrimaries = entity.ColorPrimaries;
|
|
dto.ColorSpace = entity.ColorSpace;
|
|
dto.ColorTransfer = entity.ColorTransfer;
|
|
dto.DvVersionMajor = entity.DvVersionMajor;
|
|
dto.DvVersionMinor = entity.DvVersionMinor;
|
|
dto.DvProfile = entity.DvProfile;
|
|
dto.DvLevel = entity.DvLevel;
|
|
dto.RpuPresentFlag = entity.RpuPresentFlag;
|
|
dto.ElPresentFlag = entity.ElPresentFlag;
|
|
dto.BlPresentFlag = entity.BlPresentFlag;
|
|
dto.DvBlSignalCompatibilityId = entity.DvBlSignalCompatibilityId;
|
|
dto.IsHearingImpaired = entity.IsHearingImpaired.GetValueOrDefault();
|
|
dto.Rotation = entity.Rotation;
|
|
dto.Hdr10PlusPresentFlag = entity.Hdr10PlusPresentFlag;
|
|
|
|
if (dto.Type is MediaStreamType.Audio or MediaStreamType.Subtitle)
|
|
{
|
|
dto.LocalizedDefault = _localization.GetLocalizedString("Default");
|
|
dto.LocalizedExternal = _localization.GetLocalizedString("External");
|
|
|
|
if (dto.Type is MediaStreamType.Subtitle)
|
|
{
|
|
dto.LocalizedUndefined = _localization.GetLocalizedString("Undefined");
|
|
dto.LocalizedForced = _localization.GetLocalizedString("Forced");
|
|
dto.LocalizedHearingImpaired = _localization.GetLocalizedString("HearingImpaired");
|
|
}
|
|
}
|
|
|
|
return dto;
|
|
}
|
|
|
|
private MediaStreamInfo Map(MediaStream dto, Guid itemId)
|
|
{
|
|
var entity = new MediaStreamInfo
|
|
{
|
|
Item = null!,
|
|
ItemId = itemId,
|
|
StreamIndex = dto.Index,
|
|
StreamType = (MediaStreamTypeEntity)dto.Type,
|
|
IsAvc = dto.IsAVC,
|
|
|
|
Codec = dto.Codec,
|
|
Language = dto.Language,
|
|
ChannelLayout = dto.ChannelLayout,
|
|
Profile = dto.Profile,
|
|
AspectRatio = dto.AspectRatio,
|
|
Path = GetPathToSave(dto.Path) ?? dto.Path,
|
|
IsInterlaced = dto.IsInterlaced,
|
|
BitRate = dto.BitRate,
|
|
Channels = dto.Channels,
|
|
SampleRate = dto.SampleRate,
|
|
IsDefault = dto.IsDefault,
|
|
IsForced = dto.IsForced,
|
|
IsExternal = dto.IsExternal,
|
|
Height = dto.Height,
|
|
Width = dto.Width,
|
|
AverageFrameRate = dto.AverageFrameRate,
|
|
RealFrameRate = dto.RealFrameRate,
|
|
Level = dto.Level.HasValue ? (float)dto.Level : null,
|
|
PixelFormat = dto.PixelFormat,
|
|
BitDepth = dto.BitDepth,
|
|
IsAnamorphic = dto.IsAnamorphic,
|
|
RefFrames = dto.RefFrames,
|
|
CodecTag = dto.CodecTag,
|
|
Comment = dto.Comment,
|
|
NalLengthSize = dto.NalLengthSize,
|
|
Title = dto.Title,
|
|
TimeBase = dto.TimeBase,
|
|
CodecTimeBase = dto.CodecTimeBase,
|
|
ColorPrimaries = dto.ColorPrimaries,
|
|
ColorSpace = dto.ColorSpace,
|
|
ColorTransfer = dto.ColorTransfer,
|
|
DvVersionMajor = dto.DvVersionMajor,
|
|
DvVersionMinor = dto.DvVersionMinor,
|
|
DvProfile = dto.DvProfile,
|
|
DvLevel = dto.DvLevel,
|
|
RpuPresentFlag = dto.RpuPresentFlag,
|
|
ElPresentFlag = dto.ElPresentFlag,
|
|
BlPresentFlag = dto.BlPresentFlag,
|
|
DvBlSignalCompatibilityId = dto.DvBlSignalCompatibilityId,
|
|
IsHearingImpaired = dto.IsHearingImpaired,
|
|
Rotation = dto.Rotation,
|
|
Hdr10PlusPresentFlag = dto.Hdr10PlusPresentFlag,
|
|
};
|
|
return entity;
|
|
}
|
|
}
|