Add "download conversion" setting support
This commit is contained in:
@@ -205,6 +205,12 @@
|
|||||||
},
|
},
|
||||||
"title": "Auto-download"
|
"title": "Auto-download"
|
||||||
},
|
},
|
||||||
|
"conversion": {
|
||||||
|
"compression_level": "Compression level",
|
||||||
|
"description": "In case no MIME-Type is defined, the \"default\" one will be used for the conversion.",
|
||||||
|
"mime_type": "MIME-Type",
|
||||||
|
"title": "Download conversion"
|
||||||
|
},
|
||||||
"delete_chapters": {
|
"delete_chapters": {
|
||||||
"label": {
|
"label": {
|
||||||
"allow_deletion_of_bookmarked": "Allow deleting bookmarked chapters",
|
"allow_deletion_of_bookmarked": "Allow deleting bookmarked chapters",
|
||||||
|
|||||||
@@ -37,6 +37,11 @@ export const SERVER_SETTINGS = gql`
|
|||||||
excludeEntryWithUnreadChapters
|
excludeEntryWithUnreadChapters
|
||||||
autoDownloadNewChaptersLimit
|
autoDownloadNewChaptersLimit
|
||||||
autoDownloadIgnoreReUploads
|
autoDownloadIgnoreReUploads
|
||||||
|
downloadConversions {
|
||||||
|
mimeType
|
||||||
|
target
|
||||||
|
compressionLevel
|
||||||
|
}
|
||||||
|
|
||||||
# extensions
|
# extensions
|
||||||
extensionRepos
|
extensionRepos
|
||||||
|
|||||||
@@ -2994,7 +2994,7 @@ export type MangaScreenFieldsFragment = { __typename?: 'MangaType', artist?: str
|
|||||||
|
|
||||||
export type MangaLibraryDuplicateScreenFieldsFragment = { __typename?: 'MangaType', description?: string | null, id: number, title: string, thumbnailUrl?: string | null, thumbnailUrlLastFetched?: string | null, inLibrary: boolean, initialized: boolean, sourceId: string, unreadCount: number, downloadCount: number, bookmarkCount: number, hasDuplicateChapters: boolean, chapters: { __typename?: 'ChapterNodeList', totalCount: number } };
|
export type MangaLibraryDuplicateScreenFieldsFragment = { __typename?: 'MangaType', description?: string | null, id: number, title: string, thumbnailUrl?: string | null, thumbnailUrlLastFetched?: string | null, inLibrary: boolean, initialized: boolean, sourceId: string, unreadCount: number, downloadCount: number, bookmarkCount: number, hasDuplicateChapters: boolean, chapters: { __typename?: 'ChapterNodeList', totalCount: number } };
|
||||||
|
|
||||||
export type ServerSettingsFragment = { __typename?: 'SettingsType', ip: string, port: number, socksProxyEnabled: boolean, socksProxyVersion: number, socksProxyHost: string, socksProxyPort: string, socksProxyUsername: string, socksProxyPassword: string, webUIFlavor: WebUiFlavor, initialOpenInBrowserEnabled: boolean, webUIInterface: WebUiInterface, electronPath: string, webUIChannel: WebUiChannel, webUIUpdateCheckInterval: number, downloadAsCbz: boolean, downloadsPath: string, autoDownloadNewChapters: boolean, excludeEntryWithUnreadChapters: boolean, autoDownloadNewChaptersLimit: number, autoDownloadIgnoreReUploads: boolean, extensionRepos: Array<string>, maxSourcesInParallel: number, excludeUnreadChapters: boolean, excludeNotStarted: boolean, excludeCompleted: boolean, globalUpdateInterval: number, updateMangas: boolean, authMode: AuthMode, authPassword: string, authUsername: string, debugLogsEnabled: boolean, systemTrayEnabled: boolean, maxLogFileSize: string, maxLogFiles: number, maxLogFolderSize: string, backupPath: string, backupTime: string, backupInterval: number, backupTTL: number, localSourcePath: string, flareSolverrEnabled: boolean, flareSolverrUrl: string, flareSolverrTimeout: number, flareSolverrSessionName: string, flareSolverrSessionTtl: number, flareSolverrAsResponseFallback: boolean, opdsUseBinaryFileSizes: boolean, opdsItemsPerPage: number, opdsEnablePageReadProgress: boolean, opdsMarkAsReadOnDownload: boolean, opdsShowOnlyUnreadChapters: boolean, opdsShowOnlyDownloadedChapters: boolean, opdsChapterSortOrder: SortOrder };
|
export type ServerSettingsFragment = { __typename?: 'SettingsType', ip: string, port: number, socksProxyEnabled: boolean, socksProxyVersion: number, socksProxyHost: string, socksProxyPort: string, socksProxyUsername: string, socksProxyPassword: string, webUIFlavor: WebUiFlavor, initialOpenInBrowserEnabled: boolean, webUIInterface: WebUiInterface, electronPath: string, webUIChannel: WebUiChannel, webUIUpdateCheckInterval: number, downloadAsCbz: boolean, downloadsPath: string, autoDownloadNewChapters: boolean, excludeEntryWithUnreadChapters: boolean, autoDownloadNewChaptersLimit: number, autoDownloadIgnoreReUploads: boolean, extensionRepos: Array<string>, maxSourcesInParallel: number, excludeUnreadChapters: boolean, excludeNotStarted: boolean, excludeCompleted: boolean, globalUpdateInterval: number, updateMangas: boolean, authMode: AuthMode, authPassword: string, authUsername: string, debugLogsEnabled: boolean, systemTrayEnabled: boolean, maxLogFileSize: string, maxLogFiles: number, maxLogFolderSize: string, backupPath: string, backupTime: string, backupInterval: number, backupTTL: number, localSourcePath: string, flareSolverrEnabled: boolean, flareSolverrUrl: string, flareSolverrTimeout: number, flareSolverrSessionName: string, flareSolverrSessionTtl: number, flareSolverrAsResponseFallback: boolean, opdsUseBinaryFileSizes: boolean, opdsItemsPerPage: number, opdsEnablePageReadProgress: boolean, opdsMarkAsReadOnDownload: boolean, opdsShowOnlyUnreadChapters: boolean, opdsShowOnlyDownloadedChapters: boolean, opdsChapterSortOrder: SortOrder, downloadConversions: Array<{ __typename?: 'SettingsDownloadConversionType', mimeType: string, target: string, compressionLevel?: number | null }> };
|
||||||
|
|
||||||
export type SourceMetaFieldsFragment = { __typename?: 'SourceMetaType', sourceId: string, key: string, value: string };
|
export type SourceMetaFieldsFragment = { __typename?: 'SourceMetaType', sourceId: string, key: string, value: string };
|
||||||
|
|
||||||
@@ -3356,14 +3356,14 @@ export type ResetServerSettingsMutationVariables = Exact<{
|
|||||||
}>;
|
}>;
|
||||||
|
|
||||||
|
|
||||||
export type ResetServerSettingsMutation = { __typename?: 'Mutation', resetSettings: { __typename?: 'ResetSettingsPayload', settings: { __typename?: 'SettingsType', ip: string, port: number, socksProxyEnabled: boolean, socksProxyVersion: number, socksProxyHost: string, socksProxyPort: string, socksProxyUsername: string, socksProxyPassword: string, webUIFlavor: WebUiFlavor, initialOpenInBrowserEnabled: boolean, webUIInterface: WebUiInterface, electronPath: string, webUIChannel: WebUiChannel, webUIUpdateCheckInterval: number, downloadAsCbz: boolean, downloadsPath: string, autoDownloadNewChapters: boolean, excludeEntryWithUnreadChapters: boolean, autoDownloadNewChaptersLimit: number, autoDownloadIgnoreReUploads: boolean, extensionRepos: Array<string>, maxSourcesInParallel: number, excludeUnreadChapters: boolean, excludeNotStarted: boolean, excludeCompleted: boolean, globalUpdateInterval: number, updateMangas: boolean, authMode: AuthMode, authPassword: string, authUsername: string, debugLogsEnabled: boolean, systemTrayEnabled: boolean, maxLogFileSize: string, maxLogFiles: number, maxLogFolderSize: string, backupPath: string, backupTime: string, backupInterval: number, backupTTL: number, localSourcePath: string, flareSolverrEnabled: boolean, flareSolverrUrl: string, flareSolverrTimeout: number, flareSolverrSessionName: string, flareSolverrSessionTtl: number, flareSolverrAsResponseFallback: boolean, opdsUseBinaryFileSizes: boolean, opdsItemsPerPage: number, opdsEnablePageReadProgress: boolean, opdsMarkAsReadOnDownload: boolean, opdsShowOnlyUnreadChapters: boolean, opdsShowOnlyDownloadedChapters: boolean, opdsChapterSortOrder: SortOrder } } };
|
export type ResetServerSettingsMutation = { __typename?: 'Mutation', resetSettings: { __typename?: 'ResetSettingsPayload', settings: { __typename?: 'SettingsType', ip: string, port: number, socksProxyEnabled: boolean, socksProxyVersion: number, socksProxyHost: string, socksProxyPort: string, socksProxyUsername: string, socksProxyPassword: string, webUIFlavor: WebUiFlavor, initialOpenInBrowserEnabled: boolean, webUIInterface: WebUiInterface, electronPath: string, webUIChannel: WebUiChannel, webUIUpdateCheckInterval: number, downloadAsCbz: boolean, downloadsPath: string, autoDownloadNewChapters: boolean, excludeEntryWithUnreadChapters: boolean, autoDownloadNewChaptersLimit: number, autoDownloadIgnoreReUploads: boolean, extensionRepos: Array<string>, maxSourcesInParallel: number, excludeUnreadChapters: boolean, excludeNotStarted: boolean, excludeCompleted: boolean, globalUpdateInterval: number, updateMangas: boolean, authMode: AuthMode, authPassword: string, authUsername: string, debugLogsEnabled: boolean, systemTrayEnabled: boolean, maxLogFileSize: string, maxLogFiles: number, maxLogFolderSize: string, backupPath: string, backupTime: string, backupInterval: number, backupTTL: number, localSourcePath: string, flareSolverrEnabled: boolean, flareSolverrUrl: string, flareSolverrTimeout: number, flareSolverrSessionName: string, flareSolverrSessionTtl: number, flareSolverrAsResponseFallback: boolean, opdsUseBinaryFileSizes: boolean, opdsItemsPerPage: number, opdsEnablePageReadProgress: boolean, opdsMarkAsReadOnDownload: boolean, opdsShowOnlyUnreadChapters: boolean, opdsShowOnlyDownloadedChapters: boolean, opdsChapterSortOrder: SortOrder, downloadConversions: Array<{ __typename?: 'SettingsDownloadConversionType', mimeType: string, target: string, compressionLevel?: number | null }> } } };
|
||||||
|
|
||||||
export type UpdateServerSettingsMutationVariables = Exact<{
|
export type UpdateServerSettingsMutationVariables = Exact<{
|
||||||
input: SetSettingsInput;
|
input: SetSettingsInput;
|
||||||
}>;
|
}>;
|
||||||
|
|
||||||
|
|
||||||
export type UpdateServerSettingsMutation = { __typename?: 'Mutation', setSettings: { __typename?: 'SetSettingsPayload', settings: { __typename?: 'SettingsType', ip: string, port: number, socksProxyEnabled: boolean, socksProxyVersion: number, socksProxyHost: string, socksProxyPort: string, socksProxyUsername: string, socksProxyPassword: string, webUIFlavor: WebUiFlavor, initialOpenInBrowserEnabled: boolean, webUIInterface: WebUiInterface, electronPath: string, webUIChannel: WebUiChannel, webUIUpdateCheckInterval: number, downloadAsCbz: boolean, downloadsPath: string, autoDownloadNewChapters: boolean, excludeEntryWithUnreadChapters: boolean, autoDownloadNewChaptersLimit: number, autoDownloadIgnoreReUploads: boolean, extensionRepos: Array<string>, maxSourcesInParallel: number, excludeUnreadChapters: boolean, excludeNotStarted: boolean, excludeCompleted: boolean, globalUpdateInterval: number, updateMangas: boolean, authMode: AuthMode, authPassword: string, authUsername: string, debugLogsEnabled: boolean, systemTrayEnabled: boolean, maxLogFileSize: string, maxLogFiles: number, maxLogFolderSize: string, backupPath: string, backupTime: string, backupInterval: number, backupTTL: number, localSourcePath: string, flareSolverrEnabled: boolean, flareSolverrUrl: string, flareSolverrTimeout: number, flareSolverrSessionName: string, flareSolverrSessionTtl: number, flareSolverrAsResponseFallback: boolean, opdsUseBinaryFileSizes: boolean, opdsItemsPerPage: number, opdsEnablePageReadProgress: boolean, opdsMarkAsReadOnDownload: boolean, opdsShowOnlyUnreadChapters: boolean, opdsShowOnlyDownloadedChapters: boolean, opdsChapterSortOrder: SortOrder } } };
|
export type UpdateServerSettingsMutation = { __typename?: 'Mutation', setSettings: { __typename?: 'SetSettingsPayload', settings: { __typename?: 'SettingsType', ip: string, port: number, socksProxyEnabled: boolean, socksProxyVersion: number, socksProxyHost: string, socksProxyPort: string, socksProxyUsername: string, socksProxyPassword: string, webUIFlavor: WebUiFlavor, initialOpenInBrowserEnabled: boolean, webUIInterface: WebUiInterface, electronPath: string, webUIChannel: WebUiChannel, webUIUpdateCheckInterval: number, downloadAsCbz: boolean, downloadsPath: string, autoDownloadNewChapters: boolean, excludeEntryWithUnreadChapters: boolean, autoDownloadNewChaptersLimit: number, autoDownloadIgnoreReUploads: boolean, extensionRepos: Array<string>, maxSourcesInParallel: number, excludeUnreadChapters: boolean, excludeNotStarted: boolean, excludeCompleted: boolean, globalUpdateInterval: number, updateMangas: boolean, authMode: AuthMode, authPassword: string, authUsername: string, debugLogsEnabled: boolean, systemTrayEnabled: boolean, maxLogFileSize: string, maxLogFiles: number, maxLogFolderSize: string, backupPath: string, backupTime: string, backupInterval: number, backupTTL: number, localSourcePath: string, flareSolverrEnabled: boolean, flareSolverrUrl: string, flareSolverrTimeout: number, flareSolverrSessionName: string, flareSolverrSessionTtl: number, flareSolverrAsResponseFallback: boolean, opdsUseBinaryFileSizes: boolean, opdsItemsPerPage: number, opdsEnablePageReadProgress: boolean, opdsMarkAsReadOnDownload: boolean, opdsShowOnlyUnreadChapters: boolean, opdsShowOnlyDownloadedChapters: boolean, opdsChapterSortOrder: SortOrder, downloadConversions: Array<{ __typename?: 'SettingsDownloadConversionType', mimeType: string, target: string, compressionLevel?: number | null }> } } };
|
||||||
|
|
||||||
export type GetSourceMangasFetchMutationVariables = Exact<{
|
export type GetSourceMangasFetchMutationVariables = Exact<{
|
||||||
input: FetchSourceMangaInput;
|
input: FetchSourceMangaInput;
|
||||||
@@ -3747,7 +3747,7 @@ export type GetWebuiUpdateStatusQuery = { __typename?: 'Query', getWebUIUpdateSt
|
|||||||
export type GetServerSettingsQueryVariables = Exact<{ [key: string]: never; }>;
|
export type GetServerSettingsQueryVariables = Exact<{ [key: string]: never; }>;
|
||||||
|
|
||||||
|
|
||||||
export type GetServerSettingsQuery = { __typename?: 'Query', settings: { __typename?: 'SettingsType', ip: string, port: number, socksProxyEnabled: boolean, socksProxyVersion: number, socksProxyHost: string, socksProxyPort: string, socksProxyUsername: string, socksProxyPassword: string, webUIFlavor: WebUiFlavor, initialOpenInBrowserEnabled: boolean, webUIInterface: WebUiInterface, electronPath: string, webUIChannel: WebUiChannel, webUIUpdateCheckInterval: number, downloadAsCbz: boolean, downloadsPath: string, autoDownloadNewChapters: boolean, excludeEntryWithUnreadChapters: boolean, autoDownloadNewChaptersLimit: number, autoDownloadIgnoreReUploads: boolean, extensionRepos: Array<string>, maxSourcesInParallel: number, excludeUnreadChapters: boolean, excludeNotStarted: boolean, excludeCompleted: boolean, globalUpdateInterval: number, updateMangas: boolean, authMode: AuthMode, authPassword: string, authUsername: string, debugLogsEnabled: boolean, systemTrayEnabled: boolean, maxLogFileSize: string, maxLogFiles: number, maxLogFolderSize: string, backupPath: string, backupTime: string, backupInterval: number, backupTTL: number, localSourcePath: string, flareSolverrEnabled: boolean, flareSolverrUrl: string, flareSolverrTimeout: number, flareSolverrSessionName: string, flareSolverrSessionTtl: number, flareSolverrAsResponseFallback: boolean, opdsUseBinaryFileSizes: boolean, opdsItemsPerPage: number, opdsEnablePageReadProgress: boolean, opdsMarkAsReadOnDownload: boolean, opdsShowOnlyUnreadChapters: boolean, opdsShowOnlyDownloadedChapters: boolean, opdsChapterSortOrder: SortOrder } };
|
export type GetServerSettingsQuery = { __typename?: 'Query', settings: { __typename?: 'SettingsType', ip: string, port: number, socksProxyEnabled: boolean, socksProxyVersion: number, socksProxyHost: string, socksProxyPort: string, socksProxyUsername: string, socksProxyPassword: string, webUIFlavor: WebUiFlavor, initialOpenInBrowserEnabled: boolean, webUIInterface: WebUiInterface, electronPath: string, webUIChannel: WebUiChannel, webUIUpdateCheckInterval: number, downloadAsCbz: boolean, downloadsPath: string, autoDownloadNewChapters: boolean, excludeEntryWithUnreadChapters: boolean, autoDownloadNewChaptersLimit: number, autoDownloadIgnoreReUploads: boolean, extensionRepos: Array<string>, maxSourcesInParallel: number, excludeUnreadChapters: boolean, excludeNotStarted: boolean, excludeCompleted: boolean, globalUpdateInterval: number, updateMangas: boolean, authMode: AuthMode, authPassword: string, authUsername: string, debugLogsEnabled: boolean, systemTrayEnabled: boolean, maxLogFileSize: string, maxLogFiles: number, maxLogFolderSize: string, backupPath: string, backupTime: string, backupInterval: number, backupTTL: number, localSourcePath: string, flareSolverrEnabled: boolean, flareSolverrUrl: string, flareSolverrTimeout: number, flareSolverrSessionName: string, flareSolverrSessionTtl: number, flareSolverrAsResponseFallback: boolean, opdsUseBinaryFileSizes: boolean, opdsItemsPerPage: number, opdsEnablePageReadProgress: boolean, opdsMarkAsReadOnDownload: boolean, opdsShowOnlyUnreadChapters: boolean, opdsShowOnlyDownloadedChapters: boolean, opdsChapterSortOrder: SortOrder, downloadConversions: Array<{ __typename?: 'SettingsDownloadConversionType', mimeType: string, target: string, compressionLevel?: number | null }> } };
|
||||||
|
|
||||||
export type GetSourceBrowseQueryVariables = Exact<{
|
export type GetSourceBrowseQueryVariables = Exact<{
|
||||||
id: Scalars['LongString']['input'];
|
id: Scalars['LongString']['input'];
|
||||||
|
|||||||
@@ -12,3 +12,9 @@ export const DOWNLOAD_AHEAD = {
|
|||||||
default: 2,
|
default: 2,
|
||||||
step: 1,
|
step: 1,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export const DOWNLOAD_CONVERSION_COMPRESSION = {
|
||||||
|
min: 0,
|
||||||
|
max: 1,
|
||||||
|
step: 0.01,
|
||||||
|
};
|
||||||
|
|||||||
344
src/modules/downloads/components/DownloadConversionSetting.tsx
Normal file
344
src/modules/downloads/components/DownloadConversionSetting.tsx
Normal file
@@ -0,0 +1,344 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) Contributors to the Suwayomi project
|
||||||
|
*
|
||||||
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||||
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||||
|
* file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import ListItemButton from '@mui/material/ListItemButton';
|
||||||
|
import ListItemText from '@mui/material/ListItemText';
|
||||||
|
import Dialog from '@mui/material/Dialog';
|
||||||
|
import DialogTitle from '@mui/material/DialogTitle';
|
||||||
|
import DialogContent from '@mui/material/DialogContent';
|
||||||
|
import { useState } from 'react';
|
||||||
|
import TextField from '@mui/material/TextField';
|
||||||
|
import Stack from '@mui/material/Stack';
|
||||||
|
import DeleteIcon from '@mui/icons-material/Delete';
|
||||||
|
import IconButton from '@mui/material/IconButton';
|
||||||
|
import InputAdornment from '@mui/material/InputAdornment';
|
||||||
|
import Button from '@mui/material/Button';
|
||||||
|
import DialogActions from '@mui/material/DialogActions';
|
||||||
|
import DialogContentText from '@mui/material/DialogContentText';
|
||||||
|
import { SettingsDownloadConversion } from '@/lib/graphql/generated/graphql.ts';
|
||||||
|
import { DOWNLOAD_CONVERSION_COMPRESSION } from '@/modules/downloads/Downloads.constants.ts';
|
||||||
|
import { CustomTooltip } from '@/modules/core/components/CustomTooltip.tsx';
|
||||||
|
import { TypographyMaxLines } from '@/modules/core/components/texts/TypographyMaxLines.tsx';
|
||||||
|
|
||||||
|
const DEFAULT_MIME_TYPE = 'default';
|
||||||
|
const MIME_TYPE_PREFIX = 'image/';
|
||||||
|
const DEFAULT_FOCUS_INDEX = -1;
|
||||||
|
|
||||||
|
const normalizeMimeType = (mimeType: string): string => mimeType.replace(MIME_TYPE_PREFIX, '');
|
||||||
|
|
||||||
|
const isDefaultMimeType = (mimeType: string): boolean =>
|
||||||
|
normalizeMimeType(mimeType.toLowerCase().trim()) === DEFAULT_MIME_TYPE;
|
||||||
|
|
||||||
|
const isDuplicateConversion = (mimeType: string, index: number, conversions: SettingsDownloadConversion[]): boolean =>
|
||||||
|
conversions.slice(0, index).some((conversion) => conversion.mimeType === mimeType);
|
||||||
|
|
||||||
|
const isValidCompressionLevel = (compression: number | null | undefined): boolean =>
|
||||||
|
compression == null ||
|
||||||
|
(compression >= DOWNLOAD_CONVERSION_COMPRESSION.min && compression <= DOWNLOAD_CONVERSION_COMPRESSION.max);
|
||||||
|
|
||||||
|
const containsInvalidConversion = (conversions: SettingsDownloadConversion[]): boolean =>
|
||||||
|
conversions.some(
|
||||||
|
({ mimeType, compressionLevel }, index) =>
|
||||||
|
!isValidCompressionLevel(compressionLevel) || isDuplicateConversion(mimeType, index, conversions),
|
||||||
|
);
|
||||||
|
|
||||||
|
const normalizeConversions = (conversions: SettingsDownloadConversion[]): SettingsDownloadConversion[] =>
|
||||||
|
conversions.map((conversion) => ({
|
||||||
|
...conversion,
|
||||||
|
mimeType: normalizeMimeType(conversion.mimeType),
|
||||||
|
target: normalizeMimeType(conversion.target),
|
||||||
|
}));
|
||||||
|
|
||||||
|
const toValidServerConversions = (conversions: SettingsDownloadConversion[]): SettingsDownloadConversion[] =>
|
||||||
|
conversions
|
||||||
|
.filter(({ mimeType, target }) => !!mimeType && !!target)
|
||||||
|
.map((conversion) => ({
|
||||||
|
...conversion,
|
||||||
|
mimeType: `${MIME_TYPE_PREFIX}${conversion.mimeType}`,
|
||||||
|
target: `${MIME_TYPE_PREFIX}${conversion.target}`,
|
||||||
|
}));
|
||||||
|
|
||||||
|
const maybeAddDefault = (conversions: SettingsDownloadConversion[]) => {
|
||||||
|
const isDefaultDefined = conversions.some(({ mimeType }) => isDefaultMimeType(mimeType));
|
||||||
|
|
||||||
|
return [
|
||||||
|
...(isDefaultDefined
|
||||||
|
? []
|
||||||
|
: [
|
||||||
|
{
|
||||||
|
mimeType: DEFAULT_MIME_TYPE,
|
||||||
|
target: '',
|
||||||
|
},
|
||||||
|
]),
|
||||||
|
...conversions,
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
const didUpdateConversions = (
|
||||||
|
conversions: SettingsDownloadConversion[],
|
||||||
|
tmpConversions: SettingsDownloadConversion[],
|
||||||
|
): boolean => {
|
||||||
|
if (conversions.length !== tmpConversions.length) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return conversions.some(({ mimeType, target, compressionLevel }, index) => {
|
||||||
|
const tmpConversion = tmpConversions[index];
|
||||||
|
|
||||||
|
return (
|
||||||
|
normalizeMimeType(mimeType) !== tmpConversion.mimeType ||
|
||||||
|
normalizeMimeType(target) !== tmpConversion.target ||
|
||||||
|
compressionLevel !== tmpConversion.compressionLevel
|
||||||
|
);
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
const MimeTypeTextField = ({
|
||||||
|
shouldAutoFocus,
|
||||||
|
isDefault,
|
||||||
|
isDuplicate,
|
||||||
|
label,
|
||||||
|
value,
|
||||||
|
onUpdate,
|
||||||
|
}: {
|
||||||
|
shouldAutoFocus: boolean;
|
||||||
|
isDefault: boolean;
|
||||||
|
isDuplicate: boolean;
|
||||||
|
label: string;
|
||||||
|
value: string;
|
||||||
|
onUpdate: (value: string) => void;
|
||||||
|
}) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<TextField
|
||||||
|
sx={{ maxWidth: 150 }}
|
||||||
|
autoFocus={shouldAutoFocus}
|
||||||
|
label={label}
|
||||||
|
value={value}
|
||||||
|
disabled={isDefault}
|
||||||
|
error={isDuplicate}
|
||||||
|
helperText={isDuplicate && t('global.error.label.invalid_input')}
|
||||||
|
slotProps={{
|
||||||
|
input: {
|
||||||
|
startAdornment: <InputAdornment position="start">{MIME_TYPE_PREFIX}</InputAdornment>,
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
onChange={(e) => onUpdate(e.target.value.trim())}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
const Conversion = ({
|
||||||
|
index,
|
||||||
|
shouldAutoFocusMimeTypeTextField,
|
||||||
|
conversion: { mimeType, target, compressionLevel },
|
||||||
|
setFocusMimeTypeTextField,
|
||||||
|
onChange,
|
||||||
|
isDuplicate,
|
||||||
|
}: {
|
||||||
|
shouldAutoFocusMimeTypeTextField: boolean;
|
||||||
|
index: number;
|
||||||
|
conversion: SettingsDownloadConversion;
|
||||||
|
setFocusMimeTypeTextField: (focus: boolean) => void;
|
||||||
|
onChange: (newConversion: SettingsDownloadConversion | null) => void;
|
||||||
|
isDuplicate: boolean;
|
||||||
|
}) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
const isCompressionLevelValid = isValidCompressionLevel(compressionLevel);
|
||||||
|
const isDefault = isDefaultMimeType(mimeType) && !isDuplicate;
|
||||||
|
const isDisabled = isDefault && !target && compressionLevel == null;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Stack
|
||||||
|
// eslint-disable-next-line react/no-array-index-key
|
||||||
|
key={`${mimeType}-${index}`}
|
||||||
|
sx={{
|
||||||
|
gap: 1,
|
||||||
|
flexDirection: 'row',
|
||||||
|
flexWrap: 'nowrap',
|
||||||
|
alignItems: 'center',
|
||||||
|
pt: 1,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Stack
|
||||||
|
sx={{
|
||||||
|
gap: 1,
|
||||||
|
flexDirection: 'row',
|
||||||
|
alignItems: 'baseline',
|
||||||
|
flexWrap: 'wrap',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<MimeTypeTextField
|
||||||
|
shouldAutoFocus={shouldAutoFocusMimeTypeTextField}
|
||||||
|
isDefault={isDefault}
|
||||||
|
isDuplicate={isDuplicate}
|
||||||
|
label={t(isDefault ? 'global.label.default' : 'download.settings.conversion.mime_type')}
|
||||||
|
value={mimeType}
|
||||||
|
onUpdate={(value) => {
|
||||||
|
setFocusMimeTypeTextField(true);
|
||||||
|
|
||||||
|
onChange({
|
||||||
|
mimeType: value,
|
||||||
|
target,
|
||||||
|
compressionLevel,
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<TypographyMaxLines sx={{ mx: 1 }}>→</TypographyMaxLines>
|
||||||
|
<MimeTypeTextField
|
||||||
|
shouldAutoFocus={false}
|
||||||
|
isDefault={false}
|
||||||
|
isDuplicate={false}
|
||||||
|
label={t('download.settings.conversion.compression_level')}
|
||||||
|
value={target}
|
||||||
|
onUpdate={(value) =>
|
||||||
|
onChange({
|
||||||
|
mimeType,
|
||||||
|
target: value,
|
||||||
|
compressionLevel,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
/>
|
||||||
|
<TextField
|
||||||
|
label="Compression"
|
||||||
|
value={compressionLevel ?? ''}
|
||||||
|
type="number"
|
||||||
|
error={!isCompressionLevelValid}
|
||||||
|
helperText={!isCompressionLevelValid ? t('global.error.label.invalid_input') : ''}
|
||||||
|
slotProps={{
|
||||||
|
input: {
|
||||||
|
inputProps: DOWNLOAD_CONVERSION_COMPRESSION,
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
onChange={(e) => {
|
||||||
|
onChange({
|
||||||
|
mimeType,
|
||||||
|
target,
|
||||||
|
compressionLevel: e.target.value ? Number(e.target.value) : undefined,
|
||||||
|
});
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</Stack>
|
||||||
|
<CustomTooltip disabled={isDisabled} title={t('chapter.action.download.delete.label.action')}>
|
||||||
|
<IconButton
|
||||||
|
disabled={isDisabled}
|
||||||
|
onClick={() => {
|
||||||
|
setFocusMimeTypeTextField(false);
|
||||||
|
onChange(null);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<DeleteIcon />
|
||||||
|
</IconButton>
|
||||||
|
</CustomTooltip>
|
||||||
|
</Stack>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export const DownloadConversionSetting = ({
|
||||||
|
conversions,
|
||||||
|
updateSetting,
|
||||||
|
}: {
|
||||||
|
conversions: SettingsDownloadConversion[];
|
||||||
|
updateSetting: (conversions: SettingsDownloadConversion[]) => void;
|
||||||
|
}) => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
const [isDialogOpen, setIsDialogOpen] = useState(false);
|
||||||
|
const [tmpConversions, setTmpConversions] = useState(normalizeConversions(maybeAddDefault(conversions)));
|
||||||
|
const [focusedMimeTypeTextFieldIndex, setFocusedMimeTypeTextFieldIndex] = useState(DEFAULT_FOCUS_INDEX);
|
||||||
|
|
||||||
|
const hasInvalidConversion = containsInvalidConversion(tmpConversions);
|
||||||
|
|
||||||
|
const hasChanged = didUpdateConversions(conversions, tmpConversions);
|
||||||
|
|
||||||
|
const onClose = () => {
|
||||||
|
setTmpConversions(normalizeConversions(maybeAddDefault(conversions)));
|
||||||
|
setIsDialogOpen(false);
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<ListItemButton disabled={false} onClick={() => setIsDialogOpen(true)}>
|
||||||
|
<ListItemText
|
||||||
|
primary={t('download.settings.conversion.title')}
|
||||||
|
secondary={conversions
|
||||||
|
.map((conversion) => `${conversion.mimeType} → ${conversion.target}`)
|
||||||
|
.join('; ')}
|
||||||
|
secondaryTypographyProps={{ style: { display: 'flex', flexDirection: 'column' } }}
|
||||||
|
/>
|
||||||
|
</ListItemButton>
|
||||||
|
<Dialog open={isDialogOpen} onClose={onClose}>
|
||||||
|
<DialogTitle>{t('download.settings.conversion.title')}</DialogTitle>
|
||||||
|
<DialogContent>
|
||||||
|
<DialogContentText sx={{ mb: 2 }}>
|
||||||
|
{t('download.settings.conversion.description')}
|
||||||
|
</DialogContentText>
|
||||||
|
<Stack sx={{ flexDirection: 'column', gap: 3 }}>
|
||||||
|
{tmpConversions.map((conversion, index) => {
|
||||||
|
const { mimeType } = conversion;
|
||||||
|
|
||||||
|
const isDuplicate = isDuplicateConversion(mimeType, index, tmpConversions);
|
||||||
|
const shouldAutoFocusMimeTypeTextField = index === focusedMimeTypeTextFieldIndex;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Conversion
|
||||||
|
// eslint-disable-next-line react/no-array-index-key
|
||||||
|
key={`${mimeType}-${index}`}
|
||||||
|
conversion={conversion}
|
||||||
|
isDuplicate={isDuplicate}
|
||||||
|
index={index}
|
||||||
|
setFocusMimeTypeTextField={(focus) =>
|
||||||
|
setFocusedMimeTypeTextFieldIndex(focus ? index : DEFAULT_FOCUS_INDEX)
|
||||||
|
}
|
||||||
|
shouldAutoFocusMimeTypeTextField={shouldAutoFocusMimeTypeTextField}
|
||||||
|
onChange={(newConversion) => {
|
||||||
|
setTmpConversions((prev) =>
|
||||||
|
maybeAddDefault(
|
||||||
|
prev.toSpliced(index, 1, ...(newConversion ? [newConversion] : [])),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
})}
|
||||||
|
</Stack>
|
||||||
|
</DialogContent>
|
||||||
|
<DialogActions>
|
||||||
|
<Stack
|
||||||
|
direction="row"
|
||||||
|
sx={{
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
width: '100%',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Button
|
||||||
|
variant="outlined"
|
||||||
|
onClick={() => {
|
||||||
|
setTmpConversions((prev) => [...prev, { mimeType: '', target: '' }]);
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{t('global.button.add')}
|
||||||
|
</Button>
|
||||||
|
<Stack direction="row">
|
||||||
|
<Button onClick={onClose}>{t('global.button.cancel')}</Button>
|
||||||
|
<Button
|
||||||
|
disabled={hasInvalidConversion || !hasChanged}
|
||||||
|
onClick={() => updateSetting(toValidServerConversions(tmpConversions))}
|
||||||
|
>
|
||||||
|
{t('global.button.ok')}
|
||||||
|
</Button>
|
||||||
|
</Stack>
|
||||||
|
</Stack>
|
||||||
|
</DialogActions>
|
||||||
|
</Dialog>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -32,6 +32,7 @@ import { MetadataDownloadSettings } from '@/modules/downloads/Downloads.types.ts
|
|||||||
import { ServerSettings } from '@/modules/settings/Settings.types.ts';
|
import { ServerSettings } from '@/modules/settings/Settings.types.ts';
|
||||||
import { getErrorMessage } from '@/lib/HelperFunctions.ts';
|
import { getErrorMessage } from '@/lib/HelperFunctions.ts';
|
||||||
import { useAppTitle } from '@/modules/navigation-bar/hooks/useAppTitle.ts';
|
import { useAppTitle } from '@/modules/navigation-bar/hooks/useAppTitle.ts';
|
||||||
|
import { DownloadConversionSetting } from '@/modules/downloads/components/DownloadConversionSetting.tsx';
|
||||||
|
|
||||||
type DownloadSettingsType = Pick<
|
type DownloadSettingsType = Pick<
|
||||||
ServerSettings,
|
ServerSettings,
|
||||||
@@ -41,6 +42,7 @@ type DownloadSettingsType = Pick<
|
|||||||
| 'autoDownloadNewChaptersLimit'
|
| 'autoDownloadNewChaptersLimit'
|
||||||
| 'excludeEntryWithUnreadChapters'
|
| 'excludeEntryWithUnreadChapters'
|
||||||
| 'autoDownloadIgnoreReUploads'
|
| 'autoDownloadIgnoreReUploads'
|
||||||
|
| 'downloadConversions'
|
||||||
>;
|
>;
|
||||||
|
|
||||||
const extractDownloadSettings = (settings: ServerSettings): DownloadSettingsType => ({
|
const extractDownloadSettings = (settings: ServerSettings): DownloadSettingsType => ({
|
||||||
@@ -50,6 +52,7 @@ const extractDownloadSettings = (settings: ServerSettings): DownloadSettingsType
|
|||||||
autoDownloadNewChaptersLimit: settings.autoDownloadNewChaptersLimit,
|
autoDownloadNewChaptersLimit: settings.autoDownloadNewChaptersLimit,
|
||||||
excludeEntryWithUnreadChapters: settings.excludeEntryWithUnreadChapters,
|
excludeEntryWithUnreadChapters: settings.excludeEntryWithUnreadChapters,
|
||||||
autoDownloadIgnoreReUploads: settings.autoDownloadIgnoreReUploads,
|
autoDownloadIgnoreReUploads: settings.autoDownloadIgnoreReUploads,
|
||||||
|
downloadConversions: settings.downloadConversions,
|
||||||
});
|
});
|
||||||
|
|
||||||
export const DownloadSettings = () => {
|
export const DownloadSettings = () => {
|
||||||
@@ -134,6 +137,10 @@ export const DownloadSettings = () => {
|
|||||||
onChange={(e) => updateSetting('downloadAsCbz', e.target.checked)}
|
onChange={(e) => updateSetting('downloadAsCbz', e.target.checked)}
|
||||||
/>
|
/>
|
||||||
</ListItem>
|
</ListItem>
|
||||||
|
<DownloadConversionSetting
|
||||||
|
conversions={downloadSettings?.downloadConversions}
|
||||||
|
updateSetting={(conversions) => updateSetting('downloadConversions', conversions)}
|
||||||
|
/>
|
||||||
<List
|
<List
|
||||||
subheader={
|
subheader={
|
||||||
<ListSubheader component="div" id="download-settings-auto-delete-downloads">
|
<ListSubheader component="div" id="download-settings-auto-delete-downloads">
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[
|
[
|
||||||
{
|
{
|
||||||
"uiVersion": "PREVIEW",
|
"uiVersion": "PREVIEW",
|
||||||
"serverVersion": "r1837"
|
"serverVersion": "r1856"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"tag": "20250703.01",
|
"tag": "20250703.01",
|
||||||
|
|||||||
Reference in New Issue
Block a user