ChoChoX/suwayomi-material-you-webui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correctly download ahead for batch download action

Browse Source
This commit is contained in:
schroda
2024-04-20 21:52:18 +02:00
parent 65992bbcdb
commit 6f12ae7e4a
1 changed files with 28 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/lib/data/Mangas.ts
View File

@@ -248,7 +248,7 @@ export class Mangas {
mangaIds: number[],
{ size, onlyUnread, downloadAhead = false }: DownloadChaptersOptions = {},
): Promise<void> {
const [unReadUnDownloadedChapters, unReadDownloadedChapters] = await Promise.all([
const [chaptersToConsider, unReadDownloadedChapters] = await Promise.all([
Mangas.getChapterIdsWithState(mangaIds, {
isRead: onlyUnread ? false : undefined,
isDownloaded: false,
@@ -256,12 +256,34 @@ export class Mangas {
downloadAhead ? Mangas.getChapterIdsWithState(mangaIds, { isRead: false, isDownloaded: true }) : [],
]);
const downloadAheadSize = Math.abs(unReadDownloadedChapters.length - (size ?? unReadDownloadedChapters.length));
const actualSize = downloadAhead ? downloadAheadSize : size;
type MangaIdToDownloadSize = [MangaId: string, DownloadSize: number | undefined];
const mangaIdToChapters = Object.groupBy(unReadUnDownloadedChapters, ({ mangaId }) => mangaId);
const chapterIdsToDownload = Object.values(mangaIdToChapters)
.map((mangaChapters) => mangaChapters!.slice(0, actualSize)) // the result of groupBy can't result in undefined values
const mangaIdToDefaultDownloadSize = mangaIds.map((mangaId) => [
String(mangaId),
size,
]) satisfies MangaIdToDownloadSize[];
const mangaIdToChaptersToConsider = Object.groupBy(chaptersToConsider, ({ mangaId }) => mangaId);
const mangaIdToUnReadDownloadedChapters = Object.groupBy(unReadDownloadedChapters, ({ mangaId }) => mangaId);
const mangaIdToDownloadSize = Object.entries(mangaIdToUnReadDownloadedChapters).map(
([mangaId, downloadedChapters]) => {
const downloadAheadSize = Math.max(
0,
(size ?? downloadedChapters!.length) - downloadedChapters!.length,
);
const actualSize = downloadAhead ? downloadAheadSize : size;
return [mangaId, actualSize];
},
) satisfies MangaIdToDownloadSize[];
const mangaIdToActualDownloadSize = Object.entries(
Object.fromEntries([...mangaIdToDefaultDownloadSize, ...mangaIdToDownloadSize]),
) satisfies MangaIdToDownloadSize[];
const chapterIdsToDownload = mangaIdToActualDownloadSize
.map(([mangaId, actualSize]) => mangaIdToChaptersToConsider[Number(mangaId)]!.slice(0, actualSize))
.flat();
if (!chapterIdsToDownload.length) {