Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-11 08:10:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into mediaencoding

Browse source
This commit is contained in:
Bond-009 2019-12-12 16:34:34 +01:00
parent 0bf8bfbb0c 96a5dda9ff
commit baadb504bb
5 changed files with 20 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Emby.Server.Implementations/Updates/InstallationManager.cs
View file

@ -141,8 +141,7 @@ namespace Emby.Server.Implementations.Updates
if (guid != Guid.Empty) if (guid != Guid.Empty)
{ {
var strGuid = guid.ToString("N", CultureInfo.InvariantCulture); availablePackages = availablePackages.Where(x => Guid.Parse(x.guid) == guid);
availablePackages = availablePackages.Where(x => x.guid.Equals(strGuid, StringComparison.OrdinalIgnoreCase));
} }
return availablePackages; return availablePackages;

11
MediaBrowser.Api/PackageService.cs
View file

@ -136,10 +136,11 @@ namespace MediaBrowser.Api
/// <returns>System.Object.</returns> /// <returns>System.Object.</returns>
public object Get(GetPackage request) public object Get(GetPackage request)
{ {
var packages = _installationManager.GetAvailablePackages().Result; var packages = _installationManager.GetAvailablePackages().GetAwaiter().GetResult();
var result = _installationManager.FilterPackages(
var result = packages.FirstOrDefault(p => string.Equals(p.guid, request.AssemblyGuid ?? "none", StringComparison.OrdinalIgnoreCase)) packages,
?? packages.FirstOrDefault(p => p.name.Equals(request.Name, StringComparison.OrdinalIgnoreCase)); request.Name,
string.IsNullOrEmpty(request.AssemblyGuid) ? default : Guid.Parse(request.AssemblyGuid)).FirstOrDefault();
return ToOptimizedResult(result); return ToOptimizedResult(result);
} }
@ -184,7 +185,7 @@ namespace MediaBrowser.Api
var package = _installationManager.GetCompatibleVersions( var package = _installationManager.GetCompatibleVersions(
packages, packages,
request.Name, request.Name,
new Guid(request.AssemblyGuid), string.IsNullOrEmpty(request.AssemblyGuid) ? Guid.Empty : Guid.Parse(request.AssemblyGuid),
string.IsNullOrEmpty(request.Version) ? null : Version.Parse(request.Version), string.IsNullOrEmpty(request.Version) ? null : Version.Parse(request.Version),
request.UpdateClass).FirstOrDefault(); request.UpdateClass).FirstOrDefault();

8
MediaBrowser.Api/UserLibrary/ItemsService.cs
View file

@ -119,6 +119,7 @@ namespace MediaBrowser.Api.UserLibrary
var result = new QueryResult<BaseItemDto> var result = new QueryResult<BaseItemDto>
{ {
StartIndex = request.StartIndex.GetValueOrDefault(),
TotalRecordCount = itemsResult.TotalRecordCount, TotalRecordCount = itemsResult.TotalRecordCount,
Items = returnItems Items = returnItems
}; };
@ -169,6 +170,7 @@ namespace MediaBrowser.Api.UserLibrary
return new QueryResult<BaseItemDto> return new QueryResult<BaseItemDto>
{ {
StartIndex = request.StartIndex.GetValueOrDefault(),
TotalRecordCount = result.TotalRecordCount, TotalRecordCount = result.TotalRecordCount,
Items = dtoList Items = dtoList
}; };
@ -229,7 +231,8 @@ namespace MediaBrowser.Api.UserLibrary
return new QueryResult<BaseItem> return new QueryResult<BaseItem>
{ {
Items = Array.Empty<BaseItem>(), Items = Array.Empty<BaseItem>(),
TotalRecordCount = 0 TotalRecordCount = 0,
StartIndex = 0
}; };
} }
@ -242,7 +245,8 @@ namespace MediaBrowser.Api.UserLibrary
return new QueryResult<BaseItem> return new QueryResult<BaseItem>
{ {
Items = itemsArray, Items = itemsArray,
TotalRecordCount = itemsArray.Length TotalRecordCount = itemsArray.Length,
StartIndex = 0
}; };
} }

6
MediaBrowser.Model/Querying/QueryResult.cs
View file

@ -17,6 +17,12 @@ namespace MediaBrowser.Model.Querying
/// <value>The total record count.</value> /// <value>The total record count.</value>
public int TotalRecordCount { get; set; } public int TotalRecordCount { get; set; }
/// <summary>
/// The index of the first record in Items.
/// </summary>
/// <value>First record index.</value>
public int StartIndex { get; set; }
public QueryResult() public QueryResult()
{ {
Items = Array.Empty<T>(); Items = Array.Empty<T>();

2
deployment/ubuntu-package-x64/Dockerfile
View file

@ -1,4 +1,4 @@
FROM microsoft/dotnet:2.2-sdk-bionic FROM microsoft/dotnet:3.0-sdk-bionic
# Docker build arguments # Docker build arguments
ARG SOURCE_DIR=/jellyfin ARG SOURCE_DIR=/jellyfin
ARG PLATFORM_DIR=/jellyfin/deployment/ubuntu-package-x64 ARG PLATFORM_DIR=/jellyfin/deployment/ubuntu-package-x64