Merge c8ccd16dad into 9cabbbd193

.github/workflows/build-macos.yml

@@ -3,17 +3,21 @@ on:
   workflow_dispatch:
     inputs:
       branch:
-        description: 'Branch to use for building macOS release'
+        description: 'Branch to use for building release'
         required: true
         default: 'master'
       borg_version:
         description: 'Borg version to package'
         required: true
-        default: '1.2.1'
+        default: '1.2.8'
+      macos_version:
+        description: 'macOS version for building'
+        required: true
+        default: 'macos-11'
 
 jobs:
   build:
-    runs-on: macos-11
+    runs-on: ${{ github.event.inputs.macos_version }}
 
     steps:
     - name: Check out selected branch

.github/workflows/stale.yml

@@ -6,10 +6,13 @@ on:
 jobs:
   stale:
     runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
     steps:
       - uses: actions/stale@v8
         with:
-          days-before-issue-stale: 60
+          days-before-issue-stale: 90
           days-before-pr-stale: -1
           days-before-issue-close: 7
           # days-before-pr-close: 10

src/vorta/assets/exclusion_presets/dev.json

@@ -56,5 +56,44 @@
         ],
         "tags": ["type:dev", "editor:android-studio", "os:linux"],
         "author": "shivansh02"
+    },
+    {
+        "name": "Jetbrains IDEs cache, config, path and logs",
+        "slug": "jetbrains",
+        "patterns": [
+            "fm:*/.config/JetBrains",
+            "fm:*/.cache/JetBrains",
+            "fm:*/.local/share/JetBrains"
+        ],
+        "tags": ["type:dev", "editor:jetbrains", "os:linux"],
+        "author": "SAMAD101"
+    },
+    {
+        "name": "AWS artefacts",
+        "slug": "aws-artefacts",
+        "patterns": [
+            "fm:*/.aws"
+        ],
+        "tags": ["type:dev", "cloud:aws", "os:linux", "os:darwin"],
+        "author": "SAMAD101"
+    },
+    {
+        "name": "Spotify cache and config files",
+        "slug": "spotify",
+        "patterns": [
+            "fm:*/.cache/spotify",
+            "fm:*/.config/spotify"
+        ],
+        "tags": ["type:media", "media:spotify", "os:linux"],
+        "author": "SAMAD101"
+    },
+    {
+        "name": "Docker artefacts",
+        "slug": "docker-artefacts",
+        "patterns": [
+            "fm:*/.docker"
+        ],
+        "tags": ["type:dev", "cloud:docker", "os:linux", "os:darwin"],
+        "author": "SAMAD101"
     }
 ]

src/vorta/borg/borg_job.py

@@ -113,16 +113,19 @@ class BorgJob(JobInterface, BackupProfileMixin):
         return self.site_id
 
     def cancel(self):
-        logger.debug("Cancel job on site %s", self.site_id)
+        logger.debug("Cancelling job on site %s", self.site_id)
         if self.process is not None:
-            self.process.send_signal(signal.SIGINT)
+            self.terminate_process(self.process)
+
+    def terminate_process(self, process):
+        process.send_signal(signal.SIGINT)
+        try:
+            process.wait(timeout=3)
+        except TimeoutExpired:
             try:
-                self.process.wait(timeout=3)
-            except TimeoutExpired:
-                try:
-                    os.killpg(os.getpgid(self.process.pid), signal.SIGTERM)
-                except ProcessLookupError:
-                    pass
+                os.killpg(os.getpgid(process.pid), signal.SIGTERM)
+            except ProcessLookupError:
+                pass
 
     @classmethod
     def prepare(cls, profile):

src/vorta/scheduler.py

@@ -459,6 +459,7 @@ class VortaScheduler(QtCore.QObject):
         Pruning and checking after successful backup.
         """
         profile = BackupProfileModel.get(id=profile_id)
+        notifier = VortaNotifications.pick()
         logger.info('Doing post-backup jobs for %s', profile.name)
         if profile.prune_on:
             msg = BorgPruneJob.prepare(profile)
@@ -489,6 +490,11 @@ class VortaScheduler(QtCore.QObject):
                 self.app.jobs_manager.add_job(job)
 
         logger.info('Finished background task for profile %s', profile.name)
+        notifier.deliver(
+            self.tr('Vorta Backup'),
+            self.tr('Post Backup Tasks successful for %s' % profile.name),
+            level='info',
+        )
 
     def remove_job(self, profile_id):
         if profile_id in self.timers: