Usenet streaming with a WebDAV server and a SABnzbd-compatible API
C#
Updated frontend Repair settings.
nzbdav-devb0e736c87ef7
diff --git a/frontend/app/routes/settings/maintenance/maintenance.tsx b/frontend/app/routes/settings/maintenance/maintenance.tsxindex 7e4cc703..4f4a7b5d 100644--- a/frontend/app/routes/settings/maintenance/maintenance.tsx+++ b/frontend/app/routes/settings/maintenance/maintenance.tsx@@ -72,7 +72,7 @@ export function Maintenance({ savedConfig }: MaintenanceProps) {<ul className={styles.list}><li className={styles["list-item"]}>You must first configure the Library Directory setting before running this task.- Head over to the Library tab.+ Head over to the Repairs tab.</li></ul></Alert>diff --git a/frontend/app/routes/settings/repairs/repairs.module.css.d.ts b/frontend/app/routes/settings/repairs/repairs.module.css.d.tsnew file mode 100644index 00000000..0f335a22--- /dev/null+++ b/frontend/app/routes/settings/repairs/repairs.module.css.d.ts@@ -0,0 +1,7 @@+declare const styles: {+ readonly "container": string;+ readonly "input": string;+ readonly "error": string;+};+export = styles;+diff --git a/frontend/app/routes/settings/repairs/repairs.tsx b/frontend/app/routes/settings/repairs/repairs.tsxindex 852131fe..4b0db6f5 100644--- a/frontend/app/routes/settings/repairs/repairs.tsx+++ b/frontend/app/routes/settings/repairs/repairs.tsx@@ -1,8 +1,7 @@-import { Form } from "react-bootstrap";+import { Alert, Form } from "react-bootstrap";import styles from "./repairs.module.css"import { type Dispatch, type SetStateAction } from "react";import { className } from "~/utils/styling";-import { isPositiveInteger } from "../usenet/usenet";type RepairsSettingsProps = {config: Record<string, string>@@ -10,8 +9,48 @@ type RepairsSettingsProps = {};export function RepairsSettings({ config, setNewConfig }: RepairsSettingsProps) {+ const libraryDirConfig = config["media.library-dir"];+ const arrConfig = JSON.parse(config["arr.instances"]);+ const areArrInstancesConfigured =+ arrConfig.RadarrInstances.length > 0 ||+ arrConfig.SonarrInstances.length > 0;+ const canEnableRepairs = !!libraryDirConfig && areArrInstancesConfigured;+ var helpText = canEnableRepairs+ ? "When enabled, usenet items will be continuously monitored for health. Unhealthy items will be removed. If an unhealthy item is part of your Radarr/Sonarr library, a new search will be triggered to find a replacement."+ : "When enabled, usenet items will be continuously monitored for health. Unhealthy items will be removed and replaced. This setting can only be enabled once your Library-Directory and Radarr/Sonarr instances are configured.";+return (<div className={styles.container}>+ <Form.Group>+ <Form.Check+ className={styles.input}+ type="checkbox"+ id="enable-repairs-checkbox"+ aria-describedby="enable-repairs-help"+ label={`Enable Background Repairs`}+ checked={canEnableRepairs && config["repair.enable"] === "true"}+ disabled={!canEnableRepairs}+ onChange={e => setNewConfig({ ...config, "repair.enable": "" + e.target.checked })} />+ <Form.Text id="enable-repairs-help" muted>+ {helpText}+ </Form.Text>+ </Form.Group>+ <hr />+ <Form.Group>+ <Form.Label htmlFor="library-dir-input">Library Directory</Form.Label>+ <Form.Control+ className={styles.input}+ type="text"+ id="library-dir-input"+ aria-describedby="library-dir-help"+ value={config["media.library-dir"]}+ onChange={e => setNewConfig({ ...config, "media.library-dir": e.target.value })} />+ <Form.Text id="library-dir-help" muted>+ The path to your organized media library that contains all your imported symlinks.+ Make sure this path is visible to your NzbDAV container.+ </Form.Text>+ </Form.Group>+ <hr /><Form.Group><Form.Label htmlFor="repairs-connections-input">Max Connections for Health Checks</Form.Label><Form.Control@@ -19,34 +58,21 @@ export function RepairsSettings({ config, setNewConfig }: RepairsSettingsProps)type="text"id="repairs-connections-input"aria-describedby="repairs-connections-help"- placeholder="10"+ placeholder="0"value={config["repair.connections"] || ""}onChange={e => setNewConfig({ ...config, "repair.connections": e.target.value })} /><Form.Text id="repairs-connections-help" muted>The background health-check job will not use any more than this number of connections.</Form.Text></Form.Group>- <hr />- <Form.Group>- <Form.Check- className={styles.input}- type="checkbox"- id="delete-unlinked-files-checkbox"- aria-describedby="delete-unlinked-files-help"- label="Delete Unlinked Files When Unhealthy"- checked={config["repair.delete-unlinked-files"] === "true"}- onChange={e => setNewConfig({ ...config, "repair.delete-unlinked-files": "" + e.target.checked })} />- <Form.Text id="delete-unlinked-files-help" muted>- When an unhealthy file is identified that cannot be linked back to a Radarr/Sonarr item, should it be deleted?- </Form.Text>- </Form.Group></div>);}export function isRepairsSettingsUpdated(config: Record<string, string>, newConfig: Record<string, string>) {- return config["repair.connections"] !== newConfig["repair.connections"]- || config["repair.delete-unlinked-files"] !== newConfig["repair.delete-unlinked-files"];+ return config["repair.enable"] !== newConfig["repair.enable"]+ || config["repair.connections"] !== newConfig["repair.connections"]+ || config["media.library-dir"] !== newConfig["media.library-dir"];}export function isRepairsSettingsValid(newConfig: Record<string, string>) {@@ -54,5 +80,10 @@ export function isRepairsSettingsValid(newConfig: Record<string, string>) {}function isValidRepairsConnections(repairsConnections: string): boolean {- return repairsConnections === "" || isPositiveInteger(repairsConnections);+ return repairsConnections === "" || isNonNegativeInteger(repairsConnections);+}++function isNonNegativeInteger(value: string) {+ const num = Number(value);+ return Number.isInteger(num) && num >= 0 && value.trim() === num.toString();}\ No newline at end of filediff --git a/frontend/app/routes/settings/route.tsx b/frontend/app/routes/settings/route.tsxindex 421c3056..054c71f6 100644--- a/frontend/app/routes/settings/route.tsx+++ b/frontend/app/routes/settings/route.tsx@@ -6,7 +6,6 @@ import { isUsenetSettingsUpdated, UsenetSettings } from "./usenet/usenet";import React, { useEffect } from "react";import { isSabnzbdSettingsUpdated, isSabnzbdSettingsValid, SabnzbdSettings } from "./sabnzbd/sabnzbd";import { isWebdavSettingsUpdated, isWebdavSettingsValid, WebdavSettings } from "./webdav/webdav";-import { isLibrarySettingsUpdated, LibrarySettings } from "./library/library";import { isArrsSettingsUpdated, isArrsSettingsValid, ArrsSettings } from "./arrs/arrs";import { Maintenance } from "./maintenance/maintenance";import { isRepairsSettingsUpdated, isRepairsSettingsValid, RepairsSettings } from "./repairs/repairs";@@ -34,11 +33,9 @@ const defaultConfig = {"media.library-dir": "","arr.instances": "{\"RadarrInstances\":[],\"SonarrInstances\":[],\"QueueRules\":[]}","repair.connections": "",- "repair.delete-unlinked-files": "false",+ "repair.enable": "false",}-const advancedTabs = ["library", "maintenance"];-export async function loader({ request }: Route.LoaderArgs) {// fetch the config itemsvar configItems = await backendClient.getConfig(Object.keys(defaultConfig));@@ -68,23 +65,20 @@ function Body(props: BodyProps) {const [isUsenetSettingsReadyToSave, setIsUsenetSettingsReadyToSave] = React.useState(false);const [isSaving, setIsSaving] = React.useState(false);const [isSaved, setIsSaved] = React.useState(false);- const [showAdvanced, setShowAdvanced] = React.useState(false);const [activeTab, setActiveTab] = React.useState('usenet');// derived variablesconst iseUsenetUpdated = isUsenetSettingsUpdated(config, newConfig);const isSabnzbdUpdated = isSabnzbdSettingsUpdated(config, newConfig);const isWebdavUpdated = isWebdavSettingsUpdated(config, newConfig);- const isLibraryUpdated = isLibrarySettingsUpdated(config, newConfig);const isArrsUpdated = isArrsSettingsUpdated(config, newConfig);const isRepairsUpdated = isRepairsSettingsUpdated(config, newConfig);- const isUpdated = iseUsenetUpdated || isSabnzbdUpdated || isWebdavUpdated || isLibraryUpdated || isArrsUpdated || isRepairsUpdated;+ const isUpdated = iseUsenetUpdated || isSabnzbdUpdated || isWebdavUpdated || isArrsUpdated || isRepairsUpdated;const usenetTitle = iseUsenetUpdated ? "✏️ Usenet" : "Usenet";const sabnzbdTitle = isSabnzbdUpdated ? "✏️ SABnzbd " : "SABnzbd";const webdavTitle = isWebdavUpdated ? "✏️ WebDAV" : "WebDAV";const arrsTitle = isArrsUpdated ? "✏️ Radarr/Sonarr" : "Radarr/Sonarr";- const libraryTitle = isLibraryUpdated ? "✏️ Library" : "Library";const repairsTitle = isRepairsUpdated ? "✏️ Repairs" : "Repairs";const saveButtonLabel = isSaving ? "Saving..."@@ -101,23 +95,7 @@ function Body(props: BodyProps) {: "secondary";const isSaveButtonDisabled = saveButtonLabel !== "Save";- // effects- useEffect(() => {- if (!showAdvanced && advancedTabs.includes(activeTab)) {- setActiveTab("usenet");- }- }, [showAdvanced, activeTab, setActiveTab])-// events- const onSelectTab = React.useCallback((tab: string | null) => {- if (tab === "*") {- setShowAdvanced(true);- setActiveTab("library")- } else {- setActiveTab(tab!);- }- }, [setShowAdvanced, setActiveTab]);-const onClear = React.useCallback(() => {setNewConfig(config);setIsSaved(false);@@ -150,7 +128,7 @@ function Body(props: BodyProps) {<div className={styles.container}><TabsactiveKey={activeTab}- onSelect={onSelectTab}+ onSelect={x => setActiveTab(x!)}className={styles.tabs}><Tab eventKey="usenet" title={usenetTitle}>@@ -168,31 +146,11 @@ function Body(props: BodyProps) {<Tab eventKey="repairs" title={repairsTitle}><RepairsSettings config={newConfig} setNewConfig={setNewConfig} /></Tab>- {!showAdvanced &&- <Tab eventKey="*" title={"🚀"}>- </Tab>- }- {showAdvanced &&- <Tab eventKey="library" title={libraryTitle}>- <LibrarySettings savedConfig={config} config={newConfig} setNewConfig={setNewConfig} />- </Tab>- }- {showAdvanced &&- <Tab eventKey="maintenance" title="Maintenance">- <Maintenance savedConfig={config} />- </Tab>- }+ <Tab eventKey="maintenance" title="Maintenance">+ <Maintenance savedConfig={config} />+ </Tab></Tabs><hr />-- <Form.Check- style={{ marginBottom: '20px' }}- type="checkbox"- id="advanced-settings-checkbox"- label="Show Advanced Settings"- checked={showAdvanced}- onChange={(e) => setShowAdvanced(Boolean(e.target.checked))} />-{isUpdated && <ButtonclassName={styles.button}variant="secondary"