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

Place errored source searches after ones with search results

Browse Source
This commit is contained in:
schroda
2025-04-22 21:30:28 +02:00
parent f19c5d5038
commit f93abd5b93
1 changed files with 29 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/modules/global-search/screens/SearchAll.tsx
View File

@@ -35,7 +35,7 @@ import { Sources } from '@/modules/source/services/Sources.ts';
import { SourceDisplayNameInfo, SourceIdInfo } from '@/modules/source/Source.types.ts';
import { useMetadataServerSettings } from '@/modules/settings/services/ServerSettingsMetadata.ts';
type SourceLoadingState = { isLoading: boolean; hasResults: boolean; emptySearch: boolean };
type SourceLoadingState = { isLoading: boolean; hasResults: boolean; emptySearch: boolean; error: any };
type SourceToLoadingStateMap = Map<string, SourceLoadingState>;
const compareSourceByName = (sourceA: SourceDisplayNameInfo, sourceB: SourceDisplayNameInfo): number =>
@@ -46,20 +46,24 @@ const compareSourcesBySearchResult = (
sourceB: SourceIdInfo,
sourceToFetchedStateMap: SourceToLoadingStateMap,
): -1 | 0 | 1 => {
const isSourceAFetched = !sourceToFetchedStateMap.get(sourceA.id)?.isLoading;
const isSourceBFetched = !sourceToFetchedStateMap.get(sourceB.id)?.isLoading;
const sourceAState = sourceToFetchedStateMap.get(sourceA.id);
const sourceBState = sourceToFetchedStateMap.get(sourceB.id);
const isSourceAFetched = !sourceAState?.isLoading;
const hasSourceAError = !!sourceAState?.error;
const isSourceASearchResultEmpty = !sourceAState?.hasResults && !hasSourceAError;
const isSourceBFetched = !sourceBState?.isLoading;
const hasSourceBError = !!sourceBState?.error;
const isSourceBSearchResultEmpty = !sourceBState?.hasResults && !hasSourceBError;
if (isSourceAFetched && !isSourceBFetched) {
return -1;
}
if (!isSourceAFetched && isSourceBFetched) {
return 1;
}
if (!isSourceAFetched && !isSourceBFetched) {
return 0;
}
const isSourceASearchResultEmpty = !sourceToFetchedStateMap.get(sourceA.id)?.hasResults;
const isSourceBSearchResultEmpty = !sourceToFetchedStateMap.get(sourceB.id)?.hasResults;
if (isSourceASearchResultEmpty && !isSourceBSearchResultEmpty) {
return 1;
}
@@ -67,6 +71,13 @@ const compareSourcesBySearchResult = (
return -1;
}
if (!hasSourceAError && hasSourceBError) {
return -1;
}
if (hasSourceAError && !hasSourceBError) {
return 1;
}
return 0;
};
const TRIGGER_SEARCH_THRESHOLD = 1000; // ms
@@ -80,12 +91,7 @@ const SourceSearchPreview = React.memo(
mode,
}: {
source: Pick<SourceType, 'id' | 'displayName' | 'lang'>;
onSearchRequestFinished: (
source: SourceIdInfo,
isLoading: boolean,
hasResults: boolean,
emptySearch: boolean,
) => void;
onSearchRequestFinished: (source: SourceIdInfo, state: SourceLoadingState) => void;
searchString: string | null | undefined;
emptyQuery: boolean;
} & Pick<MangaCardProps, 'mode'>) => {
@@ -114,8 +120,13 @@ const SourceSearchPreview = React.memo(
const noMangasFound = !error && !isLoading && !mangas.length;
useEffect(() => {
onSearchRequestFinished(source, isLoading, !noMangasFound, !searchString);
}, [isLoading, noMangasFound, searchString]);
onSearchRequestFinished(source, {
isLoading,
hasResults: !noMangasFound,
emptySearch: !searchString,
error,
});
}, [isLoading, noMangasFound, searchString, error]);
let errorMessage: string | undefined;
if (error) {
@@ -214,10 +225,10 @@ export const SearchAll: React.FC = () => {
);
const updateSourceLoadingState = useCallback(
({ id }: SourceIdInfo, isLoading: boolean, hasResults: boolean, emptySearch: boolean) => {
({ id }: SourceIdInfo, loadState: SourceLoadingState) => {
setSourceToLoadingStateMap((currentMap) => {
const mapCopy = new Map(currentMap);
mapCopy.set(id, { isLoading, hasResults, emptySearch });
mapCopy.set(id, loadState);
return mapCopy;
});
},