fixed an issue with the video image provider requiring two-pass refreshing
This commit is contained in:
parent
9794c8fb1a
commit
9c7f492e2c
|
@ -93,7 +93,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
|
|||
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
await Fetch(myItem, cancellationToken, result, isoMount).ConfigureAwait(false);
|
||||
Fetch(myItem, cancellationToken, result, isoMount);
|
||||
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
|
@ -180,7 +180,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
|
|||
/// <param name="result">The result.</param>
|
||||
/// <param name="isoMount">The iso mount.</param>
|
||||
/// <returns>Task.</returns>
|
||||
protected abstract Task Fetch(T item, CancellationToken cancellationToken, FFProbeResult result, IIsoMount isoMount);
|
||||
protected abstract void Fetch(T item, CancellationToken cancellationToken, FFProbeResult result, IIsoMount isoMount);
|
||||
|
||||
/// <summary>
|
||||
/// Converts ffprobe stream info to our MediaStream class
|
||||
|
|
|
@ -57,12 +57,6 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
|
|||
|
||||
if (video != null)
|
||||
{
|
||||
// Can't extract images if there are no video streams
|
||||
if (video.MediaStreams == null || video.MediaStreams.All(m => m.Type != MediaStreamType.Video))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
if (video.VideoType == VideoType.Iso && video.IsoType.HasValue && _isoManager.CanMount(item.Path))
|
||||
{
|
||||
return true;
|
||||
|
@ -93,17 +87,21 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
|
|||
{
|
||||
var video = (Video)item;
|
||||
|
||||
var filename = item.Id + "_" + item.DateModified.Ticks + "_primary";
|
||||
|
||||
var path = Kernel.Instance.FFMpegManager.VideoImageCache.GetResourcePath(filename, ".jpg");
|
||||
|
||||
if (!Kernel.Instance.FFMpegManager.VideoImageCache.ContainsFilePath(path))
|
||||
// We can only extract images from videos if we know there's an embedded video stream
|
||||
if (video.MediaStreams != null && video.MediaStreams.Any(m => m.Type == MediaStreamType.Video))
|
||||
{
|
||||
return ExtractImage(video, path, cancellationToken);
|
||||
}
|
||||
var filename = item.Id + "_" + item.DateModified.Ticks + "_primary";
|
||||
|
||||
// Image is already in the cache
|
||||
item.PrimaryImagePath = path;
|
||||
var path = Kernel.Instance.FFMpegManager.VideoImageCache.GetResourcePath(filename, ".jpg");
|
||||
|
||||
if (!Kernel.Instance.FFMpegManager.VideoImageCache.ContainsFilePath(path))
|
||||
{
|
||||
return ExtractImage(video, path, cancellationToken);
|
||||
}
|
||||
|
||||
// Image is already in the cache
|
||||
item.PrimaryImagePath = path;
|
||||
}
|
||||
}
|
||||
|
||||
SetLastRefreshed(item, DateTime.UtcNow);
|
||||
|
|
|
@ -42,41 +42,38 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
|
|||
/// <param name="data">The data.</param>
|
||||
/// <param name="isoMount">The iso mount.</param>
|
||||
/// <returns>Task.</returns>
|
||||
protected override Task Fetch(Audio audio, CancellationToken cancellationToken, FFProbeResult data, IIsoMount isoMount)
|
||||
protected override void Fetch(Audio audio, CancellationToken cancellationToken, FFProbeResult data, IIsoMount isoMount)
|
||||
{
|
||||
return Task.Run(() =>
|
||||
if (data.streams == null)
|
||||
{
|
||||
if (data.streams == null)
|
||||
{
|
||||
Logger.Error("Audio item has no streams: " + audio.Path);
|
||||
return;
|
||||
}
|
||||
Logger.Error("Audio item has no streams: " + audio.Path);
|
||||
return;
|
||||
}
|
||||
|
||||
audio.MediaStreams = data.streams.Select(s => GetMediaStream(s, data.format)).ToList();
|
||||
audio.MediaStreams = data.streams.Select(s => GetMediaStream(s, data.format)).ToList();
|
||||
|
||||
// Get the first audio stream
|
||||
var stream = data.streams.First(s => s.codec_type.Equals("audio", StringComparison.OrdinalIgnoreCase));
|
||||
// Get the first audio stream
|
||||
var stream = data.streams.First(s => s.codec_type.Equals("audio", StringComparison.OrdinalIgnoreCase));
|
||||
|
||||
// Get duration from stream properties
|
||||
var duration = stream.duration;
|
||||
// Get duration from stream properties
|
||||
var duration = stream.duration;
|
||||
|
||||
// If it's not there go into format properties
|
||||
if (string.IsNullOrEmpty(duration))
|
||||
{
|
||||
duration = data.format.duration;
|
||||
}
|
||||
// If it's not there go into format properties
|
||||
if (string.IsNullOrEmpty(duration))
|
||||
{
|
||||
duration = data.format.duration;
|
||||
}
|
||||
|
||||
// If we got something, parse it
|
||||
if (!string.IsNullOrEmpty(duration))
|
||||
{
|
||||
audio.RunTimeTicks = TimeSpan.FromSeconds(double.Parse(duration, UsCulture)).Ticks;
|
||||
}
|
||||
// If we got something, parse it
|
||||
if (!string.IsNullOrEmpty(duration))
|
||||
{
|
||||
audio.RunTimeTicks = TimeSpan.FromSeconds(double.Parse(duration, UsCulture)).Ticks;
|
||||
}
|
||||
|
||||
if (data.format.tags != null)
|
||||
{
|
||||
FetchDataFromTags(audio, data.format.tags);
|
||||
}
|
||||
});
|
||||
if (data.format.tags != null)
|
||||
{
|
||||
FetchDataFromTags(audio, data.format.tags);
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -187,44 +187,41 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
|
|||
/// <param name="data">The data.</param>
|
||||
/// <param name="isoMount">The iso mount.</param>
|
||||
/// <returns>Task.</returns>
|
||||
protected override Task Fetch(Video video, CancellationToken cancellationToken, FFProbeResult data, IIsoMount isoMount)
|
||||
protected override void Fetch(Video video, CancellationToken cancellationToken, FFProbeResult data, IIsoMount isoMount)
|
||||
{
|
||||
return Task.Run(() =>
|
||||
if (data.format != null)
|
||||
{
|
||||
if (data.format != null)
|
||||
// For dvd's this may not always be accurate, so don't set the runtime if the item already has one
|
||||
var needToSetRuntime = video.VideoType != VideoType.Dvd || video.RunTimeTicks == null || video.RunTimeTicks.Value == 0;
|
||||
|
||||
if (needToSetRuntime && !string.IsNullOrEmpty(data.format.duration))
|
||||
{
|
||||
// For dvd's this may not always be accurate, so don't set the runtime if the item already has one
|
||||
var needToSetRuntime = video.VideoType != VideoType.Dvd || video.RunTimeTicks == null || video.RunTimeTicks.Value == 0;
|
||||
|
||||
if (needToSetRuntime && !string.IsNullOrEmpty(data.format.duration))
|
||||
{
|
||||
video.RunTimeTicks = TimeSpan.FromSeconds(double.Parse(data.format.duration, UsCulture)).Ticks;
|
||||
}
|
||||
video.RunTimeTicks = TimeSpan.FromSeconds(double.Parse(data.format.duration, UsCulture)).Ticks;
|
||||
}
|
||||
}
|
||||
|
||||
if (data.streams != null)
|
||||
{
|
||||
video.MediaStreams = data.streams.Select(s => GetMediaStream(s, data.format)).ToList();
|
||||
}
|
||||
if (data.streams != null)
|
||||
{
|
||||
video.MediaStreams = data.streams.Select(s => GetMediaStream(s, data.format)).ToList();
|
||||
}
|
||||
|
||||
if (data.Chapters != null)
|
||||
{
|
||||
video.Chapters = data.Chapters;
|
||||
}
|
||||
if (data.Chapters != null)
|
||||
{
|
||||
video.Chapters = data.Chapters;
|
||||
}
|
||||
|
||||
if (video.Chapters == null || video.Chapters.Count == 0)
|
||||
{
|
||||
AddDummyChapters(video);
|
||||
}
|
||||
if (video.Chapters == null || video.Chapters.Count == 0)
|
||||
{
|
||||
AddDummyChapters(video);
|
||||
}
|
||||
|
||||
if (video.VideoType == VideoType.BluRay || (video.IsoType.HasValue && video.IsoType.Value == IsoType.BluRay))
|
||||
{
|
||||
var inputPath = isoMount != null ? isoMount.MountedPath : video.Path;
|
||||
FetchBdInfo(video, inputPath, BdInfoCache, cancellationToken);
|
||||
}
|
||||
if (video.VideoType == VideoType.BluRay || (video.IsoType.HasValue && video.IsoType.Value == IsoType.BluRay))
|
||||
{
|
||||
var inputPath = isoMount != null ? isoMount.MountedPath : video.Path;
|
||||
FetchBdInfo(video, inputPath, BdInfoCache, cancellationToken);
|
||||
}
|
||||
|
||||
AddExternalSubtitles(video);
|
||||
});
|
||||
AddExternalSubtitles(video);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -104,7 +104,7 @@ namespace MediaBrowser.Server.Implementations.Providers
|
|||
/// <param name="providers">The providers.</param>
|
||||
public void AddMetadataProviders(IEnumerable<BaseMetadataProvider> providers)
|
||||
{
|
||||
MetadataProviders = providers.ToArray();
|
||||
MetadataProviders = providers.OrderBy(e => e.Priority).ToArray();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -30,7 +30,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
|
|||
/// <summary>
|
||||
/// The flush interval
|
||||
/// </summary>
|
||||
private const int FlushInterval = 5000;
|
||||
private const int FlushInterval = 2000;
|
||||
|
||||
/// <summary>
|
||||
/// The flush timer
|
||||
|
|
|
@ -34,6 +34,18 @@ namespace MediaBrowser.Server.Implementations.Sqlite
|
|||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Gets a value indicating whether [enable delayed commands].
|
||||
/// </summary>
|
||||
/// <value><c>true</c> if [enable delayed commands]; otherwise, <c>false</c>.</value>
|
||||
protected override bool EnableDelayedCommands
|
||||
{
|
||||
get
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// The _protobuf serializer
|
||||
/// </summary>
|
||||
|
@ -106,7 +118,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
|
|||
/// or
|
||||
/// userDataId
|
||||
/// </exception>
|
||||
public Task SaveUserData(Guid userId, Guid userDataId, UserItemData userData, CancellationToken cancellationToken)
|
||||
public async Task SaveUserData(Guid userId, Guid userDataId, UserItemData userData, CancellationToken cancellationToken)
|
||||
{
|
||||
if (userData == null)
|
||||
{
|
||||
|
@ -127,19 +139,36 @@ namespace MediaBrowser.Server.Implementations.Sqlite
|
|||
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
return Task.Run(() =>
|
||||
var serialized = _protobufSerializer.SerializeToBytes(userData);
|
||||
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
var cmd = connection.CreateCommand();
|
||||
cmd.CommandText = "replace into userdata (id, userId, data) values (@1, @2, @3)";
|
||||
cmd.AddParam("@1", userDataId);
|
||||
cmd.AddParam("@2", userId);
|
||||
cmd.AddParam("@3", serialized);
|
||||
|
||||
using (var tran = connection.BeginTransaction())
|
||||
{
|
||||
var serialized = _protobufSerializer.SerializeToBytes(userData);
|
||||
try
|
||||
{
|
||||
cmd.Transaction = tran;
|
||||
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
await cmd.ExecuteNonQueryAsync(cancellationToken);
|
||||
|
||||
var cmd = connection.CreateCommand();
|
||||
cmd.CommandText = "replace into userdata (id, userId, data) values (@1, @2, @3)";
|
||||
cmd.AddParam("@1", userDataId);
|
||||
cmd.AddParam("@2", userId);
|
||||
cmd.AddParam("@3", serialized);
|
||||
QueueCommand(cmd);
|
||||
});
|
||||
tran.Commit();
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
tran.Rollback();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.ErrorException("Failed to commit transaction.", e);
|
||||
tran.Rollback();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -45,6 +45,18 @@ namespace MediaBrowser.Server.Implementations.Sqlite
|
|||
/// </summary>
|
||||
private readonly IApplicationPaths _appPaths;
|
||||
|
||||
/// <summary>
|
||||
/// Gets a value indicating whether [enable delayed commands].
|
||||
/// </summary>
|
||||
/// <value><c>true</c> if [enable delayed commands]; otherwise, <c>false</c>.</value>
|
||||
protected override bool EnableDelayedCommands
|
||||
{
|
||||
get
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Initializes a new instance of the <see cref="SQLiteUserDataRepository" /> class.
|
||||
/// </summary>
|
||||
|
@ -97,7 +109,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
|
|||
/// <param name="cancellationToken">The cancellation token.</param>
|
||||
/// <returns>Task.</returns>
|
||||
/// <exception cref="System.ArgumentNullException">user</exception>
|
||||
public Task SaveUser(User user, CancellationToken cancellationToken)
|
||||
public async Task SaveUser(User user, CancellationToken cancellationToken)
|
||||
{
|
||||
if (user == null)
|
||||
{
|
||||
|
@ -109,20 +121,37 @@ namespace MediaBrowser.Server.Implementations.Sqlite
|
|||
throw new ArgumentNullException("cancellationToken");
|
||||
}
|
||||
|
||||
return Task.Run(() =>
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
var serialized = _jsonSerializer.SerializeToBytes(user);
|
||||
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
var cmd = connection.CreateCommand();
|
||||
cmd.CommandText = "replace into users (guid, data) values (@1, @2)";
|
||||
cmd.AddParam("@1", user.Id);
|
||||
cmd.AddParam("@2", serialized);
|
||||
|
||||
using (var tran = connection.BeginTransaction())
|
||||
{
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
try
|
||||
{
|
||||
cmd.Transaction = tran;
|
||||
|
||||
var serialized = _jsonSerializer.SerializeToBytes(user);
|
||||
await cmd.ExecuteNonQueryAsync(cancellationToken);
|
||||
|
||||
cancellationToken.ThrowIfCancellationRequested();
|
||||
|
||||
var cmd = connection.CreateCommand();
|
||||
cmd.CommandText = "replace into users (guid, data) values (@1, @2)";
|
||||
cmd.AddParam("@1", user.Id);
|
||||
cmd.AddParam("@2", serialized);
|
||||
QueueCommand(cmd);
|
||||
});
|
||||
tran.Commit();
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
tran.Rollback();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Logger.ErrorException("Failed to commit transaction.", e);
|
||||
tran.Rollback();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
@ -298,7 +298,7 @@ namespace MediaBrowser.ServerApplication
|
|||
|
||||
() => LibraryManager.AddParts(GetExports<IResolverIgnoreRule>(), GetExports<IVirtualFolderCreator>(), GetExports<IItemResolver>(), GetExports<IIntroProvider>(), GetExports<IBaseItemComparer>()),
|
||||
|
||||
() => ProviderManager.AddMetadataProviders(GetExports<BaseMetadataProvider>().OrderBy(e => e.Priority).ToArray())
|
||||
() => ProviderManager.AddMetadataProviders(GetExports<BaseMetadataProvider>().ToArray())
|
||||
);
|
||||
|
||||
UdpServer = new UdpServer(Logger, NetworkManager, ServerConfigurationManager);
|
||||
|
|
Loading…
Reference in New Issue
Block a user