prehistoric-systems/FilterLists
1
0
Fork 0
mirror of https://github.com/collinbarrett/FilterLists.git synced 2026-03-11 09:04:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor snap tidies

Browse source
This commit is contained in:
Collin M. Barrett 2018-09-01 16:19:53 -05:00
parent 8623537e33
commit 64d1e8a689
1 changed files with 29 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
src/FilterLists.Services/Snapshot/Snapshot.cs
View file

@ -107,24 +107,30 @@ private async Task GetLines()
var response = await httpClient.GetAsync(ListUrl, HttpCompletionOption.ResponseHeadersRead);
SnapEntity.HttpStatusCode = (int)response.StatusCode;
response.EnsureSuccessStatusCode();
lines = new HashSet<string>();
using (var stream = await response.Content.ReadAsStreamAsync())
await GetLinesFromSource(response);
}
}
private async Task GetLinesFromSource(HttpResponseMessage response)
{
lines = new HashSet<string>();
using (var stream = await response.Content.ReadAsStreamAsync())
using (var memoryStream = new MemoryStream())
{
await stream.CopyToAsync(memoryStream);
memoryStream.Position = 0;
SetChecksum(memoryStream);
await SetWasUpdated();
if (SnapEntity.WasUpdated)
{
using (var memoryStream = new MemoryStream())
{
await stream.CopyToAsync(memoryStream);
memoryStream.Position = 0;
SetChecksum(memoryStream);
if (await SaveIsNewChecksum())
{
memoryStream.Position = 0;
if (ListUrl.EndsWith(".7z"))
await GetLinesFrom7Zip(memoryStream);
else
await GetLinesFromStream(memoryStream);
}
}
memoryStream.Position = 0;
if (ListUrl.EndsWith(".7z"))
await GetLinesFrom7Zip(memoryStream);
else
await GetLinesFromStream(memoryStream);
}
await dbContext.SaveChangesAsync();
}
}
@ -136,29 +142,25 @@ private void SetChecksum(Stream stream)
}
}
private async Task<bool> SaveIsNewChecksum()
{
SnapEntity.WasUpdated =
!SnapEntity.Md5Checksum.SequenceEqual(await GetPreviousChecksum() ?? Array.Empty<byte>());
await dbContext.SaveChangesAsync();
return SnapEntity.WasUpdated;
}
private async Task SetWasUpdated() =>
SnapEntity.WasUpdated = !SnapEntity.Md5Checksum.SequenceEqual(await GetPreviousChecksum());
private async Task<byte[]> GetPreviousChecksum() =>
await dbContext.Snapshots
.Where(s => s.WasSuccessful && s.FilterListId == List.Id)
.OrderByDescending(s => s.CreatedDateUtc)
.Select(s => s.Md5Checksum)
.FirstOrDefaultAsync();
.FirstOrDefaultAsync() ?? Array.Empty<byte>();
private async Task GetLinesFrom7Zip(Stream stream)
{
using (var archive = SevenZipArchive.Open(stream))
{
foreach (var entry in archive.Entries.Where(entry => !entry.IsDirectory))
using (var entryMemoryStream = entry.OpenEntryStream())
var archiveEntries = archive.Entries.Where(entry => !entry.IsDirectory);
foreach (var entry in archiveEntries)
using (var entryStream = entry.OpenEntryStream())
{
await GetLinesFromStream(entryMemoryStream);
await GetLinesFromStream(entryStream);
}
}
}