mirror of https://github.com/jellyfin/jellyfin.git
Fix BD and DVD folder recognition for tv episodes
This commit is contained in:
parent
d89cd188eb
commit
3d4b2f840a
|
@ -67,11 +67,23 @@ namespace Emby.Server.Implementations.Library.Resolvers
|
||||||
{
|
{
|
||||||
if (IsDvdDirectory(child.FullName, filename, args.DirectoryService))
|
if (IsDvdDirectory(child.FullName, filename, args.DirectoryService))
|
||||||
{
|
{
|
||||||
videoType = VideoType.Dvd;
|
var videoTmp = new TVideoType
|
||||||
|
{
|
||||||
|
Path = args.Path,
|
||||||
|
VideoType = VideoType.Dvd
|
||||||
|
};
|
||||||
|
Set3DFormat(videoTmp);
|
||||||
|
return videoTmp;
|
||||||
}
|
}
|
||||||
else if (IsBluRayDirectory(filename))
|
else if (IsBluRayDirectory(filename))
|
||||||
{
|
{
|
||||||
videoType = VideoType.BluRay;
|
var videoTmp = new TVideoType
|
||||||
|
{
|
||||||
|
Path = args.Path,
|
||||||
|
VideoType = VideoType.BluRay
|
||||||
|
};
|
||||||
|
Set3DFormat(videoTmp);
|
||||||
|
return videoTmp;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else if (IsDvdFile(filename))
|
else if (IsDvdFile(filename))
|
||||||
|
|
|
@ -117,19 +117,25 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||||
mediaInfoResult.RunTimeTicks += tmpMediaInfo.RunTimeTicks;
|
mediaInfoResult.RunTimeTicks += tmpMediaInfo.RunTimeTicks;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
else if (item.VideoType == VideoType.BluRay)
|
||||||
|
{
|
||||||
|
blurayDiscInfo = GetBDInfo(item.Path);
|
||||||
|
var m2ts = _mediaEncoder.GetPrimaryPlaylistM2TsFiles(item.Path, null).ToList();
|
||||||
|
mediaInfoResult = await GetMediaInfo(
|
||||||
|
new Video
|
||||||
|
{
|
||||||
|
Path = m2ts.First()
|
||||||
|
},
|
||||||
|
cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (blurayDiscInfo.Files.Length == 0)
|
||||||
|
{
|
||||||
|
_logger.LogError("No playable vobs found in bluray structure, skipping ffprobe.");
|
||||||
|
return ItemUpdateType.MetadataImport;
|
||||||
|
}
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (item.VideoType == VideoType.BluRay)
|
|
||||||
{
|
|
||||||
blurayDiscInfo = GetBDInfo(item.Path);
|
|
||||||
|
|
||||||
if (blurayDiscInfo.Files.Length == 0)
|
|
||||||
{
|
|
||||||
_logger.LogError("No playable vobs found in bluray structure, skipping ffprobe.");
|
|
||||||
return ItemUpdateType.MetadataImport;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
mediaInfoResult = await GetMediaInfo(item, cancellationToken).ConfigureAwait(false);
|
mediaInfoResult = await GetMediaInfo(item, cancellationToken).ConfigureAwait(false);
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue