liweichun
/
my-bookmark
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

用多个方法尝试下载favicon

This commit is contained in:
luchenqun 2017-03-09 20:29:25 +08:00
parent 4bb164dafe
commit 5e07109055
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
routes/api.js
View File

@ -593,13 +593,13 @@ api.post('/uploadBookmarkFile', upload.single('bookmark'), function(req, res) {
var tags = []; var tags = [];
item.tags.forEach((tag) => { item.tags.forEach((tag) => {
allTags.forEach((at) => { allTags.forEach((at) => {
if (at.name == tag) { if (at.name == tag) {
tags.push(at.id); tags.push(at.id);
} }
})
}) })
// 插入书签 })
// 插入书签
db.addBookmark(userId, bookmark) // 插入书签 db.addBookmark(userId, bookmark) // 插入书签
.then((bookmark_id) => { .then((bookmark_id) => {
db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类 db.delBookmarkTags(bookmark_id); // 不管3721，先删掉旧的分类
@ -959,13 +959,13 @@ api.getFaviconByTimer = function() {
busy = false busy = false
}); });
} else { } else {
// 尝试用http试一下：手动抓取成功后会被缓存起来,直接使用[http]即可访问.请勿批量使用[https] // http://www.cnblogs.com/zhangwei595806165/p/4984912.html 各种方法都试一遍
var faviconUrl = "http://g.soz.im/" + url; // 默认地址
if (faviconState == 1) { if (faviconState == 1) {
if (url.startsWith("https")) { faviconUrl = "http://www.google.com/s2/favicons?domain=" + url;
url = "http" + url.substring(5); } else if (faviconState == 2) {
} faviconUrl = "http://favicon.byi.pw/?url=" + url;
} }
var faviconUrl = "http://g.soz.im/" + url;
download(faviconUrl).then(data => { download(faviconUrl).then(data => {
fs.writeFileSync(faviconPath, data); fs.writeFileSync(faviconPath, data);
db.updateBookmarkFaviconState(id, -1) db.updateBookmarkFaviconState(id, -1)