michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add SeriesStudioInfo object

Browse Source
This commit is contained in:
Luke Pulverenti 2016-12-08 00:58:38 -05:00
parent 21816ff63e
commit c2da52914c
5 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Emby.Server.Implementations/Dto/DtoService.cs
View File

@ -1351,6 +1351,27 @@ namespace Emby.Server.Implementations.Dto
if (episodeSeries != null)
{
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)
{
}
}
}
}
}

4
Emby.Server.Implementations/Library/LibraryManager.cs
View File

@ -341,13 +341,13 @@ namespace Emby.Server.Implementations.Library
}
if (item is IItemByName)
{
if (!(item is MusicArtist))
if (!(item is MusicArtist) && !(item is Studio))
{
return;
}
}
if (item.IsFolder)
else if (item.IsFolder)
{
//if (!(item is ICollectionFolder) && !(item is UserView) && !(item is Channel) && !(item is AggregateFolder))
//{

12
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -1594,7 +1594,17 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
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)

2
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -396,7 +396,7 @@ namespace MediaBrowser.Api.Playback
param += " -crf 23";
}
param += " -tune zerolatency";
//param += " -tune zerolatency";
}
else if (string.Equals(videoEncoder, "libx265", StringComparison.OrdinalIgnoreCase))

2
MediaBrowser.Model/Dto/BaseItemDto.cs
View File

@ -729,6 +729,8 @@ namespace MediaBrowser.Model.Dto
/// <value>The series studio.</value>
public string SeriesStudio { get; set; }
public StudioDto SeriesStudioInfo { get; set; }
/// <summary>
/// Gets or sets the parent thumb item id.
/// </summary>