From ce6cedaf4be53d52f2e558055b91e515b92e4c83 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Fri, 19 Jul 2019 13:15:45 -0400
Subject: add background fetch for mod compatibility list (#651)

---
 src/SMAPI.Web/Controllers/ModsController.cs | 33 ++++++++++++-----------------
 1 file changed, 14 insertions(+), 19 deletions(-)

(limited to 'src/SMAPI.Web/Controllers')

diff --git a/src/SMAPI.Web/Controllers/ModsController.cs b/src/SMAPI.Web/Controllers/ModsController.cs
index b6040e06..b621ded0 100644
--- a/src/SMAPI.Web/Controllers/ModsController.cs
+++ b/src/SMAPI.Web/Controllers/ModsController.cs
@@ -1,9 +1,7 @@
 using System.Linq;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using StardewModdingAPI.Toolkit;
 using StardewModdingAPI.Web.Framework.Caching.Wiki;
 using StardewModdingAPI.Web.Framework.ConfigModels;
 using StardewModdingAPI.Web.ViewModels;
@@ -19,8 +17,8 @@ namespace StardewModdingAPI.Web.Controllers
         /// <summary>The cache in which to store mod metadata.</summary>
         private readonly IWikiCacheRepository Cache;
 
-        /// <summary>The number of minutes successful update checks should be cached before refetching them.</summary>
-        private readonly int CacheMinutes;
+        /// <summary>The number of minutes before which wiki data should be considered old.</summary>
+        private readonly int StaleMinutes;
 
 
         /*********
@@ -34,15 +32,15 @@ namespace StardewModdingAPI.Web.Controllers
             ModCompatibilityListConfig config = configProvider.Value;
 
             this.Cache = cache;
-            this.CacheMinutes = config.CacheMinutes;
+            this.StaleMinutes = config.StaleMinutes;
         }
 
         /// <summary>Display information for all mods.</summary>
         [HttpGet]
         [Route("mods")]
-        public async Task<ViewResult> Index()
+        public ViewResult Index()
         {
-            return this.View("Index", await this.FetchDataAsync());
+            return this.View("Index", this.FetchData());
         }
 
 
@@ -50,25 +48,22 @@ namespace StardewModdingAPI.Web.Controllers
         ** Private methods
         *********/
         /// <summary>Asynchronously fetch mod metadata from the wiki.</summary>
-        public async Task<ModListModel> FetchDataAsync()
+        public ModListModel FetchData()
         {
-            // refresh cache
-            CachedWikiMod[] mods;
-            if (!this.Cache.TryGetWikiMetadata(out CachedWikiMetadata metadata) || this.Cache.IsStale(metadata.LastUpdated, this.CacheMinutes))
-            {
-                var wikiCompatList = await new ModToolkit().GetWikiCompatibilityListAsync();
-                this.Cache.SaveWikiData(wikiCompatList.StableVersion, wikiCompatList.BetaVersion, wikiCompatList.Mods, out metadata, out mods);
-            }
-            else
-                mods = this.Cache.GetWikiMods().ToArray();
+            // fetch cached data
+            if (!this.Cache.TryGetWikiMetadata(out CachedWikiMetadata metadata))
+                return new ModListModel();
 
             // build model
             return new ModListModel(
                 stableVersion: metadata.StableVersion,
                 betaVersion: metadata.BetaVersion,
-                mods: mods
+                mods: this.Cache
+                    .GetWikiMods()
                     .Select(mod => new ModModel(mod.GetModel()))
-                    .OrderBy(p => Regex.Replace(p.Name.ToLower(), "[^a-z0-9]", "")) // ignore case, spaces, and special characters when sorting
+                    .OrderBy(p => Regex.Replace(p.Name.ToLower(), "[^a-z0-9]", "")), // ignore case, spaces, and special characters when sorting
+                lastUpdated: metadata.LastUpdated,
+                isStale: this.Cache.IsStale(metadata.LastUpdated, this.StaleMinutes)
             );
         }
     }
-- 
cgit