lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2369 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-12-28 14:42:52 -05:00 committed by GitHub
commit bda4afeede
4 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Emby.Server.Implementations/Sync/SyncManager.cs
View File

@ -1030,6 +1030,18 @@ namespace Emby.Server.Implementations.Sync
{
await CancelJobItem(jobItem.Id).ConfigureAwait(false);
}
var syncJobResult = await GetJobs(new SyncJobQuery
{
ItemId = item,
TargetId = targetId
}).ConfigureAwait(false);
foreach (var job in syncJobResult.Items)
{
await CancelJob(job.Id).ConfigureAwait(false);
}
}
}

5
Emby.Server.Implementations/Sync/SyncRepository.cs
View File

@ -360,6 +360,11 @@ namespace Emby.Server.Implementations.Sync
whereClauses.Add("UserId=?");
paramList.Add(query.UserId);
}
if (!string.IsNullOrWhiteSpace(query.ItemId))
{
whereClauses.Add("ItemIds like ?");
paramList.Add("%" + query.ItemId + "%");
}
if (query.SyncNewContent.HasValue)
{
whereClauses.Add("SyncNewContent=?");

18
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@ -1967,10 +1967,15 @@ namespace MediaBrowser.Api.Playback
state.OutputVideoCodec = state.VideoRequest.VideoCodec;
state.OutputVideoBitrate = GetVideoBitrateParamValue(state.VideoRequest, state.VideoStream, state.OutputVideoCodec);
if (state.OutputVideoBitrate.HasValue)
if (videoRequest != null)
{
TryStreamCopy(state, videoRequest);
}
if (state.OutputVideoBitrate.HasValue && !string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase))
{
var resolution = ResolutionNormalizer.Normalize(
state.VideoStream == null ? (int?)null : state.VideoStream.BitRate,
state.VideoStream == null ? (int?) null : state.VideoStream.BitRate,
state.OutputVideoBitrate.Value,
state.VideoStream == null ? null : state.VideoStream.Codec,
state.OutputVideoCodec,
@ -1980,13 +1985,12 @@ namespace MediaBrowser.Api.Playback
videoRequest.MaxWidth = resolution.MaxWidth;
videoRequest.MaxHeight = resolution.MaxHeight;
}
ApplyDeviceProfileSettings(state);
}
ApplyDeviceProfileSettings(state);
if (videoRequest != null)
else
{
TryStreamCopy(state, videoRequest);
ApplyDeviceProfileSettings(state);
}
state.OutputFilePath = GetOutputFilePath(state);

1
MediaBrowser.Model/Sync/SyncJobQuery.cs
View File

@ -24,6 +24,7 @@ namespace MediaBrowser.Model.Sync
/// <value>The user identifier.</value>
public string UserId { get; set; }
public string ExcludeTargetIds { get; set; }
public string ItemId { get; set; }
/// <summary>
/// Gets or sets the status.
/// </summary>