Mirrors/stash
1
0
Fork 0
mirror of https://github.com/stashapp/stash.git synced 2025-12-17 20:34:37 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle equality when scraping scene performers (#4094)

Browse Source
This commit is contained in:
WithoutPants
2023-09-11 10:50:24 +10:00
committed by GitHub
parent 50c4ac98af
commit cf3301c8bc
4 changed files with 63 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ui/v2.5/src/components/Scenes/SceneMergeDialog.tsx
View File

@@ -25,6 +25,7 @@ import { RatingSystem } from "src/components/Shared/Rating/RatingSystem";
import { ModalComponent } from "../Shared/Modal";
import { IHasStoredID, sortStoredIdObjects } from "src/utils/data";
import {
ObjectListScrapeResult,
ScrapeResult,
ZeroableScrapeResult,
hasScrapedValues,
@@ -118,9 +119,9 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
}
const [performers, setPerformers] = useState<
ScrapeResult<GQL.ScrapedPerformer[]>
ObjectListScrapeResult<GQL.ScrapedPerformer>
>(
new ScrapeResult<GQL.ScrapedPerformer[]>(
new ObjectListScrapeResult<GQL.ScrapedPerformer>(
sortStoredIdObjects(dest.performers.map(idToStoredID))
)
);
@@ -203,8 +204,8 @@ const SceneMergeDetails: React.FC<ISceneMergeDetailsProps> = ({
);
setPerformers(
new ScrapeResult(
dest.performers.map(idToStoredID),
new ObjectListScrapeResult<GQL.ScrapedPerformer>(
sortStoredIdObjects(dest.performers.map(idToStoredID)),
uniqIDStoredIDs(all.map((s) => s.performers.map(idToStoredID)).flat())
)
);