Merge pull request #2844 from MediaBrowser/dev

fix video images not being created
This commit is contained in:
Luke 2017-08-26 15:51:02 -04:00 committed by GitHub
commit 7434dae5d2
4 changed files with 21 additions and 2 deletions

View File

@ -75,6 +75,11 @@ namespace Emby.Server.Implementations.MediaEncoder
return false;
}
if (!video.IsCompleteMedia)
{
return false;
}
// Can't extract images if there are no video streams
return video.DefaultVideoStreamIndex.HasValue;
}

View File

@ -161,7 +161,10 @@ namespace MediaBrowser.Controller.Entities
{
videoType = VideoType.Dvd;
}
else
{
return new string[] { };
}
return MediaEncoder.GetPlayableStreamFileNames(Path, videoType);
}
@ -265,6 +268,12 @@ namespace MediaBrowser.Controller.Entities
return base.CanDelete();
}
[IgnoreDataMember]
public bool IsCompleteMedia
{
get { return !IsActiveRecording(); }
}
[IgnoreDataMember]
protected virtual bool EnableDefaultVideoUserDataKeys
{

View File

@ -39,6 +39,11 @@ namespace MediaBrowser.Providers.MediaInfo
return new List<string>();
}
if (!video.IsCompleteMedia)
{
return new List<string>();
}
VideoContentType mediaType;
if (video is Episode)

View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.28.6")]
[assembly: AssemblyVersion("3.2.28.7")]