summaryrefslogtreecommitdiffstatshomepage
path: root/frontend/src/lib/scraper
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--frontend/src/lib/scraper/ComicScrapeForm.svelte125
-rw-r--r--frontend/src/lib/scraper/Scraper.svelte.ts (renamed from frontend/src/lib/Scraper.ts)28
-rw-r--r--frontend/src/lib/scraper/components/SelectorButton.svelte10
-rw-r--r--frontend/src/lib/scraper/components/SelectorGroup.svelte13
-rw-r--r--frontend/src/lib/scraper/components/SelectorItem.svelte5
5 files changed, 101 insertions, 80 deletions
diff --git a/frontend/src/lib/scraper/ComicScrapeForm.svelte b/frontend/src/lib/scraper/ComicScrapeForm.svelte
index 30ad89b..6cc3451 100644
--- a/frontend/src/lib/scraper/ComicScrapeForm.svelte
+++ b/frontend/src/lib/scraper/ComicScrapeForm.svelte
@@ -2,60 +2,69 @@
import { upsertComics } from '$gql/Mutations';
import { comicScrapersQuery, scrapeComic } from '$gql/Queries';
import { isError } from '$gql/Utils';
- import { OnMissing, type FullComicFragment } from '$gql/graphql';
- import { ScrapedComicSelector, getScraperContext } from '$lib/Scraper';
+ import { OnMissing, type FullComicFragment, type ScrapeComicQuery } from '$gql/graphql';
import { toastError, toastFinally } from '$lib/Toasts';
import Select from '$lib/components/Select.svelte';
import Spinner from '$lib/components/Spinner.svelte';
- import { getContextClient } from '@urql/svelte';
+ import { getContextClient, type OperationResult } from '@urql/svelte';
+ import { getScraperContext, ScrapedComicSelector } from './Scraper.svelte';
import SelectorGroup from './components/SelectorGroup.svelte';
import SelectorItem from './components/SelectorItem.svelte';
let client = getContextClient();
const context = getScraperContext();
- export let comic: FullComicFragment;
- let createMissing = false;
- let loading = false;
+ interface Props {
+ comic: FullComicFragment;
+ onupsert: () => void;
+ }
- $: scrapersResult = comicScrapersQuery(client, { id: comic.id });
- $: scrapers = $scrapersResult.data?.comicScrapers;
+ let { comic, onupsert }: Props = $props();
+ let createMissing = $state(false);
+ let loading = $state(false);
- function scrape() {
- loading = true;
- scrapeComic(client, { id: comic.id, scraper: $context.scraper })
- .then((result) => {
- if (result.error) {
- toastError(result.error.message);
- return;
- }
+ let scrapersResult = $derived(comicScrapersQuery(client, { id: comic.id }));
+ let scrapers = $derived($scrapersResult.data?.comicScrapers);
- if (result.data) {
- if (isError(result.data.scrapeComic)) {
- toastError(result.data.scrapeComic.message);
- return;
- }
+ function scrape(event: SubmitEvent) {
+ event.preventDefault();
+ if (!context.scraper) return;
- if (result.data.scrapeComic.__typename === 'ScrapeComicResult') {
- $context.selector = new ScrapedComicSelector(result.data.scrapeComic.data, comic);
- $context.warnings = result.data.scrapeComic.warnings;
- }
- }
- })
+ loading = true;
+ scrapeComic(client, { id: comic.id, scraper: context.scraper })
+ .then(handleScrapeResult)
.catch(toastFinally)
.finally(() => (loading = false));
}
- function updateFromScrape(createMissing: boolean) {
- if (!$context.selector) return;
+ function handleScrapeResult(result: OperationResult<ScrapeComicQuery>) {
+ if (result.error) {
+ toastError(result.error.message);
+ return;
+ }
+
+ if (result.data) {
+ if (isError(result.data.scrapeComic)) {
+ toastError(result.data.scrapeComic.message);
+ return;
+ }
+
+ if (result.data.scrapeComic.__typename === 'ScrapeComicResult') {
+ context.selector = new ScrapedComicSelector(result.data.scrapeComic.data, comic);
+ context.warnings = result.data.scrapeComic.warnings;
+ }
+ }
+ }
+
+ function upsert(event: SubmitEvent) {
+ event.preventDefault();
+ if (!context.selector) return;
- upsertComics(client, {
- ids: comic.id,
- input: $context.selector.toInput(createMissing ? OnMissing.Create : OnMissing.Ignore)
- })
+ const input = context.selector.input(createMissing ? OnMissing.Create : OnMissing.Ignore);
+ upsertComics(client, { ids: comic.id, input })
.then(() => {
- $context.selector = undefined;
- $context.warnings = [];
+ onupsert();
+ context.reset();
})
.catch(toastFinally);
}
@@ -65,56 +74,56 @@
{#if scrapers && scrapers.length === 0}
<h2 class="text-base">No scrapers available.</h2>
{:else}
- <form on:submit|preventDefault={scrape}>
+ <form onsubmit={scrape}>
<div class="grid grid-cols-6 gap-2">
<div class="col-span-5">
<Select
id="scrapers"
options={scrapers}
placeholder={'Select scraper...'}
- bind:value={$context.scraper}
+ bind:value={context.scraper}
/>
</div>
- <button type="submit" disabled={!$context.scraper} class="btn-blue">Scrape</button>
+ <button type="submit" disabled={!context.scraper} class="btn-blue">Scrape</button>
</div>
</form>
{/if}
{#if loading}
<Spinner />
- {:else if $context.selector}
- {#if $context.warnings.length > 0}
+ {:else if context.selector}
+ {#if context.warnings.length > 0}
<div class="flex flex-col gap-2">
<h2 class="flex gap-1 border-b border-slate-700 text-base font-medium">Warnings</h2>
<ul class="ml-2 list-inside list-disc">
- {#each $context.warnings as warning}
+ {#each context.warnings as warning}
<li>{warning}</li>
{/each}
</ul>
</div>
{/if}
- {#if !$context.selector.hasData()}
+ {#if !context.selector.pending()}
<h2 class="text-base">No data to merge.</h2>
{:else}
<div class="flex flex-col gap-2">
<h2 class="border-b border-slate-700 text-base font-medium">Results</h2>
- <form on:submit|preventDefault={() => updateFromScrape(createMissing)}>
+ <form onsubmit={upsert}>
<div class="grid grid-cols-6 gap-4 pb-2">
- <SelectorItem title="Title" selector={$context.selector.title} />
- <SelectorItem title="Original Title" selector={$context.selector.originalTitle} />
- <SelectorItem title="URL" selector={$context.selector.url} />
- <SelectorItem title="Date" selector={$context.selector.date} --span="2" />
- <SelectorItem title="Category" selector={$context.selector.category} --span="2" />
- <SelectorItem title="Language" selector={$context.selector.language} --span="2" />
- <SelectorItem title="Rating" selector={$context.selector.rating} --span="2" />
- <SelectorItem title="Censorship" selector={$context.selector.censorship} --span="2" />
- <SelectorItem title="Direction" selector={$context.selector.direction} --span="2" />
- <SelectorItem title="Layout" selector={$context.selector.layout} --span="2" />
- <SelectorGroup title="Artists" selectors={$context.selector.artists} />
- <SelectorGroup title="Circles" selectors={$context.selector.circles} />
- <SelectorGroup title="Characters" selectors={$context.selector.characters} />
- <SelectorGroup title="Worlds" selectors={$context.selector.worlds} />
- <SelectorGroup title="Tags" selectors={$context.selector.tags} />
+ <SelectorItem title="Title" selector={context.selector.title} />
+ <SelectorItem title="Original Title" selector={context.selector.originalTitle} />
+ <SelectorItem title="URL" selector={context.selector.url} />
+ <SelectorItem title="Date" selector={context.selector.date} --span="2" />
+ <SelectorItem title="Category" selector={context.selector.category} --span="2" />
+ <SelectorItem title="Language" selector={context.selector.language} --span="2" />
+ <SelectorItem title="Rating" selector={context.selector.rating} --span="2" />
+ <SelectorItem title="Censorship" selector={context.selector.censorship} --span="2" />
+ <SelectorItem title="Direction" selector={context.selector.direction} --span="2" />
+ <SelectorItem title="Layout" selector={context.selector.layout} --span="2" />
+ <SelectorGroup title="Artists" selectors={context.selector.artists} />
+ <SelectorGroup title="Circles" selectors={context.selector.circles} />
+ <SelectorGroup title="Characters" selectors={context.selector.characters} />
+ <SelectorGroup title="Worlds" selectors={context.selector.worlds} />
+ <SelectorGroup title="Tags" selectors={context.selector.tags} />
</div>
<div class="flex flex-col gap-2">
<h2 class="border-b border-slate-700 text-base font-medium">Options</h2>
diff --git a/frontend/src/lib/Scraper.ts b/frontend/src/lib/scraper/Scraper.svelte.ts
index 4baf370..93e756b 100644
--- a/frontend/src/lib/Scraper.ts
+++ b/frontend/src/lib/scraper/Scraper.svelte.ts
@@ -20,24 +20,28 @@ import {
RatingLabel
} from '$lib/Enums';
import { getContext, setContext } from 'svelte';
-import { writable, type Writable } from 'svelte/store';
-interface ScraperContext {
- scraper: string;
- warnings: string[];
- selector?: ScrapedComicSelector;
+class ScraperContext {
+ scraper?: string = $state();
+ warnings: string[] = $state([]);
+ selector?: ScrapedComicSelector = $state();
+
+ reset = () => {
+ this.selector = undefined;
+ this.warnings = [];
+ };
}
export function initScraperContext() {
- return setContext<Writable<ScraperContext>>('scraper', writable({ scraper: '', warnings: [] }));
+ return setContext<ScraperContext>('scraper', new ScraperContext());
}
export function getScraperContext() {
- return getContext<Writable<ScraperContext>>('scraper');
+ return getContext<ScraperContext>('scraper');
}
export class Selector<T extends string> {
- keep = true;
+ keep = $state(true);
value: T;
display: string | undefined;
@@ -46,6 +50,10 @@ export class Selector<T extends string> {
this.display = display;
}
+ toggle = () => {
+ this.keep = !this.keep;
+ };
+
toString() {
return this.display ?? this.value;
}
@@ -121,7 +129,7 @@ export class ScrapedComicSelector {
this.worlds = Selector.fromList(scraped.worlds, comic.worlds);
}
- hasData() {
+ pending() {
return (
Object.values(this).filter((i) => {
if (i === undefined) {
@@ -134,7 +142,7 @@ export class ScrapedComicSelector {
);
}
- toInput(onMissing: OnMissing): UpsertComicInput {
+ input(onMissing: OnMissing): UpsertComicInput {
return {
title: keepItem(this.title),
originalTitle: keepItem(this.originalTitle),
diff --git a/frontend/src/lib/scraper/components/SelectorButton.svelte b/frontend/src/lib/scraper/components/SelectorButton.svelte
index b786f89..e976f91 100644
--- a/frontend/src/lib/scraper/components/SelectorButton.svelte
+++ b/frontend/src/lib/scraper/components/SelectorButton.svelte
@@ -1,19 +1,19 @@
<script lang="ts">
- import { Selector } from '$lib/Scraper';
+ import { Selector } from '../Scraper.svelte';
- export let selector: Selector<string>;
+ let { selector }: { selector: Selector<string> } = $props();
</script>
<button
type="button"
class="ml-1 flex rounded-sm border-slate-700 bg-slate-900 hover:brightness-110"
- on:click={() => (selector.keep = !selector.keep)}
+ onclick={selector.toggle}
>
<div class="flex self-center pl-1">
{#if selector.keep}
- <span class="icon-base icon-[material-symbols--check] text-green-400" />
+ <span class="icon-base icon-[material-symbols--check] text-green-400"></span>
{:else}
- <span class="icon-base icon-[material-symbols--close] text-red-400" />
+ <span class="icon-base icon-[material-symbols--close] text-red-400"></span>
{/if}
</div>
<p class:opacity-50={!selector.keep} class="p-1 text-left">
diff --git a/frontend/src/lib/scraper/components/SelectorGroup.svelte b/frontend/src/lib/scraper/components/SelectorGroup.svelte
index 1fdb8f2..11489b1 100644
--- a/frontend/src/lib/scraper/components/SelectorGroup.svelte
+++ b/frontend/src/lib/scraper/components/SelectorGroup.svelte
@@ -1,9 +1,13 @@
<script lang="ts">
- import { Selector } from '$lib/Scraper';
+ import { Selector } from '../Scraper.svelte';
import SelectorButton from './SelectorButton.svelte';
- export let title: string;
- export let selectors: Selector<string>[];
+ interface Props {
+ title: string;
+ selectors: Selector<string>[];
+ }
+
+ let { title, selectors = $bindable() }: Props = $props();
function invert() {
for (let selector of selectors) {
@@ -20,8 +24,9 @@
<button
type="button"
class="flex items-end opacity-75 brightness-75 transition-opacity hover:opacity-100 hover:brightness-110 focus-visible:opacity-100"
- on:click={invert}
+ onclick={invert}
title="Invert selection"
+ aria-label="Invert selection"
>
<span class="icon-xs icon-[material-symbols--compare-arrows]"></span>
</button>
diff --git a/frontend/src/lib/scraper/components/SelectorItem.svelte b/frontend/src/lib/scraper/components/SelectorItem.svelte
index dd3f5b4..5beba50 100644
--- a/frontend/src/lib/scraper/components/SelectorItem.svelte
+++ b/frontend/src/lib/scraper/components/SelectorItem.svelte
@@ -1,9 +1,8 @@
<script lang="ts">
- import { Selector } from '$lib/Scraper';
+ import { Selector } from '../Scraper.svelte';
import SelectorButton from './SelectorButton.svelte';
- export let title: string;
- export let selector: Selector<string> | undefined;
+ let { title, selector }: { title: string; selector?: Selector<string> } = $props();
</script>
{#if selector}
powered by cgit and git | oriole.systems | how to verify signatures