ok-script 1.0.136__tar.gz → 1.0.138__tar.gz

{ok_script-1.0.136 → ok_script-1.0.138}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 1.0.136
+Version: 1.0.138
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking

{ok_script-1.0.136 → ok_script-1.0.138}/ok/gui/StartController.py

@@ -13,9 +13,13 @@ logger = Logger.get_logger(__name__)
 
 
 class StartController(QObject):
-    def __init__(self, app_config, exit_event):
-        super().__init__()
-        self.config = app_config
+    STARTED_WINDOW_MIN_SIZE = (100, 100)
+    STARTED_WINDOW_STABLE_SECONDS = 10
+    STARTED_WINDOW_POLL_INTERVAL = 0.2
+
+    def __init__(self, app_config, exit_event):
+        super().__init__()
+        self.config = app_config
         self.exit_event = exit_event
         self.handler = Handler(exit_event, __name__)
         self.start_timeout = app_config.get('start_timeout', 60)
@@ -103,9 +107,9 @@ class StartController(QObject):
             communicate.starting_emulator.emit(True, self.tr(f'Start failed: {e}'), 0)
             return False
 
-    def _wait_until_device_ready(self):
-        wait_until = time.time() + self.start_timeout
-        while not self.exit_event.is_set():
+    def _wait_until_device_ready(self):
+        wait_until = time.time() + self.start_timeout
+        while not self.exit_event.is_set():
             og.device_manager.do_refresh(True)
             error = self.check_device_error()
             if error is None:
@@ -116,11 +120,42 @@ class StartController(QObject):
                 communicate.starting_emulator.emit(True, self.tr('Start game timeout!'), 0)
                 return False
             communicate.starting_emulator.emit(False, None, int(remaining_time))
-            time.sleep(2)
-        return False
-
-    def start_device(self):
-        device = og.device_manager.get_preferred_device()
+            time.sleep(2)
+        return False
+
+    def _wait_until_started_window_stable(self):
+        wait_until = time.monotonic() + self.start_timeout
+        stable_size = None
+        stable_since = None
+        min_width, min_height = self.STARTED_WINDOW_MIN_SIZE
+
+        while not self.exit_event.is_set():
+            hwnd_window = getattr(og.device_manager, 'hwnd_window', None)
+            if hwnd_window is not None:
+                hwnd_window.do_update_window_size()
+                size = (hwnd_window.width, hwnd_window.height)
+                if hwnd_window.hwnd and size[0] >= min_width and size[1] >= min_height:
+                    now = time.monotonic()
+                    if size != stable_size:
+                        logger.info(f'waiting for started window to stabilize, current size {size[0]}x{size[1]}')
+                        stable_size = size
+                        stable_since = now
+                    elif now - stable_since >= self.STARTED_WINDOW_STABLE_SECONDS:
+                        logger.info(f'started window size stable for {self.STARTED_WINDOW_STABLE_SECONDS}s: {size[0]}x{size[1]}')
+                        return True
+                else:
+                    stable_size = None
+                    stable_since = None
+
+            remaining_time = wait_until - time.monotonic()
+            if remaining_time <= 0:
+                communicate.starting_emulator.emit(True, self.tr('Start game timeout!'), 0)
+                return False
+            time.sleep(self.STARTED_WINDOW_POLL_INTERVAL)
+        return False
+
+    def start_device(self):
+        device = og.device_manager.get_preferred_device()
         logger.info(f'start_device: {device}')
 
         if device and not device['connected']:
@@ -137,11 +172,13 @@ class StartController(QObject):
                 dx11_config = og.global_config.get_config('Launch with DX11')
                 if dx11_config and dx11_config.get('Launch with DX11'):
                     args = "-dx11 -d3d11 -force-d3d11"
