feat: using showItemInFolder to open exe and download paths

This commit is contained in:
Zamitto 2024-06-07 14:03:57 -03:00
parent cead92d900
commit 08eda5573d
7 changed files with 28 additions and 21 deletions

View File

@ -103,9 +103,9 @@
"select_executable": "Select executable",
"no_executable_selected": "No executable selected",
"open_folder": "Open folder",
"open_download_location": "Abrir local de download",
"create_shortcut": "Create shortcut",
"installer_path": "Installer path",
"remove_installer": "Remove installer"
"remove_files": "Remove files"
},
"activation": {
"title": "Activate Hydra",

View File

@ -100,9 +100,9 @@
"select_executable": "Selecionar executável",
"no_executable_selected": "Nenhum executável selecionado",
"open_folder": "Abrir pasta",
"open_download_location": "Abrir local de download",
"create_shortcut": "Criar atalho",
"installer_path": "Caminho do instalador",
"remove_installer": "Remover instalador"
"remove_files": "Remover arquivos"
},
"activation": {
"title": "Ativação",

View File

@ -1,5 +1,4 @@
import { shell } from "electron";
import path from "node:path";
import { gameRepository } from "@main/repository";
import { registerEvent } from "../register-event";
@ -11,12 +10,9 @@ const openGameExecutablePath = async (
where: { id: gameId, isDeleted: false },
});
if (!game || !game.executablePath) return true;
if (!game || !game.executablePath) return;
const gamePath = path.join(game.executablePath, "../");
shell.openPath(gamePath);
return true;
shell.showItemInFolder(game.executablePath);
};
registerEvent("openGameExecutablePath", openGameExecutablePath);

View File

@ -12,14 +12,14 @@ const openGameInstallerPath = async (
where: { id: gameId, isDeleted: false },
});
if (!game || !game.folderName) return true;
if (!game || !game.folderName || !game.downloadPath) return true;
const gamePath = path.join(
game.downloadPath ?? (await getDownloadsPath()),
game.folderName!
);
shell.openPath(gamePath);
shell.showItemInFolder(gamePath);
return true;
};

View File

@ -63,7 +63,7 @@ declare global {
getLibrary: () => Promise<LibraryGame[]>;
openGameInstaller: (gameId: number) => Promise<boolean>;
openGameInstallerPath: (gameId: number) => Promise<boolean>;
openGameExecutablePath: (gameId: number) => Promise<boolean>;
openGameExecutablePath: (gameId: number) => Promise<void>;
openGame: (gameId: number, executablePath: string) => Promise<void>;
closeGame: (gameId: number) => Promise<boolean>;
removeGameFromLibrary: (gameId: number) => Promise<void>;

View File

@ -140,7 +140,7 @@ export function HeroPanelActions() {
setShowGameOptionsModal(true);
}}
theme="outline"
disabled={deleting}
disabled={deleting || isGameRunning}
className={styles.heroPanelAction}
>
<GearIcon />

View File

@ -21,6 +21,8 @@ export function GameOptionsModal({
onClose,
selectGameExecutable,
}: GameOptionsModalProps) {
const { t } = useTranslation("game_details");
const { updateGame, openRepacksModal } = useContext(gameDetailsContext);
const [showDeleteModal, setShowDeleteModal] = useState(false);
@ -30,7 +32,10 @@ export function GameOptionsModal({
const deleting = game ? isGameDeleting(game?.id) : false;
const { t } = useTranslation("game_details");
const { lastPacket } = useDownload();
const isGameDownloading =
game?.status === "active" && lastPacket?.game.id === game?.id;
const handleRemoveGameFromLibrary = async () => {
await removeGameFromLibrary(game.id);
@ -51,6 +56,10 @@ export function GameOptionsModal({
await window.electron.createGameShortcut(game.id);
};
const handleOpenDownloadFolder = async () => {
await window.electron.openGameInstallerPath(game.id);
};
const handleDeleteGame = async () => {
await removeGameInstaller(game.id);
updateGame();
@ -84,12 +93,12 @@ export function GameOptionsModal({
{t("open_download_options")}
</Button>
<Button
onClick={handleCreateShortcut}
onClick={handleOpenDownloadFolder}
style={{ alignSelf: "flex-end" }}
theme="outline"
disabled={deleting || !game.downloadPath}
>
{"Abrir local de download"}
{t("open_download_location")}
</Button>
<Button
onClick={handleCreateShortcut}
@ -129,13 +138,15 @@ export function GameOptionsModal({
</div>
<div className={styles.gameOptionRow}>
<Button
onClick={handleCreateShortcut}
onClick={() => {
setShowDeleteModal(true);
}}
style={{ alignSelf: "flex-end" }}
theme="outline"
disabled={deleting || !game.downloadPath}
disabled={isGameDownloading || deleting || !game.downloadPath}
>
<TrashIcon />
Remover arquivos
{t("remove_files")}
</Button>
<Button
@ -145,7 +156,7 @@ export function GameOptionsModal({
disabled={deleting}
>
<NoEntryIcon />
Remover da biblioteca
{t("remove_from_library")}
</Button>
</div>
</div>