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

Extract migration entry search state update into function

Browse Source
This commit is contained in:
schroda
2026-06-21 15:36:12 +02:00
parent 0f12bf0607
commit 792c034599
2 changed files with 68 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/features/migration/Migration.types.ts
View File

@@ -7,9 +7,11 @@
*/
import type {
ChapterListFieldsFragment,
GetMangaToMigrateQuery,
GetMangaToMigrateToFetchMutation,
GetMigratableSourcesQuery,
MangaMigrationFieldsFragment,
} from '@/lib/graphql/generated/graphql.ts';
import type {
SourceDisplayNameInfo,
@@ -176,3 +178,8 @@ export type MigrationChapter = ChapterIdInfo &
export type MigrateAction = { copy: () => Promise<unknown>[]; cleanup: () => Promise<unknown>[] };
export type MigrateActionCreator = () => MigrateAction;
export type EntrySourceSearchResult = {
manga: MangaMigrationFieldsFragment;
chapters: ChapterListFieldsFragment[] | null;
};

112
src/features/migration/MigrationManager.ts
View File

@@ -12,6 +12,7 @@ import { create } from 'zustand';
import { immer } from 'zustand/middleware/immer';
import { devtools, persist } from 'zustand/middleware';
import {
type EntrySourceSearchResult,
type MigratableEntry,
type MigrateOptions,
type MigrationBulkSearchSettings,
@@ -33,7 +34,6 @@ import {
import { requestManager } from '@/lib/requests/RequestManager.ts';
import { GET_MIGRATION_SOURCE_MANGAS_FETCH } from '@/lib/graphql/source/SourceMutation.ts';
import type {
ChapterListFieldsFragment,
GetMigrationSourceMangasFetchMutation,
GetMigrationSourceMangasFetchMutationVariables,
GetServerSettingsQuery,
@@ -796,7 +796,7 @@ export class MigrationManager {
sourceId: SourceIdInfo['id'],
signal: AbortSignal,
{ selectHighestChapterNumberSource, performAdvancedSearch }: MigrationBulkSearchSettings,
): Promise<{ manga: MangaMigrationFieldsFragment; chapters: ChapterListFieldsFragment[] | null }[]> {
): Promise<EntrySourceSearchResult[]> {
if (signal.aborted) {
throw new Error(signal.reason);
}
@@ -891,57 +891,17 @@ export class MigrationManager {
return updatedMatches;
}
private static async searchForMangaInSource(
sourceId: SourceIdInfo['id'],
private static updateEntrySearchState(
mangaId: MangaIdInfo['id'],
mangaTitle: string,
signal: AbortSignal,
searchController: AbortController,
options: MigrationBulkSearchSettings,
): Promise<void> {
const {
sourceId: SourceIdInfo['id'],
foundMatches: EntrySourceSearchResult[],
{
selectHighestChapterNumberSource,
ignoreOutdatedMatches,
requireAdditionalChapters,
ignoreWithMissingChapters,
} = options;
signal.throwIfAborted();
if (!selectHighestChapterNumberSource && MigrationManager.hasHigherSourcePriorityMatch(mangaId, sourceId)) {
return;
}
const foundMatches = await (async () => {
try {
return await MigrationManager.findMatchesForMangaInSource(
mangaId,
mangaTitle,
sourceId,
signal,
options,
);
} catch (e) {
MigrationManager.updateState((draft) => {
const draftEntry = draft.entries[mangaId];
draftEntry.destSourceIdToSearchState[sourceId] = false;
});
throw e;
}
})();
if (!foundMatches.length) {
MigrationManager.updateState((draft) => {
const draftEntry = draft.entries[mangaId];
draftEntry.destSourceIdToSearchState[sourceId] = false;
});
return;
}
}: MigrationBulkSearchSettings,
): void {
MigrationManager.updateState((draft) => {
const draftEntry = draft.entries[mangaId];
const draftMatchEntry = draftEntry.selectedMatchMangaId
@@ -1009,14 +969,60 @@ export class MigrationManager {
draftEntry.selectedMatchMangaId = bestMatch.id;
draftEntry.selectedMatchSourceId = sourceId;
}
});
}
if (
!selectHighestChapterNumberSource &&
!MigrationManager.isHigherPrioritySourceUnsettled(mangaId, sourceId)
) {
private static async searchForMangaInSource(
sourceId: SourceIdInfo['id'],
mangaId: MangaIdInfo['id'],
mangaTitle: string,
signal: AbortSignal,
searchController: AbortController,
options: MigrationBulkSearchSettings,
): Promise<void> {
const { selectHighestChapterNumberSource } = options;
signal.throwIfAborted();
if (!selectHighestChapterNumberSource && MigrationManager.hasHigherSourcePriorityMatch(mangaId, sourceId)) {
return;
}
const foundMatches = await (async () => {
try {
return await MigrationManager.findMatchesForMangaInSource(
mangaId,
mangaTitle,
sourceId,
signal,
options,
);
} catch (e) {
MigrationManager.updateState((draft) => {
const draftEntry = draft.entries[mangaId];
draftEntry.destSourceIdToSearchState[sourceId] = false;
});
throw e;
}
})();
if (!foundMatches.length) {
MigrationManager.updateState((draft) => {
const draftEntry = draft.entries[mangaId];
draftEntry.destSourceIdToSearchState[sourceId] = false;
});
return;
}
MigrationManager.updateEntrySearchState(mangaId, sourceId, foundMatches, options);
if (!selectHighestChapterNumberSource && !MigrationManager.isHigherPrioritySourceUnsettled(mangaId, sourceId)) {
searchController.abort(`Found best match in source "${sourceId}"`);
}
});
}
private static async searchForManga(