mirror of https://github.com/jellyfin/jellyfin.git
add new streambuilder options
This commit is contained in:
parent
afaf7f7c5b
commit
959c6a397c
|
@ -11,8 +11,14 @@ namespace MediaBrowser.Model.Dlna
|
||||||
public AudioOptions()
|
public AudioOptions()
|
||||||
{
|
{
|
||||||
Context = EncodingContext.Streaming;
|
Context = EncodingContext.Streaming;
|
||||||
|
|
||||||
|
EnableDirectPlay = true;
|
||||||
|
EnableDirectStream = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public bool EnableDirectPlay { get; set; }
|
||||||
|
public bool EnableDirectStream { get; set; }
|
||||||
|
|
||||||
public string ItemId { get; set; }
|
public string ItemId { get; set; }
|
||||||
public List<MediaSourceInfo> MediaSources { get; set; }
|
public List<MediaSourceInfo> MediaSources { get; set; }
|
||||||
public DeviceProfile Profile { get; set; }
|
public DeviceProfile Profile { get; set; }
|
||||||
|
|
|
@ -11,6 +11,8 @@ namespace MediaBrowser.Model.Dlna
|
||||||
|
|
||||||
public ProfileCondition[] Conditions { get; set; }
|
public ProfileCondition[] Conditions { get; set; }
|
||||||
|
|
||||||
|
public ProfileCondition[] ApplyConditions { get; set; }
|
||||||
|
|
||||||
[XmlAttribute("codec")]
|
[XmlAttribute("codec")]
|
||||||
public string Codec { get; set; }
|
public string Codec { get; set; }
|
||||||
|
|
||||||
|
@ -20,6 +22,7 @@ namespace MediaBrowser.Model.Dlna
|
||||||
public CodecProfile()
|
public CodecProfile()
|
||||||
{
|
{
|
||||||
Conditions = new ProfileCondition[] {};
|
Conditions = new ProfileCondition[] {};
|
||||||
|
ApplyConditions = new ProfileCondition[] { };
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<string> GetCodecs()
|
public List<string> GetCodecs()
|
||||||
|
|
|
@ -131,6 +131,11 @@ namespace MediaBrowser.Model.Dlna
|
||||||
|
|
||||||
List<PlayMethod> directPlayMethods = GetAudioDirectPlayMethods(item, audioStream, options);
|
List<PlayMethod> directPlayMethods = GetAudioDirectPlayMethods(item, audioStream, options);
|
||||||
|
|
||||||
|
ConditionProcessor conditionProcessor = new ConditionProcessor();
|
||||||
|
|
||||||
|
int? inputAudioChannels = audioStream == null ? null : audioStream.Channels;
|
||||||
|
int? inputAudioBitrate = audioStream == null ? null : audioStream.BitDepth;
|
||||||
|
|
||||||
if (directPlayMethods.Count > 0)
|
if (directPlayMethods.Count > 0)
|
||||||
{
|
{
|
||||||
string audioCodec = audioStream == null ? null : audioStream.Codec;
|
string audioCodec = audioStream == null ? null : audioStream.Codec;
|
||||||
|
@ -138,12 +143,23 @@ namespace MediaBrowser.Model.Dlna
|
||||||
// Make sure audio codec profiles are satisfied
|
// Make sure audio codec profiles are satisfied
|
||||||
if (!string.IsNullOrEmpty(audioCodec))
|
if (!string.IsNullOrEmpty(audioCodec))
|
||||||
{
|
{
|
||||||
ConditionProcessor conditionProcessor = new ConditionProcessor();
|
|
||||||
|
|
||||||
List<ProfileCondition> conditions = new List<ProfileCondition>();
|
List<ProfileCondition> conditions = new List<ProfileCondition>();
|
||||||
foreach (CodecProfile i in options.Profile.CodecProfiles)
|
foreach (CodecProfile i in options.Profile.CodecProfiles)
|
||||||
{
|
{
|
||||||
if (i.Type == CodecType.Audio && i.ContainsCodec(audioCodec, item.Container))
|
if (i.Type == CodecType.Audio && i.ContainsCodec(audioCodec, item.Container))
|
||||||
|
{
|
||||||
|
bool applyConditions = true;
|
||||||
|
foreach (ProfileCondition applyCondition in i.ApplyConditions)
|
||||||
|
{
|
||||||
|
if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate))
|
||||||
|
{
|
||||||
|
LogConditionFailure(options.Profile, "AudioCodecProfile", applyCondition, item);
|
||||||
|
applyConditions = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (applyConditions)
|
||||||
{
|
{
|
||||||
foreach (ProfileCondition c in i.Conditions)
|
foreach (ProfileCondition c in i.Conditions)
|
||||||
{
|
{
|
||||||
|
@ -151,14 +167,12 @@ namespace MediaBrowser.Model.Dlna
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
int? audioChannels = audioStream.Channels;
|
|
||||||
int? audioBitrate = audioStream.BitRate;
|
|
||||||
|
|
||||||
bool all = true;
|
bool all = true;
|
||||||
foreach (ProfileCondition c in conditions)
|
foreach (ProfileCondition c in conditions)
|
||||||
{
|
{
|
||||||
if (!conditionProcessor.IsAudioConditionSatisfied(c, audioChannels, audioBitrate))
|
if (!conditionProcessor.IsAudioConditionSatisfied(c, inputAudioChannels, inputAudioBitrate))
|
||||||
{
|
{
|
||||||
LogConditionFailure(options.Profile, "AudioCodecProfile", c, item);
|
LogConditionFailure(options.Profile, "AudioCodecProfile", c, item);
|
||||||
all = false;
|
all = false;
|
||||||
|
@ -240,12 +254,26 @@ namespace MediaBrowser.Model.Dlna
|
||||||
|
|
||||||
List<ProfileCondition> audioTranscodingConditions = new List<ProfileCondition>();
|
List<ProfileCondition> audioTranscodingConditions = new List<ProfileCondition>();
|
||||||
foreach (CodecProfile i in audioCodecProfiles)
|
foreach (CodecProfile i in audioCodecProfiles)
|
||||||
|
{
|
||||||
|
bool applyConditions = true;
|
||||||
|
foreach (ProfileCondition applyCondition in i.ApplyConditions)
|
||||||
|
{
|
||||||
|
if (!conditionProcessor.IsAudioConditionSatisfied(applyCondition, inputAudioChannels, inputAudioBitrate))
|
||||||
|
{
|
||||||
|
LogConditionFailure(options.Profile, "AudioCodecProfile", applyCondition, item);
|
||||||
|
applyConditions = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (applyConditions)
|
||||||
{
|
{
|
||||||
foreach (ProfileCondition c in i.Conditions)
|
foreach (ProfileCondition c in i.Conditions)
|
||||||
{
|
{
|
||||||
audioTranscodingConditions.Add(c);
|
audioTranscodingConditions.Add(c);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
ApplyTranscodingConditions(playlistItem, audioTranscodingConditions);
|
ApplyTranscodingConditions(playlistItem, audioTranscodingConditions);
|
||||||
|
|
||||||
|
@ -294,7 +322,7 @@ namespace MediaBrowser.Model.Dlna
|
||||||
if (directPlayProfile != null)
|
if (directPlayProfile != null)
|
||||||
{
|
{
|
||||||
// While options takes the network and other factors into account. Only applies to direct stream
|
// While options takes the network and other factors into account. Only applies to direct stream
|
||||||
if (item.SupportsDirectStream && IsAudioEligibleForDirectPlay(item, options.GetMaxBitrate()))
|
if (item.SupportsDirectStream && IsAudioEligibleForDirectPlay(item, options.GetMaxBitrate()) && options.EnableDirectStream)
|
||||||
{
|
{
|
||||||
playMethods.Add(PlayMethod.DirectStream);
|
playMethods.Add(PlayMethod.DirectStream);
|
||||||
}
|
}
|
||||||
|
@ -302,7 +330,7 @@ namespace MediaBrowser.Model.Dlna
|
||||||
// The profile describes what the device supports
|
// The profile describes what the device supports
|
||||||
// If device requirements are satisfied then allow both direct stream and direct play
|
// If device requirements are satisfied then allow both direct stream and direct play
|
||||||
if (item.SupportsDirectPlay &&
|
if (item.SupportsDirectPlay &&
|
||||||
IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options)))
|
IsAudioEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options)) && options.EnableDirectPlay)
|
||||||
{
|
{
|
||||||
playMethods.Add(PlayMethod.DirectPlay);
|
playMethods.Add(PlayMethod.DirectPlay);
|
||||||
}
|
}
|
||||||
|
@ -385,8 +413,8 @@ namespace MediaBrowser.Model.Dlna
|
||||||
MediaStream videoStream = item.VideoStream;
|
MediaStream videoStream = item.VideoStream;
|
||||||
|
|
||||||
// TODO: This doesn't accout for situation of device being able to handle media bitrate, but wifi connection not fast enough
|
// TODO: This doesn't accout for situation of device being able to handle media bitrate, but wifi connection not fast enough
|
||||||
bool isEligibleForDirectPlay = IsEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options), subtitleStream, options, PlayMethod.DirectPlay);
|
bool isEligibleForDirectPlay = options.EnableDirectPlay && IsEligibleForDirectPlay(item, GetBitrateForDirectPlayCheck(item, options), subtitleStream, options, PlayMethod.DirectPlay);
|
||||||
bool isEligibleForDirectStream = IsEligibleForDirectPlay(item, options.GetMaxBitrate(), subtitleStream, options, PlayMethod.DirectStream);
|
bool isEligibleForDirectStream = options.EnableDirectStream && IsEligibleForDirectPlay(item, options.GetMaxBitrate(), subtitleStream, options, PlayMethod.DirectStream);
|
||||||
|
|
||||||
_logger.Info("Profile: {0}, Path: {1}, isEligibleForDirectPlay: {2}, isEligibleForDirectStream: {3}",
|
_logger.Info("Profile: {0}, Path: {1}, isEligibleForDirectPlay: {2}, isEligibleForDirectStream: {3}",
|
||||||
options.Profile.Name ?? "Unknown Profile",
|
options.Profile.Name ?? "Unknown Profile",
|
||||||
|
@ -463,11 +491,30 @@ namespace MediaBrowser.Model.Dlna
|
||||||
}
|
}
|
||||||
playlistItem.SubProtocol = transcodingProfile.Protocol;
|
playlistItem.SubProtocol = transcodingProfile.Protocol;
|
||||||
playlistItem.AudioStreamIndex = audioStreamIndex;
|
playlistItem.AudioStreamIndex = audioStreamIndex;
|
||||||
|
ConditionProcessor conditionProcessor = new ConditionProcessor();
|
||||||
|
|
||||||
List<ProfileCondition> videoTranscodingConditions = new List<ProfileCondition>();
|
List<ProfileCondition> videoTranscodingConditions = new List<ProfileCondition>();
|
||||||
foreach (CodecProfile i in options.Profile.CodecProfiles)
|
foreach (CodecProfile i in options.Profile.CodecProfiles)
|
||||||
{
|
{
|
||||||
if (i.Type == CodecType.Video && i.ContainsCodec(transcodingProfile.VideoCodec, transcodingProfile.Container))
|
if (i.Type == CodecType.Video && i.ContainsCodec(transcodingProfile.VideoCodec, transcodingProfile.Container))
|
||||||
|
{
|
||||||
|
bool applyConditions = true;
|
||||||
|
foreach (ProfileCondition applyCondition in i.ApplyConditions)
|
||||||
|
{
|
||||||
|
bool? isSecondaryAudio = audioStream == null ? null : item.IsSecondaryAudio(audioStream);
|
||||||
|
int? inputAudioBitrate = audioStream == null ? null : audioStream.BitRate;
|
||||||
|
int? audioChannels = audioStream == null ? null : audioStream.Channels;
|
||||||
|
string audioProfile = audioStream == null ? null : audioStream.Profile;
|
||||||
|
|
||||||
|
if (!conditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, inputAudioBitrate, audioProfile, isSecondaryAudio))
|
||||||
|
{
|
||||||
|
LogConditionFailure(options.Profile, "AudioCodecProfile", applyCondition, item);
|
||||||
|
applyConditions = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (applyConditions)
|
||||||
{
|
{
|
||||||
foreach (ProfileCondition c in i.Conditions)
|
foreach (ProfileCondition c in i.Conditions)
|
||||||
{
|
{
|
||||||
|
@ -476,12 +523,43 @@ namespace MediaBrowser.Model.Dlna
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
ApplyTranscodingConditions(playlistItem, videoTranscodingConditions);
|
ApplyTranscodingConditions(playlistItem, videoTranscodingConditions);
|
||||||
|
|
||||||
List<ProfileCondition> audioTranscodingConditions = new List<ProfileCondition>();
|
List<ProfileCondition> audioTranscodingConditions = new List<ProfileCondition>();
|
||||||
foreach (CodecProfile i in options.Profile.CodecProfiles)
|
foreach (CodecProfile i in options.Profile.CodecProfiles)
|
||||||
{
|
{
|
||||||
if (i.Type == CodecType.VideoAudio && i.ContainsCodec(playlistItem.TargetAudioCodec, transcodingProfile.Container))
|
if (i.Type == CodecType.VideoAudio && i.ContainsCodec(playlistItem.TargetAudioCodec, transcodingProfile.Container))
|
||||||
|
{
|
||||||
|
bool applyConditions = true;
|
||||||
|
foreach (ProfileCondition applyCondition in i.ApplyConditions)
|
||||||
|
{
|
||||||
|
int? width = videoStream == null ? null : videoStream.Width;
|
||||||
|
int? height = videoStream == null ? null : videoStream.Height;
|
||||||
|
int? bitDepth = videoStream == null ? null : videoStream.BitDepth;
|
||||||
|
int? videoBitrate = videoStream == null ? null : videoStream.BitRate;
|
||||||
|
double? videoLevel = videoStream == null ? null : videoStream.Level;
|
||||||
|
string videoProfile = videoStream == null ? null : videoStream.Profile;
|
||||||
|
float? videoFramerate = videoStream == null ? null : videoStream.AverageFrameRate ?? videoStream.AverageFrameRate;
|
||||||
|
bool? isAnamorphic = videoStream == null ? null : videoStream.IsAnamorphic;
|
||||||
|
string videoCodecTag = videoStream == null ? null : videoStream.CodecTag;
|
||||||
|
|
||||||
|
TransportStreamTimestamp? timestamp = videoStream == null ? TransportStreamTimestamp.None : item.Timestamp;
|
||||||
|
int? packetLength = videoStream == null ? null : videoStream.PacketLength;
|
||||||
|
int? refFrames = videoStream == null ? null : videoStream.RefFrames;
|
||||||
|
|
||||||
|
int? numAudioStreams = item.GetStreamCount(MediaStreamType.Audio);
|
||||||
|
int? numVideoStreams = item.GetStreamCount(MediaStreamType.Video);
|
||||||
|
|
||||||
|
if (!conditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, refFrames, numVideoStreams, numAudioStreams, videoCodecTag))
|
||||||
|
{
|
||||||
|
LogConditionFailure(options.Profile, "VideoCodecProfile", applyCondition, item);
|
||||||
|
applyConditions = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (applyConditions)
|
||||||
{
|
{
|
||||||
foreach (ProfileCondition c in i.Conditions)
|
foreach (ProfileCondition c in i.Conditions)
|
||||||
{
|
{
|
||||||
|
@ -490,6 +568,7 @@ namespace MediaBrowser.Model.Dlna
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
ApplyTranscodingConditions(playlistItem, audioTranscodingConditions);
|
ApplyTranscodingConditions(playlistItem, audioTranscodingConditions);
|
||||||
|
|
||||||
// Honor requested max channels
|
// Honor requested max channels
|
||||||
|
@ -665,6 +744,19 @@ namespace MediaBrowser.Model.Dlna
|
||||||
foreach (CodecProfile i in profile.CodecProfiles)
|
foreach (CodecProfile i in profile.CodecProfiles)
|
||||||
{
|
{
|
||||||
if (i.Type == CodecType.Video && i.ContainsCodec(videoCodec, container))
|
if (i.Type == CodecType.Video && i.ContainsCodec(videoCodec, container))
|
||||||
|
{
|
||||||
|
bool applyConditions = true;
|
||||||
|
foreach (ProfileCondition applyCondition in i.ApplyConditions)
|
||||||
|
{
|
||||||
|
if (!conditionProcessor.IsVideoConditionSatisfied(applyCondition, width, height, bitDepth, videoBitrate, videoProfile, videoLevel, videoFramerate, packetLength, timestamp, isAnamorphic, refFrames, numVideoStreams, numAudioStreams, videoCodecTag))
|
||||||
|
{
|
||||||
|
LogConditionFailure(profile, "VideoCodecProfile", applyCondition, mediaSource);
|
||||||
|
applyConditions = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (applyConditions)
|
||||||
{
|
{
|
||||||
foreach (ProfileCondition c in i.Conditions)
|
foreach (ProfileCondition c in i.Conditions)
|
||||||
{
|
{
|
||||||
|
@ -672,6 +764,7 @@ namespace MediaBrowser.Model.Dlna
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
foreach (ProfileCondition i in conditions)
|
foreach (ProfileCondition i in conditions)
|
||||||
{
|
{
|
||||||
|
@ -697,9 +790,24 @@ namespace MediaBrowser.Model.Dlna
|
||||||
}
|
}
|
||||||
|
|
||||||
conditions = new List<ProfileCondition>();
|
conditions = new List<ProfileCondition>();
|
||||||
|
bool? isSecondaryAudio = audioStream == null ? null : mediaSource.IsSecondaryAudio(audioStream);
|
||||||
|
|
||||||
foreach (CodecProfile i in profile.CodecProfiles)
|
foreach (CodecProfile i in profile.CodecProfiles)
|
||||||
{
|
{
|
||||||
if (i.Type == CodecType.VideoAudio && i.ContainsCodec(audioCodec, container))
|
if (i.Type == CodecType.VideoAudio && i.ContainsCodec(audioCodec, container))
|
||||||
|
{
|
||||||
|
bool applyConditions = true;
|
||||||
|
foreach (ProfileCondition applyCondition in i.ApplyConditions)
|
||||||
|
{
|
||||||
|
if (!conditionProcessor.IsVideoAudioConditionSatisfied(applyCondition, audioChannels, audioBitrate, audioProfile, isSecondaryAudio))
|
||||||
|
{
|
||||||
|
LogConditionFailure(profile, "VideoAudioCodecProfile", applyCondition, mediaSource);
|
||||||
|
applyConditions = false;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (applyConditions)
|
||||||
{
|
{
|
||||||
foreach (ProfileCondition c in i.Conditions)
|
foreach (ProfileCondition c in i.Conditions)
|
||||||
{
|
{
|
||||||
|
@ -707,10 +815,10 @@ namespace MediaBrowser.Model.Dlna
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
foreach (ProfileCondition i in conditions)
|
foreach (ProfileCondition i in conditions)
|
||||||
{
|
{
|
||||||
bool? isSecondaryAudio = audioStream == null ? null : mediaSource.IsSecondaryAudio(audioStream);
|
|
||||||
if (!conditionProcessor.IsVideoAudioConditionSatisfied(i, audioChannels, audioBitrate, audioProfile, isSecondaryAudio))
|
if (!conditionProcessor.IsVideoAudioConditionSatisfied(i, audioChannels, audioBitrate, audioProfile, isSecondaryAudio))
|
||||||
{
|
{
|
||||||
LogConditionFailure(profile, "VideoAudioCodecProfile", i, mediaSource);
|
LogConditionFailure(profile, "VideoAudioCodecProfile", i, mediaSource);
|
||||||
|
|
|
@ -111,7 +111,8 @@ namespace MediaBrowser.Providers.TV
|
||||||
Name = seasonName,
|
Name = seasonName,
|
||||||
IndexNumber = seasonNumber,
|
IndexNumber = seasonNumber,
|
||||||
Id = _libraryManager.GetNewItemId((series.Id + (seasonNumber ?? -1).ToString(_usCulture) + seasonName), typeof(Season)),
|
Id = _libraryManager.GetNewItemId((series.Id + (seasonNumber ?? -1).ToString(_usCulture) + seasonName), typeof(Season)),
|
||||||
IsVirtualItem = isVirtualItem
|
IsVirtualItem = isVirtualItem,
|
||||||
|
SeriesId = series.Id
|
||||||
};
|
};
|
||||||
|
|
||||||
season.SetParent(series);
|
season.SetParent(series);
|
||||||
|
|
|
@ -33,6 +33,7 @@ using System.Net;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using CommonIO;
|
using CommonIO;
|
||||||
|
using MediaBrowser.Controller.Channels;
|
||||||
using MediaBrowser.Model.Channels;
|
using MediaBrowser.Model.Channels;
|
||||||
using MediaBrowser.Model.Dto;
|
using MediaBrowser.Model.Dto;
|
||||||
using MediaBrowser.Model.Extensions;
|
using MediaBrowser.Model.Extensions;
|
||||||
|
@ -353,10 +354,6 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
|
|
||||||
private void RegisterItem(Guid id, BaseItem item)
|
private void RegisterItem(Guid id, BaseItem item)
|
||||||
{
|
{
|
||||||
if (item.SourceType != SourceType.Library)
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (item is IItemByName)
|
if (item is IItemByName)
|
||||||
{
|
{
|
||||||
if (!(item is MusicArtist))
|
if (!(item is MusicArtist))
|
||||||
|
@ -364,14 +361,26 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (item.IsFolder)
|
||||||
|
{
|
||||||
|
if (!(item is ICollectionFolder) && !(item is UserView) && !(item is Channel))
|
||||||
|
{
|
||||||
|
if (item.SourceType != SourceType.Library)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return;
|
||||||
if (item is Photo)
|
if (item is Photo)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!(item is Folder))
|
|
||||||
{
|
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LibraryItemsCache.AddOrUpdate(id, item, delegate { return item; });
|
LibraryItemsCache.AddOrUpdate(id, item, delegate { return item; });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -782,19 +791,19 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
|
|
||||||
public BaseItem FindByPath(string path, bool? isFolder)
|
public BaseItem FindByPath(string path, bool? isFolder)
|
||||||
{
|
{
|
||||||
var query = new InternalItemsQuery
|
|
||||||
{
|
|
||||||
Path = path,
|
|
||||||
IsFolder = isFolder
|
|
||||||
};
|
|
||||||
|
|
||||||
// If this returns multiple items it could be tricky figuring out which one is correct.
|
// If this returns multiple items it could be tricky figuring out which one is correct.
|
||||||
// In most cases, the newest one will be and the others obsolete but not yet cleaned up
|
// In most cases, the newest one will be and the others obsolete but not yet cleaned up
|
||||||
|
|
||||||
return GetItemIds(query)
|
var query = new InternalItemsQuery
|
||||||
.Select(GetItemById)
|
{
|
||||||
.Where(i => i != null)
|
Path = path,
|
||||||
.OrderByDescending(i => i.DateCreated)
|
IsFolder = isFolder,
|
||||||
|
SortBy = new[] { ItemSortBy.DateCreated },
|
||||||
|
SortOrder = SortOrder.Descending,
|
||||||
|
Limit = 1
|
||||||
|
};
|
||||||
|
|
||||||
|
return GetItemList(query)
|
||||||
.FirstOrDefault();
|
.FirstOrDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1258,6 +1267,8 @@ namespace MediaBrowser.Server.Implementations.Library
|
||||||
|
|
||||||
item = RetrieveItem(id);
|
item = RetrieveItem(id);
|
||||||
|
|
||||||
|
//_logger.Debug("GetitemById {0}", id);
|
||||||
|
|
||||||
if (item != null)
|
if (item != null)
|
||||||
{
|
{
|
||||||
RegisterItem(item);
|
RegisterItem(item);
|
||||||
|
|
|
@ -30,14 +30,6 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
// If the parent is a Season or Series, then this is an Episode if the VideoResolver returns something
|
|
||||||
// Also handle flat tv folders
|
|
||||||
if (string.Equals(args.GetCollectionType(), CollectionType.TvShows, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
var episode = ResolveVideo<Episode>(args, false);
|
|
||||||
|
|
||||||
if (episode != null)
|
|
||||||
{
|
|
||||||
var season = parent as Season;
|
var season = parent as Season;
|
||||||
// Just in case the user decided to nest episodes.
|
// Just in case the user decided to nest episodes.
|
||||||
// Not officially supported but in some cases we can handle it.
|
// Not officially supported but in some cases we can handle it.
|
||||||
|
@ -46,6 +38,16 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
|
||||||
season = parent.GetParents().OfType<Season>().FirstOrDefault();
|
season = parent.GetParents().OfType<Season>().FirstOrDefault();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If the parent is a Season or Series, then this is an Episode if the VideoResolver returns something
|
||||||
|
// Also handle flat tv folders
|
||||||
|
if (season != null ||
|
||||||
|
string.Equals(args.GetCollectionType(), CollectionType.TvShows, StringComparison.OrdinalIgnoreCase) ||
|
||||||
|
args.HasParent<Series>())
|
||||||
|
{
|
||||||
|
var episode = ResolveVideo<Episode>(args, false);
|
||||||
|
|
||||||
|
if (episode != null)
|
||||||
|
{
|
||||||
var series = parent as Series;
|
var series = parent as Series;
|
||||||
if (series == null)
|
if (series == null)
|
||||||
{
|
{
|
||||||
|
|
|
@ -38,10 +38,12 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
|
||||||
if (args.Parent is Series && args.IsDirectory)
|
if (args.Parent is Series && args.IsDirectory)
|
||||||
{
|
{
|
||||||
var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
|
var namingOptions = ((LibraryManager)_libraryManager).GetNamingOptions();
|
||||||
|
var series = ((Series)args.Parent);
|
||||||
|
|
||||||
var season = new Season
|
var season = new Season
|
||||||
{
|
{
|
||||||
IndexNumber = new SeasonPathParser(namingOptions, new RegexProvider()).Parse(args.Path, true, true).SeasonNumber
|
IndexNumber = new SeasonPathParser(namingOptions, new RegexProvider()).Parse(args.Path, true, true).SeasonNumber,
|
||||||
|
SeriesId = series.Id
|
||||||
};
|
};
|
||||||
|
|
||||||
if (season.IndexNumber.HasValue && season.IndexNumber.Value == 0)
|
if (season.IndexNumber.HasValue && season.IndexNumber.Value == 0)
|
||||||
|
|
Loading…
Reference in New Issue