Merge branch 'master' into feat/allow-new-networks-and-show-disallowed-notif-setting

Author: diivi

src/vorta/application.py

@@ -9,7 +9,7 @@
 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
@@ -330,7 +330,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(LOG_DIR.as_uri())
                 infotext = error_message
             elif returncode > 128:
                 # 128+N - killed by signal N (e.g. 137 == kill -9)

src/vorta/assets/UI/mainwindow.ui

@@ -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">

src/vorta/borg/check.py

@@ -1,4 +1,6 @@
 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
 
@@ -20,7 +22,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(
+                    LOG_DIR.as_uri()
+                )
+            )
             self.app.check_failed_event.emit(result)
         else:
             self.app.backup_progress_event.emit(self.tr('Check completed.'))

src/vorta/borg/compact.py

@@ -1,5 +1,6 @@
 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
 
@@ -21,7 +22,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(LOG_DIR.as_uri())
+            )
         else:
             self.app.backup_progress_event.emit(self.tr('Compaction completed.'))
 

src/vorta/borg/create.py

@@ -2,7 +2,8 @@
 import subprocess
 import tempfile
 from datetime import datetime as dt
-from vorta.i18n import trans_late
+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
@@ -33,7 +34,12 @@ 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(
+                    translate(
+                        'BorgCreateJob',
+                        'Backup finished with warnings. See the <a href="{0}">logs</a> for details.',
+                    ).format(LOG_DIR.as_uri())
+                )
             else:
                 self.app.backup_progress_event.emit(self.tr('Backup finished.'))
 

src/vorta/utils.py

@@ -266,7 +266,7 @@ def find_best_unit_for_size(size: Optional[int], metric: bool = True, precision:
     if not isinstance(size, int) or size == 0:  # this will also take care of the None case
         return 0
     power = 10**3 if metric else 2**10
-    n = math.floor(math.log(size * 10**precision, power))
+    n = math.floor(math.log(abs(size) * 10**precision, power))
     return n