feat: update context menu for egs games

Signed-off-by: Boris Yumankulov <boria138@altlinux.org>

portprotonqt/context_menu_manager.py

@@ -3,13 +3,26 @@ import shlex
 import glob
 import shutil
 import subprocess
-from PySide6.QtWidgets import QMessageBox, QDialog, QMenu
-from PySide6.QtCore import QUrl, QPoint
+import threading
+import logging
+import re
+import json
+from PySide6.QtWidgets import QMessageBox, QDialog, QMenu, QFileDialog
+from PySide6.QtCore import QUrl, QPoint, QObject, Signal, Qt
 from PySide6.QtGui import QDesktopServices
 from portprotonqt.config_utils import parse_desktop_entry, read_favorites, save_favorites
 from portprotonqt.localization import _
 from portprotonqt.steam_api import is_game_in_steam, add_to_steam, remove_from_steam
 from portprotonqt.dialogs import AddGameDialog
+from portprotonqt.egs_api import add_egs_to_steam, get_egs_executable
+import vdf
+
+logger = logging.getLogger(__name__)
+
+class ContextMenuSignals(QObject):
+    """Signals for thread-safe UI updates from worker threads."""
+    show_status_message = Signal(str, int)
+    show_warning_dialog = Signal(str, str)
 
 class ContextMenuManager:
     """Manages context menu actions for game management in PortProtonQt."""
@@ -30,6 +43,56 @@ class ContextMenuManager:
         self.theme = theme
         self.load_games = load_games_callback
         self.update_game_grid = update_game_grid_callback
+        self.legendary_path = os.path.join(
+            os.getenv("XDG_CACHE_HOME", os.path.join(os.path.expanduser("~"), ".cache")),
+            "PortProtonQt", "legendary_cache", "legendary"
+        )
+        self.legendary_config_path = os.path.join(
+            os.getenv("XDG_CACHE_HOME", os.path.join(os.path.expanduser("~"), ".cache")),
+            "PortProtonQt", "legendary_cache"
+        )
+        # Initialize signals for thread-safe UI updates
+        self.signals = ContextMenuSignals()
+        if self.parent.statusBar() is None:
+            logger.warning("Status bar is not initialized in MainWindow")
+        else:
+            self.signals.show_status_message.connect(
+                self.parent.statusBar().showMessage,
+                Qt.ConnectionType.QueuedConnection
+            )
+            logger.debug("Connected show_status_message signal to statusBar")
+        self.signals.show_warning_dialog.connect(
+            self._show_warning_dialog,
+            Qt.ConnectionType.QueuedConnection
+        )
+
+    def _show_warning_dialog(self, title: str, message: str):
+        """Show a warning dialog in the main thread."""
+        logger.debug("Showing warning dialog: %s - %s", title, message)
+        QMessageBox.warning(self.parent, title, message)
+
+    def _is_egs_game_installed(self, app_name: str) -> bool:
+        """
+        Check if an EGS game is installed by reading installed.json.
+
+        Args:
+            app_name: The Legendary app_name (unique identifier for the game).
+
+        Returns:
+            bool: True if the game is installed, False otherwise.
+        """
+        installed_json_path = os.path.join(self.legendary_config_path, "installed.json")
+        if not os.path.exists(installed_json_path):
+            logger.debug("installed.json not found at %s", installed_json_path)
+            return False
+
+        try:
+            with open(installed_json_path, encoding="utf-8") as f:
+                installed_games = json.load(f)
+            return app_name in installed_games
+        except (OSError, json.JSONDecodeError) as e:
+            logger.error("Failed to read installed.json: %s", e)
+            return False
 
     def show_context_menu(self, game_card, pos: QPoint):
         """
@@ -39,7 +102,6 @@ class ContextMenuManager:
             game_card: The GameCard instance requesting the context menu.
             pos: The position (in widget coordinates) where the menu should appear.
         """
-
         menu = QMenu(self.parent)
         menu.setStyleSheet(self.theme.CONTEXT_MENU_STYLE)
 
@@ -53,6 +115,34 @@ class ContextMenuManager:
             favorite_action = menu.addAction(_("Add to Favorites"))
             favorite_action.triggered.connect(lambda: self.toggle_favorite(game_card, True))
 
+        if game_card.game_source == "epic":
+            # Always show Import to Legendary
+            import_action = menu.addAction(_("Import to Legendary"))
+            import_action.triggered.connect(
+                lambda: self.import_to_legendary(game_card.name, game_card.appid)
+            )
+            # Show other actions only if the game is installed
+            if self._is_egs_game_installed(game_card.appid):
+                uninstall_action = menu.addAction(_("Uninstall Game"))
+                uninstall_action.triggered.connect(
+                    lambda: self.uninstall_egs_game(game_card.name, game_card.appid)
+                )
+                is_in_steam = is_game_in_steam(game_card.name)
+                if is_in_steam:
+                    remove_steam_action = menu.addAction(_("Remove from Steam"))
+                    remove_steam_action.triggered.connect(
+                        lambda: self.remove_from_steam(game_card.name, game_card.exec_line, game_card.game_source)
+                    )
+                else:
+                    add_steam_action = menu.addAction(_("Add to Steam"))
+                    add_steam_action.triggered.connect(
+                        lambda: self.add_egs_to_steam(game_card.name, game_card.appid)
+                    )
+                open_folder_action = menu.addAction(_("Open Game Folder"))
+                open_folder_action.triggered.connect(
+                    lambda: self.open_egs_game_folder(game_card.appid)
+                )
+
         if game_card.game_source not in ("steam", "epic"):
             desktop_dir = subprocess.check_output(['xdg-user-dir', 'DESKTOP']).decode('utf-8').strip()
             desktop_path = os.path.join(desktop_dir, f"{game_card.name}.desktop")
@@ -64,13 +154,17 @@ class ContextMenuManager:
                 add_action.triggered.connect(lambda: self.add_to_desktop(game_card.name, game_card.exec_line))
 
             edit_action = menu.addAction(_("Edit Shortcut"))
-            edit_action.triggered.connect(lambda: self.edit_game_shortcut(game_card.name, game_card.exec_line, game_card.cover_path))
+            edit_action.triggered.connect(
+                lambda: self.edit_game_shortcut(game_card.name, game_card.exec_line, game_card.cover_path)
+            )
 
             delete_action = menu.addAction(_("Delete from PortProton"))
             delete_action.triggered.connect(lambda: self.delete_game(game_card.name, game_card.exec_line))
 
             open_folder_action = menu.addAction(_("Open Game Folder"))
-            open_folder_action.triggered.connect(lambda: self.open_game_folder(game_card.name, game_card.exec_line))
+            open_folder_action.triggered.connect(
+                lambda: self.open_game_folder(game_card.name, game_card.exec_line)
+            )
 
             applications_dir = os.path.join(os.path.expanduser("~"), ".local", "share", "applications")
             desktop_path = os.path.join(applications_dir, f"{game_card.name}.desktop")
@@ -81,17 +175,209 @@ class ContextMenuManager:
                 add_action = menu.addAction(_("Add to Menu"))
                 add_action.triggered.connect(lambda: self.add_to_menu(game_card.name, game_card.exec_line))
 
-            # Add Steam-related actions
             is_in_steam = is_game_in_steam(game_card.name)
             if is_in_steam:
                 remove_steam_action = menu.addAction(_("Remove from Steam"))
-                remove_steam_action.triggered.connect(lambda: self.remove_from_steam(game_card.name, game_card.exec_line))
+                remove_steam_action.triggered.connect(
+                    lambda: self.remove_from_steam(game_card.name, game_card.exec_line, game_card.game_source)
+                )
             else:
                 add_steam_action = menu.addAction(_("Add to Steam"))
-                add_steam_action.triggered.connect(lambda: self.add_to_steam(game_card.name, game_card.exec_line, game_card.cover_path))
+                add_steam_action.triggered.connect(
+                    lambda: self.add_to_steam(game_card.name, game_card.exec_line, game_card.cover_path)
+                )
 
         menu.exec(game_card.mapToGlobal(pos))
 
