Boria138/PortProtonQt
3
4
Fork 4
Code Issues 1 Pull Requests Actions Releases 6 Activity

fix(pyright): fix pyright errors

Browse Source 
Signed-off-by: Boris Yumankulov <boria138@altlinux.org>
This commit is contained in:
Boris Yumankulov
2025-10-12 15:14:02 +05:00
parent efe8a35832
commit e3cb2857e7
3 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
portprotonqt/input_manager.py
View File

@@ -38,7 +38,7 @@ class MainWindowProtocol(Protocol):
stackedWidget: QStackedWidget stackedWidget: QStackedWidget
tabButtons: dict[int, QWidget] tabButtons: dict[int, QWidget]
gamesListWidget: QWidget gamesListWidget: QWidget
autoInstallContainer: QWidget autoInstallContainer: QWidget | None
currentDetailPage: QWidget | None currentDetailPage: QWidget | None
current_exec_line: str | None current_exec_line: str | None
current_add_game_dialog: AddGameDialog | None current_add_game_dialog: AddGameDialog | None

29
portprotonqt/main_window.py
View File

@@ -452,13 +452,11 @@ class MainWindow(QMainWindow):
self.current_install_script = script_name self.current_install_script = script_name
self.seen_progress = False self.seen_progress = False
self.current_percent = 0.0 self.current_percent = 0.0
start_sh = os.path.join(self.portproton_location, "data", "scripts", "start.sh") start_sh = os.path.join(self.portproton_location or "", "data", "scripts", "start.sh") if self.portproton_location else ""
if not os.path.exists(start_sh): if not os.path.exists(start_sh):
self.installing = False self.installing = False
QMessageBox.warning(self, _("Error"), _("start.sh not found."))
return return
cmd = [start_sh, "cli", "--autoinstall", script_name] cmd = [start_sh, "cli", "--autoinstall", script_name]
print(cmd)
self.install_process = QProcess(self) self.install_process = QProcess(self)
self.install_process.finished.connect(self.on_install_finished) self.install_process.finished.connect(self.on_install_finished)
self.install_process.errorOccurred.connect(self.on_install_error) self.install_process.errorOccurred.connect(self.on_install_error)
@@ -493,14 +491,16 @@ class MainWindow(QMainWindow):
self.current_percent = percent self.current_percent = percent
elif self.seen_progress and percent == 0: elif self.seen_progress and percent == 0:
self.current_percent = 100.0 self.current_percent = 100.0
self.install_monitor_timer.stop() if self.install_monitor_timer is not None:
self.install_monitor_timer.stop()
# Update progress bar to determinate if not already # Update progress bar to determinate if not already
if self.progress_bar.maximum() == 0: if self.progress_bar.maximum() == 0:
self.progress_bar.setRange(0, 100) self.progress_bar.setRange(0, 100)
self.progress_bar.setFormat("%p") # Show percentage self.progress_bar.setFormat("%p") # Show percentage
self.progress_bar.setValue(int(self.current_percent)) self.progress_bar.setValue(int(self.current_percent))
if self.current_percent >= 100: if self.current_percent >= 100:
self.install_monitor_timer.stop() if self.install_monitor_timer is not None:
self.install_monitor_timer.stop()
except ValueError: except ValueError:
pass # Ignore invalid floats pass # Ignore invalid floats
except Exception as e: except Exception as e:
@@ -510,7 +510,7 @@ class MainWindow(QMainWindow):
def on_install_finished(self, exit_code: int, exit_status: int): def on_install_finished(self, exit_code: int, exit_status: int):
"""Handle installation finish.""" """Handle installation finish."""
self.installing = False self.installing = False
if self.install_monitor_timer: if self.install_monitor_timer is not None:
self.install_monitor_timer.stop() self.install_monitor_timer.stop()
self.install_monitor_timer.deleteLater() self.install_monitor_timer.deleteLater()
self.install_monitor_timer = None self.install_monitor_timer = None
@@ -518,6 +518,7 @@ class MainWindow(QMainWindow):
self.progress_bar.setValue(100) self.progress_bar.setValue(100)
if exit_code == 0: if exit_code == 0:
self.update_status_message.emit(_("Installation completed successfully."), 5000) self.update_status_message.emit(_("Installation completed successfully."), 5000)
QTimer.singleShot(500, lambda: self.restart_application())
else: else:
self.update_status_message.emit(_("Installation failed."), 5000) self.update_status_message.emit(_("Installation failed."), 5000)
QMessageBox.warning(self, _("Error"), f"Installation failed (code: {exit_code}).") QMessageBox.warning(self, _("Error"), f"Installation failed (code: {exit_code}).")
@@ -530,7 +531,7 @@ class MainWindow(QMainWindow):
def on_install_error(self, error: QProcess.ProcessError): def on_install_error(self, error: QProcess.ProcessError):
"""Handle installation error.""" """Handle installation error."""
self.installing = False self.installing = False
if self.install_monitor_timer: if self.install_monitor_timer is not None:
self.install_monitor_timer.stop() self.install_monitor_timer.stop()
self.install_monitor_timer.deleteLater() self.install_monitor_timer.deleteLater()
self.install_monitor_timer = None self.install_monitor_timer = None
@@ -1059,7 +1060,6 @@ class MainWindow(QMainWindow):
get_steam_game_info_async(final_name, exec_line, on_steam_info) get_steam_game_info_async(final_name, exec_line, on_steam_info)
def createAutoInstallTab(self): def createAutoInstallTab(self):
autoInstallPage = QWidget() autoInstallPage = QWidget()
autoInstallPage.setStyleSheet(self.theme.LIBRARY_WIDGET_STYLE) autoInstallPage.setStyleSheet(self.theme.LIBRARY_WIDGET_STYLE)
autoInstallLayout = QVBoxLayout(autoInstallPage) autoInstallLayout = QVBoxLayout(autoInstallPage)
@@ -1075,7 +1075,7 @@ class MainWindow(QMainWindow):
# Заголовок # Заголовок
titleLabel = QLabel(_("Auto Install")) titleLabel = QLabel(_("Auto Install"))
titleLabel.setStyleSheet(self.theme.TAB_TITLE_STYLE) titleLabel.setStyleSheet(self.theme.TAB_TITLE_STYLE)
titleLabel.setAlignment(Qt.AlignVCenter | Qt.AlignLeft) titleLabel.setAlignment(Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignLeft)
headerLayout.addWidget(titleLabel) headerLayout.addWidget(titleLabel)
headerLayout.addStretch() headerLayout.addStretch()
@@ -1083,7 +1083,7 @@ class MainWindow(QMainWindow):
# Поисковая строка # Поисковая строка
self.autoInstallSearchLineEdit = CustomLineEdit(self, theme=self.theme) self.autoInstallSearchLineEdit = CustomLineEdit(self, theme=self.theme)
icon: QIcon = cast(QIcon, self.theme_manager.get_icon("search")) icon: QIcon = cast(QIcon, self.theme_manager.get_icon("search"))
action_pos = cast(int, CustomLineEdit.ActionPosition.LeadingPosition) action_pos = QLineEdit.ActionPosition.LeadingPosition
self.search_action = self.autoInstallSearchLineEdit.addAction(icon, action_pos) self.search_action = self.autoInstallSearchLineEdit.addAction(icon, action_pos)
self.autoInstallSearchLineEdit.setMaximumWidth(200) self.autoInstallSearchLineEdit.setMaximumWidth(200)
self.autoInstallSearchLineEdit.setPlaceholderText(_("Find Games ...")) self.autoInstallSearchLineEdit.setPlaceholderText(_("Find Games ..."))
@@ -2028,9 +2028,6 @@ class MainWindow(QMainWindow):
gamepad_connected = self.input_manager.find_gamepad() is not None gamepad_connected = self.input_manager.find_gamepad() is not None
if fullscreen or (auto_fullscreen_gamepad and gamepad_connected): if fullscreen or (auto_fullscreen_gamepad and gamepad_connected):
self.showFullScreen() self.showFullScreen()
else:
self.showNormal()
self.resize(*read_window_geometry())
self.statusBar().showMessage(_("Settings saved"), 3000) self.statusBar().showMessage(_("Settings saved"), 3000)
@@ -2975,11 +2972,11 @@ class MainWindow(QMainWindow):
self.game_processes = [] # Очищаем список процессов self.game_processes = [] # Очищаем список процессов
# Очищаем таймеры # Очищаем таймеры
if hasattr(self, 'games_load_timer') and self.games_load_timer.isActive(): if hasattr(self, 'games_load_timer') and self.games_load_timer is not None and self.games_load_timer.isActive():
self.games_load_timer.stop() self.games_load_timer.stop()
if hasattr(self, 'settingsDebounceTimer') and self.settingsDebounceTimer.isActive(): if hasattr(self, 'settingsDebounceTimer') and self.settingsDebounceTimer is not None and self.settingsDebounceTimer.isActive():
self.settingsDebounceTimer.stop() self.settingsDebounceTimer.stop()
if hasattr(self, 'searchDebounceTimer') and self.searchDebounceTimer.isActive(): if hasattr(self, 'searchDebounceTimer') and self.searchDebounceTimer is not None and self.searchDebounceTimer.isActive():
self.searchDebounceTimer.stop() self.searchDebounceTimer.stop()
if hasattr(self, 'checkProcessTimer') and self.checkProcessTimer is not None and self.checkProcessTimer.isActive(): if hasattr(self, 'checkProcessTimer') and self.checkProcessTimer is not None and self.checkProcessTimer.isActive():
self.checkProcessTimer.stop() self.checkProcessTimer.stop()

2
portprotonqt/portproton_api.py
View File

@@ -234,7 +234,7 @@ class PortProtonAPI:
def get_autoinstall_games_async(self, callback: Callable[[list[tuple]], None]) -> None: def get_autoinstall_games_async(self, callback: Callable[[list[tuple]], None]) -> None:
"""Load auto-install games with user/builtin covers (no async download here).""" """Load auto-install games with user/builtin covers (no async download here)."""
games = [] games = []
auto_dir = os.path.join(self.portproton_location, "data", "scripts", "pw_autoinstall") auto_dir = os.path.join(self.portproton_location or "", "data", "scripts", "pw_autoinstall") if self.portproton_location else ""
if not os.path.exists(auto_dir): if not os.path.exists(auto_dir):
callback(games) callback(games)
return return