Merge branch 'develop'

floccusaddon · Apr 2, 2018 · 0da9c70 · 0da9c70 · SomePoorBastard · Apr 3, 2018
2 parents 74331e1 + 244ffc3
commit 0da9c70
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## v2.0.5
+ - FIX: Display sync folder path
+
 ## v2.0.4
  - FIX: getAllAccounts didn't have a fallback for the initial loading of the extension
 

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Floccus (nextcloud Sync)",
   "short_name": "Floccus",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "Sync your browser with nextcloud (currently only bookmarks; more to come)",
   "icons": {
     "48": "icons/logo.png"

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "2.0.4",
+  "version": "2.0.5",
   "description": "The goal of this project is to build a browser extension that syncs your browser data with [OwnCloud](http://owncloud.org).",
   "main": "index.js",
   "scripts": {

diff --git a/src/lib/Tree.js b/src/lib/Tree.js
@@ -163,6 +163,27 @@ export default class Tree {
     return recurse(tree)
   }
 
+  static async getPathFromLocalId (localId, ancestors, relativeToRoot) {
+    ancestors = ancestors || await Tree.getIdPathFromLocalId(localId)
+
+    if (relativeToRoot) {
+      ancestors = ancestors.slice(ancestors.indexOf(relativeToRoot) + 1)
+    }
+
+    return '/' + (await Promise.all(
+      ancestors
+        .map(async ancestor => {
+          try {
+            let bms = await browser.bookmarks.getSubTree(ancestor)
+            let bm = bms[0]
+            return bm.title.replace(/[/]/g, '\\/')
+          } catch (e) {
+            return 'Error!'
+          }
+        })
+    )).join('/')
+  }
+
   async mkdirpPath (path) {
     const allAccounts = await Account.getAllAccounts()
     return Tree.mkdirpPath(path, this.rootId, allAccounts)