Merge branch 'develop'

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## not released
 
+## v0.4.2 (2024-04-19)
+
+- Fix: Display HTML entities in preview #21
+- Fix: Images with mime type `image/jpg` are not displayed #22
+- Fix: `homepage_url` for Joplin manage plugins
+
 ## v0.4.1 (2024-02-17)
 
 - Fix: Increase thumbnail size for better previews, the Joplin zoom level is also taken into account #18

README.md

@@ -56,7 +56,7 @@ The new note list view can be activated under `View > Note list style > Preview`
 
 ## Plugin options
 
-Settings for the plugin, accessible at `Tools > Options > Note overview`.
+Settings for the plugin, accessible at `Tools > Options > Note list (Preview)`.
 Joplin must be restarted after changing settings!
 
 ## Layouts

package.json

@@ -1,6 +1,6 @@
 {
   "name": "joplin-plugin-notelistpreview",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "scripts": {
     "dist": "webpack --env joplin-plugin-config=buildMain && webpack --env joplin-plugin-config=buildExtraScripts && webpack --env joplin-plugin-config=createArchive",
     "prepare": "npm run dist && husky install",
@@ -20,7 +20,7 @@
     "publish"
   ],
   "devDependencies": {
-    "@joplin/lib": "~2.9",
+    "@joplin/lib": "^2.14.1",
     "@types/jest": "^29.5.11",
     "@types/node": "^18.7.13",
     "chalk": "^4.1.0",
@@ -43,7 +43,7 @@
   },
   "dependencies": {
     "electron-log": "^5.0.3",
-    "html-to-image": "^1.11.11",
+    "html-entities": "^2.5.2",
     "i18n": "^0.15.1",
     "moment": "^2.29.4",
     "remove-markdown": "^0.5.0",

src/manifest.json

@@ -1,12 +1,12 @@
 {
   "manifest_version": 1,
   "id": "io.github.jackgruber.notelistpreview",
-  "app_min_version": "2.13",
-  "version": "0.4.1",
+  "app_min_version": "2.13.2",
+  "version": "0.4.2",
   "name": "Note list (Preview)",
   "description": "Displays a note preview in the note list",
   "author": "JackGruber",
-  "homepage_url": "https://github.com/JackGruber/joplin-plugin-hotfolder/blob/master/README.md",
+  "homepage_url": "https://github.com/JackGruber/joplin-plugin-notelistpreview/blob/master/README.md",
   "repository_url": "https://github.com/JackGruber/joplin-plugin-notelistpreview",
   "keywords": ["preview", "vorschau", "notiz", "note", "notelist"],
   "categories": ["themes", "viewer", "appearance"],

src/notelist.ts

@@ -11,6 +11,7 @@ import * as fs from "fs-extra";
 import notelistLogging from "electron-log/main";
 import { MenuItemLocation } from "api/types";
 import { ModelType } from "api/types";
+import { decode } from "html-entities";
 
 let i18n: any;
 
@@ -454,6 +455,8 @@ class Notelist {
     noteBody = noteBody.replace(/(\s\\?==|==\s)/g, " ");
     noteBody = noteBody.replace(/(\s\\?\+\+|\+\+\s)/g, " ");
 
+    noteBody = decode(noteBody); // Decode HTML entities
+
     let bodyExcerpt = "";
     noteBody = noteBody.replace(/(\r\n|\n)/g, " ");
     noteBody = noteBody.replace(/\s+/g, " ");
@@ -914,7 +917,9 @@ class Notelist {
 
         if (
           resourceItem.mime.includes("image/png") ||
-          resourceItem.mime.includes("image/jpeg")
+          resourceItem.mime.includes("image/jpeg") ||
+          resourceItem.mime.includes("image/jpg")
+          //// || resourceItem.mime.includes("application/pdf")
         ) {
           thumbnailPath = await this.genResourcePreviewImage(
             resourceItem,

src/settings.ts

@@ -112,7 +112,7 @@ export namespace settings {
         description: i18n.__("settings.bodyExcerpt.description"),
       },
       thumbnailSize: {
-        value: 75,
+        value: 70,
         minimum: 1,
         maximum: 200,
         type: SettingItemType.Int,