diff --git a/CHANGELOG.md b/CHANGELOG.md index c6bab02dd9..e27855f4ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [5.0.2] - 2023-12-09 + +### Fixed + +- Fix another XBEL parser bug +- Fix HTML parser + ## [5.0.1] - 2023-12-09 ### Fixed diff --git a/android/app/build.gradle b/android/app/build.gradle index 3551cf2f43..2813e6599a 100644 --- 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 5000001 - versionName "5.0.1" + versionCode 5000002 + versionName "5.0.2" 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 index 945e5dc369..af0b3f02d5 100644 --- 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.1", + "version": "5.0.2", "description": "__MSG_DescriptionExtension__", "icons": { "48": "icons/logo.png", diff --git a/manifest.firefox.json b/manifest.firefox.json index a63a583b1a..fa60db22ea 100644 --- 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.1", + "version": "5.0.2", "description": "__MSG_DescriptionExtension__", "icons": { "48": "icons/logo.png", diff --git a/manifest.json b/manifest.json index 945e5dc369..af0b3f02d5 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 3, "name": "floccus bookmarks sync", "short_name": "floccus", - "version": "5.0.1", + "version": "5.0.2", "description": "__MSG_DescriptionExtension__", "icons": { "48": "icons/logo.png", diff --git a/package-lock.json b/package-lock.json index 59cf6b0ac5..c06f2aa2c5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "floccus", - "version": "5.0.1", + "version": "5.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "floccus", - "version": "5.0.1", + "version": "5.0.2", "license": "MPL-2.0", "dependencies": { "@byteowls/capacitor-oauth2": "4.x", diff --git a/package.json b/package.json index 41da63d61a..46cdf58583 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "floccus", - "version": "5.0.1", + "version": "5.0.2", "description": "Sync your bookmarks privately across browsers and devices", "scripts": { "build": "gulp", diff --git a/src/lib/serializers/Html.ts b/src/lib/serializers/Html.ts index cc69033f0f..d0f8ffcda7 100644 --- a/src/lib/serializers/Html.ts +++ b/src/lib/serializers/Html.ts @@ -31,13 +31,8 @@ class HtmlSerializer implements Serializer { deserialize(html): Folder { const folders: Folder[] = parseByString(html) - if (folders.length === 1) { - folders[0].isRoot = true - return folders[0] - } else { - folders.forEach(f => f.parentId = '0') - return new Folder({id: '0', title: 'root', children: folders, location: ItemLocation.SERVER, isRoot: true}) - } + folders.forEach(f => {f.parentId = '0'}) + return new Folder({id: '0', title: 'root', children: folders, location: ItemLocation.SERVER, isRoot: true}) } } @@ -79,7 +74,7 @@ export const getRootFolder = (body: cheerio.Cheerio) => { export const parseByString = (content: string) => { const $ = cheerio.load(content, { - decodeEntities: false + decodeEntities: true }) const body = $('body') diff --git a/src/lib/serializers/Xbel.ts b/src/lib/serializers/Xbel.ts index 8cfbe83acc..3589b1d567 100644 --- 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]?.title?.[0]?.['#text'] || '', + title: '' + (node.bookmark?.[0]?.title?.[0]?.['#text'] || ''), // cast to string location: ItemLocation.SERVER, }) } else if (typeof node.folder !== 'undefined') { item = new Folder({ id: parseInt(node[':@']?.['@_id']), - title: node.folder?.[0]?.title?.[0]?.['#text'] || '', + title: '' + (node.folder?.[0]?.title?.[0]?.['#text'] || ''), // cast to string parentId: folder.id, location: ItemLocation.SERVER, }) diff --git a/src/ui/components/OptionsGoogleDrive.vue b/src/ui/components/OptionsGoogleDrive.vue index a5020a5bb7..36ded98d20 100644 --- a/src/ui/components/OptionsGoogleDrive.vue +++ b/src/ui/components/OptionsGoogleDrive.vue @@ -82,7 +82,6 @@