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

Prefer correct extension for page icon

This commit is contained in:
Jia Hao 2016-03-09 14:50:25 +08:00
parent a5e3c5c2f8
commit c3374618d9
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/infer/inferIcon.js
View File

@ -7,11 +7,17 @@ tmp.setGracefulCleanup();
/**
*
* @param {string} targetUrl
* @param {string} platform
* @param {string} outDir
* @param {inferIconCallback} callback
*/
function inferIconFromUrlToPath(targetUrl, outDir, callback) {
pageIcon(targetUrl, {ext: 'png'})
function inferIconFromUrlToPath(targetUrl, platform, outDir, callback) {
let preferredExt = 'png';
if (platform === 'win32') {
preferredExt = 'ico';
}
pageIcon(targetUrl, {ext: preferredExt})
.then(icon => {
const outfilePath = path.join(outDir, `/icon.${icon.ext}`);
fs.writeFile(outfilePath, icon.data, error => {
@ -29,12 +35,13 @@ function inferIconFromUrlToPath(targetUrl, outDir, callback) {
/**
* @param {string} targetUrl
* @param {string} platform
* @param {inferIconCallback} callback
*/
function inferIcon(targetUrl, callback) {
function inferIcon(targetUrl, platform, callback) {
const tmpObj = tmp.dirSync({unsafeCleanup: true});
const tmpPath = tmpObj.name;
inferIconFromUrlToPath(targetUrl, tmpPath, callback);
inferIconFromUrlToPath(targetUrl, platform, tmpPath, callback);
}
export default inferIcon;

2
src/options/optionsMain.js
View File

@ -63,7 +63,7 @@ function optionsFactory(inpOptions, callback) {
callback();
return;
}
inferIcon(options.targetUrl, (error, pngPath) => {
inferIcon(options.targetUrl, options.platform, (error, pngPath) => {
if (error) {
console.warn('Cannot automatically retrieve the app icon:', error);
} else {