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

同步不了tag时也报错!

Browse Source
This commit is contained in:
life
2015-11-25 19:12:43 +08:00
parent bb20eb1f54
commit dbb469e036
1 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
node_modules/sync.js generated vendored
View File

@@ -521,8 +521,8 @@ var Sync = {
return; return;
} }
Api.getSyncTags(afterUsn, me._tagMaxEntry, function(tags) { Api.getSyncTags(afterUsn, me._tagMaxEntry, function(tags) {
log('syncTags------------------------------------') // console.log(afterUsn + ' syncTags------------------------------------')
log(tags); // console.log(tags);
if(Common.isOk(tags)) { if(Common.isOk(tags)) {
me._totalSyncTagNum += tags.length; me._totalSyncTagNum += tags.length;
// 证明可能还有要同步的 // 证明可能还有要同步的
@@ -547,8 +547,8 @@ var Sync = {
// 同步失败 // 同步失败
me._syncInfo.tag.ok = false; me._syncInfo.tag.ok = false;
me._syncInfo.tag.msg = "cann't get all chunks"; me._syncInfo.tag.msg = "cann't get all chunks";
console.log(tags); console.error('tags eeeeeeeeeeeeeeeeeerrror')
console.log('tags eeeeeeeeeeeeeeeeeerrror') // console.log(tags);
callback && callback(false); callback && callback(false);
} }
}); });
@@ -566,10 +566,9 @@ var Sync = {
// 为了避免全都重新来过, 这里保存每次 // 为了避免全都重新来过, 这里保存每次
updateSyncUsn: function (type, usn) { updateSyncUsn: function (type, usn) {
console.error('-------------------------------------------------'); // console.error('---')
console.log(type + ' = ' + usn); // console.log(type + ' = ' + usn);
User.updateEachSyncState(type, usn, function() { User.updateEachSyncState(type, usn, function() {});
});
}, },
// 全量同步 // 全量同步
@@ -609,13 +608,19 @@ var Sync = {
if(ok) { if(ok) {
// Web.syncTagFinish(); // Web.syncTagFinish();
// 同步标签 // 同步标签
me.syncTag(tagUsn, function() { me.syncTag(tagUsn, function(ok) {
// 更新上次同步时间 if (ok) {
me.updateLastSyncState(function() { // 更新上次同步时间
// send changes me.updateLastSyncState(function() {
// me.sendChanges(); // send changes
callback && callback(me._syncInfo, true); // me.sendChanges();
}); callback && callback(me._syncInfo, true);
});
}
else {
console.error('syncTag error....');
callback && callback(me._syncInfo, false);
}
}); });
} else { } else {
console.error('syncNote error.... 跳过tag'); console.error('syncNote error.... 跳过tag');