michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

3.0.5518.3

Browse Source
This commit is contained in:
Luke Pulverenti 2015-02-11 11:19:16 -05:00
parent 94f534b3c6
commit cfb7e50720
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@ -128,6 +128,7 @@ namespace MediaBrowser.Server.Implementations.Dto
SetItemByNameInfo(item, dto, libraryItems.ToList(), user); SetItemByNameInfo(item, dto, libraryItems.ToList(), user);
FillSyncInfo(dto, item, options);
return dto; return dto;
} }
@ -307,6 +308,7 @@ namespace MediaBrowser.Server.Implementations.Dto
var dto = GetBaseItemDtoInternal(item, options, user); var dto = GetBaseItemDtoInternal(item, options, user);
SetItemByNameInfo(item, dto, taggedItems, user); SetItemByNameInfo(item, dto, taggedItems, user);
FillSyncInfo(dto, item, options);
return dto; return dto;
} }

10
MediaBrowser.Server.Implementations/Sync/SyncManager.cs
View File

@ -12,6 +12,7 @@ using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.LiveTv; using MediaBrowser.Controller.LiveTv;
using MediaBrowser.Controller.MediaEncoding; using MediaBrowser.Controller.MediaEncoding;
using MediaBrowser.Controller.Playlists;
using MediaBrowser.Controller.Sync; using MediaBrowser.Controller.Sync;
using MediaBrowser.Controller.TV; using MediaBrowser.Controller.TV;
using MediaBrowser.Model.Dlna; using MediaBrowser.Model.Dlna;
@ -207,7 +208,7 @@ namespace MediaBrowser.Server.Implementations.Sync
internal async Task UpdateSyncJobItemInternal(SyncJobItem jobItem) internal async Task UpdateSyncJobItemInternal(SyncJobItem jobItem)
{ {
await _repo.Update(jobItem).ConfigureAwait(false); await _repo.Update(jobItem).ConfigureAwait(false);
if (SyncJobUpdated != null) if (SyncJobUpdated != null)
{ {
EventHelper.FireEventIfNotNull(SyncJobItemUpdated, this, new GenericEventArgs<SyncJobItem> EventHelper.FireEventIfNotNull(SyncJobItemUpdated, this, new GenericEventArgs<SyncJobItem>
@ -433,6 +434,11 @@ namespace MediaBrowser.Server.Implementations.Sync
public bool SupportsSync(BaseItem item) public bool SupportsSync(BaseItem item)
{ {
if (item is Playlist)
{
return true;
}
if (string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase) || if (string.Equals(item.MediaType, MediaType.Video, StringComparison.OrdinalIgnoreCase) ||
string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase) || string.Equals(item.MediaType, MediaType.Audio, StringComparison.OrdinalIgnoreCase) ||
string.Equals(item.MediaType, MediaType.Photo, StringComparison.OrdinalIgnoreCase) || string.Equals(item.MediaType, MediaType.Photo, StringComparison.OrdinalIgnoreCase) ||
@ -461,7 +467,7 @@ namespace MediaBrowser.Server.Implementations.Sync
{ {
return false; return false;
} }
if (video.IsPlaceHolder) if (video.IsPlaceHolder)
{ {
return false; return false;

2
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5518.2")] [assembly: AssemblyVersion("3.0.5518.3")]