From 133aa53b2fb295046bd6fd9d73ae40458e44bc17 Mon Sep 17 00:00:00 2001 From: Misode Date: Sun, 27 Dec 2020 04:17:47 +0100 Subject: [PATCH] Fix dynamic registries not being cached --- src/app/DataFetcher.ts | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/app/DataFetcher.ts b/src/app/DataFetcher.ts index b98d666f..ad8f4a4a 100644 --- a/src/app/DataFetcher.ts +++ b/src/app/DataFetcher.ts @@ -23,7 +23,7 @@ export const fetchData = async (target: CollectionRegistry, versionId: string) = const cache = JSON.parse(localStorage.getItem(localStorageCache(versionId)) ?? '{}') const mcdataCacheValid = cache.format === CACHE_FORMAT && (version.mcdata_ref !== 'master' || cache.mcdata_hash === __MCDATA_MASTER_HASH__) - const vanillaDatapackCacheValid = cache.format === CACHE_FORMAT && (version.vanilla_datapack_summary_ref !== 'master' || cache.vanilla_datapack_summary_hash === __VANILLA_DATAPACK_SUMMARY_HASH__) + const vanillaDatapackCacheValid = cache.format === CACHE_FORMAT && (version.vanilla_datapack_summary_ref !== 'summary' || cache.vanilla_datapack_summary_hash === __VANILLA_DATAPACK_SUMMARY_HASH__) await Promise.all([ fetchRegistries(target, version, cache, mcdataCacheValid), @@ -32,12 +32,8 @@ export const fetchData = async (target: CollectionRegistry, versionId: string) = ]) if (!mcdataCacheValid || !vanillaDatapackCacheValid) { - if (version.mcdata_ref === 'master') { - cache.mcdata_hash = __MCDATA_MASTER_HASH__ - } - if (version.vanilla_datapack_summary_ref === 'master') { - cache.vanilla_datapack_summary_hash = __VANILLA_DATAPACK_SUMMARY_HASH__ - } + cache.mcdata_hash = __MCDATA_MASTER_HASH__ + cache.vanilla_datapack_summary_hash = __VANILLA_DATAPACK_SUMMARY_HASH__ cache.format = CACHE_FORMAT localStorage.setItem(localStorageCache(versionId), JSON.stringify(cache)) }