From 19b51ab69176eb4f834c2c497f4c93a13779d7c7 Mon Sep 17 00:00:00 2001
From: Fuwn <contact@fuwn.me>
Date: Wed, 6 Sep 2023 00:30:46 -0700
Subject: feat(list): cache flattened

---
 src/lib/AniList/media.ts              | 12 ++++++++----
 src/lib/List/Due/AnimeList.svelte     | 26 +++++++++++++++++++++-----
 src/lib/List/Due/MangaList.svelte     | 29 +++++++++++++++++++++--------
 src/lib/List/UpcomingAnimeList.svelte | 26 +++++++++++++++++++++-----
 src/lib/List/WatchingAnimeList.svelte | 26 +++++++++++++++++++++-----
 5 files changed, 92 insertions(+), 27 deletions(-)

diff --git a/src/lib/AniList/media.ts b/src/lib/AniList/media.ts
index f6f6a68e..1fddbbe5 100644
--- a/src/lib/AniList/media.ts
+++ b/src/lib/AniList/media.ts
@@ -60,7 +60,7 @@ export const mediaListCollection = async (
 	mediaCache: string | undefined,
 	currentLastPruneAt: string | number,
 	forcePrune = false
-): Promise<{ entries: { media: Media }[] }[]> => {
+): Promise<Media[]> => {
 	let currentCacheMinutes;
 
 	settings.subscribe((value) => {
@@ -126,11 +126,15 @@ export const mediaListCollection = async (
 
 	if (mediaCache === '') {
 		if (type === Type.Anime) {
-			anime.set(JSON.stringify(userIdResponse['data']['MediaListCollection']['lists']));
+			anime.set(
+				JSON.stringify(flattenLists(userIdResponse['data']['MediaListCollection']['lists']))
+			);
 		} else {
-			manga.set(JSON.stringify(userIdResponse['data']['MediaListCollection']['lists']));
+			manga.set(
+				JSON.stringify(flattenLists(userIdResponse['data']['MediaListCollection']['lists']))
+			);
 		}
 	}
 
-	return userIdResponse['data']['MediaListCollection']['lists'];
+	return flattenLists(userIdResponse['data']['MediaListCollection']['lists']);
 };
diff --git a/src/lib/List/Due/AnimeList.svelte b/src/lib/List/Due/AnimeList.svelte
index 5024f8c2..83511ca0 100644
--- a/src/lib/List/Due/AnimeList.svelte
+++ b/src/lib/List/Due/AnimeList.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	/* eslint svelte/no-at-html-tags: "off" */
 
-	import { mediaListCollection, Type, flattenLists, type Media } from '$lib/AniList/media';
+	import { mediaListCollection, Type, type Media } from '$lib/AniList/media';
 	import type { UserIdentity, AniListAuthorisation } from '$lib/AniList/identity';
 	import { onDestroy, onMount } from 'svelte';
 	import anime from '../../../stores/anime';
@@ -12,7 +12,7 @@
 	export let identity: UserIdentity;
 	export let displayUnresolved: boolean;
 
-	let animeLists: Promise<{ entries: { media: Media }[] }[]>;
+	let animeLists: Promise<Media[]>;
 	let startTime: number;
 	let endTime: number;
 
@@ -38,13 +38,12 @@
 		clearInterval(keyCacher);
 	});
 
-	const cleanMedia = (media: { entries: { media: Media }[] }[], displayUnresolved: boolean) => {
+	const cleanMedia = (media: Media[], displayUnresolved: boolean) => {
 		if (media === undefined) {
 			return [];
 		}
 
-		const flattenedLists = flattenLists(media);
-		const releasingMedia = flattenedLists.filter(
+		const releasingMedia = media.filter(
 			(media: Media) =>
 				media.status == 'RELEASING' &&
 				(media.mediaListEntry || { status: 'DROPPED' }).status !=
@@ -152,6 +151,17 @@
 			);
 		});
 	};
+
+	const cleanCache = () => {
+		animeLists = mediaListCollection(
+			user,
+			identity,
+			Type.Anime,
+			$anime,
+			$lastPruneTimes.anime,
+			true
+		);
+	};
 </script>
 
 {#await animeLists}
@@ -166,6 +176,12 @@
 		<small style="opacity: 50%">{endTime / 1000}s</small></summary
 	>
 
+	{#if cleanedMedia.length === 0}
+		<ul>
+			<li>No anime to display. <a href={'#'} on:click={cleanCache}>Force refresh</a></li>
+		</ul>
+	{/if}
+
 	<ul>
 		{#each cleanedMedia as anime}
 			<li>
diff --git a/src/lib/List/Due/MangaList.svelte b/src/lib/List/Due/MangaList.svelte
index e7a1321f..379ec228 100644
--- a/src/lib/List/Due/MangaList.svelte
+++ b/src/lib/List/Due/MangaList.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { mediaListCollection, Type, flattenLists, type Media } from '$lib/AniList/media';
+	import { mediaListCollection, Type, type Media } from '$lib/AniList/media';
 	import type { UserIdentity, AniListAuthorisation } from '$lib/AniList/identity';
 	import { onDestroy, onMount } from 'svelte';
 	import { chapterCount } from '$lib/mangadex';
@@ -12,7 +12,7 @@
 	export let identity: UserIdentity;
 	export let displayUnresolved: boolean;
 
-	let mangaLists: Promise<{ entries: { media: Media }[] }[]>;
+	let mangaLists: Promise<Media[]>;
 	let startTime: number;
 	let endTime: number;
 
@@ -31,10 +31,7 @@
 		clearInterval(keyCacher);
 	});
 
-	const cleanMedia = async (
-		media: { entries: { media: Media }[] }[],
-		displayUnresolved: boolean
-	) => {
+	const cleanMedia = async (media: Media[], displayUnresolved: boolean) => {
 		if (media === undefined) {
 			return [];
 		}
@@ -54,8 +51,7 @@
 			}
 		}
 
-		const flattenedLists = flattenLists(media);
-		const releasingMedia = flattenedLists.filter(
+		const releasingMedia = media.filter(
 			(media: Media) =>
 				media.status == 'RELEASING' &&
 				media.format != 'NOVEL' &&
@@ -117,6 +113,17 @@
 			);
 		});
 	};
