add importing from prefix
This commit is contained in:
parent
29a20324a6
commit
b83e530392
11 changed files with 287 additions and 22 deletions
|
|
@ -39,6 +39,10 @@ cd PLWL
|
|||
./olcxja.plwl/olcxja.plwl
|
||||
```
|
||||
|
||||
## Importing from a wine prefix
|
||||
|
||||
Besides copy/move/leave, an app can be imported **from a wine prefix**: pick the prefix, then the app folder inside its `drive_c`. Nothing is copied — paths are stored relative to the prefix, so wine sees the app as if it were normally installed on `C:\` (registry entries pointing to `C:\...` keep working). Both layouts work: plain wine prefixes (`drive_c` at the top) and Proton-managed ones (`drive_c` under `pfx/`). The app stays tied to that prefix; removing the launcher entry never deletes files from the prefix.
|
||||
|
||||
## Wine & Proton support
|
||||
|
||||
- **System Wine** — uses the `wine` binary from PATH.
|
||||
|
|
|
|||
|
|
@ -28,14 +28,22 @@
|
|||
"library.never": "Never",
|
||||
"library.portable": "Portable",
|
||||
"library.external": "External",
|
||||
"library.inPrefix": "In prefix",
|
||||
"library.removeConfirm": "Remove {0} from the launcher?{1}",
|
||||
"library.removeFilesNote": "\nIts imported files in files/apps will also be deleted.",
|
||||
"library.removePrefixNote": "\nFiles stay in the prefix - only the launcher entry is removed.",
|
||||
"library.tools": "Wine tools",
|
||||
"library.viewLogs": "View logs",
|
||||
"import.question": "Should the app files be brought into the launcher so it stays portable, or left where they are?",
|
||||
"import.mode.copy": "Copy into launcher (portable)",
|
||||
"import.mode.move": "Move into launcher (portable)",
|
||||
"import.mode.leave": "Leave in place",
|
||||
"import.mode.prefix": "Import from a wine prefix",
|
||||
"import.prefix.title": "Import from prefix",
|
||||
"import.prefix.hint": "Pick the wine prefix the app lives in. Nothing is copied - the app is launched from the prefix, so Windows paths keep working (C:\\...).",
|
||||
"import.pickPrefixFolder": "Choose the app folder inside the prefix (drive_c)",
|
||||
"import.prefix.outside": "the selected folder is outside the prefix's drive_c",
|
||||
"import.prefix.noDriveC": "this prefix has no drive_c yet - run any app in it once so wine creates it",
|
||||
"import.pickFolder": "Choose the app folder",
|
||||
"import.progress": "Importing {0}…",
|
||||
"import.fileDone": "{0} files copied",
|
||||
|
|
@ -61,6 +69,7 @@
|
|||
"config.wineDefault": "Default ({0})",
|
||||
"config.prefix": "Wine prefix",
|
||||
"config.prefixDefault": "Default prefix ({0})",
|
||||
"config.prefixLocked": "This app was imported from a prefix - its prefix cannot be changed",
|
||||
"config.dllOverrides": "DLL overrides",
|
||||
"config.overrides.add": "Add override",
|
||||
"config.overrides.dll": "DLL name",
|
||||
|
|
|
|||
|
|
@ -28,14 +28,22 @@
|
|||
"library.never": "Nigdy",
|
||||
"library.portable": "Przenośna",
|
||||
"library.external": "Zewnętrzna",
|
||||
"library.inPrefix": "W prefiksie",
|
||||
"library.removeConfirm": "Usunąć {0} z launchera?{1}",
|
||||
"library.removeFilesNote": "\nJej zaimportowane pliki w files/apps również zostaną usunięte.",
|
||||
"library.removePrefixNote": "\nPliki zostają w prefiksie - usuwany jest tylko wpis w launcherze.",
|
||||
"library.tools": "Narzędzia Wine",
|
||||
"library.viewLogs": "Podejrzyj logi",
|
||||
"import.question": "Czy pliki aplikacji mają trafić do launchera, aby był przenośny, czy mają zostać tam, gdzie są?",
|
||||
"import.mode.copy": "Skopiuj do launchera (przenośne)",
|
||||
"import.mode.move": "Przenieś do launchera (przenośne)",
|
||||
"import.mode.leave": "Zostaw w miejscu",
|
||||
"import.mode.prefix": "Importuj z prefiksu wine",
|
||||
"import.prefix.title": "Import z prefiksu",
|
||||
"import.prefix.hint": "Wybierz prefiks wine, w którym jest aplikacja. Nic nie jest kopiowane - aplikacja odpalana jest z prefiksu, więc ścieżki windowsowe (C:\\...) dalej działają.",
|
||||
"import.pickPrefixFolder": "Wybierz folder aplikacji wewnątrz prefiksu (drive_c)",
|
||||
"import.prefix.outside": "wybrany folder jest poza drive_c prefiksu",
|
||||
"import.prefix.noDriveC": "ten prefiks nie ma jeszcze drive_c - uruchom w nim dowolną apkę raz, żeby wine je utworzył",
|
||||
"import.pickFolder": "Wybierz folder aplikacji",
|
||||
"import.progress": "Importowanie {0}…",
|
||||
"import.fileDone": "Skopiowane pliki: {0}",
|
||||
|
|
@ -61,6 +69,7 @@
|
|||
"config.wineDefault": "Domyślna ({0})",
|
||||
"config.prefix": "Prefiks Wine",
|
||||
"config.prefixDefault": "Prefiks domyślny ({0})",
|
||||
"config.prefixLocked": "Ta aplikacja została zaimportowana z prefiksu - nie można zmienić jej prefiksu",
|
||||
"config.dllOverrides": "Nadpisania DLL",
|
||||
"config.overrides.add": "Dodaj nadpisanie",
|
||||
"config.overrides.dll": "Nazwa DLL",
|
||||
|
|
|
|||
|
|
@ -6,8 +6,8 @@
|
|||
"main": "src/main.js",
|
||||
"scripts": {
|
||||
"start": "electron .",
|
||||
"test": "node test/import.test.js && node test/icons.test.js && node test/shortcuts.test.js && node test/wines-portable.test.js",
|
||||
"smoke": "node test/import.test.js && node test/icons.test.js && node test/shortcuts.test.js && node test/wines-portable.test.js"
|
||||
"test": "node test/import.test.js && node test/prefix-import.test.js && node test/icons.test.js && node test/shortcuts.test.js && node test/wines-portable.test.js",
|
||||
"smoke": "node test/import.test.js && node test/prefix-import.test.js && node test/icons.test.js && node test/shortcuts.test.js && node test/wines-portable.test.js"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@electron/asar": "^3.4.1",
|
||||
|
|
|
|||
154
renderer/app.js
154
renderer/app.js
|
|
@ -104,8 +104,20 @@ function toast(message, kind) {
|
|||
})
|
||||
}
|
||||
|
||||
// The teardown of a closing modal is delayed (for the fade-out) - an
|
||||
// eagerly armed timer must never kill a modal opened in the meantime (e.g.
|
||||
// import mode -> prefix picker happens within milliseconds), so showModal
|
||||
// cancels any pending teardown and clears the closing state.
|
||||
let modalTeardownTimer = null
|
||||
|
||||
function showModal(html) {
|
||||
if (modalTeardownTimer) {
|
||||
clearTimeout(modalTeardownTimer)
|
||||
modalTeardownTimer = null
|
||||
}
|
||||
const overlay = qs('#modal-overlay')
|
||||
const modal = qs('#modal')
|
||||
modal.classList.remove('closing')
|
||||
qs('#modal').innerHTML = html
|
||||
overlay.style.display = 'flex'
|
||||
requestAnimationFrame(() => requestAnimationFrame(() => overlay.classList.add('show')))
|
||||
|
|
@ -118,7 +130,9 @@ function closeModal() {
|
|||
if (overlay.style.display === 'none') return
|
||||
modal.classList.add('closing')
|
||||
overlay.classList.remove('show')
|
||||
setTimeout(() => {
|
||||
if (modalTeardownTimer) clearTimeout(modalTeardownTimer)
|
||||
modalTeardownTimer = setTimeout(() => {
|
||||
modalTeardownTimer = null
|
||||
overlay.style.display = 'none'
|
||||
modal.classList.remove('closing')
|
||||
modal.innerHTML = ''
|
||||
|
|
@ -310,6 +324,29 @@ function absPathInput(v) {
|
|||
return v
|
||||
}
|
||||
|
||||
// Prefix-imported apps: show paths the way wine sees them - relative to the
|
||||
// prefix ("pfx/drive_c/..." or "drive_c/...") instead of the long
|
||||
// files/wineprefixes/<prefix>/... form.
|
||||
function displayGamePath(p, game) {
|
||||
if (game && game.importSource === 'prefix' && game.prefix) {
|
||||
const files = window.plwl.FILES_DIR
|
||||
const base = files ? files + '/wineprefixes/' + game.prefix + '/' : ''
|
||||
if (base && p && p.startsWith(base)) return p.slice(base.length)
|
||||
}
|
||||
return displayPath(p)
|
||||
}
|
||||
|
||||
// Inverse of displayGamePath: accept a prefix-relative (drive_c/... or
|
||||
// pfx/drive_c/...) path and resolve it under the game's prefix; anything
|
||||
// else falls through to the normal FILES/absolute handling.
|
||||
function absGamePathInput(v, game) {
|
||||
if (game && game.importSource === 'prefix' && game.prefix && /^(pfx\/)?drive_c([\/]|$)/i.test(v || '')) {
|
||||
const files = window.plwl.FILES_DIR
|
||||
if (files) return files + '/wineprefixes/' + game.prefix + '/' + v
|
||||
}
|
||||
return absPathInput(v)
|
||||
}
|
||||
|
||||
function fmtPlaytime(seconds) {
|
||||
const s = Math.round(seconds || 0)
|
||||
if (s < 60) return t('library.playtimeSeconds', s)
|
||||
|
|
@ -341,11 +378,15 @@ function renderLibrary() {
|
|||
card.className = 'game-card'
|
||||
card.style.animationDelay = `${idx * 0.04}s`
|
||||
const portable = game.mode === 'copy' || game.mode === 'move'
|
||||
const inPrefix = game.importSource === 'prefix'
|
||||
const sourceBadge = inPrefix
|
||||
? `<span class="badge primary">${t('library.inPrefix')}${game.prefix ? ' · ' + game.prefix : ''}</span>`
|
||||
: `<span class="badge ${portable ? 'primary' : ''}">${portable ? t('library.portable') : t('library.external')}</span>`
|
||||
const last = game.lastPlayed ? new Date(game.lastPlayed).toLocaleDateString() : t('library.never')
|
||||
card.innerHTML = `
|
||||
<h3 title=""></h3>
|
||||
<div class="meta">
|
||||
<span class="badge ${portable ? 'primary' : ''}">${portable ? t('library.portable') : t('library.external')}</span>
|
||||
${sourceBadge}
|
||||
<span class="badge">${wineLabel(game.wine)}</span>
|
||||
</div>
|
||||
<div class="meta">${t('library.lastPlayed', last)}</div>
|
||||
|
|
@ -382,7 +423,9 @@ function renderLibrary() {
|
|||
else toast(t('library.viewLogs'))
|
||||
}
|
||||
card.querySelector('[data-act=remove]').onclick = async () => {
|
||||
const note = game.mode === 'copy' || game.mode === 'move' ? t('library.removeFilesNote') : ''
|
||||
const note = game.mode === 'copy' || game.mode === 'move'
|
||||
? t('library.removeFilesNote')
|
||||
: (inPrefix ? t('library.removePrefixNote') : '')
|
||||
const ok = await confirmModal(t('library.removeConfirm', game.name, note), t('library.remove'))
|
||||
if (!ok) return
|
||||
await window.plwl.gamesRemove(game.id)
|
||||
|
|
@ -446,6 +489,7 @@ async function startImportFlow() {
|
|||
<button class="button" data-mode="copy">${t('import.mode.copy')}</button>
|
||||
<button class="button" data-mode="move">${t('import.mode.move')}</button>
|
||||
<button class="button" data-mode="leave">${t('import.mode.leave')}</button>
|
||||
<button class="button" data-mode="prefix">${t('import.mode.prefix')}</button>
|
||||
</div>
|
||||
<div class="modal-actions">
|
||||
<button class="button" id="modal-cancel">${t('dialog.cancel')}</button>
|
||||
|
|
@ -456,6 +500,7 @@ async function startImportFlow() {
|
|||
btn.onclick = async () => {
|
||||
const mode = btn.dataset.mode
|
||||
closeModal()
|
||||
if (mode === 'prefix') return startPrefixImportFlow()
|
||||
const srcDir = await window.plwl.gamesPickFolder()
|
||||
if (!srcDir) return
|
||||
await doImport(srcDir, mode)
|
||||
|
|
@ -463,6 +508,48 @@ async function startImportFlow() {
|
|||
})
|
||||
}
|
||||
|
||||
// Import from a wine prefix, step 1: pick WHICH prefix - the app folder must
|
||||
// live inside one so its paths can stay prefix-relative (wine then sees it as
|
||||
// a regular C:\ install).
|
||||
async function startPrefixImportFlow() {
|
||||
try {
|
||||
state.prefixes = await window.plwl.prefixesList()
|
||||
} catch (err) {
|
||||
toast(t('import.failed', (err && err.message) || String(err)), 'error')
|
||||
return
|
||||
}
|
||||
const modal = showModal(`
|
||||
<h2>${t('import.prefix.title')}</h2>
|
||||
<p>${t('import.prefix.hint')}</p>
|
||||
<div class="mode-buttons" id="prefix-choices"></div>
|
||||
<div class="modal-actions">
|
||||
<button class="button" id="modal-cancel">${t('dialog.cancel')}</button>
|
||||
</div>
|
||||
`)
|
||||
modal.querySelector('#modal-cancel').onclick = closeModal
|
||||
const choices = modal.querySelector('#prefix-choices')
|
||||
if (!state.prefixes.prefixes.length) {
|
||||
const p = document.createElement('p')
|
||||
p.className = 'subtitle'
|
||||
p.textContent = t('prefixes.empty')
|
||||
choices.replaceWith(p)
|
||||
return
|
||||
}
|
||||
for (const p of state.prefixes.prefixes) {
|
||||
const btn = document.createElement('button')
|
||||
btn.className = 'button'
|
||||
btn.textContent = p.name + (p.name === state.prefixes.default ? ` (${t('prefixes.default')})` : '')
|
||||
btn.onclick = async () => {
|
||||
const prefix = p.name
|
||||
closeModal()
|
||||
const srcDir = await window.plwl.gamesPickPrefixFolder(prefix)
|
||||
if (!srcDir) return
|
||||
await doPrefixImport(prefix, srcDir)
|
||||
}
|
||||
choices.appendChild(btn)
|
||||
}
|
||||
}
|
||||
|
||||
async function doImport(srcDir, mode) {
|
||||
const name = srcDir.split('/').filter(Boolean).pop()
|
||||
const modal = showModal(`
|
||||
|
|
@ -495,6 +582,36 @@ async function doImport(srcDir, mode) {
|
|||
}
|
||||
}
|
||||
|
||||
// Import from a prefix, step 2: register the app in place - nothing is
|
||||
// copied, paths stay prefix-relative.
|
||||
async function doPrefixImport(prefix, srcDir) {
|
||||
const name = srcDir.split('/').filter(Boolean).pop()
|
||||
const modal = showModal(`
|
||||
<h2>${t('import.progress', name)}</h2>
|
||||
<div class="progress-row"><progress></progress></div>
|
||||
`)
|
||||
try {
|
||||
const game = await window.plwl.gamesImportFromPrefix(prefix, srcDir)
|
||||
closeModal()
|
||||
if (!game || game.ok === false) {
|
||||
const raw = (game && game.error) || ''
|
||||
const errText =
|
||||
raw === 'no-exe-found' ? t('import.noExe')
|
||||
: raw === 'no-drive-c' ? t('import.prefix.noDriveC')
|
||||
: t('import.prefix.outside')
|
||||
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('import.failed', (err && err.message) || String(err)), 'error')
|
||||
}
|
||||
}
|
||||
|
||||
function renderPrefixes() {
|
||||
const list = qs('#prefix-list')
|
||||
list.innerHTML = ''
|
||||
|
|
@ -654,6 +771,9 @@ function renderPrefixOptions(selectId, selected) {
|
|||
{ value: '', label: t('config.prefixDefault', defs.default) },
|
||||
...defs.prefixes.filter(p => p.name !== defs.default).map(p => ({ value: p.name, label: p.name }))
|
||||
]
|
||||
// prefix imports pin their prefix even when it IS the default (which the
|
||||
// list above omits) - keep it visible instead of a blank select
|
||||
if (selected && !opts.some(o => o.value === selected)) opts.push({ value: selected, label: selected })
|
||||
if (!selects[selectId]) selects[selectId] = new CustomSelect(qs('#' + selectId), opts, selected || '')
|
||||
else selects[selectId].update(opts, selected || '')
|
||||
}
|
||||
|
|
@ -691,8 +811,8 @@ async function openGameConfig(id) {
|
|||
qs('#gc-title').textContent = game.name
|
||||
qs('#gc-name').value = game.name
|
||||
refreshConfigIcon()
|
||||
qs('#gc-exe').value = displayPath(game.exePath)
|
||||
qs('#gc-workdir').value = displayPath(game.workdir)
|
||||
qs('#gc-exe').value = displayGamePath(game.exePath, game)
|
||||
qs('#gc-workdir').value = displayGamePath(game.workdir, game)
|
||||
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)
|
||||
|
|
@ -764,19 +884,33 @@ async function saveGameConfig() {
|
|||
const idx = line.indexOf('=')
|
||||
if (idx > 0) env[line.slice(0, idx).trim()] = line.slice(idx + 1).trim()
|
||||
})
|
||||
// prefix imports keep their paths relative to the prefix they were
|
||||
// imported from - pointing them at another prefix would silently break
|
||||
// exePath/workdir, so the original prefix stays locked. Other edits in
|
||||
// the same save are kept; only the prefix snaps back (with a hint).
|
||||
let prefixLockedHint = false
|
||||
let prefix = selects['gc-prefix'].value
|
||||
if (game.importSource === 'prefix') {
|
||||
if (prefix !== game.prefix) {
|
||||
prefixLockedHint = true
|
||||
renderPrefixOptions('gc-prefix', game.prefix)
|
||||
}
|
||||
prefix = game.prefix
|
||||
}
|
||||
const patch = {
|
||||
name: qs('#gc-name').value.trim() || game.name,
|
||||
exePath: absPathInput(qs('#gc-exe').value.trim()),
|
||||
workdir: absPathInput(qs('#gc-workdir').value.trim()),
|
||||
exePath: absGamePathInput(qs('#gc-exe').value.trim(), game),
|
||||
workdir: absGamePathInput(qs('#gc-workdir').value.trim(), game),
|
||||
args: qs('#gc-args').value,
|
||||
wine: selects['gc-wine'].value,
|
||||
prefix: selects['gc-prefix'].value,
|
||||
prefix,
|
||||
env,
|
||||
dllOverrides: readOverrides()
|
||||
}
|
||||
await window.plwl.gamesUpdate(game.id, patch)
|
||||
state.games = await window.plwl.gamesList()
|
||||
toast(t('config.saved'), 'success')
|
||||
if (prefixLockedHint) toast(t('config.prefixLocked'), 'error')
|
||||
if (state.currentView === 'gameconfig') {
|
||||
state.currentGame = { ...state.currentGame, ...patch }
|
||||
qs('#gc-title').textContent = patch.name
|
||||
|
|
@ -862,12 +996,12 @@ function wireEvents() {
|
|||
qs('#gc-exe-browse').addEventListener('click', async () => {
|
||||
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)
|
||||
if (p) qs('#gc-exe').value = displayGamePath(p, state.currentGame)
|
||||
})
|
||||
qs('#gc-workdir-browse').addEventListener('click', async () => {
|
||||
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)
|
||||
if (p) qs('#gc-workdir').value = displayGamePath(p, state.currentGame)
|
||||
})
|
||||
qs('#gc-tool-run').addEventListener('click', runCustomTool)
|
||||
async function applyIconResult(res) {
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ const path = require('path')
|
|||
const { DIRS, resolvePortablePath } = require('./paths')
|
||||
const { newGame, newGameId, addGame } = require('./library')
|
||||
const { extractIconFromExe } = require('./icons')
|
||||
const { prefixPath } = require('./prefixes')
|
||||
|
||||
// Directories that typically hold installers/redistributables, not the game.
|
||||
const SKIPPED_DIRS = new Set(['redist', 'directx', '_commonredist', 'support', 'dotnet', 'vc'])
|
||||
|
|
@ -62,6 +63,35 @@ async function importGame(srcDir, mode, onProgress) {
|
|||
return addGame(game)
|
||||
}
|
||||
|
||||
// Import from a wine prefix: the folder is picked under the prefix's
|
||||
// drive_c and left in place - the game paths are stored relative to the
|
||||
// prefix, so wine sees the app exactly as if it had been installed
|
||||
// normally into C:\...
|
||||
async function importGameFromPrefix(prefix, srcDir, onProgress) {
|
||||
const prefixes = require('./prefixes')
|
||||
if (!prefixes.listPrefixes().prefixes.some(p => p.name === prefix)) return { ok: false, error: 'prefix-not-found' }
|
||||
// the folder must live inside the prefix's C: drive so the C:\ mapping
|
||||
// holds - drive_c sits at the prefix top for plain wine, under pfx/ for
|
||||
// Proton-managed prefixes
|
||||
const driveRoot = prefixes.prefixDriveRoot(prefix)
|
||||
if (!driveRoot) return { ok: false, error: 'no-drive-c' }
|
||||
const rel = path.relative(driveRoot, srcDir)
|
||||
if (!rel || rel.startsWith('..') || path.isAbsolute(rel)) return { ok: false, error: 'outside-drive-c' }
|
||||
const preExe = await findDefaultExe(srcDir)
|
||||
if (!preExe) return { ok: false, error: 'no-exe-found' }
|
||||
const id = newGameId()
|
||||
const game = newGame({ id, name: path.basename(srcDir), exePath: preExe, workdir: srcDir, mode: 'prefix' })
|
||||
game.importSource = 'prefix'
|
||||
game.prefix = prefix
|
||||
// exe 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(preExe), icon).ok) {
|
||||
game.iconSource = icon
|
||||
}
|
||||
return addGame(game)
|
||||
}
|
||||
|
||||
// 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.
|
||||
|
|
@ -103,4 +133,4 @@ async function findDefaultExe(dir) {
|
|||
return best
|
||||
}
|
||||
|
||||
module.exports = { importGame, findDefaultExe, copyRecursive, moveFolder }
|
||||
module.exports = { importGame, importGameFromPrefix, findDefaultExe, copyRecursive, moveFolder }
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
'use strict'
|
||||
|
||||
const { runGame, runTool } = require('../runner')
|
||||
const { importGame } = require('../importer')
|
||||
const { importGame, importGameFromPrefix } = require('../importer')
|
||||
const library = require('../library')
|
||||
|
||||
function killProcessGroup(pid) {
|
||||
|
|
@ -114,7 +114,13 @@ function createGamesService({ getWindow, onGamesChanged }) {
|
|||
return importGame(srcDir, mode, data => sendToWindow(win, 'import:progress', data))
|
||||
}
|
||||
|
||||
return { isRunning, listRunning, start, kill, runToolFor, import: importTo, setOnGameExit }
|
||||
// prefix import: nothing is copied, the game just gets registered with
|
||||
// paths relative to the prefix (wine sees it as a normal C:\ install)
|
||||
async function importFromPrefix(win, prefix, srcDir) {
|
||||
return importGameFromPrefix(prefix, srcDir)
|
||||
}
|
||||
|
||||
return { isRunning, listRunning, start, kill, runToolFor, import: importTo, importFromPrefix, setOnGameExit }
|
||||
}
|
||||
|
||||
module.exports = { createGamesService, killProcessGroup, sendToWindow }
|
||||
|
|
|
|||
|
|
@ -180,6 +180,27 @@ function registerIpc({ getWindow, onGamesChanged }) {
|
|||
return errorResult(err)
|
||||
}
|
||||
})
|
||||
// import from an existing wine prefix: pick the prefix first, then the app
|
||||
// folder inside it (drive_c) - paths are stored prefix-relative so the app
|
||||
// shows up for wine as a regular C:\ install
|
||||
ipcMain.handle('games:pickPrefixFolder', async (e, prefix) => {
|
||||
// open the picker straight in the prefix's C: drive (plain wine: top
|
||||
// level, Proton: under pfx/)
|
||||
const driveC = prefixes.prefixDriveRoot(prefix)
|
||||
const res = await dialog.showOpenDialog(getWindow(), {
|
||||
title: i18n.translate(library.loadSettings().language, 'import.pickPrefixFolder'),
|
||||
defaultPath: driveC || prefixes.prefixPath(prefix),
|
||||
properties: ['openDirectory']
|
||||
})
|
||||
return res.canceled || !res.filePaths[0] ? null : res.filePaths[0]
|
||||
})
|
||||
ipcMain.handle('games:importFromPrefix', async (e, prefix, srcDir) => {
|
||||
try {
|
||||
return await games.importFromPrefix(getWindow(), prefix, srcDir)
|
||||
} catch (err) {
|
||||
return errorResult(err)
|
||||
}
|
||||
})
|
||||
|
||||
// dialogs & shell ---------------------------------------------------------------------------
|
||||
ipcMain.handle('dialog:pickFile', async (e, opts) => {
|
||||
|
|
|
|||
|
|
@ -29,13 +29,23 @@ function writePlaySeconds(id, seconds) {
|
|||
fs.writeFileSync(file, String(Math.max(0, Math.round(seconds))))
|
||||
}
|
||||
|
||||
// Prefix imports keep exe/workdir paths relative to the PREFIX ROOT
|
||||
// ("drive_c/..." for plain wine, "pfx/drive_c/..." for Proton-managed
|
||||
// prefixes) so wine sees them under C:\... - everything else is
|
||||
// FILES-relative/absolute.
|
||||
const isPrefixRel = v => typeof v === 'string' && /^(pfx[/\\])?drive_c([/\\]|$)/i.test(v)
|
||||
|
||||
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)
|
||||
// stored relative to FILES (portable) -> resolve to absolute for use.
|
||||
// Prefix imports resolve against their own prefix instead (never the
|
||||
// launcher-wide default).
|
||||
const usePrefix = g.importSource === 'prefix' && g.prefix ? prefixPath(g.prefix) : null
|
||||
for (const k of ['path', 'exePath', 'workdir']) {
|
||||
if (!g[k]) continue
|
||||
g[k] = usePrefix && isPrefixRel(g[k]) ? path.join(usePrefix, g[k]) : resolvePortablePath(g[k])
|
||||
}
|
||||
if (g.iconSource) g.iconSource = resolvePortablePath(g.iconSource)
|
||||
const ps = readPlaySeconds(g.id)
|
||||
if (ps != null) g.playSeconds = ps
|
||||
|
|
@ -48,8 +58,18 @@ function loadGames() {
|
|||
// FILES (apps left in place) are kept as-is.
|
||||
function portableGame(g) {
|
||||
const out = { ...g }
|
||||
const pfx = out.importSource === 'prefix' && out.prefix ? prefixPath(out.prefix) : null
|
||||
for (const k of ['path', 'exePath', 'workdir', 'iconSource']) {
|
||||
if (out[k]) out[k] = toPortablePath(out[k])
|
||||
const v = out[k]
|
||||
if (!v) continue
|
||||
if (pfx && k !== 'iconSource' && !isPrefixRel(v)) {
|
||||
// prefix game: store relative to the PREFIX ROOT (keeps the drive_c
|
||||
// segment, e.g. "drive_c/Games/..." or "pfx/drive_c/Games/...")
|
||||
const rel = path.relative(pfx, resolvePortablePath(v))
|
||||
if (rel && !rel.startsWith('..') && !path.isAbsolute(rel)) out[k] = rel
|
||||
} else if (!(pfx && isPrefixRel(v))) {
|
||||
out[k] = toPortablePath(v)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
|
@ -95,6 +115,9 @@ function removeGame(id) {
|
|||
require('fs').rmSync(g.path, { recursive: true, force: true })
|
||||
} catch {}
|
||||
}
|
||||
// prefix imports live inside the prefix: deleting launcher files would
|
||||
// nuke the user's prefix (installed DLLs, saves of every other app), so
|
||||
// only the registry entry is dropped
|
||||
games.splice(idx, 1)
|
||||
saveGames(games)
|
||||
return true
|
||||
|
|
|
|||
|
|
@ -42,6 +42,24 @@ function prefixExists(name) {
|
|||
}
|
||||
}
|
||||
|
||||
// Where the Windows C: drive of a prefix actually lives: plain wine keeps
|
||||
// it at the top (WINEPREFIX=<prefix>), Proton-managed prefixes nest it
|
||||
// under pfx/ (WINEPREFIX=<prefix>/pfx). system.reg marks the real prefix
|
||||
// root; a fresh prefix may not have it yet, so fall back to drive_c itself.
|
||||
function prefixDriveRoot(name) {
|
||||
const root = prefixPath(name)
|
||||
for (const pass of [true, false]) {
|
||||
for (const base of [root, path.join(root, 'pfx')]) {
|
||||
try {
|
||||
const driveC = path.join(base, 'drive_c')
|
||||
if (!fs.statSync(driveC).isDirectory()) continue
|
||||
if (!pass || fs.existsSync(path.join(base, 'system.reg'))) return driveC
|
||||
} catch {}
|
||||
}
|
||||
}
|
||||
return null
|
||||
}
|
||||
|
||||
function createPrefix(name) {
|
||||
const clean = normalizeName(name)
|
||||
if (!clean) return { ok: false, error: 'invalidName' }
|
||||
|
|
@ -75,4 +93,4 @@ function setDefaultPrefix(name) {
|
|||
return { ok: true }
|
||||
}
|
||||
|
||||
module.exports = { listPrefixes, createPrefix, deletePrefix, setDefaultPrefix, prefixPath, prefixExists, normalizeName, MAIN }
|
||||
module.exports = { listPrefixes, createPrefix, deletePrefix, setDefaultPrefix, prefixPath, prefixExists, prefixDriveRoot, normalizeName, MAIN }
|
||||
|
|
|
|||
|
|
@ -3,6 +3,13 @@
|
|||
const { contextBridge, ipcRenderer } = require('electron')
|
||||
const { DIRS } = require('./paths')
|
||||
|
||||
// single-slot progress: every import modal used to register ANOTHER listener
|
||||
// and old ones never unregistered, so the file counter sped up per import
|
||||
let importProgressCb = null
|
||||
ipcRenderer.on('import:progress', (e, data) => {
|
||||
if (importProgressCb) importProgressCb(data)
|
||||
})
|
||||
|
||||
contextBridge.exposeInMainWorld('plwl', {
|
||||
FILES_DIR: DIRS.FILES,
|
||||
i18nList: () => ipcRenderer.invoke('i18n:list'),
|
||||
|
|
@ -32,7 +39,9 @@ contextBridge.exposeInMainWorld('plwl', {
|
|||
gamesCreateShortcut: id => ipcRenderer.invoke('games:createShortcut', id),
|
||||
gamesShortcutPaths: id => ipcRenderer.invoke('games:shortcutPaths', id),
|
||||
gamesPickFolder: () => ipcRenderer.invoke('games:pickFolder'),
|
||||
gamesPickPrefixFolder: prefix => ipcRenderer.invoke('games:pickPrefixFolder', prefix),
|
||||
gamesImport: (src, mode) => ipcRenderer.invoke('games:import', src, mode),
|
||||
gamesImportFromPrefix: (prefix, src) => ipcRenderer.invoke('games:importFromPrefix', prefix, src),
|
||||
gamesRun: id => ipcRenderer.invoke('games:run', id),
|
||||
gamesRunTool: (id, tool, args) => ipcRenderer.invoke('games:runTool', id, tool, args),
|
||||
gamesGetLogs: id => ipcRenderer.invoke('games:getLogs', id),
|
||||
|
|
@ -42,6 +51,8 @@ contextBridge.exposeInMainWorld('plwl', {
|
|||
dialogPickFile: opts => ipcRenderer.invoke('dialog:pickFile', opts),
|
||||
shellOpenPath: p => ipcRenderer.invoke('shell:openPath', p),
|
||||
shellShowItemInFolder: p => ipcRenderer.invoke('shell:showItemInFolder', p),
|
||||
onImportProgress: cb => ipcRenderer.on('import:progress', (e, data) => cb(data)),
|
||||
onImportProgress: cb => {
|
||||
importProgressCb = cb
|
||||
},
|
||||
onGamesChanged: cb => ipcRenderer.on('games:changed', () => cb())
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue