spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2026-04-26 01:10:16 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix(install-manager): 改进已安装应用列表的解析逻辑

Browse Source 
增强对APM包名的解析，支持带或不带section的格式
添加更多调试日志以帮助排查问题
This commit is contained in:
shenmo
2026-03-29 12:48:09 +08:00
parent 596515e0a4
commit 1e6e776afe
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
electron/main/backend/install-manager.ts
View File

@@ -806,11 +806,15 @@ ipcMain.handle("list-installed", async () => {
) )
continue; continue;
// 解析格式: pkgname/repo,section version arch [flags] // 解析格式: pkgname/repo,section version arch [flags] 或 pkgname/repo version arch [flags]
// 注意: repo后面可能有逗号和section，也可能没有
const match = trimmed.match( const match = trimmed.match(
/^(\S+)\/\S+,\S+\s+(\S+)\s+(\S+)\s+\[(.+)\]$/, /^(\S+)\/\S+(?:,\S+)?\s+(\S+)\s+(\S+)\s+\[(.+)\]$/,
); );
if (!match) continue; if (!match) {
logger.debug(`Failed to parse line: ${trimmed}`);
continue;
}
const [, pkgname, version, arch, flags] = match; const [, pkgname, version, arch, flags] = match;
@@ -824,20 +828,25 @@ ipcMain.handle("list-installed", async () => {
if (hasEntries) { if (hasEntries) {
try { try {
const desktopFiles = fs.readdirSync(entriesPath); const desktopFiles = fs.readdirSync(entriesPath);
logger.debug(`Found desktop files for ${pkgname}: ${desktopFiles.join(", ")}`);
for (const file of desktopFiles) { for (const file of desktopFiles) {
if (file.endsWith(".desktop")) { if (file.endsWith(".desktop")) {
const desktopPath = path.join(entriesPath, file); const desktopPath = path.join(entriesPath, file);
logger.debug(`Reading desktop file: ${desktopPath}`);
const content = fs.readFileSync(desktopPath, "utf-8"); const content = fs.readFileSync(desktopPath, "utf-8");
const nameMatch = content.match(/^Name=(.+)$/m); const nameMatch = content.match(/^Name=(.+)$/m);
const iconMatch = content.match(/^Icon=(.+)$/m); const iconMatch = content.match(/^Icon=(.+)$/m);
if (nameMatch) appName = nameMatch[1].trim(); if (nameMatch) appName = nameMatch[1].trim();
if (iconMatch) icon = iconMatch[1].trim(); if (iconMatch) icon = iconMatch[1].trim();
logger.debug(`Parsed desktop file for ${pkgname}: name=${appName}, icon=${icon}`);
break; break;
} }
} }
} catch (e) { } catch (e) {
logger.warn(`Failed to read desktop file for ${pkgname}: ${e}`); logger.warn(`Failed to read desktop file for ${pkgname}: ${e}`);
} }
} else {
logger.debug(`No entries path for ${pkgname}: ${entriesPath}`);
} }
installedApps.push({ installedApps.push({
@@ -866,6 +875,7 @@ ipcMain.handle("list-installed", async () => {
return a.pkgname.localeCompare(b.pkgname); return a.pkgname.localeCompare(b.pkgname);
}); });
logger.info(`Found ${installedApps.length} installed APM apps`);
return { success: true, apps: installedApps }; return { success: true, apps: installedApps };
} catch (error) { } catch (error) {
logger.error( logger.error(