-                if not execute(path, arguments=args):
-                    communicate.starting_emulator.emit(True, self.tr("Start game failed, please start game first"), 0)
-                    return False
-                if not self._wait_until_device_ready():
-                    return False
+                if not execute(path, arguments=args):
+                    communicate.starting_emulator.emit(True, self.tr("Start game failed, please start game first"), 0)
+                    return False
+                if device['device'] == "windows" and not self._wait_until_started_window_stable():
+                    return False
+                if not self._wait_until_device_ready():
+                    return False
             else:
                 communicate.starting_emulator.emit(True,
                                                    self.tr('Game path does not exist, Please open game manually!'), 0)

{ok_script-1.0.136 → ok_script-1.0.138}/ok/gui/tasks/ModifyListDialog.py

@@ -1,142 +1,150 @@
-from PySide6.QtCore import Signal
-from PySide6.QtWidgets import QHBoxLayout, QVBoxLayout, QWidget
-from qfluentwidgets import (
-    BodyLabel, FlowLayout, MessageBoxBase, SubtitleLabel, ListWidget, PushButton, FluentIcon,
-    LineEdit
-)
-
-from ok import og
-
-
-class ModifyListDialog(MessageBoxBase):
-    list_modified = Signal(list)
-
-    def __init__(self, items, parent, options_available=None, allow_duplication=False):
-        super().__init__(parent)
-        self.original_items = list(items)
-        self.options_available = list(options_available) if options_available is not None else None
-        self.allow_duplication = allow_duplication
-        self.list_widget = ListWidget()
-        self.option_buttons = {}
-        self.source_by_display = {}
-
-        if self.options_available is None:
-            self.list_widget.addItems(self.original_items)
-        else:
-            self.source_by_display = {
-                og.app.tr(option): option for option in self.options_available
-            }
-            self.list_widget.addItems([
-                og.app.tr(item) for item in self.original_items if item in self.options_available
-            ])
-
-        self.move_up_button = PushButton(FluentIcon.UP, self.tr("Move Up"))
-        self.move_up_button.clicked.connect(self.move_up)
+from PySide6.QtCore import Signal, Qt
+from PySide6.QtWidgets import QHBoxLayout, QScrollArea, QVBoxLayout, QWidget
+from qfluentwidgets import (
+    BodyLabel, FlowLayout, MessageBoxBase, SubtitleLabel, ListWidget, PushButton, FluentIcon,
+    LineEdit
+)
+
+from ok import og
+
+
+class ModifyListDialog(MessageBoxBase):
+    list_modified = Signal(list)
+
+    def __init__(self, items, parent, options_available=None, allow_duplication=False):
+        super().__init__(parent)
+        self.original_items = list(items)
+        self.options_available = list(options_available) if options_available is not None else None
+        self.allow_duplication = allow_duplication
+        self.list_widget = ListWidget()
+        self.option_buttons = {}
+        self.source_by_display = {}
+
+        if self.options_available is None:
+            self.list_widget.addItems(self.original_items)
+        else:
+            self.source_by_display = {
+                og.app.tr(option): option for option in self.options_available
+            }
+            self.list_widget.addItems([
+                og.app.tr(item) for item in self.original_items if item in self.options_available
+            ])
+
+        self.move_up_button = PushButton(FluentIcon.UP, self.tr("Move Up"))
+        self.move_up_button.clicked.connect(self.move_up)
 
         self.move_down_button = PushButton(FluentIcon.DOWN, self.tr("Move Down"))
         self.move_down_button.clicked.connect(self.move_down)
 
-        self.add_button = None
-        if self.options_available is None:
-            self.add_button = PushButton(FluentIcon.ADD, self.tr("Add"))
-            self.add_button.clicked.connect(self.add_item)
-
-        self.remove_button = PushButton(FluentIcon.REMOVE, self.tr("Remove"))
-        self.remove_button.clicked.connect(self.remove_item)
-        self.list_widget.itemSelectionChanged.connect(self.update_list_actions)
-        self._match_list_action_widths()
-
-        self.yesButton.clicked.connect(self.confirm)
+        self.add_button = None
+        if self.options_available is None:
+            self.add_button = PushButton(FluentIcon.ADD, self.tr("Add"))
+            self.add_button.clicked.connect(self.add_item)
+
+        self.remove_button = PushButton(FluentIcon.REMOVE, self.tr("Remove"))
+        self.remove_button.clicked.connect(self.remove_item)
+        self.list_widget.itemSelectionChanged.connect(self.update_list_actions)
+        self._match_list_action_widths()
+
+        self.yesButton.clicked.connect(self.confirm)
 
         self.cancelButton.clicked.connect(self.cancel)
 
