remember user audio/subtitle selections
This commit is contained in:
parent
dacdfd272a
commit
e700aff047
|
@ -3,7 +3,7 @@ using System.Collections.Generic;
|
||||||
|
|
||||||
namespace MediaBrowser.Controller.Entities
|
namespace MediaBrowser.Controller.Entities
|
||||||
{
|
{
|
||||||
public interface IHasMediaSources : IHasId
|
public interface IHasMediaSources : IHasUserData
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets the media sources.
|
/// Gets the media sources.
|
||||||
|
|
|
@ -78,7 +78,17 @@ namespace MediaBrowser.Controller.Entities
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <value><c>true</c> if played; otherwise, <c>false</c>.</value>
|
/// <value><c>true</c> if played; otherwise, <c>false</c>.</value>
|
||||||
public bool Played { get; set; }
|
public bool Played { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the index of the audio stream.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The index of the audio stream.</value>
|
||||||
|
public int? AudioStreamIndex { get; set; }
|
||||||
|
/// <summary>
|
||||||
|
/// Gets or sets the index of the subtitle stream.
|
||||||
|
/// </summary>
|
||||||
|
/// <value>The index of the subtitle stream.</value>
|
||||||
|
public int? SubtitleStreamIndex { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// This is an interpreted property to indicate likes or dislikes
|
/// This is an interpreted property to indicate likes or dislikes
|
||||||
/// This should never be serialized.
|
/// This should never be serialized.
|
||||||
|
|
|
@ -639,6 +639,8 @@ namespace MediaBrowser.Server.Implementations.Dto
|
||||||
private IEnumerable<string> GetCacheTags(BaseItem item, ImageType type, int limit)
|
private IEnumerable<string> GetCacheTags(BaseItem item, ImageType type, int limit)
|
||||||
{
|
{
|
||||||
return item.GetImages(type)
|
return item.GetImages(type)
|
||||||
|
// Convert to a list now in case GetImageCacheTag is slow
|
||||||
|
.ToList()
|
||||||
.Select(p => GetImageCacheTag(item, p))
|
.Select(p => GetImageCacheTag(item, p))
|
||||||
.Where(i => i != null)
|
.Where(i => i != null)
|
||||||
.Take(limit)
|
.Take(limit)
|
||||||
|
|
|
@ -30,8 +30,9 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
|
|
||||||
private IMediaSourceProvider[] _providers;
|
private IMediaSourceProvider[] _providers;
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
|
private readonly IUserDataManager _userDataManager;
|
||||||
|
|
||||||
public MediaSourceManager(IItemRepository itemRepo, IUserManager userManager, ILibraryManager libraryManager, ILogger logger, IJsonSerializer jsonSerializer, IFileSystem fileSystem)
|
public MediaSourceManager(IItemRepository itemRepo, IUserManager userManager, ILibraryManager libraryManager, ILogger logger, IJsonSerializer jsonSerializer, IFileSystem fileSystem, IUserDataManager userDataManager)
|
||||||
{
|
{
|
||||||
_itemRepo = itemRepo;
|
_itemRepo = itemRepo;
|
||||||
_userManager = userManager;
|
_userManager = userManager;
|
||||||
|
@ -39,6 +40,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_jsonSerializer = jsonSerializer;
|
_jsonSerializer = jsonSerializer;
|
||||||
_fileSystem = fileSystem;
|
_fileSystem = fileSystem;
|
||||||
|
_userDataManager = userDataManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddParts(IEnumerable<IMediaSourceProvider> providers)
|
public void AddParts(IEnumerable<IMediaSourceProvider> providers)
|
||||||
|
@ -140,7 +142,7 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
{
|
{
|
||||||
if (user != null)
|
if (user != null)
|
||||||
{
|
{
|
||||||
SetUserProperties(source, user);
|
SetUserProperties(hasMediaSources, source, user);
|
||||||
}
|
}
|
||||||
if (source.Protocol == MediaProtocol.File)
|
if (source.Protocol == MediaProtocol.File)
|
||||||
{
|
{
|
||||||
|
@ -257,25 +259,38 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
{
|
{
|
||||||
foreach (var source in sources)
|
foreach (var source in sources)
|
||||||
{
|
{
|
||||||
SetUserProperties(source, user);
|
SetUserProperties(item, source, user);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return sources;
|
return sources;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SetUserProperties(MediaSourceInfo source, User user)
|
private void SetUserProperties(IHasUserData item, MediaSourceInfo source, User user)
|
||||||
{
|
{
|
||||||
var preferredAudio = string.IsNullOrEmpty(user.Configuration.AudioLanguagePreference)
|
var userData = item == null ? new UserItemData() : _userDataManager.GetUserData(user.Id, item.GetUserDataKey());
|
||||||
? new string[] { }
|
|
||||||
: new[] { user.Configuration.AudioLanguagePreference };
|
|
||||||
|
|
||||||
|
SetDefaultAudioStreamIndex(source, userData, user);
|
||||||
|
SetDefaultSubtitleStreamIndex(source, userData, user);
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData userData, User user)
|
||||||
|
{
|
||||||
|
if (userData.SubtitleStreamIndex.HasValue)
|
||||||
|
{
|
||||||
|
var index = userData.SubtitleStreamIndex.Value;
|
||||||
|
// Make sure the saved index is still valid
|
||||||
|
if (index == -1 || source.MediaStreams.Any(i => i.Type == MediaStreamType.Subtitle && i.Index == index))
|
||||||
|
{
|
||||||
|
source.DefaultSubtitleStreamIndex = index;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var preferredSubs = string.IsNullOrEmpty(user.Configuration.SubtitleLanguagePreference)
|
var preferredSubs = string.IsNullOrEmpty(user.Configuration.SubtitleLanguagePreference)
|
||||||
? new List<string> { }
|
? new List<string> { }
|
||||||
: new List<string> { user.Configuration.SubtitleLanguagePreference };
|
: new List<string> { user.Configuration.SubtitleLanguagePreference };
|
||||||
|
|
||||||
source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex(source.MediaStreams, preferredAudio, user.Configuration.PlayDefaultAudioTrack);
|
|
||||||
|
|
||||||
var defaultAudioIndex = source.DefaultAudioStreamIndex;
|
var defaultAudioIndex = source.DefaultAudioStreamIndex;
|
||||||
var audioLangage = defaultAudioIndex == null
|
var audioLangage = defaultAudioIndex == null
|
||||||
? null
|
? null
|
||||||
|
@ -290,6 +305,26 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
user.Configuration.SubtitleMode, audioLangage);
|
user.Configuration.SubtitleMode, audioLangage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SetDefaultAudioStreamIndex(MediaSourceInfo source, UserItemData userData, User user)
|
||||||
|
{
|
||||||
|
if (userData.AudioStreamIndex.HasValue)
|
||||||
|
{
|
||||||
|
var index = userData.AudioStreamIndex.Value;
|
||||||
|
// Make sure the saved index is still valid
|
||||||
|
if (source.MediaStreams.Any(i => i.Type == MediaStreamType.Audio && i.Index == index))
|
||||||
|
{
|
||||||
|
source.DefaultAudioStreamIndex = index;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var preferredAudio = string.IsNullOrEmpty(user.Configuration.AudioLanguagePreference)
|
||||||
|
? new string[] { }
|
||||||
|
: new[] { user.Configuration.AudioLanguagePreference };
|
||||||
|
|
||||||
|
source.DefaultAudioStreamIndex = MediaStreamSelector.GetDefaultAudioStreamIndex(source.MediaStreams, preferredAudio, user.Configuration.PlayDefaultAudioTrack);
|
||||||
|
}
|
||||||
|
|
||||||
private IEnumerable<MediaSourceInfo> SortMediaSources(IEnumerable<MediaSourceInfo> sources)
|
private IEnumerable<MediaSourceInfo> SortMediaSources(IEnumerable<MediaSourceInfo> sources)
|
||||||
{
|
{
|
||||||
return sources.OrderBy(i =>
|
return sources.OrderBy(i =>
|
||||||
|
@ -349,11 +384,14 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
var json = _jsonSerializer.SerializeToString(mediaSource);
|
var json = _jsonSerializer.SerializeToString(mediaSource);
|
||||||
_logger.Debug("Live stream opened: " + json);
|
_logger.Debug("Live stream opened: " + json);
|
||||||
var clone = _jsonSerializer.DeserializeFromString<MediaSourceInfo>(json);
|
var clone = _jsonSerializer.DeserializeFromString<MediaSourceInfo>(json);
|
||||||
|
|
||||||
if (!string.IsNullOrWhiteSpace(request.UserId))
|
if (!string.IsNullOrWhiteSpace(request.UserId))
|
||||||
{
|
{
|
||||||
var user = _userManager.GetUserById(request.UserId);
|
var user = _userManager.GetUserById(request.UserId);
|
||||||
SetUserProperties(clone, user);
|
var item = string.IsNullOrWhiteSpace(request.ItemId)
|
||||||
|
? null
|
||||||
|
: _libraryManager.GetItemById(request.ItemId);
|
||||||
|
SetUserProperties(item, clone, user);
|
||||||
}
|
}
|
||||||
|
|
||||||
return new LiveStreamResponse
|
return new LiveStreamResponse
|
||||||
|
|
|
@ -56,6 +56,9 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
};
|
};
|
||||||
|
|
||||||
_connection.RunQueries(queries, Logger);
|
_connection.RunQueries(queries, Logger);
|
||||||
|
|
||||||
|
_connection.AddColumn(Logger, "userdata", "AudioStreamIndex", "int");
|
||||||
|
_connection.AddColumn(Logger, "userdata", "SubtitleStreamIndex", "int");
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
@ -127,7 +130,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
|
|
||||||
using (var cmd = _connection.CreateCommand())
|
using (var cmd = _connection.CreateCommand())
|
||||||
{
|
{
|
||||||
cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate)";
|
cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)";
|
||||||
|
|
||||||
cmd.Parameters.Add(cmd, "@key", DbType.String).Value = key;
|
cmd.Parameters.Add(cmd, "@key", DbType.String).Value = key;
|
||||||
cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
|
cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
|
||||||
|
@ -137,6 +140,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
cmd.Parameters.Add(cmd, "@isFavorite", DbType.Boolean).Value = userData.IsFavorite;
|
cmd.Parameters.Add(cmd, "@isFavorite", DbType.Boolean).Value = userData.IsFavorite;
|
||||||
cmd.Parameters.Add(cmd, "@playbackPositionTicks", DbType.Int64).Value = userData.PlaybackPositionTicks;
|
cmd.Parameters.Add(cmd, "@playbackPositionTicks", DbType.Int64).Value = userData.PlaybackPositionTicks;
|
||||||
cmd.Parameters.Add(cmd, "@lastPlayedDate", DbType.DateTime).Value = userData.LastPlayedDate;
|
cmd.Parameters.Add(cmd, "@lastPlayedDate", DbType.DateTime).Value = userData.LastPlayedDate;
|
||||||
|
cmd.Parameters.Add(cmd, "@AudioStreamIndex", DbType.Int32).Value = userData.AudioStreamIndex;
|
||||||
|
cmd.Parameters.Add(cmd, "@SubtitleStreamIndex", DbType.Int32).Value = userData.SubtitleStreamIndex;
|
||||||
|
|
||||||
cmd.Transaction = transaction;
|
cmd.Transaction = transaction;
|
||||||
|
|
||||||
|
@ -199,7 +204,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
{
|
{
|
||||||
using (var cmd = _connection.CreateCommand())
|
using (var cmd = _connection.CreateCommand())
|
||||||
{
|
{
|
||||||
cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate)";
|
cmd.CommandText = "replace into userdata (key, userId, rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex) values (@key, @userId, @rating,@played,@playCount,@isFavorite,@playbackPositionTicks,@lastPlayedDate,@AudioStreamIndex,@SubtitleStreamIndex)";
|
||||||
|
|
||||||
cmd.Parameters.Add(cmd, "@key", DbType.String).Value = userItemData.Key;
|
cmd.Parameters.Add(cmd, "@key", DbType.String).Value = userItemData.Key;
|
||||||
cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
|
cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
|
||||||
|
@ -209,6 +214,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
cmd.Parameters.Add(cmd, "@isFavorite", DbType.Boolean).Value = userItemData.IsFavorite;
|
cmd.Parameters.Add(cmd, "@isFavorite", DbType.Boolean).Value = userItemData.IsFavorite;
|
||||||
cmd.Parameters.Add(cmd, "@playbackPositionTicks", DbType.Int64).Value = userItemData.PlaybackPositionTicks;
|
cmd.Parameters.Add(cmd, "@playbackPositionTicks", DbType.Int64).Value = userItemData.PlaybackPositionTicks;
|
||||||
cmd.Parameters.Add(cmd, "@lastPlayedDate", DbType.DateTime).Value = userItemData.LastPlayedDate;
|
cmd.Parameters.Add(cmd, "@lastPlayedDate", DbType.DateTime).Value = userItemData.LastPlayedDate;
|
||||||
|
cmd.Parameters.Add(cmd, "@AudioStreamIndex", DbType.Int32).Value = userItemData.AudioStreamIndex;
|
||||||
|
cmd.Parameters.Add(cmd, "@SubtitleStreamIndex", DbType.Int32).Value = userItemData.SubtitleStreamIndex;
|
||||||
|
|
||||||
cmd.Transaction = transaction;
|
cmd.Transaction = transaction;
|
||||||
|
|
||||||
|
@ -275,7 +282,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
|
|
||||||
using (var cmd = _connection.CreateCommand())
|
using (var cmd = _connection.CreateCommand())
|
||||||
{
|
{
|
||||||
cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate from userdata where key = @key and userId=@userId";
|
cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where key = @key and userId=@userId";
|
||||||
|
|
||||||
cmd.Parameters.Add(cmd, "@key", DbType.String).Value = key;
|
cmd.Parameters.Add(cmd, "@key", DbType.String).Value = key;
|
||||||
cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
|
cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
|
||||||
|
@ -310,7 +317,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
|
|
||||||
using (var cmd = _connection.CreateCommand())
|
using (var cmd = _connection.CreateCommand())
|
||||||
{
|
{
|
||||||
cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate from userdata where userId=@userId";
|
cmd.CommandText = "select key,userid,rating,played,playCount,isFavorite,playbackPositionTicks,lastPlayedDate,AudioStreamIndex,SubtitleStreamIndex from userdata where userId=@userId";
|
||||||
|
|
||||||
cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
|
cmd.Parameters.Add(cmd, "@userId", DbType.Guid).Value = userId;
|
||||||
|
|
||||||
|
@ -350,6 +357,16 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
userData.LastPlayedDate = reader.GetDateTime(7).ToUniversalTime();
|
userData.LastPlayedDate = reader.GetDateTime(7).ToUniversalTime();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!reader.IsDBNull(8))
|
||||||
|
{
|
||||||
|
userData.AudioStreamIndex = reader.GetInt32(8);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!reader.IsDBNull(9))
|
||||||
|
{
|
||||||
|
userData.SubtitleStreamIndex = reader.GetInt32(9);
|
||||||
|
}
|
||||||
|
|
||||||
return userData;
|
return userData;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -680,7 +680,7 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
|
|
||||||
foreach (var user in users)
|
foreach (var user in users)
|
||||||
{
|
{
|
||||||
await OnPlaybackProgress(user.Id, key, libraryItem, info.PositionTicks).ConfigureAwait(false);
|
await OnPlaybackProgress(user.Id, key, libraryItem, info).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -712,18 +712,28 @@ namespace MediaBrowser.Server.Implementations.Session
|
||||||
StartIdleCheckTimer();
|
StartIdleCheckTimer();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task OnPlaybackProgress(Guid userId, string userDataKey, BaseItem item, long? positionTicks)
|
private async Task OnPlaybackProgress(Guid userId, string userDataKey, BaseItem item, PlaybackProgressInfo info)
|
||||||
{
|
{
|
||||||
var data = _userDataRepository.GetUserData(userId, userDataKey);
|
var data = _userDataRepository.GetUserData(userId, userDataKey);
|
||||||
|
|
||||||
|
var positionTicks = info.PositionTicks;
|
||||||
|
|
||||||
if (positionTicks.HasValue)
|
if (positionTicks.HasValue)
|
||||||
{
|
{
|
||||||
_userDataRepository.UpdatePlayState(item, data, positionTicks.Value);
|
_userDataRepository.UpdatePlayState(item, data, positionTicks.Value);
|
||||||
|
|
||||||
|
UpdatePlaybackSettings(info, data);
|
||||||
|
|
||||||
await _userDataRepository.SaveUserData(userId, item, data, UserDataSaveReason.PlaybackProgress, CancellationToken.None).ConfigureAwait(false);
|
await _userDataRepository.SaveUserData(userId, item, data, UserDataSaveReason.PlaybackProgress, CancellationToken.None).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void UpdatePlaybackSettings(PlaybackProgressInfo info, UserItemData data)
|
||||||
|
{
|
||||||
|
data.AudioStreamIndex = info.AudioStreamIndex;
|
||||||
|
data.SubtitleStreamIndex = info.SubtitleStreamIndex;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Used to report that playback has ended for an item
|
/// Used to report that playback has ended for an item
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -490,7 +490,7 @@ namespace MediaBrowser.Server.Startup.Common
|
||||||
ChannelManager = new ChannelManager(UserManager, DtoService, LibraryManager, LogManager.GetLogger("ChannelManager"), ServerConfigurationManager, FileSystemManager, UserDataManager, JsonSerializer, LocalizationManager, HttpClient, ProviderManager);
|
ChannelManager = new ChannelManager(UserManager, DtoService, LibraryManager, LogManager.GetLogger("ChannelManager"), ServerConfigurationManager, FileSystemManager, UserDataManager, JsonSerializer, LocalizationManager, HttpClient, ProviderManager);
|
||||||
RegisterSingleInstance(ChannelManager);
|
RegisterSingleInstance(ChannelManager);
|
||||||
|
|
||||||
MediaSourceManager = new MediaSourceManager(ItemRepository, UserManager, LibraryManager, LogManager.GetLogger("MediaSourceManager"), JsonSerializer, FileSystemManager);
|
MediaSourceManager = new MediaSourceManager(ItemRepository, UserManager, LibraryManager, LogManager.GetLogger("MediaSourceManager"), JsonSerializer, FileSystemManager, UserDataManager);
|
||||||
RegisterSingleInstance(MediaSourceManager);
|
RegisterSingleInstance(MediaSourceManager);
|
||||||
|
|
||||||
SessionManager = new SessionManager(UserDataManager, LogManager.GetLogger("SessionManager"), UserRepository, LibraryManager, UserManager, musicManager, DtoService, ImageProcessor, JsonSerializer, this, HttpClient, AuthenticationRepository, DeviceManager, MediaSourceManager);
|
SessionManager = new SessionManager(UserDataManager, LogManager.GetLogger("SessionManager"), UserRepository, LibraryManager, UserManager, musicManager, DtoService, ImageProcessor, JsonSerializer, this, HttpClient, AuthenticationRepository, DeviceManager, MediaSourceManager);
|
||||||
|
|
Loading…
Reference in New Issue
Block a user