+    def add_egs_to_steam(self, game_name: str, app_name: str):
+        """
+        Adds an EGS game to Steam using the egs_api.
+
+        Args:
+            game_name: The display name of the game.
+            app_name: The Legendary app_name (unique identifier for the game).
+        """
+        if not self._check_portproton():
+            return
+
+        if not os.path.exists(self.legendary_path):
+            self._show_warning_dialog(_("Error"), _("Legendary executable not found at {0}").format(self.legendary_path))
+            return
+
+        def on_add_to_steam_result(result: tuple[bool, str]):
+            success, message = result
+            if success:
+                self.signals.show_status_message.emit(
+                    _("The game was added successfully. Please restart Steam for changes to take effect."), 5000
+                )
+            else:
+                self.signals.show_warning_dialog.emit(_("Error"), message)
+
+        if self.parent.statusBar():
+            self.parent.statusBar().showMessage(_("Adding '{0}' to Steam...").format(game_name), 0)
+            logger.debug("Direct status message: Adding '%s' to Steam", game_name)
+        else:
+            logger.warning("Status bar not available when adding '%s' to Steam", game_name)
+        add_egs_to_steam(app_name, game_name, self.legendary_path, on_add_to_steam_result)
+
+    def open_egs_game_folder(self, app_name: str):
+        """
+        Opens the folder containing the EGS game's executable.
+
+        Args:
+            app_name: The Legendary app_name (unique identifier for the game).
+        """
+        if not self._check_portproton():
+            return
+
+        exe_path = get_egs_executable(app_name, self.legendary_config_path)
+        if not exe_path or not os.path.exists(exe_path):
+            self._show_warning_dialog(
+                _("Error"),
+                _("Executable file not found for game: {0}").format(app_name)
+            )
+            return
+
+        try:
+            folder_path = os.path.dirname(os.path.abspath(exe_path))
+            QDesktopServices.openUrl(QUrl.fromLocalFile(folder_path))
+            if self.parent.statusBar():
+                self.parent.statusBar().showMessage(
+                    _("Opened folder for EGS game '{0}'").format(app_name), 3000
+                )
+                logger.debug("Direct status message: Opened folder for '%s'", app_name)
+            else:
+                logger.warning("Status bar not available when opening folder for '%s'", app_name)
+        except Exception as e:
+            self._show_warning_dialog(
+                _("Error"),
+                _("Failed to open game folder: {0}").format(str(e))
+            )
+
+    def import_to_legendary(self, game_name, app_name):
+        """
+        Imports an installed Epic Games Store game to Legendary asynchronously.
+
+        Args:
+            game_name: The display name of the game.
+            app_name: The Legendary app_name (unique identifier for the game).
+        """
+        if not self._check_portproton():
+            return
+
+        folder_path = QFileDialog.getExistingDirectory(
+            self.parent,
+            _("Select Game Installation Folder"),
+            os.path.expanduser("~")
+        )
+        if not folder_path:
+            if self.parent.statusBar():
+                self.parent.statusBar().showMessage(_("No folder selected"), 3000)
+                logger.debug("Direct status message: No folder selected for '%s'", game_name)
+            else:
+                logger.warning("Status bar not available when no folder selected for '%s'", game_name)
+            return
+
+        if not os.path.exists(self.legendary_path):
+            self._show_warning_dialog(
+                _("Error"),
+                _("Legendary executable not found at {0}").format(self.legendary_path)
+            )
+            return
+
+        def run_import():
+            cmd = [self.legendary_path, "import", app_name, folder_path]
+            subprocess.run(
+                cmd,
+                capture_output=True,
+                text=True,
+                check=True
+            )
+
+        if self.parent.statusBar():
+            self.parent.statusBar().showMessage(
+                _("Importing '{0}' to Legendary...").format(game_name), 0
+            )
+            logger.debug("Direct status message: Importing '%s' to Legendary", game_name)
+        else:
+            logger.warning("Status bar not available when importing '%s'", game_name)
+        threading.Thread(target=run_import, daemon=True).start()
+
+    def uninstall_egs_game(self, game_name: str, app_name: str):
+        """
+        Uninstalls an Epic Games Store game using Legendary asynchronously.
+
+        Args:
+            game_name: The display name of the game.
+            app_name: The Legendary app_name (unique identifier for the game).
+        """
+        if not self._check_portproton():
+            return
+
+        if not os.path.exists(self.legendary_path):
+            self._show_warning_dialog(
+                _("Error"),
+                _("Legendary executable not found at {0}").format(self.legendary_path)
+            )
+            return
+
+        reply = QMessageBox.question(
+            self.parent,
+            _("Confirm Uninstallation"),
+            _("Are you sure you want to uninstall '{0}'? This will remove the game files.").format(game_name),
+            QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
+            QMessageBox.StandardButton.No
+        )
+        if reply != QMessageBox.StandardButton.Yes:
+            return
+
+        def run_uninstall():
+            cmd = [self.legendary_path, "uninstall", app_name, "--skip-uninstaller"]
+            try:
+                subprocess.run(
+                    cmd,
+                    capture_output=True,
+                    text=True,
+                    check=True,
+                    env={"LEGENDARY_CONFIG_PATH": self.legendary_config_path}
+                )
+                self.signals.show_status_message.emit(
+                    _("Successfully uninstalled '{0}'").format(game_name), 3000
+                )
+            except subprocess.CalledProcessError as e:
+                self.signals.show_status_message.emit(
+                    _("Failed to uninstall '{0}'").format(game_name), 3000
+                )
+                self.signals.show_warning_dialog.emit(
+                    _("Error"),
+                    _("Failed to uninstall '{0}': {1}").format(game_name, e.stderr)
+                )
+            except FileNotFoundError:
+                self.signals.show_status_message.emit(
+                    _("Legendary executable not found"), 3000
+                )
+                self.signals.show_warning_dialog.emit(
+                    _("Error"),
+                    _("Legendary executable not found")
+                )
+            except Exception as e:
+                self.signals.show_status_message.emit(
+                    _("Unexpected error during uninstall"), 3000
+                )
+                self.signals.show_warning_dialog.emit(
+                    _("Error"),
+                    _("Unexpected error during uninstall: {0}").format(str(e))
+                )
+
+        if self.parent.statusBar():
+            self.parent.statusBar().showMessage(
+                _("Uninstalling '{0}'...").format(game_name), 0
+            )
+            logger.debug("Direct status message: Uninstalling '%s'", game_name)
+        else:
+            logger.warning("Status bar not available when uninstalling '%s'", game_name)
+        threading.Thread(target=run_uninstall, daemon=True).start()
+
     def toggle_favorite(self, game_card, add: bool):
         """
         Toggle the favorite status of a game and update its icon.
@@ -104,18 +390,33 @@ class ContextMenuManager:
         if add and game_card.name not in favorites:
             favorites.append(game_card.name)
             game_card.is_favorite = True
-            self.parent.statusBar().showMessage(_("Added '{0}' to favorites").format(game_card.name), 3000)
+            if self.parent.statusBar():
+                self.parent.statusBar().showMessage(
+                    _("Added '{0}' to favorites").format(game_card.name), 3000
+                )
+                logger.debug("Direct status message: Added '%s' to favorites", game_card.name)
+            else:
+                logger.warning("Status bar not available when adding '%s' to favorites", game_card.name)
         elif not add and game_card.name in favorites:
             favorites.remove(game_card.name)
             game_card.is_favorite = False
-            self.parent.statusBar().showMessage(_("Removed '{0}' from favorites").format(game_card.name), 3000)
+            if self.parent.statusBar():
+                self.parent.statusBar().showMessage(
+                    _("Removed '{0}' from favorites").format(game_card.name), 3000
+                )
+                logger.debug("Direct status message: Removed '%s' from favorites", game_card.name)
+            else:
+                logger.warning("Status bar not available when removing '%s' from favorites", game_card.name)
         save_favorites(favorites)
         game_card.update_favorite_icon()
 
     def _check_portproton(self):
         """Check if PortProton is available."""
         if self.portproton_location is None:
-            QMessageBox.warning(self.parent, _("Error"), _("PortProton is not found."))
+            self._show_warning_dialog(
+                _("Error"),
+                _("PortProton is not found.")
+            )
             return False
         return True
 
@@ -139,33 +440,32 @@ class ContextMenuManager:
                 if entry:
                     exec_line = entry.get("Exec", entry.get("exec", "")).strip()
                     if not exec_line:
-                        QMessageBox.warning(
-                            self.parent, _("Error"),
+                        self._show_warning_dialog(
+                            _("Error"),
                             _("No executable command found in .desktop for game: {0}").format(game_name)
                         )
                         return None
                 else:
-                    QMessageBox.warning(
-                        self.parent, _("Error"),
+                    self._show_warning_dialog(
+                        _("Error"),
                         _("Failed to parse .desktop file for game: {0}").format(game_name)
                     )
                     return None
             except Exception as e:
-                QMessageBox.warning(
-                    self.parent, _("Error"),
+                self._show_warning_dialog(
+                    _("Error"),
                     _("Error reading .desktop file: {0}").format(e)
                 )
                 return None
         else:
-            # Fallback: Search all .desktop files
             for file in glob.glob(os.path.join(self.portproton_location, "*.desktop")):
                 entry = parse_desktop_entry(file)
                 if entry:
                     exec_line = entry.get("Exec", entry.get("exec", "")).strip()
                     if exec_line:
                         return exec_line
-            QMessageBox.warning(
-                self.parent, _("Error"),
+            self._show_warning_dialog(
+                _("Error"),
                 _(".desktop file not found for game: {0}").format(game_name)
             )
             return None
@@ -176,8 +476,8 @@ class ContextMenuManager:
         try:
             entry_exec_split = shlex.split(exec_line)
             if not entry_exec_split:
-                QMessageBox.warning(
-                    self.parent, _("Error"),
+                self._show_warning_dialog(
+                    _("Error"),
                     _("Invalid executable command: {0}").format(exec_line)
                 )
                 return None
@@ -188,15 +488,15 @@ class ContextMenuManager:
             else:
                 exe_path = entry_exec_split[-1]
             if not exe_path or not os.path.exists(exe_path):
-                QMessageBox.warning(
-                    self.parent, _("Error"),
+                self._show_warning_dialog(
+                    _("Error"),
                     _("Executable file not found: {0}").format(exe_path or "None")
                 )
                 return None
             return exe_path
         except Exception as e:
-            QMessageBox.warning(
-                self.parent, _("Error"),
+            self._show_warning_dialog(
+                _("Error"),
                 _("Failed to parse executable command: {0}").format(e)
             )
             return None
@@ -205,10 +505,17 @@ class ContextMenuManager:
         """Remove a file and handle errors."""
         try:
             os.remove(file_path)
-            self.parent.statusBar().showMessage(success_message.format(game_name), 3000)
+            if self.parent.statusBar():
+                self.parent.statusBar().showMessage(success_message.format(game_name), 3000)
+                logger.debug("Direct status message: %s", success_message.format(game_name))
+            else:
+                logger.warning("Status bar not available when removing file for '%s'", game_name)
             return True
         except OSError as e:
-            QMessageBox.warning(self.parent, _("Error"), error_message.format(e))
+            self._show_warning_dialog(
+                _("Error"),
+                error_message.format(e)
+            )
             return False
 
     def delete_game(self, game_name, exec_line):
@@ -229,13 +536,12 @@ class ContextMenuManager:
 
         desktop_path = self._get_desktop_path(game_name)
         if not os.path.exists(desktop_path):
-            QMessageBox.warning(
-                self.parent, _("Error"),
+            self._show_warning_dialog(
+                _("Error"),
                 _("Could not locate .desktop file for '{0}'").format(game_name)
             )
             return
 
-        # Get exec_line and parse exe_path
         exec_line = self._get_exec_line(game_name, exec_line)
         if not exec_line:
             return
@@ -243,7 +549,6 @@ class ContextMenuManager:
         exe_path = self._parse_exe_path(exec_line, game_name)
         exe_name = os.path.splitext(os.path.basename(exe_path))[0] if exe_path else None
 
-        # Remove .desktop file
         if not self._remove_file(
             desktop_path,
             _("Failed to delete .desktop file: {0}"),
@@ -252,7 +557,6 @@ class ContextMenuManager:
         ):
             return
 
-        # Remove custom data if we got an exe_name
         if exe_name:
             xdg_data_home = os.getenv(
                 "XDG_DATA_HOME",
@@ -263,15 +567,11 @@ class ContextMenuManager:
                 try:
                     shutil.rmtree(custom_folder)
                 except OSError as e:
-                    QMessageBox.warning(
-                        self.parent, _("Error"),
+                    self._show_warning_dialog(
+                        _("Error"),
                         _("Failed to delete custom data: {0}").format(e)
                     )
 
-        # Refresh UI
-        self.parent.games = self.load_games()
-        self.update_game_grid()
-
     def add_to_menu(self, game_name, exec_line):
         """Copy the .desktop file to ~/.local/share/applications."""
         if not self._check_portproton():
@@ -279,25 +579,29 @@ class ContextMenuManager:
 
         desktop_path = self._get_desktop_path(game_name)
         if not os.path.exists(desktop_path):
-            QMessageBox.warning(
-                self.parent, _("Error"),
+            self._show_warning_dialog(
+                _("Error"),
                 _("Could not locate .desktop file for '{0}'").format(game_name)
             )
             return
 
-        # Destination path
         applications_dir = os.path.join(os.path.expanduser("~"), ".local", "share", "applications")
         os.makedirs(applications_dir, exist_ok=True)
         dest_path = os.path.join(applications_dir, f"{game_name}.desktop")
 
-        # Copy .desktop file
         try:
             shutil.copyfile(desktop_path, dest_path)
-            os.chmod(dest_path, 0o755)  # Ensure executable permissions
-            self.parent.statusBar().showMessage(_("Game '{0}' added to menu").format(game_name), 3000)
+            os.chmod(dest_path, 0o755)
+            if self.parent.statusBar():
+                self.parent.statusBar().showMessage(
+                    _("Game '{0}' added to menu").format(game_name), 3000
+                )
+                logger.debug("Direct status message: Game '%s' added to menu", game_name)
+            else:
+                logger.warning("Status bar not available when adding '%s' to menu", game_name)
         except OSError as e:
-            QMessageBox.warning(
-                self.parent, _("Error"),
+            self._show_warning_dialog(
+                _("Error"),
                 _("Failed to add game to menu: {0}").format(str(e))
             )
 
@@ -319,25 +623,29 @@ class ContextMenuManager:
 
         desktop_path = self._get_desktop_path(game_name)
         if not os.path.exists(desktop_path):
-            QMessageBox.warning(
-                self.parent, _("Error"),
+            self._show_warning_dialog(
+                _("Error"),
                 _("Could not locate .desktop file for '{0}'").format(game_name)
             )
             return
 
-        # Destination path
         desktop_dir = subprocess.check_output(['xdg-user-dir', 'DESKTOP']).decode('utf-8').strip()
         os.makedirs(desktop_dir, exist_ok=True)
         dest_path = os.path.join(desktop_dir, f"{game_name}.desktop")
 
-        # Copy .desktop file
         try:
             shutil.copyfile(desktop_path, dest_path)
-            os.chmod(dest_path, 0o755)  # Ensure executable permissions
-            self.parent.statusBar().showMessage(_("Game '{0}' added to desktop").format(game_name), 3000)
+            os.chmod(dest_path, 0o755)
+            if self.parent.statusBar():
+                self.parent.statusBar().showMessage(
+                    _("Game '{0}' added to desktop").format(game_name), 3000
+                )
+                logger.debug("Direct status message: Game '%s' added to desktop", game_name)
+            else:
+                logger.warning("Status bar not available when adding '%s' to desktop", game_name)
         except OSError as e:
-            QMessageBox.warning(
-                self.parent, _("Error"),
+            self._show_warning_dialog(
+                _("Error"),
                 _("Failed to add game to desktop: {0}").format(str(e))
             )
 
@@ -354,7 +662,6 @@ class ContextMenuManager:
 
     def edit_game_shortcut(self, game_name, exec_line, cover_path):
         """Opens the AddGameDialog in edit mode to modify an existing .desktop file."""
-
         if not self._check_portproton():
             return
 
@@ -366,7 +673,6 @@ class ContextMenuManager:
         if not exe_path:
             return
 
-        # Open dialog in edit mode
         dialog = AddGameDialog(
             parent=self.parent,
             theme=self.theme,
@@ -382,16 +688,20 @@ class ContextMenuManager:
             new_cover_path = dialog.coverEdit.text().strip()
 
             if not new_name or not new_exe_path:
-                QMessageBox.warning(self.parent, _("Error"), _("Game name and executable path are required."))
+                self._show_warning_dialog(
+                    _("Error"),
+                    _("Game name and executable path are required.")
+                )
                 return
 
-            # Generate new .desktop file content
             desktop_entry, new_desktop_path = dialog.getDesktopEntryData()
             if not desktop_entry or not new_desktop_path:
-                QMessageBox.warning(self.parent, _("Error"), _("Failed to generate .desktop file data."))
+                self._show_warning_dialog(
+                    _("Error"),
+                    _("Failed to generate .desktop file data.")
+                )
                 return
 
-            # If the name has changed, remove the old .desktop file
             old_desktop_path = self._get_desktop_path(game_name)
             if game_name != new_name and os.path.exists(old_desktop_path):
                 self._remove_file(
@@ -401,16 +711,17 @@ class ContextMenuManager:
                     game_name
                 )
 
-            # Save the updated .desktop file
             try:
                 with open(new_desktop_path, "w", encoding="utf-8") as f:
                     f.write(desktop_entry)
                     os.chmod(new_desktop_path, 0o755)
             except OSError as e:
-                QMessageBox.warning(self.parent, _("Error"), _("Failed to save .desktop file: {0}").format(e))
+                self._show_warning_dialog(
+                    _("Error"),
+                    _("Failed to save .desktop file: {0}").format(e)
+                )
                 return
 
-            # Update custom cover if provided
             if os.path.isfile(new_cover_path):
                 exe_name = os.path.splitext(os.path.basename(new_exe_path))[0]
                 xdg_data_home = os.getenv(
@@ -425,16 +736,14 @@ class ContextMenuManager:
                     try:
                         shutil.copyfile(new_cover_path, os.path.join(custom_folder, f"cover{ext}"))
                     except OSError as e:
-                        QMessageBox.warning(self.parent, _("Error"), _("Failed to copy cover image: {0}").format(e))
+                        self._show_warning_dialog(
+                            _("Error"),
+                            _("Failed to copy cover image: {0}").format(e)
+                        )
                         return
 
-            # Refresh the game list
-            self.parent.games = self.load_games()
-            self.update_game_grid()
-
     def add_to_steam(self, game_name, exec_line, cover_path):
         """Handle adding a non-Steam game to Steam via steam_api."""
-
         if not self._check_portproton():
             return
 
@@ -446,37 +755,174 @@ class ContextMenuManager:
         if not exe_path:
             return
 
-        success, message = add_to_steam(game_name, exec_line, cover_path)
-        if success:
-            QMessageBox.information(
-                self.parent, _("Restart Steam"),
-                _("The game was added successfully.\nPlease restart Steam for changes to take effect.")
+        def on_add_to_steam_result(result: tuple[bool, str]):
+            success, message = result
+            if success:
+                self.signals.show_status_message.emit(
+                    _("The game was added successfully. Please restart Steam for changes to take effect."), 5000
+                )
+            else:
+                self.signals.show_warning_dialog.emit(_("Error"), message)
+
+        if self.parent.statusBar():
+            self.parent.statusBar().showMessage(
+                _("Adding '{0}' to Steam...").format(game_name), 0
             )
+            logger.debug("Direct status message: Adding '%s' to Steam", game_name)
         else:
-            QMessageBox.warning(self.parent, _("Error"), message)
-
-    def remove_from_steam(self, game_name, exec_line):
-        """Handle removing a non-Steam game from Steam via steam_api."""
+            logger.warning("Status bar not available when adding '%s' to Steam", game_name)
+        add_to_steam(game_name, exec_line, cover_path)
 
+    def remove_from_steam(self, game_name, exec_line, game_source):
+        """Handle removing a game from Steam via steam_api, supporting both EGS and non-EGS games."""
         if not self._check_portproton():
             return
 
-        exec_line = self._get_exec_line(game_name, exec_line)
-        if not exec_line:
-            return
+        def on_remove_from_steam_result(result: tuple[bool, str]):
+            success, message = result
+            if success:
+                self.signals.show_status_message.emit(
+                    _("The game was removed successfully. Please restart Steam for changes to take effect."), 5000
+                )
+            else:
+                self.signals.show_warning_dialog.emit(_("Error"), message)
 
-        exe_path = self._parse_exe_path(exec_line, game_name)
-        if not exe_path:
-            return
+        if game_source == "epic":
+            # For EGS games, construct the script path used in Steam shortcuts.vdf
+            if not self.portproton_location:
+                self._show_warning_dialog(
+                    _("Error"),
+                    _("PortProton directory not found")
+                )
+                return
+            steam_scripts_dir = os.path.join(self.portproton_location, "steam_scripts")
+            safe_game_name = re.sub(r'[<>:"/\\|?*]', '_', game_name.strip())
+            script_path = os.path.join(steam_scripts_dir, f"{safe_game_name}_egs.sh")
+            quoted_script_path = f'"{script_path}"'
+
+            # Directly remove the shortcut by matching AppName and Exe
+            try:
+                from portprotonqt.steam_api import get_steam_home, get_last_steam_user, convert_steam_id
+                steam_home = get_steam_home()
+                if not steam_home:
+                    self._show_warning_dialog(_("Error"), _("Steam directory not found"))
+                    return
+
+                last_user = get_last_steam_user(steam_home)
+                if not last_user or 'SteamID' not in last_user:
+                    self._show_warning_dialog(_("Error"), _("Failed to get Steam user ID"))
+                    return
+
+                userdata_dir = os.path.join(steam_home, "userdata")
+                user_id = last_user['SteamID']
+                unsigned_id = convert_steam_id(user_id)
+                user_dir = os.path.join(userdata_dir, str(unsigned_id))
+                steam_shortcuts_path = os.path.join(user_dir, "config", "shortcuts.vdf")
+                backup_path = f"{steam_shortcuts_path}.backup"
+
+                if not os.path.exists(steam_shortcuts_path):
+                    self._show_warning_dialog(
+                        _("Error"),
+                        _("Steam shortcuts file not found")
+                    )
+                    return
+
+                # Backup shortcuts.vdf
+                try:
+                    shutil.copy2(steam_shortcuts_path, backup_path)
+                    logger.info(f"Created backup of shortcuts.vdf at {backup_path}")
+                except Exception as e:
+                    self._show_warning_dialog(
+                        _("Error"),
+                        _("Failed to create backup of shortcuts.vdf: {0}").format(e)
+                    )
+                    return
+
+                # Load shortcuts.vdf
+                try:
+                    with open(steam_shortcuts_path, 'rb') as f:
+                        shortcuts_data = vdf.binary_load(f)
+                except Exception as e:
+                    self._show_warning_dialog(
+                        _("Error"),
+                        _("Failed to load shortcuts.vdf: {0}").format(e)
+                    )
+                    return
+
+                shortcuts = shortcuts_data.get("shortcuts", {})
+                modified = False
+                new_shortcuts = {}
+                index = 0
+
+                for _key, entry in shortcuts.items():
+                    if entry.get("AppName") == game_name and entry.get("Exe") == quoted_script_path:
+                        modified = True
+                        logger.info(f"Removing EGS game '{game_name}' from Steam shortcuts")
+                        continue
+                    new_shortcuts[str(index)] = entry
+                    index += 1
+
+                if not modified:
+                    self._show_warning_dialog(
+                        _("Error"),
+                        _("Game '{0}' not found in Steam shortcuts").format(game_name)
+                    )
+                    return
+
+                # Save updated shortcuts.vdf
+                try:
+                    with open(steam_shortcuts_path, 'wb') as f:
+                        vdf.binary_dump({"shortcuts": new_shortcuts}, f)
+                    logger.info(f"Updated shortcuts.vdf, removed '{game_name}'")
+                    on_remove_from_steam_result((True, f"Game '{game_name}' removed from Steam"))
+                except Exception as e:
+                    self._show_warning_dialog(
+                        _("Error"),
+                        _("Failed to update shortcuts.vdf: {0}").format(e)
+                    )
+                    if os.path.exists(backup_path):
+                        try:
+                            shutil.copy2(backup_path, steam_shortcuts_path)
+                            logger.info("Restored shortcuts.vdf from backup")
+                        except Exception as restore_err:
+                            logger.error(f"Failed to restore shortcuts.vdf: {restore_err}")
+                    on_remove_from_steam_result((False, f"Failed to update shortcuts.vdf: {e}"))
+                    return
+
+                # Optionally, remove the script file
+                if os.path.exists(script_path):
+                    try:
+                        os.remove(script_path)
+                        logger.info(f"Removed EGS script file: {script_path}")
+                    except Exception as e:
+                        logger.warning(f"Failed to remove EGS script file {script_path}: {e}")
+
+            except Exception as e:
+                self._show_warning_dialog(
+                    _("Error"),
+                    _("Failed to remove EGS game from Steam: {0}").format(e)
+                )
+                on_remove_from_steam_result((False, f"Failed to remove EGS game from Steam: {e}"))
+                return
 
-        success, message = remove_from_steam(game_name, exec_line)
-        if success:
-            QMessageBox.information(
-                self.parent, _("Restart Steam"),
-                _("The game was removed successfully.\nPlease restart Steam for changes to take effect.")
-            )
         else:
-            QMessageBox.warning(self.parent, _("Error"), message)
+            # For non-EGS games, use the existing logic
+            exec_line = self._get_exec_line(game_name, exec_line)
+            if not exec_line:
+                return
+
+            exe_path = self._parse_exe_path(exec_line, game_name)
+            if not exe_path:
+                return
+
+            if self.parent.statusBar():
+                self.parent.statusBar().showMessage(
+                    _("Removing '{0}' from Steam...").format(game_name), 0
+                )
+                logger.debug("Direct status message: Removing '%s' from Steam", game_name)
+            else:
+                logger.warning("Status bar not available when removing '%s' from Steam", game_name)
+            remove_from_steam(game_name, exec_line)
 
     def open_game_folder(self, game_name, exec_line):
         """Open the folder containing the game's executable."""