-        list_layout = self._create_selected_list_layout()
-
-        if self.options_available is None:
-            self.viewLayout.addLayout(list_layout)
-        else:
-            available_layout = QVBoxLayout()
-            available_layout.addWidget(SubtitleLabel(self.tr("Available Options"), self))
-            available_layout.addWidget(BodyLabel(self.tr("Click an option to add it."), self))
-            available_layout.addWidget(self._create_available_options_widget(), stretch=1)
-
-            selected_layout = QVBoxLayout()
-            selected_layout.addWidget(SubtitleLabel(self.tr("Selected Options"), self))
-            selected_layout.addLayout(list_layout)
-
-            options_layout = QHBoxLayout()
-            options_layout.addLayout(available_layout, stretch=2)
-            options_layout.addLayout(selected_layout, stretch=1)
-            self.viewLayout.addLayout(options_layout)
-
-        self.yesButton.setText(self.tr("Confirm"))
-        self.cancelButton.setText(self.tr("Cancel"))
-        self._wrap_dialog_buttons()
-        if self.options_available is None:
-            self.widget.setMinimumHeight(520)
-        else:
-            self.widget.setMinimumSize(840, 600)
-        self.update_list_actions()
-        self.update_option_buttons()
-
-    def _create_selected_list_layout(self):
-        actions_layout = QVBoxLayout()
-        actions_layout.addWidget(self.move_up_button)
-        actions_layout.addWidget(self.move_down_button)
-        if self.options_available is None:
-            actions_layout.addWidget(self.add_button)
-        actions_layout.addWidget(self.remove_button)
-        actions_layout.addStretch(1)
-
-        list_layout = QHBoxLayout()
-        list_layout.addWidget(self.list_widget)
-        list_layout.addLayout(actions_layout)
-        return list_layout
-
-    def _create_available_options_widget(self):
-        widget = QWidget()
-        layout = FlowLayout(widget, False)
-        layout.setContentsMargins(0, 0, 0, 0)
-        layout.setHorizontalSpacing(10)
-        layout.setVerticalSpacing(10)
-        for option in self.options_available:
-            button = PushButton(FluentIcon.ADD, og.app.tr(option))
-            button.clicked.connect(lambda checked=False, value=option: self.add_available_item(value))
-            layout.addWidget(button)
-            self.option_buttons[option] = button
-        return widget
-
-    def _match_list_action_widths(self):
-        buttons = [self.move_up_button, self.move_down_button, self.remove_button]
-        if self.options_available is None:
-            buttons.append(self.add_button)
-        width = max(button.sizeHint().width() for button in buttons)
-        for button in buttons:
-            button.setFixedWidth(width)
-
-    def update_list_actions(self):
-        row = self.list_widget.currentRow()
-        has_selection = row >= 0
-        self.move_up_button.setEnabled(has_selection and row > 0)
-        self.move_down_button.setEnabled(has_selection and row < self.list_widget.count() - 1)
-        self.remove_button.setEnabled(has_selection)
-        self.update_option_buttons()
-
-    def update_option_buttons(self):
-        if self.options_available is None:
-            return
-
-        selected_options = {
-            self.list_widget.item(i).text() for i in range(self.list_widget.count())
-        }
-        for option, button in self.option_buttons.items():
-            button.setEnabled(self.allow_duplication or og.app.tr(option) not in selected_options)
-
-    def _wrap_dialog_buttons(self):
-        self.yesButton.setFixedWidth(self.yesButton.sizeHint().width() * 2)
-        self.cancelButton.setFixedWidth(self.cancelButton.sizeHint().width() * 2)
-
-    def move_up(self):
+        list_layout = self._create_selected_list_layout()
+
+        if self.options_available is None:
+            self.viewLayout.addLayout(list_layout)
+        else:
+            available_layout = QVBoxLayout()
+            available_layout.addWidget(SubtitleLabel(self.tr("Available Options"), self))
+            available_layout.addWidget(BodyLabel(self.tr("Click an option to add it."), self))
+            available_scroll_area = QScrollArea(self)
+            available_scroll_area.setWidgetResizable(True)
+            available_scroll_area.setHorizontalScrollBarPolicy(Qt.ScrollBarAlwaysOff)
+            available_scroll_area.setFrameShape(QScrollArea.NoFrame)
+            available_scroll_area.setStyleSheet("QScrollArea { background-color: transparent; border: none; }")
+            available_scroll_area.viewport().setStyleSheet("background-color: transparent;")
+            available_scroll_area.setWidget(self._create_available_options_widget())
+            available_layout.addWidget(available_scroll_area, stretch=1)
+
+            selected_layout = QVBoxLayout()
+            selected_layout.addWidget(SubtitleLabel(self.tr("Selected Options"), self))
+            selected_layout.addLayout(list_layout)
+
+            options_layout = QHBoxLayout()
+            options_layout.addLayout(available_layout, stretch=2)
+            options_layout.addLayout(selected_layout, stretch=1)
+            self.viewLayout.addLayout(options_layout)
+
+        self.yesButton.setText(self.tr("Confirm"))
+        self.cancelButton.setText(self.tr("Cancel"))
+        self._wrap_dialog_buttons()
+        if self.options_available is None:
+            self.widget.setMinimumHeight(520)
+        else:
+            self.widget.setMinimumSize(840, 600)
+        self.update_list_actions()
+        self.update_option_buttons()
+
+    def _create_selected_list_layout(self):
+        actions_layout = QVBoxLayout()
+        actions_layout.addWidget(self.move_up_button)
+        actions_layout.addWidget(self.move_down_button)
+        if self.options_available is None:
+            actions_layout.addWidget(self.add_button)
+        actions_layout.addWidget(self.remove_button)
+        actions_layout.addStretch(1)
+
+        list_layout = QHBoxLayout()
+        list_layout.addWidget(self.list_widget)
+        list_layout.addLayout(actions_layout)
+        return list_layout
+
+    def _create_available_options_widget(self):
+        widget = QWidget()
+        widget.setStyleSheet("background-color: transparent;")
+        layout = FlowLayout(widget, False)
+        layout.setContentsMargins(0, 0, 0, 0)
+        layout.setHorizontalSpacing(10)
+        layout.setVerticalSpacing(10)
+        for option in self.options_available:
+            button = PushButton(FluentIcon.ADD, og.app.tr(option))
+            button.clicked.connect(lambda checked=False, value=option: self.add_available_item(value))
+            layout.addWidget(button)
+            self.option_buttons[option] = button
+        return widget
+
+    def _match_list_action_widths(self):
+        buttons = [self.move_up_button, self.move_down_button, self.remove_button]
+        if self.options_available is None:
+            buttons.append(self.add_button)
+        width = max(button.sizeHint().width() for button in buttons)
+        for button in buttons:
+            button.setFixedWidth(width)
+
+    def update_list_actions(self):
+        row = self.list_widget.currentRow()
+        has_selection = row >= 0
+        self.move_up_button.setEnabled(has_selection and row > 0)
+        self.move_down_button.setEnabled(has_selection and row < self.list_widget.count() - 1)
+        self.remove_button.setEnabled(has_selection)
+        self.update_option_buttons()
+
+    def update_option_buttons(self):
+        if self.options_available is None:
+            return
+
+        selected_options = {
+            self.list_widget.item(i).text() for i in range(self.list_widget.count())
+        }
+        for option, button in self.option_buttons.items():
+            button.setEnabled(self.allow_duplication or og.app.tr(option) not in selected_options)
+
+    def _wrap_dialog_buttons(self):
+        self.yesButton.setFixedWidth(self.yesButton.sizeHint().width() * 2)
+        self.cancelButton.setFixedWidth(self.cancelButton.sizeHint().width() * 2)
+
+    def move_up(self):
         current_row = self.list_widget.currentRow()
         if current_row >= 1:
             item = self.list_widget.takeItem(current_row)
