refactor

Author: diivi

src/vorta/application.py

@@ -113,10 +113,7 @@ def create_backup_action(self, profile_id=None):
             job = BorgCreateJob(msg['cmd'], msg, profile.repo.id)
             self.jobs_manager.add_job(job)
         else:
-            if not (
-                msg['message'] == 'Current Wifi is not allowed.'
-                and not profile.show_notification_when_network_disallowed
-            ):
+            if msg['message'] != 'Current Wifi is not allowed.' or profile.show_notification_when_network_disallowed:
                 notifier = VortaNotifications.pick()
                 notifier.deliver(
                     self.tr('Vorta Backup'),

src/vorta/scheduler.py

@@ -418,9 +418,9 @@ def create_backup(self, profile_id):
             else:
                 logger.error('Conditions for backup not met. Aborting.')
                 logger.error(msg['message'])
-                if not (
-                    msg['message'] == 'Current Wifi is not allowed.'
-                    and not profile.show_notification_when_network_disallowed
+                if (
+                    msg['message'] != 'Current Wifi is not allowed.'
+                    or profile.show_notification_when_network_disallowed
                 ):
                     notifier.deliver(
                         self.tr('Vorta Backup'),

src/vorta/store/migrations.py

@@ -233,7 +233,7 @@ def run_migrations(current_schema, db_connection):
             migrator.add_column(
                 BackupProfileModel._meta.table_name,
                 'allow_new_networks',
-                pw.BooleanField(default=False),
+                pw.BooleanField(default=True),
             ),
             migrator.add_column(
                 BackupProfileModel._meta.table_name,

src/vorta/views/schedule_tab.py

@@ -155,12 +155,8 @@ def populate_from_profile(self):
         self.meteredNetworksCheckBox.setChecked(
             QtCore.Qt.Unchecked if profile.dont_run_on_metered_networks else QtCore.Qt.Checked
         )
-        self.allowNewNetworksCheckBox.setChecked(
-            QtCore.Qt.Checked if profile.allow_new_networks else QtCore.Qt.Unchecked
-        )
-        self.networkDisallowedNotificationCheckBox.setChecked(
-            QtCore.Qt.Checked if profile.show_notification_when_network_disallowed else QtCore.Qt.Unchecked
-        )
+        self.allowNewNetworksCheckBox.setChecked(profile.allow_new_networks)
+        self.networkDisallowedNotificationCheckBox.setChecked(profile.show_notification_when_network_disallowed)
 
         self.preBackupCmdLineEdit.setText(profile.pre_backup_cmd)
         self.postBackupCmdLineEdit.setText(profile.post_backup_cmd)