{translate('WhySearchesCouldBeFailing')}
diff --git a/frontend/src/Studio/AddNewStudio/AddNewStudioModal.tsx b/frontend/src/Studio/AddNewStudio/AddNewStudioModal.tsx
index 4a977ecd66..d8370bd463 100644
--- a/frontend/src/Studio/AddNewStudio/AddNewStudioModal.tsx
+++ b/frontend/src/Studio/AddNewStudio/AddNewStudioModal.tsx
@@ -1,11 +1,12 @@
import React from 'react';
import Modal from 'Components/Modal/Modal';
-import { Image } from 'Studio/Studio';
+import Studio, { Image } from 'Studio/Studio';
import AddNewStudioModalContent from './AddNewStudioModalContent';
interface AddNewStudioModalProps {
isOpen: boolean;
onModalClose: () => void;
+ studio: Studio;
foreignId: string;
title: string;
images: Image[];
diff --git a/frontend/src/Studio/AddNewStudio/AddNewStudioModalContent.tsx b/frontend/src/Studio/AddNewStudio/AddNewStudioModalContent.tsx
index be40092c3f..b4773fa78c 100644
--- a/frontend/src/Studio/AddNewStudio/AddNewStudioModalContent.tsx
+++ b/frontend/src/Studio/AddNewStudio/AddNewStudioModalContent.tsx
@@ -10,7 +10,7 @@ import ModalContent from 'Components/Modal/ModalContent';
import ModalFooter from 'Components/Modal/ModalFooter';
import ModalHeader from 'Components/Modal/ModalHeader';
import { inputTypes, kinds } from 'Helpers/Props';
-import { Image } from 'Studio/Studio';
+import Studio, { Image } from 'Studio/Studio';
import StudioLogo from 'Studio/StudioLogo';
import { EnhancedSelectInputChanged } from 'typings/inputs';
import translate from 'Utilities/String/translate';
@@ -18,6 +18,7 @@ import { useAddNewStudioModalContent } from './useAddNewStudio';
import styles from './AddNewStudioModalContent.css';
interface AddNewStudioModalContentProps {
+ studio: Studio;
foreignId: string;
title: string;
images: Image[];
@@ -25,7 +26,7 @@ interface AddNewStudioModalContentProps {
}
function AddNewStudioModalContent(props: AddNewStudioModalContentProps) {
- const { foreignId, title, images, onModalClose } = props;
+ const { title, images, onModalClose, studio } = props;
const {
isAdding,
@@ -35,7 +36,7 @@ function AddNewStudioModalContent(props: AddNewStudioModalContentProps) {
settings,
onInputChange,
onAddStudioPress,
- } = useAddNewStudioModalContent(foreignId);
+ } = useAddNewStudioModalContent(studio);
const onQualityProfileIdChange = React.useCallback(
({ value }: EnhancedSelectInputChanged
) => {
diff --git a/frontend/src/Studio/AddNewStudio/AddNewStudioSearchResult.tsx b/frontend/src/Studio/AddNewStudio/AddNewStudioSearchResult.tsx
index 5414a49dcb..4c42f37060 100644
--- a/frontend/src/Studio/AddNewStudio/AddNewStudioSearchResult.tsx
+++ b/frontend/src/Studio/AddNewStudio/AddNewStudioSearchResult.tsx
@@ -134,6 +134,7 @@ function AddNewStudioSearchResult({
;
}
-interface AddMovieState {
- isPopulated: boolean;
- error: AppError | null;
- isAdding: boolean;
- isFetching: boolean;
- isAdded: boolean;
- addError: AppError | null;
- items: LookupStudioItem[];
- studiosWithStatus: StudioWithExistingStatus[];
- studioDefaults: StudioDefaults;
-}
-
-type RootState = AppState & {
- addMovie: AddMovieState;
-};
-
const defaultStudioDefaults: StudioDefaults = {
rootFolderPath: '',
monitored: true,
@@ -86,111 +61,75 @@ const defaultStudioDefaults: StudioDefaults = {
tags: [],
};
+interface SearchResource {
+ foreignId: string;
+ studio: Studio;
+ isExisting: boolean;
+}
+
function useAddNewStudio() {
const dispatch = useDispatch();
- const addMovie = useSelector((state: RootState) => state.addMovie);
const uiSettings = useSelector(createUISettingsSelector());
const existingStudiosCount = useSelector(
(state: AppState) => state.studios.items.length
);
const [term, setTerm] = useState('');
-
- const studioLookupTimeout = React.useRef | null>(null);
+ const [debouncedTerm, setDebouncedTerm] = useState('');
+ const timeoutRef = useRef | null>(null);
React.useEffect(() => {
dispatch(fetchRootFolders());
dispatch(fetchQueueDetails());
return () => {
- if (studioLookupTimeout.current) {
- clearTimeout(studioLookupTimeout.current);
+ if (timeoutRef.current) {
+ clearTimeout(timeoutRef.current);
}
- dispatch(clearAddMovie());
dispatch(clearQueueDetails());
};
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
- // When lookup results change, check which studios already exist
- React.useEffect(() => {
- if (addMovie?.items && addMovie.items.length > 0) {
- const foreignIds = addMovie.items
- .map((item: LookupStudioItem) => item.studio.foreignId)
- .filter((id: string | undefined) => id);
-
- if (foreignIds.length > 0) {
- const { request } = createAjaxRequest({
- url: '/studio/list',
- method: 'POST',
- contentType: 'application/json',
- data: JSON.stringify(foreignIds),
- });
-
- request.done((existingStudios: Studio[]) => {
- // Create a map of foreignId to full studio object
- const existingStudioMap = new Map(
- existingStudios.map((s) => [s.foreignId, s])
- );
-
- // Map over lookup items, using full studio data if available
- const mapped = addMovie.items.map((item: LookupStudioItem) => {
- const fullStudio = existingStudioMap.get(item.studio.foreignId);
- return {
- studio: fullStudio || item.studio,
- isExistingStudio: !!fullStudio,
- };
- });
-
- dispatch(setStudiosWithStatus(mapped));
- });
-
- request.fail(() => {
- // If the request fails, assume none exist
- const mapped = addMovie.items.map((item: LookupStudioItem) => ({
- studio: item.studio,
- isExistingStudio: false,
- }));
-
- dispatch(setStudiosWithStatus(mapped));
- });
- }
+ const {
+ data: searchResources = [],
+ isFetching,
+ error,
+ } = useApiQuery({
+ path: '/lookup/studio',
+ queryParams: { term: debouncedTerm },
+ queryOptions: { enabled: !!debouncedTerm.trim() },
+ });
+
+ const onStudioLookupChange = React.useCallback((value: string) => {
+ setTerm(value);
+ if (timeoutRef.current) {
+ clearTimeout(timeoutRef.current);
+ }
+ if (value.trim() === '') {
+ setDebouncedTerm('');
} else {
- dispatch(setStudiosWithStatus([]));
+ timeoutRef.current = setTimeout(() => {
+ setDebouncedTerm(value);
+ }, 300);
}
- }, [addMovie?.items, addMovie?.isAdding, dispatch]);
-
- const onStudioLookupChange = React.useCallback(
- (value: string) => {
- setTerm(value);
- if (studioLookupTimeout.current) {
- clearTimeout(studioLookupTimeout.current);
- }
- if (value.trim() === '') {
- dispatch(clearAddMovie());
- } else {
- studioLookupTimeout.current = setTimeout(() => {
- dispatch(lookupStudio({ term: value }));
- }, 300);
- }
- },
- [dispatch]
- );
+ }, []);
const onClearStudioLookupPress = React.useCallback(() => {
setTerm('');
- dispatch(clearAddMovie());
- }, [dispatch]);
+ setDebouncedTerm('');
+ }, []);
return {
- isPopulated: addMovie?.isPopulated || false,
- error: addMovie?.error,
- isAdding: addMovie?.isAdding || false,
- isFetching: addMovie?.isFetching || false,
- isAdded: addMovie?.isAdded || false,
- addError: addMovie?.addError,
- items: addMovie?.items || [],
- studiosWithStatus: addMovie?.studiosWithStatus || [],
+ isPopulated: !!debouncedTerm.trim() && !isFetching,
+ error,
+ isAdding: false,
+ isFetching: isFetching && !!debouncedTerm.trim(),
+ isAdded: false,
+ addError: null,
+ items: searchResources,
+ studiosWithStatus: searchResources.map((r) => ({
+ studio: r.studio,
+ isExistingStudio: r.isExisting,
+ })),
term,
colorImpairedMode: uiSettings.enableColorImpairedMode,
hasExistingStudios: existingStudiosCount > 0,
@@ -211,25 +150,39 @@ export function useAddNewStudioSearchResult() {
};
}
-export function useAddNewStudioModalContent(foreignId: string) {
+export function useAddNewStudioModalContent(studio: Studio) {
const dispatch = useDispatch();
const { isSmallScreen } = useSelector(createDimensionsSelector());
const systemStatus = useSelector(createSystemStatusSelector());
const safeForWorkMode = useSelector(
(state: AppState) => state.settings.safeForWorkMode
);
- const addMovieState = useSelector((state: RootState) => state.addMovie);
- const {
- isAdding = false,
- addError,
- studioDefaults = defaultStudioDefaults,
- } = addMovieState || {};
+ const addMovieState = useSelector(
+ (
+ state: AppState & {
+ addMovie: { studioDefaults: StudioDefaults; addError?: ApiError };
+ }
+ ) => state.addMovie
+ );
+
+ const { studioDefaults = defaultStudioDefaults } = addMovieState || {};
+
+ const mutation = useApiMutation({
+ method: 'POST',
+ path: '/studio',
+ mutationOptions: {
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ['/studio/paged'] });
+ queryClient.invalidateQueries({ queryKey: ['/lookup/studio'] });
+ },
+ },
+ });
const { settings, validationErrors, validationWarnings } = selectSettings(
studioDefaults,
{},
- addError
+ mutation.error
) as {
settings: AddStudioSettings;
validationErrors: unknown[];
@@ -244,22 +197,21 @@ export function useAddNewStudioModalContent(foreignId: string) {
);
const onAddStudioPress = React.useCallback(() => {
- dispatch(
- addStudio({
- foreignId,
- rootFolderPath: settings.rootFolderPath.value,
- monitored: settings.monitored.value === true,
- moviesMonitored: settings.moviesMonitored.value === true,
- qualityProfileId: settings.qualityProfileId.value,
- searchForMovie: settings.searchForMovie.value,
- tags: settings.tags.value,
- })
- );
- }, [dispatch, foreignId, settings]);
+ const studioToAdd = getNewStudio(cloneDeep(studio) as object, {
+ rootFolderPath: settings.rootFolderPath.value,
+ monitored: settings.monitored.value === true,
+ moviesMonitored: settings.moviesMonitored.value === true,
+ qualityProfileId: settings.qualityProfileId.value,
+ searchForMovie: settings.searchForMovie.value,
+ tags: settings.tags.value,
+ }) as Studio;
+ studioToAdd.id = 0;
+ mutation.mutate(studioToAdd);
+ }, [studio, settings, mutation]);
return {
- addError,
- isAdding,
+ addError: mutation.error,
+ isAdding: mutation.isPending,
isSmallScreen,
isWindows: systemStatus.isWindows,
safeForWorkMode,
diff --git a/src/Whisparr.Api.V3/Search/SearchController.cs b/src/Whisparr.Api.V3/Search/SearchController.cs
index 1fee1f3ae0..d1abd1e9f3 100644
--- a/src/Whisparr.Api.V3/Search/SearchController.cs
+++ b/src/Whisparr.Api.V3/Search/SearchController.cs
@@ -27,6 +27,7 @@ public class SearchController : Controller
private readonly IConfigService _configService;
private readonly IImportListExclusionService _exclusionService;
private readonly IMovieService _movieService;
+ private readonly IStudioService _studioService;
public SearchController(ISearchForNewMovie searchProxy,
IBuildFileNames fileNameBuilder,
@@ -34,7 +35,8 @@ public SearchController(ISearchForNewMovie searchProxy,
IMapCoversToLocal coverMapper,
IConfigService configService,
IImportListExclusionService exclusionService,
- IMovieService movieService)
+ IMovieService movieService,
+ IStudioService studioService)
{
_searchProxy = searchProxy;
_fileNameBuilder = fileNameBuilder;
@@ -43,6 +45,7 @@ public SearchController(ISearchForNewMovie searchProxy,
_configService = configService;
_exclusionService = exclusionService;
_movieService = movieService;
+ _studioService = studioService;
}
[HttpGet("scene")]
@@ -67,7 +70,9 @@ public object SearchMovie([FromQuery] string term)
public object SearchStudio([FromQuery] string term)
{
var searchResults = _searchProxy.SearchForNewStudio(term);
- return MapToResource(searchResults).ToList();
+ var searchResources = MapToResource(searchResults).ToList();
+ MapToExistingStudios(searchResources);
+ return searchResources;
}
[HttpGet("performer")]
@@ -90,6 +95,19 @@ private void MapToExistingMovies(List searchResources)
}
}
+ private void MapToExistingStudios(List searchResources)
+ {
+ var matches = _studioService.FindByForeignIds(searchResources.Select(s => s.ForeignId).ToList());
+ foreach (var s in searchResources)
+ {
+ var match = matches.Where(m => m.ForeignId == s.ForeignId);
+ if (match.Any())
+ {
+ s.isExisting = true;
+ }
+ }
+ }
+
private IEnumerable MapToResource(IEnumerable