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

Merge pull request #2916 from Bond-009/minor2

Browse Source 
Minor improvements
This commit is contained in:
dkanada 2020-04-20 13:52:27 +09:00 committed by GitHub
commit 3142c9b990
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Api/UserLibrary/ItemsService.cs
View File

@ -242,11 +242,11 @@ namespace MediaBrowser.Api.UserLibrary
return folder.GetItems(GetItemsQuery(request, dtoOptions, user));
}
var itemsArray = folder.GetChildren(user, true).ToArray();
var itemsArray = folder.GetChildren(user, true);
return new QueryResult<BaseItem>
{
Items = itemsArray,
TotalRecordCount = itemsArray.Length,
TotalRecordCount = itemsArray.Count,
StartIndex = 0
};
}

5
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -2741,7 +2741,7 @@ namespace MediaBrowser.Controller.Entities
{
var list = GetEtagValues(user);
return string.Join("|", list.ToArray()).GetMD5().ToString("N", CultureInfo.InvariantCulture);
return string.Join("|", list).GetMD5().ToString("N", CultureInfo.InvariantCulture);
}
protected virtual List<string> GetEtagValues(User user)
@ -2784,8 +2784,7 @@ namespace MediaBrowser.Controller.Entities
return true;
}
var view = this as IHasCollectionType;
if (view != null)
if (this is IHasCollectionType view)
{
if (string.Equals(view.CollectionType, CollectionType.LiveTv, StringComparison.OrdinalIgnoreCase))
{

2
MediaBrowser.Controller/Entities/Folder.cs
View File

@ -864,7 +864,7 @@ namespace MediaBrowser.Controller.Entities
return SortItemsByRequest(query, result);
}
return result.ToArray();
return result;
}
return GetItemsInternal(query).Items;

4
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -478,7 +478,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
}
catch (Exception ex)
{
_logger.LogError(ex, "I-frame image extraction failed, will attempt standard way. Input: {arguments}", inputArgument);
_logger.LogError(ex, "I-frame image extraction failed, will attempt standard way. Input: {Arguments}", inputArgument);
}
}
@ -969,7 +969,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
public int? ExitCode { get; private set; }
void OnProcessExited(object sender, EventArgs e)
private void OnProcessExited(object sender, EventArgs e)
{
var process = (Process)sender;