Added handlebars, pulling JS libs now per liferea:// URI scheme

Author: lwindolf

.eslintrc.js

@@ -0,0 +1,26 @@
+module.exports = {
+    "env": {
+        "browser": true,
+        "es2021": true
+    },
+    "extends": "eslint:recommended",
+    "overrides": [
+        {
+            "env": {
+                "node": true
+            },
+            "files": [
+                ".eslintrc.{js,cjs}"
+            ],
+            "parserOptions": {
+                "sourceType": "script"
+            }
+        }
+    ],
+    "parserOptions": {
+        "ecmaVersion": "latest",
+        "sourceType": "module"
+    },
+    "rules": {
+    }
+}

js/gresource.xml

@@ -4,11 +4,10 @@
     <file compressed="true">Readability-readerable.js</file>
     <file compressed="true">Readability.js</file>
   </gresource>
-  <gresource prefix="/org/gnome/liferea/dompurify">
-    <file compressed="true">purify.min.js</file>
-  </gresource>
-  <gresource prefix="/org/gnome/liferea">
+  <gresource prefix="/org/gnome/liferea/js">
     <file compressed="true">htmlview.js</file>
+    <file compressed="true">purify.min.js</file>
+    <file compressed="true">handlebars.min.js</file>
   </gresource>
 </gresources>
 

js/handlebars.min.js

