mirror of
https://github.com/hydralauncher/hydra.git
synced 2025-03-09 15:40:26 +00:00
fix: linux game tracking and closed button
This commit is contained in:
parent
ee4639e041
commit
7785d42021
5 changed files with 41 additions and 13 deletions
1
.python-version
Normal file
1
.python-version
Normal file
|
@ -0,0 +1 @@
|
||||||
|
3.9.20
|
|
@ -24,7 +24,11 @@ const closeGame = async (
|
||||||
if (!game) return;
|
if (!game) return;
|
||||||
|
|
||||||
const gameProcess = processes.find((runningProcess) => {
|
const gameProcess = processes.find((runningProcess) => {
|
||||||
return runningProcess.exe === game.executablePath;
|
if (process.platform === "linux") {
|
||||||
|
return runningProcess.name === game.executablePath?.split("/").at(-1);
|
||||||
|
} else {
|
||||||
|
return runningProcess.exe === game.executablePath;
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if (gameProcess) {
|
if (gameProcess) {
|
||||||
|
|
|
@ -35,4 +35,5 @@ export interface LibtorrentPayload {
|
||||||
export interface ProcessPayload {
|
export interface ProcessPayload {
|
||||||
exe: string;
|
exe: string;
|
||||||
pid: number;
|
pid: number;
|
||||||
|
name: string;
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,21 +25,43 @@ export const watchProcesses = async () => {
|
||||||
if (games.length === 0) return;
|
if (games.length === 0) return;
|
||||||
const processes = await PythonInstance.getProcessList();
|
const processes = await PythonInstance.getProcessList();
|
||||||
|
|
||||||
const processSet = new Set(processes.map((process) => process.exe));
|
if (process.platform === "linux") {
|
||||||
|
const processSet = new Set(processes.map((process) => process.name));
|
||||||
|
|
||||||
for (const game of games) {
|
for (const game of games) {
|
||||||
const executablePath = game.executablePath!;
|
const executable = game.executablePath?.split("/").at(-1);
|
||||||
|
|
||||||
const gameProcess = processSet.has(executablePath);
|
if (!executable) continue;
|
||||||
|
|
||||||
if (gameProcess) {
|
const gameProcess = processSet.has(executable);
|
||||||
if (gamesPlaytime.has(game.id)) {
|
|
||||||
onTickGame(game);
|
if (gameProcess) {
|
||||||
} else {
|
if (gamesPlaytime.has(game.id)) {
|
||||||
onOpenGame(game);
|
onTickGame(game);
|
||||||
|
} else {
|
||||||
|
onOpenGame(game);
|
||||||
|
}
|
||||||
|
} else if (gamesPlaytime.has(game.id)) {
|
||||||
|
onCloseGame(game);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
const processSet = new Set(processes.map((process) => process.exe));
|
||||||
|
|
||||||
|
for (const game of games) {
|
||||||
|
const executablePath = game.executablePath!;
|
||||||
|
|
||||||
|
const gameProcess = processSet.has(executablePath);
|
||||||
|
|
||||||
|
if (gameProcess) {
|
||||||
|
if (gamesPlaytime.has(game.id)) {
|
||||||
|
onTickGame(game);
|
||||||
|
} else {
|
||||||
|
onOpenGame(game);
|
||||||
|
}
|
||||||
|
} else if (gamesPlaytime.has(game.id)) {
|
||||||
|
onCloseGame(game);
|
||||||
}
|
}
|
||||||
} else if (gamesPlaytime.has(game.id)) {
|
|
||||||
onCloseGame(game);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ class Handler(BaseHTTPRequestHandler):
|
||||||
self.end_headers()
|
self.end_headers()
|
||||||
return
|
return
|
||||||
|
|
||||||
process_list = [proc.info for proc in psutil.process_iter(['exe', 'pid', 'username'])]
|
process_list = [proc.info for proc in psutil.process_iter(['exe', 'pid', 'name'])]
|
||||||
|
|
||||||
self.send_response(200)
|
self.send_response(200)
|
||||||
self.send_header("Content-type", "application/json")
|
self.send_header("Content-type", "application/json")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue