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

Abort active migration search on manual search match selection

Browse Source
This commit is contained in:
schroda
2026-05-16 22:37:23 +02:00
parent 531ec46be7
commit cd8fde4a7b
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,8 @@ export class MigrationManager {
private static mangaProcessQueue = pLimit(MAX_MANGAS_IN_PARALLEL);
private static parallelSourcesQueue: LimitFunction | undefined;
private static queueBySource = new Map<string, LimitFunction>();
private static queueBySource = new Map<SourceIdInfo['id'], LimitFunction>();
private static searchAbortControllerByManga = new Map<MangaIdInfo['id'], AbortController>();
private static abortAndResetAbortController(reason: unknown): void {
MigrationManager.abortController?.abort(reason);
@@ -617,7 +618,16 @@ export class MigrationManager {
draft.entries[mangaId].manualMatches = [...draft.entries[mangaId].manualMatches, match];
}
const isSearching = ![
MigrationEntryStatus.SEARCH_FAILED,
MigrationEntryStatus.SEARCH_COMPLETE,
].includes(entry.status);
MigrationManager.selectMatch(mangaId, match.id, match.sourceId, true);
if (isSearching) {
MigrationManager.searchAbortControllerByManga.get(mangaId)?.abort('Manual match selected');
}
}
});
}
@@ -705,10 +715,6 @@ export class MigrationManager {
throw new Error(signal.reason);
}
if (signal.aborted) {
throw new Error(signal.reason);
}
if (!selectHighestChapterNumberSource && MigrationManager.hasHigherSourcePriorityMatch(mangaId, sourceId)) {
throw new Error('Entry already has a selected match from a higher priority source');
}
@@ -803,6 +809,9 @@ export class MigrationManager {
const searchController = new AbortController();
const signal = AbortSignal.any([mainSignal, searchController.signal]);
MigrationManager.searchAbortControllerByManga.get(mangaId)?.abort('search');
MigrationManager.searchAbortControllerByManga.set(mangaId, searchController);
if (!entry) {
return;
}
@@ -973,6 +982,8 @@ export class MigrationManager {
draft.searchProgress.completed += 1;
draft.searchProgress.failed += 1;
});
} finally {
MigrationManager.searchAbortControllerByManga.delete(mangaId);
}
}