Merge pull request #2122 from floccusaddon/feat/improve-failsafe-wording

Failsafe: be more precise about where bookmarks are added/deleted

Author: marcelklehr

_locales/en/messages.json

@@ -84,7 +84,7 @@
     "message": "E028: Couldn't authenticate with the server."
   },
   "Error029": {
-    "message": "E029: Failsafe: The current sync run would delete {0}% of your links. Refusing to execute. Disable this failsafe in the account settings if you want to proceed anyway."
+    "message": "E029: Failsafe: The current sync run would delete {0}% of your links on the server. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway."
   },
   "Error030": {
     "message": "E030: Failed to decrypt bookmarks file. The passphrase may be wrong or the file may be corrupted."
@@ -126,7 +126,7 @@
     "message": "E042: Remote bookmarks file size could not be retrieved. It is impossible to verify that the bookmarks file was downloaded in full. If this error persists please contact the server administrator."
   },
   "Error043": {
-    "message": "E043: Failsafe: The current sync run would increase your bookmarks count by {0}%. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway."
+    "message": "E043: Failsafe: The current sync run would increase your links count on the server by {0}%. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway."
   },
   "Error044": {
     "message": "E044: Git push operation failed: {0}"
@@ -140,6 +140,12 @@
   "Error047": {
     "message": "E047: Failed to parse XBEL file. The XBEL data seems to be corrupted or incomplete. You can try removing the file on the server to let floccus recreate it. Make sure to take a backup first."
   },
+  "Error049": {
+    "message": "E049: Failsafe: The current sync run would increase your local links count in this profile by {0}%. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway."
+  },
+  "Error050": {
+    "message": "E050: Failsafe: The current sync run would delete {0}% of your local links in this profile. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway."
+  },
   "LabelWebdavurl": {
     "message": "WebDAV URL"
   },
@@ -532,7 +538,7 @@
     "message": "Failsafe"
   },
   "DescriptionFailsafe": {
-    "message": "Sometimes configuration errors or software bugs can cause the unintended removal of data, which is then lost, or the unintended duplication of data, which is then hard to sort out. To prevent this from happening, floccus will not delete more than 20% of your bookmarks in one go and will also not add more than 20% to your bookmarks count in one go, unless you disable this failsafe here."
+    "message": "Sometimes configuration errors or software bugs can cause the unintended removal of data, which is then lost, or the unintended duplication of data, which is then hard to sort out. To prevent this from happening, floccus will not delete more than 20% of your bookmarks in one go and will also not add more than 20% to your links count in one go, unless you disable this failsafe here."
   },
   "LabelFailsafeon": {
     "message": "Enabled. Will not delete or add more than 20% from/to your local bookmarks without asking you first. (Recommended)"

gulpfile.js

@@ -109,6 +109,7 @@ const js = async function() {
       resolve()
     })
   )
+  await new Promise(resolve => setTimeout(resolve, 5000))
   html(statsJson)
 }
 

package-lock.json

@@ -0,0 +1,3 @@
+export function lazyLoadIntegration() {
+  throw new Error('Cannot lazy load sources from network')
+}

src/build-fixtures/lazyLoadIntegration.js

