From 47c0ce7413bbfdfc2e984fe4d715e95e7812138a Mon Sep 17 00:00:00 2001 From: Adam Saudagar Date: Mon, 6 Mar 2023 23:32:39 +0530 Subject: [PATCH] removed Linux temprorily until linux.py is implemented --- fishy/__main__.py | 5 ++++- fishy/engine/common/window_server.py | 1 + fishy/osservices/os_services.py | 19 ++++++++++++------- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/fishy/__main__.py b/fishy/__main__.py index c2c7183..68fd28e 100644 --- a/fishy/__main__.py +++ b/fishy/__main__.py @@ -42,7 +42,10 @@ def initialize(): def main(): print("launching please wait...") - os_services.init() + if not os_services.init(): + print("platform not supported") + return + config.init() if not check_eula(): return diff --git a/fishy/engine/common/window_server.py b/fishy/engine/common/window_server.py index 2c0e128..ec043ab 100644 --- a/fishy/engine/common/window_server.py +++ b/fishy/engine/common/window_server.py @@ -44,6 +44,7 @@ def init(): if monitor_rect is None or WindowServer.crop is None: logging.error("Game window not found") WindowServer.status = Status.CRASHED + return for i, m in enumerate(WindowServer.sct.monitors): if m["top"] == monitor_rect[0] and m["left"] == monitor_rect[1]: diff --git a/fishy/osservices/os_services.py b/fishy/osservices/os_services.py index 182d9ba..03f5a9a 100644 --- a/fishy/osservices/os_services.py +++ b/fishy/osservices/os_services.py @@ -7,6 +7,7 @@ from typing import Tuple, Optional import platform + class IOSServices(ABC): @abstractmethod @@ -46,7 +47,7 @@ class IOSServices(ABC): """ @abstractmethod - def get_monitor_rect(self): + def get_monitor_rect(self) -> Optional[Tuple[int, int]]: """ :return: [top, left, height, width] of monitor which has game running in it """ @@ -83,13 +84,17 @@ class os_services: _instance: Optional[IOSServices] = None @staticmethod - def init(): + def init() -> bool: os_name = platform.system() if os_name == "Windows": from fishy.osservices.windows import Windows os_services._instance = Windows() - elif os_name == "Linux": - from fishy.osservices.linux import Linux - os_services._instance = Linux() - else: - logging.error("Platform not supported") + return True + + # todo uncomment after linux.py is implemented + # if os_name == "Linux": + # from fishy.osservices.linux import Linux + # os_services._instance = Linux() + # return True + + return False