Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add link to the logs folder in borg warnings #1609

Merged
merged 20 commits into from
Mar 12, 2023
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
6d3fd14
feat: add link to logs folder in borg warnings
diivi Feb 24, 2023
e44a48b
use trans_late
diivi Feb 25, 2023
dfc5bff
remove prior translation strings
diivi Feb 25, 2023
21a4af2
revert translation string removal
diivi Feb 25, 2023
e20e923
use pathlib and change translation contexts
diivi Feb 26, 2023
3cc0514
change translation format
diivi Feb 28, 2023
29e3bb7
Merge branch 'master' into feat/link-logs-in-warnings
real-yfprojects Mar 2, 2023
2b2b583
Merge branch 'master' into feat/link-logs-in-warnings
real-yfprojects Mar 2, 2023
898d5ad
code revie
diivi Mar 4, 2023
e84ec51
Merge branch 'feat/link-logs-in-warnings' of https://github.com/diivi…
diivi Mar 4, 2023
d07c68e
add the
diivi Mar 5, 2023
2503d0f
Merge branch 'master' into feat/link-logs-in-warnings
m3nu Mar 6, 2023
96e08c6
remove extra emit
diivi Mar 6, 2023
66299a6
Merge branch 'master' of https://github.com/diivi/vorta into feat/lin…
diivi Mar 6, 2023
c3ef29e
Merge branch 'feat/link-logs-in-warnings' of https://github.com/diivi…
diivi Mar 6, 2023
520016b
Merge branch 'master' into feat/link-logs-in-warnings
real-yfprojects Mar 8, 2023
1d9b11e
Merge branch 'master' of https://github.com/diivi/vorta into feat/lin…
diivi Mar 10, 2023
38c833a
Merge branch 'feat/link-logs-in-warnings' of https://github.com/diivi…
diivi Mar 10, 2023
ed1c688
Merge branch 'master' of https://github.com/diivi/vorta into feat/lin…
diivi Mar 10, 2023
6e5ab07
update LOG_DIR usage as Path
diivi Mar 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/vorta/application.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
import logging
import os
import sys
from pathlib import Path
from typing import Any, Dict, List, Tuple
from PyQt5 import QtCore
from PyQt5.QtWidgets import QMessageBox
from vorta.borg.break_lock import BorgBreakJob
from vorta.borg.create import BorgCreateJob
from vorta.borg.jobs_manager import JobsManager
from vorta.borg.version import BorgVersionJob
from vorta.config import PROFILE_BOOTSTRAP_FILE, TEMP_DIR
from vorta.config import LOG_DIR, PROFILE_BOOTSTRAP_FILE, TEMP_DIR
from vorta.i18n import init_translations, translate
from vorta.notifications import VortaNotifications
from vorta.profile_export import ProfileExport
Expand Down Expand Up @@ -325,7 +326,9 @@ def check_failed_response(self, result: Dict[str, Any]):
if returncode == 1:
# warning
msg.setIcon(QMessageBox.Icon.Warning)
text = self.tr('Borg exited with a warning message. See logs for details.')
text = translate(
'VortaApp', 'Borg exited with warning status (rc 1). See the <a href="{0}">logs</a> for details.'
).format(Path(LOG_DIR).as_uri())
infotext = error_message
elif returncode > 128:
# 128+N - killed by signal N (e.g. 137 == kill -9)
Expand Down
3 changes: 3 additions & 0 deletions src/vorta/assets/UI/mainwindow.ui
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1" alignment="Qt::AlignTop">
Expand Down
9 changes: 8 additions & 1 deletion src/vorta/borg/check.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
from pathlib import Path
from typing import Any, Dict
from vorta.config import LOG_DIR
from vorta.i18n import translate
from vorta.utils import borg_compat
from .borg_job import BorgJob

Expand All @@ -20,7 +23,11 @@ def finished_event(self, result: Dict[str, Any]):
self.app.backup_finished_event.emit(result)
self.result.emit(result)
if result['returncode'] != 0:
self.app.backup_progress_event.emit(self.tr('Repo check failed. See logs for details.'))
self.app.backup_progress_event.emit(
translate('RepoCheckJob', 'Repo check failed. See the <a href="{0}">logs</a> for details.').format(
Path(LOG_DIR).as_uri()
)
)
self.app.check_failed_event.emit(result)
else:
self.app.backup_progress_event.emit(self.tr('Check completed.'))
Expand Down
10 changes: 8 additions & 2 deletions src/vorta/borg/compact.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
from pathlib import Path
from typing import Any, Dict
from vorta.i18n import trans_late
from vorta.config import LOG_DIR
from vorta.i18n import trans_late, translate
from vorta.utils import borg_compat
from .borg_job import BorgJob

Expand All @@ -21,7 +23,11 @@ def finished_event(self, result: Dict[str, Any]):
self.app.backup_finished_event.emit(result)
self.result.emit(result)
if result['returncode'] != 0:
self.app.backup_progress_event.emit(self.tr('Errors during compaction. See logs for details.'))
self.app.backup_progress_event.emit(
translate(
'BorgCompactJob', 'Errors during compaction. See the <a href="{0}">logs</a> for details.'
).format(Path(LOG_DIR).as_uri())
)
else:
self.app.backup_progress_event.emit(self.tr('Compaction completed.'))

Expand Down
13 changes: 11 additions & 2 deletions src/vorta/borg/create.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
import subprocess
import tempfile
from datetime import datetime as dt
from vorta.i18n import trans_late
from pathlib import Path
from vorta.config import LOG_DIR
from vorta.i18n import trans_late, translate
from vorta.store.models import ArchiveModel, RepoModel, SourceFileModel, WifiSettingModel
from vorta.utils import borg_compat, format_archive_name, get_network_status_monitor
from .borg_job import BorgJob
Expand Down Expand Up @@ -33,7 +35,14 @@ def process_result(self, result):
repo.save()

if result['returncode'] == 1:
self.app.backup_progress_event.emit(self.tr('Backup finished with warnings. See logs for details.'))
self.app.backup_progress_event.emit(
self.app.backup_progress_event.emit(
translate(
'BorgCreateJob',
'Backup finished with warnings. See the <a href="{0}">logs</a> for details.',
).format(Path(LOG_DIR).as_uri())
)
)
else:
self.app.backup_progress_event.emit(self.tr('Backup finished.'))

Expand Down