diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-08 00:58:38 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-12-08 00:58:38 -0500 |
| commit | c2da52914c3b5cabcb2cf153a4d5940e46e68387 (patch) | |
| tree | 93a6830ae087e840249d9ac305a06110bc419100 /Emby.Server.Implementations | |
| parent | 21816ff63e90e0b77c6be73d96dba886c6d542c6 (diff) | |
add SeriesStudioInfo object
Diffstat (limited to 'Emby.Server.Implementations')
| -rw-r--r-- | Emby.Server.Implementations/Dto/DtoService.cs | 21 | ||||
| -rw-r--r-- | Emby.Server.Implementations/Library/LibraryManager.cs | 4 | ||||
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs | 12 |
3 files changed, 34 insertions, 3 deletions
diff --git a/Emby.Server.Implementations/Dto/DtoService.cs b/Emby.Server.Implementations/Dto/DtoService.cs index 438fc55d7..2b2c3e000 100644 --- a/Emby.Server.Implementations/Dto/DtoService.cs +++ b/Emby.Server.Implementations/Dto/DtoService.cs @@ -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) + { + + } + } } } } diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs index d96756ce1..3db8c7213 100644 --- a/Emby.Server.Implementations/Library/LibraryManager.cs +++ b/Emby.Server.Implementations/Library/LibraryManager.cs @@ -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)) //{ diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs index 4e5b8d34f..4e2b3f661 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs @@ -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) |