incr 同步完成, 待send changes

node_modules/api.js

@@ -1,6 +1,6 @@
 var db = require('db');
-var Common = require('common');
 var User = require('user');
+var Common = require('common');
 var Tags = db.tags;
 var needle = require('needle');
 var fs = require('fs');
@@ -8,12 +8,17 @@ var fs = require('fs');
 function log(o) {
 	console.log(o);
 }
+log(Common);
+log(db);
+log("??")
 
 // 远程数据服务
 var Api = {
 	leanoteUrl: 'http://localhost:9000',
 	baseUrl: 'http://localhost:9000/api',
 	getUrl: function(url, param) {
+		if(!User) {
+		}
 		var url = this.baseUrl + '/' + url;
 		var token = User.getToken();
 		param = param || {};
@@ -32,12 +37,17 @@ var Api = {
 	// 登录
 	auth: function(email, pwd, callback) { 
 		var me = this;
-		log({emai: email, pwd: pwd});
+		// log({emai: email, pwd: pwd});
+		// log(this.getUrl('auth/login', {email: email, pwd: pwd}));
 		needle.get(this.getUrl('auth/login', {email: email, pwd: pwd}), function(error, response) {
+			if(error) {
+				return callback && callback(false);
+			}
 		// needle.get('http://localhost/phpinfo.php?email=xx', {emai: email, pwd: pwd}, function(error, response) {
 			var ret = response.body;
 			// 登录成功, 保存token
-			log(ret);
+			// log('login ret');
+			// log(ret);
 			if(Common.isOk(ret)) {
 				ret.Pwd = pwd;
 				User.setCurUser(ret);
@@ -87,7 +97,12 @@ var Api = {
 		var me = this;
 		var url = this.getUrl('notebook/getSyncNotebooks', {afterUsn: afterUsn, maxEntry: maxEntry});
 		needle.get(url, function(error, response) {
+			if(error) {
+				return callback && callback(false);
+			}
 			var ret = response.body;
+			log(ret);
+			log(Common);
 			if(Common.isOk(ret)) {
 				callback && callback(ret);
 			} else {
@@ -100,6 +115,9 @@ var Api = {
 		var url = this.getUrl('note/getSyncNotes', {afterUsn: afterUsn, maxEntry: maxEntry});
 		log(url);
 		needle.get(url, function(error, response) {
+			if(error) {
+				return callback && callback(false);
+			}
 			var ret = response.body;
 			if(Common.isOk(ret)) {
 				callback && callback(ret);
@@ -108,12 +126,34 @@ var Api = {
 			}
 		});	
 	},
+	getLastSyncState: function(callback) {
+		var me = this;
+		log('--getSyncState--')
+		var url = this.getUrl('user/getSyncState');
+		log(url);
+		needle.get(url, function(error, response) {
+			if(error) {
+				return callback && callback(false);
+			}
+			var ret = response.body;
+			log('--getSyncState--ret---')
+			log(ret);
+			if(Common.isOk(ret)) {
+				callback && callback(ret);
+			} else {
+				callback && callback(false);
+			}
+		});	
+	},
 	// 获取笔记内容, 获取之后保存到笔记中
 	getNoteContent: function(noteId, callback) {
 		var me = this;
 		var url = this.getUrl('note/getNoteContent', {noteId: noteId});
 		log(url);
 		needle.get(url, function(error, response) {
+			if(error) {
+				return callback && callback(false);
+			}
 			var ret = response.body;
 			log('--------')
 			log(ret);
@@ -136,6 +176,9 @@ var Api = {
 		var url = me.getUrl('file/getImage', {fileId: fileId});
 		log(url);
 		needle.get(url, function(err, resp) {
+			if(err) {
+				return callback && callback(false);
+			}
 			// log(resp.body);
 			/*
 			{ 'accept-ranges': 'bytes',
@@ -176,4 +219,4 @@ var Api = {
 		});
 	},
 };
-module.exports = Api;
+module.exports = Api;