From 988095fde59e16c81ccf6616209fe044d0516e6c Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Sat, 6 Jan 2024 17:20:39 +0000
Subject: [PATCH] Fix finding path of packaged archive and loading landing page

---
 www/js/app.js | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/www/js/app.js b/www/js/app.js
index 8c0a4e69..7580e938 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -3194,10 +3194,10 @@ if (storages !== null && storages.length > 0 ||
         var archiveFilePath = params.storedFilePath;
         if (params.storedFile === params.packagedFile) {
             // If the app is packed inside an asar archive, or is Electron running from localhost, we need to alter the archivePath to point outside the asar directory
-            if ((/\/app.asar\//.test(document.location.href) || window.fs && document.location.protocol === 'http:')) {
-                params.archivePath = params.archivePath.replace(/^(?:resources\/)?/, 'resources/');
+            if (electronAPI && electronAPI.__dirname) {
+                archiveFilePath = electronAPI.__dirname.replace(/[/\\]app\.asar/, '');
             }
-            archiveFilePath = params.archivePath + '/' + params.packagedFile;
+            archiveFilePath = archiveFilePath + '/' + params.archivePath + '/' + params.packagedFile;
             if (~params.storedFilePath.indexOf(archiveFilePath)) {
                 params.storedFilePath = archiveFilePath;
             }
@@ -6324,7 +6324,10 @@ function displayArticleContentInContainer (dirEntry, htmlArticle) {
                     loaded = false;
                     articleWindow.location.href = newLocation;
                 } else {
-                    console.error('No Service Worker controller found while waiting for transformed HTML to be loaded!');
+                    console.warn('No Service Worker controller found while waiting for transformed HTML to be loaded! Let\'s wait...');
+                    setTimeout(function () {
+                        document.getElementById('btnHome').click();
+                    }, 1800);
                 }
             }
             return;