add back horrible hacks because epubjs can't open location on load (sometimes) from first attempt

1 files changed, 21 insertions, 7 deletions

diff --git a/js/reader.js b/js/reader.js
index 1a8bf10..682578a 100644
--- a/js/reader.js
+++ b/js/reader.js
@@ -1332,6 +1332,8 @@ const Reader = {
 			}
 		},
 		openLastRead: async function() {
+			$(".loading-message").html("Opening last read page…");
+
 			const rendition = window.book.rendition;
 
 			if (!rendition) {
@@ -1346,10 +1348,7 @@ const Reader = {
 			if (lr_local && lr_local.cfi) {
 				console.log('using local lastread cfi', lr_local.cfi);
 				try {
-					Reader.Page.blockLastReadUpdate();
-
-					await rendition.display(lr_local.cfi);
-
+					await Reader.Page.moveToCfiVerify(rendition, lr_local.cfi);
 					location_found = true;
 				} catch (e) {
 					console.warn(e);
@@ -1366,12 +1365,10 @@ const Reader = {
 						if (lr_remote.cfi && lr_local.cfi != lr_remote.cfi && (!lr_local.timestamp || lr_remote.timestamp <= lr_local.timestamp)) {
 							console.log(`using remote lastread cfi ${lr_remote.cfi} (timestamp is newer or local timestamp is missing)`);
 
-							Reader.Page.blockLastReadUpdate();
-
 							await localforage.setItem(Reader.cacheId("lastread"),
 								{cfi: lr_remote.cfi, page: lr_remote.page, total: lr_remote.total, timestamp: lr_remote.timestamp});
 
-							await rendition.display(lr_remote.cfi);
+							await Reader.Page.moveToCfiVerify(rendition, lr_remote.cfi);
 
 							location_found = true;
 						}
@@ -1388,6 +1385,23 @@ const Reader = {
 
 			$(".loading").hide();
 		},
+		moveToCfiVerify: async function(rendition, cfi, attempts = 3) {
+			for (let att = 1; att < attempts; att++) {
+				Reader.Page.blockLastReadUpdate();
+
+				console.log(`trying to open ${cfi}: attempt ${att} of ${attempts}...`);
+
+				/* eslint-disable no-await-in-loop */
+				await rendition.display(cfi); // we need to be synchronous here
+
+				const moved_to = rendition.currentLocation().start.cfi;
+
+				console.log(`opened cfi ${moved_to} expected ${cfi}`);
+
+				if (moved_to == cfi)
+					return;
+			}
+		},
 	},
 	Settings: {
 		onThemeChanged: async function(elem) {