@@ -150,32 +158,32 @@ class ModifyListDialog(MessageBoxBase):
             self.list_widget.insertItem(current_row + 1, item)
             self.list_widget.setCurrentRow(current_row + 1)
 
-    def add_item(self):
-        w = AddTextMessageBox(self.window())
-        if w.exec():
-            self.list_widget.addItem(w.add_text_edit.text())
-            self.list_widget.setCurrentRow(self.list_widget.count() - 1)
-
-    def add_available_item(self, option):
-        text = og.app.tr(option)
-        if self.allow_duplication or all(
-            self.list_widget.item(i).text() != text for i in range(self.list_widget.count())
-        ):
-            self.list_widget.addItem(text)
-            self.list_widget.setCurrentRow(self.list_widget.count() - 1)
-            self.update_option_buttons()
-
-    def remove_item(self):
-        current_row = self.list_widget.currentRow()
-        if current_row >= 0:
-            self.list_widget.takeItem(current_row)
-            self.update_list_actions()
-
-    def confirm(self):
-        items_text = [self.list_widget.item(i).text() for i in range(self.list_widget.count())]
-        if self.options_available is not None:
-            items_text = [self.source_by_display[text] for text in items_text]
-        self.list_modified.emit(items_text)
+    def add_item(self):
+        w = AddTextMessageBox(self.window())
+        if w.exec():
+            self.list_widget.addItem(w.add_text_edit.text())
+            self.list_widget.setCurrentRow(self.list_widget.count() - 1)
+
+    def add_available_item(self, option):
+        text = og.app.tr(option)
+        if self.allow_duplication or all(
+            self.list_widget.item(i).text() != text for i in range(self.list_widget.count())
+        ):
+            self.list_widget.addItem(text)
+            self.list_widget.setCurrentRow(self.list_widget.count() - 1)
+            self.update_option_buttons()
+
+    def remove_item(self):
+        current_row = self.list_widget.currentRow()
+        if current_row >= 0:
+            self.list_widget.takeItem(current_row)
+            self.update_list_actions()
+
+    def confirm(self):
+        items_text = [self.list_widget.item(i).text() for i in range(self.list_widget.count())]
+        if self.options_available is not None:
+            items_text = [self.source_by_display[text] for text in items_text]
+        self.list_modified.emit(items_text)
         self.close()
 
     def cancel(self):
@@ -198,10 +206,10 @@ class AddTextMessageBox(MessageBoxBase):
         self.viewLayout.addWidget(self.add_text_edit)
 
         # change the text of button
-        self.yesButton.setText(self.tr('Confirm'))
-        self.cancelButton.setText(self.tr('Cancel'))
-        self.yesButton.setFixedWidth(self.yesButton.sizeHint().width() * 2)
-        self.cancelButton.setFixedWidth(self.cancelButton.sizeHint().width() * 2)
+        self.yesButton.setText(self.tr('Confirm'))
+        self.cancelButton.setText(self.tr('Cancel'))
+        self.yesButton.setFixedWidth(self.yesButton.sizeHint().width() * 2)
+        self.cancelButton.setFixedWidth(self.cancelButton.sizeHint().width() * 2)
 
         self.widget.setMinimumWidth(360)
         self.yesButton.setDisabled(True)

{ok_script-1.0.136 → ok_script-1.0.138}/ok_script.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ok-script
-Version: 1.0.136
+Version: 1.0.138
 Summary: Automation with Computer Vision for Python
 Home-page: https://github.com/ok-oldking/ok-script
 Author: ok-oldking