打算获取favico

This commit is contained in:
luchenqun 2017-02-27 22:51:42 +08:00
parent 6c77a23c49
commit b7b58e5023
4 changed files with 42 additions and 11 deletions

View File

@ -477,7 +477,7 @@ db.addTags = function(user_id, tags_name) {
if (i >= 1) {
sql += ','
}
sql += "('"+ user_id +"', '"+ name +"', '88')"; // sort默认一个比较大的值默认在后面
sql += "('" + user_id + "', '" + name + "', '88')"; // sort默认一个比较大的值默认在后面
});
return new Promise(function(resolve, reject) {
if (tags_name.length == 0) {

View File

@ -14,6 +14,7 @@
"ejs": "~2.4.1",
"express": "~4.13.4",
"express-session": "^1.14.1",
"favicon": "^0.0.2",
"jsdom": "^9.10.0",
"morgan": "~1.7.0",
"multer": "^1.3.0",

View File

@ -7,6 +7,35 @@ var parseHtml = require('../common/parse_html.js');
var multer = require('multer');
var webshot = require('webshot');
var fs = require('fs');
var favicon = require('favicon');
var download = function(url, dest, cb) {
var file = fs.createWriteStream(dest);
var sendReq = request.get(url);
var error = null;
sendReq.on('response', function(response) {
if (response.statusCode !== 200) {
error = 'Response status was ' + response.statusCode;
}
});
sendReq.on('error', function(err) {
fs.unlink(dest);
error = err
});
sendReq.pipe(file);
file.on('finish', function() {
file.close(cb(error));
});
file.on('error', function(err) {
fs.unlink(dest);
error = err.message;
});
};
var storage = multer.diskStorage({
destination: function(req, file, cb) {
@ -796,8 +825,9 @@ api.getSnapByTimer = function() {
var id = bookmarks[0].id;
var snap_state = bookmarks[0].snap_state;
var url = bookmarks[0].url;
var finePath = './public/images/snap/' + id + '.png'
fs.exists(finePath, function(exists) {
var filePath = './public/images/snap/' + id + '.png';
fs.exists(filePath, function(exists) {
if (exists) {
db.updateBookmarkSnapState(id, -1);
} else {
@ -812,7 +842,7 @@ api.getSnapByTimer = function() {
},
timeout: timeout,
};
webshot(url, finePath, webshotOptions, function(err) {
webshot(url, filePath, webshotOptions, function(err) {
var newSnapState = -1;
if (err) {
console.log("boomarkid = " + id + ", webshot over", err)

View File

@ -24,7 +24,7 @@ CREATE TABLE `bookmarks` (
`click_count` smallint DEFAULT 1, -- 总共点击次数
`created_at` datetime DEFAULT now(), -- 创建时间
`last_click` datetime DEFAULT now(), -- 最后一次点击时间
`snap_state` tinyint(8) DEFAULT 0, -- -1获取成功。012获取快照次数。当前天+31今天不再获取该网页快照
`snap_state` tinyint(8) DEFAULT 0, -- -1获取截图成功。-2获取ico成功。-3全部获取成功。012获取快照次数。当前天+31今天不再获取该网页快照
PRIMARY KEY (`id`),
KEY `userIdIdx` (`user_id`)
);