Merge branch 'master' into wait-for-network

Author: m3nu

.github/actions/setup/action.yml

@@ -43,7 +43,7 @@ runs:
 
     - name: Caching for Pre-Commit
       if: ${{ inputs.pre-commit }}
-      uses: actions/cache@v3
+      uses: actions/cache@v4
       with:
         path: ~/.cache/pre-commit
         key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}

.github/workflows/build-macos.yml

@@ -26,7 +26,7 @@ jobs:
 
     steps:
     - name: Check out selected branch
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         ref: ${{ github.event.inputs.branch }}
     - name: Install uv

.github/workflows/test.yml

@@ -20,7 +20,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Setup python, vorta and dev deps
         uses: ./.github/actions/setup
         with:
@@ -37,7 +37,7 @@ jobs:
       matrix-unit: ${{ steps.set-matrix-unit.outputs.matrix }}
       matrix-integration: ${{ steps.set-matrix-integration.outputs.matrix }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Give execute permission to script
         run: chmod +x ./.github/scripts/generate-matrix.sh
@@ -63,7 +63,7 @@ jobs:
       matrix: ${{fromJson(needs.prepare-matrix.outputs.matrix-unit)}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install system dependencies
         uses: ./.github/actions/install-dependencies
@@ -99,7 +99,7 @@ jobs:
         run: echo $PKG_CONFIG_PATH && make test-unit
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v3
+        uses: codecov/codecov-action@v4
         env:
           OS: ${{ runner.os }}
           python: ${{ matrix.python-version }}
@@ -116,7 +116,7 @@ jobs:
       matrix: ${{fromJson(needs.prepare-matrix.outputs.matrix-integration)}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install system dependencies
         uses: ./.github/actions/install-dependencies

src/vorta/assets/UI/about_tab.ui

@@ -118,7 +118,7 @@
         </layout>
        </item>
        <item>
-        <widget class="QFrame" name="seperator">
+        <widget class="QFrame" name="separator">
          <property name="frameShape">
           <enum>QFrame::HLine</enum>
          </property>
@@ -223,7 +223,7 @@
         </layout>
        </item>
        <item>
-        <widget class="QFrame" name="seperator">
+        <widget class="QFrame" name="separator">
          <property name="frameShape">
           <enum>QFrame::HLine</enum>
          </property>

src/vorta/borg/info_archive.py

@@ -46,7 +46,7 @@ def process_result(self, result):
                     archive = ArchiveModel.get_or_none(name=remote_archive['name'], repo=repo_id)
                     archive.snapshot_id = remote_archive['id']
 
-                archive.name = remote_archive['name']  # incase name changed
+                archive.name = remote_archive['name']  # in case name changed
                 # archive.time = parser.parse(remote_archive['time'])
                 archive.duration = remote_archive['duration']
                 archive.size = remote_archive['stats']['deduplicated_size']

src/vorta/keyring/darwin.py

@@ -94,9 +94,9 @@ def delete_password(self, service, repo_url):
         try:
             result, password_length, password_buffer, keychain_item = SecKeychainFindGenericPassword(
                 self.login_keychain,
-                len(service),
+                len(service.encode()),
                 service.encode(),
-                len(repo_url),
+                len(repo_url.encode()),
                 repo_url.encode(),
                 None,
                 None,
@@ -124,9 +124,9 @@ def get_password(self, service, repo_url):
             keychain_item,
         ) = SecKeychainFindGenericPassword(
             self.login_keychain,
-            len(service),
+            len(service.encode()),
             service.encode(),
-            len(repo_url),
+            len(repo_url.encode()),
             repo_url.encode(),
             None,
             None,

src/vorta/profile_export.py

@@ -100,7 +100,7 @@ def to_db(self, overwrite_profile=False, overwrite_settings=True):
             while BackupProfileModel.get_or_none(BackupProfileModel.id == self.id) is not None:
                 self._profile_dict['id'] += 1
 
-            # Add suffix incase names are the same
+            # Add suffix in case names are the same
             if BackupProfileModel.get_or_none(BackupProfileModel.name == self.name) is not None:
                 suffix = 1
                 while BackupProfileModel.get_or_none(BackupProfileModel.name == f"{self.name}-{suffix}") is not None:

src/vorta/views/archive_tab.py

@@ -1045,7 +1045,7 @@ def rename_result(self, result):
     def toggle_compact_button_visibility(self):
         """
         Enable or disable the compact button depending on the Borg version.
-        This function runs once on startup, and everytime the profile is changed.
+        This function runs once on startup, and every time the profile is changed.
         """
         if borg_compat.check("COMPACT_SUBCOMMAND"):
             self.compactButton.setEnabled(True)

src/vorta/views/partials/treemodel.py

@@ -412,7 +412,7 @@ def _addChild(
         This is called by `addItem` in a reduce statement. It should
         add a new child with the given attributes to the given item.
         This implementation provides a reasonable default, most subclasses
-        wont need to override this method. The implementation should make use
+        won't need to override this method. The implementation should make use
         of `_make_filesystemitem`, `_merge_data`, `_add_children`.
 
         Parameters
@@ -562,7 +562,7 @@ def setMode(self, value: 'DisplayMode'):
 
         In TREE mode (default) the tree will be displayed as is.
         In SIMPLIFIED_TREE items will simplify the tree by combining
-        items with their single child if they posess only one.
+        items with their single child if they possess only one.
         In FLAT mode items will be displayed as a simple list. The items
         shown can be filtered by `_flat_filter`.
 

tests/unit/test_keyring_darwin.py

@@ -0,0 +1,16 @@
+import sys
+import uuid
+
+import pytest
+
+
+@pytest.mark.skipif(sys.platform != "darwin", reason="macOS only")
+def test_keyring_non_ascii_repo():
+    from vorta.keyring.darwin import VortaDarwinKeyring
+
+    UNICODE_PW = 'password'
+    REPO = 'vorta-test-repo-한글'
+
+    keyring = VortaDarwinKeyring()
+    keyring.set_password('vorta-repo', REPO, UNICODE_PW)
+    assert keyring.get_password("vorta-repo", REPO) == UNICODE_PW