diff options
Diffstat (limited to 'MediaBrowser.Server.Implementations/Sync')
3 files changed, 13 insertions, 8 deletions
diff --git a/MediaBrowser.Server.Implementations/Sync/MediaSync.cs b/MediaBrowser.Server.Implementations/Sync/MediaSync.cs index dd8ce82ef1..620143f175 100644 --- a/MediaBrowser.Server.Implementations/Sync/MediaSync.cs +++ b/MediaBrowser.Server.Implementations/Sync/MediaSync.cs @@ -371,7 +371,7 @@ namespace MediaBrowser.Server.Implementations.Sync if (item.IsType("episode")) { - parts.Add("TV"); + //parts.Add("TV"); if (!string.IsNullOrWhiteSpace(item.SeriesName)) { parts.Add(item.SeriesName); @@ -379,12 +379,12 @@ namespace MediaBrowser.Server.Implementations.Sync } else if (item.IsVideo) { - parts.Add("Videos"); + //parts.Add("Videos"); parts.Add(item.Name); } else if (item.IsAudio) { - parts.Add("Music"); + //parts.Add("Music"); if (!string.IsNullOrWhiteSpace(item.AlbumArtist)) { @@ -398,7 +398,7 @@ namespace MediaBrowser.Server.Implementations.Sync } else if (string.Equals(item.MediaType, MediaType.Photo, StringComparison.OrdinalIgnoreCase)) { - parts.Add("Photos"); + //parts.Add("Photos"); if (!string.IsNullOrWhiteSpace(item.Album)) { diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs index 2cf6c68539..d1ebbd28e3 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs @@ -721,7 +721,7 @@ namespace MediaBrowser.Server.Implementations.Sync var jobItemResult = GetJobItems(new SyncJobItemQuery { TargetId = targetId, - Statuses = new SyncJobItemStatus[] + Statuses = new[] { SyncJobItemStatus.ReadyToTransfer } diff --git a/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs b/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs index 1c17b99936..d1ef523e14 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs @@ -92,6 +92,8 @@ namespace MediaBrowser.Server.Implementations.Sync keyList.Add(item.Id); mediaSource.OpenToken = string.Join("|", keyList.ToArray()); } + + list.Add(mediaSource); } public async Task<MediaSourceInfo> OpenMediaSource(string openToken, CancellationToken cancellationToken) @@ -111,13 +113,16 @@ namespace MediaBrowser.Server.Implementations.Sync var dynamicInfo = await requiresDynamicAccess.GetSyncedFileInfo(localItem.LocalPath, target, cancellationToken).ConfigureAwait(false); var mediaSource = localItem.Item.MediaSources.First(); + mediaSource.LiveStreamId = Guid.NewGuid().ToString(); SetStaticMediaSourceInfo(localItem, mediaSource); foreach (var stream in mediaSource.MediaStreams) { - var dynamicStreamInfo = await requiresDynamicAccess.GetSyncedFileInfo(stream.ExternalId, target, cancellationToken).ConfigureAwait(false); - - stream.Path = dynamicStreamInfo.Path; + if (!string.IsNullOrWhiteSpace(stream.ExternalId)) + { + var dynamicStreamInfo = await requiresDynamicAccess.GetSyncedFileInfo(stream.ExternalId, target, cancellationToken).ConfigureAwait(false); + stream.Path = dynamicStreamInfo.Path; + } } mediaSource.Path = dynamicInfo.Path; |