From cfb7e50720e037048b24aeacb65371356524216b Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Wed, 11 Feb 2015 11:19:16 -0500 Subject: [PATCH] 3.0.5518.3 --- MediaBrowser.Server.Implementations/Dto/DtoService.cs | 2 ++ .../Sync/SyncManager.cs | 10 ++++++++-- SharedVersion.cs | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/MediaBrowser.Server.Implementations/Dto/DtoService.cs b/MediaBrowser.Server.Implementations/Dto/DtoService.cs index 75bddda723..9e75591fb4 100644 --- a/MediaBrowser.Server.Implementations/Dto/DtoService.cs +++ b/MediaBrowser.Server.Implementations/Dto/DtoService.cs @@ -128,6 +128,7 @@ namespace MediaBrowser.Server.Implementations.Dto SetItemByNameInfo(item, dto, libraryItems.ToList(), user); + FillSyncInfo(dto, item, options); return dto; } @@ -307,6 +308,7 @@ namespace MediaBrowser.Server.Implementations.Dto var dto = GetBaseItemDtoInternal(item, options, user); SetItemByNameInfo(item, dto, taggedItems, user); + FillSyncInfo(dto, item, options); return dto; } diff --git a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs index 098e2b0959..78821f950b 100644 --- a/MediaBrowser.Server.Implementations/Sync/SyncManager.cs +++ b/MediaBrowser.Server.Implementations/Sync/SyncManager.cs @@ -12,6 +12,7 @@ using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.LiveTv; using MediaBrowser.Controller.MediaEncoding; +using MediaBrowser.Controller.Playlists; using MediaBrowser.Controller.Sync; using MediaBrowser.Controller.TV; using MediaBrowser.Model.Dlna; @@ -207,7 +208,7 @@ namespace MediaBrowser.Server.Implementations.Sync internal async Task UpdateSyncJobItemInternal(SyncJobItem jobItem) { await _repo.Update(jobItem).ConfigureAwait(false); - + if (SyncJobUpdated != null) { EventHelper.FireEventIfNotNull(SyncJobItemUpdated, this, new GenericEventArgs @@ -433,6 +434,11 @@ namespace MediaBrowser.Server.Implementations.Sync public bool SupportsSync(BaseItem item) { + if (item is Playlist) + { + return true; + } + if (string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase) || string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase) || string.Equals(item.MediaType, MediaType.Photo, StringComparison.OrdinalIgnoreCase) || @@ -461,7 +467,7 @@ namespace MediaBrowser.Server.Implementations.Sync { return false; } - + if (video.IsPlaceHolder) { return false; diff --git a/SharedVersion.cs b/SharedVersion.cs index 658aa62a7e..11e0a10cfc 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; //[assembly: AssemblyVersion("3.0.*")] -[assembly: AssemblyVersion("3.0.5518.2")] +[assembly: AssemblyVersion("3.0.5518.3")]