fix(deps): lock file maintenance python dependencies

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

.gitea/workflows/renovate.yml

@@ -8,11 +8,24 @@ on:
 jobs:
   renovate:
     runs-on: ubuntu-latest
-    container: ghcr.io/renovatebot/renovate:41.1.4
+    container: ghcr.io/renovatebot/renovate:latest
     steps:
       - uses: https://gitea.com/actions/checkout@v4
-      - run: renovate
+
+      - name: Install uv
+        uses: https://github.com/astral-sh/setup-uv@v6
+        with:
+          enable-cache: true
+
+      - name: Download external renovate config
+        run: |
+          mkdir -p /tmp/renovate-config
+          curl -fsSL "https://git.linux-gaming.ru/Linux-Gaming/renovate-config/raw/branch/main/config.js" \
+            -o /tmp/renovate-config/config.js
+
+      - name: Run Renovate
+        run: renovate
         env:
-          RENOVATE_CONFIG_FILE: "/workspace/Boria138/PortProtonQt/config.js"
+          RENOVATE_CONFIG_FILE: "/tmp/renovate-config/config.js"
           LOG_LEVEL: "debug"
           RENOVATE_TOKEN: ${{ secrets.RENOVATE_TOKEN }}

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 exclude: '(data/|documentation/|portprotonqt/locales/|portprotonqt/custom_data/|dev-scripts/|\.venv/|venv/|.*\.svg$)'
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -11,15 +11,14 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/astral-sh/uv-pre-commit
-    rev: 0.6.14
+    rev: 0.8.9
     hooks:
       - id: uv-lock
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.5
+    rev: v0.12.8
     hooks:
-      - id: ruff
-        args: [--fix]
+      - id: ruff-check
 
   - repo: local
     hooks:

CHANGELOG.md

@@ -7,12 +7,15 @@
 
 ### Added
 - Больше типов анимаций при открытии карточки игры (за подробностями в документацию)
+- Анимация при выходе из карточки игры (за подробностями в документацию)
 
 ### Changed
 - Уменьшена длительность анимации открытия карточки с 800 до 350мс
 - Контекстное меню при открытие теперь сразу фокусируется на первом элементе
 - Анимации теперь можно настраивать через темы (за подробностями в документацию)
 - Общие json (steam_apps и anticheat_games) теперь перекачиваются если сломаны
+- Временно удалена светлая тема
+- Добавление и удаление игр из Steam теперь не требует перезагрузки Steam
 
 ### Fixed
 - legendary list теперь не вызывается если вход в EGS не был произведён
@@ -22,6 +25,7 @@
 
 
 ### Contributors
+- @Alex Smith
 
 ---
 

TODO.md

@@ -41,7 +41,7 @@
 - [X] Получать slug через GraphQL [запрос](https://launcher.store.epicgames.com/graphql)
 - [X] Добавить на карточку бейдж, указывающий, что игра из Steam
 - [X] Добавить поддержку версий Steam для Flatpak и Snap
-- [ ] Реализовать добавление игры как сторонней в Steam без перезапуска
+- [X] Реализовать добавление игры как сторонней в Steam без перезапуска
 - [X] Отображать данные о самом последнем пользователе Steam, а не первом попавшемся
 - [X] Исправить склонения в детальном выводе времени, например, не «3 часов назад», а «3 часа назад»
 - [X] Добавить перевод через gettext [Документация](documentation/localization_guide)

build-aux/PKGBUILD

@@ -6,7 +6,7 @@ arch=('any')
 url="https://git.linux-gaming.ru/Boria138/PortProtonQt"
 license=('GPL-3.0')
 depends=('python-numpy' 'python-requests' 'python-babel' 'python-evdev' 'python-pyudev' 'python-orjson'
-    'python-psutil' 'python-tqdm' 'python-vdf' 'pyside6' 'icoextract' 'python-pillow' 'perl-image-exiftool' 'xdg-utils' 'python-beautifulsoup4')
+    'python-psutil' 'python-tqdm' 'python-vdf' 'pyside6' 'icoextract' 'python-pillow' 'perl-image-exiftool' 'xdg-utils' 'python-beautifulsoup4' 'python-websocket-client')
 makedepends=('python-'{'build','installer','setuptools','wheel'})
 source=("git+https://git.linux-gaming.ru/Boria138/PortProtonQt#tag=v$pkgver")
 sha256sums=('SKIP')

build-aux/PKGBUILD-git

@@ -6,7 +6,7 @@ arch=('any')
 url="https://git.linux-gaming.ru/Boria138/PortProtonQt"
 license=('GPL-3.0')
 depends=('python-numpy' 'python-requests' 'python-babel' 'python-evdev' 'python-pyudev' 'python-orjson'
-    'python-psutil' 'python-tqdm' 'python-vdf' 'pyside6' 'icoextract' 'python-pillow' 'perl-image-exiftool' 'xdg-utils' 'python-beautifulsoup4')
+    'python-psutil' 'python-tqdm' 'python-vdf' 'pyside6' 'icoextract' 'python-pillow' 'perl-image-exiftool' 'xdg-utils' 'python-beautifulsoup4' 'python-websocket-client')
 makedepends=('python-'{'build','installer','setuptools','wheel'})
 source=("git+https://git.linux-gaming.ru/Boria138/PortProtonQt.git")
 sha256sums=('SKIP')

build-aux/fedora-git.spec

@@ -33,6 +33,7 @@ Requires:       python3-babel
 Requires:       python3-evdev
 Requires:       python3-icoextract
 Requires:       python3-numpy
+Requires:       python3-websocket-client
 Requires:       python3-orjson
 Requires:       python3-psutil
 Requires:       python3-pyside6

build-aux/fedora.spec

@@ -30,6 +30,7 @@ Requires:       python3-babel
 Requires:       python3-evdev
 Requires:       python3-icoextract
 Requires:       python3-numpy
+Requires:       python3-websocket-client
 Requires:       python3-orjson
 Requires:       python3-psutil
 Requires:       python3-pyside6

config.js

@@ -1,8 +0,0 @@
-module.exports = {
-    "endpoint": "https://git.linux-gaming.ru/api/v1",
-    "gitAuthor": "Renovate Bot <noreply@linux-gaming.ru>",
-    "platform": "gitea",
-    "onboardingConfigFileName": "renovate.json",
-    "autodiscover": true,
-    "optimizeForDisabled": true,
-};

documentation/localization_guide/README.md

@@ -3,10 +3,11 @@
 ---
 
 ## 📋 Contents