@@ -494,6 +940,15 @@ class ContextMenuManager:
         try:
             folder_path = os.path.dirname(os.path.abspath(exe_path))
             QDesktopServices.openUrl(QUrl.fromLocalFile(folder_path))
-            self.parent.statusBar().showMessage(_("Opened folder for '{0}'").format(game_name), 3000)
+            if self.parent.statusBar():
+                self.parent.statusBar().showMessage(
+                    _("Opened folder for '{0}'").format(game_name), 3000
+                )
+                logger.debug("Direct status message: Opened folder for '%s'", game_name)
+            else:
+                logger.warning("Status bar not available when opening folder for '%s'", game_name)
         except Exception as e:
-            QMessageBox.warning(self.parent, _("Error"), _("Failed to open game folder: {0}").format(str(e)))
+            self._show_warning_dialog(
+                _("Error"),
+                _("Failed to open game folder: {0}").format(str(e))
+            )

portprotonqt/egs_api.py

@@ -12,9 +12,42 @@ from collections.abc import Callable
 from portprotonqt.localization import get_egs_language, _
 from portprotonqt.logger import get_logger
 from portprotonqt.image_utils import load_pixmap_async
+from portprotonqt.time_utils import parse_playtime_file, format_playtime, get_last_launch, get_last_launch_timestamp
+from portprotonqt.config_utils import get_portproton_location
+from portprotonqt.steam_api import (
+    get_weanticheatyet_status_async, get_steam_apps_and_index_async, get_protondb_tier_async,
+    search_app, get_steam_home, get_last_steam_user, convert_steam_id, generate_thumbnail
+)
+import vdf
+import shutil
+import zlib
+from portprotonqt.downloader import Downloader
 from PySide6.QtGui import QPixmap
 
 logger = get_logger(__name__)