+
+	const cleanCache = () => {
+		mangaLists = mediaListCollection(
+			user,
+			identity,
+			Type.Manga,
+			$manga,
+			$lastPruneTimes.manga,
+			true
+		);
+	};
 </script>
 
 {#await mangaLists}
@@ -134,6 +141,12 @@
 			<small style="opacity: 50%">{endTime / 1000}s</small>
 		</summary>
 
+		{#if cleanedMedia.length === 0}
+			<ul>
+				<li>No manga to display. <a href={'#'} on:click={cleanCache}>Force refresh</a></li>
+			</ul>
+		{/if}
+
 		<ul>
 			{#each cleanedMedia as manga}
 				<li>
diff --git a/src/lib/List/UpcomingAnimeList.svelte b/src/lib/List/UpcomingAnimeList.svelte
index 8eee9e48..679a38d7 100644
--- a/src/lib/List/UpcomingAnimeList.svelte
+++ b/src/lib/List/UpcomingAnimeList.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	/* eslint svelte/no-at-html-tags: "off" */
 
-	import { mediaListCollection, Type, flattenLists, type Media } from '$lib/AniList/media';
+	import { mediaListCollection, Type, type Media } from '$lib/AniList/media';
 	import type { UserIdentity, AniListAuthorisation } from '$lib/AniList/identity';
 	import { onMount } from 'svelte';
 	import anime from '../../stores/anime';
@@ -12,7 +12,7 @@
 	export let identity: UserIdentity;
 	export let displayUnresolved: boolean;
 
-	let animeLists: Promise<{ entries: { media: Media }[] }[]>;
+	let animeLists: Promise<Media[]>;
 	let startTime: number;
 	let endTime: number;
 
@@ -21,13 +21,12 @@
 		animeLists = mediaListCollection(user, identity, Type.Anime, $anime, $lastPruneTimes.anime);
 	});
 
-	const cleanMedia = (media: { entries: { media: Media }[] }[], displayUnresolved: boolean) => {
+	const cleanMedia = (media: Media[], displayUnresolved: boolean) => {
 		if (media === undefined) {
 			return [];
 		}
 
-		const flattenedLists = flattenLists(media);
-		const releasingMedia = flattenedLists.filter(
+		const releasingMedia = media.filter(
 			(media: Media) => media.status == 'RELEASING' && media.nextAiringEpisode !== null
 			/* &&
 				(media['mediaListEntry'] || { progress: 0 })['progress'] >=
@@ -107,6 +106,17 @@
 	const totalEpisodes = (anime: Media) => {
 		return anime.episodes === null ? '' : `<span style="opacity: 50%">/${anime.episodes}</span>`;
 	};
+
+	const cleanCache = () => {
+		animeLists = mediaListCollection(
+			user,
+			identity,
+			Type.Anime,
+			$anime,
+			$lastPruneTimes.anime,
+			true
+		);
+	};
 </script>
 
 {#await animeLists}
@@ -121,6 +131,12 @@
 		<small style="opacity: 50%">{endTime / 1000}s</small></summary
 	>
 
+	{#if cleanedMedia.length === 0}
+		<ul>
+			<li>No anime to display. <a href={'#'} on:click={cleanCache}>Force refresh</a></li>
+		</ul>
+	{/if}
+
 	<ul>
 		{#each cleanedMedia as anime}
 			<li>
diff --git a/src/lib/List/WatchingAnimeList.svelte b/src/lib/List/WatchingAnimeList.svelte
index 52e3c505..fc8909c1 100644
--- a/src/lib/List/WatchingAnimeList.svelte
+++ b/src/lib/List/WatchingAnimeList.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
 	/* eslint svelte/no-at-html-tags: "off" */
 
-	import { mediaListCollection, Type, flattenLists, type Media } from '$lib/AniList/media';
+	import { mediaListCollection, Type, type Media } from '$lib/AniList/media';
 	import type { UserIdentity, AniListAuthorisation } from '$lib/AniList/identity';
 	import { onMount } from 'svelte';
 	import anime from '../../stores/anime';
@@ -11,7 +11,7 @@
 	export let user: AniListAuthorisation;
 	export let identity: UserIdentity;
 
-	let animeLists: Promise<{ entries: { media: Media }[] }[]>;
+	let animeLists: Promise<Media[]>;
 	let startTime: number;
 	let endTime: number;
 
@@ -20,13 +20,12 @@
 		animeLists = mediaListCollection(user, identity, Type.Anime, $anime, $lastPruneTimes.anime);
 	});
 
-	const cleanMedia = (media: { entries: { media: Media }[] }[]) => {
+	const cleanMedia = (media: Media[]) => {
 		if (media === undefined) {
 			return [];
 		}
 
-		const flattenedLists = flattenLists(media);
-		const releasingMedia = flattenedLists.filter(
+		const releasingMedia = media.filter(
 			(media: Media) =>
 				media.status !== 'RELEASING' &&
 				media.status !== 'NOT_YET_RELEASED' &&
@@ -81,6 +80,17 @@
 			);
 		});
 	};
+
+	const cleanCache = () => {
+		animeLists = mediaListCollection(
+			user,
+			identity,
+			Type.Anime,
+			$anime,
+			$lastPruneTimes.anime,
+			true
+		);
+	};
 </script>
 
 {#await animeLists}
@@ -95,6 +105,12 @@
 		<small style="opacity: 50%">{endTime / 1000}s</small></summary
 	>
 
+	{#if cleanedMedia.length === 0}
+		<ul>
+			<li>No anime to display. <a href={'#'} on:click={cleanCache}>Force refresh</a></li>
+		</ul>
+	{/if}
+
 	<ul>
 		{#each cleanedMedia as anime}
 			<li>
-- 
cgit v1.2.3