live tv fix

MediaBrowser · Mar 31, 2015 · fd590cb · fd590cb
1 parent 370d9d7
commit fd590cb
Show file tree

Hide file tree

Showing 20 changed files with 207 additions and 66 deletions.
diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs
@@ -39,29 +39,6 @@ public class GetPlaybackInfo : IReturn<PlaybackInfoResponse>
     [Route("/Items/{Id}/PlaybackInfo", "POST", Summary = "Gets live playback media info for an item")]
     public class GetPostedPlaybackInfo : PlaybackInfoRequest, IReturn<PlaybackInfoResponse>
     {
-        [ApiMember(Name = "Id", Description = "Item Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string Id { get; set; }
-
-        [ApiMember(Name = "UserId", Description = "User Id", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
-        public string UserId { get; set; }
-
-        [ApiMember(Name = "MaxStreamingBitrate", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "POST")]
-        public int? MaxStreamingBitrate { get; set; }
-
-        [ApiMember(Name = "StartTimeTicks", Description = "Optional. Specify a starting offset, in ticks. 1 tick = 10000 ms", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "POST")]
-        public long? StartTimeTicks { get; set; }
-
-        [ApiMember(Name = "AudioStreamIndex", Description = "Optional. The index of the audio stream to use. If omitted the first audio stream will be used.", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "POST")]
-        public int? AudioStreamIndex { get; set; }
-
-        [ApiMember(Name = "SubtitleStreamIndex", Description = "Optional. The index of the subtitle stream to use. If omitted no subtitles will be used.", IsRequired = false, DataType = "int", ParameterType = "query", Verb = "POST")]
-        public int? SubtitleStreamIndex { get; set; }
-
-        [ApiMember(Name = "MediaSourceId", Description = "The media version id, if playing an alternate version", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string MediaSourceId { get; set; }
-
-        [ApiMember(Name = "LiveStreamId", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
-        public string LiveStreamId { get; set; }
     }
 
     [Route("/LiveStreams/Open", "POST", Summary = "Opens a media source")]

diff --git a/MediaBrowser.Api/Playback/TranscodingThrottler.cs b/MediaBrowser.Api/Playback/TranscodingThrottler.cs
@@ -42,7 +42,7 @@ private void TimerCallback(object state)
 
             var options = GetOptions();
 
-            if (/*options.EnableThrottling &&*/ IsThrottleAllowed(_job, options.ThrottleThresholdSeconds))
+            if (options.EnableThrottling && IsThrottleAllowed(_job, options.ThrottleThresholdSeconds))
             {
                 PauseTranscoding();
             }

diff --git a/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs b/MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs
@@ -107,30 +107,40 @@ private HttpClientInfo GetHttpClient(string host, bool enableHttpCompression)
 
         private WebRequest GetRequest(HttpRequestOptions options, string method, bool enableHttpCompression)
         {
-            var request = (HttpWebRequest)WebRequest.Create(options.Url);
+            var request = WebRequest.Create(options.Url);
+            var httpWebRequest = request as HttpWebRequest;
 
-            AddRequestHeaders(request, options);
+            if (httpWebRequest != null)
+            {
+                AddRequestHeaders(httpWebRequest, options);
 
-            request.AutomaticDecompression = enableHttpCompression ? DecompressionMethods.Deflate : DecompressionMethods.None;
+                httpWebRequest.AutomaticDecompression = enableHttpCompression ? DecompressionMethods.Deflate : DecompressionMethods.None;
+            }
 
             request.CachePolicy = new RequestCachePolicy(RequestCacheLevel.BypassCache);
 
-            if (options.EnableKeepAlive)
+            if (httpWebRequest != null)
             {
-                request.KeepAlive = true;
+                if (options.EnableKeepAlive)
+                {
+                    httpWebRequest.KeepAlive = true;
+                }
             }
 
             request.Method = method;
             request.Timeout = options.TimeoutMs;
 
-            if (!string.IsNullOrEmpty(options.Host))
+            if (httpWebRequest != null)
             {
-                request.Host = options.Host;
-            }
+                if (!string.IsNullOrEmpty(options.Host))
+                {
+                    httpWebRequest.Host = options.Host;
+                }
 
-            if (!string.IsNullOrEmpty(options.Referer))
-            {
-                request.Referer = options.Referer;
+                if (!string.IsNullOrEmpty(options.Referer))
+                {
+                    httpWebRequest.Referer = options.Referer;
+                }
             }
 
             //request.ServicePoint.BindIPEndPointDelegate = BindIPEndPointCallback;

diff --git a/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs b/MediaBrowser.Controller/LiveTv/LiveTvProgram.cs
@@ -34,6 +34,12 @@ protected override string CreateUserDataKey()
         /// <value>The channel identifier.</value>
         public string ExternalChannelId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the original air date.
+        /// </summary>
+        /// <value>The original air date.</value>
+        public DateTime? OriginalAirDate { get; set; }
+
         /// <summary>
         /// Gets or sets the type of the channel.
         /// </summary>

diff --git a/MediaBrowser.Controller/Sync/ISyncDataProvider.cs b/MediaBrowser.Controller/Sync/ISyncDataProvider.cs
@@ -14,6 +14,14 @@ public interface ISyncDataProvider
         /// <returns>Task&lt;List&lt;System.String&gt;&gt;.</returns>
         Task<List<string>> GetServerItemIds(SyncTarget target, string serverId);
 
+        /// <summary>
+        /// Gets the synchronize job item ids.
+        /// </summary>
+        /// <param name="target">The target.</param>
+        /// <param name="serverId">The server identifier.</param>
+        /// <returns>Task&lt;List&lt;System.String&gt;&gt;.</returns>
+        Task<List<string>> GetSyncJobItemIds(SyncTarget target, string serverId);
+
         /// <summary>
         /// Adds the or update.
         /// </summary>
@@ -46,5 +54,13 @@ public interface ISyncDataProvider
         /// <param name="itemId">The item identifier.</param>
         /// <returns>Task&lt;LocalItem&gt;.</returns>
         Task<List<LocalItem>> GetCachedItems(SyncTarget target, string serverId, string itemId);
+        /// <summary>
+        /// Gets the cached items by synchronize job item identifier.
+        /// </summary>
+        /// <param name="target">The target.</param>
+        /// <param name="serverId">The server identifier.</param>
+        /// <param name="syncJobItemId">The synchronize job item identifier.</param>
+        /// <returns>Task&lt;List&lt;LocalItem&gt;&gt;.</returns>
+        Task<List<LocalItem>> GetCachedItemsBySyncJobItemId(SyncTarget target, string serverId, string syncJobItemId);
     }
 }
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -248,10 +248,9 @@ Task<T> GetAsync<T>(string url, CancellationToken cancellationToken = default(Ca
         /// <summary>
         /// Gets the playback information.
         /// </summary>
-        /// <param name="itemId">The item identifier.</param>
-        /// <param name="userId">The user identifier.</param>
+        /// <param name="request">The request.</param>
         /// <returns>Task&lt;LiveMediaInfoResult&gt;.</returns>
-        Task<PlaybackInfoResponse> GetPlaybackInfo(string itemId, string userId);
+        Task<PlaybackInfoResponse> GetPlaybackInfo(PlaybackInfoRequest request);
 
         /// <summary>
         /// Gets the users async.

diff --git a/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs b/MediaBrowser.Model/MediaInfo/PlaybackInfoRequest.cs
@@ -4,6 +4,22 @@ namespace MediaBrowser.Model.MediaInfo
 {
     public class PlaybackInfoRequest
     {
+        public string Id { get; set; }
+
+        public string UserId { get; set; }
+
+        public int? MaxStreamingBitrate { get; set; }
+
+        public long? StartTimeTicks { get; set; }
+
+        public int? AudioStreamIndex { get; set; }
+
+        public int? SubtitleStreamIndex { get; set; }
+
+        public string MediaSourceId { get; set; }
+
+        public string LiveStreamId { get; set; }
+
         public DeviceProfile DeviceProfile { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/Sync/LocalItem.cs b/MediaBrowser.Model/Sync/LocalItem.cs
@@ -31,6 +31,11 @@ public class LocalItem
         /// <value>The item identifier.</value>
         public string ItemId { get; set; }
         /// <summary>
+        /// Gets or sets the synchronize job item identifier.
+        /// </summary>
+        /// <value>The synchronize job item identifier.</value>
+        public string SyncJobItemId { get; set; }
+        /// <summary>
         /// Gets or sets the user ids with access.
         /// </summary>
         /// <value>The user ids with access.</value>

diff --git a/MediaBrowser.Model/Sync/SyncDataRequest.cs b/MediaBrowser.Model/Sync/SyncDataRequest.cs
@@ -6,6 +6,7 @@ public class SyncDataRequest
     {
         public List<string> LocalItemIds { get; set; }
         public List<string> OfflineUserIds { get; set; }
+        public List<string> SyncJobItemIds { get; set; }
 
         public string TargetId { get; set; }
 

diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/Channels/ChannelImageProvider.cs
@@ -2,7 +2,6 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;

diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -129,6 +129,11 @@ private IEnumerable<MediaStream> GetMediaStreamsForItem(IEnumerable<MediaStream>
             return list;
         }
 
+        public Task<IEnumerable<MediaSourceInfo>> GetPlayackMediaSources(string id, bool enablePathSubstitution, CancellationToken cancellationToken)
+        {
+            return GetPlayackMediaSources(id, null, enablePathSubstitution, cancellationToken);
+        }
+
         public async Task<IEnumerable<MediaSourceInfo>> GetPlayackMediaSources(string id, string userId, bool enablePathSubstitution, CancellationToken cancellationToken)
         {
             var item = _libraryManager.GetItemById(id);
@@ -225,11 +230,6 @@ private void SetKeyProperties(IMediaSourceProvider provider, MediaSourceInfo med
             }
         }
 
-        public Task<IEnumerable<MediaSourceInfo>> GetPlayackMediaSources(string id, bool enablePathSubstitution, CancellationToken cancellationToken)
-        {
-            return GetPlayackMediaSources(id, null, enablePathSubstitution, cancellationToken);
-        }
-
         public MediaSourceInfo GetStaticMediaSource(IHasMediaSources item, string mediaSourceId, bool enablePathSubstitution)
         {
             return GetStaticMediaSources(item, enablePathSubstitution).FirstOrDefault(i => string.Equals(i.Id, mediaSourceId, StringComparison.OrdinalIgnoreCase));

diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvDtoService.cs
@@ -373,7 +373,7 @@ public ProgramInfoDto GetProgramInfoDto(LiveTvProgram item, LiveTvChannel channe
                 StartDate = item.StartDate,
                 OfficialRating = item.OfficialRating,
                 IsHD = item.IsHD,
-                OriginalAirDate = item.PremiereDate,
+                OriginalAirDate = item.OriginalAirDate,
                 Audio = item.Audio,
                 CommunityRating = GetClientCommunityRating(item.CommunityRating),
                 IsRepeat = item.IsRepeat,

diff --git a/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs b/MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -589,13 +589,15 @@ private async Task<LiveTvProgram> GetProgram(ProgramInfo info, ChannelType chann
             item.Name = info.Name;
             item.OfficialRating = info.OfficialRating;
             item.Overview = info.Overview;
-            item.PremiereDate = info.OriginalAirDate;
+            item.OriginalAirDate = info.OriginalAirDate;
             item.ProviderImagePath = info.ImagePath;
             item.ProviderImageUrl = info.ImageUrl;
             item.RunTimeTicks = (info.EndDate - info.StartDate).Ticks;
             item.StartDate = info.StartDate;
-            item.ProductionYear = info.ProductionYear;
 
+            item.ProductionYear = info.ProductionYear;
+            item.PremiereDate = item.PremiereDate ?? info.OriginalAirDate;
+
             await item.UpdateToRepository(ItemUpdateType.MetadataImport, cancellationToken).ConfigureAwait(false);
 
             return item;

diff --git a/MediaBrowser.Server.Implementations/Sync/MediaSync.cs b/MediaBrowser.Server.Implementations/Sync/MediaSync.cs
@@ -67,12 +67,12 @@ public MediaSync(ILogger logger, ISyncManager syncManager, IServerApplicationHos
             SyncTarget target,
             CancellationToken cancellationToken)
         {
-            var localIds = await dataProvider.GetServerItemIds(target, serverId).ConfigureAwait(false);
+            var jobItemIds = await dataProvider.GetSyncJobItemIds(target, serverId).ConfigureAwait(false);
 
             var result = await _syncManager.SyncData(new SyncDataRequest
             {
                 TargetId = target.Id,
-                LocalItemIds = localIds
+                SyncJobItemIds = jobItemIds
 
             }).ConfigureAwait(false);
 
@@ -285,11 +285,11 @@ private string GetSubtitleSaveFileName(LocalItem item, string language, bool isF
         private async Task RemoveItem(IServerSyncProvider provider,
             ISyncDataProvider dataProvider,
             string serverId,
-            string itemId,
+            string syncJobItemId,
             SyncTarget target,
             CancellationToken cancellationToken)
         {
-            var localItems = await dataProvider.GetCachedItems(target, serverId, itemId);
+            var localItems = await dataProvider.GetCachedItemsBySyncJobItemId(target, serverId, syncJobItemId);
 
             foreach (var localItem in localItems)
             {
@@ -350,7 +350,8 @@ public LocalItem CreateLocalItem(IServerSyncProvider provider, SyncedItem synced
                 ItemId = libraryItem.Id,
                 ServerId = serverId,
                 LocalPath = localPath,
-                Id = GetLocalId(syncedItem.SyncJobItemId, libraryItem.Id)
+                Id = GetLocalId(syncedItem.SyncJobItemId, libraryItem.Id),
+                SyncJobItemId = syncedItem.SyncJobItemId
             };
         }