+downloader = Downloader()
+
+def get_egs_executable(app_name: str, legendary_config_path: str) -> str | None:
+    """Получает путь к исполняемому файлу EGS-игры из installed.json с использованием orjson."""
+    installed_json_path = os.path.join(legendary_config_path, "installed.json")
+    try:
+        with open(installed_json_path, "rb") as f:
+            installed_data = orjson.loads(f.read())
+            if app_name in installed_data:
+                install_path = installed_data[app_name].get("install_path", "").decode('utf-8') if isinstance(installed_data[app_name].get("install_path"), bytes) else installed_data[app_name].get("install_path", "")
+                executable = installed_data[app_name].get("executable", "").decode('utf-8') if isinstance(installed_data[app_name].get("executable"), bytes) else installed_data[app_name].get("executable", "")
+                if install_path and executable:
+                    return os.path.join(install_path, executable)
+            return None
+    except FileNotFoundError:
+        logger.error(f"installed.json not found at {installed_json_path}")
+        return None
+    except orjson.JSONDecodeError:
+        logger.error(f"Invalid JSON in {installed_json_path}")
+        return None
+    except Exception as e:
+        logger.error(f"Error reading installed.json: {e}")
+        return None
 
 def get_cache_dir() -> Path:
     """Returns the path to the cache directory, creating it if necessary."""
