lostecho/Pake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 Fix ico icon problem under Windows

Browse Source
This commit is contained in:
Tw93
2025-08-22 09:57:04 +08:00
parent 5749604f9e
commit f5016da19d
3 changed files with 74 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
bin/options/icon.ts vendored
View File

@@ -107,7 +107,28 @@ async function convertIconFormat(
export async function handleIcon(options: PakeAppOptions, url?: string) {
if (options.icon) {
if (options.icon.startsWith('http')) {
return downloadIcon(options.icon);
const downloadedPath = await downloadIcon(options.icon);
if (downloadedPath && options.name) {
// Convert downloaded icon to platform-specific format
const convertedPath = await convertIconFormat(
downloadedPath,
options.name,
);
if (convertedPath) {
// For Windows, copy the converted ico to the expected location
if (IS_WIN && convertedPath.endsWith('.ico')) {
const finalIconPath = path.join(
npmDirectory,
`src-tauri/png/${options.name.toLowerCase()}_256.ico`,
);
await fsExtra.ensureDir(path.dirname(finalIconPath));
await fsExtra.copy(convertedPath, finalIconPath);
return finalIconPath;
}
return convertedPath;
}
}
return downloadedPath;
}
return path.resolve(options.icon);
}
@@ -142,7 +163,14 @@ export async function handleIcon(options: PakeAppOptions, url?: string) {
try {
const convertedPath = await convertIconFormat(defaultPngPath, 'icon');
if (convertedPath && (await fsExtra.pathExists(convertedPath))) {
return convertedPath;
// Copy converted icon to the expected location for Windows
const finalIconPath = path.join(
npmDirectory,
'src-tauri/png/icon_256.ico',
);
await fsExtra.ensureDir(path.dirname(finalIconPath));
await fsExtra.copy(convertedPath, finalIconPath);
return finalIconPath;
}
} catch (error) {
logger.warn(`Failed to convert default png to ico: ${error.message}`);
@@ -226,6 +254,19 @@ async function tryGetFavicon(
const convertedPath = await convertIconFormat(faviconPath, appName);
if (convertedPath) {
// For Windows, copy the converted ico to the expected location
if (IS_WIN && convertedPath.endsWith('.ico')) {
const finalIconPath = path.join(
npmDirectory,
`src-tauri/png/${appName.toLowerCase()}_256.ico`,
);
await fsExtra.ensureDir(path.dirname(finalIconPath));
await fsExtra.copy(convertedPath, finalIconPath);
spinner.succeed(
chalk.green('Icon fetched and converted successfully!'),
);
return finalIconPath;
}
spinner.succeed(
chalk.green('Icon fetched and converted successfully!'),
);

33
dist/cli.js vendored
View File

@@ -22,7 +22,7 @@ import sharp from 'sharp';
import * as psl from 'psl';
var name = "pake-cli";
var version = "3.2.9";
var version = "3.2.10";
var description = "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。";
var engines = {
node: ">=16.0.0"
@@ -935,7 +935,22 @@ async function convertIconFormat(inputPath, appName) {
async function handleIcon(options, url) {
if (options.icon) {
if (options.icon.startsWith('http')) {
return downloadIcon(options.icon);
const downloadedPath = await downloadIcon(options.icon);
if (downloadedPath && options.name) {
// Convert downloaded icon to platform-specific format
const convertedPath = await convertIconFormat(downloadedPath, options.name);
if (convertedPath) {
// For Windows, copy the converted ico to the expected location
if (IS_WIN && convertedPath.endsWith('.ico')) {
const finalIconPath = path.join(npmDirectory, `src-tauri/png/${options.name.toLowerCase()}_256.ico`);
await fsExtra.ensureDir(path.dirname(finalIconPath));
await fsExtra.copy(convertedPath, finalIconPath);
return finalIconPath;
}
return convertedPath;
}
}
return downloadedPath;
}
return path.resolve(options.icon);
}
@@ -960,7 +975,11 @@ async function handleIcon(options, url) {
try {
const convertedPath = await convertIconFormat(defaultPngPath, 'icon');
if (convertedPath && (await fsExtra.pathExists(convertedPath))) {
return convertedPath;
// Copy converted icon to the expected location for Windows
const finalIconPath = path.join(npmDirectory, 'src-tauri/png/icon_256.ico');
await fsExtra.ensureDir(path.dirname(finalIconPath));
await fsExtra.copy(convertedPath, finalIconPath);
return finalIconPath;
}
}
catch (error) {
@@ -1024,6 +1043,14 @@ async function tryGetFavicon(url, appName) {
continue;
const convertedPath = await convertIconFormat(faviconPath, appName);
if (convertedPath) {
// For Windows, copy the converted ico to the expected location
if (IS_WIN && convertedPath.endsWith('.ico')) {
const finalIconPath = path.join(npmDirectory, `src-tauri/png/${appName.toLowerCase()}_256.ico`);
await fsExtra.ensureDir(path.dirname(finalIconPath));
await fsExtra.copy(convertedPath, finalIconPath);
spinner.succeed(chalk.green('Icon fetched and converted successfully!'));
return finalIconPath;
}
spinner.succeed(chalk.green('Icon fetched and converted successfully!'));
return convertedPath;
}

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "pake-cli",
"version": "3.2.9",
"version": "3.2.10",
"description": "🤱🏻 Turn any webpage into a desktop app with Rust. 🤱🏻 利用 Rust 轻松构建轻量级多端桌面应用。",
"engines": {
"node": ">=16.0.0"