From 5af77aee97274073440773766d9e0a15d676bbfa Mon Sep 17 00:00:00 2001 From: Collin Barrett Date: Sat, 25 Aug 2018 10:07:31 -0500 Subject: [PATCH] Revert "lazy-create batches" This reverts commit 66bba40bcc8dad0d41725cd2853fef7d81374202. --- src/FilterLists.Services/Snapshot/Snapshot.cs | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/FilterLists.Services/Snapshot/Snapshot.cs b/src/FilterLists.Services/Snapshot/Snapshot.cs index 2e30504d0..09442cd70 100644 --- a/src/FilterLists.Services/Snapshot/Snapshot.cs +++ b/src/FilterLists.Services/Snapshot/Snapshot.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using System.IO; +using System.Linq; using System.Net; using System.Net.Http; using System.Threading; @@ -119,14 +120,21 @@ private async Task GetLines() } private async Task SaveInBatches() + { + var snapBatches = await CreateBatches(); + SaveBatches(snapBatches); + } + + private async Task> CreateBatches() { SnapEntity.BatchSize = await batchSizeService.GetBatchSize(); - var lineBatches = lines.Batch(SnapEntity.BatchSize.Value); - foreach (var lineBatch in lineBatches) - { - var batch = new Batch(dbContext, lineBatch, SnapEntity); + return lines.Batch(SnapEntity.BatchSize.Value).Select(b => new Batch(dbContext, b, SnapEntity)); + } + + private static void SaveBatches(IEnumerable batches) + { + foreach (var batch in batches) batch.Save(); - } } private async Task SetSuccessful()