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

Update get favicon

This commit is contained in:
luchenqun 2019-03-28 12:48:41 +08:00
parent 529787a90d
commit c6d92c19f1
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
routes/api.js
View File

@ -1232,14 +1232,12 @@ api.getFaviconByTimer = function() {
let faviconState = bookmark.favicon_state; let faviconState = bookmark.favicon_state;
let url = encodeURI(bookmark.url); let url = encodeURI(bookmark.url);
let faviconPath = './public/images/favicon/' + id + '.ico'; let faviconPath = './public/images/favicon/' + id + '.ico';
let defaultFile = './public/images/favicon/default.ico'; let defaultFile = './public/images/default.ico';
if (/http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/.test(url)) { if (/http(s)?:\/\/([\w-]+\.)+[\w-]+(\/[\w- .\/?%&=]*)?/.test(url)) {
// http://www.cnblogs.com/zhangwei595806165/p/4984912.html 各种方法都试一遍 // http://www.cnblogs.com/zhangwei595806165/p/4984912.html 各种方法都试一遍
var faviconUrl = "http://47.75.89.228:3000/?url=" + url; // 默认地址 var faviconUrl = "http://47.75.89.228:3000/?url=" + url; // 默认地址
if (faviconState == 1) { if (faviconState == 1) {
faviconUrl = "https://api.statvoo.com/favicon/?url=" + url;
} else if (faviconState == 2) {
faviconUrl = "http://www.google.com/s2/favicons?domain=" + url; faviconUrl = "http://www.google.com/s2/favicons?domain=" + url;
} }
@ -1249,9 +1247,9 @@ api.getFaviconByTimer = function() {
faviconState = -1; faviconState = -1;
} catch (error) { } catch (error) {
console.log("boomarkid = " + id + ", url = " + url + ", download error") console.log("boomarkid = " + id + ", url = " + url + ", download error")
if (faviconState == 0 || faviconState == 1) { if (faviconState == 0) {
faviconState = faviconState + 1; faviconState = faviconState + 1;
} else if (faviconState == 2) { } else if (faviconState == 1) {
faviconState = -1; faviconState = -1;
copyFile(defaultFile, faviconPath); copyFile(defaultFile, faviconPath);
} }