Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-03 20:33:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

update polymer components

Browse source
This commit is contained in:
Luke Pulverenti 2015-10-29 19:23:43 -04:00
parent f66c6f2c75
commit 50f6ee1039
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
MediaBrowser.Server.Implementations/LiveTv/LiveTvManager.cs
View file

@ -666,7 +666,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
{
item.SetImagePath(ImageType.Primary, info.ImageUrl);
}
if (isNew)
{
await _libraryManager.CreateItem(item, cancellationToken).ConfigureAwait(false);
@ -831,7 +831,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
public async Task<QueryResult<BaseItemDto>> GetPrograms(ProgramQuery query, DtoOptions options, CancellationToken cancellationToken)
{
var user = string.IsNullOrEmpty(query.UserId) ? null : _userManager.GetUserById(query.UserId);
var internalQuery = new InternalItemsQuery(user)
{
IncludeItemTypes = new[] { typeof(LiveTvProgram).Name },
@ -890,7 +890,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
public async Task<QueryResult<LiveTvProgram>> GetRecommendedProgramsInternal(RecommendedProgramQuery query, CancellationToken cancellationToken)
{
var user = _userManager.GetUserById(query.UserId);
var internalQuery = new InternalItemsQuery(user)
{
IncludeItemTypes = new[] { typeof(LiveTvProgram).Name },
@ -1378,7 +1378,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
internalQuery.ChannelIds = new[] { query.ChannelId };
}
var queryResult = _libraryManager.GetItems(internalQuery, user, new string[]{});
var queryResult = _libraryManager.GetItems(internalQuery, user, new string[] { });
IEnumerable<ILiveTvRecording> recordings = queryResult.Cast<ILiveTvRecording>();
if (!string.IsNullOrEmpty(query.Id))
@ -1783,9 +1783,9 @@ namespace MediaBrowser.Server.Implementations.LiveTv
MaxStartDate = now,
MinEndDate = now,
Limit = 1,
SortBy = new[] { "StartDate"}
SortBy = new[] { "StartDate" }
}, user, new string[]{}).Cast<LiveTvProgram>();
}, user, new string[] { }).Cast<LiveTvProgram>();
var currentProgram = programs.FirstOrDefault();
@ -1809,7 +1809,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
Limit = 1,
SortBy = new[] { "StartDate" }
}, user, new string []{}).Cast<LiveTvProgram>();
}, user, new string[] { }).Cast<LiveTvProgram>();
var currentProgram = programs.FirstOrDefault();

4
MediaBrowser.sln
View file

@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
Performance2.psess = Performance2.psess
Performance3.psess = Performance3.psess
Performance4.psess = Performance4.psess
Performance5.psess = Performance5.psess
EndProjectSection
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget (2)", ".nuget (2)", "{E60FB157-87E2-4A41-8B04-27EA49B63B4D}"
@ -543,4 +544,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal