Skip to content

[General] add optional '--no-https' flag for legendary args for LanCache compatibility #1538

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
Show file tree
Hide file tree
Changes from all commits
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
17 changes: 12 additions & 5 deletions electron/legendary/games.ts
Original file line number Diff line number Diff line change
Expand Up @@ -293,12 +293,14 @@ class LegendaryGame extends Game {
runner: 'legendary',
status: 'updating'
})
const { maxWorkers } = await GlobalConfig.get().getSettings()
const { maxWorkers, downloadNoHttps } =
await GlobalConfig.get().getSettings()
const info = await Game.get(this.appName, 'legendary').getInstallInfo()
const workers = maxWorkers ? ['--max-workers', `${maxWorkers}`] : []
const noHttps = downloadNoHttps ? ['--no-https'] : []
const logPath = join(heroicGamesConfigPath, this.appName + '.log')

const commandParts = ['update', this.appName, ...workers, '-y']
const commandParts = ['update', this.appName, ...workers, ...noHttps, '-y']

const onOutput = (data: string) => {
this.onInstallOrUpdateOutput(
Expand Down Expand Up @@ -368,11 +370,13 @@ class LegendaryGame extends Game {
sdlList,
platformToInstall
}: InstallArgs): Promise<{ status: 'done' | 'error' }> {
const { maxWorkers } = await GlobalConfig.get().getSettings()
const { maxWorkers, downloadNoHttps } =
await GlobalConfig.get().getSettings()
const info = await Game.get(this.appName, 'legendary').getInstallInfo(
platformToInstall
)
const workers = maxWorkers ? ['--max-workers', `${maxWorkers}`] : []
const noHttps = downloadNoHttps ? ['--no-https'] : []
const withDlcs = installDlcs ? '--with-dlcs' : '--skip-dlcs'
const installSdl = sdlList.length
? this.getSdlList(sdlList)
Expand All @@ -390,6 +394,7 @@ class LegendaryGame extends Game {
withDlcs,
...installSdl,
...workers,
...noHttps,
'-y'
]

Expand Down Expand Up @@ -454,12 +459,14 @@ class LegendaryGame extends Game {
*/
public async repair(): Promise<ExecResult> {
// this.state.status = 'repairing'
const { maxWorkers } = await GlobalConfig.get().getSettings()
const { maxWorkers, downloadNoHttps } =
await GlobalConfig.get().getSettings()
const workers = maxWorkers ? ['--max-workers', `${maxWorkers}`] : []
const noHttps = downloadNoHttps ? ['--no-https'] : []

const logPath = join(heroicGamesConfigPath, this.appName + '.log')

const commandParts = ['repair', this.appName, ...workers, '-y']
const commandParts = ['repair', this.appName, ...workers, ...noHttps, '-y']

const res = await runLegendaryCommand(commandParts, {
logFile: logPath,
Expand Down
1 change: 1 addition & 0 deletions electron/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export interface AppSettings {
defaultInstallPath: string
disableController: boolean
discordRPC: boolean
downloadNoHttps: boolean
egsLinkedPath: string
exitToTray: boolean
enableEsync: boolean
Expand Down
1 change: 1 addition & 0 deletions public/locales/bg/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Задаване на папка за нови префикси на Wine",
"disable_controller": "Изключване на навигирането в Heroic посредством контролер",
"discordRPC": "Включване на актуализирането на присъствието в Дискорд",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Синхронизиране с вече инсталиран Epic Games",
"enableFSRHack": "Включване на хака FSR (версията на Wine трябва да го поддържа)",
"esync": "Включване на Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ca/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Directori de prefixos Wine nous",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Activa la Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Sincronitza amb l'Epic Games instal·lat",
"enableFSRHack": "Activa el FSR Hack (cal que la versió del Wine en sigui compatible)",
"esync": "Activa l'Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/cs/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Nastavit složku pro nové Prefixy Wine",
"disable_controller": "Zakázat navigaci v Heroic pomocí ovladače",
"discordRPC": "Povolit Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Synchronizovat s instalovaným Epic Games Store",
"enableFSRHack": "Povolte FSR Hack (verze Wine jej musí podporovat)",
"esync": "Povolit Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/de/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Ordner für neue Wine Präfixe festlegen",
"disable_controller": "Heroic Navigation mit Controller deaktivieren",
"discordRPC": "Discord Rich Presence aktivieren",
"download-no-https": "Spiele ohne HTTPS herunterladen (nützlich für CDNs z.B. LanCache)",
"egs-sync": "Mit installiertem Epic Games synchronisieren",
"enableFSRHack": "FSR Hack aktivieren (Wine-Version muss es unterstützen)",
"esync": "Esync aktivieren",
Expand Down
1 change: 1 addition & 0 deletions public/locales/el/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Καθορισμός Φακέλου για νέα Προθήματα Wine",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Ενεργοποίηση Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Συγχρονισμός με εγκατεστημένο Epic Games",
"enableFSRHack": "Ενεργοποίηση FSR Hack (Η έκδοση Wine πρέπει να το υποστηρίζει)",
"esync": "Ενεργοποίηση Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/en/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Set Folder for new Wine Prefixes",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Enable Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Sync with Installed Epic Games",
"enableFSRHack": "Enable FSR Hack (Wine version needs to support it)",
"esync": "Enable Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/es/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Establecer carpeta para nuevos prefijos de Wine",
"disable_controller": "Desactivar la navegación de Heroic usando el controlador",
"discordRPC": "Activar Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Sincronizar con juegos EGS",
"enableFSRHack": "Habilitar el hack FSR (La versión de Wine debe soportarlo)",
"esync": "Activar Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/et/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Määrake uute Wine'i prefikside jaoks kaust",
"disable_controller": "Keela Heroic'u mängupuldiga navigeerimine",
"discordRPC": "Luba Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Sünkroonimine paigaldatud Epic Games'iga",
"enableFSRHack": "Luba FSR häkk (Wine'i versioon peab seda toetama)",
"esync": "Luba Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/fa/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "تنظیم پوشه برای Wine Prefix جدید",
"disable_controller": "غیر فعال کردن کنترل Heroic با استفاده از دسته",
"discordRPC": "فعالسازی Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "همگامسازی با بازیهای اپیک نصب شده",
"enableFSRHack": "فعالسازی FSR Hack (نسخه Wine باید از آن پشتیبانی کند)",
"esync": "فعالسازی Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/fi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Aseta kansio uusille Winen Prefixeille",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Ota käyttöön Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Synkronoi asennetun Epic Gamesin kanssa",
"enableFSRHack": "Ota käyttöön FSR Hack (Wine version tulee tukea sitä)",
"esync": "Ota Esync käyttöön",
Expand Down
1 change: 1 addition & 0 deletions public/locales/fr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Set Folder for new Wine Prefixes",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Activer Rich Presence dans Discord",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Synchroniser avec l'installation d'Epic Games",
"enableFSRHack": "Activer FSR Hack (la version de wine doit le prendre en charge)",
"esync": "Activer Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/gl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Estabelecer cartafol para os prefixos de Wine",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Activar a presencia enriquecida de Discord",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Sincronizar cos xogos instalados de Epic",
"enableFSRHack": "Activar o hack de FSR (A versión de Wine debe soportalo)",
"esync": "Activar Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/hr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Set Folder for new Wine Prefixes",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Enable Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Sinkroniziraj sa instaliranim Epic Games",
"enableFSRHack": "Enable FSR Hack (Wine version needs to support it)",
"esync": "Enable Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/hu/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Mappa beállítása új Wine prefixeknek",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Discord Rich Presence engedélyezése",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Szinkronizálás a telepített Epic Gamesszel",
"enableFSRHack": "FSR hack engedélyezése (a Wine verziónak támogatnia kell)",
"esync": "Esync engedélyezése",
Expand Down
1 change: 1 addition & 0 deletions public/locales/id/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Atur Folder untuk Prefiks Wine baru",
"disable_controller": "Nonaktifkan navigasi Heroic menggunakan pengontrol",
"discordRPC": "Aktifkan Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Sinkronkan dengan Epic Games yang Terpasang",
"enableFSRHack": "Aktifkan Peretasan FSR (perlu versi Wine yang mendukung)",
"esync": "Aktifkan Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/it/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Imposta cartella per i nuovi prefissi Wine",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Attiva \"Discord Rich Presence\"",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Sincronizza con l'Epic Games già installato",
"enableFSRHack": "Attiva l'FSR Hack (la versione di Wine deve supportarlo)",
"esync": "Abilita l'Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ja/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Set Folder for new Wine Prefixes",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Discord Rich Presenceを有効にする",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "インストールされているEpic Gamesと同期する",
"enableFSRHack": "FSRハックを有効にする(Wineバージョンはそれをサポートする必要があります)",
"esync": "Esyncを有効にする",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ko/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "새로운 Wine 접두사를 위한 폴더 설정",
"disable_controller": "컨트롤러를 이용한 Heroic 탐색 비활성화",
"discordRPC": "Discord Rich Presence 활성화",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "설치된 Epic Games와 동기화",
"enableFSRHack": "FSR 활성화 (지원하는 Wine 버전을 사용해야 합니다)",
"esync": "Esync 활성화",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ml/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Set Folder for new Wine Prefixes",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "ഡിസ്കോര്ഡ് റിച്ച് പ്രെസന്സ് വക്കൂ",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "സ്ഥാപിച്ച എപിക് ഗെയിംസുമായി ഒന്നിപ്പിക്കുക",
"enableFSRHack": "എഫ്എസ്ആര് ഹാക്ക് വയ്ക്കൂ (Wine version needs to support it)",
"esync": "Esync വയ്ക്കൂ",
Expand Down
1 change: 1 addition & 0 deletions public/locales/nl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Set Folder for new Wine Prefixes",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "\"Discord Rich Presence\" inschakelen",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Synchronisatie met geïnstalleerde Epic Games",
"enableFSRHack": "FSR Hack inschakelen (Wine versie moet dit ondersteunen)",
"esync": "Esync inschakelen",
Expand Down
1 change: 1 addition & 0 deletions public/locales/pl/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Ustaw Folder dla nowych Prefiksów Wine",
"disable_controller": "Wyłącz nawigację Heroic przy użyciu kontrolera",
"discordRPC": "Włącz Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Synchronizuj z zainstalowanym Epic Games",
"enableFSRHack": "Włącz FSR Hack (Wersja Wine musi to wspierać)",
"esync": "Włącz Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/pt/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Set Folder for new Wine Prefixes",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Habilitar Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Sincronizar com Epic Games Store",
"enableFSRHack": "Habilitar Hack FSR (Wine precisa supportar a feature)",
"esync": "Enable Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/pt_BR/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Pasta padrão para novos prefixos Wine",
"disable_controller": "Desabilitar navegação por controle no Heroic",
"discordRPC": "Habilitar o Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Sincronizar com a Epic Games Store",
"enableFSRHack": "Habilitar Hack FSR (a versão do Wine precisa suportar o recurso)",
"esync": "Habilitar Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ru/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Указать папку для новых префиксов Wine",
"disable_controller": "Отключить навигацию в Heroic с помощью контроллера",
"discordRPC": "Включить Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Синхронизировать с установленнными играми EGS",
"enableFSRHack": "Включить FSR Hack (версия Wine должна поддерживать)",
"esync": "Включить Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/sv/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Ange sökväg för nya Wine-prefix",
"disable_controller": "Deaktivera navigering via handkontroll",
"discordRPC": "Aktivera Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Synkronisera med installerade Epic spel",
"enableFSRHack": "Aktivera FSR Hack (Wine-versionen måste stödja det)",
"esync": "Aktivera Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/ta/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Set Folder for new Wine Prefixes",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Enable Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "நிறுவப்பட்ட எபிக் விளையாட்டுகளுடன் ஒத்திசை",
"enableFSRHack": "Enable FSR Hack (Wine version needs to support it)",
"esync": "Enable Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/tr/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Yeni Wine Prefix'leri için Klasörü Ayarla",
"disable_controller": "Denetleyiciyi kullanarak Heroic gezinmesini devre dışı bırak",
"discordRPC": "Discord Rich Presence'i Etkinleştir",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Kurulu Epic Games ile Eşzamanla",
"enableFSRHack": "FSR Hack'i Etkinleştir (Wine sürümünün desteklemesi gerekiyor)",
"esync": "Esync'i Etkinleştir",
Expand Down
1 change: 1 addition & 0 deletions public/locales/uk/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Обрати теку для нових префіксів Wine",
"disable_controller": "Вимкнути навігацію Heroic за допомогою контролера",
"discordRPC": "Ввімкнути Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Синхронізуватися із встановленим Epic Games Launcher",
"enableFSRHack": "Ввімкнути FSR Hack (версія Wine має це підтримувати)",
"esync": "Ввімкнути Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/vi/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Đặt thư mục cho prefix mới của Wine",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "Bật tính năng Discord Rich Presence",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "Đồng bộ với Game Epic đã cài",
"enableFSRHack": "Bật tính năng FSR hack (Phiên bản Wine cần hỗ trợ tính năng này)",
"esync": "Bật Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/zh_Hans/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "为新的 WinePrefix设置文件夹",
"disable_controller": "使用控制器禁止 Heroic 导航",
"discordRPC": "启用Discord的Rich Presence(活动状态)",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "与已安装的 Epic 游戏同步",
"enableFSRHack": "启用 FSR(需要支持的WINE版本)",
"esync": "启用 Esync",
Expand Down
1 change: 1 addition & 0 deletions public/locales/zh_Hant/translation.json
Original file line number Diff line number Diff line change
Expand Up @@ -288,6 +288,7 @@
"defaultWinePrefix": "Set Folder for new Wine Prefixes",
"disable_controller": "Disable Heroic navigation using controller",
"discordRPC": "啟用Discord的Rich Presence(活動狀態)",
"download-no-https": "Download games without HTTPS (useful for CDNs e.g. LanCache)",
"egs-sync": "與已安裝的Epic Games同步",
"enableFSRHack": "啟用FSR(需要支持的WINE版本)",
"esync": "Enable Esync",
Expand Down
Loading