From b1ce29ebb07e248d1cba367417d227d9f12e7bc8 Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Tue, 30 Jan 2018 06:18:33 -0600 Subject: [PATCH] minor ScrapeService tweaks --- src/FilterLists.Services/Services/ScrapeService.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/FilterLists.Services/Services/ScrapeService.cs b/src/FilterLists.Services/Services/ScrapeService.cs index c9e58538e..7a2db85d2 100644 --- a/src/FilterLists.Services/Services/ScrapeService.cs +++ b/src/FilterLists.Services/Services/ScrapeService.cs @@ -70,8 +70,8 @@ private async Task AddOrUpdateRules(Snapshot snapshot) { // add new Rules var preExistingSnapshotRules = dbContext.Rules.Where(x => snapshot.RawRules.Contains(x.Raw)); - var newSnapshotRulesRaw = snapshot.RawRules.Except(preExistingSnapshotRules.Select(x => x.Raw)); - var newSnapshotRules = newSnapshotRulesRaw.Select(newSnapshotRuleRaw => new Rule {Raw = newSnapshotRuleRaw}); + var newSnapshotRawRules = snapshot.RawRules.Except(preExistingSnapshotRules.Select(x => x.Raw)); + var newSnapshotRules = newSnapshotRawRules.Select(newSnapshotRuleRaw => new Rule {Raw = newSnapshotRuleRaw}); dbContext.Rules.AddRange(newSnapshotRules); // remove deleted FilterListRules @@ -79,9 +79,9 @@ private async Task AddOrUpdateRules(Snapshot snapshot) var deletedFilterListRules = preExistingFilterListRules.Where(x => !preExistingSnapshotRules.Select(y => y.Id).Contains(x.RuleId)); dbContext.FilterListRules.RemoveRange(deletedFilterListRules); - // add new (or previously missing junction) FilterListRules + // add new FilterListRules var preExistingSnapshotFilterListRules = preExistingSnapshotRules.Select(newSnapshotRule => - new FilterListRule {FilterListId = snapshot.FilterListId, Rule = newSnapshotRule}); + new FilterListRule {FilterListId = snapshot.FilterListId, Rule = newSnapshotRule}).Except(preExistingFilterListRules); dbContext.FilterListRules.AddRange(preExistingSnapshotFilterListRules); var newFilterListRules = newSnapshotRules.Select(newSnapshotRule => new FilterListRule {FilterListId = snapshot.FilterListId, Rule = newSnapshotRule});