alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-12 13:22:17 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

sync updates

Browse Source
This commit is contained in:
Luke Pulverenti
2015-03-29 18:38:32 -04:00
parent 66ea0b2566
commit 5474215141
5 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Server.Implementations/Sync/MediaSync.cs
View File

@@ -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))
{

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

@@ -721,7 +721,7 @@ namespace MediaBrowser.Server.Implementations.Sync
var jobItemResult = GetJobItems(new SyncJobItemQuery
{
TargetId = targetId,
Statuses = new SyncJobItemStatus[]
Statuses = new[]
{
SyncJobItemStatus.ReadyToTransfer
}

11
MediaBrowser.Server.Implementations/Sync/SyncedMediaSourceProvider.cs
View File

@@ -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;