Skip to content

[FIX] Issues with Epic Login and refresh Library #1073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Mar 10, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 32 additions & 4 deletions electron/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,25 +11,53 @@ import {
import { env } from 'process'
import { app } from 'electron'
import { existsSync } from 'graceful-fs'
import os from 'os'

const configStore = new Store({
cwd: 'store'
})

// based on https://github.com/jy95/escape-path-with-spaces/blob/master/index.js
// unfortunatelly this cant go into utils since it needs to be loaded on app start
function fixPathWithSpaces(path: string) {
// to detect on with os user had used path.resolve(...)
const is_posix_os = !isWindows
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This feels kinda unnecessary, why not just do if (!isWindows) below?

const version = os.release()

// For some windows version (Windows 10 v1803), it is not useful to escape spaces in path
// https://docs.microsoft.com/en-us/windows/release-information/
const windows_version_regex = /(\d+\.\d+)\.(\d+)/
const should_not_escape = (major_release = '', os_build = '') =>
/1\d+\.\d+/.test(major_release) && Number(os_build) >= 17134.1184

if (is_posix_os) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be higher up, so the regex isn't applied when it's not used anyway

return path.replace(/(\s+)/g, '\\$1')
}

// for windows, it depend of the build
return should_not_escape(...windows_version_regex.exec(version).splice(1))
? // on major version, no need to escape anymore
// https://support.microsoft.com/en-us/help/4467268/url-encoded-unc-paths-not-url-decoded-in-windows-10-version-1803-later
path
: // on older version, replace space with symbol %20
path.replace(/(\s+)/g, '%20')
}

function getLegendaryBin() {
const settings = configStore.get('settings') as { altLeg: string }
const bin =
settings?.altLeg ||
`"${fixAsarPath(
`${fixAsarPath(
join(
__dirname,
'bin',
process.platform,
isWindows ? 'legendary.exe' : 'legendary'
)
)}"`
)}`

logInfo(`Location: ${bin}`, LogPrefix.Legendary)
return bin
return fixPathWithSpaces(bin)
}

function getGOGdlBin() {
Expand All @@ -44,7 +72,7 @@ function getGOGdlBin() {
)
)
logInfo(`Location: ${bin}`, LogPrefix.Gog)
return bin
return fixPathWithSpaces(bin)
}

const isMac = platform() === 'darwin'
Expand Down
2 changes: 1 addition & 1 deletion electron/legendary/library.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ class LegendaryLibrary {

return new Promise((res, rej) => {
const getUeAssets = showUnrealMarket ? '--include-ue' : ''
const child = spawn(legendaryBin, ['list', getUeAssets])
const child = spawn(legendaryBin, ['list', getUeAssets], { shell: true })
child.stderr.on('data', (data) => {
if (`${data}`.includes('ERROR')) {
logError(`${data}`.trim(), LogPrefix.Legendary)
Expand Down
2 changes: 1 addition & 1 deletion electron/legendary/user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export class LegendaryUser {

const command = `auth --sid ${sid}`.split(' ')
return new Promise((res) => {
const child = spawn(legendaryBin, command)
const child = spawn(legendaryBin, command, { shell: true })
child.stderr.on('data', (data) => {
if (`${data}`.includes('ERROR')) {
logError(`${data}`, LogPrefix.Legendary)
Expand Down