mirror of
https://github.com/jellyfin/jellyfin.git
synced 2024-09-06 05:47:14 -04:00
fix(external-media): implement review suggestions
This commit is contained in:
parent
719b707281
commit
a36e34fbd2
@ -9,7 +9,7 @@ using MediaBrowser.Model.Globalization;
|
|||||||
namespace Emby.Naming.ExternalFiles
|
namespace Emby.Naming.ExternalFiles
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// External file parser class.
|
/// External media file parser class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class ExternalPathParser
|
public class ExternalPathParser
|
||||||
{
|
{
|
||||||
@ -44,9 +44,8 @@ namespace Emby.Naming.ExternalFiles
|
|||||||
}
|
}
|
||||||
|
|
||||||
var extension = Path.GetExtension(path);
|
var extension = Path.GetExtension(path);
|
||||||
if (!((_type == DlnaProfileType.Subtitle && _namingOptions.SubtitleFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
|
if (!(_type == DlnaProfileType.Subtitle && _namingOptions.SubtitleFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
|
||||||
|| (_type == DlnaProfileType.Audio && _namingOptions.AudioFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))
|
&& !(_type == DlnaProfileType.Audio && _namingOptions.AudioFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase)))
|
||||||
|| (_type == DlnaProfileType.Video && _namingOptions.VideoFileExtensions.Contains(extension, StringComparison.OrdinalIgnoreCase))))
|
|
||||||
{
|
{
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
@ -66,7 +65,7 @@ namespace Emby.Naming.ExternalFiles
|
|||||||
|
|
||||||
while (languageString.Length > 0)
|
while (languageString.Length > 0)
|
||||||
{
|
{
|
||||||
var lastSeparator = languageString.LastIndexOf(separator, StringComparison.OrdinalIgnoreCase);
|
int lastSeparator = languageString.LastIndexOf(separator, StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
if (lastSeparator == -1)
|
if (lastSeparator == -1)
|
||||||
{
|
{
|
||||||
@ -74,8 +73,9 @@ namespace Emby.Naming.ExternalFiles
|
|||||||
}
|
}
|
||||||
|
|
||||||
string currentSlice = languageString[lastSeparator..];
|
string currentSlice = languageString[lastSeparator..];
|
||||||
|
string currentSliceWithoutSeparator = currentSlice[separatorLength..];
|
||||||
|
|
||||||
if (_namingOptions.MediaDefaultFlags.Any(s => currentSlice[separatorLength..].Contains(s, StringComparison.OrdinalIgnoreCase)))
|
if (_namingOptions.MediaDefaultFlags.Any(s => currentSliceWithoutSeparator.Contains(s, StringComparison.OrdinalIgnoreCase)))
|
||||||
{
|
{
|
||||||
pathInfo.IsDefault = true;
|
pathInfo.IsDefault = true;
|
||||||
extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase);
|
extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase);
|
||||||
@ -83,7 +83,7 @@ namespace Emby.Naming.ExternalFiles
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_namingOptions.MediaForcedFlags.Any(s => currentSlice[separatorLength..].Contains(s, StringComparison.OrdinalIgnoreCase)))
|
if (_namingOptions.MediaForcedFlags.Any(s => currentSliceWithoutSeparator.Contains(s, StringComparison.OrdinalIgnoreCase)))
|
||||||
{
|
{
|
||||||
pathInfo.IsForced = true;
|
pathInfo.IsForced = true;
|
||||||
extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase);
|
extraString = extraString.Replace(currentSlice, string.Empty, StringComparison.OrdinalIgnoreCase);
|
||||||
@ -92,7 +92,7 @@ namespace Emby.Naming.ExternalFiles
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Try to translate to three character code
|
// Try to translate to three character code
|
||||||
var culture = _localizationManager.FindLanguageInfo(currentSlice[separatorLength..]);
|
var culture = _localizationManager.FindLanguageInfo(currentSliceWithoutSeparator);
|
||||||
|
|
||||||
if (culture != null && pathInfo.Language == null)
|
if (culture != null && pathInfo.Language == null)
|
||||||
{
|
{
|
||||||
|
28
MediaBrowser.Providers/MediaInfo/AudioResolver.cs
Normal file
28
MediaBrowser.Providers/MediaInfo/AudioResolver.cs
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
using Emby.Naming.Common;
|
||||||
|
using MediaBrowser.Controller.Entities;
|
||||||
|
using MediaBrowser.Controller.MediaEncoding;
|
||||||
|
using MediaBrowser.Model.Dlna;
|
||||||
|
using MediaBrowser.Model.Globalization;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Providers.MediaInfo
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Resolves external audio files for <see cref="Video"/>.
|
||||||
|
/// </summary>
|
||||||
|
public class AudioResolver : MediaInfoResolver
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="MediaInfoResolver"/> class for external audio file processing.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="localizationManager">The localization manager.</param>
|
||||||
|
/// <param name="mediaEncoder">The media encoder.</param>
|
||||||
|
/// <param name="namingOptions">The <see cref="NamingOptions"/> object containing FileExtensions, MediaDefaultFlags, MediaForcedFlags and MediaFlagDelimiters.</param>
|
||||||
|
public AudioResolver(
|
||||||
|
ILocalizationManager localizationManager,
|
||||||
|
IMediaEncoder mediaEncoder,
|
||||||
|
NamingOptions namingOptions)
|
||||||
|
: base(localizationManager, mediaEncoder, namingOptions, DlnaProfileType.Audio)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -40,8 +40,8 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
IHasItemChangeMonitor
|
IHasItemChangeMonitor
|
||||||
{
|
{
|
||||||
private readonly ILogger<FFProbeProvider> _logger;
|
private readonly ILogger<FFProbeProvider> _logger;
|
||||||
private readonly MediaInfoResolver _subtitleResolver;
|
private readonly AudioResolver _audioResolver;
|
||||||
private readonly MediaInfoResolver _audioResolver;
|
private readonly SubtitleResolver _subtitleResolver;
|
||||||
private readonly FFProbeVideoInfo _videoProber;
|
private readonly FFProbeVideoInfo _videoProber;
|
||||||
private readonly FFProbeAudioInfo _audioProber;
|
private readonly FFProbeAudioInfo _audioProber;
|
||||||
private readonly Task<ItemUpdateType> _cachedTask = Task.FromResult(ItemUpdateType.None);
|
private readonly Task<ItemUpdateType> _cachedTask = Task.FromResult(ItemUpdateType.None);
|
||||||
@ -61,8 +61,8 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
NamingOptions namingOptions)
|
NamingOptions namingOptions)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_audioResolver = new MediaInfoResolver(localization, mediaEncoder, namingOptions, DlnaProfileType.Audio);
|
_audioResolver = new AudioResolver(localization, mediaEncoder, namingOptions);
|
||||||
_subtitleResolver = new MediaInfoResolver(localization, mediaEncoder, namingOptions, DlnaProfileType.Subtitle);
|
_subtitleResolver = new SubtitleResolver(localization, mediaEncoder, namingOptions);
|
||||||
_videoProber = new FFProbeVideoInfo(
|
_videoProber = new FFProbeVideoInfo(
|
||||||
_logger,
|
_logger,
|
||||||
mediaSourceManager,
|
mediaSourceManager,
|
||||||
@ -75,8 +75,8 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
subtitleManager,
|
subtitleManager,
|
||||||
chapterManager,
|
chapterManager,
|
||||||
libraryManager,
|
libraryManager,
|
||||||
_subtitleResolver,
|
_audioResolver,
|
||||||
_audioResolver);
|
_subtitleResolver);
|
||||||
_audioProber = new FFProbeAudioInfo(mediaSourceManager, mediaEncoder, itemRepo, libraryManager);
|
_audioProber = new FFProbeAudioInfo(mediaSourceManager, mediaEncoder, itemRepo, libraryManager);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -44,8 +44,8 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
private readonly ISubtitleManager _subtitleManager;
|
private readonly ISubtitleManager _subtitleManager;
|
||||||
private readonly IChapterManager _chapterManager;
|
private readonly IChapterManager _chapterManager;
|
||||||
private readonly ILibraryManager _libraryManager;
|
private readonly ILibraryManager _libraryManager;
|
||||||
private readonly MediaInfoResolver _audioResolver;
|
private readonly AudioResolver _audioResolver;
|
||||||
private readonly MediaInfoResolver _subtitleResolver;
|
private readonly SubtitleResolver _subtitleResolver;
|
||||||
private readonly IMediaSourceManager _mediaSourceManager;
|
private readonly IMediaSourceManager _mediaSourceManager;
|
||||||
|
|
||||||
private readonly long _dummyChapterDuration = TimeSpan.FromMinutes(5).Ticks;
|
private readonly long _dummyChapterDuration = TimeSpan.FromMinutes(5).Ticks;
|
||||||
@ -62,10 +62,11 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
ISubtitleManager subtitleManager,
|
ISubtitleManager subtitleManager,
|
||||||
IChapterManager chapterManager,
|
IChapterManager chapterManager,
|
||||||
ILibraryManager libraryManager,
|
ILibraryManager libraryManager,
|
||||||
MediaInfoResolver subtitleResolver,
|
AudioResolver audioResolver,
|
||||||
MediaInfoResolver audioResolver)
|
SubtitleResolver subtitleResolver)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
_mediaSourceManager = mediaSourceManager;
|
||||||
_mediaEncoder = mediaEncoder;
|
_mediaEncoder = mediaEncoder;
|
||||||
_itemRepo = itemRepo;
|
_itemRepo = itemRepo;
|
||||||
_blurayExaminer = blurayExaminer;
|
_blurayExaminer = blurayExaminer;
|
||||||
@ -77,7 +78,6 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
_libraryManager = libraryManager;
|
_libraryManager = libraryManager;
|
||||||
_audioResolver = audioResolver;
|
_audioResolver = audioResolver;
|
||||||
_subtitleResolver = subtitleResolver;
|
_subtitleResolver = subtitleResolver;
|
||||||
_mediaSourceManager = mediaSourceManager;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<ItemUpdateType> ProbeVideo<T>(
|
public async Task<ItemUpdateType> ProbeVideo<T>(
|
||||||
@ -536,14 +536,7 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
CancellationToken cancellationToken)
|
CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var startIndex = currentStreams.Count == 0 ? 0 : (currentStreams.Select(i => i.Index).Max() + 1);
|
var startIndex = currentStreams.Count == 0 ? 0 : (currentStreams.Select(i => i.Index).Max() + 1);
|
||||||
var externalSubtitleStreamsAsync = _subtitleResolver.GetExternalStreamsAsync(video, startIndex, options.DirectoryService, false, cancellationToken);
|
var externalSubtitleStreams = await _subtitleResolver.GetExternalStreamsAsync(video, startIndex, options.DirectoryService, false, cancellationToken);
|
||||||
|
|
||||||
List<MediaStream> externalSubtitleStreams = new List<MediaStream>();
|
|
||||||
|
|
||||||
await foreach (MediaStream externalSubtitleStream in externalSubtitleStreamsAsync)
|
|
||||||
{
|
|
||||||
externalSubtitleStreams.Add(externalSubtitleStream);
|
|
||||||
}
|
|
||||||
|
|
||||||
var enableSubtitleDownloading = options.MetadataRefreshMode == MetadataRefreshMode.Default ||
|
var enableSubtitleDownloading = options.MetadataRefreshMode == MetadataRefreshMode.Default ||
|
||||||
options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh;
|
options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh;
|
||||||
@ -597,10 +590,7 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
// Rescan
|
// Rescan
|
||||||
if (downloadedLanguages.Count > 0)
|
if (downloadedLanguages.Count > 0)
|
||||||
{
|
{
|
||||||
await foreach (MediaStream externalSubtitleStream in _subtitleResolver.GetExternalStreamsAsync(video, startIndex, options.DirectoryService, true, cancellationToken))
|
externalSubtitleStreams = await _subtitleResolver.GetExternalStreamsAsync(video, startIndex, options.DirectoryService, true, cancellationToken);
|
||||||
{
|
|
||||||
externalSubtitleStreams.Add(externalSubtitleStream);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -623,12 +613,9 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
CancellationToken cancellationToken)
|
CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
var startIndex = currentStreams.Count == 0 ? 0 : currentStreams.Max(i => i.Index) + 1;
|
var startIndex = currentStreams.Count == 0 ? 0 : currentStreams.Max(i => i.Index) + 1;
|
||||||
var externalAudioStreams = _audioResolver.GetExternalStreamsAsync(video, startIndex, options.DirectoryService, false, cancellationToken);
|
var externalAudioStreams = await _audioResolver.GetExternalStreamsAsync(video, startIndex, options.DirectoryService, false, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
await foreach (MediaStream externalAudioStream in externalAudioStreams)
|
currentStreams = currentStreams.Concat(externalAudioStreams).ToList();
|
||||||
{
|
|
||||||
currentStreams.Add(externalAudioStream);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Select all external audio file paths
|
// Select all external audio file paths
|
||||||
video.AudioFiles = currentStreams.Where(i => i.Type == MediaStreamType.Audio && i.IsExternal).Select(i => i.Path).Distinct().ToArray();
|
video.AudioFiles = currentStreams.Where(i => i.Type == MediaStreamType.Audio && i.IsExternal).Select(i => i.Path).Distinct().ToArray();
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using Emby.Naming.Common;
|
using Emby.Naming.Common;
|
||||||
@ -19,9 +19,9 @@ using MediaBrowser.Model.MediaInfo;
|
|||||||
namespace MediaBrowser.Providers.MediaInfo
|
namespace MediaBrowser.Providers.MediaInfo
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Resolves external files for videos.
|
/// Resolves external files for <see cref="Video"/>.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class MediaInfoResolver
|
public abstract class MediaInfoResolver
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The <see cref="CompareOptions"/> instance.
|
/// The <see cref="CompareOptions"/> instance.
|
||||||
@ -55,7 +55,7 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
/// <param name="mediaEncoder">The media encoder.</param>
|
/// <param name="mediaEncoder">The media encoder.</param>
|
||||||
/// <param name="namingOptions">The <see cref="NamingOptions"/> object containing FileExtensions, MediaDefaultFlags, MediaForcedFlags and MediaFlagDelimiters.</param>
|
/// <param name="namingOptions">The <see cref="NamingOptions"/> object containing FileExtensions, MediaDefaultFlags, MediaForcedFlags and MediaFlagDelimiters.</param>
|
||||||
/// <param name="type">The <see cref="DlnaProfileType"/> of the parsed file.</param>
|
/// <param name="type">The <see cref="DlnaProfileType"/> of the parsed file.</param>
|
||||||
public MediaInfoResolver(
|
protected MediaInfoResolver(
|
||||||
ILocalizationManager localizationManager,
|
ILocalizationManager localizationManager,
|
||||||
IMediaEncoder mediaEncoder,
|
IMediaEncoder mediaEncoder,
|
||||||
NamingOptions namingOptions,
|
NamingOptions namingOptions,
|
||||||
@ -73,27 +73,32 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
/// <param name="startIndex">The stream index to start adding external streams at.</param>
|
/// <param name="startIndex">The stream index to start adding external streams at.</param>
|
||||||
/// <param name="directoryService">The directory service to search for files.</param>
|
/// <param name="directoryService">The directory service to search for files.</param>
|
||||||
/// <param name="clearCache">True if the directory service cache should be cleared before searching.</param>
|
/// <param name="clearCache">True if the directory service cache should be cleared before searching.</param>
|
||||||
/// <param name="cancellationToken">The cancellation token to cancel operation.</param>
|
/// <param name="cancellationToken">The cancellation token.</param>
|
||||||
/// <returns>The external streams located.</returns>
|
/// <returns>The external streams located.</returns>
|
||||||
public async IAsyncEnumerable<MediaStream> GetExternalStreamsAsync(
|
public async Task<IReadOnlyList<MediaStream>> GetExternalStreamsAsync(
|
||||||
Video video,
|
Video video,
|
||||||
int startIndex,
|
int startIndex,
|
||||||
IDirectoryService directoryService,
|
IDirectoryService directoryService,
|
||||||
bool clearCache,
|
bool clearCache,
|
||||||
[EnumeratorCancellation] CancellationToken cancellationToken)
|
CancellationToken cancellationToken)
|
||||||
{
|
{
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
|
||||||
|
|
||||||
if (!video.IsFileProtocol)
|
if (!video.IsFileProtocol)
|
||||||
{
|
{
|
||||||
yield break;
|
return Array.Empty<MediaStream>();
|
||||||
}
|
}
|
||||||
|
|
||||||
var pathInfos = GetExternalFiles(video, directoryService, clearCache);
|
var pathInfos = GetExternalFiles(video, directoryService, clearCache);
|
||||||
|
|
||||||
|
if (!pathInfos.Any())
|
||||||
|
{
|
||||||
|
return Array.Empty<MediaStream>();
|
||||||
|
}
|
||||||
|
|
||||||
|
var mediaStreams = new List<MediaStream>();
|
||||||
|
|
||||||
foreach (var pathInfo in pathInfos)
|
foreach (var pathInfo in pathInfos)
|
||||||
{
|
{
|
||||||
Model.MediaInfo.MediaInfo mediaInfo = await GetMediaInfo(pathInfo.Path, _type, cancellationToken).ConfigureAwait(false);
|
var mediaInfo = await GetMediaInfo(pathInfo.Path, _type, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
if (mediaInfo.MediaStreams.Count == 1)
|
if (mediaInfo.MediaStreams.Count == 1)
|
||||||
{
|
{
|
||||||
@ -102,7 +107,7 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
mediaStream.IsDefault = pathInfo.IsDefault || mediaStream.IsDefault;
|
mediaStream.IsDefault = pathInfo.IsDefault || mediaStream.IsDefault;
|
||||||
mediaStream.IsForced = pathInfo.IsForced || mediaStream.IsForced;
|
mediaStream.IsForced = pathInfo.IsForced || mediaStream.IsForced;
|
||||||
|
|
||||||
yield return MergeMetadata(mediaStream, pathInfo);
|
mediaStreams.Add(MergeMetadata(mediaStream, pathInfo));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -110,10 +115,12 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
{
|
{
|
||||||
mediaStream.Index = startIndex++;
|
mediaStream.Index = startIndex++;
|
||||||
|
|
||||||
yield return MergeMetadata(mediaStream, pathInfo);
|
mediaStreams.Add(MergeMetadata(mediaStream, pathInfo));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return mediaStreams.AsReadOnly();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -123,26 +130,33 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
/// <param name="directoryService">The directory service to search for files.</param>
|
/// <param name="directoryService">The directory service to search for files.</param>
|
||||||
/// <param name="clearCache">True if the directory service cache should be cleared before searching.</param>
|
/// <param name="clearCache">True if the directory service cache should be cleared before searching.</param>
|
||||||
/// <returns>The external file paths located.</returns>
|
/// <returns>The external file paths located.</returns>
|
||||||
public IEnumerable<ExternalPathParserResult> GetExternalFiles(
|
public IReadOnlyList<ExternalPathParserResult> GetExternalFiles(
|
||||||
Video video,
|
Video video,
|
||||||
IDirectoryService directoryService,
|
IDirectoryService directoryService,
|
||||||
bool clearCache)
|
bool clearCache)
|
||||||
{
|
{
|
||||||
if (!video.IsFileProtocol)
|
if (!video.IsFileProtocol)
|
||||||
{
|
{
|
||||||
yield break;
|
return Array.Empty<ExternalPathParserResult>();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Check if video folder exists
|
// Check if video folder exists
|
||||||
string folder = video.ContainingFolderPath;
|
string folder = video.ContainingFolderPath;
|
||||||
if (!Directory.Exists(folder))
|
if (!Directory.Exists(folder))
|
||||||
{
|
{
|
||||||
yield break;
|
return Array.Empty<ExternalPathParserResult>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var externalPathInfos = new List<ExternalPathParserResult>();
|
||||||
|
|
||||||
var files = directoryService.GetFilePaths(folder, clearCache).ToList();
|
var files = directoryService.GetFilePaths(folder, clearCache).ToList();
|
||||||
files.AddRange(directoryService.GetFilePaths(video.GetInternalMetadataPath(), clearCache));
|
files.AddRange(directoryService.GetFilePaths(video.GetInternalMetadataPath(), clearCache));
|
||||||
|
|
||||||
|
if (!files.Any())
|
||||||
|
{
|
||||||
|
return Array.Empty<ExternalPathParserResult>();
|
||||||
|
}
|
||||||
|
|
||||||
foreach (var file in files)
|
foreach (var file in files)
|
||||||
{
|
{
|
||||||
if (_compareInfo.IsPrefix(Path.GetFileNameWithoutExtension(file), video.FileNameWithoutExtension, CompareOptions, out int matchLength))
|
if (_compareInfo.IsPrefix(Path.GetFileNameWithoutExtension(file), video.FileNameWithoutExtension, CompareOptions, out int matchLength))
|
||||||
@ -151,10 +165,12 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
|
|
||||||
if (externalPathInfo != null)
|
if (externalPathInfo != null)
|
||||||
{
|
{
|
||||||
yield return externalPathInfo;
|
externalPathInfos.Add(externalPathInfo);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return externalPathInfos.AsReadOnly();
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@ -198,7 +214,6 @@ namespace MediaBrowser.Providers.MediaInfo
|
|||||||
{
|
{
|
||||||
DlnaProfileType.Audio => MediaStreamType.Audio,
|
DlnaProfileType.Audio => MediaStreamType.Audio,
|
||||||
DlnaProfileType.Subtitle => MediaStreamType.Subtitle,
|
DlnaProfileType.Subtitle => MediaStreamType.Subtitle,
|
||||||
DlnaProfileType.Video => MediaStreamType.Video,
|
|
||||||
_ => mediaStream.Type
|
_ => mediaStream.Type
|
||||||
};
|
};
|
||||||
|
|
||||||
|
28
MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
Normal file
28
MediaBrowser.Providers/MediaInfo/SubtitleResolver.cs
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
using Emby.Naming.Common;
|
||||||
|
using MediaBrowser.Controller.Entities;
|
||||||
|
using MediaBrowser.Controller.MediaEncoding;
|
||||||
|
using MediaBrowser.Model.Dlna;
|
||||||
|
using MediaBrowser.Model.Globalization;
|
||||||
|
|
||||||
|
namespace MediaBrowser.Providers.MediaInfo
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Resolves external subtitle files for <see cref="Video"/>.
|
||||||
|
/// </summary>
|
||||||
|
public class SubtitleResolver : MediaInfoResolver
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// Initializes a new instance of the <see cref="MediaInfoResolver"/> class for external subtitle file processing.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="localizationManager">The localization manager.</param>
|
||||||
|
/// <param name="mediaEncoder">The media encoder.</param>
|
||||||
|
/// <param name="namingOptions">The <see cref="NamingOptions"/> object containing FileExtensions, MediaDefaultFlags, MediaForcedFlags and MediaFlagDelimiters.</param>
|
||||||
|
public SubtitleResolver(
|
||||||
|
ILocalizationManager localizationManager,
|
||||||
|
IMediaEncoder mediaEncoder,
|
||||||
|
NamingOptions namingOptions)
|
||||||
|
: base(localizationManager, mediaEncoder, namingOptions, DlnaProfileType.Subtitle)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -8,7 +8,6 @@ using MediaBrowser.Controller.Entities;
|
|||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Controller.MediaEncoding;
|
using MediaBrowser.Controller.MediaEncoding;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Dlna;
|
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Globalization;
|
using MediaBrowser.Model.Globalization;
|
||||||
using MediaBrowser.Providers.MediaInfo;
|
using MediaBrowser.Providers.MediaInfo;
|
||||||
@ -21,17 +20,11 @@ namespace Jellyfin.Providers.Tests.MediaInfo
|
|||||||
{
|
{
|
||||||
private const string VideoDirectoryPath = "Test Data/Video";
|
private const string VideoDirectoryPath = "Test Data/Video";
|
||||||
private const string MetadataDirectoryPath = "Test Data/Metadata";
|
private const string MetadataDirectoryPath = "Test Data/Metadata";
|
||||||
private readonly MediaInfoResolver _audioResolver;
|
private readonly AudioResolver _audioResolver;
|
||||||
|
|
||||||
public AudioResolverTests()
|
public AudioResolverTests()
|
||||||
{
|
{
|
||||||
var englishCultureDto = new CultureDto
|
var englishCultureDto = new CultureDto("English", "English", "en", new[] { "eng" });
|
||||||
{
|
|
||||||
Name = "English",
|
|
||||||
DisplayName = "English",
|
|
||||||
ThreeLetterISOLanguageNames = new[] { "eng" },
|
|
||||||
TwoLetterISOLanguageName = "en"
|
|
||||||
};
|
|
||||||
|
|
||||||
var localizationManager = new Mock<ILocalizationManager>(MockBehavior.Loose);
|
var localizationManager = new Mock<ILocalizationManager>(MockBehavior.Loose);
|
||||||
localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"en.*", RegexOptions.IgnoreCase)))
|
localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"en.*", RegexOptions.IgnoreCase)))
|
||||||
@ -47,11 +40,11 @@ namespace Jellyfin.Providers.Tests.MediaInfo
|
|||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
_audioResolver = new MediaInfoResolver(localizationManager.Object, mediaEncoder.Object, new NamingOptions(), DlnaProfileType.Audio);
|
_audioResolver = new AudioResolver(localizationManager.Object, mediaEncoder.Object, new NamingOptions());
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public async void AddExternalStreams_GivenMixedFilenames_ReturnsValidSubtitles()
|
public async void AddExternalStreamsAsync_GivenMixedFilenames_ReturnsValidSubtitles()
|
||||||
{
|
{
|
||||||
var startIndex = 0;
|
var startIndex = 0;
|
||||||
var index = startIndex;
|
var index = startIndex;
|
||||||
@ -108,13 +101,7 @@ namespace Jellyfin.Providers.Tests.MediaInfo
|
|||||||
directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
|
directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
|
||||||
.Returns(metadataFiles);
|
.Returns(metadataFiles);
|
||||||
|
|
||||||
var asyncStreams = _audioResolver.GetExternalStreamsAsync(video.Object, startIndex, directoryService.Object, false, CancellationToken.None).ConfigureAwait(false);
|
var streams = await _audioResolver.GetExternalStreamsAsync(video.Object, startIndex, directoryService.Object, false, CancellationToken.None);
|
||||||
|
|
||||||
var streams = new List<MediaStream>();
|
|
||||||
await foreach (var stream in asyncStreams)
|
|
||||||
{
|
|
||||||
streams.Add(stream);
|
|
||||||
}
|
|
||||||
|
|
||||||
Assert.Equal(expectedResult.Length, streams.Count);
|
Assert.Equal(expectedResult.Length, streams.Count);
|
||||||
for (var i = 0; i < expectedResult.Length; i++)
|
for (var i = 0; i < expectedResult.Length; i++)
|
||||||
@ -140,7 +127,7 @@ namespace Jellyfin.Providers.Tests.MediaInfo
|
|||||||
[InlineData("My.Video.forced.English.mp3", "eng", null, true, false)]
|
[InlineData("My.Video.forced.English.mp3", "eng", null, true, false)]
|
||||||
[InlineData("My.Video.default.English.mp3", "eng", null, false, true)]
|
[InlineData("My.Video.default.English.mp3", "eng", null, false, true)]
|
||||||
[InlineData("My.Video.English.forced.default.Title.mp3", "eng", "Title", true, true)]
|
[InlineData("My.Video.English.forced.default.Title.mp3", "eng", "Title", true, true)]
|
||||||
public async void GetExternalAudioStreams_GivenSingleFile_ReturnsExpectedStream(string file, string? language, string? title, bool isForced, bool isDefault)
|
public async void AddExternalStreamsAsync_GivenSingleFile_ReturnsExpectedStream(string file, string? language, string? title, bool isForced, bool isDefault)
|
||||||
{
|
{
|
||||||
BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
|
BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
|
||||||
|
|
||||||
@ -155,13 +142,7 @@ namespace Jellyfin.Providers.Tests.MediaInfo
|
|||||||
directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
|
directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
|
||||||
.Returns(Array.Empty<string>());
|
.Returns(Array.Empty<string>());
|
||||||
|
|
||||||
var asyncStreams = _audioResolver.GetExternalStreamsAsync(video.Object, 0, directoryService.Object, false, CancellationToken.None).ConfigureAwait(false);
|
var streams = await _audioResolver.GetExternalStreamsAsync(video.Object, 0, directoryService.Object, false, CancellationToken.None);
|
||||||
|
|
||||||
var streams = new List<MediaStream>();
|
|
||||||
await foreach (var stream in asyncStreams)
|
|
||||||
{
|
|
||||||
streams.Add(stream);
|
|
||||||
}
|
|
||||||
|
|
||||||
Assert.Single(streams);
|
Assert.Single(streams);
|
||||||
|
|
||||||
|
@ -8,7 +8,6 @@ using MediaBrowser.Controller.Entities;
|
|||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Controller.MediaEncoding;
|
using MediaBrowser.Controller.MediaEncoding;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
using MediaBrowser.Model.Dlna;
|
|
||||||
using MediaBrowser.Model.Entities;
|
using MediaBrowser.Model.Entities;
|
||||||
using MediaBrowser.Model.Globalization;
|
using MediaBrowser.Model.Globalization;
|
||||||
using MediaBrowser.Providers.MediaInfo;
|
using MediaBrowser.Providers.MediaInfo;
|
||||||
@ -21,24 +20,12 @@ namespace Jellyfin.Providers.Tests.MediaInfo
|
|||||||
{
|
{
|
||||||
private const string VideoDirectoryPath = "Test Data/Video";
|
private const string VideoDirectoryPath = "Test Data/Video";
|
||||||
private const string MetadataDirectoryPath = "Test Data/Metadata";
|
private const string MetadataDirectoryPath = "Test Data/Metadata";
|
||||||
private readonly MediaInfoResolver _subtitleResolver;
|
private readonly SubtitleResolver _subtitleResolver;
|
||||||
|
|
||||||
public SubtitleResolverTests()
|
public SubtitleResolverTests()
|
||||||
{
|
{
|
||||||
var englishCultureDto = new CultureDto
|
var englishCultureDto = new CultureDto("English", "English", "en", new[] { "eng" });
|
||||||
{
|
var frenchCultureDto = new CultureDto("French", "French", "fr", new[] { "fre", "fra" });
|
||||||
Name = "English",
|
|
||||||
DisplayName = "English",
|
|
||||||
ThreeLetterISOLanguageNames = new[] { "eng" },
|
|
||||||
TwoLetterISOLanguageName = "en"
|
|
||||||
};
|
|
||||||
var frenchCultureDto = new CultureDto
|
|
||||||
{
|
|
||||||
Name = "French",
|
|
||||||
DisplayName = "French",
|
|
||||||
ThreeLetterISOLanguageNames = new[] { "fre", "fra" },
|
|
||||||
TwoLetterISOLanguageName = "fr"
|
|
||||||
};
|
|
||||||
|
|
||||||
var localizationManager = new Mock<ILocalizationManager>(MockBehavior.Loose);
|
var localizationManager = new Mock<ILocalizationManager>(MockBehavior.Loose);
|
||||||
localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"en.*", RegexOptions.IgnoreCase)))
|
localizationManager.Setup(lm => lm.FindLanguageInfo(It.IsRegex(@"en.*", RegexOptions.IgnoreCase)))
|
||||||
@ -56,11 +43,11 @@ namespace Jellyfin.Providers.Tests.MediaInfo
|
|||||||
}
|
}
|
||||||
}));
|
}));
|
||||||
|
|
||||||
_subtitleResolver = new MediaInfoResolver(localizationManager.Object, mediaEncoder.Object, new NamingOptions(), DlnaProfileType.Subtitle);
|
_subtitleResolver = new SubtitleResolver(localizationManager.Object, mediaEncoder.Object, new NamingOptions());
|
||||||
}
|
}
|
||||||
|
|
||||||
[Fact]
|
[Fact]
|
||||||
public async void AddExternalSubtitleStreams_GivenMixedFilenames_ReturnsValidSubtitles()
|
public async void AddExternalStreamsAsync_GivenMixedFilenames_ReturnsValidSubtitles()
|
||||||
{
|
{
|
||||||
var startIndex = 0;
|
var startIndex = 0;
|
||||||
var index = startIndex;
|
var index = startIndex;
|
||||||
@ -127,13 +114,7 @@ namespace Jellyfin.Providers.Tests.MediaInfo
|
|||||||
directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
|
directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
|
||||||
.Returns(metadataFiles);
|
.Returns(metadataFiles);
|
||||||
|
|
||||||
var asyncStreams = _subtitleResolver.GetExternalStreamsAsync(video.Object, startIndex, directoryService.Object, false, CancellationToken.None).ConfigureAwait(false);
|
var streams = await _subtitleResolver.GetExternalStreamsAsync(video.Object, startIndex, directoryService.Object, false, CancellationToken.None);
|
||||||
|
|
||||||
var streams = new List<MediaStream>();
|
|
||||||
await foreach (var stream in asyncStreams)
|
|
||||||
{
|
|
||||||
streams.Add(stream);
|
|
||||||
}
|
|
||||||
|
|
||||||
Assert.Equal(expectedResult.Length, streams.Count);
|
Assert.Equal(expectedResult.Length, streams.Count);
|
||||||
for (var i = 0; i < expectedResult.Length; i++)
|
for (var i = 0; i < expectedResult.Length; i++)
|
||||||
@ -169,7 +150,7 @@ namespace Jellyfin.Providers.Tests.MediaInfo
|
|||||||
[InlineData("My.Video.Track.Label.srt", "srt", null, "Track.Label", false, false)]
|
[InlineData("My.Video.Track.Label.srt", "srt", null, "Track.Label", false, false)]
|
||||||
[InlineData("My.Video.Track Label.en.default.forced.srt", "srt", "eng", "Track Label", true, true)]
|
[InlineData("My.Video.Track Label.en.default.forced.srt", "srt", "eng", "Track Label", true, true)]
|
||||||
[InlineData("My.Video.en.default.forced.Track Label.srt", "srt", "eng", "Track Label", true, true)]
|
[InlineData("My.Video.en.default.forced.Track Label.srt", "srt", "eng", "Track Label", true, true)]
|
||||||
public async void AddExternalSubtitleStreams_GivenSingleFile_ReturnsExpectedSubtitle(string file, string codec, string? language, string? title, bool isForced, bool isDefault)
|
public async void AddExternalStreamsAsync_GivenSingleFile_ReturnsExpectedSubtitle(string file, string codec, string? language, string? title, bool isForced, bool isDefault)
|
||||||
{
|
{
|
||||||
BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
|
BaseItem.MediaSourceManager = Mock.Of<IMediaSourceManager>();
|
||||||
|
|
||||||
@ -184,13 +165,7 @@ namespace Jellyfin.Providers.Tests.MediaInfo
|
|||||||
directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
|
directoryService.Setup(ds => ds.GetFilePaths(It.IsRegex(@"Test Data[/\\]Metadata"), It.IsAny<bool>(), It.IsAny<bool>()))
|
||||||
.Returns(Array.Empty<string>());
|
.Returns(Array.Empty<string>());
|
||||||
|
|
||||||
var asyncStreams = _subtitleResolver.GetExternalStreamsAsync(video.Object, 0, directoryService.Object, false, CancellationToken.None).ConfigureAwait(false);
|
var streams = await _subtitleResolver.GetExternalStreamsAsync(video.Object, 0, directoryService.Object, false, CancellationToken.None);
|
||||||
|
|
||||||
var streams = new List<MediaStream>();
|
|
||||||
await foreach (var stream in asyncStreams)
|
|
||||||
{
|
|
||||||
streams.Add(stream);
|
|
||||||
}
|
|
||||||
|
|
||||||
Assert.Single(streams);
|
Assert.Single(streams);
|
||||||
var actual = streams[0];
|
var actual = streams[0];
|
||||||
|
Loading…
Reference in New Issue
Block a user