mirror of
https://github.com/hydralauncher/hydra.git
synced 2026-01-11 05:46:17 +00:00
feat: implement archive deletion prompt and translations for confirmation messages
This commit is contained in:
@@ -416,7 +416,11 @@
|
||||
"resume_seeding": "Resume seeding",
|
||||
"options": "Manage",
|
||||
"extract": "Extract files",
|
||||
"extracting": "Extracting files…"
|
||||
"extracting": "Extracting files…",
|
||||
"delete_archive_title": "Would you like to delete {{fileName}}?",
|
||||
"delete_archive_description": "The file has been successfully extracted and it's no longer needed.",
|
||||
"yes": "Yes",
|
||||
"no": "No"
|
||||
},
|
||||
"settings": {
|
||||
"downloads_path": "Downloads path",
|
||||
|
||||
@@ -404,7 +404,11 @@
|
||||
"resume_seeding": "Semear",
|
||||
"options": "Gerenciar",
|
||||
"extract": "Extrair arquivos",
|
||||
"extracting": "Extraindo arquivos…"
|
||||
"extracting": "Extraindo arquivos…",
|
||||
"delete_archive_title": "Deseja deletar {{fileName}}?",
|
||||
"delete_archive_description": "O arquivo foi extraído com sucesso e não é mais necessário.",
|
||||
"yes": "Sim",
|
||||
"no": "Não"
|
||||
},
|
||||
"settings": {
|
||||
"downloads_path": "Diretório dos downloads",
|
||||
|
||||
23
src/main/events/library/delete-archive.ts
Normal file
23
src/main/events/library/delete-archive.ts
Normal file
@@ -0,0 +1,23 @@
|
||||
import fs from "node:fs";
|
||||
|
||||
import { registerEvent } from "../register-event";
|
||||
import { logger } from "@main/services";
|
||||
|
||||
const deleteArchive = async (
|
||||
_event: Electron.IpcMainInvokeEvent,
|
||||
filePath: string
|
||||
) => {
|
||||
try {
|
||||
if (fs.existsSync(filePath)) {
|
||||
await fs.promises.unlink(filePath);
|
||||
logger.info(`Deleted archive: ${filePath}`);
|
||||
return true;
|
||||
}
|
||||
return true;
|
||||
} catch (err) {
|
||||
logger.error(`Failed to delete archive: ${filePath}`, err);
|
||||
return false;
|
||||
}
|
||||
};
|
||||
|
||||
registerEvent("deleteArchive", deleteArchive);
|
||||
@@ -8,6 +8,7 @@ import "./close-game";
|
||||
import "./copy-custom-game-asset";
|
||||
import "./create-game-shortcut";
|
||||
import "./create-steam-shortcut";
|
||||
import "./delete-archive";
|
||||
import "./delete-game-folder";
|
||||
import "./extract-game-download";
|
||||
import "./get-default-wine-prefix-selection-path";
|
||||
|
||||
@@ -116,17 +116,15 @@ export class GameFilesManager {
|
||||
}
|
||||
}
|
||||
|
||||
for (const file of compressedFiles) {
|
||||
const extractionPath = path.join(directoryPath, file);
|
||||
const archivePaths = compressedFiles
|
||||
.map((file) => path.join(directoryPath, file))
|
||||
.filter((archivePath) => fs.existsSync(archivePath));
|
||||
|
||||
try {
|
||||
if (fs.existsSync(extractionPath)) {
|
||||
await fs.promises.unlink(extractionPath);
|
||||
logger.info(`Deleted archive: ${file}`);
|
||||
}
|
||||
} catch (err) {
|
||||
logger.error(`Failed to delete file: ${file}`, err);
|
||||
}
|
||||
if (archivePaths.length > 0) {
|
||||
WindowManager.mainWindow?.webContents.send(
|
||||
"on-archive-deletion-prompt",
|
||||
archivePaths
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -186,12 +184,10 @@ export class GameFilesManager {
|
||||
await this.extractFilesInDirectory(extractionPath);
|
||||
|
||||
if (fs.existsSync(extractionPath) && fs.existsSync(filePath)) {
|
||||
try {
|
||||
await fs.promises.unlink(filePath);
|
||||
logger.info(`Deleted archive: ${download.folderName}`);
|
||||
} catch (err) {
|
||||
logger.error(`Failed to delete file: ${download.folderName}`, err);
|
||||
}
|
||||
WindowManager.mainWindow?.webContents.send(
|
||||
"on-archive-deletion-prompt",
|
||||
[filePath]
|
||||
);
|
||||
}
|
||||
|
||||
await downloadsSublevel.put(this.gameKey, {
|
||||
|
||||
@@ -279,6 +279,17 @@ contextBridge.exposeInMainWorld("electron", {
|
||||
ipcRenderer.on("on-extraction-progress", listener);
|
||||
return () => ipcRenderer.removeListener("on-extraction-progress", listener);
|
||||
},
|
||||
onArchiveDeletionPrompt: (cb: (archivePaths: string[]) => void) => {
|
||||
const listener = (
|
||||
_event: Electron.IpcRendererEvent,
|
||||
archivePaths: string[]
|
||||
) => cb(archivePaths);
|
||||
ipcRenderer.on("on-archive-deletion-prompt", listener);
|
||||
return () =>
|
||||
ipcRenderer.removeListener("on-archive-deletion-prompt", listener);
|
||||
},
|
||||
deleteArchive: (filePath: string) =>
|
||||
ipcRenderer.invoke("deleteArchive", filePath),
|
||||
|
||||
/* Hardware */
|
||||
getDiskFreeSpace: (path: string) =>
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import { useCallback, useEffect, useRef } from "react";
|
||||
import { useCallback, useEffect, useRef, useState } from "react";
|
||||
import { Sidebar, BottomPanel, Header, Toast } from "@renderer/components";
|
||||
|
||||
import {
|
||||
@@ -26,6 +26,7 @@ import { useTranslation } from "react-i18next";
|
||||
import { UserFriendModal } from "./pages/shared-modals/user-friend-modal";
|
||||
import { useSubscription } from "./hooks/use-subscription";
|
||||
import { HydraCloudModal } from "./pages/shared-modals/hydra-cloud/hydra-cloud-modal";
|
||||
import { ArchiveDeletionModal } from "./pages/downloads/archive-deletion-error-modal";
|
||||
|
||||
import {
|
||||
injectCustomCss,
|
||||
@@ -80,6 +81,10 @@ export function App() {
|
||||
|
||||
const { showSuccessToast } = useToast();
|
||||
|
||||
const [showArchiveDeletionModal, setShowArchiveDeletionModal] =
|
||||
useState(false);
|
||||
const [archivePaths, setArchivePaths] = useState<string[]>([]);
|
||||
|
||||
useEffect(() => {
|
||||
Promise.all([
|
||||
levelDBService.get("userPreferences", null, "json"),
|
||||
@@ -193,6 +198,10 @@ export function App() {
|
||||
dispatch(clearExtraction());
|
||||
updateLibrary();
|
||||
}),
|
||||
window.electron.onArchiveDeletionPrompt((paths) => {
|
||||
setArchivePaths(paths);
|
||||
setShowArchiveDeletionModal(true);
|
||||
}),
|
||||
];
|
||||
|
||||
return () => {
|
||||
@@ -290,6 +299,12 @@ export function App() {
|
||||
feature={hydraCloudFeature}
|
||||
/>
|
||||
|
||||
<ArchiveDeletionModal
|
||||
visible={showArchiveDeletionModal}
|
||||
archivePaths={archivePaths}
|
||||
onClose={() => setShowArchiveDeletionModal(false)}
|
||||
/>
|
||||
|
||||
{userDetails && (
|
||||
<UserFriendModal
|
||||
visible={isFriendsModalVisible}
|
||||
|
||||
4
src/renderer/src/declaration.d.ts
vendored
4
src/renderer/src/declaration.d.ts
vendored
@@ -211,6 +211,10 @@ declare global {
|
||||
onExtractionProgress: (
|
||||
cb: (shop: GameShop, objectId: string, progress: number) => void
|
||||
) => () => Electron.IpcRenderer;
|
||||
onArchiveDeletionPrompt: (
|
||||
cb: (archivePaths: string[]) => void
|
||||
) => () => Electron.IpcRenderer;
|
||||
deleteArchive: (filePath: string) => Promise<boolean>;
|
||||
getDefaultWinePrefixSelectionPath: () => Promise<string | null>;
|
||||
createSteamShortcut: (shop: GameShop, objectId: string) => Promise<void>;
|
||||
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { ConfirmationModal } from "@renderer/components";
|
||||
|
||||
interface ArchiveDeletionModalProps {
|
||||
visible: boolean;
|
||||
archivePaths: string[];
|
||||
onClose: () => void;
|
||||
}
|
||||
|
||||
export function ArchiveDeletionModal({
|
||||
visible,
|
||||
archivePaths,
|
||||
onClose,
|
||||
}: Readonly<ArchiveDeletionModalProps>) {
|
||||
const { t } = useTranslation("downloads");
|
||||
|
||||
const fullFileName =
|
||||
archivePaths.length > 0 ? (archivePaths[0].split(/[/\\]/).pop() ?? "") : "";
|
||||
|
||||
const maxLength = 40;
|
||||
const fileName =
|
||||
fullFileName.length > maxLength
|
||||
? `${fullFileName.slice(0, maxLength)}…`
|
||||
: fullFileName;
|
||||
|
||||
const handleConfirm = async () => {
|
||||
for (const archivePath of archivePaths) {
|
||||
await window.electron.deleteArchive(archivePath);
|
||||
}
|
||||
onClose();
|
||||
};
|
||||
|
||||
return (
|
||||
<ConfirmationModal
|
||||
visible={visible}
|
||||
title={t("delete_archive_title", { fileName })}
|
||||
descriptionText={t("delete_archive_description")}
|
||||
confirmButtonLabel={t("yes")}
|
||||
cancelButtonLabel={t("no")}
|
||||
onConfirm={handleConfirm}
|
||||
onClose={onClose}
|
||||
/>
|
||||
);
|
||||
}
|
||||
@@ -538,7 +538,7 @@
|
||||
border-radius: 4px;
|
||||
|
||||
&--extraction {
|
||||
background-color: #4caf50;
|
||||
background-color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -40,11 +40,13 @@ export default function Downloads() {
|
||||
useEffect(() => {
|
||||
window.electron.onSeedingStatus((value) => setSeedingStatus(value));
|
||||
|
||||
const unsubscribe = window.electron.onExtractionComplete(() => {
|
||||
const unsubscribeExtraction = window.electron.onExtractionComplete(() => {
|
||||
updateLibrary();
|
||||
});
|
||||
|
||||
return () => unsubscribe();
|
||||
return () => {
|
||||
unsubscribeExtraction();
|
||||
};
|
||||
}, [updateLibrary]);
|
||||
|
||||
const handleOpenGameInstaller = (shop: GameShop, objectId: string) =>
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
|
||||
&--extraction {
|
||||
&::-webkit-progress-value {
|
||||
background-color: #4caf50;
|
||||
background-color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user