Merge branch 'develop'

floccusaddon · Dec 9, 2023 · b2ebc03 · b2ebc03
2 parents e559f25 + db9c49c
commit b2ebc03
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## [5.0.1] - 2023-12-09
+
+### Fixed
+
+- Fixes XBEL parser
+
 ## [5.0.0] - 2023-12-09
 
 ## New

diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "org.handmadeideas.floccus"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 5000000
-        versionName "5.0.0"
+        versionCode 5000001
+        versionName "5.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/manifest.chrome.json b/manifest.chrome.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

diff --git a/manifest.firefox.json b/manifest.firefox.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 3,
   "name": "floccus bookmarks sync",
   "short_name": "floccus",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "__MSG_DescriptionExtension__",
   "icons": {
     "48": "icons/logo.png",

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "floccus",
-  "version": "5.0.0",
+  "version": "5.0.1",
   "description": "Sync your bookmarks privately across browsers and devices",
   "scripts": {
     "build": "gulp",

diff --git a/src/lib/serializers/Xbel.ts b/src/lib/serializers/Xbel.ts
@@ -41,13 +41,13 @@ class XbelSerializer implements Serializer {
             id: parseInt(node[':@']['@_id']),
             parentId: folder.id,
             url: node[':@']['@_href'],
-            title: node.bookmark?.[0]?.['#text'] || '',
+            title: node.bookmark?.[0]?.title?.[0]?.['#text'] || '',
             location: ItemLocation.SERVER,
           })
         } else if (typeof node.folder !== 'undefined') {
           item = new Folder({
             id: parseInt(node[':@']?.['@_id']),
-            title: node[':@']?.['@_title'] || '',
+            title: node.folder?.[0]?.title?.[0]?.['#text'] || '',
             parentId: folder.id,
             location: ItemLocation.SERVER,
           })
@@ -66,7 +66,7 @@ class XbelSerializer implements Serializer {
         if (child instanceof Bookmark) {
           return {
             bookmark: [
-              {'#text': child.title}
+              {title: [{'#text': child.title}]}
             ],
             ':@': {
               '@_href': child.url,
@@ -77,10 +77,12 @@ class XbelSerializer implements Serializer {
 
         if (child instanceof Folder) {
           return {
-            folder: this._serializeFolder(child),
+            folder: [
+              {title: [{'#text': child.title}]},
+              ...this._serializeFolder(child)
+            ],
             ':@': {
               ...('id' in child && {'@_id': String(child.id)}),
-              '@_title': child.title,
             }
           }
         }