add SeriesStudioInfo object
This commit is contained in:
parent
21816ff63e
commit
c2da52914c
|
@ -1351,6 +1351,27 @@ namespace Emby.Server.Implementations.Dto
|
||||||
if (episodeSeries != null)
|
if (episodeSeries != null)
|
||||||
{
|
{
|
||||||
dto.SeriesStudio = episodeSeries.Studios.FirstOrDefault();
|
dto.SeriesStudio = episodeSeries.Studios.FirstOrDefault();
|
||||||
|
if (!string.IsNullOrWhiteSpace(dto.SeriesStudio))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var studio = _libraryManager.GetStudio(dto.SeriesStudio);
|
||||||
|
|
||||||
|
if (studio != null)
|
||||||
|
{
|
||||||
|
dto.SeriesStudioInfo = new StudioDto
|
||||||
|
{
|
||||||
|
Name = dto.SeriesStudio,
|
||||||
|
Id = studio.Id.ToString("N"),
|
||||||
|
PrimaryImageTag = GetImageCacheTag(studio, ImageType.Primary)
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -341,13 +341,13 @@ namespace Emby.Server.Implementations.Library
|
||||||
}
|
}
|
||||||
if (item is IItemByName)
|
if (item is IItemByName)
|
||||||
{
|
{
|
||||||
if (!(item is MusicArtist))
|
if (!(item is MusicArtist) && !(item is Studio))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.IsFolder)
|
else if (item.IsFolder)
|
||||||
{
|
{
|
||||||
//if (!(item is ICollectionFolder) && !(item is UserView) && !(item is Channel) && !(item is AggregateFolder))
|
//if (!(item is ICollectionFolder) && !(item is UserView) && !(item is Channel) && !(item is AggregateFolder))
|
||||||
//{
|
//{
|
||||||
|
|
|
@ -1594,7 +1594,17 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
|
||||||
|
|
||||||
private void Process_Exited(object sender, EventArgs e)
|
private void Process_Exited(object sender, EventArgs e)
|
||||||
{
|
{
|
||||||
((IProcess)sender).Dispose();
|
var process = (IProcess)sender;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
_logger.Info("Recording post-processing script completed with exit code {0}", process.ExitCode);
|
||||||
|
}
|
||||||
|
catch
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
process.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task SaveRecordingImage(string recordingPath, LiveTvProgram program, ItemImageInfo image)
|
private async Task SaveRecordingImage(string recordingPath, LiveTvProgram program, ItemImageInfo image)
|
||||||
|
|
|
@ -396,7 +396,7 @@ namespace MediaBrowser.Api.Playback
|
||||||
param += " -crf 23";
|
param += " -crf 23";
|
||||||
}
|
}
|
||||||
|
|
||||||
param += " -tune zerolatency";
|
//param += " -tune zerolatency";
|
||||||
}
|
}
|
||||||
|
|
||||||
else if (string.Equals(videoEncoder, "libx265", StringComparison.OrdinalIgnoreCase))
|
else if (string.Equals(videoEncoder, "libx265", StringComparison.OrdinalIgnoreCase))
|
||||||
|
|
|
@ -729,6 +729,8 @@ namespace MediaBrowser.Model.Dto
|
||||||
/// <value>The series studio.</value>
|
/// <value>The series studio.</value>
|
||||||
public string SeriesStudio { get; set; }
|
public string SeriesStudio { get; set; }
|
||||||
|
|
||||||
|
public StudioDto SeriesStudioInfo { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets the parent thumb item id.
|
/// Gets or sets the parent thumb item id.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user