Skip to content

Commit c74ed00

Browse files
diividiivi
authored
Merge branch 'master' into feat/allow-new-networks-and-show-disallowed-notif-setting
2 parents 03b759e + 6d5e738 commit c74ed00

26 files changed

Lines changed: 433 additions & 134 deletions

‎src/vorta/application.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ def create_backup_action(self, profile_id=None):
120120
translate('messages', msg['message']),
121121
level='error',
122122
)
123-
self.backup_progress_event.emit(translate('messages', msg['message']))
123+
self.backup_progress_event.emit(f"[{profile.name}] {translate('messages', msg['message'])}")
124124
return None
125125

126126
def open_main_window_action(self):
@@ -195,6 +195,10 @@ def check_darwin_permissions(self):
195195
This function tries reading a file that is known to be restricted and warn the user about
196196
incomplete backups.
197197
"""
198+
199+
if not SettingsModel.get(key="check_full_disk_access").value:
200+
return
201+
198202
test_path = Path('~/Library/Cookies').expanduser()
199203
if test_path.exists() and not os.access(test_path, os.R_OK):
200204
msg = QMessageBox()
@@ -251,7 +255,7 @@ def react_to_log(self, mgs, context):
251255
def break_lock(self, profile):
252256
params = BorgBreakJob.prepare(profile)
253257
if not params['ok']:
254-
self.backup_progress_event.emit(params['message'])
258+
self.backup_progress_event.emit(f"[{profile.name}] {params['message']}")
255259
return
256260
job = BorgBreakJob(params['cmd'], params)
257261
self.jobs_manager.add_job(job)

‎src/vorta/borg/borg_job.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,9 @@ def read_async(fd):
270270
'profile_name': self.params.get('profile_name'),
271271
'cmd': self.params['cmd'][1],
272272
}
273-
self.app.backup_log_event.emit(f'{parsed["levelname"]}: {parsed["message"]}', context)
273+
self.app.backup_log_event.emit(
274+
f'[{self.params["profile_name"]}] {parsed["levelname"]}: {parsed["message"]}', context
275+
)
274276
level_int = getattr(logging, parsed["levelname"])
275277
logger.log(level_int, parsed["message"])
276278

@@ -279,21 +281,23 @@ def read_async(fd):
279281
error_messages.append((level_int, parsed["message"]))
280282

281283
elif parsed['type'] == 'file_status':
282-
self.app.backup_log_event.emit(f'{parsed["path"]} ({parsed["status"]})', {})
284+
self.app.backup_log_event.emit(
285+
f'[{self.params["profile_name"]}] {parsed["path"]} ({parsed["status"]})', {}
286+
)
283287
elif parsed['type'] == 'progress_percent' and parsed.get("message"):
284-
self.app.backup_log_event.emit(f'{parsed["message"]}', {})
288+
self.app.backup_log_event.emit(f'[{self.params["profile_name"]}] {parsed["message"]}', {})
285289
elif parsed['type'] == 'archive_progress' and not parsed.get('finished', False):
286290
msg = (
287291
f"{translate('BorgJob','Files')}: {parsed['nfiles']}, "
288292
f"{translate('BorgJob','Original')}: {pretty_bytes(parsed['original_size'])}, "
289293
# f"{translate('BorgJob','Compressed')}: {pretty_bytes(parsed['compressed_size'])}, "
290294
f"{translate('BorgJob','Deduplicated')}: {pretty_bytes(parsed['deduplicated_size'])}" # noqa: E501
291295
)
292-
self.app.backup_progress_event.emit(msg)
296+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {msg}")
293297
except json.decoder.JSONDecodeError:
294298
msg = line.strip()
295299
if msg: # Log only if there is something to log.
296-
self.app.backup_log_event.emit(msg, {})
300+
self.app.backup_log_event.emit(f'[{self.params["profile_name"]}] {msg}', {})
297301
logger.warning(msg)
298302

299303
if p.poll() is not None:

‎src/vorta/borg/break_lock.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,13 @@
44
class BorgBreakJob(BorgJob):
55
def started_event(self):
66
self.app.backup_started_event.emit()
7-
self.app.backup_progress_event.emit(self.tr('Breaking repository lock…'))
7+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {self.tr('Breaking repository lock…')}")
88

99
def finished_event(self, result):
1010
self.app.backup_finished_event.emit(result)
11-
self.app.backup_progress_event.emit(self.tr('Repository lock broken. Please redo your last action.'))
11+
self.app.backup_progress_event.emit(
12+
f"[{self.params['profile_name']}] {self.tr('Repository lock broken. Please redo your last action.')}"
13+
)
1214
self.result.emit(result)
1315

1416
@classmethod

‎src/vorta/borg/check.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
class BorgCheckJob(BorgJob):
99
def started_event(self):
1010
self.app.backup_started_event.emit()
11-
self.app.backup_progress_event.emit(self.tr('Starting consistency check…'))
11+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {self.tr('Starting consistency check…')}")
1212

1313
def finished_event(self, result: Dict[str, Any]):
1414
"""
@@ -23,13 +23,14 @@ def finished_event(self, result: Dict[str, Any]):
2323
self.result.emit(result)
2424
if result['returncode'] != 0:
2525
self.app.backup_progress_event.emit(
26-
translate('RepoCheckJob', 'Repo check failed. See the <a href="{0}">logs</a> for details.').format(
26+
f"[{self.params['profile_name']}] "
27+
+ translate('RepoCheckJob', 'Repo check failed. See the <a href="{0}">logs</a> for details.').format(
2728
LOG_DIR.as_uri()
2829
)
2930
)
3031
self.app.check_failed_event.emit(result)
3132
else:
32-
self.app.backup_progress_event.emit(self.tr('Check completed.'))
33+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {self.tr('Check completed.')}")
3334

3435
@classmethod
3536
def prepare(cls, profile):

‎src/vorta/borg/compact.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@
88
class BorgCompactJob(BorgJob):
99
def started_event(self):
1010
self.app.backup_started_event.emit()
11-
self.app.backup_progress_event.emit(self.tr('Starting repository compaction...'))
11+
self.app.backup_progress_event.emit(
12+
f"[{self.params['profile_name']} {self.tr('Starting repository compaction...')}]"
13+
)
1214

1315
def finished_event(self, result: Dict[str, Any]):
1416
"""
@@ -23,12 +25,13 @@ def finished_event(self, result: Dict[str, Any]):
2325
self.result.emit(result)
2426
if result['returncode'] != 0:
2527
self.app.backup_progress_event.emit(
26-
translate(
28+
f"[{self.params['profile_name']}] "
29+
+ translate(
2730
'BorgCompactJob', 'Errors during compaction. See the <a href="{0}">logs</a> for details.'
2831
).format(LOG_DIR.as_uri())
2932
)
3033
else:
31-
self.app.backup_progress_event.emit(self.tr('Compaction completed.'))
34+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {self.tr('Compaction completed.')}")
3235

3336
@classmethod
3437
def prepare(cls, profile):

‎src/vorta/borg/create.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,20 +35,21 @@ def process_result(self, result):
3535

3636
if result['returncode'] == 1:
3737
self.app.backup_progress_event.emit(
38-
translate(
38+
f"[{self.params['profile_name']}] "
39+
+ translate(
3940
'BorgCreateJob',
4041
'Backup finished with warnings. See the <a href="{0}">logs</a> for details.',
4142
).format(LOG_DIR.as_uri())
4243
)
4344
else:
44-
self.app.backup_progress_event.emit(self.tr('Backup finished.'))
45+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {self.tr('Backup finished.')}")
4546

4647
def progress_event(self, fmt):
47-
self.app.backup_progress_event.emit(fmt)
48+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {fmt}")
4849

4950
def started_event(self):
5051
self.app.backup_started_event.emit()
51-
self.app.backup_progress_event.emit(self.tr('Backup started.'))
52+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {self.tr('Backup started.')}")
5253

5354
def finished_event(self, result):
5455
self.app.backup_finished_event.emit(result)

‎src/vorta/borg/delete.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
class BorgDeleteJob(BorgJob):
88
def started_event(self):
99
self.app.backup_started_event.emit()
10-
self.app.backup_progress_event.emit(self.tr('Deleting archive…'))
10+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {self.tr('Deleting archive…')}")
1111

1212
def finished_event(self, result):
1313
# set repo stats to N/A
@@ -20,7 +20,7 @@ def finished_event(self, result):
2020

2121
self.app.backup_finished_event.emit(result)
2222
self.result.emit(result)
23-
self.app.backup_progress_event.emit(self.tr('Archive deleted.'))
23+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {self.tr('Archive deleted.')}")
2424

2525
@classmethod
2626
def prepare(cls, profile, archives: List[str]):

‎src/vorta/borg/diff.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,15 @@
55
class BorgDiffJob(BorgJob):
66
def started_event(self):
77
self.app.backup_started_event.emit()
8-
self.app.backup_progress_event.emit(self.tr('Requesting differences between archives…'))
8+
self.app.backup_progress_event.emit(
9+
f"[{self.params['profile_name']}] {self.tr('Requesting differences between archives…')}"
10+
)
911

1012
def finished_event(self, result):
1113
self.app.backup_finished_event.emit(result)
12-
self.app.backup_progress_event.emit(self.tr('Obtained differences between archives.'))
14+
self.app.backup_progress_event.emit(
15+
f"[{self.params['profile_name']}] {self.tr('Obtained differences between archives.')}"
16+
)
1317
self.result.emit(result)
1418

1519
@classmethod

‎src/vorta/borg/extract.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,16 @@
99
class BorgExtractJob(BorgJob):
1010
def started_event(self):
1111
self.app.backup_started_event.emit()
12-
self.app.backup_progress_event.emit(self.tr('Downloading files from archive…'))
12+
self.app.backup_progress_event.emit(
13+
f"[{self.params['profile_name']}] {self.tr('Downloading files from archive…')}"
14+
)
1315

1416
def finished_event(self, result):
1517
self.app.backup_finished_event.emit(result)
1618
self.result.emit(result)
17-
self.app.backup_progress_event.emit(self.tr('Restored files from archive.'))
19+
self.app.backup_progress_event.emit(
20+
f"[{self.params['profile_name']}] {self.tr('Restored files from archive.')}"
21+
)
1822

1923
@classmethod
2024
def prepare(cls, profile, archive_name, model: ExtractTree, destination_folder):

‎src/vorta/borg/info_archive.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@
66
class BorgInfoArchiveJob(BorgJob):
77
def started_event(self):
88
self.app.backup_started_event.emit()
9-
self.app.backup_progress_event.emit(self.tr('Refreshing archive…'))
9+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {self.tr('Refreshing archive…')}")
1010

1111
def finished_event(self, result):
1212
self.app.backup_finished_event.emit(result)
1313
self.result.emit(result)
14-
self.app.backup_progress_event.emit(self.tr('Refreshing archive done.'))
14+
self.app.backup_progress_event.emit(f"[{self.params['profile_name']}] {self.tr('Refreshing archive done.')}")
1515

1616
@classmethod
1717
def prepare(cls, profile, archive_name):

0 commit comments

Comments
 (0)