@@ -26,6 +59,237 @@ def get_cache_dir() -> Path:
     cache_dir.mkdir(parents=True, exist_ok=True)
     return cache_dir
 
+def add_egs_to_steam(app_name: str, game_title: str, legendary_path: str, callback: Callable[[tuple[bool, str]], None]) -> None:
+    """
+    Asynchronously adds an EGS game to Steam via shortcuts.vdf with PortProton tag.
+    Creates a launch script using legendary CLI with --no-wine and PortProton wrapper.
+    Wrapper is flatpak run if portproton_location is None or contains .var, otherwise start.sh.
+    Downloads Steam Grid covers if the game exists in Steam, and generates a thumbnail.
+    Calls the callback with (success, message).
+    """
+    if not app_name or not app_name.strip() or not game_title or not game_title.strip():
+        logger.error("Invalid app_name or game_title: empty or whitespace")
+        callback((False, "Game name or app name is empty or invalid"))
+        return
+
+    if not os.path.exists(legendary_path):
+        logger.error(f"Legendary executable not found: {legendary_path}")
+        callback((False, f"Legendary executable not found: {legendary_path}"))
+        return
+
+    portproton_dir = get_portproton_location()
+    if not portproton_dir:
+        logger.error("PortProton directory not found")
+        callback((False, "PortProton directory not found"))
+        return
+
+    # Determine wrapper
+    wrapper = "flatpak run ru.linux_gaming.PortProton"
+    start_sh_path = os.path.join(portproton_dir, "data", "scripts", "start.sh")
+    if portproton_dir is not None and ".var" not in portproton_dir:
+        wrapper = start_sh_path
+        if not os.path.exists(start_sh_path):
+            logger.error(f"start.sh not found at {start_sh_path}")
+            callback((False, f"start.sh not found at {start_sh_path}"))
+            return
+
+    # Create launch script
+    steam_scripts_dir = os.path.join(portproton_dir, "steam_scripts")
+    os.makedirs(steam_scripts_dir, exist_ok=True)
+    safe_game_name = re.sub(r'[<>:"/\\|?*]', '_', game_title.strip())
+    script_path = os.path.join(steam_scripts_dir, f"{safe_game_name}_egs.sh")
+    legendary_config_path = os.path.dirname(legendary_path)
+
+    script_content = f"""#!/usr/bin/env bash
+export LD_PRELOAD=
+export LEGENDARY_CONFIG_PATH="{legendary_config_path}"
+"{legendary_path}" launch {app_name} --no-wine --wrapper "env START_FROM_STEAM=1 {wrapper}" "$@"
+"""
+    try:
+        with open(script_path, "w", encoding="utf-8") as f:
+            f.write(script_content)
+        os.chmod(script_path, 0o755)
+        logger.info(f"Created launch script for EGS game: {script_path}")
+    except Exception as e:
+        logger.error(f"Failed to create launch script {script_path}: {e}")
+        callback((False, f"Failed to create launch script: {e}"))
+        return
+
+    # Generate thumbnail
+    generated_icon_path = os.path.join(portproton_dir, "data", "img", f"{safe_game_name}_egs.png")
+    try:
+        img_dir = os.path.join(portproton_dir, "data", "img")
+        os.makedirs(img_dir, exist_ok=True)
+        game_exe = get_egs_executable(app_name, legendary_config_path)
+        if not game_exe or not os.path.exists(game_exe):
+            logger.warning(f"Executable not found for {app_name}, skipping thumbnail generation")
+            icon_path = ""
+        elif os.path.exists(generated_icon_path):
+            logger.info(f"Reusing existing thumbnail: {generated_icon_path}")
+            icon_path = generated_icon_path
+        else:
+            success = generate_thumbnail(game_exe, generated_icon_path, size=128, force_resize=True)
+            if not success or not os.path.exists(generated_icon_path):
+                logger.warning(f"generate_thumbnail failed for {game_exe}")
+                icon_path = ""
+            else:
+                logger.info(f"Generated thumbnail: {generated_icon_path}")
+                icon_path = generated_icon_path
+    except Exception as e:
+        logger.error(f"Error generating thumbnail for {app_name}: {e}")
+        icon_path = ""
+
+    # Get Steam directories
+    steam_home = get_steam_home()
+    if not steam_home:
+        logger.error("Steam home directory not found")
+        callback((False, "Steam directory not found"))
+        return
+
+    last_user = get_last_steam_user(steam_home)
+    if not last_user or 'SteamID' not in last_user:
+        logger.error("Failed to retrieve Steam user ID")
+        callback((False, "Failed to get Steam user ID"))
+        return
+
+    userdata_dir = steam_home / "userdata"
+    user_id = last_user['SteamID']
+    unsigned_id = convert_steam_id(user_id)
+    user_dir = userdata_dir / str(unsigned_id)
+    steam_shortcuts_path = user_dir / "config" / "shortcuts.vdf"
+    grid_dir = user_dir / "config" / "grid"
+    os.makedirs(grid_dir, exist_ok=True)
+
+    # Backup shortcuts.vdf
+    backup_path = f"{steam_shortcuts_path}.backup"
+    if os.path.exists(steam_shortcuts_path):
+        try:
+            shutil.copy2(steam_shortcuts_path, backup_path)
+            logger.info(f"Created backup of shortcuts.vdf at {backup_path}")
+        except Exception as e:
+            logger.error(f"Failed to create backup of shortcuts.vdf: {e}")
+            callback((False, f"Failed to create backup of shortcuts.vdf: {e}"))
+            return
+
+    # Generate unique appid
+    unique_string = f"{script_path}{game_title}"
+    baseid = zlib.crc32(unique_string.encode('utf-8')) & 0xffffffff
+    appid = baseid | 0x80000000
+    if appid > 0x7FFFFFFF:
+        aidvdf = appid - 0x100000000
+    else:
+        aidvdf = appid
+
+    steam_appid = None
+    downloaded_count = 0
+    total_covers = 4
+    download_lock = threading.Lock()
+
+    def on_cover_download(cover_file: str, cover_type: str):
+        nonlocal downloaded_count
+        try:
+            if cover_file and os.path.exists(cover_file):
+                logger.info(f"Downloaded cover {cover_type} to {cover_file}")
+            else:
+                logger.warning(f"Failed to download cover {cover_type} for appid {steam_appid}")
+        except Exception as e:
+            logger.error(f"Error processing cover {cover_type} for appid {steam_appid}: {e}")
+        with download_lock:
+            downloaded_count += 1
+            if downloaded_count == total_covers:
+                finalize_shortcut()
+
+    def finalize_shortcut():
+        tags_dict = {'0': 'PortProton'}
+        shortcut = {
+            "appid": aidvdf,
+            "AppName": game_title,
+            "Exe": f'"{script_path}"',
+            "StartDir": f'"{os.path.dirname(script_path)}"',
+            "icon": icon_path,
+            "LaunchOptions": "",
+            "IsHidden": 0,
+            "AllowDesktopConfig": 1,
+            "AllowOverlay": 1,
+            "openvr": 0,
+            "Devkit": 0,
+            "DevkitGameID": "",
+            "LastPlayTime": 0,
+            "tags": tags_dict
+        }
+        logger.info(f"Shortcut entry for EGS game: {shortcut}")
+
+        try:
+            if not os.path.exists(steam_shortcuts_path):
+                os.makedirs(os.path.dirname(steam_shortcuts_path), exist_ok=True)
+                open(steam_shortcuts_path, 'wb').close()
+
+            try:
+                if os.path.getsize(steam_shortcuts_path) > 0:
+                    with open(steam_shortcuts_path, 'rb') as f:
+                        shortcuts_data = vdf.binary_load(f)
+                else:
+                    shortcuts_data = {"shortcuts": {}}
+            except Exception as load_err:
+                logger.warning(f"Failed to load shortcuts.vdf, starting fresh: {load_err}")
+                shortcuts_data = {"shortcuts": {}}
+
+            shortcuts = shortcuts_data.get("shortcuts", {})
+            for _key, entry in shortcuts.items():
+                if entry.get("AppName") == game_title and entry.get("Exe") == f'"{script_path}"':
+                    logger.info(f"EGS game '{game_title}' already exists in Steam shortcuts")
+                    callback((False, f"Game '{game_title}' already exists in Steam"))
+                    return
+
+            new_index = str(len(shortcuts))
+            shortcuts[new_index] = shortcut
+
+            with open(steam_shortcuts_path, 'wb') as f:
+                vdf.binary_dump({"shortcuts": shortcuts}, f)
+        except Exception as e:
+            logger.error(f"Failed to update shortcuts.vdf: {e}")
+            if os.path.exists(backup_path):
+                try:
+                    shutil.copy2(backup_path, steam_shortcuts_path)
+                    logger.info("Restored shortcuts.vdf from backup")
+                except Exception as restore_err:
+                    logger.error(f"Failed to restore shortcuts.vdf: {restore_err}")
+            callback((False, f"Failed to update shortcuts.vdf: {e}"))
+            return
+
+        logger.info(f"EGS game '{game_title}' added to Steam")
+        callback((True, f"Game '{game_title}' added to Steam with covers"))
+
+    def on_steam_apps(steam_data: tuple[list, dict]):
+        nonlocal steam_appid
+        steam_apps, steam_apps_index = steam_data
+        matching_app = search_app(game_title, steam_apps_index)
+        steam_appid = matching_app.get("appid") if matching_app else None
+
+        if not steam_appid:
+            logger.info(f"No Steam appid found for EGS game {game_title}, skipping cover download")
+            finalize_shortcut()
+            return
+
+        cover_types = [
+            (".jpg", "header.jpg"),
+            ("p.jpg", "library_600x900_2x.jpg"),
+            ("_hero.jpg", "library_hero.jpg"),
+            ("_logo.png", "logo.png")
+        ]
+
+        for suffix, cover_type in cover_types:
+            cover_file = os.path.join(grid_dir, f"{appid}{suffix}")
+            cover_url = f"https://cdn.cloudflare.steamstatic.com/steam/apps/{steam_appid}/{cover_type}"
+            downloader.download_async(
+                cover_url,
+                cover_file,
+                timeout=5,
+                callback=lambda result, cfile=cover_file, ctype=cover_type: on_cover_download(cfile, ctype)
+            )
+
+    get_steam_apps_and_index_async(on_steam_apps)
+
 def get_egs_game_description_async(
     app_name: str,
     callback: Callable[[str], None],
@@ -281,6 +545,7 @@ def get_egs_game_description_async(
 
     thread = threading.Thread(target=fetch_description, daemon=True)
     thread.start()
+
 def run_legendary_list_async(legendary_path: str, callback: Callable[[list | None], None]):
     """
     Асинхронно выполняет команду 'legendary list --json' и возвращает результат через callback.
@@ -326,6 +591,8 @@ def run_legendary_list_async(legendary_path: str, callback: Callable[[list | Non
 def load_egs_games_async(legendary_path: str, callback: Callable[[list[tuple]], None], downloader, update_progress: Callable[[int], None], update_status_message: Callable[[str, int], None]):
     """
     Асинхронно загружает Epic Games Store игры с использованием legendary CLI.
+    Читает статистику времени игры и последнего запуска из файла statistics.
+    Проверяет наличие игры в Steam для получения ProtonDB статуса.
     """
     logger.debug("Starting to load Epic Games Store games")
     games: list[tuple] = []
@@ -334,6 +601,14 @@ def load_egs_games_async(legendary_path: str, callback: Callable[[list[tuple]],
     cache_file = cache_dir / "legendary_games.json"
     cache_ttl = 3600  # Cache TTL in seconds (1 hour)
 
+    # Путь к файлу statistics
+    portproton_location = get_portproton_location()
+    if portproton_location is None:
+        logger.error("PortProton location is not set, cannot locate statistics file")
+        statistics_file = ""
+    else:
+        statistics_file = os.path.join(portproton_location, "data", "tmp", "statistics")
+
     if not os.path.exists(legendary_path):
         logger.info("Legendary binary not found, downloading...")
         def on_legendary_downloaded(result):
@@ -345,7 +620,7 @@ def load_egs_games_async(legendary_path: str, callback: Callable[[list[tuple]],
                     logger.error(f"Failed to make legendary binary executable: {e}")
                     callback(games)  # Return empty games list on failure
                     return
-                _continue_loading_egs_games(legendary_path, callback, metadata_dir, cache_dir, cache_file, cache_ttl, update_progress, update_status_message)
+                _continue_loading_egs_games(legendary_path, callback, metadata_dir, cache_dir, cache_file, cache_ttl, update_progress, update_status_message, statistics_file)
             else:
                 logger.error("Failed to download legendary binary")
                 callback(games)  # Return empty games list on failure
@@ -356,9 +631,9 @@ def load_egs_games_async(legendary_path: str, callback: Callable[[list[tuple]],
             callback(games)
         return
     else:
-        _continue_loading_egs_games(legendary_path, callback, metadata_dir, cache_dir, cache_file, cache_ttl, update_progress, update_status_message)
+        _continue_loading_egs_games(legendary_path, callback, metadata_dir, cache_dir, cache_file, cache_ttl, update_progress, update_status_message, statistics_file)
 
-def _continue_loading_egs_games(legendary_path: str, callback: Callable[[list[tuple]], None], metadata_dir: Path, cache_dir: Path, cache_file: Path, cache_ttl: int, update_progress: Callable[[int], None], update_status_message: Callable[[str, int], None]):
+def _continue_loading_egs_games(legendary_path: str, callback: Callable[[list[tuple]], None], metadata_dir: Path, cache_dir: Path, cache_file: Path, cache_ttl: int, update_progress: Callable[[int], None], update_status_message: Callable[[str, int], None], statistics_file: str):
     """
     Продолжает процесс загрузки EGS игр, либо из кэша, либо через legendary CLI.
     """
@@ -410,6 +685,33 @@ def _continue_loading_egs_games(legendary_path: str, callback: Callable[[list[tu
                         callback(final_games)
                 return
 
+            # Получаем путь к .exe для извлечения имени
+            game_exe = get_egs_executable(app_name, os.path.dirname(legendary_path))
+            exe_name = ""
+            if game_exe:
+                exe_name = os.path.splitext(os.path.basename(game_exe))[0]
+
+            # Читаем статистику из файла statistics
+            playtime_seconds = 0
+            formatted_playtime = ""
+            last_launch = _("Never")
+            last_launch_timestamp = 0
+            if exe_name and os.path.exists(statistics_file):
+                try:
+                    playtime_data = parse_playtime_file(statistics_file)
+                    matching_key = next(
+                        (key for key in playtime_data if os.path.basename(key).split('.')[0] == exe_name),
+                        None
+                    )
+                    if matching_key:
+                        playtime_seconds = playtime_data[matching_key]
+                        formatted_playtime = format_playtime(playtime_seconds)
+                except Exception as e:
+                    logger.error(f"Failed to parse playtime data for {app_name}: {e}")
+            if exe_name:
+                last_launch = get_last_launch(exe_name) or _("Never")
+                last_launch_timestamp = get_last_launch_timestamp(exe_name)
+
             metadata_file = metadata_dir / f"{app_name}.json"
             cover_url = ""
             try:
@@ -426,40 +728,54 @@ def _continue_loading_egs_games(legendary_path: str, callback: Callable[[list[tu
             image_folder = os.path.join(os.getenv("XDG_CACHE_HOME", os.path.join(os.path.expanduser("~"), ".cache")), "PortProtonQt", "images")
             local_path = os.path.join(image_folder, f"{app_name}.jpg") if cover_url else ""
 
-            def on_description_fetched(api_description: str):
-                final_description = api_description or _("No description available")
+            def on_steam_apps(steam_data: tuple[list, dict]):
+                steam_apps, steam_apps_index = steam_data
+                matching_app = search_app(title, steam_apps_index)
+                steam_appid = matching_app.get("appid") if matching_app else None
 
-                def on_cover_loaded(pixmap: QPixmap):
-                    from portprotonqt.steam_api import get_weanticheatyet_status_async
-                    def on_anticheat_status(status: str):
-                        nonlocal pending_images
-                        with results_lock:
-                            game_results[index] = (
-                                title,
-                                final_description,
-                                local_path if os.path.exists(local_path) else "",
-                                app_name,
-                                f"legendary:launch:{app_name}",
-                                "",
-                                _("Never"),
-                                "",
-                                "",
-                                status or "",
-                                0,
-                                0,
-                                "epic"
-                            )
-                            pending_images -= 1
-                            update_progress(total_games - pending_images)
-                            if pending_images == 0:
-                                final_games = [game_results[i] for i in sorted(game_results.keys())]
-                                callback(final_games)
+                def on_protondb_tier(protondb_tier: str):
+                    def on_description_fetched(api_description: str):
+                        final_description = api_description or _("No description available")
 
-                    get_weanticheatyet_status_async(title, on_anticheat_status)
+                        def on_cover_loaded(pixmap: QPixmap):
+                            def on_anticheat_status(status: str):
+                                nonlocal pending_images
+                                with results_lock:
+                                    game_results[index] = (
+                                        title,
+                                        final_description,
+                                        local_path if os.path.exists(local_path) else "",
+                                        app_name,
+                                        f"legendary:launch:{app_name}",
+                                        "",
+                                        last_launch,  # Время последнего запуска
+                                        formatted_playtime,  # Форматированное время игры
+                                        protondb_tier,  # ProtonDB tier
+                                        status or "",
+                                        last_launch_timestamp,  # Временная метка последнего запуска
+                                        playtime_seconds,  # Время игры в секундах
+                                        "epic"
+                                    )
+                                    pending_images -= 1
+                                    update_progress(total_games - pending_images)
+                                    if pending_images == 0:
+                                        final_games = [game_results[i] for i in sorted(game_results.keys())]
+                                        callback(final_games)
 
-                load_pixmap_async(cover_url, 600, 900, on_cover_loaded, app_name=app_name)
+                            get_weanticheatyet_status_async(title, on_anticheat_status)
 
-            get_egs_game_description_async(title, on_description_fetched)
+                        load_pixmap_async(cover_url, 600, 900, on_cover_loaded, app_name=app_name)
+
+                    get_egs_game_description_async(title, on_description_fetched)
+
+                if steam_appid:
+                    logger.info(f"Found Steam appid {steam_appid} for EGS game {title}")
+                    get_protondb_tier_async(steam_appid, on_protondb_tier)
+                else:
+                    logger.debug(f"No Steam app found for EGS game {title}")
+                    on_protondb_tier("")  # Proceed with empty ProtonDB tier
+
+            get_steam_apps_and_index_async(on_steam_apps)
 
         max_workers = min(4, len(valid_games))
         with ThreadPoolExecutor(max_workers=max_workers) as executor:

portprotonqt/game_card.py

@@ -171,7 +171,7 @@ class GameCard(QFrame):
         self.steamLabel.setVisible(self.steam_visible)
 
         # Epic Games Store бейдж
-        egs_icon = self.theme_manager.get_icon("steam")
+        egs_icon = self.theme_manager.get_icon("epic_games")
         self.egsLabel = ClickableLabel(
             "Epic Games",
             icon=egs_icon,

portprotonqt/main_window.py

@@ -17,7 +17,7 @@ from portprotonqt.system_overlay import SystemOverlay
 
 from portprotonqt.image_utils import load_pixmap_async, round_corners, ImageCarousel
 from portprotonqt.steam_api import get_steam_game_info_async, get_full_steam_game_info_async, get_steam_installed_games
-from portprotonqt.egs_api import load_egs_games_async
+from portprotonqt.egs_api import load_egs_games_async, get_egs_executable
 from portprotonqt.theme_manager import ThemeManager, load_theme_screenshots, load_logo
 from portprotonqt.time_utils import save_last_launch, get_last_launch, parse_playtime_file, format_playtime, get_last_launch_timestamp, format_last_launch
 from portprotonqt.config_utils import (
@@ -325,19 +325,25 @@ class MainWindow(QMainWindow):
                 self.update_status_message.emit
             )
         elif display_filter == "favorites":
-            def on_all_games(portproton_games, steam_games):
-                games = [game for game in portproton_games + steam_games if game[0] in favorites]
+            def on_all_games(portproton_games, steam_games, epic_games):
+                games = [game for game in portproton_games + steam_games + epic_games if game[0] in favorites]
                 self.games_loaded.emit(games)
             self._load_portproton_games_async(
                 lambda pg: self._load_steam_games_async(
-                    lambda sg: on_all_games(pg, sg)
+                    lambda sg: load_egs_games_async(
+                        self.legendary_path,
+                        lambda eg: on_all_games(pg, sg, eg),
+                        self.downloader,
+                        self.update_progress.emit,
+                        self.update_status_message.emit
+                    )
                 )
             )
         else:
-            def on_all_games(portproton_games, steam_games):
+            def on_all_games(portproton_games, steam_games, epic_games):
                 seen = set()
                 games = []
-                for game in portproton_games + steam_games:
+                for game in portproton_games + steam_games + epic_games:
                     # Уникальный ключ: имя + exec_line
                     key = (game[0], game[4])
                     if key not in seen:
@@ -346,7 +352,13 @@ class MainWindow(QMainWindow):
                 self.games_loaded.emit(games)
             self._load_portproton_games_async(
                 lambda pg: self._load_steam_games_async(
-                    lambda sg: on_all_games(pg, sg)
+                    lambda sg: load_egs_games_async(
+                        self.legendary_path,
+                        lambda eg: on_all_games(pg, sg, eg),
+                        self.downloader,
+                        self.update_progress.emit,
+                        self.update_status_message.emit
+                    )
                 )
             )
         return []
@@ -998,7 +1010,7 @@ class MainWindow(QMainWindow):
 
         # 3. Games display_filter
         self.filter_keys = ["all", "steam", "portproton", "favorites", "epic"]
-        self.filter_labels = [_("all"), "steam", "portproton", _("favorites")]
+        self.filter_labels = [_("all"), "steam", "portproton", _("favorites"), "epic games store"]
         self.gamesDisplayCombo = QComboBox()
         self.gamesDisplayCombo.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
         self.gamesDisplayCombo.addItems(self.filter_labels)
@@ -1081,6 +1093,37 @@ class MainWindow(QMainWindow):
         self.gamepadRumbleCheckBox.setChecked(current_rumble_state)
         formLayout.addRow(self.gamepadRumbleTitle, self.gamepadRumbleCheckBox)
 
+        # 8. Legendary Authentication
+        self.legendaryAuthButton = AutoSizeButton(
+            _("Open Legendary Login"),
+            icon=self.theme_manager.get_icon("login")
+        )
+        self.legendaryAuthButton.setStyleSheet(self.theme.ACTION_BUTTON_STYLE)
+        self.legendaryAuthButton.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
+        self.legendaryAuthButton.clicked.connect(self.openLegendaryLogin)
+        self.legendaryAuthTitle = QLabel(_("Legendary Authentication:"))
+        self.legendaryAuthTitle.setStyleSheet(self.theme.PARAMS_TITLE_STYLE)
+        self.legendaryAuthTitle.setFocusPolicy(Qt.FocusPolicy.NoFocus)
+        formLayout.addRow(self.legendaryAuthTitle, self.legendaryAuthButton)
+
+        self.legendaryCodeEdit = QLineEdit()
+        self.legendaryCodeEdit.setPlaceholderText(_("Enter Legendary Authorization Code"))
+        self.legendaryCodeEdit.setStyleSheet(self.theme.PROXY_INPUT_STYLE)
+        self.legendaryCodeEdit.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
+        self.legendaryCodeTitle = QLabel(_("Authorization Code:"))
+        self.legendaryCodeTitle.setStyleSheet(self.theme.PARAMS_TITLE_STYLE)
+        self.legendaryCodeTitle.setFocusPolicy(Qt.FocusPolicy.NoFocus)
+        formLayout.addRow(self.legendaryCodeTitle, self.legendaryCodeEdit)
+
+        self.submitCodeButton = AutoSizeButton(
+            _("Submit Code"),
+            icon=self.theme_manager.get_icon("save")
+        )
+        self.submitCodeButton.setStyleSheet(self.theme.ACTION_BUTTON_STYLE)
+        self.submitCodeButton.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
+        self.submitCodeButton.clicked.connect(self.submitLegendaryCode)
+        formLayout.addRow(QLabel(""), self.submitCodeButton)
+
         layout.addLayout(formLayout)
 
         # Кнопки
@@ -1131,6 +1174,37 @@ class MainWindow(QMainWindow):
             logger.error(f"Failed to open Legendary login page: {e}")
             self.statusBar().showMessage(_("Failed to open Legendary login page"), 3000)
 
+    def submitLegendaryCode(self):
+        """Submits the Legendary authorization code using the legendary CLI."""
+        auth_code = self.legendaryCodeEdit.text().strip()
+        if not auth_code:
+            QMessageBox.warning(self, _("Error"), _("Please enter an authorization code"))
+            return
+
+        try:
+            # Execute legendary auth command
+            result = subprocess.run(
+                [self.legendary_path, "auth", "--code", auth_code],
+                capture_output=True,
+                text=True,
+                check=True
+            )
+            logger.info("Legendary authentication successful: %s", result.stdout)
+            self.statusBar().showMessage(_("Successfully authenticated with Legendary"), 3000)
+            self.legendaryCodeEdit.clear()
+            # Reload Epic Games Store games after successful authentication
+            self.games = self.loadGames()
+            self.updateGameGrid()
+        except subprocess.CalledProcessError as e:
+            logger.error("Legendary authentication failed: %s", e.stderr)
+            self.statusBar().showMessage(_("Legendary authentication failed: {0}").format(e.stderr), 5000)
+        except FileNotFoundError:
+            logger.error("Legendary executable not found at %s", self.legendary_path)
+            self.statusBar().showMessage(_("Legendary executable not found"), 5000)
+        except Exception as e:
+            logger.error("Unexpected error during Legendary authentication: %s", str(e))
+            self.statusBar().showMessage(_("Unexpected error during authentication"), 5000)
+
     def resetSettings(self):
         """Сбрасывает настройки и перезапускает приложение."""
         reply = QMessageBox.question(
@@ -1526,7 +1600,7 @@ class MainWindow(QMainWindow):
         steamLabel.clicked.connect(lambda: QDesktopServices.openUrl(QUrl(f"https://steamcommunity.com/app/{appid}")))
 
         # Epic Games Store бейдж
-        egs_icon = self.theme_manager.get_icon("steam")
+        egs_icon = self.theme_manager.get_icon("epic_games")
         egsLabel = ClickableLabel(
             "Epic Games",
             icon=egs_icon,
@@ -1823,11 +1897,110 @@ class MainWindow(QMainWindow):
         self.target_exe = None
 
     def toggleGame(self, exec_line, button=None):
+        # Обработка Steam-игр
         if exec_line.startswith("steam://"):
             url = QUrl(exec_line)
             QDesktopServices.openUrl(url)
             return
 
+        # Обработка EGS-игр
+        if exec_line.startswith("legendary:launch:"):
+            app_name = exec_line.split("legendary:launch:")[1]
+
+            # Получаем путь к .exe из installed.json
+            game_exe = get_egs_executable(app_name, self.legendary_config_path)
+            if not game_exe or not os.path.exists(game_exe):
+                QMessageBox.warning(self, _("Error"), _("Executable not found for EGS game: {0}").format(app_name))
+                return
+
+            current_exe = os.path.basename(game_exe)
+            if self.game_processes and self.target_exe is not None and self.target_exe != current_exe:
+                QMessageBox.warning(self, _("Error"), _("Cannot launch game while another game is running"))
+                return
+
+            # Обновляем кнопку
+            update_button = button if button is not None else self.current_play_button
+            self.current_running_button = update_button
+            self.target_exe = current_exe
+            exe_name = os.path.splitext(current_exe)[0]
+
+            # Проверяем, запущена ли игра
+            if self.game_processes and self.target_exe == current_exe:
+                # Останавливаем игру
+                if hasattr(self, 'input_manager'):
+                    self.input_manager.enable_gamepad_handling()
+
+                for proc in self.game_processes:
+                    try:
+                        parent = psutil.Process(proc.pid)
+                        children = parent.children(recursive=True)
+                        for child in children:
+                            try:
+                                child.terminate()
+                            except psutil.NoSuchProcess:
+                                pass
+                        psutil.wait_procs(children, timeout=5)
+                        for child in children:
+                            if child.is_running():
+                                child.kill()
+                        os.killpg(os.getpgid(proc.pid), signal.SIGTERM)
+                    except psutil.NoSuchProcess:
+                        pass
+                self.game_processes = []
+                if update_button:
+                    update_button.setText(_("Play"))
+                    icon = self.theme_manager.get_icon("play")
+                    if isinstance(icon, str):
+                        icon = QIcon(icon)
+                    elif icon is None:
+                        icon = QIcon()
+                    update_button.setIcon(icon)
+                if hasattr(self, 'checkProcessTimer') and self.checkProcessTimer is not None:
+                    self.checkProcessTimer.stop()
+                    self.checkProcessTimer.deleteLater()
+                    self.checkProcessTimer = None
+                self.current_running_button = None
+                self.target_exe = None
+                self._gameLaunched = False
+            else:
+                # Запускаем игру через PortProton
+                env_vars = os.environ.copy()
+                env_vars['START_FROM_STEAM'] = '1'
+                env_vars['LEGENDARY_CONFIG_PATH'] = self.legendary_config_path
+
+                wrapper = "flatpak run ru.linux_gaming.PortProton"
+                if self.portproton_location is not None and ".var" not in self.portproton_location:
+                    start_sh = os.path.join(self.portproton_location, "data", "scripts", "start.sh")
+                    wrapper = start_sh
+
+                cmd = [wrapper, game_exe]
+
+                try:
+                    process = subprocess.Popen(cmd, env=env_vars, shell=False, preexec_fn=os.setsid)
+                    self.game_processes.append(process)
+                    save_last_launch(exe_name, datetime.now())
+                    if update_button:
+                        update_button.setText(_("Launching"))
+                        icon = self.theme_manager.get_icon("stop")
+                        if isinstance(icon, str):
+                            icon = QIcon(icon)
+                        elif icon is None:
+                            icon = QIcon()
+                        update_button.setIcon(icon)
+
+                    # Delay disabling gamepad handling
+                    if hasattr(self, 'input_manager'):
+                        QTimer.singleShot(200, self.input_manager.disable_gamepad_handling)
+
+                    self.checkProcessTimer = QTimer(self)
+                    self.checkProcessTimer.timeout.connect(self.checkTargetExe)
+                    self.checkProcessTimer.start(500)
+                except Exception as e:
+                    logger.error(f"Failed to launch EGS game {app_name}: {e}")
+                    QMessageBox.warning(self, _("Error"), _("Failed to launch game: {0}").format(str(e)))
+            return
+
+        # Обработка PortProton-игр
         entry_exec_split = shlex.split(exec_line)
         if entry_exec_split[0] == "env":
             if len(entry_exec_split) < 3:
@@ -1841,18 +2014,20 @@ class MainWindow(QMainWindow):
             file_to_check = entry_exec_split[3]
         else:
             file_to_check = entry_exec_split[0]
+
         if not os.path.exists(file_to_check):
             QMessageBox.warning(self, _("Error"), _("File not found: {0}").format(file_to_check))
             return
-        current_exe = os.path.basename(file_to_check)
 
+        current_exe = os.path.basename(file_to_check)
         if self.game_processes and self.target_exe is not None and self.target_exe != current_exe:
             QMessageBox.warning(self, _("Error"), _("Cannot launch game while another game is running"))
             return
 
+        # Обновляем кнопку
         update_button = button if button is not None else self.current_play_button
 
-        # Если игра уже запущена для этого exe – останавливаем её по нажатию кнопки
+        # Если игра уже запущена для этого exe – останавливаем её
         if self.game_processes and self.target_exe == current_exe:
             if hasattr(self, 'input_manager'):
                 self.input_manager.enable_gamepad_handling()
@@ -1905,6 +2080,15 @@ class MainWindow(QMainWindow):
                 env_vars['START_FROM_STEAM'] = '1'
             elif entry_exec_split[0] == "flatpak":
                 env_vars['START_FROM_STEAM'] = '1'
+            return
+
+        # Запускаем игру
+        self.current_running_button = update_button
+        self.target_exe = current_exe
+        exe_name = os.path.splitext(current_exe)[0]
+        env_vars = os.environ.copy()
+        env_vars['START_FROM_STEAM'] = '1'
+        try:
             process = subprocess.Popen(entry_exec_split, env=env_vars, shell=False, preexec_fn=os.setsid)
             self.game_processes.append(process)
             save_last_launch(exe_name, datetime.now())
@@ -1920,6 +2104,9 @@ class MainWindow(QMainWindow):
             self.checkProcessTimer = QTimer(self)
             self.checkProcessTimer.timeout.connect(self.checkTargetExe)
             self.checkProcessTimer.start(500)
+        except Exception as e:
+            logger.error(f"Failed to launch game {exe_name}: {e}")
+            QMessageBox.warning(self, _("Error"), _("Failed to launch game: {0}").format(str(e)))
 
     def closeEvent(self, event):
         """Завершает все дочерние процессы и сохраняет настройки при закрытии окна."""