Merge pull request #1230 from hydralauncher/fix/linux-game-tracking
Some checks failed
Release / build (ubuntu-latest) (push) Has been cancelled
Release / build (windows-latest) (push) Has been cancelled

fix: linux game tracking and closed button
This commit is contained in:
JackEnx 2024-12-13 11:45:12 -03:00 committed by GitHub
commit ff917b7ecf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 27 additions and 6 deletions

1
.python-version Normal file
View File

@ -0,0 +1 @@
3.9.20

View File

@ -24,7 +24,11 @@ const closeGame = async (
if (!game) return;
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) {

View File

@ -35,4 +35,5 @@ export interface LibtorrentPayload {
export interface ProcessPayload {
exe: string;
pid: number;
name: string;
}

View File

@ -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)) {

View File

@ -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")