external/hydra
1
0
Fork 0
mirror of https://github.com/hydralauncher/hydra.git synced 2025-03-09 15:40:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

chore: resolving merge conflict on downloads

Browse source
This commit is contained in:
Chubby Granny Chaser 2024-06-05 14:30:12 +01:00
commit d123f63095
No known key found for this signature in database
5 changed files with 56 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/renderer/src/hooks/use-download.ts
View file

@ -52,7 +52,6 @@ export function useDownload() {
try {
await window.electron.deleteGameFolder(gameId);
await window.electron.removeGame(gameId);
updateLibrary();
} finally {
dispatch(removeGameFromDeleting(gameId));

2
src/renderer/src/pages/downloads/downloads.tsx
View file

@ -69,7 +69,7 @@ export function Downloads() {
);
const complete = orderBy(result.complete, (game) =>
game.status === "complete" ? 0 : 1
game.progress === 1 ? 0 : 1
);
return {

33
src/renderer/src/pages/game-details/hero/hero-panel-actions.tsx
View file

@ -110,11 +110,6 @@ export function HeroPanelActions() {
return;
}
if (game?.executablePath) {
window.electron.openGame(game.id, game.executablePath);
return;
}
const gameExecutablePath = await selectGameExecutable();
if (gameExecutablePath)
window.electron.openGame(game.id, gameExecutablePath);
@ -139,6 +134,17 @@ export function HeroPanelActions() {
</Button>
);
const showDownloadOptionsButton = (
<Button
onClick={openRepacksModal}
theme="outline"
disabled={deleting}
className={styles.heroPanelAction}
>
{t("open_download_options")}
</Button>
);
if (game?.status === "active" && game?.progress !== 1) {
return (
<>
@ -188,14 +194,7 @@ export function HeroPanelActions() {
if (game?.status === "removed") {
return (
<>
<Button
onClick={openRepacksModal}
theme="outline"
disabled={deleting}
className={styles.heroPanelAction}
>
{t("open_download_options")}
</Button>
{showDownloadOptionsButton}
<Button
onClick={() => removeGameFromLibrary(game.id).then(updateGame)}
@ -227,7 +226,7 @@ export function HeroPanelActions() {
if (game) {
return (
<>
{game?.progress === 1 ? (
{game.progress === 1 && game.downloadPath && (
<>
<BinaryNotFoundModal
visible={showBinaryNotFoundModal}
@ -243,10 +242,12 @@ export function HeroPanelActions() {
{t("install")}
</Button>
</>
) : (
toggleGameOnLibraryButton
)}
{game.progress === 1 && !game.downloadPath && showDownloadOptionsButton}
{game.progress !== 1 && toggleGameOnLibraryButton}
{isGameRunning ? (
<Button
onClick={closeGame}