-
-
Notifications
You must be signed in to change notification settings - Fork 480
[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
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
ec09ef9
fix: issues with legendary enoent
flavioislima 505ce2a
fix: deal with spaces on windows
flavioislima 135dee2
fix: dirname
flavioislima f4d2d3a
fix: more space issues on windows
flavioislima 3fcbba8
chore: cleaning
flavioislima b1e2582
chore: rever gogdl changes
flavioislima 4041872
chore: split build workflow
flavioislima 74d79cb
fix: pr comments
flavioislima c2da0d5
Merge branch 'main' into fix_enoent
flavioislima File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
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) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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() { | ||
|
@@ -44,7 +72,7 @@ function getGOGdlBin() { | |
) | ||
) | ||
logInfo(`Location: ${bin}`, LogPrefix.Gog) | ||
return bin | ||
return fixPathWithSpaces(bin) | ||
} | ||
|
||
const isMac = platform() === 'darwin' | ||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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?