mirror of
https://github.com/idanoo/autobrr
synced 2025-07-22 16:29:12 +00:00
feat(lists): add anilist support (#1949)
* fix(lists): clear selected list * chore(web): improve onChange set values for select_wide * feat(web): add anilist lists * feat(web): Filter is required on ListForm * fix(web): ListForm reset url when change type * feat(lists): add anilist support * feat(lists): filter duplicates for anilist * feat(anilist): handle special characters * fix(lists): better title matching fix(lists): add alternatives to apostrophe replacement * test(title): add some anime cases * feat(anilist): replace unicodes with regex * feat(lists): move additional anilist processing to autobrr instead of brr api * feat(lists): clean Unicode Block “Latin Extended-A” chars --------- Co-authored-by: martylukyy <35452459+martylukyy@users.noreply.github.com>
This commit is contained in:
parent
5e2769639f
commit
b724429b97
10 changed files with 257 additions and 55 deletions
|
@ -78,12 +78,8 @@ export function SelectFieldCreatable<T>({ name, label, help, placeholder, toolti
|
|||
// value={field?.value ? field.value : options.find(o => o.value == field?.value)}
|
||||
value={field?.value ? { value: field.value, label: field.value } : field.value}
|
||||
onChange={(newValue: unknown) => {
|
||||
if (newValue) {
|
||||
setFieldValue(field.name, (newValue as { value: string }).value);
|
||||
}
|
||||
else {
|
||||
setFieldValue(field.name, "")
|
||||
}
|
||||
const option = newValue as { value: string };
|
||||
setFieldValue(field.name, option?.value ?? "");
|
||||
}}
|
||||
options={[...[...options, { value: field.value, label: field.value }].reduce((map, obj) => map.set(obj.value, obj), new Map()).values()]}
|
||||
/>
|
||||
|
@ -143,12 +139,8 @@ export function SelectField<T>({ name, label, help, placeholder, options }: Sele
|
|||
// value={field?.value ? field.value : options.find(o => o.value == field?.value)}
|
||||
value={field?.value ? { value: field.value, label: field.value } : field.value}
|
||||
onChange={(newValue: unknown) => {
|
||||
if (newValue) {
|
||||
setFieldValue(field.name, (newValue as { value: string }).value);
|
||||
}
|
||||
else {
|
||||
setFieldValue(field.name, "")
|
||||
}
|
||||
const option = newValue as { value: string };
|
||||
setFieldValue(field.name, option?.value ?? "");
|
||||
}}
|
||||
options={[...[...options, { value: field.value, label: field.value }].reduce((map, obj) => map.set(obj.value, obj), new Map()).values()]}
|
||||
/>
|
||||
|
@ -213,12 +205,8 @@ export function SelectFieldBasic<T>({ name, label, help, placeholder, required,
|
|||
defaultValue={defaultValue}
|
||||
value={field?.value && options.find(o => o.value == field?.value)}
|
||||
onChange={(newValue: unknown) => {
|
||||
if (newValue) {
|
||||
setFieldValue(field.name, (newValue as { value: string }).value);
|
||||
}
|
||||
else {
|
||||
setFieldValue(field.name, "")
|
||||
}
|
||||
const option = newValue as { value: string };
|
||||
setFieldValue(field.name, option?.value ?? "");
|
||||
}}
|
||||
options={options}
|
||||
/>
|
||||
|
@ -247,7 +235,7 @@ interface ListFilterMultiSelectOption {
|
|||
name: string;
|
||||
}
|
||||
|
||||
export function ListFilterMultiSelectField({ name, label, help, tooltip, options }: MultiSelectFieldProps) {
|
||||
export function ListFilterMultiSelectField({ name, label, help, tooltip, options, required }: MultiSelectFieldProps) {
|
||||
return (
|
||||
<div className="flex items-center space-y-1 p-4 sm:space-y-0 sm:grid sm:grid-cols-3 sm:gap-4">
|
||||
<div>
|
||||
|
@ -259,11 +247,12 @@ export function ListFilterMultiSelectField({ name, label, help, tooltip, options
|
|||
{tooltip ? (
|
||||
<DocsTooltip label={label}>{tooltip}</DocsTooltip>
|
||||
) : label}
|
||||
<common.RequiredField required={required} />
|
||||
</div>
|
||||
</label>
|
||||
</div>
|
||||
<div className="sm:col-span-2">
|
||||
<Field name={name} type="select">
|
||||
<Field name={name} type="select" required={required}>
|
||||
{({
|
||||
field,
|
||||
form: { setFieldValue }
|
||||
|
|
|
@ -450,6 +450,10 @@ export const ListTypeOptions: OptionBasicTyped<ListType>[] = [
|
|||
label: "Metacritic",
|
||||
value: "METACRITIC"
|
||||
},
|
||||
{
|
||||
label: "AniList",
|
||||
value: "ANILIST"
|
||||
},
|
||||
];
|
||||
|
||||
export const ListTypeNameMap: Record<ListType, string> = {
|
||||
|
@ -463,6 +467,7 @@ export const ListTypeNameMap: Record<ListType, string> = {
|
|||
"METACRITIC": "Metacritic",
|
||||
"STEAM": "Steam",
|
||||
"PLAINTEXT": "Plaintext",
|
||||
"ANILIST": "AniList",
|
||||
};
|
||||
|
||||
export const NotificationTypeOptions: OptionBasicTyped<NotificationType>[] = [
|
||||
|
@ -708,3 +713,18 @@ export const ListsMDBListOptions: OptionBasic[] = [
|
|||
value: "https://mdblist.com/lists/garycrawfordgc/latest-tv-shows/json"
|
||||
},
|
||||
];
|
||||
|
||||
export const ListsAniListOptions: OptionBasic[] = [
|
||||
{
|
||||
label: "Current anime season",
|
||||
value: "https://api.autobrr.com/lists/anilist/seasonal"
|
||||
},
|
||||
{
|
||||
label: "Trending animes",
|
||||
value: "https://api.autobrr.com/lists/anilist/trending"
|
||||
},
|
||||
{
|
||||
label: "Next anime season",
|
||||
value: "https://api.autobrr.com/lists/anilist/upcoming"
|
||||
},
|
||||
];
|
||||
|
|
|
@ -20,7 +20,9 @@ import {
|
|||
DialogPanel,
|
||||
DialogTitle,
|
||||
Listbox,
|
||||
ListboxButton, ListboxOption, ListboxOptions,
|
||||
ListboxButton,
|
||||
ListboxOption,
|
||||
ListboxOptions,
|
||||
Transition,
|
||||
TransitionChild
|
||||
} from "@headlessui/react";
|
||||
|
@ -41,8 +43,9 @@ import {
|
|||
ListsMDBListOptions,
|
||||
ListsMetacriticOptions,
|
||||
ListsTraktOptions,
|
||||
ListTypeOptions, OptionBasicTyped,
|
||||
SelectOption
|
||||
ListsAniListOptions,
|
||||
ListTypeOptions,
|
||||
OptionBasicTyped
|
||||
} from "@domain/constants";
|
||||
import { DEBUG } from "@components/debug";
|
||||
import {
|
||||
|
@ -53,6 +56,7 @@ import {
|
|||
import { classNames, sleep } from "@utils";
|
||||
import {
|
||||
ListFilterMultiSelectField,
|
||||
SelectFieldBasic,
|
||||
SelectFieldCreatable
|
||||
} from "@components/inputs/select_wide";
|
||||
import { DocsTooltip } from "@components/tooltips/DocsTooltip";
|
||||
|
@ -215,15 +219,9 @@ export function ListAddForm({ isOpen, toggle }: AddFormProps) {
|
|||
}
|
||||
})}
|
||||
value={field?.value && field.value.value}
|
||||
onChange={(option: unknown) => {
|
||||
// resetForm();
|
||||
|
||||
const opt = option as SelectOption;
|
||||
// setFieldValue("name", option?.label ?? "")
|
||||
setFieldValue(
|
||||
field.name,
|
||||
opt.value ?? ""
|
||||
);
|
||||
onChange={(newValue: unknown) => {
|
||||
const option = newValue as { value: string };
|
||||
setFieldValue(field.name, option?.value ?? "");
|
||||
}}
|
||||
options={ListTypeOptions}
|
||||
/>
|
||||
|
@ -235,7 +233,7 @@ export function ListAddForm({ isOpen, toggle }: AddFormProps) {
|
|||
<SwitchGroupWide name="enabled" label="Enabled"/>
|
||||
</div>
|
||||
|
||||
<ListTypeForm listType={values.type} clients={clients ?? []}/>
|
||||
<ListTypeForm listType={values.type as ListType} clients={clients ?? []}/>
|
||||
|
||||
<div className="flex flex-col space-y-4 py-6 sm:py-0 sm:space-y-0">
|
||||
<div className="border-t border-gray-200 dark:border-gray-700 py-4">
|
||||
|
@ -248,7 +246,12 @@ export function ListAddForm({ isOpen, toggle }: AddFormProps) {
|
|||
</p>
|
||||
</div>
|
||||
|
||||
<ListFilterMultiSelectField name="filters" label="Filters" options={filterQuery.data?.map(f => ({ value: f.id, label: f.name })) ?? []} />
|
||||
<ListFilterMultiSelectField
|
||||
name="filters"
|
||||
label="Filters"
|
||||
required={true}
|
||||
options={filterQuery.data?.map(f => ({ value: f.id, label: f.name })) ?? []}
|
||||
/>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
@ -422,10 +425,12 @@ export function ListUpdateForm({ isOpen, toggle, data }: UpdateFormProps<List>)
|
|||
</p>
|
||||
</div>
|
||||
|
||||
<ListFilterMultiSelectField name="filters" label="Filters" options={filterQuery.data?.map(f => ({
|
||||
value: f.id,
|
||||
label: f.name
|
||||
})) ?? []}/>
|
||||
<ListFilterMultiSelectField
|
||||
name="filters"
|
||||
label="Filters"
|
||||
required={true}
|
||||
options={filterQuery.data?.map(f => ({ value: f.id, label: f.name })) ?? []}
|
||||
/>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
|
@ -522,27 +527,27 @@ const SubmitButton = (props: SubmitButtonProps) => {
|
|||
|
||||
interface ListTypeFormProps {
|
||||
listID?: number;
|
||||
listType: string;
|
||||
listType: ListType;
|
||||
clients: DownloadClient[];
|
||||
}
|
||||
|
||||
const ListTypeForm = (props: ListTypeFormProps) => {
|
||||
const { setFieldValue } = useFormikContext();
|
||||
const [prevActionType, setPrevActionType] = useState<string | null>(null);
|
||||
|
||||
const { listType } = props;
|
||||
|
||||
useEffect(() => {
|
||||
// if (prevActionType !== null && prevActionType !== list.type && ListTypeOptions.map(l => l.value).includes(list.type)) {
|
||||
if (prevActionType !== null && prevActionType !== listType && ListTypeOptions.map(l => l.value).includes(listType as ListType)) {
|
||||
if (prevActionType !== null && prevActionType !== listType && ListTypeOptions.map(l => l.value).includes(listType)) {
|
||||
// Reset the client_id field value
|
||||
setFieldValue(`client_id`, 0);
|
||||
setFieldValue('client_id', 0);
|
||||
// Reset the url
|
||||
setFieldValue('url', '');
|
||||
}
|
||||
|
||||
setPrevActionType(listType);
|
||||
}, [listType, prevActionType, setFieldValue]);
|
||||
|
||||
switch (props.listType) {
|
||||
switch (listType) {
|
||||
case "RADARR":
|
||||
return <ListTypeArr {...props} />;
|
||||
case "SONARR":
|
||||
|
@ -563,6 +568,8 @@ const ListTypeForm = (props: ListTypeFormProps) => {
|
|||
return <ListTypeMDBList />;
|
||||
case "PLAINTEXT":
|
||||
return <ListTypePlainText />;
|
||||
case "ANILIST":
|
||||
return <ListTypeAniList />;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
|
@ -677,6 +684,34 @@ function ListTypeTrakt() {
|
|||
)
|
||||
}
|
||||
|
||||
function ListTypeAniList() {
|
||||
return (
|
||||
<div className="border-t border-gray-200 dark:border-gray-700 py-4">
|
||||
<div className="px-4 space-y-1">
|
||||
<DialogTitle className="text-lg font-medium text-gray-900 dark:text-white">
|
||||
Source list
|
||||
</DialogTitle>
|
||||
<p className="text-sm text-gray-500 dark:text-gray-400">
|
||||
Use an AniList list from one of the default autobrr hosted lists.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<SelectFieldBasic
|
||||
name="url"
|
||||
label="List URL"
|
||||
options={ListsAniListOptions.map(u => ({ value: u.value, label: u.label, key: u.label }))}
|
||||
/>
|
||||
|
||||
<div className="space-y-1">
|
||||
<fieldset>
|
||||
<legend className="sr-only">Settings</legend>
|
||||
<SwitchGroupWide name="match_release" label="Match Release" description="Use Match Releases field. Uses Movies/Shows field by default." />
|
||||
</fieldset>
|
||||
</div>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
function ListTypePlainText() {
|
||||
return (
|
||||
<div className="border-t border-gray-200 dark:border-gray-700 py-4">
|
||||
|
@ -689,8 +724,8 @@ function ListTypePlainText() {
|
|||
</p>
|
||||
</div>
|
||||
|
||||
<TextFieldWide
|
||||
name="url"
|
||||
<TextFieldWide
|
||||
name="url"
|
||||
label="List URL"
|
||||
help="URL to a plain text file with one item per line"
|
||||
placeholder="https://example.com/list.txt"
|
||||
|
|
|
@ -8,7 +8,8 @@ import { Link } from '@tanstack/react-router'
|
|||
import {
|
||||
Listbox,
|
||||
ListboxButton,
|
||||
ListboxOption, ListboxOptions,
|
||||
ListboxOption,
|
||||
ListboxOptions,
|
||||
Menu,
|
||||
MenuButton,
|
||||
MenuItem,
|
||||
|
|
13
web/src/types/List.d.ts
vendored
13
web/src/types/List.d.ts
vendored
|
@ -41,4 +41,15 @@ interface ListCreate {
|
|||
include_alternate_titles: boolean;
|
||||
}
|
||||
|
||||
type ListType = "SONARR" | "RADARR" | "LIDARR" | "READARR" | "WHISPARR" | "MDBLIST" | "TRAKT" | "METACRITIC" | "STEAM" | "PLAINTEXT";
|
||||
type ListType =
|
||||
| "SONARR"
|
||||
| "RADARR"
|
||||
| "LIDARR"
|
||||
| "READARR"
|
||||
| "WHISPARR"
|
||||
| "MDBLIST"
|
||||
| "TRAKT"
|
||||
| "METACRITIC"
|
||||
| "STEAM"
|
||||
| "PLAINTEXT"
|
||||
| "ANILIST";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue