leanote/desktop-app
1
0
Fork 0
mirror of https://github.com/leanote/desktop-app.git synced 2025-10-18 17:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

2.3 released

Browse Source
This commit is contained in:
life
2017-01-22 22:41:16 +08:00
parent 405d6c6330
commit 414a562563
8 changed files with 126 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

85
node_modules/sync.js generated vendored
View File

@@ -581,6 +581,7 @@ var Sync = {
},
// 全量同步
// callback(error, info)
fullSync: function(callback) {
var me = this;
me._stop = false;
@@ -607,44 +608,53 @@ var Sync = {
console.log('fullSync ' + notebookUsn + ' ' + noteUsn + ' ' + tagUsn);
// Web.syncNotebookFinish();
// 同步笔记本
me.syncNotebook(notebookUsn, function(ok) {
if(ok) {
// Web.syncNoteFinish();
// console.log('------------------')
// 同步笔记
me.syncNote(noteUsn, function(ok) {
if(ok) {
// Web.syncTagFinish();
// 同步标签
me.syncTag(tagUsn, function(ok) {
if (ok) {
me.fullSyncStart = false;
// 更新上次同步时间
me.updateLastSyncState(function() {
// send changes
// me.sendChanges();
callback && callback(me._syncInfo, true);
});
}
else {
me.fullSyncStart = false;
console.error('syncTag error....');
callback && callback(me._syncInfo, false);
}
});
} else {
me.fullSyncStart = false;
console.error('syncNote error.... 跳过tag');
callback && callback(me._syncInfo, false);
}
});
} else {
me.fullSyncStart = false;
console.error('syncNotebook error.... 跳过note,tag');
callback && callback(me._syncInfo, false);
Api.getLastSyncState(function(serverState) {
if(!Common.isOk(serverState)) {
console.error(' get Server LastSyncState error!!');
callback && callback(serverState, null);
return;
}
// Web.syncNotebookFinish();
// 同步笔记本
me.syncNotebook(notebookUsn, function(ok) {
if(ok) {
// Web.syncNoteFinish();
// console.log('------------------')
// 同步笔记
me.syncNote(noteUsn, function(ok) {
if(ok) {
// Web.syncTagFinish();
// 同步标签
me.syncTag(tagUsn, function(ok) {
if (ok) {
me.fullSyncStart = false;
// 更新上次同步时间
me.updateLastSyncState(function() {
// send changes
// me.sendChanges();
callback && callback(false, me._syncInfo);
});
}
else {
me.fullSyncStart = false;
console.error('syncTag error....');
callback && callback({}, me._syncInfo);
}
});
} else {
me.fullSyncStart = false;
console.error('syncNote error.... 跳过tag');
callback && callback({}, me._syncInfo);
}
});
} else {
me.fullSyncStart = false;
console.error('syncNotebook error.... 跳过note,tag');
callback && callback({}, me._syncInfo);
}
});
});
});
@@ -782,6 +792,7 @@ var Sync = {
me.setSyncFinished();
return;
}
// 先从服务器上得到usn, 与本地的判断, 是否需要pull
Api.getLastSyncState(function(serverState) {
if(!Common.isOk(serverState)) {