* fix PEP8 E721
do not compare types, for exact checks use `is` / `is not`, for instance checks use `isinstance()`
* remove redundant parentheses
* fix SiteWorker.run for empty job queue
local variable job is not assigned if queue was empty
when calling .run(), but it is used in exception handler.
* remove unreachable code in parse_diff_lines
* bug fix for unreachable code in is_worker_running
the code intended to check if *any* worker is running for
any site was *unreachable*.
this caused false negative results for site=None.
* check_failed_response: remove outdated part of docstring
* pull request template: fix relative path to LICENSE.txt
* fix typos
* use logger.warning, .warn is deprecated
Allows vorta to be called with the command-line flag `--development` or `-D` that will make it use a directory in the project tree to store all the settings, logs, and cache. This default directory will be called `.dev_config` and placed in the projects root.
Also allows for a custom directory path allowing for multiple "configuration" folders at once.
This can be used to prevent the vorta instance that a developer is working on from accessing the configuration files that they have set up for their personal backups.
* .gitignore : Add `.dev_config`.
* src/vorta/utils.py (parse_args): Add `--development` flag. The default will be `DEFAULT_DIR_FLAG`.
* src/vorta/utils.py : Add `DEFAULT_DIR_FLAG`.
* src/vorta/config.py : Add methods for populating the config directories exposed by this module.
* src/vorta/__main__.py (main): Handle `--development` flag and update config directories if its specified.
* Access config constants through the `config` module instead of importing them directly with `from .config import`.
---------
Co-authored-by: yfprojects <62463991+real-yfprojects@users.noreply.github.com>
Currently the label `logText` is not cleared after a borg command finished. When creating a backup the label will show the path of the last backuped file even after backup completion.
This changes that and clears `logText` after the backup.
* src/vorta/borg/create.py (BorgCreateJob.process_result)
---------
Co-authored-by: yfprojects <62463991+real-yfprojects@users.noreply.github.com>
This puts Vorta on PyQt6 and starts a new main branch 0.9.
---------
Co-authored-by: real-yfprojects <real-yfprojects@users.noreply.github.com>
Co-authored-by: Manu <3916435+m3nu@users.noreply.github.com>
Co-authored-by: yfprojects <62463991+real-yfprojects@users.noreply.github.com>
* feat: add profile name to log messages
* update tests
* add profile name to all occurences of backup progress event emit
* update tests
* merge with logs link code
---------
Co-authored-by: Hofer-Julian <30049909+Hofer-Julian@users.noreply.github.com>
In case a borg job finishes with warning, vorta will display it and tell the user to have a look in the logs. This adds a clickable link to the log message that opens the default file explorer at the log location.
* src/vorta/application.py (VortaApp.check_failed_response): Improve wording of warning message and link logs.
* src/vorta/borg/create.py (BorgCreateJob.process_result): Link logs.
* src/vorta/borg/compact.py (BorgCompactJob.finished_event): ^^
* src/vorta/borg/check.py (BorgCheckJob.finished_event): ^^
* src/vorta/assets/UI/mainwindow.ui : Enable `openExternalLinks` for `progressText` label.
Fixes#1463. This makes the code count the database rows for the current profile only.
Previously one could run a backup without any sources when one had sources configured in a different profile.
* src/vorta/borg/create.py (BorgCreateJob.prepare)
Adds different behaviour when borg version >=1.2.2 but <2.0.0: The prune pattern is supplied without a style prefix like `sh:`.
Fixes#1564.
---------
Co-authored-by: herrwusel <herrwusel@user.noreply.github.com>
Co-authored-by: yfprojects <62463991+real-yfprojects@users.noreply.github.com>
* src/vorta/views/archive_tab.py : Move all command building logic into `mount.py`.
* src/vorta/borg/mount.py (BorgMountJob.prepare): Add command building logic previously in other places.
* src/vorta/borg/mount.py (BorgMountJob.prepare): Use `-a` command line option to select a single archive.
* src/vorta/utils.py (SHELL_PATTERN_ELEMENT): A pattern that can be used to detect shell pattern syntax.
* src/vorta/utils.py (get_mount_points): Implement parsing a borg v2 cmd.
* src/vorta/borg/umount.py (BorgUmountJob.prepare): Add parameters `mount_point` and optional `archive_name`.
Handle them correctly.
* src/vorta/views/archive_tab.py : Remove code that can now be found in `umount.py`.
Translate error messages returned by `BorgUmountJob.prepare`.
Co-authored-by: real-yfprojects <real-yfprojects@users.noreply.github.com>
Adjust available encryptions for borg v2.
Use `-r` for all/most commands. Implement `rinfo`.
Use `ssh://` style URL as a placeholder.
Implement compatibility for `borg extract`.
Adjust for beta3, use --match-archives for deletions
Co-authored-by: real-yfprojects <real-yfprojects@users.noreply.github.com>
Co-authored-by: Manu <manu@snapdragon.cc>
Backups will run although no sources are specified if `--paths-from-command` is supplied.
Also arguments after `--` will be appended to the end of the command after all other arguments.
Closes#1537.
* src/vorta/borg/create.py
* tests/test_create.py : Add test for using `--path-from-commands`.
Co-authored-by: real-yfprojects <real-yfprojects@users.noreply.github.com>
Start `borg check` with option `--progress` and handle the progress messages. Now the long repo check phase won't look like a freeze in vorta because vorta will show status updates. Fixes#1497.
Co-authored-by: yfprojects <62463991+real-yfprojects@users.noreply.github.com>
Fixes#1488.
Closing deletes the temp file. This will be done by `BorgJob.run` after running the command.
* src/vorta/borg/extract.py (BorgExtractJob.prepare): Remove call to `close` of temporary file.
In python `+` takes precedence over the `if-else` operator.
Therefore brackets are needed around the latter.
* src/vorta/borg/list_archive.py (BorgListArchiveJob.prepare)
First element with index 0 is always the 'unset' option with data `None`.
* src/vorta/views/repo_tab.py (RepoTab.set_repos): Add element.
* src/vorta/views/repo_tab.py (RepoTab.repo_unlink_action): Handle the first element as unset.
* src/vorta/views/repo_tab.py (RepoTab.copy_URL_action): Handle unset state.
* tests/test_repo.py (test_repo_unlink): Fix test.
Co-authored-by: real-yfprojects <real-yfprojects@users.noreply.github.com>
* src/vorta/views/extract_dialog.py: Add `ParseThread`, `ExtractTree` and `parse_json_lines`.
* src/vorta/views/extract_dialog.py (ExtractTree.__init__): Adjust signature.
* src/vorta/borg/list_archive.py (BorgListArchiveJob.prepare): Adjust format to
include additional attributes.
* src/vorta/views/archive_tab.py (ArchiveTab): Parse extract data using `ParseThread` and
open `ExtractDialog` afterwards.
* tests/test_archives.py (test_archive_extract): Update tests.
* src/vorta/borg/extract.py (BorgExtractJob.prepare): Adjust signature.
Handling of the data isn't implemented yet.
* tests/test_extract.py
* Remove fullstops in the labels of the settings.
* src/vorta/store/settings.py (get_misc_setting): Remove fullstops in the `label` fields of each setting.
* Fix *Add Profile*-Dialog.
* src/vorta/assets/UI/profileadd.ui (label_2): Rename to `profileExplainer`.
* src/vorta/assets/UI/profileadd.ui (profileExplainer): Remove unnecessary text and rephrase it in simpler terms.
* src/vorta/assets/UI/profileadd.ui (formLayout): Move into frame for better layout in dialog.
* src/vorta/assets/UI/profileadd.ui (Dialog): Make dialog modal.
* src/vorta/assets/UI/profileadd.ui : Modify spacing a bit and change all widgets to `expanding` mode.
* src/vorta/assets/UI/profileadd.ui (Dialog): Set title to `Add Profile`.
* src/vorta/assets/UI/profileadd.ui : Make `label_3` a buddy of `profileNameField`.
* Add colon after entry label in `Add Profile`-Dialog.
* src/vorta/assets/UI/profileadd.ui (label_3): Add colon at the end of label.
* Fix capitalization in schedule tab.
* src/vorta/assets/UI/scheduletab.ui (pruneCheckBox): Replace `Archive` by `archive`.
* Fix tooltips.
Ensure sentence capitalization.
Rephrase some tooltips that do not mention the action they provide a tip for. (There are still many to go.)
Remove fullstop from tooltips that aren't a sentence.
Add fullstop to tooltips that are a sentence.
* src/vorta/assets/UI/archivetab.ui
* src/vorta/assets/UI/mainwindow.ui
* src/vorta/assets/UI/repoadd.ui
* src/vorta/assets/UI/repotab.ui
* src/vorta/assets/UI/sourcetab.ui
* src/vorta/views/export_window.py
* src/vorta/views/import_window.py
* src/vorta/views/source_tab.py
* Replace `n't` by `not` in GUI strings.
* src/vorta/application.py
* src/vorta/assets/UI/repotab.ui
* src/vorta/assets/UI/scheduletab.ui
* src/vorta/assets/UI/sshadd.ui
* src/vorta/notifications.py
* src/vorta/views/main_window.py
* src/vorta/views/main_window.py
* src/vorta/views/repo_tab.py
* Shorten unlink button tooltip.
* src/vorta/assets/UI/repotab.ui (repoRemoveToolbutton): Shorten tooltip by only keeping the most valuable information needed to understand the feature.
* Fix entry being embedded in label text.
Sentences should not be constructed from text in several controls.
Sentences that run from one control to another will often not make sense when translated into other languages.
* src/vorta/assets/UI/archivetab.ui
* src/vorta/assets/UI/scheduletab.ui
* Rewrite tooltips to make them HIG conform.
The KDE HIG was used.
* src/vorta/assets/UI/exportwindow.ui
* src/vorta/assets/UI/importwindow.ui
* src/vorta/assets/UI/mainwindow.ui
* src/vorta/assets/UI/repoadd.ui
* src/vorta/assets/UI/repotab.ui
* src/vorta/assets/UI/sourcetab.ui
* src/vorta/views/export_window.py
* src/vorta/views/import_window.py (ImportWindow.init_overwrite_profile_checkbox): Make tooltip static as the HIG suggests.
* src/vorta/views/main_window.py
* Replace `...` with unicode ellipses `…` (U+2028) in GUI text.
* src/vorta/borg/break_lock.py
* src/vorta/borg/check.py
* src/vorta/borg/create.py
* src/vorta/borg/delete.py
* src/vorta/borg/diff.py
* src/vorta/borg/extract.py
* src/vorta/borg/info_archive.py
* src/vorta/borg/info_repo.py
* src/vorta/borg/init.py
* src/vorta/borg/list_archive.py
* src/vorta/borg/list_archive.py
* src/vorta/borg/list_repo.py
* Clean prune tab in `archivetab.ui`.
* src/vorta/assets/UI/archivetab.ui
* Prettify `repotab`.
* src/vorta/assets/UI/repotab.ui
* Fix tooltips for pruning in `archivetab.ui`.
* src/vorta/assets/UI/archivetab.ui
* Use affirmative phrase in checkbox for metered networks.
* src/vorta/assets/UI/scheduletab.ui (dontRunOnMeteredNetworksCheckbox): Rename to `meteredNetworksCheckBox`.
* src/vorta/assets/UI/scheduletab.ui (meteredNetworksCheckBox): Change text into affirmative phrase.
* src/vorta/views/schedule_tab.py : Invert values for `meteredNetworksCheckBox`.
* Add label in shell commands pane in `scheduletab` and fix placeholders.
Placeholders shouldn't be a replacement for a label.
* src/vorta/assets/UI/scheduletab.ui
* Group settings widgets in `misctab`.
* src/vorta/assets/UI/misctab.ui (checkboxLayout): Replace with frame `frameSettings` containing a form layout.
* src/vorta/utils.py (search): Added. Searches for a key inside an iterable
applying a given function before comparison.
* src/vorta/store/models.py (SettingsModel): Add field `group` to assign settings to a group.
* src/vorta/store/migrations.py (run_migrations): Add new schema version `19` and
implement migration adding the `group` field.
* src/vorta/store/connection.py (SCHEMA_VERSION): Update to `19`.
* src/vorta/store/settings.py (get_misc_settings): Add and assign settings groups.
* src/vorta/store/connection.py (init_db): Update group and type of settings if needed.
* src/vorta/views/misc_tab.py (Imports): Import `search` from `..utils`.
* src/vorta/views/misc_tab.py : Instanciate logger.
* src/vorta/views/misc_tab.py (MiscTab.__init__): Create a checkboxLayout for `frameSettings`.
* src/vorta/views/misc_tab.py (populate): Add settings widgets in groups with labels in spacer in between.
* Fix tests for `misctab`.
* tests/test_misc.py
* Fix margins.
* src/vorta/assets/UI/archivetab.ui
* src/vorta/assets/UI/misctab.ui
* src/vorta/assets/UI/repotab.ui
* src/vorta/assets/UI/scheduletab.ui
* src/vorta/assets/UI/sourcetab.ui
* Morph buttons in `sourcetab` into toolbuttons with icons.
Adds gradient buttons along the way. Fixes#933.
* src/vorta/assets/UI/sourcetab.ui : Change layout and buttons.
Merge buttons with adding capabilities into one toolbutton (with menu).
* src/vorta/assets/UI/sourcetab.ui : Rename `sourceRemove` to `removeButton`.
Rename `sourceUpdate` to `updateButton`.
Add `addButton`.
* src/vorta/assets/icons/minus.svg : Add minus sign icon from *fontawesome* v6.0.
* src/vorta/views/source_tab.py (SourceTab.set_icons): Added.
* src/vorta/views/source_tab.py (SourceTab.__init__): Create Menu for the `addButton` with
actions to add files and folders and to paste.
* src/vorta/application.py (VortaApp.eventFilter): Call `set_icons` of `sourceTab` as well.
* Fix tests for `sourcetab`.
* tests/test_source.py
* Add paste icon to paste action in `sourcetab`.
* src/vorta/assets/icons/paste.svg : Added from fontawesome (paste-solid, v6.0)
* src/vorta/views/source_tab.py (SourceTab.__init__): Save paste action in `pasteAction`.
* src/vorta/views/source_tab.py (SourceTab.set_icons): Set icon for `pasteAction`.
* Add icons to open actions in `sourcetab`.
* src/vorta/assets/icons/file.svg : Added `file-solid` from fontawesome, v6.0
* src/vorta/assets/icons/folder.svg : Added `folder-solid` from fontawesome, v6.0
* src/vorta/views/source_tab.py (SourceTab.__init__): Save files and folders action
to `addFilesAction` and `addFoldersAction`.
* src/vorta/views/source_tab.py (SourceTab.set_icons): Set icons for `addFilesAction` and `addFolderAction`.
* Fix icon size of `file.svg`.
* src/vorta/assets/icons/file.svg
* Set fill of added svgs to `#000000`.
* src/vorta/assets/icons/file.svg
* src/vorta/assets/icons/folder.svg
* src/vorta/assets/icons/minus.svg
* src/vorta/assets/icons/paste.svg
* Improve UX and consistency within the app for `scheduletab`.
* src/vorta/assets/UI/scheduletab.ui : Arrange schedule pane in a form layout.
* src/vorta/views/schedule_tab.py (ScheduleTab.__init__): Connect enabled state of entries
to radiobuttons and checkboxes.
* Workaround scheduletab tests being broken in github actions.
For some unknown reason clicking the `scheduleFixedRadio` won't work
when running using github action on ubuntu.
* tests/test_schedule.py
* Fix labels and spacing in `scheduletab`.
* src/vorta/assets/UI/scheduletab.ui
* Make archive operations more accessible and rename actions of `ArchiveTab`.
* src/vorta/views/archive_tab.py (ArchiveTab): Rename `list_action` to `refresh_archive_list`.
Rename `refresh_archive_action` to `refresh_archive_info`.
Rename `refresh_archive_result` to `info_result`.
Rename `list_archive_action` to `extract_action`.
Rename `list_archive_result` to `extract_list_result`.
* src/vorta/views/main_window.py : Apply renaming.
* src/vorta/assets/UI/archivetab.ui : Create own buttons for the archive actions.
Remove `archiveActionButton`. And some other layout changes.
* src/vorta/assets/UI/archivetab.ui : Rename `pruneButton` to `bPrune`.
Rename `checkButton` to `bCheck`.
Rename `diffButton` to `bDiff`.
Rename `listButton` to `bList`.
* tests/test_archives.py : Apply renaming.
* src/vorta/views/archive_tab.py : Connect new action buttons.
* src/vorta/views/archive_tab.py : Remove `archiveActionButton`.
* tests/test_archives.py : Fix tests.
* Enable and disable archive actions depending on selection.
* src/vorta/assets/UI/archivetab.ui : Put archive actions into a frame.
* src/vorta/views/archive_tab.py (ArchiveTab): Added `on_selection_change` that
enables/disables the frame depending on the selection count.
* src/vorta/views/archive_tab.py (ArchiveTab.populate_from_profile): Clear selection.
* src/vorta/views/archive_tab.py (ArchiveTab.__toggle_all_buttons): Add `fArchiveActions`.
Call `on_selection_change` at the end.
* Fix tests for `archivetab`.
* tests/test_archives.py
* Replace line by spacer in repotab.
* src/vorta/assets/UI/repotab.ui
* Show labels for archive action buttons.
* src/vorta/assets/UI/archivetab.ui
* Add tooltips and ellipses to archivetab.
* src/vorta/assets/UI/archivetab.ui
* src/vorta/views/archive_tab.py
* Fix tooltips.
* src/vorta/assets/UI/sourcetab.ui : Add tooltips.
* src/vorta/views/archive_tab.py (ArchiveTab.on_selection_change): Add reason for disabled state dynamically to archive action buttons.
* Add context menu to source view.
* src/vorta/views/source_tab.py (SourceTab): Implement `sourceitem_contextmenu` and `source_copy`.
Set context menu policiy of `sourceFilesWidget` to `CustomContextMenu`.
* src/vorta/assets/UI/sourcetab.ui: Change size hints.
* Add context menu to archive view.
* src/vorta/views/archive_tab.py (ArchiveTab): Set context menu policy of `archiveTable` to `CustomContextMenu`.
Implement `archiveitem_contextmenu`.
* Replace `Type` column in sources view by icon.
* src/vorta/views/source_tab.py (SourceColumn): Remove `Type` column.
* src/vorta/views/source_tab.py (SourceTab.set_icons): Set icon for each item in source view.
* src/vorta/views/source_tab.py (SourceTab.set_path_info): Set icon instead of `Type` column.
* src/vorta/assets/UI/sourcetab.ui : Remove `Type` column.
* Fix initial sort indicator of source view.
* src/vorta/views/source_tab.py
* Fix adding items while sorting enabled.
* src/vorta/views/source_tab.py
* Remove status bar and remove fix size hint for log text label.
* src/vorta/assets/UI/mainwindow.ui
* src/vorta/views/main_window.py (MainWindow.__init__): Set minimum height of `logText` to
two times the height of a line calculated by `QFontMetrics`.
* Resize main window height to `670`.
* src/vorta/assets/UI/mainwindow.ui
* Replace `QToolbutton` by `QPushbutton`.
* src/vorta/assets/UI/archivetab.ui
* src/vorta/assets/UI/repotab.ui
* src/vorta/assets/UI/sourcetab.ui
* src/vorta/views/source_tab.py
* Fix flake8
* Improve label of entry for `borg create` extra arguments.
* src/vorta/assets/UI/scheduletab.ui
* Unify label font size in `repotab`.
* src/vorta/assets/UI/repotab.ui
* Morph `QPushButton`s into `QToolButton`s.
Some exceptions were made, especially in the dialog windows.
* src/vorta/assets/UI/archivetab.ui
* src/vorta/assets/UI/mainwindow.ui
* src/vorta/assets/UI/repotab.ui
* src/vorta/assets/UI/sourcetab.ui
* Add copy capabilities to archive view and a copy shortcut to it and to source tab.
* src/vorta/views/source_tab.py (SourceTab): Add QShortcut for copying.
* src/vorta/views/archive_tab.py (ArchiveTab.archiveitem_contextmenu): Add copy action.
* src/vorta/views/archive_tab.py (ArchiveTab): Add QShortcut for copying.
* Move actions in comboBoxes to buttons.
* src/vorta/assets/UI/repotab.ui : Add `bAddSSHKey` and `bAddRepo`.
* src/vorta/views/repo_tab.py : Move code out of `ssh_select_action` and `repo_select_action` into `add_existing_repo`, `new_repo` and `create_ssh_key`.
* src/vorta/views/repo_tab.py
* Make tooltip of `storePassword` checkbox more fluent.
* src/vorta/assets/UI/exportwindow.ui
* Introduce `QDialogButtonBox` to modal dialogs in vorta.
* src/vorta/assets/UI/extractdialog.ui
* src/vorta/views/extract_dialog.py
* src/vorta/assets/UI/repoadd.ui
* src/vorta/views/repo_add_dialog.py
* src/vorta/assets/UI/sshadd.ui
* src/vorta/views/ssh_dialog.py
* Move some options in scheduletab to the side.
This results in two columns of options and fixes vertical scrolling.
* src/vorta/assets/UI/scheduletab.ui
* Changes for macOS layout
* Set `sizeAdjustPolicy` of comboBoxes to `AdustToContents`.
* src/vorta/assets/UI/mainwindow.ui
* src/vorta/assets/UI/repotab.ui
* Fix some icons, translations strings and link
* Lint
Co-authored-by: real-yfprojects <real-yfprojects@users.noreply.github.com>
Co-authored-by: Manu <3916435+m3nu@users.noreply.github.com>
Co-authored-by: Manu <manu@snapdragon.cc>
TW