From 82de6487e4f313efed1417863fe5c87626e8939a Mon Sep 17 00:00:00 2001 From: "Collin M. Barrett" Date: Fri, 24 Aug 2018 13:12:29 -0500 Subject: [PATCH] don't re-snapshot lists with fixed archive urls ref #325 --- src/FilterLists.Services/Snapshot/SnapshotService.cs | 8 +++++++- src/FilterLists.Services/Wayback/WaybackService.cs | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/FilterLists.Services/Snapshot/SnapshotService.cs b/src/FilterLists.Services/Snapshot/SnapshotService.cs index 328f8b295..132a61b29 100644 --- a/src/FilterLists.Services/Snapshot/SnapshotService.cs +++ b/src/FilterLists.Services/Snapshot/SnapshotService.cs @@ -6,6 +6,7 @@ using AutoMapper.QueryableExtensions; using FilterLists.Data; using FilterLists.Services.Snapshot.Models; +using FilterLists.Services.Wayback; using Microsoft.EntityFrameworkCore; namespace FilterLists.Services.Snapshot @@ -37,7 +38,12 @@ await DbContext l.Snapshots .Select(s => s.CreatedDateUtc) .OrderByDescending(d => d) - .First() < yesterday)) + .First() < yesterday && + !l.Snapshots + .First() + .FilterList + .ViewUrl + .StartsWith(WaybackService.WaybackMachineUrlPrefix))) .OrderBy(l => l.Snapshots.Any()) .ThenBy(l => l.Snapshots .OrderByDescending(s => s.CreatedDateUtc) diff --git a/src/FilterLists.Services/Wayback/WaybackService.cs b/src/FilterLists.Services/Wayback/WaybackService.cs index 12fbfe99b..e4f4e92c2 100644 --- a/src/FilterLists.Services/Wayback/WaybackService.cs +++ b/src/FilterLists.Services/Wayback/WaybackService.cs @@ -9,6 +9,7 @@ namespace FilterLists.Services.Wayback { public static class WaybackService { + public const string WaybackMachineUrlPrefix = "https://web.archive.org/web/"; private const string WaybackAvailabilityApiUrlPrefix = "https://archive.org/wayback/available?url="; public static async Task GetMostRecentSnapshotMeta(string url)