github/Discord.Net
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PagedAsyncEnumerator's nextPage should return false if there are no more pages.

Browse Source
This commit is contained in:
RogueException
2016-10-17 16:11:35 -03:00
parent 3ca0067f1b
commit dfe654af3b
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Discord.Net.Core/Utils/Paging/PagedEnumerator.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
@@ -13,9 +12,9 @@ namespace Discord
private readonly ulong? _start;
private readonly int? _count;
private readonly Func<PageInfo, CancellationToken, Task<IReadOnlyCollection<T>>> _getPage;
private readonly Action<PageInfo, IReadOnlyCollection<T>> _nextPage;
private readonly Func<PageInfo, IReadOnlyCollection<T>, bool> _nextPage;
public PagedAsyncEnumerable(int pageSize, Func<PageInfo, CancellationToken, Task<IReadOnlyCollection<T>>> getPage, Action<PageInfo, IReadOnlyCollection<T>> nextPage = null,
public PagedAsyncEnumerable(int pageSize, Func<PageInfo, CancellationToken, Task<IReadOnlyCollection<T>>> getPage, Func<PageInfo, IReadOnlyCollection<T>, bool> nextPage = null,
ulong? start = null, int? count = null)
{
PageSize = pageSize;
@@ -64,7 +63,10 @@ namespace Discord
_info.PageSize = _info.Remaining != null ? (int)Math.Min(_info.Remaining.Value, _source.PageSize) : _source.PageSize;
if (_info.Remaining != 0)
_source?._nextPage(_info, data);
{
if (!_source._nextPage(_info, data))
_info.Remaining = 0;
}
return true;
}