forked from jellyfin/jellyfin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request jellyfin#6898 from jonas-resch/support-external-au…
…dio-files Add support for external audio files
- Loading branch information
Showing
6 changed files
with
255 additions
and
10 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,176 @@ | ||
| using System; | ||
| using System.Collections.Generic; | ||
| using System.IO; | ||
| using System.Runtime.CompilerServices; | ||
| using System.Threading; | ||
| using System.Threading.Tasks; | ||
| using Emby.Naming.Audio; | ||
| using Emby.Naming.Common; | ||
| using Jellyfin.Extensions; | ||
| using MediaBrowser.Controller.Entities; | ||
| using MediaBrowser.Controller.MediaEncoding; | ||
| using MediaBrowser.Controller.Providers; | ||
| using MediaBrowser.Model.Dlna; | ||
| using MediaBrowser.Model.Dto; | ||
| using MediaBrowser.Model.Entities; | ||
| using MediaBrowser.Model.Globalization; | ||
| using MediaBrowser.Model.MediaInfo; | ||
|
|
||
| namespace MediaBrowser.Providers.MediaInfo | ||
| { | ||
| /// <summary> | ||
| /// Resolves external audios for videos. | ||
| /// </summary> | ||
| public class AudioResolver | ||
| { | ||
| private readonly ILocalizationManager _localizationManager; | ||
| private readonly IMediaEncoder _mediaEncoder; | ||
| private readonly NamingOptions _namingOptions; | ||
|
|
||
| /// <summary> | ||
| /// Initializes a new instance of the <see cref="AudioResolver"/> class. | ||
| /// </summary> | ||
| /// <param name="localizationManager">The localization manager.</param> | ||
| /// <param name="mediaEncoder">The media encoder.</param> | ||
| /// <param name="namingOptions">The naming options.</param> | ||
| public AudioResolver( | ||
| ILocalizationManager localizationManager, | ||
| IMediaEncoder mediaEncoder, | ||
| NamingOptions namingOptions) | ||
| { | ||
| _localizationManager = localizationManager; | ||
| _mediaEncoder = mediaEncoder; | ||
| _namingOptions = namingOptions; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Returns the audio streams found in the external audio files for the given video. | ||
| /// </summary> | ||
| /// <param name="video">The video to get the external audio streams from.</param> | ||
| /// <param name="startIndex">The stream index to start adding audio streams at.</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="cancellationToken">The cancellation token to cancel operation.</param> | ||
| /// <returns>A list of external audio streams.</returns> | ||
| public async IAsyncEnumerable<MediaStream> GetExternalAudioStreams( | ||
| Video video, | ||
| int startIndex, | ||
| IDirectoryService directoryService, | ||
| bool clearCache, | ||
| [EnumeratorCancellation] CancellationToken cancellationToken) | ||
| { | ||
| cancellationToken.ThrowIfCancellationRequested(); | ||
|
|
||
| if (!video.IsFileProtocol) | ||
| { | ||
| yield break; | ||
| } | ||
|
|
||
| IEnumerable<string> paths = GetExternalAudioFiles(video, directoryService, clearCache); | ||
| foreach (string path in paths) | ||
| { | ||
| string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(path); | ||
| Model.MediaInfo.MediaInfo mediaInfo = await GetMediaInfo(path, cancellationToken).ConfigureAwait(false); | ||
|
|
||
| foreach (MediaStream mediaStream in mediaInfo.MediaStreams) | ||
| { | ||
| mediaStream.Index = startIndex++; | ||
| mediaStream.Type = MediaStreamType.Audio; | ||
| mediaStream.IsExternal = true; | ||
| mediaStream.Path = path; | ||
| mediaStream.IsDefault = false; | ||
| mediaStream.Title = null; | ||
|
|
||
| if (string.IsNullOrEmpty(mediaStream.Language)) | ||
| { | ||
| // Try to translate to three character code | ||
| // Be flexible and check against both the full and three character versions | ||
| var language = StringExtensions.RightPart(fileNameWithoutExtension, '.').ToString(); | ||
|
|
||
| if (language != fileNameWithoutExtension) | ||
| { | ||
| var culture = _localizationManager.FindLanguageInfo(language); | ||
|
|
||
| language = culture == null ? language : culture.ThreeLetterISOLanguageName; | ||
| mediaStream.Language = language; | ||
| } | ||
| } | ||
|
|
||
| yield return mediaStream; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Returns the external audio file paths for the given video. | ||
| /// </summary> | ||
| /// <param name="video">The video to get the external audio file paths from.</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> | ||
| /// <returns>A list of external audio file paths.</returns> | ||
| public IEnumerable<string> GetExternalAudioFiles( | ||
| Video video, | ||
| IDirectoryService directoryService, | ||
| bool clearCache) | ||
| { | ||
| if (!video.IsFileProtocol) | ||
| { | ||
| yield break; | ||
| } | ||
|
|
||
| // Check if video folder exists | ||
| string folder = video.ContainingFolderPath; | ||
| if (!Directory.Exists(folder)) | ||
| { | ||
| yield break; | ||
| } | ||
|
|
||
| string videoFileNameWithoutExtension = Path.GetFileNameWithoutExtension(video.Path); | ||
|
|
||
| var files = directoryService.GetFilePaths(folder, clearCache, true); | ||
| for (int i = 0; i < files.Count; i++) | ||
| { | ||
| string file = files[i]; | ||
| if (string.Equals(video.Path, file, StringComparison.OrdinalIgnoreCase) | ||
| || !AudioFileParser.IsAudioFile(file, _namingOptions) | ||
| || Path.GetExtension(file.AsSpan()).Equals(".strm", StringComparison.OrdinalIgnoreCase)) | ||
| { | ||
| continue; | ||
| } | ||
|
|
||
| string fileNameWithoutExtension = Path.GetFileNameWithoutExtension(file); | ||
| // The audio filename must either be equal to the video filename or start with the video filename followed by a dot | ||
| if (videoFileNameWithoutExtension.Equals(fileNameWithoutExtension, StringComparison.OrdinalIgnoreCase) | ||
| || (fileNameWithoutExtension.Length > videoFileNameWithoutExtension.Length | ||
| && fileNameWithoutExtension[videoFileNameWithoutExtension.Length] == '.' | ||
| && fileNameWithoutExtension.StartsWith(videoFileNameWithoutExtension, StringComparison.OrdinalIgnoreCase))) | ||
| { | ||
| yield return file; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Returns the media info of the given audio file. | ||
| /// </summary> | ||
| /// <param name="path">The path to the audio file.</param> | ||
| /// <param name="cancellationToken">The cancellation token to cancel operation.</param> | ||
| /// <returns>The media info for the given audio file.</returns> | ||
| private Task<Model.MediaInfo.MediaInfo> GetMediaInfo(string path, CancellationToken cancellationToken) | ||
| { | ||
| cancellationToken.ThrowIfCancellationRequested(); | ||
|
|
||
| return _mediaEncoder.GetMediaInfo( | ||
| new MediaInfoRequest | ||
| { | ||
| MediaType = DlnaProfileType.Audio, | ||
| MediaSource = new MediaSourceInfo | ||
| { | ||
| Path = path, | ||
| Protocol = MediaProtocol.File | ||
| } | ||
| }, | ||
| cancellationToken); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters