mirror of
https://github.com/hydralauncher/hydra.git
synced 2025-01-23 21:44:55 +03:00
feat: dont set game as removed when deleting instalation folder
This commit is contained in:
parent
d6e57c20c7
commit
7ac7d92a28
@ -1,8 +1,6 @@
|
||||
import path from "node:path";
|
||||
import fs from "node:fs";
|
||||
|
||||
import { In } from "typeorm";
|
||||
|
||||
import { gameRepository } from "@main/repository";
|
||||
|
||||
import { getDownloadsPath } from "../helpers/get-downloads-path";
|
||||
@ -16,7 +14,6 @@ const deleteGameFolder = async (
|
||||
const game = await gameRepository.findOne({
|
||||
where: {
|
||||
id: gameId,
|
||||
status: In(["removed", "complete"]),
|
||||
isDeleted: false,
|
||||
},
|
||||
});
|
||||
@ -29,8 +26,15 @@ const deleteGameFolder = async (
|
||||
game.folderName
|
||||
);
|
||||
|
||||
if (fs.existsSync(folderPath)) {
|
||||
return new Promise((resolve, reject) => {
|
||||
if (!fs.existsSync(folderPath)) {
|
||||
await gameRepository.update(
|
||||
{ id: gameId },
|
||||
{ downloadPath: null, folderName: null }
|
||||
);
|
||||
}
|
||||
|
||||
console.log("folder exists");
|
||||
return new Promise<void>((resolve, reject) => {
|
||||
fs.rm(
|
||||
folderPath,
|
||||
{ recursive: true, force: true, maxRetries: 5, retryDelay: 200 },
|
||||
@ -43,9 +47,14 @@ const deleteGameFolder = async (
|
||||
resolve();
|
||||
}
|
||||
);
|
||||
}).then(async () => {
|
||||
console.log("resolved");
|
||||
await gameRepository.update(
|
||||
{ id: gameId },
|
||||
{ downloadPath: null, folderName: null }
|
||||
);
|
||||
});
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
registerEvent("deleteGameFolder", deleteGameFolder);
|
||||
|
@ -30,6 +30,6 @@ export const getSteamAppDetails = async (
|
||||
})
|
||||
.catch((err) => {
|
||||
logger.error(err, { method: "getSteamAppDetails" });
|
||||
throw new Error(err);
|
||||
return null;
|
||||
});
|
||||
};
|
||||
|
@ -52,7 +52,6 @@ export function useDownload() {
|
||||
|
||||
try {
|
||||
await window.electron.deleteGameFolder(gameId);
|
||||
await window.electron.removeGame(gameId);
|
||||
updateLibrary();
|
||||
} finally {
|
||||
dispatch(removeGameFromDeleting(gameId));
|
||||
|
@ -47,7 +47,11 @@ export function Downloads() {
|
||||
complete: [],
|
||||
};
|
||||
|
||||
const result = library.reduce((prev, next) => {
|
||||
const result = library
|
||||
.filter((game) => {
|
||||
return game.downloadPath;
|
||||
})
|
||||
.reduce((prev, next) => {
|
||||
if (lastPacket?.game.id === next.id) {
|
||||
return { ...prev, downloading: [...prev.downloading, next] };
|
||||
}
|
||||
@ -66,7 +70,7 @@ export function Downloads() {
|
||||
);
|
||||
|
||||
const complete = orderBy(result.complete, (game) =>
|
||||
game.status === "complete" ? 0 : 1
|
||||
game.progress === 1 ? 0 : 1
|
||||
);
|
||||
|
||||
return {
|
||||
|
@ -77,13 +77,11 @@ export function HeroPanelActions() {
|
||||
if (game) {
|
||||
await removeGameFromLibrary(game.id);
|
||||
} else {
|
||||
const gameExecutablePath = await selectGameExecutable();
|
||||
|
||||
await window.electron.addGameToLibrary(
|
||||
objectID!,
|
||||
gameTitle,
|
||||
"steam",
|
||||
gameExecutablePath
|
||||
null
|
||||
);
|
||||
}
|
||||
|
||||
@ -110,11 +108,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 +132,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 +192,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 +224,7 @@ export function HeroPanelActions() {
|
||||
if (game) {
|
||||
return (
|
||||
<>
|
||||
{game?.progress === 1 ? (
|
||||
{game?.progress === 1 && game?.folderName && (
|
||||
<>
|
||||
<BinaryNotFoundModal
|
||||
visible={showBinaryNotFoundModal}
|
||||
@ -243,10 +240,12 @@ export function HeroPanelActions() {
|
||||
{t("install")}
|
||||
</Button>
|
||||
</>
|
||||
) : (
|
||||
toggleGameOnLibraryButton
|
||||
)}
|
||||
|
||||
{game?.progress === 1 && !game?.folderName && showDownloadOptionsButton}
|
||||
|
||||
{game?.progress !== 1 && toggleGameOnLibraryButton}
|
||||
|
||||
{isGameRunning ? (
|
||||
<Button
|
||||
onClick={closeGame}
|
||||
|
Loading…
Reference in New Issue
Block a user