Поправки багов синхронизации

This commit is contained in:
Book Pauk
2019-10-21 20:07:42 +07:00
parent f209d49bb5
commit 544a995312
2 changed files with 9 additions and 19 deletions

View File

@@ -327,7 +327,6 @@ class Reader extends Vue {
(async() => {
await bookManager.init(this.settings);
bookManager.addEventListener(this.bookManagerEvent);
await this.$refs.serverStorage.init();
if (this.$root.rootRoute == '/reader') {
if (this.routeParamUrl) {
@@ -337,6 +336,7 @@ class Reader extends Vue {
}
}
await this.$refs.serverStorage.init();
this.checkSetStorageAccessKey();
this.checkActivateDonateHelpPage();
this.loading = false;
@@ -510,7 +510,7 @@ class Reader extends Vue {
this.debouncedUpdateRoute();
}
async bookManagerEvent(eventName) {
async bookManagerEvent(eventName, value) {
if (eventName == 'set-recent' || eventName == 'recent-deleted') {
const oldBook = (this.textPage ? this.textPage.lastBook : null);
const oldPos = (this.textPage ? this.textPage.bookPos : null);
@@ -539,6 +539,13 @@ class Reader extends Vue {
if (this.recentBooksActive) {
await this.$refs.recentBooksPage.updateTableData();
}
if (value) {
await utils.sleep(500);
while (!this.$refs.serverStorage.inited) await utils.sleep(100);
this.$refs.serverStorage.saveRecent(value);
}
}
}

View File

@@ -49,10 +49,6 @@ class ServerStorage extends Vue {
this.saveSettings();
}, 500);
this.debouncedSaveRecent = _.debounce((itemKey) => {
this.saveRecent(itemKey);
}, 1000);
this.debouncedNotifySuccess = _.debounce(() => {
this.success('Данные синхронизированы с сервером');
}, 1000);
@@ -81,8 +77,6 @@ class ServerStorage extends Vue {
} else {
await this.serverStorageKeyChanged();
}
bookManager.addEventListener(this.bookManagerEvent);
} finally {
this.inited = true;
}
@@ -103,17 +97,6 @@ class ServerStorage extends Vue {
this.cachedRecentMod = value;
}
async bookManagerEvent(eventName, itemKey) {
if (!this.serverSyncEnabled)
return;
if (eventName == 'recent-changed') {
if (itemKey) {
this.debouncedSaveRecent(itemKey);
}
}
}
async generateNewServerStorageKey() {
const key = utils.toBase58(utils.randomArray(32));
this.commit('reader/setServerStorageKey', key);