aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2016-03-23 23:52:04 -0400
committerLuke <luke.pulverenti@gmail.com>2016-03-23 23:52:04 -0400
commitea2ec2c854bb957101cd812265218cca1a7dcef7 (patch)
tree81a6df086dbbe26768295522ba7cfcc736614dab /MediaBrowser.Server.Implementations
parent22087329ad67b8ca6c56d128efa5ecd446bdfd7e (diff)
parent32b5ef7b802237db03af3bb17f21b1efc579a7cd (diff)
Merge pull request #1579 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations')
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs6
-rw-r--r--MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs4
2 files changed, 9 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
index 7e55d77d7..75186c1e1 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
@@ -314,6 +314,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
{
}
+ catch (Exception ex)
+ {
+ _logger.ErrorException("Error deleting recording file {0}", ex, remove.Path);
+ }
}
_recordingProvider.Delete(remove);
}
@@ -525,7 +529,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV
}
_logger.Debug("Getting programs for channel {0}-{1} from {2}-{3}", channel.Number, channel.Name, provider.Item1.Name, provider.Item2.ListingsId ?? string.Empty);
-
+
var programs = await provider.Item1.GetProgramsAsync(provider.Item2, channel.Number, channel.Name, startDateUtc, endDateUtc, cancellationToken)
.ConfigureAwait(false);
diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
index 6c00d61f2..08b0256b2 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -1845,6 +1845,10 @@ namespace MediaBrowser.Server.Implementations.LiveTv
var dto = tuple.Item1;
var channel = tuple.Item2;
+ dto.Number = channel.Number;
+ dto.ChannelType = channel.ChannelType;
+ dto.ServiceName = GetService(channel).Name;
+
dto.MediaSources = channel.GetMediaSources(true).ToList();
var channelIdString = channel.Id.ToString("N");