Assign names to repos. By @diivi (#1665)

Author: diivi

src/vorta/assets/UI/repoadd.ui

@@ -27,7 +27,7 @@
 db_lock = Lock()
 logger = logging.getLogger(__name__)
 
-FakeRepo = namedtuple('Repo', ['url', 'id', 'extra_borg_arguments', 'encryption'])
+FakeRepo = namedtuple('Repo', ['url', 'name', 'id', 'extra_borg_arguments', 'encryption'])
 FakeProfile = namedtuple('FakeProfile', ['id', 'repo', 'name', 'ssh_key'])
 
 """
@@ -190,6 +190,7 @@ def prepare(cls, profile):
         ret['ssh_key'] = profile.ssh_key
         ret['repo_id'] = profile.repo.id
         ret['repo_url'] = profile.repo.url
+        ret['repo_name'] = profile.repo.name
         ret['extra_borg_arguments'] = profile.repo.extra_borg_arguments
         ret['profile_name'] = profile.name
         ret['profile_id'] = profile.id

src/vorta/assets/icons/eye-slash.svg

@@ -18,7 +18,7 @@ def prepare(cls, params):
         # Build fake profile because we don't have it in the DB yet. Assume unencrypted.
         profile = FakeProfile(
             999,
-            FakeRepo(params['repo_url'], 999, params['extra_borg_arguments'], 'none'),
+            FakeRepo(params['repo_url'], params['repo_name'], 999, params['extra_borg_arguments'], 'none'),
             'New Repo',
             params['ssh_key'],
         )
@@ -47,14 +47,17 @@ def prepare(cls, params):
                 ret['message'] = trans_late('messages', 'Please unlock your password manager.')
                 return ret
 
+        ret['repo_name'] = params['repo_name']
         ret['ok'] = True
         ret['cmd'] = cmd
 
         return ret
 
     def process_result(self, result):
         if result['returncode'] == 0:
-            new_repo, _ = RepoModel.get_or_create(url=result['cmd'][-1])
+            new_repo, _ = RepoModel.get_or_create(
+                url=result['cmd'][-1], defaults={'name': result['params']['repo_name']}
+            )
             if 'cache' in result['data']:
                 stats = result['data']['cache']['stats']
                 new_repo.total_size = stats['total_size']
@@ -64,7 +67,6 @@ def process_result(self, result):
                 new_repo.encryption = result['data']['encryption']['mode']
             if new_repo.encryption != 'none':
                 self.keyring.set_password("vorta-repo", new_repo.url, result['params']['password'])
-
             new_repo.extra_borg_arguments = result['params']['extra_borg_arguments']
 
             new_repo.save()

src/vorta/assets/icons/eye.svg

@@ -16,6 +16,7 @@ def prepare(cls, params):
             999,
             FakeRepo(
                 params['repo_url'],
+                params['repo_name'],
                 999,
                 params['extra_borg_arguments'],
                 params['encryption'],
@@ -61,6 +62,7 @@ def process_result(self, result):
                 defaults={
                     'encryption': result['params']['encryption'],
                     'extra_borg_arguments': result['params']['extra_borg_arguments'],
+                    'name': result['params']['repo_name'],
                 },
             )
             if new_repo.encryption != 'none':

src/vorta/borg/borg_job.py

@@ -21,7 +21,7 @@
 )
 from .settings import get_misc_settings
 
-SCHEMA_VERSION = 21
+SCHEMA_VERSION = 22
 
 
 @signals.post_save(sender=SettingsModel)

src/vorta/borg/info_repo.py

@@ -239,6 +239,17 @@ def run_migrations(current_schema, db_connection):
             ),
         )
 
+    if current_schema.version < 22:
+        _apply_schema_update(
+            current_schema,
+            22,
+            migrator.add_column(
+                RepoModel._meta.table_name,
+                'name',
+                pw.CharField(default=''),
+            ),
+        )
+
 
 def _apply_schema_update(current_schema, version_after, *operations):
     with DB.atomic():

src/vorta/borg/init.py

@@ -39,6 +39,7 @@ class RepoModel(BaseModel):
     """A single remote repo with unique URL."""
 
     url = pw.CharField(unique=True)
+    name = pw.CharField(default='')
     added_at = pw.DateTimeField(default=datetime.now)
     encryption = pw.CharField(null=True)
     unique_size = pw.IntegerField(null=True)

src/vorta/store/connection.py

@@ -265,7 +265,12 @@ def populate_from_profile(self):
             if repo_mount_points:
                 self.repo_mount_point = repo_mount_points[0]
 
-            self.toolBox.setItemText(0, self.tr('Archives for %s') % profile.repo.url)
+            if profile.repo.name:
+                repo_name = f"{profile.repo.name} ({profile.repo.url})"
+            else:
+                repo_name = profile.repo.url
+            self.toolBox.setItemText(0, self.tr('Archives for {}').format(repo_name))
+
             archives = [s for s in profile.repo.archives.select().order_by(ArchiveModel.time.desc())]
 
             # if no archive's name can be found in self.mount_points, then hide the mount point column