octoleo
/
nativefier
mirror of https://github.com/Llewellynvdm/nativefier.git
2
2
Fork 0
Code Issues Releases Activity

Remove dependency on bestIcon api 

Use page-icon instead
This commit is contained in:
Jia Hao 2016-03-08 20:29:04 +08:00
parent e0e5b16f0b
commit c8d6cef815
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -43,6 +43,7 @@
"hasbin": "^1.2.0",
"lodash": "^4.0.0",
"ncp": "^2.0.0",
"page-icon": "^0.1.0",
"request": "^2.67.0",
"sanitize-filename": "^1.5.3",
"shelljs": "^0.5.3",

33
src/infer/inferIcon.js
View File

@ -1,4 +1,4 @@
import request from 'request';
import pageIcon from 'page-icon';
import path from 'path';
import fs from 'fs';
import tmp from 'tmp';
@ -14,34 +14,13 @@ const BEST_ICON_API = 'http://45.55.116.63:8080/icon';
*/
function inferIconFromUrlToPath(targetUrl, outDir, callback) {
const outfilePath = path.join(outDir, '/icon.png');
request({
url: BEST_ICON_API,
qs: {
url: targetUrl,
size: 57,
formats: 'png'
},
encoding: null
}, (error, response, body) => {
if (error) {
callback(error);
return;
}
try {
const parsedError = JSON.parse(body).error;
callback(parsedError);
} catch (exception) {
if (/<html>/i.test(body)) {
callback('BestIcon server 502 error');
return;
}
// body is an image
fs.writeFile(outfilePath, body, error => {
pageIcon(targetUrl, {ext: 'png'})
.then(icon => {
fs.writeFile(outfilePath, icon.data, error => {
callback(error, outfilePath);
});
}
});
})
.catch(callback);
}
/**