mirror of
https://github.com/leanote/desktop-app.git
synced 2025-10-16 16:04:56 +00:00
leanote protocol移到main进程, 所有图片的操作通过db_client进行操作
This commit is contained in:
20
node_modules/file.js
generated
vendored
20
node_modules/file.js
generated
vendored
@@ -1,4 +1,5 @@
|
||||
var db = require('db');
|
||||
var dbClient = require('db_client');
|
||||
var fs = require('fs');
|
||||
var crypto = require('crypto');
|
||||
var needle = require('needle');
|
||||
@@ -6,7 +7,7 @@ var path = require('path');
|
||||
var Evt = require('evt');
|
||||
var User = require('user');
|
||||
var Common = require('common');
|
||||
var Images = db.images;
|
||||
var Images = dbClient.images;
|
||||
var Attachs = db.attachs;
|
||||
var Web = require('web');
|
||||
|
||||
@@ -392,8 +393,9 @@ var File = {
|
||||
if(isForce) {
|
||||
image.ServerFileId = fileId;
|
||||
}
|
||||
db.images.insert(image, function(err, doc) {
|
||||
log(err);
|
||||
dbClient.images.insert(image, function(err, doc) {
|
||||
console.log(err);
|
||||
console.log(doc);
|
||||
if(err) {
|
||||
callback && callback(false);
|
||||
} else {
|
||||
@@ -407,7 +409,7 @@ var File = {
|
||||
addImageForce: function(fileId, path, callback) {
|
||||
var me = this;
|
||||
// 先删除之, 可能是本地有记录, 但是文件没了
|
||||
db.images.remove({FileId: fileId}, function() {
|
||||
dbClient.images.remove({FileId: fileId}, function() {
|
||||
me._addImage(fileId, path, callback, true);
|
||||
});
|
||||
},
|
||||
@@ -417,8 +419,8 @@ var File = {
|
||||
// 因为图片的链接 有可能是本地添加的, 又有可能是远程的
|
||||
// 如果是远程的, FileId == ServerFileId, 是一样的, 所以不要Or
|
||||
getImageLocalPath: function(fileId, callback) {
|
||||
// db.images.findOne({$or: {FileId: fileId}, {ServerFileId: fileId}}, function(err, doc) {
|
||||
db.images.findOne({FileId: fileId}, function(err, doc) {
|
||||
// dbClient.images.findOne({$or: {FileId: fileId}, {ServerFileId: fileId}}, function(err, doc) {
|
||||
dbClient.images.findOne({FileId: fileId}, function(err, doc) {
|
||||
if(!err && doc && doc.Path) { // FileLocalPath是相对于项目的路径
|
||||
callback(true, doc.Path);
|
||||
} else {
|
||||
@@ -428,7 +430,7 @@ var File = {
|
||||
},
|
||||
|
||||
getImageInfo: function(fileId, callback) {
|
||||
db.images.findOne({FileId: fileId}, function(err, doc) {
|
||||
dbClient.images.findOne({FileId: fileId}, function(err, doc) {
|
||||
if(!err && doc && doc.Path) {
|
||||
callback(true, doc);
|
||||
} else {
|
||||
@@ -450,7 +452,7 @@ var File = {
|
||||
// 得到fileIds所有的images, 为了发送到服务器上
|
||||
getAllImages: function(fileIds, callback) {
|
||||
var me = this;
|
||||
db.images.find({$or:[{FileId: {$in: fileIds}}, {ServerFileId: {$in: fileIds}}]}, function(err, images) {
|
||||
dbClient.images.find({$or:[{FileId: {$in: fileIds}}, {ServerFileId: {$in: fileIds}}]}, function(err, images) {
|
||||
if(err || !images) {
|
||||
return callback(false);
|
||||
}
|
||||
@@ -473,7 +475,7 @@ var File = {
|
||||
if(!file.FileId || !file.LocalFileId) {
|
||||
continue;
|
||||
}
|
||||
db.images.update({FileId: file.LocalFileId}, {$set: {ServerFileId: file.FileId, IsDirty: false}});
|
||||
dbClient.images.update({FileId: file.LocalFileId}, {$set: {ServerFileId: file.FileId, IsDirty: false}});
|
||||
}
|
||||
},
|
||||
|
||||
|
Reference in New Issue
Block a user