From 201f9d7a7ef0998cbb683bab33bc2fc7d4f96065 Mon Sep 17 00:00:00 2001 From: olcxja Date: Sat, 26 Sep 2026 11:40:04 +0200 Subject: [PATCH] fix (i hope) all bugs --- files/translations/en-us.json | 1 + files/translations/pl.json | 1 + package.json | 3 +- renderer/app.js | 50 +++++++++++++++++++++++------ renderer/plwl.png | Bin 9536 -> 9458 bytes renderer/style.css | 6 +++- src/icons.js | 53 +++++++++++++++++++++++++++---- src/importer.js | 57 ++++++++++++++++++++++++++-------- src/library.js | 36 ++++++++++++++++++--- src/paths.js | 18 ++++++++++- src/runner.js | 7 +++++ 11 files changed, 195 insertions(+), 37 deletions(-) diff --git a/files/translations/en-us.json b/files/translations/en-us.json index aace39a..70b6c97 100644 --- a/files/translations/en-us.json +++ b/files/translations/en-us.json @@ -44,6 +44,7 @@ "import.fileDone": "{0} files copied", "import.done": "Import finished", "import.failed": "Import failed: {0}", + "import.noExe": "no .exe file found in the selected folder", "config.title": "App configuration", "config.icon.auto": "Extract from exe", diff --git a/files/translations/pl.json b/files/translations/pl.json index 7889aac..5e5b022 100644 --- a/files/translations/pl.json +++ b/files/translations/pl.json @@ -44,6 +44,7 @@ "import.fileDone": "Skopiowane pliki: {0}", "import.done": "Import zakończony", "import.failed": "Import nie powiódł się: {0}", + "import.noExe": "nie znaleziono pliku .exe w wybranym folderze", "config.title": "Konfiguracja aplikacji", "config.icon.auto": "Wyciągnij z exe", diff --git a/package.json b/package.json index a11ab1a..d68c601 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,8 @@ "main": "src/main.js", "scripts": { "start": "electron .", - "smoke": "node test/smoke.js" + "test": "node test/import.test.js && node test/icons.test.js", + "smoke": "node test/import.test.js && node test/icons.test.js" }, "devDependencies": { "@electron/asar": "^3.4.1", diff --git a/renderer/app.js b/renderer/app.js index dc82d52..9c35176 100644 --- a/renderer/app.js +++ b/renderer/app.js @@ -287,6 +287,28 @@ function iconUrl(id) { return `plwl-icon://${encodeURIComponent(id)}/icon` } +// Paths of imported (copy/move) apps live inside FILES/ and are stored +// relative to it in the registry (portable mode) - show them prefixed with +// files/ instead of the absolute install location. External (leave) apps +// keep their absolute path. +function displayPath(p) { + if (!p) return '' + const files = window.plwl.FILES_DIR + if (files && p.startsWith(files + '/')) return 'files/' + p.slice(files.length + 1) + return p +} + +// Inverse of displayPath for input fields: accept a files/-prefixed (or bare, +// FILES-relative) path and resolve it to an absolute one. +function absPathInput(v) { + if (!v) return v + const files = window.plwl.FILES_DIR + if (!files) return v + if (v.startsWith('files/')) return files + '/' + v.slice(6) + if (!v.includes('/') && !v.startsWith('.')) return files + '/' + v + return v +} + function fmtPlaytime(seconds) { const s = Math.round(seconds || 0) if (s < 60) return t('library.playtimeSeconds', s) @@ -456,13 +478,19 @@ async function doImport(srcDir, mode) { try { const game = await window.plwl.gamesImport(srcDir, mode) closeModal() - toast(t('toast.importDone', game.name), 'success') + if (!game || game.ok === false) { + const raw = (game && game.error) || '' + const errText = raw === 'no-exe-found' ? t('import.noExe') : (raw || 'unknown error') + toast(t('import.failed', errText), 'error') + return + } state.games = await window.plwl.gamesList() renderLibrary() + toast(t('toast.importDone', game.name), 'success') await openGameConfig(game.id) } catch (err) { closeModal() - toast(t('toast.importFailed') + ': ' + (err.message || err), 'error') + toast(t('import.failed', (err && err.message) || String(err)), 'error') } } @@ -660,8 +688,8 @@ async function openGameConfig(id) { qs('#gc-title').textContent = game.name qs('#gc-name').value = game.name refreshConfigIcon() - qs('#gc-exe').value = game.exePath - qs('#gc-workdir').value = game.workdir + qs('#gc-exe').value = displayPath(game.exePath) + qs('#gc-workdir').value = displayPath(game.workdir) qs('#gc-args').value = game.args || '' qs('#gc-env').value = Object.entries(game.env || {}).map(([k, v]) => `${k}=${v}`).join('\n') renderWineOptions('gc-wine', game.wine) @@ -724,8 +752,8 @@ async function saveGameConfig() { }) const patch = { name: qs('#gc-name').value.trim() || game.name, - exePath: qs('#gc-exe').value.trim(), - workdir: qs('#gc-workdir').value.trim(), + exePath: absPathInput(qs('#gc-exe').value.trim()), + workdir: absPathInput(qs('#gc-workdir').value.trim()), args: qs('#gc-args').value, wine: selects['gc-wine'].value, prefix: selects['gc-prefix'].value, @@ -818,12 +846,14 @@ function wireEvents() { qs('#btn-gc-save').addEventListener('click', saveGameConfig) qs('#gc-override-add').addEventListener('click', addOverrideRow) qs('#gc-exe-browse').addEventListener('click', async () => { - const p = await window.plwl.dialogPickFile({ properties: ['openFile'], defaultPath: qs('#gc-workdir').value || window.plwl.FILES_DIR }) - if (p) qs('#gc-exe').value = p + const cur = absPathInput(qs('#gc-workdir').value.trim()) + const p = await window.plwl.dialogPickFile({ properties: ['openFile'], defaultPath: cur || window.plwl.FILES_DIR }) + if (p) qs('#gc-exe').value = displayPath(p) }) qs('#gc-workdir-browse').addEventListener('click', async () => { - const p = await window.plwl.dialogPickFile({ properties: ['openDirectory'], defaultPath: qs('#gc-exe').value || window.plwl.FILES_DIR }) - if (p) qs('#gc-workdir').value = p + const cur = absPathInput(qs('#gc-exe').value.trim()) + const p = await window.plwl.dialogPickFile({ properties: ['openDirectory'], defaultPath: cur || window.plwl.FILES_DIR }) + if (p) qs('#gc-workdir').value = displayPath(p) }) qs('#gc-tool-run').addEventListener('click', runCustomTool) async function applyIconResult(res) { diff --git a/renderer/plwl.png b/renderer/plwl.png index cfab4e6a14d524a387219b57ed55b480d3ffc7b1..ee0c558dbb65ef4e1acac8fbd50ec8f3a2b4171e 100644 GIT binary patch literal 9458 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 IF$etr1LCoDGynhq diff --git a/renderer/style.css b/renderer/style.css index e8801c5..2cb5fb1 100644 --- a/renderer/style.css +++ b/renderer/style.css @@ -598,10 +598,14 @@ select { border: var(--border-width) solid var(--light-border-color); border-radius: 0.8rem; padding: 0.6rem 1rem; - max-width: 24rem; + max-width: min(24rem, calc(100vw - 2rem)); box-shadow: 0 0.5rem 2rem rgba(0, 0, 0, 0.4); opacity: 0; transform: translateX(1.5rem); + white-space: normal; + overflow-wrap: anywhere; + word-break: break-word; + min-width: 0; transition: opacity 0.2s ease, transform 0.3s ease-out, diff --git a/src/icons.js b/src/icons.js index 0907101..94a7265 100644 --- a/src/icons.js +++ b/src/icons.js @@ -120,6 +120,36 @@ function pngSize(img) { return null } +// Raw RT_ICON payloads are BITMAPINFOHEADER-based bitmaps: biSize, biWidth, +// biHeight (2x the visible height - XOR + AND mask), biPlanes, biBitCount, +// ..., biClrUsed. Read the real dimensions from there instead of treating the +// first bytes as an ICONDIRENTRY (which yielded garbage like h=0, planes=48 +// and made Chromium decode an empty image). +function bmpDims(img) { + if (img.length < 12) return null + const biSize = img.readUInt32LE(0) + if (biSize === 12) { + // BITMAPCOREHEADER (Win 2.x/3.x era icons): DWORD size, then WORD width, + // height, planes, bitcount + const w = img.readUInt16LE(4) + const h = Math.floor(img.readUInt16LE(6) / 2) + const planes = img.readUInt16LE(8) || 1 + const bpp = img.readUInt16LE(10) || 32 + const colors = bpp <= 8 ? 1 << bpp : 0 + if (w > 0 && h > 0 && w <= 1024 && h <= 1024) return { w, h, planes, bpp, colors } + return null + } + if (biSize >= 40 && biSize <= 124 && img.length > 40) { + const w = img.readUInt32LE(4) + const h = Math.floor(img.readUInt32LE(8) / 2) + const planes = img.readUInt16LE(12) || 1 + const bpp = img.readUInt16LE(14) || 32 + const colors = img.readUInt32LE(32) || (bpp <= 8 ? 1 << bpp : 0) + if (w > 0 && h > 0 && w <= 1024 && h <= 1024) return { w, h, planes, bpp, colors } + } + return null +} + function buildIco(images) { const header = Buffer.alloc(6) header.writeUInt16LE(0, 0) @@ -135,16 +165,27 @@ function buildIco(images) { w = dim.w h = dim.h } else { - w = img.readUInt8(0) || 256 - h = img.readUInt8(1) || 256 - colors = img.readUInt8(2) - planes = img.length > 4 ? img.readUInt16LE(4) || 1 : 1 - bpp = img.length > 6 ? img.readUInt16LE(6) || 32 : 32 + const dims = bmpDims(img) + if (dims) { + w = dims.w + h = dims.h + colors = dims.colors + planes = dims.planes + bpp = dims.bpp + } else { + // legacy fallback: ICONDIRENTRY-style first bytes (PNG-era heuristic) + w = img.readUInt8(0) || 256 + h = img.readUInt8(1) || 256 + colors = img.readUInt8(2) + planes = img.length > 4 ? img.readUInt16LE(4) || 1 : 1 + bpp = img.length > 6 ? img.readUInt16LE(6) || 32 : 32 + } } const meta = Buffer.alloc(16) meta.writeUInt8(w >= 256 ? 0 : w, 0) meta.writeUInt8(h >= 256 ? 0 : h, 1) - meta.writeUInt8(colors, 2) + // 0 in the ICO dir entry means "256+ colors" (palette implied by bpp) + meta.writeUInt8(colors >= 256 ? 0 : colors, 2) meta.writeUInt8(0, 3) meta.writeUInt16LE(planes, 4) meta.writeUInt16LE(bpp, 6) diff --git a/src/importer.js b/src/importer.js index 4f5d8ce..d4763e5 100644 --- a/src/importer.js +++ b/src/importer.js @@ -2,9 +2,9 @@ const fsp = require('fs').promises const path = require('path') -const { DIRS } = require('./paths') -const { newGame } = require('./library') -const { dedupeDir } = require('./fsutil') +const { DIRS, resolvePortablePath } = require('./paths') +const { newGame, newGameId, addGame } = require('./library') +const { extractIconFromExe } = require('./icons') // Directories that typically hold installers/redistributables, not the game. const SKIPPED_DIRS = new Set(['redist', 'directx', '_commonredist', 'support', 'dotnet', 'vc']) @@ -33,21 +33,53 @@ function moveFolder(src, dst, onProgress) { async function importGame(srcDir, mode, onProgress) { const name = path.basename(srcDir) + // Validate before touching the user's files: refuse an import without any + // .exe (and don't half-move a folder we'd then have to roll back). + const preExe = await findDefaultExe(srcDir) + if (!preExe) return { ok: false, error: 'no-exe-found' } + // The id doubles as the imported folder name, so generate it first and + // create files/apps/ - no dedupe suffixes, ids can never collide. + const id = newGameId() let workdir = srcDir if (mode === 'copy' || mode === 'move') { - const dst = dedupeDir(DIRS.APPS, name) + const dst = path.join(DIRS.APPS, id) if (mode === 'copy') await copyRecursive(srcDir, dst, onProgress) else await moveFolder(srcDir, dst, onProgress) workdir = dst } - const exePath = await findDefaultExe(workdir) - return newGame({ name, exePath, workdir, mode }) + const exePath = (await findDefaultExe(workdir)) || preExe + if (!exePath) { + return { ok: false, error: 'no-exe-found' } + } + const game = newGame({ id, name, exePath, workdir, mode }) + game.imported = mode === 'copy' || mode === 'move' + // the exe was picked automatically -> grab its icon right away; a missing + // icon is not an import failure (game can still get one from config) + const icon = path.join(DIRS.DATA, 'icons', id, 'icon.ico') + if (extractIconFromExe(resolvePortablePath(exePath), icon).ok) { + game.iconSource = icon + } + return addGame(game) } -// Largest .exe in the tree, skipping redistributable folders. +// Largest .exe in the tree, skipping redistributable folders. Files are +// stat'ed in parallel and folders walked breadth-first so big games don't +// turn the picker into a sequential crawl. async function findDefaultExe(dir) { let best = '' let bestSize = -1 + const pending = [] + const consider = full => { + const size = fsp.stat(full).then(st => st.size).catch(() => -1) + pending.push( + size.then(sz => { + if (sz > bestSize) { + best = full + bestSize = sz + } + }) + ) + } const walk = async d => { let entries = [] try { @@ -55,20 +87,19 @@ async function findDefaultExe(dir) { } catch { return } + const subdirs = [] for (const e of entries) { const full = path.join(d, e.name) if (e.isDirectory()) { - if (!SKIPPED_DIRS.has(e.name.toLowerCase())) await walk(full) + if (!SKIPPED_DIRS.has(e.name.toLowerCase())) subdirs.push(full) } else if (e.name.toLowerCase().endsWith('.exe')) { - const size = await fsp.stat(full).then(st => st.size).catch(() => -1) - if (size > bestSize) { - best = full - bestSize = size - } + consider(full) } } + await Promise.all(subdirs.map(walk)) } await walk(dir) + await Promise.all(pending) return best } diff --git a/src/library.js b/src/library.js index e80a5a4..04192dc 100644 --- a/src/library.js +++ b/src/library.js @@ -2,7 +2,7 @@ const path = require('path') const fs = require('fs') -const { DIRS, readJson, writeJson } = require('./paths') +const { DIRS, readJson, writeJson, toPortablePath, resolvePortablePath } = require('./paths') const { prefixPath } = require('./prefixes') const REGISTRY = path.join(DIRS.DATA, 'apps.json') @@ -32,14 +32,30 @@ function writePlaySeconds(id, seconds) { function loadGames() { const games = readJson(REGISTRY, []) for (const g of games) { + // stored relative to FILES (portable) -> resolve to absolute for use + g.path = resolvePortablePath(g.path) + g.exePath = resolvePortablePath(g.exePath) + if (g.workdir) g.workdir = resolvePortablePath(g.workdir) + if (g.iconSource) g.iconSource = resolvePortablePath(g.iconSource) const ps = readPlaySeconds(g.id) if (ps != null) g.playSeconds = ps } return games } +// Paths of anything living inside FILES/ are stored RELATIVE to FILES so the +// whole launcher folder can be moved (portable mode). Absolute paths outside +// FILES (apps left in place) are kept as-is. +function portableGame(g) { + const out = { ...g } + for (const k of ['path', 'exePath', 'workdir', 'iconSource']) { + if (out[k]) out[k] = toPortablePath(out[k]) + } + return out +} + function saveGames(games) { - writeJson(REGISTRY, games) + writeJson(REGISTRY, games.map(portableGame)) } function getGame(id) { @@ -94,9 +110,19 @@ function saveSettings(patch) { return s } -function newGame({ name, exePath, workdir, mode }) { +// ID is the current timestamp (ms); while a game with that id or a folder +// with that name exists, keep incrementing - so ids and import folder names +// can never collide. +function newGameId() { + let id = Date.now().toString() + const taken = () => getGame(id) || fs.existsSync(path.join(DIRS.APPS, id)) + while (taken()) id = String(Number(id) + 1) + return id +} + +function newGame({ id, name, exePath, workdir, mode }) { return { - id: 'g' + Date.now().toString(36) + Math.random().toString(36).slice(2, 6), + id: id || newGameId(), name, mode, path: workdir, @@ -120,4 +146,4 @@ function resolvePrefixDir(game) { return prefixPath(defs.default || 'default') } -module.exports = { loadGames, saveGames, getGame, addGame, updateGame, removeGame, loadSettings, saveSettings, newGame, resolvePrefixDir, clearPlaytime, readPlaySeconds, writePlaySeconds, playtimeFile } +module.exports = { loadGames, saveGames, getGame, addGame, updateGame, removeGame, loadSettings, saveSettings, newGame, newGameId, resolvePrefixDir, clearPlaytime, readPlaySeconds, writePlaySeconds, playtimeFile } diff --git a/src/paths.js b/src/paths.js index 2b72054..71310c1 100644 --- a/src/paths.js +++ b/src/paths.js @@ -64,6 +64,22 @@ function ensureDirs() { } } +// Portable paths: anything stored under FILES/ goes into the registry as a +// path RELATIVE to FILES (e.g. apps//game.exe), so moving the whole +// launcher folder keeps the library working. Absolute paths outside FILES +// (games left in place) are stored as-is. Resolve on read, normalize on write. +function toPortablePath(p) { + if (typeof p !== 'string' || !p || !path.isAbsolute(p)) return p + const rel = path.relative(FILES, p) + if (!rel || rel.startsWith('..') || path.isAbsolute(rel)) return p + return rel +} + +function resolvePortablePath(p) { + if (typeof p !== 'string' || !p || path.isAbsolute(p)) return p + return path.join(FILES, p) +} + function readJson(file, fallback) { try { return JSON.parse(fs.readFileSync(file, 'utf8')) @@ -79,4 +95,4 @@ function writeJson(file, data) { fs.renameSync(tmp, file) } -module.exports = { RESOURCES, APP_ROOT, BUILD, FILES, DATA, DIRS, ensureDirs, readJson, writeJson } +module.exports = { RESOURCES, APP_ROOT, BUILD, FILES, DATA, DIRS, ensureDirs, readJson, writeJson, toPortablePath, resolvePortablePath } diff --git a/src/runner.js b/src/runner.js index d9fd927..24cf499 100644 --- a/src/runner.js +++ b/src/runner.js @@ -44,6 +44,13 @@ function buildEnv({ game, wine }) { env.STEAM_COMPAT_APP_ID = '0' env.SteamAppId = '0' env.SteamGameId = '0' + // Launch like the UMU protocol does (UMU/PortProton/Heroic): with UMU_ID + // set, newer Protons (incl. DW Proton 11, GE-Proton 10+) run the game via + // their built-in umu.exe instead of the steam.exe helper, which would + // otherwise try to load Steam's steamclient.so and crash with an + // "Assertion failed \"!status\"" dialog (steamclient_main.c) when no + // Steam client is installed. + if (!env.UMU_ID) env.UMU_ID = 'umu-0' env.WINEPREFIX = path.join(env.STEAM_COMPAT_DATA_PATH, 'pfx') env.PROTON_LOG_DIR = path.join(DIRS.DATA, 'logs') fs.mkdirSync(env.PROTON_LOG_DIR, { recursive: true })