Merged
Conversation
ffcb086 to
fe2c7ea
Compare
This reverts commit 9ece3af.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Description: Merge
update-python-rclone-depand GUI ImprovementsThis PR merges the changes from the
update-python-rclone-depbranch intonew-gui, resolves merge conflicts, and ensures the CLI/GUI is fully functional with the new dependency structure.Changes
1. Merge Conflict Resolution
pyproject.toml&src/rclone_decrypt/__init__.py: Maintained version0.2.0as the base for the new GUI features.src/rclone_decrypt/decrypt.py:rcloneconfiguration discovery usingrclone config file.subprocess-basedrclone copyexecution, removing the directrclonePython library dependency for core decryption tasks.2. CLI & GUI Integration
src/rclone_decrypt/cli.py:--guiflag to launch the Flet-based interface.--configto be optional when launching the GUI, as the interface provides its own config picker.src/rclone_decrypt/gui.py:3. Dependencies & Tooling
poetry.lock: Updated to reflect the merged dependencies and versioning.flake8checks.Verification Results
Automated Tests
poetry run pytest.Linting
poetry run flake8.CLI Verification
poetry run rclone-decrypt --helpdisplays the new--guioption correctly.