feat: Allow custom labels for profiles

fixes #1294

Signed-off-by: Marcel Klehr <mklehr@gmx.net>

_locales/en/messages.json

@@ -722,5 +722,11 @@
   },
   "LabelTelemetrydisable": {
     "message": "Do not send error data to floccus developers"
+  },
+  "LabelAccountlabel": {
+    "message": "Profile label"
+  },
+  "DescriptionAccountlabel": {
+    "message": "Give this profile a name so you can recognize it more easily"
   }
 }

src/lib/Account.ts

@@ -100,6 +100,7 @@ export default class Account {
       nestedSync: false,
       failsafe: true,
       allowNetwork: false,
+      label: '',
     }
     const data = Object.assign(defaults, this.server.getData())
     if (data.type === 'nextcloud-folders') {

src/lib/adapters/Caching.ts

@@ -29,7 +29,7 @@ export default class CachingAdapter implements Adapter, BulkImportResource {
 
   getLabel():string {
     const data = this.getData()
-    return data.username + '@' + new URL(data.url).hostname
+    return data.label || data.username + '@' + new URL(data.url).hostname
   }
 
   async getBookmarksTree(): Promise<Folder> {

src/lib/adapters/Git.ts

@@ -53,7 +53,7 @@ export default class GitAdapter extends CachingAdapter {
     const data = this.getData()
     const url = new URL(data.url)
     url.protocol = ''
-    return data.username + '@' + url.hostname + ':' + data.bookmark_file
+    return data.label || data.username + '@' + url.hostname + ':' + data.bookmark_file
   }
 
   getData() {

src/lib/adapters/GoogleDrive.ts

@@ -166,7 +166,7 @@ export default class GoogleDriveAdapter extends CachingAdapter {
   }
 
   getLabel():string {
-    return 'Google Drive: ' + this.server.bookmark_file
+    return this.server.label || 'Google Drive: ' + this.server.bookmark_file
   }
 
   static getDefaultValues() {

src/lib/adapters/NextcloudBookmarks.ts

@@ -102,7 +102,7 @@ export default class NextcloudBookmarksAdapter implements Adapter, BulkImportRes
 
   getLabel():string {
     const data = this.getData()
-    return data.label || data.username.includes('@') ? data.username + ' on ' + new URL(data.url).hostname : data.username + '@' + new URL(data.url).hostname
+    return data.label || (data.username.includes('@') ? data.username + ' on ' + new URL(data.url).hostname : data.username + '@' + new URL(data.url).hostname)
   }
 
   acceptsBookmark(bm: Bookmark):boolean {

src/lib/interfaces/AccountStorage.ts

@@ -12,6 +12,7 @@ export interface IAccountData {
   failsafe?: boolean
   username?: string
   password?: string
+  label?: string
   [p:string]: any
 }
 

src/ui/components/OptionsGit.vue

@@ -1,5 +1,15 @@
 <template>
   <v-container>
+    <div>
+      <v-text-field
+        append-icon="mdi-label"
+        class="mt-2 mb-2"
+        :value="label"
+        :label="t('LabelAccountlabel')"
+        :hint="t('DescriptionAccountlabel')"
+        :persistent-hint="true"
+        @input="$emit('update:label', $event)" />
+    </div>
     <v-card class="mb-4">
       <v-card-text
         id="server"
@@ -35,9 +45,9 @@
           :value="bookmark_file_type"
           @input="$emit('update:bookmark_file_type', $event)" />
         <v-text-field
-            v-model="branch"
-            class="mb-2"
-            :label="t('LabelGitbranch')" />
+          v-model="branch"
+          class="mb-2"
+          :label="t('LabelGitbranch')" />
       </v-card-text>
     </v-card>
 
@@ -147,7 +157,7 @@ import OptionExportBookmarks from './OptionExportBookmarks.vue'
 export default {
   name: 'OptionsGit',
   components: { OptionExportBookmarks, OptionAllowNetwork, OptionDownloadLogs, OptionAllowRedirects, OptionClientCert, OptionFailsafe, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval, OptionNestedSync, OptionFileType },
-  props: ['url', 'username', 'password', 'branch', 'includeCredentials', 'serverRoot', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'bookmark_file', 'nestedSync', 'failsafe', 'allowRedirects', 'bookmark_file_type', 'enabled'],
+  props: ['url', 'username', 'password', 'branch', 'includeCredentials', 'serverRoot', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'bookmark_file', 'nestedSync', 'failsafe', 'allowRedirects', 'bookmark_file_type', 'enabled', 'label'],
   data() {
     return {
       panels: [0, 1],

src/ui/components/OptionsGoogleDrive.vue

@@ -1,5 +1,15 @@
 <template>
   <v-container>
+    <div>
+      <v-text-field
+        append-icon="mdi-label"
+        class="mt-2 mb-2"
+        :value="label"
+        :label="t('LabelAccountlabel')"
+        :hint="t('DescriptionAccountlabel')"
+        :persistent-hint="true"
+        @input="$emit('update:label', $event)" />
+    </div>
     <v-card class="mb-4">
       <v-card-title
         id="server"
@@ -136,7 +146,7 @@ import OptionExportBookmarks from './OptionExportBookmarks.vue'
 export default {
   name: 'OptionsGoogleDrive',
   components: { OptionExportBookmarks, OptionPassphrase, OptionAllowNetwork, OptionDownloadLogs, OptionFailsafe, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval, OptionNestedSync },
-  props: ['username', 'password', 'refreshToken', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'bookmark_file', 'nestedSync', 'failsafe', 'enabled'],
+  props: ['username', 'password', 'refreshToken', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'bookmark_file', 'nestedSync', 'failsafe', 'enabled', 'label'],
   data() {
     return {
       panels: [0, 1],

src/ui/components/OptionsNextcloudBookmarks.vue

@@ -1,5 +1,15 @@
 <template>
   <v-container>
+    <div>
+      <v-text-field
+        append-icon="mdi-label"
+        class="mt-2 mb-2"
+        :value="label"
+        :label="t('LabelAccountlabel')"
+        :hint="t('DescriptionAccountlabel')"
+        :persistent-hint="true"
+        @input="$emit('update:label', $event)" />
+    </div>
     <v-card class="mb-4">
       <v-card-title
         id="server">
@@ -137,7 +147,7 @@ import OptionExportBookmarks from './OptionExportBookmarks.vue'
 export default {
   name: 'OptionsNextcloudBookmarks',
   components: { OptionExportBookmarks, OptionAllowNetwork, OptionDownloadLogs, OptionAllowRedirects, OptionClientCert, OptionFailsafe, OptionNestedSync, NextcloudLogin, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval },
-  props: ['url', 'username', 'password', 'includeCredentials', 'serverRoot', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'nestedSync', 'failsafe', 'allowRedirects', 'enabled'],
+  props: ['url', 'username', 'password', 'includeCredentials', 'serverRoot', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'nestedSync', 'failsafe', 'allowRedirects', 'enabled', 'label'],
   data() {
     return {
       panels: [0, 1]

src/ui/components/OptionsWebdav.vue

@@ -1,5 +1,15 @@
 <template>
   <v-container>
+    <div>
+      <v-text-field
+        append-icon="mdi-label"
+        class="mt-2 mb-2"
+        :value="label"
+        :label="t('LabelAccountlabel')"
+        :hint="t('DescriptionAccountlabel')"
+        :persistent-hint="true"
+        @input="$emit('update:label', $event)" />
+    </div>
     <v-card class="mb-4">
       <v-card-text
         id="server"
@@ -147,7 +157,7 @@ import OptionPassphrase from './OptionPassphrase.vue'
 export default {
   name: 'OptionsWebdav',
   components: { OptionExportBookmarks, OptionAllowNetwork, OptionDownloadLogs, OptionAllowRedirects, OptionClientCert, OptionFailsafe, OptionSyncFolder, OptionDeleteAccount, OptionSyncStrategy, OptionResetCache, OptionSyncInterval, OptionNestedSync, OptionFileType, OptionPassphrase },
-  props: ['url', 'username', 'password','passphrase', 'includeCredentials', 'serverRoot', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'bookmark_file', 'nestedSync', 'failsafe', 'allowRedirects', 'bookmark_file_type', 'enabled'],
+  props: ['url', 'username', 'password','passphrase', 'includeCredentials', 'serverRoot', 'localRoot', 'allowNetwork', 'syncInterval', 'strategy', 'bookmark_file', 'nestedSync', 'failsafe', 'allowRedirects', 'bookmark_file_type', 'enabled', 'label'],
   data() {
     return {
       panels: [0, 1],