Skip to content

Replace identifier skip checkboxes with a select that matches the filter's behavior #277

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
bhoffman20 wants to merge 1 commit into from
Closed

Replace identifier skip checkboxes with a select that matches the filter's behavior #277

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 63 additions & 18 deletions frontend/src/Settings/Profiles/Metadata/EditMetadataProfileModalContent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,51 @@ import { icons, inputTypes, kinds, tooltipPositions } from 'Helpers/Props';
import translate from 'Utilities/String/translate';
import styles from './EditMetadataProfileModalContent.css';

// Each option is a combination of the existing skipMissingIsbn/skipMissingAsin flags. The backend
// keeps an edition when: neither flag -> always; isbn only -> ISBN or ASIN; asin only -> ASIN;
// both -> ISBN and ASIN. Requiring ISBN alone has no flag combination, so it isn't offered.
const identifierRequirementFlags = {
none: { skipMissingIsbn: false, skipMissingAsin: false },
missingBoth: { skipMissingIsbn: true, skipMissingAsin: false },
missingEither: { skipMissingIsbn: true, skipMissingAsin: true },
missingAsin: { skipMissingIsbn: false, skipMissingAsin: true }
};

const identifierRequirementOptions = [
{
key: 'none',
get value() {
return translate('SkipMissingIdentifierNone');
}
},
{
key: 'missingBoth',
get value() {
return translate('SkipMissingIdentifierMissingBoth');
}
},
{
key: 'missingEither',
get value() {
return translate('SkipMissingIdentifierMissingEither');
}
},
{
key: 'missingAsin',
get value() {
return translate('SkipMissingIdentifierMissingAsin');
}
}
];

function getIdentifierRequirement(skipMissingIsbn, skipMissingAsin) {
if (skipMissingIsbn) {
return skipMissingAsin ? 'missingEither' : 'missingBoth';
}

return skipMissingAsin ? 'missingAsin' : 'none';
}

function fieldWithDefault(field, value) {
return field ?? {
value,
Expand Down Expand Up @@ -76,6 +121,17 @@ function EditMetadataProfileModalContent(props) {
const labelSuffix = isAudiobook ? 'Audiobook' : 'Book';
const deleteDisabledTooltip = translate('IsInUseCantDeleteAMetadataProfileThatIsAttachedToAnAuthorImportListOrRootFolder');

const identifierRequirement = getIdentifierRequirement(skipMissingIsbnField.value, skipMissingAsinField.value);
const identifierRequirementErrors = [...skipMissingIsbnField.errors, ...skipMissingAsinField.errors];
const identifierRequirementWarnings = [...skipMissingIsbnField.warnings, ...skipMissingAsinField.warnings];

const onIdentifierRequirementChange = ({ value }) => {
const flags = identifierRequirementFlags[value] ?? identifierRequirementFlags.none;

onInputChange({ name: 'skipMissingIsbn', value: flags.skipMissingIsbn });
onInputChange({ name: 'skipMissingAsin', value: flags.skipMissingAsin });
};

return (
<ModalContent onModalClose={onModalClose}>
<ModalHeader>
Expand Down Expand Up @@ -162,25 +218,14 @@ function EditMetadataProfileModalContent(props) {
</FormLabel>

<FormInputGroup
type={inputTypes.CHECK}
name="skipMissingIsbn"
{...skipMissingIsbnField}
type={inputTypes.SELECT}
name="identifierRequirement"
value={identifierRequirement}
values={identifierRequirementOptions}
errors={identifierRequirementErrors}
warnings={identifierRequirementWarnings}
helpText={translate(`SkipMissingIdentifier${labelSuffix}HelpText`)}
onChange={onInputChange}
/>
</FormGroup>

<FormGroup>
<FormLabel>
{translate(`SkipMissingAsin${labelSuffix}`)}
</FormLabel>

<FormInputGroup
type={inputTypes.CHECK}
name="skipMissingAsin"
{...skipMissingAsinField}
helpText={translate(`SkipMissingAsin${labelSuffix}HelpText`)}
onChange={onInputChange}
onChange={onIdentifierRequirementChange}
/>
</FormGroup>

Expand Down
12 changes: 6 additions & 6 deletions src/NzbDrone.Core/Localization/Core/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1902,18 +1902,18 @@
"Skip": "Skip",
"SkipFreeSpaceCheck": "Skip Free Space Check",
"SkipFreeSpaceCheckWhenImportingHelpText": "Use when Chaptarr is unable to detect free space from your author root folder",
"SkipMissingAsinAudiobook": "Skip audiobooks missing ASIN",
"SkipMissingAsinAudiobookHelpText": "Requires ASIN. Best for well-known, well-published authors where complete metadata is expected.",
"SkipMissingAsinBook": "Skip books missing ASIN",
"SkipMissingAsinBookHelpText": "Requires ASIN. Best for well-known, well-published authors where complete metadata is expected.",
"SkipMissingDateAudiobook": "Skip audiobooks with missing release date",
"SkipMissingDateAudiobookHelpText": "Hides audiobooks with no release date in metadata. They will appear once providers add a date on the next author refresh.",
"SkipMissingDateBook": "Skip books with missing release date",
"SkipMissingDateBookHelpText": "Hides books with no release date in metadata. They will appear once providers add a date on the next author refresh.",
"SkipMissingIdentifierAudiobook": "Skip audiobooks missing identifier",
"SkipMissingIdentifierAudiobookHelpText": "Filters out audiobooks without any identifier (ISBN or ASIN). Quick way to remove low-quality metadata entries.",
"SkipMissingIdentifierAudiobookHelpText": "Which identifiers an audiobook edition needs to be kept. Editions you have files for or added manually are never skipped.",
"SkipMissingIdentifierBook": "Skip books missing identifier",
"SkipMissingIdentifierBookHelpText": "Filters out books without any identifier (ISBN or ASIN). Quick way to remove low-quality metadata entries.",
"SkipMissingIdentifierBookHelpText": "Which identifiers a book edition needs to be kept. Editions you have files for or added manually are never skipped.",
"SkipMissingIdentifierMissingAsin": "Skip if missing ASIN",
"SkipMissingIdentifierMissingBoth": "Skip if missing both ISBN and ASIN (Require either)",
"SkipMissingIdentifierMissingEither": "Skip if missing either ISBN or ASIN (Require both)",
"SkipMissingIdentifierNone": "Don't skip",
"SkipMissingIdentifierOmnibusAudiobook": "Skip omnibus/collection audiobooks without identifiers",
"SkipMissingIdentifierOmnibusAudiobookHelpText": "Removes omnibus/collection audiobooks only when no edition has an ASIN or ISBN.",
"SkipMissingIdentifierOmnibusBook": "Skip omnibus/collection books without identifiers",
Expand Down