Compare commits
	
		
			139 Commits
		
	
	
		
			0efc3a8701
			...
			v0.1.5
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 8e11dac987 | |||
| 358afbdbdb | |||
| 83730499e2 | |||
| 84f560ed30 | |||
| 888c9ac387 | |||
| 68d06ca05c | |||
| 6923a5f05c | |||
| f3f85441d8 | |||
| eb90836710 | |||
| dd125c975b | |||
| 4521d3ca1c | |||
| dd044dbd95 | |||
| 0047b29cd2 | |||
| d0fbc79168 | |||
| 57f6ac9c4b | |||
| 60271f7a13 | |||
| 38ab4acc86 | |||
| 8f54f4814c | |||
| 37254b89f1 | |||
| 893e33bdce | |||
| 1ee784d890 | |||
| 39f505079c | |||
| 46253115ff | |||
| 31a7ef3e7e | |||
|  | cb07904c1b | ||
| 05e0d9d846 | |||
| 81433d3c56 | |||
| 0ff66e282b | |||
| 831b7739ba | |||
| 50e1dfda57 | |||
| fcf04e521d | |||
| 74d0700d7c | |||
| 0435c77630 | |||
| 1cf93a60c8 | |||
| 31247d21c3 | |||
| c6017a7dce | |||
| c74d209dbd | |||
| 5b257d3b62 | |||
| 4dcf1dbe6d | |||
| 8d6fe4aa65 | |||
| 022eb3f1e9 | |||
| 11b847ed05 | |||
| 1e4e0127a4 | |||
| c045aa7a56 | |||
| f18e7bae6b | |||
| dcf8904037 | |||
| f9d24e385d | |||
| 09028931be | |||
| 0294c90c54 | |||
| 17dfef2d27 | |||
|  | f0690f8811 | ||
| ac20447ba3 | |||
| ba143c15a8 | |||
| 13068f3959 | |||
|  | c8360d08ca | ||
| b070ff1fca | |||
| b5a2f41bdf | |||
| 9a37f31841 | |||
| aeed0112cd | |||
| 027ae68d4d | |||
| 37d41fef8d | |||
| e37422fc95 | |||
| d7951e8587 | |||
| 556533785a | |||
| a13aca4d84 | |||
| 35736e1723 | |||
|  | 24a7c2e657 | ||
|  | 279f7ec36b | ||
| 41f6943998 | |||
| 3bf10dc4cd | |||
| 33b96d3185 | |||
| 3573b8e373 | |||
| 582ddd2218 | |||
| 2753e53a4d | |||
| 46973f35e1 | |||
| 8e34c92385 | |||
| d50b63bca7 | |||
| 6966253e9b | |||
| 13f3af7a42 | |||
| c7bed80570 | |||
| 6fde7c18db | |||
| 37782d4375 | |||
| 0a8a7c538c | |||
|  | 9cc4b8c51d | ||
| 397dede2be | |||
| 6a66f37ba1 | |||
| 4db1cce32c | |||
| edaeca4f11 | |||
| 11d44f091d | |||
| 09d9c6510a | |||
| 272be51bb0 | |||
| 63933172f9 | |||
| 85e9aba836 | |||
| 4d3499d2c1 | |||
| a13c15bc28 | |||
| 83076d3dfc | |||
| 04aaf68e36 | |||
| e91037708a | |||
| 1b743026c2 | |||
| 30b4cec4d1 | |||
| db68c9050c | |||
| 1a93d5b82c | |||
| cc0690cf9e | |||
| 809ba2c976 | |||
| 68c9636e10 | |||
| f0df1f89be | |||
| f25224b668 | |||
| 0cda47fdfd | |||
| 1a8c733580 | |||
| 2476bea32a | |||
| 1bbc95a5c1 | |||
| d12b801191 | |||
| 233dab1269 | |||
| 700a478598 | |||
| 0fe727331f | |||
| 599644c4f6 | |||
|  | 409e06f531 | ||
| 4818cf5b67 | |||
| 59bfcdbbba | |||
| 989af36e5b | |||
| 8300857aaa | |||
| aea1a36cfd | |||
| f7a4fa6a17 | |||
| 230ce904d9 | |||
| 23d5aaf0ce | |||
| 37e099d0b0 | |||
| bd6fc73d6f | |||
| 341e6e048f | |||
| e57770f796 | |||
| 49cd77ee38 | |||
| d26b9774a0 | |||
| 9a27d67dc0 | |||
| b0fff5af0c | |||
| e54fac8aa4 | |||
| f111674260 | |||
| a5df7f0477 | |||
| f2954497d9 | |||
| 80bbab692d | |||
| 731e919884 | 
| @@ -17,10 +17,12 @@ jobs: | ||||
|       - name: Install required dependencies | ||||
|         run: | | ||||
|             sudo apt update | ||||
|             sudo apt install -y binutils coreutils desktop-file-utils gtk-update-icon-cache fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-dev python3-setuptools squashfs-tools strace util-linux zsync | ||||
|             sudo apt install -y binutils coreutils desktop-file-utils gtk-update-icon-cache fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-dev python3-setuptools squashfs-tools strace util-linux zsync git zstd | ||||
|  | ||||
|       - name: Install tools | ||||
|         run: pip3 install appimage-builder uv | ||||
|         run: | | ||||
|             pip3 install git+https://github.com/Boria138/appimage-builder.git | ||||
|             pip3 install uv | ||||
|  | ||||
|       - name: Build AppImage | ||||
|         run: | | ||||
|   | ||||
| @@ -8,7 +8,7 @@ on: | ||||
|  | ||||
| env: | ||||
|   # Common version, will be used for tagging the release | ||||
|   VERSION: 0.1.3 | ||||
|   VERSION: 0.1.5 | ||||
|   PKGDEST: "/tmp/portprotonqt" | ||||
|   PACKAGE: "portprotonqt" | ||||
|   GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }} | ||||
| @@ -23,10 +23,12 @@ jobs: | ||||
|       - name: Install required dependencies | ||||
|         run: | | ||||
|             sudo apt update | ||||
|             sudo apt install -y binutils coreutils desktop-file-utils gtk-update-icon-cache fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-dev python3-setuptools squashfs-tools strace util-linux zsync | ||||
|             sudo apt install -y binutils coreutils desktop-file-utils gtk-update-icon-cache fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-dev python3-setuptools squashfs-tools strace util-linux zsync git zstd | ||||
|  | ||||
|       - name: Install tools | ||||
|         run: pip3 install appimage-builder uv | ||||
|         run: | | ||||
|             pip3 install git+https://github.com/Boria138/appimage-builder.git | ||||
|             pip3 install uv | ||||
|  | ||||
|       - name: Build AppImage | ||||
|         run: | | ||||
| @@ -157,6 +159,7 @@ jobs: | ||||
|           mkdir -p extracted | ||||
|           find release/ -name '*.zip' -exec unzip -o {} -d extracted/ \; | ||||
|           find extracted/ -type f -exec mv {} release/ \; | ||||
|           find release/ -name '*.zip' -delete | ||||
|           rm -rf extracted/ | ||||
|  | ||||
|       - name: Extract changelog for version | ||||
|   | ||||
							
								
								
									
										187
									
								
								.gitea/workflows/code-build.yml
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,187 @@ | ||||
| name: Build Check - AppImage, Arch, Fedora | ||||
|  | ||||
| on: | ||||
|   workflow_dispatch: | ||||
|   pull_request: | ||||
|     paths: | ||||
|       - 'build-aux/**' | ||||
|  | ||||
| env: | ||||
|   PKGDEST: "/tmp/portprotonqt" | ||||
|   PACKAGE: "portprotonqt" | ||||
|  | ||||
| jobs: | ||||
|   changes: | ||||
|     runs-on: ubuntu-latest | ||||
|     outputs: | ||||
|       appimage: ${{ steps.check.outputs.appimage }} | ||||
|       fedora:   ${{ steps.check.outputs.fedora }} | ||||
|       arch:     ${{ steps.check.outputs.arch }} | ||||
|     steps: | ||||
|       - uses: https://gitea.com/actions/checkout@v4 | ||||
|         with: | ||||
|           fetch-depth: 0 | ||||
|  | ||||
|       - name: Ensure git is installed | ||||
|         run: | | ||||
|           sudo apt update | ||||
|           sudo apt install -y git | ||||
|  | ||||
|       - name: Check changed files | ||||
|         id: check | ||||
|         run: | | ||||
|           # Get changed files | ||||
|           git diff --name-only ${{ github.event.pull_request.base.sha }}...${{ github.event.pull_request.head.sha }} > changed_files.txt | ||||
|  | ||||
|           echo "Changed files:" | ||||
|           cat changed_files.txt | ||||
|  | ||||
|           # Check AppImage files | ||||
|           if grep -q "build-aux/AppImageBuilder.yml" changed_files.txt; then | ||||
|             echo "appimage=true" >> $GITHUB_OUTPUT | ||||
|           else | ||||
|             echo "appimage=false" >> $GITHUB_OUTPUT | ||||
|           fi | ||||
|  | ||||
|           # Check Fedora spec files (only fedora-git.spec) | ||||
|           if grep -q "build-aux/fedora-git.spec" changed_files.txt; then | ||||
|             echo "fedora=true" >> $GITHUB_OUTPUT | ||||
|           else | ||||
|             echo "fedora=false" >> $GITHUB_OUTPUT | ||||
|           fi | ||||
|  | ||||
|           # Check Arch PKGBUILD-git | ||||
|           if grep -q "build-aux/PKGBUILD-git" changed_files.txt; then | ||||
|             echo "arch=true" >> $GITHUB_OUTPUT | ||||
|           else | ||||
|             echo "arch=false" >> $GITHUB_OUTPUT | ||||
|           fi | ||||
|  | ||||
|   build-appimage: | ||||
|     name: Build AppImage | ||||
|     runs-on: ubuntu-22.04 | ||||
|     needs: changes | ||||
|     if: needs.changes.outputs.appimage == 'true' || github.event_name == 'workflow_dispatch' | ||||
|     steps: | ||||
|       - uses: https://gitea.com/actions/checkout@v4 | ||||
|  | ||||
|       - name: Install required dependencies | ||||
|         run: | | ||||
|             sudo apt update | ||||
|             sudo apt install -y binutils coreutils desktop-file-utils gtk-update-icon-cache fakeroot fuse libgdk-pixbuf2.0-dev patchelf python3-pip python3-dev python3-setuptools squashfs-tools strace util-linux zsync zstd git | ||||
|  | ||||
|       - name: Install tools | ||||
|         run: | | ||||
|             pip3 install git+https://github.com/Boria138/appimage-builder.git | ||||
|             pip3 install uv | ||||
|  | ||||
|       - name: Build AppImage | ||||
|         run: | | ||||
|           cd build-aux | ||||
|           appimage-builder | ||||
|  | ||||
|       - name: Upload AppImage | ||||
|         uses: https://gitea.com/actions/gitea-upload-artifact@v4 | ||||
|         with: | ||||
|           name: PortProtonQt-AppImage | ||||
|           path: build-aux/PortProtonQt*.AppImage | ||||
|  | ||||
|   build-fedora: | ||||
|     name: Build Fedora RPM | ||||
|     runs-on: ubuntu-latest | ||||
|     needs: changes | ||||
|     if: needs.changes.outputs.fedora == 'true' || github.event_name == 'workflow_dispatch' | ||||
|  | ||||
|     strategy: | ||||
|       matrix: | ||||
|         fedora_version: [41, 42, rawhide] | ||||
|  | ||||
|     container: | ||||
|       image: fedora:${{ matrix.fedora_version }} | ||||
|       options: --privileged | ||||
|  | ||||
|     steps: | ||||
|       - name: Install build dependencies | ||||
|         run: | | ||||
|           dnf install -y git rpmdevtools python3-devel python3-wheel python3-pip \ | ||||
|                          python3-build pyproject-rpm-macros python3-setuptools \ | ||||
|                          redhat-rpm-config nodejs npm | ||||
|  | ||||
|       - name: Setup rpmbuild environment | ||||
|         run: | | ||||
|           useradd rpmbuild -u 5002 -g users || true | ||||
|           mkdir -p /home/rpmbuild/{BUILD,RPMS,SPECS,SRPMS,SOURCES} | ||||
|           chown -R rpmbuild:users /home/rpmbuild | ||||
|           echo '%_topdir /home/rpmbuild' > /home/rpmbuild/.rpmmacros | ||||
|  | ||||
|       - name: Checkout repo | ||||
|         uses: https://gitea.com/actions/checkout@v4 | ||||
|  | ||||
|       - name: Copy fedora-git.spec | ||||
|         run: | | ||||
|           cp build-aux/fedora-git.spec /home/rpmbuild/SPECS/${{ env.PACKAGE }}.spec | ||||
|           chown -R rpmbuild:users /home/rpmbuild | ||||
|  | ||||
|       - name: Build RPM | ||||
|         run: | | ||||
|           su rpmbuild -c "rpmbuild -ba /home/rpmbuild/SPECS/${{ env.PACKAGE }}.spec" | ||||
|  | ||||
|       - name: Upload RPM package | ||||
|         uses: https://gitea.com/actions/gitea-upload-artifact@v4 | ||||
|         with: | ||||
|           name: PortProtonQt-RPM-Fedora-${{ matrix.fedora_version }} | ||||
|           path: /home/rpmbuild/RPMS/**/*.rpm | ||||
|  | ||||
|   build-arch: | ||||
|     name: Build Arch Package | ||||
|     runs-on: ubuntu-22.04 | ||||
|     needs: changes | ||||
|     if: needs.changes.outputs.arch == 'true' || github.event_name == 'workflow_dispatch' | ||||
|     container: | ||||
|       image: archlinux:base-devel | ||||
|       volumes: | ||||
|         - /usr:/usr-host | ||||
|         - /opt:/opt-host | ||||
|       options: --privileged | ||||
|  | ||||
|     steps: | ||||
|       - name: Prepare container | ||||
|         run: | | ||||
|           pacman -Sy --noconfirm --disable-download-timeout --needed git wget gnupg nodejs npm | ||||
|           sed -i 's/#MAKEFLAGS="-j2"/MAKEFLAGS="-j$(nproc) -l$(nproc)"/g' /etc/makepkg.conf | ||||
|           sed -i 's/OPTIONS=(.*)/OPTIONS=(strip docs !libtool !staticlibs emptydirs zipman purge lto)/g' /etc/makepkg.conf | ||||
|           yes | pacman -Scc | ||||
|           pacman-key --init | ||||
|           pacman -S --noconfirm archlinux-keyring | ||||
|           mkdir -p /__w/portproton-repo | ||||
|           pacman-key --recv-key 3056513887B78AEB --keyserver keyserver.ubuntu.com | ||||
|           pacman-key --lsign-key 3056513887B78AEB | ||||
|           pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-keyring.pkg.tar.zst' | ||||
|           pacman -U --noconfirm 'https://cdn-mirror.chaotic.cx/chaotic-aur/chaotic-mirrorlist.pkg.tar.zst' | ||||
|           cat << EOM >> /etc/pacman.conf | ||||
|  | ||||
|           [chaotic-aur] | ||||
|           Include = /etc/pacman.d/chaotic-mirrorlist | ||||
|           EOM | ||||
|           pacman -Syy | ||||
|           useradd -m user -G wheel && echo "user ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers | ||||
|           echo "PACKAGER=\"Boris Yumankulov <boria138@altlinux.org>\"" >> /etc/makepkg.conf | ||||
|           chown user -R /tmp | ||||
|           chown user -R .. | ||||
|  | ||||
|       - name: Build | ||||
|         run: | | ||||
|           cd /__w/portproton-repo | ||||
|           git clone https://git.linux-gaming.ru/Boria138/PortProtonQt.git | ||||
|           cd /__w/portproton-repo/PortProtonQt/build-aux | ||||
|           chown user -R .. | ||||
|           su user -c "yes '' | makepkg --noconfirm -s -p PKGBUILD-git" | ||||
|  | ||||
|       - name: Checkout | ||||
|         uses: https://gitea.com/actions/checkout@v4 | ||||
|  | ||||
|       - name: Upload Arch package | ||||
|         uses: https://gitea.com/actions/gitea-upload-artifact@v4 | ||||
|         with: | ||||
|           name: PortProtonQt-Arch | ||||
|           path: ${{ env.PKGDEST }}/* | ||||
| @@ -1,4 +1,4 @@ | ||||
| name: Code and build check | ||||
| name: Code check | ||||
|  | ||||
| on: | ||||
|   pull_request: | ||||
| @@ -22,10 +22,16 @@ jobs: | ||||
|     steps: | ||||
|       - uses: https://gitea.com/actions/checkout@v4 | ||||
|  | ||||
|       - name: Install uv | ||||
|         uses: https://github.com/astral-sh/setup-uv@v6 | ||||
|       - name: Set up Node.js | ||||
|         uses: https://gitea.com/actions/setup-node@v4 | ||||
|         with: | ||||
|           enable-cache: true | ||||
|           node-version: 20 | ||||
|  | ||||
|       - name: Install uv manually | ||||
|         run: | | ||||
|           curl -LsSf https://astral.sh/uv/install.sh | sh | ||||
|           source $HOME/.local/bin/env | ||||
|           uv --version | ||||
|  | ||||
|       - name: Sync dependencies into venv | ||||
|         run: uv sync --all-extras --dev | ||||
| @@ -35,20 +41,3 @@ jobs: | ||||
|         run: | | ||||
|           source .venv/bin/activate | ||||
|           pre-commit run --show-diff-on-failure --color=always --all-files | ||||
|  | ||||
|   build-uv: | ||||
|     name: Build with uv | ||||
|     runs-on: ubuntu-latest | ||||
|     steps: | ||||
|       - uses: https://gitea.com/actions/checkout@v4 | ||||
|  | ||||
|       - name: Install uv | ||||
|         uses: https://github.com/astral-sh/setup-uv@v6 | ||||
|         with: | ||||
|           enable-cache: true | ||||
|  | ||||
|       - name: Sync dependencies | ||||
|         run: uv sync | ||||
|  | ||||
|       - name: Build project | ||||
|         run: uv build | ||||
|   | ||||
| @@ -8,11 +8,30 @@ 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: Set up Node.js | ||||
|         uses: https://gitea.com/actions/setup-node@v4 | ||||
|         with: | ||||
|           node-version: 20 | ||||
|  | ||||
|       - name: Install uv manually | ||||
|         run: | | ||||
|           curl -LsSf https://astral.sh/uv/install.sh | sh | ||||
|           . $HOME/.local/bin/env | ||||
|           uv --version | ||||
|  | ||||
|       - 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 }} | ||||
|   | ||||
| @@ -1,9 +1,9 @@ | ||||
| # See https://pre-commit.com for more information | ||||
| # See https://pre-commit.com/hooks.html for more hooks | ||||
| exclude: '(data/|documentation/|portprotonqt/locales/|dev-scripts/|\.venv/|venv/|.*\.svg$)' | ||||
| 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: | ||||
| @@ -27,8 +26,9 @@ repos: | ||||
|         name: pyright | ||||
|         entry: pyright | ||||
|         language: system | ||||
|         'types_or': [python, pyi] | ||||
|         types_or: [python, pyi] | ||||
|         require_serial: true | ||||
|         exclude: '^portprotonqt/themes/[^/]+/styles\.py$' | ||||
|  | ||||
|   - repo: local | ||||
|     hooks: | ||||
| @@ -37,5 +37,5 @@ repos: | ||||
|         entry: ./dev-scripts/check_qss_properties.py | ||||
|         language: system | ||||
|         types: [file] | ||||
|         files: \.py$ | ||||
|         files: ^portprotonqt/themes/[^/]+/styles\.py$ | ||||
|         pass_filenames: false | ||||
|   | ||||
							
								
								
									
										234
									
								
								CHANGELOG.md
									
									
									
									
									
								
							
							
						
						| @@ -3,17 +3,73 @@ | ||||
| Все заметные изменения в этом проекте фиксируются в этом файле. | ||||
| Формат основан на [Keep a Changelog](https://keepachangelog.com/) и придерживается принципов [Semantic Versioning](https://semver.org/). | ||||
|  | ||||
| ## [Unreleased] | ||||
| ## [0.1.5] - 2025-08-31 | ||||
|  | ||||
| ### Added | ||||
|  | ||||
| - Больше типов анимаций при открытии карточки игры (подробности см. в документации). | ||||
| - Второй тип анимации при наведении и фокусе карточки (подробности см. в документации). | ||||
| - Анимация при закрытии карточки игры (подробности см. в документации). | ||||
| - Добавлен обработчик нажатий стрелок на клавиатуре в поле ввода (позволяет перемещаться между символами с помощью стрелок). | ||||
| - Система быстрого доступа (избранного) в диалоге выбора файлов. | ||||
| - Автоматическая прокрутка для панели дисков в диалоге выбора файлов. | ||||
| - Возможность выбора папок и / или дисков в диалоге выбора файлов через клавиатуру. | ||||
| - Переход в родительскую директорию в диалоге выбора файлов по клавише Backspace. | ||||
| - Пункты "Избранное" и "Недавние" в трей для быстрого запуска игр. | ||||
| - Пункт "Выход" в трей. | ||||
| - Пункт "Темы" в трей для быстрого переключения тем. | ||||
| - Двойной клик по иконке трея для показа/скрытия главного окна. | ||||
| - Запуск через трей показывает модальное окно для слежки за процессом запуска | ||||
|  | ||||
| ### Changed | ||||
| - Оптимизированны обложки автоинсталлов | ||||
|  | ||||
| - Уменьшена длительность анимации открытия карточки с 800 до 350 мс. | ||||
| - Контекстное меню при открытии теперь сразу фокусируется на первом элементе. | ||||
| - Анимации теперь можно настраивать через темы (подробности см. в документации). | ||||
| - Общие JSON-файлы (`steam_apps` и `anticheat_games`) теперь перекачиваются, если они повреждены. | ||||
| - Временно удалена светлая тема. | ||||
| - Добавление и удаление игр из Steam больше не требует перезапуска клиента. | ||||
| - Обновлены все зависимости (затрагивает только AppImage). | ||||
| - Приложение теперь не закрывается полностью, а сворачивается в трей. | ||||
| - Карточки теперь все находятся друг под другом, а не в разнабой | ||||
| - Изменено соотношение сторон карточек | ||||
|  | ||||
| ### Fixed | ||||
| - `legendary list` теперь не вызывается, если вход в EGS не был выполнен. | ||||
| - Скриншоты тем больше не теряют качество при масштабе, отличном от 100%. | ||||
| - Данные от HLTB теперь не отображаются в карточке, если нет информации о времени прохождения. | ||||
| - Диалог добавления игры больше не добавляет игру, если `exe` не существует. | ||||
| - Вкладки больше не переключаются стрелками, если фокус в поле ввода. | ||||
| - Исправлено переключение слайдера: RT (Xbox) / R2 (PS), LT (Xbox) / L2 (PS). | ||||
| - Заголовок окна диалога выбора файлов теперь можно перевести. | ||||
| - Трей теперь можно перевести. | ||||
| - Отображение устройств смонтированных в /run/media в диалоге выбора файлов. | ||||
| - Закрытие диалогов добавления / редактирования игры и выбора файлов по клавише Escape. | ||||
|  | ||||
| ### Contributors | ||||
| - @Alex Smith | ||||
|  | ||||
| --- | ||||
|  | ||||
| ## [0.1.4] - 2025-07-21 | ||||
|  | ||||
| ### Added | ||||
| - Переводы в переопределениях (подробности см. в документации). | ||||
| - Обложки и описания для всех автоинсталлов. | ||||
| - Возможность указать ссылку для скачивания обложки в диалоге добавления игры. | ||||
| - Интеграция с howlongtobeat.com. | ||||
|  | ||||
| ### Changed | ||||
| - Оптимизированы обложки автоинсталлов. | ||||
| - Папка `custom_data` исключена из сборки модуля для уменьшения его размера. | ||||
| - Бейдж PortProton теперь открывает PortProtonDB. | ||||
| - Отключено переключение полноэкранного режима через F11 или кнопку Select на геймпаде в Gamescope-сессии. | ||||
| - Удалён аргумент `--session`, так как тестирование Gamescope-сессии завершено. | ||||
| - В контекстном меню игр без exe-файла теперь отображается только пункт «Удалить из PortProton». | ||||
|  | ||||
| ### Fixed | ||||
| - Запрос к GitHub API при загрузке legendary теперь учитывает настройки прокси. | ||||
| - Путь к `portprotonqt-session-select` в оверлее. | ||||
| - Работа `exiftool` в AppImage. | ||||
| - Открытие контекстного меню у игр без exe-файла. | ||||
|  | ||||
| ### Contributors | ||||
| - @Vector_null | ||||
| @@ -23,32 +79,32 @@ | ||||
| ## [0.1.3] - 2025-07-05 | ||||
|  | ||||
| ### Added | ||||
| - Аргумент `--session` для запуска приложения в gamescope (Исключительно в целях тестирования) | ||||
| - Начальная поддержка EGS (Без EOS, скачивания игр и запуска игр из сторонних магазинов) | ||||
| - Автодополнение bash для комманды portprotonqt | ||||
| - Поддержка геймпадов в диалоге выбора игры | ||||
| - Быстрый запуск и остановка игры через контекстное меню | ||||
| - Иконки в контекстом меню | ||||
| - Обложки для части автоинсталлов | ||||
| - Аргумент `--session` для запуска приложения в Gamescope (исключительно в целях тестирования). | ||||
| - Начальная поддержка EGS (без EOS, скачивания и запуска игр из сторонних магазинов). | ||||
| - Автодополнение bash для команды `portprotonqt`. | ||||
| - Поддержка геймпадов в диалоге выбора игры. | ||||
| - Быстрый запуск и остановка игры через контекстное меню. | ||||
| - Иконки в контекстном меню. | ||||
| - Обложки для части автоинсталлов. | ||||
|  | ||||
| ### Changed | ||||
| - Удалены сборки для Fedora 40 | ||||
| - Перенесены параметры анимации GameCard в `styles.py` с подробной документацией для поддержки кастомизации тем. | ||||
| - Статус выделения и наведения на карточки теперь взаимоисключают друг друга | ||||
| - Все desktop файлы создаются с коментарием "Запустить игру {название} через PortProton" | ||||
| - Заполнители в переводах теперь стали более осмысленными | ||||
| - Изменена компоновка диалога добавления игры для лучшего отображения в Gamescope | ||||
| - Текст бейджей теперь обрезается через ... если не помещается | ||||
| - Удалены сборки для Fedora 40. | ||||
| - Параметры анимации GameCard перенесены в `styles.py` с подробной документацией для кастомизации тем. | ||||
| - Статусы выделения и наведения на карточки теперь взаимоисключающие. | ||||
| - Все desktop-файлы создаются с комментарием «Запустить игру {название} через PortProton». | ||||
| - Заполнители в переводах стали более осмысленными. | ||||
| - Изменена компоновка диалога добавления игры для лучшего отображения в Gamescope. | ||||
| - Текст бейджей теперь обрезается троеточием, если не помещается. | ||||
|  | ||||
| ### Fixed | ||||
| - Дублирование обводки выделения карточек при быстром перемешении мыши | ||||
| - Завершение приложения при закритие окна | ||||
| - Использование системной палитры в темах | ||||
| - Ошибки темы в нативном пакете | ||||
| - Ошибки темы в Gamescope | ||||
| - Размер иконок для desktop файлов теперь 128x128 | ||||
| - Пустая область при обновлении сетки игр | ||||
| - Запуск игры при открытом оверлее | ||||
| - Дублирование обводки карточек при быстром перемещении мыши. | ||||
| - Завершение приложения при закрытии окна. | ||||
| - Использование системной палитры в темах. | ||||
| - Ошибки тем в нативном пакете. | ||||
| - Ошибки тем в Gamescope. | ||||
| - Размер иконок для desktop-файлов теперь 128x128. | ||||
| - Пустая область при обновлении сетки игр. | ||||
| - Запуск игры при открытом оверлее. | ||||
|  | ||||
| ### Contributors | ||||
| - @Dervart | ||||
| @@ -59,63 +115,63 @@ | ||||
| ## [0.1.2] - 2025-06-15 | ||||
|  | ||||
| ### Added | ||||
| - Кнопки сброса настроек и очистки кэша | ||||
| - Бейдж PortProton | ||||
| - Зависимость от `xdg-utils` | ||||
| - Интеграция статуса WeAntiCheatYet в карточку | ||||
| - Переключение полноэкршанного режима через F11 или кнопку Select на геймпаде | ||||
| - Выбор состояния `QCheckBox` через Enter или кнопку A на геймпаде | ||||
| - Закрытие диалога добавления игры через ESC или кнопку B на геймпаде | ||||
| - Закрытие окна приложения по комбинации клавиш Ctrl+Q | ||||
| - Сохранение и восстановление размера окна при перезапуске | ||||
| - Переключатель полноэкранного режима приложения | ||||
| - Пункт в контекстном меню «Открыть папку игры» | ||||
| - Пункты в контекстном меню «Добавить в Steam» и «Удалить из Steam» | ||||
| - Пункты в контекстном меню «Добавить в Избранное» и «Удалить из Избранного» | ||||
| - Метод сортировки «Сначала избранное» | ||||
| - Настройка автоматического перехода в полноэкранный режим при подключении геймпада (по умолчанию отключена) | ||||
| - Поддержка управления геймпадом в `QMenu` и `QComboBox` | ||||
| - Аргумент `--fullscreen` для запуска приложения в полноэкранном режиме | ||||
| - Оверлей на кнопку  Insert или кнопку Xbox/PS на геймпаде для закрытия приложения, выключения, перезагрузки и перехода в спящий режим или переключения между сессиями | ||||
| - [Gamescope сессия](https://git.linux-gaming.ru/Boria138/gamescope-session-portprotonqt) | ||||
| - Пресеты управления для DualShock 4 и DualSense | ||||
| - Настройка тактильной отдачи на геймпаде при запуске игры (по умолчанию выключена) | ||||
| - Переводы пунктов настроек | ||||
| - Кнопки сброса настроек и очистки кэша. | ||||
| - Бейдж PortProton. | ||||
| - Зависимость от `xdg-utils`. | ||||
| - Интеграция статуса WeAntiCheatYet в карточку. | ||||
| - Переключение полноэкранного режима через F11 или кнопку Select на геймпаде. | ||||
| - Выбор состояния `QCheckBox` через Enter или кнопку A на геймпаде. | ||||
| - Закрытие диалога добавления игры через ESC или кнопку B на геймпаде. | ||||
| - Закрытие приложения комбинацией клавиш Ctrl+Q. | ||||
| - Сохранение и восстановление размера окна при перезапуске. | ||||
| - Переключатель полноэкранного режима приложения. | ||||
| - Пункт в контекстном меню «Открыть папку игры». | ||||
| - Пункты в контекстном меню «Добавить в Steam» и «Удалить из Steam». | ||||
| - Пункты в контекстном меню «Добавить в избранное» и «Удалить из избранного». | ||||
| - Метод сортировки «Сначала избранное». | ||||
| - Настройка автоматического перехода в полноэкранный режим при подключении геймпада (по умолчанию отключена). | ||||
| - Поддержка управления геймпадом в `QMenu` и `QComboBox`. | ||||
| - Аргумент `--fullscreen` для запуска приложения в полноэкранном режиме. | ||||
| - Оверлей на кнопку Insert или Xbox/PS-кнопку на геймпаде для закрытия приложения, выключения, перезагрузки, перехода в спящий режим или переключения между сессиями. | ||||
| - [Gamescope-сессия](https://git.linux-gaming.ru/Boria138/gamescope-session-portprotonqt). | ||||
| - Пресеты управления для DualShock 4 и DualSense. | ||||
| - Настройка тактильной отдачи на геймпаде при запуске игры (по умолчанию отключена). | ||||
| - Переводы пунктов настроек. | ||||
|  | ||||
| ### Changed | ||||
| - Обновлены все иконки | ||||
| - Переименована функция `_get_steam_home` в `get_steam_home` | ||||
| - Переименован `steam_game` в `game_source` | ||||
| - Логика контекстного меню вынесена в `ContextMenuManager` | ||||
| - Бейдж Steam теперь открывает Steam Community | ||||
| - Изменена лицензия с MIT на GPL-3.0 для совместимости с кодом от legendary | ||||
| - Оптимизирована генерация карточек для плавной работы при поиске и изменении размера окна | ||||
| - Бейджи с карточек теперь отображаются также на странице с деталями, а не только в библиотеке | ||||
| - Установлена ширина бейджа в две трети ширины карточки | ||||
| - Бейджи источников (`Steam`, `EGS`, `PortProton`) теперь отображаются только при активном фильтре `all` или `favorites` | ||||
| - Карточки теперь фокусируются в направлении движения стрелок или D-pad: | ||||
| - Поддерживается удержание D-pad для непрерывного переключения карточек | ||||
| - Объединён обработчик управления стрелками клавиатуры и D-pad для консистентности | ||||
| - D-pad больше не переключает вкладки (только кнопки RB/LB) | ||||
| - Кнопка добавления игры больше не фокусируется | ||||
| - Диалог добавления игры теперь открывается только в библиотеке | ||||
| - Удалены все упоминания PortProtonQT из кода и заменены на PortProtonQt | ||||
| - Размер карточек теперь меняется только при отпускании слайдера | ||||
| - Слайдер теперь управляется через тригеры на геймпаде | ||||
| - Диалог добавления игры теперь открывается на X, а не на Y | ||||
| - Обновлены все иконки. | ||||
| - Функция `_get_steam_home` переименована в `get_steam_home`. | ||||
| - `steam_game` переименован в `game_source`. | ||||
| - Логика контекстного меню вынесена в `ContextMenuManager`. | ||||
| - Бейдж Steam теперь открывает Steam Community. | ||||
| - Лицензия изменена с MIT на GPL-3.0 для совместимости с кодом legendary. | ||||
| - Оптимизирована генерация карточек для плавной работы при поиске и изменении размера окна. | ||||
| - Бейджи с карточек теперь отображаются и на странице с деталями, а не только в библиотеке. | ||||
| - Установлена ширина бейджа в 2/3 ширины карточки. | ||||
| - Бейджи источников (`Steam`, `EGS`, `PortProton`) отображаются только при активном фильтре `all` или `favorites`. | ||||
| - Карточки теперь фокусируются в направлении движения стрелок или D-pad. | ||||
| - Поддерживается удержание D-pad для непрерывного переключения карточек. | ||||
| - Объединён обработчик управления стрелками клавиатуры и D-pad для консистентности. | ||||
| - D-pad больше не переключает вкладки (только кнопки RB/LB). | ||||
| - Кнопка добавления игры больше не получает фокус. | ||||
| - Диалог добавления игры открывается только в библиотеке. | ||||
| - Все упоминания PortProtonQT заменены на PortProtonQt. | ||||
| - Размер карточек меняется только при отпускании слайдера. | ||||
| - Слайдер теперь управляется триггерами на геймпаде. | ||||
| - Диалог добавления игры теперь открывается на X, а не на Y. | ||||
|  | ||||
| ### Fixed | ||||
| - Возврат к теме «standard» при выборе несуществующей темы | ||||
| - Корректное открытие контекстного меню | ||||
| - Запуск приложения при отсутствии `exiftool` | ||||
| - Предотвращено бесконечное обращение к `get_portproton_location` | ||||
| - Обновлены ссылки на документацию в README | ||||
| - Устранён traceback при отсутствии обложек (placeholder) | ||||
| - Устранены утечки памяти при загрузке обложек | ||||
| - Исправлены ошибки при подключении геймпада | ||||
| - Предотвращено многократное открытие диалога добавления игры через геймпад | ||||
| - Корректная обработка событий геймпада во время игры | ||||
| - Убийсво всех процессов "зомби" при закрытии программы | ||||
| - Возврат к теме «standard» при выборе несуществующей темы. | ||||
| - Корректное открытие контекстного меню. | ||||
| - Запуск приложения при отсутствии `exiftool`. | ||||
| - Предотвращено бесконечное обращение к `get_portproton_location`. | ||||
| - Обновлены ссылки на документацию в README. | ||||
| - Исправлено падение при отсутствии обложек (placeholder). | ||||
| - Устранены утечки памяти при загрузке обложек. | ||||
| - Исправлены ошибки при подключении геймпада. | ||||
| - Предотвращено многократное открытие диалога добавления игры через геймпад. | ||||
| - Корректная обработка событий геймпада во время игры. | ||||
| - Убийство всех процессов-зомби при закрытии программы. | ||||
|  | ||||
| ### Contributors | ||||
| - @Vector_null | ||||
| @@ -126,20 +182,20 @@ | ||||
| ## [0.1.1] – 2025-05-17 | ||||
|  | ||||
| ### Added | ||||
| - Алфавитная сортировка библиотеки | ||||
| - Проверка переводов через yaspeller | ||||
| - Сборка Fedora-пакета | ||||
| - Сборка AppImage | ||||
| - Алфавитная сортировка библиотеки. | ||||
| - Проверка переводов через yaspeller. | ||||
| - Сборка Fedora-пакета. | ||||
| - Сборка AppImage. | ||||
|  | ||||
| ### Changed | ||||
| - Удалён жёстко заданный размер окна | ||||
| - Использован `icoextract` как Python-модуль | ||||
| - Удалён жёстко заданный размер окна. | ||||
| - Использован `icoextract` как Python-модуль. | ||||
|  | ||||
| ### Fixed | ||||
| - Скрытие статус-бара | ||||
| - Чтение списка Steam-игр | ||||
| - Зависание GUI | ||||
| - Сбой при повреждённом Steam | ||||
| - Скрытие статус-бара. | ||||
| - Чтение списка Steam-игр. | ||||
| - Зависание GUI. | ||||
| - Сбой при повреждённом Steam. | ||||
|  | ||||
| ### Contributors | ||||
| - @Vector_null | ||||
|   | ||||
							
								
								
									
										278
									
								
								LICENSE
									
									
									
									
									
								
							
							
						
						| @@ -1,232 +1,100 @@ | ||||
| GNU GENERAL PUBLIC LICENSE | ||||
| Version 3, 29 June 2007 | ||||
| +---------------------------------------------------+ | ||||
| | PortProtonQt - Licensing - Read carefully         | | ||||
| +---------------------------------------------------+ | ||||
|  | ||||
| Copyright © 2007 Free Software Foundation, Inc. <https://fsf.org/> | ||||
|  | ||||
| Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. | ||||
| This program is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published by | ||||
| the Free Software Foundation, either version 3 of the License, or | ||||
| (at your option) any later version. | ||||
|  | ||||
| Preamble | ||||
| This program is distributed in the hope that it will be useful, | ||||
| but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||||
| GNU General Public License for more details. | ||||
|  | ||||
| The GNU General Public License is a free, copyleft license for software and other kinds of works. | ||||
| You should have received a copy of the GNU General Public License | ||||
| along with this program. If not, see <https://www.gnu.org/licenses/>. | ||||
|  | ||||
| The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. We, the Free Software Foundation, use the GNU General Public License for most of our software; it applies also to any other work released this way by its authors. You can apply it to your programs, too. | ||||
| We make use of various projects, some of which require their license to be preserved. Here's their respective licenses: | ||||
| ----------------------------------------------------------------------------------------------------------------------- | ||||
|  | ||||
| When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. | ||||
|  | ||||
| To protect your rights, we need to prevent others from denying you these rights or asking you to surrender the rights. Therefore, you have certain responsibilities if you distribute copies of the software, or if you modify it: responsibilities to respect the freedom of others. | ||||
| =============== | ||||
| = icoextract: = | ||||
| =============== | ||||
| MIT License | ||||
|  | ||||
| For example, if you distribute copies of such a program, whether gratis or for a fee, you must pass on to the recipients the same freedoms that you received. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights. | ||||
| Copyright (c) 2015-2016 Fadhil Mandaga | ||||
| Copyright (c) 2019-2025 James Lu <james@overdrivenetworks.com> | ||||
|  | ||||
| Developers that use the GNU GPL protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License giving you legal permission to copy, distribute and/or modify it. | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documentation files (the "Software"), to deal | ||||
| in the Software without restriction, including without limitation the rights | ||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
| copies of the Software, and to permit persons to whom the Software is | ||||
| furnished to do so, subject to the following conditions: | ||||
|  | ||||
| For the developers' and authors' protection, the GPL clearly explains that there is no warranty for this free software. For both users' and authors' sake, the GPL requires that modified versions be marked as changed, so that their problems will not be attributed erroneously to authors of previous versions. | ||||
| The above copyright notice and this permission notice shall be included in all | ||||
| copies or substantial portions of the Software. | ||||
|  | ||||
| Some devices are designed to deny users access to install or run modified versions of the software inside them, although the manufacturer can do so. This is fundamentally incompatible with the aim of protecting users' freedom to change the software. The systematic pattern of such abuse occurs in the area of products for individuals to use, which is precisely where it is most unacceptable. Therefore, we have designed this version of the GPL to prohibit the practice for those products. If such problems arise substantially in other domains, we stand ready to extend this provision to those domains in future versions of the GPL, as needed to protect the freedom of users. | ||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||
| SOFTWARE. | ||||
|  | ||||
| Finally, every program is threatened constantly by software patents. States should not allow patents to restrict development and use of software on general-purpose computers, but in those that do, we wish to avoid the special danger that patents applied to a free program could make it effectively proprietary. To prevent this, the GPL assures that patents cannot be used to render the program non-free. | ||||
|  | ||||
| The precise terms and conditions for copying, distribution and modification follow. | ||||
| =============== | ||||
| = portproton: = | ||||
| =============== | ||||
| MIT License | ||||
|  | ||||
| TERMS AND CONDITIONS | ||||
|  | ||||
| 0. Definitions. | ||||
| Copyright (c) 2025 Mikhail Tergoev | ||||
|  | ||||
| “This License” refers to version 3 of the GNU General Public License. | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documentation files (the "Software"), to deal | ||||
| in the Software without restriction, including without limitation the rights | ||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
| copies of the Software, and to permit persons to whom the Software is | ||||
| furnished to do so, subject to the following conditions: | ||||
|  | ||||
| “Copyright” also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. | ||||
| The above copyright notice and this permission notice shall be included in all | ||||
| copies or substantial portions of the Software. | ||||
|  | ||||
| “The Program” refers to any copyrightable work licensed under this License. Each licensee is addressed as “you”. “Licensees” and “recipients” may be individuals or organizations. | ||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||
| SOFTWARE. | ||||
|  | ||||
| To “modify” a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a “modified version” of the earlier work or a work “based on” the earlier work. | ||||
| =============================== | ||||
| =  HowLongToBeat-Python-API : = | ||||
| =============================== | ||||
| MIT License | ||||
|  | ||||
| A “covered work” means either the unmodified Program or a work based on the Program. | ||||
| Copyright (c) 2020 JaeguKim | ||||
|  | ||||
| To “propagate” a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: | ||||
|  | ||||
| To “convey” a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. | ||||
| The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. | ||||
|  | ||||
| An interactive user interface displays “Appropriate Legal Notices” to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. | ||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||||
|  | ||||
| 1. Source Code. | ||||
| The “source code” for a work means the preferred form of the work for making modifications to it. “Object code” means any non-source form of a work. | ||||
| ============== | ||||
| = legendary: = | ||||
| ============== | ||||
| GNU General Public License v3.0 | ||||
|  | ||||
| A “Standard Interface” means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. | ||||
| Copyright (c) 2020–2025 Derek Taylor and contributors | ||||
|  | ||||
| The “System Libraries” of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A “Major Component”, in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. | ||||
| Legendary is free software: you can redistribute it and/or modify | ||||
| it under the terms of the GNU General Public License as published | ||||
| by the Free Software Foundation, version 3. | ||||
|  | ||||
| The “Corresponding Source” for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those subprograms and other parts of the work. | ||||
|  | ||||
| The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. | ||||
|  | ||||
| The Corresponding Source for a work in source code form is that same work. | ||||
|  | ||||
| 2. Basic Permissions. | ||||
| All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. | ||||
|  | ||||
| You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. | ||||
|  | ||||
| Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. | ||||
|  | ||||
| 3. Protecting Users' Legal Rights From Anti-Circumvention Law. | ||||
| No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. | ||||
|  | ||||
| When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. | ||||
|  | ||||
| 4. Conveying Verbatim Copies. | ||||
| You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. | ||||
|  | ||||
| You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. | ||||
|  | ||||
| 5. Conveying Modified Source Versions. | ||||
| You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: | ||||
|  | ||||
|      a) The work must carry prominent notices stating that you modified it, and giving a relevant date. | ||||
|  | ||||
|      b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to “keep intact all notices”. | ||||
|  | ||||
|      c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. | ||||
|  | ||||
|      d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. | ||||
|  | ||||
| A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an “aggregate” if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. | ||||
|  | ||||
| 6. Conveying Non-Source Forms. | ||||
| You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: | ||||
|  | ||||
|      a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. | ||||
|  | ||||
|      b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. | ||||
|  | ||||
|      c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. | ||||
|  | ||||
|      d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. | ||||
|  | ||||
|      e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. | ||||
|  | ||||
| A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. | ||||
|  | ||||
| A “User Product” is either (1) a “consumer product”, which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, “normally used” refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. | ||||
|  | ||||
| “Installation Information” for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. | ||||
|  | ||||
| If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). | ||||
|  | ||||
| The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. | ||||
|  | ||||
| Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. | ||||
|  | ||||
| 7. Additional Terms. | ||||
| “Additional permissions” are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. | ||||
|  | ||||
| When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. | ||||
|  | ||||
| Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: | ||||
|  | ||||
|      a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or | ||||
|  | ||||
|      b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or | ||||
|  | ||||
|      c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or | ||||
|  | ||||
|      d) Limiting the use for publicity purposes of names of licensors or authors of the material; or | ||||
|  | ||||
|      e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or | ||||
|  | ||||
|      f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. | ||||
|  | ||||
| All other non-permissive additional terms are considered “further restrictions” within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. | ||||
|  | ||||
| If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. | ||||
|  | ||||
| Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. | ||||
|  | ||||
| 8. Termination. | ||||
| You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). | ||||
|  | ||||
| However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. | ||||
|  | ||||
| Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. | ||||
|  | ||||
| Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. | ||||
|  | ||||
| 9. Acceptance Not Required for Having Copies. | ||||
| You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. | ||||
|  | ||||
| 10. Automatic Licensing of Downstream Recipients. | ||||
| Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. | ||||
|  | ||||
| An “entity transaction” is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. | ||||
|  | ||||
| You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. | ||||
|  | ||||
| 11. Patents. | ||||
| A “contributor” is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's “contributor version”. | ||||
|  | ||||
| A contributor's “essential patent claims” are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, “control” includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. | ||||
|  | ||||
| Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. | ||||
|  | ||||
| In the following three paragraphs, a “patent license” is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To “grant” such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. | ||||
|  | ||||
| If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent license to downstream recipients. “Knowingly relying” means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. | ||||
|  | ||||
| If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. | ||||
|  | ||||
| A patent license is “discriminatory” if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. | ||||
|  | ||||
| Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. | ||||
|  | ||||
| 12. No Surrender of Others' Freedom. | ||||
| If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. | ||||
|  | ||||
| 13. Use with the GNU Affero General Public License. | ||||
| Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU Affero General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the special requirements of the GNU Affero General Public License, section 13, concerning interaction through a network will apply to the combination as such. | ||||
|  | ||||
| 14. Revised Versions of this License. | ||||
| The Free Software Foundation may publish revised and/or new versions of the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. | ||||
|  | ||||
| Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU General Public License “or any later version” applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU General Public License, you may choose any version ever published by the Free Software Foundation. | ||||
|  | ||||
| If the Program specifies that a proxy can decide which future versions of the GNU General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. | ||||
|  | ||||
| Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. | ||||
|  | ||||
| 15. Disclaimer of Warranty. | ||||
| THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM “AS IS” WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. | ||||
|  | ||||
| 16. Limitation of Liability. | ||||
| IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. | ||||
|  | ||||
| 17. Interpretation of Sections 15 and 16. | ||||
| If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. | ||||
|  | ||||
| END OF TERMS AND CONDITIONS | ||||
|  | ||||
| How to Apply These Terms to Your New Programs | ||||
|  | ||||
| If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. | ||||
|  | ||||
| To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found. | ||||
|  | ||||
|      PortProtonQt | ||||
|      Copyright (C) 2025  Boria138 | ||||
|  | ||||
|      This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. | ||||
|  | ||||
|      This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details. | ||||
|  | ||||
|      You should have received a copy of the GNU General Public License along with this program.  If not, see <https://www.gnu.org/licenses/>. | ||||
|  | ||||
| Also add information on how to contact you by electronic and paper mail. | ||||
|  | ||||
| If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: | ||||
|  | ||||
|      PortProtonQt  Copyright (C) 2025  Boria138 | ||||
|      This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. | ||||
|      This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. | ||||
|  | ||||
| The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, your program's commands might be different; for a GUI interface, you would use an “about box”. | ||||
|  | ||||
| You should also get your employer (if you work as a programmer) or school, if any, to sign a “copyright disclaimer” for the program, if necessary. For more information on this, and how to apply and follow the GNU GPL, see <https://www.gnu.org/licenses/>. | ||||
|  | ||||
| The GNU General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. But first, please read <https://www.gnu.org/philosophy/why-not-lgpl.html>. | ||||
| https://github.com/derrod/legendary | ||||
|   | ||||
							
								
								
									
										81
									
								
								README.md
									
									
									
									
									
								
							
							
						
						| @@ -4,79 +4,6 @@ | ||||
|   <p align="center">Удобный графический интерфейс для управления и запуска игр из PortProton, Steam и Epic Games Store. Оно объединяет библиотеки игр в единый центр для лёгкой навигации и организации. Лёгкая структура и кроссплатформенная поддержка обеспечивают цельный игровой опыт без необходимости использования нескольких лаунчеров. Интеграция с PortProton упрощает запуск Windows-игр на Linux с минимальной настройкой.</p> | ||||
| </div> | ||||
|  | ||||
| ## В планах | ||||
|  | ||||
| - [X] Адаптировать структуру проекта для поддержки инструментов сборки | ||||
| - [X] Добавить возможность управления с геймпада | ||||
| - [ ] Добавить возможность управления с тачскрина | ||||
| - [X] Добавить возможность управления с мыши и клавиатуры | ||||
| - [X] Добавить систему тем [Документация](documentation/theme_guide) | ||||
| - [X] Вынести все константы, такие как уровень закругления карточек, в темы (частично выполнено) | ||||
| - [X] Добавить метаданные для тем (скриншоты, описание, домашняя страница и автор) | ||||
| - [ ] Продумать систему вкладок вместо текущей | ||||
| - [ ] [Добавить сессию Gamescope, аналогичную той, что используется в SteamOS](https://git.linux-gaming.ru/Boria138/gamescope-session-portprotonqt) | ||||
| - [X] Разобраться почему теряется часть стилей в Gamescope | ||||
| - [ ] Разработать адаптивный дизайн (за эталон берётся Steam Deck с разрешением 1280×800) | ||||
| - [ ] Переделать скриншоты для соответствия [гайдлайнам Flathub](https://docs.flathub.org/docs/for-app-authors/metainfo-guidelines/quality-guidelines#screenshots) | ||||
| - [X] Получать описания и названия игр из базы данных Steam | ||||
| - [X] Получать обложки для игр из SteamGridDB или CDN Steam | ||||
| - [X] Оптимизировать работу со Steam API для ускорения времени запуска | ||||
| - [X] Улучшить функцию поиска в Steam API для исправления некорректного определения ID (например, Graven определялся как ENGRAVEN или GRAVENFALL, Spore — как SporeBound или Spore Valley) | ||||
| - [ ] Убрать логи Steam API в релизной версии, так как они замедляют выполнение кода | ||||
| - [X] Решить проблему с ограничением Steam API в 50 тысяч игр за один запрос (иногда нужные игры не попадают в выборку и остаются без обложки) | ||||
| - [X] Избавиться от вызовов yad | ||||
| - [X] Реализовать собственный механизм запрета ухода в спящий режим вместо использования механизма PortProton (оставлено для [PortProton 2.0](https://github.com/Castro-Fidel/PortProton_2.0)) | ||||
| - [X] Реализовать собственный системный трей вместо использования трея PortProton | ||||
| - [X] Добавить экранную клавиатуру в поиск (реализация собственной клавиатуры слишком затратна, поэтому используется встроенная в DE клавиатура: Maliit в KDE, gjs-osk в GNOME, Squeekboard в Phosh, клавиатура SteamOS и т.д.) | ||||
| - [X] Добавить сортировку карточек по различным критериям (доступны: по недавности, количеству наигранного времени, избранному или алфавиту) | ||||
| - [X] Добавить индикацию запуска приложения | ||||
| - [X] Достигнуть паритета функциональности с Ingame | ||||
| - [ ] Достигнуть паритета функциональности с PortProton | ||||
| - [X] Добавить возможность изменения названия, описания и обложки через файлы `.local/share/PortProtonQT/custom_data/exe_name/{desc,name,cover}` | ||||
| - [X] Добавить встроенное переопределение названия, описания и обложки, например, по пути `portprotonqt/custom_data` [Документация](documentation/metadata_override/) | ||||
| - [ ] Добавить переводы в переопределения | ||||
| - [ ] Придумать как переопределять launcher.exe | ||||
| - [X] Добавить в карточку игры сведения о поддержке геймпада | ||||
| - [X] Добавить в карточки данные с ProtonDB | ||||
| - [X] Добавить в карточки данные с AreWeAntiCheatYet | ||||
| - [X] Продублировать бейджи с карточки на страницу с деталями игры | ||||
| - [X] Добавить парсинг ярлыков из Steam | ||||
| - [X] Добавить парсинг ярлыков из EGS | ||||
| - [ ] Избавиться от бинарника legendary | ||||
| - [X] Добавить запуск игр из EGS | ||||
| - [ ] Добавить скачивание игр из EGS | ||||
| - [ ] Добавить поддержку запуска сторонних игр из EGS | ||||
| - [ ] Добавить авторизацию в EGS через WebView вместо ручного ввода | ||||
| - [X] Получать описания для игр из EGS через их [API](https://store-content.ak.epicgames.com/api) | ||||
| - [X] Получать slug через GraphQL [запрос](https://launcher.store.epicgames.com/graphql) | ||||
| - [X] Добавить на карточку бейдж, указывающий, что игра из Steam | ||||
| - [X] Добавить поддержку версий Steam для Flatpak и Snap | ||||
| - [X] Отображать данные о самом последнем пользователе Steam, а не первом попавшемся | ||||
| - [X] Исправить склонения в детальном выводе времени, например, не «3 часов назад», а «3 часа назад» | ||||
| - [X] Добавить перевод через gettext [Документация](documentation/localization_guide) | ||||
| - [X] Отображать описания игр и другие данные на языке системы | ||||
| - [X] Добавить недокументированные параметры конфигурации в GUI (time_detail_level, games_sort_method, games_display_filter) | ||||
| - [X] Добавить систему избранного для карточек | ||||
| - [X] Заменить все `print` на `logging` | ||||
| - [ ] Привести все логи к единому языку | ||||
| - [X] Уменьшить количество подстановок в переводах | ||||
| - [X] Стилизовать все элементы без стилей (QMessageBox, QSlider, QDialog) | ||||
| - [X] Убрать жёсткую привязку путей к стрелочкам QComboBox в `styles.py` | ||||
| - [X] Исправить частичное применение тем на лету | ||||
| - [X] Исправить наложение подписей скриншотов при первом перелистывании в полноэкранном режиме | ||||
| - [ ] Добавить поддержку GOG (?) | ||||
| - [X] Определиться с названием (PortProtonQt или PortProtonQT или вообще третий вариант) | ||||
| - [ ] Добавить данные с HowLongToBeat на страницу с деталями игры (?) | ||||
| - [X] Добавить виброотдачу на геймпаде при запуске игры | ||||
| - [X] Исправить некорректную работу слайдера увеличения размера карточек([Последствия регрессии после этого коммита](https://github.com/Boria138/PortProtonQt/commit/aebdd60b5537280f06a922ff80469cd4ab27bc63) | ||||
| - [X] Исправить баг с наложением карточек друг на друга при изменении фильтра отображения ([Последствия регрессии после этого коммита](https://github.com/Boria138/PortProtonQt/commit/aebdd60b5537280f06a922ff80469cd4ab27bc63)) | ||||
| - [X] Скопировать логику управления с D-pad на стрелки с клавиатуры | ||||
| - [ ] Доделать светлую тему | ||||
| - [ ] Добавить подсказки к управлению с геймпада | ||||
| - [ ] Добавить загрузку звуков в темы например для добавления звука запуска в тему и тд | ||||
| - [X] Добавить миниатюры к выбору файлов в диалоге добавления игры | ||||
| - [X] Добавить быстрый доступ к смонтированным дискам к выбору файлов в диалоге добавления игры | ||||
|  | ||||
| ### Установка (devel) | ||||
|  | ||||
| ```sh | ||||
| @@ -124,11 +51,11 @@ pre-commit run --all-files | ||||
|  | ||||
| PortProtonQt использует код и зависимости от следующих проектов: | ||||
|  | ||||
| - [Legendary](https://github.com/derrod/legendary) — инструмент для работы с Epic Games Store, лицензия [GPL-3.0](https://www.gnu.org/licenses/gpl-3.0.html). | ||||
| - [Icoextract](https://github.com/jlu5/icoextract) — библиотека для извлечения иконок, лицензия [MIT](https://opensource.org/licenses/MIT). | ||||
| - [PortProton 2.0](https://git.linux-gaming.ru/CastroFidel/PortProton_2.0) — библиотека для взаимодействия с PortProton, лицензия [MIT](https://opensource.org/licenses/MIT). | ||||
| - [Legendary](https://github.com/derrod/legendary) — инструмент для работы с Epic Games Store, лицензия [GPL-3.0](https://github.com/derrod/legendary/blob/master/LICENSE). | ||||
| - [Icoextract](https://github.com/jlu5/icoextract) — библиотека для извлечения иконок, лицензия [MIT](https://github.com/jlu5/icoextract/blob/master/LICENSE). | ||||
| - [HowLongToBeat Python API](https://github.com/ScrappyCocco/HowLongToBeat-PythonAPI) — библиотека для взаимодействия с HowLongToBeat, лицензия [MIT](https://github.com/ScrappyCocco/HowLongToBeat-PythonAPI/blob/master/LICENSE.md). | ||||
|  | ||||
| Полный текст лицензий см. в файлах [LICENSE](LICENSE), [LICENSE-icoextract](documentation/licenses/icoextract), [LICENSE-portproton](documentation/licenses/portproton), [LICENSE-legendary](documentation/licenses/legendary). | ||||
| Полный текст лицензий см. в файле [LICENSE](LICENSE). | ||||
|  | ||||
| > [!WARNING] | ||||
| > Проект находится на стадии WIP (work in progress) корректная работоспособность не гарантирована | ||||
|   | ||||
							
								
								
									
										68
									
								
								TODO.md
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,68 @@ | ||||
| - [X] Адаптировать структуру проекта для поддержки инструментов сборки | ||||
| - [X] Добавить возможность управления с геймпада | ||||
| - [ ] Добавить возможность управления с тачскрина | ||||
| - [X] Добавить возможность управления с мыши и клавиатуры | ||||
| - [X] Добавить систему тем [Документация](documentation/theme_guide) | ||||
| - [X] Вынести все константы, такие как уровень закругления карточек, в темы (частично выполнено) | ||||
| - [X] Добавить метаданные для тем (скриншоты, описание, домашняя страница и автор) | ||||
| - [ ] Продумать систему вкладок вместо текущей | ||||
| - [X] [Добавить сессию Gamescope, аналогичную той, что используется в SteamOS](https://git.linux-gaming.ru/Boria138/gamescope-session-portprotonqt) | ||||
| - [X] Разобраться почему теряется часть стилей в Gamescope | ||||
| - [ ] Разработать адаптивный дизайн (за эталон берётся Steam Deck с разрешением 1280×800) | ||||
| - [ ] Переделать скриншоты для соответствия [гайдлайнам Flathub](https://docs.flathub.org/docs/for-app-authors/metainfo-guidelines/quality-guidelines#screenshots) | ||||
| - [X] Получать описания и названия игр из базы данных Steam | ||||
| - [X] Получать обложки для игр из SteamGridDB или CDN Steam | ||||
| - [X] Оптимизировать работу со Steam API для ускорения времени запуска | ||||
| - [X] Улучшить функцию поиска в Steam API для исправления некорректного определения ID (например, Graven определялся как ENGRAVEN или GRAVENFALL, Spore — как SporeBound или Spore Valley) | ||||
| - [ ] Убрать логи Steam API в релизной версии, так как они замедляют выполнение кода | ||||
| - [X] Решить проблему с ограничением Steam API в 50 тысяч игр за один запрос (иногда нужные игры не попадают в выборку и остаются без обложки) | ||||
| - [X] Избавиться от вызовов yad | ||||
| - [X] Реализовать собственный системный трей вместо использования трея PortProton | ||||
| - [X] Добавить экранную клавиатуру в поиск (реализация собственной клавиатуры слишком затратна, поэтому используется встроенная в DE клавиатура: Maliit в KDE, gjs-osk в GNOME, Squeekboard в Phosh, клавиатура SteamOS и т.д.) | ||||
| - [X] Добавить сортировку карточек по различным критериям (доступны: по недавности, количеству наигранного времени, избранному или алфавиту) | ||||
| - [X] Добавить индикацию запуска приложения | ||||
| - [X] Достигнуть паритета функциональности с Ingame | ||||
| - [ ] Достигнуть паритета функциональности с PortProton | ||||
| - [X] Добавить возможность изменения названия, описания и обложки через файлы `.local/share/PortProtonQT/custom_data/exe_name/{desc,name,cover}` | ||||
| - [X] Добавить встроенное переопределение названия, описания и обложки, например, по пути `portprotonqt/custom_data` [Документация](documentation/metadata_override/) | ||||
| - [X] Добавить переводы в переопределения | ||||
| - [X] Добавить в карточку игры сведения о поддержке геймпада | ||||
| - [X] Добавить в карточки данные с ProtonDB | ||||
| - [X] Добавить в карточки данные с AreWeAntiCheatYet | ||||
| - [X] Продублировать бейджи с карточки на страницу с деталями игры | ||||
| - [X] Добавить парсинг ярлыков из Steam | ||||
| - [X] Добавить парсинг ярлыков из EGS | ||||
| - [ ] Избавиться от бинарника legendary | ||||
| - [X] Добавить запуск игр из EGS | ||||
| - [ ] Добавить скачивание игр из EGS | ||||
| - [ ] Добавить поддержку запуска сторонних игр из EGS | ||||
| - [ ] Добавить авторизацию в EGS через WebView вместо ручного ввода | ||||
| - [X] Получать описания для игр из EGS через их [API](https://store-content.ak.epicgames.com/api) | ||||
| - [X] Получать slug через GraphQL [запрос](https://launcher.store.epicgames.com/graphql) | ||||
| - [X] Добавить на карточку бейдж, указывающий, что игра из Steam | ||||
| - [X] Добавить поддержку версий Steam для Flatpak и Snap | ||||
| - [X] Реализовать добавление игры как сторонней в Steam без перезапуска | ||||
| - [X] Отображать данные о самом последнем пользователе Steam, а не первом попавшемся | ||||
| - [X] Исправить склонения в детальном выводе времени, например, не «3 часов назад», а «3 часа назад» | ||||
| - [X] Добавить перевод через gettext [Документация](documentation/localization_guide) | ||||
| - [X] Отображать описания игр и другие данные на языке системы | ||||
| - [X] Добавить недокументированные параметры конфигурации в GUI (time_detail_level, games_sort_method, games_display_filter) | ||||
| - [X] Добавить систему избранного для карточек | ||||
| - [X] Заменить все `print` на `logging` | ||||
| - [ ] Привести все логи к единому языку | ||||
| - [X] Уменьшить количество подстановок в переводах | ||||
| - [X] Стилизовать все элементы без стилей (QMessageBox, QSlider, QDialog) | ||||
| - [X] Убрать жёсткую привязку путей к стрелочкам QComboBox в `styles.py` | ||||
| - [X] Исправить частичное применение тем на лету | ||||
| - [X] Исправить наложение подписей скриншотов при первом перелистывании в полноэкранном режиме | ||||
| - [ ] Добавить поддержку GOG (?) | ||||
| - [X] Определиться с названием (PortProtonQt или PortProtonQT или вообще третий вариант) | ||||
| - [X] Добавить данные с HowLongToBeat на страницу с деталями игры | ||||
| - [X] Добавить виброотдачу на геймпаде при запуске игры | ||||
| - [X] Исправить некорректную работу слайдера увеличения размера карточек([Последствия регрессии после этого коммита](https://github.com/Boria138/PortProtonQt/commit/aebdd60b5537280f06a922ff80469cd4ab27bc63) | ||||
| - [X] Исправить баг с наложением карточек друг на друга при изменении фильтра отображения ([Последствия регрессии после этого коммита](https://github.com/Boria138/PortProtonQt/commit/aebdd60b5537280f06a922ff80469cd4ab27bc63)) | ||||
| - [X] Скопировать логику управления с D-pad на стрелки с клавиатуры | ||||
| - [ ] Доделать светлую тему | ||||
| - [ ] Добавить подсказки к управлению с геймпада | ||||
| - [X] Добавить миниатюры к выбору файлов в диалоге добавления игры | ||||
| - [X] Добавить быстрый доступ к смонтированным дискам к выбору файлов в диалоге добавления игры | ||||
| @@ -1,5 +1,4 @@ | ||||
| version: 1 | ||||
|  | ||||
| script: | ||||
|   # 1) чистим старый AppDir | ||||
|   - rm -rf AppDir || true | ||||
| @@ -14,29 +13,48 @@ script: | ||||
|   # 5) чистим от ненужных модулей и бинарников | ||||
|   - rm -rf AppDir/usr/local/lib/python3.10/dist-packages/PySide6/Qt/qml/ | ||||
|   - rm -f AppDir/usr/local/lib/python3.10/dist-packages/PySide6/{assistant,designer,linguist,lrelease,lupdate} | ||||
|   - rm -f AppDir/usr/local/lib/python3.10/dist-packages/PySide6/{Qt3D*,QtBluetooth*,QtCharts*,QtConcurrent*,QtDataVisualization*,QtDesigner*,QtHelp*,QtMultimedia*,QtNetwork*,QtOpenGL*,QtPositioning*,QtPrintSupport*,QtQml*,QtQuick*,QtRemoteObjects*,QtScxml*,QtSensors*,QtSerialPort*,QtSql*,QtStateMachine*,QtTest*,QtWeb*,QtXml*} | ||||
|   - rm -f AppDir/usr/local/lib/python3.10/dist-packages/PySide6/{Qt3DAnimation*,Qt3DCore*,Qt3DExtras*,Qt3DInput*,Qt3DLogic*,Qt3DRender*,QtBluetooth*,QtCharts*,QtConcurrent*,QtDataVisualization*,QtDesigner*,QtExampleIcons*,QtGraphs*,QtGraphsWidgets*,QtHelp*,QtHttpServer*,QtLocation*,QtMultimedia*,QtMultimediaWidgets*,QtNetwork*,QtNetworkAuth*,QtNfc*,QtOpenGL*,QtOpenGLWidgets*,QtPdf*,QtPdfWidgets*,QtPositioning*,QtPrintSupport*,QtQml*,QtQuick*,QtQuick3D*,QtQuickControls2*,QtQuickTest*,QtQuickWidgets*,QtRemoteObjects*,QtScxml*,QtSensors*,QtSerialBus*,QtSerialPort*,QtSpatialAudio*,QtSql*,QtStateMachine*,QtSvgWidgets*,QtTest*,QtTextToSpeech*,QtUiTools*,QtWebChannel*,QtWebEngineCore*,QtWebEngineQuick*,QtWebEngineWidgets*,QtWebSockets*,QtWebView*,QtXml*} | ||||
|   - shopt -s extglob | ||||
|   - rm -rf AppDir/usr/local/lib/python3.10/dist-packages/PySide6/Qt/lib/!(libQt6Core*|libQt6Gui*|libQt6Widgets*|libQt6OpenGL*|libQt6XcbQpa*|libQt6Wayland*|libQt6Egl*|libicudata*|libicuuc*|libicui18n*|libQt6DBus*|libQt6Svg*|libQt6Qml*|libQt6Network*) | ||||
|  | ||||
|   - rm -rf AppDir/usr/local/lib/python3.10/dist-packages/PySide6/Qt/lib/!(libQt6Core*|libQt6DBus*|libQt6Egl*|libQt6Gui*|libQt6Svg*|libQt6Wayland*|libQt6Widgets*|libQt6XcbQpa*|libicudata*|libicui18n*|libicuuc*) | ||||
| AppDir: | ||||
|   path: ./AppDir | ||||
|  | ||||
|   after_bundle: | ||||
|     # Документация, справка, примеры | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/man || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/doc || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/doc-base || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/info || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/help || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/gtk-doc || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/devhelp || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/examples || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/pkgconfig || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/bash-completion || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/pixmaps || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/mime || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/share/metainfo || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/include || true | ||||
|     - rm -rf $TARGET_APPDIR/usr/lib/pkgconfig || true | ||||
|     # Статика и отладка | ||||
|     - find $TARGET_APPDIR -type f \( -name '*.a' -o -name '*.la' -o -name '*.h' -o -name '*.cmake' -o -name '*.pdb' \) -delete || true | ||||
|     # Strip ELF бинарников (исключая Python extensions) | ||||
|     - "find $TARGET_APPDIR -type f -executable -exec file {} \\; | grep ELF | grep -v '/dist-packages/' | grep -v '/site-packages/' | cut -d: -f1 | xargs strip --strip-unneeded || true" | ||||
|     # Удаление пустых папок | ||||
|     - find $TARGET_APPDIR -type d -empty -delete || true | ||||
|   app_info: | ||||
|     id: ru.linux_gaming.PortProtonQt | ||||
|     name: PortProtonQt | ||||
|     icon: ru.linux_gaming.PortProtonQt | ||||
|     version: 0.1.3 | ||||
|     version: 0.1.5 | ||||
|     exec: usr/bin/python3 | ||||
|     exec_args: "-m portprotonqt.app $@" | ||||
|  | ||||
|   apt: | ||||
|     arch: amd64 | ||||
|     sources: | ||||
|       - sourceline: 'deb [arch=amd64] http://archive.ubuntu.com/ubuntu/ jammy main restricted universe multiverse' | ||||
|         key_url: 'http://keyserver.ubuntu.com/pks/lookup?op=get&search=0x871920d1991bc93c' | ||||
|  | ||||
|     include: | ||||
|       - python3 | ||||
|       - python3-minimal | ||||
|       - python3-pkg-resources | ||||
|       - libopengl0 | ||||
|       - libk5crypto3 | ||||
| @@ -45,14 +63,23 @@ AppDir: | ||||
|       - libxcb-cursor0 | ||||
|       - libimage-exiftool-perl | ||||
|       - xdg-utils | ||||
|     exclude: [] | ||||
|  | ||||
|     exclude: | ||||
|       # Документация и man-страницы | ||||
|       - "*-doc" | ||||
|       - "*-man" | ||||
|       - manpages | ||||
|       - mandb | ||||
|       # Статические библиотеки | ||||
|       - "*-dev" | ||||
|       - "*-static" | ||||
|       # Дебаг-символы | ||||
|       - "*-dbg" | ||||
|       - "*-dbgsym" | ||||
|   runtime: | ||||
|     env: | ||||
|       PYTHONHOME: '${APPDIR}/usr' | ||||
|       PYTHONPATH: '${APPDIR}/usr/local/lib/python3.10/dist-packages' | ||||
|  | ||||
|       PERLLIB: '${APPDIR}/usr/share/perl5:${APPDIR}/usr/lib/x86_64-linux-gnu/perl/5.34:${APPDIR}/usr/share/perl/5.34' | ||||
| AppImage: | ||||
|   update-information: gh-releases-zsync|Boria138|PortProtonQt|latest|PortProtonQt-*x86_64.AppImage.zsync | ||||
|   sign-key: None | ||||
|   arch: x86_64 | ||||
|   | ||||
| @@ -1,12 +1,12 @@ | ||||
| pkgname=portprotonqt | ||||
| pkgver=0.1.3 | ||||
| pkgver=0.1.5 | ||||
| pkgrel=1 | ||||
| pkgdesc="Modern GUI for managing and launching games from PortProton, Steam, and Epic Games Store" | ||||
| 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-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') | ||||
|   | ||||
| @@ -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-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') | ||||
|   | ||||
| @@ -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 | ||||
| @@ -44,6 +45,7 @@ Requires:       python3-pefile | ||||
| Requires:       python3-pillow | ||||
| Requires:       perl-Image-ExifTool | ||||
| Requires:       xdg-utils | ||||
| Requires:       python3-beautifulsoup4 | ||||
|  | ||||
| %description -n python3-%{pypi_name}-git | ||||
| This application provides a sleek, intuitive graphical interface for managing and launching games from PortProton, Steam, and Epic Games Store. It consolidates your game libraries into a single, user-friendly hub for seamless navigation and organization. Its lightweight structure and cross-platform support deliver a cohesive gaming experience, eliminating the need for multiple launchers. Unique PortProton integration enhances Linux gaming, enabling effortless play of Windows-based titles with minimal setup. | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| %global pypi_name portprotonqt | ||||
| %global pypi_version 0.1.3 | ||||
| %global pypi_version 0.1.5 | ||||
| %global oname PortProtonQt | ||||
| %global _python_no_extras_requires 1 | ||||
|  | ||||
| @@ -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 | ||||
| @@ -41,6 +42,7 @@ Requires:       python3-pefile | ||||
| Requires:       python3-pillow | ||||
| Requires:       perl-Image-ExifTool | ||||
| Requires:       xdg-utils | ||||
| Requires:       python3-beautifulsoup4 | ||||
|  | ||||
| %description -n python3-%{pypi_name} | ||||
| This application provides a sleek, intuitive graphical interface for managing and launching games from PortProton, Steam, and Epic Games Store. It consolidates your game libraries into a single, user-friendly hub for seamless navigation and organization. Its lightweight structure and cross-platform support deliver a cohesive gaming experience, eliminating the need for multiple launchers. Unique PortProton integration enhances Linux gaming, enabling effortless play of Windows-based titles with minimal setup. | ||||
|   | ||||
| @@ -9,7 +9,7 @@ _portprotonqt() { | ||||
|     esac | ||||
|  | ||||
|     if [[ "$cur" == -* ]]; then | ||||
|         COMPREPLY=( $( compgen -W '--fullscreen --session' -- "$cur" ) ) | ||||
|         COMPREPLY=( $( compgen -W '--fullscreen' -- "$cur" ) ) | ||||
|         return 0 | ||||
|     fi | ||||
|  | ||||
|   | ||||
| @@ -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, | ||||
| }; | ||||
| @@ -765,7 +765,7 @@ | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "lost ark", | ||||
|     "status": "Broken" | ||||
|     "status": "Running" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "archeage unchained", | ||||
| @@ -1405,7 +1405,7 @@ | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "wuthering waves", | ||||
|     "status": "Planned" | ||||
|     "status": "Running" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "dota underlords", | ||||
| @@ -4426,5 +4426,61 @@ | ||||
|   { | ||||
|     "normalized_name": "carx street", | ||||
|     "status": "Broken" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "warcos 2", | ||||
|     "status": "Broken" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "karos classic", | ||||
|     "status": "Broken" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "dead island riptide", | ||||
|     "status": "Running" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "lineage", | ||||
|     "status": "Broken" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "day of dragons", | ||||
|     "status": "Running" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "sonic rumble", | ||||
|     "status": "Broken" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "black stigma", | ||||
|     "status": "Broken" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "umamusume pretty derby", | ||||
|     "status": "Running" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "dirt rally", | ||||
|     "status": "Supported" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "minifighter", | ||||
|     "status": "Broken" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "hide & hold out h2o", | ||||
|     "status": "Running" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "f1 25", | ||||
|     "status": "Denied" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "ghost of tsushima director's cut", | ||||
|     "status": "Denied" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_name": "sword of justice", | ||||
|     "status": "Broken" | ||||
|   } | ||||
| ] | ||||
							
								
								
									
										13310
									
								
								data/games_appid.json
									
									
									
									
									
								
							
							
						
						| @@ -1,4 +1,180 @@ | ||||
| [ | ||||
|   { | ||||
|     "normalized_title": "no sleep for kaname date from ai the somnium files", | ||||
|     "slug": "no-sleep-for-kaname-date-from-ai-the-somnium-files" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "dead island 2", | ||||
|     "slug": "dead-island-2" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "dead island", | ||||
|     "slug": "dead-island-definitive-edition" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "wuchang fallen feathers", | ||||
|     "slug": "wuchang-fallen-feathers" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "mindseye", | ||||
|     "slug": "mindseye" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "alan wake", | ||||
|     "slug": "alan-wake" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "s.t.a.l.k.e.r. anomaly g.a.m.m.a", | ||||
|     "slug": "s-t-a-l-k-e-r-anomaly-g-a-m-m-a" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "fifa 18", | ||||
|     "slug": "fifa-18" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "eriksholm the stolen dream", | ||||
|     "slug": "eriksholm-the-stolen-dream" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "caravan sandwitch", | ||||
|     "slug": "caravan-sandwitch" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "expeditions a mudrunner game", | ||||
|     "slug": "expeditions-a-mudrunner-game" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "#drive rally", | ||||
|     "slug": "drive-rally" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "return alive", | ||||
|     "slug": "return-alive" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "recore", | ||||
|     "slug": "recore-definitive-edition" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "no man's sky", | ||||
|     "slug": "no-mans-sky" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "alan wake 2", | ||||
|     "slug": "alan-wake-2" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "architect life a house design simulator", | ||||
|     "slug": "architect-life-a-house-design-simulator" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "clair obscur expedition 33", | ||||
|     "slug": "clair-obscur-expedition-33" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "metro 2033 redux", | ||||
|     "slug": "metro-2033-redux" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "nova drift", | ||||
|     "slug": "nova-drift" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "deathloop", | ||||
|     "slug": "deathloop" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "mullet madjack", | ||||
|     "slug": "mullet-madjack" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "luma island", | ||||
|     "slug": "luma-island" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "cash cleaner simulator", | ||||
|     "slug": "cash-cleaner-simulator" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "the plucky squire (отважный паж)", | ||||
|     "slug": "the-plucky-squire-otvazhnyj-pazh" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "crsed cuisine royale", | ||||
|     "slug": "crsed-cuisine-royale" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "tainted grail the fall of avalon", | ||||
|     "slug": "tainted-grail-the-fall-of-avalon" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "battle of space raiders", | ||||
|     "slug": "battle-of-space-raiders" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "gzdoom", | ||||
|     "slug": "gzdoom" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "rain on your parade", | ||||
|     "slug": "rain-on-your-parade" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "партизан (partisan widerstand hinter feindlichen linien)", | ||||
|     "slug": "partizan-partisan-widerstand-hinter-feindlichen-linien" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "ebola 2", | ||||
|     "slug": "ebola-2" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "monster care simulator", | ||||
|     "slug": "monster-care-simulator" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "steins;gate the distant valhalla", | ||||
|     "slug": "steins-gate-the-distant-valhalla" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "hogwarts legacy", | ||||
|     "slug": "hogwarts-legacy" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "osu!", | ||||
|     "slug": "osu" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "stalker online (stay out)", | ||||
|     "slug": "stalker-online-stay-out" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "slitterhead", | ||||
|     "slug": "slitterhead" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "indiana jones and the great circle", | ||||
|     "slug": "indiana-jones-and-the-great-circle" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "crossout", | ||||
|     "slug": "crossout" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "days gone", | ||||
|     "slug": "days-gone" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "warcraft iii reforged 2.0", | ||||
|     "slug": "warcraft-iii-reforged-2-0" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "biomutant", | ||||
|     "slug": "biomutant" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "overwatch 2", | ||||
|     "slug": "overwatch-2" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "settlement survival", | ||||
|     "slug": "settlement-survival" | ||||
| @@ -551,10 +727,6 @@ | ||||
|     "normalized_title": "snowrunner (ранее mudrunner 2)", | ||||
|     "slug": "snowrunner-ranee-mudrunner-2" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "alan wake 2", | ||||
|     "slug": "alan-wake-2" | ||||
|   }, | ||||
|   { | ||||
|     "normalized_title": "verse project", | ||||
|     "slug": "verse-project" | ||||
|   | ||||
							
								
								
									
										378
									
								
								dev-scripts/appimage_clean.py
									
									
									
									
									
										Executable file
									
								
							
							
						
						| @@ -0,0 +1,378 @@ | ||||
| #!/usr/bin/env python3 | ||||
| """ | ||||
| PySide6 Dependencies Analyzer with ldd support | ||||
| Анализирует зависимости PySide6 модулей используя ldd для определения | ||||
| реальных зависимостей скомпилированных библиотек. | ||||
| """ | ||||
|  | ||||
| import ast | ||||
| import os | ||||
| import sys | ||||
| import subprocess | ||||
| import re | ||||
| from pathlib import Path | ||||
| from typing import Set, Dict, List | ||||
| import argparse | ||||
| import json | ||||
|  | ||||
|  | ||||
| class PySide6DependencyAnalyzer: | ||||
|     def __init__(self): | ||||
|         # Системные библиотеки, которые нужно всегда оставлять | ||||
|         self.system_libs = { | ||||
|             'libQt6XcbQpa', 'libQt6Wayland', 'libQt6Egl', | ||||
|             'libicudata', 'libicuuc', 'libicui18n', 'libQt6DBus' | ||||
|         } | ||||
|  | ||||
|         self.real_dependencies = {} | ||||
|         self.used_modules_code = set() | ||||
|         self.used_modules_ldd = set() | ||||
|         self.all_required_modules = set() | ||||
|  | ||||
|     def find_python_files(self, directory: Path) -> List[Path]: | ||||
|         """Находит все Python файлы в директории""" | ||||
|         python_files = [] | ||||
|         for root, dirs, files in os.walk(directory): | ||||
|             dirs[:] = [d for d in dirs if d not in {'.venv', '__pycache__', '.git'}] | ||||
|  | ||||
|             for file in files: | ||||
|                 if file.endswith('.py'): | ||||
|                     python_files.append(Path(root) / file) | ||||
|         return python_files | ||||
|  | ||||
|     def find_pyside6_libs(self, base_path: Path) -> Dict[str, Path]: | ||||
|         """Находит все PySide6 библиотеки (.so файлы)""" | ||||
|         libs = {} | ||||
|  | ||||
|         # Поиск в единственной локации | ||||
|         search_path = Path("../.venv/lib/python3.10/site-packages/PySide6") | ||||
|         print(f"Поиск PySide6 библиотек в: {search_path}") | ||||
|  | ||||
|         if search_path.exists(): | ||||
|             # Ищем .so файлы модулей | ||||
|             for so_file in search_path.glob("Qt*.*.so"): | ||||
|                 module_name = so_file.stem.split('.')[0]  # QtCore.abi3.so -> QtCore | ||||
|                 if module_name.startswith('Qt'): | ||||
|                     libs[module_name] = so_file | ||||
|  | ||||
|             # Также ищем в подпапках | ||||
|             for subdir in search_path.iterdir(): | ||||
|                 if subdir.is_dir() and subdir.name.startswith('Qt'): | ||||
|                     for so_file in subdir.glob("*.so*"): | ||||
|                         if 'Qt' in so_file.name: | ||||
|                             libs[subdir.name] = so_file | ||||
|                             break | ||||
|  | ||||
|         return libs | ||||
|  | ||||
|     def analyze_ldd_dependencies(self, lib_path: Path) -> Set[str]: | ||||
|         """Анализирует зависимости библиотеки с помощью ldd""" | ||||
|         qt_deps = set() | ||||
|  | ||||
|         try: | ||||
|             result = subprocess.run(['ldd', str(lib_path)], | ||||
|                                   capture_output=True, text=True, check=True) | ||||
|  | ||||
|             # Парсим вывод ldd и ищем Qt библиотеки | ||||
|             for line in result.stdout.split('\n'): | ||||
|                 # Ищем строки вида: libQt6Core.so.6 => /path/to/lib | ||||
|                 match = re.search(r'libQt6(\w+)\.so', line) | ||||
|                 if match: | ||||
|                     qt_module = f"Qt{match.group(1)}" | ||||
|                     qt_deps.add(qt_module) | ||||
|  | ||||
|         except (subprocess.CalledProcessError, FileNotFoundError) as e: | ||||
|             print(f"Предупреждение: не удалось выполнить ldd для {lib_path}: {e}") | ||||
|  | ||||
|         return qt_deps | ||||
|  | ||||
|     def build_real_dependency_graph(self, pyside_libs: Dict[str, Path]) -> Dict[str, Set[str]]: | ||||
|         """Строит граф зависимостей на основе ldd анализа""" | ||||
|         dependencies = {} | ||||
|  | ||||
|         print("Анализ реальных зависимостей с помощью ldd...") | ||||
|         for module, lib_path in pyside_libs.items(): | ||||
|             print(f"  Анализируется {module}...") | ||||
|             deps = self.analyze_ldd_dependencies(lib_path) | ||||
|             dependencies[module] = deps | ||||
|  | ||||
|             if deps: | ||||
|                 print(f"    Зависимости: {', '.join(sorted(deps))}") | ||||
|  | ||||
|         return dependencies | ||||
|  | ||||
|     def analyze_file_imports(self, file_path: Path) -> Set[str]: | ||||
|         """Анализирует один Python файл и возвращает используемые PySide6 модули""" | ||||
|         modules = set() | ||||
|         try: | ||||
|             with open(file_path, 'r', encoding='utf-8', errors='ignore') as f: | ||||
|                 content = f.read() | ||||
|  | ||||
|             tree = ast.parse(content) | ||||
|  | ||||
|             for node in ast.walk(tree): | ||||
|                 if isinstance(node, ast.Import): | ||||
|                     for alias in node.names: | ||||
|                         if alias.name.startswith('PySide6.'): | ||||
|                             module = alias.name.split('.', 2)[1] | ||||
|                             if module.startswith('Qt'): | ||||
|                                 modules.add(module) | ||||
|  | ||||
|                 elif isinstance(node, ast.ImportFrom): | ||||
|                     if node.module and node.module.startswith('PySide6.'): | ||||
|                         module = node.module.split('.', 2)[1] | ||||
|                         if module.startswith('Qt'): | ||||
|                             modules.add(module) | ||||
|  | ||||
|         except Exception as e: | ||||
|             print(f"Ошибка при анализе {file_path}: {e}") | ||||
|  | ||||
|         return modules | ||||
|  | ||||
|     def get_all_dependencies(self, modules: Set[str], dependency_graph: Dict[str, Set[str]]) -> Set[str]: | ||||
|         """Получает все зависимости для набора модулей, используя граф зависимостей из ldd""" | ||||
|         all_deps = set(modules) | ||||
|  | ||||
|         if not dependency_graph: | ||||
|             return all_deps | ||||
|  | ||||
|         # Повторяем до тех пор, пока не найдем все транзитивные зависимости | ||||
|         changed = True | ||||
|         iteration = 0 | ||||
|         while changed and iteration < 10:  # Защита от бесконечного цикла | ||||
|             changed = False | ||||
|             current_deps = set(all_deps) | ||||
|  | ||||
|             for module in current_deps: | ||||
|                 if module in dependency_graph: | ||||
|                     new_deps = dependency_graph[module] - all_deps | ||||
|                     if new_deps: | ||||
|                         all_deps.update(new_deps) | ||||
|                         changed = True | ||||
|  | ||||
|             iteration += 1 | ||||
|  | ||||
|         return all_deps | ||||
|  | ||||
|     def analyze_project(self, project_path: Path, appdir_path: Path = None) -> Dict: | ||||
|         """Анализирует весь проект""" | ||||
|         python_files = self.find_python_files(project_path) | ||||
|         print(f"Найдено {len(python_files)} Python файлов") | ||||
|  | ||||
|         # Анализ статических импортов | ||||
|         used_modules_code = set() | ||||
|         file_modules = {} | ||||
|  | ||||
|         for file_path in python_files: | ||||
|             modules = self.analyze_file_imports(file_path) | ||||
|             if modules: | ||||
|                 file_modules[str(file_path.relative_to(project_path))] = list(modules) | ||||
|                 used_modules_code.update(modules) | ||||
|  | ||||
|         print(f"Найдено {len(used_modules_code)} модулей в коде: {', '.join(sorted(used_modules_code))}") | ||||
|  | ||||
|         # Поиск PySide6 библиотек | ||||
|         search_base = appdir_path if appdir_path else project_path | ||||
|         pyside_libs = self.find_pyside6_libs(search_base) | ||||
|  | ||||
|         if not pyside_libs: | ||||
|             print("ОШИБКА: PySide6 библиотеки не найдены! Анализ невозможен.") | ||||
|             return { | ||||
|                 'error': 'PySide6 библиотеки не найдены', | ||||
|                 'analysis_method': 'failed', | ||||
|                 'found_libraries': 0, | ||||
|                 'directly_used_code': sorted(used_modules_code), | ||||
|                 'all_required': [], | ||||
|                 'removable': [], | ||||
|                 'available_modules': [], | ||||
|                 'file_usage': file_modules | ||||
|             } | ||||
|  | ||||
|         print(f"Найдено {len(pyside_libs)} PySide6 библиотек") | ||||
|  | ||||
|         # Анализ реальных зависимостей с ldd | ||||
|         real_dependencies = self.build_real_dependency_graph(pyside_libs) | ||||
|  | ||||
|         # Определяем модули, которые реально используются через ldd | ||||
|         used_modules_ldd = set() | ||||
|         for module in used_modules_code: | ||||
|             if module in real_dependencies: | ||||
|                 used_modules_ldd.update(real_dependencies[module]) | ||||
|                 used_modules_ldd.add(module) | ||||
|  | ||||
|         print(f"Реальные зависимости через ldd: {', '.join(sorted(used_modules_ldd))}") | ||||
|  | ||||
|         # Объединяем результаты анализа кода и ldd | ||||
|         all_used_modules = used_modules_code | used_modules_ldd | ||||
|  | ||||
|         # Получаем все необходимые модули включая зависимости | ||||
|         all_required = self.get_all_dependencies(all_used_modules, real_dependencies) | ||||
|  | ||||
|         # Все доступные PySide6 модули | ||||
|         available_modules = set(pyside_libs.keys()) | ||||
|  | ||||
|         # Модули, которые можно удалить | ||||
|         removable = available_modules - all_required | ||||
|  | ||||
|         return { | ||||
|             'analysis_method': 'ldd + static analysis', | ||||
|             'found_libraries': len(pyside_libs), | ||||
|             'directly_used_code': sorted(used_modules_code), | ||||
|             'directly_used_ldd': sorted(used_modules_ldd), | ||||
|             'all_required': sorted(all_required), | ||||
|             'removable': sorted(removable), | ||||
|             'available_modules': sorted(available_modules), | ||||
|             'file_usage': file_modules, | ||||
|             'real_dependencies': {k: sorted(v) for k, v in real_dependencies.items()}, | ||||
|             'library_paths': {k: str(v) for k, v in pyside_libs.items()}, | ||||
|             'analysis_summary': { | ||||
|                 'total_modules': len(available_modules), | ||||
|                 'required_modules': len(all_required), | ||||
|                 'removable_modules': len(removable), | ||||
|                 'space_saving_potential': f"{len(removable)/len(available_modules)*100:.1f}%" if available_modules else "0%" | ||||
|             } | ||||
|         } | ||||
|  | ||||
|     def generate_appimage_recipe(self, removable_modules: List[str], template_path: Path) -> str: | ||||
|         """Генерирует обновленный AppImage рецепт с командами очистки""" | ||||
|  | ||||
|         # Читаем существующий рецепт | ||||
|         try: | ||||
|             with open(template_path, 'r', encoding='utf-8') as f: | ||||
|                 recipe_content = f.read() | ||||
|         except FileNotFoundError: | ||||
|             print(f"Шаблон рецепта не найден: {template_path}") | ||||
|             return "" | ||||
|  | ||||
|         # Генерируем новые команды очистки | ||||
|         cleanup_lines = [] | ||||
|  | ||||
|         # QML удаляем только если не используется | ||||
|         qml_modules = {'QtQml', 'QtQuick', 'QtQuickWidgets'} | ||||
|         if qml_modules.issubset(set(removable_modules)): | ||||
|             cleanup_lines.append("  - rm -rf AppDir/usr/local/lib/python3.10/dist-packages/PySide6/Qt/qml/") | ||||
|  | ||||
|         # Инструменты разработки (всегда удаляем) | ||||
|         cleanup_lines.append("  - rm -f AppDir/usr/local/lib/python3.10/dist-packages/PySide6/{assistant,designer,linguist,lrelease,lupdate}") | ||||
|  | ||||
|         # Модули для удаления | ||||
|         if removable_modules: | ||||
|             modules_list = ','.join([f"{mod}*" for mod in sorted(removable_modules)]) | ||||
|             cleanup_lines.append(f"  - rm -f AppDir/usr/local/lib/python3.10/dist-packages/PySide6/{{{modules_list}}}") | ||||
|  | ||||
|         # Генерируем команду для удаления нативных библиотек с сохранением нужных | ||||
|         required_libs = set() | ||||
|         for module in sorted(set(self.all_required_modules)): | ||||
|             required_libs.add(f"libQt6{module.replace('Qt', '')}*") | ||||
|  | ||||
|         # Добавляем системные библиотеки | ||||
|         for lib in self.system_libs: | ||||
|             required_libs.add(f"{lib}*") | ||||
|  | ||||
|         keep_pattern = '|'.join(sorted(required_libs)) | ||||
|  | ||||
|         cleanup_lines.extend([ | ||||
|             "  - shopt -s extglob", | ||||
|             f"  - rm -rf AppDir/usr/local/lib/python3.10/dist-packages/PySide6/Qt/lib/!({keep_pattern})" | ||||
|         ]) | ||||
|  | ||||
|         # Заменяем блок очистки в рецепте | ||||
|         import re | ||||
|  | ||||
|         # Ищем блок "# 5) чистим от ненужных модулей и бинарников" до следующего комментария или до AppDir: | ||||
|         pattern = r'(  # 5\) чистим от ненужных модулей и бинарников\n).*?(?=\nAppDir:|\n  # [0-9]+\)|$)' | ||||
|  | ||||
|         new_cleanup_block = "  # 5) чистим от ненужных модулей и бинарников\n" + '\n'.join(cleanup_lines) | ||||
|  | ||||
|         updated_recipe = re.sub(pattern, new_cleanup_block, recipe_content, flags=re.DOTALL) | ||||
|  | ||||
|         return updated_recipe | ||||
|  | ||||
|  | ||||
| def main(): | ||||
|     parser = argparse.ArgumentParser(description='Анализ зависимостей PySide6 модулей с использованием ldd') | ||||
|     parser.add_argument('project_path', help='Путь к проекту для анализа') | ||||
|     parser.add_argument('--appdir', help='Путь к AppDir для поиска PySide6 библиотек') | ||||
|     parser.add_argument('--output', '-o', help='Путь для сохранения результатов (JSON)') | ||||
|     parser.add_argument('--verbose', '-v', action='store_true', help='Подробный вывод') | ||||
|  | ||||
|     args = parser.parse_args() | ||||
|  | ||||
|     project_path = Path(args.project_path) | ||||
|     if not project_path.exists(): | ||||
|         print(f"Ошибка: путь {project_path} не существует") | ||||
|         sys.exit(1) | ||||
|  | ||||
|     appdir_path = Path(args.appdir) if args.appdir else None | ||||
|     if appdir_path and not appdir_path.exists(): | ||||
|         print(f"Предупреждение: AppDir путь {appdir_path} не существует") | ||||
|         appdir_path = None | ||||
|  | ||||
|     analyzer = PySide6DependencyAnalyzer() | ||||
|     results = analyzer.analyze_project(project_path, appdir_path) | ||||
|  | ||||
|     # Сохраняем в анализатор для генерации команд | ||||
|     analyzer.all_required_modules = set(results.get('all_required', [])) | ||||
|  | ||||
|     # Выводим результаты | ||||
|     print("\n" + "="*60) | ||||
|     print("АНАЛИЗ ЗАВИСИМОСТЕЙ PYSIDE6 (ldd analysis)") | ||||
|     print("="*60) | ||||
|  | ||||
|     if 'error' in results: | ||||
|         print(f"\nОШИБКА: {results['error']}") | ||||
|         sys.exit(1) | ||||
|  | ||||
|     print(f"\nМетод анализа: {results['analysis_method']}") | ||||
|     print(f"Найдено библиотек: {results['found_libraries']}") | ||||
|  | ||||
|     if results['directly_used_code']: | ||||
|         print(f"\nИспользуемые модули в коде ({len(results['directly_used_code'])}):") | ||||
|         for module in results['directly_used_code']: | ||||
|             print(f"  • {module}") | ||||
|  | ||||
|     if results['directly_used_ldd']: | ||||
|         print(f"\nРеальные зависимости через ldd ({len(results['directly_used_ldd'])}):") | ||||
|         for module in results['directly_used_ldd']: | ||||
|             print(f"  • {module}") | ||||
|  | ||||
|     print(f"\nВсе необходимые модули ({len(results['all_required'])}):") | ||||
|     for module in results['all_required']: | ||||
|         print(f"  • {module}") | ||||
|  | ||||
|     print(f"\nМодули, которые можно удалить ({len(results['removable'])}):") | ||||
|     for module in results['removable']: | ||||
|         print(f"  • {module}") | ||||
|  | ||||
|     print(f"\nПотенциальная экономия места: {results['analysis_summary']['space_saving_potential']}") | ||||
|  | ||||
|     if args.verbose and results['real_dependencies']: | ||||
|         Devlin(f"\nРеальные зависимости (ldd):") | ||||
|         for module, deps in results['real_dependencies'].items(): | ||||
|             if deps: | ||||
|                 print(f"  {module} → {', '.join(deps)}") | ||||
|  | ||||
|     # Обновляем AppImage рецепт | ||||
|     recipe_path = Path("../build-aux/AppImageBuilder.yml") | ||||
|     if recipe_path.exists(): | ||||
|         updated_recipe = analyzer.generate_appimage_recipe(results['removable'], recipe_path) | ||||
|         if updated_recipe: | ||||
|             with open(recipe_path, 'w', encoding='utf-8') as f: | ||||
|                 f.write(updated_recipe) | ||||
|             print(f"\nAppImage рецепт обновлен: {recipe_path}") | ||||
|         else: | ||||
|             print(f"\nОШИБКА: не удалось обновить рецепт") | ||||
|     else: | ||||
|         print(f"\nПредупреждение: рецепт AppImage не найден в {recipe_path}") | ||||
|  | ||||
|     # Сохраняем результаты в JSON | ||||
|     if args.output: | ||||
|         with open(args.output, 'w', encoding='utf-8') as f: | ||||
|             json.dump(results, f, ensure_ascii=False, indent=2) | ||||
|         print(f"Результаты сохранены в: {args.output}") | ||||
|  | ||||
|     print("\n" + "="*60) | ||||
|  | ||||
|  | ||||
| if __name__ == "__main__": | ||||
|     main() | ||||
| @@ -5,12 +5,19 @@ import json | ||||
| import asyncio | ||||
| import aiohttp | ||||
| import tarfile | ||||
| import ssl | ||||
|  | ||||
| # Получаем ключи и данные из переменных окружения | ||||
| STEAM_KEY = os.environ.get('STEAM_KEY') | ||||
| LINUX_GAMING_API_KEY = os.environ.get('LINUX_GAMING_API_KEY') | ||||
| LINUX_GAMING_API_USERNAME = os.environ.get('LINUX_GAMING_API_USERNAME') | ||||
|  | ||||
| # Флаги для включения/отключения источников | ||||
| ENABLE_STEAM = os.environ.get('ENABLE_STEAM', 'true').lower() == 'true' | ||||
| ENABLE_ANTICHEAT = os.environ.get('ENABLE_ANTICHEAT', 'true').lower() == 'true' | ||||
| ENABLE_LINUX_GAMING = os.environ.get('ENABLE_LINUX_GAMING', 'true').lower() == 'true' | ||||
| DEBUG_MODE = os.environ.get('DEBUG_MODE', 'false').lower() == 'true' | ||||
|  | ||||
| # Конфигурация API | ||||
| STEAM_BASE_URL = "https://api.steampowered.com/IStoreService/GetAppList/v1/?" | ||||
| LINUX_GAMING_BASE_URL = "https://linux-gaming.ru" | ||||
| @@ -21,6 +28,10 @@ LINUX_GAMING_HEADERS = { | ||||
|     "Api-Username": LINUX_GAMING_API_USERNAME | ||||
| } | ||||
|  | ||||
| # Отключаем предупреждения об SSL в дебаг-режиме | ||||
| if DEBUG_MODE: | ||||
|     print("DEBUG_MODE enabled: SSL verification is disabled (insecure, use for debugging only).") | ||||
|  | ||||
| def normalize_name(s): | ||||
|     """ | ||||
|     Приведение строки к нормальному виду: | ||||
| @@ -69,7 +80,7 @@ async def get_app_list(session, last_appid, endpoint): | ||||
|     url = endpoint | ||||
|     if last_appid: | ||||
|         url = f"{url}&last_appid={last_appid}" | ||||
|     async with session.get(url) as response: | ||||
|     async with session.get(url, verify_ssl=not DEBUG_MODE) as response: | ||||
|         response.raise_for_status() | ||||
|         return await response.json() | ||||
|  | ||||
| @@ -79,7 +90,7 @@ async def fetch_games_json(session): | ||||
|     """ | ||||
|     url = "https://raw.githubusercontent.com/AreWeAntiCheatYet/AreWeAntiCheatYet/HEAD/games.json" | ||||
|     try: | ||||
|         async with session.get(url) as response: | ||||
|         async with session.get(url, verify_ssl=not DEBUG_MODE) as response: | ||||
|             response.raise_for_status() | ||||
|             text = await response.text() | ||||
|             data = json.loads(text) | ||||
| @@ -89,52 +100,130 @@ async def fetch_games_json(session): | ||||
|         return [] | ||||
|  | ||||
| async def get_linux_gaming_topics(session, category_slug): | ||||
|     """ | ||||
|     Получает все темы из указанной категории linux-gaming.ru. | ||||
|     Сохраняет только нормализованное название (normalized_title) и slug. | ||||
|     """ | ||||
|     page = 0 | ||||
|     all_topics = [] | ||||
|     max_pages = 100 | ||||
|  | ||||
|     while True: | ||||
|         page += 1 | ||||
|         url = f"{LINUX_GAMING_BASE_URL}/c/{category_slug}/l/latest.json?page={page}" | ||||
|         try: | ||||
|             async with session.get(url, headers=LINUX_GAMING_HEADERS) as response: | ||||
|                 response.raise_for_status() | ||||
|                 data = await response.json() | ||||
|                 topics = data.get("topic_list", {}).get("topics", []) | ||||
|                 if not topics: | ||||
|     while page < max_pages: | ||||
|         # Пробуем несколько вариантов URL | ||||
|         urls_to_try = [ | ||||
|             f"{LINUX_GAMING_BASE_URL}/c/{category_slug}/5/l/latest.json",  # с id категории | ||||
|             f"{LINUX_GAMING_BASE_URL}/c/{category_slug}/l/latest.json",     # только slug | ||||
|             f"{LINUX_GAMING_BASE_URL}/c/5/l/latest.json",                  # только id | ||||
|             f"{LINUX_GAMING_BASE_URL}/latest.json"                         # все темы | ||||
|         ] | ||||
|  | ||||
|         success = False | ||||
|         data = None | ||||
|  | ||||
|         for url in urls_to_try: | ||||
|             try: | ||||
|                 # Добавляем параметры пагинации | ||||
|                 params = { | ||||
|                     'page': page, | ||||
|                     'order': 'default' | ||||
|                 } | ||||
|  | ||||
|                 async with session.get(url, headers=LINUX_GAMING_HEADERS, | ||||
|                                      params=params, verify_ssl=not DEBUG_MODE) as response: | ||||
|                     if response.status == 429: | ||||
|                         print(f"Слишком много запросов на странице {page}, ожидание...") | ||||
|                         await asyncio.sleep(5) | ||||
|                         continue | ||||
|  | ||||
|                     if response.status == 404: | ||||
|                         if DEBUG_MODE: | ||||
|                             print(f"URL не найден: {url}") | ||||
|                         continue | ||||
|  | ||||
|                     response.raise_for_status() | ||||
|                     data = await response.json() | ||||
|  | ||||
|                     # Проверяем структуру ответа | ||||
|                     topic_list = data.get("topic_list", {}) | ||||
|                     topics = topic_list.get("topics", []) | ||||
|  | ||||
|                     if not topics: | ||||
|                         if page == 0: | ||||
|                             if DEBUG_MODE: | ||||
|                                 print(f"Нет тем в URL: {url}") | ||||
|                             continue | ||||
|                         else: | ||||
|                             print(f"Страница {page} пуста, завершаем пагинацию.") | ||||
|                             return all_topics | ||||
|  | ||||
|                     if DEBUG_MODE and page == 0: | ||||
|                         print(f"Успешно подключились к URL: {url}") | ||||
|  | ||||
|                     success = True | ||||
|                     break | ||||
|                 for topic in topics: | ||||
|                     all_topics.append({ | ||||
|                         "normalized_title": normalize_name(topic["title"]), | ||||
|                         "slug": topic["slug"] | ||||
|                     }) | ||||
|                 print(f"Обработано {len(topics)} тем на странице {page}, всего: {len(all_topics)}.") | ||||
|         except Exception as error: | ||||
|             print(f"Ошибка получения тем для страницы {page}: {error}") | ||||
|  | ||||
|             except Exception as e: | ||||
|                 if DEBUG_MODE: | ||||
|                     print(f"Ошибка с URL {url}: {e}") | ||||
|                 continue | ||||
|  | ||||
|         if not success: | ||||
|             print(f"Не удалось загрузить страницу {page}") | ||||
|             break | ||||
|  | ||||
|         # Обрабатываем темы (этот блок должен быть внутри основного цикла) | ||||
|         try: | ||||
|             topic_list = data.get("topic_list", {}) | ||||
|             topics = topic_list.get("topics", []) | ||||
|  | ||||
|             page_topics_added = 0 | ||||
|             for topic in topics: | ||||
|                 slug = topic["slug"] | ||||
|  | ||||
|                 # Пропускаем тему описания категории | ||||
|                 if slug is None or slug == "opisanie-kategorii-portprotondb": | ||||
|                     if DEBUG_MODE: | ||||
|                         print(f"Пропущена тема описания категории") | ||||
|                     continue | ||||
|  | ||||
|                 normalized_title = normalize_name(topic["title"]) | ||||
|  | ||||
|                 # Добавляем только валидные темы | ||||
|                 all_topics.append({ | ||||
|                     "normalized_title": normalized_title, | ||||
|                     "slug": slug, | ||||
|                 }) | ||||
|                 page_topics_added += 1 | ||||
|  | ||||
|                 if DEBUG_MODE and page_topics_added <= 3:  # Показываем первые 3 темы | ||||
|                     print(f"Добавлена тема: {normalized_title} (slug: {slug}") | ||||
|  | ||||
|             print(f"Обработано {len(topics)} тем на странице {page}, добавлено: {page_topics_added}, всего: {len(all_topics)}.") | ||||
|  | ||||
|             # Проверяем, есть ли еще страницы | ||||
|             more_topics_url = topic_list.get("more_topics_url") | ||||
|             if not more_topics_url: | ||||
|                 print("Больше тем нет, завершаем пагинацию.") | ||||
|                 break | ||||
|  | ||||
|             page += 1 | ||||
|  | ||||
|             # Добавляем небольшую задержку между запросами | ||||
|             await asyncio.sleep(0.5) | ||||
|  | ||||
|         except Exception as e: | ||||
|             print(f"Ошибка при обработке тем на странице {page}: {e}") | ||||
|             break | ||||
|  | ||||
|     if not all_topics: | ||||
|         print("Предупреждение: не удалось получить ни одной темы из linux-gaming.ru.") | ||||
|     else: | ||||
|         print(f"Всего получено {len(all_topics)} тем из категории {category_slug}") | ||||
|  | ||||
|     return all_topics | ||||
|  | ||||
|  | ||||
| async def request_data(): | ||||
|     """ | ||||
|     Получает данные из Steam, AreWeAntiCheatYet и linux-gaming.ru, | ||||
|     обрабатывает их и сохраняет в JSON-файлы и tar.xz архивы. | ||||
|     """ | ||||
|     # Параметры запроса для Steam | ||||
|     game_param = "&include_games=true" | ||||
|     dlc_param = "&include_dlc=false" | ||||
|     software_param = "&include_software=false" | ||||
|     videos_param = "&include_videos=false" | ||||
|     hardware_param = "&include_hardware=false" | ||||
|  | ||||
|     endpoint = ( | ||||
|         f"{STEAM_BASE_URL}key={STEAM_KEY}" | ||||
|         f"{game_param}{dlc_param}{software_param}{videos_param}{hardware_param}" | ||||
|         f"&max_results=50000" | ||||
|     ) | ||||
|  | ||||
|     output_json = [] | ||||
|     total_parsed = 0 | ||||
|     linux_gaming_topics = [] | ||||
| @@ -143,26 +232,48 @@ async def request_data(): | ||||
|     try: | ||||
|         async with aiohttp.ClientSession() as session: | ||||
|             # Загружаем данные Steam | ||||
|             have_more_results = True | ||||
|             last_appid_val = None | ||||
|             while have_more_results: | ||||
|                 app_list = await get_app_list(session, last_appid_val, endpoint) | ||||
|                 apps = app_list['response']['apps'] | ||||
|                 apps = process_steam_apps(apps) | ||||
|                 output_json.extend(apps) | ||||
|                 total_parsed += len(apps) | ||||
|                 have_more_results = app_list['response'].get('have_more_results', False) | ||||
|                 last_appid_val = app_list['response'].get('last_appid') | ||||
|                 print(f"Обработано {len(apps)} игр Steam, всего: {total_parsed}.") | ||||
|             if ENABLE_STEAM: | ||||
|                 # Параметры запроса для Steam | ||||
|                 game_param = "&include_games=true" | ||||
|                 dlc_param = "&include_dlc=false" | ||||
|                 software_param = "&include_software=false" | ||||
|                 videos_param = "&include_videos=false" | ||||
|                 hardware_param = "&include_hardware=false" | ||||
|  | ||||
|                 endpoint = ( | ||||
|                     f"{STEAM_BASE_URL}key={STEAM_KEY}" | ||||
|                     f"{game_param}{dlc_param}{software_param}{videos_param}{hardware_param}" | ||||
|                     f"&max_results=50000" | ||||
|                 ) | ||||
|  | ||||
|                 have_more_results = True | ||||
|                 last_appid_val = None | ||||
|                 while have_more_results: | ||||
|                     app_list = await get_app_list(session, last_appid_val, endpoint) | ||||
|                     apps = app_list['response']['apps'] | ||||
|                     apps = process_steam_apps(apps) | ||||
|                     output_json.extend(apps) | ||||
|                     total_parsed += len(apps) | ||||
|                     have_more_results = app_list['response'].get('have_more_results', False) | ||||
|                     last_appid_val = app_list['response'].get('last_appid') | ||||
|                     print(f"Обработано {len(apps)} игр Steam, всего: {total_parsed}.") | ||||
|             else: | ||||
|                 print("Пропущена загрузка данных Steam (ENABLE_STEAM=false).") | ||||
|  | ||||
|             # Загружаем данные AreWeAntiCheatYet | ||||
|             anticheat_games = await fetch_games_json(session) | ||||
|             if ENABLE_ANTICHEAT: | ||||
|                 anticheat_games = await fetch_games_json(session) | ||||
|             else: | ||||
|                 print("Пропущена загрузка данных AreWeAntiCheatYet (ENABLE_ANTICHEAT=false).") | ||||
|  | ||||
|             # Загружаем данные linux-gaming.ru | ||||
|             if LINUX_GAMING_API_KEY and LINUX_GAMING_API_USERNAME: | ||||
|                 linux_gaming_topics = await get_linux_gaming_topics(session, CATEGORY_LINUX_GAMING) | ||||
|             if ENABLE_LINUX_GAMING: | ||||
|                 if LINUX_GAMING_API_KEY and LINUX_GAMING_API_USERNAME: | ||||
|                     linux_gaming_topics = await get_linux_gaming_topics(session, CATEGORY_LINUX_GAMING) | ||||
|                 else: | ||||
|                     print("Предупреждение: LINUX_GAMING_API_KEY или LINUX_GAMING_API_USERNAME не установлены.") | ||||
|             else: | ||||
|                 print("Предупреждение: LINUX_GAMING_API_KEY или LINUX_GAMING_API_USERNAME не установлены.") | ||||
|                 print("Пропущена загрузка данных linux-gaming.ru (ENABLE_LINUX_GAMING=false).") | ||||
|  | ||||
|     except Exception as error: | ||||
|         print(f"Ошибка получения данных: {error}") | ||||
| @@ -173,55 +284,55 @@ async def request_data(): | ||||
|     os.makedirs(data_dir, exist_ok=True) | ||||
|  | ||||
|     # Сохранение данных Steam | ||||
|     output_json_full = os.path.join(data_dir, f"{CATEGORY_STEAM}_appid.json") | ||||
|     output_json_min = os.path.join(data_dir, f"{CATEGORY_STEAM}_appid_min.json") | ||||
|     with open(output_json_full, "w", encoding="utf-8") as f: | ||||
|         json.dump(output_json, f, ensure_ascii=False, indent=2) | ||||
|     with open(output_json_min, "w", encoding="utf-8") as f: | ||||
|         json.dump(output_json, f, ensure_ascii=False, separators=(',',':')) | ||||
|     if ENABLE_STEAM and output_json: | ||||
|         output_json_full = os.path.join(data_dir, f"{CATEGORY_STEAM}_appid.json") | ||||
|         output_json_min = os.path.join(data_dir, f"{CATEGORY_STEAM}_appid_min.json") | ||||
|         with open(output_json_full, "w", encoding="utf-8") as f: | ||||
|             json.dump(output_json, f, ensure_ascii=False, indent=2) | ||||
|         with open(output_json_min, "w", encoding="utf-8") as f: | ||||
|             json.dump(output_json, f, ensure_ascii=False, separators=(',',':')) | ||||
|  | ||||
|         # Упаковка минифицированного JSON Steam в tar.xz архив | ||||
|         steam_archive_path = os.path.join(data_dir, f"{CATEGORY_STEAM}_appid.tar.xz") | ||||
|         try: | ||||
|             with tarfile.open(steam_archive_path, "w:xz", preset=9) as tar: | ||||
|                 tar.add(output_json_min, arcname=os.path.basename(output_json_min)) | ||||
|             print(f"Упаковано минифицированное JSON Steam в архив: {steam_archive_path}") | ||||
|             os.remove(output_json_min) | ||||
|         except Exception as e: | ||||
|             print(f"Ошибка при упаковке архива Steam: {e}") | ||||
|             return False | ||||
|  | ||||
|     # Сохранение данных AreWeAntiCheatYet | ||||
|     anticheat_json_full = os.path.join(data_dir, "anticheat_games.json") | ||||
|     anticheat_json_min = os.path.join(data_dir, "anticheat_games_min.json") | ||||
|     with open(anticheat_json_full, "w", encoding="utf-8") as f: | ||||
|         json.dump(anticheat_games, f, ensure_ascii=False, indent=2) | ||||
|     with open(anticheat_json_min, "w", encoding="utf-8") as f: | ||||
|         json.dump(anticheat_games, f, ensure_ascii=False, separators=(',',':')) | ||||
|     if ENABLE_ANTICHEAT and anticheat_games: | ||||
|         anticheat_json_full = os.path.join(data_dir, "anticheat_games.json") | ||||
|         anticheat_json_min = os.path.join(data_dir, "anticheat_games_min.json") | ||||
|         with open(anticheat_json_full, "w", encoding="utf-8") as f: | ||||
|             json.dump(anticheat_games, f, ensure_ascii=False, indent=2) | ||||
|         with open(anticheat_json_min, "w", encoding="utf-8") as f: | ||||
|             json.dump(anticheat_games, f, ensure_ascii=False, separators=(',',':')) | ||||
|  | ||||
|         # Упаковка минифицированного JSON AreWeAntiCheatYet в tar.xz архив | ||||
|         anticheat_archive_path = os.path.join(data_dir, "anticheat_games.tar.xz") | ||||
|         try: | ||||
|             with tarfile.open(anticheat_archive_path, "w:xz", preset=9) as tar: | ||||
|                 tar.add(anticheat_json_min, arcname=os.path.basename(anticheat_json_min)) | ||||
|             print(f"Упаковано минифицированное JSON AreWeAntiCheatYet в архив: {anticheat_archive_path}") | ||||
|             os.remove(anticheat_json_min) | ||||
|         except Exception as e: | ||||
|             print(f"Ошибка при упаковке архива AreWeAntiCheatYet: {e}") | ||||
|             return False | ||||
|  | ||||
|     # Сохранение данных linux-gaming.ru | ||||
|     linux_gaming_json_full = os.path.join(data_dir, "linux_gaming_topics.json") | ||||
|     linux_gaming_json_min = os.path.join(data_dir, "linux_gaming_topics_min.json") | ||||
|     if linux_gaming_topics: | ||||
|     if ENABLE_LINUX_GAMING and linux_gaming_topics: | ||||
|         linux_gaming_json_full = os.path.join(data_dir, "linux_gaming_topics.json") | ||||
|         linux_gaming_json_min = os.path.join(data_dir, "linux_gaming_topics_min.json") | ||||
|         with open(linux_gaming_json_full, "w", encoding="utf-8") as f: | ||||
|             json.dump(linux_gaming_topics, f, ensure_ascii=False, indent=2) | ||||
|         with open(linux_gaming_json_min, "w", encoding="utf-8") as f: | ||||
|             json.dump(linux_gaming_topics, f, ensure_ascii=False, separators=(',',':')) | ||||
|  | ||||
|     # Упаковка минифицированных JSON в tar.xz архивы | ||||
|     # Архив для Steam | ||||
|     steam_archive_path = os.path.join(data_dir, f"{CATEGORY_STEAM}_appid.tar.xz") | ||||
|     try: | ||||
|         with tarfile.open(steam_archive_path, "w:xz", preset=9) as tar: | ||||
|             tar.add(output_json_min, arcname=os.path.basename(output_json_min)) | ||||
|         print(f"Упаковано минифицированное JSON Steam в архив: {steam_archive_path}") | ||||
|         os.remove(output_json_min) | ||||
|     except Exception as e: | ||||
|         print(f"Ошибка при упаковке архива Steam: {e}") | ||||
|         return False | ||||
|  | ||||
|     # Архив для AreWeAntiCheatYet | ||||
|     anticheat_archive_path = os.path.join(data_dir, "anticheat_games.tar.xz") | ||||
|     try: | ||||
|         with tarfile.open(anticheat_archive_path, "w:xz", preset=9) as tar: | ||||
|             tar.add(anticheat_json_min, arcname=os.path.basename(anticheat_json_min)) | ||||
|         print(f"Упаковано минифицированное JSON AreWeAntiCheatYet в архив: {anticheat_archive_path}") | ||||
|         os.remove(anticheat_json_min) | ||||
|     except Exception as e: | ||||
|         print(f"Ошибка при упаковке архива AreWeAntiCheatYet: {e}") | ||||
|         return False | ||||
|  | ||||
|     # Архив для linux-gaming.ru | ||||
|     if linux_gaming_topics: | ||||
|         # Упаковка минифицированного JSON linux-gaming.ru в tar.xz архив | ||||
|         linux_gaming_archive_path = os.path.join(data_dir, "linux_gaming_topics.tar.xz") | ||||
|         try: | ||||
|             with tarfile.open(linux_gaming_archive_path, "w:xz", preset=9) as tar: | ||||
|   | ||||
| @@ -1,22 +0,0 @@ | ||||
| The MIT License (MIT) | ||||
|  | ||||
| Copyright (c) 2015-2016 Fadhil Mandaga | ||||
| Copyright (c) 2019-2025 James Lu <james@overdrivenetworks.com> | ||||
|  | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documentation files (the "Software"), to deal | ||||
| in the Software without restriction, including without limitation the rights | ||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
| copies of the Software, and to permit persons to whom the Software is | ||||
| furnished to do so, subject to the following conditions: | ||||
|  | ||||
| The above copyright notice and this permission notice shall be included in all | ||||
| copies or substantial portions of the Software. | ||||
|  | ||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||
| SOFTWARE. | ||||
| @@ -1,674 +0,0 @@ | ||||
|                     GNU GENERAL PUBLIC LICENSE | ||||
|                        Version 3, 29 June 2007 | ||||
|  | ||||
|  Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> | ||||
|  Everyone is permitted to copy and distribute verbatim copies | ||||
|  of this license document, but changing it is not allowed. | ||||
|  | ||||
|                             Preamble | ||||
|  | ||||
|   The GNU General Public License is a free, copyleft license for | ||||
| software and other kinds of works. | ||||
|  | ||||
|   The licenses for most software and other practical works are designed | ||||
| to take away your freedom to share and change the works.  By contrast, | ||||
| the GNU General Public License is intended to guarantee your freedom to | ||||
| share and change all versions of a program--to make sure it remains free | ||||
| software for all its users.  We, the Free Software Foundation, use the | ||||
| GNU General Public License for most of our software; it applies also to | ||||
| any other work released this way by its authors.  You can apply it to | ||||
| your programs, too. | ||||
|  | ||||
|   When we speak of free software, we are referring to freedom, not | ||||
| price.  Our General Public Licenses are designed to make sure that you | ||||
| have the freedom to distribute copies of free software (and charge for | ||||
| them if you wish), that you receive source code or can get it if you | ||||
| want it, that you can change the software or use pieces of it in new | ||||
| free programs, and that you know you can do these things. | ||||
|  | ||||
|   To protect your rights, we need to prevent others from denying you | ||||
| these rights or asking you to surrender the rights.  Therefore, you have | ||||
| certain responsibilities if you distribute copies of the software, or if | ||||
| you modify it: responsibilities to respect the freedom of others. | ||||
|  | ||||
|   For example, if you distribute copies of such a program, whether | ||||
| gratis or for a fee, you must pass on to the recipients the same | ||||
| freedoms that you received.  You must make sure that they, too, receive | ||||
| or can get the source code.  And you must show them these terms so they | ||||
| know their rights. | ||||
|  | ||||
|   Developers that use the GNU GPL protect your rights with two steps: | ||||
| (1) assert copyright on the software, and (2) offer you this License | ||||
| giving you legal permission to copy, distribute and/or modify it. | ||||
|  | ||||
|   For the developers' and authors' protection, the GPL clearly explains | ||||
| that there is no warranty for this free software.  For both users' and | ||||
| authors' sake, the GPL requires that modified versions be marked as | ||||
| changed, so that their problems will not be attributed erroneously to | ||||
| authors of previous versions. | ||||
|  | ||||
|   Some devices are designed to deny users access to install or run | ||||
| modified versions of the software inside them, although the manufacturer | ||||
| can do so.  This is fundamentally incompatible with the aim of | ||||
| protecting users' freedom to change the software.  The systematic | ||||
| pattern of such abuse occurs in the area of products for individuals to | ||||
| use, which is precisely where it is most unacceptable.  Therefore, we | ||||
| have designed this version of the GPL to prohibit the practice for those | ||||
| products.  If such problems arise substantially in other domains, we | ||||
| stand ready to extend this provision to those domains in future versions | ||||
| of the GPL, as needed to protect the freedom of users. | ||||
|  | ||||
|   Finally, every program is threatened constantly by software patents. | ||||
| States should not allow patents to restrict development and use of | ||||
| software on general-purpose computers, but in those that do, we wish to | ||||
| avoid the special danger that patents applied to a free program could | ||||
| make it effectively proprietary.  To prevent this, the GPL assures that | ||||
| patents cannot be used to render the program non-free. | ||||
|  | ||||
|   The precise terms and conditions for copying, distribution and | ||||
| modification follow. | ||||
|  | ||||
|                        TERMS AND CONDITIONS | ||||
|  | ||||
|   0. Definitions. | ||||
|  | ||||
|   "This License" refers to version 3 of the GNU General Public License. | ||||
|  | ||||
|   "Copyright" also means copyright-like laws that apply to other kinds of | ||||
| works, such as semiconductor masks. | ||||
|  | ||||
|   "The Program" refers to any copyrightable work licensed under this | ||||
| License.  Each licensee is addressed as "you".  "Licensees" and | ||||
| "recipients" may be individuals or organizations. | ||||
|  | ||||
|   To "modify" a work means to copy from or adapt all or part of the work | ||||
| in a fashion requiring copyright permission, other than the making of an | ||||
| exact copy.  The resulting work is called a "modified version" of the | ||||
| earlier work or a work "based on" the earlier work. | ||||
|  | ||||
|   A "covered work" means either the unmodified Program or a work based | ||||
| on the Program. | ||||
|  | ||||
|   To "propagate" a work means to do anything with it that, without | ||||
| permission, would make you directly or secondarily liable for | ||||
| infringement under applicable copyright law, except executing it on a | ||||
| computer or modifying a private copy.  Propagation includes copying, | ||||
| distribution (with or without modification), making available to the | ||||
| public, and in some countries other activities as well. | ||||
|  | ||||
|   To "convey" a work means any kind of propagation that enables other | ||||
| parties to make or receive copies.  Mere interaction with a user through | ||||
| a computer network, with no transfer of a copy, is not conveying. | ||||
|  | ||||
|   An interactive user interface displays "Appropriate Legal Notices" | ||||
| to the extent that it includes a convenient and prominently visible | ||||
| feature that (1) displays an appropriate copyright notice, and (2) | ||||
| tells the user that there is no warranty for the work (except to the | ||||
| extent that warranties are provided), that licensees may convey the | ||||
| work under this License, and how to view a copy of this License.  If | ||||
| the interface presents a list of user commands or options, such as a | ||||
| menu, a prominent item in the list meets this criterion. | ||||
|  | ||||
|   1. Source Code. | ||||
|  | ||||
|   The "source code" for a work means the preferred form of the work | ||||
| for making modifications to it.  "Object code" means any non-source | ||||
| form of a work. | ||||
|  | ||||
|   A "Standard Interface" means an interface that either is an official | ||||
| standard defined by a recognized standards body, or, in the case of | ||||
| interfaces specified for a particular programming language, one that | ||||
| is widely used among developers working in that language. | ||||
|  | ||||
|   The "System Libraries" of an executable work include anything, other | ||||
| than the work as a whole, that (a) is included in the normal form of | ||||
| packaging a Major Component, but which is not part of that Major | ||||
| Component, and (b) serves only to enable use of the work with that | ||||
| Major Component, or to implement a Standard Interface for which an | ||||
| implementation is available to the public in source code form.  A | ||||
| "Major Component", in this context, means a major essential component | ||||
| (kernel, window system, and so on) of the specific operating system | ||||
| (if any) on which the executable work runs, or a compiler used to | ||||
| produce the work, or an object code interpreter used to run it. | ||||
|  | ||||
|   The "Corresponding Source" for a work in object code form means all | ||||
| the source code needed to generate, install, and (for an executable | ||||
| work) run the object code and to modify the work, including scripts to | ||||
| control those activities.  However, it does not include the work's | ||||
| System Libraries, or general-purpose tools or generally available free | ||||
| programs which are used unmodified in performing those activities but | ||||
| which are not part of the work.  For example, Corresponding Source | ||||
| includes interface definition files associated with source files for | ||||
| the work, and the source code for shared libraries and dynamically | ||||
| linked subprograms that the work is specifically designed to require, | ||||
| such as by intimate data communication or control flow between those | ||||
| subprograms and other parts of the work. | ||||
|  | ||||
|   The Corresponding Source need not include anything that users | ||||
| can regenerate automatically from other parts of the Corresponding | ||||
| Source. | ||||
|  | ||||
|   The Corresponding Source for a work in source code form is that | ||||
| same work. | ||||
|  | ||||
|   2. Basic Permissions. | ||||
|  | ||||
|   All rights granted under this License are granted for the term of | ||||
| copyright on the Program, and are irrevocable provided the stated | ||||
| conditions are met.  This License explicitly affirms your unlimited | ||||
| permission to run the unmodified Program.  The output from running a | ||||
| covered work is covered by this License only if the output, given its | ||||
| content, constitutes a covered work.  This License acknowledges your | ||||
| rights of fair use or other equivalent, as provided by copyright law. | ||||
|  | ||||
|   You may make, run and propagate covered works that you do not | ||||
| convey, without conditions so long as your license otherwise remains | ||||
| in force.  You may convey covered works to others for the sole purpose | ||||
| of having them make modifications exclusively for you, or provide you | ||||
| with facilities for running those works, provided that you comply with | ||||
| the terms of this License in conveying all material for which you do | ||||
| not control copyright.  Those thus making or running the covered works | ||||
| for you must do so exclusively on your behalf, under your direction | ||||
| and control, on terms that prohibit them from making any copies of | ||||
| your copyrighted material outside their relationship with you. | ||||
|  | ||||
|   Conveying under any other circumstances is permitted solely under | ||||
| the conditions stated below.  Sublicensing is not allowed; section 10 | ||||
| makes it unnecessary. | ||||
|  | ||||
|   3. Protecting Users' Legal Rights From Anti-Circumvention Law. | ||||
|  | ||||
|   No covered work shall be deemed part of an effective technological | ||||
| measure under any applicable law fulfilling obligations under article | ||||
| 11 of the WIPO copyright treaty adopted on 20 December 1996, or | ||||
| similar laws prohibiting or restricting circumvention of such | ||||
| measures. | ||||
|  | ||||
|   When you convey a covered work, you waive any legal power to forbid | ||||
| circumvention of technological measures to the extent such circumvention | ||||
| is effected by exercising rights under this License with respect to | ||||
| the covered work, and you disclaim any intention to limit operation or | ||||
| modification of the work as a means of enforcing, against the work's | ||||
| users, your or third parties' legal rights to forbid circumvention of | ||||
| technological measures. | ||||
|  | ||||
|   4. Conveying Verbatim Copies. | ||||
|  | ||||
|   You may convey verbatim copies of the Program's source code as you | ||||
| receive it, in any medium, provided that you conspicuously and | ||||
| appropriately publish on each copy an appropriate copyright notice; | ||||
| keep intact all notices stating that this License and any | ||||
| non-permissive terms added in accord with section 7 apply to the code; | ||||
| keep intact all notices of the absence of any warranty; and give all | ||||
| recipients a copy of this License along with the Program. | ||||
|  | ||||
|   You may charge any price or no price for each copy that you convey, | ||||
| and you may offer support or warranty protection for a fee. | ||||
|  | ||||
|   5. Conveying Modified Source Versions. | ||||
|  | ||||
|   You may convey a work based on the Program, or the modifications to | ||||
| produce it from the Program, in the form of source code under the | ||||
| terms of section 4, provided that you also meet all of these conditions: | ||||
|  | ||||
|     a) The work must carry prominent notices stating that you modified | ||||
|     it, and giving a relevant date. | ||||
|  | ||||
|     b) The work must carry prominent notices stating that it is | ||||
|     released under this License and any conditions added under section | ||||
|     7.  This requirement modifies the requirement in section 4 to | ||||
|     "keep intact all notices". | ||||
|  | ||||
|     c) You must license the entire work, as a whole, under this | ||||
|     License to anyone who comes into possession of a copy.  This | ||||
|     License will therefore apply, along with any applicable section 7 | ||||
|     additional terms, to the whole of the work, and all its parts, | ||||
|     regardless of how they are packaged.  This License gives no | ||||
|     permission to license the work in any other way, but it does not | ||||
|     invalidate such permission if you have separately received it. | ||||
|  | ||||
|     d) If the work has interactive user interfaces, each must display | ||||
|     Appropriate Legal Notices; however, if the Program has interactive | ||||
|     interfaces that do not display Appropriate Legal Notices, your | ||||
|     work need not make them do so. | ||||
|  | ||||
|   A compilation of a covered work with other separate and independent | ||||
| works, which are not by their nature extensions of the covered work, | ||||
| and which are not combined with it such as to form a larger program, | ||||
| in or on a volume of a storage or distribution medium, is called an | ||||
| "aggregate" if the compilation and its resulting copyright are not | ||||
| used to limit the access or legal rights of the compilation's users | ||||
| beyond what the individual works permit.  Inclusion of a covered work | ||||
| in an aggregate does not cause this License to apply to the other | ||||
| parts of the aggregate. | ||||
|  | ||||
|   6. Conveying Non-Source Forms. | ||||
|  | ||||
|   You may convey a covered work in object code form under the terms | ||||
| of sections 4 and 5, provided that you also convey the | ||||
| machine-readable Corresponding Source under the terms of this License, | ||||
| in one of these ways: | ||||
|  | ||||
|     a) Convey the object code in, or embodied in, a physical product | ||||
|     (including a physical distribution medium), accompanied by the | ||||
|     Corresponding Source fixed on a durable physical medium | ||||
|     customarily used for software interchange. | ||||
|  | ||||
|     b) Convey the object code in, or embodied in, a physical product | ||||
|     (including a physical distribution medium), accompanied by a | ||||
|     written offer, valid for at least three years and valid for as | ||||
|     long as you offer spare parts or customer support for that product | ||||
|     model, to give anyone who possesses the object code either (1) a | ||||
|     copy of the Corresponding Source for all the software in the | ||||
|     product that is covered by this License, on a durable physical | ||||
|     medium customarily used for software interchange, for a price no | ||||
|     more than your reasonable cost of physically performing this | ||||
|     conveying of source, or (2) access to copy the | ||||
|     Corresponding Source from a network server at no charge. | ||||
|  | ||||
|     c) Convey individual copies of the object code with a copy of the | ||||
|     written offer to provide the Corresponding Source.  This | ||||
|     alternative is allowed only occasionally and noncommercially, and | ||||
|     only if you received the object code with such an offer, in accord | ||||
|     with subsection 6b. | ||||
|  | ||||
|     d) Convey the object code by offering access from a designated | ||||
|     place (gratis or for a charge), and offer equivalent access to the | ||||
|     Corresponding Source in the same way through the same place at no | ||||
|     further charge.  You need not require recipients to copy the | ||||
|     Corresponding Source along with the object code.  If the place to | ||||
|     copy the object code is a network server, the Corresponding Source | ||||
|     may be on a different server (operated by you or a third party) | ||||
|     that supports equivalent copying facilities, provided you maintain | ||||
|     clear directions next to the object code saying where to find the | ||||
|     Corresponding Source.  Regardless of what server hosts the | ||||
|     Corresponding Source, you remain obligated to ensure that it is | ||||
|     available for as long as needed to satisfy these requirements. | ||||
|  | ||||
|     e) Convey the object code using peer-to-peer transmission, provided | ||||
|     you inform other peers where the object code and Corresponding | ||||
|     Source of the work are being offered to the general public at no | ||||
|     charge under subsection 6d. | ||||
|  | ||||
|   A separable portion of the object code, whose source code is excluded | ||||
| from the Corresponding Source as a System Library, need not be | ||||
| included in conveying the object code work. | ||||
|  | ||||
|   A "User Product" is either (1) a "consumer product", which means any | ||||
| tangible personal property which is normally used for personal, family, | ||||
| or household purposes, or (2) anything designed or sold for incorporation | ||||
| into a dwelling.  In determining whether a product is a consumer product, | ||||
| doubtful cases shall be resolved in favor of coverage.  For a particular | ||||
| product received by a particular user, "normally used" refers to a | ||||
| typical or common use of that class of product, regardless of the status | ||||
| of the particular user or of the way in which the particular user | ||||
| actually uses, or expects or is expected to use, the product.  A product | ||||
| is a consumer product regardless of whether the product has substantial | ||||
| commercial, industrial or non-consumer uses, unless such uses represent | ||||
| the only significant mode of use of the product. | ||||
|  | ||||
|   "Installation Information" for a User Product means any methods, | ||||
| procedures, authorization keys, or other information required to install | ||||
| and execute modified versions of a covered work in that User Product from | ||||
| a modified version of its Corresponding Source.  The information must | ||||
| suffice to ensure that the continued functioning of the modified object | ||||
| code is in no case prevented or interfered with solely because | ||||
| modification has been made. | ||||
|  | ||||
|   If you convey an object code work under this section in, or with, or | ||||
| specifically for use in, a User Product, and the conveying occurs as | ||||
| part of a transaction in which the right of possession and use of the | ||||
| User Product is transferred to the recipient in perpetuity or for a | ||||
| fixed term (regardless of how the transaction is characterized), the | ||||
| Corresponding Source conveyed under this section must be accompanied | ||||
| by the Installation Information.  But this requirement does not apply | ||||
| if neither you nor any third party retains the ability to install | ||||
| modified object code on the User Product (for example, the work has | ||||
| been installed in ROM). | ||||
|  | ||||
|   The requirement to provide Installation Information does not include a | ||||
| requirement to continue to provide support service, warranty, or updates | ||||
| for a work that has been modified or installed by the recipient, or for | ||||
| the User Product in which it has been modified or installed.  Access to a | ||||
| network may be denied when the modification itself materially and | ||||
| adversely affects the operation of the network or violates the rules and | ||||
| protocols for communication across the network. | ||||
|  | ||||
|   Corresponding Source conveyed, and Installation Information provided, | ||||
| in accord with this section must be in a format that is publicly | ||||
| documented (and with an implementation available to the public in | ||||
| source code form), and must require no special password or key for | ||||
| unpacking, reading or copying. | ||||
|  | ||||
|   7. Additional Terms. | ||||
|  | ||||
|   "Additional permissions" are terms that supplement the terms of this | ||||
| License by making exceptions from one or more of its conditions. | ||||
| Additional permissions that are applicable to the entire Program shall | ||||
| be treated as though they were included in this License, to the extent | ||||
| that they are valid under applicable law.  If additional permissions | ||||
| apply only to part of the Program, that part may be used separately | ||||
| under those permissions, but the entire Program remains governed by | ||||
| this License without regard to the additional permissions. | ||||
|  | ||||
|   When you convey a copy of a covered work, you may at your option | ||||
| remove any additional permissions from that copy, or from any part of | ||||
| it.  (Additional permissions may be written to require their own | ||||
| removal in certain cases when you modify the work.)  You may place | ||||
| additional permissions on material, added by you to a covered work, | ||||
| for which you have or can give appropriate copyright permission. | ||||
|  | ||||
|   Notwithstanding any other provision of this License, for material you | ||||
| add to a covered work, you may (if authorized by the copyright holders of | ||||
| that material) supplement the terms of this License with terms: | ||||
|  | ||||
|     a) Disclaiming warranty or limiting liability differently from the | ||||
|     terms of sections 15 and 16 of this License; or | ||||
|  | ||||
|     b) Requiring preservation of specified reasonable legal notices or | ||||
|     author attributions in that material or in the Appropriate Legal | ||||
|     Notices displayed by works containing it; or | ||||
|  | ||||
|     c) Prohibiting misrepresentation of the origin of that material, or | ||||
|     requiring that modified versions of such material be marked in | ||||
|     reasonable ways as different from the original version; or | ||||
|  | ||||
|     d) Limiting the use for publicity purposes of names of licensors or | ||||
|     authors of the material; or | ||||
|  | ||||
|     e) Declining to grant rights under trademark law for use of some | ||||
|     trade names, trademarks, or service marks; or | ||||
|  | ||||
|     f) Requiring indemnification of licensors and authors of that | ||||
|     material by anyone who conveys the material (or modified versions of | ||||
|     it) with contractual assumptions of liability to the recipient, for | ||||
|     any liability that these contractual assumptions directly impose on | ||||
|     those licensors and authors. | ||||
|  | ||||
|   All other non-permissive additional terms are considered "further | ||||
| restrictions" within the meaning of section 10.  If the Program as you | ||||
| received it, or any part of it, contains a notice stating that it is | ||||
| governed by this License along with a term that is a further | ||||
| restriction, you may remove that term.  If a license document contains | ||||
| a further restriction but permits relicensing or conveying under this | ||||
| License, you may add to a covered work material governed by the terms | ||||
| of that license document, provided that the further restriction does | ||||
| not survive such relicensing or conveying. | ||||
|  | ||||
|   If you add terms to a covered work in accord with this section, you | ||||
| must place, in the relevant source files, a statement of the | ||||
| additional terms that apply to those files, or a notice indicating | ||||
| where to find the applicable terms. | ||||
|  | ||||
|   Additional terms, permissive or non-permissive, may be stated in the | ||||
| form of a separately written license, or stated as exceptions; | ||||
| the above requirements apply either way. | ||||
|  | ||||
|   8. Termination. | ||||
|  | ||||
|   You may not propagate or modify a covered work except as expressly | ||||
| provided under this License.  Any attempt otherwise to propagate or | ||||
| modify it is void, and will automatically terminate your rights under | ||||
| this License (including any patent licenses granted under the third | ||||
| paragraph of section 11). | ||||
|  | ||||
|   However, if you cease all violation of this License, then your | ||||
| license from a particular copyright holder is reinstated (a) | ||||
| provisionally, unless and until the copyright holder explicitly and | ||||
| finally terminates your license, and (b) permanently, if the copyright | ||||
| holder fails to notify you of the violation by some reasonable means | ||||
| prior to 60 days after the cessation. | ||||
|  | ||||
|   Moreover, your license from a particular copyright holder is | ||||
| reinstated permanently if the copyright holder notifies you of the | ||||
| violation by some reasonable means, this is the first time you have | ||||
| received notice of violation of this License (for any work) from that | ||||
| copyright holder, and you cure the violation prior to 30 days after | ||||
| your receipt of the notice. | ||||
|  | ||||
|   Termination of your rights under this section does not terminate the | ||||
| licenses of parties who have received copies or rights from you under | ||||
| this License.  If your rights have been terminated and not permanently | ||||
| reinstated, you do not qualify to receive new licenses for the same | ||||
| material under section 10. | ||||
|  | ||||
|   9. Acceptance Not Required for Having Copies. | ||||
|  | ||||
|   You are not required to accept this License in order to receive or | ||||
| run a copy of the Program.  Ancillary propagation of a covered work | ||||
| occurring solely as a consequence of using peer-to-peer transmission | ||||
| to receive a copy likewise does not require acceptance.  However, | ||||
| nothing other than this License grants you permission to propagate or | ||||
| modify any covered work.  These actions infringe copyright if you do | ||||
| not accept this License.  Therefore, by modifying or propagating a | ||||
| covered work, you indicate your acceptance of this License to do so. | ||||
|  | ||||
|   10. Automatic Licensing of Downstream Recipients. | ||||
|  | ||||
|   Each time you convey a covered work, the recipient automatically | ||||
| receives a license from the original licensors, to run, modify and | ||||
| propagate that work, subject to this License.  You are not responsible | ||||
| for enforcing compliance by third parties with this License. | ||||
|  | ||||
|   An "entity transaction" is a transaction transferring control of an | ||||
| organization, or substantially all assets of one, or subdividing an | ||||
| organization, or merging organizations.  If propagation of a covered | ||||
| work results from an entity transaction, each party to that | ||||
| transaction who receives a copy of the work also receives whatever | ||||
| licenses to the work the party's predecessor in interest had or could | ||||
| give under the previous paragraph, plus a right to possession of the | ||||
| Corresponding Source of the work from the predecessor in interest, if | ||||
| the predecessor has it or can get it with reasonable efforts. | ||||
|  | ||||
|   You may not impose any further restrictions on the exercise of the | ||||
| rights granted or affirmed under this License.  For example, you may | ||||
| not impose a license fee, royalty, or other charge for exercise of | ||||
| rights granted under this License, and you may not initiate litigation | ||||
| (including a cross-claim or counterclaim in a lawsuit) alleging that | ||||
| any patent claim is infringed by making, using, selling, offering for | ||||
| sale, or importing the Program or any portion of it. | ||||
|  | ||||
|   11. Patents. | ||||
|  | ||||
|   A "contributor" is a copyright holder who authorizes use under this | ||||
| License of the Program or a work on which the Program is based.  The | ||||
| work thus licensed is called the contributor's "contributor version". | ||||
|  | ||||
|   A contributor's "essential patent claims" are all patent claims | ||||
| owned or controlled by the contributor, whether already acquired or | ||||
| hereafter acquired, that would be infringed by some manner, permitted | ||||
| by this License, of making, using, or selling its contributor version, | ||||
| but do not include claims that would be infringed only as a | ||||
| consequence of further modification of the contributor version.  For | ||||
| purposes of this definition, "control" includes the right to grant | ||||
| patent sublicenses in a manner consistent with the requirements of | ||||
| this License. | ||||
|  | ||||
|   Each contributor grants you a non-exclusive, worldwide, royalty-free | ||||
| patent license under the contributor's essential patent claims, to | ||||
| make, use, sell, offer for sale, import and otherwise run, modify and | ||||
| propagate the contents of its contributor version. | ||||
|  | ||||
|   In the following three paragraphs, a "patent license" is any express | ||||
| agreement or commitment, however denominated, not to enforce a patent | ||||
| (such as an express permission to practice a patent or covenant not to | ||||
| sue for patent infringement).  To "grant" such a patent license to a | ||||
| party means to make such an agreement or commitment not to enforce a | ||||
| patent against the party. | ||||
|  | ||||
|   If you convey a covered work, knowingly relying on a patent license, | ||||
| and the Corresponding Source of the work is not available for anyone | ||||
| to copy, free of charge and under the terms of this License, through a | ||||
| publicly available network server or other readily accessible means, | ||||
| then you must either (1) cause the Corresponding Source to be so | ||||
| available, or (2) arrange to deprive yourself of the benefit of the | ||||
| patent license for this particular work, or (3) arrange, in a manner | ||||
| consistent with the requirements of this License, to extend the patent | ||||
| license to downstream recipients.  "Knowingly relying" means you have | ||||
| actual knowledge that, but for the patent license, your conveying the | ||||
| covered work in a country, or your recipient's use of the covered work | ||||
| in a country, would infringe one or more identifiable patents in that | ||||
| country that you have reason to believe are valid. | ||||
|  | ||||
|   If, pursuant to or in connection with a single transaction or | ||||
| arrangement, you convey, or propagate by procuring conveyance of, a | ||||
| covered work, and grant a patent license to some of the parties | ||||
| receiving the covered work authorizing them to use, propagate, modify | ||||
| or convey a specific copy of the covered work, then the patent license | ||||
| you grant is automatically extended to all recipients of the covered | ||||
| work and works based on it. | ||||
|  | ||||
|   A patent license is "discriminatory" if it does not include within | ||||
| the scope of its coverage, prohibits the exercise of, or is | ||||
| conditioned on the non-exercise of one or more of the rights that are | ||||
| specifically granted under this License.  You may not convey a covered | ||||
| work if you are a party to an arrangement with a third party that is | ||||
| in the business of distributing software, under which you make payment | ||||
| to the third party based on the extent of your activity of conveying | ||||
| the work, and under which the third party grants, to any of the | ||||
| parties who would receive the covered work from you, a discriminatory | ||||
| patent license (a) in connection with copies of the covered work | ||||
| conveyed by you (or copies made from those copies), or (b) primarily | ||||
| for and in connection with specific products or compilations that | ||||
| contain the covered work, unless you entered into that arrangement, | ||||
| or that patent license was granted, prior to 28 March 2007. | ||||
|  | ||||
|   Nothing in this License shall be construed as excluding or limiting | ||||
| any implied license or other defenses to infringement that may | ||||
| otherwise be available to you under applicable patent law. | ||||
|  | ||||
|   12. No Surrender of Others' Freedom. | ||||
|  | ||||
|   If conditions are imposed on you (whether by court order, agreement or | ||||
| otherwise) that contradict the conditions of this License, they do not | ||||
| excuse you from the conditions of this License.  If you cannot convey a | ||||
| covered work so as to satisfy simultaneously your obligations under this | ||||
| License and any other pertinent obligations, then as a consequence you may | ||||
| not convey it at all.  For example, if you agree to terms that obligate you | ||||
| to collect a royalty for further conveying from those to whom you convey | ||||
| the Program, the only way you could satisfy both those terms and this | ||||
| License would be to refrain entirely from conveying the Program. | ||||
|  | ||||
|   13. Use with the GNU Affero General Public License. | ||||
|  | ||||
|   Notwithstanding any other provision of this License, you have | ||||
| permission to link or combine any covered work with a work licensed | ||||
| under version 3 of the GNU Affero General Public License into a single | ||||
| combined work, and to convey the resulting work.  The terms of this | ||||
| License will continue to apply to the part which is the covered work, | ||||
| but the special requirements of the GNU Affero General Public License, | ||||
| section 13, concerning interaction through a network will apply to the | ||||
| combination as such. | ||||
|  | ||||
|   14. Revised Versions of this License. | ||||
|  | ||||
|   The Free Software Foundation may publish revised and/or new versions of | ||||
| the GNU General Public License from time to time.  Such new versions will | ||||
| be similar in spirit to the present version, but may differ in detail to | ||||
| address new problems or concerns. | ||||
|  | ||||
|   Each version is given a distinguishing version number.  If the | ||||
| Program specifies that a certain numbered version of the GNU General | ||||
| Public License "or any later version" applies to it, you have the | ||||
| option of following the terms and conditions either of that numbered | ||||
| version or of any later version published by the Free Software | ||||
| Foundation.  If the Program does not specify a version number of the | ||||
| GNU General Public License, you may choose any version ever published | ||||
| by the Free Software Foundation. | ||||
|  | ||||
|   If the Program specifies that a proxy can decide which future | ||||
| versions of the GNU General Public License can be used, that proxy's | ||||
| public statement of acceptance of a version permanently authorizes you | ||||
| to choose that version for the Program. | ||||
|  | ||||
|   Later license versions may give you additional or different | ||||
| permissions.  However, no additional obligations are imposed on any | ||||
| author or copyright holder as a result of your choosing to follow a | ||||
| later version. | ||||
|  | ||||
|   15. Disclaimer of Warranty. | ||||
|  | ||||
|   THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY | ||||
| APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT | ||||
| HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY | ||||
| OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, | ||||
| THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | ||||
| PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM | ||||
| IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF | ||||
| ALL NECESSARY SERVICING, REPAIR OR CORRECTION. | ||||
|  | ||||
|   16. Limitation of Liability. | ||||
|  | ||||
|   IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING | ||||
| WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS | ||||
| THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY | ||||
| GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE | ||||
| USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF | ||||
| DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD | ||||
| PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), | ||||
| EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF | ||||
| SUCH DAMAGES. | ||||
|  | ||||
|   17. Interpretation of Sections 15 and 16. | ||||
|  | ||||
|   If the disclaimer of warranty and limitation of liability provided | ||||
| above cannot be given local legal effect according to their terms, | ||||
| reviewing courts shall apply local law that most closely approximates | ||||
| an absolute waiver of all civil liability in connection with the | ||||
| Program, unless a warranty or assumption of liability accompanies a | ||||
| copy of the Program in return for a fee. | ||||
|  | ||||
|                      END OF TERMS AND CONDITIONS | ||||
|  | ||||
|             How to Apply These Terms to Your New Programs | ||||
|  | ||||
|   If you develop a new program, and you want it to be of the greatest | ||||
| possible use to the public, the best way to achieve this is to make it | ||||
| free software which everyone can redistribute and change under these terms. | ||||
|  | ||||
|   To do so, attach the following notices to the program.  It is safest | ||||
| to attach them to the start of each source file to most effectively | ||||
| state the exclusion of warranty; and each file should have at least | ||||
| the "copyright" line and a pointer to where the full notice is found. | ||||
|  | ||||
|     <one line to give the program's name and a brief idea of what it does.> | ||||
|     Copyright (C) <year>  <name of author> | ||||
|  | ||||
|     This program is free software: you can redistribute it and/or modify | ||||
|     it under the terms of the GNU General Public License as published by | ||||
|     the Free Software Foundation, either version 3 of the License, or | ||||
|     (at your option) any later version. | ||||
|  | ||||
|     This program is distributed in the hope that it will be useful, | ||||
|     but WITHOUT ANY WARRANTY; without even the implied warranty of | ||||
|     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the | ||||
|     GNU General Public License for more details. | ||||
|  | ||||
|     You should have received a copy of the GNU General Public License | ||||
|     along with this program.  If not, see <https://www.gnu.org/licenses/>. | ||||
|  | ||||
| Also add information on how to contact you by electronic and paper mail. | ||||
|  | ||||
|   If the program does terminal interaction, make it output a short | ||||
| notice like this when it starts in an interactive mode: | ||||
|  | ||||
|     <program>  Copyright (C) <year>  <name of author> | ||||
|     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. | ||||
|     This is free software, and you are welcome to redistribute it | ||||
|     under certain conditions; type `show c' for details. | ||||
|  | ||||
| The hypothetical commands `show w' and `show c' should show the appropriate | ||||
| parts of the General Public License.  Of course, your program's commands | ||||
| might be different; for a GUI interface, you would use an "about box". | ||||
|  | ||||
|   You should also get your employer (if you work as a programmer) or school, | ||||
| if any, to sign a "copyright disclaimer" for the program, if necessary. | ||||
| For more information on this, and how to apply and follow the GNU GPL, see | ||||
| <https://www.gnu.org/licenses/>. | ||||
|  | ||||
|   The GNU General Public License does not permit incorporating your program | ||||
| into proprietary programs.  If your program is a subroutine library, you | ||||
| may consider it more useful to permit linking proprietary applications with | ||||
| the library.  If this is what you want to do, use the GNU Lesser General | ||||
| Public License instead of this License.  But first, please read | ||||
| <https://www.gnu.org/licenses/why-not-lgpl.html>. | ||||
| @@ -1,21 +0,0 @@ | ||||
| MIT License | ||||
|  | ||||
| Copyright (c) 2025 Mikhail Tergoev | ||||
|  | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documentation files (the "Software"), to deal | ||||
| in the Software without restriction, including without limitation the rights | ||||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||||
| copies of the Software, and to permit persons to whom the Software is | ||||
| furnished to do so, subject to the following conditions: | ||||
|  | ||||
| The above copyright notice and this permission notice shall be included in all | ||||
| copies or substantial portions of the Software. | ||||
|  | ||||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||||
| SOFTWARE. | ||||
| @@ -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) | ||||
|  | ||||
| --- | ||||
|  | ||||
| @@ -20,9 +21,9 @@ Current translation status: | ||||
|  | ||||
| | Locale | Progress | Translated | | ||||
| | :----- | -------: | ---------: | | ||||
| | [de_DE](./de_DE/LC_MESSAGES/messages.po) | 0% | 0 of 192 | | ||||
| | [es_ES](./es_ES/LC_MESSAGES/messages.po) | 0% | 0 of 192 | | ||||
| | [ru_RU](./ru_RU/LC_MESSAGES/messages.po) | 100% | 192 of 192 | | ||||
| | [de_DE](./de_DE/LC_MESSAGES/messages.po) | 0% | 0 of 203 | | ||||
| | [es_ES](./es_ES/LC_MESSAGES/messages.po) | 0% | 0 of 203 | | ||||
| | [ru_RU](./ru_RU/LC_MESSAGES/messages.po) | 100% | 203 of 203 | | ||||
|  | ||||
| --- | ||||
|  | ||||
|   | ||||
| @@ -3,10 +3,11 @@ | ||||
| --- | ||||
|  | ||||
| ## 📋 Содержание | ||||
| - [Обзор](#обзор) | ||||
| - [Добавление нового перевода](#добавление-нового-перевода) | ||||
| - [Обновление существующих переводов](#обновление-существующих-переводов) | ||||
| - [Компиляция переводов](#компиляция-переводов) | ||||
| - [Обзор](#-обзор) | ||||
| - [Добавление нового перевода](#-добавление-нового-перевода) | ||||
| - [Обновление существующих переводов](#-обновление-существующих-переводов) | ||||
| - [Компиляция переводов](#-компиляция-переводов) | ||||
| - [Проверка орфографии](#-проверка-орфографии) | ||||
|  | ||||
| --- | ||||
|  | ||||
| @@ -20,9 +21,9 @@ | ||||
|  | ||||
| | Локаль | Прогресс | Переведено | | ||||
| | :----- | -------: | ---------: | | ||||
| | [de_DE](./de_DE/LC_MESSAGES/messages.po) | 0% | 0 из 192 | | ||||
| | [es_ES](./es_ES/LC_MESSAGES/messages.po) | 0% | 0 из 192 | | ||||
| | [ru_RU](./ru_RU/LC_MESSAGES/messages.po) | 100% | 192 из 192 | | ||||
| | [de_DE](./de_DE/LC_MESSAGES/messages.po) | 0% | 0 из 203 | | ||||
| | [es_ES](./es_ES/LC_MESSAGES/messages.po) | 0% | 0 из 203 | | ||||
| | [ru_RU](./ru_RU/LC_MESSAGES/messages.po) | 100% | 203 из 203 | | ||||
|  | ||||
| --- | ||||
|  | ||||
|   | ||||
| @@ -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) | ||||
|  | ||||
| --- | ||||
|  | ||||
| @@ -50,7 +45,9 @@ Each `<exe_name>` folder can include: | ||||
| - `metadata.txt` — contains name and description: | ||||
|   ```txt | ||||
|   name=My Game Title | ||||
|   name_ru=My Game Title (in russian language) | ||||
|   description=My Game Description | ||||
|   description_ru=My Game Description (in russian language) | ||||
|   ``` | ||||
| - `cover.<extension>` — image file (`.png`, `.jpg`, `.jpeg`, `.bmp`) | ||||
|  | ||||
|   | ||||
| @@ -3,15 +3,10 @@ | ||||
| --- | ||||
|  | ||||
| ## 📋 Содержание | ||||
| - [Обзор](#обзор) | ||||
| - [Как это работает](#как-это-работает) | ||||
|   - [Приоритеты данных](#приоритеты-данных) | ||||
|   - [Структура файлов](#структура-файлов) | ||||
| - [Для пользователей](#для-пользователей) | ||||
|   - [Создание пользовательских переопределений](#создание-пользовательских-переопределений) | ||||
|   - [Пример](#пример) | ||||
| - [Для разработчиков](#для-разработчиков) | ||||
|   - [Добавление встроенных переопределений](#добавление-встроенных-переопределений) | ||||
| - [Обзор](#-обзор) | ||||
| - [Как это работает](#-как-это-работает) | ||||
| - [Для пользователей](#-для-пользователей) | ||||
| - [Для разработчиков](#-для-разработчиков) | ||||
|  | ||||
| --- | ||||
|  | ||||
| @@ -50,7 +45,9 @@ | ||||
| - `metadata.txt` — имя и описание в формате: | ||||
|   ```txt | ||||
|   name=Моё название игры | ||||
|   description=Описание моей игры | ||||
|   name_en=Моё название игры (на английском) | ||||
|   description=Описание моей игры  (на английском) | ||||
|   description_en=Описание моей игры | ||||
|   ``` | ||||
| - `cover.<расширение>` — обложка (`.png`, `.jpg`, `.jpeg`, `.bmp`) | ||||
|  | ||||
|   | ||||
| @@ -3,12 +3,13 @@ | ||||
| --- | ||||
|  | ||||
| ## 📋 Contents | ||||
| - [Overview](#overview) | ||||
| - [Creating the Theme Folder](#creating-the-theme-folder) | ||||
| - [Style File](#style-file) | ||||
| - [Metadata](#metadata) | ||||
| - [Screenshots](#screenshots) | ||||
| - [Fonts and Icons](#fonts-and-icons) | ||||
| - [Overview](#-overview) | ||||
| - [Creating the Theme Folder](#-creating-the-theme-folder) | ||||
| - [Style File](#-style-file-stylespy) | ||||
| - [Animation configuration](#-animation-configuration) | ||||
| - [Metadata](#-metadata-metainfoini) | ||||
| - [Screenshots](#-screenshots) | ||||
| - [Fonts and Icons](#-fonts-and-icons-optional) | ||||
|  | ||||
| --- | ||||
|  | ||||
| @@ -45,6 +46,163 @@ def custom_button_style(color1, color2): | ||||
|  | ||||
| --- | ||||
|  | ||||
| ## 🎥 Animation configuration | ||||
|  | ||||
| The `GAME_CARD_ANIMATION` dictionary controls all animation parameters for game cards: | ||||
|  | ||||
| ```python | ||||
| GAME_CARD_ANIMATION = { | ||||
|     # Type of animation when entering or exiting the detail page | ||||
|     # Possible values: "fade", "slide_left", "slide_right", "slide_up", "slide_down", "bounce" | ||||
|     # Determines how the detail page appears and disappears | ||||
|     "detail_page_animation_type": "fade", | ||||
|  | ||||
|     # Border width of the card in idle state (no hover or focus) | ||||
|     # Affects the thickness of the border around the card when it's not selected | ||||
|     # 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., when 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 | ||||
|     # Determines the minimum border thickness during the "breathing" animation | ||||
|     # Value in pixels | ||||
|     "pulse_min_border_width": 8, | ||||
|  | ||||
|     # Maximum border width during pulsing animation | ||||
|     # Determines the maximum border thickness during pulsing | ||||
|     # Value in pixels | ||||
|     "pulse_max_border_width": 10, | ||||
|  | ||||
|     # Duration of the border thickness animation (e.g., on hover or focus) | ||||
|     # Affects the speed of transition from one border width to another | ||||
|     # Value in milliseconds | ||||
|     "thickness_anim_duration": 300, | ||||
|  | ||||
|     # Duration of one pulsing animation cycle | ||||
|     # Determines 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, | ||||
|  | ||||
|     # Starting angle of the gradient (in degrees) | ||||
|     # Determines the initial rotation point of the gradient at animation start | ||||
|     "gradient_start_angle": 360, | ||||
|  | ||||
|     # Ending angle of the gradient (in degrees) | ||||
|     # Determines the final rotation point of the gradient | ||||
|     # Value 0 means a full 360° rotation | ||||
|     "gradient_end_angle": 0, | ||||
|  | ||||
|     # Type of card animation on hover or focus | ||||
|     # Possible values: "gradient", "scale" | ||||
|     # "gradient" enables a rotating gradient for the border, "scale" enlarges the card | ||||
|     "card_animation_type": "gradient", | ||||
|  | ||||
|     # Card scale in idle state | ||||
|     # Determines the base size of the card (1.0 = 100% of original size) | ||||
|     # Value as a fraction (e.g., 1.0 for normal size) | ||||
|     "default_scale": 1.0, | ||||
|  | ||||
|     # Card scale on hover | ||||
|     # Increases the card size on hover | ||||
|     # Value as a fraction (e.g., 1.1 = 110% of original size) | ||||
|     "hover_scale": 1.1, | ||||
|  | ||||
|     # Card scale on focus (e.g., when selected via keyboard) | ||||
|     # Increases the card size on focus | ||||
|     # Value as a fraction (e.g., 1.05 = 105% of original size) | ||||
|     "focus_scale": 1.05, | ||||
|  | ||||
|     # Duration of scale animation | ||||
|     # Affects how fast the card changes size on hover or focus | ||||
|     # Value in milliseconds | ||||
|     "scale_anim_duration": 200, | ||||
|  | ||||
|     # Easing curve type for border thickness increase 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 thickness decrease animation (on hover/focus exit) | ||||
|     # Affects the "feel" of returning to the default border width | ||||
|     "thickness_easing_curve_out": "InBack", | ||||
|  | ||||
|     # Easing curve type for scale increase animation (on hover/focus) | ||||
|     # Affects the "feel" of the scaling animation (e.g., with a "bounce" effect) | ||||
|     # Possible values: strings corresponding to QEasingCurve.Type | ||||
|     "scale_easing_curve": "OutBack", | ||||
|  | ||||
|     # Easing curve type for scale decrease animation (on hover/focus exit) | ||||
|     # Affects the "feel" of returning to the original scale | ||||
|     "scale_easing_curve_out": "InBack", | ||||
|  | ||||
|     # Gradient colors for animated border | ||||
|     # List of dictionaries, each specifying position (0.0–1.0) and color in hex format | ||||
|     # Affects the appearance of the border on hover or focus if card_animation_type="gradient" | ||||
|     "gradient_colors": [ | ||||
|         {"position": 0, "color": "#00fff5"},    # Starting color (cyan) | ||||
|         {"position": 0.33, "color": "#FF5733"}, # Color at 33% (orange) | ||||
|         {"position": 0.66, "color": "#9B59B6"}, # Color at 66% (purple) | ||||
|         {"position": 1, "color": "#00fff5"}     # Ending color (back to cyan) | ||||
|     ], | ||||
|  | ||||
|     # Duration of fade animation when entering the detail page | ||||
|     # Affects the speed of page appearance with fade animation | ||||
|     # Value in milliseconds | ||||
|     "detail_page_fade_duration": 350, | ||||
|  | ||||
|     # Duration of slide animation when entering the detail page | ||||
|     # Affects the speed of page sliding animation | ||||
|     # Value in milliseconds | ||||
|     "detail_page_slide_duration": 500, | ||||
|  | ||||
|     # Duration of bounce animation when entering the detail page | ||||
|     # Affects the speed of page "bounce" animation | ||||
|     # Value in milliseconds | ||||
|     "detail_page_bounce_duration": 400, | ||||
|  | ||||
|     # Duration of fade animation when exiting the detail page | ||||
|     # Affects the speed of page disappearance with fade animation | ||||
|     # Value in milliseconds | ||||
|     "detail_page_fade_duration_exit": 350, | ||||
|  | ||||
|     # Duration of slide animation when exiting the detail page | ||||
|     # Affects the speed of page sliding animation | ||||
|     # Value in milliseconds | ||||
|     "detail_page_slide_duration_exit": 500, | ||||
|  | ||||
|     # Duration of bounce animation when exiting the detail page | ||||
|     # Affects the speed of page "compression" animation | ||||
|     # Value in milliseconds | ||||
|     "detail_page_bounce_duration_exit": 400, | ||||
|  | ||||
|     # Easing curve type for animations when entering the detail page | ||||
|     # Applied to slide and bounce animations; affects the "feel" of movement | ||||
|     # Possible values: strings corresponding to QEasingCurve.Type | ||||
|     "detail_page_easing_curve": "OutCubic", | ||||
|  | ||||
|     # Easing curve type for animations when exiting the detail page | ||||
|     # Applied to slide and bounce animations; affects the "feel" of movement | ||||
|     # Possible values: strings corresponding to QEasingCurve.Type | ||||
|     "detail_page_easing_curve_exit": "InCubic" | ||||
| } | ||||
| ``` | ||||
|  | ||||
| --- | ||||
|  | ||||
| ## 📝 Metadata (`metainfo.ini`) | ||||
|  | ||||
| ```ini | ||||
|   | ||||
| @@ -3,12 +3,13 @@ | ||||
| --- | ||||
|  | ||||
| ## 📋 Содержание | ||||
| - [Обзор](#обзор) | ||||
| - [Создание папки темы](#создание-папки-темы) | ||||
| - [Файл стилей](#файл-стилей) | ||||
| - [Метаинформация](#метаинформация) | ||||
| - [Скриншоты](#скриншоты) | ||||
| - [Шрифты и иконки](#шрифты-и-иконки) | ||||
| - [Обзор](#-обзор) | ||||
| - [Создание папки темы](#-создание-папки-темы) | ||||
| - [Файл стилей](#-файл-стилей-stylespy) | ||||
| - [Конфигурация анимации](#-конфигурация-анимации) | ||||
| - [Метаинформация](#-метаинформация-metainfoini) | ||||
| - [Скриншоты](#-скриншоты) | ||||
| - [Шрифты и иконки](#-шрифты-и-иконки-опционально) | ||||
|  | ||||
| --- | ||||
|  | ||||
| @@ -45,6 +46,163 @@ def custom_button_style(color1, color2): | ||||
|  | ||||
| --- | ||||
|  | ||||
| ## 🎥 Конфигурация анимации | ||||
|  | ||||
| Словарь `GAME_CARD_ANIMATION` управляет всеми параметрами анимации для карточек игр: | ||||
|  | ||||
| ```python | ||||
| GAME_CARD_ANIMATION = { | ||||
|     # Тип анимации при входе и выходе на детальную страницу | ||||
|     # Возможные значения: "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, | ||||
|  | ||||
|     # Тип анимации для карточки при наведении или фокусе | ||||
|     # Возможные значения: "gradient", "scale" | ||||
|     # "gradient" включает вращающийся градиент для обводки, "scale" увеличивает размер карточки | ||||
|     "card_animation_type": "gradient", | ||||
|  | ||||
|     # Масштаб карточки в состоянии покоя | ||||
|     # Определяет базовый размер карточки (1.0 = 100% от исходного размера) | ||||
|     # Значение в долях (например, 1.0 для нормального размера) | ||||
|     "default_scale": 1.0, | ||||
|  | ||||
|     # Масштаб карточки при наведении курсора | ||||
|     # Увеличивает размер карточки при наведении | ||||
|     # Значение в долях (например, 1.1 = 110% от исходного размера) | ||||
|     "hover_scale": 1.1, | ||||
|  | ||||
|     # Масштаб карточки при фокусе (например, при выборе с клавиатуры) | ||||
|     # Увеличивает размер карточки при фокусе | ||||
|     # Значение в долях (например, 1.05 = 105% от исходного размера) | ||||
|     "focus_scale": 1.05, | ||||
|  | ||||
|     # Длительность анимации масштабирования | ||||
|     # Влияет на скорость изменения размера карточки при наведении или фокусе | ||||
|     # Значение в миллисекундах | ||||
|     "scale_anim_duration": 200, | ||||
|  | ||||
|     # Тип кривой сглаживания для анимации увеличения обводки (при наведении/фокусе) | ||||
|     # Влияет на "чувство" анимации (например, плавное ускорение или замедление) | ||||
|     # Возможные значения: строки, соответствующие QEasingCurve.Type (например, "OutBack", "InOutQuad") | ||||
|     "thickness_easing_curve": "OutBack", | ||||
|  | ||||
|     # Тип кривой сглаживания для анимации уменьшения обводки (при уходе курсора/потере фокуса) | ||||
|     # Влияет на "чувство" возврата к исходной ширине обводки | ||||
|     "thickness_easing_curve_out": "InBack", | ||||
|  | ||||
|     # Тип кривой сглаживания для анимации увеличения масштаба (при наведении/фокусе) | ||||
|     # Влияет на "чувство" анимации масштабирования (например, с эффектом "отскока") | ||||
|     # Возможные значения: строки, соответствующие QEasingCurve.Type | ||||
|     "scale_easing_curve": "OutBack", | ||||
|  | ||||
|     # Тип кривой сглаживания для анимации уменьшения масштаба (при уходе курсора/потере фокуса) | ||||
|     # Влияет на "чувство" возврата к исходному масштабу | ||||
|     "scale_easing_curve_out": "InBack", | ||||
|  | ||||
|     # Цвета градиента для анимированной обводки | ||||
|     # Список словарей, где каждый словарь задает позицию (0.0–1.0) и цвет в формате hex | ||||
|     # Влияет на внешний вид обводки при наведении или фокусе, если card_animation_type="gradient" | ||||
|     "gradient_colors": [ | ||||
|         {"position": 0, "color": "#00fff5"},    # Начальный цвет (циан) | ||||
|         {"position": 0.33, "color": "#FF5733"}, # Цвет на 33% (оранжевый) | ||||
|         {"position": 0.66, "color": "#9B59B6"}, # Цвет на 66% (пурпурный) | ||||
|         {"position": 1, "color": "#00fff5"}     # Конечный цвет (возвращение к циану) | ||||
|     ], | ||||
|  | ||||
|     # Длительность анимации fade при входе на детальную страницу | ||||
|     # Влияет на скорость появления страницы при fade-анимации | ||||
|     # Значение в миллисекундах | ||||
|     "detail_page_fade_duration": 350, | ||||
|  | ||||
|     # Длительность анимации slide при входе на детальную страницу | ||||
|     # Влияет на скорость скольжения страницы при slide-анимации | ||||
|     # Значение в миллисекундах | ||||
|     "detail_page_slide_duration": 500, | ||||
|  | ||||
|     # Длительность анимации bounce при входе на детальную страницу | ||||
|     # Влияет на скорость "прыжка" страницы при bounce-анимации | ||||
|     # Значение в миллисекундах | ||||
|     "detail_page_bounce_duration": 400, | ||||
|  | ||||
|     # Длительность анимации fade при выходе из детальной страницы | ||||
|     # Влияет на скорость исчезновения страницы при fade-анимации | ||||
|     # Значение в миллисекундах | ||||
|     "detail_page_fade_duration_exit": 350, | ||||
|  | ||||
|     # Длительность анимации slide при выходе из детальной страницы | ||||
|     # Влияет на скорость скольжения страницы при slide-анимации | ||||
|     # Значение в миллисекундах | ||||
|     "detail_page_slide_duration_exit": 500, | ||||
|  | ||||
|     # Длительность анимации bounce при выходе из детальной страницы | ||||
|     # Влияет на скорость "сжатия" страницы при bounce-анимации | ||||
|     # Значение в миллисекундах | ||||
|     "detail_page_bounce_duration_exit": 400, | ||||
|  | ||||
|     # Тип кривой сглаживания для анимации при входе на детальную страницу | ||||
|     # Применяется к slide и bounce анимациям, влияет на "чувство" движения | ||||
|     # Возможные значения: строки, соответствующие QEasingCurve.Type | ||||
|     "detail_page_easing_curve": "OutCubic", | ||||
|  | ||||
|     # Тип кривой сглаживания для анимации при выходе из детальной страницы | ||||
|     # Применяется к slide и bounce анимациям, влияет на "чувство" движения | ||||
|     # Возможные значения: строки, соответствующие QEasingCurve.Type | ||||
|     "detail_page_easing_curve_exit": "InCubic" | ||||
| } | ||||
| ``` | ||||
|  | ||||
| --- | ||||
|  | ||||
| ## 📝 Метаинформация (`metainfo.ini`) | ||||
|  | ||||
| ```ini | ||||
|   | ||||
							
								
								
									
										384
									
								
								portprotonqt/animations.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,384 @@ | ||||
| from PySide6.QtCore import QPropertyAnimation, QByteArray, QEasingCurve, QAbstractAnimation, QParallelAnimationGroup, QRect, Qt, QPoint | ||||
| from PySide6.QtGui import QPainter, QPen, QColor, QConicalGradient, QBrush | ||||
| from PySide6.QtWidgets import QWidget, QGraphicsOpacityEffect | ||||
| from collections.abc import Callable | ||||
| import portprotonqt.themes.standart.styles as default_styles | ||||
| 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 | ||||
|         self.theme = theme if theme is not None else default_styles | ||||
|         self.thickness_anim: QPropertyAnimation | None = None | ||||
|         self.gradient_anim: QPropertyAnimation | None = None | ||||
|         self.scale_anim: QPropertyAnimation | None = None | ||||
|         self.pulse_anim: QPropertyAnimation | None = None | ||||
|         self._isPulseAnimationConnected = False | ||||
|  | ||||
|     def setup_animations(self): | ||||
|         """Initialize animation properties based on theme.""" | ||||
|         self.thickness_anim = QPropertyAnimation(self.game_card, QByteArray(b"borderWidth")) | ||||
|         self.thickness_anim.setDuration(self.theme.GAME_CARD_ANIMATION["thickness_anim_duration"]) | ||||
|  | ||||
|         animation_type = self.theme.GAME_CARD_ANIMATION.get("card_animation_type", "gradient") | ||||
|         if animation_type == "gradient": | ||||
|             self.gradient_anim = QPropertyAnimation(self.game_card, QByteArray(b"gradientAngle")) | ||||
|             self.gradient_anim.setDuration(self.theme.GAME_CARD_ANIMATION["gradient_anim_duration"]) | ||||
|         elif animation_type == "scale": | ||||
|             self.scale_anim = QPropertyAnimation(self.game_card, QByteArray(b"scale")) | ||||
|             self.scale_anim.setDuration(self.theme.GAME_CARD_ANIMATION["scale_anim_duration"]) | ||||
|  | ||||
|     def start_pulse_animation(self): | ||||
|         """Start pulse animation for border width when hovered or focused.""" | ||||
|         if not (self.game_card._hovered or self.game_card._focused): | ||||
|             return | ||||
|         if self.pulse_anim: | ||||
|             self.pulse_anim.stop() | ||||
|         self.pulse_anim = QPropertyAnimation(self.game_card, QByteArray(b"borderWidth")) | ||||
|         self.pulse_anim.setDuration(self.theme.GAME_CARD_ANIMATION["pulse_anim_duration"]) | ||||
|         self.pulse_anim.setLoopCount(0) | ||||
|         self.pulse_anim.setKeyValueAt(0, self.theme.GAME_CARD_ANIMATION["pulse_min_border_width"]) | ||||
|         self.pulse_anim.setKeyValueAt(0.5, self.theme.GAME_CARD_ANIMATION["pulse_max_border_width"]) | ||||
|         self.pulse_anim.setKeyValueAt(1, self.theme.GAME_CARD_ANIMATION["pulse_min_border_width"]) | ||||
|         self.pulse_anim.start() | ||||
|  | ||||
|     def handle_enter_event(self): | ||||
|         """Handle mouse enter event animations.""" | ||||
|         self.game_card._hovered = True | ||||
|         self.game_card.hoverChanged.emit(self.game_card.name, True) | ||||
|         self.game_card.setFocus(Qt.FocusReason.MouseFocusReason) | ||||
|  | ||||
|         if not self.thickness_anim: | ||||
|             self.setup_animations() | ||||
|  | ||||
|         animation_type = self.theme.GAME_CARD_ANIMATION.get("card_animation_type", "gradient") | ||||
|  | ||||
|         if self.thickness_anim: | ||||
|             self.thickness_anim.stop() | ||||
|             if self._isPulseAnimationConnected: | ||||
|                 self.thickness_anim.finished.disconnect(self.start_pulse_animation) | ||||
|                 self._isPulseAnimationConnected = False | ||||
|             self.thickness_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["thickness_easing_curve"]])) | ||||
|             self.thickness_anim.setStartValue(self.game_card._borderWidth) | ||||
|             self.thickness_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["hover_border_width"]) | ||||
|             self.thickness_anim.finished.connect(self.start_pulse_animation) | ||||
|             self._isPulseAnimationConnected = True | ||||
|             self.thickness_anim.start() | ||||
|  | ||||
|         if animation_type == "gradient": | ||||
|             if self.gradient_anim: | ||||
|                 self.gradient_anim.stop() | ||||
|             self.gradient_anim = QPropertyAnimation(self.game_card, QByteArray(b"gradientAngle")) | ||||
|             self.gradient_anim.setDuration(self.theme.GAME_CARD_ANIMATION["gradient_anim_duration"]) | ||||
|             self.gradient_anim.setStartValue(self.theme.GAME_CARD_ANIMATION["gradient_start_angle"]) | ||||
|             self.gradient_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["gradient_end_angle"]) | ||||
|             self.gradient_anim.setLoopCount(-1) | ||||
|             self.gradient_anim.start() | ||||
|         elif animation_type == "scale": | ||||
|             if self.scale_anim: | ||||
|                 self.scale_anim.stop() | ||||
|             self.scale_anim = QPropertyAnimation(self.game_card, QByteArray(b"scale")) | ||||
|             self.scale_anim.setDuration(self.theme.GAME_CARD_ANIMATION["scale_anim_duration"]) | ||||
|             self.scale_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["scale_easing_curve"]])) | ||||
|             self.scale_anim.setStartValue(self.game_card._scale) | ||||
|             self.scale_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["hover_scale"]) | ||||
|             self.scale_anim.start() | ||||
|  | ||||
|     def handle_leave_event(self): | ||||
|         """Handle mouse leave event animations.""" | ||||
|         self.game_card._hovered = False | ||||
|         self.game_card.hoverChanged.emit(self.game_card.name, False) | ||||
|         if not self.game_card._focused: | ||||
|             animation_type = self.theme.GAME_CARD_ANIMATION.get("card_animation_type", "gradient") | ||||
|             if animation_type == "gradient": | ||||
|                 if self.gradient_anim: | ||||
|                     self.gradient_anim.stop() | ||||
|                     self.gradient_anim = None | ||||
|             elif animation_type == "scale": | ||||
|                 if self.scale_anim: | ||||
|                     self.scale_anim.stop() | ||||
|                 self.scale_anim = QPropertyAnimation(self.game_card, QByteArray(b"scale")) | ||||
|                 self.scale_anim.setDuration(self.theme.GAME_CARD_ANIMATION["scale_anim_duration"]) | ||||
|                 self.scale_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["scale_easing_curve_out"]])) | ||||
|                 self.scale_anim.setStartValue(self.game_card._scale) | ||||
|                 self.scale_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["default_scale"]) | ||||
|                 self.scale_anim.start() | ||||
|             if self.pulse_anim: | ||||
|                 self.pulse_anim.stop() | ||||
|                 self.pulse_anim = None | ||||
|             if self.thickness_anim: | ||||
|                 self.thickness_anim.stop() | ||||
|                 if self._isPulseAnimationConnected: | ||||
|                     self.thickness_anim.finished.disconnect(self.start_pulse_animation) | ||||
|                     self._isPulseAnimationConnected = False | ||||
|                 self.thickness_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["thickness_easing_curve_out"]])) | ||||
|                 self.thickness_anim.setStartValue(self.game_card._borderWidth) | ||||
|                 self.thickness_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["default_border_width"]) | ||||
|                 self.thickness_anim.start() | ||||
|  | ||||
|     def handle_focus_in_event(self): | ||||
|         """Handle focus in event animations.""" | ||||
|         if not self.game_card._hovered: | ||||
|             self.game_card._focused = True | ||||
|             self.game_card.focusChanged.emit(self.game_card.name, True) | ||||
|  | ||||
|             if not self.thickness_anim: | ||||
|                 self.setup_animations() | ||||
|  | ||||
|             animation_type = self.theme.GAME_CARD_ANIMATION.get("card_animation_type", "gradient") | ||||
|  | ||||
|             if self.thickness_anim: | ||||
|                 self.thickness_anim.stop() | ||||
|                 if self._isPulseAnimationConnected: | ||||
|                     self.thickness_anim.finished.disconnect(self.start_pulse_animation) | ||||
|                     self._isPulseAnimationConnected = False | ||||
|                 self.thickness_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["thickness_easing_curve"]])) | ||||
|                 self.thickness_anim.setStartValue(self.game_card._borderWidth) | ||||
|                 self.thickness_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["focus_border_width"]) | ||||
|                 self.thickness_anim.finished.connect(self.start_pulse_animation) | ||||
|                 self._isPulseAnimationConnected = True | ||||
|                 self.thickness_anim.start() | ||||
|  | ||||
|             if animation_type == "gradient": | ||||
|                 if self.gradient_anim: | ||||
|                     self.gradient_anim.stop() | ||||
|                 self.gradient_anim = QPropertyAnimation(self.game_card, QByteArray(b"gradientAngle")) | ||||
|                 self.gradient_anim.setDuration(self.theme.GAME_CARD_ANIMATION["gradient_anim_duration"]) | ||||
|                 self.gradient_anim.setStartValue(self.theme.GAME_CARD_ANIMATION["gradient_start_angle"]) | ||||
|                 self.gradient_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["gradient_end_angle"]) | ||||
|                 self.gradient_anim.setLoopCount(-1) | ||||
|                 self.gradient_anim.start() | ||||
|             elif animation_type == "scale": | ||||
|                 if self.scale_anim: | ||||
|                     self.scale_anim.stop() | ||||
|                 self.scale_anim = QPropertyAnimation(self.game_card, QByteArray(b"scale")) | ||||
|                 self.scale_anim.setDuration(self.theme.GAME_CARD_ANIMATION["scale_anim_duration"]) | ||||
|                 self.scale_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["scale_easing_curve"]])) | ||||
|                 self.scale_anim.setStartValue(self.game_card._scale) | ||||
|                 self.scale_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["focus_scale"]) | ||||
|                 self.scale_anim.start() | ||||
|  | ||||
|     def handle_focus_out_event(self): | ||||
|         """Handle focus out event animations.""" | ||||
|         self.game_card._focused = False | ||||
|         self.game_card.focusChanged.emit(self.game_card.name, False) | ||||
|         if not self.game_card._hovered: | ||||
|             animation_type = self.theme.GAME_CARD_ANIMATION.get("card_animation_type", "gradient") | ||||
|             if animation_type == "gradient": | ||||
|                 if self.gradient_anim: | ||||
|                     self.gradient_anim.stop() | ||||
|                     self.gradient_anim = None | ||||
|             elif animation_type == "scale": | ||||
|                 if self.scale_anim: | ||||
|                     self.scale_anim.stop() | ||||
|                 self.scale_anim = QPropertyAnimation(self.game_card, QByteArray(b"scale")) | ||||
|                 self.scale_anim.setDuration(self.theme.GAME_CARD_ANIMATION["scale_anim_duration"]) | ||||
|                 self.scale_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["scale_easing_curve_out"]])) | ||||
|                 self.scale_anim.setStartValue(self.game_card._scale) | ||||
|                 self.scale_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["default_scale"]) | ||||
|                 self.scale_anim.start() | ||||
|             if self.pulse_anim: | ||||
|                 self.pulse_anim.stop() | ||||
|                 self.pulse_anim = None | ||||
|             if self.thickness_anim: | ||||
|                 self.thickness_anim.stop() | ||||
|                 if self._isPulseAnimationConnected: | ||||
|                     self.thickness_anim.finished.disconnect(self.start_pulse_animation) | ||||
|                     self._isPulseAnimationConnected = False | ||||
|                 self.thickness_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["thickness_easing_curve_out"]])) | ||||
|                 self.thickness_anim.setStartValue(self.game_card._borderWidth) | ||||
|                 self.thickness_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["default_border_width"]) | ||||
|                 self.thickness_anim.start() | ||||
|  | ||||
|     def paint_border(self, painter: QPainter): | ||||
|         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) | ||||
|         animation_type = self.theme.GAME_CARD_ANIMATION.get("card_animation_type", "gradient") | ||||
|         if (self.game_card._hovered or self.game_card._focused) and animation_type == "gradient": | ||||
|             center = self.game_card.rect().center() | ||||
|             gradient = QConicalGradient(center, self.game_card._gradientAngle) | ||||
|             for stop in self.theme.GAME_CARD_ANIMATION["gradient_colors"]: | ||||
|                 gradient.setColorAt(stop["position"], QColor(stop["color"])) | ||||
|             pen.setBrush(QBrush(gradient)) | ||||
|         else: | ||||
|             pen.setColor(QColor(0, 0, 0, 0)) | ||||
|         painter.setPen(pen) | ||||
|         radius = 18 * self.game_card._scale | ||||
|         bw = round(self.game_card._borderWidth / 2) | ||||
|         rect = self.game_card.rect().adjusted(bw, bw, -bw, -bw) | ||||
|         if rect.isEmpty(): | ||||
|             return | ||||
|         painter.drawRoundedRect(rect, radius, radius) | ||||
|  | ||||
| class DetailPageAnimations: | ||||
|     def __init__(self, main_window, theme=None): | ||||
|         self.main_window = main_window | ||||
|         self.theme = theme if theme is not None else default_styles | ||||
|         self.animations = main_window._animations if hasattr(main_window, '_animations') else {} | ||||
|  | ||||
|     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.""" | ||||
|         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": | ||||
|             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.0) | ||||
|             animation.setEndValue(0.999) | ||||
|             animation.start(QAbstractAnimation.DeletionPolicy.DeleteWhenStopped) | ||||
|             self.animations[detail_page] = animation | ||||
|             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")]) | ||||
|             start_pos = { | ||||
|                 "slide_left": QPoint(self.main_window.width(), 0), | ||||
|                 "slide_right": QPoint(-self.main_window.width(), 0), | ||||
|                 "slide_up": QPoint(0, self.main_window.height()), | ||||
|                 "slide_down": QPoint(0, -self.main_window.height()) | ||||
|             }[animation_type] | ||||
|             detail_page.move(start_pos) | ||||
|             animation = QPropertyAnimation(detail_page, QByteArray(b"pos")) | ||||
|             animation.setDuration(duration) | ||||
|             animation.setStartValue(start_pos) | ||||
|             animation.setEndValue(self.main_window.stackedWidget.rect().topLeft()) | ||||
|             animation.setEasingCurve(easing_curve) | ||||
|             animation.start(QAbstractAnimation.DeletionPolicy.DeleteWhenStopped) | ||||
|             self.animations[detail_page] = animation | ||||
|             animation.finished.connect(cleanup_animation) | ||||
|             animation.finished.connect(load_image_and_restore_effect) | ||||
|         elif animation_type == "bounce": | ||||
|             duration = self.theme.GAME_CARD_ANIMATION.get("detail_page_bounce_duration", 400) | ||||
|             easing_curve = QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION.get("detail_page_easing_curve", "OutCubic")]) | ||||
|             detail_page.setWindowOpacity(0.0) | ||||
|             opacity_anim = QPropertyAnimation(detail_page, QByteArray(b"windowOpacity")) | ||||
|             opacity_anim.setDuration(duration) | ||||
|             opacity_anim.setStartValue(0.0) | ||||
|             opacity_anim.setEndValue(1.0) | ||||
|             initial_rect = QRect(detail_page.x() + detail_page.width() // 4, detail_page.y() + detail_page.height() // 4, | ||||
|                                 detail_page.width() // 2, detail_page.height() // 2) | ||||
|             final_rect = detail_page.geometry() | ||||
|             geometry_anim = QPropertyAnimation(detail_page, QByteArray(b"geometry")) | ||||
|             geometry_anim.setDuration(duration) | ||||
|             geometry_anim.setStartValue(initial_rect) | ||||
|             geometry_anim.setEndValue(final_rect) | ||||
|             geometry_anim.setEasingCurve(easing_curve) | ||||
|             group_anim = QParallelAnimationGroup() | ||||
|             group_anim.addAnimation(opacity_anim) | ||||
|             group_anim.addAnimation(geometry_anim) | ||||
|             group_anim.finished.connect(load_image_and_restore_effect) | ||||
|             group_anim.finished.connect(cleanup_animation) | ||||
|             group_anim.start(QAbstractAnimation.DeletionPolicy.DeleteWhenStopped) | ||||
|             self.animations[detail_page] = group_anim | ||||
|  | ||||
|     def animate_detail_page_exit(self, detail_page: QWidget, cleanup_callback: Callable): | ||||
|         """Animate the detail page exit based on theme settings.""" | ||||
|         try: | ||||
|             animation_type = self.theme.GAME_CARD_ANIMATION.get("detail_page_animation_type", "fade") | ||||
|  | ||||
|             # Safely stop and remove any existing animation | ||||
|             if detail_page in self.animations: | ||||
|                 try: | ||||
|                     animation = self.animations[detail_page] | ||||
|                     if isinstance(animation, QAbstractAnimation) and animation.state() == QAbstractAnimation.State.Running: | ||||
|                         animation.stop() | ||||
|                 except RuntimeError: | ||||
|                     logger.debug("Animation already deleted for page") | ||||
|                 except Exception as e: | ||||
|                     logger.error(f"Error stopping existing animation: {e}", exc_info=True) | ||||
|                 finally: | ||||
|                     self.animations.pop(detail_page, None) | ||||
|  | ||||
|             # Define animation based on type | ||||
|             if animation_type == "fade": | ||||
|                 duration = self.theme.GAME_CARD_ANIMATION.get("detail_page_fade_duration_exit", 350) | ||||
|                 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(0.999) | ||||
|                 animation.setEndValue(0.0) | ||||
|                 animation.start(QAbstractAnimation.DeletionPolicy.DeleteWhenStopped) | ||||
|                 self.animations[detail_page] = animation | ||||
|                 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) | ||||
|             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")]) | ||||
|                 end_pos = { | ||||
|                     "slide_left": QPoint(-self.main_window.width(), 0), | ||||
|                     "slide_right": QPoint(self.main_window.width(), 0), | ||||
|                     "slide_up": QPoint(0, self.main_window.height()), | ||||
|                     "slide_down": QPoint(0, -self.main_window.height()) | ||||
|                 }[animation_type] | ||||
|                 animation = QPropertyAnimation(detail_page, QByteArray(b"pos")) | ||||
|                 animation.setDuration(duration) | ||||
|                 animation.setStartValue(detail_page.pos()) | ||||
|                 animation.setEndValue(end_pos) | ||||
|                 animation.setEasingCurve(easing_curve) | ||||
|                 animation.start(QAbstractAnimation.DeletionPolicy.DeleteWhenStopped) | ||||
|                 self.animations[detail_page] = animation | ||||
|                 animation.finished.connect(cleanup_callback) | ||||
|             elif animation_type == "bounce": | ||||
|                 duration = self.theme.GAME_CARD_ANIMATION.get("detail_page_bounce_duration_exit", 400) | ||||
|                 easing_curve = QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION.get("detail_page_easing_curve_exit", "InCubic")]) | ||||
|                 opacity_anim = QPropertyAnimation(detail_page, QByteArray(b"windowOpacity")) | ||||
|                 opacity_anim.setDuration(duration) | ||||
|                 opacity_anim.setStartValue(1.0) | ||||
|                 opacity_anim.setEndValue(0.0) | ||||
|                 final_rect = QRect(detail_page.x() + detail_page.width() // 4, detail_page.y() + detail_page.height() // 4, | ||||
|                                   detail_page.width() // 2, detail_page.height() // 2) | ||||
|                 geometry_anim = QPropertyAnimation(detail_page, QByteArray(b"geometry")) | ||||
|                 geometry_anim.setDuration(duration) | ||||
|                 geometry_anim.setStartValue(detail_page.geometry()) | ||||
|                 geometry_anim.setEndValue(final_rect) | ||||
|                 geometry_anim.setEasingCurve(easing_curve) | ||||
|                 group_anim = QParallelAnimationGroup() | ||||
|                 group_anim.addAnimation(opacity_anim) | ||||
|                 group_anim.addAnimation(geometry_anim) | ||||
|                 group_anim.finished.connect(cleanup_callback) | ||||
|                 group_anim.start(QAbstractAnimation.DeletionPolicy.DeleteWhenStopped) | ||||
|                 self.animations[detail_page] = group_anim | ||||
|         except Exception as e: | ||||
|             logger.error(f"Error in animate_detail_page_exit: {e}", exc_info=True) | ||||
|             self.animations.pop(detail_page, None) | ||||
|             cleanup_callback() | ||||
| @@ -1,12 +1,9 @@ | ||||
| import sys | ||||
| import os | ||||
| import subprocess | ||||
| from PySide6.QtCore import QLocale, QTranslator, QLibraryInfo | ||||
| from PySide6.QtWidgets import QApplication | ||||
| from PySide6.QtGui import QIcon | ||||
| from portprotonqt.main_window import MainWindow | ||||
| from portprotonqt.tray import SystemTray | ||||
| from portprotonqt.config_utils import read_theme_from_config, save_fullscreen_config | ||||
| from portprotonqt.config_utils import save_fullscreen_config | ||||
| from portprotonqt.logger import get_logger | ||||
| from portprotonqt.cli import parse_args | ||||
|  | ||||
| @@ -14,7 +11,7 @@ logger = get_logger(__name__) | ||||
|  | ||||
| __app_id__ = "ru.linux_gaming.PortProtonQt" | ||||
| __app_name__ = "PortProtonQt" | ||||
| __app_version__ = "0.1.3" | ||||
| __app_version__ = "0.1.5" | ||||
|  | ||||
| def main(): | ||||
|     app = QApplication(sys.argv) | ||||
| @@ -33,49 +30,20 @@ def main(): | ||||
|  | ||||
|     args = parse_args() | ||||
|  | ||||
|     window = MainWindow() | ||||
|  | ||||
|     if args.session: | ||||
|         gamescope_cmd = os.getenv("GAMESCOPE_CMD", "gamescope -f --xwayland-count 2") | ||||
|         cmd = f"{gamescope_cmd} -- portprotonqt" | ||||
|         logger.info(f"Executing: {cmd}") | ||||
|         subprocess.Popen(cmd, shell=True) | ||||
|         sys.exit(0) | ||||
|     window = MainWindow(app_name=__app_name__) | ||||
|  | ||||
|     if args.fullscreen: | ||||
|         logger.info("Launching in fullscreen mode due to --fullscreen flag") | ||||
|         save_fullscreen_config(True) | ||||
|         window.showFullScreen() | ||||
|  | ||||
|     current_theme_name = read_theme_from_config() | ||||
|     tray = SystemTray(app, current_theme_name) | ||||
|     tray.show_action.triggered.connect(window.show) | ||||
|     tray.hide_action.triggered.connect(window.hide) | ||||
|  | ||||
|     def recreate_tray(): | ||||
|         nonlocal tray | ||||
|         if tray: | ||||
|             logger.debug("Recreating system tray") | ||||
|             tray.cleanup() | ||||
|             tray = None | ||||
|         current_theme = read_theme_from_config() | ||||
|         tray = SystemTray(app, current_theme) | ||||
|         # Ensure window is not None before connecting signals | ||||
|         if window: | ||||
|             tray.show_action.triggered.connect(window.show) | ||||
|             tray.hide_action.triggered.connect(window.hide) | ||||
|  | ||||
|     def cleanup_on_exit(): | ||||
|         nonlocal tray, window | ||||
|         nonlocal window | ||||
|         app.aboutToQuit.disconnect() | ||||
|         if tray: | ||||
|             tray.cleanup() | ||||
|             tray = None | ||||
|         if window: | ||||
|             window.close() | ||||
|         app.quit() | ||||
|  | ||||
|     window.settings_saved.connect(recreate_tray) | ||||
|     app.aboutToQuit.connect(cleanup_on_exit) | ||||
|  | ||||
|     window.show() | ||||
|   | ||||
| @@ -13,9 +13,4 @@ def parse_args(): | ||||
|         action="store_true", | ||||
|         help="Запустить приложение в полноэкранном режиме и сохранить эту настройку" | ||||
|     ) | ||||
|     parser.add_argument( | ||||
|         "--session", | ||||
|         action="store_true", | ||||
|         help="Запустить приложение с использованием gamescope" | ||||
|     ) | ||||
|     return parser.parse_args() | ||||
|   | ||||
| @@ -549,3 +549,41 @@ def save_auto_fullscreen_gamepad(auto_fullscreen): | ||||
|     cp["Display"]["auto_fullscreen_gamepad"] = str(auto_fullscreen) | ||||
|     with open(CONFIG_FILE, "w", encoding="utf-8") as configfile: | ||||
|         cp.write(configfile) | ||||
|  | ||||
| def read_favorite_folders(): | ||||
|     """ | ||||
|     Читает список избранных папок из секции [FavoritesFolders] конфигурационного файла. | ||||
|     Список хранится как строка, заключённая в кавычки, с путями, разделёнными запятыми. | ||||
|     Если секция или параметр отсутствуют, возвращает пустой список. | ||||
|     """ | ||||
|     cp = configparser.ConfigParser() | ||||
|     if os.path.exists(CONFIG_FILE): | ||||
|         try: | ||||
|             cp.read(CONFIG_FILE, encoding="utf-8") | ||||
|         except Exception as e: | ||||
|             logger.error("Ошибка чтения конфига: %s", e) | ||||
|             return [] | ||||
|         if cp.has_section("FavoritesFolders") and cp.has_option("FavoritesFolders", "folders"): | ||||
|             favs = cp.get("FavoritesFolders", "folders", fallback="").strip() | ||||
|             if favs.startswith('"') and favs.endswith('"'): | ||||
|                 favs = favs[1:-1] | ||||
|             return [os.path.normpath(s.strip()) for s in favs.split(",") if s.strip() and os.path.isdir(os.path.normpath(s.strip()))] | ||||
|     return [] | ||||
|  | ||||
| def save_favorite_folders(folders): | ||||
|     """ | ||||
|     Сохраняет список избранных папок в секцию [FavoritesFolders] конфигурационного файла. | ||||
|     Список сохраняется как строка, заключённая в двойные кавычки, где пути разделены запятыми. | ||||
|     """ | ||||
|     cp = configparser.ConfigParser() | ||||
|     if os.path.exists(CONFIG_FILE): | ||||
|         try: | ||||
|             cp.read(CONFIG_FILE, encoding="utf-8") | ||||
|         except Exception as e: | ||||
|             logger.error("Ошибка чтения конфига: %s", e) | ||||
|     if "FavoritesFolders" not in cp: | ||||
|         cp["FavoritesFolders"] = {} | ||||
|     fav_str = ", ".join([os.path.normpath(folder) for folder in folders]) | ||||
|     cp["FavoritesFolders"]["folders"] = f'"{fav_str}"' | ||||
|     with open(CONFIG_FILE, "w", encoding="utf-8") as configfile: | ||||
|         cp.write(configfile) | ||||
|   | ||||
| @@ -12,7 +12,7 @@ from PySide6.QtWidgets import QMessageBox, QDialog, QMenu, QLineEdit, QApplicati | ||||
| from PySide6.QtCore import QUrl, QPoint, QObject, Signal, Qt | ||||
| from PySide6.QtGui import QDesktopServices, QIcon, QKeySequence | ||||
| from portprotonqt.localization import _ | ||||
| from portprotonqt.config_utils import parse_desktop_entry, read_favorites, save_favorites | ||||
| from portprotonqt.config_utils import parse_desktop_entry, read_favorites, save_favorites, read_favorite_folders, save_favorite_folders | ||||
| from portprotonqt.steam_api import is_game_in_steam, add_to_steam, remove_from_steam | ||||
| from portprotonqt.egs_api import add_egs_to_steam, get_egs_executable, remove_egs_from_steam | ||||
| from portprotonqt.dialogs import AddGameDialog, FileExplorer, generate_thumbnail | ||||
| @@ -148,10 +148,85 @@ class ContextMenuManager: | ||||
|                 return False | ||||
|             current_exe = os.path.basename(exe_path) | ||||
|  | ||||
|         # Check if the current_exe matches the target_exe in MainWindow | ||||
|         if hasattr(self.parent, 'target_exe') and self.parent.target_exe == current_exe: | ||||
|             return True | ||||
|         return False | ||||
|         return hasattr(self.parent, 'target_exe') and self.parent.target_exe == current_exe | ||||
|  | ||||
|     def show_folder_context_menu(self, file_explorer, pos): | ||||
|         """Shows the context menu for a folder in FileExplorer.""" | ||||
|         try: | ||||
|             item = file_explorer.file_list.itemAt(pos) | ||||
|             if not item: | ||||
|                 logger.debug("No item selected at position %s", pos) | ||||
|                 return | ||||
|             selected = item.text() | ||||
|             if not selected.endswith("/"): | ||||
|                 logger.debug("Selected item is not a folder: %s", selected) | ||||
|                 return  # Only for folders | ||||
|             full_path = os.path.normpath(os.path.join(file_explorer.current_path, selected.rstrip("/"))) | ||||
|             if not os.path.isdir(full_path): | ||||
|                 logger.debug("Path is not a directory: %s", full_path) | ||||
|                 return | ||||
|  | ||||
|             menu = QMenu(file_explorer) | ||||
|             menu.setStyleSheet(self.theme.CONTEXT_MENU_STYLE) | ||||
|             menu.setParent(file_explorer, Qt.WindowType.Popup)  # Set transientParent for Wayland | ||||
|  | ||||
|             favorite_folders = read_favorite_folders() | ||||
|             is_favorite = full_path in favorite_folders | ||||
|             action_text = _("Remove from Favorites") if is_favorite else _("Add to Favorites") | ||||
|             favorite_action = menu.addAction(self._get_safe_icon("star" if is_favorite else "star_full"), action_text) | ||||
|             favorite_action.triggered.connect(lambda: self.toggle_favorite_folder(file_explorer, full_path, not is_favorite)) | ||||
|  | ||||
|             # Disconnect file_list signals to prevent navigation during menu interaction | ||||
|             try: | ||||
|                 file_explorer.file_list.itemClicked.disconnect(file_explorer.handle_item_click) | ||||
|                 file_explorer.file_list.itemDoubleClicked.disconnect(file_explorer.handle_item_double_click) | ||||
|             except TypeError: | ||||
|                 pass  # Signals may not be connected | ||||
|  | ||||
|             # Reconnect signals after menu closes | ||||
|             def reconnect_signals(): | ||||
|                 try: | ||||
|                     file_explorer.file_list.itemClicked.connect(file_explorer.handle_item_click) | ||||
|                     file_explorer.file_list.itemDoubleClicked.connect(file_explorer.handle_item_double_click) | ||||
|                 except Exception as e: | ||||
|                     logger.error("Error reconnecting file list signals: %s", e) | ||||
|  | ||||
|             menu.aboutToHide.connect(reconnect_signals) | ||||
|  | ||||
|             # Set focus to the first menu item | ||||
|             actions = menu.actions() | ||||
|             if actions: | ||||
|                 menu.setActiveAction(actions[0]) | ||||
|  | ||||
|             # Map local position to global for menu display | ||||
|             global_pos = file_explorer.file_list.mapToGlobal(pos) | ||||
|             menu.exec(global_pos) | ||||
|         except Exception as e: | ||||
|             logger.error("Error showing folder context menu: %s", e) | ||||
|  | ||||
|     def toggle_favorite_folder(self, file_explorer, folder_path, add): | ||||
|         """Adds or removes a folder from favorites.""" | ||||
|         favorite_folders = read_favorite_folders() | ||||
|         if add: | ||||
|             if folder_path not in favorite_folders: | ||||
|                 favorite_folders.append(folder_path) | ||||
|                 save_favorite_folders(favorite_folders) | ||||
|                 logger.info(f"Folder added to favorites: {folder_path}") | ||||
|         else: | ||||
|             if folder_path in favorite_folders: | ||||
|                 favorite_folders.remove(folder_path) | ||||
|                 save_favorite_folders(favorite_folders) | ||||
|                 logger.info(f"Folder removed from favorites: {folder_path}") | ||||
|         file_explorer.update_drives_list() | ||||
|  | ||||
|     def _get_safe_icon(self, icon_name: str) -> QIcon: | ||||
|         """Returns a QIcon, ensuring it is valid.""" | ||||
|         icon = self.theme_manager.get_icon(icon_name) | ||||
|         if isinstance(icon, QIcon): | ||||
|             return icon | ||||
|         elif isinstance(icon, str) and os.path.exists(icon): | ||||
|             return QIcon(icon) | ||||
|         return QIcon() | ||||
|  | ||||
|     def show_context_menu(self, game_card, pos: QPoint): | ||||
|         """ | ||||
| @@ -161,23 +236,25 @@ class ContextMenuManager: | ||||
|             game_card: The GameCard instance requesting the context menu. | ||||
|             pos: The position (in widget coordinates) where the menu should appear. | ||||
|         """ | ||||
|  | ||||
|         def get_safe_icon(icon_name: str) -> QIcon: | ||||
|             icon = self.theme_manager.get_icon(icon_name) | ||||
|             if isinstance(icon, QIcon): | ||||
|                 return icon | ||||
|             elif isinstance(icon, str) and os.path.exists(icon): | ||||
|                 return QIcon(icon) | ||||
|             return QIcon() | ||||
|  | ||||
|         menu = QMenu(self.parent) | ||||
|         menu.setStyleSheet(self.theme.CONTEXT_MENU_STYLE) | ||||
|  | ||||
|         # Check if the game is running | ||||
|         # For non-Steam and non-Epic games, check if exe exists | ||||
|         if game_card.game_source not in ("steam", "epic"): | ||||
|             exec_line = self._get_exec_line(game_card.name, game_card.exec_line) | ||||
|             exe_path = self._parse_exe_path(exec_line, game_card.name) if exec_line else None | ||||
|             if not exe_path: | ||||
|                 # Show only "Delete from PortProton" if no valid exe | ||||
|                 delete_action = menu.addAction(self._get_safe_icon("delete"), _("Delete from PortProton")) | ||||
|                 delete_action.triggered.connect(lambda: self.delete_game(game_card.name, game_card.exec_line)) | ||||
|                 menu.exec(game_card.mapToGlobal(pos)) | ||||
|                 return | ||||
|  | ||||
|         # Normal menu for games with valid exe or from Steam/Epic | ||||
|         is_running = self._is_game_running(game_card) | ||||
|         action_text = _("Stop Game") if is_running else _("Launch Game") | ||||
|         action_icon = "stop" if is_running else "play" | ||||
|         launch_action = menu.addAction(get_safe_icon(action_icon), action_text) | ||||
|         launch_action = menu.addAction(self._get_safe_icon(action_icon), action_text) | ||||
|         launch_action.triggered.connect( | ||||
|             lambda: self._launch_game(game_card) | ||||
|         ) | ||||
| @@ -186,11 +263,11 @@ class ContextMenuManager: | ||||
|         is_favorite = game_card.name in favorites | ||||
|         icon_name = "star_full" if is_favorite else "star" | ||||
|         text = _("Remove from Favorites") if is_favorite else _("Add to Favorites") | ||||
|         favorite_action = menu.addAction(get_safe_icon(icon_name), text) | ||||
|         favorite_action = menu.addAction(self._get_safe_icon(icon_name), text) | ||||
|         favorite_action.triggered.connect(lambda: self.toggle_favorite(game_card, not is_favorite)) | ||||
|  | ||||
|         if game_card.game_source == "epic": | ||||
|             import_action = menu.addAction(get_safe_icon("epic_games"), _("Import to Legendary")) | ||||
|             import_action = menu.addAction(self._get_safe_icon("epic_games"), _("Import to Legendary")) | ||||
|             import_action.triggered.connect( | ||||
|                 lambda: self.import_to_legendary(game_card.name, game_card.appid) | ||||
|             ) | ||||
| @@ -198,13 +275,13 @@ class ContextMenuManager: | ||||
|                 is_in_steam = is_game_in_steam(game_card.name) | ||||
|                 icon_name = "delete" if is_in_steam else "steam" | ||||
|                 text = _("Remove from Steam") if is_in_steam else _("Add to Steam") | ||||
|                 steam_action = menu.addAction(get_safe_icon(icon_name), text) | ||||
|                 steam_action = menu.addAction(self._get_safe_icon(icon_name), text) | ||||
|                 steam_action.triggered.connect( | ||||
|                     lambda: self.remove_from_steam(game_card.name, game_card.exec_line, game_card.game_source) | ||||
|                     if is_in_steam | ||||
|                     else self.add_egs_to_steam(game_card.name, game_card.appid) | ||||
|                 ) | ||||
|                 open_folder_action = menu.addAction(get_safe_icon("search"), _("Open Game Folder")) | ||||
|                 open_folder_action = menu.addAction(self._get_safe_icon("search"), _("Open Game Folder")) | ||||
|                 open_folder_action.triggered.connect( | ||||
|                     lambda: self.open_egs_game_folder(game_card.appid) | ||||
|                 ) | ||||
| @@ -212,7 +289,7 @@ class ContextMenuManager: | ||||
|                 desktop_path = os.path.join(desktop_dir, f"{game_card.name}.desktop") | ||||
|                 icon_name = "delete" if os.path.exists(desktop_path) else "desktop" | ||||
|                 text = _("Remove from Desktop") if os.path.exists(desktop_path) else _("Add to Desktop") | ||||
|                 desktop_action = menu.addAction(get_safe_icon(icon_name), text) | ||||
|                 desktop_action = menu.addAction(self._get_safe_icon(icon_name), text) | ||||
|                 desktop_action.triggered.connect( | ||||
|                     lambda: self.remove_egs_from_desktop(game_card.name) | ||||
|                     if os.path.exists(desktop_path) | ||||
| @@ -221,7 +298,7 @@ class ContextMenuManager: | ||||
|                 applications_dir = os.path.join(os.path.expanduser("~"), ".local", "share", "applications") | ||||
|                 menu_path = os.path.join(applications_dir, f"{game_card.name}.desktop") | ||||
|                 menu_action = menu.addAction( | ||||
|                     get_safe_icon("delete" if os.path.exists(menu_path) else "menu"), | ||||
|                     self._get_safe_icon("delete" if os.path.exists(menu_path) else "menu"), | ||||
|                     _("Remove from Menu") if os.path.exists(menu_path) else _("Add to Menu") | ||||
|                 ) | ||||
|                 menu_action.triggered.connect( | ||||
| @@ -235,19 +312,19 @@ class ContextMenuManager: | ||||
|             desktop_path = os.path.join(desktop_dir, f"{game_card.name}.desktop") | ||||
|             icon_name = "delete" if os.path.exists(desktop_path) else "desktop" | ||||
|             text = _("Remove from Desktop") if os.path.exists(desktop_path) else _("Add to Desktop") | ||||
|             desktop_action = menu.addAction(get_safe_icon(icon_name), text) | ||||
|             desktop_action = menu.addAction(self._get_safe_icon(icon_name), text) | ||||
|             desktop_action.triggered.connect( | ||||
|                 lambda: self.remove_from_desktop(game_card.name) | ||||
|                 if os.path.exists(desktop_path) | ||||
|                 else self.add_to_desktop(game_card.name, game_card.exec_line) | ||||
|             ) | ||||
|             edit_action = menu.addAction(get_safe_icon("edit"), _("Edit Shortcut")) | ||||
|             edit_action = menu.addAction(self._get_safe_icon("edit"), _("Edit Shortcut")) | ||||
|             edit_action.triggered.connect( | ||||
|                 lambda: self.edit_game_shortcut(game_card.name, game_card.exec_line, game_card.cover_path) | ||||
|             ) | ||||
|             delete_action = menu.addAction(get_safe_icon("delete"), _("Delete from PortProton")) | ||||
|             delete_action = menu.addAction(self._get_safe_icon("delete"), _("Delete from PortProton")) | ||||
|             delete_action.triggered.connect(lambda: self.delete_game(game_card.name, game_card.exec_line)) | ||||
|             open_folder_action = menu.addAction(get_safe_icon("search"), _("Open Game Folder")) | ||||
|             open_folder_action = menu.addAction(self._get_safe_icon("search"), _("Open Game Folder")) | ||||
|             open_folder_action.triggered.connect( | ||||
|                 lambda: self.open_game_folder(game_card.name, game_card.exec_line) | ||||
|             ) | ||||
| @@ -255,7 +332,7 @@ class ContextMenuManager: | ||||
|             menu_path = os.path.join(applications_dir, f"{game_card.name}.desktop") | ||||
|             icon_name = "delete" if os.path.exists(menu_path) else "menu" | ||||
|             text = _("Remove from Menu") if os.path.exists(menu_path) else _("Add to Menu") | ||||
|             menu_action = menu.addAction(get_safe_icon(icon_name), text) | ||||
|             menu_action = menu.addAction(self._get_safe_icon(icon_name), text) | ||||
|             menu_action.triggered.connect( | ||||
|                 lambda: self.remove_from_menu(game_card.name) | ||||
|                 if os.path.exists(menu_path) | ||||
| @@ -264,7 +341,7 @@ class ContextMenuManager: | ||||
|             is_in_steam = is_game_in_steam(game_card.name) | ||||
|             icon_name = "delete" if is_in_steam else "steam" | ||||
|             text = _("Remove from Steam") if is_in_steam else _("Add to Steam") | ||||
|             steam_action = menu.addAction(get_safe_icon(icon_name), text) | ||||
|             steam_action = menu.addAction(self._get_safe_icon(icon_name), text) | ||||
|             steam_action.triggered.connect( | ||||
|                 lambda: ( | ||||
|                     self.remove_from_steam(game_card.name, game_card.exec_line, game_card.game_source) | ||||
| @@ -273,7 +350,12 @@ class ContextMenuManager: | ||||
|                 ) | ||||
|             ) | ||||
|  | ||||
|         menu.exec(game_card.mapToGlobal(pos)) | ||||
|         # Set focus to the first menu item | ||||
|         actions = menu.actions() | ||||
|         if actions: | ||||
|             menu.setActiveAction(actions[0]) | ||||
|  | ||||
|             menu.exec(game_card.mapToGlobal(pos)) | ||||
|  | ||||
|     def _launch_game(self, game_card): | ||||
|         """ | ||||
| @@ -410,7 +492,7 @@ class ContextMenuManager: | ||||
|             ) | ||||
|             return | ||||
|  | ||||
|         # Используем FileExplorer с directory_only=True | ||||
|         # Use FileExplorer with directory_only=True | ||||
|         file_explorer = FileExplorer( | ||||
|             parent=self.parent, | ||||
|             theme=self.theme, | ||||
| @@ -440,10 +522,10 @@ class ContextMenuManager: | ||||
|             self._show_status_message(_("Importing '{game_name}' to Legendary...").format(game_name=game_name)) | ||||
|             threading.Thread(target=run_import, daemon=True).start() | ||||
|  | ||||
|         # Подключаем сигнал выбора файла/папки | ||||
|         # Connect the file selection signal | ||||
|         file_explorer.file_signal.file_selected.connect(on_folder_selected) | ||||
|  | ||||
|         # Центрируем FileExplorer относительно родительского виджета | ||||
|         # Center FileExplorer relative to the parent widget | ||||
|         parent_widget = self.parent | ||||
|         if parent_widget: | ||||
|             parent_geometry = parent_widget.geometry() | ||||
| @@ -697,15 +779,12 @@ Icon={icon_path} | ||||
|             return None | ||||
|         return exec_line | ||||
|  | ||||
|     def _parse_exe_path(self, exec_line, game_name): | ||||
|     def _parse_exe_path(self, exec_line: str, game_name: str) -> str | None: | ||||
|         """Parse the executable path from exec_line.""" | ||||
|         try: | ||||
|             entry_exec_split = shlex.split(exec_line) | ||||
|             if not entry_exec_split: | ||||
|                 self.signals.show_warning_dialog.emit( | ||||
|                     _("Error"), | ||||
|                     _("Invalid executable command: {exec_line}").format(exec_line=exec_line) | ||||
|                 ) | ||||
|                 logger.debug("Invalid executable command for '%s': %s", game_name, exec_line) | ||||
|                 return None | ||||
|             if entry_exec_split[0] == "env" and len(entry_exec_split) >= 3: | ||||
|                 exe_path = entry_exec_split[2] | ||||
| @@ -714,17 +793,11 @@ Icon={icon_path} | ||||
|             else: | ||||
|                 exe_path = entry_exec_split[-1] | ||||
|             if not exe_path or not os.path.exists(exe_path): | ||||
|                 self.signals.show_warning_dialog.emit( | ||||
|                     _("Error"), | ||||
|                     _("Executable not found: {path}").format(path=exe_path or "None") | ||||
|                 ) | ||||
|                 logger.debug("Executable not found for '%s': %s", game_name, exe_path or "None") | ||||
|                 return None | ||||
|             return exe_path | ||||
|         except Exception as e: | ||||
|             self.signals.show_warning_dialog.emit( | ||||
|                 _("Error"), | ||||
|                 _("Failed to parse executable: {error}").format(error=str(e)) | ||||
|             ) | ||||
|             logger.debug("Failed to parse executable for '%s': %s", game_name, e) | ||||
|             return None | ||||
|  | ||||
|     def _remove_file(self, file_path, error_message, success_message, game_name, location=""): | ||||
| @@ -786,7 +859,7 @@ Icon={icon_path} | ||||
|                         _("Failed to delete custom data: {error}").format(error=str(e)) | ||||
|                     ) | ||||
|  | ||||
|         # Перезагрузка списка игр и обновление сетки | ||||
|         # Reload games list and update grid | ||||
|         self.load_games() | ||||
|         self.update_game_grid() | ||||
|  | ||||
|   | ||||
| Before Width: | Height: | Size: 720 KiB After Width: | Height: | Size: 720 KiB | 
| Before Width: | Height: | Size: 655 KiB After Width: | Height: | Size: 655 KiB | 
| Before Width: | Height: | Size: 315 KiB After Width: | Height: | Size: 315 KiB | 
| Before Width: | Height: | Size: 978 KiB After Width: | Height: | Size: 978 KiB | 
| Before Width: | Height: | Size: 650 KiB After Width: | Height: | Size: 650 KiB | 
| Before Width: | Height: | Size: 391 KiB After Width: | Height: | Size: 391 KiB | 
| Before Width: | Height: | Size: 710 KiB After Width: | Height: | Size: 710 KiB | 
| Before Width: | Height: | Size: 670 KiB After Width: | Height: | Size: 670 KiB | 
| Before Width: | Height: | Size: 58 KiB After Width: | Height: | Size: 58 KiB | 
| Before Width: | Height: | Size: 814 KiB After Width: | Height: | Size: 814 KiB | 
| Before Width: | Height: | Size: 447 KiB | 
| @@ -1,3 +0,0 @@ | ||||
| name=Pulse Online | ||||
| description_ru=Многопользовательская онлайн-игра в жанре MMORPG, действие которой происходит в научно-фантастическом мире с уникальной боевой системой и глубоким крафтом. Игроки могут исследовать обширные локации, выполнять квесты, сражаться с противниками и взаимодействовать с другими участниками игры. | ||||
| description_en=A multiplayer online game in the MMORPG genre set in a sci-fi world with a unique combat system and deep crafting mechanics. Players can explore vast locations, complete quests, battle enemies, and interact with other participants in the game. | ||||
| Before Width: | Height: | Size: 566 KiB After Width: | Height: | Size: 566 KiB | 
| Before Width: | Height: | Size: 895 KiB After Width: | Height: | Size: 895 KiB | 
| Before Width: | Height: | Size: 627 KiB After Width: | Height: | Size: 627 KiB | 
| Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB | 
| Before Width: | Height: | Size: 722 KiB After Width: | Height: | Size: 722 KiB | 
| @@ -8,8 +8,8 @@ def compute_layout(nat_sizes, rect_width, spacing, max_scale): | ||||
|     Вычисляет расположение элементов с учетом отступов и возможного увеличения карточек. | ||||
|     nat_sizes: массив (N, 2) с натуральными размерами элементов (ширина, высота). | ||||
|     rect_width: доступная ширина контейнера. | ||||
|     spacing: отступ между элементами. | ||||
|     max_scale: максимальный коэффициент масштабирования (например, 1.2). | ||||
|     spacing: отступ между элементами (горизонтальный и вертикальный). | ||||
|     max_scale: максимальный коэффициент масштабирования (например, 1.0). | ||||
|  | ||||
|     Возвращает: | ||||
|       result: массив (N, 4), где каждая строка содержит [x, y, new_width, new_height]. | ||||
| @@ -19,16 +19,49 @@ def compute_layout(nat_sizes, rect_width, spacing, max_scale): | ||||
|     result = np.zeros((N, 4), dtype=np.int32) | ||||
|     y = 0 | ||||
|     i = 0 | ||||
|     min_margin = 20  # Минимальный отступ по краям | ||||
|  | ||||
|     # Определяем максимальное количество элементов в ряду и общий масштаб | ||||
|     max_items_per_row = 0 | ||||
|     global_scale = 1.0 | ||||
|     max_row_x_start = min_margin  # Начальная позиция x самого длинного ряда | ||||
|     temp_i = 0 | ||||
|  | ||||
|     # Первый проход: находим максимальное количество элементов в ряду | ||||
|     while temp_i < N: | ||||
|         sum_width = 0 | ||||
|         count = 0 | ||||
|         temp_j = temp_i | ||||
|         while temp_j < N: | ||||
|             w = nat_sizes[temp_j, 0] | ||||
|             if count > 0 and (sum_width + spacing + w) > rect_width - 2 * min_margin: | ||||
|                 break | ||||
|             sum_width += w | ||||
|             count += 1 | ||||
|             temp_j += 1 | ||||
|  | ||||
|         if count > max_items_per_row: | ||||
|             max_items_per_row = count | ||||
|             # Вычисляем масштаб для самого заполненного ряда | ||||
|             available_width = rect_width - spacing * (count - 1) - 2 * min_margin | ||||
|             desired_scale = available_width / sum_width if sum_width > 0 else 1.0 | ||||
|             global_scale = desired_scale if desired_scale < max_scale else max_scale | ||||
|             # Сохраняем начальную позицию x для самого длинного ряда | ||||
|             scaled_row_width = int(sum_width * global_scale) + spacing * (count - 1) | ||||
|             max_row_x_start = max(min_margin, (rect_width - scaled_row_width) // 2) | ||||
|         temp_i = temp_j | ||||
|  | ||||
|     # Второй проход: размещаем элементы | ||||
|     while i < N: | ||||
|         sum_width = 0 | ||||
|         row_max_height = 0 | ||||
|         count = 0 | ||||
|         j = i | ||||
|  | ||||
|         # Подбираем количество элементов для текущего ряда | ||||
|         while j < N: | ||||
|             w = nat_sizes[j, 0] | ||||
|             # Если уже есть хотя бы один элемент и следующий не помещается с учетом spacing, выходим | ||||
|             if count > 0 and (sum_width + spacing + w) > rect_width: | ||||
|             if count > 0 and (sum_width + spacing + w) > rect_width - 2 * min_margin: | ||||
|                 break | ||||
|             sum_width += w | ||||
|             count += 1 | ||||
| @@ -36,13 +69,19 @@ def compute_layout(nat_sizes, rect_width, spacing, max_scale): | ||||
|             if h > row_max_height: | ||||
|                 row_max_height = h | ||||
|             j += 1 | ||||
|         # Доступная ширина ряда с учетом обязательных отступов между элементами | ||||
|         available_width = rect_width - spacing * (count - 1) | ||||
|         desired_scale = available_width / sum_width if sum_width > 0 else 1.0 | ||||
|         # Разрешаем увеличение карточек, но не более max_scale | ||||
|         scale = desired_scale if desired_scale < max_scale else max_scale | ||||
|         # Выравниваем по левому краю (offset = 0) | ||||
|         x = 0 | ||||
|  | ||||
|         # Используем глобальный масштаб для всех рядов | ||||
|         scale = global_scale | ||||
|         scaled_row_width = int(sum_width * scale) + spacing * (count - 1) | ||||
|  | ||||
|         # Определяем начальную координату x | ||||
|         if count == max_items_per_row: | ||||
|             # Центрируем полный ряд | ||||
|             x = max(min_margin, (rect_width - scaled_row_width) // 2) | ||||
|         else: | ||||
|             # Выравниваем неполный ряд по левому краю, совмещая с началом самого длинного ряда | ||||
|             x = max_row_x_start | ||||
|  | ||||
|         for k in range(i, j): | ||||
|             new_w = int(nat_sizes[k, 0] * scale) | ||||
|             new_h = int(nat_sizes[k, 1] * scale) | ||||
| @@ -51,6 +90,7 @@ def compute_layout(nat_sizes, rect_width, spacing, max_scale): | ||||
|             result[k, 2] = new_w | ||||
|             result[k, 3] = new_h | ||||
|             x += new_w + spacing | ||||
|  | ||||
|         y += int(row_max_height * scale) + spacing | ||||
|         i = j | ||||
|     return result, y | ||||
| @@ -59,18 +99,17 @@ class FlowLayout(QLayout): | ||||
|     def __init__(self, parent=None): | ||||
|         super().__init__(parent) | ||||
|         self.itemList = [] | ||||
|         # Устанавливаем отступы контейнера в 0 и задаем spacing между карточками | ||||
|         self.setContentsMargins(0, 0, 0, 0) | ||||
|         self._spacing = 3  # отступ между карточками | ||||
|         self._max_scale = 1.2  # максимальное увеличение карточек (например, на 20%) | ||||
|         self.setContentsMargins(20, 20, 20, 20)  # Отступы по краям | ||||
|         self._spacing = 20  # Отступ для анимации и предотвращения перекрытий | ||||
|         self._max_scale = 1.0  # Отключено масштабирование в layout | ||||
|  | ||||
|     def addItem(self, item: QLayoutItem) -> None: | ||||
|             self.itemList.append(item) | ||||
|         self.itemList.append(item) | ||||
|  | ||||
|     def takeAt(self, index: int) -> QLayoutItem: | ||||
|             if 0 <= index < len(self.itemList): | ||||
|                 return self.itemList.pop(index) | ||||
|             raise IndexError("Index out of range") | ||||
|         if 0 <= index < len(self.itemList): | ||||
|             return self.itemList.pop(index) | ||||
|         raise IndexError("Index out of range") | ||||
|  | ||||
|     def count(self) -> int: | ||||
|         return len(self.itemList) | ||||
| @@ -102,7 +141,7 @@ class FlowLayout(QLayout): | ||||
|             size = size.expandedTo(item.minimumSize()) | ||||
|         margins = self.contentsMargins() | ||||
|         size += QSize(margins.left() + margins.right(), | ||||
|                              margins.top() + margins.bottom()) | ||||
|                       margins.top() + margins.bottom()) | ||||
|         return size | ||||
|  | ||||
|     def doLayout(self, rect, testOnly): | ||||
| @@ -110,14 +149,12 @@ class FlowLayout(QLayout): | ||||
|         if N == 0: | ||||
|             return 0 | ||||
|  | ||||
|         # Собираем натуральные размеры всех элементов в массив NumPy | ||||
|         nat_sizes = np.empty((N, 2), dtype=np.int32) | ||||
|         for i, item in enumerate(self.itemList): | ||||
|             s = item.sizeHint() | ||||
|             nat_sizes[i, 0] = s.width() | ||||
|             nat_sizes[i, 1] = s.height() | ||||
|  | ||||
|         # Вычисляем геометрию с учетом spacing и max_scale через numba-функцию | ||||
|         geom_array, total_height = compute_layout(nat_sizes, rect.width(), self._spacing, self._max_scale) | ||||
|  | ||||
|         if not testOnly: | ||||
| @@ -152,7 +189,7 @@ class ClickableLabel(QLabel): | ||||
|         self._icon_size = icon_size | ||||
|         self._icon_space = icon_space | ||||
|         self._font_scale_factor = font_scale_factor | ||||
|         self._card_width = 250  # Значение по умолчанию | ||||
|         self._card_width = 250 | ||||
|         if change_cursor: | ||||
|             self.setCursor(Qt.CursorShape.PointingHandCursor) | ||||
|         self.updateFontSize() | ||||
| @@ -170,28 +207,23 @@ class ClickableLabel(QLabel): | ||||
|         self.update() | ||||
|  | ||||
|     def setCardWidth(self, card_width: int): | ||||
|         """Обновляет ширину карточки и пересчитывает размер шрифта.""" | ||||
|         self._card_width = card_width | ||||
|         self.updateFontSize() | ||||
|  | ||||
|     def updateFontSize(self): | ||||
|         """Обновляет размер шрифта на основе card_width и font_scale_factor.""" | ||||
|         font = self.font() | ||||
|         font_size = int(self._card_width * self._font_scale_factor) | ||||
|         font.setPointSize(max(8, font_size))  # Минимальный размер шрифта 8 | ||||
|         font.setPointSize(max(8, font_size)) | ||||
|         self.setFont(font) | ||||
|         self.update() | ||||
|  | ||||
|     def paintEvent(self, event): | ||||
|         painter = QPainter(self) | ||||
|         painter.setRenderHint(QPainter.RenderHint.Antialiasing) | ||||
|  | ||||
|         rect = self.contentsRect() | ||||
|         alignment = self.alignment() | ||||
|  | ||||
|         icon_size = self._icon_size | ||||
|         spacing = self._icon_space | ||||
|  | ||||
|         text = self.text() | ||||
|  | ||||
|         if self._icon: | ||||
| @@ -200,17 +232,11 @@ class ClickableLabel(QLabel): | ||||
|             pixmap = None | ||||
|  | ||||
|         fm = QFontMetrics(self.font()) | ||||
|  | ||||
|         # Считаем, сколько места остаётся под текст | ||||
|         available_width = rect.width() | ||||
|         if pixmap: | ||||
|             available_width -= (icon_size + spacing) | ||||
|         # Отступы по 2px с каждой стороны | ||||
|         available_width = max(0, available_width - 4) | ||||
|  | ||||
|         # Получаем «обрезанный» текст с многоточием | ||||
|         display_text = fm.elidedText(text, Qt.TextElideMode.ElideRight, available_width) | ||||
|  | ||||
|         text_width = fm.horizontalAdvance(display_text) | ||||
|         text_height = fm.height() | ||||
|         total_width = text_width + (icon_size + spacing if pixmap else 0) | ||||
| @@ -280,8 +306,6 @@ class AutoSizeButton(QPushButton): | ||||
|  | ||||
|         self.setCursor(Qt.CursorShape.PointingHandCursor) | ||||
|         self.setFlat(True) | ||||
|  | ||||
|         # Изначально выставляем минимальную ширину | ||||
|         self.setMinimumWidth(50) | ||||
|         self.adjustFontSize() | ||||
|  | ||||
| @@ -312,7 +336,6 @@ class AutoSizeButton(QPushButton): | ||||
|         if not self._update_size: | ||||
|             return | ||||
|  | ||||
|         # Определяем доступную ширину внутри кнопки | ||||
|         available_width = self.width() | ||||
|         if self._icon: | ||||
|             available_width -= self._icon_size | ||||
| @@ -323,7 +346,6 @@ class AutoSizeButton(QPushButton): | ||||
|         font = QFont(self._original_font) | ||||
|         text = self._original_text | ||||
|  | ||||
|         # Подбираем максимально возможный размер шрифта, при котором текст укладывается | ||||
|         chosen_size = self._max_font_size | ||||
|         for font_size in range(self._max_font_size, self._min_font_size - 1, -1): | ||||
|             font.setPointSize(font_size) | ||||
| @@ -336,14 +358,12 @@ class AutoSizeButton(QPushButton): | ||||
|         font.setPointSize(chosen_size) | ||||
|         self.setFont(font) | ||||
|  | ||||
|         # После выбора шрифта вычисляем требуемую ширину для полного отображения текста | ||||
|         fm = QFontMetrics(font) | ||||
|         text_width = fm.horizontalAdvance(text) | ||||
|         required_width = text_width + margins.left() + margins.right() + self._padding * 2 | ||||
|         if self._icon: | ||||
|             required_width += self._icon_size | ||||
|  | ||||
|         # Если текущая ширина меньше требуемой, обновляем минимальную ширину | ||||
|         if self.width() < required_width: | ||||
|             self.setMinimumWidth(required_width) | ||||
|  | ||||
| @@ -353,7 +373,6 @@ class AutoSizeButton(QPushButton): | ||||
|         if not self._update_size: | ||||
|             return super().sizeHint() | ||||
|         else: | ||||
|             # Вычисляем оптимальный размер кнопки на основе текста и отступов | ||||
|             font = self.font() | ||||
|             fm = QFontMetrics(font) | ||||
|             text_width = fm.horizontalAdvance(self._original_text) | ||||
| @@ -364,7 +383,6 @@ class AutoSizeButton(QPushButton): | ||||
|             height = fm.height() + margins.top() + margins.bottom() + self._padding | ||||
|             return QSize(width, height) | ||||
|  | ||||
|  | ||||
| class NavLabel(QLabel): | ||||
|     clicked = Signal() | ||||
|  | ||||
| @@ -376,7 +394,6 @@ class NavLabel(QLabel): | ||||
|         self._isChecked = False | ||||
|         self.setProperty("checked", self._isChecked) | ||||
|         self.setCursor(Qt.CursorShape.PointingHandCursor) | ||||
|         # Explicitly enable focus | ||||
|         self.setFocusPolicy(Qt.FocusPolicy.StrongFocus) | ||||
|  | ||||
|     def setCheckable(self, checkable): | ||||
| @@ -395,7 +412,6 @@ class NavLabel(QLabel): | ||||
|  | ||||
|     def mousePressEvent(self, event): | ||||
|         if event.button() == Qt.MouseButton.LeftButton: | ||||
|             # Ensure widget can take focus on click | ||||
|             self.setFocus(Qt.FocusReason.MouseFocusReason) | ||||
|             if self._checkable: | ||||
|                 self.setChecked(not self._isChecked) | ||||
|   | ||||
| @@ -1,19 +1,22 @@ | ||||
| import os | ||||
| import tempfile | ||||
| import re | ||||
| from typing import cast, TYPE_CHECKING | ||||
| from PySide6.QtGui import QPixmap, QIcon | ||||
| from PySide6.QtWidgets import ( | ||||
|     QDialog, QFormLayout, QHBoxLayout, QLabel, QVBoxLayout, QListWidget, QScrollArea, QWidget, QListWidgetItem, QSizePolicy, QApplication | ||||
|     QDialog, QFormLayout, QHBoxLayout, QLabel, QVBoxLayout, QListWidget, QScrollArea, QWidget, QListWidgetItem, QSizePolicy, QApplication, QProgressBar | ||||
| ) | ||||
| from PySide6.QtCore import Qt, QObject, Signal, QMimeDatabase, QTimer | ||||
| from icoextract import IconExtractor, IconExtractorError | ||||
| from PIL import Image | ||||
| from portprotonqt.config_utils import get_portproton_location | ||||
| from portprotonqt.config_utils import get_portproton_location, read_favorite_folders | ||||
| from portprotonqt.localization import _ | ||||
| from portprotonqt.logger import get_logger | ||||
| import portprotonqt.themes.standart.styles as default_styles | ||||
| from portprotonqt.theme_manager import ThemeManager | ||||
| from portprotonqt.custom_widgets import AutoSizeButton | ||||
| from portprotonqt.downloader import Downloader | ||||
| import psutil | ||||
|  | ||||
| if TYPE_CHECKING: | ||||
|     from portprotonqt.main_window import MainWindow | ||||
| @@ -87,6 +90,86 @@ def generate_thumbnail(inputfile, outfile, size=128, force_resize=True): | ||||
| class FileSelectedSignal(QObject): | ||||
|     file_selected = Signal(str)  # Сигнал с путем к выбранному файлу | ||||
|  | ||||
| class GameLaunchDialog(QDialog): | ||||
|     """Modal dialog to indicate game launch progress, similar to Steam's launch dialog.""" | ||||
|     def __init__(self, parent=None, game_name=None, theme=None, target_exe=None): | ||||
|         super().__init__(parent) | ||||
|         self.theme = theme if theme else default_styles | ||||
|         self.theme_manager = ThemeManager() | ||||
|         self.game_name = game_name | ||||
|         self.target_exe = target_exe  # Store the target executable name | ||||
|         self.setWindowTitle(_("Launching {0}").format(self.game_name)) | ||||
|         self.setModal(True) | ||||
|         self.setFixedSize(400, 200) | ||||
|         self.setStyleSheet(self.theme.MESSAGE_BOX_STYLE) | ||||
|         self.setWindowModality(Qt.WindowModality.ApplicationModal) | ||||
|         self.setWindowFlags(Qt.WindowType.Dialog | Qt.WindowType.FramelessWindowHint) | ||||
|  | ||||
|         # Layout | ||||
|         layout = QVBoxLayout(self) | ||||
|         layout.setContentsMargins(10, 10, 10, 10) | ||||
|         layout.setSpacing(10) | ||||
|  | ||||
|         # Game name label | ||||
|         label = QLabel(_("Launching {0}").format(self.game_name)) | ||||
|         label.setStyleSheet(self.theme.PARAMS_TITLE_STYLE) | ||||
|         label.setAlignment(Qt.AlignmentFlag.AlignCenter) | ||||
|         layout.addWidget(label) | ||||
|  | ||||
|         # Progress bar (indeterminate) | ||||
|         self.progress_bar = QProgressBar() | ||||
|         self.progress_bar.setStyleSheet(self.theme.PROGRESS_BAR_STYLE) | ||||
|         self.progress_bar.setRange(0, 0)  # Indeterminate mode | ||||
|         layout.addWidget(self.progress_bar) | ||||
|  | ||||
|         # Cancel button | ||||
|         self.cancel_button = AutoSizeButton(_("Cancel"), icon=self.theme_manager.get_icon("cancel")) | ||||
|         self.cancel_button.setStyleSheet(self.theme.ACTION_BUTTON_STYLE) | ||||
|         self.cancel_button.clicked.connect(self.reject) | ||||
|         layout.addWidget(self.cancel_button, alignment=Qt.AlignmentFlag.AlignCenter) | ||||
|  | ||||
|         # Center dialog on parent | ||||
|         if parent: | ||||
|             parent_geometry = parent.geometry() | ||||
|             center_point = parent_geometry.center() | ||||
|             dialog_geometry = self.geometry() | ||||
|             dialog_geometry.moveCenter(center_point) | ||||
|             self.setGeometry(dialog_geometry) | ||||
|  | ||||
|         # Timer to check if the game process is running | ||||
|         self.check_process_timer = QTimer(self) | ||||
|         self.check_process_timer.timeout.connect(self.check_target_exe) | ||||
|         self.check_process_timer.start(500) | ||||
|  | ||||
|     def is_target_exe_running(self): | ||||
|         """Check if the target executable is running using psutil.""" | ||||
|         if not self.target_exe: | ||||
|             return False | ||||
|         for proc in psutil.process_iter(attrs=["name"]): | ||||
|             if proc.info["name"].lower() == self.target_exe.lower(): | ||||
|                 return True | ||||
|         return False | ||||
|  | ||||
|     def check_target_exe(self): | ||||
|         """Check if the game process is running and close the dialog if it is.""" | ||||
|         if self.is_target_exe_running(): | ||||
|             logger.info(f"Game {self.game_name} process detected as running, closing launch dialog") | ||||
|             self.accept()  # Close dialog when game is running | ||||
|             self.check_process_timer.stop() | ||||
|             self.check_process_timer.deleteLater() | ||||
|         elif not hasattr(self.parent(), 'game_processes') or not any(proc.poll() is None for proc in cast("MainWindow", self.parent()).game_processes): | ||||
|             # If no child processes are running, stop the timer but keep dialog open | ||||
|             self.check_process_timer.stop() | ||||
|             self.check_process_timer.deleteLater() | ||||
|  | ||||
|  | ||||
|     def reject(self): | ||||
|         """Handle dialog cancellation.""" | ||||
|         logger.info(f"Game launch cancelled for {self.game_name}") | ||||
|         self.check_process_timer.stop() | ||||
|         self.check_process_timer.deleteLater() | ||||
|         super().reject() | ||||
|  | ||||
| class FileExplorer(QDialog): | ||||
|     def __init__(self, parent=None, theme=None, file_filter=None, initial_path=None, directory_only=False): | ||||
|         super().__init__(parent) | ||||
| @@ -104,13 +187,15 @@ class FileExplorer(QDialog): | ||||
|         self.setWindowModality(Qt.WindowModality.ApplicationModal) | ||||
|         self.setWindowFlags(self.windowFlags() & ~Qt.WindowType.WindowContextHelpButtonHint) | ||||
|  | ||||
|         # Find InputManager from parent | ||||
|         # Find InputManager and ContextMenuManager from parent | ||||
|         self.input_manager = None | ||||
|         self.context_menu_manager = None | ||||
|         parent = self.parent() | ||||
|         while parent: | ||||
|             if hasattr(parent, 'input_manager'): | ||||
|                 self.input_manager = cast("MainWindow", parent).input_manager | ||||
|                 break | ||||
|             if hasattr(parent, 'context_menu_manager'): | ||||
|                 self.context_menu_manager = cast("MainWindow", parent).context_menu_manager | ||||
|             parent = parent.parent() | ||||
|  | ||||
|         if self.input_manager: | ||||
| @@ -135,8 +220,9 @@ class FileExplorer(QDialog): | ||||
|                     if len(parts) < 2: | ||||
|                         continue | ||||
|                     mount_point = parts[1] | ||||
|                     # Исключаем системные и временные пути | ||||
|                     if mount_point.startswith(('/run', '/dev', '/sys', '/proc', '/tmp', '/snap', '/var/lib')): | ||||
|                     # Исключаем системные и временные пути, но сохраняем /run/media | ||||
|                     if (mount_point.startswith(('/dev', '/sys', '/proc', '/tmp', '/snap', '/var/lib')) or | ||||
|                         (mount_point.startswith('/run') and not mount_point.startswith('/run/media'))): | ||||
|                         continue | ||||
|                     # Проверяем, является ли точка монтирования директорией и доступна ли она | ||||
|                     if os.path.isdir(mount_point) and os.access(mount_point, os.R_OK): | ||||
| @@ -148,7 +234,7 @@ class FileExplorer(QDialog): | ||||
|  | ||||
|     def setup_ui(self): | ||||
|         """Настройка интерфейса""" | ||||
|         self.setWindowTitle("File Explorer") | ||||
|         self.setWindowTitle(_("File Explorer")) | ||||
|         self.setGeometry(100, 100, 600, 600) | ||||
|  | ||||
|         self.main_layout = QVBoxLayout() | ||||
| @@ -156,7 +242,7 @@ class FileExplorer(QDialog): | ||||
|         self.main_layout.setSpacing(10) | ||||
|         self.setLayout(self.main_layout) | ||||
|  | ||||
|         # Панель для смонтированных дисков | ||||
|         # Панель для смонтированных дисков и избранных папок | ||||
|         self.drives_layout = QHBoxLayout() | ||||
|         self.drives_scroll = QScrollArea() | ||||
|         self.drives_scroll.setWidgetResizable(True) | ||||
| @@ -167,7 +253,7 @@ class FileExplorer(QDialog): | ||||
|         self.drives_scroll.setFixedHeight(70) | ||||
|         self.main_layout.addWidget(self.drives_scroll) | ||||
|         self.drives_scroll.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff) | ||||
|         self.drives_scroll.setFocusPolicy(Qt.FocusPolicy.StrongFocus)  # Allow focus on scroll area | ||||
|         self.drives_scroll.setFocusPolicy(Qt.FocusPolicy.StrongFocus) | ||||
|  | ||||
|         # Путь | ||||
|         self.path_label = QLabel() | ||||
| @@ -179,6 +265,8 @@ class FileExplorer(QDialog): | ||||
|         self.file_list.setStyleSheet(self.theme.FILE_EXPLORER_STYLE) | ||||
|         self.file_list.itemClicked.connect(self.handle_item_click) | ||||
|         self.file_list.itemDoubleClicked.connect(self.handle_item_double_click) | ||||
|         self.file_list.setContextMenuPolicy(Qt.ContextMenuPolicy.CustomContextMenu) | ||||
|         self.file_list.customContextMenuRequested.connect(self.show_folder_context_menu) | ||||
|         self.main_layout.addWidget(self.file_list) | ||||
|  | ||||
|         # Кнопки | ||||
| @@ -195,6 +283,13 @@ class FileExplorer(QDialog): | ||||
|         self.select_button.clicked.connect(self.select_item) | ||||
|         self.cancel_button.clicked.connect(self.reject) | ||||
|  | ||||
|     def show_folder_context_menu(self, pos): | ||||
|         """Shows the context menu for a folder using ContextMenuManager.""" | ||||
|         if self.context_menu_manager: | ||||
|             self.context_menu_manager.show_folder_context_menu(self, pos) | ||||
|         else: | ||||
|             logger.warning("ContextMenuManager not found in parent") | ||||
|  | ||||
|     def move_selection(self, direction): | ||||
|         """Перемещение выбора по списку""" | ||||
|         current_row = self.file_list.currentRow() | ||||
| @@ -284,44 +379,96 @@ class FileExplorer(QDialog): | ||||
|         except Exception as e: | ||||
|             logger.error(f"Error navigating to parent directory: {e}") | ||||
|  | ||||
|     def ensure_button_visible(self, button): | ||||
|         """Ensure the specified button is visible in the drives_scroll area.""" | ||||
|         try: | ||||
|             if not button or not self.drives_scroll: | ||||
|                 return | ||||
|             # Ensure the button is visible in the scroll area | ||||
|             self.drives_scroll.ensureWidgetVisible(button, 50, 50) | ||||
|             logger.debug(f"Ensured button {button.text()} is visible in drives_scroll") | ||||
|         except Exception as e: | ||||
|             logger.error(f"Error ensuring button visible: {e}") | ||||
|  | ||||
|     def update_drives_list(self): | ||||
|         """Обновление списка смонтированных дисков""" | ||||
|         """Обновление списка смонтированных дисков и избранных папок.""" | ||||
|         for i in reversed(range(self.drives_layout.count())): | ||||
|             widget = self.drives_layout.itemAt(i).widget() | ||||
|             if widget: | ||||
|             item = self.drives_layout.itemAt(i) | ||||
|             if item and item.widget(): | ||||
|                 widget = item.widget() | ||||
|                 self.drives_layout.removeWidget(widget) | ||||
|                 widget.deleteLater() | ||||
|  | ||||
|         self.drive_buttons = [] | ||||
|         drives = self.get_mounted_drives() | ||||
|         self.drive_buttons = []  # Store buttons for navigation | ||||
|         favorite_folders = read_favorite_folders() | ||||
|  | ||||
|         # Добавляем смонтированные диски | ||||
|         for drive in drives: | ||||
|             drive_name = os.path.basename(drive) or drive.split('/')[-1] or drive | ||||
|             button = AutoSizeButton(drive_name, icon=self.theme_manager.get_icon("mount_point")) | ||||
|             button.setStyleSheet(self.theme.ACTION_BUTTON_STYLE) | ||||
|             button.setFocusPolicy(Qt.FocusPolicy.StrongFocus)  # Make button focusable | ||||
|             button.setFocusPolicy(Qt.FocusPolicy.StrongFocus) | ||||
|             button.clicked.connect(lambda checked, path=drive: self.change_drive(path)) | ||||
|             self.drives_layout.addWidget(button) | ||||
|             self.drive_buttons.append(button) | ||||
|         self.drives_layout.addStretch() | ||||
|  | ||||
|         # Set focus to first drive button if available | ||||
|         if self.drive_buttons: | ||||
|             self.drive_buttons[0].setFocus() | ||||
|         # Добавляем избранные папки | ||||
|         for folder in favorite_folders: | ||||
|             folder_name = os.path.basename(folder) or folder.split('/')[-1] or folder | ||||
|             button = AutoSizeButton(folder_name, icon=self.theme_manager.get_icon("folder")) | ||||
|             button.setStyleSheet(self.theme.ACTION_BUTTON_STYLE) | ||||
|             button.setFocusPolicy(Qt.FocusPolicy.StrongFocus) | ||||
|             button.clicked.connect(lambda checked, path=folder: self.change_drive(path)) | ||||
|             self.drives_layout.addWidget(button) | ||||
|             self.drive_buttons.append(button) | ||||
|  | ||||
|         # Добавляем растяжку, чтобы выровнять элементы | ||||
|         spacer = QWidget() | ||||
|         spacer.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred) | ||||
|         self.drives_layout.addWidget(spacer) | ||||
|  | ||||
|     def select_drive(self): | ||||
|         """Handle drive selection via gamepad""" | ||||
|         """Обрабатывает выбор диска или избранной папки через геймпад.""" | ||||
|         focused_widget = QApplication.focusWidget() | ||||
|         if isinstance(focused_widget, AutoSizeButton) and focused_widget in self.drive_buttons: | ||||
|             drive_path = None | ||||
|             for drive in self.get_mounted_drives(): | ||||
|                 drive_name = os.path.basename(drive) or drive.split('/')[-1] or drive | ||||
|                 if drive_name == focused_widget.text(): | ||||
|                     drive_path = drive | ||||
|                     break | ||||
|             if drive_path and os.path.isdir(drive_path) and os.access(drive_path, os.R_OK): | ||||
|                 self.current_path = os.path.normpath(drive_path) | ||||
|                 self.update_file_list() | ||||
|             else: | ||||
|                 logger.warning(f"Путь диска недоступен: {drive_path}") | ||||
|             drive_name = focused_widget.text().strip()  # Удаляем пробелы | ||||
|             logger.debug(f"Выбрано имя: {drive_name}") | ||||
|  | ||||
|             # Специальная обработка корневого каталога | ||||
|             if drive_name == "/": | ||||
|                 if os.path.isdir("/") and os.access("/", os.R_OK): | ||||
|                     self.current_path = "/" | ||||
|                     self.update_file_list() | ||||
|                     logger.info("Выбран корневой каталог: /") | ||||
|                     return | ||||
|                 else: | ||||
|                     logger.warning("Корневой каталог недоступен: недостаточно прав или ошибка пути") | ||||
|                     return | ||||
|  | ||||
|             # Проверяем избранные папки | ||||
|             favorite_folders = read_favorite_folders() | ||||
|             logger.debug(f"Избранные папки: {favorite_folders}") | ||||
|             for folder in favorite_folders: | ||||
|                 folder_name = os.path.basename(os.path.normpath(folder)) or folder  # Для корневых путей | ||||
|                 if folder_name == drive_name and os.path.isdir(folder) and os.access(folder, os.R_OK): | ||||
|                     self.current_path = os.path.normpath(folder) | ||||
|                     self.update_file_list() | ||||
|                     logger.info(f"Выбрана избранная папка: {self.current_path}") | ||||
|                     return | ||||
|  | ||||
|             # Проверяем смонтированные диски | ||||
|             mounted_drives = self.get_mounted_drives() | ||||
|             logger.debug(f"Смонтированные диски: {mounted_drives}") | ||||
|             for drive in mounted_drives: | ||||
|                 drive_basename = os.path.basename(os.path.normpath(drive)) or drive  # Для корневых путей | ||||
|                 if drive_basename == drive_name and os.path.isdir(drive) and os.access(drive, os.R_OK): | ||||
|                     self.current_path = os.path.normpath(drive) | ||||
|                     self.update_file_list() | ||||
|                     logger.info(f"Выбран смонтированный диск: {self.current_path}") | ||||
|                     return | ||||
|  | ||||
|             logger.warning(f"Путь недоступен: {drive_name}.") | ||||
|  | ||||
|     def change_drive(self, drive_path): | ||||
|         """Переход к выбранному диску""" | ||||
| @@ -449,6 +596,7 @@ class AddGameDialog(QDialog): | ||||
|         self.original_name = game_name | ||||
|         self.last_exe_path = exe_path  # Store last selected exe path | ||||
|         self.last_cover_path = cover_path  # Store last selected cover path | ||||
|         self.downloader = Downloader(max_workers=4)  # Initialize Downloader | ||||
|  | ||||
|         self.setWindowTitle(_("Edit Game") if edit_mode else _("Add Game")) | ||||
|         self.setModal(True) | ||||
| @@ -472,8 +620,7 @@ class AddGameDialog(QDialog): | ||||
|  | ||||
|         # Exe path | ||||
|         exe_label = QLabel(_("Path to Executable:")) | ||||
|         exe_label.setStyleSheet( | ||||
|             self.theme.PARAMS_TITLE_STYLE) | ||||
|         exe_label.setStyleSheet(self.theme.PARAMS_TITLE_STYLE) | ||||
|  | ||||
|         self.exeEdit = CustomLineEdit(self, theme=self.theme) | ||||
|         self.exeEdit.setStyleSheet(self.theme.ADDGAME_INPUT_STYLE) | ||||
| @@ -550,7 +697,7 @@ class AddGameDialog(QDialog): | ||||
|             exeBrowseButton.setFixedWidth(self.exeEdit.width()) | ||||
|             coverBrowseButton.setFixedWidth(self.coverEdit.width()) | ||||
|  | ||||
|         # Вызываем после отображения окна, когда размеры установлены, чтобы реально дождаться, когда всё сформируется | ||||
|         # Вызываем после отображения окна, когда размеры установлены | ||||
|         QTimer.singleShot(0, update_button_widths) | ||||
|  | ||||
|         # Обновляем превью, если в режиме редактирования | ||||
| @@ -615,15 +762,46 @@ class AddGameDialog(QDialog): | ||||
|         """Обработчик выбора файла обложки в FileExplorer""" | ||||
|         if file_path and os.path.splitext(file_path)[1].lower() in ('.png', '.jpg', '.jpeg', '.bmp'): | ||||
|             self.coverEdit.setText(file_path) | ||||
|             self.last_cover_path = file_path  # Update last selected cover path | ||||
|             self.last_cover_path = file_path | ||||
|             self.updatePreview() | ||||
|         else: | ||||
|             logger.warning(f"Selected file is not a valid image: {file_path}") | ||||
|  | ||||
|     def handleDownloadedCover(self, file_path): | ||||
|         """Handle the downloaded cover image and update the preview.""" | ||||
|         if file_path and os.path.isfile(file_path): | ||||
|             self.last_cover_path = file_path | ||||
|             pixmap = QPixmap(file_path) | ||||
|             if not pixmap.isNull(): | ||||
|                 self.coverPreview.setPixmap(pixmap.scaled(250, 250, Qt.AspectRatioMode.KeepAspectRatio)) | ||||
|             else: | ||||
|                 self.coverPreview.setText(_("Invalid image")) | ||||
|         else: | ||||
|             self.coverPreview.setText(_("Failed to download cover")) | ||||
|             logger.warning(f"Failed to download cover to {file_path}") | ||||
|  | ||||
|     def updatePreview(self): | ||||
|         """Update the cover preview image.""" | ||||
|         cover_path = self.coverEdit.text().strip() | ||||
|         exe_path = self.exeEdit.text().strip() | ||||
|         if cover_path and os.path.isfile(cover_path): | ||||
|  | ||||
|         # Check if cover_path is a URL | ||||
|         url_pattern = r'^https?://[^\s/$.?#].[^\s]*$' | ||||
|         if re.match(url_pattern, cover_path): | ||||
|             # Create a temporary file for the downloaded image | ||||
|             fd, local_path = tempfile.mkstemp(suffix=".png") | ||||
|             os.close(fd) | ||||
|             os.unlink(local_path) | ||||
|  | ||||
|             # Start asynchronous download | ||||
|             self.downloader.download_async( | ||||
|                 url=cover_path, | ||||
|                 local_path=local_path, | ||||
|                 timeout=10, | ||||
|                 callback=self.handleDownloadedCover | ||||
|             ) | ||||
|             self.coverPreview.setText(_("Downloading cover...")) | ||||
|         elif cover_path and os.path.isfile(cover_path): | ||||
|             pixmap = QPixmap(cover_path) | ||||
|             if not pixmap.isNull(): | ||||
|                 self.coverPreview.setPixmap(pixmap.scaled(250, 250, Qt.AspectRatioMode.KeepAspectRatio)) | ||||
| @@ -644,7 +822,10 @@ class AddGameDialog(QDialog): | ||||
|         exe_path = self.exeEdit.text().strip() | ||||
|         name = self.nameEdit.text().strip() | ||||
|  | ||||
|         if not exe_path or not name: | ||||
|         if not exe_path or not os.path.isfile(exe_path): | ||||
|             return None, None | ||||
|  | ||||
|         if not name: | ||||
|             return None, None | ||||
|  | ||||
|         portproton_path = get_portproton_location() | ||||
| @@ -666,8 +847,8 @@ class AddGameDialog(QDialog): | ||||
|  | ||||
|         os.makedirs(os.path.dirname(icon_path), exist_ok=True) | ||||
|  | ||||
|         # Generate thumbnail (128x128) from exe | ||||
|         if not generate_thumbnail(exe_path, icon_path, size=128): | ||||
|         # Generate thumbnail (128x128) from exe if no cover is provided | ||||
|         if not self.last_cover_path and not generate_thumbnail(exe_path, icon_path, size=128): | ||||
|             logger.error(f"Failed to generate thumbnail from exe: {exe_path}") | ||||
|             icon_path = ""  # Set empty icon if generation fails | ||||
|  | ||||
|   | ||||
| @@ -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: | ||||
| @@ -248,7 +255,8 @@ class Downloader(QObject): | ||||
|         """Get the latest legendary release info from GitHub API.""" | ||||
|         try: | ||||
|             api_url = "https://api.github.com/repos/derrod/legendary/releases/latest" | ||||
|             response = requests.get(api_url, timeout=10) | ||||
|             session = get_requests_session() | ||||
|             response = session.get(api_url, timeout=10) | ||||
|             response.raise_for_status() | ||||
|  | ||||
|             release_data = orjson.loads(response.content) | ||||
|   | ||||
| @@ -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) | ||||
| @@ -747,6 +845,11 @@ def _continue_loading_egs_games(legendary_path: str, callback: Callable[[list[tu | ||||
|     games: list[tuple] = [] | ||||
|     cache_dir.mkdir(parents=True, exist_ok=True) | ||||
|  | ||||
|     user_json_path = cache_dir / "user.json" | ||||
|     if not user_json_path.exists(): | ||||
|         callback(games) | ||||
|         return | ||||
|  | ||||
|     def process_games(installed_games: list | None): | ||||
|         if installed_games is None: | ||||
|             logger.info("No installed Epic Games Store games found") | ||||
| @@ -855,12 +958,12 @@ def _continue_loading_egs_games(legendary_path: str, callback: Callable[[list[tu | ||||
|                                         app_name, | ||||
|                                         f"legendary:launch:{app_name}", | ||||
|                                         "", | ||||
|                                         last_launch,  # Время последнего запуска | ||||
|                                         formatted_playtime,  # Форматированное время игры | ||||
|                                         protondb_tier,  # ProtonDB tier | ||||
|                                         last_launch, | ||||
|                                         formatted_playtime, | ||||
|                                         protondb_tier, | ||||
|                                         status or "", | ||||
|                                         last_launch_timestamp,  # Временная метка последнего запуска | ||||
|                                         playtime_seconds,  # Время игры в секундах | ||||
|                                         last_launch_timestamp, | ||||
|                                         playtime_seconds, | ||||
|                                         "epic" | ||||
|                                     ) | ||||
|                                     pending_images -= 1 | ||||
| @@ -880,7 +983,7 @@ def _continue_loading_egs_games(legendary_path: str, callback: Callable[[list[tu | ||||
|                     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 | ||||
|                     on_protondb_tier("") | ||||
|  | ||||
|             get_steam_apps_and_index_async(on_steam_apps) | ||||
|  | ||||
|   | ||||
| @@ -1,5 +1,5 @@ | ||||
| from PySide6.QtGui import QPainter, QPen, QColor, QConicalGradient, QBrush, QDesktopServices | ||||
| from PySide6.QtCore import QEasingCurve, Signal, Property, Qt, QPropertyAnimation, QByteArray, QUrl | ||||
| from PySide6.QtGui import QPainter, QColor, QDesktopServices | ||||
| from PySide6.QtCore import Signal, Property, Qt, QUrl | ||||
| from PySide6.QtWidgets import QFrame, QGraphicsDropShadowEffect, QVBoxLayout, QWidget, QStackedLayout, QLabel | ||||
| from collections.abc import Callable | ||||
| import portprotonqt.themes.standart.styles as default_styles | ||||
| @@ -9,28 +9,30 @@ from portprotonqt.config_utils import read_favorites, save_favorites, read_displ | ||||
| from portprotonqt.theme_manager import ThemeManager | ||||
| from portprotonqt.config_utils import read_theme_from_config | ||||
| from portprotonqt.custom_widgets import ClickableLabel | ||||
| import weakref | ||||
| from portprotonqt.portproton_api import PortProtonAPI | ||||
| from portprotonqt.downloader import Downloader | ||||
| from portprotonqt.animations import GameCardAnimations | ||||
| from typing import cast | ||||
|  | ||||
| class GameCard(QFrame): | ||||
|     borderWidthChanged = Signal() | ||||
|     gradientAngleChanged = Signal() | ||||
|     # Signals for context menu actions | ||||
|     editShortcutRequested = Signal(str, str, str) # name, exec_line, cover_path | ||||
|     deleteGameRequested = Signal(str, str)        # name, exec_line | ||||
|     addToMenuRequested = Signal(str, str)         # name, exec_line | ||||
|     removeFromMenuRequested = Signal(str)         # name | ||||
|     addToDesktopRequested = Signal(str, str)      # name, exec_line | ||||
|     removeFromDesktopRequested = Signal(str)      # name | ||||
|     addToSteamRequested = Signal(str, str, str)   # name, exec_line, cover_path | ||||
|     removeFromSteamRequested = Signal(str, str)   # name, exec_line | ||||
|     openGameFolderRequested = Signal(str, str)    # name, exec_line | ||||
|     scaleChanged = Signal() | ||||
|     editShortcutRequested = Signal(str, str, str) | ||||
|     deleteGameRequested = Signal(str, str) | ||||
|     addToMenuRequested = Signal(str, str) | ||||
|     removeFromMenuRequested = Signal(str) | ||||
|     addToDesktopRequested = Signal(str, str) | ||||
|     removeFromDesktopRequested = Signal(str) | ||||
|     addToSteamRequested = Signal(str, str, str) | ||||
|     removeFromSteamRequested = Signal(str, str) | ||||
|     openGameFolderRequested = Signal(str, str) | ||||
|     hoverChanged = Signal(str, bool) | ||||
|     focusChanged = Signal(str, bool) | ||||
|  | ||||
|     def __init__(self, name, description, cover_path, appid, controller_support, exec_line, | ||||
|                 last_launch, formatted_playtime, protondb_tier, anticheat_status, last_launch_ts, playtime_seconds, game_source, | ||||
|                 select_callback, theme=None, card_width=250, parent=None, context_menu_manager=None): | ||||
|                  last_launch, formatted_playtime, protondb_tier, anticheat_status, last_launch_ts, playtime_seconds, game_source, | ||||
|                  select_callback, theme=None, card_width=250, parent=None, context_menu_manager=None): | ||||
|         super().__init__(parent) | ||||
|         self.name = name | ||||
|         self.description = description | ||||
| @@ -45,7 +47,9 @@ class GameCard(QFrame): | ||||
|         self.game_source = game_source | ||||
|         self.last_launch_ts = last_launch_ts | ||||
|         self.playtime_seconds = playtime_seconds | ||||
|         self.card_width = card_width | ||||
|         self.base_card_width = card_width | ||||
|         self.base_pixmap = None | ||||
|         self.base_font_size = None | ||||
|  | ||||
|         self.select_callback = select_callback | ||||
|         self.context_menu_manager = context_menu_manager | ||||
| @@ -56,85 +60,53 @@ class GameCard(QFrame): | ||||
|  | ||||
|         self.display_filter = read_display_filter() | ||||
|         self.current_theme_name = read_theme_from_config() | ||||
|         self.downloader = Downloader(max_workers=4) | ||||
|         self.portproton_api = PortProtonAPI(self.downloader) | ||||
|  | ||||
|         self.steam_visible = (str(game_source).lower() == "steam" and self.display_filter in ("all", "favorites")) | ||||
|         self.egs_visible = (str(game_source).lower() == "epic" and self.display_filter in ("all", "favorites")) | ||||
|         self.portproton_visible = (str(game_source).lower() == "portproton" and self.display_filter in ("all", "favorites")) | ||||
|  | ||||
|         # Дополнительное пространство для анимации | ||||
|         extra_margin = 20 | ||||
|         self.setFixedSize(card_width + extra_margin, int(card_width * 1.6) + extra_margin) | ||||
|         self.base_extra_margin = 20 | ||||
|         self.setFocusPolicy(Qt.FocusPolicy.StrongFocus) | ||||
|         self.setStyleSheet(self.theme.GAME_CARD_WINDOW_STYLE) | ||||
|  | ||||
|         # Параметры анимации обводки | ||||
|         self._borderWidth = self.theme.GAME_CARD_ANIMATION["default_border_width"] | ||||
|         self._gradientAngle = self.theme.GAME_CARD_ANIMATION["gradient_start_angle"] | ||||
|         self._scale = self.theme.GAME_CARD_ANIMATION["default_scale"] | ||||
|         self._hovered = False | ||||
|         self._focused = False | ||||
|  | ||||
|         # Анимации | ||||
|         self.thickness_anim = QPropertyAnimation(self, QByteArray(b"borderWidth")) | ||||
|         self.thickness_anim.setDuration(self.theme.GAME_CARD_ANIMATION["thickness_anim_duration"]) | ||||
|         self.gradient_anim = None | ||||
|         self.pulse_anim = None | ||||
|         self.animations = GameCardAnimations(self, self.theme) | ||||
|         self.animations.setup_animations() | ||||
|  | ||||
|         # Флаг для отслеживания подключения слота startPulseAnimation | ||||
|         self._isPulseAnimationConnected = False | ||||
|         self.shadow = QGraphicsDropShadowEffect(self) | ||||
|         self.shadow.setBlurRadius(20) | ||||
|         self.shadow.setColor(QColor(0, 0, 0, 150)) | ||||
|         self.shadow.setOffset(0, 0) | ||||
|         self.setGraphicsEffect(self.shadow) | ||||
|  | ||||
|         # Тень | ||||
|         shadow = QGraphicsDropShadowEffect(self) | ||||
|         shadow.setBlurRadius(20) | ||||
|         shadow.setColor(QColor(0, 0, 0, 150)) | ||||
|         shadow.setOffset(0, 0) | ||||
|         self.setGraphicsEffect(shadow) | ||||
|         self.layout_ = QVBoxLayout(self) | ||||
|         self.layout_.setSpacing(5) | ||||
|         self.layout_.setContentsMargins(self.base_extra_margin // 2, self.base_extra_margin // 2, self.base_extra_margin // 2, self.base_extra_margin // 2) | ||||
|  | ||||
|         # Отступы | ||||
|         layout = QVBoxLayout(self) | ||||
|         layout.setContentsMargins(extra_margin // 2, extra_margin // 2, extra_margin // 2, extra_margin // 2) | ||||
|         layout.setSpacing(5) | ||||
|  | ||||
|         # Контейнер обложки | ||||
|         coverWidget = QWidget() | ||||
|         coverWidget.setFixedSize(card_width, int(card_width * 1.2)) | ||||
|         coverLayout = QStackedLayout(coverWidget) | ||||
|         self.coverWidget = QWidget() | ||||
|         coverLayout = QStackedLayout(self.coverWidget) | ||||
|         coverLayout.setContentsMargins(0, 0, 0, 0) | ||||
|         coverLayout.setStackingMode(QStackedLayout.StackingMode.StackAll) | ||||
|  | ||||
|         # Обложка | ||||
|         self.coverLabel = QLabel() | ||||
|         self.coverLabel.setFixedSize(card_width, int(card_width * 1.2)) | ||||
|         self.coverLabel.setStyleSheet(self.theme.COVER_LABEL_STYLE) | ||||
|         coverLayout.addWidget(self.coverLabel) | ||||
|  | ||||
|         # создаём слабую ссылку на label | ||||
|         label_ref = weakref.ref(self.coverLabel) | ||||
|         load_pixmap_async(cover_path or "", self.base_card_width, int(self.base_card_width * 1.5), self.on_cover_loaded) | ||||
|  | ||||
|         def on_cover_loaded(pixmap): | ||||
|             label = label_ref() | ||||
|             if label is None: | ||||
|                 return | ||||
|             label.setPixmap(round_corners(pixmap, 15)) | ||||
|  | ||||
|         # асинхронная загрузка обложки (пустая строка даст placeholder внутри load_pixmap_async) | ||||
|         load_pixmap_async(cover_path or "", card_width, int(card_width * 1.2), on_cover_loaded) | ||||
|  | ||||
|         # Значок избранного (звёздочка) в левом верхнем углу обложки | ||||
|         self.favoriteLabel = ClickableLabel(coverWidget) | ||||
|         self.favoriteLabel.setFixedSize(*self.theme.favoriteLabelSize) | ||||
|         self.favoriteLabel.move(8, 8) | ||||
|         self.favoriteLabel = ClickableLabel(self.coverWidget) | ||||
|         self.favoriteLabel.clicked.connect(self.toggle_favorite) | ||||
|         self.is_favorite = self.name in read_favorites() | ||||
|         self.update_favorite_icon() | ||||
|         self.favoriteLabel.raise_() | ||||
|  | ||||
|         # Определяем общие параметры для бейджей | ||||
|         badge_width = int(card_width * 2/3) | ||||
|         icon_size = int(card_width * 0.06)  # 6% от ширины карточки | ||||
|         icon_space = int(card_width * 0.012)  # 1.2% от ширины карточки | ||||
|         font_scale_factor = 0.06  # Шрифт будет 6% от card_width | ||||
|  | ||||
|         # ProtonDB бейдж | ||||
|         tier_text = self.getProtonDBText(protondb_tier) | ||||
|         if tier_text: | ||||
|             icon_filename = self.getProtonDBIconFilename(protondb_tier) | ||||
| @@ -142,67 +114,50 @@ class GameCard(QFrame): | ||||
|             self.protondbLabel = ClickableLabel( | ||||
|                 tier_text, | ||||
|                 icon=icon, | ||||
|                 parent=coverWidget, | ||||
|                 icon_size=icon_size, | ||||
|                 icon_space=icon_space, | ||||
|                 font_scale_factor=font_scale_factor | ||||
|                 parent=self.coverWidget, | ||||
|                 font_scale_factor=0.06 | ||||
|             ) | ||||
|             self.protondbLabel.setStyleSheet(self.theme.get_protondb_badge_style(protondb_tier)) | ||||
|             self.protondbLabel.setFixedWidth(badge_width) | ||||
|             self.protondbLabel.setCardWidth(card_width) | ||||
|         else: | ||||
|             self.protondbLabel = ClickableLabel("", parent=coverWidget, icon_size=icon_size, icon_space=icon_space) | ||||
|             self.protondbLabel.setFixedWidth(badge_width) | ||||
|             self.protondbLabel = ClickableLabel("", parent=self.coverWidget) | ||||
|             self.protondbLabel.setVisible(False) | ||||
|  | ||||
|         # Steam бейдж | ||||
|         steam_icon = self.theme_manager.get_icon("steam") | ||||
|         self.steamLabel = ClickableLabel( | ||||
|             "Steam", | ||||
|             icon=steam_icon, | ||||
|             parent=coverWidget, | ||||
|             icon_size=icon_size, | ||||
|             icon_space=icon_space, | ||||
|             font_scale_factor=font_scale_factor | ||||
|             parent=self.coverWidget, | ||||
|             font_scale_factor=0.06 | ||||
|         ) | ||||
|         self.steamLabel.setStyleSheet(self.theme.STEAM_BADGE_STYLE) | ||||
|         self.steamLabel.setFixedWidth(badge_width) | ||||
|         self.steamLabel.setCardWidth(card_width) | ||||
|         self.steamLabel.setVisible(self.steam_visible) | ||||
|  | ||||
|         # Epic Games Store бейдж | ||||
|         egs_icon = self.theme_manager.get_icon("epic_games") | ||||
|         self.egsLabel = ClickableLabel( | ||||
|             "Epic Games", | ||||
|             icon=egs_icon, | ||||
|             parent=coverWidget, | ||||
|             icon_size=icon_size, | ||||
|             icon_space=icon_space, | ||||
|             font_scale_factor=font_scale_factor, | ||||
|             parent=self.coverWidget, | ||||
|             font_scale_factor=0.06, | ||||
|             change_cursor=False | ||||
|         ) | ||||
|         self.egsLabel.setStyleSheet(self.theme.STEAM_BADGE_STYLE) | ||||
|         self.egsLabel.setFixedWidth(badge_width) | ||||
|         self.egsLabel.setCardWidth(card_width) | ||||
|         self.egsLabel.setVisible(self.egs_visible) | ||||
|  | ||||
|         # PortProton бейдж | ||||
|         portproton_icon = self.theme_manager.get_icon("ppqt-tray") | ||||
|         portproton_icon = self.theme_manager.get_icon("portproton") | ||||
|         self.portprotonLabel = ClickableLabel( | ||||
|             "PortProton", | ||||
|             icon=portproton_icon, | ||||
|             parent=coverWidget, | ||||
|             icon_size=icon_size, | ||||
|             icon_space=icon_space, | ||||
|             font_scale_factor=font_scale_factor, | ||||
|             change_cursor=False | ||||
|             parent=self.coverWidget, | ||||
|             font_scale_factor=0.06 | ||||
|         ) | ||||
|         self.portprotonLabel.setStyleSheet(self.theme.STEAM_BADGE_STYLE) | ||||
|         self.portprotonLabel.setFixedWidth(badge_width) | ||||
|         self.portprotonLabel.setCardWidth(card_width) | ||||
|         self.portprotonLabel.setVisible(self.portproton_visible) | ||||
|         self.portprotonLabel.clicked.connect(self.open_portproton_forum_topic) | ||||
|  | ||||
|         # WeAntiCheatYet бейдж | ||||
|         anticheat_text = self.getAntiCheatText(anticheat_status) | ||||
|         if anticheat_text: | ||||
|             icon_filename = self.getAntiCheatIconFilename(anticheat_status) | ||||
| @@ -210,40 +165,57 @@ class GameCard(QFrame): | ||||
|             self.anticheatLabel = ClickableLabel( | ||||
|                 anticheat_text, | ||||
|                 icon=icon, | ||||
|                 parent=coverWidget, | ||||
|                 icon_size=icon_size, | ||||
|                 icon_space=icon_space, | ||||
|                 font_scale_factor=font_scale_factor | ||||
|                 parent=self.coverWidget, | ||||
|                 font_scale_factor=0.06 | ||||
|             ) | ||||
|             self.anticheatLabel.setStyleSheet(self.theme.get_anticheat_badge_style(anticheat_status)) | ||||
|             self.anticheatLabel.setFixedWidth(badge_width) | ||||
|             self.anticheatLabel.setCardWidth(card_width) | ||||
|         else: | ||||
|             self.anticheatLabel = ClickableLabel("", parent=coverWidget, icon_size=icon_size, icon_space=icon_space) | ||||
|             self.anticheatLabel.setFixedWidth(badge_width) | ||||
|             self.anticheatLabel = ClickableLabel("", parent=self.coverWidget) | ||||
|             self.anticheatLabel.setVisible(False) | ||||
|  | ||||
|         # Расположение бейджей | ||||
|         self._position_badges(card_width) | ||||
|         self.protondbLabel.clicked.connect(self.open_protondb_report) | ||||
|         self.steamLabel.clicked.connect(self.open_steam_page) | ||||
|         self.anticheatLabel.clicked.connect(self.open_weanticheatyet_page) | ||||
|  | ||||
|         layout.addWidget(coverWidget) | ||||
|         self.layout_.addWidget(self.coverWidget) | ||||
|  | ||||
|         # Название игры | ||||
|         nameLabel = QLabel(name) | ||||
|         nameLabel.setAlignment(Qt.AlignmentFlag.AlignCenter) | ||||
|         nameLabel.setStyleSheet(self.theme.GAME_CARD_NAME_LABEL_STYLE) | ||||
|         layout.addWidget(nameLabel) | ||||
|         self.nameLabel = QLabel(name) | ||||
|         self.nameLabel.setAlignment(Qt.AlignmentFlag.AlignCenter) | ||||
|         self.nameLabel.setStyleSheet(self.theme.GAME_CARD_NAME_LABEL_STYLE) | ||||
|         self.layout_.addWidget(self.nameLabel) | ||||
|  | ||||
|     def _position_badges(self, card_width): | ||||
|         """Позиционирует бейджи на основе ширины карточки.""" | ||||
|         right_margin = 8 | ||||
|         badge_spacing = int(card_width * 0.02)  # 2% от ширины карточки | ||||
|         top_y = 10 | ||||
|         font_size = self.nameLabel.font().pointSizeF() | ||||
|         self.base_font_size = font_size if font_size > 0 else 10.0 | ||||
|  | ||||
|         self.update_scale() | ||||
|  | ||||
|         # Force initial layout update to ensure correct geometry | ||||
|         self.updateGeometry() | ||||
|         parent = self.parentWidget() | ||||
|         if parent: | ||||
|             layout = parent.layout() | ||||
|             if layout: | ||||
|                 layout.invalidate() | ||||
|             parent.updateGeometry() | ||||
|  | ||||
|     def on_cover_loaded(self, pixmap): | ||||
|         self.base_pixmap = pixmap | ||||
|         self.update_cover_pixmap() | ||||
|  | ||||
|     def update_cover_pixmap(self): | ||||
|         if self.base_pixmap: | ||||
|             scaled_width = int(self.base_card_width * self._scale) | ||||
|             scaled_pixmap = self.base_pixmap.scaled(scaled_width, int(scaled_width * 1.5), Qt.AspectRatioMode.KeepAspectRatioByExpanding, Qt.TransformationMode.SmoothTransformation) | ||||
|             rounded_pixmap = round_corners(scaled_pixmap, int(15 * self._scale)) | ||||
|             self.coverLabel.setPixmap(rounded_pixmap) | ||||
|  | ||||
|     def _position_badges(self, current_width): | ||||
|         right_margin = int(8 * self._scale) | ||||
|         badge_spacing = int(current_width * 0.02) | ||||
|         top_y = int(10 * self._scale) | ||||
|         badge_y_positions = [] | ||||
|         badge_width = int(card_width * 2/3) | ||||
|         badge_width = int(current_width * 2/3) | ||||
|  | ||||
|         badges = [ | ||||
|             (self.steam_visible, self.steamLabel), | ||||
| @@ -255,80 +227,99 @@ class GameCard(QFrame): | ||||
|  | ||||
|         for is_visible, badge in badges: | ||||
|             if is_visible: | ||||
|                 badge_x = card_width - badge_width - right_margin | ||||
|                 badge_x = current_width - badge_width - right_margin | ||||
|                 badge_y = badge_y_positions[-1] + badge_spacing if badge_y_positions else top_y | ||||
|                 badge.move(badge_x, badge_y) | ||||
|                 badge.move(int(badge_x), int(badge_y)) | ||||
|                 badge_y_positions.append(badge_y + badge.height()) | ||||
|  | ||||
|         # Поднимаем бейджи в правильном порядке (от нижнего к верхнему) | ||||
|         self.anticheatLabel.raise_() | ||||
|         self.protondbLabel.raise_() | ||||
|         self.portprotonLabel.raise_() | ||||
|         self.egsLabel.raise_() | ||||
|         self.steamLabel.raise_() | ||||
|  | ||||
|     def update_card_size(self, new_width: int): | ||||
|         """Обновляет размер карточки, обложки и бейджей.""" | ||||
|         self.card_width = new_width | ||||
|         extra_margin = 20 | ||||
|         self.setFixedSize(new_width + extra_margin, int(new_width * 1.6) + extra_margin) | ||||
|     def update_scale(self): | ||||
|         scaled_width = int(self.base_card_width * self._scale) | ||||
|         scaled_height = int(self.base_card_width * 1.8 * self._scale) | ||||
|         scaled_extra = int(self.base_extra_margin * self._scale) | ||||
|         self.setFixedSize(scaled_width + scaled_extra, scaled_height + scaled_extra) | ||||
|         self.layout_.setContentsMargins(scaled_extra // 2, scaled_extra // 2, scaled_extra // 2, scaled_extra // 2) | ||||
|  | ||||
|         if self.coverLabel is None: | ||||
|             return | ||||
|         self.coverWidget.setFixedSize(scaled_width, int(scaled_width * 1.5)) | ||||
|         self.coverLabel.setFixedSize(scaled_width, int(scaled_width * 1.5)) | ||||
|  | ||||
|         coverWidget = self.coverLabel.parentWidget() | ||||
|         if coverWidget is None: | ||||
|             return | ||||
|         self.update_cover_pixmap() | ||||
|  | ||||
|         coverWidget.setFixedSize(new_width, int(new_width * 1.2)) | ||||
|         self.coverLabel.setFixedSize(new_width, int(new_width * 1.2)) | ||||
|         favorite_size = (int(self.theme.favoriteLabelSize[0] * self._scale), int(self.theme.favoriteLabelSize[1] * self._scale)) | ||||
|         self.favoriteLabel.setFixedSize(*favorite_size) | ||||
|         self.favoriteLabel.move(int(8 * self._scale), int(8 * self._scale)) | ||||
|  | ||||
|         label_ref = weakref.ref(self.coverLabel) | ||||
|         def on_cover_loaded(pixmap): | ||||
|             label = label_ref() | ||||
|             if label: | ||||
|                 scaled_pixmap = pixmap.scaled(new_width, int(new_width * 1.2), Qt.AspectRatioMode.KeepAspectRatioByExpanding, Qt.TransformationMode.SmoothTransformation) | ||||
|                 rounded_pixmap = round_corners(scaled_pixmap, 15) | ||||
|                 label.setPixmap(rounded_pixmap) | ||||
|  | ||||
|         load_pixmap_async(self.cover_path or "", new_width, int(new_width * 1.2), on_cover_loaded) | ||||
|  | ||||
|         # Обновляем размеры и шрифты бейджей | ||||
|         badge_width = int(new_width * 2/3) | ||||
|         icon_size = int(new_width * 0.06) | ||||
|         icon_space = int(new_width * 0.012) | ||||
|         badge_width = int(scaled_width * 2/3) | ||||
|         icon_size = int(scaled_width * 0.06) | ||||
|         icon_space = int(scaled_width * 0.012) | ||||
|         for label in [self.steamLabel, self.egsLabel, self.portprotonLabel, self.protondbLabel, self.anticheatLabel]: | ||||
|             if label is not None: | ||||
|                 label.setFixedWidth(badge_width) | ||||
|                 label.setIconSize(icon_size, icon_space) | ||||
|                 label.setCardWidth(new_width)  # Пересчитываем размер шрифта | ||||
|                 label.setCardWidth(scaled_width) | ||||
|  | ||||
|         # Перепозиционируем бейджи | ||||
|         self._position_badges(new_width) | ||||
|         self._position_badges(scaled_width) | ||||
|  | ||||
|         if self.base_font_size is not None: | ||||
|             font = self.nameLabel.font() | ||||
|             new_font_size = self.base_font_size * self._scale | ||||
|             if new_font_size > 0: | ||||
|                 font.setPointSizeF(new_font_size) | ||||
|                 self.nameLabel.setFont(font) | ||||
|  | ||||
|         self.shadow.setBlurRadius(int(20 * self._scale)) | ||||
|  | ||||
|         self.updateGeometry() | ||||
|         self.update() | ||||
|  | ||||
|         # Ensure parent layout is updated safely | ||||
|         parent = self.parentWidget() | ||||
|         if parent: | ||||
|             layout = parent.layout() | ||||
|             if layout: | ||||
|                 layout.invalidate() | ||||
|                 layout.activate() | ||||
|                 layout.update() | ||||
|             parent.updateGeometry() | ||||
|  | ||||
|     def update_card_size(self, new_width: int): | ||||
|         self.base_card_width = new_width | ||||
|         load_pixmap_async(self.cover_path or "", new_width, int(new_width * 1.5), self.on_cover_loaded) | ||||
|         self.update_scale() | ||||
|  | ||||
|     def update_badge_visibility(self, display_filter: str): | ||||
|         """Обновляет видимость бейджей на основе display_filter.""" | ||||
|         self.display_filter = display_filter | ||||
|         self.steam_visible = (str(self.game_source).lower() == "steam" and display_filter in ("all", "favorites")) | ||||
|         self.egs_visible = (str(self.game_source).lower() == "epic" and display_filter in ("all", "favorites")) | ||||
|         self.portproton_visible = (str(self.game_source).lower() == "portproton" and display_filter in ("all", "favorites")) | ||||
|         self.steam_visible = (str(self.game_source).lower() == "steam" and self.display_filter in ("all", "favorites")) | ||||
|         self.egs_visible = (str(self.game_source).lower() == "epic" and self.display_filter in ("all", "favorites")) | ||||
|         self.portproton_visible = (str(self.game_source).lower() == "portproton" and self.display_filter in ("all", "favorites")) | ||||
|         protondb_visible = bool(self.getProtonDBText(self.protondb_tier)) | ||||
|         anticheat_visible = bool(self.getAntiCheatText(self.anticheat_status)) | ||||
|  | ||||
|         # Обновляем видимость бейджей | ||||
|         self.steamLabel.setVisible(self.steam_visible) | ||||
|         self.egsLabel.setVisible(self.egs_visible) | ||||
|         self.portprotonLabel.setVisible(self.portproton_visible) | ||||
|         self.protondbLabel.setVisible(protondb_visible) | ||||
|         self.anticheatLabel.setVisible(anticheat_visible) | ||||
|  | ||||
|         # Перепозиционируем бейджи | ||||
|         self._position_badges(self.card_width) | ||||
|         scaled_width = int(self.base_card_width * self._scale) | ||||
|         self._position_badges(scaled_width) | ||||
|  | ||||
|         # Update layout after visibility changes | ||||
|         self.updateGeometry() | ||||
|         parent = self.parentWidget() | ||||
|         if parent: | ||||
|             layout = parent.layout() | ||||
|             if layout: | ||||
|                 layout.invalidate() | ||||
|                 layout.update() | ||||
|             parent.updateGeometry() | ||||
|  | ||||
|     def _show_context_menu(self, pos): | ||||
|         """Delegate context menu display to ContextMenuManager.""" | ||||
|         if self.context_menu_manager: | ||||
|             self.context_menu_manager.show_context_menu(self, pos) | ||||
|  | ||||
| @@ -385,6 +376,15 @@ class GameCard(QFrame): | ||||
|             return "broken" | ||||
|         return "" | ||||
|  | ||||
|     def open_portproton_forum_topic(self): | ||||
|         result = self.portproton_api.get_forum_topic_slug(self.name) | ||||
|         base_url = "https://linux-gaming.ru/" | ||||
|         if result.startswith("search?q="): | ||||
|             url = QUrl(f"{base_url}{result}") | ||||
|         else: | ||||
|             url = QUrl(f"{base_url}t/{result}") | ||||
|         QDesktopServices.openUrl(url) | ||||
|  | ||||
|     def open_protondb_report(self): | ||||
|         url = QUrl(f"https://www.protondb.com/app/{self.appid}") | ||||
|         QDesktopServices.openUrl(url) | ||||
| @@ -436,138 +436,37 @@ class GameCard(QFrame): | ||||
|             self.gradientAngleChanged.emit() | ||||
|             self.update() | ||||
|  | ||||
|     def getScale(self) -> float: | ||||
|         return self._scale | ||||
|  | ||||
|     def setScale(self, value: float): | ||||
|         if self._scale != value: | ||||
|             self._scale = value | ||||
|             self.update_scale() | ||||
|             self.scaleChanged.emit() | ||||
|  | ||||
|     borderWidth = Property(int, getBorderWidth, setBorderWidth, None, "", notify=cast(Callable[[], None], borderWidthChanged)) | ||||
|     gradientAngle = Property(float, getGradientAngle, setGradientAngle, None, "", notify=cast(Callable[[], None], gradientAngleChanged)) | ||||
|     scale = Property(float, getScale, setScale, None, "", notify=cast(Callable[[], None], scaleChanged)) | ||||
|  | ||||
|     def paintEvent(self, event): | ||||
|         super().paintEvent(event) | ||||
|         painter = QPainter(self) | ||||
|         painter.setRenderHint(QPainter.RenderHint.Antialiasing) | ||||
|  | ||||
|         pen = QPen() | ||||
|         pen.setWidth(self._borderWidth) | ||||
|         if self._hovered or self._focused: | ||||
|             center = self.rect().center() | ||||
|             gradient = QConicalGradient(center, self._gradientAngle) | ||||
|             for stop in self.theme.GAME_CARD_ANIMATION["gradient_colors"]: | ||||
|                 gradient.setColorAt(stop["position"], QColor(stop["color"])) | ||||
|             pen.setBrush(QBrush(gradient)) | ||||
|         else: | ||||
|             pen.setColor(QColor(0, 0, 0, 0)) | ||||
|  | ||||
|         painter.setPen(pen) | ||||
|         radius = 18 | ||||
|         bw = round(self._borderWidth / 2) | ||||
|         rect = self.rect().adjusted(bw, bw, -bw, -bw) | ||||
|         painter.drawRoundedRect(rect, radius, radius) | ||||
|  | ||||
|     def startPulseAnimation(self): | ||||
|         if not (self._hovered or self._focused): | ||||
|             return | ||||
|         if self.pulse_anim: | ||||
|             self.pulse_anim.stop() | ||||
|         self.pulse_anim = QPropertyAnimation(self, QByteArray(b"borderWidth")) | ||||
|         self.pulse_anim.setDuration(self.theme.GAME_CARD_ANIMATION["pulse_anim_duration"]) | ||||
|         self.pulse_anim.setLoopCount(0) | ||||
|         self.pulse_anim.setKeyValueAt(0, self.theme.GAME_CARD_ANIMATION["pulse_min_border_width"]) | ||||
|         self.pulse_anim.setKeyValueAt(0.5, self.theme.GAME_CARD_ANIMATION["pulse_max_border_width"]) | ||||
|         self.pulse_anim.setKeyValueAt(1, self.theme.GAME_CARD_ANIMATION["pulse_min_border_width"]) | ||||
|         self.pulse_anim.start() | ||||
|         self.animations.paint_border(QPainter(self)) | ||||
|  | ||||
|     def enterEvent(self, event): | ||||
|         self._hovered = True | ||||
|         self.hoverChanged.emit(self.name, True) | ||||
|         self.setFocus(Qt.FocusReason.MouseFocusReason) | ||||
|  | ||||
|         self.thickness_anim.stop() | ||||
|         if self._isPulseAnimationConnected: | ||||
|             self.thickness_anim.finished.disconnect(self.startPulseAnimation) | ||||
|             self._isPulseAnimationConnected = False | ||||
|         self.thickness_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["thickness_easing_curve"]])) | ||||
|         self.thickness_anim.setStartValue(self._borderWidth) | ||||
|         self.thickness_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["hover_border_width"]) | ||||
|         self.thickness_anim.finished.connect(self.startPulseAnimation) | ||||
|         self._isPulseAnimationConnected = True | ||||
|         self.thickness_anim.start() | ||||
|  | ||||
|         if self.gradient_anim: | ||||
|             self.gradient_anim.stop() | ||||
|         self.gradient_anim = QPropertyAnimation(self, QByteArray(b"gradientAngle")) | ||||
|         self.gradient_anim.setDuration(self.theme.GAME_CARD_ANIMATION["gradient_anim_duration"]) | ||||
|         self.gradient_anim.setStartValue(self.theme.GAME_CARD_ANIMATION["gradient_start_angle"]) | ||||
|         self.gradient_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["gradient_end_angle"]) | ||||
|         self.gradient_anim.setLoopCount(-1) | ||||
|         self.gradient_anim.start() | ||||
|  | ||||
|         self.animations.handle_enter_event() | ||||
|         super().enterEvent(event) | ||||
|  | ||||
|     def leaveEvent(self, event): | ||||
|         self._hovered = False | ||||
|         self.hoverChanged.emit(self.name, False) | ||||
|         if not self._focused: | ||||
|             if self.gradient_anim: | ||||
|                 self.gradient_anim.stop() | ||||
|                 self.gradient_anim = None | ||||
|             if self.pulse_anim: | ||||
|                 self.pulse_anim.stop() | ||||
|                 self.pulse_anim = None | ||||
|             if self.thickness_anim: | ||||
|                 self.thickness_anim.stop() | ||||
|             if self._isPulseAnimationConnected: | ||||
|                 self.thickness_anim.finished.disconnect(self.startPulseAnimation) | ||||
|                 self._isPulseAnimationConnected = False | ||||
|             self.thickness_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["thickness_easing_curve_out"]])) | ||||
|             self.thickness_anim.setStartValue(self._borderWidth) | ||||
|             self.thickness_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["default_border_width"]) | ||||
|             self.thickness_anim.start() | ||||
|         self.animations.handle_leave_event() | ||||
|         super().leaveEvent(event) | ||||
|  | ||||
|     def focusInEvent(self, event): | ||||
|         if not self._hovered: | ||||
|             self._focused = True | ||||
|             self.focusChanged.emit(self.name, True) | ||||
|  | ||||
|             self.thickness_anim.stop() | ||||
|             if self._isPulseAnimationConnected: | ||||
|                 self.thickness_anim.finished.disconnect(self.startPulseAnimation) | ||||
|                 self._isPulseAnimationConnected = False | ||||
|             self.thickness_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["thickness_easing_curve"]])) | ||||
|             self.thickness_anim.setStartValue(self._borderWidth) | ||||
|             self.thickness_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["focus_border_width"]) | ||||
|             self.thickness_anim.finished.connect(self.startPulseAnimation) | ||||
|             self._isPulseAnimationConnected = True | ||||
|             self.thickness_anim.start() | ||||
|  | ||||
|             if self.gradient_anim: | ||||
|                 self.gradient_anim.stop() | ||||
|             self.gradient_anim = QPropertyAnimation(self, QByteArray(b"gradientAngle")) | ||||
|             self.gradient_anim.setDuration(self.theme.GAME_CARD_ANIMATION["gradient_anim_duration"]) | ||||
|             self.gradient_anim.setStartValue(self.theme.GAME_CARD_ANIMATION["gradient_start_angle"]) | ||||
|             self.gradient_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["gradient_end_angle"]) | ||||
|             self.gradient_anim.setLoopCount(-1) | ||||
|             self.gradient_anim.start() | ||||
|  | ||||
|         self.animations.handle_focus_in_event() | ||||
|         super().focusInEvent(event) | ||||
|  | ||||
|     def focusOutEvent(self, event): | ||||
|         self._focused = False | ||||
|         self.focusChanged.emit(self.name, False) | ||||
|         if not self._hovered: | ||||
|             if self.gradient_anim: | ||||
|                 self.gradient_anim.stop() | ||||
|                 self.gradient_anim = None | ||||
|             if self.pulse_anim: | ||||
|                 self.pulse_anim.stop() | ||||
|                 self.pulse_anim = None | ||||
|             if self.thickness_anim: | ||||
|                 self.thickness_anim.stop() | ||||
|             if self._isPulseAnimationConnected: | ||||
|                 self.thickness_anim.finished.disconnect(self.startPulseAnimation) | ||||
|                 self._isPulseAnimationConnected = False | ||||
|             self.thickness_anim.setEasingCurve(QEasingCurve(QEasingCurve.Type[self.theme.GAME_CARD_ANIMATION["thickness_easing_curve_out"]])) | ||||
|             self.thickness_anim.setStartValue(self._borderWidth) | ||||
|             self.thickness_anim.setEndValue(self.theme.GAME_CARD_ANIMATION["default_border_width"]) | ||||
|             self.thickness_anim.start() | ||||
|         self.animations.handle_focus_out_event() | ||||
|         super().focusOutEvent(event) | ||||
|  | ||||
|     def mousePressEvent(self, event): | ||||
| @@ -587,6 +486,7 @@ class GameCard(QFrame): | ||||
|             ) | ||||
|         super().mousePressEvent(event) | ||||
|  | ||||
|  | ||||
|     def keyPressEvent(self, event): | ||||
|         if event.key() in (Qt.Key.Key_Return, Qt.Key.Key_Enter): | ||||
|             self.select_callback( | ||||
|   | ||||
							
								
								
									
										373
									
								
								portprotonqt/howlongtobeat_api.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,373 @@ | ||||
| import orjson | ||||
| import re | ||||
| import os | ||||
| from dataclasses import dataclass, field | ||||
| from typing import Any | ||||
| from difflib import SequenceMatcher | ||||
| from threading import Thread | ||||
| import requests | ||||
| from bs4 import BeautifulSoup, Tag | ||||
| from portprotonqt.config_utils import read_proxy_config | ||||
| from portprotonqt.time_utils import format_playtime | ||||
| from PySide6.QtCore import QObject, Signal | ||||
|  | ||||
| @dataclass | ||||
| class GameEntry: | ||||
|     """Информация об игре из HowLongToBeat.""" | ||||
|     game_id: int = -1 | ||||
|     game_name: str | None = None | ||||
|     main_story: float | None = None | ||||
|     main_extra: float | None = None | ||||
|     completionist: float | None = None | ||||
|     similarity: float = -1.0 | ||||
|     raw_data: dict[str, Any] = field(default_factory=dict) | ||||
|  | ||||
| @dataclass | ||||
| class SearchConfig: | ||||
|     """Конфигурация для поиска.""" | ||||
|     api_key: str | None = None | ||||
|     search_url: str | None = None | ||||
|  | ||||
| class APIKeyExtractor: | ||||
|     """Извлекает API ключ и URL поиска из скриптов сайта.""" | ||||
|     @staticmethod | ||||
|     def extract_from_script(script_content: str) -> SearchConfig: | ||||
|         config = SearchConfig() | ||||
|         config.api_key = APIKeyExtractor._extract_api_key(script_content) | ||||
|         config.search_url = APIKeyExtractor._extract_search_url(script_content, config.api_key) | ||||
|         return config | ||||
|  | ||||
|     @staticmethod | ||||
|     def _extract_api_key(script_content: str) -> str | None: | ||||
|         user_id_pattern = r'users\s*:\s*{\s*id\s*:\s*"([^"]+)"' | ||||
|         matches = re.findall(user_id_pattern, script_content) | ||||
|         if matches: | ||||
|             return ''.join(matches) | ||||
|         concat_pattern = r'\/api\/\w+\/"(?:\.concat\("[^"]*"\))+' | ||||
|         matches = re.findall(concat_pattern, script_content) | ||||
|         if matches: | ||||
|             parts = str(matches).split('.concat') | ||||
|             cleaned_parts = [re.sub(r'["\(\)\[\]\']', '', part) for part in parts[1:]] | ||||
|             return ''.join(cleaned_parts) | ||||
|         return None | ||||
|  | ||||
|     @staticmethod | ||||
|     def _extract_search_url(script_content: str, api_key: str | None) -> str | None: | ||||
|         if not api_key: | ||||
|             return None | ||||
|         pattern = re.compile( | ||||
|             r'fetch\(\s*["\'](\/api\/[^"\']*)["\']' | ||||
|             r'((?:\s*\.concat\(\s*["\']([^"\']*)["\']\s*\))+)' | ||||
|             r'\s*,', | ||||
|             re.DOTALL | ||||
|         ) | ||||
|         for match in pattern.finditer(script_content): | ||||
|             endpoint = match.group(1) | ||||
|             concat_calls = match.group(2) | ||||
|             concat_strings = re.findall(r'\.concat\(\s*["\']([^"\']*)["\']\s*\)', concat_calls) | ||||
|             concatenated_str = ''.join(concat_strings) | ||||
|             if concatenated_str == api_key: | ||||
|                 return endpoint | ||||
|         return None | ||||
|  | ||||
| class HTTPClient: | ||||
|     """HTTP клиент для работы с API HowLongToBeat.""" | ||||
|     BASE_URL = 'https://howlongtobeat.com/' | ||||
|     SEARCH_URL = BASE_URL + "api/s/" | ||||
|  | ||||
|     def __init__(self, timeout: int = 60): | ||||
|         self.timeout = timeout | ||||
|         self.session = requests.Session() | ||||
|         self.session.headers.update({ | ||||
|             'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36', | ||||
|             'referer': self.BASE_URL | ||||
|         }) | ||||
|         proxy_config = read_proxy_config() | ||||
|         if proxy_config: | ||||
|             self.session.proxies.update(proxy_config) | ||||
|  | ||||
|     def get_search_config(self, parse_all_scripts: bool = False) -> SearchConfig | None: | ||||
|         try: | ||||
|             response = self.session.get(self.BASE_URL, timeout=self.timeout) | ||||
|             response.raise_for_status() | ||||
|             soup = BeautifulSoup(response.text, 'html.parser') | ||||
|             scripts = soup.find_all('script', src=True) | ||||
|             script_urls = [] | ||||
|             for script in scripts: | ||||
|                 if isinstance(script, Tag): | ||||
|                     src = script.get('src') | ||||
|                     if src is not None and isinstance(src, str): | ||||
|                         if parse_all_scripts or '_app-' in src: | ||||
|                             script_urls.append(src) | ||||
|             for script_url in script_urls: | ||||
|                 full_url = self.BASE_URL + script_url | ||||
|                 script_response = self.session.get(full_url, timeout=self.timeout) | ||||
|                 if script_response.status_code == 200: | ||||
|                     config = APIKeyExtractor.extract_from_script(script_response.text) | ||||
|                     if config.api_key: | ||||
|                         return config | ||||
|         except requests.RequestException: | ||||
|             pass | ||||
|         return None | ||||
|  | ||||
|     def search_games(self, game_name: str, page: int = 1, config: SearchConfig | None = None) -> str | None: | ||||
|         if not config: | ||||
|             config = self.get_search_config() | ||||
|             if not config: | ||||
|                 config = self.get_search_config(parse_all_scripts=True) | ||||
|         if not config or not config.api_key: | ||||
|             return None | ||||
|         search_url = self.SEARCH_URL | ||||
|         if config.search_url: | ||||
|             search_url = self.BASE_URL + config.search_url.lstrip('/') | ||||
|         payload = self._build_search_payload(game_name, page, config) | ||||
|         headers = { | ||||
|             'content-type': 'application/json', | ||||
|             'accept': '*/*' | ||||
|         } | ||||
|         try: | ||||
|             response = self.session.post( | ||||
|                 search_url + config.api_key, | ||||
|                 headers=headers, | ||||
|                 data=orjson.dumps(payload), | ||||
|                 timeout=self.timeout | ||||
|             ) | ||||
|             if response.status_code == 200: | ||||
|                 return response.text | ||||
|         except requests.RequestException: | ||||
|             pass | ||||
|         try: | ||||
|             response = self.session.post( | ||||
|                 search_url, | ||||
|                 headers=headers, | ||||
|                 data=orjson.dumps(payload), | ||||
|                 timeout=self.timeout | ||||
|             ) | ||||
|             if response.status_code == 200: | ||||
|                 return response.text | ||||
|         except requests.RequestException: | ||||
|             pass | ||||
|         return None | ||||
|  | ||||
|     def _build_search_payload(self, game_name: str, page: int, config: SearchConfig) -> dict[str, Any]: | ||||
|         payload = { | ||||
|             'searchType': "games", | ||||
|             'searchTerms': game_name.split(), | ||||
|             'searchPage': page, | ||||
|             'size': 1,  # Limit to 1 result | ||||
|             'searchOptions': { | ||||
|                 'games': { | ||||
|                     'userId': 0, | ||||
|                     'platform': "", | ||||
|                     'sortCategory': "popular", | ||||
|                     'rangeCategory': "main", | ||||
|                     'rangeTime': {'min': 0, 'max': 0}, | ||||
|                     'gameplay': { | ||||
|                         'perspective': "", | ||||
|                         'flow': "", | ||||
|                         'genre': "", | ||||
|                         "difficulty": "" | ||||
|                     }, | ||||
|                     'rangeYear': {'max': "", 'min': ""}, | ||||
|                     'modifier': ""  # Hardcoded to empty string for SearchModifiers.NONE | ||||
|                 }, | ||||
|                 'users': {'sortCategory': "postcount"}, | ||||
|                 'lists': {'sortCategory': "follows"}, | ||||
|                 'filter': "", | ||||
|                 'sort': 0, | ||||
|                 'randomizer': 0 | ||||
|             }, | ||||
|             'useCache': True, | ||||
|             'fields': ["game_id", "game_name", "comp_main", "comp_plus", "comp_100"]  # Request only needed fields | ||||
|         } | ||||
|         if config.api_key: | ||||
|             payload['searchOptions']['users']['id'] = config.api_key | ||||
|         return payload | ||||
|  | ||||
| class ResultParser: | ||||
|     """Парсер результатов поиска.""" | ||||
|     def __init__(self, search_query: str, minimum_similarity: float = 0.4, case_sensitive: bool = True): | ||||
|         self.search_query = search_query | ||||
|         self.minimum_similarity = minimum_similarity | ||||
|         self.case_sensitive = case_sensitive | ||||
|         self.search_numbers = self._extract_numbers(search_query) | ||||
|  | ||||
|     def parse_results(self, json_response: str, target_game_id: int | None = None) -> list[GameEntry]: | ||||
|         try: | ||||
|             data = orjson.loads(json_response) | ||||
|             games = [] | ||||
|             # Only process the first result | ||||
|             if data.get("data"): | ||||
|                 game_data = data["data"][0] | ||||
|                 game = self._parse_game_entry(game_data) | ||||
|                 if target_game_id is not None: | ||||
|                     if game.game_id == target_game_id: | ||||
|                         games.append(game) | ||||
|                 elif self.minimum_similarity == 0.0 or game.similarity >= self.minimum_similarity: | ||||
|                     games.append(game) | ||||
|             return games | ||||
|         except (orjson.JSONDecodeError, KeyError, IndexError): | ||||
|             return [] | ||||
|  | ||||
|     def _parse_game_entry(self, game_data: dict[str, Any]) -> GameEntry: | ||||
|         game = GameEntry() | ||||
|         game.game_id = game_data.get("game_id", -1) | ||||
|         game.game_name = game_data.get("game_name") | ||||
|         game.raw_data = game_data | ||||
|         time_fields = [ | ||||
|             ("comp_main", "main_story"), | ||||
|             ("comp_plus", "main_extra"), | ||||
|             ("comp_100", "completionist") | ||||
|         ] | ||||
|         all_zero = all(game_data.get(json_field, 0) == 0 for json_field, _ in time_fields) | ||||
|         for json_field, attr_name in time_fields: | ||||
|             if json_field in game_data: | ||||
|                 time_seconds = game_data[json_field] | ||||
|                 time_hours = None if all_zero else round(time_seconds / 3600, 2) | ||||
|                 setattr(game, attr_name, time_hours) | ||||
|         game.similarity = self._calculate_similarity(game) | ||||
|         return game | ||||
|  | ||||
|     def _calculate_similarity(self, game: GameEntry) -> float: | ||||
|         return self._compare_strings(self.search_query, game.game_name) | ||||
|  | ||||
|     def _compare_strings(self, a: str | None, b: str | None) -> float: | ||||
|         if not a or not b: | ||||
|             return 0.0 | ||||
|         if self.case_sensitive: | ||||
|             similarity = SequenceMatcher(None, a, b).ratio() | ||||
|         else: | ||||
|             similarity = SequenceMatcher(None, a.lower(), b.lower()).ratio() | ||||
|         if self.search_numbers and not self._contains_numbers(b, self.search_numbers): | ||||
|             similarity -= 0.1 | ||||
|         return max(0.0, similarity) | ||||
|  | ||||
|     @staticmethod | ||||
|     def _extract_numbers(text: str) -> list[str]: | ||||
|         return [word for word in text.split() if word.isdigit()] | ||||
|  | ||||
|     @staticmethod | ||||
|     def _contains_numbers(text: str, numbers: list[str]) -> bool: | ||||
|         if not numbers: | ||||
|             return True | ||||
|         cleaned_text = re.sub(r'([^\s\w]|_)+', '', text) | ||||
|         text_numbers = [word for word in cleaned_text.split() if word.isdigit()] | ||||
|         return any(num in text_numbers for num in numbers) | ||||
|  | ||||
| def get_cache_dir(): | ||||
|     """Возвращает путь к каталогу кэша, создаёт его при необходимости.""" | ||||
|     xdg_cache_home = os.getenv("XDG_CACHE_HOME", os.path.join(os.path.expanduser("~"), ".cache")) | ||||
|     cache_dir = os.path.join(xdg_cache_home, "PortProtonQt") | ||||
|     os.makedirs(cache_dir, exist_ok=True) | ||||
|     return cache_dir | ||||
|  | ||||
| class HowLongToBeat(QObject): | ||||
|     """Основной класс для работы с API HowLongToBeat.""" | ||||
|     searchCompleted = Signal(list) | ||||
|  | ||||
|     def __init__(self, minimum_similarity: float = 0.4, timeout: int = 60, parent=None): | ||||
|         super().__init__(parent) | ||||
|         self.minimum_similarity = minimum_similarity | ||||
|         self.http_client = HTTPClient(timeout) | ||||
|         self.cache_dir = get_cache_dir() | ||||
|  | ||||
|     def _get_cache_file_path(self, game_name: str) -> str: | ||||
|         """Возвращает путь к файлу кэша для заданного имени игры.""" | ||||
|         safe_game_name = re.sub(r'[^\w\s-]', '', game_name).replace(' ', '_').lower() | ||||
|         cache_file = f"hltb_{safe_game_name}.json" | ||||
|         return os.path.join(self.cache_dir, cache_file) | ||||
|  | ||||
|     def _load_from_cache(self, game_name: str) -> str | None: | ||||
|         """Пытается загрузить данные из кэша, если они существуют.""" | ||||
|         cache_file = self._get_cache_file_path(game_name) | ||||
|         try: | ||||
|             if os.path.exists(cache_file): | ||||
|                 with open(cache_file, 'rb') as f: | ||||
|                     return f.read().decode('utf-8') | ||||
|         except (OSError, UnicodeDecodeError): | ||||
|             pass | ||||
|         return None | ||||
|  | ||||
|     def _save_to_cache(self, game_name: str, json_response: str): | ||||
|         """Сохраняет данные в кэш, храня только первую игру и необходимые поля.""" | ||||
|         cache_file = self._get_cache_file_path(game_name) | ||||
|         try: | ||||
|             # Парсим JSON и берем только первую игру | ||||
|             data = orjson.loads(json_response) | ||||
|             if data.get("data"): | ||||
|                 first_game = data["data"][0] | ||||
|                 simplified_data = { | ||||
|                     "data": [{ | ||||
|                         "game_id": first_game.get("game_id", -1), | ||||
|                         "game_name": first_game.get("game_name"), | ||||
|                         "comp_main": first_game.get("comp_main", 0), | ||||
|                         "comp_plus": first_game.get("comp_plus", 0), | ||||
|                         "comp_100": first_game.get("comp_100", 0) | ||||
|                     }] | ||||
|                 } | ||||
|                 with open(cache_file, 'wb') as f: | ||||
|                     f.write(orjson.dumps(simplified_data)) | ||||
|         except (OSError, orjson.JSONDecodeError, IndexError): | ||||
|             pass | ||||
|  | ||||
|     def search(self, game_name: str, case_sensitive: bool = True) -> list[GameEntry] | None: | ||||
|         if not game_name or not game_name.strip(): | ||||
|             return None | ||||
|         # Проверяем кэш | ||||
|         cached_response = self._load_from_cache(game_name) | ||||
|         if cached_response: | ||||
|             try: | ||||
|                 cached_data = orjson.loads(cached_response) | ||||
|                 full_json = { | ||||
|                     "data": [ | ||||
|                         { | ||||
|                             "game_id": game["game_id"], | ||||
|                             "game_name": game["game_name"], | ||||
|                             "comp_main": game["comp_main"], | ||||
|                             "comp_plus": game["comp_plus"], | ||||
|                             "comp_100": game["comp_100"] | ||||
|                         } | ||||
|                         for game in cached_data.get("data", []) | ||||
|                     ] | ||||
|                 } | ||||
|                 parser = ResultParser( | ||||
|                     game_name, | ||||
|                     self.minimum_similarity, | ||||
|                     case_sensitive | ||||
|                 ) | ||||
|                 return parser.parse_results(orjson.dumps(full_json).decode('utf-8')) | ||||
|             except orjson.JSONDecodeError: | ||||
|                 pass | ||||
|         # Если нет в кэше, делаем запрос | ||||
|         json_response = self.http_client.search_games(game_name) | ||||
|         if not json_response: | ||||
|             return None | ||||
|         # Сохраняем в кэш только первую игру | ||||
|         self._save_to_cache(game_name, json_response) | ||||
|         parser = ResultParser( | ||||
|             game_name, | ||||
|             self.minimum_similarity, | ||||
|             case_sensitive | ||||
|         ) | ||||
|         return parser.parse_results(json_response) | ||||
|  | ||||
|     def format_game_time(self, game_entry: GameEntry, time_field: str = "main_story") -> str | None: | ||||
|         time_value = getattr(game_entry, time_field, None) | ||||
|         if time_value is None: | ||||
|             return None | ||||
|         time_seconds = int(time_value * 3600) | ||||
|         return format_playtime(time_seconds) | ||||
|  | ||||
|     def search_with_callback(self, game_name: str, case_sensitive: bool = True): | ||||
|         """Выполняет поиск игры в фоновом потоке и испускает сигнал с результатами.""" | ||||
|         def search_thread(): | ||||
|             try: | ||||
|                 results = self.search(game_name, case_sensitive) | ||||
|                 self.searchCompleted.emit(results if results else []) | ||||
|             except Exception as e: | ||||
|                 print(f"Error in search_with_callback: {e}") | ||||
|                 self.searchCompleted.emit([]) | ||||
|  | ||||
|         thread = Thread(target=search_thread) | ||||
|         thread.daemon = True | ||||
|         thread.start() | ||||
| @@ -21,6 +21,13 @@ image_load_queue = Queue() | ||||
| image_executor = ThreadPoolExecutor(max_workers=4) | ||||
| queue_lock = threading.Lock() | ||||
|  | ||||
| def get_device_pixel_ratio() -> float: | ||||
|     """ | ||||
|     Retrieves the device pixel ratio from QApplication, with a fallback of 1.0 if not available. | ||||
|     """ | ||||
|     app = QApplication.instance() | ||||
|     return app.devicePixelRatio() if isinstance(app, QApplication) else 1.0 | ||||
|  | ||||
| def load_pixmap_async(cover: str, width: int, height: int, callback: Callable[[QPixmap], None], app_name: str = ""): | ||||
|     """ | ||||
|     Асинхронно загружает обложку через очередь задач. | ||||
| @@ -164,7 +171,6 @@ class FullscreenDialog(QDialog): | ||||
|         :param theme: Объект темы для стилизации (если None, используется default_styles) | ||||
|         """ | ||||
|         super().__init__(parent) | ||||
|         # Удаление диалога после закрытия | ||||
|         self.setAttribute(Qt.WidgetAttribute.WA_DeleteOnClose) | ||||
|         self.setFocusPolicy(Qt.FocusPolicy.StrongFocus) | ||||
|         self.setFocus() | ||||
| @@ -173,14 +179,12 @@ class FullscreenDialog(QDialog): | ||||
|         self.current_index = current_index | ||||
|         self.theme = theme if theme else default_styles | ||||
|  | ||||
|         # Убираем стандартные элементы управления окна | ||||
|         self.setWindowFlags(Qt.WindowType.FramelessWindowHint | Qt.WindowType.Dialog) | ||||
|         self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground) | ||||
|  | ||||
|         self.init_ui() | ||||
|         self.update_display() | ||||
|  | ||||
|         # Фильтруем события для закрытия диалога по клику | ||||
|         self.imageLabel.installEventFilter(self) | ||||
|         self.captionLabel.installEventFilter(self) | ||||
|  | ||||
| @@ -190,32 +194,28 @@ class FullscreenDialog(QDialog): | ||||
|         self.mainLayout.setContentsMargins(0, 0, 0, 0) | ||||
|         self.mainLayout.setSpacing(0) | ||||
|  | ||||
|         # Контейнер для изображения и стрелок | ||||
|         self.imageContainer = QWidget() | ||||
|         self.imageContainer.setFixedSize(self.FIXED_WIDTH, self.FIXED_HEIGHT) | ||||
|         self.imageContainerLayout = QHBoxLayout(self.imageContainer) | ||||
|         self.imageContainerLayout.setContentsMargins(0, 0, 0, 0) | ||||
|         self.imageContainerLayout.setSpacing(0) | ||||
|  | ||||
|         # Левая стрелка | ||||
|         self.prevButton = QToolButton() | ||||
|         self.prevButton.setArrowType(Qt.ArrowType.LeftArrow) | ||||
|         self.prevButton.setStyleSheet(self.theme.PREV_BUTTON_STYLE) | ||||
|         self.prevButton.setStyleSheet(getattr(self.theme, "PREV_BUTTON_STYLE", "")) | ||||
|         self.prevButton.setCursor(Qt.CursorShape.PointingHandCursor) | ||||
|         self.prevButton.setFixedSize(40, 40) | ||||
|         self.prevButton.clicked.connect(self.show_prev) | ||||
|         self.imageContainerLayout.addWidget(self.prevButton) | ||||
|  | ||||
|         # Метка для изображения | ||||
|         self.imageLabel = QLabel() | ||||
|         self.imageLabel.setFixedSize(self.FIXED_WIDTH - 80, self.FIXED_HEIGHT) | ||||
|         self.imageLabel.setAlignment(Qt.AlignmentFlag.AlignCenter) | ||||
|         self.imageContainerLayout.addWidget(self.imageLabel, stretch=1) | ||||
|  | ||||
|         # Правая стрелка | ||||
|         self.nextButton = QToolButton() | ||||
|         self.nextButton.setArrowType(Qt.ArrowType.RightArrow) | ||||
|         self.nextButton.setStyleSheet(self.theme.NEXT_BUTTON_STYLE) | ||||
|         self.nextButton.setStyleSheet(getattr(self.theme, "NEXT_BUTTON_STYLE", "")) | ||||
|         self.nextButton.setCursor(Qt.CursorShape.PointingHandCursor) | ||||
|         self.nextButton.setFixedSize(40, 40) | ||||
|         self.nextButton.clicked.connect(self.show_next) | ||||
| @@ -223,16 +223,14 @@ class FullscreenDialog(QDialog): | ||||
|  | ||||
|         self.mainLayout.addWidget(self.imageContainer) | ||||
|  | ||||
|         # Небольшой отступ между изображением и подписью | ||||
|         spacer = QSpacerItem(20, 10, QSizePolicy.Policy.Minimum, QSizePolicy.Policy.Fixed) | ||||
|         self.mainLayout.addItem(spacer) | ||||
|  | ||||
|         # Подпись | ||||
|         self.captionLabel = QLabel() | ||||
|         self.captionLabel.setAlignment(Qt.AlignmentFlag.AlignCenter) | ||||
|         self.captionLabel.setFixedHeight(40) | ||||
|         self.captionLabel.setWordWrap(True) | ||||
|         self.captionLabel.setStyleSheet(self.theme.CAPTION_LABEL_STYLE) | ||||
|         self.captionLabel.setStyleSheet(getattr(self.theme, "CAPTION_LABEL_STYLE", "")) | ||||
|         self.captionLabel.setCursor(Qt.CursorShape.PointingHandCursor) | ||||
|         self.mainLayout.addWidget(self.captionLabel) | ||||
|  | ||||
| @@ -241,28 +239,37 @@ class FullscreenDialog(QDialog): | ||||
|         if not self.images: | ||||
|             return | ||||
|  | ||||
|         # Очищаем старое содержимое | ||||
|         self.imageLabel.clear() | ||||
|         self.captionLabel.clear() | ||||
|         QApplication.processEvents() | ||||
|  | ||||
|         pixmap, caption = self.images[self.current_index] | ||||
|         # Масштабируем изображение так, чтобы оно поместилось в область фиксированного размера | ||||
|         # Учитываем devicePixelRatio для масштабирования высокого качества | ||||
|         device_pixel_ratio = get_device_pixel_ratio() | ||||
|         target_width = int((self.FIXED_WIDTH - 80) * device_pixel_ratio) | ||||
|         target_height = int(self.FIXED_HEIGHT * device_pixel_ratio) | ||||
|  | ||||
|         # Масштабируем изображение из оригинального pixmap | ||||
|         scaled_pixmap = pixmap.scaled( | ||||
|             self.FIXED_WIDTH - 80,  # учитываем ширину стрелок | ||||
|             self.FIXED_HEIGHT, | ||||
|             target_width, | ||||
|             target_height, | ||||
|             Qt.AspectRatioMode.KeepAspectRatio, | ||||
|             Qt.TransformationMode.SmoothTransformation | ||||
|         ) | ||||
|         scaled_pixmap.setDevicePixelRatio(device_pixel_ratio) | ||||
|         self.imageLabel.setPixmap(scaled_pixmap) | ||||
|         self.captionLabel.setText(caption) | ||||
|         self.setWindowTitle(caption) | ||||
|  | ||||
|         # Принудительная перерисовка виджетов | ||||
|         self.imageLabel.repaint() | ||||
|         self.captionLabel.repaint() | ||||
|         self.repaint() | ||||
|  | ||||
|     def resizeEvent(self, event): | ||||
|         """Обновляет изображение при изменении размера окна.""" | ||||
|         super().resizeEvent(event) | ||||
|         self.update_display()  # Перерисовываем изображение с учетом нового размера | ||||
|  | ||||
|     def show_prev(self): | ||||
|         """Показывает предыдущее изображение.""" | ||||
|         if self.images: | ||||
| @@ -292,7 +299,6 @@ class FullscreenDialog(QDialog): | ||||
|     def mousePressEvent(self, event): | ||||
|         """Закрывает диалог при клике на пустую область.""" | ||||
|         pos = event.pos() | ||||
|         # Проверяем, находится ли клик вне imageContainer и captionLabel | ||||
|         if not (self.imageContainer.geometry().contains(pos) or | ||||
|                 self.captionLabel.geometry().contains(pos)): | ||||
|             self.close() | ||||
| @@ -305,15 +311,14 @@ class ClickablePixmapItem(QGraphicsPixmapItem): | ||||
|     """ | ||||
|     def __init__(self, pixmap, caption="Просмотр изображения", images_list=None, index=0, carousel=None): | ||||
|         """ | ||||
|         :param pixmap: QPixmap для отображения в карусели | ||||
|         :param pixmap: QPixmap для отображения в карусели (оригинальное, высокое разрешение) | ||||
|         :param caption: Подпись к изображению | ||||
|         :param images_list: Список всех изображений (кортежей (QPixmap, caption)), | ||||
|                             чтобы в диалоге можно было перелистывать. | ||||
|                             Если не передан, будет использован только текущее изображение. | ||||
|         :param index: Индекс текущего изображения в images_list. | ||||
|         :param carousel: Ссылка на родительскую карусель (ImageCarousel) для управления стрелками. | ||||
|         :param images_list: Список всех изображений (кортежей (QPixmap, caption)) | ||||
|         :param index: Индекс текущего изображения в images_list | ||||
|         :param carousel: Ссылка на родительскую карусель (ImageCarousel) | ||||
|         """ | ||||
|         super().__init__(pixmap) | ||||
|         super().__init__() | ||||
|         self.original_pixmap = pixmap  # Store original high-resolution pixmap | ||||
|         self.caption = caption | ||||
|         self.images_list = images_list if images_list is not None else [(pixmap, caption)] | ||||
|         self.index = index | ||||
| @@ -323,6 +328,20 @@ class ClickablePixmapItem(QGraphicsPixmapItem): | ||||
|         self._click_start_position = None | ||||
|         self.setAcceptedMouseButtons(Qt.MouseButton.LeftButton) | ||||
|         self.setFlag(QGraphicsItem.GraphicsItemFlag.ItemIsSelectable) | ||||
|         self.update_pixmap()  # Set initial pixmap | ||||
|  | ||||
|     def update_pixmap(self, height=300): | ||||
|         """Update the displayed pixmap by scaling from the original high-resolution pixmap.""" | ||||
|         if self.original_pixmap.isNull(): | ||||
|             return | ||||
|         # Scale pixmap to desired height, considering device pixel ratio | ||||
|         device_pixel_ratio = get_device_pixel_ratio() | ||||
|         scaled_pixmap = self.original_pixmap.scaledToHeight( | ||||
|             int(height * device_pixel_ratio), | ||||
|             Qt.TransformationMode.SmoothTransformation | ||||
|         ) | ||||
|         scaled_pixmap.setDevicePixelRatio(device_pixel_ratio) | ||||
|         self.setPixmap(scaled_pixmap) | ||||
|  | ||||
|     def mousePressEvent(self, event): | ||||
|         if event.button() == Qt.MouseButton.LeftButton: | ||||
| @@ -339,17 +358,14 @@ class ClickablePixmapItem(QGraphicsPixmapItem): | ||||
|         event.accept() | ||||
|  | ||||
|     def show_fullscreen(self): | ||||
|         # Скрываем стрелки карусели перед открытием FullscreenDialog | ||||
|         if self.carousel: | ||||
|             self.carousel.prevArrow.hide() | ||||
|             self.carousel.nextArrow.hide() | ||||
|         dialog = FullscreenDialog(self.images_list, current_index=self.index) | ||||
|         dialog.exec() | ||||
|         # После закрытия диалога обновляем видимость стрелок | ||||
|         if self.carousel: | ||||
|             self.carousel.update_arrows_visibility() | ||||
|  | ||||
|  | ||||
| class ImageCarousel(QGraphicsView): | ||||
|     """ | ||||
|     Карусель изображений с адаптивностью, возможностью увеличения по клику | ||||
| @@ -357,19 +373,16 @@ class ImageCarousel(QGraphicsView): | ||||
|     """ | ||||
|     def __init__(self, images: list[tuple], parent: QWidget | None = None, theme: object | None = None): | ||||
|         super().__init__(parent) | ||||
|  | ||||
|         # Аннотируем тип scene как QGraphicsScene | ||||
|         self.carousel_scene: QGraphicsScene = QGraphicsScene(self) | ||||
|         self.setScene(self.carousel_scene) | ||||
|  | ||||
|         self.images = images  # Список кортежей: (QPixmap, caption) | ||||
|         self.image_items = [] | ||||
|         self._animation = None | ||||
|         self.theme = theme if theme else default_styles | ||||
|         self.max_height = 300  # Default height for images | ||||
|         self.init_ui() | ||||
|         self.create_arrows() | ||||
|  | ||||
|         # Переменные для поддержки перетаскивания | ||||
|         self._drag_active = False | ||||
|         self._drag_start_position = None | ||||
|         self._scroll_start_value = None | ||||
| @@ -380,30 +393,38 @@ class ImageCarousel(QGraphicsView): | ||||
|         self.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff) | ||||
|         self.setFrameShape(QFrame.Shape.NoFrame) | ||||
|  | ||||
|         x_offset = 10  # Отступ между изображениями | ||||
|         max_height = 300  # Фиксированная высота изображений | ||||
|         self.update_scene() | ||||
|  | ||||
|     def update_scene(self): | ||||
|         """Update the scene with scaled images based on current size and scale.""" | ||||
|         self.carousel_scene.clear() | ||||
|         self.image_items.clear() | ||||
|  | ||||
|         x_offset = 10 | ||||
|         x = 0 | ||||
|         device_pixel_ratio = get_device_pixel_ratio() | ||||
|  | ||||
|         for i, (pixmap, caption) in enumerate(self.images): | ||||
|             item = ClickablePixmapItem( | ||||
|                 pixmap.scaledToHeight(max_height, Qt.TransformationMode.SmoothTransformation), | ||||
|                 pixmap,  # Pass original pixmap | ||||
|                 caption, | ||||
|                 images_list=self.images, | ||||
|                 index=i, | ||||
|                 carousel=self  # Передаем ссылку на карусель | ||||
|                 carousel=self | ||||
|             ) | ||||
|             item.update_pixmap(self.max_height)  # Scale to current height | ||||
|             item.setPos(x, 0) | ||||
|             self.carousel_scene.addItem(item) | ||||
|             self.image_items.append(item) | ||||
|             x += item.pixmap().width() + x_offset | ||||
|             x += item.pixmap().width() / device_pixel_ratio + x_offset | ||||
|  | ||||
|         self.setSceneRect(0, 0, x, max_height) | ||||
|         self.setSceneRect(0, 0, x, self.max_height) | ||||
|  | ||||
|     def create_arrows(self): | ||||
|         """Создаёт кнопки-стрелки и привязывает их к функциям прокрутки.""" | ||||
|         self.prevArrow = QToolButton(self) | ||||
|         self.prevArrow.setArrowType(Qt.ArrowType.LeftArrow) | ||||
|         self.prevArrow.setStyleSheet(self.theme.PREV_BUTTON_STYLE) # type: ignore | ||||
|         self.prevArrow.setStyleSheet(getattr(self.theme, "PREV_BUTTON_STYLE", "")) | ||||
|         self.prevArrow.setFixedSize(40, 40) | ||||
|         self.prevArrow.setCursor(Qt.CursorShape.PointingHandCursor) | ||||
|         self.prevArrow.setAutoRepeat(True) | ||||
| @@ -414,7 +435,7 @@ class ImageCarousel(QGraphicsView): | ||||
|  | ||||
|         self.nextArrow = QToolButton(self) | ||||
|         self.nextArrow.setArrowType(Qt.ArrowType.RightArrow) | ||||
|         self.nextArrow.setStyleSheet(self.theme.NEXT_BUTTON_STYLE) # type: ignore | ||||
|         self.nextArrow.setStyleSheet(getattr(self.theme, "NEXT_BUTTON_STYLE", "")) | ||||
|         self.nextArrow.setFixedSize(40, 40) | ||||
|         self.nextArrow.setCursor(Qt.CursorShape.PointingHandCursor) | ||||
|         self.nextArrow.setAutoRepeat(True) | ||||
| @@ -423,14 +444,9 @@ class ImageCarousel(QGraphicsView): | ||||
|         self.nextArrow.clicked.connect(self.scroll_right) | ||||
|         self.nextArrow.raise_() | ||||
|  | ||||
|         # Проверяем видимость стрелок при создании | ||||
|         self.update_arrows_visibility() | ||||
|  | ||||
|     def update_arrows_visibility(self): | ||||
|         """ | ||||
|         Показывает стрелки, если контент шире видимой области. | ||||
|         Иначе скрывает их. | ||||
|         """ | ||||
|         if hasattr(self, "prevArrow") and hasattr(self, "nextArrow"): | ||||
|             if self.horizontalScrollBar().maximum() == 0: | ||||
|                 self.prevArrow.hide() | ||||
| @@ -444,7 +460,8 @@ class ImageCarousel(QGraphicsView): | ||||
|         margin = 10 | ||||
|         self.prevArrow.move(margin, (self.height() - self.prevArrow.height()) // 2) | ||||
|         self.nextArrow.move(self.width() - self.nextArrow.width() - margin, | ||||
|                               (self.height() - self.nextArrow.height()) // 2) | ||||
|                             (self.height() - self.nextArrow.height()) // 2) | ||||
|         self.update_scene()  # Re-scale images on resize | ||||
|         self.update_arrows_visibility() | ||||
|  | ||||
|     def animate_scroll(self, end_value): | ||||
| @@ -469,19 +486,15 @@ class ImageCarousel(QGraphicsView): | ||||
|         self.animate_scroll(new_value) | ||||
|  | ||||
|     def update_images(self, new_images): | ||||
|         self.carousel_scene.clear() | ||||
|         self.images = new_images | ||||
|         self.image_items.clear() | ||||
|         self.init_ui() | ||||
|         self.update_scene() | ||||
|         self.update_arrows_visibility() | ||||
|  | ||||
|     # Обработка событий мыши для перетаскивания | ||||
|     def mousePressEvent(self, event): | ||||
|         if event.button() == Qt.MouseButton.LeftButton: | ||||
|             self._drag_active = True | ||||
|             self._drag_start_position = event.pos() | ||||
|             self._scroll_start_value = self.horizontalScrollBar().value() | ||||
|             # Скрываем стрелки при начале перетаскивания | ||||
|             if hasattr(self, "prevArrow"): | ||||
|                 self.prevArrow.hide() | ||||
|             if hasattr(self, "nextArrow"): | ||||
| @@ -497,6 +510,5 @@ class ImageCarousel(QGraphicsView): | ||||
|  | ||||
|     def mouseReleaseEvent(self, event): | ||||
|         self._drag_active = False | ||||
|         # Показываем стрелки после завершения перетаскивания (с проверкой видимости) | ||||
|         self.update_arrows_visibility() | ||||
|         super().mouseReleaseEvent(event) | ||||
|   | ||||
| @@ -4,7 +4,7 @@ import os | ||||
| from typing import Protocol, cast | ||||
| from evdev import InputDevice, InputEvent, ecodes, list_devices, ff | ||||
| from pyudev import Context, Monitor, MonitorObserver, Device | ||||
| from PySide6.QtWidgets import QWidget, QStackedWidget, QApplication, QScrollArea, QLineEdit, QDialog, QMenu, QComboBox, QListView, QMessageBox | ||||
| from PySide6.QtWidgets import QWidget, QStackedWidget, QApplication, QScrollArea, QLineEdit, QDialog, QMenu, QComboBox, QListView, QMessageBox, QListWidget | ||||
| from PySide6.QtCore import Qt, QObject, QEvent, QPoint, Signal, Slot, QTimer | ||||
| from PySide6.QtGui import QKeyEvent | ||||
| from portprotonqt.logger import get_logger | ||||
| @@ -42,17 +42,17 @@ class MainWindowProtocol(Protocol): | ||||
| # https://github.com/torvalds/linux/blob/master/drivers/hid/hid-playstation.c | ||||
| # https://github.com/torvalds/linux/blob/master/drivers/input/joystick/xpad.c | ||||
| BUTTONS = { | ||||
|     'confirm':   {ecodes.BTN_SOUTH},               # A (Xbox) / Cross (PS) | ||||
|     'back':      {ecodes.BTN_EAST},                # B (Xbox) / Circle (PS) | ||||
|     'add_game':  {ecodes.BTN_NORTH},               # X (Xbox) / Triangle (PS) | ||||
|     'prev_dir':  {ecodes.BTN_WEST},                # Y (Xbox) / Square (PS) | ||||
|     'prev_tab':  {ecodes.BTN_TL},                  # LB (Xbox) / L1 (PS) | ||||
|     'next_tab':  {ecodes.BTN_TR},                  # RB (Xbox) / R1 (PS) | ||||
|     'context_menu': {ecodes.BTN_START},            # Start (Xbox) / Options (PS) | ||||
|     'menu':      {ecodes.BTN_SELECT},              # Select (Xbox) / Share (PS) | ||||
|     'guide':     {ecodes.BTN_MODE},                # Xbox Button / PS Button | ||||
|     'increase_size': {ecodes.ABS_RZ},              # RT (Xbox) / R2 (PS) | ||||
|     'decrease_size': {ecodes.ABS_Z},               # LT (Xbox) / L2 (PS) | ||||
|     'confirm':       {ecodes.BTN_SOUTH},           # A (Xbox) / Cross (PS) | ||||
|     'back':          {ecodes.BTN_EAST},            # B (Xbox) / Circle (PS) | ||||
|     'add_game':      {ecodes.BTN_NORTH},           # X (Xbox) / Triangle (PS) | ||||
|     'prev_dir':      {ecodes.BTN_WEST},            # Y (Xbox) / Square (PS) | ||||
|     'prev_tab':      {ecodes.BTN_TL},              # LB (Xbox) / L1 (PS) | ||||
|     'next_tab':      {ecodes.BTN_TR},              # RB (Xbox) / R1 (PS) | ||||
|     'context_menu':  {ecodes.BTN_START},           # Start (Xbox) / Options (PS) | ||||
|     'menu':          {ecodes.BTN_SELECT},          # Select (Xbox) / Share (PS) | ||||
|     'guide':         {ecodes.BTN_MODE},            # Xbox Button / PS Button | ||||
|     'increase_size': {ecodes.BTN_TR2},             # RT (Xbox) / R2 (PS) | ||||
|     'decrease_size': {ecodes.BTN_TL2},             # LT (Xbox) / L2 (PS) | ||||
| } | ||||
|  | ||||
| class InputManager(QObject): | ||||
| @@ -111,6 +111,8 @@ class InputManager(QObject): | ||||
|         self.stick_value = 0  # Текущее значение стика (для плавности) | ||||
|         self.dead_zone = 8000  # Мертвая зона стика | ||||
|  | ||||
|         self._is_gamescope_session = 'gamescope' in os.environ.get('DESKTOP_SESSION', '').lower() | ||||
|  | ||||
|         # Add variables for continuous D-pad movement | ||||
|         self.dpad_timer = QTimer(self) | ||||
|         self.dpad_timer.timeout.connect(self.handle_dpad_repeat) | ||||
| @@ -159,7 +161,20 @@ class InputManager(QObject): | ||||
|  | ||||
|     def handle_file_explorer_button(self, button_code): | ||||
|         try: | ||||
|             popup = QApplication.activePopupWidget() | ||||
|             if isinstance(popup, QMenu): | ||||
|                 if button_code in BUTTONS['confirm']:  # A button (BTN_SOUTH) | ||||
|                     if popup.activeAction(): | ||||
|                         popup.activeAction().trigger() | ||||
|                         popup.close() | ||||
|                     return | ||||
|                 elif button_code in BUTTONS['back']:  # B button | ||||
|                     popup.close() | ||||
|                     return | ||||
|                 return  # Skip other handling if menu is open | ||||
|  | ||||
|             if not self.file_explorer or not hasattr(self.file_explorer, 'file_list'): | ||||
|                 logger.debug("No file explorer or file_list available") | ||||
|                 return | ||||
|  | ||||
|             focused_widget = QApplication.focusWidget() | ||||
| @@ -167,27 +182,37 @@ class InputManager(QObject): | ||||
|                 if isinstance(focused_widget, AutoSizeButton) and hasattr(self.file_explorer, 'drive_buttons') and focused_widget in self.file_explorer.drive_buttons: | ||||
|                     self.file_explorer.select_drive()  # Select the focused drive | ||||
|                 elif self.file_explorer.file_list.count() == 0: | ||||
|                     logger.debug("File list is empty") | ||||
|                     return | ||||
|                 else: | ||||
|                     selected = self.file_explorer.file_list.currentItem().text() | ||||
|                     full_path = os.path.join(self.file_explorer.current_path, selected) | ||||
|                     if os.path.isdir(full_path): | ||||
|                         # Открываем директорию | ||||
|                         self.file_explorer.current_path = os.path.normpath(full_path) | ||||
|                         self.file_explorer.update_file_list() | ||||
|                     elif not self.file_explorer.directory_only: | ||||
|                         # Выбираем файл, если directory_only=False | ||||
|                         self.file_explorer.file_signal.file_selected.emit(os.path.normpath(full_path)) | ||||
|                         self.file_explorer.accept() | ||||
|                     else: | ||||
|                         logger.debug("Selected item is not a directory, cannot select: %s", full_path) | ||||
|             elif button_code in BUTTONS['context_menu']:  # Start button (BTN_START) | ||||
|                 if self.file_explorer.file_list.count() == 0: | ||||
|                     logger.debug("File list is empty, cannot show context menu") | ||||
|                     return | ||||
|                 current_item = self.file_explorer.file_list.currentItem() | ||||
|                 if current_item: | ||||
|                     item_rect = self.file_explorer.file_list.visualItemRect(current_item) | ||||
|                     pos = item_rect.center()  # Use local coordinates for itemAt check | ||||
|                     self.file_explorer.show_folder_context_menu(pos) | ||||
|                 else: | ||||
|                     logger.debug("No item selected for context menu") | ||||
|             elif button_code in BUTTONS['add_game']:  # X button | ||||
|                 if self.file_explorer.file_list.count() == 0: | ||||
|                     logger.debug("File list is empty") | ||||
|                     return | ||||
|                 selected = self.file_explorer.file_list.currentItem().text() | ||||
|                 full_path = os.path.join(self.file_explorer.current_path, selected) | ||||
|                 if os.path.isdir(full_path): | ||||
|                     # Подтверждаем выбор директории | ||||
|                     self.file_explorer.file_signal.file_selected.emit(os.path.normpath(full_path)) | ||||
|                     self.file_explorer.accept() | ||||
|                 else: | ||||
| @@ -200,12 +225,29 @@ class InputManager(QObject): | ||||
|                 if self.original_button_handler: | ||||
|                     self.original_button_handler(button_code) | ||||
|         except Exception as e: | ||||
|             logger.error(f"Error in FileExplorer button handler: {e}") | ||||
|             logger.error("Error in FileExplorer button handler: %s", e) | ||||
|  | ||||
|     def handle_file_explorer_dpad(self, code, value, current_time): | ||||
|         """Обработка движения D-pad и левого стика для FileExplorer""" | ||||
|         try: | ||||
|             popup = QApplication.activePopupWidget() | ||||
|             if isinstance(popup, QMenu): | ||||
|                 if code == ecodes.ABS_HAT0Y and value != 0: | ||||
|                     actions = popup.actions() | ||||
|                     if not actions: | ||||
|                         return | ||||
|                     current_action = popup.activeAction() | ||||
|                     current_idx = actions.index(current_action) if current_action in actions else -1 | ||||
|                     if value > 0:  # Down | ||||
|                         next_idx = (current_idx + 1) % len(actions) if current_idx != -1 else 0 | ||||
|                         popup.setActiveAction(actions[next_idx]) | ||||
|                     elif value < 0:  # Up | ||||
|                         next_idx = (current_idx - 1) % len(actions) if current_idx != -1 else len(actions) - 1 | ||||
|                         popup.setActiveAction(actions[next_idx]) | ||||
|                 return  # Skip other handling if menu is open | ||||
|  | ||||
|             if not self.file_explorer or not hasattr(self.file_explorer, 'file_list') or not self.file_explorer.file_list: | ||||
|                 logger.debug("No file explorer or file_list available") | ||||
|                 return | ||||
|  | ||||
|             focused_widget = QApplication.focusWidget() | ||||
| @@ -214,14 +256,17 @@ class InputManager(QObject): | ||||
|                 if not isinstance(focused_widget, AutoSizeButton) or focused_widget not in self.file_explorer.drive_buttons: | ||||
|                     # If not focused on a drive button, focus the first one | ||||
|                     self.file_explorer.drive_buttons[0].setFocus() | ||||
|                     self.file_explorer.ensure_button_visible(self.file_explorer.drive_buttons[0]) | ||||
|                     return | ||||
|                 current_idx = self.file_explorer.drive_buttons.index(focused_widget) | ||||
|                 if value < 0:  # Left | ||||
|                     next_idx = max(current_idx - 1, 0) | ||||
|                     self.file_explorer.drive_buttons[next_idx].setFocus() | ||||
|                     self.file_explorer.ensure_button_visible(self.file_explorer.drive_buttons[next_idx]) | ||||
|                 elif value > 0:  # Right | ||||
|                     next_idx = min(current_idx + 1, len(self.file_explorer.drive_buttons) - 1) | ||||
|                     self.file_explorer.drive_buttons[next_idx].setFocus() | ||||
|                     self.file_explorer.ensure_button_visible(self.file_explorer.drive_buttons[next_idx]) | ||||
|             elif code in (ecodes.ABS_HAT0Y, ecodes.ABS_Y): | ||||
|                 if isinstance(focused_widget, AutoSizeButton) and focused_widget in self.file_explorer.drive_buttons: | ||||
|                     # Move focus to file list if navigating down from drive buttons | ||||
| @@ -262,7 +307,7 @@ class InputManager(QObject): | ||||
|             elif self.original_dpad_handler: | ||||
|                 self.original_dpad_handler(code, value, current_time) | ||||
|         except Exception as e: | ||||
|             logger.error(f"Error in FileExplorer dpad handler: {e}") | ||||
|             logger.error("Error in FileExplorer dpad handler: %s", e) | ||||
|  | ||||
|     def handle_navigation_repeat(self): | ||||
|         """Плавное повторение движения с переменной скоростью для FileExplorer""" | ||||
| @@ -628,87 +673,107 @@ class InputManager(QObject): | ||||
|                         scroll_area.ensureWidgetVisible(game_cards[0], 50, 50) | ||||
|                     return | ||||
|  | ||||
|                 # Group cards by rows based on y-coordinate | ||||
|                 cards = self._parent.gamesListWidget.findChildren(GameCard, options=Qt.FindChildOption.FindChildrenRecursively) | ||||
|                 if not cards: | ||||
|                     return | ||||
|                 # Group cards by rows with tolerance for y-position | ||||
|                 rows = {} | ||||
|                 for card in game_cards: | ||||
|                 y_tolerance = 10  # Allow slight variations in y-position | ||||
|                 for card in cards: | ||||
|                     y = card.pos().y() | ||||
|                     if y not in rows: | ||||
|                         rows[y] = [] | ||||
|                     rows[y].append(card) | ||||
|                 # Sort cards in each row by x-coordinate | ||||
|                 for y in rows: | ||||
|                     rows[y].sort(key=lambda c: c.pos().x()) | ||||
|                 # Sort rows by y-coordinate | ||||
|                     matched = False | ||||
|                     for row_y in rows: | ||||
|                         if abs(y - row_y) <= y_tolerance: | ||||
|                             rows[row_y].append(card) | ||||
|                             matched = True | ||||
|                             break | ||||
|                     if not matched: | ||||
|                         rows[y] = [card] | ||||
|                 sorted_rows = sorted(rows.items(), key=lambda x: x[0]) | ||||
|                 if not sorted_rows: | ||||
|                     return | ||||
|                 current_row_idx = None | ||||
|                 current_col_idx = None | ||||
|                 for row_idx, (_y, row_cards) in enumerate(sorted_rows): | ||||
|                     for idx, card in enumerate(row_cards): | ||||
|                         if card == focused: | ||||
|                             current_row_idx = row_idx | ||||
|                             current_col_idx = idx | ||||
|                             break | ||||
|                     if current_row_idx is not None: | ||||
|                         break | ||||
|  | ||||
|                 # Fallback: if focused card not found, select closest row by y-position | ||||
|                 if current_row_idx is None: | ||||
|                     if not sorted_rows:  # Additional safety check | ||||
|                         return | ||||
|                     focused_y = focused.pos().y() | ||||
|                     current_row_idx = min(range(len(sorted_rows)), key=lambda i: abs(sorted_rows[i][0] - focused_y)) | ||||
|                     if current_row_idx >= len(sorted_rows):  # Safety check | ||||
|                         return | ||||
|                     current_row = sorted_rows[current_row_idx][1] | ||||
|                     focused_x = focused.pos().x() + focused.width() / 2 | ||||
|                     current_col_idx = min(range(len(current_row)), key=lambda i: abs((current_row[i].pos().x() + current_row[i].width() / 2) - focused_x), default=0) # type: ignore | ||||
|  | ||||
|                 # Add null checks before using current_row_idx and current_col_idx | ||||
|                 if current_row_idx is None or current_col_idx is None or current_row_idx >= len(sorted_rows): | ||||
|                     return | ||||
|  | ||||
|                 # Find current row and column | ||||
|                 current_y = focused.pos().y() | ||||
|                 current_row_idx = next(i for i, (y, _) in enumerate(sorted_rows) if y == current_y) | ||||
|                 current_row = sorted_rows[current_row_idx][1] | ||||
|                 current_col_idx = current_row.index(focused) | ||||
|  | ||||
|                 if code == ecodes.ABS_HAT0X and value != 0:  # Left/Right | ||||
|                 if code == ecodes.ABS_HAT0X and value != 0: | ||||
|                     if value < 0:  # Left | ||||
|                         next_col_idx = current_col_idx - 1 | ||||
|                         if next_col_idx >= 0: | ||||
|                             next_card = current_row[next_col_idx] | ||||
|                             next_card.setFocus() | ||||
|                         if current_col_idx > 0: | ||||
|                             next_card = current_row[current_col_idx - 1] | ||||
|                             next_card.setFocus(Qt.FocusReason.OtherFocusReason) | ||||
|                             if scroll_area: | ||||
|                                 scroll_area.ensureWidgetVisible(next_card, 50, 50) | ||||
|                         else: | ||||
|                             # Move to the last card of the previous row if available | ||||
|                             if current_row_idx > 0: | ||||
|                                 prev_row = sorted_rows[current_row_idx - 1][1] | ||||
|                                 next_card = prev_row[-1] if prev_row else None | ||||
|                                 if next_card: | ||||
|                                     next_card.setFocus() | ||||
|                                     next_card.setFocus(Qt.FocusReason.OtherFocusReason) | ||||
|                                     if scroll_area: | ||||
|                                         scroll_area.ensureWidgetVisible(next_card, 50, 50) | ||||
|                     elif value > 0:  # Right | ||||
|                         next_col_idx = current_col_idx + 1 | ||||
|                         if next_col_idx < len(current_row): | ||||
|                             next_card = current_row[next_col_idx] | ||||
|                             next_card.setFocus() | ||||
|                         if current_col_idx < len(current_row) - 1: | ||||
|                             next_card = current_row[current_col_idx + 1] | ||||
|                             next_card.setFocus(Qt.FocusReason.OtherFocusReason) | ||||
|                             if scroll_area: | ||||
|                                 scroll_area.ensureWidgetVisible(next_card, 50, 50) | ||||
|                         else: | ||||
|                             # Move to the first card of the next row if available | ||||
|                             if current_row_idx < len(sorted_rows) - 1: | ||||
|                                 next_row = sorted_rows[current_row_idx + 1][1] | ||||
|                                 next_card = next_row[0] if next_row else None | ||||
|                                 if next_card: | ||||
|                                     next_card.setFocus() | ||||
|                                     next_card.setFocus(Qt.FocusReason.OtherFocusReason) | ||||
|                                     if scroll_area: | ||||
|                                         scroll_area.ensureWidgetVisible(next_card, 50, 50) | ||||
|                 elif code == ecodes.ABS_HAT0Y and value != 0:  # Up/Down | ||||
|                 elif code == ecodes.ABS_HAT0Y and value != 0: | ||||
|                     if value > 0:  # Down | ||||
|                         next_row_idx = current_row_idx + 1 | ||||
|                         if next_row_idx < len(sorted_rows): | ||||
|                             next_row = sorted_rows[next_row_idx][1] | ||||
|                             # Find card in same column or closest | ||||
|                             target_x = focused.pos().x() | ||||
|                         if current_row_idx < len(sorted_rows) - 1: | ||||
|                             next_row = sorted_rows[current_row_idx + 1][1] | ||||
|                             current_x = focused.pos().x() + focused.width() / 2 | ||||
|                             next_card = min( | ||||
|                                 next_row, | ||||
|                                 key=lambda c: abs(c.pos().x() - target_x), | ||||
|                                 key=lambda c: abs((c.pos().x() + c.width() / 2) - current_x), | ||||
|                                 default=None | ||||
|                             ) | ||||
|                             if next_card: | ||||
|                                 next_card.setFocus() | ||||
|                                 next_card.setFocus(Qt.FocusReason.OtherFocusReason) | ||||
|                                 if scroll_area: | ||||
|                                     scroll_area.ensureWidgetVisible(next_card, 50, 50) | ||||
|                     elif value < 0:  # Up | ||||
|                         next_row_idx = current_row_idx - 1 | ||||
|                         if next_row_idx >= 0: | ||||
|                             next_row = sorted_rows[next_row_idx][1] | ||||
|                             # Find card in same column or closest | ||||
|                             target_x = focused.pos().x() | ||||
|                         if current_row_idx > 0: | ||||
|                             prev_row = sorted_rows[current_row_idx - 1][1] | ||||
|                             current_x = focused.pos().x() + focused.width() / 2 | ||||
|                             next_card = min( | ||||
|                                 next_row, | ||||
|                                 key=lambda c: abs(c.pos().x() - target_x), | ||||
|                                 prev_row, | ||||
|                                 key=lambda c: abs((c.pos().x() + c.width() / 2) - current_x), | ||||
|                                 default=None | ||||
|                             ) | ||||
|                             if next_card: | ||||
|                                 next_card.setFocus() | ||||
|                                 next_card.setFocus(Qt.FocusReason.OtherFocusReason) | ||||
|                                 if scroll_area: | ||||
|                                     scroll_area.ensureWidgetVisible(next_card, 50, 50) | ||||
|                         elif current_row_idx == 0: | ||||
| @@ -740,6 +805,11 @@ class InputManager(QObject): | ||||
|         if not app: | ||||
|             return super().eventFilter(obj, event) | ||||
|  | ||||
|         # Ensure obj is a QObject | ||||
|         if not isinstance(obj, QObject): | ||||
|             logger.debug(f"Skipping event filter for non-QObject: {type(obj).__name__}") | ||||
|             return False | ||||
|  | ||||
|         # Handle key press and release events | ||||
|         if not isinstance(event, QKeyEvent): | ||||
|             return super().eventFilter(obj, event) | ||||
| @@ -752,6 +822,62 @@ class InputManager(QObject): | ||||
|  | ||||
|         # Handle key press events | ||||
|         if event.type() == QEvent.Type.KeyPress: | ||||
|             # Handle FileExplorer specific logic | ||||
|             if self.file_explorer: | ||||
|                 # Handle drive buttons in FileExplorer | ||||
|                 if key in (Qt.Key.Key_Return, Qt.Key.Key_Enter): | ||||
|                     if isinstance(focused, AutoSizeButton) and hasattr(self.file_explorer, 'drive_buttons') and focused in self.file_explorer.drive_buttons: | ||||
|                         self.file_explorer.select_drive() | ||||
|                         return True | ||||
|                     elif isinstance(focused, QListWidget) and focused == self.file_explorer.file_list: | ||||
|                         current_item = focused.currentItem() | ||||
|                         if current_item: | ||||
|                             selected = current_item.text() | ||||
|                             full_path = os.path.join(self.file_explorer.current_path, selected) | ||||
|                             if os.path.isdir(full_path): | ||||
|                                 if selected == "../": | ||||
|                                     self.file_explorer.previous_dir() | ||||
|                                 else: | ||||
|                                     self.file_explorer.current_path = os.path.normpath(full_path) | ||||
|                                     self.file_explorer.update_file_list() | ||||
|                             elif not self.file_explorer.directory_only: | ||||
|                                 self.file_explorer.file_signal.file_selected.emit(os.path.normpath(full_path)) | ||||
|                                 self.file_explorer.accept() | ||||
|                             return True | ||||
|                     else: | ||||
|                         self._parent.activateFocusedWidget() | ||||
|                         return True | ||||
|  | ||||
|                 # Handle FileExplorer navigation with right arrow key | ||||
|                 if key == Qt.Key.Key_Right: | ||||
|                     try: | ||||
|                         if hasattr(self.file_explorer, 'drive_buttons') and self.file_explorer.drive_buttons: | ||||
|                             if not isinstance(focused, AutoSizeButton) or focused not in self.file_explorer.drive_buttons: | ||||
|                                 self.file_explorer.drive_buttons[0].setFocus() | ||||
|                                 self.file_explorer.ensure_button_visible(self.file_explorer.drive_buttons[0]) | ||||
|                             else: | ||||
|                                 current_idx = self.file_explorer.drive_buttons.index(focused) | ||||
|                                 next_idx = min(current_idx + 1, len(self.file_explorer.drive_buttons) - 1) | ||||
|                                 self.file_explorer.drive_buttons[next_idx].setFocus() | ||||
|                                 self.file_explorer.ensure_button_visible(self.file_explorer.drive_buttons[next_idx]) | ||||
|                             return True | ||||
|                     except Exception as e: | ||||
|                         logger.error(f"Error handling right arrow in FileExplorer: {e}") | ||||
|                         return True | ||||
|  | ||||
|                 # Handle Backspace for FileExplorer navigation | ||||
|                 if key == Qt.Key.Key_Backspace: | ||||
|                     self.file_explorer.previous_dir() | ||||
|                     return True | ||||
|  | ||||
|             # Handle QLineEdit cursor movement with Left/Right arrows | ||||
|             if isinstance(focused, QLineEdit) and key in (Qt.Key.Key_Left, Qt.Key.Key_Right): | ||||
|                 if key == Qt.Key.Key_Left: | ||||
|                     focused.cursorBackward(False, 1)  # Move cursor left by one character | ||||
|                 elif key == Qt.Key.Key_Right: | ||||
|                     focused.cursorForward(False, 1)  # Move cursor right by one character | ||||
|                 return True  # Consume the event to prevent further processing | ||||
|  | ||||
|             # Open system overlay with Insert | ||||
|             if key == Qt.Key.Key_Insert: | ||||
|                 if not popup and not isinstance(active_win, QDialog): | ||||
| @@ -763,11 +889,19 @@ class InputManager(QObject): | ||||
|                 app.quit() | ||||
|                 return True | ||||
|  | ||||
|             # Close AddGameDialog with Escape | ||||
|             if key == Qt.Key.Key_Escape and isinstance(popup, QDialog): | ||||
|                 popup.reject() | ||||
|             # Handle Backspace for FileExplorer navigation (move to parent directory) | ||||
|             if key == Qt.Key.Key_Backspace and self.file_explorer: | ||||
|                 self.file_explorer.previous_dir() | ||||
|                 return True | ||||
|  | ||||
|             # Close Dialogs with Escape | ||||
|             if key == Qt.Key.Key_Escape: | ||||
|                 if isinstance(focused, QLineEdit): | ||||
|                     return False | ||||
|                 if isinstance(active_win, QDialog): | ||||
|                     active_win.reject() | ||||
|                     return True | ||||
|  | ||||
|             # FullscreenDialog navigation | ||||
|             if isinstance(active_win, FullscreenDialog): | ||||
|                 if key in (Qt.Key.Key_Escape, Qt.Key.Key_Return, Qt.Key.Key_Enter, Qt.Key.Key_Backspace): | ||||
| @@ -781,8 +915,8 @@ class InputManager(QObject): | ||||
|                         active_win.show_next() | ||||
|                     return True  # Consume event to prevent tab switching | ||||
|  | ||||
|             # Handle tab switching with Left/Right arrow keys when not in GameCard focus | ||||
|             if key in (Qt.Key.Key_Left, Qt.Key.Key_Right) and (not isinstance(focused, GameCard) or focused is None): | ||||
|             # Handle tab switching with Left/Right arrow keys when not in GameCard focus or QLineEdit | ||||
|             if key in (Qt.Key.Key_Left, Qt.Key.Key_Right) and not isinstance(focused, GameCard | QLineEdit) and not self.file_explorer: | ||||
|                 idx = self._parent.stackedWidget.currentIndex() | ||||
|                 total = len(self._parent.tabButtons) | ||||
|                 if key == Qt.Key.Key_Left: | ||||
| @@ -849,7 +983,7 @@ class InputManager(QObject): | ||||
|                     return True | ||||
|  | ||||
|             # Toggle fullscreen with F11 | ||||
|             if key == Qt.Key.Key_F11: | ||||
|             if key == Qt.Key.Key_F11 and not self._is_gamescope_session: | ||||
|                 self.toggle_fullscreen.emit(not self._is_fullscreen) | ||||
|                 return True | ||||
|  | ||||
| @@ -946,7 +1080,7 @@ class InputManager(QObject): | ||||
|                     continue | ||||
|                 now = time.time() | ||||
|                 if event.type == ecodes.EV_KEY and event.value == 1: | ||||
|                     if event.code in BUTTONS['menu']: | ||||
|                     if event.code in BUTTONS['menu'] and not self._is_gamescope_session: | ||||
|                         self.toggle_fullscreen.emit(not self._is_fullscreen) | ||||
|                     else: | ||||
|                         self.button_pressed.emit(event.code) | ||||
|   | ||||
| @@ -9,7 +9,7 @@ msgid "" | ||||
| msgstr "" | ||||
| "Project-Id-Version: PROJECT VERSION\n" | ||||
| "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | ||||
| "POT-Creation-Date: 2025-07-03 19:29+0700\n" | ||||
| "POT-Creation-Date: 2025-08-31 12:28+0500\n" | ||||
| "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||||
| "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||||
| "Language: de_DE\n" | ||||
| @@ -26,18 +26,21 @@ msgstr "" | ||||
| msgid "PortProton is not found" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Stop Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Launch Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Remove from Favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Add to Favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Delete from PortProton" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Stop Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Launch Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Import to Legendary" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -65,9 +68,6 @@ msgstr "" | ||||
| msgid "Edit Shortcut" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Delete from PortProton" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Stopped '{game_name}'" | ||||
| msgstr "" | ||||
| @@ -170,18 +170,6 @@ msgstr "" | ||||
| msgid "No .desktop file found for '{game_name}'" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Invalid executable command: {exec_line}" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Executable not found: {path}" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Failed to parse executable: {error}" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Confirm Deletion" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -260,12 +248,19 @@ msgstr "" | ||||
| msgid "Select All" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Select" | ||||
| #, python-brace-format | ||||
| msgid "Launching {0}" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Cancel" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "File Explorer" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Select" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Path: " | ||||
| msgstr "" | ||||
|  | ||||
| @@ -296,6 +291,12 @@ msgstr "" | ||||
| msgid "Invalid image" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Failed to download cover" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Downloading cover..." | ||||
| msgstr "" | ||||
|  | ||||
| msgid "No cover selected" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -338,6 +339,9 @@ msgstr "" | ||||
| msgid "Pending" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Unknown Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Library" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -362,9 +366,6 @@ msgstr "" | ||||
| msgid "Loading PortProton games..." | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Unknown Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Game Library" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -557,6 +558,15 @@ msgstr "" | ||||
| msgid "PLAY TIME" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "MAIN STORY" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "MAIN + SIDES" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "COMPLETIONIST" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "full" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -645,3 +655,24 @@ msgstr "" | ||||
| msgid "sec." | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Show" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Recent Games" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Exit" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Hide" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "No favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "No recent games" | ||||
| msgstr "" | ||||
|  | ||||
|   | ||||
| @@ -9,7 +9,7 @@ msgid "" | ||||
| msgstr "" | ||||
| "Project-Id-Version: PROJECT VERSION\n" | ||||
| "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | ||||
| "POT-Creation-Date: 2025-07-03 19:29+0700\n" | ||||
| "POT-Creation-Date: 2025-08-31 12:28+0500\n" | ||||
| "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||||
| "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||||
| "Language: es_ES\n" | ||||
| @@ -26,18 +26,21 @@ msgstr "" | ||||
| msgid "PortProton is not found" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Stop Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Launch Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Remove from Favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Add to Favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Delete from PortProton" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Stop Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Launch Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Import to Legendary" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -65,9 +68,6 @@ msgstr "" | ||||
| msgid "Edit Shortcut" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Delete from PortProton" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Stopped '{game_name}'" | ||||
| msgstr "" | ||||
| @@ -170,18 +170,6 @@ msgstr "" | ||||
| msgid "No .desktop file found for '{game_name}'" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Invalid executable command: {exec_line}" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Executable not found: {path}" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Failed to parse executable: {error}" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Confirm Deletion" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -260,12 +248,19 @@ msgstr "" | ||||
| msgid "Select All" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Select" | ||||
| #, python-brace-format | ||||
| msgid "Launching {0}" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Cancel" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "File Explorer" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Select" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Path: " | ||||
| msgstr "" | ||||
|  | ||||
| @@ -296,6 +291,12 @@ msgstr "" | ||||
| msgid "Invalid image" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Failed to download cover" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Downloading cover..." | ||||
| msgstr "" | ||||
|  | ||||
| msgid "No cover selected" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -338,6 +339,9 @@ msgstr "" | ||||
| msgid "Pending" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Unknown Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Library" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -362,9 +366,6 @@ msgstr "" | ||||
| msgid "Loading PortProton games..." | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Unknown Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Game Library" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -557,6 +558,15 @@ msgstr "" | ||||
| msgid "PLAY TIME" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "MAIN STORY" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "MAIN + SIDES" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "COMPLETIONIST" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "full" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -645,3 +655,24 @@ msgstr "" | ||||
| msgid "sec." | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Show" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Recent Games" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Exit" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Hide" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "No favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "No recent games" | ||||
| msgstr "" | ||||
|  | ||||
|   | ||||
| @@ -9,7 +9,7 @@ msgid "" | ||||
| msgstr "" | ||||
| "Project-Id-Version: PortProtonQt 0.1.1\n" | ||||
| "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | ||||
| "POT-Creation-Date: 2025-07-03 19:29+0700\n" | ||||
| "POT-Creation-Date: 2025-08-31 12:28+0500\n" | ||||
| "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | ||||
| "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | ||||
| "Language-Team: LANGUAGE <LL@li.org>\n" | ||||
| @@ -24,18 +24,21 @@ msgstr "" | ||||
| msgid "PortProton is not found" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Stop Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Launch Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Remove from Favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Add to Favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Delete from PortProton" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Stop Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Launch Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Import to Legendary" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -63,9 +66,6 @@ msgstr "" | ||||
| msgid "Edit Shortcut" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Delete from PortProton" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Stopped '{game_name}'" | ||||
| msgstr "" | ||||
| @@ -168,18 +168,6 @@ msgstr "" | ||||
| msgid "No .desktop file found for '{game_name}'" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Invalid executable command: {exec_line}" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Executable not found: {path}" | ||||
| msgstr "" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Failed to parse executable: {error}" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Confirm Deletion" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -258,12 +246,19 @@ msgstr "" | ||||
| msgid "Select All" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Select" | ||||
| #, python-brace-format | ||||
| msgid "Launching {0}" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Cancel" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "File Explorer" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Select" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Path: " | ||||
| msgstr "" | ||||
|  | ||||
| @@ -294,6 +289,12 @@ msgstr "" | ||||
| msgid "Invalid image" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Failed to download cover" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Downloading cover..." | ||||
| msgstr "" | ||||
|  | ||||
| msgid "No cover selected" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -336,6 +337,9 @@ msgstr "" | ||||
| msgid "Pending" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Unknown Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Library" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -360,9 +364,6 @@ msgstr "" | ||||
| msgid "Loading PortProton games..." | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Unknown Game" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Game Library" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -555,6 +556,15 @@ msgstr "" | ||||
| msgid "PLAY TIME" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "MAIN STORY" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "MAIN + SIDES" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "COMPLETIONIST" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "full" | ||||
| msgstr "" | ||||
|  | ||||
| @@ -643,3 +653,24 @@ msgstr "" | ||||
| msgid "sec." | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Show" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Recent Games" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Exit" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "Hide" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "No favorites" | ||||
| msgstr "" | ||||
|  | ||||
| msgid "No recent games" | ||||
| msgstr "" | ||||
|  | ||||
|   | ||||
| @@ -9,8 +9,8 @@ msgid "" | ||||
| msgstr "" | ||||
| "Project-Id-Version: PROJECT VERSION\n" | ||||
| "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" | ||||
| "POT-Creation-Date: 2025-07-03 19:29+0700\n" | ||||
| "PO-Revision-Date: 2025-07-03 19:28+0700\n" | ||||
| "POT-Creation-Date: 2025-08-31 12:28+0500\n" | ||||
| "PO-Revision-Date: 2025-08-31 12:28+0500\n" | ||||
| "Last-Translator: \n" | ||||
| "Language: ru_RU\n" | ||||
| "Language-Team: ru_RU <LL@li.org>\n" | ||||
| @@ -27,18 +27,21 @@ msgstr "Ошибка" | ||||
| msgid "PortProton is not found" | ||||
| msgstr "PortProton не найден" | ||||
|  | ||||
| msgid "Stop Game" | ||||
| msgstr "Остановить игру" | ||||
|  | ||||
| msgid "Launch Game" | ||||
| msgstr "Запустить игру" | ||||
|  | ||||
| msgid "Remove from Favorites" | ||||
| msgstr "Удалить из Избранного" | ||||
|  | ||||
| msgid "Add to Favorites" | ||||
| msgstr "Добавить в Избранное" | ||||
|  | ||||
| msgid "Delete from PortProton" | ||||
| msgstr "Удалить из PortProton" | ||||
|  | ||||
| msgid "Stop Game" | ||||
| msgstr "Остановить игру" | ||||
|  | ||||
| msgid "Launch Game" | ||||
| msgstr "Запустить игру" | ||||
|  | ||||
| msgid "Import to Legendary" | ||||
| msgstr "Импортировать игру" | ||||
|  | ||||
| @@ -66,9 +69,6 @@ msgstr "Добавить в меню" | ||||
| msgid "Edit Shortcut" | ||||
| msgstr "Редактировать" | ||||
|  | ||||
| msgid "Delete from PortProton" | ||||
| msgstr "Удалить из PortProton" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Stopped '{game_name}'" | ||||
| msgstr "Остановлен(а) '{game_name}'" | ||||
| @@ -173,18 +173,6 @@ msgstr "Не удалось прочитать файл .desktop: {error}" | ||||
| msgid "No .desktop file found for '{game_name}'" | ||||
| msgstr "Файл .desktop для '{game_name}' не найден" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Invalid executable command: {exec_line}" | ||||
| msgstr "Недопустимая исполняемая команда: {exec_line}" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Executable not found: {path}" | ||||
| msgstr "Исполняемый файл не найден: {path}" | ||||
|  | ||||
| #, python-brace-format | ||||
| msgid "Failed to parse executable: {error}" | ||||
| msgstr "Не удалось разобрать исполняемый файл: {error}" | ||||
|  | ||||
| msgid "Confirm Deletion" | ||||
| msgstr "Подтвердите удаление" | ||||
|  | ||||
| @@ -267,12 +255,19 @@ msgstr "Удалить" | ||||
| msgid "Select All" | ||||
| msgstr "Выбрать всё" | ||||
|  | ||||
| msgid "Select" | ||||
| msgstr "Выбрать" | ||||
| #, python-brace-format | ||||
| msgid "Launching {0}" | ||||
| msgstr "Идёт запуск {0}" | ||||
|  | ||||
| msgid "Cancel" | ||||
| msgstr "Отмена" | ||||
|  | ||||
| msgid "File Explorer" | ||||
| msgstr "Проводник" | ||||
|  | ||||
| msgid "Select" | ||||
| msgstr "Выбрать" | ||||
|  | ||||
| msgid "Path: " | ||||
| msgstr "Путь: " | ||||
|  | ||||
| @@ -303,6 +298,12 @@ msgstr "Применить" | ||||
| msgid "Invalid image" | ||||
| msgstr "Недопустимое изображение" | ||||
|  | ||||
| msgid "Failed to download cover" | ||||
| msgstr "Не удалось скачать обложку" | ||||
|  | ||||
| msgid "Downloading cover..." | ||||
| msgstr "Скачивание обложки..." | ||||
|  | ||||
| msgid "No cover selected" | ||||
| msgstr "Обложка не выбрана" | ||||
|  | ||||
| @@ -345,6 +346,9 @@ msgstr "Бронза" | ||||
| msgid "Pending" | ||||
| msgstr "В ожидании" | ||||
|  | ||||
| msgid "Unknown Game" | ||||
| msgstr "Неизвестная игра" | ||||
|  | ||||
| msgid "Library" | ||||
| msgstr "Библиотека" | ||||
|  | ||||
| @@ -369,9 +373,6 @@ msgstr "Загрузка игр из Steam..." | ||||
| msgid "Loading PortProton games..." | ||||
| msgstr "Загрузка игр из PortProton..." | ||||
|  | ||||
| msgid "Unknown Game" | ||||
| msgstr "Неизвестная игра" | ||||
|  | ||||
| msgid "Game Library" | ||||
| msgstr "Игровая библиотека" | ||||
|  | ||||
| @@ -566,6 +567,15 @@ msgstr "Последний запуск" | ||||
| msgid "PLAY TIME" | ||||
| msgstr "Время игры" | ||||
|  | ||||
| msgid "MAIN STORY" | ||||
| msgstr "СЮЖЕТ" | ||||
|  | ||||
| msgid "MAIN + SIDES" | ||||
| msgstr "СЮЖЕТ + ПОБОЧКИ" | ||||
|  | ||||
| msgid "COMPLETIONIST" | ||||
| msgstr "100%" | ||||
|  | ||||
| msgid "full" | ||||
| msgstr "полная" | ||||
|  | ||||
| @@ -654,3 +664,24 @@ msgstr "мин." | ||||
| msgid "sec." | ||||
| msgstr "сек." | ||||
|  | ||||
| msgid "Show" | ||||
| msgstr "Показать" | ||||
|  | ||||
| msgid "Favorites" | ||||
| msgstr "Избранное" | ||||
|  | ||||
| msgid "Recent Games" | ||||
| msgstr "Недавние" | ||||
|  | ||||
| msgid "Exit" | ||||
| msgstr "Выход" | ||||
|  | ||||
| msgid "Hide" | ||||
| msgstr "Скрыть" | ||||
|  | ||||
| msgid "No favorites" | ||||
| msgstr "Нет избранных" | ||||
|  | ||||
| msgid "No recent games" | ||||
| msgstr "Нет недавних игр" | ||||
|  | ||||
|   | ||||
| @@ -1,6 +1,7 @@ | ||||
| import gettext | ||||
| from pathlib import Path | ||||
| import locale | ||||
| import os | ||||
| from babel import Locale | ||||
|  | ||||
| LOCALE_MAP = { | ||||
| @@ -72,3 +73,32 @@ def get_egs_language(): | ||||
|  | ||||
|     # Если что-то пошло не так — используем английский по умолчанию | ||||
|     return 'en' | ||||
|  | ||||
| def read_metadata_translations(metadata_file, language_code): | ||||
|     """ | ||||
|     Читает переводы из metadata.txt для указанного языка. | ||||
|     Возвращает словарь с полями name и description. | ||||
|     Для name: использует name_<language_code>, затем name_en, затем name, и наконец _('Unknown Game'). | ||||
|     Для description: использует description_<language_code>, затем description_en, затем description. | ||||
|     """ | ||||
|     translations = {'name': _('Unknown Game'), 'description': ''} | ||||
|     if not os.path.exists(metadata_file): | ||||
|         return translations | ||||
|  | ||||
|     with open(metadata_file, encoding='utf-8') as f: | ||||
|         for line in f: | ||||
|             line = line.strip() | ||||
|             if line.startswith(f'name_{language_code}='): | ||||
|                 translations['name'] = line[len(f'name_{language_code}='):].strip() | ||||
|             elif line.startswith('name_en=') and translations['name'] == _('Unknown Game'): | ||||
|                 translations['name'] = line[len('name_en='):].strip() | ||||
|             elif line.startswith('name=') and translations['name'] == _('Unknown Game'): | ||||
|                 translations['name'] = line[len('name='):].strip() | ||||
|             elif line.startswith(f'description_{language_code}='): | ||||
|                 translations['description'] = line[len(f'description_{language_code}='):].strip() | ||||
|             elif line.startswith('description_en=') and not translations['description']: | ||||
|                 translations['description'] = line[len('description_en='):].strip() | ||||
|             elif line.startswith('description=') and not translations['description']: | ||||
|                 translations['description'] = line[len('description='):].strip() | ||||
|  | ||||
|     return translations | ||||
|   | ||||
| @@ -10,7 +10,9 @@ import psutil | ||||
|  | ||||
| from portprotonqt.dialogs import AddGameDialog, FileExplorer | ||||
| from portprotonqt.game_card import GameCard | ||||
| from portprotonqt.animations import DetailPageAnimations | ||||
| from portprotonqt.custom_widgets import FlowLayout, ClickableLabel, AutoSizeButton, NavLabel | ||||
| from portprotonqt.portproton_api import PortProtonAPI | ||||
| from portprotonqt.input_manager import InputManager | ||||
| from portprotonqt.context_menu_manager import ContextMenuManager, CustomLineEdit | ||||
| from portprotonqt.system_overlay import SystemOverlay | ||||
| @@ -28,33 +30,34 @@ from portprotonqt.config_utils import ( | ||||
|     save_fullscreen_config, read_window_geometry, save_window_geometry, reset_config, | ||||
|     clear_cache, read_auto_fullscreen_gamepad, save_auto_fullscreen_gamepad, read_rumble_config, save_rumble_config | ||||
| ) | ||||
| from portprotonqt.localization import _ | ||||
| from portprotonqt.localization import _, get_egs_language, read_metadata_translations | ||||
| from portprotonqt.logger import get_logger | ||||
| from portprotonqt.howlongtobeat_api import HowLongToBeat | ||||
| from portprotonqt.downloader import Downloader | ||||
| from portprotonqt.tray_manager import TrayManager | ||||
|  | ||||
| from PySide6.QtWidgets import (QLineEdit, QMainWindow, QStatusBar, QWidget, QVBoxLayout, QLabel, QHBoxLayout, QStackedWidget, QComboBox, QScrollArea, QSlider, | ||||
|                                QDialog, QFormLayout, QFrame, QGraphicsDropShadowEffect, QMessageBox, QGraphicsEffect, QGraphicsOpacityEffect, QApplication, QPushButton, QProgressBar, QCheckBox) | ||||
|                                QDialog, QFormLayout, QFrame, QGraphicsDropShadowEffect, QMessageBox, QApplication, QPushButton, QProgressBar, QCheckBox, QSizePolicy) | ||||
| from PySide6.QtCore import Qt, QAbstractAnimation, QUrl, Signal, QTimer, Slot | ||||
| from PySide6.QtGui import QIcon, QPixmap, QColor, QDesktopServices | ||||
| from PySide6.QtCore import Qt, QAbstractAnimation, QPropertyAnimation, QByteArray, QUrl, Signal, QTimer, Slot | ||||
| from typing import cast | ||||
| from collections.abc import Callable | ||||
| from concurrent.futures import ThreadPoolExecutor | ||||
| from datetime import datetime | ||||
| from PySide6.QtWidgets import QSizePolicy | ||||
|  | ||||
| logger = get_logger(__name__) | ||||
|  | ||||
| class MainWindow(QMainWindow): | ||||
|     """Main window of PortProtonQt.""" | ||||
|     settings_saved = Signal() | ||||
|     games_loaded = Signal(list) | ||||
|     update_progress = Signal(int)  # Signal to update progress bar | ||||
|     update_status_message = Signal(str, int)  # Signal to update status message | ||||
|  | ||||
|     def __init__(self): | ||||
|     def __init__(self, app_name: str): | ||||
|         super().__init__() | ||||
|         # Создаём менеджер тем и читаем, какая тема выбрана | ||||
|         self.theme_manager = ThemeManager() | ||||
|         self.is_exiting = False | ||||
|         selected_theme = read_theme_from_config() | ||||
|         self.current_theme_name = selected_theme | ||||
|         try: | ||||
| @@ -66,8 +69,9 @@ class MainWindow(QMainWindow): | ||||
|             save_theme_to_config("standart") | ||||
|         if not self.theme: | ||||
|             self.theme = default_styles | ||||
|         self.tray_manager = TrayManager(self, app_name, self.current_theme_name) | ||||
|         self.card_width = read_card_size() | ||||
|         self.setWindowTitle("PortProtonQt") | ||||
|         self.setWindowTitle(app_name) | ||||
|         self.setMinimumSize(800, 600) | ||||
|  | ||||
|         self.games = [] | ||||
| @@ -120,6 +124,7 @@ class MainWindow(QMainWindow): | ||||
|  | ||||
|         self.legendary_path = os.path.join(self.legendary_config_path, "legendary") | ||||
|         self.downloader = Downloader(max_workers=4) | ||||
|         self.portproton_api = PortProtonAPI(self.downloader) | ||||
|  | ||||
|         # Статус-бар | ||||
|         self.setStatusBar(QStatusBar(self)) | ||||
| @@ -207,6 +212,7 @@ class MainWindow(QMainWindow): | ||||
|         self.restore_state() | ||||
|  | ||||
|         self.input_manager = InputManager(self) | ||||
|         self.detail_animations = DetailPageAnimations(self, self.theme) | ||||
|         QTimer.singleShot(0, self.loadGames) | ||||
|  | ||||
|         if read_fullscreen_config(): | ||||
| @@ -246,6 +252,16 @@ class MainWindow(QMainWindow): | ||||
|         self.updateGameGrid() | ||||
|         self.progress_bar.setVisible(False) | ||||
|  | ||||
|     def open_portproton_forum_topic(self, topic_name: str): | ||||
|         """Open the PortProton forum topic or search page for this game.""" | ||||
|         result = self.portproton_api.get_forum_topic_slug(topic_name) | ||||
|         base_url = "https://linux-gaming.ru/" | ||||
|         if result.startswith("search?q="): | ||||
|             url = QUrl(f"{base_url}{result}") | ||||
|         else: | ||||
|             url = QUrl(f"{base_url}t/{result}") | ||||
|         QDesktopServices.openUrl(url) | ||||
|  | ||||
|     def _on_card_focused(self, game_name: str, is_focused: bool): | ||||
|         """Обработчик сигнала focusChanged от GameCard.""" | ||||
|         card_key = None | ||||
| @@ -465,11 +481,9 @@ class MainWindow(QMainWindow): | ||||
|         os.makedirs(user_custom_folder, exist_ok=True) | ||||
|  | ||||
|         builtin_cover = "" | ||||
|         builtin_name = None | ||||
|         builtin_desc = None | ||||
|         user_cover = "" | ||||
|         user_name = None | ||||
|         user_desc = None | ||||
|         user_game_folder = "" | ||||
|         builtin_game_folder = "" | ||||
|  | ||||
|         if game_exe: | ||||
|             exe_name = os.path.splitext(os.path.basename(game_exe))[0] | ||||
| @@ -477,6 +491,19 @@ class MainWindow(QMainWindow): | ||||
|             user_game_folder = os.path.join(user_custom_folder, exe_name) | ||||
|             os.makedirs(user_game_folder, exist_ok=True) | ||||
|  | ||||
|             # Check if local game folder is empty and download assets if it is | ||||
|             if not os.listdir(user_game_folder): | ||||
|                 logger.debug(f"Local folder for {exe_name} is empty, checking repository") | ||||
|                 def on_assets_downloaded(results): | ||||
|                     nonlocal user_cover | ||||
|                     if results["cover"]: | ||||
|                         user_cover = results["cover"] | ||||
|                         logger.info(f"Downloaded assets for {exe_name}: {results}") | ||||
|                     if results["metadata"]: | ||||
|                         logger.info(f"Downloaded metadata for {exe_name}: {results['metadata']}") | ||||
|                 self.portproton_api.download_game_assets_async(exe_name, timeout=5, callback=on_assets_downloaded) | ||||
|  | ||||
|             # Read cover | ||||
|             builtin_files = set(os.listdir(builtin_game_folder)) if os.path.exists(builtin_game_folder) else set() | ||||
|             for ext in [".jpg", ".png", ".jpeg", ".bmp"]: | ||||
|                 candidate = f"cover{ext}" | ||||
| @@ -484,16 +511,6 @@ class MainWindow(QMainWindow): | ||||
|                     builtin_cover = os.path.join(builtin_game_folder, candidate) | ||||
|                     break | ||||
|  | ||||
|             builtin_metadata_file = os.path.join(builtin_game_folder, "metadata.txt") | ||||
|             if os.path.exists(builtin_metadata_file): | ||||
|                 with open(builtin_metadata_file, encoding="utf-8") as f: | ||||
|                     for line in f: | ||||
|                         line = line.strip() | ||||
|                         if line.startswith("name="): | ||||
|                             builtin_name = line[len("name="):].strip() | ||||
|                         elif line.startswith("description="): | ||||
|                             builtin_desc = line[len("description="):].strip() | ||||
|  | ||||
|             user_files = set(os.listdir(user_game_folder)) if os.path.exists(user_game_folder) else set() | ||||
|             for ext in [".jpg", ".png", ".jpeg", ".bmp"]: | ||||
|                 candidate = f"cover{ext}" | ||||
| @@ -501,16 +518,7 @@ class MainWindow(QMainWindow): | ||||
|                     user_cover = os.path.join(user_game_folder, candidate) | ||||
|                     break | ||||
|  | ||||
|             user_metadata_file = os.path.join(user_game_folder, "metadata.txt") | ||||
|             if os.path.exists(user_metadata_file): | ||||
|                 with open(user_metadata_file, encoding="utf-8") as f: | ||||
|                     for line in f: | ||||
|                         line = line.strip() | ||||
|                         if line.startswith("name="): | ||||
|                             user_name = line[len("name="):].strip() | ||||
|                         elif line.startswith("description="): | ||||
|                             user_desc = line[len("description="):].strip() | ||||
|  | ||||
|             # Read statistics | ||||
|             if self.portproton_location: | ||||
|                 statistics_file = os.path.join(self.portproton_location, "data", "tmp", "statistics") | ||||
|                 try: | ||||
| @@ -523,16 +531,29 @@ class MainWindow(QMainWindow): | ||||
|                         playtime_seconds = playtime_data[matching_key] | ||||
|                         formatted_playtime = format_playtime(playtime_seconds) | ||||
|                 except Exception as e: | ||||
|                     print(f"Failed to parse playtime data: {e}") | ||||
|                     logger.error(f"Failed to parse playtime data: {e}") | ||||
|  | ||||
|         def on_steam_info(steam_info: dict): | ||||
|             final_name = user_name or builtin_name or desktop_name | ||||
|             final_desc = (user_desc if user_desc is not None else | ||||
|                         builtin_desc if builtin_desc is not None else | ||||
|                         steam_info.get("description", "")) | ||||
|             # Get current language | ||||
|             language_code = get_egs_language() | ||||
|  | ||||
|             # Read translations from metadata.txt | ||||
|             user_metadata_file = os.path.join(user_game_folder, "metadata.txt") | ||||
|             builtin_metadata_file = os.path.join(builtin_game_folder, "metadata.txt") | ||||
|  | ||||
|             # Try user translations first | ||||
|             translations = {'name': desktop_name, 'description': ''} | ||||
|             if os.path.exists(user_metadata_file): | ||||
|                 translations = read_metadata_translations(user_metadata_file, language_code) | ||||
|             elif os.path.exists(builtin_metadata_file): | ||||
|                 translations = read_metadata_translations(builtin_metadata_file, language_code) | ||||
|  | ||||
|             final_name = translations['name'] | ||||
|             final_desc = translations['description'] or steam_info.get("description", "") | ||||
|             final_cover = (user_cover if user_cover else | ||||
|                         builtin_cover if builtin_cover else | ||||
|                         steam_info.get("cover", "") or entry.get("Icon", "")) | ||||
|  | ||||
|             callback(( | ||||
|                 final_name, | ||||
|                 final_desc, | ||||
| @@ -680,6 +701,15 @@ class MainWindow(QMainWindow): | ||||
|  | ||||
|     def resizeEvent(self, event): | ||||
|         super().resizeEvent(event) | ||||
|         if hasattr(self, '_animations') and self._animations: | ||||
|             for widget, animation in list(self._animations.items()): | ||||
|                 try: | ||||
|                     if animation.state() == QAbstractAnimation.State.Running: | ||||
|                         animation.stop() | ||||
|                         widget.setWindowOpacity(1.0) | ||||
|                         del self._animations[widget] | ||||
|                 except RuntimeError: | ||||
|                     del self._animations[widget] | ||||
|         if not hasattr(self, '_last_width'): | ||||
|             self._last_width = self.width() | ||||
|         if abs(self.width() - self._last_width) > 10: | ||||
| @@ -1303,7 +1333,6 @@ class MainWindow(QMainWindow): | ||||
|  | ||||
|         self.settingsDebounceTimer.start() | ||||
|  | ||||
|         self.settings_saved.emit() | ||||
|  | ||||
|         # Управление полноэкранным режимом | ||||
|         gamepad_connected = self.input_manager.find_gamepad() is not None | ||||
| @@ -1499,25 +1528,48 @@ class MainWindow(QMainWindow): | ||||
|         detailPage = QWidget() | ||||
|         self._animations = {} | ||||
|         imageLabel = QLabel() | ||||
|         imageLabel.setFixedSize(300, 400) | ||||
|         imageLabel.setFixedSize(300, 450) | ||||
|         self._detail_page_active = True | ||||
|         self._current_detail_page = detailPage | ||||
|  | ||||
|         if cover_path: | ||||
|             def on_pixmap_ready(pixmap): | ||||
|                 rounded = round_corners(pixmap, 10) | ||||
|                 imageLabel.setPixmap(rounded) | ||||
|         # Функция загрузки изображения и обновления стилей | ||||
|         def load_image_and_restore_effect(): | ||||
|             if not detailPage or detailPage.isHidden(): | ||||
|                 logger.warning("Detail page is None or hidden, skipping image load") | ||||
|                 return | ||||
|  | ||||
|                 def on_palette_ready(palette): | ||||
|                     dark_palette = [self.darkenColor(color, factor=200) for color in palette] | ||||
|                     stops = ",\n".join( | ||||
|                         [f"stop:{i/(len(dark_palette)-1):.2f} {dark_palette[i].name()}" for i in range(len(dark_palette))] | ||||
|                     ) | ||||
|                     detailPage.setStyleSheet(self.theme.detail_page_style(stops)) | ||||
|             detailPage.setWindowOpacity(1.0) | ||||
|  | ||||
|                 self.getColorPalette_async(cover_path, num_colors=5, callback=on_palette_ready) | ||||
|             if cover_path: | ||||
|                 def on_pixmap_ready(pixmap): | ||||
|                     if not detailPage or detailPage.isHidden(): | ||||
|                         logger.warning("Detail page is None or hidden, skipping pixmap update") | ||||
|                         return | ||||
|                     rounded = round_corners(pixmap, 10) | ||||
|                     imageLabel.setPixmap(rounded) | ||||
|                     logger.debug("Pixmap set for imageLabel") | ||||
|  | ||||
|             load_pixmap_async(cover_path, 300, 400, on_pixmap_ready) | ||||
|         else: | ||||
|             detailPage.setStyleSheet(self.theme.DETAIL_PAGE_NO_COVER_STYLE) | ||||
|                     def on_palette_ready(palette): | ||||
|                         if not detailPage or detailPage.isHidden(): | ||||
|                             logger.warning("Detail page is None or hidden, skipping palette update") | ||||
|                             return | ||||
|                         dark_palette = [self.darkenColor(color, factor=200) for color in palette] | ||||
|                         stops = ",\n".join( | ||||
|                             [f"stop:{i/(len(dark_palette)-1):.2f} {dark_palette[i].name()}" for i in range(len(dark_palette))] | ||||
|                         ) | ||||
|                         detailPage.setStyleSheet(self.theme.detail_page_style(stops)) | ||||
|                         detailPage.update() | ||||
|                         logger.debug("Stylesheet updated with palette") | ||||
|  | ||||
|                     self.getColorPalette_async(cover_path, num_colors=5, callback=on_palette_ready) | ||||
|                 load_pixmap_async(cover_path, 300, 450, on_pixmap_ready) | ||||
|             else: | ||||
|                 detailPage.setStyleSheet(self.theme.DETAIL_PAGE_NO_COVER_STYLE) | ||||
|                 detailPage.update() | ||||
|  | ||||
|         def cleanup_animation(): | ||||
|             if detailPage in self._animations: | ||||
|                 del self._animations[detailPage] | ||||
|  | ||||
|         mainLayout = QVBoxLayout(detailPage) | ||||
|         mainLayout.setContentsMargins(30, 30, 30, 30) | ||||
| @@ -1538,7 +1590,7 @@ class MainWindow(QMainWindow): | ||||
|  | ||||
|         # Обложка (слева) | ||||
|         coverFrame = QFrame() | ||||
|         coverFrame.setFixedSize(300, 400) | ||||
|         coverFrame.setFixedSize(300, 450) | ||||
|         coverFrame.setStyleSheet(self.theme.COVER_FRAME_STYLE) | ||||
|         shadow = QGraphicsDropShadowEffect(coverFrame) | ||||
|         shadow.setBlurRadius(20) | ||||
| @@ -1572,7 +1624,7 @@ class MainWindow(QMainWindow): | ||||
|         badge_spacing = 5 | ||||
|         top_y = 10 | ||||
|         badge_y_positions = [] | ||||
|         badge_width = int(300 * 2/3)  # 2/3 ширины обложки (300 px) | ||||
|         badge_width = int(300 * 2/3) | ||||
|  | ||||
|         # ProtonDB бейдж | ||||
|         protondb_text = GameCard.getProtonDBText(protondb_tier) | ||||
| @@ -1625,18 +1677,18 @@ class MainWindow(QMainWindow): | ||||
|         egsLabel.setVisible(egs_visible) | ||||
|  | ||||
|         # PortProton badge | ||||
|         portproton_icon = self.theme_manager.get_icon("ppqt-tray") | ||||
|         portproton_icon = self.theme_manager.get_icon("portproton") | ||||
|         portprotonLabel = ClickableLabel( | ||||
|             "PortProton", | ||||
|             icon=portproton_icon, | ||||
|             parent=coverFrame, | ||||
|             icon_size=16, | ||||
|             icon_space=5, | ||||
|             change_cursor=False | ||||
|         ) | ||||
|         portprotonLabel.setStyleSheet(self.theme.STEAM_BADGE_STYLE) | ||||
|         portprotonLabel.setFixedWidth(badge_width) | ||||
|         portprotonLabel.setVisible(portproton_visible) | ||||
|         portprotonLabel.clicked.connect(lambda: self.open_portproton_forum_topic(name)) | ||||
|  | ||||
|         # WeAntiCheatYet бейдж | ||||
|         anticheat_text = GameCard.getAntiCheatText(anticheat_status) | ||||
| @@ -1661,11 +1713,6 @@ class MainWindow(QMainWindow): | ||||
|             anticheat_visible = False | ||||
|  | ||||
|         # Расположение бейджей | ||||
|         right_margin = 8 | ||||
|         badge_spacing = 5 | ||||
|         top_y = 10 | ||||
|         badge_y_positions = [] | ||||
|         badge_width = int(300 * 2/3) | ||||
|         if steam_visible: | ||||
|             steam_x = 300 - badge_width - right_margin | ||||
|             steamLabel.move(steam_x, top_y) | ||||
| @@ -1719,22 +1766,102 @@ class MainWindow(QMainWindow): | ||||
|         descLabel.setStyleSheet(self.theme.DETAIL_PAGE_DESC_STYLE) | ||||
|         detailsLayout.addWidget(descLabel) | ||||
|  | ||||
|         infoLayout = QHBoxLayout() | ||||
|         infoLayout.setSpacing(10) | ||||
|         # Инициализация HowLongToBeat | ||||
|         hltb = HowLongToBeat(parent=self) | ||||
|  | ||||
|         # Создаем общий layout для всей игровой информации | ||||
|         gameInfoLayout = QVBoxLayout() | ||||
|         gameInfoLayout.setSpacing(10) | ||||
|  | ||||
|         # Первая строка: Last Launch и Play Time | ||||
|         firstRowLayout = QHBoxLayout() | ||||
|         firstRowLayout.setSpacing(10) | ||||
|  | ||||
|         # Last Launch | ||||
|         lastLaunchTitle = QLabel(_("LAST LAUNCH")) | ||||
|         lastLaunchTitle.setStyleSheet(self.theme.LAST_LAUNCH_TITLE_STYLE) | ||||
|         lastLaunchValue = QLabel(last_launch) | ||||
|         lastLaunchValue.setStyleSheet(self.theme.LAST_LAUNCH_VALUE_STYLE) | ||||
|         firstRowLayout.addWidget(lastLaunchTitle) | ||||
|         firstRowLayout.addWidget(lastLaunchValue) | ||||
|         firstRowLayout.addSpacing(30) | ||||
|  | ||||
|         # Play Time | ||||
|         playTimeTitle = QLabel(_("PLAY TIME")) | ||||
|         playTimeTitle.setStyleSheet(self.theme.PLAY_TIME_TITLE_STYLE) | ||||
|         playTimeValue = QLabel(formatted_playtime) | ||||
|         playTimeValue.setStyleSheet(self.theme.PLAY_TIME_VALUE_STYLE) | ||||
|         infoLayout.addWidget(lastLaunchTitle) | ||||
|         infoLayout.addWidget(lastLaunchValue) | ||||
|         infoLayout.addSpacing(30) | ||||
|         infoLayout.addWidget(playTimeTitle) | ||||
|         infoLayout.addWidget(playTimeValue) | ||||
|         detailsLayout.addLayout(infoLayout) | ||||
|         firstRowLayout.addWidget(playTimeTitle) | ||||
|         firstRowLayout.addWidget(playTimeValue) | ||||
|  | ||||
|         gameInfoLayout.addLayout(firstRowLayout) | ||||
|  | ||||
|         # Создаем placeholder для второй строки (HLTB данные) | ||||
|         hltbLayout = QHBoxLayout() | ||||
|         hltbLayout.setSpacing(10) | ||||
|  | ||||
|         # Время прохождения (Main Story, Main + Sides, Completionist) | ||||
|         def on_hltb_results(results): | ||||
|             if not hasattr(self, '_detail_page_active') or not self._detail_page_active: | ||||
|                 return | ||||
|             if not self._current_detail_page or self._current_detail_page.isHidden() or not self._current_detail_page.parent(): | ||||
|                 return | ||||
|  | ||||
|             if results: | ||||
|                 game = results[0]  # Берем первый результат | ||||
|                 main_story_time = hltb.format_game_time(game, "main_story") | ||||
|                 main_extra_time = hltb.format_game_time(game, "main_extra") | ||||
|                 completionist_time = hltb.format_game_time(game, "completionist") | ||||
|  | ||||
|                 # Очищаем layout перед добавлением новых элементов | ||||
|                 while hltbLayout.count(): | ||||
|                     child = hltbLayout.takeAt(0) | ||||
|                     if child.widget(): | ||||
|                         child.widget().deleteLater() | ||||
|  | ||||
|                 has_data = False | ||||
|  | ||||
|                 if main_story_time is not None: | ||||
|                     mainStoryTitle = QLabel(_("MAIN STORY")) | ||||
|                     mainStoryTitle.setStyleSheet(self.theme.LAST_LAUNCH_TITLE_STYLE) | ||||
|                     mainStoryValue = QLabel(main_story_time) | ||||
|                     mainStoryValue.setStyleSheet(self.theme.LAST_LAUNCH_VALUE_STYLE) | ||||
|                     hltbLayout.addWidget(mainStoryTitle) | ||||
|                     hltbLayout.addWidget(mainStoryValue) | ||||
|                     hltbLayout.addSpacing(30) | ||||
|                     has_data = True | ||||
|  | ||||
|                 if main_extra_time is not None: | ||||
|                     mainExtraTitle = QLabel(_("MAIN + SIDES")) | ||||
|                     mainExtraTitle.setStyleSheet(self.theme.PLAY_TIME_TITLE_STYLE) | ||||
|                     mainExtraValue = QLabel(main_extra_time) | ||||
|                     mainExtraValue.setStyleSheet(self.theme.PLAY_TIME_VALUE_STYLE) | ||||
|                     hltbLayout.addWidget(mainExtraTitle) | ||||
|                     hltbLayout.addWidget(mainExtraValue) | ||||
|                     hltbLayout.addSpacing(30) | ||||
|                     has_data = True | ||||
|  | ||||
|                 if completionist_time is not None: | ||||
|                     completionistTitle = QLabel(_("COMPLETIONIST")) | ||||
|                     completionistTitle.setStyleSheet(self.theme.LAST_LAUNCH_TITLE_STYLE) | ||||
|                     completionistValue = QLabel(completionist_time) | ||||
|                     completionistValue.setStyleSheet(self.theme.LAST_LAUNCH_VALUE_STYLE) | ||||
|                     hltbLayout.addWidget(completionistTitle) | ||||
|                     hltbLayout.addWidget(completionistValue) | ||||
|                     has_data = True | ||||
|  | ||||
|                 # Если есть данные, добавляем layout во вторую строку | ||||
|                 if has_data: | ||||
|                     gameInfoLayout.addLayout(hltbLayout) | ||||
|  | ||||
|         # Подключаем сигнал searchCompleted к on_hltb_results | ||||
|         hltb.searchCompleted.connect(on_hltb_results) | ||||
|  | ||||
|         # Запускаем поиск в фоновом потоке | ||||
|         hltb.search_with_callback(name, case_sensitive=False) | ||||
|  | ||||
|         # Добавляем общий layout с игровой информацией | ||||
|         detailsLayout.addLayout(gameInfoLayout) | ||||
|  | ||||
|         if controller_support: | ||||
|             cs = controller_support.lower() | ||||
| @@ -1752,7 +1879,7 @@ class MainWindow(QMainWindow): | ||||
|  | ||||
|         detailsLayout.addStretch(1) | ||||
|  | ||||
|         # Определяем текущий идентификатор игры по exec_line для корректного отображения кнопки | ||||
|         # Определяем текущий идентификатор игры по exec_line | ||||
|         entry_exec_split = shlex.split(exec_line) | ||||
|         if not entry_exec_split: | ||||
|             return | ||||
| @@ -1785,17 +1912,7 @@ class MainWindow(QMainWindow): | ||||
|         self.current_play_button = playButton | ||||
|  | ||||
|         # Анимация | ||||
|         opacityEffect = QGraphicsOpacityEffect(detailPage) | ||||
|         detailPage.setGraphicsEffect(opacityEffect) | ||||
|         animation = QPropertyAnimation(opacityEffect, QByteArray(b"opacity")) | ||||
|         animation.setDuration(800) | ||||
|         animation.setStartValue(0) | ||||
|         animation.setEndValue(1) | ||||
|         animation.start(QAbstractAnimation.DeletionPolicy.DeleteWhenStopped) | ||||
|         self._animations[detailPage] = animation | ||||
|         animation.finished.connect( | ||||
|             lambda: detailPage.setGraphicsEffect(cast(QGraphicsEffect, None)) | ||||
|         ) | ||||
|         self.detail_animations.animate_detail_page(detailPage, load_image_and_restore_effect, cleanup_animation) | ||||
|  | ||||
|     def toggleFavoriteInDetailPage(self, game_name, label): | ||||
|         favorites = read_favorites() | ||||
| @@ -1851,14 +1968,42 @@ class MainWindow(QMainWindow): | ||||
|             parent = parent.parent() | ||||
|  | ||||
|     def goBackDetailPage(self, page: QWidget | None) -> None: | ||||
|         if page is None or page != self.stackedWidget.currentWidget(): | ||||
|         if page is None or page != self.stackedWidget.currentWidget() or getattr(self, '_exit_animation_in_progress', False): | ||||
|             return | ||||
|         self.stackedWidget.setCurrentIndex(0) | ||||
|         self.stackedWidget.removeWidget(page) | ||||
|         page.deleteLater() | ||||
|         self.currentDetailPage = None | ||||
|         self.current_exec_line = None | ||||
|         self.current_play_button = None | ||||
|         self._exit_animation_in_progress = True | ||||
|         self._detail_page_active = False | ||||
|         self._current_detail_page = None | ||||
|  | ||||
|         def cleanup(): | ||||
|             """Helper function to clean up after animation.""" | ||||
|             try: | ||||
|                 if page in self._animations: | ||||
|                     animation = self._animations[page] | ||||
|                     try: | ||||
|                         if animation.state() == QAbstractAnimation.State.Running: | ||||
|                             animation.stop() | ||||
|                     except RuntimeError: | ||||
|                         pass  # Animation already deleted | ||||
|                     finally: | ||||
|                         del self._animations[page] | ||||
|                 self.stackedWidget.setCurrentIndex(0) | ||||
|                 self.stackedWidget.removeWidget(page) | ||||
|                 page.deleteLater() | ||||
|                 self.currentDetailPage = None | ||||
|                 self.current_exec_line = None | ||||
|                 self.current_play_button = None | ||||
|                 self._exit_animation_in_progress = False | ||||
|             except Exception as e: | ||||
|                 logger.error(f"Error in cleanup: {e}", exc_info=True) | ||||
|                 self._exit_animation_in_progress = False | ||||
|  | ||||
|         # Start exit animation | ||||
|         try: | ||||
|             self.detail_animations.animate_detail_page_exit(page, cleanup) | ||||
|         except Exception as e: | ||||
|             logger.error(f"Error starting exit animation: {e}", exc_info=True) | ||||
|             self._exit_animation_in_progress = False | ||||
|             cleanup()  # Fallback to cleanup if animation fails | ||||
|  | ||||
|     def is_target_exe_running(self): | ||||
|         """Проверяет, запущен ли процесс с именем self.target_exe через psutil.""" | ||||
| @@ -2124,46 +2269,51 @@ class MainWindow(QMainWindow): | ||||
|  | ||||
|  | ||||
|     def closeEvent(self, event): | ||||
|         """Завершает все дочерние процессы и сохраняет настройки при закрытии окна.""" | ||||
|         for proc in self.game_processes: | ||||
|             try: | ||||
|                 parent = psutil.Process(proc.pid) | ||||
|                 children = parent.children(recursive=True) | ||||
|                 for child in children: | ||||
|                     try: | ||||
|                         logger.debug(f"Terminating child process {child.pid}") | ||||
|                         child.terminate() | ||||
|                     except psutil.NoSuchProcess: | ||||
|                         logger.debug(f"Child process {child.pid} already terminated") | ||||
|                 psutil.wait_procs(children, timeout=5) | ||||
|                 for child in children: | ||||
|                     if child.is_running(): | ||||
|                         logger.debug(f"Killing child process {child.pid}") | ||||
|                         child.kill() | ||||
|                 logger.debug(f"Terminating process group {proc.pid}") | ||||
|                 os.killpg(os.getpgid(proc.pid), signal.SIGTERM) | ||||
|             except (psutil.NoSuchProcess, ProcessLookupError) as e: | ||||
|                 logger.debug(f"Process {proc.pid} already terminated: {e}") | ||||
|         """Обработчик закрытия окна: сворачивает приложение в трей, если не требуется принудительный выход.""" | ||||
|         if hasattr(self, 'is_exiting') and self.is_exiting: | ||||
|             # Принудительное закрытие: завершаем процессы и приложение | ||||
|             for proc in self.game_processes: | ||||
|                 try: | ||||
|                     parent = psutil.Process(proc.pid) | ||||
|                     children = parent.children(recursive=True) | ||||
|                     for child in children: | ||||
|                         try: | ||||
|                             logger.debug(f"Terminating child process {child.pid}") | ||||
|                             child.terminate() | ||||
|                         except psutil.NoSuchProcess: | ||||
|                             logger.debug(f"Child process {child.pid} already terminated") | ||||
|                     psutil.wait_procs(children, timeout=5) | ||||
|                     for child in children: | ||||
|                         if child.is_running(): | ||||
|                             logger.debug(f"Killing child process {child.pid}") | ||||
|                             child.kill() | ||||
|                     logger.debug(f"Terminating process group {proc.pid}") | ||||
|                     os.killpg(os.getpgid(proc.pid), signal.SIGTERM) | ||||
|                 except (psutil.NoSuchProcess, ProcessLookupError) as e: | ||||
|                     logger.debug(f"Process {proc.pid} already terminated: {e}") | ||||
|  | ||||
|         self.game_processes = []  # Очищаем список процессов | ||||
|             self.game_processes = []  # Очищаем список процессов | ||||
|  | ||||
|         # Сохраняем настройки окна | ||||
|         if not read_fullscreen_config(): | ||||
|             logger.debug(f"Saving window geometry: {self.width()}x{self.height()}") | ||||
|             save_window_geometry(self.width(), self.height()) | ||||
|         save_card_size(self.card_width) | ||||
|             # Очищаем таймеры | ||||
|             if hasattr(self, 'games_load_timer') and self.games_load_timer.isActive(): | ||||
|                 self.games_load_timer.stop() | ||||
|             if hasattr(self, 'settingsDebounceTimer') and self.settingsDebounceTimer.isActive(): | ||||
|                 self.settingsDebounceTimer.stop() | ||||
|             if hasattr(self, 'searchDebounceTimer') and self.searchDebounceTimer.isActive(): | ||||
|                 self.searchDebounceTimer.stop() | ||||
|             if hasattr(self, 'checkProcessTimer') and self.checkProcessTimer and self.checkProcessTimer.isActive(): | ||||
|                 self.checkProcessTimer.stop() | ||||
|                 self.checkProcessTimer.deleteLater() | ||||
|                 self.checkProcessTimer = None | ||||
|  | ||||
|         # Очищаем таймеры и другие ресурсы | ||||
|         if hasattr(self, 'games_load_timer') and self.games_load_timer.isActive(): | ||||
|             self.games_load_timer.stop() | ||||
|         if hasattr(self, 'settingsDebounceTimer') and self.settingsDebounceTimer.isActive(): | ||||
|             self.settingsDebounceTimer.stop() | ||||
|         if hasattr(self, 'searchDebounceTimer') and self.searchDebounceTimer.isActive(): | ||||
|             self.searchDebounceTimer.stop() | ||||
|         if hasattr(self, 'checkProcessTimer') and self.checkProcessTimer and self.checkProcessTimer.isActive(): | ||||
|             self.checkProcessTimer.stop() | ||||
|             self.checkProcessTimer.deleteLater() | ||||
|             self.checkProcessTimer = None | ||||
|             # Сохраняем настройки окна | ||||
|             if not read_fullscreen_config(): | ||||
|                 logger.debug(f"Saving window geometry: {self.width()}x{self.height()}") | ||||
|                 save_window_geometry(self.width(), self.height()) | ||||
|             save_card_size(self.card_width) | ||||
|  | ||||
|         QApplication.quit() | ||||
|         event.accept() | ||||
|             event.accept() | ||||
|         else: | ||||
|             # Сворачиваем в трей вместо закрытия | ||||
|             self.hide() | ||||
|             event.ignore() | ||||
|   | ||||
							
								
								
									
										227
									
								
								portprotonqt/portproton_api.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						| @@ -0,0 +1,227 @@ | ||||
| import os | ||||
| import tarfile | ||||
| import orjson | ||||
| import requests | ||||
| import urllib.parse | ||||
| import time | ||||
| from collections.abc import Callable | ||||
| from portprotonqt.downloader import Downloader | ||||
| from portprotonqt.logger import get_logger | ||||
|  | ||||
| logger = get_logger(__name__) | ||||
| CACHE_DURATION = 30 * 24 * 60 * 60  # 30 days in seconds | ||||
|  | ||||
| def normalize_name(s): | ||||
|     """ | ||||
|     Приведение строки к нормальному виду: | ||||
|     - перевод в нижний регистр, | ||||
|     - удаление символов ™ и ®, | ||||
|     - замена разделителей (-, :, ,) на пробел, | ||||
|     - удаление лишних пробелов, | ||||
|     - удаление суффиксов 'bin' или 'app' в конце строки, | ||||
|     - удаление ключевых слов типа 'ultimate', 'edition' и т.п. | ||||
|     """ | ||||
|     s = s.lower() | ||||
|     for ch in ["™", "®"]: | ||||
|         s = s.replace(ch, "") | ||||
|     for ch in ["-", ":", ","]: | ||||
|         s = s.replace(ch, " ") | ||||
|     s = " ".join(s.split()) | ||||
|     for suffix in ["bin", "app"]: | ||||
|         if s.endswith(suffix): | ||||
|             s = s[:-len(suffix)].strip() | ||||
|  | ||||
|     keywords_to_remove = {"ultimate", "edition", "definitive", "complete", "remastered"} | ||||
|     words = s.split() | ||||
|     filtered_words = [word for word in words if word not in keywords_to_remove] | ||||
|     return " ".join(filtered_words) | ||||
|  | ||||
| def get_cache_dir(): | ||||
|     """Return the cache directory path, creating it if necessary.""" | ||||
|     xdg_cache_home = os.getenv("XDG_CACHE_HOME", os.path.join(os.path.expanduser("~"), ".cache")) | ||||
|     cache_dir = os.path.join(xdg_cache_home, "PortProtonQt") | ||||
|     os.makedirs(cache_dir, exist_ok=True) | ||||
|     return cache_dir | ||||
|  | ||||
| class PortProtonAPI: | ||||
|     """API to fetch game assets (cover, metadata) and forum topics from the PortProtonQt repository.""" | ||||
|     def __init__(self, downloader: Downloader | None = None): | ||||
|         self.base_url = "https://git.linux-gaming.ru/Boria138/PortProtonQt/raw/branch/main/portprotonqt/custom_data" | ||||
|         self.topics_url = "https://git.linux-gaming.ru/Boria138/PortProtonQt/raw/branch/main/data/linux_gaming_topics.tar.xz" | ||||
|         self.downloader = downloader or Downloader(max_workers=4) | ||||
|         self.xdg_data_home = os.getenv("XDG_DATA_HOME", os.path.join(os.path.expanduser("~"), ".local", "share")) | ||||
|         self.custom_data_dir = os.path.join(self.xdg_data_home, "PortProtonQt", "custom_data") | ||||
|         os.makedirs(self.custom_data_dir, exist_ok=True) | ||||
|         self._topics_data = None | ||||
|  | ||||
|     def _get_game_dir(self, exe_name: str) -> str: | ||||
|         game_dir = os.path.join(self.custom_data_dir, exe_name) | ||||
|         os.makedirs(game_dir, exist_ok=True) | ||||
|         return game_dir | ||||
|  | ||||
|     def _check_file_exists(self, url: str, timeout: int = 5) -> bool: | ||||
|         try: | ||||
|             response = requests.head(url, timeout=timeout) | ||||
|             response.raise_for_status() | ||||
|             return response.status_code == 200 | ||||
|         except requests.RequestException as e: | ||||
|             logger.debug(f"Failed to check file at {url}: {e}") | ||||
|             return False | ||||
|  | ||||
|     def download_game_assets(self, exe_name: str, timeout: int = 5) -> dict[str, str | None]: | ||||
|         game_dir = self._get_game_dir(exe_name) | ||||
|         results: dict[str, str | None] = {"cover": None, "metadata": None} | ||||
|         cover_extensions = [".png", ".jpg", ".jpeg", ".bmp"] | ||||
|         cover_url_base = f"{self.base_url}/{exe_name}/cover" | ||||
|         metadata_url = f"{self.base_url}/{exe_name}/metadata.txt" | ||||
|  | ||||
|         for ext in cover_extensions: | ||||
|             cover_url = f"{cover_url_base}{ext}" | ||||
|             if self._check_file_exists(cover_url, timeout): | ||||
|                 local_cover_path = os.path.join(game_dir, f"cover{ext}") | ||||
|                 result = self.downloader.download(cover_url, local_cover_path, timeout=timeout) | ||||
|                 if result: | ||||
|                     results["cover"] = result | ||||
|                     logger.info(f"Downloaded cover for {exe_name} to {result}") | ||||
|                     break | ||||
|                 else: | ||||
|                     logger.error(f"Failed to download cover for {exe_name} from {cover_url}") | ||||
|             else: | ||||
|                 logger.debug(f"No cover found for {exe_name} with extension {ext}") | ||||
|  | ||||
|         if self._check_file_exists(metadata_url, timeout): | ||||
|             local_metadata_path = os.path.join(game_dir, "metadata.txt") | ||||
|             result = self.downloader.download(metadata_url, local_metadata_path, timeout=timeout) | ||||
|             if result: | ||||
|                 results["metadata"] = result | ||||
|                 logger.info(f"Downloaded metadata for {exe_name} to {result}") | ||||
|             else: | ||||
|                 logger.error(f"Failed to download metadata for {exe_name} from {metadata_url}") | ||||
|         else: | ||||
|             logger.debug(f"No metadata found for {exe_name}") | ||||
|  | ||||
|         return results | ||||
|  | ||||
|     def download_game_assets_async(self, exe_name: str, timeout: int = 5, callback: Callable[[dict[str, str | None]], None] | None = None) -> None: | ||||
|         game_dir = self._get_game_dir(exe_name) | ||||
|         cover_extensions = [".png", ".jpg", ".jpeg", ".bmp"] | ||||
|         cover_url_base = f"{self.base_url}/{exe_name}/cover" | ||||
|         metadata_url = f"{self.base_url}/{exe_name}/metadata.txt" | ||||
|  | ||||
|         results: dict[str, str | None] = {"cover": None, "metadata": None} | ||||
|         pending_downloads = 0 | ||||
|  | ||||
|         def on_cover_downloaded(local_path: str | None, ext: str): | ||||
|             nonlocal pending_downloads | ||||
|             if local_path: | ||||
|                 logger.info(f"Async cover downloaded for {exe_name}: {local_path}") | ||||
|                 results["cover"] = local_path | ||||
|             else: | ||||
|                 logger.debug(f"No cover downloaded for {exe_name} with extension {ext}") | ||||
|             pending_downloads -= 1 | ||||
|             check_completion() | ||||
|  | ||||
|         def on_metadata_downloaded(local_path: str | None): | ||||
|             nonlocal pending_downloads | ||||
|             if local_path: | ||||
|                 logger.info(f"Async metadata downloaded for {exe_name}: {local_path}") | ||||
|                 results["metadata"] = local_path | ||||
|             else: | ||||
|                 logger.debug(f"No metadata downloaded for {exe_name}") | ||||
|             pending_downloads -= 1 | ||||
|             check_completion() | ||||
|  | ||||
|         def check_completion(): | ||||
|             if pending_downloads == 0 and callback: | ||||
|                 callback(results) | ||||
|  | ||||
|         for ext in cover_extensions: | ||||
|             cover_url = f"{cover_url_base}{ext}" | ||||
|             if self._check_file_exists(cover_url, timeout): | ||||
|                 local_cover_path = os.path.join(game_dir, f"cover{ext}") | ||||
|                 pending_downloads += 1 | ||||
|                 self.downloader.download_async( | ||||
|                     cover_url, | ||||
|                     local_cover_path, | ||||
|                     timeout=timeout, | ||||
|                     callback=lambda path, ext=ext: on_cover_downloaded(path, ext) | ||||
|                 ) | ||||
|                 break | ||||
|  | ||||
|         if self._check_file_exists(metadata_url, timeout): | ||||
|             local_metadata_path = os.path.join(game_dir, "metadata.txt") | ||||
|             pending_downloads += 1 | ||||
|             self.downloader.download_async( | ||||
|                 metadata_url, | ||||
|                 local_metadata_path, | ||||
|                 timeout=timeout, | ||||
|                 callback=on_metadata_downloaded | ||||
|             ) | ||||
|  | ||||
|         if pending_downloads == 0: | ||||
|             logger.debug(f"No assets found for {exe_name}") | ||||
|             if callback: | ||||
|                 callback(results) | ||||
|  | ||||
|     def _load_topics_data(self): | ||||
|         """Load and cache linux_gaming_topics_min.json from the archive.""" | ||||
|         if self._topics_data is not None: | ||||
|             return self._topics_data | ||||
|  | ||||
|         cache_dir = get_cache_dir() | ||||
|         cache_tar = os.path.join(cache_dir, "linux_gaming_topics.tar.xz") | ||||
|         cache_json = os.path.join(cache_dir, "linux_gaming_topics_min.json") | ||||
|  | ||||
|         if os.path.exists(cache_json) and (time.time() - os.path.getmtime(cache_json) < CACHE_DURATION): | ||||
|             logger.info("Using cached topics JSON: %s", cache_json) | ||||
|             try: | ||||
|                 with open(cache_json, "rb") as f: | ||||
|                     self._topics_data = orjson.loads(f.read()) | ||||
|                 logger.debug("Loaded %d topics from cache", len(self._topics_data)) | ||||
|                 return self._topics_data | ||||
|             except Exception as e: | ||||
|                 logger.error("Error reading cached topics JSON: %s", e) | ||||
|                 self._topics_data = [] | ||||
|  | ||||
|         def process_tar(result: str | None): | ||||
|             if not result or not os.path.exists(result): | ||||
|                 logger.error("Failed to download topics archive") | ||||
|                 self._topics_data = [] | ||||
|                 return | ||||
|             try: | ||||
|                 with tarfile.open(result, mode="r:xz") as tar: | ||||
|                     member = next((m for m in tar.getmembers() if m.name == "linux_gaming_topics_min.json"), None) | ||||
|                     if member is None: | ||||
|                         raise RuntimeError("linux_gaming_topics_min.json not found in archive") | ||||
|                     fobj = tar.extractfile(member) | ||||
|                     if fobj is None: | ||||
|                         raise RuntimeError("Failed to extract linux_gaming_topics_min.json from archive") | ||||
|                     raw = fobj.read() | ||||
|                     fobj.close() | ||||
|                     self._topics_data = orjson.loads(raw) | ||||
|                     with open(cache_json, "wb") as f: | ||||
|                         f.write(orjson.dumps(self._topics_data)) | ||||
|                     if os.path.exists(cache_tar): | ||||
|                         os.remove(cache_tar) | ||||
|                         logger.info("Archive %s deleted after extraction", cache_tar) | ||||
|                     logger.info("Loaded %d topics from archive", len(self._topics_data)) | ||||
|             except Exception as e: | ||||
|                 logger.error("Error processing topics archive: %s", e) | ||||
|                 self._topics_data = [] | ||||
|  | ||||
|         self.downloader.download_async(self.topics_url, cache_tar, timeout=5, callback=process_tar) | ||||
|         # Wait for async download to complete if called synchronously | ||||
|         while self._topics_data is None: | ||||
|             time.sleep(0.1) | ||||
|         return self._topics_data | ||||
|  | ||||
|     def get_forum_topic_slug(self, game_name: str) -> str: | ||||
|         """Get the forum topic slug or search URL for a given game name.""" | ||||
|         topics = self._load_topics_data() | ||||
|         normalized_name = normalize_name(game_name) | ||||
|         for topic in topics: | ||||
|             if topic["normalized_title"] == normalized_name: | ||||
|                 return topic["slug"] | ||||
|         logger.debug("No forum topic found for game: %s, redirecting to search", game_name) | ||||
|         encoded_name = urllib.parse.quote(f"#ppdb {game_name}") | ||||
|         return f"search?q={encoded_name}" | ||||
| @@ -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__) | ||||
| @@ -291,7 +295,7 @@ def load_steam_apps_async(callback: Callable[[list], None]): | ||||
|             if os.path.exists(cache_tar): | ||||
|                 os.remove(cache_tar) | ||||
|                 logger.info("Archive %s deleted after extraction", cache_tar) | ||||
|             steam_apps = data.get("applist", {}).get("apps", []) if isinstance(data, dict) else data or [] | ||||
|             steam_apps = data if isinstance(data, list) else [] | ||||
|             logger.info("Loaded %d apps from archive", len(steam_apps)) | ||||
|             callback(steam_apps) | ||||
|         except Exception as e: | ||||
| @@ -303,12 +307,25 @@ def load_steam_apps_async(callback: Callable[[list], None]): | ||||
|         try: | ||||
|             with open(cache_json, "rb") as f: | ||||
|                 data = orjson.loads(f.read()) | ||||
|             steam_apps = data.get("applist", {}).get("apps", []) if isinstance(data, dict) else data or [] | ||||
|             # Validate JSON structure | ||||
|             if not isinstance(data, list): | ||||
|                 logger.error("Cached JSON %s has invalid format (not a list), re-downloading", cache_json) | ||||
|                 raise ValueError("Invalid JSON structure") | ||||
|             # Validate each app entry | ||||
|             for app in data: | ||||
|                 if not isinstance(app, dict) or "appid" not in app or "normalized_name" not in app: | ||||
|                     logger.error("Cached JSON %s contains invalid app entry, re-downloading", cache_json) | ||||
|                     raise ValueError("Invalid app entry structure") | ||||
|             steam_apps = data | ||||
|             logger.info("Loaded %d apps from cache", len(steam_apps)) | ||||
|             callback(steam_apps) | ||||
|         except Exception as e: | ||||
|             logger.error("Error reading cached JSON: %s", e) | ||||
|             callback([]) | ||||
|             logger.error("Error reading or validating cached JSON %s: %s", cache_json, e) | ||||
|             # Attempt to re-download if cache is invalid or corrupted | ||||
|             app_list_url = ( | ||||
|                 "https://git.linux-gaming.ru/Boria138/PortProtonQt/raw/branch/main/data/games_appid.tar.xz" | ||||
|             ) | ||||
|             downloader.download_async(app_list_url, cache_tar, timeout=5, callback=process_tar) | ||||
|     else: | ||||
|         app_list_url = ( | ||||
|             "https://git.linux-gaming.ru/Boria138/PortProtonQt/raw/branch/main/data/games_appid.tar.xz" | ||||
| @@ -448,12 +465,25 @@ def load_weanticheatyet_data_async(callback: Callable[[list], None]): | ||||
|         try: | ||||
|             with open(cache_json, "rb") as f: | ||||
|                 data = orjson.loads(f.read()) | ||||
|             anti_cheat_data = data or [] | ||||
|             # Validate JSON structure | ||||
|             if not isinstance(data, list): | ||||
|                 logger.error("Cached JSON %s has invalid format (not a list), re-downloading", cache_json) | ||||
|                 raise ValueError("Invalid JSON structure") | ||||
|             # Validate each anti-cheat entry | ||||
|             for entry in data: | ||||
|                 if not isinstance(entry, dict) or "normalized_name" not in entry or "status" not in entry: | ||||
|                     logger.error("Cached JSON %s contains invalid anti-cheat entry, re-downloading", cache_json) | ||||
|                     raise ValueError("Invalid anti-cheat entry structure") | ||||
|             anti_cheat_data = data | ||||
|             logger.info("Loaded %d anti-cheat entries from cache", len(anti_cheat_data)) | ||||
|             callback(anti_cheat_data) | ||||
|         except Exception as e: | ||||
|             logger.error("Error reading cached WeAntiCheatYet JSON: %s", e) | ||||
|             callback([]) | ||||
|             logger.error("Error reading or validating cached WeAntiCheatYet JSON %s: %s", cache_json, e) | ||||
|             # Attempt to re-download if cache is invalid or corrupted | ||||
|             app_list_url = ( | ||||
|                 "https://git.linux-gaming.ru/Boria138/PortProtonQt/raw/branch/main/data/anticheat_games.tar.xz" | ||||
|             ) | ||||
|             downloader.download_async(app_list_url, cache_tar, timeout=5, callback=process_tar) | ||||
|     else: | ||||
|         app_list_url = ( | ||||
|             "https://git.linux-gaming.ru/Boria138/PortProtonQt/raw/branch/main/data/anticheat_games.tar.xz" | ||||
| @@ -745,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, | ||||
| @@ -846,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, | ||||
| @@ -899,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}") | ||||
|  | ||||
| @@ -929,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): | ||||
| @@ -937,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) | ||||
| @@ -1017,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: | ||||
| @@ -1043,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 = [ | ||||
|   | ||||
| @@ -20,6 +20,8 @@ class SystemOverlay(QDialog): | ||||
|         self.theme_manager = ThemeManager() | ||||
|         self.setStyleSheet(self.theme.OVERLAY_WINDOW_STYLE) | ||||
|  | ||||
|         self.script_path = "/usr/bin/portprotonqt-session-select" | ||||
|  | ||||
|         # Make window stay on top and frameless | ||||
|         self.setWindowFlags( | ||||
|             Qt.WindowType.FramelessWindowHint | | ||||
| @@ -79,8 +81,7 @@ class SystemOverlay(QDialog): | ||||
|         desktop_button.setStyleSheet(self.theme.OVERLAY_BUTTON_STYLE) | ||||
|         desktop_button.setFocusPolicy(Qt.FocusPolicy.StrongFocus) | ||||
|         desktop_button.clicked.connect(self.return_to_desktop) | ||||
|         script_path = "/usr/bin/portprotonqt-session-select" | ||||
|         script_exists = os.path.isfile(script_path) | ||||
|         script_exists = os.path.isfile(self.script_path) | ||||
|         desktop_button.setEnabled(script_exists) | ||||
|         if not script_exists: | ||||
|             desktop_button.setToolTip(_("portprotonqt-session-select file not found at /usr/bin/")) | ||||
| @@ -139,8 +140,8 @@ class SystemOverlay(QDialog): | ||||
|  | ||||
|     def return_to_desktop(self): | ||||
|         try: | ||||
|             script_path = os.path.join(os.path.dirname(__file__), "portprotonqt-session-select") | ||||
|             subprocess.run([script_path, "desktop"], check=True) | ||||
|             QApplication.quit() | ||||
|             subprocess.run([self.script_path, "desktop"], check=True) | ||||
|         except subprocess.CalledProcessError as e: | ||||
|             logger.error(f"Failed to return to desktop: {e}") | ||||
|             QMessageBox.warning(self, _("Error"), _("Failed to return to desktop")) | ||||
|   | ||||
| @@ -1 +0,0 @@ | ||||
| <svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m3.3334 1c-1.2926 0-2.3333 1.0408-2.3333 2.3333v9.3333c0 1.2926 1.0408 2.3333 2.3333 2.3333h9.3333c1.2926 0 2.3333-1.0408 2.3333-2.3333v-9.3333c0-1.2926-1.0408-2.3333-2.3333-2.3333zm4.6667 2.4979c0.41261 0 0.75035 0.33774 0.75035 0.75035v3.0014h3.0014c0.41261 0 0.75035 0.33774 0.75035 0.75035s-0.33774 0.75035-0.75035 0.75035h-3.0014v3.0014c0 0.41261-0.33774 0.75035-0.75035 0.75035s-0.75035-0.33774-0.75035-0.75035v-3.0014h-3.0014c-0.41261 0-0.75035-0.33774-0.75035-0.75035s0.33774-0.75035 0.75035-0.75035h3.0014v-3.0014c0-0.41261 0.33774-0.75035 0.75035-0.75035z" fill="#fff" fill-rule="evenodd"/></svg> | ||||
| Before Width: | Height: | Size: 734 B | 
| @@ -1 +0,0 @@ | ||||
| <svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m12.13 2.2617-5.7389 5.7389 5.7389 5.7389-1.2604 1.2605-7-7 7-7z" fill="#fff"/></svg> | ||||
| Before Width: | Height: | Size: 213 B | 
| @@ -1 +0,0 @@ | ||||
| <svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m5.48 11.5 2.52-2.52 2.52 2.52 0.98-0.98-2.52-2.52 2.52-2.52-0.98-0.98-2.52 2.52-2.52-2.52-0.98 0.98 2.52 2.52-2.52 2.52zm2.52 3.5q-1.4525 0-2.73-0.55125t-2.2225-1.4962-1.4962-2.2225-0.55125-2.73 0.55125-2.73 1.4962-2.2225 2.2225-1.4962 2.73-0.55125 2.73 0.55125 2.2225 1.4962 1.4962 2.2225 0.55125 2.73-0.55125 2.73-1.4962 2.2225-2.2225 1.4962-2.73 0.55125zm0-1.4q2.345 0 3.9725-1.6275t1.6275-3.9725-1.6275-3.9725-3.9725-1.6275-3.9725 1.6275-1.6275 3.9725 1.6275 3.9725 3.9725 1.6275z"/></svg> | ||||
| Before Width: | Height: | Size: 622 B | 
| @@ -1 +0,0 @@ | ||||
| <svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m8 11.5-7-7h14z" fill="#fff"/></svg> | ||||
| Before Width: | Height: | Size: 164 B | 
| @@ -1 +0,0 @@ | ||||
| <svg width="16" height="16" version="1.1" viewBox="0 0 16 16" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><path d="m7.02 11.22 4.935-4.935-0.98-0.98-3.955 3.955-1.995-1.995-0.98 0.98zm0.98 3.78q-1.4525 0-2.73-0.55125t-2.2225-1.4962-1.4962-2.2225-0.55125-2.73 0.55125-2.73 1.4962-2.2225 2.2225-1.4962 2.73-0.55125 2.73 0.55125 2.2225 1.4962 1.4962 2.2225 0.55125 2.73-0.55125 2.73-1.4962 2.2225-2.2225 1.4962-2.73 0.55125zm0-1.4q2.345 0 3.9725-1.6275t1.6275-3.9725-1.6275-3.9725-3.9725-1.6275-3.9725 1.6275-1.6275 3.9725 1.6275 3.9725 3.9725 1.6275z"/></svg> | ||||
| Before Width: | Height: | Size: 570 B |