diff --git a/.gitignore b/.gitignore index 39c8249..13cd3c8 100644 --- a/.gitignore +++ b/.gitignore @@ -38,4 +38,4 @@ jspm_packages # Upload File uploads -/public/images/shot/ \ No newline at end of file +/public/images/snap/ \ No newline at end of file diff --git a/app.js b/app.js index fe91d77..120becc 100644 --- a/app.js +++ b/app.js @@ -76,5 +76,6 @@ app.use(function(err, req, res, next) { }); }); +api.getSnapByTimer(); module.exports = app; diff --git a/database/db.js b/database/db.js index 365a4e0..7ff4e48 100644 --- a/database/db.js +++ b/database/db.js @@ -52,15 +52,15 @@ Date.prototype.format = function(fmt) { //author: meizz // update delete 返回影响的行数 var db = { -} -// var sql = "SELECT * FROM `users` WHERE `username` = 'luchenqun'"; -// client.query(sql, (err, result) => { -// if (err) { -// console.log(err); -// } else { -// console.log(result); -// } -// }); + } + // var sql = "SELECT * FROM `users` WHERE `username` = 'luchenqun1'"; + // client.query(sql, (err, result) => { + // if (err) { + // console.log(err); + // } else { + // console.log(result); + // } + // }); db.addBookmark = function(user_id, bookmark) { var insertSql = "INSERT INTO `bookmarks` (`user_id`, `title`, `description`, `url`, `public`, `click_count`) VALUES ('" + user_id + "', '" + bookmark.title + "', '" + bookmark.description + "', '" + bookmark.url + "', '" + bookmark.public + "', '1')"; @@ -561,4 +561,32 @@ db.getTagsBookmarks = function(bookmark_ids) { }); } +db.getBookmarkWaitSnap = function(today) { + var todayNotSnap = today + 31; + var sql = "SELECT id, url, snap_state FROM `bookmarks` WHERE `snap_state`>=0 AND `snap_state` <= 64 AND snap_state != " + todayNotSnap + " ORDER BY last_click DESC LIMIT 0, 1"; + return new Promise(function(resolve, reject) { + client.query(sql, (err, result) => { + if (err) { + reject(err); + } else { + resolve(result); + } + }); + }); +} + +db.updateBookmarkSnapState = function(id, snapState) { + console.log("updateBookmarkSnapState id = " + id + ", snapState = " + snapState); + var sql = "UPDATE `bookmarks` SET `snap_state`='"+ snapState +"' WHERE (`id`='"+ id +"')"; + return new Promise(function(resolve, reject) { + client.query(sql, (err, result) => { + if (err) { + reject(err); + } else { + resolve(result.affectedRows); + } + }); + }); +} + module.exports = db; diff --git a/public/views/bookmarks.html b/public/views/bookmarks.html index 3104b47..d19e62a 100644 --- a/public/views/bookmarks.html +++ b/public/views/bookmarks.html @@ -95,7 +95,7 @@
- +
diff --git a/routes/api.js b/routes/api.js index c6d08b2..80bcd00 100644 --- a/routes/api.js +++ b/routes/api.js @@ -13,6 +13,7 @@ var webshotOptions = { width: 320, height: 320 }, + timeout: 50000, }; var storage = multer.diskStorage({ @@ -522,36 +523,38 @@ api.post('/uploadBookmarkFile', upload.single('bookmark'), function(req, res) { .then((allTags) => { bookmarks.forEach((item, index) => { var count = 0; + if (/http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/.test(item.url)) { + var bookmark = {}; + bookmark.title = item.name; + bookmark.description = ""; + bookmark.url = item.url; + bookmark.public = '1'; + if (item.tags.length == 0) { + item.tags.push("未分类") + } - var bookmark = {}; - bookmark.title = item.name; - bookmark.description = ""; - bookmark.url = item.url; - bookmark.public = '1'; - if (item.tags.length == 0) { - item.tags.push("未分类") + var tags = []; + item.tags.forEach((tag) => { + allTags.forEach((at) => { + if (at.name == tag) { + tags.push(at.id); + } + }) + }) + // 插入书签 + db.addBookmark(userId, bookmark) // 插入书签 + .then((bookmark_id) => { + db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类 + return bookmark_id; + }) // 将之前所有的书签分类信息删掉 + .then((bookmark_id) => db.addTagsBookmarks(tags, bookmark_id)) // 插入分类 + .then(() => db.updateLastUseTags(userId, tags)) // 更新最新使用的分类 + .then(() => { + count++ + }) // 运气不错 + .catch((err) => console.log('uploadBookmarkFile addBookmark err', err)); // oops! } - var tags = []; - item.tags.forEach((tag) => { - allTags.forEach((at) => { - if (at.name == tag) { - tags.push(at.id); - } - }) - }) - // 插入书签 - db.addBookmark(userId, bookmark) // 插入书签 - .then((bookmark_id) => { - db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类 - return bookmark_id; - }) // 将之前所有的书签分类信息删掉 - .then((bookmark_id) => db.addTagsBookmarks(tags, bookmark_id)) // 插入分类 - .then(() => db.updateLastUseTags(userId, tags)) // 更新最新使用的分类 - .then(() => { - count++ - }) // 运气不错 - .catch((err) => console.log('uploadBookmarkFile addBookmark err', err)); // oops! if ((index + 1) == bookmarks.length) { // 通知前台 } @@ -575,10 +578,7 @@ api.post('/addBookmark', function(req, res) { db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类 return bookmark_id; }) // 将之前所有的书签分类信息删掉 - .then((bookmark_id) => { - getWebshot(bookmark_id, bookmark.url); - return db.addTagsBookmarks(tags, bookmark_id) - }) // 插入分类 + .then((bookmark_id) => db.addTagsBookmarks(tags, bookmark_id)) // 插入分类 .then(() => db.updateLastUseTags(userId, tags)) // 更新最新使用的分类 .then(() => res.json({})) // 运气不错 .catch((err) => console.log('addBookmark err', err)); // oops! @@ -625,28 +625,47 @@ api.post('/getTitle', function(req, response) { }); }) -function md5(str) { - return crypto - .createHash('md5') - .update(str) - .digest('hex'); -}; - -var cnt = 1; - -function getWebshot(id, url) { - var finePath = './public/images/shot/' + id + '.png' - fs.exists(finePath, function(exists) { - if (!exists) { - setTimeout(function() { - webshot(url, finePath, webshotOptions, function(err) { - if (err) { - console.log(id + " webshot fail", err); - } - }); - }, 10000 * cnt++); - } - }); +api.getSnapByTimer = function() { + console.log('getSnapByTimer...........'); + setInterval(function() { + var today = new Date().getDate(); + db.getBookmarkWaitSnap(today) + .then((bookmarks) => { + if (bookmarks.length == 1) { + 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) { + if (exists) { + db.updateBookmarkSnapState(id, -1); + } else { + if (!/http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/.test(url)) { + db.updateBookmarkSnapState(id, today + 31); + return; + } + webshot(url, finePath, webshotOptions, function(err) { + var newSnapState = -1; + if (err) { + console.log("boomarkid = " + id + ", webshot over", err) + if (snap_state == 0 || snap_state == 1) { + newSnapState = snap_state + 1; + } else if (snap_state == 2) { + newSnapState = today + 31; + } + } + db.updateBookmarkSnapState(id, newSnapState); + }); + } + }); + } + }) + .catch((err) => console.log('getBookmarkWaitSnap err', err)); + }, 60000); } +function md5(str) { + return crypto.createHash('md5').update(str).digest('hex'); +}; + module.exports = api; diff --git a/schema.sql b/schema.sql index 52a5a99..14e223f 100644 --- a/schema.sql +++ b/schema.sql @@ -24,6 +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：获取成功。0，1，2：获取快照次数。当前天+31：今天不再获取该网页快照 PRIMARY KEY (`id`), KEY `userIdIdx` (`user_id`) );