-- [Overview](#overview)
-- [Adding a New Translation](#adding-a-new-translation)
-- [Updating Existing Translations](#updating-existing-translations)
-- [Compiling Translations](#compiling-translations)
+- [Overview](#-overview)
+- [Adding a New Translation](#-adding-a-new-translation)
+- [Updating Existing Translations](#-updating-existing-translations)
+- [Compiling Translations](#-compiling-translations)
+- [Spell Check](#-spell-check)
 
 ---
 

documentation/localization_guide/README.ru.md

@@ -3,10 +3,11 @@
 ---
 
 ## 📋 Содержание
-- [Обзор](#обзор)
-- [Добавление нового перевода](#добавление-нового-перевода)
-- [Обновление существующих переводов](#обновление-существующих-переводов)
-- [Компиляция переводов](#компиляция-переводов)
+- [Обзор](#-обзор)
+- [Добавление нового перевода](#-добавление-нового-перевода)
+- [Обновление существующих переводов](#-обновление-существующих-переводов)
+- [Компиляция переводов](#-компиляция-переводов)
+- [Проверка орфографии](#-проверка-орфографии)
 
 ---
 

documentation/metadata_override/README.md

@@ -3,15 +3,10 @@
 ---
 
 ## 📋 Contents
-- [Overview](#overview)
-- [How It Works](#how-it-works)
-  - [Data Priorities](#data-priorities)
-  - [File Structure](#file-structure)
-- [For Users](#for-users)
-  - [Creating User Overrides](#creating-user-overrides)
-  - [Example](#example)
-- [For Developers](#for-developers)
-  - [Adding Built-In Overrides](#adding-built-in-overrides)
+- [Overview](#-overview)
+- [How It Works](#-how-it-works)
+- [For Users](#-for-users)
+- [For Developers](#-for-developers)
 
 ---
 

documentation/metadata_override/README.ru.md

@@ -3,15 +3,10 @@
 ---
 
 ## 📋 Содержание
-- [Обзор](#обзор)
-- [Как это работает](#как-это-работает)
-  - [Приоритеты данных](#приоритеты-данных)
-  - [Структура файлов](#структура-файлов)
-- [Для пользователей](#для-пользователей)
-  - [Создание пользовательских переопределений](#создание-пользовательских-переопределений)
-  - [Пример](#пример)
-- [Для разработчиков](#для-разработчиков)
-  - [Добавление встроенных переопределений](#добавление-встроенных-переопределений)
+- [Обзор](#-обзор)
+- [Как это работает](#-как-это-работает)
+- [Для пользователей](#-для-пользователей)
+- [Для разработчиков](#-для-разработчиков)
 
 ---
 

documentation/theme_guide/README.md

@@ -52,42 +52,103 @@ The `GAME_CARD_ANIMATION` dictionary controls all animation parameters for game
 
 ```python
 GAME_CARD_ANIMATION = {
-    # Animation type when transitioning to a detailed page
-    # Available values: "fade", "slide_left", "slide_right", "slide_up", "slide_down", "bounce"
+    # Type of animation when entering and exiting the detail page
+    # Possible values: "fade", "slide_left", "slide_right", "slide_up", "slide_down", "bounce"
     "detail_page_animation_type": "fade",
 
-    # Border width settings (in pixels)
+    # Border width of the card in idle state (no hover or focus).
+    # Affects the thickness of the border when the card is not highlighted.
+    # Value in pixels.
     "default_border_width": 2,
+
+    # Border width on hover.
+    # Increases the border thickness when the cursor is over the card.
+    # Value in pixels.
     "hover_border_width": 8,
+
+    # Border width on focus (e.g., selected via keyboard).
+    # Increases the border thickness when the card is focused.
+    # Value in pixels.
     "focus_border_width": 12,
+
+    # Minimum border width during pulsing animation.
+    # Sets the minimum border thickness during the "breathing" animation.
+    # Value in pixels.
     "pulse_min_border_width": 8,
+
+    # Maximum border width during pulsing animation.
+    # Sets the maximum border thickness during pulsing.
+    # Value in pixels.
     "pulse_max_border_width": 10,
 
-    # Animation duration (in milliseconds)
+    # Duration of the border thickness animation (e.g., on hover or focus).
+    # Affects the speed of transition between different border widths.
+    # Value in milliseconds.
     "thickness_anim_duration": 300,
+
+    # Duration of one pulsing animation cycle.
+    # Defines how fast the border "pulses" between min and max values.
+    # Value in milliseconds.
     "pulse_anim_duration": 800,
+
+    # Duration of the gradient rotation animation.
+    # Affects how fast the gradient border rotates around the card.
+    # Value in milliseconds.
     "gradient_anim_duration": 3000,
 
-    # Gradient animation angles (in degrees)
+    # Starting angle of the gradient (in degrees).
+    # Defines the initial rotation point of the gradient when the animation starts.
     "gradient_start_angle": 360,
+
+    # Ending angle of the gradient (in degrees).
+    # Defines the end rotation point of the gradient.
+    # A value of 0 means a full 360-degree rotation.
     "gradient_end_angle": 0,
 
-    # Smoothing curves for smooth animations
+    # Easing curve type for border expansion animation (on hover/focus).
+    # Affects the "feel" of the animation (e.g., smooth acceleration or deceleration).
+    # Possible values: strings corresponding to QEasingCurve.Type (e.g., "OutBack", "InOutQuad").
     "thickness_easing_curve": "OutBack",
+
+    # Easing curve type for border contraction animation (on mouse leave/focus loss).
+    # Affects the "feel" of returning to the original border width.
     "thickness_easing_curve_out": "InBack",
 
-    # Gradient colors for animated stroke
+    # Gradient colors for the animated border.
+    # A list of dictionaries where each defines a position (0.0–1.0) and color in hex format.
+    # Affects the appearance of the border on hover or focus.
     "gradient_colors": [
-        {"position": 0, "color": "#00fff5"},
-        {"position": 0.33, "color": "#FF5733"},
-        {"position": 0.66, "color": "#9B59B6"},
-        {"position": 1, "color": "#00fff5"}
+        {"position": 0, "color": "#00fff5"},    # Start color (cyan)
+        {"position": 0.33, "color": "#FF5733"}, # 33% color (orange)
+        {"position": 0.66, "color": "#9B59B6"}, # 66% color (purple)
+        {"position": 1, "color": "#00fff5"}     # End color (back to cyan)
     ],
 
-    # Duration of transitions to the detailed page
+    # Duration of the fade animation when entering the detail page
     "detail_page_fade_duration": 350,
+
+    # Duration of the slide animation when entering the detail page
     "detail_page_slide_duration": 500,
-    "detail_page_zoom_duration": 400
+
+    # Duration of the bounce animation when entering the detail page
+    "detail_page_bounce_duration": 400,
+
+    # Duration of the fade animation when exiting the detail page
+    "detail_page_fade_duration_exit": 350,
+
+    # Duration of the slide animation when exiting the detail page
+    "detail_page_slide_duration_exit": 500,
+
+    # Duration of the bounce animation when exiting the detail page
+    "detail_page_bounce_duration_exit": 400,
+
+    # Easing curve type for animation when entering the detail page
+    # Applies to slide and bounce animations
+    "detail_page_easing_curve": "OutCubic",
+
+    # Easing curve type for animation when exiting the detail page
+    # Applies to slide and bounce animations
+    "detail_page_easing_curve_exit": "InCubic"
 }
 ```
 

documentation/theme_guide/README.ru.md

@@ -52,42 +52,103 @@ def custom_button_style(color1, color2):
 
 ```python
 GAME_CARD_ANIMATION = {
-    # Тип анимации при переходе на детальную страницу
-    # Доступные значения: "fade", "slide_left", "slide_right", "slide_up", "slide_down", "bounce"
+    # Тип анимации при входе и выходе на детальную страницу
+    # Возможные значения: "fade", "slide_left", "slide_right", "slide_up", "slide_down", "bounce"
     "detail_page_animation_type": "fade",
 
-    # Настройки ширины обводки (в пикселях)
+    # Ширина обводки карточки в состоянии покоя (без наведения или фокуса).
+    # Влияет на толщину рамки вокруг карточки, когда она не выделена.
+    # Значение в пикселях.
     "default_border_width": 2,
+
+    # Ширина обводки при наведении курсора.
+    # Увеличивает толщину рамки, когда курсор находится над карточкой.
+    # Значение в пикселях.
     "hover_border_width": 8,
+
+    # Ширина обводки при фокусе (например, при выборе с клавиатуры).
+    # Увеличивает толщину рамки, когда карточка в фокусе.
+    # Значение в пикселях.
     "focus_border_width": 12,
+
+    # Минимальная ширина обводки во время пульсирующей анимации.
+    # Определяет минимальную толщину рамки при пульсации (анимация "дыхания").
+    # Значение в пикселях.
     "pulse_min_border_width": 8,
+
+    # Максимальная ширина обводки во время пульсирующей анимации.
+    # Определяет максимальную толщину рамки при пульсации.
+    # Значение в пикселях.
     "pulse_max_border_width": 10,
 
-    # Длительности анимаций (в миллисекундах)
+    # Длительность анимации изменения толщины обводки (например, при наведении или фокусе).
+    # Влияет на скорость перехода от одной ширины обводки к другой.
+    # Значение в миллисекундах.
     "thickness_anim_duration": 300,
+
+    # Длительность одного цикла пульсирующей анимации.
+    # Определяет, как быстро рамка "пульсирует" между min и max значениями.
+    # Значение в миллисекундах.
     "pulse_anim_duration": 800,
+
+    # Длительность анимации вращения градиента.
+    # Влияет на скорость, с которой градиентная обводка вращается вокруг карточки.
+    # Значение в миллисекундах.
     "gradient_anim_duration": 3000,
 
-    # Углы анимации градиента (в градусах)
+    # Начальный угол градиента (в градусах).
+    # Определяет начальную точку вращения градиента при старте анимации.
     "gradient_start_angle": 360,
+
+    # Конечный угол градиента (в градусах).
+    # Определяет конечную точку вращения градиента.
+    # Значение 0 означает полный поворот на 360 градусов.
     "gradient_end_angle": 0,
 
-    # Кривые сглаживания для плавных анимаций
+    # Тип кривой сглаживания для анимации увеличения обводки (при наведении/фокусе).
+    # Влияет на "чувство" анимации (например, плавное ускорение или замедление).
+    # Возможные значения: строки, соответствующие QEasingCurve.Type (например, "OutBack", "InOutQuad").
     "thickness_easing_curve": "OutBack",
+
+    # Тип кривой сглаживания для анимации уменьшения обводки (при уходе курсора/потере фокуса).
+    # Влияет на "чувство" возврата к исходной ширине обводки.
     "thickness_easing_curve_out": "InBack",
 
-    # Цвета градиента для анимированной обводки
+    # Цвета градиента для анимированной обводки.
+    # Список словарей, где каждый словарь задает позицию (0.0–1.0) и цвет в формате hex.
+    # Влияет на внешний вид обводки при наведении или фокусе.
     "gradient_colors": [
-        {"position": 0, "color": "#00fff5"},
-        {"position": 0.33, "color": "#FF5733"},
-        {"position": 0.66, "color": "#9B59B6"},
-        {"position": 1, "color": "#00fff5"}
+        {"position": 0, "color": "#00fff5"},    # Начальный цвет (циан)
+        {"position": 0.33, "color": "#FF5733"}, # Цвет на 33% (оранжевый)
+        {"position": 0.66, "color": "#9B59B6"}, # Цвет на 66% (пурпурный)
+        {"position": 1, "color": "#00fff5"}     # Конечный цвет (возвращение к циану)
     ],
 
-    # Длительности переходов на детальную страницу
+    # Длительность анимации fade при входе на детальную страницу
     "detail_page_fade_duration": 350,
+
+    # Длительность анимации slide при входе на детальную страницу
     "detail_page_slide_duration": 500,
-    "detail_page_zoom_duration": 400
+
+    # Длительность анимации bounce при входе на детальную страницу
+    "detail_page_bounce_duration": 400,
+
+    # Длительность анимации fade при выходе из детальной страницы
+    "detail_page_fade_duration_exit": 350,
+
+    # Длительность анимации slide при выходе из детальной страницы
+    "detail_page_slide_duration_exit": 500,
+
+    # Длительность анимации bounce при выходе из детальной страницы
+    "detail_page_bounce_duration_exit": 400,
+
+    # Тип кривой сглаживания для анимации при входе на детальную страницу
+    # Применяется к slide и bounce анимациям
+    "detail_page_easing_curve": "OutCubic",
+
+    # Тип кривой сглаживания для анимации при выходе из детальной страницы
+    # Применяется к slide и bounce анимациям
+    "detail_page_easing_curve_exit": "InCubic"
 }
 ```
 

portprotonqt/animations.py

@@ -7,6 +7,19 @@ from portprotonqt.logger import get_logger
 
 logger = get_logger(__name__)
 
+class SafeOpacityEffect(QGraphicsOpacityEffect):
+    def __init__(self, parent=None, disable_at_full=True):
+        super().__init__(parent)
+        self.disable_at_full = disable_at_full
+
+    def setOpacity(self, opacity: float):
+        opacity = max(0.0, min(1.0, opacity))
+        super().setOpacity(opacity)
+        if opacity < 1.0:
+            self.setEnabled(True)
+        elif self.disable_at_full:
+            self.setEnabled(False)
+
 class GameCardAnimations:
     def __init__(self, game_card, theme=None):
         self.game_card = game_card
@@ -138,7 +151,9 @@ class GameCardAnimations:
                 self.thickness_anim.start()
 
     def paint_border(self, painter: QPainter):
-        """Paint the animated border for the GameCard."""
+        if not painter.isActive():
+            logger.warning("Painter is not active; skipping border paint")
+            return
         painter.setRenderHint(QPainter.RenderHint.Antialiasing)
         pen = QPen()
         pen.setWidth(self.game_card._borderWidth)
@@ -154,6 +169,8 @@ class GameCardAnimations:
         radius = 18
         bw = round(self.game_card._borderWidth / 2)
         rect = self.game_card.rect().adjusted(bw, bw, -bw, -bw)
+        if rect.isEmpty():
+            return  # Avoid drawing invalid rect
         painter.drawRoundedRect(rect, radius, radius)
 
 class DetailPageAnimations:
@@ -164,21 +181,28 @@ class DetailPageAnimations:
 
     def animate_detail_page(self, detail_page: QWidget, load_image_and_restore_effect: Callable, cleanup_animation: Callable):
         """Animate the detail page based on theme settings."""
-        shadow = detail_page.graphicsEffect()
         animation_type = self.theme.GAME_CARD_ANIMATION.get("detail_page_animation_type", "fade")
         duration = self.theme.GAME_CARD_ANIMATION.get("detail_page_fade_duration", 350)
 
         if animation_type == "fade":
-            opacity_effect = QGraphicsOpacityEffect(detail_page)
+            original_effect = detail_page.graphicsEffect()
+            opacity_effect = SafeOpacityEffect(detail_page, disable_at_full=True)
+            opacity_effect.setOpacity(0.0)
             detail_page.setGraphicsEffect(opacity_effect)
             animation = QPropertyAnimation(opacity_effect, QByteArray(b"opacity"))
             animation.setDuration(duration)
-            animation.setStartValue(0)
-            animation.setEndValue(1)
+            animation.setStartValue(0.0)
+            animation.setEndValue(0.999)
             animation.start(QAbstractAnimation.DeletionPolicy.DeleteWhenStopped)
             self.animations[detail_page] = animation
-            animation.finished.connect(lambda: detail_page.setGraphicsEffect(shadow) if shadow is not None else detail_page.setGraphicsEffect(None)) # type: ignore
+            def restore_effect():
+                try:
+                    detail_page.setGraphicsEffect(original_effect) # type: ignore
+                except RuntimeError:
+                    logger.debug("Original effect already deleted")
+            animation.finished.connect(restore_effect)
             animation.finished.connect(load_image_and_restore_effect)
+            animation.finished.connect(opacity_effect.deleteLater)
         elif animation_type in ["slide_left", "slide_right", "slide_up", "slide_down"]:
             duration = self.theme.GAME_CARD_ANIMATION.get("detail_page_slide_duration", 500)
             easing_curve = QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION.get("detail_page_easing_curve", "OutCubic")])
@@ -243,15 +267,24 @@ class DetailPageAnimations:
             # Define animation based on type
             if animation_type == "fade":
                 duration = self.theme.GAME_CARD_ANIMATION.get("detail_page_fade_duration_exit", 350)
-                opacity_effect = QGraphicsOpacityEffect(detail_page)
+                original_effect = detail_page.graphicsEffect()
+                opacity_effect = SafeOpacityEffect(detail_page, disable_at_full=False)
+                opacity_effect.setOpacity(0.999)
                 detail_page.setGraphicsEffect(opacity_effect)
                 animation = QPropertyAnimation(opacity_effect, QByteArray(b"opacity"))
                 animation.setDuration(duration)
-                animation.setStartValue(1)
-                animation.setEndValue(0)
+                animation.setStartValue(0.999)
+                animation.setEndValue(0.0)
                 animation.start(QAbstractAnimation.DeletionPolicy.DeleteWhenStopped)
                 self.animations[detail_page] = animation
-                animation.finished.connect(cleanup_callback)
+                def restore_and_cleanup():
+                    try:
+                        detail_page.setGraphicsEffect(original_effect) # type: ignore
+                    except RuntimeError:
+                        logger.debug("Original effect already deleted")
+                    cleanup_callback()
+                animation.finished.connect(restore_and_cleanup)
+                animation.finished.connect(opacity_effect.deleteLater)  # Clean up effect
             elif animation_type in ["slide_left", "slide_right", "slide_up", "slide_down"]:
                 duration = self.theme.GAME_CARD_ANIMATION.get("detail_page_slide_duration_exit", 500)
                 easing_curve = QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION.get("detail_page_easing_curve_exit", "InCubic")])

portprotonqt/downloader.py

@@ -144,14 +144,21 @@ class Downloader(QObject):
                 logger.warning(f"Предыдущая ошибка загрузки для {url}, пропускаем")
                 return None
             if url in self._cache:
-                return self._cache[url]
+                cached_path = self._cache[url]
+                if os.path.exists(cached_path):
+                    if os.path.abspath(cached_path) == os.path.abspath(local_path):
+                        return cached_path
+                else:
+                    del self._cache[url]
         url_lock = self._get_url_lock(url)
         with url_lock:
             with self._global_lock:
                 if url in self._last_error:
                     return None
                 if url in self._cache:
-                    return self._cache[url]
+                    cached_path = self._cache[url]
+                    if os.path.exists(cached_path) and os.path.abspath(cached_path) == os.path.abspath(local_path):
+                        return cached_path
             result = download_with_cache(url, local_path, timeout, self)
             with self._global_lock:
                 if result:

portprotonqt/egs_api.py

@@ -16,13 +16,14 @@ from portprotonqt.time_utils import parse_playtime_file, format_playtime, get_la
 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
+    search_app, get_steam_home, get_last_steam_user, convert_steam_id, generate_thumbnail, call_steam_api
 )
 import vdf
 import shutil
 import zlib
 from portprotonqt.downloader import Downloader
 from PySide6.QtGui import QPixmap
+import base64
 
 logger = get_logger(__name__)
 downloader = Downloader()
@@ -66,7 +67,8 @@ def get_cache_dir() -> Path:
 
 def remove_egs_from_steam(game_name: str, portproton_dir: str, callback: Callable[[tuple[bool, str]], None]) -> None:
     """
-    Removes an EGS game from Steam by modifying shortcuts.vdf and deleting the launch script.
+    Removes an EGS game from Steam using CEF API or by modifying shortcuts.vdf and deleting the launch script.
+    Also deletes associated cover files in the Steam grid directory.
     Calls the callback with (success, message).
 
     Args:
@@ -74,6 +76,7 @@ def remove_egs_from_steam(game_name: str, portproton_dir: str, callback: Callabl
         portproton_dir: Path to the PortProton directory.
         callback: Callback function to handle the result (success, message).
     """
+
     if not portproton_dir:
         logger.error("PortProton directory not found")
         callback((False, "PortProton directory not found"))
@@ -101,51 +104,89 @@ def remove_egs_from_steam(game_name: str, portproton_dir: str, callback: Callabl
     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"
+    grid_dir = os.path.join(user_dir, "config", "grid")
 
     if not os.path.exists(steam_shortcuts_path):
         logger.error("Steam shortcuts file not found")
         callback((False, "Steam shortcuts file not found"))
         return
 
+    # Find appid for the shortcut
+    try:
+        with open(steam_shortcuts_path, 'rb') as f:
+            shortcuts_data = vdf.binary_load(f)
+        shortcuts = shortcuts_data.get("shortcuts", {})
+        appid = None
+        for _key, entry in shortcuts.items():
+            if entry.get("AppName") == game_name and entry.get("Exe") == quoted_script_path:
+                appid = convert_steam_id(int(entry.get("appid")))
+                logger.info(f"Found matching shortcut for '{game_name}' with AppID {appid}")
+                break
+        if not appid:
+            logger.info(f"Game '{game_name}' not found in Steam shortcuts")
+            callback((False, f"Game '{game_name}' not found in Steam"))
+            return
+    except Exception as e:
+        logger.error(f"Failed to load shortcuts.vdf: {e}")
+        callback((False, f"Failed to load shortcuts.vdf: {e}"))
+        return
+
+    # Try CEF API first
+    logger.info(f"Attempting to remove EGS game '{game_name}' via Steam CEF API with AppID {appid}")
+    api_response = call_steam_api("removeShortcut", appid)
+    if api_response is not None:  # API responded, even if empty
+        logger.info(f"Shortcut for AppID {appid} successfully removed via CEF API")
+
+        # Delete cover files
+        cover_files = [
+            os.path.join(grid_dir, f"{appid}.jpg"),
+            os.path.join(grid_dir, f"{appid}p.jpg"),
+            os.path.join(grid_dir, f"{appid}_hero.jpg"),
+            os.path.join(grid_dir, f"{appid}_logo.png")
+        ]
+        for cover_file in cover_files:
+            if os.path.exists(cover_file):
+                try:
+                    os.remove(cover_file)
+                    logger.info(f"Deleted cover file: {cover_file}")
+                except Exception as e:
+                    logger.error(f"Failed to delete cover file {cover_file}: {e}")
+
+        # Delete launch script
+        if os.path.exists(script_path):
+            try:
+                os.remove(script_path)
+                logger.info(f"Removed EGS script: {script_path}")
+            except OSError as e:
+                logger.warning(f"Failed to remove EGS script '{script_path}': {str(e)}")
+
+        callback((True, f"Game '{game_name}' was removed from Steam. Please restart Steam for changes to take effect."))
+        return
+
+    # Fallback to VDF modification
+    logger.warning("CEF API failed for EGS game removal; falling back to VDF modification")
+    backup_path = f"{steam_shortcuts_path}.backup"
     try:
         shutil.copy2(steam_shortcuts_path, backup_path)
-        logger.info("Created backup of shortcuts.vdf at %s", 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
 
     try:
-        with open(steam_shortcuts_path, 'rb') as f:
-            shortcuts_data = vdf.binary_load(f)
-    except Exception as e:
-        logger.error(f"Failed to load shortcuts.vdf: {e}")
-        callback((False, f"Failed to load shortcuts.vdf: {e}"))
-        return
+        new_shortcuts = {}
+        index = 0
+        for _key, entry in shortcuts.items():
+            if entry.get("AppName") == game_name and entry.get("Exe") == quoted_script_path:
+                logger.info(f"Removing EGS game '{game_name}' from Steam shortcuts")
+                continue
+            new_shortcuts[str(index)] = entry
+            index += 1
 
-    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("Removing EGS game '%s' from Steam shortcuts", game_name)
-            continue
-        new_shortcuts[str(index)] = entry
-        index += 1
-
-    if not modified:
-        logger.error("Game '%s' not found in Steam shortcuts", game_name)
-        callback((False, f"Game '{game_name}' not found in Steam shortcuts"))
-        return
-
-    try:
         with open(steam_shortcuts_path, 'wb') as f:
             vdf.binary_dump({"shortcuts": new_shortcuts}, f)
-        logger.info("Updated shortcuts.vdf, removed '%s'", game_name)
+        logger.info(f"Updated shortcuts.vdf, removed '{game_name}'")
     except Exception as e:
         logger.error(f"Failed to update shortcuts.vdf: {e}")
         if os.path.exists(backup_path):
@@ -157,10 +198,26 @@ def remove_egs_from_steam(game_name: str, portproton_dir: str, callback: Callabl
         callback((False, f"Failed to update shortcuts.vdf: {e}"))
         return
 
+    # Delete cover files
+    cover_files = [
+        os.path.join(grid_dir, f"{appid}.jpg"),
+        os.path.join(grid_dir, f"{appid}p.jpg"),
+        os.path.join(grid_dir, f"{appid}_hero.jpg"),
+        os.path.join(grid_dir, f"{appid}_logo.png")
+    ]
+    for cover_file in cover_files:
+        if os.path.exists(cover_file):
+            try:
+                os.remove(cover_file)
+                logger.info(f"Deleted cover file: {cover_file}")
+            except Exception as e:
+                logger.error(f"Failed to delete cover file {cover_file}: {e}")
+
+    # Delete launch script
     if os.path.exists(script_path):
         try:
             os.remove(script_path)
-            logger.info("Removed EGS script: %s", script_path)
+            logger.info(f"Removed EGS script: {script_path}")
         except OSError as e:
             logger.warning(f"Failed to remove EGS script '{script_path}': {str(e)}")
 
@@ -168,11 +225,17 @@ def remove_egs_from_steam(game_name: str, portproton_dir: str, callback: Callabl
 
 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.
+    Asynchronously adds an EGS game to Steam via CEF API or 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).
+
+    Args:
+        app_name: The Legendary app_name (unique identifier for the game).
+        game_title: The display name of the game.
+        legendary_path: Path to the Legendary CLI executable.
+        callback: Callback function to handle the result (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")
@@ -267,47 +330,47 @@ export LEGENDARY_CONFIG_PATH="{legendary_config_path}"
     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
+    # Try CEF API first
+    logger.info(f"Attempting to add EGS game '{game_title}' via Steam CEF API")
+    api_response = call_steam_api(
+        "createShortcut",
+        game_title,
+        script_path,
+        str(Path(script_path).parent),
+        icon_path,
+        ""
+    )
 
-    # 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
+    appid = None
+    was_api_used = False
+
+    if api_response and isinstance(api_response, dict) and 'id' in api_response:
+        appid = api_response['id']
+        was_api_used = True
+        logger.info(f"EGS game '{game_title}' successfully added via CEF API. AppID: {appid}")
     else:
-        aidvdf = appid
+        logger.warning("CEF API failed for EGS game addition; falling back to VDF modification")
+        # 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
 
-    steam_appid = None
-    downloaded_count = 0
-    total_covers = 4
-    download_lock = threading.Lock()
+        # 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
 
-    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'}
+        # Create shortcut entry
         shortcut = {
             "appid": aidvdf,
             "AppName": game_title,
@@ -322,7 +385,7 @@ export LEGENDARY_CONFIG_PATH="{legendary_config_path}"
             "Devkit": 0,
             "DevkitGameID": "",
             "LastPlayTime": 0,
-            "tags": tags_dict
+            "tags": {'0': 'PortProton'}
         }
         logger.info(f"Shortcut entry for EGS game: {shortcut}")
 
@@ -353,6 +416,7 @@ export LEGENDARY_CONFIG_PATH="{legendary_config_path}"
 
             with open(steam_shortcuts_path, 'wb') as f:
                 vdf.binary_dump({"shortcuts": shortcuts}, f)
+            logger.info(f"EGS game '{game_title}' added to Steam via VDF")
         except Exception as e:
             logger.error(f"Failed to update shortcuts.vdf: {e}")
             if os.path.exists(backup_path):
@@ -364,8 +428,42 @@ export LEGENDARY_CONFIG_PATH="{legendary_config_path}"
             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"))
+    if not appid:
+        callback((False, "Failed to create shortcut via any method"))
+        return
+
+    steam_appid = None
+    downloaded_count = 0
+    total_covers = 4
+    download_lock = threading.Lock()
+
+    def on_cover_download(cover_file: str | None, cover_type: str, index: int):
+        nonlocal downloaded_count
+        try:
+            if cover_file is None or not os.path.exists(cover_file):
+                logger.warning(f"Failed to download cover {cover_type} for appid {steam_appid}")
+                with download_lock:
+                    downloaded_count += 1
+                    if downloaded_count == total_covers:
+                        callback((True, f"Game '{game_title}' added to Steam with covers"))
+                return
+
+            logger.info(f"Downloaded cover {cover_type} to {cover_file}")
+            if was_api_used:
+                try:
+                    with open(cover_file, 'rb') as f:
+                        img_b64 = base64.b64encode(f.read()).decode('utf-8')
+                    logger.info(f"Applying cover type '{cover_type}' via API for AppID {appid}")
+                    ext = Path(cover_type).suffix.lstrip('.')
+                    call_steam_api("setGrid", appid, index, ext, img_b64)
+                except Exception as e:
+                    logger.error(f"Error applying cover '{cover_type}' via API: {e}")
+        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:
+                callback((True, f"Game '{game_title}' added to Steam with covers"))
 
     def on_steam_apps(steam_data: tuple[list, dict]):
         nonlocal steam_appid
@@ -375,24 +473,24 @@ export LEGENDARY_CONFIG_PATH="{legendary_config_path}"
 
         if not steam_appid:
             logger.info(f"No Steam appid found for EGS game {game_title}, skipping cover download")
-            finalize_shortcut()
+            callback((True, f"Game '{game_title}' added to Steam"))
             return
 
         cover_types = [
-            (".jpg", "header.jpg"),
-            ("p.jpg", "library_600x900_2x.jpg"),
-            ("_hero.jpg", "library_hero.jpg"),
-            ("_logo.png", "logo.png")
+            (".jpg", "header.jpg", 0),
+            ("p.jpg", "library_600x900_2x.jpg", 1),
+            ("_hero.jpg", "library_hero.jpg", 2),
+            ("_logo.png", "logo.png", 3)
         ]
 
-        for suffix, cover_type in cover_types:
+        for suffix, cover_type, index 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)
+                callback=lambda result, ctype=cover_type, idx=index: on_cover_download(result, ctype, idx)
             )
 
     get_steam_apps_and_index_async(on_steam_apps)

portprotonqt/steam_api.py

@@ -18,6 +18,10 @@ from collections.abc import Callable
 import re
 import shutil
 import zlib
+import websocket
+import requests
+import random
+import base64
 
 downloader = Downloader()
 logger = get_logger(__name__)
@@ -771,6 +775,126 @@ def get_steam_apps_and_index_async(callback: Callable[[tuple[list, dict]], None]
 
     load_steam_apps_async(on_steam_apps)
 
+def enable_steam_cef() -> tuple[bool, str]:
+    """
+    Проверяет и при необходимости активирует режим удаленной отладки Steam CEF.
+
+    Создает файл .cef-enable-remote-debugging в директории Steam.
+    Steam необходимо перезапустить после первого создания этого файла.
+
+    Возвращает кортеж:
+    - (True, "already_enabled") если уже было активно.
+    - (True, "restart_needed") если было только что активировано и нужен перезапуск Steam.
+    - (False, "steam_not_found") если директория Steam не найдена.
+    """
+    steam_home = get_steam_home()
+    if not steam_home:
+        return (False, "steam_not_found")
+
+    cef_flag_file = steam_home / ".cef-enable-remote-debugging"
+    logger.info(f"Проверка CEF флага: {cef_flag_file}")
+
+    if cef_flag_file.exists():
+        logger.info("CEF Remote Debugging уже активирован.")
+        return (True, "already_enabled")
+    else:
+        try:
+            os.makedirs(cef_flag_file.parent, exist_ok=True)
+            cef_flag_file.touch()
+            logger.info("CEF Remote Debugging активирован. Steam необходимо перезапустить.")
+            return (True, "restart_needed")
+        except Exception as e:
+            logger.error(f"Не удалось создать CEF флаг {cef_flag_file}: {e}")
+            return (False, str(e))
+
+def call_steam_api(js_cmd: str, *args) -> dict | None:
+    """
+    Выполняет JavaScript функцию в контексте Steam через CEF Remote Debugging.
+
+    Args:
+        js_cmd: Имя JS функции для вызова (напр. 'createShortcut').
+        *args: Аргументы для передачи в JS функцию.
+
+    Returns:
+        Словарь с результатом выполнения или None в случае ошибки.
+    """
+    status, message = enable_steam_cef()
+    if not (status is True and message == "already_enabled"):
+        if message == "restart_needed":
+            logger.warning("Steam CEF API доступен, но требует перезапуска Steam для полной активации.")
+        elif message == "steam_not_found":
+            logger.error("Не удалось найти директорию Steam для проверки CEF API.")
+        else:
+            logger.error(f"Steam CEF API недоступен или не готов: {message}")
+        return None
+
+    steam_debug_url = "http://localhost:8080/json"
+
+    try:
+        response = requests.get(steam_debug_url, timeout=2)
+        response.raise_for_status()
+        contexts = response.json()
+        ws_url = next((ctx['webSocketDebuggerUrl'] for ctx in contexts if ctx['title'] == 'SharedJSContext'), None)
+        if not ws_url:
+            logger.warning("Не удалось найти SharedJSContext. Steam запущен с флагом -cef-enable-remote-debugging?")
+            return None
+    except Exception as e:
+        logger.warning(f"Не удалось подключиться к Steam CEF API по адресу {steam_debug_url}. Steam запущен? {e}")
+        return None
+
+    js_code = """
+        async function createShortcut(name, exe, dir, icon, args) {
+            const id = await SteamClient.Apps.AddShortcut(name, exe, dir, args);
+            console.log("Shortcut created with ID:", id);
+            await SteamClient.Apps.SetShortcutName(id, name);
+            if (icon)
+                await SteamClient.Apps.SetShortcutIcon(id, icon);
+            if (args)
+                await SteamClient.Apps.SetAppLaunchOptions(id, args);
+            return { id };
+        };
+
+        async function setGrid(id, i, ext, image) {
+            await SteamClient.Apps.SetCustomArtworkForApp(id, image, ext, i);
+            return true;
+        };
+
+        async function removeShortcut(id) {
+            await SteamClient.Apps.RemoveShortcut(+id);
+            return true;
+        };
+    """
+    try:
+        ws = websocket.create_connection(ws_url, timeout=5)
+        js_args = ", ".join(orjson.dumps(arg).decode('utf-8') for arg in args)
+        expression = f"{js_code} {js_cmd}({js_args});"
+        payload = {
+            "id": random.randint(0, 32767),
+            "method": "Runtime.evaluate",
+            "params": {
+                "expression": expression,
+                "awaitPromise": True,
+                "returnByValue": True
+            }
+        }
+
+        ws.send(orjson.dumps(payload))
+        response_str = ws.recv()
+        ws.close()
+
+        response_data = orjson.loads(response_str)
+        if "error" in response_data:
+            logger.error(f"Ошибка выполнения JS в Steam: {response_data['error']['message']}")
+            return None
+        result = response_data.get('result', {}).get('result', {})
+        if result.get('type') == 'object' and result.get('subtype') == 'error':
+            logger.error(f"Ошибка выполнения JS в Steam: {result.get('description')}")
+            return None
+        return result.get('value')
+    except Exception as e:
+        logger.error(f"Ошибка при взаимодействии с WebSocket Steam: {e}")
+        return None
+
 def add_to_steam(game_name: str, exec_line: str, cover_path: str) -> tuple[bool, str]:
     """
     Add a non-Steam game to Steam via shortcuts.vdf with PortProton tag,
@@ -872,45 +996,42 @@ export START_FROM_STEAM=1
     grid_dir = user_dir / "config" / "grid"
     os.makedirs(grid_dir, exist_ok=True)
 
-    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}")
-            return (False, f"Failed to create backup of shortcuts.vdf: {e}")
+    appid = None
+    was_api_used = False
 
-    unique_string = f"{script_path}{game_name}"
-    baseid = zlib.crc32(unique_string.encode('utf-8')) & 0xffffffff
-    appid = baseid | 0x80000000
-    if appid > 0x7FFFFFFF:
-        aidvdf = appid - 0x100000000
+    logger.info("Попытка добавления ярлыка через Steam CEF API...")
+    api_response = call_steam_api(
+        "createShortcut",
+        game_name,
+        script_path,
+        str(Path(script_path).parent),
+        icon_path,
+        ""
+    )
+
+    if api_response and isinstance(api_response, dict) and 'id' in api_response:
+        appid = api_response['id']
+        was_api_used = True
+        logger.info(f"Ярлык успешно добавлен через API. AppID: {appid}")
     else:
-        aidvdf = appid
+        logger.warning("Не удалось добавить ярлык через API. Используется запасной метод (запись в 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}")
+                return (False, f"Failed to create backup of shortcuts.vdf: {e}")
 
-    steam_appid = None
-    downloaded_count = 0
-    total_covers = 4  # количество обложек
+        unique_string = f"{script_path}{game_name}"
+        baseid = zlib.crc32(unique_string.encode('utf-8')) & 0xffffffff
+        appid = baseid | 0x80000000
+        if appid > 0x7FFFFFFF:
+            aidvdf = appid - 0x100000000
+        else:
+            aidvdf = appid
 
-    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_name,
@@ -925,7 +1046,7 @@ export START_FROM_STEAM=1
             "Devkit": 0,
             "DevkitGameID": "",
             "LastPlayTime": 0,
-            "tags": tags_dict
+            "tags": {'0': 'PortProton'}
         }
         logger.info(f"Shortcut entry to be written: {shortcut}")
 
@@ -955,6 +1076,7 @@ export START_FROM_STEAM=1
 
             with open(steam_shortcuts_path, 'wb') as f:
                 vdf.binary_dump({"shortcuts": shortcuts}, f)
+            logger.info(f"Game '{game_name}' successfully added to Steam with covers")
         except Exception as e:
             logger.error(f"Failed to update shortcuts.vdf: {e}")
             if os.path.exists(backup_path):
@@ -963,34 +1085,54 @@ export START_FROM_STEAM=1
                     logger.info("Restored shortcuts.vdf from backup due to update failure")
                 except Exception as restore_err:
                     logger.error(f"Failed to restore shortcuts.vdf from backup: {restore_err}")
-            return (False, f"Failed to update shortcuts.vdf: {e}")
+            appid = None
 
-        logger.info(f"Game '{game_name}' successfully added to Steam with covers")
-        return (True, f"Game '{game_name}' added to Steam with covers")
+    if not appid:
+        return (False, "Не удалось создать ярлык ни одним из способов.")
+
+    steam_appid = None
 
     def on_game_info(game_info: dict):
         nonlocal steam_appid
         steam_appid = game_info.get("appid")
         if not steam_appid or not isinstance(steam_appid, int):
             logger.info("No valid Steam appid found, skipping cover download")
-            return finalize_shortcut()
+            return
+        logger.info(f"Найден Steam AppID {steam_appid} для загрузки обложек.")
 
-        # Обложки и имена, соответствующие bash-скрипту и твоим размерам
         cover_types = [
-            (".jpg", "header.jpg"),              # базовый, сохранится как AppId.jpg
-            ("p.jpg", "library_600x900_2x.jpg"), # сохранится как AppIdp.jpg
-            ("_hero.jpg", "library_hero.jpg"),   # AppId_hero.jpg
-            ("_logo.png", "logo.png")            # AppId_logo.png
+            ("p.jpg", "library_600x900_2x.jpg"),
+            ("_hero.jpg", "library_hero.jpg"),
+            ("_logo.png", "logo.png"),
+            (".jpg", "header.jpg")
         ]
 
-        for suffix, cover_type in cover_types:
+        def on_cover_download(result_path: str | None, steam_name: str, index: int):
+            try:
+                if result_path and os.path.exists(result_path):
+                    logger.info(f"Downloaded cover {steam_name} to {result_path}")
+                    if was_api_used:
+                        try:
+                            with open(result_path, 'rb') as f:
+                                img_b64 = base64.b64encode(f.read()).decode('utf-8')
+                            logger.info(f"Применение обложки типа '{steam_name}' через API для AppID {appid}")
+                            ext = Path(steam_name).suffix.lstrip('.')
+                            call_steam_api("setGrid", appid, index, ext, img_b64)
+                        except Exception as e:
+                            logger.error(f"Ошибка при применении обложки '{steam_name}' через API: {e}")
+                else:
+                    logger.warning(f"Failed to download cover {steam_name} for appid {steam_appid}")
+            except Exception as e:
+                logger.error(f"Error processing cover {steam_name} for appid {steam_appid}: {e}")
+
+        for i, (suffix, steam_name) in enumerate(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}"
+            cover_url = f"https://cdn.cloudflare.steamstatic.com/steam/apps/{steam_appid}/{steam_name}"
             downloader.download_async(
                 cover_url,
                 cover_file,
                 timeout=5,
-                callback=lambda result, cfile=cover_file, ctype=cover_type: on_cover_download(cfile, ctype)
+                callback=lambda result, index=i, name=steam_name: on_cover_download(result, name, index)
             )
 
     get_steam_game_info_async(game_name, exec_line, on_game_info)
@@ -1043,19 +1185,7 @@ def remove_from_steam(game_name: str, exec_line: str) -> tuple[bool, str]:
         logger.info(f"shortcuts.vdf not found at {steam_shortcuts_path}")
         return (False, f"Game '{game_name}' not found in Steam")
 
-    # Generate appid for identifying cover files
-    unique_string = f"{script_path}{game_name}"
-    baseid = zlib.crc32(unique_string.encode('utf-8')) & 0xffffffff
-    appid = baseid | 0x80000000
-
-    # Create backup of shortcuts.vdf
-    backup_path = f"{steam_shortcuts_path}.backup"
-    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}")
-        return (False, f"Failed to create backup of shortcuts.vdf: {e}")
+    appid = None
 
     # Load and modify shortcuts.vdf
     try:
@@ -1069,37 +1199,51 @@ def remove_from_steam(game_name: str, exec_line: str) -> tuple[bool, str]:
         return (False, f"Failed to load shortcuts.vdf: {load_err}")
 
     shortcuts = shortcuts_data.get("shortcuts", {})
-    found = False
     new_shortcuts = {}
     index = 0
 
     # Filter out the matching shortcut
     for _key, entry in shortcuts.items():
         if entry.get("AppName") == game_name and entry.get("Exe") == f'"{script_path}"':
-            found = True
+            appid = convert_steam_id(int(entry.get("appid")))
             logger.info(f"Found matching shortcut for '{game_name}' to remove")
             continue
         new_shortcuts[str(index)] = entry
         index += 1
 
-    if not found:
+    if not appid:
         logger.info(f"Game '{game_name}' not found in Steam shortcuts")
         return (False, f"Game '{game_name}' not found in Steam")
 
-    # Save updated shortcuts.vdf
-    try:
-        with open(steam_shortcuts_path, 'wb') as f:
-            vdf.binary_dump({"shortcuts": new_shortcuts}, f)
-        logger.info(f"Successfully updated shortcuts.vdf, removed '{game_name}'")
-    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 due to update failure")
-            except Exception as restore_err:
-                logger.error(f"Failed to restore shortcuts.vdf from backup: {restore_err}")
-        return (False, f"Failed to update shortcuts.vdf: {e}")
+    api_response = call_steam_api("removeShortcut", appid)
+    if api_response is not None: # API ответил, даже если ответ пустой
+        logger.info(f"Ярлык для AppID {appid} успешно удален через API.")
+    else:
+        logger.warning("Не удалось удалить ярлык через API. Используется запасной метод (редактирование shortcuts.vdf).")
+
+        # Create backup of shortcuts.vdf
+        backup_path = f"{steam_shortcuts_path}.backup"
+        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}")
+            return (False, f"Failed to create backup of shortcuts.vdf: {e}")
+
+        # Save updated shortcuts.vdf
+        try:
+            with open(steam_shortcuts_path, 'wb') as f:
+                vdf.binary_dump({"shortcuts": new_shortcuts}, f)
+            logger.info(f"Successfully updated shortcuts.vdf, removed '{game_name}'")
+        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 due to update failure")
+                except Exception as restore_err:
+                    logger.error(f"Failed to restore shortcuts.vdf from backup: {restore_err}")
+            return (False, f"Failed to update shortcuts.vdf: {e}")
 
     # Delete cover files
     cover_files = [

pyproject.toml

@@ -28,17 +28,18 @@ requires-python = ">=3.10"
 dependencies = [
     "babel>=2.17.0",
     "beautifulsoup4>=4.13.4",
-    "evdev>=1.9.1",
-    "icoextract>=0.1.6",
+    "evdev>=1.9.2",
+    "icoextract>=0.2.0",
     "numpy>=2.2.4",
-    "orjson>=3.10.16",
-    "pillow>=11.2.1",
+    "orjson>=3.11.2",
+    "pillow>=11.3.0",
     "psutil>=7.0.0",
-    "pyside6>=6.9.0",
+    "pyside6>=6.9.1",
     "pyudev>=0.24.3",
-    "requests>=2.32.3",
+    "requests>=2.32.4",
     "tqdm>=4.67.1",
     "vdf>=3.4",
+    "websocket-client>=1.8.0",
 ]
 
 [project.scripts]
@@ -102,7 +103,7 @@ ignore = [
 
 [dependency-groups]
 dev = [
-    "pre-commit>=4.2.0",
+    "pre-commit>=4.3.0",
     "pyaspeller>=2.0.2",
-    "pyright>=1.1.400",
+    "pyright>=1.1.403",
 ]

renovate.json

@@ -15,12 +15,23 @@
       "enabled": false
     },
     {
-      "matchFileNames": [".gitea/workflows/**.yaml", ".gitea/workflows/**.yml"],
+      "matchFileNames": [".python-version"],
       "enabled": false
     },
     {
-      "matchFileNames": [".python-version"],
+      "matchManagers": ["github-actions", "pre-commit"],
       "enabled": false
+    },
+    {
+      "matchManagers": ["pep621"],
+      "rangeStrategy": "bump",
+      "versioning": "pep440",
+      "groupName": "Python dependencies"
+    },
+    {
+      "matchPackageNames": ["numpy", "setuptools"],
+      "enabled": false,
+      "description": "Disabled due to Python 3.10 incompatibility with numpy>=2.3.2 (requires Python>=3.11)"
     }
   ]
 }

uv.lock

@@ -482,6 +482,7 @@ dependencies = [
     { name = "requests" },
     { name = "tqdm" },
     { name = "vdf" },
+    { name = "websocket-client" },
 ]
 
 [package.dev-dependencies]
@@ -506,6 +507,7 @@ requires-dist = [
     { name = "requests", specifier = ">=2.32.3" },
     { name = "tqdm", specifier = ">=4.67.1" },
     { name = "vdf", specifier = ">=3.4" },
+    { name = "websocket-client", specifier = ">=1.8.0" },
 ]
 
 [package.metadata.requires-dev]
@@ -560,15 +562,15 @@ wheels = [
 
 [[package]]
 name = "pyright"
-version = "1.1.402"
+version = "1.1.403"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "nodeenv" },
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/aa/04/ce0c132d00e20f2d2fb3b3e7c125264ca8b909e693841210534b1ea1752f/pyright-1.1.402.tar.gz", hash = "sha256:85a33c2d40cd4439c66aa946fd4ce71ab2f3f5b8c22ce36a623f59ac22937683", size = 3888207 }
+sdist = { url = "https://files.pythonhosted.org/packages/fe/f6/35f885264ff08c960b23d1542038d8da86971c5d8c955cfab195a4f672d7/pyright-1.1.403.tar.gz", hash = "sha256:3ab69b9f41c67fb5bbb4d7a36243256f0d549ed3608678d381d5f51863921104", size = 3913526 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/fe/37/1a1c62d955e82adae588be8e374c7f77b165b6cb4203f7d581269959abbc/pyright-1.1.402-py3-none-any.whl", hash = "sha256:2c721f11869baac1884e846232800fe021c33f1b4acb3929cff321f7ea4e2982", size = 5624004 },
+    { url = "https://files.pythonhosted.org/packages/49/b6/b04e5c2f41a5ccad74a1a4759da41adb20b4bc9d59a5e08d29ba60084d07/pyright-1.1.403-py3-none-any.whl", hash = "sha256:c0eeca5aa76cbef3fcc271259bbd785753c7ad7bcac99a9162b4c4c7daed23b3", size = 5684504 },
 ]
 
 [[package]]
@@ -760,3 +762,12 @@ sdist = { url = "https://files.pythonhosted.org/packages/56/2c/444f465fb2c65f40c
 wheels = [
     { url = "https://files.pythonhosted.org/packages/f3/40/b1c265d4b2b62b58576588510fc4d1fe60a86319c8de99fd8e9fec617d2c/virtualenv-20.31.2-py3-none-any.whl", hash = "sha256:36efd0d9650ee985f0cad72065001e66d49a6f24eb44d98980f630686243cf11", size = 6057982 },
 ]
+
+[[package]]
+name = "websocket-client"
+version = "1.8.0"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/e6/30/fba0d96b4b5fbf5948ed3f4681f7da2f9f64512e1d303f94b4cc174c24a5/websocket_client-1.8.0.tar.gz", hash = "sha256:3239df9f44da632f96012472805d40a23281a991027ce11d2f45a6f24ac4c3da", size = 54648 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/5a/84/44687a29792a70e111c5c477230a72c4b957d88d16141199bf9acb7537a3/websocket_client-1.8.0-py3-none-any.whl", hash = "sha256:17b44cc997f5c498e809b22cdf2d9c7a9e71c02c8cc2b6c56e7c2d1239bfa526", size = 58826 },
+]