@@ -240,14 +240,14 @@ export class InterruptedSyncError extends FloccusError {
 
 // code 28 is unused
 
-export class DeletionFailsafeError extends FloccusError {
+export class ServersideDeletionFailsafeError extends FloccusError {
   public percent: number
 
   constructor(percent:number) {
-    super(`E029: Failsafe: The current sync run would delete ${percent}% of your links. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway.`)
+    super(`E029: Failsafe: The current sync run would delete ${percent}% of your links on the server. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway.`)
     this.code = 29
     this.percent = percent
-    Object.setPrototypeOf(this, DeletionFailsafeError.prototype)
+    Object.setPrototypeOf(this, ServersideDeletionFailsafeError.prototype)
   }
 }
 
@@ -359,14 +359,14 @@ export class FileSizeUnknown extends FloccusError {
   }
 }
 
-export class AdditionFailsafeError extends FloccusError {
+export class ServersideAdditionFailsafeError extends FloccusError {
   public percent: number
 
   constructor(percent:number) {
-    super(`E043: Failsafe: The current sync run would increase your bookmarks count by ${percent}%. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway.`)
+    super(`E043: Failsafe: The current sync run would increase your links count on the server by ${percent}%. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway.`)
     this.code = 43
     this.percent = percent
-    Object.setPrototypeOf(this, AdditionFailsafeError.prototype)
+    Object.setPrototypeOf(this, ServersideAdditionFailsafeError.prototype)
   }
 }
 
@@ -422,4 +422,26 @@ export class MappingFailureError extends FloccusError {
     this.code = 48
     Object.setPrototypeOf(this, MappingFailureError.prototype)
   }
+}
+
+export class ClientsideAdditionFailsafeError extends FloccusError {
+  public percent: number
+
+  constructor(percent:number) {
+    super(`E049: Failsafe: The current sync run would increase your local links count in this profile by ${percent}%. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway.`)
+    this.code = 49
+    this.percent = percent
+    Object.setPrototypeOf(this, ClientsideAdditionFailsafeError.prototype)
+  }
+}
+
+export class ClientsideDeletionFailsafeError extends FloccusError {
+  public percent: number
+
+  constructor(percent:number) {
+    super(`E050: Failsafe: The current sync run would delete ${percent}% of your local links in this profile. Refusing to execute. Disable this failsafe in the profile settings if you want to proceed anyway.`)
+    this.code = 50
+    this.percent = percent
+    Object.setPrototypeOf(this, ClientsideDeletionFailsafeError.prototype)
+  }
 }

src/errors/Error.ts

@@ -4,13 +4,13 @@ import browser from '../browser-api'
 import AdapterFactory from '../AdapterFactory'
 import Account from '../Account'
 import {
-  AdditionFailsafeError,
+  ClientsideAdditionFailsafeError, ClientsideDeletionFailsafeError,
   CreateBookmarkError,
-  DeletionFailsafeError, FloccusError, GitPushError,
+  FloccusError, GitPushError,
   HttpError,
   InconsistentBookmarksExistenceError, InvalidUrlError, LockFileError,
   MissingItemOrderError,
-  ParseResponseError, UnexpectedFolderPathError,
+  ParseResponseError, ServersideAdditionFailsafeError, ServersideDeletionFailsafeError, UnexpectedFolderPathError,
   UnknownFolderItemOrderError, UpdateBookmarkError
 } from '../../errors/Error'
 import {i18n} from '../native/I18n'
@@ -108,10 +108,16 @@ export default class BrowserAccount extends Account {
     if (er instanceof LockFileError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.status, er.lockFile])
     }
-    if (er instanceof DeletionFailsafeError) {
+    if (er instanceof ServersideDeletionFailsafeError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
     }
-    if (er instanceof AdditionFailsafeError) {
+    if (er instanceof ServersideAdditionFailsafeError) {
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
+    }
+    if (er instanceof ClientsideDeletionFailsafeError) {
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
+    }
+    if (er instanceof ClientsideAdditionFailsafeError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
     }
     if (er instanceof CreateBookmarkError) {

src/lib/browser/BrowserAccount.ts

@@ -4,13 +4,13 @@ import AdapterFactory from '../AdapterFactory'
 import Account from '../Account'
 import { IAccountData } from '../interfaces/AccountStorage'
 import {
-  AdditionFailsafeError,
+  ClientsideAdditionFailsafeError, ClientsideDeletionFailsafeError,
   CreateBookmarkError,
-  DeletionFailsafeError, FloccusError, GitPushError,
+  FloccusError, GitPushError,
   HttpError,
   InconsistentBookmarksExistenceError, InvalidUrlError, LockFileError,
   MissingItemOrderError,
-  ParseResponseError, UnexpectedFolderPathError,
+  ParseResponseError, ServersideAdditionFailsafeError, ServersideDeletionFailsafeError, UnexpectedFolderPathError,
   UnknownFolderItemOrderError, UpdateBookmarkError
 } from '../../errors/Error'
 import Logger from '../Logger'
@@ -85,10 +85,16 @@ export default class NativeAccount extends Account {
     if (er instanceof LockFileError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.status, er.lockFile])
     }
-    if (er instanceof DeletionFailsafeError) {
+    if (er instanceof ServersideDeletionFailsafeError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
     }
-    if (er instanceof AdditionFailsafeError) {
+    if (er instanceof ServersideAdditionFailsafeError) {
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
+    }
+    if (er instanceof ClientsideDeletionFailsafeError) {
+      return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
+    }
+    if (er instanceof ClientsideAdditionFailsafeError) {
       return i18n.getMessage('Error' + String(er.code).padStart(3, '0'), [er.percent])
     }
     if (er instanceof CreateBookmarkError) {