fix syncclient.set not doing anything

1 files changed, 33 insertions, 16 deletions

diff --git a/reader.js b/reader.js
index 9dd9290..22dff30 100755
--- a/reader.js
+++ b/reader.js
@@ -32,24 +32,36 @@ function Model() {
 			return rv;
 		},
 		set: function(page) {
-			if (!self.syncAccount() || !self.fileName())
-				return;
+			return new Promise((resolve, reject) => {
+				if (!self.syncAccount() || !self.fileName()) {
+					resolve(null);
+					return;
+				}
+
+				const owner = this._sha1_compat(self.syncAccount());
+				const hash = this._sha1_compat(self.fileName());
+
+				console.log('syncClient, set', owner, hash, page);
 
-			const owner = this._sha1_compat(self.syncAccount());
-			const hash = this._sha1_compat(self.fileName());
+				$.post(TCRSYNC_SERVER, {op: "set", version: 2, owner: owner, hash: hash, position: page}).then((resp) => {
+					console.log('tcrsync_set', resp);
 
-			console.log('syncClient, set', owner, hash, page)
+					resolve(page);
+				});
+			});
 		},
 		get: function() {
-			if (!self.syncAccount() || !self.fileName())
-				return;
+			return new Promise((resolve, reject) => {
+				if (!self.syncAccount() || !self.fileName()) {
+					resolve(-1);
+					return;
+				}
 
-			const owner = this._sha1_compat(self.syncAccount());
-			const hash = this._sha1_compat(self.fileName());
+				const owner = this._sha1_compat(self.syncAccount());
+				const hash = this._sha1_compat(self.fileName());
 
-			console.log('syncClient, get', owner, hash);
+				console.log('syncClient, get', owner, hash);
 
-			return new Promise((resolve, reject) => {
 				$.post(TCRSYNC_SERVER, {op: "get", version: 2, owner: owner, hash: hash}).then((resp) => {
 					console.log('tcrsync_get', resp);
 
@@ -259,6 +271,8 @@ function Model() {
 						case "F-FLIP":
 							m.checked = self.flipColumns();
 							break;
+						case "F-SYNC":
+							m.enabled = self.syncAccount() != "";
 					}
 				}
 			});
@@ -350,12 +364,15 @@ $(document).ready(function () {
 
 	ipcRenderer.on("sync-to-last", (event, args) => {
 		model.syncClient.get().then((page) => {
-			if (confirm("You are currently on page %p. Furthest read page stored on the server is %r. Open it instead?"
-							.replace("%p", model.currentPageDisp())
-							.replace("%r", page + 1))) {
-
-				model.currentPage(page);
+			if (page > model.currentPage()) {
+				if (confirm("You are currently on page %p. Furthest read page stored on the server is %r. Open it instead?"
+					.replace("%p", model.currentPageDisp())
+					.replace("%r", page + 1))) {
 
+					model.currentPage(page);
+				}
+			} else {
+				alert("No information stored or you are on the furthest read page.");
 			}
 		});
 	});