vrr/VOffline
2
0
Fork 0
mirror of https://github.com/Rast1234/VOffline.git synced 2026-07-14 19:49:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Compare commits

base: vrr:master
Branches Tags
vrr:master
vrr:dependabot/nuget/VOffline/Newtonsoft.Json-13.0.2
vrr:wip
vrr:0.4
vrr:0.3
vrr:0.2
vrr:0.1
..
compare: vrr:0.3
Branches Tags
vrr:dependabot/nuget/VOffline/Newtonsoft.Json-13.0.2
vrr:master
vrr:wip
vrr:0.4
vrr:0.3
vrr:0.2
vrr:0.1

No commits in common. "master" and "0.3" have entirely different histories.
master ... 0.3

1 changed files with 3 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

40
VOffline/Services/Vk/VkApiUtils.cs
View file

@ -153,21 +153,10 @@ namespace VOffline.Services.Vk
.Select(pageNumber => (ulong)pageNumber * pageSize)
.Select(async offset =>
{
VkCollection<T> page = null;
try
{
page = await pageGetter(pageSize, offset);
log.Debug($"{offset}/{total}, {page.Count} items");
}
catch (Exception e)
{
log.Warn($"Error getting page {offset}/{total}. Getting page by smaller chunks...", e);
var items = await GetSinglePage(pageGetter, offset, pageSize, token, log);
page = new VkCollection<T>(0, items);
}
var page = await pageGetter(pageSize, offset);
log.Debug($"{0}/{total}, {page.Count} items");
token.ThrowIfCancellationRequested();
return page ?? new VkCollection<T>(0, new List<T>());
return page;
});
var pages = await Task.WhenAll(pageTasks);
foreach (var page in pages)
@ -188,29 +177,6 @@ namespace VOffline.Services.Vk
return result.ToList();
}
private async Task<IEnumerable<T>> GetSinglePage<T>(PageGetter<T> pageGetter, decimal offset, decimal length, CancellationToken token, ILog log)
{
var pageTasks = Enumerable.Range((int)offset, (int)length)
.Select(async x =>
{
VkCollection<T> page = null;
try
{
page = await pageGetter(1, offset);
log.Debug($"{x}/{length} item from bad page");
}
catch (Exception e)
{
log.Warn($"Error getting item {x}", e);
}
token.ThrowIfCancellationRequested();
return page ?? new VkCollection<T>(0, new List<T>());
});
var pages = await Task.WhenAll(pageTasks);
return pages.SelectMany(x => x);
}
public async Task<PlaylistWithAudio> ExpandPlaylist(AudioPlaylist playlist, CancellationToken token, ILog log)
{
var audios = await GetAllPagesAsync(AudiosInPlaylist(playlist), long.MaxValue, token, log, true);