mirror of
https://github.com/hydralauncher/hydra.git
synced 2025-01-23 05:24:55 +03:00
Merge pull request #1230 from hydralauncher/fix/linux-game-tracking
fix: linux game tracking and closed button
This commit is contained in:
commit
ff917b7ecf
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;
|
||||
|
||||
const gameProcess = processes.find((runningProcess) => {
|
||||
if (process.platform === "linux") {
|
||||
return runningProcess.name === game.executablePath?.split("/").at(-1);
|
||||
} else {
|
||||
return runningProcess.exe === game.executablePath;
|
||||
}
|
||||
});
|
||||
|
||||
if (gameProcess) {
|
||||
|
@ -35,4 +35,5 @@ export interface LibtorrentPayload {
|
||||
export interface ProcessPayload {
|
||||
exe: string;
|
||||
pid: number;
|
||||
name: string;
|
||||
}
|
||||
|
@ -14,6 +14,20 @@ export const gamesPlaytime = new Map<
|
||||
const TICKS_TO_UPDATE_API = 120;
|
||||
let currentTick = 1;
|
||||
|
||||
const getSystemProcessSet = async () => {
|
||||
const processes = await PythonInstance.getProcessList();
|
||||
|
||||
if (process.platform === "linux")
|
||||
return new Set(processes.map((process) => process.name));
|
||||
return new Set(processes.map((process) => process.exe));
|
||||
};
|
||||
|
||||
const getExecutable = (game: Game) => {
|
||||
if (process.platform === "linux")
|
||||
return game.executablePath?.split("/").at(-1);
|
||||
return game.executablePath;
|
||||
};
|
||||
|
||||
export const watchProcesses = async () => {
|
||||
const games = await gameRepository.find({
|
||||
where: {
|
||||
@ -23,14 +37,15 @@ export const watchProcesses = async () => {
|
||||
});
|
||||
|
||||
if (games.length === 0) return;
|
||||
const processes = await PythonInstance.getProcessList();
|
||||
|
||||
const processSet = new Set(processes.map((process) => process.exe));
|
||||
const processSet = await getSystemProcessSet();
|
||||
|
||||
for (const game of games) {
|
||||
const executablePath = game.executablePath!;
|
||||
const executable = getExecutable(game);
|
||||
|
||||
const gameProcess = processSet.has(executablePath);
|
||||
if (!executable) continue;
|
||||
|
||||
const gameProcess = processSet.has(executable);
|
||||
|
||||
if (gameProcess) {
|
||||
if (gamesPlaytime.has(game.id)) {
|
||||
|
@ -60,7 +60,7 @@ class Handler(BaseHTTPRequestHandler):
|
||||
self.end_headers()
|
||||
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_header("Content-type", "application/json")
|
||||
|
Loading…
Reference in New Issue
Block a user