@@ -150,12 +150,12 @@ function loadItem(data, baseURL = null, direction) {
 	let item = JSON.parse(decodeURIComponent(data));
 	let richContent = metadata_get(item, "richContent");
 	let description = item.description;
-	// FIXME: use this!
-	/*let author		= metadata_get(item, "author");
+	let author		= metadata_get(item, "author");
 	let creator		= metadata_get(item, "creator");
 	let sharedby	= metadata_get(item, "sharedby");
 	let via			= metadata_get(item, "via");
-	let related		= metadata_get(item, "related");
+	// FIXME: use this!
+	/*let related		= metadata_get(item, "related");
 	let point		= metadata_get(item, "point");
 	let mediaviews	= metadata_get(item, "mediaviews");
 	let ratingavg	= metadata_get(item, "mediastarRatingavg");
@@ -202,6 +202,10 @@ function loadItem(data, baseURL = null, direction) {
   				<span class="slashDepartment">Department</span><span class="slashValue">${slash.split(',')[1]}</span>
 			</div>
 			`:''}
+			${author?`<div>Author: ${author}</div>`:''}
+			${creator?`<div>Creator: ${creator}</div>`:''}
+			${sharedby?`<div>Shared By: ${sharedby}</div>`:''}
+			${via?`<div>Via: <a href="${via}">${via}</a></div>`:''}
 		</header>			
 
 		<!-- cleaned by DOMPurify -->
@@ -271,7 +275,7 @@ function loadItem(data, baseURL = null, direction) {
 function contentCleanup() {
 
 	// Run DOMPurify
-	content = document.getElementById('content').innerHTML;
+	let content = document.getElementById('content').innerHTML;
 	document.getElementById('content').innerHTML = DOMPurify.sanitize(content);
 
 	// Fix inline SVG sizes
@@ -307,7 +311,6 @@ function contentCleanup() {
 		});
 
 	// Drop empty elements (to get rid of empty picture/video/iframe divs)
-	const emptyRegex = new RegExp("^\s*$");
 	document.getElementById('content')
 		.querySelectorAll(":only-child")
 		.forEach((el) => {

js/htmlview.js

@@ -1,6 +1,14 @@
 {
+  "scripts": {
+    "test": "eslint js/htmlview.js",
+    "installDeps": "ls node_modules"
+  },
   "dependencies": {
     "dompurify": "^3.0.6",
-    "readability": "^0.1.0"
+    "readability": "^0.1.0",
+    "handlebars": "^4.7.8"
+  },
+  "devDependencies": {
+    "eslint": "^8.49.0"
   }
 }

package.json

@@ -476,28 +476,15 @@ liferea_browser_do_zoom (LifereaBrowser *browser, gint zoom)
 static void
 liferea_browser_write_body (LifereaBrowser *browser, const gchar *script, const gchar *baseURL)
 {
-	g_autoptr(GBytes) b1, b2, b3, b4;
 	g_autoptr(GString) buffer = g_string_new ("");
 
-	// Return Readability.js and Liferea specific loader code
-	b1 = g_resources_lookup_data ("/org/gnome/liferea/readability/Readability-readerable.js", 0, NULL);
-	b2 = g_resources_lookup_data ("/org/gnome/liferea/readability/Readability.js", 0, NULL);
-	b3 = g_resources_lookup_data ("/org/gnome/liferea/dompurify/purify.min.js", 0, NULL);
-	b4 = g_resources_lookup_data ("/org/gnome/liferea/htmlview.js", 0, NULL);
-
-	g_assert(b1 != NULL);
-	g_assert(b2 != NULL);
-	g_assert(b3 != NULL);
-	g_assert(b4 != NULL);
-
-	/* Prepare HTML boilderplate */
 	g_string_append (buffer, "<!DOCTYPE html>\n");
 	g_string_append (buffer, "<html>\n");
 	g_string_append (buffer, "<head>");
-	g_string_append_printf (buffer, "<script>%s</script>", (gchar *)g_bytes_get_data (b1, NULL));
-	g_string_append_printf (buffer, "<script>%s</script>", (gchar *)g_bytes_get_data (b2, NULL));
-	g_string_append_printf (buffer, "<script>%s</script>", (gchar *)g_bytes_get_data (b3, NULL));
-	g_string_append_printf (buffer, "<script>%s</script>", (gchar *)g_bytes_get_data (b4, NULL));
+	g_string_append (buffer, "<script src='liferea:///readability/Readability.js'></script>");
+	g_string_append (buffer, "<script src='liferea:///js/purify.min.js'></script>");
+	g_string_append (buffer, "<script src='liferea:///js/handlebar.min.js'></script>");
+	g_string_append (buffer, "<script src='liferea:///js/htmlview.js'></script>");
 
 	// FIXME: consider adding CSP meta tag here as e.g. Firefox reader mode page does
 	g_string_append (buffer, "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />");

src/ui/liferea_browser.c

@@ -30,6 +30,7 @@
 #include "browser.h"
 #include "conf.h"
 #include "common.h"
+#include "debug.h"
 #include "download.h"
 #include "net.h"
 #include "ui/browser_tabs.h"
@@ -368,19 +369,27 @@ liferea_webkit_download_started (WebKitWebContext	*context,
 	download_show ();
 }
 
+
 static void
 liferea_webkit_handle_liferea_scheme (WebKitURISchemeRequest *request, gpointer user_data)
 {
-	const gchar *uri = webkit_uri_scheme_request_get_uri (request);
-	GInputStream *stream;
-	gssize length;
-	gchar *contents;
-
-	contents = g_strdup_printf ("Placeholder handler for liferea scheme. URI requested : %s", uri);
-	length = (gssize) strlen (contents);
-	stream = g_memory_input_stream_new_from_data (contents, length, g_free);
-	webkit_uri_scheme_request_finish (request, stream, length, "text/plain");
-	g_object_unref (stream);
+	const gchar *path = webkit_uri_scheme_request_get_path (request);
+	g_autofree gchar *rpath;
+	g_autoptr(GBytes) b;
+
+	rpath = g_strdup_printf ("/org/gnome/liferea%s", path);
+	debug (DEBUG_HTML, "Handling liferea:// request for path %s (%s)", path, rpath);
+
+	b = g_resources_lookup_data (rpath, 0, NULL);
+	if (b) {
+		const guchar *data = g_bytes_get_data (b, NULL);
+		GInputStream *stream = g_memory_input_stream_new_from_data (data, -1, NULL);
+		webkit_uri_scheme_request_finish (request, stream, -1, "text/plain");
+		g_object_unref (stream);
+	} else {
+		g_autoptr(GError) error = g_error_new (G_IO_ERROR, G_IO_ERROR_NOT_FOUND, "Resource not found");
+		webkit_uri_scheme_request_finish_error (request, error);
+	}
 }
 
 static void