mirror of
https://github.com/hydralauncher/hydra.git
synced 2026-01-21 05:09:39 -03:00
Compare commits
6 Commits
feat/LBX-4
...
feat/LBX-3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2108a523bc | ||
|
|
fbbb2520e0 | ||
|
|
049a989e85 | ||
|
|
88b2581797 | ||
|
|
c9801644ac | ||
|
|
98cfe7be98 |
@@ -1,36 +1,10 @@
|
||||
from flask import Flask, request, jsonify
|
||||
import sys, json, urllib.parse, psutil, socket
|
||||
import sys, json, urllib.parse, psutil
|
||||
from torrent_downloader import TorrentDownloader
|
||||
from http_downloader import HttpDownloader
|
||||
from profile_image_processor import ProfileImageProcessor
|
||||
import libtorrent as lt
|
||||
|
||||
RPC_PORT_MIN = 8080
|
||||
RPC_PORT_MAX = 9000
|
||||
|
||||
def find_available_port(preferred_port, start=RPC_PORT_MIN, end=RPC_PORT_MAX):
|
||||
"""Find an available port, trying the preferred port first."""
|
||||
# Try preferred port first
|
||||
try:
|
||||
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
|
||||
s.bind(('0.0.0.0', preferred_port))
|
||||
return preferred_port
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
# Try ports in range
|
||||
for port in range(start, end + 1):
|
||||
if port == preferred_port:
|
||||
continue
|
||||
try:
|
||||
with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
|
||||
s.bind(('0.0.0.0', port))
|
||||
return port
|
||||
except OSError:
|
||||
continue
|
||||
|
||||
raise RuntimeError(f"No available ports in range {start}-{end}")
|
||||
|
||||
app = Flask(__name__)
|
||||
|
||||
# Retrieve command line arguments
|
||||
@@ -218,7 +192,4 @@ def action():
|
||||
return "", 200
|
||||
|
||||
if __name__ == "__main__":
|
||||
actual_port = find_available_port(int(http_port))
|
||||
# Print port for Node.js to capture - must be flushed immediately
|
||||
print(f"RPC_PORT:{actual_port}", flush=True)
|
||||
app.run(host="0.0.0.0", port=actual_port)
|
||||
app.run(host="0.0.0.0", port=int(http_port))
|
||||
|
||||
@@ -108,7 +108,17 @@
|
||||
"search_results": "Search results",
|
||||
"settings": "Settings",
|
||||
"version_available_install": "Version {{version}} available. Click here to restart and install.",
|
||||
"version_available_download": "Version {{version}} available. Click here to download."
|
||||
"version_available_download": "Version {{version}} available. Click here to download.",
|
||||
"scan_games_tooltip": "Scan PC for installed games",
|
||||
"scan_games_title": "Scan PC for installed games",
|
||||
"scan_games_description": "This will scan your disks for known game executables. This may take several minutes.",
|
||||
"scan_games_start": "Start Scan",
|
||||
"scan_games_cancel": "Cancel",
|
||||
"scan_games_result": "Found {{found}} of {{total}} games without executable path",
|
||||
"scan_games_no_results": "We couldn't find any installed games.",
|
||||
"scan_games_in_progress": "Scanning your disks for installed games...",
|
||||
"scan_games_close": "Close",
|
||||
"scan_games_scan_again": "Scan Again"
|
||||
},
|
||||
"bottom_panel": {
|
||||
"no_downloads_in_progress": "No downloads in progress",
|
||||
@@ -619,7 +629,11 @@
|
||||
"game_extracted": "{{title}} extracted successfully",
|
||||
"friend_started_playing_game": "{{displayName}} started playing a game",
|
||||
"test_achievement_notification_title": "This is a test notification",
|
||||
"test_achievement_notification_description": "Pretty cool, huh?"
|
||||
"test_achievement_notification_description": "Pretty cool, huh?",
|
||||
"scan_games_complete_title": "Scanning for games finished successfully",
|
||||
"scan_games_complete_description": "Found {{count}} games without executable path set",
|
||||
"scan_games_no_results_title": "Scanning for games finished",
|
||||
"scan_games_no_results_description": "No installed games were found"
|
||||
},
|
||||
"system_tray": {
|
||||
"open": "Open Hydra",
|
||||
|
||||
@@ -24,6 +24,7 @@ import "./remove-game-from-favorites";
|
||||
import "./remove-game-from-library";
|
||||
import "./remove-game";
|
||||
import "./reset-game-achievements";
|
||||
import "./scan-installed-games";
|
||||
import "./select-game-wine-prefix";
|
||||
import "./toggle-automatic-cloud-sync";
|
||||
import "./toggle-game-pin";
|
||||
|
||||
143
src/main/events/library/scan-installed-games.ts
Normal file
143
src/main/events/library/scan-installed-games.ts
Normal file
@@ -0,0 +1,143 @@
|
||||
import path from "node:path";
|
||||
import fs from "node:fs";
|
||||
import { t } from "i18next";
|
||||
import { registerEvent } from "../register-event";
|
||||
import { gamesSublevel } from "@main/level";
|
||||
import {
|
||||
GameExecutables,
|
||||
LocalNotificationManager,
|
||||
logger,
|
||||
WindowManager,
|
||||
} from "@main/services";
|
||||
|
||||
const SCAN_DIRECTORIES = [
|
||||
String.raw`C:\Games`,
|
||||
String.raw`D:\Games`,
|
||||
String.raw`C:\Program Files (x86)\Steam\steamapps\common`,
|
||||
String.raw`C:\Program Files\Steam\steamapps\common`,
|
||||
String.raw`C:\Program Files (x86)\DODI-Repacks`,
|
||||
];
|
||||
|
||||
interface FoundGame {
|
||||
title: string;
|
||||
executablePath: string;
|
||||
}
|
||||
|
||||
interface ScanResult {
|
||||
foundGames: FoundGame[];
|
||||
total: number;
|
||||
}
|
||||
|
||||
async function searchInDirectories(
|
||||
executableNames: Set<string>
|
||||
): Promise<string | null> {
|
||||
for (const scanDir of SCAN_DIRECTORIES) {
|
||||
if (!fs.existsSync(scanDir)) continue;
|
||||
|
||||
const foundPath = await findExecutableInFolder(scanDir, executableNames);
|
||||
if (foundPath) return foundPath;
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
async function publishScanNotification(foundCount: number): Promise<void> {
|
||||
const hasFoundGames = foundCount > 0;
|
||||
|
||||
await LocalNotificationManager.createNotification(
|
||||
"SCAN_GAMES_COMPLETE",
|
||||
t(
|
||||
hasFoundGames
|
||||
? "scan_games_complete_title"
|
||||
: "scan_games_no_results_title",
|
||||
{ ns: "notifications" }
|
||||
),
|
||||
t(
|
||||
hasFoundGames
|
||||
? "scan_games_complete_description"
|
||||
: "scan_games_no_results_description",
|
||||
{ ns: "notifications", count: foundCount }
|
||||
),
|
||||
{ url: "/library?openScanModal=true" }
|
||||
);
|
||||
}
|
||||
|
||||
const scanInstalledGames = async (
|
||||
_event: Electron.IpcMainInvokeEvent
|
||||
): Promise<ScanResult> => {
|
||||
const games = await gamesSublevel
|
||||
.iterator()
|
||||
.all()
|
||||
.then((results) =>
|
||||
results
|
||||
.filter(
|
||||
([_key, game]) => game.isDeleted === false && game.shop !== "custom"
|
||||
)
|
||||
.map(([key, game]) => ({ key, game }))
|
||||
);
|
||||
|
||||
const foundGames: FoundGame[] = [];
|
||||
const gamesToScan = games.filter((g) => !g.game.executablePath);
|
||||
|
||||
for (const { key, game } of gamesToScan) {
|
||||
const executableNames = GameExecutables.getExecutablesForGame(
|
||||
game.objectId
|
||||
);
|
||||
|
||||
if (!executableNames || executableNames.length === 0) continue;
|
||||
|
||||
const normalizedNames = new Set(
|
||||
executableNames.map((name) => name.toLowerCase())
|
||||
);
|
||||
|
||||
const foundPath = await searchInDirectories(normalizedNames);
|
||||
|
||||
if (foundPath) {
|
||||
await gamesSublevel.put(key, { ...game, executablePath: foundPath });
|
||||
|
||||
logger.info(
|
||||
`[ScanInstalledGames] Found executable for ${game.objectId}: ${foundPath}`
|
||||
);
|
||||
|
||||
foundGames.push({ title: game.title, executablePath: foundPath });
|
||||
}
|
||||
}
|
||||
|
||||
WindowManager.mainWindow?.webContents.send("on-library-batch-complete");
|
||||
await publishScanNotification(foundGames.length);
|
||||
|
||||
return { foundGames, total: gamesToScan.length };
|
||||
};
|
||||
|
||||
async function findExecutableInFolder(
|
||||
folderPath: string,
|
||||
executableNames: Set<string>
|
||||
): Promise<string | null> {
|
||||
try {
|
||||
const entries = await fs.promises.readdir(folderPath, {
|
||||
withFileTypes: true,
|
||||
recursive: true,
|
||||
});
|
||||
|
||||
for (const entry of entries) {
|
||||
if (!entry.isFile()) continue;
|
||||
|
||||
const fileName = entry.name.toLowerCase();
|
||||
|
||||
if (executableNames.has(fileName)) {
|
||||
const parentPath =
|
||||
"parentPath" in entry ? entry.parentPath : folderPath;
|
||||
|
||||
return path.join(parentPath, entry.name);
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
logger.error(
|
||||
`[ScanInstalledGames] Error reading folder ${folderPath}:`,
|
||||
err
|
||||
);
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
registerEvent("scanInstalledGames", scanInstalledGames);
|
||||
@@ -362,6 +362,11 @@ export class DownloadManager {
|
||||
|
||||
if (download.automaticallyExtract) {
|
||||
this.handleExtraction(download, game);
|
||||
} else {
|
||||
// For downloads without extraction (e.g., torrents with ready-to-play files),
|
||||
// search for executable in the download folder
|
||||
const gameFilesManager = new GameFilesManager(game.shop, game.objectId);
|
||||
gameFilesManager.searchAndBindExecutable();
|
||||
}
|
||||
|
||||
await this.processNextQueuedDownload();
|
||||
|
||||
13
src/main/services/game-executables.ts
Normal file
13
src/main/services/game-executables.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
import { gameExecutables } from "./process-watcher";
|
||||
|
||||
export class GameExecutables {
|
||||
static getExecutablesForGame(objectId: string): string[] | null {
|
||||
const executables = gameExecutables[objectId];
|
||||
|
||||
if (!executables || executables.length === 0) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return executables.map((exe) => exe.exe);
|
||||
}
|
||||
}
|
||||
@@ -7,6 +7,7 @@ import { SevenZip, ExtractionProgress } from "./7zip";
|
||||
import { WindowManager } from "./window-manager";
|
||||
import { publishExtractionCompleteNotification } from "./notifications";
|
||||
import { logger } from "./logger";
|
||||
import { GameExecutables } from "./game-executables";
|
||||
|
||||
const PROGRESS_THROTTLE_MS = 1000;
|
||||
|
||||
@@ -151,6 +152,100 @@ export class GameFilesManager {
|
||||
if (publishNotification && game) {
|
||||
publishExtractionCompleteNotification(game);
|
||||
}
|
||||
|
||||
await this.searchAndBindExecutable();
|
||||
}
|
||||
|
||||
async searchAndBindExecutable(): Promise<void> {
|
||||
try {
|
||||
const [download, game] = await Promise.all([
|
||||
downloadsSublevel.get(this.gameKey),
|
||||
gamesSublevel.get(this.gameKey),
|
||||
]);
|
||||
|
||||
if (!download || !game || game.executablePath) {
|
||||
return;
|
||||
}
|
||||
|
||||
const executableNames = GameExecutables.getExecutablesForGame(
|
||||
this.objectId
|
||||
);
|
||||
|
||||
if (!executableNames || executableNames.length === 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
if (!download.folderName) {
|
||||
return;
|
||||
}
|
||||
|
||||
const gameFolderPath = path.join(
|
||||
download.downloadPath,
|
||||
download.folderName
|
||||
);
|
||||
|
||||
if (!fs.existsSync(gameFolderPath)) {
|
||||
return;
|
||||
}
|
||||
|
||||
const foundExePath = await this.findExecutableInFolder(
|
||||
gameFolderPath,
|
||||
executableNames
|
||||
);
|
||||
|
||||
if (foundExePath) {
|
||||
logger.info(
|
||||
`[GameFilesManager] Auto-detected executable for ${this.objectId}: ${foundExePath}`
|
||||
);
|
||||
|
||||
await gamesSublevel.put(this.gameKey, {
|
||||
...game,
|
||||
executablePath: foundExePath,
|
||||
});
|
||||
|
||||
WindowManager.mainWindow?.webContents.send("on-library-batch-complete");
|
||||
}
|
||||
} catch (err) {
|
||||
logger.error(
|
||||
`[GameFilesManager] Error searching for executable: ${this.objectId}`,
|
||||
err
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private async findExecutableInFolder(
|
||||
folderPath: string,
|
||||
executableNames: string[]
|
||||
): Promise<string | null> {
|
||||
const normalizedNames = new Set(
|
||||
executableNames.map((name) => name.toLowerCase())
|
||||
);
|
||||
|
||||
try {
|
||||
const entries = await fs.promises.readdir(folderPath, {
|
||||
withFileTypes: true,
|
||||
recursive: true,
|
||||
});
|
||||
|
||||
for (const entry of entries) {
|
||||
if (!entry.isFile()) continue;
|
||||
|
||||
const fileName = entry.name.toLowerCase();
|
||||
|
||||
if (normalizedNames.has(fileName)) {
|
||||
const parentPath =
|
||||
"parentPath" in entry
|
||||
? entry.parentPath
|
||||
: (entry as unknown as { path?: string }).path || folderPath;
|
||||
|
||||
return path.join(parentPath, entry.name);
|
||||
}
|
||||
}
|
||||
} catch {
|
||||
// Silently fail if folder cannot be read
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
async extractDownloadedFile() {
|
||||
|
||||
@@ -10,6 +10,7 @@ export * from "./ludusavi";
|
||||
export * from "./cloud-sync";
|
||||
export * from "./7zip";
|
||||
export * from "./game-files-manager";
|
||||
export * from "./game-executables";
|
||||
export * from "./common-redist-manager";
|
||||
export * from "./aria2";
|
||||
export * from "./ws";
|
||||
|
||||
@@ -69,7 +69,7 @@ const getGameExecutables = async () => {
|
||||
return gameExecutables;
|
||||
};
|
||||
|
||||
const gameExecutables = await getGameExecutables();
|
||||
export const gameExecutables = await getGameExecutables();
|
||||
|
||||
const findGamePathByProcess = async (
|
||||
processMap: Map<string, Set<string>>,
|
||||
|
||||
@@ -27,19 +27,11 @@ const binaryNameByPlatform: Partial<Record<NodeJS.Platform, string>> = {
|
||||
win32: "hydra-python-rpc.exe",
|
||||
};
|
||||
|
||||
const RPC_PORT_PREFIX = "RPC_PORT:";
|
||||
const PORT_DISCOVERY_TIMEOUT_MS = 30000;
|
||||
const HEALTH_CHECK_INTERVAL_MS = 100;
|
||||
const HEALTH_CHECK_TIMEOUT_MS = 10000;
|
||||
|
||||
export class PythonRPC {
|
||||
public static readonly BITTORRENT_PORT = "5881";
|
||||
public static readonly DEFAULT_RPC_PORT = "8084";
|
||||
|
||||
private static currentPort: string = this.DEFAULT_RPC_PORT;
|
||||
|
||||
public static readonly RPC_PORT = "8084";
|
||||
public static readonly rpc = axios.create({
|
||||
baseURL: `http://localhost:${this.DEFAULT_RPC_PORT}`,
|
||||
baseURL: `http://localhost:${this.RPC_PORT}`,
|
||||
httpAgent: new http.Agent({
|
||||
family: 4, // Force IPv4
|
||||
}),
|
||||
@@ -70,102 +62,6 @@ export class PythonRPC {
|
||||
return newPassword;
|
||||
}
|
||||
|
||||
private static updateBaseURL(port: string) {
|
||||
this.currentPort = port;
|
||||
this.rpc.defaults.baseURL = `http://localhost:${port}`;
|
||||
pythonRpcLogger.log(`RPC baseURL updated to port ${port}`);
|
||||
}
|
||||
|
||||
private static parsePortFromStdout(data: string): string | null {
|
||||
const lines = data.split("\n");
|
||||
for (const line of lines) {
|
||||
if (line.startsWith(RPC_PORT_PREFIX)) {
|
||||
return line.slice(RPC_PORT_PREFIX.length).trim();
|
||||
}
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static async waitForHealthCheck(): Promise<void> {
|
||||
const startTime = Date.now();
|
||||
|
||||
while (Date.now() - startTime < HEALTH_CHECK_TIMEOUT_MS) {
|
||||
try {
|
||||
const response = await this.rpc.get("/healthcheck", { timeout: 1000 });
|
||||
if (response.status === 200) {
|
||||
pythonRpcLogger.log("RPC health check passed");
|
||||
return;
|
||||
}
|
||||
} catch {
|
||||
// Server not ready yet, continue polling
|
||||
}
|
||||
await new Promise((resolve) =>
|
||||
setTimeout(resolve, HEALTH_CHECK_INTERVAL_MS)
|
||||
);
|
||||
}
|
||||
|
||||
throw new Error("RPC health check timed out");
|
||||
}
|
||||
|
||||
private static waitForPort(
|
||||
childProcess: cp.ChildProcess
|
||||
): Promise<string | null> {
|
||||
return new Promise((resolve, reject) => {
|
||||
let resolved = false;
|
||||
let stdoutBuffer = "";
|
||||
|
||||
const timeout = setTimeout(() => {
|
||||
if (!resolved) {
|
||||
resolved = true;
|
||||
reject(
|
||||
new Error(
|
||||
`Port discovery timed out after ${PORT_DISCOVERY_TIMEOUT_MS}ms`
|
||||
)
|
||||
);
|
||||
}
|
||||
}, PORT_DISCOVERY_TIMEOUT_MS);
|
||||
|
||||
const cleanup = () => {
|
||||
clearTimeout(timeout);
|
||||
};
|
||||
|
||||
if (childProcess.stdout) {
|
||||
childProcess.stdout.setEncoding("utf-8");
|
||||
childProcess.stdout.on("data", (data: string) => {
|
||||
stdoutBuffer += data;
|
||||
pythonRpcLogger.log(data);
|
||||
|
||||
const port = this.parsePortFromStdout(stdoutBuffer);
|
||||
if (port && !resolved) {
|
||||
resolved = true;
|
||||
cleanup();
|
||||
resolve(port);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
childProcess.on("error", (err) => {
|
||||
if (!resolved) {
|
||||
resolved = true;
|
||||
cleanup();
|
||||
reject(err);
|
||||
}
|
||||
});
|
||||
|
||||
childProcess.on("exit", (code) => {
|
||||
if (!resolved) {
|
||||
resolved = true;
|
||||
cleanup();
|
||||
if (code === 0) {
|
||||
resolve(null);
|
||||
} else {
|
||||
reject(new Error(`Python RPC process exited with code ${code}`));
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
public static async spawn(
|
||||
initialDownload?: GamePayload,
|
||||
initialSeeding?: GamePayload[]
|
||||
@@ -174,14 +70,12 @@ export class PythonRPC {
|
||||
|
||||
const commonArgs = [
|
||||
this.BITTORRENT_PORT,
|
||||
this.DEFAULT_RPC_PORT,
|
||||
this.RPC_PORT,
|
||||
rpcPassword,
|
||||
initialDownload ? JSON.stringify(initialDownload) : "",
|
||||
initialSeeding ? JSON.stringify(initialSeeding) : "",
|
||||
];
|
||||
|
||||
let childProcess: cp.ChildProcess;
|
||||
|
||||
if (app.isPackaged) {
|
||||
const binaryName = binaryNameByPlatform[process.platform]!;
|
||||
const binaryPath = path.join(
|
||||
@@ -197,13 +91,16 @@ export class PythonRPC {
|
||||
);
|
||||
|
||||
app.quit();
|
||||
return;
|
||||
}
|
||||
|
||||
childProcess = cp.spawn(binaryPath, commonArgs, {
|
||||
const childProcess = cp.spawn(binaryPath, commonArgs, {
|
||||
windowsHide: true,
|
||||
stdio: ["inherit", "pipe", "pipe"],
|
||||
stdio: ["inherit", "inherit"],
|
||||
});
|
||||
|
||||
this.logStderr(childProcess.stderr);
|
||||
|
||||
this.pythonProcess = childProcess;
|
||||
} else {
|
||||
const scriptPath = path.join(
|
||||
__dirname,
|
||||
@@ -213,44 +110,16 @@ export class PythonRPC {
|
||||
"main.py"
|
||||
);
|
||||
|
||||
childProcess = cp.spawn("python", [scriptPath, ...commonArgs], {
|
||||
stdio: ["inherit", "pipe", "pipe"],
|
||||
const childProcess = cp.spawn("python", [scriptPath, ...commonArgs], {
|
||||
stdio: ["inherit", "inherit"],
|
||||
});
|
||||
|
||||
this.logStderr(childProcess.stderr);
|
||||
|
||||
this.pythonProcess = childProcess;
|
||||
}
|
||||
|
||||
this.logStderr(childProcess.stderr);
|
||||
this.pythonProcess = childProcess;
|
||||
|
||||
try {
|
||||
const port = await this.waitForPort(childProcess);
|
||||
|
||||
if (port) {
|
||||
this.updateBaseURL(port);
|
||||
} else {
|
||||
pythonRpcLogger.log(
|
||||
`No port received, using default port ${this.DEFAULT_RPC_PORT}`
|
||||
);
|
||||
this.updateBaseURL(this.DEFAULT_RPC_PORT);
|
||||
}
|
||||
|
||||
this.rpc.defaults.headers.common["x-hydra-rpc-password"] = rpcPassword;
|
||||
|
||||
await this.waitForHealthCheck();
|
||||
|
||||
pythonRpcLogger.log(
|
||||
`Python RPC started successfully on port ${this.currentPort}`
|
||||
);
|
||||
} catch (err) {
|
||||
pythonRpcLogger.log(`Failed to start Python RPC: ${err}`);
|
||||
|
||||
dialog.showErrorBox(
|
||||
"RPC Error",
|
||||
`Failed to start download service. ${err instanceof Error ? err.message : String(err)}\n\nPlease ensure no other application is using ports 8080-9000 and try restarting Hydra.`
|
||||
);
|
||||
|
||||
this.kill();
|
||||
throw err;
|
||||
}
|
||||
this.rpc.defaults.headers.common["x-hydra-rpc-password"] = rpcPassword;
|
||||
}
|
||||
|
||||
public static kill() {
|
||||
|
||||
@@ -241,6 +241,7 @@ contextBridge.exposeInMainWorld("electron", {
|
||||
ipcRenderer.invoke("changeGamePlayTime", shop, objectId, playtime),
|
||||
extractGameDownload: (shop: GameShop, objectId: string) =>
|
||||
ipcRenderer.invoke("extractGameDownload", shop, objectId),
|
||||
scanInstalledGames: () => ipcRenderer.invoke("scanInstalledGames"),
|
||||
getDefaultWinePrefixSelectionPath: () =>
|
||||
ipcRenderer.invoke("getDefaultWinePrefixSelectionPath"),
|
||||
createSteamShortcut: (shop: GameShop, objectId: string) =>
|
||||
|
||||
@@ -61,10 +61,26 @@
|
||||
cursor: pointer;
|
||||
transition: all ease 0.2s;
|
||||
padding: globals.$spacing-unit;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
||||
&:hover {
|
||||
color: #dadbe1;
|
||||
}
|
||||
|
||||
&--scanning svg {
|
||||
animation: spin 2s linear infinite;
|
||||
}
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
from {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
&__section {
|
||||
|
||||
@@ -1,7 +1,13 @@
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { useEffect, useMemo, useRef, useState } from "react";
|
||||
import { useLocation, useNavigate } from "react-router-dom";
|
||||
import { ArrowLeftIcon, SearchIcon, XIcon } from "@primer/octicons-react";
|
||||
import { useEffect, useId, useMemo, useRef, useState } from "react";
|
||||
import { useLocation, useNavigate, useSearchParams } from "react-router-dom";
|
||||
import {
|
||||
ArrowLeftIcon,
|
||||
SearchIcon,
|
||||
SyncIcon,
|
||||
XIcon,
|
||||
} from "@primer/octicons-react";
|
||||
import { Tooltip } from "react-tooltip";
|
||||
|
||||
import {
|
||||
useAppDispatch,
|
||||
@@ -12,6 +18,7 @@ import {
|
||||
|
||||
import "./header.scss";
|
||||
import { AutoUpdateSubHeader } from "./auto-update-sub-header";
|
||||
import { ScanGamesModal } from "./scan-games-modal";
|
||||
import { setFilters, setLibrarySearchQuery } from "@renderer/features";
|
||||
import cn from "classnames";
|
||||
import { SearchDropdown } from "@renderer/components";
|
||||
@@ -29,9 +36,11 @@ const pathTitle: Record<string, string> = {
|
||||
export function Header() {
|
||||
const inputRef = useRef<HTMLInputElement>(null);
|
||||
const searchContainerRef = useRef<HTMLDivElement>(null);
|
||||
const scanButtonTooltipId = useId();
|
||||
|
||||
const navigate = useNavigate();
|
||||
const location = useLocation();
|
||||
const [searchParams, setSearchParams] = useSearchParams();
|
||||
|
||||
const { headerTitle, draggingDisabled } = useAppSelector(
|
||||
(state) => state.window
|
||||
@@ -61,6 +70,12 @@ export function Header() {
|
||||
x: 0,
|
||||
y: 0,
|
||||
});
|
||||
const [showScanModal, setShowScanModal] = useState(false);
|
||||
const [isScanning, setIsScanning] = useState(false);
|
||||
const [scanResult, setScanResult] = useState<{
|
||||
foundGames: { title: string; executablePath: string }[];
|
||||
total: number;
|
||||
} | null>(null);
|
||||
|
||||
const { t } = useTranslation("header");
|
||||
|
||||
@@ -224,6 +239,25 @@ export function Header() {
|
||||
setActiveIndex(-1);
|
||||
};
|
||||
|
||||
const handleStartScan = async () => {
|
||||
if (isScanning) return;
|
||||
|
||||
setIsScanning(true);
|
||||
setScanResult(null);
|
||||
setShowScanModal(false);
|
||||
|
||||
try {
|
||||
const result = await window.electron.scanInstalledGames();
|
||||
setScanResult(result);
|
||||
} finally {
|
||||
setIsScanning(false);
|
||||
}
|
||||
};
|
||||
|
||||
const handleClearScanResult = () => {
|
||||
setScanResult(null);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (!isDropdownVisible) return;
|
||||
|
||||
@@ -235,6 +269,14 @@ export function Header() {
|
||||
return () => window.removeEventListener("resize", handleResize);
|
||||
}, [isDropdownVisible]);
|
||||
|
||||
useEffect(() => {
|
||||
if (searchParams.get("openScanModal") === "true") {
|
||||
setShowScanModal(true);
|
||||
searchParams.delete("openScanModal");
|
||||
setSearchParams(searchParams, { replace: true });
|
||||
}
|
||||
}, [searchParams, setSearchParams]);
|
||||
|
||||
return (
|
||||
<>
|
||||
<header
|
||||
@@ -265,6 +307,21 @@ export function Header() {
|
||||
</section>
|
||||
|
||||
<section className="header__section">
|
||||
{isOnLibraryPage && window.electron.platform === "win32" && (
|
||||
<button
|
||||
type="button"
|
||||
className={cn("header__action-button", {
|
||||
"header__action-button--scanning": isScanning,
|
||||
})}
|
||||
onClick={() => setShowScanModal(true)}
|
||||
data-tooltip-id={scanButtonTooltipId}
|
||||
data-tooltip-content={t("scan_games_tooltip")}
|
||||
data-tooltip-place="bottom"
|
||||
>
|
||||
<SyncIcon size={16} />
|
||||
</button>
|
||||
)}
|
||||
|
||||
<div
|
||||
ref={searchContainerRef}
|
||||
className={cn("header__search", {
|
||||
@@ -304,6 +361,11 @@ export function Header() {
|
||||
</div>
|
||||
</section>
|
||||
</header>
|
||||
|
||||
{isOnLibraryPage && window.electron.platform === "win32" && (
|
||||
<Tooltip id={scanButtonTooltipId} style={{ zIndex: 1 }} />
|
||||
)}
|
||||
|
||||
<AutoUpdateSubHeader />
|
||||
|
||||
<SearchDropdown
|
||||
@@ -327,6 +389,15 @@ export function Header() {
|
||||
currentQuery={searchValue}
|
||||
searchContainerRef={searchContainerRef}
|
||||
/>
|
||||
|
||||
<ScanGamesModal
|
||||
visible={showScanModal}
|
||||
onClose={() => setShowScanModal(false)}
|
||||
isScanning={isScanning}
|
||||
scanResult={scanResult}
|
||||
onStartScan={handleStartScan}
|
||||
onClearResult={handleClearScanResult}
|
||||
/>
|
||||
</>
|
||||
);
|
||||
}
|
||||
|
||||
107
src/renderer/src/components/header/scan-games-modal.scss
Normal file
107
src/renderer/src/components/header/scan-games-modal.scss
Normal file
@@ -0,0 +1,107 @@
|
||||
@use "../../scss/globals.scss";
|
||||
|
||||
.scan-games-modal {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: calc(globals.$spacing-unit * 3);
|
||||
min-width: 400px;
|
||||
|
||||
&__description {
|
||||
color: globals.$muted-color;
|
||||
font-size: 14px;
|
||||
line-height: 1.5;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
&__results {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: calc(globals.$spacing-unit * 2);
|
||||
}
|
||||
|
||||
&__result {
|
||||
color: globals.$body-color;
|
||||
font-size: 14px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
&__no-results {
|
||||
color: globals.$muted-color;
|
||||
font-size: 14px;
|
||||
margin: 0;
|
||||
text-align: center;
|
||||
padding: calc(globals.$spacing-unit * 2) 0;
|
||||
}
|
||||
|
||||
&__scanning {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
gap: calc(globals.$spacing-unit * 2);
|
||||
padding: calc(globals.$spacing-unit * 3) 0;
|
||||
}
|
||||
|
||||
&__spinner {
|
||||
color: globals.$muted-color;
|
||||
animation: spin 2s linear infinite;
|
||||
}
|
||||
|
||||
&__scanning-text {
|
||||
color: globals.$muted-color;
|
||||
font-size: 14px;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
@keyframes spin {
|
||||
from {
|
||||
transform: rotate(0deg);
|
||||
}
|
||||
to {
|
||||
transform: rotate(360deg);
|
||||
}
|
||||
}
|
||||
|
||||
&__games-list {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
max-height: 200px;
|
||||
overflow-y: auto;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: globals.$spacing-unit;
|
||||
background-color: globals.$dark-background-color;
|
||||
border-radius: 4px;
|
||||
padding: calc(globals.$spacing-unit * 2);
|
||||
}
|
||||
|
||||
&__game-item {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 4px;
|
||||
padding-bottom: globals.$spacing-unit;
|
||||
border-bottom: 1px solid globals.$border-color;
|
||||
|
||||
&:last-child {
|
||||
border-bottom: none;
|
||||
padding-bottom: 0;
|
||||
}
|
||||
}
|
||||
|
||||
&__game-title {
|
||||
color: globals.$body-color;
|
||||
font-size: 14px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
&__game-path {
|
||||
color: globals.$muted-color;
|
||||
font-size: 12px;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
&__actions {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: calc(globals.$spacing-unit * 2);
|
||||
}
|
||||
}
|
||||
126
src/renderer/src/components/header/scan-games-modal.tsx
Normal file
126
src/renderer/src/components/header/scan-games-modal.tsx
Normal file
@@ -0,0 +1,126 @@
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { SyncIcon } from "@primer/octicons-react";
|
||||
|
||||
import { Button, Modal } from "@renderer/components";
|
||||
|
||||
import "./scan-games-modal.scss";
|
||||
|
||||
interface FoundGame {
|
||||
title: string;
|
||||
executablePath: string;
|
||||
}
|
||||
|
||||
interface ScanResult {
|
||||
foundGames: FoundGame[];
|
||||
total: number;
|
||||
}
|
||||
|
||||
export interface ScanGamesModalProps {
|
||||
visible: boolean;
|
||||
onClose: () => void;
|
||||
isScanning: boolean;
|
||||
scanResult: ScanResult | null;
|
||||
onStartScan: () => void;
|
||||
onClearResult: () => void;
|
||||
}
|
||||
|
||||
export function ScanGamesModal({
|
||||
visible,
|
||||
onClose,
|
||||
isScanning,
|
||||
scanResult,
|
||||
onStartScan,
|
||||
onClearResult,
|
||||
}: Readonly<ScanGamesModalProps>) {
|
||||
const { t } = useTranslation("header");
|
||||
|
||||
const handleClose = () => {
|
||||
onClose();
|
||||
};
|
||||
|
||||
const handleStartScan = () => {
|
||||
onStartScan();
|
||||
};
|
||||
|
||||
const handleScanAgain = () => {
|
||||
onClearResult();
|
||||
onStartScan();
|
||||
};
|
||||
|
||||
return (
|
||||
<Modal
|
||||
visible={visible}
|
||||
title={t("scan_games_title")}
|
||||
onClose={handleClose}
|
||||
clickOutsideToClose={!isScanning}
|
||||
>
|
||||
<div className="scan-games-modal">
|
||||
{!scanResult && !isScanning && (
|
||||
<p className="scan-games-modal__description">
|
||||
{t("scan_games_description")}
|
||||
</p>
|
||||
)}
|
||||
|
||||
{isScanning && !scanResult && (
|
||||
<div className="scan-games-modal__scanning">
|
||||
<SyncIcon size={24} className="scan-games-modal__spinner" />
|
||||
<p className="scan-games-modal__scanning-text">
|
||||
{t("scan_games_in_progress")}
|
||||
</p>
|
||||
</div>
|
||||
)}
|
||||
|
||||
{scanResult && (
|
||||
<div className="scan-games-modal__results">
|
||||
{scanResult.foundGames.length > 0 ? (
|
||||
<>
|
||||
<p className="scan-games-modal__result">
|
||||
{t("scan_games_result", {
|
||||
found: scanResult.foundGames.length,
|
||||
total: scanResult.total,
|
||||
})}
|
||||
</p>
|
||||
|
||||
<ul className="scan-games-modal__games-list">
|
||||
{scanResult.foundGames.map((game) => (
|
||||
<li
|
||||
key={game.executablePath}
|
||||
className="scan-games-modal__game-item"
|
||||
>
|
||||
<span className="scan-games-modal__game-title">
|
||||
{game.title}
|
||||
</span>
|
||||
<span className="scan-games-modal__game-path">
|
||||
{game.executablePath}
|
||||
</span>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</>
|
||||
) : (
|
||||
<p className="scan-games-modal__no-results">
|
||||
{t("scan_games_no_results")}
|
||||
</p>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
|
||||
<div className="scan-games-modal__actions">
|
||||
<Button theme="outline" onClick={handleClose}>
|
||||
{scanResult ? t("scan_games_close") : t("scan_games_cancel")}
|
||||
</Button>
|
||||
{!scanResult && (
|
||||
<Button onClick={handleStartScan} disabled={isScanning}>
|
||||
{t("scan_games_start")}
|
||||
</Button>
|
||||
)}
|
||||
{scanResult && (
|
||||
<Button onClick={handleScanAgain}>
|
||||
{t("scan_games_scan_again")}
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</Modal>
|
||||
);
|
||||
}
|
||||
@@ -225,6 +225,16 @@ export function GameDetailsContextProvider({
|
||||
};
|
||||
}, [game?.id, isGameRunning, updateGame]);
|
||||
|
||||
useEffect(() => {
|
||||
const unsubscribe = window.electron.onLibraryBatchComplete(() => {
|
||||
updateGame();
|
||||
});
|
||||
|
||||
return () => {
|
||||
unsubscribe();
|
||||
};
|
||||
}, [updateGame]);
|
||||
|
||||
useEffect(() => {
|
||||
const handler = (ev: Event) => {
|
||||
try {
|
||||
|
||||
4
src/renderer/src/declaration.d.ts
vendored
4
src/renderer/src/declaration.d.ts
vendored
@@ -211,6 +211,10 @@ declare global {
|
||||
minimized: boolean;
|
||||
}) => Promise<void>;
|
||||
extractGameDownload: (shop: GameShop, objectId: string) => Promise<boolean>;
|
||||
scanInstalledGames: () => Promise<{
|
||||
foundGames: { title: string; executablePath: string }[];
|
||||
total: number;
|
||||
}>;
|
||||
onExtractionComplete: (
|
||||
cb: (shop: GameShop, objectId: string) => void
|
||||
) => () => Electron.IpcRenderer;
|
||||
|
||||
@@ -58,6 +58,8 @@ export function LocalNotificationItem({
|
||||
return <SyncIcon size={24} />;
|
||||
case "ACHIEVEMENT_UNLOCKED":
|
||||
return <TrophyIcon size={24} />;
|
||||
case "SCAN_GAMES_COMPLETE":
|
||||
return <SyncIcon size={24} />;
|
||||
default:
|
||||
return <DownloadIcon size={24} />;
|
||||
}
|
||||
|
||||
@@ -330,7 +330,8 @@ export type LocalNotificationType =
|
||||
| "EXTRACTION_COMPLETE"
|
||||
| "DOWNLOAD_COMPLETE"
|
||||
| "UPDATE_AVAILABLE"
|
||||
| "ACHIEVEMENT_UNLOCKED";
|
||||
| "ACHIEVEMENT_UNLOCKED"
|
||||
| "SCAN_GAMES_COMPLETE";
|
||||
|
||||
export interface Notification {
|
||||
id: string;
|
||||
|
||||
Reference in New Issue
Block a user