Skip to content
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.

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

feat!: add conflict resolution option to configuration file #76

Merged
merged 1 commit into from
Oct 24, 2023

Conversation

gahyusuh
Copy link
Contributor

@gahyusuh gahyusuh commented Oct 17, 2023

What was the problem/requirement? (What/Why)

We need to provide a way for users to set their preferences for how file conflicts are resolved during downloads (when downloading files with the same file path or filename that already exist on the local.)

What was the solution? (How)

  • Added a new conflict_resolution setting to the configuration file.
  • Provided a dropdown in the Configuration GUI where users can select their preferred conflict resolution option.
  • Ensured that the --conflict-resolution option can still be specified in the download-output CLI command, which will override the config setting if both are present.

What is the impact of this change?

Users can now set their preferred method for resolving file conflicts directly in the configuration file, providing a more streamlined user experience.

How was this change tested?

  • hatch run lint && hatch run test
  • Configuration GUI testing: verified that the selected conflict resolution option is accurately saved in the config file.
  • CLI testing: Checked the behaviour when downloading output with file conflicts. Specifically, tested the combination of auto-accept and conflict-resolution.
    • auto-accept True, and conflict-resolution NOT_SELECTED --> No user prompt, executes default behaviour - CREATE_COPY
    • auto-accept True, and conflict-resolution something selected --> No user prompt, executes selected resolution
    • auto-accept False, and conflict-resolution NOT_SELECTED --> No user prompt, executes selected resolution
    • auto-accept False, and conflict-resolution something selected --> User is prompted for resolution, executes selected option
  • Priority testing: Verified that CLI-specified conflict resolution takes precedence over the config file setting.

Screenshot 2023-10-16 at 9 52 53 PM

Was this change documented?

No.

Is this a breaking change?

No.

@gahyusuh gahyusuh marked this pull request as ready for review October 17, 2023 13:38
@gahyusuh gahyusuh requested a review from a team as a code owner October 17, 2023 13:39
@gahyusuh gahyusuh force-pushed the gahyusuh/add_conflict_resolution_in_config branch from d8610a8 to 5e21211 Compare October 18, 2023 01:21
Signed-off-by: Gahyun Suh <gahyusuh@dev-dsk-gahyusuh-2a-387e0b51.us-west-2.amazon.com>
@gahyusuh gahyusuh force-pushed the gahyusuh/add_conflict_resolution_in_config branch from 5e21211 to dd89d59 Compare October 23, 2023 20:28
@gahyusuh gahyusuh changed the title feat: add conflict resolution option to configuration file feat!: add conflict resolution option to configuration file Oct 24, 2023
@gahyusuh gahyusuh merged commit d2d87c5 into mainline Oct 24, 2023
18 checks passed
@gahyusuh gahyusuh deleted the gahyusuh/add_conflict_resolution_in_config branch October 24, 2023 16:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants