Unify scrape refactor (#1630)

* Unify scraped types
* Make name fields optional
* Unify single scrape queries
* Change UI to use new interfaces
* Add multi scrape interfaces
* Use images instead of image
This commit is contained in:
WithoutPants
2021-09-07 11:54:22 +10:00
committed by GitHub
parent 04e146f290
commit 4625e1f955
40 changed files with 1035 additions and 781 deletions

View File

@@ -277,12 +277,12 @@ export const SceneEditPanel: React.FC<IProps> = ({
setIsLoading(true);
try {
const result = await queryStashBoxScene(stashBoxIndex, scene.id);
if (!result.data || !result.data.queryStashBoxScene) {
if (!result.data || !result.data.scrapeSingleScene) {
return;
}
if (result.data.queryStashBoxScene.length > 0) {
setScrapedScene(result.data.queryStashBoxScene[0]);
if (result.data.scrapeSingleScene.length > 0) {
setScrapedScene(result.data.scrapeSingleScene[0]);
} else {
Toast.success({
content: "No scenes found",
@@ -298,17 +298,15 @@ export const SceneEditPanel: React.FC<IProps> = ({
async function onScrapeClicked(scraper: GQL.Scraper) {
setIsLoading(true);
try {
const result = await queryScrapeScene(
scraper.id,
getSceneInput(formik.values)
);
if (!result.data || !result.data.scrapeScene) {
const result = await queryScrapeScene(scraper.id, scene.id);
if (!result.data || !result.data.scrapeSingleScene?.length) {
Toast.success({
content: "No scenes found",
});
return;
}
setScrapedScene(result.data.scrapeScene);
// assume one returned scene
setScrapedScene(result.data.scrapeSingleScene[0]);
} catch (e) {
Toast.error(e);
} finally {