commit before pull

This commit is contained in:
FeiBam
2023-06-23 13:22:36 +09:00
parent 3b93339fce
commit fa2cc6b0f2

View File

@@ -98,156 +98,160 @@ export default class Settings extends Component<SettingsProps> {
set_changed={set_changed} set_changed={set_changed}
set_settings={set_settings} set_settings={set_settings}
> >
<SettingsCheckbox <div>
name="download_original_img" <SettingsCheckbox
checked={settings.download_original_img} name="download_original_img"
description={t("settings.download_original_img")} checked={settings.download_original_img}
/> description={t("settings.download_original_img")}
<SettingsCheckbox />
name="ex" <SettingsCheckbox
checked={settings.ex} name="ex"
description={t("settings.ex")} checked={settings.ex}
/> description={t("settings.ex")}
<SettingsCheckbox />
name="mpv" <SettingsCheckbox
checked={settings.mpv} name="mpv"
description={t("settings.mpv")} checked={settings.mpv}
/> description={t("settings.mpv")}
<SettingsCheckbox />
name="export_zip_jpn_title" <SettingsCheckbox
checked={settings.export_zip_jpn_title} name="export_zip_jpn_title"
description={t("settings.export_zip_jpn_title")} checked={settings.export_zip_jpn_title}
/> description={t("settings.export_zip_jpn_title")}
<SettingsText />
name="base" </div>
value={settings.base} <div>
description={t("settings.base")} <SettingsText
type="text" name="base"
outlined={true} value={settings.base}
/> description={t("settings.base")}
<SettingsText type="text"
name="ua" outlined={true}
value={settings.ua ? settings.ua : ""} />
description={t("settings.ua")} <SettingsText
type="text" name="ua"
outlined={true} value={settings.ua ? settings.ua : ""}
ref={ref} description={t("settings.ua")}
> type="text"
<Button outlined={true}
onClick={() => { ref={ref}
if (ref.current) {
const ua = navigator.userAgent;
const t = ref.current;
t.update(ua);
t.set_value(ua);
}
}}
> >
{t("settings.ua_now")} <Button
</Button> onClick={() => {
</SettingsText> if (ref.current) {
<SettingsText const ua = navigator.userAgent;
name="cookies" const t = ref.current;
value={new_cookies} t.update(ua);
description={t("settings.cookies")} t.set_value(ua);
type="text" }
set_value={set_new_cookies} }}
label={t( >
`settings.enter${ {t("settings.ua_now")}
settings.cookies ? "_new" : "" </Button>
}_cookies`, </SettingsText>
)} <SettingsText
outlined={true} name="cookies"
/> value={new_cookies}
<SettingsText description={t("settings.cookies")}
name="max_task_count" type="text"
value={settings.max_task_count} set_value={set_new_cookies}
description={t("settings.max_task_count")} label={t(
type="number" `settings.enter${
min={1} settings.cookies ? "_new" : ""
outlined={true} }_cookies`,
/> )}
<SettingsText outlined={true}
name="max_retry_count" />
value={settings.max_retry_count} <SettingsText
description={t("settings.max_retry_count")} name="max_task_count"
type="number" value={settings.max_task_count}
min={1} description={t("settings.max_task_count")}
outlined={true} type="number"
/> min={1}
<SettingsText outlined={true}
name="max_download_img_count" />
value={settings.max_download_img_count} <SettingsText
description={t("settings.max_download_img_count")} name="max_retry_count"
type="number" value={settings.max_retry_count}
min={1} description={t("settings.max_retry_count")}
outlined={true} type="number"
/> min={1}
<SettingsText outlined={true}
name="db_path" />
value={settings.db_path || ""} <SettingsText
type="text" name="max_download_img_count"
description={t("settings.db_path")} value={settings.max_download_img_count}
helpertext={t("settings.db_path_help")} description={t("settings.max_download_img_count")}
outlined={true} type="number"
/> min={1}
<SettingsText outlined={true}
name="port" />
value={settings.port} <SettingsText
description={t("settings.port")} name="db_path"
type="number" value={settings.db_path || ""}
min={0} type="text"
max={65535} description={t("settings.db_path")}
outlined={true} helpertext={t("settings.db_path_help")}
/> outlined={true}
<SettingsText />
name="hostname" <SettingsText
value={settings.hostname} name="port"
description={t("settings.hostname")} value={settings.port}
type="text" description={t("settings.port")}
outlined={true} type="number"
/> min={0}
<SettingsText max={65535}
name="meili_host" outlined={true}
value={settings.meili_host || ""} />
description={t("settings.meili_host")} <SettingsText
type="text" name="hostname"
outlined={true} value={settings.hostname}
/> description={t("settings.hostname")}
<SettingsText type="text"
name="meili_update_api_key" outlined={true}
value={settings.meili_update_api_key || ""} />
description={t("settings.meili_update_api_key")} <SettingsText
type="text" name="meili_host"
outlined={true} value={settings.meili_host || ""}
/> description={t("settings.meili_host")}
<SettingsText type="text"
name="meili_search_api_key" outlined={true}
value={settings.meili_search_api_key || ""} />
description={t("settings.meili_search_api_key")} <SettingsText
type="text" name="meili_update_api_key"
outlined={true} value={settings.meili_update_api_key || ""}
/> description={t("settings.meili_update_api_key")}
<SettingsText type="text"
name="ffmpeg_path" outlined={true}
value={settings.ffmpeg_path} />
description={t("settings.ffmpeg_path")} <SettingsText
type="text" name="meili_search_api_key"
outlined={true} value={settings.meili_search_api_key || ""}
/> description={t("settings.meili_search_api_key")}
<SettingsSelect type="text"
name="thumbnail_method" outlined={true}
list={[{ />
value: ThumbnailMethod.FFMPEG_BINARY, <SettingsText
text: t("settings.thumbnail_method0"), name="ffmpeg_path"
}, { value={settings.ffmpeg_path}
value: ThumbnailMethod.FFMPEG_API, description={t("settings.ffmpeg_path")}
text: t("settings.thumbnail_method1"), type="text"
}]} outlined={true}
description={t("settings.thumbnail_method")} />
selectedIndex={settings.thumbnail_method} <SettingsSelect
outlined={true} name="thumbnail_method"
/> list={[{
value: ThumbnailMethod.FFMPEG_BINARY,
text: t("settings.thumbnail_method0"),
}, {
value: ThumbnailMethod.FFMPEG_API,
text: t("settings.thumbnail_method1"),
}]}
description={t("settings.thumbnail_method")}
selectedIndex={settings.thumbnail_method}
outlined={true}
/>
</div>
</SettingsContext> </SettingsContext>
<Button onClick={loadData}>{t("common.reload")}</Button> <Button onClick={loadData}>{t("common.reload")}</Button>
<Button onClick={showDlg} disabled={disabled}> <Button onClick={showDlg} disabled={disabled}>