Add options to reset "delete data" flag or remember user choice

Defaults to "default off" which will always reset the delete flag Issue #155
openscopeproject · Feb 4, 2024 · a491644 · a491644
1 parent 40611b5
commit a491644
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
diff --git a/src/components/modals/interfacepanel.tsx b/src/components/modals/interfacepanel.tsx
@@ -21,14 +21,15 @@ import { Checkbox, Grid, NativeSelect, NumberInput, Textarea, useMantineTheme }
 import type { UseFormReturnType } from "@mantine/form";
 import ColorChooser from "components/colorchooser";
 import { useGlobalStyleOverrides } from "themehooks";
-import type { ColorSetting, StyleOverrides } from "config";
+import { DeleteTorrentDataOptions, type ColorSetting, type DeleteTorrentDataOption, type StyleOverrides } from "config";
 import { ColorSchemeToggle } from "components/miscbuttons";
 const { TAURI, invoke } = await import(/* webpackChunkName: "taurishim" */"taurishim");
 
 export interface InterfaceFormValues {
     interface: {
         styleOverrides: StyleOverrides,
         skipAddDialog: boolean,
+        deleteTorrentData: DeleteTorrentDataOption,
         numLastSaveDirs: number,
         defaultTrackers: string[],
     },
@@ -111,6 +112,14 @@ export function InterfaceSettigsPanel<V extends InterfaceFormValues>(props: { fo
                 <Checkbox label="Skip add torrent dialog"
                     {...props.form.getInputProps("interface.skipAddDialog", { type: "checkbox" })} />
             </Grid.Col>
+            <Grid.Col span={8}>
+                Delete torrent data
+            </Grid.Col>
+            <Grid.Col span={4}>
+                <NativeSelect data={DeleteTorrentDataOptions as unknown as string[]}
+                    value={props.form.values.interface.deleteTorrentData}
+                    onChange={(e) => { setFieldValue("interface.deleteTorrentData", e.target.value); }} />
+            </Grid.Col>
             <Grid.Col span={8}>Max number of saved download directories</Grid.Col>
             <Grid.Col span={2}>
                 <NumberInput

diff --git a/src/components/modals/remove.tsx b/src/components/modals/remove.tsx
@@ -19,15 +19,33 @@
 import { Button, Checkbox, Divider, Group, Text } from "@mantine/core";
 import type { ModalState } from "./common";
 import { HkModal, TorrentsNames } from "./common";
-import React, { useCallback, useState } from "react";
+import React, { useCallback, useContext, useEffect, useState } from "react";
 import { useRemoveTorrents } from "queries";
 import { notifications } from "@mantine/notifications";
 import { useServerSelectedTorrents } from "rpc/torrent";
+import { ConfigContext } from "config";
 
 export function RemoveModal(props: ModalState) {
+    const config = useContext(ConfigContext);
     const serverSelected = useServerSelectedTorrents();
     const [deleteData, setDeleteData] = useState<boolean>(false);
 
+    useEffect(() => {
+        if (props.opened) {
+            if (config.values.interface.deleteTorrentData !== "remember selection") {
+                setDeleteData(config.values.interface.deleteTorrentData === "default on");
+            } else {
+                setDeleteData(config.values.interface.deleteTorrentDataSelection);
+            }
+        }
+    }, [config, props.opened]);
+
+    const onDeleteDataChanged = useCallback((e: React.ChangeEvent<HTMLInputElement>) => {
+        const value = e.currentTarget.checked;
+        setDeleteData(value);
+        config.values.interface.deleteTorrentDataSelection = value;
+    }, [config]);
+
     const remove = useRemoveTorrents();
 
     const onDelete = useCallback(() => {
@@ -57,7 +75,7 @@ export function RemoveModal(props: ModalState) {
             <Checkbox
                 label="Delete torrent data"
                 checked={deleteData}
-                onChange={(e) => { setDeleteData(e.currentTarget.checked); }}
+                onChange={onDeleteDataChanged}
                 my="xl" />
             <Divider my="sm" />
             <Group position="center" spacing="md">

diff --git a/src/config.ts b/src/config.ts
@@ -95,8 +95,10 @@ export type SectionsVisibility<S extends string> = Array<{
 
 export const WindowMinimizeOptions = ["minimize", "hide"] as const;
 export const WindowCloseOptions = ["hide", "close", "quit"] as const;
+export const DeleteTorrentDataOptions = ["default off", "default on", "remember selection"] as const;
 export type WindowMinimizeOption = typeof WindowMinimizeOptions[number];
 export type WindowCloseOption = typeof WindowCloseOptions[number];
+export type DeleteTorrentDataOption = typeof DeleteTorrentDataOptions[number];
 
 export interface ColorSetting {
     color: DefaultMantineColor,
@@ -149,6 +151,8 @@ interface Settings {
         showFilesSearchBox: boolean,
         mainSplit: SplitType,
         skipAddDialog: boolean,
+        deleteTorrentData: DeleteTorrentDataOption,
+        deleteTorrentDataSelection: boolean,
         numLastSaveDirs: number,
         defaultTrackers: string[],
         styleOverrides: StyleOverrides,
@@ -260,6 +264,8 @@ const DefaultSettings: Settings = {
         showFilesSearchBox: false,
         mainSplit: "vertical",
         skipAddDialog: false,
+        deleteTorrentData: "default off",
+        deleteTorrentDataSelection: false,
         numLastSaveDirs: 20,
         defaultTrackers: [...DefaultTrackerList],
         styleOverrides: {