diff --git a/.ci/Arch/Dockerfile b/.ci/Arch/Dockerfile index b08e568f3..f37315262 100644 --- a/.ci/Arch/Dockerfile +++ b/.ci/Arch/Dockerfile @@ -8,7 +8,6 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \ gtest \ mariadb-libs \ ninja \ - openssl \ protobuf \ qt6-base \ qt6-declarative \ diff --git a/.ci/Debian12/Dockerfile b/.ci/Debian12/Dockerfile index fc756aac2..0fa227d6f 100644 --- a/.ci/Debian12/Dockerfile +++ b/.ci/Debian12/Dockerfile @@ -15,15 +15,14 @@ RUN apt-get update && \ libprotobuf-dev \ libqt6multimedia6 \ libqt6sql6-mysql \ - libssl-dev \ ninja-build \ protobuf-compiler \ - qt6-declarative-dev \ qt6-image-formats-plugins \ qt6-l10n-tools \ qt6-multimedia-dev \ - qt6-shadertools-dev \ + qt6-declarative-dev \ qt6-svg-dev \ + qt6-shadertools-dev \ qt6-tools-dev \ qt6-tools-dev-tools \ qt6-websockets-dev \ diff --git a/.ci/Debian13/Dockerfile b/.ci/Debian13/Dockerfile index bdecb56df..13e8b35c7 100644 --- a/.ci/Debian13/Dockerfile +++ b/.ci/Debian13/Dockerfile @@ -16,15 +16,14 @@ RUN apt-get update && \ libprotobuf-dev \ libqt6multimedia6 \ libqt6sql6-mysql \ - libssl-dev \ ninja-build \ protobuf-compiler \ - qt6-declarative-dev \ qt6-image-formats-plugins \ qt6-l10n-tools \ qt6-multimedia-dev \ - qt6-shadertools-dev \ + qt6-declarative-dev \ qt6-svg-dev \ + qt6-shadertools-dev \ qt6-tools-dev \ qt6-tools-dev-tools \ qt6-websockets-dev \ diff --git a/.ci/Fedora43/Dockerfile b/.ci/Fedora43/Dockerfile index 463da5a51..68e894543 100644 --- a/.ci/Fedora43/Dockerfile +++ b/.ci/Fedora43/Dockerfile @@ -7,9 +7,8 @@ RUN dnf install -y \ git \ mariadb-devel \ ninja-build \ - openssl-devel \ protobuf-devel \ - qt6-{qtdeclarative,qtmultimedia,qtshadertools,qtsvg,qttools,qtwebsockets}-devel \ + qt6-{qtdeclarative,qtshadertools,qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \ qt6-qtimageformats \ rpm-build \ xz-devel \ diff --git a/.ci/Fedora44/Dockerfile b/.ci/Fedora44/Dockerfile index 62238e760..ffd7c1b9b 100644 --- a/.ci/Fedora44/Dockerfile +++ b/.ci/Fedora44/Dockerfile @@ -7,9 +7,8 @@ RUN dnf install -y \ git \ mariadb-devel \ ninja-build \ - openssl-devel \ protobuf-devel \ - qt6-{qtdeclarative,qtmultimedia,qtshadertools,qtsvg,qttools,qtwebsockets}-devel \ + qt6-{qtdeclarative,qtshadertools,qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \ qt6-qtimageformats \ rpm-build \ xz-devel \ diff --git a/.ci/Servatrice_Debian12/Dockerfile b/.ci/Servatrice_Debian12/Dockerfile index 321aa7c0f..21f6a036e 100644 --- a/.ci/Servatrice_Debian12/Dockerfile +++ b/.ci/Servatrice_Debian12/Dockerfile @@ -12,7 +12,6 @@ RUN apt-get update && \ libmariadb-dev-compat \ libprotobuf-dev \ libqt6sql6-mysql \ - libssl-dev \ ninja-build \ protobuf-compiler \ qt6-tools-dev \ diff --git a/.ci/Ubuntu24.04/Dockerfile b/.ci/Ubuntu24.04/Dockerfile index 715997474..12320c276 100644 --- a/.ci/Ubuntu24.04/Dockerfile +++ b/.ci/Ubuntu24.04/Dockerfile @@ -15,15 +15,14 @@ RUN apt-get update && \ libprotobuf-dev \ libqt6multimedia6 \ libqt6sql6-mysql \ - libssl-dev \ ninja-build \ protobuf-compiler \ - qt6-declarative-dev \ qt6-image-formats-plugins \ qt6-l10n-tools \ qt6-multimedia-dev \ - qt6-shadertools-dev \ + qt6-declarative-dev \ qt6-svg-dev \ + qt6-shadertools-dev \ qt6-tools-dev \ qt6-tools-dev-tools \ qt6-websockets-dev \ diff --git a/.ci/Ubuntu26.04/Dockerfile b/.ci/Ubuntu26.04/Dockerfile index 96dd10763..ce3d9cd6c 100644 --- a/.ci/Ubuntu26.04/Dockerfile +++ b/.ci/Ubuntu26.04/Dockerfile @@ -16,15 +16,14 @@ RUN apt-get update && \ libprotobuf-dev \ libqt6multimedia6 \ libqt6sql6-mysql \ - libssl-dev \ ninja-build \ protobuf-compiler \ - qt6-declarative-dev \ qt6-image-formats-plugins \ qt6-l10n-tools \ qt6-multimedia-dev \ - qt6-shadertools-dev \ + qt6-declarative-dev \ qt6-svg-dev \ + qt6-shadertools-dev \ qt6-tools-dev \ qt6-tools-dev-tools \ qt6-websockets-dev \ diff --git a/.ci/compile.sh b/.ci/compile.sh index f20432893..8a16d3243 100755 --- a/.ci/compile.sh +++ b/.ci/compile.sh @@ -149,9 +149,6 @@ if [[ $MAKE_TEST ]]; then fi if [[ $USE_CCACHE ]]; then flags+=("-DUSE_CCACHE=1") - # PCH-aware caching is required or ccache refuses to cache any TU that - # consumes a precompiled header, silently recompiling everything on every run. - ccache --set-config sloppiness=pch_defines,time_macros if [[ $CCACHE_SIZE ]]; then # note, this setting persists after running the script ccache --max-size "$CCACHE_SIZE" @@ -327,32 +324,4 @@ if [[ $MAKE_PACKAGE ]]; then BUILD_DIR="$BUILD_DIR" .ci/name_build.sh "$PACKAGE_SUFFIX" echo "::endgroup::" fi - - if [[ $RUNNER_OS == Windows ]]; then - echo "::group::Check installer for build-tree artifacts" - cd "$BUILD_DIR" - package="$(find . -maxdepth 1 -type f -name 'Cockatrice-*.exe' -print -quit)" - if [[ ! $package ]]; then - echo "::error file=$0::Could not find installer to inspect" - exit 1 - fi - seven_zip="$(command -v 7z || true)" - if [[ ! $seven_zip ]]; then - seven_zip="/c/Program Files/7-Zip/7z.exe" - fi - if [[ ! -f $seven_zip ]]; then - echo "::warning file=$0::7-Zip not found, skipping installer content check" - else - echo "Inspecting $package" - # Fail the build if the installer contains any path left behind by the MSBuild or - # Qt AUTOMOC tooling (build-tree artifacts must live in the build dir, not the install) - if "$seven_zip" l "$package" | - grep -E "_autogen|\.dir[\\/]|\.tlog|(^|[\\/])x64[\\/]|(^|[\\/])\.qt[\\/]|(^|[\\/])\.qsb[\\/]|(^|[\\/])\.lupdate[\\/]|CMakeFiles"; then - echo "::error file=$0::Installer contains build-tree artifacts" - exit 1 - fi - echo "Installer content is clean" - fi - echo "::endgroup::" - fi fi diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 75fbc59f1..e895e2220 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -40,7 +40,7 @@ jobs: steps: - name: "Checkout repository" - uses: actions/checkout@v7 + uses: actions/checkout@v6 - name: "Initialize CodeQL" uses: github/codeql-action/init@v4 diff --git a/.github/workflows/desktop-build.yml b/.github/workflows/desktop-build.yml index bd528f245..04037a74e 100644 --- a/.github/workflows/desktop-build.yml +++ b/.github/workflows/desktop-build.yml @@ -152,7 +152,7 @@ jobs: env: CACHE: ${{ github.workspace }}/.cache/${{ matrix.distro }}${{ matrix.version }} # directory for caching docker image and ccache CCACHE_EVICTION_AGE: 7d - CCACHE_SIZE: 600M # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy + CCACHE_SIZE: 550M # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy CMAKE_GENERATOR: 'Ninja' NAME: ${{ matrix.distro }}${{ matrix.version }} @@ -176,12 +176,8 @@ jobs: shell: bash run: | source .ci/docker.sh - args=() - [[ $GITHUB_REF == "refs/heads/master" ]] && args+=(--evict-ccache "$CCACHE_EVICTION_AGE") - args+=(--ccache "$CCACHE_SIZE") - args+=(--cmake-generator "$CMAKE_GENERATOR") - - RUN --server --debug --test "${args[@]}" + RUN --server --debug --test --ccache "$CCACHE_SIZE" \ + --cmake-generator "$CMAKE_GENERATOR" - name: "Build release package" id: build @@ -272,8 +268,8 @@ jobs: make_package: 1 override_target: 13 package_suffix: "-macOS13_Intel" - qt_version: 6.11.* - qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets + qt_version: 6.11.1 + qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools soc: Intel type: Release use_ccache: 1 @@ -288,8 +284,8 @@ jobs: make_package: 1 override_target: 14 package_suffix: "-macOS14" - qt_version: 6.11.* - qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets + qt_version: 6.11.1 + qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools soc: Apple type: Release use_ccache: 1 @@ -304,8 +300,8 @@ jobs: make_package: 1 override_target: 15 package_suffix: "-macOS15" - qt_version: 6.11.* - qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets + qt_version: 6.11.1 + qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools soc: Apple type: Release use_ccache: 1 @@ -317,8 +313,8 @@ jobs: ccache_eviction_age: 7d cmake_generator: Ninja - qt_version: 6.11.* - qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets + qt_version: 6.11.1 + qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools soc: Apple type: Debug use_ccache: 1 @@ -332,8 +328,8 @@ jobs: cmake_generator_platform: x64 make_package: 1 package_suffix: "-Win10" - qt_version: 6.11.* - qt_modules: qtimageformats qtmultimedia qtshadertools qtwebsockets + qt_version: 6.11.1 + qt_modules: qtimageformats qtmultimedia qtwebsockets qtshadertools type: Release name: ${{ matrix.os }} ${{ matrix.target }}${{ matrix.soc == 'Intel' && ' Intel' || '' }}${{ matrix.type == 'Debug' && ' Debug' || '' }} @@ -342,7 +338,7 @@ jobs: timeout-minutes: 100 env: CCACHE_DIR: ${{ github.workspace }}/.cache/ - CCACHE_SIZE: 600M # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy + CCACHE_SIZE: 550M # space of all repo is 10Gi: https://docs.github.com/en/actions/using-workflows/caching-dependencies-to-speed-up-workflows#usage-limits-and-eviction-policy steps: - name: "Checkout" @@ -368,20 +364,18 @@ jobs: key: ccache-${{ matrix.runner }}_${{ matrix.override_target }}-Xcode${{ matrix.xcode }} path: ${{ env.CCACHE_DIR }} - - name: "[macOS] Install aqtinstall" - if: matrix.os == 'macOS' + - name: "Install aqtinstall" run: pipx install aqtinstall # Resolve given wildcard versions (e.g. Qt 6.6.*) to latest version via aqtinstall to avoid stale caches on new releases - - name: "[macOS] Resolve latest Qt from ${{ matrix.qt_version }} input" - if: matrix.os == 'macOS' + - name: "Resolve latest Qt patch version" env: QT_VERSION: ${{ matrix.qt_version }} id: resolve_qt_version shell: bash run: .ci/resolve_latest_aqt_qt_version.sh "$QT_VERSION" - - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }}" + - name: "[macOS] Restore thin Qt ${{ steps.resolve_qt_version.outputs.version }} libraries" if: matrix.os == 'macOS' id: restore_qt uses: actions/cache/restore@v6 @@ -391,22 +385,21 @@ jobs: # Using jurplel/install-qt-action to install Qt without using brew # Qt build using vcpkg either just fails or takes too long to build - - name: "[macOS] Install fat Qt ${{ matrix.qt_version }}" + - name: "[macOS] Install fat Qt ${{ steps.resolve_qt_version.outputs.version }}" if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' uses: jurplel/install-qt-action@v4 with: cache: false - # cache-key-prefix: Qt - dir: ${{ github.workspace }} # thinning script depends on this location + dir: ${{ github.workspace }} modules: ${{ matrix.qt_modules }} - version: ${{ matrix.qt_version }} + version: ${{ steps.resolve_qt_version.outputs.version }} - name: "[macOS] Create thin Qt libraries" if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' run: .ci/thin_macos_qtlib.sh - name: "[macOS] Cache thin Qt libraries" - if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' && github.ref == 'refs/heads/master' + if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true' uses: actions/cache/save@v6 with: key: ${{ steps.restore_qt.outputs.cache-primary-key }} @@ -418,10 +411,10 @@ jobs: with: # Qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released aqtsource: git+https://github.com/miurahr/aqtinstall.git - cache: ${{ github.ref == 'refs/heads/master' }} + cache: true cache-key-prefix: Qt modules: ${{ matrix.qt_modules }} - version: ${{ matrix.qt_version }} + version: ${{ steps.resolve_qt_version.outputs.version }} - name: "[Windows] Install NSIS" if: matrix.os == 'Windows' @@ -453,7 +446,7 @@ jobs: PACKAGE_SUFFIX: '${{ matrix.package_suffix }}' TARGET_MACOS_VERSION: ${{ matrix.override_target }} USE_CCACHE: ${{ matrix.use_ccache }} - VCPKG_BINARY_SOURCES: "clear;files,${{ steps.vcpkg-cache.outputs.path }},${{ case(github.ref == 'refs/heads/master', 'readwrite', 'read') }}" + VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite' VCPKG_DISABLE_METRICS: 1 VCPKG_FEATURE_FLAGS: dependencygraph run: .ci/compile.sh --server --test --vcpkg diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml index 967d94c58..df4fe233c 100644 --- a/.github/workflows/docker-release.yml +++ b/.github/workflows/docker-release.yml @@ -76,7 +76,7 @@ jobs: uses: docker/build-push-action@v7 with: cache-from: type=gha,scope=${{ env.CACHE_SCOPE }} - cache-to: ${{ case(github.ref == 'refs/heads/master', format('type=gha,mode=max,scope={0}', env.CACHE_SCOPE), '') }} + cache-to: type=gha,mode=max,scope=${{ env.CACHE_SCOPE }} context: . platforms: ${{ matrix.platform }} push: false @@ -127,7 +127,7 @@ jobs: steps: - name: "Download digests" - uses: actions/download-artifact@v8 + uses: actions/download-artifact@v7 with: path: ${{ runner.temp }}/digests pattern: digest-* diff --git a/CMakeLists.txt b/CMakeLists.txt index 293e25dd9..27fecc979 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,23 +5,23 @@ # This file sets all the variables shared between the projects # like the installation path, compilation flags etc.. -# 3.16 required for Qt6 and target_precompile_headers() -cmake_minimum_required(VERSION 3.16) +# cmake 3.16 is required if using qt6 +cmake_minimum_required(VERSION 3.10) -# Use compiler cache (ccache) +# Early detect ccache option(USE_CCACHE "Cache the build results with ccache" ON) # Treat warnings as errors (Debug builds only) option(WARNING_AS_ERROR "Treat warnings as errors in debug builds" ON) # Check for translation updates option(UPDATE_TRANSLATIONS "Update translations on compile" OFF) -# Compile Cockatrice -option(WITH_CLIENT "Build Cockatrice client" ON) -# Compile Oracle -option(WITH_ORACLE "Build Cockatrice card database tool (Oracle)" ON) -# Compile Servatrice -option(WITH_SERVER "Build Cockatrice server (Servatrice)" OFF) +# Compile servatrice +option(WITH_SERVER "build servatrice" OFF) +# Compile cockatrice +option(WITH_CLIENT "build cockatrice" ON) +# Compile oracle +option(WITH_ORACLE "build oracle" ON) # Compile tests -option(TEST "Build tests" OFF) +option(TEST "build tests" OFF) # Use vcpkg regardless of OS option(USE_VCPKG "Use vcpkg regardless of OS" OFF) @@ -39,24 +39,13 @@ else() ) endif() -# ccache does not support MSVC and must not auto-engage on Windows -# (it is installed unintentionally on the Windows CI runner). -# NOTE: this keys off the target OS, so a mingw/Ninja configuration on Windows -# also opts out of ccache even though the GNUCXX branch below supports it. -if(USE_CCACHE AND NOT WIN32) +if(USE_CCACHE) find_program(CCACHE_PROGRAM ccache) if(CCACHE_PROGRAM) # Support Unix Makefiles and Ninja set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}") - # PCH-aware caching, matching .ci/compile.sh: without this ccache refuses - # to cache any TU that consumes a precompiled header, so every PCH-backed - # target recompiles from scratch on each build. - execute_process(COMMAND ${CCACHE_PROGRAM} --set-config sloppiness=pch_defines,time_macros) message(STATUS "Found CCache ${CCACHE_PROGRAM}") endif() -elseif(USE_CCACHE AND WIN32) - # An explicit opt-in must not disappear silently on Windows. - message(STATUS "ccache disabled: not supported for the MSVC toolchain on Windows") endif() if(WIN32 OR USE_VCPKG) @@ -195,9 +184,6 @@ elseif(CMAKE_COMPILER_IS_GNUCXX) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${FLAG}") endif() endforeach() - - # Reduce compiler I/O by using pipes between stages instead of temp files - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe") else() # other: osx/llvm, bsd/llvm set(CMAKE_CXX_FLAGS_RELEASE "-O2") @@ -206,9 +192,6 @@ else() else() set(CMAKE_CXX_FLAGS_DEBUG "-g -O0 -Wall -Wextra") endif() - - # Reduce compiler I/O by using pipes between stages instead of temp files - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe") endif() # GNU systems need to define the Mersenne exponent for the RNG to compile w/o warning @@ -256,6 +239,11 @@ if(WIN32) find_package(OpenSSL REQUIRED) if(OPENSSL_FOUND) include_directories(${OPENSSL_INCLUDE_DIRS}) + else() + message( + WARNING + "Could not find OpenSSL runtime libraries. They are not required for compiling, but needs to be available at runtime." + ) endif() endif() @@ -293,7 +281,7 @@ if(UNIX) if(CPACK_GENERATOR STREQUAL "RPM") set(CPACK_RPM_PACKAGE_LICENSE "GPLv2") set(CPACK_RPM_MAIN_COMPONENT "cockatrice") - set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qtimageformats, qt6-qtmultimedia, qt6-qtsvg, qt6-qttools") + set(CPACK_RPM_PACKAGE_REQUIRES "protobuf, qt6-qttools, qt6-qtsvg, qt6-qtmultimedia, qt6-qtimageformats") set(CPACK_RPM_PACKAGE_GROUP "Amusements/Games") set(CPACK_RPM_PACKAGE_URL "http://github.com/Cockatrice/Cockatrice") # stop directories from making package conflicts @@ -311,7 +299,7 @@ if(UNIX) set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS ON) set(CPACK_DEBIAN_PACKAGE_SECTION "games") set(CPACK_DEBIAN_PACKAGE_HOMEPAGE "http://github.com/Cockatrice/Cockatrice") - set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-image-formats-plugins, qt6-qpa-plugins") + set(CPACK_DEBIAN_PACKAGE_DEPENDS "libqt6multimedia6, libqt6svg6, qt6-qpa-plugins, qt6-image-formats-plugins") set(CPACK_DEBIAN_PACKAGE_RECOMMENDS "libqt6sql6-mysql") # for connecting servatrice to a mysql db endif() endif() diff --git a/Dockerfile b/Dockerfile index 7d3deb5fb..382309d47 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,7 +14,6 @@ RUN apt-get update \ libmariadb-dev-compat \ libprotobuf-dev \ libqt6sql6-mysql \ - libssl-dev \ qt6-websockets-dev \ protobuf-compiler \ qt6-tools-dev \ @@ -43,7 +42,6 @@ RUN apt-get update \ libprotobuf32t64 \ libqt6sql6-mysql \ libqt6websockets6 \ - libssl3 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/README.md b/README.md index 5935bb540..f22df461f 100644 --- a/README.md +++ b/README.md @@ -149,15 +149,15 @@ You can then
The following flags (with their non-default values) can be passed to `cmake`: -| Flag | Description | -| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------- | -| `-DWITH_SERVER=1` | Build Servatrice server | -| `-DWITH_CLIENT=0` | Don't build Cockatrice client | -| `-DWITH_ORACLE=0` | Don't build Oracle card database tool | -| `-DCMAKE_BUILD_TYPE=Debug` | Compile in debug mode
Enables extra logging output, debug symbols, and much more verbose compiler warnings | -| `-DWARNING_AS_ERROR=0` | Don't treat compilation warnings as errors in debug mode | -| `-DUPDATE_TRANSLATIONS=1` | Configure `make` to update the translation .ts files for new strings in the source code
**Note:** `make clean` will remove the .ts files | -| `-DTEST=1` | Enable regression tests
**Note:** `make test` to run tests, *googletest* will be downloaded if not available | +| Flag | Description | +| --- | --- | +| `-DWITH_SERVER=1` | Build Servatrice server | +| `-DWITH_CLIENT=0` | Don't build Cockatrice client | +| `-DWITH_ORACLE=0` | Don't build Oracle card database tool | +| `-DCMAKE_BUILD_TYPE=Debug` | Compile in debug mode
Enables extra logging output, debug symbols, and much more verbose compiler warnings | +| `-DWARNING_AS_ERROR=0` | Don't treat compilation warnings as errors in debug mode | +| `-DUPDATE_TRANSLATIONS=1` | Configure `make` to update the translation .ts files for new strings in the source code
**Note:** `make clean` will remove the .ts files | +| `-DTEST=1` | Enable regression tests
**Note:** `make test` to run tests, *googletest* will be downloaded if not available | # Run diff --git a/cmake/FindQtRuntime.cmake b/cmake/FindQtRuntime.cmake index 971c9094d..0259d12e1 100644 --- a/cmake/FindQtRuntime.cmake +++ b/cmake/FindQtRuntime.cmake @@ -28,7 +28,7 @@ if(WITH_CLIENT) ) endif() if(WITH_ORACLE) - set(_ORACLE_NEEDED Concurrent Network Svg Widgets Xml) + set(_ORACLE_NEEDED Concurrent Network Svg Widgets) endif() if(TEST) # Union of Qt modules required across all test targets (independent of application targets). diff --git a/cmake/NSIS.template.in b/cmake/NSIS.template.in index b3cbcece8..5af116470 100644 --- a/cmake/NSIS.template.in +++ b/cmake/NSIS.template.in @@ -387,14 +387,19 @@ SectionEnd Section "un.Application" UnSecApplication SetShellVarContext all + RMDir /r "$INSTDIR\plugins" + RMDir /r "$INSTDIR\sounds" + RMDir /r "$INSTDIR\themes" + RMDir /r "$INSTDIR\translations" + Delete "$INSTDIR\*.exe" + Delete "$INSTDIR\*.dll" + Delete "$INSTDIR\qt.conf" + Delete "$INSTDIR\qdebug.txt" + Delete "$INSTDIR\servatrice.sql" + Delete "$INSTDIR\servatrice.ini.example" + RMDir "$INSTDIR" - ; Remove the entire application directory so any file that is not part of - ; the installed payload (e.g. build-tree artifacts such as *.dir folders, - ; *_autogen and *.tlog files from a build) cannot survive between an - ; uninstall and a fresh reinstall. - RMDir /r "$INSTDIR" - - RMDir /r "$SMPROGRAMS\Cockatrice" + RMDir "$SMPROGRAMS\Cockatrice" DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\Cockatrice" SectionEnd diff --git a/cmake/pch/qtcore_pch.h b/cmake/pch/qtcore_pch.h deleted file mode 100644 index cc3dd12ee..000000000 --- a/cmake/pch/qtcore_pch.h +++ /dev/null @@ -1,24 +0,0 @@ -/** @file qtcore_pch.h - * @brief Precompiled header for all Qt targets (Qt Core only). - * - * Safe for every target that links Qt Core, including the headless - * Servatrice binary. Keep this header free of any widget/gui types. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/cmake/pch/qtwidgets_pch.h b/cmake/pch/qtwidgets_pch.h deleted file mode 100644 index 2c63f450e..000000000 --- a/cmake/pch/qtwidgets_pch.h +++ /dev/null @@ -1,30 +0,0 @@ -/** @file qtwidgets_pch.h - * @brief Precompiled header for GUI targets (Cockatrice client, Oracle). - * - * Includes the Qt Core precompiled header plus the heavy Gui, Widgets and - * Network layers that virtually every client translation unit re-parses. - * Do not use on Servatrice (headless, QT_DONT_USE_QTGUI). - */ - -#include "qtcore_pch.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 9b31310e6..c00f1b9ce 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -45,14 +45,11 @@ set(cockatrice_SOURCES src/interface/widgets/dialogs/dlg_load_deck_from_website.cpp src/interface/widgets/dialogs/dlg_load_remote_deck.cpp src/interface/widgets/dialogs/dlg_local_game_options.cpp - src/interface/widgets/dialogs/dlg_login_prompt.cpp src/interface/widgets/dialogs/dlg_manage_sets.cpp src/interface/widgets/dialogs/dlg_my_reports.cpp src/interface/widgets/dialogs/dlg_register.cpp src/interface/widgets/dialogs/dlg_report_user.cpp src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp - src/interface/widgets/dialogs/dlg_share_deck.cpp - src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp src/interface/widgets/dialogs/dlg_settings.cpp src/interface/widgets/dialogs/dlg_startup_card_check.cpp src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp @@ -60,9 +57,6 @@ set(cockatrice_SOURCES src/interface/widgets/dialogs/dlg_view_log.cpp src/interface/widgets/dialogs/override_printing_warning.cpp src/interface/widgets/dialogs/tip_of_the_day.cpp - src/interface/widgets/deck_share/deck_share_utils.cpp - src/interface/widgets/deck_share/shared_deck_preview_widget.cpp - src/interface/widgets/deck_share/share_bar_widget.cpp src/filters/deck_filter_string.cpp src/filters/filter_builder.cpp src/filters/filter_tree_model.cpp @@ -169,11 +163,9 @@ set(cockatrice_SOURCES src/interface/palette_editor/palette_grid_widget.cpp src/interface/palette_editor/palette_editor_dialog.cpp src/interface/widgets/cards/additional_info/color_identity_widget.cpp - src/interface/widgets/cards/additional_info/deck_color_identity.cpp src/interface/widgets/cards/additional_info/mana_cost_widget.cpp src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp src/interface/widgets/cards/art_crop_attribution.cpp - src/interface/widgets/cards/card_art_utils.cpp src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp @@ -222,7 +214,6 @@ set(cockatrice_SOURCES src/interface/widgets/deck_editor/deck_editor_printing_selector_dock_widget.cpp src/interface/widgets/deck_editor/deck_list_style_proxy.cpp src/interface/widgets/deck_editor/deck_state_manager.cpp - src/interface/widgets/deck_editor/deck_zone_dialog.cpp src/interface/widgets/deck_editor/printing_disabled_info_widget.cpp src/interface/widgets/general/background_sources.cpp src/interface/widgets/general/display/background_plate_widget.cpp @@ -280,7 +271,6 @@ set(cockatrice_SOURCES src/interface/widgets/server/user/user_context_menu.cpp src/interface/widgets/server/user/user_info_box.cpp src/interface/widgets/server/user/user_info_connection.cpp - src/interface/widgets/server/user/user_list_dialog.cpp src/interface/widgets/server/user/user_list_manager.cpp src/interface/widgets/server/user/user_list_painter.cpp src/interface/widgets/server/user/user_list_panel_widget.cpp @@ -324,8 +314,6 @@ set(cockatrice_SOURCES src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_item_widget.cpp src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp - src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp - src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp @@ -391,13 +379,11 @@ set(cockatrice_SOURCES src/interface/widgets/tabs/tab_card_art_rules.cpp src/interface/widgets/tabs/tab_deck_editor.cpp src/interface/widgets/tabs/tab_deck_storage.cpp - src/interface/widgets/tabs/tab_developer.cpp src/interface/widgets/tabs/tab_game.cpp src/interface/widgets/tabs/tab_home.cpp src/interface/widgets/tabs/tab_logs.cpp src/interface/widgets/tabs/tab_message.cpp src/interface/widgets/tabs/tab_moderation.cpp - src/interface/widgets/tabs/tab_public_decks.cpp src/interface/widgets/tabs/tab_report.cpp src/interface/widgets/tabs/tab_replays.cpp src/interface/widgets/tabs/tab_room.cpp @@ -413,7 +399,6 @@ set(cockatrice_SOURCES src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp src/interface/widgets/tabs/api/commander_spellbook/handle_commander_brackets.cpp src/interface/widgets/onboarding/banner_shader_config.h - src/interface/widgets/onboarding/brand_colors.h src/interface/widgets/onboarding/first_run_wizard.cpp src/interface/widgets/onboarding/first_run_wizard.h src/interface/widgets/onboarding/first_run_wizard_page.cpp @@ -454,8 +439,6 @@ set(cockatrice_SOURCES src/interface/intents/intent_login.h src/interface/intents/intent_open_server_room_by_name.cpp src/interface/intents/intent_open_server_room_by_name.h - src/interface/intents/intent_open_shared_deck.cpp - src/interface/intents/intent_open_shared_deck.h src/interface/intents/url_parser.cpp src/interface/intents/url_parser.h src/interface/widgets/server/user/user_info_popup.cpp @@ -532,8 +515,6 @@ qt6_add_executable( MANUAL_FINALIZATION ) -target_precompile_headers(cockatrice PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtwidgets_pch.h") - qt6_add_shaders( cockatrice "onboarding_shaders" @@ -543,7 +524,6 @@ qt6_add_shaders( "src/interface/widgets/onboarding/shaders" FILES src/interface/widgets/onboarding/shaders/brand_banner.frag - src/interface/widgets/onboarding/shaders/brand_plate.frag ) qt6_add_resources( @@ -668,35 +648,18 @@ if(WIN32) set(qtconf_dest_dir .) install( - DIRECTORY "$/" + DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/" DESTINATION ./ FILES_MATCHING PATTERN "*.dll" - PATTERN "*.pdb" EXCLUDE - PATTERN "*.dir*" EXCLUDE - PATTERN "*_autogen*" EXCLUDE - PATTERN "*.tlog*" EXCLUDE - PATTERN "CMakeFiles*" EXCLUDE - PATTERN "x64*" EXCLUDE - PATTERN ".qt*" EXCLUDE - PATTERN ".qsb*" EXCLUDE - PATTERN ".lupdate*" EXCLUDE ) install( DIRECTORY "${CMAKE_BINARY_DIR}/cockatrice/" DESTINATION ./ FILES_MATCHING + PATTERN "CMakeFiles" EXCLUDE PATTERN "*.ini" - PATTERN "CMakeFiles*" EXCLUDE - PATTERN "*.dir*" EXCLUDE - PATTERN "*_autogen*" EXCLUDE - PATTERN "*.tlog*" EXCLUDE - PATTERN "*.pdb" EXCLUDE - PATTERN "x64*" EXCLUDE - PATTERN ".qt*" EXCLUDE - PATTERN ".qsb*" EXCLUDE - PATTERN ".lupdate*" EXCLUDE ) # Qt plugins: audio, iconengines, imageformats, multimedia, platforms, printsupport, styles, tls @@ -749,6 +712,10 @@ Data = Resources\") " COMPONENT Runtime ) + + if(OPENSSL_FOUND) + install(FILES ${OPENSSL_INCLUDE_DIRS} DESTINATION ./) + endif() endif() if(Qt6LinguistTools_FOUND) diff --git a/cockatrice/cockatrice.qrc b/cockatrice/cockatrice.qrc index 14cf15b2f..e21bdb0be 100644 --- a/cockatrice/cockatrice.qrc +++ b/cockatrice/cockatrice.qrc @@ -63,8 +63,6 @@ resources/icons/mana/W.svg resources/backgrounds/home.png - resources/backgrounds/home-dark.png - resources/backgrounds/home-light.png resources/backgrounds/card_triplet.svg resources/backgrounds/placeholder_printing_selector.svg @@ -365,8 +363,6 @@ resources/usericons/pawn_single.svg resources/usericons/pawn_double.svg - resources/usericons/pawn_dev_single.svg - resources/usericons/pawn_dev_double.svg resources/usericons/pawn_donator_single.svg resources/usericons/pawn_donator_double.svg resources/usericons/pawn_judge_single.svg diff --git a/cockatrice/resources/backgrounds/home-dark.png b/cockatrice/resources/backgrounds/home-dark.png deleted file mode 100644 index 68f48e2c2..000000000 Binary files a/cockatrice/resources/backgrounds/home-dark.png and /dev/null differ diff --git a/cockatrice/resources/backgrounds/home-light.png b/cockatrice/resources/backgrounds/home-light.png deleted file mode 100644 index eaaaba932..000000000 Binary files a/cockatrice/resources/backgrounds/home-light.png and /dev/null differ diff --git a/cockatrice/resources/backgrounds/home.png b/cockatrice/resources/backgrounds/home.png index eaaaba932..68f48e2c2 100644 Binary files a/cockatrice/resources/backgrounds/home.png and b/cockatrice/resources/backgrounds/home.png differ diff --git a/cockatrice/resources/help/search.md b/cockatrice/resources/help/search.md index fd0a12507..0c8bdb450 100644 --- a/cockatrice/resources/help/search.md +++ b/cockatrice/resources/help/search.md @@ -52,7 +52,6 @@ In this list of examples below, each entry has an explanation and can be clicked
Edition:
[set:lea](#set:lea) (Cards that appear in Alpha, which has the set code LEA)
[e:lea OR e:leb](#e:lea OR e:leb) (Cards that appear in Alpha or Beta)
-
[e<8ED](#e<8ED) (Cards that appear before 8th edition)
Negate:
[c:wu -c:m](#c:wu -c:m) (Any card that is white or blue, but not multicolored)
diff --git a/cockatrice/resources/usericons/pawn_dev_double.svg b/cockatrice/resources/usericons/pawn_dev_double.svg deleted file mode 100644 index 57ed5c2da..000000000 --- a/cockatrice/resources/usericons/pawn_dev_double.svg +++ /dev/null @@ -1,343 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - diff --git a/cockatrice/resources/usericons/pawn_dev_single.svg b/cockatrice/resources/usericons/pawn_dev_single.svg deleted file mode 100644 index f7c4e7018..000000000 --- a/cockatrice/resources/usericons/pawn_dev_single.svg +++ /dev/null @@ -1,211 +0,0 @@ - - - -image/svg+xml - - diff --git a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp index c1598bd25..890a621c8 100644 --- a/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp +++ b/cockatrice/src/client/network/connection_controller/remote_connection_controller.cpp @@ -1,6 +1,5 @@ #include "remote_connection_controller.h" -#include "../../../interface/pixel_map_generator.h" #include "../../settings/cache_settings.h" #include "../interface/widgets/dialogs/dlg_connect.h" #include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h" @@ -181,7 +180,7 @@ void ConnectionController::onServerShutdownEvent(const Event_ServerShutdown &eve "games will be lost.\nReason for shutdown: %1", "", event.minutes()) .arg(QString::fromStdString(event.reason()))); - serverShutdownMessageBox.setIconPixmap(themePixmap(QStringLiteral("cockatrice")).scaled(64, 64)); + serverShutdownMessageBox.setIconPixmap(QPixmap("theme:cockatrice").scaled(64, 64)); serverShutdownMessageBox.setText(tr("Scheduled server shutdown")); serverShutdownMessageBox.setWindowModality(Qt::ApplicationModal); serverShutdownMessageBox.setVisible(true); diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp index 96cafa3d3..18de2264d 100644 --- a/cockatrice/src/client/sound_engine.cpp +++ b/cockatrice/src/client/sound_engine.cpp @@ -94,7 +94,7 @@ QStringMap &SoundEngine::getAvailableThemes() QDir dir; availableThemes.clear(); - // Load themes from user profile dir + // load themes from user profile dir dir.setPath(SettingsCache::instance().getDataPath() + "/sounds"); @@ -104,7 +104,7 @@ QStringMap &SoundEngine::getAvailableThemes() } } - // Load themes from Cockatrice system dir + // load themes from cockatrice system dir dir.setPath(qApp->applicationDirPath() + #ifdef Q_OS_MAC "/../Resources/sounds" diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp index a2b7519a8..4abb8210c 100644 --- a/cockatrice/src/filters/deck_filter_string.cpp +++ b/cockatrice/src/filters/deck_filter_string.cpp @@ -43,12 +43,6 @@ NumericValue <- [0-9]+ static std::once_flag init; -// The peglib parser is a single permanent object, so the rule actions below cannot see -// per-instance state. The card language that the nested [[card name]] search matches -// against is passed through this thread-local context, which is live only while a -// DeckFilterString is being parsed, and copied into the nested FilterString closures. -thread_local CardSearchLanguage deckSearchLanguageContext; - static void setupParserRules() { // plumbing @@ -122,7 +116,7 @@ static void setupParserRules() // actual functionality search["DeckContentQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter { - auto cardFilter = FilterString(std::any_cast(sv[0]), deckSearchLanguageContext); + auto cardFilter = FilterString(std::any_cast(sv[0])); auto numberMatcher = sv.size() > 1 ? std::any_cast(sv[1]) : [](int count) { return count > 0; }; return [=](const DeckSearchData &data) -> bool { @@ -192,7 +186,7 @@ DeckFilterString::DeckFilterString() _error = "Not initialized"; } -DeckFilterString::DeckFilterString(const QString &expr, const CardSearchLanguage &searchLanguage) +DeckFilterString::DeckFilterString(const QString &expr) { QByteArray ba = expr.simplified().toUtf8(); @@ -205,8 +199,6 @@ DeckFilterString::DeckFilterString(const QString &expr, const CardSearchLanguage return; } - deckSearchLanguageContext = searchLanguage; - search.set_logger([&](size_t /*ln*/, size_t col, const std::string &msg) { _error = QString("Error at position %1: %2").arg(col).arg(QString::fromStdString(msg)); }); diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h index 5b1419004..90a6a17eb 100644 --- a/cockatrice/src/filters/deck_filter_string.h +++ b/cockatrice/src/filters/deck_filter_string.h @@ -12,7 +12,6 @@ #include #include #include -#include inline Q_LOGGING_CATEGORY(DeckFilterStringLog, "deck_filter_string"); @@ -36,7 +35,7 @@ class DeckFilterString { public: DeckFilterString(); - explicit DeckFilterString(const QString &expr, const CardSearchLanguage &searchLanguage = {}); + explicit DeckFilterString(const QString &expr); bool check(const DeckSearchData &data) const { return filter(data); diff --git a/cockatrice/src/filters/filter_builder.cpp b/cockatrice/src/filters/filter_builder.cpp index f109fbcd3..785f753e7 100644 --- a/cockatrice/src/filters/filter_builder.cpp +++ b/cockatrice/src/filters/filter_builder.cpp @@ -1,6 +1,5 @@ #include "filter_builder.h" -#include "../interface/pixel_map_generator.h" #include "../interface/widgets/utility/custom_line_edit.h" #include @@ -22,7 +21,7 @@ FilterBuilder::FilterBuilder(QWidget *parent) : QWidget(parent) typeCombo->addItem(CardFilter::typeName(static_cast(i)), QVariant(i)); } - QPushButton *ok = new QPushButton(themePixmap(QStringLiteral("icons/increment")), QString()); + QPushButton *ok = new QPushButton(QPixmap("theme:icons/increment"), QString()); ok->setObjectName("ok"); ok->setMaximumSize(20, 20); diff --git a/cockatrice/src/game/board/counter_state.cpp b/cockatrice/src/game/board/counter_state.cpp index 0970e4272..6da18b662 100644 --- a/cockatrice/src/game/board/counter_state.cpp +++ b/cockatrice/src/game/board/counter_state.cpp @@ -13,12 +13,12 @@ CounterState *CounterState::fromProto(const ServerInfo_Counter &counter, QObject convertColorToQColor(counter.counter_color()), counter.radius(), counter.count(), parent); } -void CounterState::setValue(int newValue, bool skipDamageAnimation) +void CounterState::setValue(int newValue) { if (newValue == value) { return; } int old = value; value = newValue; - emit valueChanged(old, newValue, skipDamageAnimation); + emit valueChanged(old, newValue); } \ No newline at end of file diff --git a/cockatrice/src/game/board/counter_state.h b/cockatrice/src/game/board/counter_state.h index 4c7b34473..0f2f16b55 100644 --- a/cockatrice/src/game/board/counter_state.h +++ b/cockatrice/src/game/board/counter_state.h @@ -35,23 +35,10 @@ public: return value; } - /** - * @brief Set the counter value. - * @param newValue The new value. - * @param skipDamageAnimation When true, valueChanged is emitted with skipDamageAnimation=true, letting views - * suppress damage-related feedback (e.g. battlefield shimmer, life counter flash) for values set during replay - * rewinds. - */ - void setValue(int newValue, bool skipDamageAnimation = false); + void setValue(int newValue); signals: - /** - * @brief Emitted whenever the value changes. - * @param oldValue The previous value. - * @param newValue The new value. - * @param skipDamageAnimation True when the change should not trigger damage/life-change feedback in views. - */ - void valueChanged(int oldValue, int newValue, bool skipDamageAnimation); + void valueChanged(int oldValue, int newValue); private: int id; diff --git a/cockatrice/src/game/game_event_handler.cpp b/cockatrice/src/game/game_event_handler.cpp index f146cdbb4..bc68d4d7c 100644 --- a/cockatrice/src/game/game_event_handler.cpp +++ b/cockatrice/src/game/game_event_handler.cpp @@ -430,13 +430,12 @@ void GameEventHandler::eventJoin(const Event_Join &event, int /*eventPlayerId*/, QString playerName = QString::fromStdString(playerInfo.user_info().name()); emit addPlayerToAutoCompleteList(playerName); - PlayerManager *playerManager = game->getPlayerManager(); - if (playerManager->getPlayers().contains(playerId) || playerManager->getSpectators().contains(playerId)) { + if (game->getPlayerManager()->getPlayers().contains(playerId)) { return; } if (playerInfo.spectator()) { - playerManager->addSpectator(playerId, playerInfo); + game->getPlayerManager()->addSpectator(playerId, playerInfo); emit logJoinSpectator(playerName); emit spectatorJoined(playerInfo); } else { diff --git a/cockatrice/src/game/player/event_processing_options.h b/cockatrice/src/game/player/event_processing_options.h index 06238d77e..4c7663789 100644 --- a/cockatrice/src/game/player/event_processing_options.h +++ b/cockatrice/src/game/player/event_processing_options.h @@ -13,8 +13,7 @@ enum EventProcessingOption { SKIP_REVEAL_WINDOW = 0x0001, - SKIP_TAP_ANIMATION = 0x0002, - SKIP_DAMAGE_ANIMATION = 0x0004 + SKIP_TAP_ANIMATION = 0x0002 }; // Wrap it in a QFlags typedef diff --git a/cockatrice/src/game/player/player_event_handler.cpp b/cockatrice/src/game/player/player_event_handler.cpp index 277b8b1d4..bc48298f7 100644 --- a/cockatrice/src/game/player/player_event_handler.cpp +++ b/cockatrice/src/game/player/player_event_handler.cpp @@ -262,15 +262,14 @@ void PlayerEventHandler::eventCreateCounter(const Event_CreateCounter &event) player->addCounter(event.counter_info()); } -void PlayerEventHandler::eventSetCounter(const Event_SetCounter &event, EventProcessingOptions options) +void PlayerEventHandler::eventSetCounter(const Event_SetCounter &event) { CounterState *ctr = player->getCounters().value(event.counter_id(), nullptr); if (!ctr) { return; } int oldValue = ctr->getValue(); - const bool skipDamageAnimation = options.testFlag(SKIP_DAMAGE_ANIMATION); - ctr->setValue(event.value(), skipDamageAnimation); + ctr->setValue(event.value()); emit logSetCounter(player, ctr->getName(), event.value(), oldValue); } @@ -626,7 +625,7 @@ void PlayerEventHandler::processGameEvent(GameEvent::GameEventType type, eventCreateCounter(event.GetExtension(Event_CreateCounter::ext)); break; case GameEvent::SET_COUNTER: - eventSetCounter(event.GetExtension(Event_SetCounter::ext), options); + eventSetCounter(event.GetExtension(Event_SetCounter::ext)); break; case GameEvent::DEL_COUNTER: eventDelCounter(event.GetExtension(Event_DelCounter::ext)); diff --git a/cockatrice/src/game/player/player_event_handler.h b/cockatrice/src/game/player/player_event_handler.h index 300cacd08..48ad85e88 100644 --- a/cockatrice/src/game/player/player_event_handler.h +++ b/cockatrice/src/game/player/player_event_handler.h @@ -153,7 +153,7 @@ public: void eventCreateCounter(const Event_CreateCounter &event); /// Set a player-level counter value. - void eventSetCounter(const Event_SetCounter &event, EventProcessingOptions options); + void eventSetCounter(const Event_SetCounter &event); /// Delete a player-level counter. void eventDelCounter(const Event_DelCounter &event); diff --git a/cockatrice/src/game/player/player_logic.cpp b/cockatrice/src/game/player/player_logic.cpp index 143df5c57..45ba09aac 100644 --- a/cockatrice/src/game/player/player_logic.cpp +++ b/cockatrice/src/game/player/player_logic.cpp @@ -175,15 +175,7 @@ void PlayerLogic::processPlayerInfo(const ServerInfo_Player &info) const ServerInfo_Card &cardInfo = zoneInfo.card_list(j); auto *card = new CardItem(this); card->processCardInfo(cardInfo); - // Zones without coordinates (hand, piles, stack) preserve the order - // they arrive in on the server in the positions of their cards list. - // The x coordinate of such cards is always 0, so inserting at it - // would reverse the list on reconnect. Append instead. - if (zoneInfo.with_coords()) { - zone->addCard(card, false, cardInfo.x(), cardInfo.y()); - } else { - zone->addCard(card, false, -1); - } + zone->addCard(card, false, cardInfo.x(), cardInfo.y()); } } if (zoneInfo.has_always_reveal_top_card()) { diff --git a/cockatrice/src/game/player/player_manager.cpp b/cockatrice/src/game/player/player_manager.cpp index 8486efbeb..6772d3ff1 100644 --- a/cockatrice/src/game/player/player_manager.cpp +++ b/cockatrice/src/game/player/player_manager.cpp @@ -75,14 +75,6 @@ PlayerLogic *PlayerManager::getPlayer(int playerId) const return player; } -void PlayerManager::clearSpectators() -{ - const QList spectatorIds = spectators.keys(); - for (int spectatorId : spectatorIds) { - removeSpectator(spectatorId); - } -} - void PlayerManager::onPlayerConceded(int playerId, bool conceded) { // Everything else cares about this diff --git a/cockatrice/src/game/player/player_manager.h b/cockatrice/src/game/player/player_manager.h index 504e65396..2f8b87af8 100644 --- a/cockatrice/src/game/player/player_manager.h +++ b/cockatrice/src/game/player/player_manager.h @@ -100,9 +100,6 @@ public: emit spectatorRemoved(spectatorId, spectatorInfo); } - /** @brief Remove all spectators, emitting the removal signal for each. */ - void clearSpectators(); - [[nodiscard]] AbstractGame *getGame() const { return game; diff --git a/cockatrice/src/game_graphics/board/abstract_card_item.cpp b/cockatrice/src/game_graphics/board/abstract_card_item.cpp index 3969b7d03..1410d0c80 100644 --- a/cockatrice/src/game_graphics/board/abstract_card_item.cpp +++ b/cockatrice/src/game_graphics/board/abstract_card_item.cpp @@ -1,7 +1,6 @@ #include "abstract_card_item.h" #include "../../client/settings/cache_settings.h" -#include "../../interface/card_localization.h" #include "../../interface/card_picture_loader/card_picture_loader.h" #include "../game_scene.h" #include "../z_values.h" @@ -27,8 +26,6 @@ AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::displayCardNamesChanged, this, [this] { update(); }); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this, - [this] { update(); }); refreshCardInfo(); connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::roundCardCornersChanged, this, @@ -174,7 +171,7 @@ void AbstractCardItem::paintPicture(QPainter *painter, const QSizeF &translatedS if (SettingsCache::instance().debug().getShowCardId()) { prefix = "#" + QString::number(id) + " "; } - nameStr = prefix + CardLocalization::displayName(getCardInfo()); + nameStr = prefix + cardRef.name; } painter->drawText(QRectF(3 * scaleFactor, 3 * scaleFactor, translatedSize.width() - 6 * scaleFactor, translatedSize.height() - 6 * scaleFactor), diff --git a/cockatrice/src/game_graphics/board/abstract_counter.cpp b/cockatrice/src/game_graphics/board/abstract_counter.cpp index 4ba04804f..e63117e13 100644 --- a/cockatrice/src/game_graphics/board/abstract_counter.cpp +++ b/cockatrice/src/game_graphics/board/abstract_counter.cpp @@ -29,9 +29,9 @@ AbstractCounter::AbstractCounter(CounterState *state, { setAcceptHoverEvents(true); - connect(state, &CounterState::valueChanged, this, [this](int oldValue, int newValue, bool skipDamageAnimation) { + connect(state, &CounterState::valueChanged, this, [this](int oldValue, int newValue) { value = newValue; - onValueChanged(oldValue, newValue, skipDamageAnimation); + onValueChanged(oldValue, newValue); update(); }); @@ -230,7 +230,7 @@ void AbstractCounterDialog::changeValue(int diff) setTextValue(QString::number(curValue)); } -void AbstractCounter::onValueChanged(int /*oldValue*/, int /*newValue*/, bool /*skipDamageAnimation*/) +void AbstractCounter::onValueChanged(int /*oldValue*/, int /*newValue*/) { // Default: no feedback. Subclasses such as PlayerCounter override this to // flash the counter on meaningful changes (life gain/loss). diff --git a/cockatrice/src/game_graphics/board/abstract_counter.h b/cockatrice/src/game_graphics/board/abstract_counter.h index 67b5b4074..9ddcc6d58 100644 --- a/cockatrice/src/game_graphics/board/abstract_counter.h +++ b/cockatrice/src/game_graphics/board/abstract_counter.h @@ -39,9 +39,8 @@ protected: * @brief Hook for subclasses that need per-value-change feedback (e.g. life-total flash). * * Called whenever the counter's value changes, before the item repaints. - * @param skipDamageAnimation True when damage-related feedback should be suppressed (replay rewinds). */ - virtual void onValueChanged(int oldValue, int newValue, bool skipDamageAnimation); + virtual void onValueChanged(int oldValue, int newValue); void mousePressEvent(QGraphicsSceneMouseEvent *event) override; void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; diff --git a/cockatrice/src/game_graphics/board/card_item.cpp b/cockatrice/src/game_graphics/board/card_item.cpp index c2dc455cc..c40c8c214 100644 --- a/cockatrice/src/game_graphics/board/card_item.cpp +++ b/cockatrice/src/game_graphics/board/card_item.cpp @@ -316,7 +316,7 @@ void CardItem::drawAttachArrow() for (const auto &item : scene()->selectedItems()) { CardItem *card = qgraphicsitem_cast(item); - if (card == nullptr || card == this) { + if (card == nullptr) { continue; } if (card->getZone() != state->getZone()) { diff --git a/cockatrice/src/game_graphics/deckview/deck_view.cpp b/cockatrice/src/game_graphics/deckview/deck_view.cpp index 1acd02a75..1278737a0 100644 --- a/cockatrice/src/game_graphics/deckview/deck_view.cpp +++ b/cockatrice/src/game_graphics/deckview/deck_view.cpp @@ -10,6 +10,7 @@ #include #include #include +#include #include DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item, @@ -380,10 +381,12 @@ void DeckViewScene::rebuildTree() addItem(container); } - // Cards in custom zones nested under a board are regular board cards in-game. - // They are collected recursively (like every other consumer) and reported with - // the top-level board zone as their origin, so that sideboard plans keep working. - for (auto *currentCard : deck->getCardNodes({currentZone->getName()})) { + for (int j = 0; j < currentZone->size(); j++) { + auto *currentCard = dynamic_cast(currentZone->at(j)); + if (!currentCard) { + continue; + } + for (int k = 0; k < currentCard->getNumber(); ++k) { auto *newCard = new DeckViewCard(container, currentCard->toCardRef(), currentZone->getName()); container->addCard(newCard); diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp index 6d8ad0534..b311d2ebd 100644 --- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp @@ -16,13 +16,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -90,17 +88,6 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa cardDatabaseDisplayModel = new TokenDisplayModel(this); cardDatabaseDisplayModel->setSourceModel(cardDatabaseModel); - const auto applyCardSearchLanguage = [this]() { - const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay(); - cardDatabaseDisplayModel->setSearchLanguage(CardSearchLanguage{ - cardsDisplay.getCardLang(), static_cast(cardsDisplay.getCardSearchLanguage())}); - }; - applyCardSearchLanguage(); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this, - applyCardSearchLanguage); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this, - applyCardSearchLanguage); - chooseTokenFromAllRadioButton = new QRadioButton(tr("Show &all tokens")); connect(chooseTokenFromAllRadioButton, &QRadioButton::toggled, this, &DlgCreateToken::actChooseTokenFromAll); chooseTokenFromDeckRadioButton = new QRadioButton(tr("Show tokens from this &deck")); diff --git a/cockatrice/src/game_graphics/game_scene.cpp b/cockatrice/src/game_graphics/game_scene.cpp index 17af7618b..cd2b12828 100644 --- a/cockatrice/src/game_graphics/game_scene.cpp +++ b/cockatrice/src/game_graphics/game_scene.cpp @@ -44,16 +44,11 @@ GameScene::GameScene(PhasesToolbar *_phasesToolbar, QObject *parent) GameScene::~GameScene() { - // Sever all destroyed->removeAnimatedItem connections before the members below - // are destroyed: the base QGraphicsScene destructor destroys the remaining items, - // and their destroyed() signals must not reach slots that reference members that - // no longer exist. The connection handle overload is used because the string-based - // disconnect(nullptr, nullptr, this, nullptr) is invalid (the sender must never be - // nullptr) and would otherwise fail to sever these pointer-to-member connections. - for (auto it = animationItemConnections.constBegin(); it != animationItemConnections.constEnd(); ++it) { - QObject::disconnect(*it); - } - animationItemConnections.clear(); + // Sever all incoming connections (animated item destroy-tracking) before the + // members below are destroyed: the base QGraphicsScene destructor destroys the + // remaining items, and their destroyed() signals must not reach slots that + // reference members that no longer exist. + disconnect(this); delete animationTimer; animationTimer = nullptr; @@ -221,12 +216,7 @@ void GameScene::removePlayer(PlayerLogic *player) clearArrowsForPlayer(player->getPlayerInfo()->getId()); - // Closing a view removes it from zoneViews synchronously, so iterate over a - // copy: otherwise a player with several open views (e.g. library and hand) - // only has the first one closed here and the remaining views are left - // pointing at a player that is about to be deleted. - const QList zoneViewCopy = zoneViews; - for (ZoneViewWidget *zone : zoneViewCopy) { + for (ZoneViewWidget *zone : zoneViews) { if (zone->getPlayer() == player) { zone->close(); } @@ -669,10 +659,7 @@ CardItem *GameScene::findTopmostCardInZone(const QList &items, */ void GameScene::toggleZoneView(PlayerLogic *player, const QString &zoneName, int numberCards, bool isReversed) { - // Closing a view removes it from zoneViews synchronously, so iterate over a - // copy to make sure every already-open matching view is closed. - const QList zoneViewCopy = zoneViews; - for (auto *view : zoneViewCopy) { + for (auto &view : zoneViews) { ZoneViewZone *temp = view->getZone(); if (temp->getLogic()->getName() == zoneName && temp->getLogic()->getPlayer() == player && qobject_cast(temp->getLogic())->getNumberCards() == numberCards) { @@ -790,15 +777,8 @@ void GameScene::registerAnimationItem(IAnimatedItem *item) if (!object) { return; } - // Guard against duplicate connections using the connection map, not - // animatedItems: the animation timer removes entries from animatedItems when an - // animation completes, but the destroyed->removeAnimatedItem connection must - // persist until the object is destroyed. Relying on animatedItems here would let - // a re-registered item (e.g. a life counter that flashes repeatedly) accumulate - // duplicate destroyed connections, the older ones of which would survive teardown. - if (!animationItemConnections.contains(object)) { - animationItemConnections.insert(object, - connect(object, &QObject::destroyed, this, &GameScene::removeAnimatedItem)); + if (!animatedItems.contains(object)) { + connect(object, &QObject::destroyed, this, &GameScene::removeAnimatedItem); } animatedItems.insert(object, item); if (animationTimer && !animationTimer->isActive()) { @@ -817,7 +797,6 @@ void GameScene::unregisterAnimationItem(IAnimatedItem *item) void GameScene::removeAnimatedItem(QObject *item) { animatedItems.remove(item); - animationItemConnections.remove(item); if (animationTimer && animatedItems.isEmpty()) { animationTimer->stop(); } diff --git a/cockatrice/src/game_graphics/game_scene.h b/cockatrice/src/game_graphics/game_scene.h index 859d7a6eb..c12696189 100644 --- a/cockatrice/src/game_graphics/game_scene.h +++ b/cockatrice/src/game_graphics/game_scene.h @@ -54,11 +54,9 @@ private: QPointer hoveredCard; ///< Currently hovered card QBasicTimer *animationTimer; ///< Timer for scene animations QHash animatedItems; ///< Items currently animating - QHash - animationItemConnections; ///< destroyed->removeAnimatedItem handles per animated item - int playerRotation; ///< Rotation offset for player layout - bool rearranging = false; ///< Guard against re-entrant rearrange - bool needsReArrange = false; ///< Pending rearrange requested during a pass + int playerRotation; ///< Rotation offset for player layout + bool rearranging = false; ///< Guard against re-entrant rearrange + bool needsReArrange = false; ///< Pending rearrange requested during a pass /** * @brief Updates which card is currently hovered based on scene coordinates. diff --git a/cockatrice/src/game_graphics/hand_counter.cpp b/cockatrice/src/game_graphics/hand_counter.cpp index 8dcbcfdaa..35989ff38 100644 --- a/cockatrice/src/game_graphics/hand_counter.cpp +++ b/cockatrice/src/game_graphics/hand_counter.cpp @@ -1,6 +1,5 @@ #include "hand_counter.h" -#include "../interface/pixel_map_generator.h" #include "zones/card_zone.h" #include @@ -33,8 +32,7 @@ void HandCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*op QSize translatedSize = painter->combinedTransform().mapRect(boundingRect()).size().toSize(); QPixmap cachedPixmap; if (!QPixmapCache::find("handCounter" + QString::number(translatedSize.width()), &cachedPixmap)) { - cachedPixmap = - themePixmap(QStringLiteral("hand")).scaled(translatedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); + cachedPixmap = QPixmap("theme:hand").scaled(translatedSize, Qt::KeepAspectRatio, Qt::SmoothTransformation); QPixmapCache::insert("handCounter" + QString::number(translatedSize.width()), cachedPixmap); } resetPainterTransform(painter); diff --git a/cockatrice/src/game_graphics/player/menu/tally_menu.cpp b/cockatrice/src/game_graphics/player/menu/tally_menu.cpp index 08cb6cac9..7eb3945b3 100644 --- a/cockatrice/src/game_graphics/player/menu/tally_menu.cpp +++ b/cockatrice/src/game_graphics/player/menu/tally_menu.cpp @@ -12,13 +12,11 @@ TallyMenu::TallyMenu() aTallyNone = createTallyAction(TallyType::None); aTallySubtypes = createTallyAction(TallyType::Subtypes); aTallyTotalPower = createTallyAction(TallyType::TotalPower); - aTallyTotalToughness = createTallyAction(TallyType::TotalToughness); addAction(aTallyNone); addSeparator(); addAction(aTallySubtypes); addAction(aTallyTotalPower); - addAction(aTallyTotalToughness); retranslateUi(); } @@ -56,5 +54,4 @@ void TallyMenu::retranslateUi() aTallyNone->setText(tr("None")); aTallySubtypes->setText(tr("Subtypes")); aTallyTotalPower->setText(tr("Total Power")); - aTallyTotalToughness->setText(tr("Total Toughness")); } diff --git a/cockatrice/src/game_graphics/player/menu/tally_menu.h b/cockatrice/src/game_graphics/player/menu/tally_menu.h index 11802fd20..acd1daf67 100644 --- a/cockatrice/src/game_graphics/player/menu/tally_menu.h +++ b/cockatrice/src/game_graphics/player/menu/tally_menu.h @@ -24,7 +24,6 @@ private: QAction *aTallyNone = nullptr; QAction *aTallySubtypes = nullptr; QAction *aTallyTotalPower = nullptr; - QAction *aTallyTotalToughness = nullptr; QAction *createTallyAction(TallyType tallyType); }; diff --git a/cockatrice/src/game_graphics/player/player_graphics_item.cpp b/cockatrice/src/game_graphics/player/player_graphics_item.cpp index 122ab83be..8bf2703e1 100644 --- a/cockatrice/src/game_graphics/player/player_graphics_item.cpp +++ b/cockatrice/src/game_graphics/player/player_graphics_item.cpp @@ -3,7 +3,6 @@ #include "../../game/player/player_actions.h" #include "../../interface/card_picture_loader/card_picture_loader.h" #include "../../interface/widgets/cards/art_crop_attribution.h" -#include "../../interface/widgets/cards/card_art_utils.h" #include "../../interface/widgets/playmat/playmat_utils.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../board/abstract_card_item.h" @@ -252,8 +251,8 @@ void PlayerGraphicsItem::onCounterAdded(CounterState *state) AbstractCounter *widget; if (state->getName() == "life") { widget = playerTarget->addCounter(state); - connect(state, &CounterState::valueChanged, this, [this](int oldValue, int newValue, bool skipDamageAnimation) { - if (newValue < oldValue && !skipDamageAnimation) { + connect(state, &CounterState::valueChanged, this, [this](int oldValue, int newValue) { + if (newValue < oldValue) { tableZoneGraphicsItem->triggerDamageShimmer(); } }); @@ -443,7 +442,7 @@ void PlayerGraphicsItem::updatePlaymat() hasPlaymat = true; emit playmatChanged(true); } - playmatPixmap = CardArtUtils::rotateSidewaysLayoutArt(fullRes, card); + playmatPixmap = fullRes; update(); } diff --git a/cockatrice/src/game_graphics/player/player_list_widget.cpp b/cockatrice/src/game_graphics/player/player_list_widget.cpp index a7ec2e4a9..4268e1019 100644 --- a/cockatrice/src/game_graphics/player/player_list_widget.cpp +++ b/cockatrice/src/game_graphics/player/player_list_widget.cpp @@ -53,13 +53,13 @@ PlayerListWidget::PlayerListWidget(TabSupervisor *_tabSupervisor, QWidget *parent) : QTreeWidget(parent), tabSupervisor(_tabSupervisor), client(_client), game(_game), gameStarted(false) { - readyIcon = themePixmap(QStringLiteral("icons/ready_start")); - notReadyIcon = themePixmap(QStringLiteral("icons/not_ready_start")); - concededIcon = themePixmap(QStringLiteral("icons/conceded")); + readyIcon = QPixmap("theme:icons/ready_start"); + notReadyIcon = QPixmap("theme:icons/not_ready_start"); + concededIcon = QPixmap("theme:icons/conceded"); playerIcon = loadColorAdjustedPixmap("theme:icons/player"); judgeIcon = loadColorAdjustedPixmap("theme:icons/scales"); spectatorIcon = loadColorAdjustedPixmap("theme:icons/spectator"); - lockIcon = themePixmap(QStringLiteral("icons/lock")); + lockIcon = QPixmap("theme:icons/lock"); if (tabSupervisor) { itemDelegate = new PlayerListItemDelegate(this); @@ -92,11 +92,6 @@ void PlayerListWidget::retranslateUi() void PlayerListWidget::addPlayer(const ServerInfo_PlayerProperties &player) { - if (players.contains(player.player_id())) { - updatePlayerProperties(player); - return; - } - QTreeWidgetItem *newPlayer = new PlayerListTWI; players.insert(player.player_id(), newPlayer); updatePlayerProperties(player); @@ -181,17 +176,6 @@ void PlayerListWidget::removePlayer(int playerId) delete takeTopLevelItem(indexOfTopLevelItem(player)); } -void PlayerListWidget::clearSpectators() -{ - const QList playerIds = players.keys(); - for (int playerId : playerIds) { - QTreeWidgetItem *player = players.value(playerId, 0); - if (player && !player->data(1, Qt::UserRole).toBool()) { - removePlayer(playerId); - } - } -} - void PlayerListWidget::setActivePlayer(int playerId) { QMapIterator i(players); diff --git a/cockatrice/src/game_graphics/player/player_list_widget.h b/cockatrice/src/game_graphics/player/player_list_widget.h index f2f0be5fd..a53cfa989 100644 --- a/cockatrice/src/game_graphics/player/player_list_widget.h +++ b/cockatrice/src/game_graphics/player/player_list_widget.h @@ -66,7 +66,6 @@ public slots: void addPlayer(const ServerInfo_PlayerProperties &player); void removePlayer(int playerId); void updatePlayerProperties(const ServerInfo_PlayerProperties &prop, int playerId = -1); - void clearSpectators(); }; #endif diff --git a/cockatrice/src/game_graphics/player/player_target.cpp b/cockatrice/src/game_graphics/player/player_target.cpp index d6c28370d..910ee9c17 100644 --- a/cockatrice/src/game_graphics/player/player_target.cpp +++ b/cockatrice/src/game_graphics/player/player_target.cpp @@ -69,7 +69,7 @@ void PlayerCounter::paint(QPainter *painter, const QStyleOptionGraphicsItem * /* } } -void PlayerCounter::onValueChanged(int oldValue, int newValue, bool skipDamageAnimation) +void PlayerCounter::onValueChanged(int oldValue, int newValue) { flashDelta = newValue - oldValue; if (flashDelta == 0) { @@ -81,11 +81,6 @@ void PlayerCounter::onValueChanged(int oldValue, int newValue, bool skipDamageAn return; } - if (skipDamageAnimation) { - flashAlpha = 0.0; - return; - } - flashAlpha = 1.0; flashClock.start(); if (scene()) { @@ -137,18 +132,8 @@ void PlayerTarget::paint(QPainter *painter, const QStyleOptionGraphicsItem * /*o QRectF translatedRect = painter->combinedTransform().mapRect(avatarBoundingRect); QSize translatedSize = translatedRect.size().toSize(); QPixmap cachedPixmap; - // The key must cover everything the generated pawn depends on: the rendered - // size, the user level, and the pixmap being drawn. fullPixmap.cacheKey() is - // 0 for every null pixmap, so the default-pawn branch additionally needs the - // pawn's privlevel (lowercased, matching UserLevelPixmapGenerator) and colors - // in the key — otherwise two players without a custom avatar (and the same - // user level) would share one cached pawn. const QString cacheKey = "avatar" + QString::number(translatedSize.width()) + "_" + - QString::number(translatedSize.height()) + "_" + QString::number(info->user_level()) + - "_" + QString::number(fullPixmap.cacheKey()) + "_" + - QString::fromStdString(info->privlevel()).toLower() + "_" + - QString::fromStdString(info->pawn_colors().left_side()) + "_" + - QString::fromStdString(info->pawn_colors().right_side()); + QString::number(info->user_level()) + "_" + QString::number(fullPixmap.cacheKey()); if (!QPixmapCache::find(cacheKey, &cachedPixmap)) { cachedPixmap = QPixmap(translatedSize.width(), translatedSize.height()); diff --git a/cockatrice/src/game_graphics/player/player_target.h b/cockatrice/src/game_graphics/player/player_target.h index 1d06c6274..af0e9c8b7 100644 --- a/cockatrice/src/game_graphics/player/player_target.h +++ b/cockatrice/src/game_graphics/player/player_target.h @@ -21,7 +21,7 @@ class PlayerCounter : public AbstractCounter, public IAnimatedItem { Q_OBJECT protected: - void onValueChanged(int oldValue, int newValue, bool skipDamageAnimation) override; + void onValueChanged(int oldValue, int newValue) override; private: static constexpr qreal flashDurationMs = 450.0; diff --git a/cockatrice/src/game_graphics/tally/stats_tally.cpp b/cockatrice/src/game_graphics/tally/stats_tally.cpp index 7e05c3fb1..e7a6621fa 100644 --- a/cockatrice/src/game_graphics/tally/stats_tally.cpp +++ b/cockatrice/src/game_graphics/tally/stats_tally.cpp @@ -34,31 +34,3 @@ QList StatsTally::computeTotalPower(const QList &cards) QString name = QCoreApplication::translate("StatsTally", "Total Power"); return {TallyRow{name, QString::number(total)}}; } - -static int sumToughness(const QList &cards) -{ - int total = 0; - for (auto card : cards) { - QVariantList parsed = CardItem::parsePT(card->getPT()); - if (parsed.size() == 2) { - int toughness = parsed.at(1).toInt(); // toInt will default to 0 if it's not an int - total += qMax(toughness, 0); - } - } - return total; -} - -QList StatsTally::computeTotalToughness(const QList &cards) -{ - // don't bother if none of the cards have pt - bool hasPT = - std::any_of(cards.cbegin(), cards.cend(), [](const CardItem *card) { return !card->getPT().isEmpty(); }); - if (!hasPT) { - return {}; - } - - int total = sumToughness(cards); - - QString name = QCoreApplication::translate("StatsTally", "Total Toughness"); - return {TallyRow{name, QString::number(total)}}; -} diff --git a/cockatrice/src/game_graphics/tally/stats_tally.h b/cockatrice/src/game_graphics/tally/stats_tally.h index e499587eb..4c3d93b56 100644 --- a/cockatrice/src/game_graphics/tally/stats_tally.h +++ b/cockatrice/src/game_graphics/tally/stats_tally.h @@ -16,14 +16,6 @@ namespace StatsTally */ QList computeTotalPower(const QList &cards); -/** - * @brief Sums the toughness of all selected cards - * - * @param cards The list of selected card items to analyze. - * @return A single row containing the total, or an empty list if none of the cards have pt - */ -QList computeTotalToughness(const QList &cards); - } // namespace StatsTally #endif // COCKATRICE_STATS_TALLY_H diff --git a/cockatrice/src/game_graphics/tally/tally.cpp b/cockatrice/src/game_graphics/tally/tally.cpp index 21806ee84..aa2cae024 100644 --- a/cockatrice/src/game_graphics/tally/tally.cpp +++ b/cockatrice/src/game_graphics/tally/tally.cpp @@ -21,8 +21,6 @@ QList Tally::compute(const QList &cards, const TallyType t return SubtypeTally::countSubtypes(cards); case TallyType::TotalPower: return StatsTally::computeTotalPower(cards); - case TallyType::TotalToughness: - return StatsTally::computeTotalToughness(cards); } return {}; } diff --git a/cockatrice/src/game_graphics/tally/tally.h b/cockatrice/src/game_graphics/tally/tally.h index 84c54918f..97406cddb 100644 --- a/cockatrice/src/game_graphics/tally/tally.h +++ b/cockatrice/src/game_graphics/tally/tally.h @@ -21,8 +21,7 @@ enum class TallyType None, Subtypes, TotalPower, - TotalToughness, - MaxValue = TotalToughness // sentinel value + MaxValue = TotalPower // sentinel value }; namespace Tally diff --git a/cockatrice/src/game_graphics/zones/hand_zone.cpp b/cockatrice/src/game_graphics/zones/hand_zone.cpp index 1a8f7a910..b52a4955a 100644 --- a/cockatrice/src/game_graphics/zones/hand_zone.cpp +++ b/cockatrice/src/game_graphics/zones/hand_zone.cpp @@ -41,8 +41,7 @@ void HandZone::handleDropEvent(const QList &dragItems, } } } else { - bool sameZone = startZone == getLogic(); - x = calcDropIndexFromY(dropPoint.y(), !sameZone); + x = calcDropIndexFromY(dropPoint.y()); } Command_MoveCard cmd; diff --git a/cockatrice/src/game_graphics/zones/select_zone.cpp b/cockatrice/src/game_graphics/zones/select_zone.cpp index 470c70fcf..c58c41b92 100644 --- a/cockatrice/src/game_graphics/zones/select_zone.cpp +++ b/cockatrice/src/game_graphics/zones/select_zone.cpp @@ -83,7 +83,7 @@ SelectZone::StackLayoutParams SelectZone::buildStackParams(qreal minOffset) cons return {cardCount, boundingRect().height(), cardHeight, offset, minOffset}; } -int SelectZone::calcDropIndexFromY(qreal dropY, bool allowCountExpand, qreal minOffset) const +int SelectZone::calcDropIndexFromY(qreal dropY, qreal minOffset) const { const auto &cards = getLogic()->getCards(); if (cards.isEmpty()) { @@ -94,8 +94,7 @@ int SelectZone::calcDropIndexFromY(qreal dropY, bool allowCountExpand, qreal min if (effectiveOffset <= 0.0) { return 0; } - int max = allowCountExpand ? params.cardCount : params.cardCount - 1; - return qBound(0, qRound((dropY - start) / effectiveOffset), max); + return qBound(0, qRound((dropY - start) / effectiveOffset), params.cardCount - 1); } void SelectZone::restoreStaleEscapedCards() diff --git a/cockatrice/src/game_graphics/zones/select_zone.h b/cockatrice/src/game_graphics/zones/select_zone.h index b5d3ca37a..7408f29b6 100644 --- a/cockatrice/src/game_graphics/zones/select_zone.h +++ b/cockatrice/src/game_graphics/zones/select_zone.h @@ -104,12 +104,8 @@ protected: /** * @brief Computes the card index at a given y-coordinate within the zone's vertical layout. * Returns 0 if the zone has no cards or the offset is zero. - * - * @param dropY The y-coordinate that the card was dropped at - * @param allowCountExpand If false, clamps the index at the number of cards minus 1 - * @param minOffset Minimum offset to preserve */ - int calcDropIndexFromY(qreal dropY, bool allowCountExpand, qreal minOffset = 0.0) const; + int calcDropIndexFromY(qreal dropY, qreal minOffset = 0.0) const; /** * @brief Positions cards vertically with alternating left/right x-offsets. diff --git a/cockatrice/src/game_graphics/zones/stack_zone.cpp b/cockatrice/src/game_graphics/zones/stack_zone.cpp index ff62097c7..e9b14f13d 100644 --- a/cockatrice/src/game_graphics/zones/stack_zone.cpp +++ b/cockatrice/src/game_graphics/zones/stack_zone.cpp @@ -57,14 +57,18 @@ void StackZone::handleDropEvent(const QList &dragItems, return; } - bool sameZone = startZone == getLogic(); - int index = calcDropIndexFromY(dropPoint.y(), !sameZone, MIN_CARD_VISIBLE); - if (sameZone) { + const auto &cards = getLogic()->getCards(); + int index; + if (startZone == getLogic()) { + // Reordering within the zone: use drop position + index = calcDropIndexFromY(dropPoint.y(), MIN_CARD_VISIBLE); // Same-zone no-op: don't move a card onto itself - const auto &cards = getLogic()->getCards(); if (!cards.isEmpty() && cards.at(index)->getId() == dragItems.at(0)->getId()) { return; } + } else { + // Coming from another zone: append at end (top of stack, rendered on top) + index = static_cast(cards.size()); } Command_MoveCard cmd; diff --git a/cockatrice/src/game_graphics/zones/view_zone.cpp b/cockatrice/src/game_graphics/zones/view_zone.cpp index 5bd5d262f..baf7b8b30 100644 --- a/cockatrice/src/game_graphics/zones/view_zone.cpp +++ b/cockatrice/src/game_graphics/zones/view_zone.cpp @@ -1,6 +1,5 @@ #include "view_zone.h" -#include "../../client/settings/cache_settings.h" #include "../../game/player/player_actions.h" #include "../../game/player/player_logic.h" #include "../../game/zones/view_zone_logic.h" @@ -12,13 +11,11 @@ #include #include #include -#include #include #include #include #include #include -#include /** * @param parent the parent QGraphicsWidget containing the reveal zone @@ -256,10 +253,7 @@ ZoneViewZone::GridSize ZoneViewZone::positionCardsForDisplay(CardList &cards, Ca void ZoneViewZone::setFilterString(const QString &_filterString) { - const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay(); - filterString = FilterString( - _filterString, CardSearchLanguage{cardsDisplay.getCardLang(), - static_cast(cardsDisplay.getCardSearchLanguage())}); + filterString = FilterString(_filterString); reorganizeCards(); } diff --git a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp index fa6733413..17118e80d 100644 --- a/cockatrice/src/game_graphics/zones/view_zone_widget.cpp +++ b/cockatrice/src/game_graphics/zones/view_zone_widget.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include namespace @@ -63,7 +62,7 @@ ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player, searchEdit.setPlaceholderText(tr("Search by card name (or search expressions)")); searchEdit.setClearButtonEnabled(true); searchEdit.addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); - auto help = searchEdit.addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); + auto help = searchEdit.addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition); connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(&searchEdit); }); @@ -169,12 +168,6 @@ ZoneViewWidget::ZoneViewWidget(PlayerLogic *_player, } connect(&searchEdit, &QLineEdit::textChanged, zone, &ZoneViewZone::setFilterString); - - const auto applyCardSearchLanguage = [this] { zone->setFilterString(searchEdit.text()); }; - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this, - applyCardSearchLanguage); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this, - applyCardSearchLanguage); } setLayout(vbox); @@ -556,7 +549,7 @@ void ZoneViewWidget::initStyleOption(QStyleOption *option) const { QStyleOptionTitleBar *titleBar = qstyleoption_cast(option); if (titleBar) { - titleBar->icon = themePixmap(QStringLiteral("cockatrice")); + titleBar->icon = QPixmap("theme:cockatrice"); } } diff --git a/cockatrice/src/interface/card_localization.h b/cockatrice/src/interface/card_localization.h deleted file mode 100644 index 0bfe4a764..000000000 --- a/cockatrice/src/interface/card_localization.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef COCKATRICE_CARD_LOCALIZATION_H -#define COCKATRICE_CARD_LOCALIZATION_H - -#include "../client/settings/cache_settings.h" - -#include -#include -#include - -namespace CardLocalization -{ -/** - * @brief The language code selected for localized card text and images. - */ -inline QString displayLang() -{ - return SettingsCache::instance().cardsDisplay().getCardLang(); -} - -/** - * @brief Card name in the configured display language, falling back to English. - * @param card The card to display. - * @return The localized name, or an empty string for a null card. - */ -inline QString displayName(const CardInfoPtr &card) -{ - return card.isNull() ? QString() : card->getLocalizedName(displayLang()); -} - -/** - * @brief Card rules text in the configured display language, falling back to English. - * @param card The card to display. - * @return The localized text, or an empty string for a null card. - */ -inline QString displayText(const CardInfoPtr &card) -{ - return card.isNull() ? QString() : card->getLocalizedText(displayLang()); -} - -/** - * @brief Card name in the configured display language, falling back to English. - * @param card The card to display. - */ -inline QString displayName(const CardInfo &card) -{ - return card.getLocalizedName(displayLang()); -} - -/** - * @brief Card rules text in the configured display language, falling back to English. - * @param card The card to display. - */ -inline QString displayText(const CardInfo &card) -{ - return card.getLocalizedText(displayLang()); -} -} // namespace CardLocalization - -#endif // COCKATRICE_CARD_LOCALIZATION_H \ No newline at end of file diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp index b8a54761a..2f46e7941 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp @@ -1,14 +1,13 @@ #include "card_picture_loader.h" #include "../../client/settings/cache_settings.h" -#include "../pixel_map_generator.h" #include "card_picture_loader_cache_method.h" #include "card_picture_loader_local_schemes.h" #include #include #include -#include +#include #include #include #include @@ -20,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -38,10 +36,8 @@ CardPictureLoader::CardPictureLoader() : QObject(nullptr) &CardPictureLoader::picsPathChanged); connect(&SettingsCache::instance().downloads(), &DownloadSettings::picDownloadChanged, this, &CardPictureLoader::picDownloadChanged); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this, - &CardPictureLoader::cardLangChanged); - qRegisterMetaType("ExactCard"); + qRegisterMetaType(); connect(worker, &CardPictureLoaderWorker::imageLoaded, this, &CardPictureLoader::imageLoaded); statusBar = new CardPictureLoaderStatusBar(nullptr); @@ -66,7 +62,7 @@ void CardPictureLoader::getCardBackPixmap(QPixmap &pixmap, QSize size) QString backCacheKey = "_trice_card_back_" + QString::number(size.width()) + "x" + QString::number(size.height()); if (!QPixmapCache::find(backCacheKey, &pixmap)) { qCDebug(CardPictureLoaderLog) << "PictureLoader: cache miss for" << backCacheKey; - QPixmap tmpPixmap = themePixmap(QStringLiteral("cardback")); + QPixmap tmpPixmap("theme:cardback"); if (tmpPixmap.isNull()) { qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback'! Using fallback pixmap."; @@ -87,7 +83,7 @@ void CardPictureLoader::getCardBackLoadingInProgressPixmap(QPixmap &pixmap, QSiz "_trice_card_back_inprogress_" + QString::number(size.width()) + "x" + QString::number(size.height()); if (!QPixmapCache::find(backCacheKey, &pixmap)) { qCDebug(CardPictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey; - QPixmap tmpPixmap = themePixmap(QStringLiteral("cardback")); + QPixmap tmpPixmap("theme:cardback"); if (tmpPixmap.isNull()) { qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback' for in-progress state! Using fallback."; @@ -109,7 +105,7 @@ void CardPictureLoader::getCardBackLoadingFailedPixmap(QPixmap &pixmap, QSize si "_trice_card_back_failed_" + QString::number(size.width()) + "x" + QString::number(size.height()); if (!QPixmapCache::find(backCacheKey, &pixmap)) { qCDebug(CardPictureLoaderCardBackCacheFailLog) << "PictureLoader: cache miss for" << backCacheKey; - QPixmap tmpPixmap = themePixmap(QStringLiteral("cardback")); + QPixmap tmpPixmap("theme:cardback"); if (tmpPixmap.isNull()) { qCWarning(CardPictureLoaderLog) << "Failed to load 'theme:cardback' for failed state! Using fallback."; @@ -142,8 +138,7 @@ void CardPictureLoader::getPixmap(QPixmap &pixmap, const ExactCard &card, QSize QPixmap bigPixmap; if (QPixmapCache::find(key, &bigPixmap)) { if (bigPixmap.isNull()) { - // Leave the pixmap null so callers fall back to a solid color - // instead of showing the card back. + getCardBackLoadingFailedPixmap(pixmap, size); QDateTime failedAtTime = getInstance().failedAt.value(key); if (!failedAtTime.isValid() || failedAtTime.addSecs(RETRY_FAILED_CARDS_SECS) < QDateTime::currentDateTime()) { @@ -209,49 +204,7 @@ void CardPictureLoader::imageLoaded(const ExactCard &card, const QImage &image) card.emitPixmapUpdated(); } -void CardPictureLoader::deleteAllLocalOverrides(const ExactCard &card) -{ - const QString picsRoot = SettingsCache::instance().paths().getPicsPath(); - if (picsRoot.isEmpty() || !card) { - return; - } - - QDir baseDir(picsRoot); - if (!baseDir.cd("downloadedPics")) { - return; - } - - const QString name = card.getInfo().getCorrectedName(); - - QString set, collector, uuid; - auto printing = card.getPrinting(); - if (printing.getSet()) { - set = printing.getSet()->getCorrectedShortName(); - collector = printing.getProperty("num"); - uuid = printing.getUuid(); - } - - for (const auto &scheme : CardPictureLoaderLocalSchemes::exportSchemes()) { - QString rel = CardPictureLoaderLocalSchemes::expandPattern(scheme.pattern, name, set, collector, uuid); - - if (rel.isEmpty()) { - continue; - } - - rel += ".png"; - rel = QDir::cleanPath(rel); - - QString fullPath = baseDir.filePath(rel); - - if (QFile::exists(fullPath)) { - QFile::remove(fullPath); - } - } -} - -void CardPictureLoader::saveCardImageToLocalStorage(const ExactCard &card, - const QPixmap &pixmap, - const bool allowOverwrite) +void CardPictureLoader::saveCardImageToLocalStorage(const ExactCard &card, const QPixmap &pixmap) { if (pixmap.isNull() || !card) { return; @@ -311,9 +264,8 @@ void CardPictureLoader::saveCardImageToLocalStorage(const ExactCard &card, QFileInfo outInfo(baseDir.filePath(relativePath)); - // Automatic cache writes (FILESYSTEM_CACHE) must never clobber an explicit user override. - // Only the explicit override paths pass allowOverwrite == true. - if (!allowOverwrite && outInfo.exists()) { + // Do not overwrite existing files + if (outInfo.exists()) { return; } @@ -334,122 +286,6 @@ void CardPictureLoader::saveCardImageToLocalStorage(const ExactCard &card, } } -void CardPictureLoader::installPrintingOverrideOnLoad(const ExactCard &originalCard, const ExactCard &overrideCard) -{ - // Overriding a card with itself is the reset case, not a real override: every code path below - // would re-enter itself through emitPixmapUpdated(). Reject it outright. - if (originalCard == overrideCard) { - return; - } - - CardInfoPtr cardPtr = overrideCard.getCardPtr(); - if (!cardPtr) { - return; - } - - // Heap-allocate so the lambda can capture it before the connection is made - auto *connectionHandle = new QMetaObject::Connection; - - *connectionHandle = - connect(cardPtr.data(), &CardInfo::pixmapUpdated, cardPtr.data(), - [originalCard, overrideCard, connectionHandle, this](const PrintingInfo &printing) { - // All printings share the same CardInfo, so ignore updates triggered by any - // other printing (e.g., the original card re-loading from disk). - if (printing != overrideCard.getPrinting()) { - return; - } - - QPixmap pixmap; - if (QPixmapCache::find(overrideCard.getPixmapCacheKey(), &pixmap) && !pixmap.isNull()) { - // The override art has resolved — persist it and reflect it immediately. - // Retire the connection before emitting so the refresh can't re-enter. - saveCardImageToLocalStorage(originalCard, pixmap, /*allowOverwrite=*/true); - - QObject::disconnect(*connectionHandle); - delete connectionHandle; - - QPixmapCache::clear(); - originalCard.emitPixmapUpdated(); - return; - } - - // The art could not be resolved. Keep the connection armed so a late resolution - // still lands, and surface a visible refusal instead of a silent no-op. An - // override already on disk is left untouched and simply re-displayed. - QPixmapCache::clear(); - if (!hasLocalOverrides(originalCard)) { - QPixmap refusedPixmap; - getCardBackLoadingFailedPixmap(refusedPixmap, QSize(480, 672)); - QPixmapCache::insert(originalCard.getPixmapCacheKey(), refusedPixmap); - } - originalCard.emitPixmapUpdated(); - }); - - // Now enqueue; if the image is already loading (deduplicated in the worker), - // the signal will still fire when it completes - CardPictureLoader::getInstance().worker->enqueueImageLoad(overrideCard); -} - -void CardPictureLoader::installPrintingOverride(const ExactCard &originalCard, const ExactCard &overrideCard) -{ - // Same guard as installPrintingOverrideOnLoad: self-override is the reset case. - if (originalCard == overrideCard) { - return; - } - - QPixmap pixmap; - const QString key = overrideCard.getPixmapCacheKey(); - - if (QPixmapCache::find(key, &pixmap) && !pixmap.isNull()) { - // Already cached — save immediately; the caller refreshes the card. - saveCardImageToLocalStorage(originalCard, pixmap, /*allowOverwrite=*/true); - return; - } - - // Cache miss or previously failed load — enqueue load and wait for the signal. - installPrintingOverrideOnLoad(originalCard, overrideCard); -} - -bool CardPictureLoader::hasLocalOverrides(const ExactCard &card) -{ - const QString picsRoot = SettingsCache::instance().paths().getPicsPath(); - if (picsRoot.isEmpty() || !card) { - return false; - } - - QDir baseDir(picsRoot); - if (!baseDir.cd("downloadedPics")) { - return false; - } - - const QString name = card.getInfo().getCorrectedName(); - - QString set, collector, uuid; - const PrintingInfo printing = card.getPrinting(); - if (printing.getSet()) { - set = printing.getSet()->getCorrectedShortName(); - collector = printing.getProperty("num"); - uuid = printing.getUuid(); - } - - for (const auto &scheme : CardPictureLoaderLocalSchemes::exportSchemes()) { - QString rel = CardPictureLoaderLocalSchemes::expandPattern(scheme.pattern, name, set, collector, uuid); - - if (rel.isEmpty()) { - continue; - } - - rel += ".png"; - rel = QDir::cleanPath(rel); - - if (QFile::exists(baseDir.filePath(rel))) { - return true; - } - } - - return false; -} - void CardPictureLoader::clearPixmapCache() { QPixmapCache::clear(); @@ -489,11 +325,31 @@ void CardPictureLoader::picsPathChanged() QPixmapCache::clear(); } -void CardPictureLoader::cardLangChanged() +bool CardPictureLoader::hasCustomArt() { - // Localized images are fetched via a different URL, but the in-memory - // pixmap cache is keyed by card name/uuid, so drop everything cached - // (including failure timestamps) to force a reload in the new language. - QPixmapCache::clear(); - failedAt.clear(); + auto picsPath = SettingsCache::instance().paths().getPicsPath(); + QDirIterator it(picsPath, QDir::Dirs | QDir::NoDotAndDotDot); + + // Check if there is at least one non-directory file in the pics path, other + // than in the "downloadedPics" subdirectory. + while (it.hasNext()) { +#if (QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)) + QFileInfo dir(it.nextFileInfo()); +#else + // nextFileInfo() is only available in Qt 6.3+, for previous versions, we build + // the QFileInfo from a QString which requires more system calls. + QFileInfo dir(it.next()); +#endif + + if (it.fileName() == "downloadedPics") { + continue; + } + + QDirIterator subIt(it.filePath(), QDir::Files, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); + if (subIt.hasNext()) { + return true; + } + } + + return false; } diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h index 0a4934e6d..5c3ac84a3 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.h +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.h @@ -97,17 +97,10 @@ public: static void cacheCardPixmaps(const QList &cards); /** - * @brief Check if a local override image already exists for the card. - * @param card The card to check. - * @return True if the card has at least one locally stored override image. + * @brief Check if the user has custom card art in the picsPath directory. + * @return True if any custom art exists. */ - static bool hasLocalOverrides(const ExactCard &card); - - /** - * @brief Removes all locally stored override images for the card. - * @param card The card to remove the override images of. - */ - static void deleteAllLocalOverrides(const ExactCard &card); + static bool hasCustomArt(); /** * @brief Clears the in-memory QPixmap cache for all cards. @@ -127,9 +120,7 @@ public slots: * @param image Loaded QImage. */ void imageLoaded(const ExactCard &card, const QImage &image); - void saveCardImageToLocalStorage(const ExactCard &card, const QPixmap &pixmap, bool allowOverwrite = false); - void installPrintingOverride(const ExactCard &originalCard, const ExactCard &overrideCard); - void installPrintingOverrideOnLoad(const ExactCard &originalCard, const ExactCard &overrideCard); + void saveCardImageToLocalStorage(const ExactCard &card, const QPixmap &pixmap); private slots: /** @@ -143,12 +134,6 @@ private slots: * Clears the QPixmap cache to reload images. */ void picsPathChanged(); - - /** - * @brief Triggered when the card language setting changes. - * Clears the in-memory picture caches so images reload in the new language. - */ - void cardLangChanged(); }; #endif diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp index c82fca403..39621839a 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp @@ -94,10 +94,6 @@ QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName, candidatePaths << picsPath + "/downloadedPics/" + setName + "/" + nameVariant; } - // Non-set-folder export schemes (e.g., Name_Set_Collector) write straight into - // downloadedPics/; check there as a fallback so local overrides round-trip. - candidatePaths << picsPath + "/downloadedPics/" + nameVariant; - for (const QString &path : candidatePaths) { QFileInfo fileInfo(path); QDir dir = fileInfo.dir(); @@ -109,8 +105,7 @@ QImage CardPictureLoaderLocal::tryLoadCardImageFromDisk(const QString &setName, QStringList files = dir.entryList(QDir::Files); for (const QString &file : files) { - QFileInfo fi(file); - if (fi.completeBaseName() != baseName) { + if (!file.startsWith(baseName)) { continue; } diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp index 34092f361..d288236d2 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp @@ -84,8 +84,8 @@ void CardPictureLoaderWorker::queueRequest(const QUrl &url, CardPictureLoaderWor SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) == CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE && cache->metaData(url).isValid()) { - // A request that will be served from the disk cache never touches the network and therefore - // doesn't use up any of the rate limit, so it gets to skip the queue. + // If we hit a cached url, we get to make the request for free, since it won't contribute towards the + // rate-limit makeRequest(url, worker); return; } @@ -107,13 +107,10 @@ QNetworkReply *CardPictureLoaderWorker::makeRequest(const QUrl &url, CardPicture req.setHeader(QNetworkRequest::UserAgentHeader, QString("Cockatrice %1").arg(VERSION_STRING)); req.setRawHeader("Accept", "image/avif,image/webp,image/apng,image/,/*;q=0.8"); - // Cached entries are served straight from the disk cache even when picture downloads are - // enabled: re-fetching an already-cached image would burn the rate limit for nothing. Only a - // genuine cache miss goes to the network, and only when downloads are enabled. - bool useNetworkCache = static_cast( - SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) == - CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE && - (cache->metaData(url).isValid() || !picDownload); + bool useNetworkCache = + !picDownload && static_cast( + SettingsCache::instance().cacheStorage().getCardPictureLoaderCacheMethod()) == + CardPictureLoaderCacheMethod::CacheMethod::NETWORK_CACHE; req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, useNetworkCache ? QNetworkRequest::AlwaysCache : QNetworkRequest::AlwaysNetwork); diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp index 4f933207e..5f4ff0bbd 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp @@ -282,15 +282,8 @@ QString CardPictureToLoad::transformUrl(const QString &urlTemplate) const } // language setting - const QString cardLang = SettingsCache::instance().cardsDisplay().getCardLang(); - transformMap["!sflang!"] = cardLang; - - // The localized printing's own id is unknown, so Scryfall must resolve it by - // its translated name (see populateSetUrls); expose that name for the - // `/cards/named` template. - if (cardLang != "en") { - transformMap["!localizedName!"] = card.getInfo().getLocalizedName(cardLang); - } + transformMap["!sflang!"] = QString(QCoreApplication::translate( + "PictureLoader", "en", "code for scryfall's language property, not available for all languages")); QString transformedUrl = urlTemplate; for (const QString &prop : transformMap.keys()) { diff --git a/cockatrice/src/interface/deck_loader/deck_file_format.h b/cockatrice/src/interface/deck_loader/deck_file_format.h index 3a25797ec..995de32c0 100644 --- a/cockatrice/src/interface/deck_loader/deck_file_format.h +++ b/cockatrice/src/interface/deck_loader/deck_file_format.h @@ -17,7 +17,7 @@ enum Format PlainText, /** - * This is Cockatrice's native deck file format, and supports deck metadata such as banner cards and tags. + * This is cockatrice's native deck file format, and supports deck metadata such as banner cards and tags. * Stored as .cod files. */ Cockatrice diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp index f29b4eed2..39a0c1071 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.cpp +++ b/cockatrice/src/interface/deck_loader/deck_loader.cpp @@ -50,7 +50,7 @@ DeckLoader::loadFromFile(const QString &fileName, DeckFileFormat::Format fmt, bo result = deckList.loadFromFile_Native(&file); if (!result) { qCInfo(DeckLoaderLog) << "Failed to load " << fileName - << "as Cockatrice format; retrying as plain format"; + << "as cockatrice format; retrying as plain format"; file.seek(0); result = deckList.loadFromFile_Plain(&file, CardNameNormalizer()); fmt = DeckFileFormat::PlainText; @@ -375,32 +375,15 @@ void DeckLoader::saveToStream_DeckHeader(QTextStream &out, const DeckList &deckL void DeckLoader::saveToStream_DeckZone(QTextStream &out, const InnerDecklistNode *zoneNode, bool addComments, - bool addSetNameAndNumber, - const QString &boardZoneName) + bool addSetNameAndNumber) { - // Nested sub-zones keep their owning board's identity: the top-level call - // passes no board, so the zone's own name is used; recursive calls carry the - // owning board down so the sideboard marker survives sub-zone nesting. - const QString owningBoardZoneName = boardZoneName.isEmpty() ? zoneNode->getName() : boardZoneName; - // group cards by card type and count the subtotals QMultiMap cardsByType; QMap cardTotalByType; int cardTotal = 0; - QList subZones; for (int j = 0; j < zoneNode->size(); j++) { auto *card = dynamic_cast(zoneNode->at(j)); - if (!card) { - // Cards collected in nested sub-zones are exported by recursion so - // they don't end up invisible in the plain text output. They are - // deferred until after this zone's own header and cards so they read - // as part of this zone's block. - if (auto *subZone = dynamic_cast(zoneNode->at(j))) { - subZones.append(subZone); - } - continue; - } CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(card->getName()); QString cardType = info ? info->getMainCardType() : "unknown"; @@ -428,30 +411,25 @@ void DeckLoader::saveToStream_DeckZone(QTextStream &out, QList cards = cardsByType.values(cardType); - saveToStream_DeckZoneCards(out, cards, addComments, addSetNameAndNumber, owningBoardZoneName); + saveToStream_DeckZoneCards(out, zoneNode, cards, addComments, addSetNameAndNumber); if (addComments) { out << "\n"; } } - - // Nested sub-zones come last, after the parent's own header and cards. - for (const auto *subZone : subZones) { - saveToStream_DeckZone(out, subZone, addComments, addSetNameAndNumber, owningBoardZoneName); - } } void DeckLoader::saveToStream_DeckZoneCards(QTextStream &out, + const InnerDecklistNode *zoneNode, QList cards, bool addComments, - bool addSetNameAndNumber, - const QString &boardZoneName) + bool addSetNameAndNumber) { // QMultiMap sorts values in reverse order for (int i = cards.size() - 1; i >= 0; --i) { DecklistCardNode *card = cards[i]; - if (boardZoneName == DECK_ZONE_SIDE && addComments) { + if (zoneNode->getName() == DECK_ZONE_SIDE && addComments) { out << "SB: "; } @@ -532,26 +510,9 @@ bool DeckLoader::convertToCockatriceFormat(LoadedDeck &deck) void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node) { - if (!node || node->isEmpty()) { - return; - } - const int totalColumns = 2; - // Dispatch children by type instead of trusting a whole-node height: a deck - // node may hold direct cards and nested zones side by side (custom zones), - // and an empty node would previously crash on at(0). - QVector cards; - QVector subZones; - for (int i = 0; i < node->size(); i++) { - if (auto *card = dynamic_cast(node->at(i))) { - cards.append(card); - } else if (auto *zone = dynamic_cast(node->at(i))) { - subZones.append(zone); - } - } - - if (!cards.isEmpty()) { + if (node->height() == 1) { QTextBlockFormat blockFormat; QTextCharFormat charFormat; charFormat.setFontPointSize(11); @@ -562,9 +523,9 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode tableFormat.setCellPadding(0); tableFormat.setCellSpacing(0); tableFormat.setBorder(0); - QTextTable *table = cursor->insertTable(cards.size() + 1, totalColumns, tableFormat); - for (int i = 0; i < cards.size(); i++) { - const AbstractDecklistCardNode *card = cards[i]; + QTextTable *table = cursor->insertTable(node->size() + 1, totalColumns, tableFormat); + for (int i = 0; i < node->size(); i++) { + auto *card = dynamic_cast(node->at(i)); QTextCharFormat cellCharFormat; cellCharFormat.setFontPointSize(9); @@ -579,13 +540,7 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode cellCursor = cell.firstCursorPosition(); cellCursor.insertText(card->getName()); } - } - - for (const InnerDecklistNode *subZone : subZones) { - if (subZone->isEmpty()) { - continue; - } - + } else if (node->height() == 2) { QTextBlockFormat blockFormat; QTextCharFormat charFormat; charFormat.setFontPointSize(14); @@ -604,8 +559,10 @@ void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode tableFormat.setColumnWidthConstraints(constraints); QTextTable *table = cursor->insertTable(1, totalColumns, tableFormat); - QTextCursor cellCursor = table->cellAt(0, 0).firstCursorPosition(); - printDeckListNode(&cellCursor, subZone); + for (int i = 0; i < node->size(); i++) { + QTextCursor cellCursor = table->cellAt(0, (i * totalColumns) / node->size()).lastCursorPosition(); + printDeckListNode(&cellCursor, dynamic_cast(node->at(i))); + } } cursor->movePosition(QTextCursor::End); diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h index be0df311d..ac23e1ee0 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.h +++ b/cockatrice/src/interface/deck_loader/deck_loader.h @@ -131,7 +131,7 @@ public: static void printDeckList(QPrinter *printer, const DeckList &deckList); /** - * Converts the given deck's file to the Cockatrice file format. + * Converts the given deck's file to the cockatrice file format. * Uses the lastLoadInfo in the LoadedDeck to determine the current name of the file and where to save to. * @param deck The deck to convert. Should have valid lastLoadInfo. Will update the lastLoadInfo. * @return Whether the conversion succeeded. @@ -159,13 +159,12 @@ private: static void saveToStream_DeckZone(QTextStream &out, const InnerDecklistNode *zoneNode, bool addComments = true, - bool addSetNameAndNumber = true, - const QString &boardZoneName = QString()); + bool addSetNameAndNumber = true); static void saveToStream_DeckZoneCards(QTextStream &out, + const InnerDecklistNode *zoneNode, QList cards, bool addComments = true, - bool addSetNameAndNumber = true, - const QString &boardZoneName = QString()); + bool addSetNameAndNumber = true); }; #endif diff --git a/cockatrice/src/interface/intents/contexts/context_open_deck.h b/cockatrice/src/interface/intents/contexts/context_open_deck.h deleted file mode 100644 index 03dca088e..000000000 --- a/cockatrice/src/interface/intents/contexts/context_open_deck.h +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef COCKATRICE_CONTEXT_OPEN_DECK_H -#define COCKATRICE_CONTEXT_OPEN_DECK_H - -#include "context_connect_to_server.h" - -#include - -struct ContextOpenDeck -{ - ContextConnectToServer serverContext; - QString shareToken; -}; - -#endif // COCKATRICE_CONTEXT_OPEN_DECK_H diff --git a/cockatrice/src/interface/intents/intent.cpp b/cockatrice/src/interface/intents/intent.cpp index db0d13b2c..c02a89f35 100644 --- a/cockatrice/src/interface/intents/intent.cpp +++ b/cockatrice/src/interface/intents/intent.cpp @@ -2,11 +2,10 @@ Intent::Intent(QObject *parent) : QObject(parent) { - // An intent is done as soon as it reports success, failure, or cancellation. - // Deleting it also tears down its dependency chain and disconnects any signal wiring. + // An intent is done as soon as it reports success or failure. Deleting it + // also tears down its dependency chain and disconnects any signal wiring. connect(this, &Intent::finished, this, &QObject::deleteLater); connect(this, &Intent::failed, this, &QObject::deleteLater); - connect(this, &Intent::cancelled, this, &QObject::deleteLater); } Intent::~Intent() = default; @@ -28,7 +27,6 @@ void Intent::runDependency(Intent *dependency) this->execute(); }); connect(dependency, &Intent::failed, this, &Intent::failed); - connect(dependency, &Intent::cancelled, this, &Intent::cancelled); dependency->execute(); } @@ -48,11 +46,3 @@ void Intent::emitFailed(const QString &reason) emit failed(reason); } } - -void Intent::emitCancelled() -{ - if (!completed) { - completed = true; - emit cancelled(); - } -} diff --git a/cockatrice/src/interface/intents/intent.h b/cockatrice/src/interface/intents/intent.h index 5d9fdd3d6..125900ecd 100644 --- a/cockatrice/src/interface/intents/intent.h +++ b/cockatrice/src/interface/intents/intent.h @@ -16,7 +16,6 @@ public: signals: void finished(); void failed(QString reason); - void cancelled(); protected: // --- Subclasses must implement these --- @@ -30,7 +29,6 @@ protected: // Emit the outcome exactly once; ignore late signals after the intent is done. void emitFinished(); void emitFailed(const QString &reason); - void emitCancelled(); private: bool completed = false; diff --git a/cockatrice/src/interface/intents/intent_join_server_game.cpp b/cockatrice/src/interface/intents/intent_join_server_game.cpp index b22b200ed..205c4dc70 100644 --- a/cockatrice/src/interface/intents/intent_join_server_game.cpp +++ b/cockatrice/src/interface/intents/intent_join_server_game.cpp @@ -19,15 +19,13 @@ bool IntentJoinServerGame::checkPrecondition() const if (remoteClient->getStatus() != ClientStatus::StatusLoggedIn) { return false; } - // serverName()/serverPort() reflect the server the client was configured - // to connect to, which may differ from the actual TCP peer (e.g. when - // connecting through a proxy), so compare those configured values. A link - // naming the same host on another port is a different server and must not - // reuse the session there. - if (remoteClient->serverName().compare(context->roomContext.serverContext.hostname, Qt::CaseInsensitive) != 0) { + // peerPort() reflects the actual TCP peer, which may differ from the + // configured server port (e.g. when connecting through a proxy), so only + // the hostname is compared here. + if (remoteClient->peerName() != context->roomContext.serverContext.hostname) { return false; } - if (QString::number(remoteClient->serverPort()) != context->roomContext.serverContext.port) { + if (QString::number(remoteClient->peerPort()) != context->roomContext.serverContext.port) { return false; } diff --git a/cockatrice/src/interface/intents/intent_login.cpp b/cockatrice/src/interface/intents/intent_login.cpp index 7beb63e1d..ff871fd03 100644 --- a/cockatrice/src/interface/intents/intent_login.cpp +++ b/cockatrice/src/interface/intents/intent_login.cpp @@ -1,14 +1,9 @@ #include "intent_login.h" #include "../../client/settings/cache_settings.h" -#include "../widgets/dialogs/dlg_login_prompt.h" #include "libcockatrice/settings/servers_settings.h" -#include - -IntentGetLoginCredentials::IntentGetLoginCredentials(ContextConnectToServer *_context, - bool _promptForMissingCredentials) - : Intent(), context(_context), promptForMissingCredentials(_promptForMissingCredentials) +IntentGetLoginCredentials::IntentGetLoginCredentials(ContextConnectToServer *_context) : Intent(), context(_context) { } @@ -34,46 +29,5 @@ void IntentGetLoginCredentials::onPreconditionSatisfied() void IntentGetLoginCredentials::onPreconditionNotSatisfied() { - // MainWindow::applyStartupDestination runs this intent on every launch for - // users whose startup tab is Server / Server Room; keep that path quiet, as - // it was before the link-driven sign-in dialog existed. - if (!promptForMissingCredentials) { - emitFailed(tr("No saved credentials for this server")); - return; - } - - // No credentials saved for the target server: ask the user for them. They - // opt into saving them so later links to the same server connect directly. - const QString serverText = context->hostname + ":" + context->port; - DlgLoginPrompt dialog(serverText); - // ApplicationModal: the dialog has no parent (the intent is not a widget), - // so WindowModal would not actually block any other window. - dialog.setWindowModality(Qt::ApplicationModal); - - if (dialog.exec() != QDialog::Accepted) { - emitCancelled(); - return; - } - - context->username = dialog.username(); - context->password = dialog.password(); - - if (dialog.savePassword() && !context->username.isEmpty()) { - ServersSettings &servers = SettingsCache::instance().servers(); - // The host may already be saved under a friendly name (e.g. a public-server - // list entry) with no credentials; reuse that name instead of overwriting - // it with the raw hostname when addNewServer updates the entry in place. - QString saveName = context->hostname; - const int existingIndex = servers.findServerIndex(context->hostname, context->port); - if (existingIndex >= 0) { - saveName = - servers.getValue(QString("saveName%1").arg(existingIndex), "server", "server_details").toString(); - if (saveName.isEmpty()) { - saveName = context->hostname; - } - } - servers.addNewServer(saveName, context->hostname, context->port, context->username, context->password, true); - } - - emitFinished(); + emitFailed(tr("No saved credentials for this server")); } diff --git a/cockatrice/src/interface/intents/intent_login.h b/cockatrice/src/interface/intents/intent_login.h index 8ffd91a0a..c7fec92b7 100644 --- a/cockatrice/src/interface/intents/intent_login.h +++ b/cockatrice/src/interface/intents/intent_login.h @@ -9,10 +9,7 @@ class IntentGetLoginCredentials : public Intent Q_OBJECT public: - // When promptForMissingCredentials is false (the default) a server without - // saved credentials fails silently; only intent chains from cockatrice:// - // links opt into the interactive sign-in dialog. - explicit IntentGetLoginCredentials(ContextConnectToServer *_context, bool _promptForMissingCredentials = false); + IntentGetLoginCredentials(ContextConnectToServer *_context); protected: bool checkPrecondition() const override; @@ -21,7 +18,6 @@ protected: private: ContextConnectToServer *context; - bool promptForMissingCredentials; }; #endif // COCKATRICE_INTENT_LOGIN_H diff --git a/cockatrice/src/interface/intents/intent_open_shared_deck.cpp b/cockatrice/src/interface/intents/intent_open_shared_deck.cpp deleted file mode 100644 index 016de63e6..000000000 --- a/cockatrice/src/interface/intents/intent_open_shared_deck.cpp +++ /dev/null @@ -1,208 +0,0 @@ -#include "intent_open_shared_deck.h" - -#include "../deck_loader/deck_loader.h" -#include "../widgets/dialogs/dlg_shared_decks_preview.h" -#include "../widgets/tabs/tab_supervisor.h" -#include "intent_connect_to_server.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -IntentOpenSharedDeck::IntentOpenSharedDeck(TabSupervisor *_tabSupervisor, - RemoteClient *_remoteClient, - const CardDatabaseQuerier *_querier, - std::unique_ptr _context) - : Intent(), tabSupervisor(_tabSupervisor), remoteClient(_remoteClient), querier(_querier), - context(_context.release()) -{ - downloadTimer = new QTimer(this); - downloadTimer->setSingleShot(true); - downloadTimer->setInterval(15000); - connect(downloadTimer, &QTimer::timeout, this, &IntentOpenSharedDeck::onDownloadTimeout); -} - -bool IntentOpenSharedDeck::checkPrecondition() const -{ - if (remoteClient->getStatus() != ClientStatus::StatusLoggedIn) { - return false; - } - // serverName()/serverPort() reflect the server the client was configured - // to connect to, which may differ from the actual TCP peer (e.g. when - // connecting through a proxy), so compare those configured values. The - // share token must be resolved against the host the link named — a link to - // the same host on another port is a different server. - if (remoteClient->serverName().compare(context->serverContext.hostname, Qt::CaseInsensitive) != 0) { - return false; - } - return QString::number(remoteClient->serverPort()) == context->serverContext.port; -} - -void IntentOpenSharedDeck::onPreconditionSatisfied() -{ - // Resolve the share token to its items first; a share can contain more than - // one deck, and each item is downloaded by id. Time the round trip like the - // downloads, so a silent server cannot hang the chain forever. - listPhase = true; - downloadTimer->start(); - - Command_DeckShareList cmd; - cmd.set_token(context->shareToken.toStdString()); - - PendingCommand *pend = AbstractClient::prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, &IntentOpenSharedDeck::listShareFinished); - remoteClient->sendCommand(pend); -} - -void IntentOpenSharedDeck::onPreconditionNotSatisfied() -{ - runDependency(new IntentConnectToServer(remoteClient, &context->serverContext)); -} - -void IntentOpenSharedDeck::listShareFinished(const Response &response, const CommandContainer & /* commandContainer */) -{ - downloadTimer->stop(); - listPhase = false; - - if (response.response_code() != Response::RespOk) { - emitFailed(tr("The shared deck could not be found or has expired")); - return; - } - - const Response_DeckShareList &resp = response.GetExtension(Response_DeckShareList::ext); - if (resp.items_size() == 0) { - emitFailed(tr("The shared deck is empty")); - return; - } - - QList items; - items.reserve(resp.items_size()); - for (const ServerInfo_DeckShareItem &item : resp.items()) { - items.append(item); - itemNames.insert(item.id(), QString::fromStdString(item.name())); - } - - const QString serverText = context->serverContext.hostname + ":" + context->serverContext.port; - - // Ask the user which decks to open before downloading anything. - previewDialog = new DlgSharedDecksPreview(tabSupervisor, querier, QString::fromStdString(resp.name()), - resp.expires_at(), serverText, items); - connect(previewDialog, &DlgSharedDecksPreview::openRequested, this, &IntentOpenSharedDeck::startDownloads); - connect(previewDialog, &DlgSharedDecksPreview::cancelled, this, &IntentOpenSharedDeck::emitCancelled); - connect(previewDialog, &DlgSharedDecksPreview::cancelled, previewDialog, &QWidget::deleteLater); - previewDialog->show(); - previewDialog->raise(); - previewDialog->activateWindow(); -} - -void IntentOpenSharedDeck::startDownloads(const QList &itemIds) -{ - pendingItemIds = itemIds; - totalItems = itemIds.size(); - completedItems = 0; - loadedDecks.clear(); - downloadNextItem(); -} - -void IntentOpenSharedDeck::downloadNextItem() -{ - if (pendingItemIds.isEmpty()) { - finishAll(); - return; - } - - currentItemId = pendingItemIds.takeFirst(); - downloadTimer->start(); - - Command_DeckShareDownload cmd; - cmd.set_token(context->shareToken.toStdString()); - cmd.set_item_id(currentItemId); - - PendingCommand *pend = AbstractClient::prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, &IntentOpenSharedDeck::downloadShareFinished); - remoteClient->sendCommand(pend); -} - -void IntentOpenSharedDeck::downloadShareFinished(const Response &response, - const CommandContainer & /* commandContainer */) -{ - downloadTimer->stop(); - - QString failureReason; - if (response.response_code() != Response::RespOk) { - failureReason = tr("Failed to download the shared deck"); - } else { - const Response_DeckShareDownload &resp = response.GetExtension(Response_DeckShareDownload::ext); - const QString deckString = QString::fromStdString(resp.deck()); - if (deckString.isEmpty()) { - failureReason = tr("The shared deck is empty"); - } else { - std::optional deckOpt = - DeckLoader::loadFromRemote(deckString, LoadedDeck::LoadInfo::NON_REMOTE_ID); - if (!deckOpt) { - failureReason = tr("The shared deck could not be loaded"); - } else { - loadedDecks.append(deckOpt.value()); - ++completedItems; - previewDialog->setDownloadProgress(completedItems, totalItems, - itemNames.value(currentItemId, tr("Unknown deck"))); - downloadNextItem(); - return; - } - } - } - - onItemFailure(failureReason); -} - -void IntentOpenSharedDeck::onItemFailure(const QString &reason) -{ - downloadTimer->stop(); - - if (loadedDecks.isEmpty()) { - previewDialog->deleteLater(); - emitFailed(reason); - return; - } - - const int downloadedCount = loadedDecks.size(); - const QMessageBox::StandardButton answer = QMessageBox::question( - previewDialog, tr("Open shared decks"), - tr("Could not download the deck \"%1\".\n\n%n deck(s) were already downloaded. Open them?", "", downloadedCount) - .arg(itemNames.value(currentItemId, tr("Unknown deck"))), - QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); - - if (answer == QMessageBox::Yes) { - finishAll(); - } else { - previewDialog->deleteLater(); - emitCancelled(); - } -} - -void IntentOpenSharedDeck::onDownloadTimeout() -{ - // The list phase has no preview dialog yet to report progress into; fail the - // whole intent instead of letting the shared deck hang in limbo. - if (listPhase) { - emitFailed(tr("Timed out while loading the shared deck")); - return; - } - onItemFailure(tr("Timed out while downloading the shared deck")); -} - -void IntentOpenSharedDeck::finishAll() -{ - previewDialog->deleteLater(); - for (const LoadedDeck &deck : loadedDecks) { - tabSupervisor->openDeckInNewTab(deck); - } - emitFinished(); -} diff --git a/cockatrice/src/interface/intents/intent_open_shared_deck.h b/cockatrice/src/interface/intents/intent_open_shared_deck.h deleted file mode 100644 index 87812bdea..000000000 --- a/cockatrice/src/interface/intents/intent_open_shared_deck.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef COCKATRICE_INTENT_OPEN_SHARED_DECK_H -#define COCKATRICE_INTENT_OPEN_SHARED_DECK_H - -#include "contexts/context_open_deck.h" -#include "intent.h" -#include "remote_client.h" - -#include -#include -#include -#include - -class TabSupervisor; -struct LoadedDeck; -class CardDatabaseQuerier; -class DlgSharedDecksPreview; -class QTimer; - -class IntentOpenSharedDeck : public Intent -{ - Q_OBJECT - -public: - IntentOpenSharedDeck(TabSupervisor *_tabSupervisor, - RemoteClient *_remoteClient, - const CardDatabaseQuerier *_querier, - std::unique_ptr _context); - -protected: - bool checkPrecondition() const override; - void onPreconditionSatisfied() override; - void onPreconditionNotSatisfied() override; - -private slots: - void listShareFinished(const Response &response, const CommandContainer &commandContainer); - void downloadShareFinished(const Response &response, const CommandContainer &commandContainer); - void onDownloadTimeout(); - -private: - void startDownloads(const QList &itemIds); - void downloadNextItem(); - void onItemFailure(const QString &reason); - void finishAll(); - - TabSupervisor *tabSupervisor; - RemoteClient *remoteClient; - const CardDatabaseQuerier *querier; - QScopedPointer context; - DlgSharedDecksPreview *previewDialog = nullptr; - QTimer *downloadTimer; - QMap itemNames; - QList pendingItemIds; - QList loadedDecks; - bool listPhase = true; - int currentItemId = 0; - int totalItems = 0; - int completedItems = 0; -}; - -#endif // COCKATRICE_INTENT_OPEN_SHARED_DECK_H diff --git a/cockatrice/src/interface/intents/url_parser.cpp b/cockatrice/src/interface/intents/url_parser.cpp index 707863354..509390611 100644 --- a/cockatrice/src/interface/intents/url_parser.cpp +++ b/cockatrice/src/interface/intents/url_parser.cpp @@ -1,28 +1,19 @@ #include "url_parser.h" -#include "../../client/settings/cache_settings.h" #include "../widgets/tabs/tab_room.h" #include "../widgets/tabs/tab_supervisor.h" #include "../window_main.h" #include "contexts/context_join_game.h" -#include "contexts/context_open_deck.h" -#include "intent.h" #include "intent_join_server_game.h" #include "intent_login.h" -#include "intent_open_shared_deck.h" #include -#include #include #include #include -#include #include -#include #include -inline Q_LOGGING_CATEGORY(UrlParserLog, "url_parser"); - IntentUrlParser::IntentUrlParser(QObject *parent, MainWindow *_mainWindow) : QObject(parent), mainWindow(_mainWindow) { } @@ -38,33 +29,16 @@ void IntentUrlParser::handle(const QString &urlStr) const QString action = url.host(); QUrlQuery query(url); - qCDebug(UrlParserLog) << "Parsing intent URL, action:" << action; - - PendingIntentChain chain; - Intent *firstIntent = nullptr; if (action == "joingame") { - firstIntent = createJoinGameIntent(query, chain); + handleJoinGame(query); } else if (action == "opendeck") { - firstIntent = createOpenDeckIntent(query, chain); + // handleOpenDeck(query); } else { qWarning() << "Unknown intent:" << action; } - - if (firstIntent == nullptr) { - // The link was invalid or the user declined the confirm: nothing runs. - // Report the idle state when no other chain is queued so that a startup - // launch (which skipped its own connection for this URL) falls back to it. - if (!chainRunning && pendingChains.isEmpty()) { - emit urlChainFinished(mainWindow->getRemoteClient()->getStatus() == StatusLoggedIn); - } - return; - } - - pendingChains.append(chain); - startNextChain(); } -Intent *IntentUrlParser::createJoinGameIntent(const QUrlQuery &query, PendingIntentChain &chain) +void IntentUrlParser::handleJoinGame(const QUrlQuery &query) { auto showError = [this](const QString &message) { QMessageBox::warning(mainWindow, tr("Open game"), message); }; @@ -75,21 +49,21 @@ Intent *IntentUrlParser::createJoinGameIntent(const QUrlQuery &query, PendingInt if (ctx->roomContext.serverContext.hostname.isEmpty()) { showError(tr("Missing or empty hostname in the game link")); - return nullptr; + return; } bool ok = false; ctx->roomContext.serverContext.port.toUShort(&ok); if (!ok) { showError(tr("Invalid or missing port in the game link")); - return nullptr; + return; } ctx->roomContext.roomId = query.queryItemValue("roomid").toInt(&ok); if (!ok) { showError(tr("Invalid or missing room id in the game link")); - return nullptr; + return; } ok = false; @@ -97,7 +71,7 @@ Intent *IntentUrlParser::createJoinGameIntent(const QUrlQuery &query, PendingInt if (!ok) { showError(tr("Invalid or missing game id in the game link")); - return nullptr; + return; } const QString gameDescription = query.queryItemValue("game", QUrl::FullyDecoded); @@ -106,33 +80,24 @@ Intent *IntentUrlParser::createJoinGameIntent(const QUrlQuery &query, PendingInt const QMessageBox::StandardButton answer = QMessageBox::question( mainWindow, tr("Join game"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); if (answer != QMessageBox::Yes) { - return nullptr; + return; } - RemoteClient *client = mainWindow->getRemoteClient(); - ContextConnectToServer *serverContext = &ctx->roomContext.serverContext; - // The join game intent owns the context and the credential lookup; once the // chain finishes (or fails) it deletes the whole tree. - auto joinGameIntent = new IntentJoinServerGame(mainWindow->getTabSupervisor(), client, std::move(ctx)); + ContextConnectToServer *serverContext = &ctx->roomContext.serverContext; + auto joinGameIntent = + new IntentJoinServerGame(mainWindow->getTabSupervisor(), mainWindow->getRemoteClient(), std::move(ctx)); joinGameIntent->setParent(this); - chain.intents.append(joinGameIntent); + + auto getLoginCredentialsIntent = new IntentGetLoginCredentials(serverContext); + getLoginCredentialsIntent->setParent(joinGameIntent); + + connect(getLoginCredentialsIntent, &Intent::finished, joinGameIntent, &Intent::execute); + connect(getLoginCredentialsIntent, &Intent::failed, joinGameIntent, &Intent::failed); connect(joinGameIntent, &Intent::failed, this, [showError](const QString &reason) { showError(reason); }); - Intent *firstIntent = joinGameIntent; - if (!isConnectedTo(serverContext->hostname, serverContext->port)) { - auto getLoginCredentialsIntent = - new IntentGetLoginCredentials(serverContext, /*promptForMissingCredentials=*/true); - getLoginCredentialsIntent->setParent(joinGameIntent); - chain.intents.insert(0, getLoginCredentialsIntent); - - connect(getLoginCredentialsIntent, &Intent::finished, joinGameIntent, &Intent::execute); - connect(getLoginCredentialsIntent, &Intent::failed, joinGameIntent, &Intent::failed); - connect(getLoginCredentialsIntent, &Intent::cancelled, joinGameIntent, &Intent::cancelled); - firstIntent = getLoginCredentialsIntent; - } - - return firstIntent; + getLoginCredentialsIntent->execute(); } QString IntentUrlParser::generateJoinGameMessage(const ContextJoinGame &context, const QString &gameDescription) @@ -169,270 +134,3 @@ QString IntentUrlParser::generateJoinGameMessage(const ContextJoinGame &context, .arg(gameDescription, gameIdStr, roomTab->getRoomName(), server) : tr("Join game \"%1\" (#%2) on %3?").arg(gameDescription, gameIdStr, server); } - -Intent *IntentUrlParser::createOpenDeckIntent(const QUrlQuery &query, PendingIntentChain &chain) -{ - auto showError = [this](const QString &message) { - QMessageBox::warning(mainWindow, tr("Open shared deck"), message); - }; - - auto ctx = std::make_unique(); - - ctx->serverContext.hostname = query.queryItemValue("hostname"); - ctx->serverContext.port = query.queryItemValue("port"); - ctx->shareToken = query.queryItemValue("share"); - - qCDebug(UrlParserLog) << "Open-deck intent: host" << ctx->serverContext.hostname << "port" - << ctx->serverContext.port << "token length" << ctx->shareToken.length(); - - if (ctx->serverContext.hostname.isEmpty()) { - showError(tr("Missing or empty hostname in the share link")); - return nullptr; - } - - bool ok = false; - const quint16 port = ctx->serverContext.port.toUShort(&ok); - if (!ok || port == 0) { - showError(tr("Invalid or missing port in the share link")); - return nullptr; - } - - if (ctx->shareToken.isEmpty()) { - showError(tr("Missing or empty share value in the share link")); - return nullptr; - } - - RemoteClient *client = mainWindow->getRemoteClient(); - - // The open deck download needs a connection to the link's server. Ask before - // taking the session anywhere it isn't already, naming the host we would - // connect to. Remember the link's target when it moves us away from a live - // session so a failed or cancelled chain can restore the session it left. - // The hostname is link-supplied and percent-decoded, so escape it: QMessageBox - // renders AutoText, and markup in a hostname would otherwise flip the whole - // prompt to rich text and let a link pad the message the user is shown. - const bool alreadyConnected = isConnectedTo(ctx->serverContext.hostname, ctx->serverContext.port); - if (!alreadyConnected) { - const QString target = - QStringLiteral("%1:%2").arg(ctx->serverContext.hostname.toHtmlEscaped(), ctx->serverContext.port); - - if (client->getStatus() == StatusLoggedIn) { - const QString current = - QStringLiteral("%1:%2").arg(client->serverName(), QString::number(client->serverPort())); - const QMessageBox::StandardButton answer = QMessageBox::question( - mainWindow, tr("Open shared deck"), - tr("Opening this share link connects you to %1 instead of %2.\n\nContinue?").arg(target, current), - QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); - if (answer != QMessageBox::Yes) { - return nullptr; - } - chain.migrationTargetHost = ctx->serverContext.hostname; - chain.migrationTargetPort = ctx->serverContext.port; - chain.pendingRestore = true; - } else { - // Fresh connection is harmless to wander away from, but a server the - // client has never been configured for deserves a harder warning (no - // by default) so a stray link cannot silently steer the client there. - const bool knownHost = SettingsCache::instance().servers().findHostIndex(ctx->serverContext.hostname) >= 0; - const QMessageBox::StandardButton answer = - knownHost - ? QMessageBox::question(mainWindow, tr("Open shared deck"), - tr("Opening this share link connects you to %1.\n\nContinue?").arg(target)) - : QMessageBox::warning(mainWindow, tr("Open shared deck"), - tr("Opening this share link connects you to %1, a server you have " - "never connected to before.\n\nContinue?") - .arg(target), - QMessageBox::Yes | QMessageBox::No, QMessageBox::No); - if (answer != QMessageBox::Yes) { - return nullptr; - } - } - } - - ContextConnectToServer *serverContext = &ctx->serverContext; - - // The open deck intent owns the context and the credential lookup; once - // the chain finishes (or fails) it deletes the whole tree. - auto openDeckIntent = - new IntentOpenSharedDeck(mainWindow->getTabSupervisor(), client, CardDatabaseManager::query(), std::move(ctx)); - openDeckIntent->setParent(this); - chain.intents.append(openDeckIntent); - connect(openDeckIntent, &Intent::failed, this, [showError](const QString &reason) { showError(reason); }); - - Intent *firstIntent = openDeckIntent; - if (!isConnectedTo(serverContext->hostname, serverContext->port)) { - auto getLoginCredentialsIntent = - new IntentGetLoginCredentials(serverContext, /*promptForMissingCredentials=*/true); - getLoginCredentialsIntent->setParent(openDeckIntent); - chain.intents.insert(0, getLoginCredentialsIntent); - - connect(getLoginCredentialsIntent, &Intent::finished, openDeckIntent, &Intent::execute); - connect(getLoginCredentialsIntent, &Intent::failed, openDeckIntent, &Intent::failed); - connect(getLoginCredentialsIntent, &Intent::cancelled, openDeckIntent, &Intent::cancelled); - firstIntent = getLoginCredentialsIntent; - } - - return firstIntent; -} - -bool IntentUrlParser::isConnectedTo(const QString &hostname, const QString &port) const -{ - // serverName() reflects the server the client was configured to connect to, - // which may differ from the actual TCP peer (e.g. when connecting through a - // proxy), so compare the configured host and port — exactly what a link - // names. A link to the same host on another port is a different server and - // must not silently reuse an existing session there. - RemoteClient *client = mainWindow->getRemoteClient(); - return client->getStatus() == StatusLoggedIn && client->serverName().compare(hostname, Qt::CaseInsensitive) == 0 && - QString::number(client->serverPort()) == port; -} - -void IntentUrlParser::startNextChain() -{ - if (chainRunning || pendingChains.isEmpty()) { - return; - } - chainRunning = true; - - PendingIntentChain &chain = pendingChains.first(); - if (chain.intents.isEmpty()) { - pendingChains.removeFirst(); - chainRunning = false; - startNextChain(); - return; - } - - // Snapshot the session this chain moves away from now that it actually - // runs. Chains are parsed while earlier ones are still queued, so a capture - // at parse time would follow whichever server the chain before it settled - // on, not the one the user is really on when this link is handled. - if (chain.pendingRestore) { - RemoteClient *client = mainWindow->getRemoteClient(); - chain.previousServerHost = client->serverName(); - chain.previousServerPort = QString::number(client->serverPort()); - } - - // Only the last intent completes the chain; its terminal signal ends the - // whole run. Cancellation of an intermediate intent (e.g. declined login - // prompt) is forwarded onto the last intent in the chain builders above. - Intent *finalIntent = chain.intents.last(); - connect(finalIntent, &Intent::finished, this, [this]() { chainEnded(true); }); - connect(finalIntent, &Intent::failed, this, [this]() { chainEnded(false); }); - connect(finalIntent, &Intent::cancelled, this, [this]() { chainEnded(false); }); - // Backstop: if the final intent is destroyed without emitting a terminal - // signal (e.g. a network error dropped it while running), end the chain so - // later links are not queued and dropped for the rest of the session. - chainBackstopConnection = connect(finalIntent, &QObject::destroyed, this, &IntentUrlParser::onChainIntentDestroyed); - - chain.intents.first()->execute(); -} - -void IntentUrlParser::chainEnded(bool chainSucceeded) -{ - chainRunning = false; - QObject::disconnect(chainBackstopConnection); - - const PendingIntentChain chain = pendingChains.takeFirst(); - - // Only a failed or cancelled chain restores the session the link migrated - // away from; a successful one leaves the user where they are. - if (chain.pendingRestore && !chainSucceeded) { - restorePreviousServer(chain); - } - - startNextChain(); - - // Only report the terminal state once the queue has fully drained, so a - // queued follow-up link keeps the startup fallback out of the picture. - if (!chainRunning && pendingChains.isEmpty()) { - emit urlChainFinished(mainWindow->getRemoteClient()->getStatus() == StatusLoggedIn); - } -} - -void IntentUrlParser::onChainIntentDestroyed() -{ - if (!chainRunning) { - return; - } - qCWarning(UrlParserLog) << "Share-link intent destroyed without a terminal signal; ending its chain"; - chainEnded(false); -} - -void IntentUrlParser::restorePreviousServer(const PendingIntentChain &chain) -{ - if (chain.previousServerHost.isEmpty()) { - return; - } - - RemoteClient *client = mainWindow->getRemoteClient(); - const ClientStatus status = client->getStatus(); - - // A failed/cancelled chain can fire while the client is still settling the - // in-flight connection attempt (wrong password, connect timeout). Only - // decide once the client has settled into logged-in or disconnected; - // deciding mid-connect would strand the user offline from their previous - // server. - if (status == StatusDisconnected || status == StatusLoggedIn) { - restoreToPreviousServer(chain); - return; - } - auto waitConnection = std::make_shared(); - *waitConnection = connect(client, &RemoteClient::statusChanged, this, [this, chain, client, waitConnection]() { - const ClientStatus settled = client->getStatus(); - if (settled == StatusDisconnected || settled == StatusLoggedIn) { - QObject::disconnect(*waitConnection); - restoreToPreviousServer(chain); - } - }); -} - -void IntentUrlParser::restoreToPreviousServer(const PendingIntentChain &chain) -{ - RemoteClient *client = mainWindow->getRemoteClient(); - - // Back on the previous server already → nothing to undo. - if (client->serverName().compare(chain.previousServerHost, Qt::CaseInsensitive) == 0 && - QString::number(client->serverPort()) == chain.previousServerPort) { - return; - } - - // When logged in somewhere, only intervene if that somewhere is the server - // the link moved us to; if the user went elsewhere on their own, leave them. - if (client->getStatus() == StatusLoggedIn) { - const bool onMigrationTarget = - client->serverName().compare(chain.migrationTargetHost, Qt::CaseInsensitive) == 0 && - QString::number(client->serverPort()) == chain.migrationTargetPort; - if (!onMigrationTarget) { - return; - } - - ServersSettings &servers = SettingsCache::instance().servers(); - const int index = servers.findServerIndex(chain.previousServerHost, chain.previousServerPort); - if (index >= 0 && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) { - const QString username = - servers.getValue(QString("username%1").arg(index), "server", "server_details").toString(); - const QString password = - servers.getValue(QString("password%1").arg(index), "server", "server_details").toString(); - client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), username, password); - return; - } - client->disconnectFromServer(); - return; - } - - if (client->getStatus() != StatusDisconnected) { - return; - } - - // The link's connection attempt failed: reconnect to the previous server - // when credentials are saved, otherwise stay offline. - ServersSettings &servers = SettingsCache::instance().servers(); - const int index = servers.findServerIndex(chain.previousServerHost, chain.previousServerPort); - if (index >= 0 && servers.hasLoginData(chain.previousServerHost, chain.previousServerPort)) { - const QString username = - servers.getValue(QString("username%1").arg(index), "server", "server_details").toString(); - const QString password = - servers.getValue(QString("password%1").arg(index), "server", "server_details").toString(); - client->connectToServer(chain.previousServerHost, chain.previousServerPort.toUInt(), username, password); - } -} diff --git a/cockatrice/src/interface/intents/url_parser.h b/cockatrice/src/interface/intents/url_parser.h index ea29fed53..6d705e013 100644 --- a/cockatrice/src/interface/intents/url_parser.h +++ b/cockatrice/src/interface/intents/url_parser.h @@ -1,46 +1,10 @@ #ifndef COCKATRICE_URL_PARSER_H #define COCKATRICE_URL_PARSER_H - -#include #include #include -class Intent; class MainWindow; struct ContextJoinGame; - -/** - * @brief One queued intent chain with the session-migration bookkeeping for it. - * - * The restore fields are per-chain on purpose: chains are parsed while earlier - * ones are still queued, so parser-wide state would let one chain's failure - * consume the restore data another chain recorded. - */ -struct PendingIntentChain -{ - QList intents; - - // Snapshot of the session in place when this chain started running, so a - // queued chain follows whichever server the chain before it settled on. - QString previousServerHost; - QString previousServerPort; - - // Recorded at parse time when the user confirmed migrating away from a live - // session to the host/port named by the link. - QString migrationTargetHost; - QString migrationTargetPort; - bool pendingRestore = false; -}; - -/** - * @brief Parses cockatrice:// links and runs them as serialized intent chains. - * - * Links are parsed by action (joingame/opendeck) and translated into an intent - * chain. Chains are queued and run one at a time: a document can hand multiple - * links to the window while an earlier chain still connects, and running two - * connect chains concurrently tears the connection down. urlChainFinished is - * emitted once the queue has fully drained. - */ class IntentUrlParser : public QObject { Q_OBJECT @@ -48,28 +12,12 @@ class IntentUrlParser : public QObject public: IntentUrlParser(QObject *parent, MainWindow *mainWindow); void handle(const QString &urlStr); - -signals: - /** @brief Emitted when the last queued chain ended; carries whether the client is logged in. */ - void urlChainFinished(bool connected); + void handleJoinGame(const QUrlQuery &query); private: - Intent *createJoinGameIntent(const QUrlQuery &query, PendingIntentChain &chain); - Intent *createOpenDeckIntent(const QUrlQuery &query, PendingIntentChain &chain); QString generateJoinGameMessage(const ContextJoinGame &context, const QString &gameDescription); - [[nodiscard]] bool isConnectedTo(const QString &hostname, const QString &port) const; - void startNextChain(); - void chainEnded(bool chainSucceeded); - void onChainIntentDestroyed(); - void restorePreviousServer(const PendingIntentChain &chain); - void restoreToPreviousServer(const PendingIntentChain &chain); MainWindow *mainWindow; - QList pendingChains; - bool chainRunning = false; - // Disconnects the destroyed-signal backstop once a chain ends, so an old - // intent's deferred deletion cannot end the chain that runs after it. - QMetaObject::Connection chainBackstopConnection; }; #endif // COCKATRICE_URL_PARSER_H diff --git a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp index d5a168708..9cde72c01 100644 --- a/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp +++ b/cockatrice/src/interface/palette_editor/palette_editor_dialog.cpp @@ -1,5 +1,6 @@ #include "palette_editor_dialog.h" +#include "../../client/settings/cache_settings.h" #include "../theme_manager.h" #include "palette_generator.h" #include "palette_grid_widget.h" @@ -10,11 +11,31 @@ #include #include #include +#include #include +#include #include +#include #include #include +#include #include +#include + +// Probe whether a directory is truly writable by trying to create and remove a +// temporary file. QFileInfo::isWritable() on a directory is unreliable (notably +// on Windows where UAC VirtualStore can make a system dir appear writable). +static bool isDirReallyWritable(const QString &dirPath) +{ + const QString probe = QDir(dirPath).absoluteFilePath(".cockatrice_write_test"); + QFile f(probe); + if (!f.open(QIODevice::WriteOnly)) { + return false; + } + f.close(); + f.remove(); + return true; +} PaletteEditorDialog::PaletteEditorDialog(const QString &_themeDirPath, const QString &_themeName, QWidget *parent) : QDialog(parent), themeDirPath(_themeDirPath), themeName(_themeName) @@ -25,7 +46,14 @@ PaletteEditorDialog::PaletteEditorDialog(const QString &_themeDirPath, const QSt // Resolve a writable directory for saving. Built-in (Default / Fusion) and // other read-only theme directories must be customised in the user-writable // themes directory; otherwise the write would fail or be lost on upgrade. - saveDir = ThemeManager::writableThemeDir(themeName); + if (!themeDirPath.isEmpty() && isDirReallyWritable(themeDirPath)) { + saveDir = themeDirPath; + } else { + saveDir = QDir(SettingsCache::instance().paths().getThemesPath()).absoluteFilePath(themeName); + if (!QDir().mkpath(saveDir)) { + qWarning() << "Failed to create palette save directory:" << saveDir; + } + } // Load both scheme configs upfront so switching is instant loadSchemes(); @@ -186,7 +214,7 @@ void PaletteEditorDialog::retranslateUi() resetBtn->setToolTip(tr("Discard unsaved edits and restore the last saved palette")); saveBtn->setToolTip(tr("Write palette-%1.toml and reload the theme").arg(loadedScheme.toLower())); - if (saveDir.isEmpty() || !ThemeManager::isDirReallyWritable(saveDir)) { + if (saveDir.isEmpty() || !isDirReallyWritable(saveDir)) { saveBtn->setEnabled(false); saveBtn->setToolTip(tr("Cannot save: this theme has no writable directory")); } @@ -269,7 +297,7 @@ void PaletteEditorDialog::onSave() if (it.key() == loadedScheme) { continue; } - if (it.value() == savedConfig.value(it.key())) { + if (it.value().colors == savedConfig.value(it.key()).colors) { continue; } if (!ThemeManager::commitPalette(saveDir, it.key(), it.value())) { @@ -280,7 +308,7 @@ void PaletteEditorDialog::onSave() } // Commit the active scheme last so the global colour scheme matches. - if (workingConfig[loadedScheme] != savedConfig.value(loadedScheme)) { + if (workingConfig[loadedScheme].colors != savedConfig.value(loadedScheme).colors) { if (!ThemeManager::commitPalette(saveDir, loadedScheme, workingConfig[loadedScheme])) { QMessageBox::warning(this, tr("Save failed"), tr("Could not write %1 to:\n%2").arg(PaletteConfig::fileName(loadedScheme), saveDir)); diff --git a/cockatrice/src/interface/palette_editor/palette_generator.cpp b/cockatrice/src/interface/palette_editor/palette_generator.cpp index 822e57250..d30dd14f1 100644 --- a/cockatrice/src/interface/palette_editor/palette_generator.cpp +++ b/cockatrice/src/interface/palette_editor/palette_generator.cpp @@ -150,17 +150,6 @@ PaletteConfig fromAccent(const QColor &accent, int intensity, const QString &sch cfg.colors[CG::Disabled][CR::HighlightedText] = disText; cfg.colors[CG::Inactive][CR::HighlightedText] = dark ? Qt::white : Qt::black; - // Accent: same primary hue as Highlight, so palettes derived from a - // QuickSetup accent always carry a matching Accent role. -#if QT_VERSION >= QT_VERSION_CHECK(6, 6, 0) - set3(CR::Accent, hl, disText, hl); -#endif - - // Application role colors: Strong tracks the primary accent, while Soft is - // the lightened, desaturated companion used for button-gradient highlights. - cfg.appColors[AppColor::AccentStrong] = hl; - cfg.appColors[AppColor::AccentSoft] = hsl(accent.lightness() + 60, qRound(accent.hslSaturation() * 70 / 100.0)); - // BrightText QColor bright; if (achromatic) { diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp index 97d28b731..67294cd98 100644 --- a/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp +++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.cpp @@ -1,7 +1,5 @@ #include "palette_grid_widget.h" -#include "../theme_manager.h" - #include #include #include @@ -47,11 +45,6 @@ static const QMap ROLE_DESCRIPTIONS = { {QPalette::Shadow, QT_TR_NOOP("Very dark shadow colour")}, }; -static const QMap APP_ROLE_DESCRIPTIONS = { - {AppColor::AccentStrong, QT_TR_NOOP("Vivid primary accent (e.g. home-tab button gradient start)")}, - {AppColor::AccentSoft, QT_TR_NOOP("Lightened, desaturated accent (e.g. home-tab button gradient end)")}, -}; - PaletteGridWidget::PaletteGridWidget(QWidget *parent) : QWidget(parent) { scroll = new QScrollArea(this); @@ -129,46 +122,6 @@ void PaletteGridWidget::buildGrid(QWidget *host) grid->addWidget(btn, row + 1, col + 1, Qt::AlignHCenter | Qt::AlignVCenter); } } - - // Application color section: one ColorButton per role below the role grid. - // These are not tied to a color group, so a single button spans the row. - QMetaEnum appEnum = QMetaEnum::fromType(); - - const int appHeaderRow = roles.size() + 1; - - auto *appHeader = new QLabel(tr("App colors"), host); - appHeader->setToolTip(tr("Application-specific colors layered on top of the Qt palette")); - QFont appHeaderFont = appHeader->font(); - appHeaderFont.setBold(true); - appHeader->setFont(appHeaderFont); - appHeader->setAutoFillBackground(true); - appHeader->setContentsMargins(4, 4, 4, 4); - grid->addWidget(appHeader, appHeaderRow, 0, 1, 4); - headerLabels.append(appHeader); - - for (int i = 0; i < appEnum.keyCount(); ++i) { - auto role = static_cast(appEnum.value(i)); - const int row = appHeaderRow + 1 + i; - - if (i % 2 == 0) { - for (int col = 0; col < 4; ++col) { - auto *shade = new QWidget(host); - shade->setAutoFillBackground(true); - grid->addWidget(shade, row, col); - rowShadeWidgets.push_back(shade); - } - } - - auto *label = new QLabel(QString(appEnum.valueToKey(role)), host); - label->setToolTip(APP_ROLE_DESCRIPTIONS.value(role, {})); - label->setContentsMargins(4, 2, 8, 2); - grid->addWidget(label, row, 0); - - auto *btn = new ColorButton(host); - connect(btn, &ColorButton::colorChanged, this, [this] { emit paletteChanged(); }); - appColorButtons[role] = btn; - grid->addWidget(btn, row, 1, Qt::AlignHCenter | Qt::AlignVCenter); - } } void PaletteGridWidget::changeEvent(QEvent *e) @@ -213,16 +166,6 @@ void PaletteGridWidget::loadPalette(const PaletteConfig &cfg) colorButtons[group][role]->setColor(color); } } - - QMetaEnum appEnum = QMetaEnum::fromType(); - for (int i = 0; i < appEnum.keyCount(); ++i) { - auto role = static_cast(appEnum.value(i)); - QColor color = cfg.appColors.value(role); - if (!color.isValid()) { - color = themeManager->appColor(role); - } - appColorButtons[role]->setColor(color); - } } PaletteConfig PaletteGridWidget::currentPaletteConfig() const @@ -233,12 +176,5 @@ PaletteConfig PaletteGridWidget::currentPaletteConfig() const cfg.colors[group][role] = colorButtons[group][role]->getColor(); } } - - QMetaEnum appEnum = QMetaEnum::fromType(); - for (int i = 0; i < appEnum.keyCount(); ++i) { - auto role = static_cast(appEnum.value(i)); - cfg.appColors[role] = appColorButtons[role]->getColor(); - } - return cfg; } \ No newline at end of file diff --git a/cockatrice/src/interface/palette_editor/palette_grid_widget.h b/cockatrice/src/interface/palette_editor/palette_grid_widget.h index 77cbf1c62..1a665971a 100644 --- a/cockatrice/src/interface/palette_editor/palette_grid_widget.h +++ b/cockatrice/src/interface/palette_editor/palette_grid_widget.h @@ -31,7 +31,6 @@ private: void refreshChromePalettes(); QMap> colorButtons; - QMap appColorButtons; QScrollArea *scroll; QWidget *gridHost; QVBoxLayout *layout; diff --git a/cockatrice/src/interface/pixel_map_generator.cpp b/cockatrice/src/interface/pixel_map_generator.cpp index b70dc576f..9b8c4bcdc 100644 --- a/cockatrice/src/interface/pixel_map_generator.cpp +++ b/cockatrice/src/interface/pixel_map_generator.cpp @@ -1,7 +1,5 @@ #include "pixel_map_generator.h" -#include "theme_manager.h" - #include #include #include @@ -84,13 +82,7 @@ static QPixmap loadSvg(const QString &svgPath, const QSize &size, bool expandOnl /** * Try to load path image from non-SVG formats, otherwise fall back to SVG. * This is to allow custom themes to support non-SVG format type overrides, since SVG requires custom loading. - * - * The path may already carry the resolved file extension (e.g. via - * ThemeManager::assetPath); such paths are loaded directly. Otherwise a - * format-agnostic lookup probes png, jpg and finally svg. - * - * @param path The path to the file, with no file extension unless the caller - * already resolved it. File formats will be automatically detected. + * @param path The path to the file, with no file extension. File formats will be automatically detected. * @param size The desired size of the pixmap. * @param expandOnly If true, then keep the size of the initial pixmap to at least the size (Only relevant if SVG). * @@ -98,19 +90,6 @@ static QPixmap loadSvg(const QString &svgPath, const QSize &size, bool expandOnl */ static QPixmap tryLoadImage(const QString &path, const QSize &size, bool expandOnly = false) { - if (path.endsWith(QLatin1String(".svg"), Qt::CaseInsensitive)) { - return loadSvg(path, size, expandOnly); - } - if (path.endsWith(QLatin1String(".png"), Qt::CaseInsensitive) || - path.endsWith(QLatin1String(".jpg"), Qt::CaseInsensitive) || - path.endsWith(QLatin1String(".jpeg"), Qt::CaseInsensitive)) { - QPixmap pix(path); - if (!pix.isNull()) { - return pix.scaled(size, Qt::KeepAspectRatio, Qt::SmoothTransformation); - } - return {}; - } - const auto formats = {"png", "jpg"}; QPixmap returnPixmap; @@ -132,8 +111,7 @@ QPixmap PhasePixmapGenerator::generatePixmap(int height, QString name) return pmCache.value(key); } - QPixmap pixmap = tryLoadImage(QStringLiteral("theme:") + themeManager->assetPath(QStringLiteral("phases/") + name), - QSize(height, height)); + QPixmap pixmap = tryLoadImage("theme:phases/" + name, QSize(height, height)); pmCache.insert(key, pixmap); return pixmap; @@ -361,10 +339,6 @@ static QString getIconType(const bool isBuddy, const UserLevelFlags &userLevelFl return "pawn_judge"; } - if (userLevelFlags.testFlag(ServerInfo_User::IsDeveloper)) { - return "pawn_dev"; - } - if (!privLevel.isEmpty() && privLevel.toLower() != "none") { return QString("pawn_%1").arg(privLevel.toLower()); } @@ -422,8 +396,7 @@ QPixmap LockPixmapGenerator::generatePixmap(int height) return pmCache.value(key); } - QPixmap pixmap = tryLoadImage(QStringLiteral("theme:") + themeManager->assetPath(QStringLiteral("icons/lock")), - QSize(height, height), true); + QPixmap pixmap = tryLoadImage("theme:icons/lock", QSize(height, height), true); pmCache.insert(key, pixmap); return pixmap; } @@ -438,8 +411,7 @@ QPixmap DropdownIconPixmapGenerator::generatePixmap(int height, bool expanded) } QString name = expanded ? "dropdown_expanded" : "dropdown_collapsed"; - QPixmap pixmap = tryLoadImage(QStringLiteral("theme:") + themeManager->assetPath(QStringLiteral("icons/") + name), - QSize(height, height), true); + QPixmap pixmap = tryLoadImage("theme:icons/" + name, QSize(height, height), true); pmCache.insert(key, pixmap); return pixmap; @@ -500,13 +472,6 @@ QHash ManaSymbolPixmapGenerator::scaledCache; QPixmap loadColorAdjustedPixmap(const QString &name) { - // Prefer an authored scheme-qualified variant when one exists for this asset. - const QString variant = themeManager->schemeVariantPath(QStringView(name).mid(QStringLiteral("theme:").size())); - if (!variant.isEmpty()) { - return QPixmap(QStringLiteral("theme:") + variant); - } - - // Legacy fallback: runtime-invert for dark mode when no authored variant. if (qApp->palette().windowText().color().lightness() > 200) { QImage img(name); img.invertPixels(); @@ -517,21 +482,3 @@ QPixmap loadColorAdjustedPixmap(const QString &name) return QPixmap(name); } } - -QPixmap themePixmap(QStringView prefix) -{ - const QString resolved = themeManager->assetPath(prefix); - return QPixmap(QStringLiteral("theme:") + resolved); -} - -void clearPixmapGeneratorCaches() -{ - PhasePixmapGenerator::clear(); - CounterPixmapGenerator::clear(); - PingPixmapGenerator::clear(); - CountryPixmapGenerator::clear(); - UserLevelPixmapGenerator::clear(); - LockPixmapGenerator::clear(); - DropdownIconPixmapGenerator::clear(); - ManaSymbolPixmapGenerator::clear(); -} diff --git a/cockatrice/src/interface/pixel_map_generator.h b/cockatrice/src/interface/pixel_map_generator.h index b6e822fd9..17720166a 100644 --- a/cockatrice/src/interface/pixel_map_generator.h +++ b/cockatrice/src/interface/pixel_map_generator.h @@ -156,15 +156,4 @@ public: QPixmap loadColorAdjustedPixmap(const QString &name); -// Loads a "theme:" asset (with no file extension in prefix), preferring the -// scheme-qualified variant (prefix-dark / prefix-light, resolved via -// ThemeManager::assetPath) and falling back to the plain asset. Callers load -// the returned path directly. Use for scheme-sensitive pixmaps like -// backgrounds, the card back, and the app logo. -QPixmap themePixmap(QStringView prefix); - -// Clears every PixmapGenerator's static cache so scheme variants are -// re-resolved when the active theme or color scheme changes. -void clearPixmapGeneratorCaches(); - #endif diff --git a/cockatrice/src/interface/theme_config.cpp b/cockatrice/src/interface/theme_config.cpp index 8293a82cf..3c43c467d 100644 --- a/cockatrice/src/interface/theme_config.cpp +++ b/cockatrice/src/interface/theme_config.cpp @@ -16,7 +16,7 @@ QString ThemeConfig::toIni() const out += "[Appearance]\n"; out += QString("ColorScheme = %1\n").arg(colorScheme.isEmpty() ? "System" : colorScheme); out += "\n[Style]\n"; - out += QString("Name = %1\n").arg(styleName.isEmpty() ? "System" : styleName); + out += QString("Name = %1\n").arg(styleName.isEmpty() ? "Default" : styleName); return out; } @@ -96,7 +96,7 @@ bool ThemeConfig::save(const QString &themeDirPath) const bool PaletteConfig::hasPalette() const { - return !colors.isEmpty() || !appColors.isEmpty(); + return !colors.isEmpty(); } QString PaletteConfig::toToml() const @@ -133,24 +133,6 @@ QString PaletteConfig::toToml() const out += "\n"; } - if (!appColors.isEmpty()) { - QMetaEnum appEnum = QMetaEnum::fromType(); - - out += "[AppColors]\n"; - - for (auto it = appColors.cbegin(); it != appColors.cend(); ++it) { - const char *roleName = appEnum.valueToKey(it.key()); - - if (!roleName) { - continue; - } - - out += QString("%1 = %2\n").arg(QString(roleName), -20).arg(it.value().name(QColor::HexArgb)); - } - - out += "\n"; - } - return out; } @@ -170,7 +152,6 @@ PaletteConfig PaletteConfig::fromFile(const QString &filePath) } QMetaEnum roleEnum = QMetaEnum::fromType(); - QMetaEnum appEnum = QMetaEnum::fromType(); QString currentSection; QPalette::ColorGroup currentGroup = QPalette::Active; @@ -221,26 +202,6 @@ PaletteConfig PaletteConfig::fromFile(const QString &filePath) } } - QColor color(value); - - if (!color.isValid()) { - continue; - } - - if (currentSection.compare("AppColors", Qt::CaseInsensitive) == 0) { - if (key.startsWith("AppColor::")) { - key = key.mid(10); - } - - int appRoleInt = appEnum.keyToValue(key.toUtf8().constData()); - - if (appRoleInt >= 0) { - cfg.appColors[static_cast(appRoleInt)] = color; - } - - continue; - } - if (!currentSection.startsWith("Palette", Qt::CaseInsensitive)) { continue; } @@ -255,7 +216,11 @@ PaletteConfig PaletteConfig::fromFile(const QString &filePath) continue; } - cfg.colors[currentGroup][static_cast(roleInt)] = color; + QColor color(value); + + if (color.isValid()) { + cfg.colors[currentGroup][static_cast(roleInt)] = color; + } } return cfg; diff --git a/cockatrice/src/interface/theme_config.h b/cockatrice/src/interface/theme_config.h index 567aeccda..07bf55b7a 100644 --- a/cockatrice/src/interface/theme_config.h +++ b/cockatrice/src/interface/theme_config.h @@ -3,25 +3,9 @@ #include #include -#include #include #include -// Application-specific color roles, layered on top of the fixed QPalette role -// set. Stored in the same palette-.toml under an [AppColors] section -// and editable from the palette editor, so theme authors can control colors -// beyond what Qt's palette can express. -namespace AppColor -{ -Q_NAMESPACE -enum Role -{ - AccentStrong, - AccentSoft, -}; -Q_ENUM_NS(Role) -} // namespace AppColor - struct ThemeConfig { QString colorScheme; @@ -37,16 +21,7 @@ struct ThemeConfig struct PaletteConfig { QMap> colors; - QMap appColors; - bool operator==(const PaletteConfig &rhs) const - { - return colors == rhs.colors && appColors == rhs.appColors; - } - bool operator!=(const PaletteConfig &rhs) const - { - return !(*this == rhs); - } bool hasPalette() const; QString toToml() const; diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp index d86ed77f9..e6b4b3c7f 100644 --- a/cockatrice/src/interface/theme_manager.cpp +++ b/cockatrice/src/interface/theme_manager.cpp @@ -1,13 +1,10 @@ #include "theme_manager.h" #include "../../client/settings/cache_settings.h" -#include "pixel_map_generator.h" #include #include #include -#include -#include #include #include #include @@ -22,7 +19,7 @@ #include #include -#define SYSTEM_THEME_NAME "System" +#define NONE_THEME_NAME "Default" #define FUSION_THEME_NAME "Fusion" #define STYLE_CSS_NAME "style.css" #define HANDZONE_BG_NAME "handzone" @@ -96,7 +93,7 @@ struct PaletteColorInfo static QString usableDefaultStyle(const QString &style) { // The Windows 11 native style is broken: when the OS default - // ("System" theme selection) would use it, fall back to the Vista style. + // ("Default" theme selection) would use it, fall back to the Vista style. // Explicitly choosing "windows11" in a theme is still honored. return style.compare("windows11", Qt::CaseInsensitive) == 0 ? QStringLiteral("windowsvista") : style; } @@ -119,16 +116,10 @@ ThemeManager::ThemeManager(QObject *parent) : QObject(parent) void ThemeManager::ensureThemeDirectoryExists() { - auto &settings = SettingsCache::instance(); - - // Migrate the old "Default" theme name to "System" - if (settings.getThemeName() == "Default") { - settings.setThemeName(SYSTEM_THEME_NAME); - } - - if (settings.getThemeName().isEmpty() || !getAvailableThemes().contains(settings.getThemeName())) { + if (SettingsCache::instance().getThemeName().isEmpty() || + !getAvailableThemes().contains(SettingsCache::instance().getThemeName())) { qCInfo(ThemeManagerLog) << "Theme name not set, setting default value"; - settings.setThemeName(FUSION_THEME_NAME); + SettingsCache::instance().setThemeName(NONE_THEME_NAME); } } @@ -149,74 +140,11 @@ bool ThemeManager::isDarkMode(const QString &themeDirPath) const } } -QString ThemeManager::schemeVariantPath(QStringView prefix) const +bool ThemeManager::isBuiltInTheme() { - static const QStringList formats = {QStringLiteral(".png"), QStringLiteral(".jpg"), QStringLiteral(".jpeg"), - QStringLiteral(".svg")}; - const QString scheme = isDarkMode(currentThemePath) ? QStringLiteral("dark") : QStringLiteral("light"); - const QString variantStem = prefix.toString() + QLatin1Char('-') + scheme; + const auto themeName = SettingsCache::instance().getThemeName(); - for (const QString &format : formats) { - if (QFileInfo::exists(QStringLiteral("theme:") + variantStem + format)) { - return variantStem + format; - } - } - return QString(); -} - -QString ThemeManager::assetPath(QStringView prefix) const -{ - // Probe order mirrors tryLoadImage: a theme may override the default SVG - // with a raster of the same stem, so raster wins over SVG within a stem. - static const QStringList formats = {QStringLiteral(".png"), QStringLiteral(".jpg"), QStringLiteral(".jpeg"), - QStringLiteral(".svg")}; - - auto findExisting = [](const QString &stem) { - for (const QString &format : formats) { - if (QFileInfo::exists(QStringLiteral("theme:") + stem + format)) { - return stem + format; - } - } - return QString(); - }; - - // Prefer the scheme-qualified variant when it exists, else the plain - // asset as the super fallback. Both return the resolved path including - // its file extension so callers can load it directly. - const QString variant = schemeVariantPath(prefix); - if (!variant.isEmpty()) { - return variant; - } - const QString resolvedPlain = findExisting(prefix.toString()); - return resolvedPlain.isEmpty() ? prefix.toString() : resolvedPlain; -} - -// Probe whether a directory is truly writable by trying to create and remove a -// temporary file. QFileInfo::isWritable() on a directory is unreliable (notably -// on Windows where UAC VirtualStore can make a system dir appear writable). -bool ThemeManager::isDirReallyWritable(const QString &dirPath) -{ - const QString probe = QDir(dirPath).absoluteFilePath(".cockatrice_write_test"); - QFile f(probe); - if (!f.open(QIODevice::WriteOnly)) { - return false; - } - f.close(); - f.remove(); - return true; -} - -QString ThemeManager::writableThemeDir(const QString &themeName) -{ - // All theme writes go to the user themes directory regardless of whether - // the resolved (system) theme directory happens to be writable. Even when a - // write would succeed in-place, routing it to the user directory keeps the - // install intact and guarantees changes survive upgrades. - const QString dirPath = QDir(SettingsCache::instance().paths().getThemesPath()).absoluteFilePath(themeName); - if (!QDir().mkpath(dirPath)) { - qWarning() << "Failed to create theme save directory:" << dirPath; - } - return dirPath; + return themeName == NONE_THEME_NAME || themeName == FUSION_THEME_NAME; } // System (read-only) themes location, relative to the application binary. @@ -241,7 +169,9 @@ QStringMap &ThemeManager::getAvailableThemes() // load themes from user profile dir dir.setPath(SettingsCache::instance().paths().getThemesPath()); - availableThemes.insert(SYSTEM_THEME_NAME, dir.absoluteFilePath("System")); + // add default value + availableThemes.insert(NONE_THEME_NAME, dir.absoluteFilePath("Default")); + availableThemes.insert(FUSION_THEME_NAME, dir.absoluteFilePath("Fusion")); for (QString themeName : dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)) { @@ -250,7 +180,7 @@ QStringMap &ThemeManager::getAvailableThemes() } } - // Load themes from Cockatrice system dir + // load themes from cockatrice system dir dir.setPath(systemThemesBasePath()); for (QString themeName : dir.entryList(QDir::AllDirs | QDir::NoDotAndDotDot, QDir::Name)) { @@ -265,7 +195,7 @@ QStringMap &ThemeManager::getAvailableThemes() QBrush ThemeManager::loadBrush(QString fileName, QColor fallbackColor) { QBrush brush; - QPixmap tmp = QPixmap("theme:" + assetPath(QStringLiteral("zones/") + fileName)); + QPixmap tmp = QPixmap("theme:zones/" + fileName); if (tmp.isNull()) { brush.setColor(fallbackColor); brush.setStyle(Qt::SolidPattern); @@ -279,7 +209,7 @@ QBrush ThemeManager::loadBrush(QString fileName, QColor fallbackColor) QBrush ThemeManager::loadExtraBrush(QString fileName, QBrush &fallbackBrush) { QBrush brush; - QPixmap tmp = QPixmap("theme:" + assetPath(QStringLiteral("zones/") + fileName)); + QPixmap tmp = QPixmap("theme:zones/" + fileName); if (tmp.isNull()) { brush = fallbackBrush; @@ -357,7 +287,7 @@ bool ThemeManager::commitPalette(const QString &themeDirPath, const QString &col void ThemeManager::setColorScheme(const QString &scheme) { - const QString dirPath = writableThemeDir(SettingsCache::instance().getThemeName()); + const QString dirPath = getAvailableThemes().value(SettingsCache::instance().getThemeName()); ThemeConfig cfg = ThemeConfig::fromThemeDir(dirPath); cfg.colorScheme = scheme; @@ -368,7 +298,7 @@ void ThemeManager::setColorScheme(const QString &scheme) void ThemeManager::setStyleName(const QString &styleName) { - const QString dirPath = writableThemeDir(SettingsCache::instance().getThemeName()); + const QString dirPath = getAvailableThemes().value(SettingsCache::instance().getThemeName()); ThemeConfig cfg = ThemeConfig::fromThemeDir(dirPath); cfg.styleName = styleName; @@ -399,7 +329,7 @@ void ThemeManager::applyStyleAndPalette(const QString &themeName, Q_UNUSED(activeScheme) #endif QString styleName = themeCfg.styleName; - if (styleName.isEmpty() || styleName.compare("System", Qt::CaseInsensitive) == 0) { + if (styleName.isEmpty() || styleName.compare("Default", Qt::CaseInsensitive) == 0) { if (themeName == FUSION_THEME_NAME) { styleName = "Fusion"; } else { @@ -442,8 +372,6 @@ void ThemeManager::applyStyleAndPalette(const QString &themeName, qApp->setPalette(base); qApp->setStyle(style); - currentAppColors = palCfg.appColors; - // Force every widget to re-polish and repaint immediately rather than // waiting for natural expose events, which produces a patchwork of old // and new colours during a live preview. @@ -456,35 +384,6 @@ void ThemeManager::applyStyleAndPalette(const QString &themeName, style->polish(widget); widget->update(); } - - emit paletteChanged(); -} - -QColor ThemeManager::appColor(AppColor::Role role) const -{ - const auto it = currentAppColors.constFind(role); - if (it != currentAppColors.constEnd()) { - return it.value(); - } - - // QPalette::Accent was introduced in Qt 6.6 and several shipped palettes - // set it to a value barely distinguishable from Window, so it is not a - // reliable accent source. The selection highlight is the stable accent - // (Accent defaults to Highlight when unset), and deriving from it - // unconditionally keeps every Qt version rendering identically. - const QColor accent = qApp->palette().color(QPalette::Active, QPalette::Highlight); - - if (role == AppColor::AccentSoft) { - constexpr int SOFT_SATURATION_PERCENT = 70; - constexpr int SOFT_LIGHTNESS_OFFSET = 60; - - // Light end of the gradient: same hue, softened and lightened - return QColor::fromHsl(qMax(0, accent.hslHue()), - qBound(0, qRound(accent.hslSaturation() * SOFT_SATURATION_PERCENT / 100.0), 255), - qBound(0, accent.lightness() + SOFT_LIGHTNESS_OFFSET, 255)); - } - - return accent; } void ThemeManager::themeChangedSlot() @@ -494,19 +393,9 @@ void ThemeManager::themeChangedSlot() currentThemePath = dirPath; QDir dir(dirPath); - // CSS — prefer the scheme-qualified stylesheet (style-dark.css / - // style-light.css) when present, else the plain style.css as fallback. - if (!dirPath.isEmpty()) { - const QString scheme = isDarkMode(dirPath) ? QStringLiteral("dark") : QStringLiteral("light"); - const QString schemeCss = QFileInfo(QStringLiteral(STYLE_CSS_NAME)).completeBaseName() + QLatin1Char('-') + - scheme + QStringLiteral(".css"); - if (dir.exists(schemeCss)) { - qApp->setStyleSheet("file:///" + dir.absoluteFilePath(schemeCss)); - } else if (dir.exists(STYLE_CSS_NAME)) { - qApp->setStyleSheet("file:///" + dir.absoluteFilePath(STYLE_CSS_NAME)); - } else { - qApp->setStyleSheet(""); - } + // CSS + if (!dirPath.isEmpty() && dir.exists(STYLE_CSS_NAME)) { + qApp->setStyleSheet("file:///" + dir.absoluteFilePath(STYLE_CSS_NAME)); } else { qApp->setStyleSheet(""); } @@ -521,19 +410,8 @@ void ThemeManager::themeChangedSlot() // ── Load palette: custom first, then theme default ──────────────────── PaletteConfig palette = PaletteConfig::fromScheme(dirPath, activeScheme); - const PaletteConfig themeDefault = ThemeManager::loadDefaultPaletteConfig(dirPath, themeName, activeScheme); - if (palette.hasPalette()) { - // A custom palette written before [AppColors] existed carries no app - // colors; merge the theme's shipped defaults so the identity colors - // survive (hasPalette() counts an app-colors-only file as a palette, - // so those are kept wholesale and never reach here empty). - for (auto it = themeDefault.appColors.cbegin(); it != themeDefault.appColors.cend(); ++it) { - if (!palette.appColors.contains(it.key())) { - palette.appColors.insert(it.key(), it.value()); - } - } - } else { - palette = themeDefault; + if (!palette.hasPalette()) { + palette = ThemeManager::loadDefaultPaletteConfig(dirPath, themeName, activeScheme); } applyStyleAndPalette(themeName, themeCfg, palette, activeScheme); @@ -568,7 +446,6 @@ void ThemeManager::themeChangedSlot() } QPixmapCache::clear(); - clearPixmapGeneratorCaches(); emit themeChanged(); } diff --git a/cockatrice/src/interface/theme_manager.h b/cockatrice/src/interface/theme_manager.h index aadb38ee9..79a1b6470 100644 --- a/cockatrice/src/interface/theme_manager.h +++ b/cockatrice/src/interface/theme_manager.h @@ -50,7 +50,6 @@ private: QString currentThemePath; std::array brushes; QStringMap availableThemes; - QMap currentAppColors; /* Internal cache for multiple backgrounds */ @@ -66,16 +65,7 @@ protected: const QString &activeScheme); public: - // Resolves the directory to write theme changes to for the given theme - // name. The resolved theme dir (user or system) is used when writable; - // read-only system themes fall back to the user themes directory, creating - // it if needed, so customisations never get lost on upgrade. - static QString writableThemeDir(const QString &themeName); - // Probe whether a directory is truly writable by trying to create and remove - // a temporary file. QFileInfo::isWritable() on a directory is unreliable - // (notably on Windows where UAC VirtualStore can make a system dir appear - // writable). - static bool isDirReallyWritable(const QString &dirPath); + bool isBuiltInTheme(); // Explicit color scheme of the theme: theme.cfg's ColorScheme setting // (Dark/Light), falling back to the OS color scheme when it is "System". bool isDarkMode(const QString &themeDirPath) const; @@ -97,20 +87,6 @@ public: // Load/save per-scheme palette colors static PaletteConfig loadPaletteConfig(const QString &themeDirPath, const QString &colorScheme); static bool savePaletteConfig(const QString &themeDirPath, const QString &colorScheme, const PaletteConfig &cfg); - // Resolve prefix to a scheme-qualified "theme:" path. Existence is probed - // internally across the formats themes may ship (.png/.jpg/.svg), so - // callers load the returned path directly. Prefers "-" - // when a file exists at that stem, otherwise the plain "" as the - // super fallback. The resolved scheme covers explicit light/dark as well - // as OS-resolved "system". Returns the path with its file extension when a - // match is found; unqualified assets keep working unchanged. - QString assetPath(QStringView prefix) const; - // Like assetPath, but resolves only the scheme-qualified variant - // ("-.") and returns an empty string when no - // variant exists — it never falls back to the plain "" asset. - // Callers that must distinguish "no authored variant" (e.g. to keep a - // legacy runtime fallback alive) should use this instead of assetPath. - QString schemeVariantPath(QStringView prefix) const; // Load the theme's shipped default palette, falling back to the system // theme directory when it is absent from the resolved (user) directory. static PaletteConfig @@ -125,17 +101,12 @@ public: void reloadCurrentTheme(); void previewPalette(const PaletteConfig &cfg, const QString &scheme); - // Resolves an application color role: the theme's stored [AppColors] value - // when present, otherwise a palette-accent-derived fallback. - QColor appColor(AppColor::Role role) const; - QBrush &getBgBrush(Role zone); QBrush getExtraBgBrush(Role zone, int zoneId = 0); protected slots: void themeChangedSlot(); signals: void themeChanged(); - void paletteChanged(); }; extern ThemeManager *themeManager; diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp index 2199faf30..1ea1bcb10 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp @@ -85,7 +85,7 @@ void ColorIdentityWidget::resizeEvent(QResizeEvent *event) } lastWidth = totalWidth; - const int totalHeight = qMax(0, totalWidth / 6); // Set height to 1/4 of the width + const int totalHeight = totalWidth / 6; // Set height to 1/4 of the width setFixedHeight(totalHeight); const int count = layout->count(); @@ -97,10 +97,6 @@ void ColorIdentityWidget::resizeEvent(QResizeEvent *event) const int availableWidth = totalWidth - (spacing * (count - 1)); const int iconSize = qMin(availableWidth / count, totalHeight); // Ensure icons fit within the new height - if (iconSize <= 0) { - lastIconSize = iconSize; - return; - } if (iconSize == lastIconSize) { return; } diff --git a/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp b/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp deleted file mode 100644 index 62b01511e..000000000 --- a/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "deck_color_identity.h" - -#include -#include -#include -#include - -QString getDeckColorIdentity(const DeckList &deck, const CardDatabaseQuerier *db) -{ - const QStringList cardList = deck.getCardList({DECK_ZONE_MAIN, DECK_ZONE_SIDE}); - if (cardList.isEmpty()) { - return {}; - } - - QSet colorSet; // A set to collect unique color symbols (e.g., W, U, B, R, G) - - for (const QString &cardName : cardList) { - CardInfoPtr currentCard = db->getCardInfo(cardName); - if (currentCard) { - const QString colors = currentCard->getColors(); // returns something like "WUB" - for (const QChar &color : colors) { - colorSet.insert(color); - } - } - } - - // Ensure the color identity is in WUBRG order - QString colorIdentity; - const QString wubrgOrder = "WUBRG"; - for (const QChar &color : wubrgOrder) { - if (colorSet.contains(color)) { - colorIdentity.append(color); - } - } - - return colorIdentity; -} diff --git a/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.h b/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.h deleted file mode 100644 index 04294cb1c..000000000 --- a/cockatrice/src/interface/widgets/cards/additional_info/deck_color_identity.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef COCKATRICE_DECK_COLOR_IDENTITY_H -#define COCKATRICE_DECK_COLOR_IDENTITY_H - -#include - -class CardDatabaseQuerier; -class DeckList; - -/** - * @brief Computes the color identity of a deck (e.g. "WUBRG") from the color - * symbols of all cards in the main deck and sideboard, ordered WUBRG. - * - * Shared as a free function so the deck storage previews and the deck share - * dialog compute identities identically. - * - * @param db Card database used to look up card color symbols. - */ -QString getDeckColorIdentity(const DeckList &deck, const CardDatabaseQuerier *db); - -#endif // COCKATRICE_DECK_COLOR_IDENTITY_H diff --git a/cockatrice/src/interface/widgets/cards/card_art_utils.cpp b/cockatrice/src/interface/widgets/cards/card_art_utils.cpp deleted file mode 100644 index b26b73593..000000000 --- a/cockatrice/src/interface/widgets/cards/card_art_utils.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "card_art_utils.h" - -#include -#include - -namespace CardArtUtils -{ -QPixmap rotateSidewaysLayoutArt(const QPixmap &art, const ExactCard &card) -{ - if (!card.getInfo().getUiAttributes().landscapeOrientation) { - return art; - } - - QTransform transform; - transform.rotate(90); - return art.transformed(transform, Qt::SmoothTransformation); -} -} // namespace CardArtUtils \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/cards/card_art_utils.h b/cockatrice/src/interface/widgets/cards/card_art_utils.h deleted file mode 100644 index 5c331a12c..000000000 --- a/cockatrice/src/interface/widgets/cards/card_art_utils.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef CARD_ART_UTILS_H -#define CARD_ART_UTILS_H - -#include - -class ExactCard; - -namespace CardArtUtils -{ -/** - * @brief Rotates a card's art upright when its layout shows sideways. - * - * Sideways-layout cards (planes, sieges/battles, split cards) store their - * landscape artwork rotated 90° inside a portrait frame. Art-crop displays, - * playmat art, and the card-info picture must show such art upright before - * sampling or painting. Portrait cards are returned unchanged. - * - * @param art The card pixmap to orient. - * @param card The card describing the art orientation. - * @return @p art rotated 90° clockwise for sideways-layout cards, else @p art. - */ -QPixmap rotateSidewaysLayoutArt(const QPixmap &art, const ExactCard &card); -} // namespace CardArtUtils - -#endif // CARD_ART_UTILS_H \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp index bfbdd7e42..3f36e559c 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp @@ -174,18 +174,16 @@ void CardGroupDisplayWidget::updateCardDisplays() QModelIndex sourceIndex = proxy.mapToSource(proxyIndex); // 4. persist the source index - addCardWidgets(QPersistentModelIndex(sourceIndex)); - } -} + QPersistentModelIndex persistent(sourceIndex); -void CardGroupDisplayWidget::addCardWidgets(const QPersistentModelIndex &persistent) -{ - // Get the card amount - int cardAmount = persistent.sibling(persistent.row(), DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt(); + // Get the card amount + int cardAmount = + sourceIndex.sibling(sourceIndex.row(), DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt(); - // Create multiple widgets for the card count - for (int copy = 0; copy < cardAmount; ++copy) { - addToLayout(constructWidgetForIndex(persistent)); + // Create multiple widgets for the card count + for (int copy = 0; copy < cardAmount; ++copy) { + addToLayout(constructWidgetForIndex(persistent)); + } } } diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h index a3bf70981..2308ccf8d 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h @@ -35,7 +35,6 @@ public: void onSelectionChanged(const QItemSelection &selected, const QItemSelection &deselected); void refreshSelectionForIndex(const QPersistentModelIndex &persistent); void clearAllDisplayWidgets(); - void addCardWidgets(const QPersistentModelIndex &persistent); DeckListModel *deckListModel; QItemSelectionModel *selectionModel; diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp index 2dd21e78a..79ae087d7 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp @@ -5,7 +5,6 @@ #include "../../../interface/card_picture_loader/card_picture_loader.h" #include "../../../interface/widgets/tabs/tab_supervisor.h" #include "../../window_main.h" -#include "card_art_utils.h" #include #include @@ -74,8 +73,6 @@ CardInfoPictureWidget::CardInfoPictureWidget(QWidget *parent, const bool _hoverT update(); }); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this, - &CardInfoPictureWidget::updatePixmap); } /** @@ -196,7 +193,12 @@ void CardInfoPictureWidget::paintEvent(QPaintEvent *event) QPixmap transformedPixmap = resizedPixmap; // Default pixmap if (SettingsCache::instance().cardsDisplay().getAutoRotateSidewaysLayoutCards()) { - transformedPixmap = CardArtUtils::rotateSidewaysLayoutArt(resizedPixmap, exactCard); + if (exactCard.getInfo().getUiAttributes().landscapeOrientation) { + // Rotate pixmap 90 degrees to the left + QTransform transform; + transform.rotate(90); + transformedPixmap = resizedPixmap.transformed(transform, Qt::SmoothTransformation); + } } // Handle DPI scaling diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp index 000a88b2f..c5cb59b3b 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_with_text_overlay_widget.cpp @@ -133,14 +133,12 @@ void CardInfoPictureWithTextOverlayWidget::paintEvent(QPaintEvent *event) path.addRoundedRect(glowRect, radius, radius); // Soft outer glow - QColor glowColor = palette().color(QPalette::Highlight); - glowColor.setAlpha(80); + QColor glowColor(0, 150, 255, 80); // subtle blu painter.setPen(QPen(glowColor, 6)); painter.drawPath(path); // Thin inner border for crispness - QColor borderColor = palette().color(QPalette::Highlight); - borderColor.setAlpha(200); + QColor borderColor(0, 150, 255, 200); painter.setPen(QPen(borderColor, 2)); painter.drawRoundedRect(pixmapRect, radius, radius); diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp index e98c3c02a..c6af5320b 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.cpp @@ -1,7 +1,6 @@ #include "card_info_text_widget.h" #include "../../../game_graphics/board/card_item.h" -#include "../../card_localization.h" #include #include @@ -11,7 +10,7 @@ #include #include -CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent) +CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent), info(nullptr) { propsLabel = new QLabel; propsLabel->setOpenExternalLinks(false); @@ -40,12 +39,6 @@ CardInfoTextWidget::CardInfoTextWidget(QWidget *parent) : QFrame(parent) grid->setRowStretch(1, 1); retranslateUi(); - - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this, [this] { - if (currentCard) { - setCard(currentCard); - } - }); } void CardInfoTextWidget::setTexts(const QString &propsText, const QString &textText) @@ -67,7 +60,7 @@ void CardInfoTextWidget::setCard(const ExactCard &exactCard) QString text = ""; text += QString("") - .arg(tr("Name:"), CardLocalization::displayName(card).toHtmlEscaped()); + .arg(tr("Name:"), card->getName().toHtmlEscaped()); if (!exactCard.getPrinting().isEmpty()) { QString setShort = exactCard.getPrinting().getSet()->getShortName().toHtmlEscaped(); @@ -101,8 +94,7 @@ void CardInfoTextWidget::setCard(const ExactCard &exactCard) } text += "
%1%2
"; - setTexts(text, CardLocalization::displayText(card)); - currentCard = exactCard; + setTexts(text, card->getText()); } void CardInfoTextWidget::setInvalidCardName(const QString &cardName) diff --git a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h index 683be5ab5..a9c29da37 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_text_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_info_text_widget.h @@ -23,7 +23,7 @@ private: QLabel *propsLabel; QScrollArea *propsScroll; QTextEdit *textLabel; - ExactCard currentCard; ///< Last card set, re-rendered when the card language changes. + CardInfoPtr info; void setTexts(const QString &propsText, const QString &textText); public: diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp index b00d9db1e..eaf3a67b0 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp @@ -5,7 +5,6 @@ #include "libcockatrice/card/database/card_database_manager.h" #include -#include #include DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, @@ -52,6 +51,11 @@ DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, // User Interaction // ===================================================================================================================== +void DeckCardZoneDisplayWidget::onClick(QMouseEvent *event, const ExactCard &card) +{ + emit cardClicked(event, card, zoneName); +} + void DeckCardZoneDisplayWidget::onHover(const ExactCard &card) { emit cardHovered(card); @@ -91,18 +95,12 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex } auto categoryName = index.sibling(index.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); - // Cards in a custom zone belong to that zone, not the board zone, so that - // increment/decrement/swap actions target the custom zone. - const bool isCustomZone = index.data(DeckRoles::IsCustomZoneRole).toBool(); - const QString effectiveZoneName = isCustomZone ? categoryName : zoneName; - const auto routeCardClick = [this, effectiveZoneName](QMouseEvent *event, const ExactCard &card) { - emit cardClicked(event, card, effectiveZoneName); - }; if (displayType == DisplayType::Overlap) { auto *displayWidget = new OverlappedCardGroupDisplayWidget( - cardGroupContainer, deckListModel, selectionModel, index, effectiveZoneName, categoryName, - activeGroupCriteria, activeSortCriteria, subBannerOpacity, cardSizeWidget); - connect(displayWidget, &OverlappedCardGroupDisplayWidget::cardClicked, this, routeCardClick); + cardGroupContainer, deckListModel, selectionModel, index, zoneName, categoryName, activeGroupCriteria, + activeSortCriteria, subBannerOpacity, cardSizeWidget); + connect(displayWidget, &OverlappedCardGroupDisplayWidget::cardClicked, this, + &DeckCardZoneDisplayWidget::onClick); connect(displayWidget, &OverlappedCardGroupDisplayWidget::cardHovered, this, &DeckCardZoneDisplayWidget::onHover); connect(displayWidget, &CardGroupDisplayWidget::cleanupRequested, this, @@ -113,9 +111,9 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex indexToWidgetMap.insert(index, displayWidget); } else if (displayType == DisplayType::Flat) { auto *displayWidget = new FlatCardGroupDisplayWidget(cardGroupContainer, deckListModel, selectionModel, index, - effectiveZoneName, categoryName, activeGroupCriteria, + zoneName, categoryName, activeGroupCriteria, activeSortCriteria, subBannerOpacity, cardSizeWidget); - connect(displayWidget, &FlatCardGroupDisplayWidget::cardClicked, this, routeCardClick); + connect(displayWidget, &FlatCardGroupDisplayWidget::cardClicked, this, &DeckCardZoneDisplayWidget::onClick); connect(displayWidget, &FlatCardGroupDisplayWidget::cardHovered, this, &DeckCardZoneDisplayWidget::onHover); connect(displayWidget, &CardGroupDisplayWidget::cleanupRequested, this, &DeckCardZoneDisplayWidget::cleanupInvalidCardGroup); @@ -128,18 +126,24 @@ void DeckCardZoneDisplayWidget::constructAppropriateWidget(QPersistentModelIndex void DeckCardZoneDisplayWidget::displayCards() { - if (!trackedIndex.isValid()) { - return; - } + QSortFilterProxyModel proxy; + proxy.setSourceModel(deckListModel); + proxy.setSortRole(Qt::EditRole); + proxy.sort(DeckListModelColumns::CARD_NAME, Qt::AscendingOrder); - // Iterate the direct children of the tracked zone, keeping the tree view's row - // order (criteria groups first, then custom zones, both in the model's sort order). - QList rows; - for (int i = 0; i < deckListModel->rowCount(trackedIndex); ++i) { - rows.append(QPersistentModelIndex(deckListModel->index(i, 0, trackedIndex))); - } + // 1. trackedIndex is a source index → map it to proxy space + QModelIndex proxyParent = proxy.mapFromSource(trackedIndex); + + // 2. iterate children under the proxy parent + for (int i = 0; i < proxy.rowCount(proxyParent); ++i) { + QModelIndex proxyIndex = proxy.index(i, 0, proxyParent); + + // 3. map back to source + QModelIndex sourceIndex = proxy.mapToSource(proxyIndex); + + // 4. persist the source index + QPersistentModelIndex persistent(sourceIndex); - for (const QPersistentModelIndex &persistent : rows) { constructAppropriateWidget(persistent); } } diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h index 53f3fa7cf..b426fca30 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h @@ -42,6 +42,7 @@ public: void addCardsToOverlapWidget(); public slots: + void onClick(QMouseEvent *event, const ExactCard &card); void onHover(const ExactCard &card); void cleanupInvalidCardGroup(CardGroupDisplayWidget *displayWidget); void constructAppropriateWidget(QPersistentModelIndex index); diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp index 147143e7f..1614836fc 100644 --- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp @@ -27,23 +27,18 @@ DeckPreviewCardPictureWidget::DeckPreviewCardPictureWidget(QWidget *parent, const QColor &textColor, const QColor &outlineColor, const int fontSize, - const Qt::Alignment alignment, - const bool _emitClickImmediately) + const Qt::Alignment alignment) : CardInfoPictureWithTextOverlayWidget(parent, hoverToZoomEnabled, raiseOnEnter, textColor, outlineColor, fontSize, - alignment), - emitClickImmediately(_emitClickImmediately) + alignment) { singleClickTimer = new QTimer(this); singleClickTimer->setSingleShot(true); - connect(singleClickTimer, &QTimer::timeout, this, [this]() { - emit imageClicked(lastMouseEvent, this); - emit imageSingleClicked(); - }); + connect(singleClickTimer, &QTimer::timeout, this, [this]() { emit imageClicked(lastMouseEvent, this); }); connect(&SettingsCache::instance().visualDeckStorage(), &VisualDeckStorageSettings::visualDeckStorageSelectionAnimationChanged, this, &CardInfoPictureWidget::setRaiseOnEnterEnabled); @@ -52,13 +47,8 @@ DeckPreviewCardPictureWidget::DeckPreviewCardPictureWidget(QWidget *parent, void DeckPreviewCardPictureWidget::mousePressEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton) { - if (emitClickImmediately) { - emit imageClicked(event, this); - emit imageSingleClicked(); - } else { - lastMouseEvent = event; - singleClickTimer->start(QApplication::doubleClickInterval()); - } + lastMouseEvent = event; + singleClickTimer->start(QApplication::doubleClickInterval()); } else { emit imageClicked(event, this); event->accept(); @@ -68,14 +58,7 @@ void DeckPreviewCardPictureWidget::mousePressEvent(QMouseEvent *event) void DeckPreviewCardPictureWidget::mouseDoubleClickEvent(QMouseEvent *event) { if (event->button() == Qt::LeftButton) { - if (emitClickImmediately) { - // Do not report a second single click for the second press of the - // double-click; the consumer maps the double-click to select+open. - lastMouseEvent = event; - emit imageDoubleClicked(event, this); - } else { - singleClickTimer->stop(); // Prevent single-click logic - emit imageDoubleClicked(lastMouseEvent, this); - } + singleClickTimer->stop(); // Prevent single-click logic + emit imageDoubleClicked(lastMouseEvent, this); } } diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h index 7571bc256..154e938aa 100644 --- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h +++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.h @@ -20,38 +20,21 @@ class DeckPreviewCardPictureWidget final : public CardInfoPictureWithTextOverlay Q_OBJECT public: - /** - * @brief Constructs a DeckPreviewCardPictureWidget. - * @param parent The parent widget. - * @param hoverToZoomEnabled If this widget will spawn a larger widget when hovered over. - * @param raiseOnEnter If the widget raises its border when the mouse enters. - * @param textColor The color of the overlay text. - * @param outlineColor The color of the outline around the text. - * @param fontSize The font size of the overlay text. - * @param alignment The alignment of the text within the overlay. - * @param emitClickImmediately If true, a left click is reported immediately on click - * instead of after the double-click interval. Use this for selection surfaces - * where reacting to a double-click (select-and-open) would needlessly delay the - * single-click feedback. The double-click signal is still emitted. - */ explicit DeckPreviewCardPictureWidget(QWidget *parent, bool hoverToZoomEnabled = false, bool raiseOnEnter = false, const QColor &textColor = Qt::white, const QColor &outlineColor = Qt::black, int fontSize = 12, - Qt::Alignment alignment = Qt::AlignCenter, - bool _emitClickImmediately = false); + Qt::Alignment alignment = Qt::AlignCenter); signals: void imageClicked(QMouseEvent *event, DeckPreviewCardPictureWidget *instance); - void imageSingleClicked(); void imageDoubleClicked(QMouseEvent *event, DeckPreviewCardPictureWidget *instance); private: QTimer *singleClickTimer; QMouseEvent *lastMouseEvent = nullptr; // Store the last mouse event - bool emitClickImmediately; protected: void mousePressEvent(QMouseEvent *event) override; diff --git a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp index 483fc71b0..089abc5c8 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/abstract_analytics_panel_widget.cpp @@ -1,6 +1,5 @@ #include "abstract_analytics_panel_widget.h" -#include "../../pixel_map_generator.h" #include "deck_list_statistics_analyzer.h" #include @@ -21,7 +20,7 @@ AbstractAnalyticsPanelWidget::AbstractAnalyticsPanelWidget(QWidget *parent, Deck // config button configureButton = new QPushButton(this); - configureButton->setIcon(themePixmap(QStringLiteral("icons/cogwheel"))); + configureButton->setIcon(QPixmap("theme:icons/cogwheel")); configureButton->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); connect(configureButton, &QPushButton::clicked, this, &AbstractAnalyticsPanelWidget::applyConfigFromDialog); bannerAndSettingsLayout->addWidget(configureButton, 0); diff --git a/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp b/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp index 00388a3cd..7c782b074 100644 --- a/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/card_database_view.cpp @@ -90,13 +90,6 @@ void CardDatabaseView::decrementCard(const QString &zoneName) emit cardDecremented(currentCardName(), zoneName); } -void CardDatabaseView::setZoneMenuProvider(const std::function>()> &provider, - const std::function &newZoneHandler) -{ - zoneMenuProvider = provider; - this->newZoneHandler = newZoneHandler; -} - void CardDatabaseView::updateCard(const QModelIndex ¤t, const QModelIndex & /*previous*/) { if (!current.isValid()) { @@ -149,50 +142,6 @@ void CardDatabaseView::openCustomMenu(QPoint point) [this, card] { emit cardAdded(card->getName(), DECK_ZONE_SIDE); }); connect(selectPrinting, &QAction::triggered, this, &CardDatabaseView::selectPrintingClicked); - if (zoneMenuProvider) { - QMenu *addToZoneMenu = menu.addMenu(tr("Add to Zone")); - const auto zoneBoards = zoneMenuProvider(); - for (const QString &boardName : InnerDecklistNode::boardZoneNames()) { - // Boards with zones nest their children so no two menu entries - // share a visible name: "Maindeck ▸ { Maindeck (whole board), … }". - const QStringList customZones = [&zoneBoards, boardName] { - for (const auto &zoneBoard : zoneBoards) { - if (zoneBoard.first == boardName) { - return zoneBoard.second; - } - } - return QStringList(); - }(); - if (customZones.isEmpty()) { - QAction *action = addToZoneMenu->addAction(InnerDecklistNode::visibleNameFromName(boardName)); - connect(action, &QAction::triggered, this, - [this, card, boardName] { emit cardAdded(card->getName(), boardName); }); - } else { - QMenu *boardSubmenu = addToZoneMenu->addMenu(InnerDecklistNode::visibleNameFromName(boardName)); - QAction *wholeBoardAction = boardSubmenu->addAction(InnerDecklistNode::visibleNameFromName(boardName)); - connect(wholeBoardAction, &QAction::triggered, this, - [this, card, boardName] { emit cardAdded(card->getName(), boardName); }); - for (const QString &zoneName : customZones) { - QAction *action = boardSubmenu->addAction(zoneName); - connect(action, &QAction::triggered, this, - [this, card, zoneName] { emit cardAdded(card->getName(), zoneName); }); - } - } - } - - if (newZoneHandler) { - addToZoneMenu->addSeparator(); - - QAction *newZoneAction = addToZoneMenu->addAction(tr("Create &new zone...")); - connect(newZoneAction, &QAction::triggered, this, [this, card] { - const QString zoneName = newZoneHandler(); - if (!zoneName.isEmpty()) { - emit cardAdded(card->getName(), zoneName); - } - }); - } - } - if (canBeCommander(*card)) { QAction *edhRecCommander = menu.addAction(tr("Show on EDHRec (Commander)")); connect(edhRecCommander, &QAction::triggered, this, [this, card] { emit edhrecClicked(card, true); }); diff --git a/cockatrice/src/interface/widgets/deck_editor/card_database_view.h b/cockatrice/src/interface/widgets/deck_editor/card_database_view.h index 668444199..175ec12b9 100644 --- a/cockatrice/src/interface/widgets/deck_editor/card_database_view.h +++ b/cockatrice/src/interface/widgets/deck_editor/card_database_view.h @@ -4,7 +4,6 @@ #include "../../key_signals.h" #include -#include #include class CardDatabaseModel; @@ -20,13 +19,6 @@ class CardDatabaseView : public QTreeView KeySignals searchKeySignals; CardDatabaseDisplayModel *databaseDisplayModel; - /// Provides the custom zones available in the current deck, grouped by board zone. - /// The list contains (board zone name, custom zone names) pairs for every board. - std::function>()> zoneMenuProvider; - /// Handler invoked when the user picks "New zone..." from the add-to-zone menu. - /// Returns the name of the created zone, or an empty string if creation was cancelled. - std::function newZoneHandler; - public: explicit CardDatabaseView(QWidget *parent, CardDatabaseDisplayModel *model); @@ -41,17 +33,6 @@ public: return &searchKeySignals; } - /** - * @brief Sets the provider used to populate the "Add to zone" submenu of the context menu. - * If no provider is set, the submenu is not shown. - * - * @param provider Returns the custom zones of the current deck, grouped by board zone - * @param newZoneHandler Creates a new custom zone and returns its name, or an empty string - * if creation was cancelled. The menu entry is hidden when not provided. - */ - void setZoneMenuProvider(const std::function>()> &provider, - const std::function &newZoneHandler); - signals: void cardChanged(const QString &cardName); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp index 6269f0323..2a491de4f 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_card_database_dock_widget.cpp @@ -1,12 +1,5 @@ #include "deck_editor_card_database_dock_widget.h" -#include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" -#include "card_database_view.h" -#include "deck_state_manager.h" -#include "deck_zone_dialog.h" - -#include - DeckEditorCardDatabaseDockWidget::DeckEditorCardDatabaseDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent) { setObjectName("databaseDisplayDock"); @@ -22,27 +15,6 @@ void DeckEditorCardDatabaseDockWidget::createDatabaseDisplayDock(AbstractTabDeck { databaseDisplayWidget = new DeckEditorDatabaseDisplayWidget(this, deckEditor->databaseModel); - databaseDisplayWidget->getDatabaseView()->setZoneMenuProvider( - [deckEditor]() -> QList> { - QList> result; - auto *deckListModel = deckEditor->deckStateManager->getModel(); - for (const QString &boardName : InnerDecklistNode::boardZoneNames()) { - result.append({boardName, deckListModel->getCustomZoneNames(boardName)}); - } - return result; - }, - [this, deckEditor]() -> QString { - QString boardName; - const QString zoneName = - DeckZoneDialog::promptForNewZone(this, {}, &boardName, [deckEditor](const QString &candidate) { - return deckEditor->deckStateManager->validateNewZoneName(candidate); - }); - if (!zoneName.isEmpty()) { - deckEditor->deckStateManager->createCustomZone(boardName, zoneName); - } - return zoneName; - }); - auto *frame = new QVBoxLayout; frame->setObjectName("databaseDisplayFrame"); frame->addWidget(databaseDisplayWidget); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp index a83e25f5f..9da821813 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -11,10 +11,8 @@ #include #include #include -#include #include #include -#include DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent, CardDatabaseModel *databaseModel) : QWidget(parent) @@ -30,7 +28,7 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)")); searchEdit->setClearButtonEnabled(true); searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); - auto help = searchEdit->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); + auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition); setFocusProxy(searchEdit); setFocusPolicy(Qt::ClickFocus); @@ -42,17 +40,6 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent databaseDisplayModel->setSourceModel(databaseModel); databaseDisplayModel->setFilterKeyColumn(0); - const auto applyCardSearchLanguage = [this]() { - const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay(); - databaseDisplayModel->setSearchLanguage(CardSearchLanguage{ - cardsDisplay.getCardLang(), static_cast(cardsDisplay.getCardSearchLanguage())}); - }; - applyCardSearchLanguage(); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this, - applyCardSearchLanguage); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this, - applyCardSearchLanguage); - databaseView = new CardDatabaseView(this, databaseDisplayModel); databaseView->setObjectName("databaseView"); databaseView->setFocusProxy(searchEdit); @@ -72,13 +59,13 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent &DeckEditorDatabaseDisplayWidget::onRelatedCardClicked); aAddCard = new QAction(QString(), this); - aAddCard->setIcon(themePixmap(QStringLiteral("icons/arrow_right_green"))); + aAddCard->setIcon(QPixmap("theme:icons/arrow_right_green")); connect(aAddCard, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToMainDeck); auto *tbAddCard = new QToolButton(this); tbAddCard->setDefaultAction(aAddCard); aAddCardToSideboard = new QAction(QString(), this); - aAddCardToSideboard->setIcon(themePixmap(QStringLiteral("icons/arrow_right_blue"))); + aAddCardToSideboard->setIcon(QPixmap("theme:icons/arrow_right_blue")); connect(aAddCardToSideboard, &QAction::triggered, this, &DeckEditorDatabaseDisplayWidget::actAddCardToSideboard); auto *tbAddCardToSideboard = new QToolButton(this); tbAddCardToSideboard->setDefaultAction(aAddCardToSideboard); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 4b141e255..14defc8e9 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -2,24 +2,20 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" -#include "../../pixel_map_generator.h" #include "../playmat/playmat_settings_dialog.h" #include "../settings_page/user_interface_settings_page.h" #include "../tabs/api/commander_spellbook/commander_bracket_widget.h" #include "deck_list_style_proxy.h" #include "deck_state_manager.h" -#include "deck_zone_dialog.h" #include #include #include #include -#include #include #include #include #include -#include #include #include #include @@ -193,25 +189,25 @@ void DeckEditorDeckDockWidget::createDeckDock() &DeckEditorDeckDockWidget::applyActiveGroupCriteria); aIncrement = new QAction(QString(), this); - aIncrement->setIcon(themePixmap(QStringLiteral("icons/increment"))); + aIncrement->setIcon(QPixmap("theme:icons/increment")); connect(aIncrement, &QAction::triggered, this, &DeckEditorDeckDockWidget::actIncrementSelection); auto *tbIncrement = new QToolButton(this); tbIncrement->setDefaultAction(aIncrement); aDecrement = new QAction(QString(), this); - aDecrement->setIcon(themePixmap(QStringLiteral("icons/decrement"))); + aDecrement->setIcon(QPixmap("theme:icons/decrement")); connect(aDecrement, &QAction::triggered, this, &DeckEditorDeckDockWidget::actDecrementSelection); auto *tbDecrement = new QToolButton(this); tbDecrement->setDefaultAction(aDecrement); aRemoveCard = new QAction(QString(), this); - aRemoveCard->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); + aRemoveCard->setIcon(QPixmap("theme:icons/remove_row")); connect(aRemoveCard, &QAction::triggered, this, &DeckEditorDeckDockWidget::actRemoveCard); auto *tbRemoveCard = new QToolButton(this); tbRemoveCard->setDefaultAction(aRemoveCard); aSwapCard = new QAction(QString(), this); - aSwapCard->setIcon(themePixmap(QStringLiteral("icons/swap"))); + aSwapCard->setIcon(QPixmap("theme:icons/swap")); connect(aSwapCard, &QAction::triggered, this, &DeckEditorDeckDockWidget::actSwapSelection); auto *tbSwapCard = new QToolButton(this); tbSwapCard->setDefaultAction(aSwapCard); @@ -345,9 +341,7 @@ ExactCard DeckEditorDeckDockWidget::getCurrentCard() if (!current.isValid()) { return {}; } - // The display role holds the localized card name; the edit role always carries the - // canonical English name needed to look the card up in the database. - const QString cardName = current.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); + const QString cardName = current.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString(); const QString cardProviderID = current.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data().toString(); const QModelIndex gparent = current.parent().parent(); @@ -520,11 +514,8 @@ void DeckEditorDeckDockWidget::syncBannerCardComboBoxSelectionWithDeck() void DeckEditorDeckDockWidget::setSelectedIndex(const QModelIndex &newCardIndex, bool preserveWidgetFocus) { - const QModelIndex proxyIndex = proxy->mapFromSource(newCardIndex); - deckView->clearSelection(); - deckView->setCurrentIndex(proxyIndex); - deckView->scrollTo(proxyIndex); + deckView->setCurrentIndex(newCardIndex); recursiveExpand(newCardIndex); if (!preserveWidgetFocus) { @@ -781,213 +772,14 @@ void DeckEditorDeckDockWidget::offsetCountAtIndex(const QModelIndex &idx, bool i void DeckEditorDeckDockWidget::decklistCustomMenu(QPoint point) { - const QModelIndex sourceIndex = proxy->mapToSource(deckView->indexAt(point)); - QMenu menu; - const bool isCustomZoneRow = sourceIndex.isValid() && sourceIndex.data(DeckRoles::IsCustomZoneRole).toBool(); - const bool isBoardZoneRow = sourceIndex.isValid() && !isCustomZoneRow && !sourceIndex.parent().isValid(); - const bool isCardRow = - sourceIndex.isValid() && !isCustomZoneRow && !isBoardZoneRow && !getModel()->hasChildren(sourceIndex); - - // Walk the row up to its top-level node to find the hosting board. Cards in - // the tokens board cannot be moved (moveCardToZone bails for it), so the - // move menu is skipped for them. - QString currentBoardName; - QModelIndex board = sourceIndex.parent(); - while (board.isValid() && board.parent().isValid()) { - board = board.parent(); - } - if (board.isValid()) { - currentBoardName = board.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); - } - - if (isCardRow) { - if (currentBoardName != DECK_ZONE_TOKENS) { - addMoveToZoneMenu(&menu, sourceIndex, currentBoardName); - menu.addSeparator(); - } - } else if (isCustomZoneRow) { - const QString zoneName = - sourceIndex.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); - - QAction *renameAction = menu.addAction(tr("&Rename zone...")); - connect(renameAction, &QAction::triggered, this, [this, zoneName] { - // The unchanged name must not validate as a duplicate. - const QString newName = - DeckZoneDialog::promptForRename(this, zoneName, [this, zoneName](const QString &candidate) { - return candidate == zoneName ? QString() : deckStateManager->validateNewZoneName(candidate); - }); - if (!newName.isEmpty() && newName != zoneName) { - deckStateManager->renameCustomZone(zoneName, newName); - } - }); - - QMenu *boardMenu = menu.addMenu(tr("Change &board")); - addChangeBoardMenu(boardMenu, zoneName); - - QAction *deleteAction = menu.addAction(tr("&Delete zone")); - const bool zoneHasCards = getModel()->hasChildren(sourceIndex); - deleteAction->setEnabled(!zoneHasCards); - if (zoneHasCards) { - deleteAction->setToolTip(tr("Move or remove all cards first.")); - menu.setToolTipsVisible(true); - } - connect(deleteAction, &QAction::triggered, this, [this, zoneName] { - const auto result = - QMessageBox::warning(this, tr("Delete zone"), tr("Delete the zone \"%1\"?").arg(zoneName), - QMessageBox::Yes | QMessageBox::No, QMessageBox::No); - if (result == QMessageBox::Yes) { - deckStateManager->removeCustomZone(zoneName); - } - }); - menu.addSeparator(); - } else if (isBoardZoneRow) { - const QString boardName = - sourceIndex.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); - // Tokens cannot host custom zones, so only offer the action on real boards. - const bool canHostCustomZones = - boardName == DECK_ZONE_MAIN || boardName == DECK_ZONE_SIDE || boardName == DECK_ZONE_MAYBEBOARD; - if (canHostCustomZones) { - addNewZoneAction(&menu, boardName); - menu.addSeparator(); - } - } else if (!sourceIndex.isValid()) { - addNewZoneAction(&menu); - menu.addSeparator(); - } - QAction *selectPrinting = menu.addAction(tr("Select Printing")); connect(selectPrinting, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::showPrintingSelector); menu.exec(deckView->mapToGlobal(point)); } -void DeckEditorDeckDockWidget::addMoveToZoneMenu(QMenu *menu, - const QModelIndex &sourceCardIndex, - const QString ¤tBoardName) -{ - // The card's current *zone*, derived with the same ancestor walk as - // DeckStateManager::moveCardToZone (nearest custom-zone ancestor, else the - // top-level board/zone): a card inside "Removal" under the maindeck lives in - // "Removal", not "main". Comparing against that instead of the board keeps - // the enabled state and the same-zone no-op consistent with the move logic. - QString currentZoneName; - for (QModelIndex ancestor = sourceCardIndex.parent(); ancestor.isValid(); ancestor = ancestor.parent()) { - if (ancestor.data(DeckRoles::IsCustomZoneRole).toBool() || !ancestor.parent().isValid()) { - currentZoneName = ancestor.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); - break; - } - } - - const auto addMoveAction = [this, sourceCardIndex](QMenu *targetMenu, const QString &targetZoneName, - const QString &label, bool enabled) { - QAction *action = targetMenu->addAction(label); - action->setEnabled(enabled); - if (enabled) { - connect(action, &QAction::triggered, this, [this, sourceCardIndex, targetZoneName] { - deckStateManager->moveCardToZone(sourceCardIndex, targetZoneName); - }); - } - }; - - const auto tree = deckStateManager->getDeckListShared()->getTree(); - - QMenu *moveMenu = menu->addMenu(tr("Move to &zone")); - - for (const QString &boardName : InnerDecklistNode::boardZoneNames()) { - const QString boardLabel = InnerDecklistNode::visibleNameFromName(boardName); - const auto customZones = tree->getCustomZones(boardName); - - // Boards with zones nest their children so no two menu entries share a - // visible name: "Maindeck ▸ { Maindeck (whole board), Removal, … }". - // The board the card already lives on is marked instead of offered. - if (!customZones.isEmpty()) { - QMenu *boardSubmenu = moveMenu->addMenu(boardLabel); - addMoveAction(boardSubmenu, boardName, boardLabel, boardName != currentZoneName); - for (const auto *customZone : customZones) { - addMoveAction(boardSubmenu, customZone->getName(), customZone->getName(), - customZone->getName() != currentZoneName); - } - } else { - addMoveAction(moveMenu, boardName, boardLabel, boardName != currentZoneName); - } - } - - moveMenu->addSeparator(); - - QAction *newZoneAction = moveMenu->addAction(tr("Create new zone and move &here...")); - connect(newZoneAction, &QAction::triggered, this, [this, sourceCardIndex, currentBoardName, currentZoneName] { - // Resolve the card's identity before creating the zone: - // createNewCustomZone rebuilds the model tree, so sourceCardIndex's - // internal pointer is freed by the time it would be used. - const QString cardName = - sourceCardIndex.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); - const QString providerId = - sourceCardIndex.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::DisplayRole).toString(); - const QString collectorNumber = sourceCardIndex.siblingAtColumn(DeckListModelColumns::CARD_COLLECTOR_NUMBER) - .data(Qt::DisplayRole) - .toString(); - - const QString zoneName = createNewCustomZone(currentBoardName); - if (!zoneName.isEmpty()) { - // Re-find the card: the old index is no longer safe since rows were - // rebuilt. Mirror DeckStateManager::decrementCard's re-find pattern. - const QModelIndex refreshed = getModel()->findCard(cardName, currentZoneName, providerId, collectorNumber); - if (refreshed.isValid()) { - deckStateManager->moveCardToZone(refreshed, zoneName); - } - } - }); -} - -void DeckEditorDeckDockWidget::addChangeBoardMenu(QMenu *menu, const QString &zoneName) -{ - const auto tree = deckStateManager->getDeckListShared()->getTree(); - for (const QString &boardName : InnerDecklistNode::boardZoneNames()) { - QAction *action = menu->addAction(InnerDecklistNode::visibleNameFromName(boardName)); - - // The board currently holding the zone is marked instead of offered. - // Duplicate names cannot come up through the editor, so this doubles as - // the uniqueness guard for imported decks. - bool holdsTheZone = false; - for (const auto *customZone : tree->getCustomZones(boardName)) { - if (customZone->getName() == zoneName) { - holdsTheZone = true; - break; - } - } - if (holdsTheZone) { - action->setCheckable(true); - action->setChecked(true); - continue; - } - - connect(action, &QAction::triggered, this, - [this, zoneName, boardName] { deckStateManager->moveCustomZone(zoneName, boardName); }); - } -} - -void DeckEditorDeckDockWidget::addNewZoneAction(QMenu *menu, const QString &initialBoardName) -{ - QAction *newZoneAction = menu->addAction(tr("Create &new zone...")); - connect(newZoneAction, &QAction::triggered, this, - [this, initialBoardName] { createNewCustomZone(initialBoardName); }); -} - -QString DeckEditorDeckDockWidget::createNewCustomZone(const QString &initialBoardName) -{ - QString boardName; - const QString zoneName = - DeckZoneDialog::promptForNewZone(this, initialBoardName, &boardName, [this](const QString &candidate) { - return deckStateManager->validateNewZoneName(candidate); - }); - if (!zoneName.isEmpty()) { - deckStateManager->createCustomZone(boardName, zoneName); - } - return zoneName; -} - void DeckEditorDeckDockWidget::refreshShortcuts() { ShortcutsSettings &shortcuts = SettingsCache::instance().shortcuts(); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h index 1e5f4e677..9db01e2e5 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -19,7 +19,6 @@ #include #include #include -#include #include #include #include @@ -103,11 +102,6 @@ private: [[nodiscard]] QModelIndexList getSelectedCardNodeSourceIndices() const; void offsetCountAtIndex(const QModelIndex &idx, bool isIncrement); - void addMoveToZoneMenu(QMenu *menu, const QModelIndex &sourceCardIndex, const QString ¤tBoardName); - void addChangeBoardMenu(QMenu *menu, const QString &zoneName); - QString createNewCustomZone(const QString &initialBoardName = {}); - void addNewZoneAction(QMenu *menu, const QString &initialBoardName = {}); - private slots: void decklistCustomMenu(QPoint point); void updateCard(QModelIndex, const QModelIndex ¤t); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp index c6b6e4416..2d4fb60e8 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp @@ -4,7 +4,6 @@ #include "../../../client/settings/shortcuts_settings.h" #include "../../../filters/filter_builder.h" #include "../../../filters/filter_tree_model.h" -#include "../../pixel_map_generator.h" #include #include @@ -43,11 +42,11 @@ void DeckEditorFilterDockWidget::createFiltersDock() connect(filterBuilder, &FilterBuilder::add, filterModel, &FilterTreeModel::addFilter); aClearFilterOne = new QAction(QString(), this); - aClearFilterOne->setIcon(themePixmap(QStringLiteral("icons/decrement"))); + aClearFilterOne->setIcon(QPixmap("theme:icons/decrement")); connect(aClearFilterOne, &QAction::triggered, this, &DeckEditorFilterDockWidget::actClearFilterOne); aClearFilterAll = new QAction(QString(), this); - aClearFilterAll->setIcon(themePixmap(QStringLiteral("icons/clearsearch"))); + aClearFilterAll->setIcon(QPixmap("theme:icons/clearsearch")); connect(aClearFilterAll, &QAction::triggered, this, &DeckEditorFilterDockWidget::actClearFilterAll); auto *filterDelOne = new QToolButton(); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp index c93f12b34..cef459752 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_list_history_manager_widget.cpp @@ -1,6 +1,5 @@ #include "deck_list_history_manager_widget.h" -#include "../../pixel_map_generator.h" #include "deck_state_manager.h" DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_deckStateManager, @@ -11,7 +10,7 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_de layout = new QHBoxLayout(this); aUndo = new QAction(QString(), this); - aUndo->setIcon(themePixmap(QStringLiteral("icons/arrow_undo"))); + aUndo->setIcon(QPixmap("theme:icons/arrow_undo")); aUndo->setShortcut(QKeySequence::Undo); aUndo->setShortcutContext(Qt::ApplicationShortcut); connect(aUndo, &QAction::triggered, this, &DeckListHistoryManagerWidget::doUndo); @@ -20,7 +19,7 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_de undoButton->setDefaultAction(aUndo); aRedo = new QAction(QString(), this); - aRedo->setIcon(themePixmap(QStringLiteral("icons/arrow_redo"))); + aRedo->setIcon(QPixmap("theme:icons/arrow_redo")); aRedo->setShortcut(QKeySequence::Redo); aRedo->setShortcutContext(Qt::ApplicationShortcut); connect(aRedo, &QAction::triggered, this, &DeckListHistoryManagerWidget::doRedo); @@ -32,7 +31,7 @@ DeckListHistoryManagerWidget::DeckListHistoryManagerWidget(DeckStateManager *_de layout->addWidget(redoButton); historyButton = new SettingsButtonWidget(this); - historyButton->setButtonIcon(themePixmap(QStringLiteral("icons/arrow_history"))); + historyButton->setButtonIcon(QPixmap("theme:icons/arrow_history")); historyLabel = new QLabel(this); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp index cfe989e9f..eda741728 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.cpp @@ -1,20 +1,12 @@ #include "deck_state_manager.h" -#include "../../../client/settings/cache_settings.h" - #include #include -#include -#include DeckStateManager::DeckStateManager(QObject *parent) : QObject(parent), deckList(QSharedPointer(new DeckList)), deckListModel(new DeckListModel(this, deckList)), historyManager(new DeckListHistoryManager(this)) { - deckListModel->setDisplayLanguage(SettingsCache::instance().cardsDisplay().getCardLang()); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, deckListModel, - [this](const QString &lang) { deckListModel->setDisplayLanguage(lang); }); - connect(historyManager, &DeckListHistoryManager::undoRedoStateChanged, this, [this] { setModified(true); emit historyChanged(); @@ -267,10 +259,7 @@ bool DeckStateManager::swapCardAtIndex(const QModelIndex &idx) return false; } - // The display role holds the localized card name; the edit role always carries the - // canonical English name needed to look the card up in the database. - QString displayCardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString(); - QString cardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); + QString cardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString(); QString providerId = idx.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data().toString(); QModelIndex gparent = idx.parent().parent(); @@ -287,7 +276,7 @@ bool DeckStateManager::swapCardAtIndex(const QModelIndex &idx) QString reason = tr("Moved to %1 1 × \"%2\" (%3)") // .arg(otherZoneName) - .arg(displayCardName) + .arg(cardName) .arg(providerId); return modifyDeck(reason, [&idx, &cardName, &providerId, &otherZoneName](auto model) { @@ -301,8 +290,9 @@ bool DeckStateManager::removeCardAtIndex(const QModelIndex &idx) return false; } - QString reason = - tr("Removed \"%1\" (all copies)").arg(idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString()); + QString cardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data().toString(); + + QString reason = tr("Removed \"%1\" (all copies)").arg(cardName); return modifyDeck(reason, [&idx](auto model) { return model->removeRow(idx.row(), idx.parent()); }); } @@ -317,170 +307,6 @@ bool DeckStateManager::decrementCountAtIndex(const QModelIndex &idx) return offsetCountAtIndex(idx, -1); } -bool DeckStateManager::moveCardToZone(const QModelIndex &idx, const QString &targetZoneName) -{ - if (!idx.isValid()) { - return false; - } - - // Only actual card rows can be moved. Group or zone rows report an - // aggregate amount and must never be deleted by this operation. - if (!idx.data(DeckRoles::IsCardRole).toBool()) { - return false; - } - - QString cardName = idx.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); - QString providerId = idx.siblingAtColumn(DeckListModelColumns::CARD_PROVIDER_ID).data(Qt::DisplayRole).toString(); - int copies = idx.siblingAtColumn(DeckListModelColumns::CARD_AMOUNT).data(Qt::EditRole).toInt(); - - if (copies <= 0) { - return false; - } - - // Tokens only live in the tokens zone and cannot be moved into decks. - CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(cardName); - if (info && info->getIsToken()) { - return false; - } - - // Determine the zone the card currently lives in: the enclosing custom - // zone, or the nearest top-level zone (board zone or legacy zone). - QString currentZoneName; - for (QModelIndex ancestor = idx.parent(); ancestor.isValid(); ancestor = ancestor.parent()) { - bool isCustomZone = ancestor.data(DeckRoles::IsCustomZoneRole).toBool(); - if (isCustomZone || !ancestor.parent().isValid()) { - currentZoneName = ancestor.siblingAtColumn(DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); - break; - } - } - - if (currentZoneName == targetZoneName) { - return false; - } - - QString reason = tr("Moved %1 × \"%2\" (%3) to %4") - .arg(copies) - .arg(cardName) - .arg(providerId) - .arg(InnerDecklistNode::visibleNameFromName(targetZoneName)); - - return modifyDeck(reason, [&idx, &cardName, &providerId, &targetZoneName, copies](auto model) { - if (!model->removeRow(idx.row(), idx.parent())) { - return false; - } - - if (ExactCard card = CardDatabaseManager::query()->getCard({cardName, providerId})) { - for (int i = 0; i < copies; ++i) { - model->addCard(card, targetZoneName); - } - } else { - for (int i = 0; i < copies; ++i) { - model->addPreferredPrintingCard(cardName, targetZoneName, true); - } - } - - return true; - }); -} - -bool DeckStateManager::createCustomZone(const QString &boardZoneName, const QString &zoneName) -{ - const QString trimmedZoneName = zoneName.trimmed(); - if (trimmedZoneName.isEmpty()) { - return false; - } - - QString reason = - tr("Created zone \"%1\" in %2").arg(trimmedZoneName, InnerDecklistNode::visibleNameFromName(boardZoneName)); - - return modifyTree(reason, [&boardZoneName, &trimmedZoneName](DecklistNodeTree *tree) { - return tree->addCustomZone(boardZoneName, trimmedZoneName) != nullptr; - }); -} - -bool DeckStateManager::renameCustomZone(const QString &oldZoneName, const QString &newZoneName) -{ - const QString trimmedNewZoneName = newZoneName.trimmed(); - if (trimmedNewZoneName.isEmpty() || oldZoneName == trimmedNewZoneName) { - return false; - } - - QString reason = tr("Renamed zone \"%1\" to \"%2\"").arg(oldZoneName, trimmedNewZoneName); - - return modifyTree(reason, [&oldZoneName, &trimmedNewZoneName](DecklistNodeTree *tree) { - return tree->renameCustomZone(oldZoneName, trimmedNewZoneName); - }); -} - -bool DeckStateManager::moveCustomZone(const QString &zoneName, const QString &newBoardZoneName) -{ - const auto *tree = deckList->getTree(); - - // Locate the zone through the tree's own lookup, which walks every top-level - // zone (not just the standard boards) and covers the same-board no-op below. - const auto *zone = tree->findCustomZoneByName(zoneName); - if (!zone) { - return false; - } - - // Same-board moves are no-ops and must not pollute the history. - const QString currentBoardName = zone->getParent() ? zone->getParent()->getName() : QString(); - if (currentBoardName == newBoardZoneName) { - return true; - } - - // Zone names are deck-unique among zones created through this manager, so a - // same-named zone on the target board can only come from an imported deck. - // Refuse the move instead of silently stacking same-named zones. - for (const auto *targetZone : tree->getCustomZones(newBoardZoneName)) { - if (targetZone->getName() == zoneName) { - return false; - } - } - - QString reason = - tr("Moved zone \"%1\" to %2").arg(zoneName, InnerDecklistNode::visibleNameFromName(newBoardZoneName)); - - return modifyTree(reason, [&zoneName, &newBoardZoneName](DecklistNodeTree *tree) { - return tree->moveCustomZone(zoneName, newBoardZoneName); - }); -} - -bool DeckStateManager::removeCustomZone(const QString &zoneName) -{ - QString reason = tr("Deleted zone \"%1\"").arg(zoneName); - - return modifyTree(reason, [&zoneName](DecklistNodeTree *tree) { return tree->removeCustomZone(zoneName); }); -} - -QString DeckStateManager::validateNewZoneName(const QString &zoneName) const -{ - if (zoneName.trimmed().isEmpty()) { - return tr("Enter a zone name."); - } - - const QString trimmedZoneName = zoneName.trimmed(); - - // The standard zone names are reserved even before they exist. - if (trimmedZoneName == DECK_ZONE_MAIN || trimmedZoneName == DECK_ZONE_SIDE || - trimmedZoneName == DECK_ZONE_MAYBEBOARD || trimmedZoneName == DECK_ZONE_TOKENS) { - return tr("This name is reserved."); - } - - const auto *tree = deckList->getTree(); - - // Reuse the tree's own uniqueness contract: any top-level zone and any - // custom zone on *every* board claims the name (hasZoneName also reserves - // the standard board names, which we already rejected with a dedicated - // message above). Scanning only the standard boards here would miss a - // custom zone an imported deck carries under `tokens`. - if (tree->hasZoneName(trimmedZoneName)) { - return tr("A zone with this name already exists."); - } - - return {}; -} - bool DeckStateManager::offsetCountAtIndex(const QModelIndex &idx, int offset) { if (!idx.isValid()) { @@ -541,25 +367,6 @@ void DeckStateManager::requestHistorySave(const QString &reason) historyManager->save(deckList->createMemento(reason)); } -bool DeckStateManager::modifyTree(const QString &reason, const std::function &operation) -{ - DeckListMemento memento = deckList->createMemento(reason); - bool success = operation(deckList->getTree()); - - if (success) { - historyManager->save(memento); - deckListModel->rebuildTree(); - deckList->refreshDeckHash(); - emit deckListModel->deckHashChanged(); - // removeCustomZone can drop whole card sets the model never notified - // about (rebuildTree emits no cardNodesChanged), so tell the consumers. - emit deckListModel->cardNodesChanged(); - doCardModified(); - } - - return success; -} - /** * @brief Handles updating state and emitting signals whenever the cards are modified */ diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h index 2c8b34a39..b9c99903e 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h @@ -5,7 +5,6 @@ #include "deck_list_model.h" #include -#include #include class DeckListHistoryManager; @@ -237,68 +236,6 @@ public: */ bool decrementCountAtIndex(const QModelIndex &idx); - /** - * @brief Moves all copies of the card at the given index to the given zone. - * No-ops if the index is invalid, not a card node, the card is a token, or the - * card is already in the target zone. - * Saves the operation to history if successful. - * - * @param idx The model index of the card to move - * @param targetZoneName The zone to move the card to (board zone or custom zone name) - * @return Whether the operation was successfully performed - */ - bool moveCardToZone(const QModelIndex &idx, const QString &targetZoneName); - - /** - * @brief Creates a new custom zone nested under a board zone. - * Saves the operation to history if successful. - * - * @param boardZoneName The board zone to nest the custom zone under - * @param zoneName The name of the new custom zone. Gets trimmed and must be - * unique across the deck. - * @return Whether the zone was created - */ - bool createCustomZone(const QString &boardZoneName, const QString &zoneName); - - /** - * @brief Renames a custom zone. - * Saves the operation to history if successful. - * - * @param oldZoneName The current name of the custom zone - * @param newZoneName The new name. Gets trimmed and must be unique across the deck. - * @return Whether the rename succeeded - */ - bool renameCustomZone(const QString &oldZoneName, const QString &newZoneName); - - /** - * @brief Moves a custom zone (and its cards) to a different board zone. - * Same-board moves succeed without creating a history entry. - * Saves the operation to history if successful. - * - * @param zoneName The custom zone to move - * @param newBoardZoneName The board zone to move the custom zone under - * @return Whether the move succeeded - */ - bool moveCustomZone(const QString &zoneName, const QString &newBoardZoneName); - - /** - * @brief Removes a custom zone and all its cards. - * Saves the operation to history if successful. - * - * @param zoneName The custom zone to remove - * @return Whether the zone was removed - */ - bool removeCustomZone(const QString &zoneName); - - /** - * @brief Checks whether a candidate name is usable for a new custom zone. - * - * @param zoneName The candidate name - * @return An empty string when the name is usable, otherwise a user-facing - * error message describing the problem - */ - [[nodiscard]] QString validateNewZoneName(const QString &zoneName) const; - /** * Undoes n steps of the history, setting the decklist state and updating the current step in the historyManager. * @param steps Number of steps to undo. @@ -320,7 +257,6 @@ public slots: private: bool offsetCountAtIndex(const QModelIndex &idx, int offset); - bool modifyTree(const QString &reason, const std::function &operation); void doCardModified(); void doMetadataModified(); diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp deleted file mode 100644 index 9a0be2570..000000000 --- a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.cpp +++ /dev/null @@ -1,145 +0,0 @@ -#include "deck_zone_dialog.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -DeckZoneDialog::DeckZoneDialog(QWidget *parent, - const QString &initialBoardName, - const std::function &_nameValidator, - bool _allowBoardSelection) - : QDialog(parent), nameValidator(_nameValidator), allowBoardSelection(_allowBoardSelection) -{ - nameLabel = new QLabel(this); - nameEdit = new QLineEdit(this); - nameEdit->setMaxLength(MAX_NAME_LENGTH); - - errorLabel = new QLabel(this); - errorLabel->hide(); - - boardLabel = new QLabel(this); - boardCombo = new QComboBox(this); - for (const QString &boardName : InnerDecklistNode::boardZoneNames()) { - // Use the icon overload explicitly so `boardName` lands in the user data role - // (visible text is applied below in retranslateUi). The two-argument form - // addItem({}, boardName) would be ambiguous and resolve to the icon overload - // with empty user data, yielding empty entries and an empty getBoardName(). - boardCombo->addItem({}, {}, boardName); - } - if (!initialBoardName.isEmpty()) { - int idx = boardCombo->findData(initialBoardName); - if (idx != -1) { - boardCombo->setCurrentIndex(idx); - } - } - - buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); - buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); - connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); - connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); - - auto *layout = new QVBoxLayout(this); - layout->addWidget(nameLabel); - layout->addWidget(nameEdit); - layout->addWidget(errorLabel); - if (allowBoardSelection) { - layout->addWidget(boardLabel); - layout->addWidget(boardCombo); - } else { - boardLabel->hide(); - boardCombo->hide(); - } - layout->addWidget(buttonBox); - - retranslateUi(); - - connect(nameEdit, &QLineEdit::textChanged, this, [this] { validateName(); }); - validateName(); - - nameEdit->setFocus(); -} - -QString DeckZoneDialog::getZoneName() const -{ - return nameEdit->text().trimmed(); -} - -QString DeckZoneDialog::getBoardName() const -{ - return boardCombo->currentData().toString(); -} - -void DeckZoneDialog::setZoneName(const QString &zoneName) -{ - nameEdit->setText(zoneName); - nameEdit->selectAll(); -} - -void DeckZoneDialog::changeEvent(QEvent *event) -{ - QDialog::changeEvent(event); - - if (event->type() == QEvent::LanguageChange) { - retranslateUi(); - } -} - -void DeckZoneDialog::retranslateUi() -{ - setWindowTitle(allowBoardSelection ? tr("New zone") : tr("Rename zone")); - - nameLabel->setText(tr("Zone &name:")); - nameLabel->setBuddy(nameEdit); - - boardLabel->setText(tr("&Parent zone:")); - boardLabel->setBuddy(boardCombo); - - for (int i = 0; i < boardCombo->count(); i++) { - boardCombo->setItemText(i, InnerDecklistNode::visibleNameFromName(boardCombo->itemData(i).toString())); - } -} - -void DeckZoneDialog::validateName() -{ - const QString zoneName = nameEdit->text().trimmed(); - QString error; - if (zoneName.isEmpty()) { - error = tr("Enter a zone name."); - } else if (nameValidator) { - error = nameValidator(zoneName); - } - - errorLabel->setText(error); - errorLabel->setVisible(!error.isEmpty()); - buttonBox->button(QDialogButtonBox::Ok)->setEnabled(error.isEmpty()); -} - -QString DeckZoneDialog::promptForNewZone(QWidget *parent, - const QString &initialBoardName, - QString *chosenBoardName, - const std::function &nameValidator) -{ - DeckZoneDialog dialog(parent, initialBoardName, nameValidator); - if (dialog.exec() != QDialog::Accepted) { - return {}; - } - - if (chosenBoardName) { - *chosenBoardName = dialog.getBoardName(); - } - return dialog.getZoneName(); -} - -QString DeckZoneDialog::promptForRename(QWidget *parent, - const QString ¤tZoneName, - const std::function &nameValidator) -{ - DeckZoneDialog dialog(parent, {}, nameValidator, false); - dialog.setZoneName(currentZoneName); - return dialog.exec() == QDialog::Accepted ? dialog.getZoneName() : QString(); -} diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h b/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h deleted file mode 100644 index 6f55617a8..000000000 --- a/cockatrice/src/interface/widgets/deck_editor/deck_zone_dialog.h +++ /dev/null @@ -1,123 +0,0 @@ -/** - * @file deck_zone_dialog.h - * @ingroup DeckEditorWidgets - * @brief Shared dialog for creating custom deck zones. - */ - -#ifndef DECK_ZONE_DIALOG_H -#define DECK_ZONE_DIALOG_H - -#include -#include -#include -#include - -class QComboBox; -class QDialogButtonBox; -class QLabel; -class QLineEdit; -class QWidget; - -/** - * @brief Modal dialog asking for the name and parent zone of a new custom deck zone. - * - * Menus construct the dialog transiently around exec(), so validation state only - * ever reflects the name currently typed. - */ -class DeckZoneDialog : public QDialog -{ - Q_OBJECT - -public: - /** - * @brief Constructs the dialog and runs the initial validation pass. - * - * @param parent The parent widget for the dialog - * @param initialBoardName The board zone to preselect in the combo. Unknown names - * fall back to main. - * @param _nameValidator Given the trimmed candidate name, returns an empty string - * when it is usable, otherwise a user-facing error message. May be empty. - * @param _allowBoardSelection When false the parent-zone combo is hidden and the - * dialog acts as a rename prompt for an existing zone. - */ - explicit DeckZoneDialog(QWidget *parent = nullptr, - const QString &initialBoardName = {}, - const std::function &_nameValidator = {}, - bool _allowBoardSelection = true); - - /** - * @brief The trimmed zone name entered by the user. - */ - [[nodiscard]] QString getZoneName() const; - - /** - * @brief The internal name of the board zone selected in the combo. - */ - [[nodiscard]] QString getBoardName() const; - - /** - * @brief Prefills the name field, e.g. with the current name when renaming. - * - * @param zoneName The text to put into the name field, selected for quick editing - */ - void setZoneName(const QString &zoneName); - - /** - * @brief Prompts the user for a new custom zone name and the board zone to nest it under. - * - * Convenience wrapper that runs DeckZoneDialog modally. - * - * @param parent The parent widget for the dialog - * @param initialBoardName The board zone to preselect in the dialog. Unknown names fall - * back to main. - * @param chosenBoardName (out) The internal name of the board zone the user chose - * @param nameValidator Optional validator forwarded to the dialog - * @return The trimmed zone name, or an empty string if the user cancelled - */ - static QString promptForNewZone(QWidget *parent, - const QString &initialBoardName, - QString *chosenBoardName, - const std::function &nameValidator = {}); - - /** - * @brief Prompts the user for a new name for an existing custom zone. - * - * Same inline validation as promptForNewZone, but without a parent-zone picker. - * - * @param parent The parent widget for the dialog - * @param currentZoneName The current name, prefilled for editing - * @param nameValidator Validator deciding whether a candidate name is usable. It sees - * the current name too, so callers wanting to allow unchanged names must - * special-case that themselves. - * @return The trimmed new name, or an empty string if the user cancelled - */ - static QString promptForRename(QWidget *parent, - const QString ¤tZoneName, - const std::function &nameValidator = {}); - -protected: - void changeEvent(QEvent *event) override; - -private: - /** - * @brief Sets every user-visible string. Runs on construction and on runtime - * language changes. - */ - void retranslateUi(); - - /** - * @brief Validates the current input, toggling Ok and the inline error label. - */ - void validateName(); - - QLabel *nameLabel; - QLineEdit *nameEdit; - QLabel *errorLabel; - QLabel *boardLabel; - QComboBox *boardCombo; - QDialogButtonBox *buttonBox; - std::function nameValidator; - bool allowBoardSelection; -}; - -#endif // DECK_ZONE_DIALOG_H diff --git a/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp b/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp deleted file mode 100644 index 4343f0aab..000000000 --- a/cockatrice/src/interface/widgets/deck_share/deck_share_utils.cpp +++ /dev/null @@ -1,59 +0,0 @@ -#include "deck_share_utils.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace DeckShareUtils -{ - -QString buildShareLink(const AbstractClient *client, const QString &token) -{ - QUrl url; - url.setScheme(QStringLiteral("cockatrice")); - url.setHost(QStringLiteral("opendeck")); - - QUrlQuery query; - query.addQueryItem(QStringLiteral("share"), token); - query.addQueryItem(QStringLiteral("hostname"), client->serverName()); - query.addQueryItem(QStringLiteral("port"), QString::number(client->serverPort())); - url.setQuery(query); - - return url.toString(QUrl::FullyEncoded); -} - -QString copyShareLinkToClipboard(const QString &link) -{ - QGuiApplication::clipboard()->setText(link); - return link; -} - -QString formatShareExpiry(const QDateTime &expiry) -{ - return QLocale().toString(expiry.toLocalTime(), QLocale::ShortFormat); -} - -ShareResponse handleShareResponse(const AbstractClient *client, const Response &response) -{ - const Response_DeckShareCreate &resp = response.GetExtension(Response_DeckShareCreate::ext); - const QString token = QString::fromStdString(resp.token()); - - const QString link = buildShareLink(client, token); - copyShareLinkToClipboard(link); - -#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) - const QDateTime expiry = QDateTime::fromSecsSinceEpoch(resp.expires_at(), QTimeZone::UTC); -#else - const QDateTime expiry = QDateTime::fromSecsSinceEpoch(resp.expires_at(), Qt::UTC); -#endif - - return {link, expiry}; -} - -} // namespace DeckShareUtils diff --git a/cockatrice/src/interface/widgets/deck_share/deck_share_utils.h b/cockatrice/src/interface/widgets/deck_share/deck_share_utils.h deleted file mode 100644 index c9f7afa8b..000000000 --- a/cockatrice/src/interface/widgets/deck_share/deck_share_utils.h +++ /dev/null @@ -1,59 +0,0 @@ -/** - * @file deck_share_utils.h - * @ingroup DeckShareWidgets - */ -//! \todo Document this file. - -#ifndef DECK_SHARE_UTILS_H -#define DECK_SHARE_UTILS_H - -#include -#include - -class AbstractClient; -class Response; - -/** - * @brief Shared helpers for creating temporary deck shares. - */ -namespace DeckShareUtils -{ - -/** - * @brief The outcome of a successful share-create response. - */ -struct ShareResponse -{ - QString link; ///< The share link that was copied to the clipboard. - QDateTime expiry; ///< When the share expires (UTC). -}; - -/** - * @brief Builds the cockatrice:// link for a freshly created deck share. - * @param client Used to embed the target server's hostname and port. - * @param token The share token from Response_DeckShareCreate. - */ -QString buildShareLink(const AbstractClient *client, const QString &token); - -/** - * @brief Copies the share link to the clipboard. - * @return The link that was copied. - */ -QString copyShareLinkToClipboard(const QString &link); - -/** - * @brief Formats the expiration timestamp for a share. - */ -QString formatShareExpiry(const QDateTime &expiry); - -/** - * @brief Handles a successful Response_DeckShareCreate: builds the share link, - * copies it to the clipboard, and derives the share expiry. - * @param client Used to embed the target server's hostname and port. - * @param response The successful response carrying the share token and expiry. - */ -ShareResponse handleShareResponse(const AbstractClient *client, const Response &response); - -} // namespace DeckShareUtils - -#endif // DECK_SHARE_UTILS_H diff --git a/cockatrice/src/interface/widgets/deck_share/share_bar_widget.cpp b/cockatrice/src/interface/widgets/deck_share/share_bar_widget.cpp deleted file mode 100644 index 5aca343ca..000000000 --- a/cockatrice/src/interface/widgets/deck_share/share_bar_widget.cpp +++ /dev/null @@ -1,77 +0,0 @@ -#include "share_bar_widget.h" - -#include -#include -#include -#include - -ShareBarWidget::ShareBarWidget(QWidget *parent) : QWidget(parent) -{ - auto *layout = new QHBoxLayout(this); - layout->setContentsMargins(12, 10, 12, 10); - layout->setSpacing(8); - - hintLabel = new QLabel(this); - hintLabel->setWordWrap(true); - - nameEdit = new QLineEdit(this); - nameEdit->setMaximumWidth(260); - - countLabel = new QLabel(this); - - cancelButton = new QPushButton(this); - connect(cancelButton, &QPushButton::clicked, this, &ShareBarWidget::cancelRequested); - - createButton = new QPushButton(this); - createButton->setDefault(true); - connect(createButton, &QPushButton::clicked, this, &ShareBarWidget::createRequested); - - layout->addWidget(hintLabel, 1); - layout->addWidget(nameEdit); - layout->addWidget(countLabel); - layout->addStretch(); - layout->addWidget(cancelButton); - layout->addWidget(createButton); - - setLayout(layout); - - retranslateUi(); -} - -void ShareBarWidget::retranslateUi() -{ - nameEdit->setPlaceholderText(tr("Share name")); - cancelButton->setText(tr("Cancel")); - createButton->setText(tr("Create share link")); -} - -QString ShareBarWidget::name() const -{ - return nameEdit->text().trimmed(); -} - -void ShareBarWidget::setName(const QString &value) -{ - nameEdit->setText(value); -} - -void ShareBarWidget::setCountText(const QString &text) -{ - countLabel->setText(text); -} - -void ShareBarWidget::setHintText(const QString &text, bool visible) -{ - hintLabel->setText(text); - hintLabel->setVisible(visible); -} - -void ShareBarWidget::setCreateEnabled(bool enabled) -{ - createButton->setEnabled(enabled); -} - -void ShareBarWidget::focusName() -{ - nameEdit->setFocus(); -} diff --git a/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h b/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h deleted file mode 100644 index ede9fb41b..000000000 --- a/cockatrice/src/interface/widgets/deck_share/share_bar_widget.h +++ /dev/null @@ -1,63 +0,0 @@ -/** - * @file share_bar_widget.h - * @ingroup DeckShareWidgets - */ -//! \todo Document this file. - -#ifndef SHARE_BAR_WIDGET_H -#define SHARE_BAR_WIDGET_H - -#include - -class QLabel; -class QLineEdit; -class QPushButton; - -/** - * @brief The activated toolbar used to create a temporary deck share. - * - * A single reusable component shared by the local visual deck storage and the - * remote server deck storage tabs, so the share workflow renders identically in - * both places. It owns its own widgets, strings, and layout; the owning tab only - * sets the count/hint text and reacts to the create/cancel signals. - */ -class ShareBarWidget final : public QWidget -{ - Q_OBJECT - -public: - explicit ShareBarWidget(QWidget *parent = nullptr); - - void retranslateUi(); - - /** @return The trimmed name entered by the user. */ - [[nodiscard]] QString name() const; - - /** @brief Resets the name field to the given default. */ - void setName(const QString &name); - - /** @brief Sets the selected-count summary label text. */ - void setCountText(const QString &text); - - /** @brief Sets the explainer hint text, showing it when @p visible is true. */ - void setHintText(const QString &text, bool visible); - - /** @brief Enables or disables the create-share-link button (guards double submission). */ - void setCreateEnabled(bool enabled); - - /** @brief Moves keyboard focus to the name field. */ - void focusName(); - -signals: - void createRequested(); - void cancelRequested(); - -private: - QLabel *hintLabel; - QLineEdit *nameEdit; - QLabel *countLabel; - QPushButton *cancelButton; - QPushButton *createButton; -}; - -#endif // SHARE_BAR_WIDGET_H diff --git a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp deleted file mode 100644 index 21ec80e08..000000000 --- a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.cpp +++ /dev/null @@ -1,140 +0,0 @@ -#include "shared_deck_preview_widget.h" - -#include "../cards/additional_info/color_identity_widget.h" -#include "../cards/deck_preview_card_picture_widget.h" - -#include -#include -#include -#include -#include -#include -#include - -SharedDeckPreviewWidget::SharedDeckPreviewWidget(QWidget *parent, - const CardDatabaseQuerier *querier, - const QString &deckName, - const QString &bannerCardName, - const QString &colorIdentity, - const QString &gameFormat, - const QString &deckToolTip) - : QWidget(parent) -{ - bannerCardDisplayWidget = - new DeckPreviewCardPictureWidget(this, false, false, Qt::white, Qt::black, 12, Qt::AlignCenter, true); - bannerCardDisplayWidget->setScaleFactor(100); - const ExactCard bannerCard = bannerCardName.isEmpty() ? ExactCard() : querier->getCard(CardRef{bannerCardName, {}}); - bannerCardDisplayWidget->setCard(bannerCard); - bannerCardDisplayWidget->setOverlayText(deckName); - setToolTip(deckToolTip.isEmpty() ? deckName : deckToolTip); - setFocusPolicy(Qt::StrongFocus); - setBaseAccessibleName(deckName); - - colorIdentityWidget = new ColorIdentityWidget(this, colorIdentity); - colorIdentityWidget->setVisible(!colorIdentity.isEmpty()); - - // gameFormat is server-supplied and the QLabel renders AutoText, so escape it. - gameFormatLabel = new QLabel(gameFormat.toHtmlEscaped(), this); - gameFormatLabel->setAlignment(Qt::AlignCenter); - gameFormatLabel->setVisible(!gameFormat.isEmpty()); - - selectionCheckBox = new QCheckBox(this); - selectionCheckBox->setToolTip(tr("Select this deck")); - // The tile itself is focusable (Space/Enter toggles); keep the checkbox - // from creating a second tab stop per tile. - selectionCheckBox->setFocusPolicy(Qt::NoFocus); - - // Selection frame reused from the deck-preview selection covenant: a - // palette(highlight) border around the banner card, shown while selected. - selectionFrame = new QFrame(bannerCardDisplayWidget); - selectionFrame->setAttribute(Qt::WA_TransparentForMouseEvents); - selectionFrame->setStyleSheet(QStringLiteral( - "QFrame { border: 2px solid palette(highlight); border-radius: 4px; background: transparent; }")); - selectionFrame->setVisible(false); - - auto *selectionRow = new QHBoxLayout; - selectionRow->addWidget(selectionCheckBox); - selectionRow->addStretch(1); - - auto *layout = new QVBoxLayout(this); - layout->setContentsMargins(0, 0, 0, 0); - layout->addLayout(selectionRow); - layout->addWidget(bannerCardDisplayWidget, 0, Qt::AlignHCenter); - layout->addWidget(colorIdentityWidget, 0, Qt::AlignHCenter); - layout->addWidget(gameFormatLabel, 0, Qt::AlignHCenter); - setLayout(layout); - - connect(selectionCheckBox, &QCheckBox::toggled, this, [this](bool checked) { - updateSelectionVisual(checked); - emit selectionToggled(checked); - }); - connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageClicked, this, - &SharedDeckPreviewWidget::toggleSelection); - connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this, - &SharedDeckPreviewWidget::activate); -} - -bool SharedDeckPreviewWidget::isSelected() const -{ - return selectionCheckBox->isChecked(); -} - -void SharedDeckPreviewWidget::setSelected(bool selected) -{ - if (isSelected() == selected) { - return; - } - selectionCheckBox->setChecked(selected); -} - -void SharedDeckPreviewWidget::updateSelectionVisual(bool selected) -{ - selectionFrame->setVisible(selected); - selectionFrame->raise(); - if (selected) { - setAccessibleName(baseAccessibleName + tr(" (selected)")); - } else { - setAccessibleName(baseAccessibleName); - } -} - -void SharedDeckPreviewWidget::setBaseAccessibleName(const QString &name) -{ - baseAccessibleName = name; - setAccessibleName(name); -} - -void SharedDeckPreviewWidget::toggleSelection() -{ - setSelected(!isSelected()); -} - -void SharedDeckPreviewWidget::activate() -{ - setSelected(true); - emit activated(); -} - -void SharedDeckPreviewWidget::resizeEvent(QResizeEvent *event) -{ - QWidget::resizeEvent(event); - updateSelectionFrameGeometry(); -} - -void SharedDeckPreviewWidget::updateSelectionFrameGeometry() -{ - if (selectionFrame == nullptr || bannerCardDisplayWidget == nullptr) { - return; - } - selectionFrame->setGeometry(bannerCardDisplayWidget->rect().adjusted(1, 1, -1, -1)); -} - -void SharedDeckPreviewWidget::keyPressEvent(QKeyEvent *event) -{ - if (event->key() == Qt::Key_Space || event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) { - toggleSelection(); - event->accept(); - return; - } - QWidget::keyPressEvent(event); -} diff --git a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h b/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h deleted file mode 100644 index bd4c4ee5f..000000000 --- a/cockatrice/src/interface/widgets/deck_share/shared_deck_preview_widget.h +++ /dev/null @@ -1,77 +0,0 @@ -/** - * @file shared_deck_preview_widget.h - * @ingroup DeckShareWidgets - */ -//! \todo Document this file. - -#ifndef SHARED_DECK_PREVIEW_WIDGET_H -#define SHARED_DECK_PREVIEW_WIDGET_H - -#include - -class ColorIdentityWidget; -class DeckPreviewCardPictureWidget; -class QCheckBox; -class QFrame; -class QKeyEvent; -class QLabel; -class QResizeEvent; -class CardDatabaseQuerier; - -/** - * @brief A selectable preview tile for a deck that has no local file. - * - * Renders a banner card picture (looked up by name in the card database), the - * deck name, color identity and game format. Used to preview decks shared via a - * cockatrice:// link (metadata from Command_DeckShareList) and the deck - * currently open in the deck editor. - * - * Selection follows the deck-preview covenant: the tile reports its click - * immediately (no double-click interval delay), a palette(highlight) frame - * marks the selected tile, and Space/Enter toggles selection from the keyboard. - * A double click selects the tile and emits activated() so the caller can open - * just that deck. - */ -class SharedDeckPreviewWidget : public QWidget -{ - Q_OBJECT - -public: - explicit SharedDeckPreviewWidget(QWidget *parent, - const CardDatabaseQuerier *querier, - const QString &deckName, - const QString &bannerCardName, - const QString &colorIdentity, - const QString &gameFormat = QString(), - const QString &deckToolTip = QString()); - - [[nodiscard]] bool isSelected() const; - void setSelected(bool selected); - - void setBaseAccessibleName(const QString &name); - -signals: - void selectionToggled(bool selected); - void activated(); - -protected: - void resizeEvent(QResizeEvent *event) override; - void keyPressEvent(QKeyEvent *event) override; - -private slots: - void toggleSelection(); - void activate(); - -private: - void updateSelectionVisual(bool selected); - void updateSelectionFrameGeometry(); - - DeckPreviewCardPictureWidget *bannerCardDisplayWidget; - ColorIdentityWidget *colorIdentityWidget; - QLabel *gameFormatLabel; - QCheckBox *selectionCheckBox; - QFrame *selectionFrame; - QString baseAccessibleName; -}; - -#endif // SHARED_DECK_PREVIEW_WIDGET_H \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp index 700012d45..aa8a916f8 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp @@ -1,7 +1,6 @@ #include "dlg_connect.h" #include "../../../client/settings/cache_settings.h" -#include "../../pixel_map_generator.h" #include #include @@ -22,7 +21,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent) previousHosts = new QComboBox(this); btnDeleteServer = new QPushButton(this); - btnDeleteServer->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); + btnDeleteServer->setIcon(QPixmap("theme:icons/remove_row")); btnDeleteServer->setToolTip(tr("Delete the currently selected saved server")); btnDeleteServer->setFixedWidth(30); @@ -30,7 +29,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent) hps = new HandlePublicServers(this); btnRefreshServers = new QPushButton(this); - btnRefreshServers->setIcon(themePixmap(QStringLiteral("icons/sync"))); + btnRefreshServers->setIcon(QPixmap("theme:icons/sync")); btnRefreshServers->setToolTip(tr("Refresh the server list with known public servers")); btnRefreshServers->setFixedWidth(30); @@ -100,7 +99,7 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent) updateDisplayInfo(previousHosts->currentText()); btnForgotPassword = new QPushButton(this); - btnForgotPassword->setIcon(themePixmap(QStringLiteral("icons/forgot_password"))); + btnForgotPassword->setIcon(QPixmap("theme:icons/forgot_password")); btnForgotPassword->setToolTip(tr("Reset Password")); btnForgotPassword->setFixedWidth(30); connect(btnForgotPassword, &QPushButton::released, this, &DlgConnect::actForgotPassword); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp index a4a31d78d..198fa259b 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp @@ -1,17 +1,9 @@ #include "dlg_convert_deck_to_cod_format.h" -#include "../../../client/settings/cache_settings.h" -#include "../../deck_loader/deck_loader.h" - #include #include -#include -#include -#include #include -#include #include -#include DialogConvertDeckToCodFormat::DialogConvertDeckToCodFormat(QWidget *parent) : QDialog(parent) { @@ -46,71 +38,3 @@ bool DialogConvertDeckToCodFormat::dontAskAgain() const { return dontAskAgainCheckbox->isChecked(); } - -namespace -{ - -bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath) -{ - QFileInfo fileInfo(filePath); - QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod"); - - if (QFile::exists(newFileName)) { - QMessageBox::StandardButton reply = - QMessageBox::question(parent, QObject::tr("Overwrite Existing File?"), - QObject::tr("A .cod version of this deck already exists. Overwrite it?"), - QMessageBox::Yes | QMessageBox::No); - return reply == QMessageBox::Yes; - } - return true; // Safe to proceed -} - -} // namespace - -bool DialogConvertDeckToCodFormat::promptIfRequired(QWidget *parent, - const QString &filePath, - const std::function &convert) -{ - if (DeckFileFormat::getFormatFromName(filePath) == DeckFileFormat::Cockatrice) { - return true; - } - - // Retrieve saved preference if the prompt is disabled - if (!SettingsCache::instance().visualDeckStorage().getVisualDeckStoragePromptForConversion()) { - if (!SettingsCache::instance().visualDeckStorage().getVisualDeckStorageAlwaysConvert()) { - return false; - } - - if (!confirmOverwriteIfExists(parent, filePath)) { - return false; - } - - return convert(); - } - - // Show the dialog to the user - DialogConvertDeckToCodFormat conversionDialog(parent); - if (conversionDialog.exec() != QDialog::Accepted) { - SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion( - !conversionDialog.dontAskAgain()); - SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(false); - - return false; - } - - // Try to convert file - if (!confirmOverwriteIfExists(parent, filePath)) { - return false; - } - - if (!convert()) { - return false; - } - - if (conversionDialog.dontAskAgain()) { - SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion(false); - SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(true); - } - - return true; -} diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h index 526582135..6642ad8c6 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h @@ -13,9 +13,6 @@ #include #include #include -#include - -class QWidget; class DialogConvertDeckToCodFormat : public QDialog { @@ -27,21 +24,6 @@ public: [[nodiscard]] bool dontAskAgain() const; - /** - * @brief Checks whether the deck file at \a filePath can store tags. - * - * If the file is not a .cod deck, prompts the user for conversion to the - * Cockatrice format, honoring the saved "always convert / don't ask again" - * preference. On acceptance \a convert is called to perform the conversion. - * - * @param parent The widget to parent the prompt to. - * @param filePath The path of the deck file to check. - * @param convert Called to convert the deck once the user agrees. - * @return true if tags can be stored (no conversion needed, or the conversion - * was performed), false if the user declined to convert. - */ - static bool promptIfRequired(QWidget *parent, const QString &filePath, const std::function &convert); - private: QVBoxLayout *layout; QLabel *label; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp index a56aa8e35..f249976c2 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp @@ -1,6 +1,5 @@ #include "dlg_edit_tokens.h" -#include "../../pixel_map_generator.h" #include "../interface/widgets/utility/get_text_with_max.h" #include @@ -91,10 +90,10 @@ DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nul &DlgEditTokens::tokenSelectionChanged); QAction *aAddToken = new QAction(tr("Add token"), this); - aAddToken->setIcon(themePixmap(QStringLiteral("icons/increment"))); + aAddToken->setIcon(QPixmap("theme:icons/increment")); connect(aAddToken, &QAction::triggered, this, &DlgEditTokens::actAddToken); QAction *aRemoveToken = new QAction(tr("Remove token"), this); - aRemoveToken->setIcon(themePixmap(QStringLiteral("icons/decrement"))); + aRemoveToken->setIcon(QPixmap("theme:icons/decrement")); connect(aRemoveToken, &QAction::triggered, this, &DlgEditTokens::actRemoveToken); auto *databaseToolBar = new QToolBar; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp deleted file mode 100644 index 86647ef26..000000000 --- a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.cpp +++ /dev/null @@ -1,50 +0,0 @@ -#include "dlg_login_prompt.h" - -#include -#include -#include -#include -#include -#include - -DlgLoginPrompt::DlgLoginPrompt(const QString &serverText, QWidget *parent) : QDialog(parent) -{ - setWindowTitle(tr("Sign in")); - - auto *mainLayout = new QVBoxLayout(this); - mainLayout->addWidget( - new QLabel(tr("This link requires you to be signed in.\nSign in to %1:").arg(serverText), this)); - - auto *formLayout = new QFormLayout; - usernameEdit = new QLineEdit(this); - passwordEdit = new QLineEdit(this); - passwordEdit->setEchoMode(QLineEdit::Password); - formLayout->addRow(tr("Username:"), usernameEdit); - formLayout->addRow(tr("Password:"), passwordEdit); - mainLayout->addLayout(formLayout); - - savePasswordCheckBox = new QCheckBox(tr("Save password for this server"), this); - mainLayout->addWidget(savePasswordCheckBox); - - auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); - connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); - connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); - mainLayout->addWidget(buttonBox); - - usernameEdit->setFocus(); -} - -QString DlgLoginPrompt::username() const -{ - return usernameEdit->text().trimmed(); -} - -QString DlgLoginPrompt::password() const -{ - return passwordEdit->text(); -} - -bool DlgLoginPrompt::savePassword() const -{ - return savePasswordCheckBox->isChecked(); -} diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h b/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h deleted file mode 100644 index e47924058..000000000 --- a/cockatrice/src/interface/widgets/dialogs/dlg_login_prompt.h +++ /dev/null @@ -1,40 +0,0 @@ -/** - * @file dlg_login_prompt.h - * @ingroup ConnectionDialogs - */ -//! \todo Document this file. - -#ifndef DLG_LOGIN_PROMPT_H -#define DLG_LOGIN_PROMPT_H - -#include - -class QCheckBox; -class QLineEdit; - -/** - * @brief Small sign-in dialog used when a cockatrice:// link needs credentials - * that are not saved for the target server. - * - * The entered name and password are handed to the intent chain; when the user - * opts to save them, they are stored in the server settings so that later links - * to the same server connect seamlessly. - */ -class DlgLoginPrompt : public QDialog -{ - Q_OBJECT - -public: - explicit DlgLoginPrompt(const QString &serverText, QWidget *parent = nullptr); - - [[nodiscard]] QString username() const; - [[nodiscard]] QString password() const; - [[nodiscard]] bool savePassword() const; - -private: - QLineEdit *usernameEdit; - QLineEdit *passwordEdit; - QCheckBox *savePasswordCheckBox; -}; - -#endif // DLG_LOGIN_PROMPT_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp index 556c270be..7c107eb2f 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp @@ -1,7 +1,6 @@ #include "dlg_manage_sets.h" #include "../../../client/settings/cache_settings.h" -#include "../../pixel_map_generator.h" #include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/widgets/utility/custom_line_edit.h" @@ -36,28 +35,28 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) setsEditToolBar->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); aTop = new QAction(QString(), this); - aTop->setIcon(themePixmap(QStringLiteral("icons/arrow_top_green"))); + aTop->setIcon(QPixmap("theme:icons/arrow_top_green")); aTop->setToolTip(tr("Move selected set to the top")); aTop->setEnabled(false); connect(aTop, &QAction::triggered, this, &WndSets::actTop); setsEditToolBar->addAction(aTop); aUp = new QAction(QString(), this); - aUp->setIcon(themePixmap(QStringLiteral("icons/arrow_up_green"))); + aUp->setIcon(QPixmap("theme:icons/arrow_up_green")); aUp->setToolTip(tr("Move selected set up")); aUp->setEnabled(false); connect(aUp, &QAction::triggered, this, &WndSets::actUp); setsEditToolBar->addAction(aUp); aDown = new QAction(QString(), this); - aDown->setIcon(themePixmap(QStringLiteral("icons/arrow_down_green"))); + aDown->setIcon(QPixmap("theme:icons/arrow_down_green")); aDown->setToolTip(tr("Move selected set down")); aDown->setEnabled(false); connect(aDown, &QAction::triggered, this, &WndSets::actDown); setsEditToolBar->addAction(aDown); aBottom = new QAction(QString(), this); - aBottom->setIcon(themePixmap(QStringLiteral("icons/arrow_bottom_green"))); + aBottom->setIcon(QPixmap("theme:icons/arrow_bottom_green")); aBottom->setToolTip(tr("Move selected set to the bottom")); aBottom->setEnabled(false); connect(aBottom, &QAction::triggered, this, &WndSets::actBottom); @@ -67,7 +66,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) searchField = new LineEditUnfocusable; searchField->setObjectName("searchEdit"); searchField->setPlaceholderText(tr("Search by set name, code, type, or release date")); - searchField->addAction(themePixmap(QStringLiteral("icons/search")), LineEditUnfocusable::LeadingPosition); + searchField->addAction(QPixmap("theme:icons/search"), LineEditUnfocusable::LeadingPosition); searchField->setClearButtonEnabled(true); setFocusProxy(searchField); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp index 6d022861c..6ae8c9adb 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp @@ -1,7 +1,6 @@ #include "dlg_register.h" #include "../../../client/settings/cache_settings.h" -#include "../../pixel_map_generator.h" #include "../server/handle_public_servers.h" #include "../server/user/user_info_connection.h" @@ -25,7 +24,7 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) previousHosts = new QComboBox(this); btnDeleteServer = new QPushButton(this); - btnDeleteServer->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); + btnDeleteServer->setIcon(QPixmap("theme:icons/remove_row")); btnDeleteServer->setToolTip(tr("Delete the currently selected saved server")); btnDeleteServer->setFixedWidth(30); @@ -33,7 +32,7 @@ DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) hps = new HandlePublicServers(this); btnRefreshServers = new QPushButton(this); - btnRefreshServers->setIcon(themePixmap(QStringLiteral("icons/sync"))); + btnRefreshServers->setIcon(QPixmap("theme:icons/sync")); btnRefreshServers->setToolTip(tr("Refresh the server list with known public servers")); btnRefreshServers->setFixedWidth(30); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp index 581920dbc..883cfcd03 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp @@ -6,7 +6,6 @@ #include "dlg_settings.h" #include "../../../client/settings/cache_settings.h" -#include "../../pixel_map_generator.h" #include "../main.h" #include "../settings_page/appearance_settings_page.h" #include "../settings_page/deck_editor_settings_page.h" @@ -97,7 +96,7 @@ void DlgSettings::setupUi() // Search bar searchEdit = new QLineEdit; searchEdit->setClearButtonEnabled(true); - searchEdit->addAction(themePixmap(QStringLiteral("icons/search")), QLineEdit::LeadingPosition); + searchEdit->addAction(QPixmap("theme:icons/search"), QLineEdit::LeadingPosition); searchEdit->installEventFilter(this); connect(searchEdit, &QLineEdit::textChanged, this, &DlgSettings::onSearchTextChanged); @@ -133,7 +132,7 @@ void DlgSettings::setupUi() pagesWidget->addWidget(makeScrollable(userInterfacePage)); pagesWidget->addWidget(makeScrollable(deckEditorPage)); pagesWidget->addWidget(makeScrollable(storagePage)); - pagesWidget->addWidget(makeScrollable(messagesPage)); + pagesWidget->addWidget(messagesPage); pagesWidget->addWidget(soundPage); pagesWidget->addWidget(shortcutsPage); @@ -416,11 +415,6 @@ void DlgSettings::setTab(int index) } } -AbstractSettingsPage *DlgSettings::page(SettingsPage which) const -{ - return pages.value(static_cast(which)); -} - void DlgSettings::updateLanguage() { qApp->removeTranslator(translator); // NOLINT(cppcoreguidelines-pro-type-static-cast-downcast) @@ -483,13 +477,13 @@ void DlgSettings::closeEvent(QCloseEvent *event) case Invalid: loadErrorMessage = tr("Your card database is invalid.\n\n" "Cockatrice may not function correctly with an invalid database\n\n" - "You may need to rerun Oracle to update your card database.\n\n" + "You may need to rerun oracle to update your card database.\n\n" "Would you like to change your database location setting?"); break; case VersionTooOld: loadErrorMessage = tr("Your card database version is too old.\n\n" "This can cause problems loading card information or images\n\n" - "Usually this can be fixed by rerunning Oracle to to update your card database.\n\n" + "Usually this can be fixed by rerunning oracle to to update your card database.\n\n" "Would you like to change your database location setting?"); break; case NotLoaded: diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h index 845c0b4d6..b700f7af9 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.h @@ -54,7 +54,6 @@ public: explicit DlgSettings(QWidget *parent = nullptr); void setTab(int index); - AbstractSettingsPage *page(SettingsPage which) const; private slots: void onTabClicked(int index); diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp deleted file mode 100644 index 897d32062..000000000 --- a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#include "dlg_share_deck.h" - -#include "../../../client/settings/cache_settings.h" -#include "../cards/additional_info/deck_color_identity.h" -#include "../deck_share/deck_share_utils.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -DlgShareDeck::DlgShareDeck(AbstractClient *_client, const QSharedPointer &_deck, QWidget *_parent) - : QDialog(_parent), client(_client), deck(_deck), shareTimeoutTimer(new QTimer(this)) -{ - setWindowTitle(tr("Share deck")); - - auto *layout = new QVBoxLayout(this); - - nameEdit = new QLineEdit(this); - nameEdit->setText(tr("Shared deck")); - - auto *form = new QFormLayout; - form->addRow(tr("Share name:"), nameEdit); - layout->addLayout(form); - - auto *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); - buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Create share link")); - buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Cancel")); - connect(buttonBox, &QDialogButtonBox::accepted, this, &DlgShareDeck::actShare); - connect(buttonBox, &QDialogButtonBox::rejected, this, &DlgShareDeck::reject); - this->buttonBox = buttonBox; - layout->addWidget(buttonBox); - - shareTimeoutTimer->setSingleShot(true); - shareTimeoutTimer->setInterval( - static_cast((static_cast(SettingsCache::instance().network().getTimeOut()) + 1) * - SettingsCache::instance().network().getKeepAlive() * 1000)); - connect(shareTimeoutTimer, &QTimer::timeout, this, &DlgShareDeck::onShareTimeout); -} - -void DlgShareDeck::actShare() -{ - buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); - - Command_DeckShareCreate cmd; - cmd.set_name(nameEdit->text().trimmed().toStdString()); - if (cmd.name().empty()) { - cmd.set_name(tr("Shared deck").toStdString()); - } - - DeckShareItem *item = cmd.add_items(); - item->set_deck_list(deck->writeToString_Native().toStdString()); - item->set_color_identity(getDeckColorIdentity(*deck, CardDatabaseManager::query()).toStdString()); - - PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, &DlgShareDeck::shareFinished); - client->sendCommand(pend); - shareTimeoutTimer->start(); -} - -void DlgShareDeck::shareFinished(const Response &response, const CommandContainer & /*commandContainer*/) -{ - shareTimeoutTimer->stop(); - if (response.response_code() != Response::RespOk) { - buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); - QMessageBox::critical(this, tr("Share deck"), - tr("Failed to create the share link (server response code %1).") - .arg(QString::number(static_cast(response.response_code())))); - return; - } - - const DeckShareUtils::ShareResponse share = DeckShareUtils::handleShareResponse(client, response); - - QMessageBox::information(this, tr("Share deck"), - tr("Share link created and copied to the clipboard:\n\n%1\n\n" - "The share expires on %2.") - .arg(share.link, DeckShareUtils::formatShareExpiry(share.expiry))); - accept(); -} - -void DlgShareDeck::onShareTimeout() -{ - buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true); - QMessageBox::warning(this, tr("Share deck"), tr("The server did not respond in time. Try again.")); -} diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h b/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h deleted file mode 100644 index 162fa3677..000000000 --- a/cockatrice/src/interface/widgets/dialogs/dlg_share_deck.h +++ /dev/null @@ -1,46 +0,0 @@ -/** - * @file dlg_share_deck.h - * @ingroup Dialogs - */ -//! \todo Document this file. - -#ifndef DLG_SHARE_DECK_H -#define DLG_SHARE_DECK_H - -#include -#include - -class AbstractClient; -class CommandContainer; -class DeckList; -class QDialogButtonBox; -class QLineEdit; -class QTimer; -class Response; - -/** - * @brief Slim dialog to create a temporary share for the deck open in the editor. - * - * Asks for a share name, sends Command_DeckShareCreate for the single inline - * deck, and copies the resulting link to the clipboard. - */ -class DlgShareDeck : public QDialog -{ - Q_OBJECT -public: - DlgShareDeck(AbstractClient *_client, const QSharedPointer &_deck, QWidget *parent = nullptr); - -private slots: - void actShare(); - void shareFinished(const Response &response, const CommandContainer &commandContainer); - void onShareTimeout(); - -private: - AbstractClient *client; - QSharedPointer deck; - QLineEdit *nameEdit; - QDialogButtonBox *buttonBox; - QTimer *shareTimeoutTimer; -}; - -#endif // DLG_SHARE_DECK_H diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp deleted file mode 100644 index cd7ecdcdd..000000000 --- a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.cpp +++ /dev/null @@ -1,181 +0,0 @@ -#include "dlg_shared_decks_preview.h" - -#include "../deck_share/shared_deck_preview_widget.h" -#include "../general/layout_containers/flow_widget.h" - -#include -#include -#include -#include -#include -#include -#include -#include - -DlgSharedDecksPreview::DlgSharedDecksPreview(QWidget *parent, - const CardDatabaseQuerier *querier, - const QString &shareName, - qint64 expiresAt, - const QString &serverText, - const QList &items) - : QDialog(parent) -{ - setWindowTitle(tr("Open shared decks")); - resize(700, 500); - - auto *mainLayout = new QVBoxLayout(this); - - // shareName and serverText come from the share server, so escape them: the - // QLabels render AutoText and markup would otherwise be shown as rich text. - auto *titleLabel = - new QLabel(tr("Share: %1").arg((shareName.isEmpty() ? tr("Untitled") : shareName).toHtmlEscaped()), this); - QFont titleFont = titleLabel->font(); - titleFont.setBold(true); - titleFont.setPointSize(titleFont.pointSize() + 2); - titleLabel->setFont(titleFont); - mainLayout->addWidget(titleLabel); - - if (!serverText.isEmpty()) { - mainLayout->addWidget(new QLabel(tr("From %1").arg(serverText.toHtmlEscaped()), this)); - } - - if (expiresAt > 0) { - const QString expiryText = QDateTime::fromSecsSinceEpoch(expiresAt).toLocalTime().toString(Qt::TextDate); - mainLayout->addWidget(new QLabel(tr("This share link expires on %1").arg(expiryText), this)); - } - - downloadStatusLabel = new QLabel(this); - downloadStatusLabel->setVisible(false); - mainLayout->addWidget(downloadStatusLabel); - - flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded); - mainLayout->addWidget(flowWidget, 1); - - for (const ServerInfo_DeckShareItem &item : items) { - QStringList tags; - for (const auto &tag : item.tags()) { - tags.append(QString::fromStdString(tag)); - } - - auto *tile = new SharedDeckPreviewWidget( - this, querier, QString::fromStdString(item.name()), QString::fromStdString(item.banner_card()), - QString::fromStdString(item.color_identity()), QString::fromStdString(item.game_format()), tags.join(", ")); - flowWidget->addNavigableWidget(tile); - tiles.append(tile); - itemIds.append(item.id()); - } - - if (tiles.size() == 1) { - tiles.first()->setSelected(true); - } - - auto *buttonBox = new QDialogButtonBox(this); - openSelectedButton = buttonBox->addButton(tr("Open selected"), QDialogButtonBox::AcceptRole); - openAllButton = buttonBox->addButton(tr("Open all"), QDialogButtonBox::ActionRole); - buttonBox->addButton(tr("Cancel"), QDialogButtonBox::RejectRole); - mainLayout->addWidget(buttonBox); - - connect(buttonBox, &QDialogButtonBox::rejected, this, [this]() { - onCancel(); - close(); - }); - - // Esc calls QDialog::reject() directly (which hides the dialog without a - // close event), so route it through the same guarded cancel as the button. - connect(this, &QDialog::rejected, this, [this]() { - onCancel(); - close(); - }); - - connect(openSelectedButton, &QPushButton::clicked, this, &DlgSharedDecksPreview::openSelected); - connect(buttonBox, &QDialogButtonBox::clicked, this, [this, buttonBox](QAbstractButton *button) { - if (buttonBox->buttonRole(button) == QDialogButtonBox::ActionRole) { - openAll(); - } - }); - - for (SharedDeckPreviewWidget *tile : tiles) { - connect(tile, &SharedDeckPreviewWidget::selectionToggled, this, - &DlgSharedDecksPreview::updateOpenSelectedEnabled); - } - for (int i = 0; i < tiles.size(); ++i) { - const int itemId = itemIds.at(i); - // Double-clicking a tile selects it and opens just that deck. - connect(tiles.at(i), &SharedDeckPreviewWidget::activated, this, [this, itemId]() { - resultEmitted = true; - setDownloading(true); - emit openRequested(QList{itemId}); - }); - } - updateOpenSelectedEnabled(); -} - -QList DlgSharedDecksPreview::selectedItemIds() const -{ - QList selectedIds; - for (int i = 0; i < tiles.size(); ++i) { - if (tiles.at(i)->isSelected()) { - selectedIds.append(itemIds.at(i)); - } - } - return selectedIds; -} - -void DlgSharedDecksPreview::openSelected() -{ - const QList selectedIds = selectedItemIds(); - if (selectedIds.isEmpty()) { - return; - } - resultEmitted = true; - setDownloading(true); - emit openRequested(selectedIds); -} - -void DlgSharedDecksPreview::openAll() -{ - resultEmitted = true; - setDownloading(true); - emit openRequested(itemIds); -} - -void DlgSharedDecksPreview::setDownloading(bool downloading) -{ - if (downloadInProgress == downloading) { - return; - } - downloadInProgress = downloading; - downloadStatusLabel->setVisible(downloading); - for (SharedDeckPreviewWidget *tile : tiles) { - tile->setEnabled(!downloading); - } - openSelectedButton->setEnabled(!downloading); - openAllButton->setEnabled(!downloading); -} - -void DlgSharedDecksPreview::setDownloadProgress(int done, int total, const QString ¤tDeckName) -{ - if (!downloadInProgress) { - return; - } - downloadStatusLabel->setText(tr("Downloading deck %1 of %2: %3").arg(done).arg(total).arg(currentDeckName)); -} - -void DlgSharedDecksPreview::updateOpenSelectedEnabled() -{ - openSelectedButton->setEnabled(!selectedItemIds().isEmpty()); -} - -void DlgSharedDecksPreview::onCancel() -{ - if (!resultEmitted || downloadInProgress) { - resultEmitted = true; - emit cancelled(); - } -} - -void DlgSharedDecksPreview::closeEvent(QCloseEvent *event) -{ - onCancel(); - QDialog::closeEvent(event); -} diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h b/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h deleted file mode 100644 index 31820e3a0..000000000 --- a/cockatrice/src/interface/widgets/dialogs/dlg_shared_decks_preview.h +++ /dev/null @@ -1,68 +0,0 @@ -#ifndef COCKATRICE_DLG_SHARED_DECKS_PREVIEW_H -#define COCKATRICE_DLG_SHARED_DECKS_PREVIEW_H - -#include -#include - -class FlowWidget; -class QCloseEvent; -class QLabel; -class QPushButton; -class ServerInfo_DeckShareItem; -class SharedDeckPreviewWidget; -class CardDatabaseQuerier; - -/** - * @brief Non-modal preview of the decks contained in a shared-deck link. - * - * Lets the user pick which of the shared decks to open before anything is - * downloaded. Emits openRequested with the ids of the chosen decks, or - * cancelled when the user closes the dialog without choosing. Once the user - * picks, the dialog switches into a "downloading" state: the tiles and open - * buttons are disabled, a progress label shows the current download and Cancel - * stays functional so the download can be aborted. - */ -class DlgSharedDecksPreview : public QDialog -{ - Q_OBJECT - -public: - explicit DlgSharedDecksPreview(QWidget *parent, - const CardDatabaseQuerier *querier, - const QString &shareName, - qint64 expiresAt, - const QString &serverText, - const QList &items); - - void setDownloadProgress(int done, int total, const QString ¤tDeckName); - -public slots: - void setDownloading(bool downloading); - -signals: - void openRequested(const QList &itemIds); - void cancelled(); - -protected: - void closeEvent(QCloseEvent *event) override; - -private slots: - void openSelected(); - void openAll(); - void updateOpenSelectedEnabled(); - void onCancel(); - -private: - QList selectedItemIds() const; - - FlowWidget *flowWidget; - QList tiles; - QList itemIds; - QPushButton *openSelectedButton; - QPushButton *openAllButton; - QLabel *downloadStatusLabel; - bool resultEmitted = false; - bool downloadInProgress = false; -}; - -#endif // COCKATRICE_DLG_SHARED_DECKS_PREVIEW_H \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/general/home_tab_button_color.h b/cockatrice/src/interface/widgets/general/home_tab_button_color.h index b45bd7a92..1550b57e7 100644 --- a/cockatrice/src/interface/widgets/general/home_tab_button_color.h +++ b/cockatrice/src/interface/widgets/general/home_tab_button_color.h @@ -11,8 +11,8 @@ namespace HomeTabButtonColor */ enum Source { - FromThemeColors, ///< Use the theme's identity accent colors - FromBackground, ///< Extract colour from the background image + Automatic, ///< Extract color from background, or use theme color if no background + FromBackground, ///< Always extract color from background }; struct Entry @@ -23,7 +23,7 @@ struct Entry inline QList all() { - static QList entries = {{FromThemeColors, QT_TR_NOOP("From theme colors")}, + static QList entries = {{Automatic, QT_TR_NOOP("Automatic")}, {FromBackground, QT_TR_NOOP("Extract from background")}}; return entries; @@ -33,12 +33,12 @@ inline QList all() * Safely converts an int into the corresponding Source. * * @param value The int value - * @return The Source. Returns Source::FromThemeColors if the value is not within range + * @return The Source. Returns Source::Automatic if the value is not within range */ inline Source intToSource(int value) { if (value > FromBackground) { - return FromThemeColors; // default + return Automatic; // default } return static_cast(value); diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp index 648d315f9..10fcdcb43 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.cpp +++ b/cockatrice/src/interface/widgets/general/home_widget.cpp @@ -2,7 +2,6 @@ #include "../../../client/settings/cache_settings.h" #include "../../../interface/widgets/tabs/tab_supervisor.h" -#include "../../pixel_map_generator.h" #include "../../theme_manager.h" #include "../../window_main.h" #include "../cards/art_crop_attribution.h" @@ -11,8 +10,6 @@ #include "home_tab_button_color.h" #include -#include -#include #include #include #include @@ -23,7 +20,7 @@ #include HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor) - : QWidget(parent), tabSupervisor(_tabSupervisor), background(themePixmap(QStringLiteral("backgrounds/home"))) + : QWidget(parent), tabSupervisor(_tabSupervisor), background("theme:backgrounds/home"), overlay("theme:cockatrice") { layout = new QGridLayout(this); @@ -55,27 +52,16 @@ HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor) // Lambda is cleaner to read than overloading this connect(&SettingsCache::instance().appearance(), &AppearanceSettings::homeTabDisplayCardNameChanged, this, [this] { repaint(); }); - connect(&SettingsCache::instance().appearance(), &AppearanceSettings::homeTabBackgroundDimChanged, this, - [this] { repaint(); }); connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, &HomeWidget::initializeBackgroundFromSource); connect(&SettingsCache::instance(), &SettingsCache::themeChanged, this, &HomeWidget::updateButtonsToBackgroundColor); - // Scheme flips (light/dark/system with an OS switch) fire on themeManager, - // not on SettingsCache::themeChanged, so re-resolve the variant background. - connect(themeManager, &ThemeManager::themeChanged, this, &HomeWidget::initializeBackgroundFromSource); - connect(themeManager, &ThemeManager::paletteChanged, this, &HomeWidget::updateButtonsToBackgroundColor); - connect(themeManager, &ThemeManager::paletteChanged, this, &HomeWidget::updateLogoOverlay); connect(&SettingsCache::instance().appearance(), &AppearanceSettings::homeTabButtonColorChanged, this, &HomeWidget::updateButtonsToBackgroundColor); } void HomeWidget::initializeBackgroundFromSource() { - // The featured logo is theme/scheme-derived too; reload it alongside the - // background so a theme or appearance switch doesn't leave it stale. - updateLogoOverlay(); - if (CardDatabaseManager::getInstance()->getLoadStatus() != LoadStatus::Ok) { connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this, &HomeWidget::initializeBackgroundFromSource); @@ -88,7 +74,7 @@ void HomeWidget::initializeBackgroundFromSource() switch (backgroundSourceType) { case BackgroundSources::Theme: cardChangeTimer->stop(); - background = themePixmap(QStringLiteral("backgrounds/home")); + background = QPixmap("theme:backgrounds/home"); backgroundSourceDeck = DeckList(); backgroundSourceCard->setCard(ExactCard()); updateButtonsToBackgroundColor(); @@ -114,24 +100,32 @@ void HomeWidget::loadBackgroundSourceDeck() backgroundSourceDeck = deckOpt.has_value() ? deckOpt.value().deckList : DeckList(); } -static QPair paletteDerivedButtonColors() +static bool isDefaultBackgroundAndTheme() { - return {themeManager->appColor(AppColor::AccentStrong), themeManager->appColor(AppColor::AccentSoft)}; + QString sourceId = SettingsCache::instance().appearance().getHomeTabBackgroundSource(); + return themeManager->isBuiltInTheme() && BackgroundSources::fromId(sourceId) == BackgroundSources::Theme; } QPair HomeWidget::determineButtonColor() const { + static QPair defaultColor = {QColor::fromRgb(20, 140, 60), QColor::fromRgb(120, 200, 80)}; + auto colorSource = HomeTabButtonColor::intToSource(SettingsCache::instance().appearance().getHomeTabButtonColorSourceIndex()); switch (colorSource) { - case HomeTabButtonColor::FromThemeColors: - return paletteDerivedButtonColors(); + case HomeTabButtonColor::Automatic: { + if (isDefaultBackgroundAndTheme()) { + return defaultColor; + } else { + return extractDominantColors(background); + } + } case HomeTabButtonColor::FromBackground: return extractDominantColors(background); } - return paletteDerivedButtonColors(); + return defaultColor; } void HomeWidget::setRandomCard(ExactCard &newCard) @@ -235,10 +229,10 @@ QGroupBox *HomeWidget::createButtons() QVBoxLayout *boxLayout = new QVBoxLayout; boxLayout->setAlignment(Qt::AlignHCenter); - logoLabel = new QLabel; + QLabel *logoLabel = new QLabel; + logoLabel->setPixmap(overlay.scaledToWidth(200, Qt::SmoothTransformation)); logoLabel->setAlignment(Qt::AlignCenter); boxLayout->addWidget(logoLabel); - updateLogoOverlay(); boxLayout->addSpacing(25); connectButton = new HomeStyledButton("Connect/Play", gradientColors); @@ -366,15 +360,13 @@ void HomeWidget::paintEvent(QPaintEvent *event) painter.drawPixmap(topLeft, toDraw); } - if (SettingsCache::instance().appearance().getHomeTabBackgroundDim()) { - // Draw translucent black overlay with rounded corners - QRectF overlayRect(5, 5, width() - 10, height() - 10); - QPainterPath roundedRectPath; - roundedRectPath.addRoundedRect(overlayRect, 20, 20); + // Draw translucent black overlay with rounded corners + QRectF overlayRect(5, 5, width() - 10, height() - 10); + QPainterPath roundedRectPath; + roundedRectPath.addRoundedRect(overlayRect, 20, 20); - QColor semiTransparentBlack(0, 0, 0, static_cast(255 * 0.33)); - painter.fillPath(roundedRectPath, semiTransparentBlack); - } + QColor semiTransparentBlack(0, 0, 0, static_cast(255 * 0.33)); + painter.fillPath(roundedRectPath, semiTransparentBlack); // Card name overlay (above the attribution, bottom-right) QString cardName; @@ -439,56 +431,3 @@ void HomeWidget::paintEvent(QPaintEvent *event) QWidget::paintEvent(event); } - -void HomeWidget::updateLogoOverlay() -{ - // Emulate cockatrice.svg in Qt rather than rendering the baked-in SVG. - // The SVG has no separate plate: the gradient fills the bird's silhouette - // paths (light #c9fd62/AccentSoft at the top-left, dark #139740/AccentStrong - // toward the bottom-right — the SVG's linearGradient4265-7-8 stops along - // its userSpaceOnUse axis), and the white highlight path - // (cockatrice-logo-white) sits on top. So we paint that gradient clipped to - // the full logo silhouette (the full-color logo's alpha), then overlay the - // white mark. Colours stay fully theme-driven and independent of the static - // greens baked into the SVG. - const QColor strong = themeManager->appColor(AppColor::AccentStrong); - const QColor soft = themeManager->appColor(AppColor::AccentSoft); - - const QPixmap silhouette = themePixmap(QStringLiteral("cockatrice")).scaledToWidth(200, Qt::SmoothTransformation); - const QPixmap whiteMark = - themePixmap(QStringLiteral("cockatrice-logo-white")).scaledToWidth(200, Qt::SmoothTransformation); - if (silhouette.isNull() || whiteMark.isNull()) { - return; - } - - QPixmap composite(silhouette.size()); - composite.fill(Qt::transparent); - - { - QPainter painter(&composite); - painter.setRenderHint(QPainter::Antialiasing); - painter.setRenderHint(QPainter::SmoothPixmapTransform); - - // Recreate cockatrice.svg's own gradient geometry (linearGradient - // 4265-7-8, userSpaceOnUse): light AccentSoft at S=(-8.097,-97.746), - // dark AccentStrong at E=(162.455,295.208), on the SVG's 300x300 - // canvas. Scale those coordinates to this composite's size. - const qreal scale = composite.width() / 300.0; - QLinearGradient gradient(QPointF(-8.097, -97.746) * scale, QPointF(162.455, 295.208) * scale); - gradient.setColorAt(0.0, soft); - gradient.setColorAt(1.0, strong); - painter.fillRect(composite.rect(), gradient); - - // Clip the gradient to the full logo silhouette exactly as the SVG's - // gradient paths are confined to the bird. - painter.setCompositionMode(QPainter::CompositionMode_DestinationIn); - painter.drawPixmap(0, 0, silhouette); - - painter.setCompositionMode(QPainter::CompositionMode_SourceOver); - painter.drawPixmap(0, 0, whiteMark); - } - - if (logoLabel) { - logoLabel->setPixmap(composite); - } -} diff --git a/cockatrice/src/interface/widgets/general/home_widget.h b/cockatrice/src/interface/widgets/general/home_widget.h index 1cadc4a67..9df0d7b6a 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.h +++ b/cockatrice/src/interface/widgets/general/home_widget.h @@ -15,9 +15,6 @@ #include #include -class QGridLayout; -class QLabel; - class HomeWidget : public QWidget { @@ -44,14 +41,13 @@ private: QPixmap background; CardInfoPictureArtCropWidget *backgroundSourceCard = nullptr; DeckList backgroundSourceDeck; - QLabel *logoLabel = nullptr; + QPixmap overlay; QPair gradientColors; HomeStyledButton *connectButton; void setRandomCard(ExactCard &newCard); void loadBackgroundSourceDeck(); QPair determineButtonColor() const; - void updateLogoOverlay(); }; #endif // HOME_WIDGET_H diff --git a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp index 01c9ac34e..025f457bd 100644 --- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp +++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.cpp @@ -7,7 +7,6 @@ #include "flow_widget.h" #include -#include #include #include #include @@ -81,35 +80,13 @@ FlowWidget::FlowWidget(QWidget *parent, /** * @brief Adds a widget to the flow layout within the FlowWidget. * - * Plain widgets are not filtered for arrow keys: intercepting them would steal - * Up/Down/Left/Right from controls that use them (combo boxes, spin boxes - * etc.). Widgets that want keyboard navigation between flow items must be - * added via addNavigableWidget instead. - * * @param widget_to_add The widget to add to the flow layout. */ -void FlowWidget::addWidget(QWidget *widget_to_add) +void FlowWidget::addWidget(QWidget *widget_to_add) const { flowLayout->addWidget(widget_to_add); } -/** - * @brief Adds a widget and routes its arrow keys to FlowWidget focus navigation. - * - * The widget is filtered for arrow-key events so keyboard navigation between - * the flow items keeps working even when the flow sits inside a QScrollArea, - * which swallows arrow keys before they can reach FlowWidget::keyPressEvent. - * Only widgets added through this method are affected; anything that needs its - * own arrow keys should use plain addWidget. - * - * @param widget_to_add The widget to add to the flow layout. - */ -void FlowWidget::addNavigableWidget(QWidget *widget_to_add) -{ - widget_to_add->installEventFilter(this); - flowLayout->addWidget(widget_to_add); -} - void FlowWidget::insertWidgetAtIndex(QWidget *toInsert, int index) { flowLayout->insertWidgetAtIndex(toInsert, index); @@ -200,66 +177,6 @@ QLayoutItem *FlowWidget::itemAt(int index) const return flowLayout->itemAt(index); } -void FlowWidget::keyPressEvent(QKeyEvent *event) -{ - if (moveFocus(event)) { - event->accept(); - return; - } - QWidget::keyPressEvent(event); -} - -bool FlowWidget::eventFilter(QObject *watched, QEvent *event) -{ - if (event->type() == QEvent::KeyPress && moveFocus(static_cast(event))) { - return true; - } - return QWidget::eventFilter(watched, event); -} - -bool FlowWidget::moveFocus(QKeyEvent *event) -{ - // Keyboard navigation between the flow items: arrow keys move focus just - // like clicking the sibling tiles would. Only items that can take keyboard - // focus (e.g. the deck-preview tiles in shared-deck links) are visited. - const bool moveForward = event->key() == Qt::Key_Right || event->key() == Qt::Key_Down; - const bool moveBackward = event->key() == Qt::Key_Left || event->key() == Qt::Key_Up; - if (!moveForward && !moveBackward) { - return false; - } - - QList focusableItems; - for (int i = 0; i < flowLayout->count(); ++i) { - QWidget *item = flowLayout->itemAt(i)->widget(); - if (item != nullptr && (item->focusPolicy() & Qt::TabFocus)) { - focusableItems.append(item); - } - } - - if (focusableItems.isEmpty()) { - return false; - } - - int currentIndex = -1; - for (int i = 0; i < focusableItems.size(); ++i) { - if (focusableItems.at(i)->hasFocus()) { - currentIndex = i; - break; - } - } - - const int delta = moveForward ? 1 : -1; - int nextIndex; - if (currentIndex < 0) { - nextIndex = moveForward ? 0 : focusableItems.size() - 1; - } else { - nextIndex = (currentIndex + delta + focusableItems.size()) % focusableItems.size(); - } - focusableItems.value(nextIndex)->setFocus(); - event->accept(); - return true; -} - int FlowWidget::count() const { return flowLayout->count(); diff --git a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h index 4d52db3f1..a232336d8 100644 --- a/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h +++ b/cockatrice/src/interface/widgets/general/layout_containers/flow_widget.h @@ -11,7 +11,6 @@ #include "../../../layouts/flow_layout.h" #include -#include #include #include #include @@ -29,8 +28,7 @@ public: Qt::ScrollBarPolicy horizontalPolicy, Qt::ScrollBarPolicy verticalPolicy); - void addWidget(QWidget *widget_to_add); - void addNavigableWidget(QWidget *widget_to_add); + void addWidget(QWidget *widget_to_add) const; void insertWidgetAtIndex(QWidget *toInsert, int index); void removeWidget(QWidget *widgetToRemove) const; void clearLayout(); @@ -45,15 +43,9 @@ public slots: void setSpacing(int hSpacing, int vSpacing); protected: - bool eventFilter(QObject *watched, QEvent *event) override; void resizeEvent(QResizeEvent *event) override; - void keyPressEvent(QKeyEvent *event) override; private: - /// @brief Moves keyboard focus to an adjacent flow item for an arrow-key event. - /// @return True when the event was an arrow key and was handled. - bool moveFocus(QKeyEvent *event); - Qt::Orientation flowDirection; QHBoxLayout *mainLayout; FlowLayout *flowLayout; diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp index 6e27b4e42..f057680be 100644 --- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp +++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp @@ -28,9 +28,6 @@ DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), d aSaveDeckAs = new QAction(QString(), this); connect(aSaveDeckAs, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::actSaveDeckAs); - aShareDeck = new QAction(QString(), this); - connect(aShareDeck, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::actShareDeck); - aLoadDeckFromClipboard = new QAction(QString(), this); connect(aLoadDeckFromClipboard, &QAction::triggered, deckEditor, &AbstractTabDeckEditor::actLoadDeckFromClipboard); @@ -99,7 +96,6 @@ DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), d addMenu(loadRecentDeckMenu); addAction(aSaveDeck); addAction(aSaveDeckAs); - addAction(aShareDeck); addSeparator(); addAction(aLoadDeckFromClipboard); addMenu(editDeckInClipboardMenu); @@ -124,7 +120,6 @@ void DeckEditorMenu::setSaveStatus(bool newStatus) { aSaveDeck->setEnabled(newStatus); aSaveDeckAs->setEnabled(newStatus); - aShareDeck->setEnabled(newStatus); aSaveDeckToClipboard->setEnabled(newStatus); aSaveDeckToClipboardNoSetInfo->setEnabled(newStatus); aSaveDeckToClipboardRaw->setEnabled(newStatus); @@ -162,7 +157,6 @@ void DeckEditorMenu::retranslateUi() aClearRecents->setText(tr("Clear")); aSaveDeck->setText(tr("&Save deck")); aSaveDeckAs->setText(tr("Save deck &as...")); - aShareDeck->setText(tr("Share deck...")); aLoadDeckFromClipboard->setText(tr("Load deck from cl&ipboard...")); diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h index 08ce7bba1..eff9257bb 100644 --- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.h +++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.h @@ -21,8 +21,7 @@ public: QAction *aNewDeck, *aLoadDeck, *aClearRecents, *aSaveDeck, *aSaveDeckAs, *aLoadDeckFromClipboard, *aEditDeckInClipboard, *aEditDeckInClipboardRaw, *aSaveDeckToClipboard, *aSaveDeckToClipboardNoSetInfo, *aSaveDeckToClipboardRaw, *aSaveDeckToClipboardRawNoSetInfo, *aPrintDeck, *aLoadDeckFromWebsite, - *aExportDeckDecklist, *aExportDeckDecklistXyz, *aAnalyzeDeckDeckstats, *aAnalyzeDeckTappedout, *aShareDeck, - *aClose; + *aExportDeckDecklist, *aExportDeckDecklistXyz, *aAnalyzeDeckDeckstats, *aAnalyzeDeckTappedout, *aClose; QMenu *loadRecentDeckMenu, *analyzeDeckMenu, *editDeckInClipboardMenu, *saveDeckToClipboardMenu; void setSaveStatus(bool newStatus); diff --git a/cockatrice/src/interface/widgets/onboarding/banner_shader_config.h b/cockatrice/src/interface/widgets/onboarding/banner_shader_config.h index 6008044ff..32f3e89c0 100644 --- a/cockatrice/src/interface/widgets/onboarding/banner_shader_config.h +++ b/cockatrice/src/interface/widgets/onboarding/banner_shader_config.h @@ -38,10 +38,6 @@ class BannerShaderConfig : public QObject Q_PROPERTY(QColor colorA READ colorA WRITE setColorA NOTIFY colorAChanged) Q_PROPERTY(QColor colorB READ colorB WRITE setColorB NOTIFY colorBChanged) Q_PROPERTY(QColor accent READ accent WRITE setAccent NOTIFY accentChanged) - Q_PROPERTY(QColor glowColor READ glowColor WRITE setGlowColor NOTIFY glowColorChanged) - Q_PROPERTY(QColor brandStrong READ brandStrong WRITE setBrandStrong NOTIFY brandStrongChanged) - Q_PROPERTY(QColor brandSoft READ brandSoft WRITE setBrandSoft NOTIFY brandSoftChanged) - Q_PROPERTY(qreal vignetteMin READ vignetteMin WRITE setVignetteMin NOTIFY vignetteMinChanged) Q_PROPERTY(bool logoVisible READ logoVisible WRITE setLogoVisible NOTIFY logoVisibleChanged) Q_PROPERTY(qreal logoGlow READ logoGlow WRITE setLogoGlow NOTIFY logoGlowChanged) @@ -189,54 +185,6 @@ public: } } - QColor glowColor() const - { - return m_glowColor; - } - void setGlowColor(const QColor &c) - { - if (c != m_glowColor) { - m_glowColor = c; - emit glowColorChanged(); - } - } - - QColor brandStrong() const - { - return m_brandStrong; - } - void setBrandStrong(const QColor &c) - { - if (c != m_brandStrong) { - m_brandStrong = c; - emit brandStrongChanged(); - } - } - - QColor brandSoft() const - { - return m_brandSoft; - } - void setBrandSoft(const QColor &c) - { - if (c != m_brandSoft) { - m_brandSoft = c; - emit brandSoftChanged(); - } - } - - qreal vignetteMin() const - { - return m_vignetteMin; - } - void setVignetteMin(qreal v) - { - if (v != m_vignetteMin) { - m_vignetteMin = v; - emit vignetteMinChanged(); - } - } - bool logoVisible() const { return m_logoVisible; @@ -274,10 +222,6 @@ signals: void colorAChanged(); void colorBChanged(); void accentChanged(); - void glowColorChanged(); - void brandStrongChanged(); - void brandSoftChanged(); - void vignetteMinChanged(); void logoVisibleChanged(); void logoGlowChanged(); @@ -295,16 +239,9 @@ private: bool m_frontIsA = true; - // Curated fallback seed values -- BannerHost overwrites these with - // palette-derived colours (see shader_banner_widget.cpp) before the first - // paint, so they only matter as a safe pre-first-apply default. QColor m_colorA{0x1A, 0x1A, 0x20}; QColor m_colorB{0x0E, 0x0E, 0x12}; QColor m_accent{0x8B, 0xDD, 0x6B}; - QColor m_glowColor{Qt::white}; - QColor m_brandStrong{0x13, 0x97, 0x40}; - QColor m_brandSoft{0xC9, 0xFD, 0x62}; - qreal m_vignetteMin = 0.62; bool m_logoVisible = false; qreal m_logoGlow = 1.0; diff --git a/cockatrice/src/interface/widgets/onboarding/brand_colors.h b/cockatrice/src/interface/widgets/onboarding/brand_colors.h deleted file mode 100644 index bf173270b..000000000 --- a/cockatrice/src/interface/widgets/onboarding/brand_colors.h +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef BRAND_COLORS_H -#define BRAND_COLORS_H - -#include - -/** @brief Cockatrice brand green. - * - * Single source of truth for the onboarding brand accent: it backs the - * banner's shader-accent uniform as the curated fallback when the active - * palette resolves no usable Highlight, and it preseads the wizard's - * QuickSetupPanel so a freshly generated palette keeps the brand identity - * until the user picks their own look. */ -inline const QColor kCockatriceBrandGreen(0x8B, 0xDD, 0x6B); - -#endif // BRAND_COLORS_H \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp index 4af02fe4f..618ac6f26 100644 --- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp +++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.cpp @@ -182,13 +182,6 @@ void FirstRunWizard::onCardDatabaseUpdateFinished(bool success) } } -void FirstRunWizard::onCardDatabaseUpdateProgress(const QString &stage, qint64 done, qint64 total) -{ - if (cardDatabasePage) { - cardDatabasePage->onUpdateProgress(stage, done, total); - } -} - void FirstRunWizard::finish() { accept(); diff --git a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h index 21d7b6e06..2c186ef95 100644 --- a/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h +++ b/cockatrice/src/interface/widgets/onboarding/first_run_wizard.h @@ -37,9 +37,6 @@ public slots: /** @brief Forwarded from MainWindow once the background card database update process exits. */ void onCardDatabaseUpdateFinished(bool success); - /** @brief Forwarded from MainWindow while the background card database update process runs. */ - void onCardDatabaseUpdateProgress(const QString &stage, qint64 done, qint64 total); - protected: void closeEvent(QCloseEvent *event) override; void changeEvent(QEvent *event) override; diff --git a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp index 50e8ff63d..12116de7a 100644 --- a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp +++ b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include #include @@ -180,25 +179,6 @@ void CardDatabaseSetupPage::onUpdateFinished(bool success) } } -void CardDatabaseSetupPage::onUpdateProgress(const QString &stage, qint64 done, qint64 total) -{ - if (state != State::Running) { - return; - } - progressBar->setRange(0, total > 0 ? static_cast(qMin(total, INT_MAX)) : 0); - progressBar->setValue(static_cast(qMin(done, INT_MAX))); - if (total > 0) { - const int percent = static_cast((100.0 * done) / total); - if (stage == QLatin1String("download")) { - statusLabel->setText(tr("Downloading the card database (%1%)…").arg(percent)); - } else if (stage == QLatin1String("scan")) { - statusLabel->setText(tr("Parsing the card database (%1%)…").arg(percent)); - } else if (stage == QLatin1String("import")) { - statusLabel->setText(tr("Importing cards (%1%)…").arg(percent)); - } - } -} - QString CardDatabaseSetupPage::nextButtonText() const { return state == State::NotStarted ? tr("Download") : QString(); diff --git a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h index 870e759ea..0461d11d5 100644 --- a/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h +++ b/cockatrice/src/interface/widgets/onboarding/pages/card_database_setup_page.h @@ -30,7 +30,6 @@ public: void retranslateUi() override; void onUpdateFinished(bool success); - void onUpdateProgress(const QString &stage, qint64 done, qint64 total); signals: void updateRequested(); diff --git a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp index 797fe4425..3293b19ac 100644 --- a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp +++ b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.cpp @@ -14,31 +14,10 @@ #include #include #include -#include #include #include #include -namespace -{ -/** @brief A theme's shipped identity accent, immune to any user- or auto- - * generated palette that may currently be masking appColor(). */ -QColor themeIdentityAccent(const QString &themeDirPath, const QString &themeName) -{ - for (const QString &scheme : {QStringLiteral("Light"), QStringLiteral("Dark")}) { - const PaletteConfig cfg = ThemeManager::loadDefaultPaletteConfig(themeDirPath, themeName, scheme); - if (cfg.appColors.contains(AppColor::AccentStrong)) { - return cfg.appColors.value(AppColor::AccentStrong); - } - const QColor highlight = cfg.colors.value(QPalette::Active).value(QPalette::Highlight); - if (highlight.isValid()) { - return highlight; - } - } - return {}; -} -} // namespace - ThemeSetupPage::ThemeSetupPage(QWidget *parent) : FirstRunWizardPage(parent) { themeCombo = new QComboBox(this); @@ -51,15 +30,6 @@ ThemeSetupPage::ThemeSetupPage(QWidget *parent) : FirstRunWizardPage(parent) quickSetupPanel = new QuickSetupPanel(this); - // Seed the picker from the current theme's own identity accent rather than - // a hardcoded brand green: Plasma seeds violet, Fusion green, etc., and it - // is immune to stale generated palettes that may mask appColor(). This was - // initially a brand-green workaround from before Fusion became the default. - // setAccentColor blocks signals, so this never triggers a generation. - lastSeededTheme = SettingsCache::instance().getThemeName(); - quickSetupPanel->setAccentColor( - themeIdentityAccent(themeManager->getAvailableThemes().value(lastSeededTheme), lastSeededTheme)); - connect(themeCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &ThemeSetupPage::onThemeChanged); connect(schemeCombo, QOverload::of(&QComboBox::currentIndexChanged), this, &ThemeSetupPage::onSchemeChanged); connect(quickSetupPanel, &QuickSetupPanel::valueChanged, this, &ThemeSetupPage::onGenerateFromAccent); @@ -77,8 +47,7 @@ ThemeSetupPage::ThemeSetupPage(QWidget *parent) : FirstRunWizardPage(parent) // Mirrors AppearanceSettingsPage's identical listener for the combo-sync // half of this. connect(themeManager, &ThemeManager::themeChanged, this, [this] { - const QString newTheme = SettingsCache::instance().getThemeName(); - const QString newDir = themeManager->getAvailableThemes().value(newTheme); + const QString newDir = themeManager->getAvailableThemes().value(SettingsCache::instance().getThemeName()); const ThemeConfig cfg = ThemeConfig::fromThemeDir(newDir); const QString current = cfg.colorScheme; @@ -87,14 +56,6 @@ ThemeSetupPage::ThemeSetupPage(QWidget *parent) : FirstRunWizardPage(parent) schemeCombo->setCurrentIndex(idx >= 0 ? idx : 0); schemeCombo->blockSignals(false); - // Keep the picker's accent in step with the theme's own identity; the - // swatch seeded at construction would otherwise stay stale (e.g. green - // from a previous theme) when the user toggles themes. - if (newTheme != lastSeededTheme) { - lastSeededTheme = newTheme; - quickSetupPanel->setAccentColor(themeIdentityAccent(newDir, newTheme)); - } - maybeAutoGeneratePalette(); }); @@ -197,14 +158,8 @@ void ThemeSetupPage::maybeAutoGeneratePalette() const QString dirPath = themeManager->getAvailableThemes().value(SettingsCache::instance().getThemeName()); const QString scheme = resolvedScheme(); - // The theme dir may resolve to the user profile even for built-in themes - // (getAvailableThemes gives the user copy precedence), so consult the - // shipped palette too -- both via loadDefaultPaletteConfig's system fallback. - // Without it, scheme flips regenerate a fresh palette from the picker accent - // and clobber the curated colours the theme explicitly ships. if (PaletteConfig::fromScheme(dirPath, scheme).hasPalette() || - ThemeManager::loadDefaultPaletteConfig(dirPath, SettingsCache::instance().getThemeName(), scheme) - .hasPalette()) { + PaletteConfig::fromDefault(dirPath, scheme).hasPalette()) { return; // theme already has something real to show -- leave it alone } diff --git a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h index 16a3c9a5d..d1f84c1b9 100644 --- a/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h +++ b/cockatrice/src/interface/widgets/onboarding/pages/theme_setup_page.h @@ -53,9 +53,6 @@ private: QComboBox *homeTabBackgroundCombo; bool paletteDirty = false; - - /// Theme whose identity accent currently seeds the picker. - QString lastSeededTheme; }; #endif // THEME_SETUP_PAGE_H diff --git a/cockatrice/src/interface/widgets/onboarding/qml/BrandBanner.qml b/cockatrice/src/interface/widgets/onboarding/qml/BrandBanner.qml index d94e15280..f1a385cad 100644 --- a/cockatrice/src/interface/widgets/onboarding/qml/BrandBanner.qml +++ b/cockatrice/src/interface/widgets/onboarding/qml/BrandBanner.qml @@ -16,8 +16,6 @@ Item { property vector4d uColorA: Qt.vector4d(bannerConfig.colorA.r, bannerConfig.colorA.g, bannerConfig.colorA.b, 1.0) property vector4d uColorB: Qt.vector4d(bannerConfig.colorB.r, bannerConfig.colorB.g, bannerConfig.colorB.b, 1.0) property vector4d uAccent: Qt.vector4d(bannerConfig.accent.r, bannerConfig.accent.g, bannerConfig.accent.b, 1.0) - property vector4d uGlowColor: Qt.vector4d(bannerConfig.glowColor.r, bannerConfig.glowColor.g, bannerConfig.glowColor.b, 1.0) - property real uVignetteMin: bannerConfig.vignetteMin property real uLogoGlow: bannerConfig.logoGlow fragmentShader: "qrc:/onboarding/shaders/brand_banner.frag.qsb" } @@ -35,62 +33,30 @@ Item { property vector4d uColorA: Qt.vector4d(bannerConfig.colorA.r, bannerConfig.colorA.g, bannerConfig.colorA.b, 1.0) property vector4d uColorB: Qt.vector4d(bannerConfig.colorB.r, bannerConfig.colorB.g, bannerConfig.colorB.b, 1.0) property vector4d uAccent: Qt.vector4d(bannerConfig.accent.r, bannerConfig.accent.g, bannerConfig.accent.b, 1.0) - property vector4d uGlowColor: Qt.vector4d(bannerConfig.glowColor.r, bannerConfig.glowColor.g, bannerConfig.glowColor.b, 1.0) - property real uVignetteMin: bannerConfig.vignetteMin property real uLogoGlow: bannerConfig.logoGlow fragmentShader: "qrc:/onboarding/shaders/brand_banner.frag.qsb" } - // The white logo sits at full opacity on top of the static gradient plate — - // no glow, no breathing. The plate matches home_widget's QPainter composite. - Item { - id: logoHost - visible: bannerConfig.logoVisible + // The hero logo itself — breathes cleanly over a 0.5–1.0 opacity range + Image { + id: logo anchors.centerIn: parent + visible: bannerConfig.logoVisible + source: "qrc:/resources/cockatrice-logo-white.svg" width: root.height * 0.6 - height: width + height: width * (sourceSize.height > 0 ? sourceSize.height / Math.max(sourceSize.width, 1) : 1) + fillMode: Image.PreserveAspectFit + smooth: true + opacity: 0.5 + 0.5 * bannerConfig.logoGlow + sourceSize: Qt.size(256, 256) - // The full-color logo renders beneath the white mark and is consumed as - // a texture (layer.enabled) by the plate shader's silhouette mask, so - // the gradient is clipped to the bird exactly as the SVG's gradient - // paths are. It is never drawn to the screen itself. - Image { - id: silhouetteMask - anchors.fill: parent - source: "qrc:/resources/cockatrice.svg" - sourceSize: Qt.size(256, 256) - fillMode: Image.PreserveAspectFit - smooth: true - visible: false - layer.enabled: true - layer.smooth: true - } + Behavior on opacity { NumberAnimation { duration: 300; easing.type: Easing.InOutSine } } - // The logo's gradient plate, drawn behind the mark: a linear - // AccentSoft (light) -> AccentStrong (dark) sheet along the same - // top-left -> bottom-right userSpaceOnUse axis the baked-in SVG used, - // clipped to the bird silhouette via uSilhouette. The white highlight - // path above is theme independent. Sized to the logo itself — no - // rounded badge, matching home_widget's QPainter composite. Static. - // Small ShaderEffect, Qt 6.4-safe. - ShaderEffect { - id: brandPlate - anchors.fill: parent - property vector4d uStrong: Qt.vector4d(bannerConfig.brandStrong.r, bannerConfig.brandStrong.g, - bannerConfig.brandStrong.b, 1.0) - property vector4d uSoft: Qt.vector4d(bannerConfig.brandSoft.r, bannerConfig.brandSoft.g, - bannerConfig.brandSoft.b, 1.0) - property var uSilhouette: silhouetteMask - fragmentShader: "qrc:/onboarding/shaders/brand_plate.frag.qsb" - } - - Image { - id: logoImage - anchors.fill: parent - source: "qrc:/resources/cockatrice-logo-white.svg" - sourceSize: Qt.size(256, 256) - fillMode: Image.PreserveAspectFit - smooth: true + transform: Scale { + origin.x: logo.width / 2 + origin.y: logo.height / 2 + xScale: 0.94 + 0.06 * bannerConfig.logoGlow + yScale: 0.94 + 0.06 * bannerConfig.logoGlow } } -} \ No newline at end of file +} diff --git a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp index 0b9f65783..fd1fb2a98 100644 --- a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp +++ b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.cpp @@ -1,10 +1,7 @@ #include "shader_banner_widget.h" -#include "../../theme_manager.h" #include "banner_shader_config.h" -#include "brand_colors.h" -#include #include #include #include @@ -14,98 +11,11 @@ namespace { -// Curated near-black stage -- used only when the active palette resolves no -// usable window colour. Matches the banner's original design (dark and quiet -// so the accent stands out) and satisfies design-plans §2.1's "identity -// survives a bare palette". -constexpr QRgb kFallbackColorA = 0x1A1A20; -constexpr QRgb kFallbackColorB = 0x0E0E12; - -struct SuggestedColors -{ - QColor colorA; - QColor colorB; - QColor accent; - QColor glowColor; - QColor brandStrong; - QColor brandSoft; - qreal vignetteMin = 0.62; -}; - -SuggestedColors suggestedBannerColors() -{ - const QPalette &pal = qApp->palette(); - const QColor window = pal.color(QPalette::Active, QPalette::Window); - // Identity accent: the theme's [AppColors] AccentStrong, which appColor() - // resolves to QPalette::Highlight when a theme doesn't pin AccentStrong. - // Reading bare Highlight ignored curated accent tokens (Plasma's violet - // vs Default's green) whenever a palette didn't set the role itself. - const QColor accentStrong = themeManager->appColor(AppColor::AccentStrong); - if (!window.isValid() || !accentStrong.isValid()) { - return {QColor(kFallbackColorA), - QColor(kFallbackColorB), - kCockatriceBrandGreen, - QColor(Qt::white), - kCockatriceBrandGreen, - QColor(0xC9, 0xFD, 0x62), - 0.62}; - } - - // The theme's brand pair: AccentStrong is the deep green, AccentSoft the - // lime. These two appColors form the logo's "surrounding gradient" (deep - // core grading out to the soft, brand-toned glow) on both the banner and - // the home screen. - const QColor brandStrong = accentStrong; - const QColor brandSoft = themeManager->appColor(AppColor::AccentSoft); - - // Dress the stage for the scheme so the banner never fights the - // surrounding window in either mode. Dark palettes keep the original - // quiet near-black stage (lightness 29 → 16) with the theme's window - // hue; light palettes get a pastel "frosted accent" treatment built from - // the accent hue instead of a plain near-white copy: a coloured wash that - // clearly belongs to the theme. - const qreal luma = 0.299 * window.red() + 0.587 * window.green() + 0.114 * window.blue(); - const bool lightStage = luma > 115.0; - if (lightStage) { - const int hue = accentStrong.hslHue(); - // Achromatic accents (grey) get a neutral near-white stage instead. - const int stageSat = hue < 0 ? 0 : 64; - const int hueSafe = hue < 0 ? 0 : hue; - // Depth is what stops a light stage reading as a washed-out near-white - // copy of the page behind the banner: deepen the lower pastel band and - // raise saturation so the hue is clearly present while staying frosted. - auto pastel = [hueSafe, stageSat](int lightness) { return QColor::fromHsl(hueSafe, stageSat, lightness); }; - auto pastelLower = [hueSafe](int lightness) { return QColor::fromHsl(hueSafe, 76, lightness); }; - // Brightness-lifted accent for additive glows: the raw accent on a - // light stage must be mid-bright to read instead of washing out, so - // lift lightness and saturation together. - const int accentLightness = qBound(158, accentStrong.lightness() + 82, 198); - const int accentSaturation = hue < 0 ? 0 : qMax(accentStrong.hslSaturation(), 180); - const QColor liftedAccent = - hue < 0 ? accentStrong : QColor::fromHsl(hueSafe, accentSaturation, accentLightness); - // The centre glow (and logo tint in QML) uses the deep accent itself: - // a coloured halo/fill behind the logo instead of a white or black one. - return {pastel(214), pastelLower(186), liftedAccent, accentStrong, brandStrong, brandSoft, 0.80}; - } - - // Dark stage: force the window hue down to the banner's curated darkness, - // scaling saturation away so chromatic palettes tint it without going - // muddy. The accent is the bright, brand-driven tone (hue from the accent - // itself, never the -- often grey -- window), and it drives both the - // embers/fog and the logo glow so the mark tints like the light stage. - auto stage = [&window](int lightness) { - const int hue = window.hslHue(); - const int saturation = hue < 0 ? 0 : qBound(0, qRound(window.hslSaturation() * (lightness / 40.0)), 255); - return QColor::fromHsl(hue, saturation, lightness); - }; - const int accentHue = accentStrong.hslHue(); - const int accentHueSafe = accentHue < 0 ? 0 : accentHue; - const int accentLightness = qBound(150, accentStrong.lightness() + 70, 185); - const int accentSaturation = accentHue < 0 ? 0 : qMax(accentStrong.hslSaturation(), 160); - const QColor accent = - accentHue < 0 ? accentStrong : QColor::fromHsl(accentHueSafe, accentSaturation, accentLightness); - return {stage(29), stage(16), accent, accent, brandStrong, brandSoft, 0.62}; -} +// Near-black base palette -- the background is dark and quiet so the green +// accent stands out. +constexpr QRgb kColorA = 0x1A1A20; +constexpr QRgb kColorB = 0x0E0E12; +constexpr QRgb kAccent = 0x8BDD6B; } // namespace class GradientFallbackWidget : public QWidget @@ -113,27 +23,15 @@ class GradientFallbackWidget : public QWidget public: using QWidget::QWidget; - void setColors(const QColor &a, const QColor &b) - { - if (a != colorA || b != colorB) { - colorA = a; - colorB = b; - } - } - protected: void paintEvent(QPaintEvent *) override { QPainter painter(this); QLinearGradient gradient(0, 0, width(), height()); - gradient.setColorAt(0.0, colorA); - gradient.setColorAt(1.0, colorB); + gradient.setColorAt(0.0, QColor(kColorA)); + gradient.setColorAt(1.0, QColor(kColorB)); painter.fillRect(rect(), gradient); } - -private: - QColor colorA{QColor(kFallbackColorA)}; - QColor colorB{QColor(kFallbackColorB)}; }; BannerHost::BannerHost(QWidget *parent) : QWidget(parent) @@ -164,9 +62,6 @@ BannerHost::BannerHost(QWidget *parent) : QWidget(parent) connect(&clock, &QTimer::timeout, this, &BannerHost::tick); clock.setInterval(16); // ~60fps; the shader itself is cheap, this is just a wall clock - connect(themeManager, &ThemeManager::themeChanged, this, &BannerHost::applyThemeColors); - applyThemeColors(); - applyMotifPreset(currentMotif); updateAspect(); } @@ -228,9 +123,9 @@ void BannerHost::applyMotifPreset(Motif motif) const Preset p = presetFor(motif); - config->setColorA(bannerColorA); - config->setColorB(bannerColorB); - config->setAccent(bannerAccent); + config->setColorA(QColor(kColorA)); + config->setColorB(QColor(kColorB)); + config->setAccent(QColor(kAccent)); config->setLogoVisible(motif == Motif::Welcome); if (isFirstApply) { @@ -288,34 +183,8 @@ void BannerHost::hideEvent(QHideEvent *event) clock.stop(); } -void BannerHost::applyThemeColors() -{ - const SuggestedColors colors = suggestedBannerColors(); - bannerColorA = colors.colorA; - bannerColorB = colors.colorB; - bannerAccent = colors.accent; - - if (usingFallback) { - fallback->setColors(bannerColorA, bannerColorB); - fallback->update(); - } else if (config) { - config->setColorA(bannerColorA); - config->setColorB(bannerColorB); - config->setAccent(bannerAccent); - config->setGlowColor(colors.glowColor); - config->setBrandStrong(colors.brandStrong); - config->setBrandSoft(colors.brandSoft); - config->setVignetteMin(colors.vignetteMin); - } -} - void BannerHost::tick() { - // Palette previews (e.g. accent drags in the wizard's QuickSetupPanel) - // apply qApp->palette() without firing themeChanged, so re-derive here; - // BannerShaderConfig's setters are equality-guarded, so this is a no-op - // unless the colours actually changed. - applyThemeColors(); if (config) { qreal t = elapsed.elapsed() / 1000.0; config->setTime(t); diff --git a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h index ac47b1141..2e230ad7f 100644 --- a/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h +++ b/cockatrice/src/interface/widgets/onboarding/shader_banner_widget.h @@ -1,7 +1,6 @@ #ifndef SHADER_BANNER_WIDGET_H #define SHADER_BANNER_WIDGET_H -#include #include #include #include @@ -54,7 +53,6 @@ protected: private slots: void tick(); void onSceneGraphFailed(); - void applyThemeColors(); private: struct Preset @@ -75,12 +73,6 @@ private: BannerShaderConfig *config = nullptr; GradientFallbackWidget *fallback = nullptr; - // Palette-derived banner colours -- the theme's window hue forced down to - // the banner's curated darkness, plus the theme's Highlight as accent. - QColor bannerColorA; - QColor bannerColorB; - QColor bannerAccent; - QTimer clock; QElapsedTimer elapsed; Motif currentMotif = Motif::Welcome; diff --git a/cockatrice/src/interface/widgets/onboarding/shaders/brand_banner.frag b/cockatrice/src/interface/widgets/onboarding/shaders/brand_banner.frag index 2bf6d0abf..508bd4bc4 100644 --- a/cockatrice/src/interface/widgets/onboarding/shaders/brand_banner.frag +++ b/cockatrice/src/interface/widgets/onboarding/shaders/brand_banner.frag @@ -28,8 +28,6 @@ layout(std140, binding = 0) uniform buf vec4 uColorA; vec4 uColorB; vec4 uAccent; - vec4 uGlowColor; - float uVignetteMin; float uLogoGlow; }; @@ -121,7 +119,7 @@ vec3 backgroundField(vec2 uv, float time) // Accent-coloured fog layer: flowNoise peaks above 0.6 contribute accent float fog = flowNoise(uv * 0.8 + vec2(100.0, 50.0), time * 0.02); - col += uAccent.rgb * max(fog - 0.6, 0.0) * 0.14; + col += uAccent.rgb * max(fog - 0.6, 0.0) * 0.10; return col; } @@ -138,17 +136,14 @@ vec3 motifWelcome(vec2 uv, vec3 bg, float t) vec2 center = vec2(asp * 0.5, 0.5); float cDist = length(ac - center); - // Centre bloom at logo position; intensity scales with uLogoGlow. The - // QML brandGlow halo now supplies the primary logo surround (the two - // brand appColors), so this shader bloom is deliberately kept as a subtle - // ambience rather than a competing glow. + // Centre bloom at logo position; intensity scales with uLogoGlow float centreLight = bloom(cDist, 0.08 * asp, 0.40 * asp); - col += uGlowColor.rgb * centreLight * 0.20 * uLogoGlow; + col += centreLight * 0.20 * uLogoGlow; // Flow-noise shimmer gated by Gaussian mask at centre float shimmer = flowNoise(ac * 0.8 + vec2(55.0, 33.0), t * 0.05) * 0.5 + 0.5; float shimmerMask = exp(-(cDist * cDist) / (0.18 * asp * 0.18 * asp)); - col += uGlowColor.rgb * shimmer * shimmerMask * 0.04 * uLogoGlow; + col += shimmer * shimmerMask * 0.04 * uLogoGlow; // 48 ember particles: hash-seeded position, speed, size, brightness. // Embers within a distance threshold of centre are deflected into an @@ -167,8 +162,8 @@ vec3 motifWelcome(vec2 uv, vec3 bg, float t) float pX = baseX * asp + sin(t * driftFreq + fi * 1.7) * driftAmp * asp; float pY = fract(baseY + t * riseSpeed); - float size = 0.010 + hash21(vec2(fi * 2.9, uSeed * 4.7)) * 0.014; - float bright = 0.18 + hash21(vec2(fi * 6.1, uSeed * 0.9)) * 0.32; + float size = 0.006 + hash21(vec2(fi * 2.9, uSeed * 4.7)) * 0.012; + float bright = 0.15 + hash21(vec2(fi * 6.1, uSeed * 0.9)) * 0.30; // Fade out near top/bottom edges float edgeFade = smoothstep(0.0, 0.12, pY) * smoothstep(1.0, 0.88, pY); @@ -237,7 +232,7 @@ vec3 motifCardDatabase(vec2 uv, vec3 bg, float t) // Semi-transparent dark fill float fill = smoothstep(0.015, -0.005, d); - col = mix(col, uColorB.rgb * 0.60, fill * 0.62); + col = mix(col, uColorB.rgb * 0.55, fill * 0.50); // Accent outline float edge = smoothstep(0.035, 0.0, abs(d)); @@ -314,7 +309,7 @@ vec3 motifAccount(vec2 uv, vec3 bg, float t) // Node glow via bloom; intensity modulated by pulse float dist = length(ac - pos); - col += uAccent.rgb * bloom(dist, 0.018, 0.08) * mix(0.30, 0.55, pulse); + col += uAccent.rgb * bloom(dist, 0.018, 0.08) * mix(0.20, 0.45, pulse); } // Edges: connect nodes within a radius threshold @@ -328,19 +323,19 @@ vec3 motifAccount(vec2 uv, vec3 bg, float t) vec2 ba = nodePos[j] - nodePos[i]; float h = clamp(dot(pa, ba) / dot(ba, ba), 0.0, 1.0); float lineDist = length(pa - ba * h); - col += uAccent.rgb * smoothstep(0.010, 0.0, lineDist) * strength * 0.14; + col += uAccent.rgb * smoothstep(0.010, 0.0, lineDist) * strength * 0.10; } } } // Central bloom at banner centre float cDist = length(ac - center); - col += uAccent.rgb * bloom(cDist, 0.04, 0.25) * 0.20; + col += uAccent.rgb * bloom(cDist, 0.04, 0.25) * 0.12; // Periodic expanding ring from centre float ripplePhase = t * 0.4; float rippleDist = abs(cDist - fract(ripplePhase) * asp * 0.7); - col += uAccent.rgb * smoothstep(0.02, 0.0, rippleDist) * 0.14; + col += uAccent.rgb * smoothstep(0.02, 0.0, rippleDist) * 0.10; return col; } @@ -461,8 +456,6 @@ void main() else if (uMode < 4.5) col = motifPreferences(uv, bg, t); else col = motifFinish(uv, bg, t); - // Corner vignette; uVignetteMin is scheme-driven (0.62 on dark stages, - // gentler on light ones so near-white corners don't go muddy grey). - col *= mix(uVignetteMin, 1.0, vignette(uv)); + col *= mix(0.62, 1.0, vignette(uv)); fragColor = vec4(col, 1.0) * qt_Opacity; } diff --git a/cockatrice/src/interface/widgets/onboarding/shaders/brand_plate.frag b/cockatrice/src/interface/widgets/onboarding/shaders/brand_plate.frag deleted file mode 100644 index 43b798c9f..000000000 --- a/cockatrice/src/interface/widgets/onboarding/shaders/brand_plate.frag +++ /dev/null @@ -1,42 +0,0 @@ -#version 440 - -// The logo's gradient plate, drawn by us rather than the baked-in SVG: a -// linear blend between the two brand appColors (light AccentSoft at the -// top-left grading to dark AccentStrong at the bottom-right, mirroring -// cockatrice.svg's linearGradient4265-7-8 userSpaceOnUse axis), clipped to -// the bird's full silhouette via the full-color logo's alpha (uSilhouette). -// The white highlight path (cockatrice-logo-white) is overlaid in QML on top, -// exactly as the SVG stacks its white path over the gradient paths. Fully -// static: no glow, no breathing — the plate just sits there like the home -// widget's QPainter composite. - -layout(location = 0) in vec2 qt_TexCoord0; -layout(location = 0) out vec4 fragColor; - -layout(std140, binding = 0) uniform buf -{ - mat4 qt_Matrix; - float qt_Opacity; - vec4 uStrong; - vec4 uSoft; -}; - -// The full-color logo's alpha channel acts as the silhouette mask: the -// gradient only appears inside the bird, exactly like the SVG's gradient paths. -layout(binding = 1) uniform sampler2D uSilhouette; - -void main() -{ - // Recreate cockatrice.svg's own gradient geometry (linearGradient4265-7-8, - // userSpaceOnUse): light AccentSoft at the start point S=(-8.097,-97.746), - // dark AccentStrong at the end E=(162.455,295.208), on the SVG's 300x300 - // canvas. Normalized to UV space, V=E-S=(0.5685,1.3098), so - // t = dot(uv - S_norm, V)/|V|^2 with S_norm=(-0.0270,-0.3258). - float t = clamp(dot(qt_TexCoord0 - vec2(-0.02699, -0.32582), vec2(0.56851, 1.30985)) / 2.03891, 0.0, 1.0); - vec3 color = mix(uSoft.rgb, uStrong.rgb, t); - - // Anti-aliased silhouette clip from the full-color logo's alpha. - float alpha = texture(uSilhouette, qt_TexCoord0).a; - - fragColor = vec4(color * alpha, alpha) * qt_Opacity; -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp index 9459c5ea9..57706cf93 100644 --- a/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp +++ b/cockatrice/src/interface/widgets/playmat/playmat_settings_dialog.cpp @@ -2,7 +2,6 @@ #include "../../card_picture_loader/card_picture_loader.h" #include "../cards/art_crop_attribution.h" -#include "../cards/card_art_utils.h" #include "../utility/completer_utils.h" #include "card_database_display_model.h" #include "card_database_model.h" @@ -277,7 +276,7 @@ void PlaymatSettingsDialog::reloadPreview() return; } - currentPixmap = CardArtUtils::rotateSidewaysLayoutArt(fullRes, card); + currentPixmap = fullRes; preview->setPixmap(currentPixmap); preview->setParams(currentParams); preview->setAttribution(buildArtAttribution(card)); diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp index e8816847e..0b77ca185 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp @@ -1,19 +1,13 @@ #include "printing_selector_card_overlay_widget.h" #include "../../../client/settings/cache_settings.h" -#include "../../card_picture_loader/card_picture_loader.h" #include "../cards/card_info_picture_widget.h" #include "printing_selector_card_display_widget.h" -#include -#include #include #include #include -#include #include -#include -#include #include #include #include @@ -21,49 +15,6 @@ #include #include -namespace -{ -/** - * @brief Places the preview beside the highlighted action inside the given screen. - * - * Side-aware: hugs the side of the action that has room, aligned with its row, then - * clamps every edge so the preview always lands fully on-screen on first show. - */ -QPoint -previewPositionNear(const QRect &actionRect, const QSize &labelSize, const QRect &screenGeometry, int previewOffset) -{ - const bool rightFits = actionRect.right() + previewOffset + labelSize.width() <= screenGeometry.right(); - const bool leftFits = actionRect.left() - previewOffset - labelSize.width() >= screenGeometry.left(); - - int x; - if (rightFits) { - x = actionRect.right() + previewOffset; - } else if (leftFits) { - x = actionRect.left() - previewOffset - labelSize.width(); - } else { - x = actionRect.left(); - } - x = qMax(screenGeometry.left(), x); - x = qMin(screenGeometry.right() - labelSize.width() + 1, x); - - const bool belowFits = actionRect.bottom() + previewOffset + labelSize.height() <= screenGeometry.bottom(); - const bool aboveFits = actionRect.top() - previewOffset - labelSize.height() >= screenGeometry.top(); - - int y; - if (belowFits) { - y = actionRect.bottom() + previewOffset; - } else if (aboveFits) { - y = actionRect.top() - previewOffset - labelSize.height(); - } else { - y = actionRect.top(); - } - y = qMax(screenGeometry.top(), y); - y = qMin(screenGeometry.bottom() - labelSize.height() + 1, y); - - return {x, y}; -} -} // namespace - /** * @brief Constructs a PrintingSelectorCardOverlayWidget for displaying a card overlay. * @@ -99,31 +50,6 @@ PrintingSelectorCardOverlayWidget::PrintingSelectorCardOverlayWidget(QWidget *pa initializePinBadge(); - // Parent the preview to this overlay so it is destroyed with it (Qt::ToolTip keeps - // it a frameless, non-activating top-level window despite the parent). - cardOverridePreviewLabel = new QLabel(this, Qt::ToolTip); - cardOverridePreviewLabel->setWindowFlag(Qt::FramelessWindowHint); - cardOverridePreviewLabel->setAttribute(Qt::WA_ShowWithoutActivating); - cardOverridePreviewLabel->setScaledContents(true); - cardOverridePreviewLabel->hide(); - - // While the preview is visible, keep it honest: when the hovered printing's art - // resolves (all alternate printings share the root card's CardInfo), redraw it in place. - if (rootCard.getCardPtr()) { - connect(rootCard.getCardPtr().data(), &CardInfo::pixmapUpdated, this, [this] { - if (cardOverridePreviewLabel->isVisible()) { - refreshPreview(); - } - }); - } - - // Alt-Tab / app-inactive must not strand the floating preview. - connect(qApp, &QGuiApplication::applicationStateChanged, this, [this](Qt::ApplicationState state) { - if (state != Qt::ApplicationActive) { - hidePreview(); - } - }); - // Update when this overlay emits cardPreferenceChanged or when size/scale changes connect(this, &PrintingSelectorCardOverlayWidget::cardPreferenceChanged, this, &PrintingSelectorCardOverlayWidget::updatePinBadgeVisibility); @@ -259,23 +185,19 @@ void PrintingSelectorCardOverlayWidget::leaveEvent(QEvent *event) } /** - * @brief Creates and shows the card-overlay context menu. + * @brief Creates and shows a custom context menu when the right mouse button is clicked. * - * The menu includes the card art preference (Pin/Unpin Printing), the Image Overrides - * submenu (Load Custom Image, Clear Custom Image, and one entry per alternate printing with a - * live preview), and the Show Related cards submenu. + * The context menu includes an option to show related cards, which displays a submenu with actions + * for each related card. When an action is triggered, the card information is updated, and the + * printing selector is shown. * - * @param point The local position the menu should pop at. + * @param point The position of the mouse when the right-click occurred. */ void PrintingSelectorCardOverlayWidget::customMenu(QPoint point) { QMenu menu; - hidePreview(); // Clear any preview state left over from a previous menu run. - - // Submenus are owned by the stack-allocated top-level menu (addMenu() does not - // transfer ownership). - auto *preferenceMenu = new QMenu(tr("Preference"), &menu); + auto *preferenceMenu = new QMenu(tr("Preference")); menu.addMenu(preferenceMenu); const auto &preferredProviderId = @@ -297,66 +219,8 @@ void PrintingSelectorCardOverlayWidget::customMenu(QPoint point) }); } - menu.addSeparator(); - - auto *overrideMenu = new QMenu(tr("Image Overrides"), &menu); - - auto *loadCustomAction = overrideMenu->addAction(tr("Load Custom Image...")); - auto *clearOverrideAction = overrideMenu->addAction(tr("Clear Custom Image")); - - // Nothing to clear on a card that has no local override yet. - clearOverrideAction->setEnabled(CardPictureLoader::hasLocalOverrides(rootCard)); - - overrideMenu->addSeparator(); - - const auto &allSets = rootCard.getInfo().getSets(); - - for (const auto &set : allSets) { - for (const auto &printing : set) { - if (printing == rootCard.getPrinting()) { - continue; - } - - // The submenu is already scoped to this card, so the rows lead with set + - // collector; only printings with a distinct display name add their own name. - const CardSetPtr cardSet = printing.getSet(); - if (!cardSet) { - continue; - } - - QString label = tr("%1 %2").arg(cardSet->getCorrectedShortName(), printing.getProperty("num")); - - auto *action = overrideMenu->addAction(label); - - ExactCard overrideCard(rootCard.getCardPtr(), printing); - action->setData(QVariant::fromValue(overrideCard)); - - connect(action, &QAction::triggered, this, [this, overrideCard]() { - CardPictureLoader::getInstance().installPrintingOverride(rootCard, overrideCard); - QPixmapCache::clear(); - rootCard.emitPixmapUpdated(); // refresh the overlay art in place, like the other paths - }); - } - } - - connect(clearOverrideAction, &QAction::triggered, this, [this]() { - CardPictureLoader::deleteAllLocalOverrides(rootCard); - QPixmapCache::clear(); - rootCard.emitPixmapUpdated(); // force UI refresh - }); - - connect(loadCustomAction, &QAction::triggered, this, &PrintingSelectorCardOverlayWidget::loadCustomImage); - - connect(overrideMenu, &QMenu::hovered, this, &PrintingSelectorCardOverlayWidget::showPreviewForAction); - connect(overrideMenu, &QMenu::aboutToHide, this, &PrintingSelectorCardOverlayWidget::hidePreview); - connect(overrideMenu, &QMenu::triggered, this, &PrintingSelectorCardOverlayWidget::hidePreview); - - menu.addMenu(overrideMenu); - - menu.addSeparator(); - // filling out the related cards submenu - auto *relatedMenu = new QMenu(tr("Show Related cards"), &menu); + auto *relatedMenu = new QMenu(tr("Show Related cards")); menu.addMenu(relatedMenu); auto relatedCards = rootCard.getInfo().getAllRelatedCards(); if (relatedCards.isEmpty()) { @@ -371,11 +235,7 @@ void PrintingSelectorCardOverlayWidget::customMenu(QPoint point) }); } } - // The preview anchors itself to this popup's global geometry while it is open, so the - // pointer must stay valid for the whole exec() and be dropped before the stack unwinds. - previewSourceMenu = overrideMenu; menu.exec(this->mapToGlobal(point)); - previewSourceMenu = nullptr; } /** @@ -431,136 +291,3 @@ void PrintingSelectorCardOverlayWidget::initializePinBadge() pinBadge->setVisible(false); pinBadge->raise(); } - -/** - * @brief Asks for an image file and installs it as the card's custom art. - * - * Unreadable files answer with a visible warning instead of a silent no-op. - */ -void PrintingSelectorCardOverlayWidget::loadCustomImage() -{ - QString filePath = QFileDialog::getOpenFileName(this, tr("Select Card Image"), QString(), - tr("Images (*.png *.jpg *.jpeg *.webp)")); - - if (filePath.isEmpty()) { - return; - } - - QPixmap pixmap(filePath); - if (pixmap.isNull()) { - // No silent paths: a file that cannot be read answers visibly instead of a no-op. - QMessageBox::warning(this, tr("Load Custom Image"), tr("The selected file could not be read as an image.")); - return; - } - - CardPictureLoader::getInstance().saveCardImageToLocalStorage(rootCard, pixmap, true); - - QPixmapCache::clear(); - rootCard.emitPixmapUpdated(); -} - -/** - * @brief Shows the hover preview for a highlighted printing entry in the Image Overrides submenu. - * - * QMenu::hovered fires on keyboard highlight too, so the preview appears when arrows walk - * onto a printing entry, not only under the mouse. - * - * Non-printing entries (e.g., Load Custom Image, Clear Custom Image) hide the preview. - * - * @param action The action that was highlighted. - */ -void PrintingSelectorCardOverlayWidget::showPreviewForAction(QAction *action) -{ - if (!action) { - hidePreview(); - return; - } - - const QVariant data = action->data(); - - if (!data.canConvert()) { - hidePreview(); - return; - } - - const ExactCard previewCard = qvariant_cast(data); - if (previewCard.isEmpty()) { - hidePreview(); - return; - } - - hoveredOverrideCard = previewCard; - hoveredOverrideAction = action; - refreshPreview(); -} - -/** - * @brief Renders the hover preview for the currently highlighted printing. - * - * The preview shows the loading placeholder while the art is pending and swaps in the real - * art when it resolves. The label is positioned against its already-resized geometry so the - * first-ever show at the screen's edges stays fully on-screen. - */ -void PrintingSelectorCardOverlayWidget::refreshPreview() -{ - if (hoveredOverrideCard.isEmpty()) { - hidePreview(); - return; - } - - constexpr QSize previewSize(240, 336); - constexpr int previewOffset = 20; - - QPixmap pixmap; - CardPictureLoader::getPixmap(pixmap, hoveredOverrideCard, previewSize); - - if (pixmap.isNull()) { - // Keep the preview honest while loading: show the loading placeholder instead of a void. - // Fetch at the logical size and let the label scale it, so the placeholder matches the - // real art's footprint rather than doubling on HiDPI displays. - CardPictureLoader::getCardBackLoadingInProgressPixmap(pixmap, previewSize); - } - - cardOverridePreviewLabel->setPixmap(pixmap); - // QPixmap::size() is physical pixels; the label layout must use the device-independent size - // so the preview keeps a constant footprint across DPI settings (QScreen geometry is logical). - const QSize labelSize = pixmap.deviceIndependentSize().toSize(); - cardOverridePreviewLabel->resize(labelSize); - - // Anchor the preview to the walked submenu popup rather than QCursor::pos(), which is idle - // under keyboard-only operation: a keyboard-highlighted row must preview at the same place as - // a hovered one. The mouse path is unchanged in effect — the popup sits under the cursor, so - // the preview stays beside the row in both modalities. - const QMenu *popup = previewSourceMenu; - if (!popup || !popup->isVisible() || !hoveredOverrideAction) { - hidePreview(); - return; - } - - const QRect popupGeometry = popup->geometry(); - const QRect actionRectLocal = popup->actionGeometry(hoveredOverrideAction); - const QRect actionRect(popupGeometry.topLeft() + actionRectLocal.topLeft(), actionRectLocal.size()); - - QScreen *screen = QGuiApplication::screenAt(popupGeometry.center()); - if (!screen) { - hidePreview(); - return; - } - const QRect &screenGeometry = screen->geometry(); - - cardOverridePreviewLabel->move(previewPositionNear(actionRect, labelSize, screenGeometry, previewOffset)); - cardOverridePreviewLabel->show(); -} - -/** - * @brief Hides the hover preview and forgets the currently highlighted printing. - */ -void PrintingSelectorCardOverlayWidget::hidePreview() -{ - hoveredOverrideCard = ExactCard(); - hoveredOverrideAction = nullptr; - - if (cardOverridePreviewLabel) { - cardOverridePreviewLabel->hide(); - } -} diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h index fbcfa9230..228393c9c 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h @@ -13,9 +13,6 @@ #include -class QAction; -class QMenu; - class PrintingSelectorCardOverlayWidget : public QWidget { Q_OBJECT @@ -46,19 +43,11 @@ private slots: private: void initializePinBadge(); - void loadCustomImage(); - void showPreviewForAction(QAction *action); - void refreshPreview(); - void hidePreview(); CardInfoPictureWidget *cardInfoPicture; AllZonesCardAmountWidget *allZonesCardAmountWidget; QLabel *pinBadge = nullptr; AbstractTabDeckEditor *deckEditor; ExactCard rootCard; - QLabel *cardOverridePreviewLabel = nullptr; - ExactCard hoveredOverrideCard; - QMenu *previewSourceMenu = nullptr; - QAction *hoveredOverrideAction = nullptr; }; #endif // PRINTING_SELECTOR_CARD_OVERLAY_WIDGET_H diff --git a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp index 881c3e3ac..9c433ab5a 100644 --- a/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp +++ b/cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp @@ -1,7 +1,5 @@ #include "settings_button_widget.h" -#include "../../pixel_map_generator.h" - #include #include #include @@ -10,7 +8,7 @@ SettingsButtonWidget::SettingsButtonWidget(QWidget *parent) : QWidget(parent), button(new QToolButton(this)), popup(new SettingsPopupWidget(nullptr)) { - button->setIcon(themePixmap(QStringLiteral("icons/cogwheel"))); + button->setIcon(QPixmap("theme:icons/cogwheel")); button->setCheckable(true); button->setFixedSize(32, 32); connect(button, &QToolButton::clicked, this, &SettingsButtonWidget::togglePopup); diff --git a/cockatrice/src/interface/widgets/replay/replay_manager.cpp b/cockatrice/src/interface/widgets/replay/replay_manager.cpp index c51b96b6c..a2c1e0ff0 100644 --- a/cockatrice/src/interface/widgets/replay/replay_manager.cpp +++ b/cockatrice/src/interface/widgets/replay/replay_manager.cpp @@ -142,10 +142,8 @@ void ReplayManager::processNewEvents(PlaybackMode playbackMode) } // backwards skip => always skip tap animation - // backwards skip => always skip damage animation (battlefield shimmer / life counter flash) if (playbackMode == BACKWARD_SKIP) { options |= SKIP_TAP_ANIMATION; - options |= SKIP_DAMAGE_ANIMATION; } emit eventReplayed(replay->event_list(currentEvent), options); diff --git a/cockatrice/src/interface/widgets/replay/replay_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_widget.cpp index c92771f8c..6c85d950e 100644 --- a/cockatrice/src/interface/widgets/replay/replay_widget.cpp +++ b/cockatrice/src/interface/widgets/replay/replay_widget.cpp @@ -2,7 +2,6 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" -#include "../../pixel_map_generator.h" #include "../interface/widgets/tabs/tab_game.h" #include "replay_manager.h" #include "replay_quick_settings_widget.h" @@ -51,15 +50,15 @@ ReplayWidget::ReplayWidget(QWidget *parent, GameReplay *replay) replayPlayButton = new QToolButton; replayPlayButton->setIconSize(QSize(32, 32)); QIcon playButtonIcon = QIcon(); - playButtonIcon.addPixmap(themePixmap(QStringLiteral("replay/start")), QIcon::Normal, QIcon::Off); - playButtonIcon.addPixmap(themePixmap(QStringLiteral("replay/pause")), QIcon::Normal, QIcon::On); + playButtonIcon.addPixmap(QPixmap("theme:replay/start"), QIcon::Normal, QIcon::Off); + playButtonIcon.addPixmap(QPixmap("theme:replay/pause"), QIcon::Normal, QIcon::On); replayPlayButton->setIcon(playButtonIcon); replayPlayButton->setCheckable(true); connect(replayPlayButton, &QToolButton::toggled, this, &ReplayWidget::replayPlayButtonToggled); replayFastForwardButton = new QToolButton; replayFastForwardButton->setIconSize(QSize(32, 32)); - replayFastForwardButton->setIcon(themePixmap(QStringLiteral("replay/fastforward"))); + replayFastForwardButton->setIcon(QPixmap("theme:replay/fastforward")); replayFastForwardButton->setCheckable(true); connect(replayFastForwardButton, &QToolButton::toggled, this, &ReplayWidget::updateTimeScaleFactor); diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp index 0a287c9ce..bebc2e3c4 100644 --- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp +++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp @@ -340,27 +340,16 @@ void ChatView::appendMessage(QString message, pos.relativePosition = match.captured(0).length(); // set message start auto before = match.captured(1); auto sentBy = match.captured(2); - - // The user level is not carried in the room chat history, so history - // entries used to render as fixed-level user tags. Resolve online users - // against the user list to turn their history entries into full user - // tags (correct level, name casing and moderation context menu). - QString displayName = sentBy; - // Offline users have no known level; render them as zero-level tags. - QString levelMarker = "0"; - if (const ServerInfo_User *onlineUser = userListProxy->getOnlineUser(sentBy)) { - displayName = QString::fromStdString(onlineUser->name()); - levelMarker = QString::number(onlineUser->user_level()); - } - cursor.insertText(before); // add message timestamp QTextCharFormat senderFormat(defaultFormat); senderFormat.setAnchor(true); - senderFormat.setAnchorHref("user://" + levelMarker + "_" + displayName); + // this underscore is important, it is used to add the user level, but in this case the level is + // unknown, if the name contains an underscore it would split up the name + senderFormat.setAnchorHref("user://_" + sentBy); cursor.setCharFormat(senderFormat); - cursor.insertText(displayName); // add username with href so it shows the menu - userMessagePositions[displayName].append(pos); // save message position - message.remove(0, pos.relativePosition - 2); // do not remove semicolon + cursor.insertText(sentBy); // add username with href so it shows the menu + userMessagePositions[sentBy].append(pos); // save message position + message.remove(0, pos.relativePosition - 2); // do not remove semicolon } } else { //! \todo Remove hardcoded color. diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp index 659325987..f41002247 100644 --- a/cockatrice/src/interface/widgets/server/game_selector.cpp +++ b/cockatrice/src/interface/widgets/server/game_selector.cpp @@ -1,6 +1,5 @@ #include "game_selector.h" -#include "../../pixel_map_generator.h" #include "../interface/widgets/dialogs/dlg_create_game.h" #include "../interface/widgets/dialogs/dlg_filter_games.h" #include "../interface/widgets/tabs/tab_account.h" @@ -96,10 +95,10 @@ GameSelector::GameSelector(AbstractClient *_client, } filterButton = new QPushButton; - filterButton->setIcon(themePixmap(QStringLiteral("icons/search"))); + filterButton->setIcon(QPixmap("theme:icons/search")); connect(filterButton, &QPushButton::clicked, this, &GameSelector::actSetFilter); clearFilterButton = new QPushButton; - clearFilterButton->setIcon(themePixmap(QStringLiteral("icons/clearsearch"))); + clearFilterButton->setIcon(QPixmap("theme:icons/clearsearch")); bool filtersSetToDefault = showFilters && gameListProxyModel->areFilterParametersSetToDefaults(); clearFilterButton->setEnabled(!filtersSetToDefault); connect(clearFilterButton, &QPushButton::clicked, this, &GameSelector::actClearFilter); @@ -369,7 +368,7 @@ void GameSelector::joinGame(const ServerInfo_Game &game, const bool asSpectator, return; } - bool overrideRestrictions = tabSupervisor->canOverrideGameRestrictions(); + bool overrideRestrictions = !tabSupervisor->getAdminLocked(); // Joining a full game without override privileges silently becomes a // spectator join, so ask first instead of surprising the player. @@ -462,7 +461,7 @@ void GameSelector::enableButtonsForIndex(const QModelIndex ¤t) } const ServerInfo_Game &game = gameListModel->getGame(current.data(Qt::UserRole).toInt()); - bool overrideRestrictions = tabSupervisor->canOverrideGameRestrictions(); + bool overrideRestrictions = !tabSupervisor->getAdminLocked(); spectateButton->setEnabled(game.spectators_allowed() || overrideRestrictions); joinButton->setEnabled(game.player_count() < game.max_players() || overrideRestrictions); diff --git a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp index df9dfbf53..a6add3fca 100644 --- a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp +++ b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.cpp @@ -113,7 +113,7 @@ int RemoteDeckList_TreeModel::rowCount(const QModelIndex &parent) const int RemoteDeckList_TreeModel::columnCount(const QModelIndex & /*parent*/) const { - return 4; + return 3; } QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) const @@ -121,7 +121,7 @@ QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) cons if (!index.isValid()) { return QVariant(); } - if (index.column() >= 4) { + if (index.column() >= 3) { return QVariant(); } @@ -134,29 +134,12 @@ QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) cons switch (index.column()) { case 0: return node->getName(); - case 3: - // Report the node's own bit, not the inherited effective - // state, so it stays in step with what publishing toggles. - if (node->isPublic()) { - return tr("Public"); - } - return isEffectivelyPublic(node) ? tr("Public (inherited)") : tr("Private"); default: return QVariant(); } } case Qt::DecorationRole: return index.column() == 0 ? dirIcon : QVariant(); - case Qt::ToolTipRole: - if (index.column() == 3) { - if (node->isPublic()) { - return tr("This folder is visible to other users"); - } - return isEffectivelyPublic(node) - ? tr("This folder is private, but a parent folder is public (inherited).") - : tr("This folder is only visible to you"); - } - return QVariant(); default: return QVariant(); } @@ -170,13 +153,6 @@ QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) cons return file->getId(); case 2: return file->getUploadTime(); - case 3: - // Report the node's own bit, not the inherited effective - // state, so it stays in step with what publishing toggles. - if (file->isPublic()) { - return tr("Public"); - } - return isEffectivelyPublic(file) ? tr("Public (inherited)") : tr("Private"); default: return QVariant(); } @@ -185,16 +161,6 @@ QVariant RemoteDeckList_TreeModel::data(const QModelIndex &index, int role) cons return index.column() == 0 ? fileIcon : QVariant(); case Qt::TextAlignmentRole: return index.column() == 1 ? Qt::AlignRight : Qt::AlignLeft; - case Qt::ToolTipRole: - if (index.column() == 3) { - if (file->isPublic()) { - return tr("This deck is visible to other users"); - } - return isEffectivelyPublic(file) - ? tr("This deck is private, but a parent folder is public (inherited).") - : tr("This deck is only visible to you"); - } - return QVariant(); default: return QVariant(); } @@ -217,8 +183,6 @@ QVariant RemoteDeckList_TreeModel::headerData(int section, Qt::Orientation orien return tr("ID"); case 2: return tr("Upload time"); - case 3: - return tr("Visibility"); default: return QVariant(); } @@ -275,14 +239,13 @@ void RemoteDeckList_TreeModel::addFileToTree(const ServerInfo_DeckStorage_TreeIt time.setSecsSinceEpoch(fileInfo.creation_time()); beginInsertRows(nodeToIndex(parent), parent->size(), parent->size()); - parent->append(new FileNode(QString::fromStdString(file.name()), file.id(), time, parent, fileInfo.is_public())); + parent->append(new FileNode(QString::fromStdString(file.name()), file.id(), time, parent)); endInsertRows(); } void RemoteDeckList_TreeModel::addFolderToTree(const ServerInfo_DeckStorage_TreeItem &folder, DirectoryNode *parent) { DirectoryNode *newItem = addNamedFolderToTree(QString::fromStdString(folder.name()), parent); - newItem->setIsPublic(folder.folder().is_public()); const ServerInfo_DeckStorage_Folder &folderInfo = folder.folder(); const int folderItemsSize = folderInfo.items_size(); for (int i = 0; i < folderItemsSize; ++i) { @@ -322,21 +285,6 @@ void RemoteDeckList_TreeModel::refreshTree() client->sendCommand(pend); } -bool RemoteDeckList_TreeModel::isEffectivelyPublic(const Node *node) const -{ - if (node == nullptr || node == root) { - return false; - } - const Node *current = node; - while (current != nullptr) { - if (current->isPublic()) { - return true; - } - current = current->getParent(); - } - return false; -} - void RemoteDeckList_TreeModel::clearTree() { beginResetModel(); diff --git a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h index 2cf09aff7..3dd91d7a4 100644 --- a/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h +++ b/cockatrice/src/interface/widgets/server/remote/remote_decklist_tree_widget.h @@ -27,11 +27,9 @@ public: protected: DirectoryNode *parent; QString name; - bool publicFlag; public: - explicit Node(const QString &_name, DirectoryNode *_parent = nullptr) - : parent(_parent), name(_name), publicFlag(false) + explicit Node(const QString &_name, DirectoryNode *_parent = nullptr) : parent(_parent), name(_name) { } virtual ~Node() = default; @@ -43,14 +41,6 @@ public: { return name; } - [[nodiscard]] bool isPublic() const - { - return publicFlag; - } - void setIsPublic(bool _public) - { - publicFlag = _public; - } }; class DirectoryNode : public Node, public QList { @@ -69,14 +59,9 @@ public: QDateTime uploadTime; public: - FileNode(const QString &_name, - int _id, - const QDateTime &_uploadTime, - DirectoryNode *_parent = nullptr, - bool _isPublic = false) + FileNode(const QString &_name, int _id, const QDateTime &_uploadTime, DirectoryNode *_parent = nullptr) : Node(_name, _parent), id(_id), uploadTime(_uploadTime) { - setIsPublic(_isPublic); } [[nodiscard]] int getId() const { @@ -124,11 +109,6 @@ public: { return root; } - /** - * @brief Whether a node is visible to other users (own flag or inherited - * from any ancestor folder). - */ - [[nodiscard]] bool isEffectivelyPublic(const Node *node) const; void addFileToTree(const ServerInfo_DeckStorage_TreeItem &file, DirectoryNode *parent); void addFolderToTree(const ServerInfo_DeckStorage_TreeItem &folder, DirectoryNode *parent); DirectoryNode *addNamedFolderToTree(const QString &name, DirectoryNode *parent); diff --git a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp index d62bf81aa..1f034b767 100644 --- a/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp +++ b/cockatrice/src/interface/widgets/server/remote/remote_replay_list_tree_widget.cpp @@ -1,7 +1,5 @@ #include "remote_replay_list_tree_widget.h" -#include "../../../pixel_map_generator.h" - #include #include #include @@ -39,7 +37,7 @@ RemoteReplayList_TreeModel::RemoteReplayList_TreeModel(AbstractClient *_client, QFileIconProvider fip; dirIcon = fip.icon(QFileIconProvider::Folder); fileIcon = fip.icon(QFileIconProvider::File); - lockIcon = themePixmap(QStringLiteral("icons/lock")); + lockIcon = QPixmap("theme:icons/lock"); } RemoteReplayList_TreeModel::~RemoteReplayList_TreeModel() diff --git a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp index 2ba745715..3a1876fa1 100644 --- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.cpp @@ -1,7 +1,6 @@ #include "user_card_art_provider.h" #include "../../../card_picture_loader/card_picture_loader.h" -#include "../../cards/card_art_utils.h" #include #include @@ -53,25 +52,16 @@ void UserCardArtProvider::requestCardArt(const QString &userName, const QString processQueue(); } -QPixmap UserCardArtProvider::cropCardArt(const QPixmap &fullRes, const ExactCard &card) +QPixmap UserCardArtProvider::cropCardArt(const QPixmap &fullRes) { - QPixmap source = fullRes; - - // Sideways-layout cards (plane, siege/battle, split) store their landscape - // artwork rotated 90° inside a portrait frame. Rotate it upright first so - // the crop below lands on the horizontal art, mirroring the way - // CardInfoPictureWidget displays these cards. - const bool landscape = card.getInfo().getUiAttributes().landscapeOrientation; - source = CardArtUtils::rotateSidewaysLayoutArt(source, card); - - const QSize sz = source.size(); + const QSize sz = fullRes.size(); const int marginX = sz.width() * 0.07; - const int topMargin = landscape ? sz.height() * 0.05 : sz.height() * 0.11; - const int bottomMargin = landscape ? sz.height() * 0.42 : sz.height() * 0.45; + const int topMargin = sz.height() * 0.11; + const int bottomMargin = sz.height() * 0.45; - const QRect artRect(marginX, topMargin, sz.width() - 2 * marginX, sz.height() - topMargin - bottomMargin); + const QRect foilRect(marginX, topMargin, sz.width() - 2 * marginX, sz.height() - topMargin - bottomMargin); - return source.copy(artRect.intersected(source.rect())); + return fullRes.copy(foilRect.intersected(fullRes.rect())); } void UserCardArtProvider::insertIntoCache(const QString &key, const QPixmap &pixmap) @@ -121,7 +111,7 @@ void UserCardArtProvider::processQueue() // Synchronous hit (already loaded/on disk) if (!fullRes.isNull()) { - insertIntoCache(key, cropCardArt(fullRes, card)); + insertIntoCache(key, cropCardArt(fullRes)); pending.remove(key); emit cardArtUpdated(userName); @@ -145,7 +135,7 @@ void UserCardArtProvider::processQueue() CardPictureLoader::getPixmap(fullRes, card, QSize(745, 1040)); if (!fullRes.isNull()) { - self->insertIntoCache(key, self->cropCardArt(fullRes, card)); + self->insertIntoCache(key, self->cropCardArt(fullRes)); } self->pending.remove(key); diff --git a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h index e8283a891..2592237c4 100644 --- a/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h +++ b/cockatrice/src/interface/widgets/server/user/user_card_art_provider.h @@ -6,7 +6,6 @@ #include #include #include -#include class UserCardArtProvider : public QObject { @@ -17,7 +16,7 @@ public: void requestCardArt(const QString &userName, const QString &cardName, const QString &providerId); const QMap &cache() const; - static QPixmap cropCardArt(const QPixmap &fullRes, const ExactCard &card); + static QPixmap cropCardArt(const QPixmap &fullRes); signals: void cardArtUpdated(const QString &userName); diff --git a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp index d49e3d540..532112964 100644 --- a/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_card_settings_dialog.cpp @@ -560,7 +560,7 @@ void UserCardArtSettingsDialog::reloadPreview() return; } - currentPixmap = UserCardArtProvider::cropCardArt(fullRes, card); + currentPixmap = UserCardArtProvider::cropCardArt(fullRes); preview->setPixmap(currentPixmap); preview->setParams(currentParams); diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp index f95ad88e4..646f2ee33 100644 --- a/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.cpp @@ -7,9 +7,9 @@ #include "../chat_view/chat_view.h" #include "../game_selector.h" #include "user_info_box.h" -#include "user_list_dialog.h" #include "user_list_manager.h" #include "user_list_proxy.h" +#include "user_list_widget.h" #include #include @@ -37,7 +37,6 @@ UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent, aDetails = new QAction(QString(), this); aChat = new QAction(QString(), this); aShowGames = new QAction(QString(), this); - aViewPublicDecks = new QAction(QString(), this); aAddToBuddyList = new QAction(QString(), this); aRemoveFromBuddyList = new QAction(QString(), this); aAddToIgnoreList = new QAction(QString(), this); @@ -52,8 +51,6 @@ UserContextMenu::UserContextMenu(TabSupervisor *_tabSupervisor, QWidget *parent, aDemoteFromMod = new QAction(QString(), this); aPromoteToJudge = new QAction(QString(), this); aDemoteFromJudge = new QAction(QString(), this); - aPromoteToDeveloper = new QAction(QString(), this); - aDemoteFromDeveloper = new QAction(QString(), this); aGetAdminNotes = new QAction(QString(), this); aInvestigateUser = new QAction(QString(), this); @@ -65,7 +62,6 @@ void UserContextMenu::retranslateUi() aDetails->setText(tr("User &details")); aChat->setText(tr("Private &chat")); aShowGames->setText(tr("Show this user's &games")); - aViewPublicDecks->setText(tr("View this user's &public decks")); aAddToBuddyList->setText(tr("Add to &buddy list")); aRemoveFromBuddyList->setText(tr("Remove from &buddy list")); aAddToIgnoreList->setText(tr("Add to &ignore list")); @@ -80,8 +76,6 @@ void UserContextMenu::retranslateUi() aDemoteFromMod->setText(tr("Dem&ote user from moderator")); aPromoteToJudge->setText(tr("Promote user to &judge")); aDemoteFromJudge->setText(tr("Demote user from judge")); - aPromoteToDeveloper->setText(tr("Promote user to &developer")); - aDemoteFromDeveloper->setText(tr("Demote user from de&veloper")); aGetAdminNotes->setText(tr("View admin notes")); aInvestigateUser->setText(tr("Investigate user")); } @@ -274,7 +268,7 @@ void UserContextMenu::adjustMod_processUserResponse(const Response &resp, const const Command_AdjustMod &cmd = commandContainer.admin_command(0).GetExtension(Command_AdjustMod::ext); if (resp.response_code() == Response::RespOk) { - if (cmd.should_be_mod() || cmd.should_be_judge() || cmd.should_be_developer()) { + if (cmd.should_be_mod() || cmd.should_be_judge()) { QMessageBox::information(static_cast(parent()), tr("Success"), tr("Successfully promoted user.")); } else { @@ -282,7 +276,7 @@ void UserContextMenu::adjustMod_processUserResponse(const Response &resp, const } } else { - if (cmd.should_be_mod() || cmd.should_be_judge() || cmd.should_be_developer()) { + if (cmd.should_be_mod() || cmd.should_be_judge()) { QMessageBox::information(static_cast(parent()), tr("Failed"), tr("Failed to promote user.")); } else { QMessageBox::information(static_cast(parent()), tr("Failed"), tr("Failed to demote user.")); @@ -378,9 +372,6 @@ void UserContextMenu::showContextMenu(const QPoint &pos, } menu->addAction(aDetails); menu->addAction(aShowGames); - if (userLevel.testFlag(ServerInfo_User::IsRegistered)) { - menu->addAction(aViewPublicDecks); - } menu->addAction(aChat); const QList inviteOptions = inviteOptionsForUser(userName); if (!inviteOptions.isEmpty()) { @@ -446,21 +437,11 @@ void UserContextMenu::showContextMenu(const QPoint &pos, (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsAdmin)) { menu->addAction(aPromoteToJudge); } - - if (userLevel.testFlag(ServerInfo_User::IsDeveloper) && - (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsAdmin)) { - menu->addAction(aDemoteFromDeveloper); - - } else if (userLevel.testFlag(ServerInfo_User::IsRegistered) && - (tabSupervisor->getUserInfo()->user_level() & ServerInfo_User::IsAdmin)) { - menu->addAction(aPromoteToDeveloper); - } } aDetails->setEnabled(true); - aChat->setEnabled(anotherUser && online && !userListProxy->isUserIgnored(userName)); + aChat->setEnabled(anotherUser && online); aShowGames->setEnabled(online); aReport->setEnabled(anotherUser); - aViewPublicDecks->setEnabled(anotherUser); aAddToBuddyList->setEnabled(anotherUser); aRemoveFromBuddyList->setEnabled(anotherUser); aAddToIgnoreList->setEnabled(anotherUser); @@ -474,10 +455,6 @@ void UserContextMenu::showContextMenu(const QPoint &pos, aInvestigateUser->setEnabled(anotherUser); aPromoteToMod->setEnabled(anotherUser); aDemoteFromMod->setEnabled(anotherUser); - aPromoteToJudge->setEnabled(anotherUser); - aDemoteFromJudge->setEnabled(anotherUser); - aPromoteToDeveloper->setEnabled(anotherUser); - aDemoteFromDeveloper->setEnabled(anotherUser); QAction *actionClicked = menu->exec(pos); if (actionClicked == nullptr) { @@ -487,8 +464,6 @@ void UserContextMenu::showContextMenu(const QPoint &pos, execChat(userName); } else if (actionClicked == aShowGames) { execShowGames(userName); - } else if (actionClicked == aViewPublicDecks) { - execViewPublicDecks(userName); } else if (actionClicked == aAddToBuddyList) { execAddToBuddy(userName); } else if (actionClicked == aRemoveFromBuddyList) { @@ -514,8 +489,6 @@ void UserContextMenu::showContextMenu(const QPoint &pos, execAdjustMod(userName, actionClicked == aPromoteToMod); } else if (actionClicked == aPromoteToJudge || actionClicked == aDemoteFromJudge) { execAdjustJudge(userName, actionClicked == aPromoteToJudge); - } else if (actionClicked == aPromoteToDeveloper || actionClicked == aDemoteFromDeveloper) { - execAdjustDeveloper(userName, actionClicked == aPromoteToDeveloper); } else if (actionClicked == aBanHistory) { execBanHistory(userName); } else if (actionClicked == aWarnUser) { @@ -612,11 +585,6 @@ void UserContextMenu::execShowGames(const QString &userName) client->sendCommand(pend); } -void UserContextMenu::execViewPublicDecks(const QString &userName) -{ - tabSupervisor->openTabPublicDecks(userName); -} - void UserContextMenu::execAddToBuddy(const QString &userName) { Command_AddToList cmd; @@ -638,15 +606,7 @@ void UserContextMenu::execAddToIgnore(const QString &userName) Command_AddToList cmd; cmd.set_list("ignore"); cmd.set_user_name(userName.toStdString()); - PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, - [this, userName](const Response &response, const CommandContainer &, const QVariant &) { - if (response.response_code() == Response::RespOk) { - QMessageBox::information(static_cast(parent()), tr("Ignore list"), - tr("%1 has been added to your ignore list.").arg(userName)); - } - }); - client->sendCommand(pend); + client->sendCommand(client->prepareSessionCommand(cmd)); } void UserContextMenu::execRemoveFromIgnore(const QString &userName) @@ -738,14 +698,4 @@ void UserContextMenu::execAdjustJudge(const QString &userName, bool shouldBeJudg PendingCommand *pend = client->prepareAdminCommand(cmd); connect(pend, &PendingCommand::finished, this, &UserContextMenu::adjustMod_processUserResponse); client->sendCommand(pend); -} - -void UserContextMenu::execAdjustDeveloper(const QString &userName, bool shouldBeDeveloper) -{ - Command_AdjustMod cmd; - cmd.set_user_name(userName.toStdString()); - cmd.set_should_be_developer(shouldBeDeveloper); - PendingCommand *pend = client->prepareAdminCommand(cmd); - connect(pend, &PendingCommand::finished, this, &UserContextMenu::adjustMod_processUserResponse); - client->sendCommand(pend); -} +} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/user/user_context_menu.h b/cockatrice/src/interface/widgets/server/user/user_context_menu.h index 0922eae94..f1ce931f8 100644 --- a/cockatrice/src/interface/widgets/server/user/user_context_menu.h +++ b/cockatrice/src/interface/widgets/server/user/user_context_menu.h @@ -37,7 +37,6 @@ private: QAction *aUserName; QAction *aDetails; QAction *aShowGames; - QAction *aViewPublicDecks; QAction *aChat; QAction *aAddToBuddyList, *aRemoveFromBuddyList; QAction *aAddToIgnoreList, *aRemoveFromIgnoreList; @@ -46,7 +45,6 @@ private: QAction *aBan, *aBanHistory; QAction *aPromoteToMod, *aDemoteFromMod; QAction *aPromoteToJudge, *aDemoteFromJudge; - QAction *aPromoteToDeveloper, *aDemoteFromDeveloper; QAction *aWarnUser, *aWarnHistory; QAction *aGetAdminNotes; std::function()> gameInviteLinkProvider; @@ -112,7 +110,6 @@ public: void execInvite(const QString &userName); void execDetails(const QString &userName); void execShowGames(const QString &userName); - void execViewPublicDecks(const QString &userName); void execAddToBuddy(const QString &userName); void execRemoveFromBuddy(const QString &userName); void execAddToIgnore(const QString &userName); @@ -126,7 +123,6 @@ public: void execInvestigateUser(const QString &userName); void execAdjustMod(const QString &userName, bool shouldBeMod); void execAdjustJudge(const QString &userName, bool shouldBeJudge); - void execAdjustDeveloper(const QString &userName, bool shouldBeDeveloper); private: void execInvite(const QString &userName, const GameInviteOption &option); diff --git a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp index 3d89cecf5..875bdfb05 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_box.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_info_box.cpp @@ -122,8 +122,6 @@ void UserInfoBox::updateInfo(const ServerInfo_User &user) QString userLevelText; if (userLevel.testFlag(ServerInfo_User::IsAdmin)) { userLevelText = tr("Administrator"); - } else if (userLevel.testFlag(ServerInfo_User::IsDeveloper)) { - userLevelText = tr("Developer"); } else if (userLevel.testFlag(ServerInfo_User::IsModerator)) { userLevelText = tr("Moderator"); } else if (userLevel.testFlag(ServerInfo_User::IsRegistered)) { diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp index 8be76eea0..f6f34a6a5 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.cpp @@ -245,9 +245,6 @@ void UserInfoHeaderWidget::paintEvent(QPaintEvent *) if (level.testFlag(ServerInfo_User::IsAdmin)) { return QColor(245, 158, 11); } - if (level.testFlag(ServerInfo_User::IsDeveloper)) { - return QColor(185, 28, 28); - } if (level.testFlag(ServerInfo_User::IsModerator)) { return QColor(59, 130, 246); } @@ -303,8 +300,6 @@ void UserInfoHeaderWidget::paintEvent(QPaintEvent *) } badge; if (level.testFlag(ServerInfo_User::IsAdmin)) { badge = {"ADMIN", QColor(245, 158, 11)}; - } else if (level.testFlag(ServerInfo_User::IsDeveloper)) { - badge = {"DEV", QColor(185, 28, 28)}; } else if (level.testFlag(ServerInfo_User::IsModerator)) { badge = {"MOD", QColor(59, 130, 246)}; } else if (level.testFlag(ServerInfo_User::IsJudge)) { @@ -530,13 +525,6 @@ void UserInfoPopup::rebuildActionButtons(const ServerInfo_User &userInfo, bool o connect(games, &QPushButton::clicked, this, [this, name] { emit showGamesRequested(name); }); add(games); - // ── Invite (only while the inviter has a joinable game for this user) ──── - if (!isSelf && online && gameInviteAvailable && gameInviteAvailable(name)) { - auto *invite = makeBtn(tr("Invite"), tr("Invite to your game"), actionArea, theme); - connect(invite, &QPushButton::clicked, this, [this, name] { emit inviteRequested(name); }); - add(invite); - } - // ── Buddy / ignore (registered users only) ──────────────────────────────── if (!isSelf && isReg) { if (isBuddy) { diff --git a/cockatrice/src/interface/widgets/server/user/user_info_popup.h b/cockatrice/src/interface/widgets/server/user/user_info_popup.h index ed7320fba..02cc2b44e 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_popup.h +++ b/cockatrice/src/interface/widgets/server/user/user_info_popup.h @@ -9,7 +9,6 @@ #include #include #include -#include #include #include #include @@ -150,17 +149,6 @@ public: /** Re-pulls the avatar/card art for the currently shown user (e.g. after it loads). */ void refreshHeader(); - /** - * Sets a predicate evaluated on every action-button rebuild. It receives - * the name of the user the popup currently shows; when it returns true an - * "Invite" button is shown. The popup itself never resolves the invite - * link, it just forwards the request. - */ - void setGameInviteAvailable(std::function available) - { - gameInviteAvailable = std::move(available); - } - signals: void mouseEnteredPopup(); void mouseLeftPopup(); @@ -171,7 +159,6 @@ signals: // ── Action signals — connect to UserContextMenu::exec*() ────────────────── void chatRequested(const QString &userName); - void inviteRequested(const QString &userName); void detailsRequested(const QString &userName); void showGamesRequested(const QString &userName); void addBuddyRequested(const QString &userName); @@ -213,7 +200,6 @@ private: QString currentUser; ServerInfo_User currentUserInfo; bool currentOnline = false; - std::function gameInviteAvailable; UserInfoHeaderWidget *header; QWidget *actionArea; ///< rebuilt per user diff --git a/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp b/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp deleted file mode 100644 index fc5b520ad..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_list_dialog.cpp +++ /dev/null @@ -1,302 +0,0 @@ -#include "user_list_dialog.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent) -{ - setAttribute(Qt::WA_DeleteOnClose); - - nameBanCheckBox = new QCheckBox(tr("ban &user name")); - nameBanCheckBox->setChecked(true); - nameBanEdit = new QLineEdit(QString::fromStdString(info.name())); - nameBanEdit->setMaxLength(MAX_NAME_LENGTH); - ipBanCheckBox = new QCheckBox(tr("ban &IP address")); - ipBanCheckBox->setChecked(true); - ipBanEdit = new QLineEdit(QString::fromStdString(info.address())); - ipBanEdit->setMaxLength(MAX_NAME_LENGTH); - idBanCheckBox = new QCheckBox(tr("ban client I&D")); - idBanCheckBox->setChecked(true); - idBanEdit = new QLineEdit(QString::fromStdString(info.clientid())); - idBanEdit->setMaxLength(MAX_NAME_LENGTH); - if (QString::fromStdString(info.clientid()).isEmpty()) { - idBanCheckBox->setChecked(false); - } - - QGridLayout *banTypeGrid = new QGridLayout; - banTypeGrid->addWidget(nameBanCheckBox, 0, 0); - banTypeGrid->addWidget(nameBanEdit, 0, 1); - banTypeGrid->addWidget(ipBanCheckBox, 1, 0); - banTypeGrid->addWidget(ipBanEdit, 1, 1); - banTypeGrid->addWidget(idBanCheckBox, 2, 0); - banTypeGrid->addWidget(idBanEdit, 2, 1); - QGroupBox *banTypeGroupBox = new QGroupBox(tr("Ban type")); - banTypeGroupBox->setLayout(banTypeGrid); - - permanentRadio = new QRadioButton(tr("&permanent ban")); - temporaryRadio = new QRadioButton(tr("&temporary ban")); - temporaryRadio->setChecked(true); - connect(temporaryRadio, &QRadioButton::toggled, this, &BanDialog::enableTemporaryEdits); - daysLabel = new QLabel(tr("&Days:")); - daysEdit = new QSpinBox; - daysEdit->setMinimum(0); - daysEdit->setValue(0); - daysEdit->setMaximum(10000); - daysLabel->setBuddy(daysEdit); - hoursLabel = new QLabel(tr("&Hours:")); - hoursEdit = new QSpinBox; - hoursEdit->setMinimum(0); - hoursEdit->setValue(0); - hoursEdit->setMaximum(24); - hoursLabel->setBuddy(hoursEdit); - minutesLabel = new QLabel(tr("&Minutes:")); - minutesEdit = new QSpinBox; - minutesEdit->setMinimum(0); - minutesEdit->setValue(5); - minutesEdit->setMaximum(60); - minutesLabel->setBuddy(minutesEdit); - QGridLayout *durationLayout = new QGridLayout; - durationLayout->addWidget(permanentRadio, 0, 0, 1, 6); - durationLayout->addWidget(temporaryRadio, 1, 0, 1, 6); - durationLayout->addWidget(daysLabel, 2, 0); - durationLayout->addWidget(daysEdit, 2, 1); - durationLayout->addWidget(hoursLabel, 2, 2); - durationLayout->addWidget(hoursEdit, 2, 3); - durationLayout->addWidget(minutesLabel, 2, 4); - durationLayout->addWidget(minutesEdit, 2, 5); - QGroupBox *durationGroupBox = new QGroupBox(tr("Duration of the ban")); - durationGroupBox->setLayout(durationLayout); - - QLabel *reasonLabel = new QLabel(tr("Please enter the reason for the ban.\n" - "This is only saved for moderators and cannot be seen by the banned person.")); - reasonEdit = new QPlainTextEdit; - - QLabel *visibleReasonLabel = - new QLabel(tr("Please enter the reason for the ban that will be visible to the banned person.")); - visibleReasonEdit = new QPlainTextEdit; - - deleteMessages = new QCheckBox(tr("Redact all messages from this user in all rooms")); - - QPushButton *okButton = new QPushButton(tr("&OK")); - okButton->setAutoDefault(true); - connect(okButton, &QPushButton::clicked, this, &BanDialog::okClicked); - QPushButton *cancelButton = new QPushButton(tr("&Cancel")); - connect(cancelButton, &QPushButton::clicked, this, &BanDialog::reject); - - QHBoxLayout *buttonLayout = new QHBoxLayout; - buttonLayout->addStretch(); - buttonLayout->addWidget(okButton); - buttonLayout->addWidget(cancelButton); - - QVBoxLayout *vbox = new QVBoxLayout; - vbox->addWidget(banTypeGroupBox); - vbox->addWidget(durationGroupBox); - vbox->addWidget(reasonLabel); - vbox->addWidget(reasonEdit); - vbox->addWidget(visibleReasonLabel); - vbox->addWidget(visibleReasonEdit); - vbox->addWidget(deleteMessages); - vbox->addLayout(buttonLayout); - - setLayout(vbox); - setWindowTitle(tr("Ban user from server")); -} - -WarningDialog::WarningDialog(const QString &userName, const QString &clientID, QWidget *parent) : QDialog(parent) -{ - setAttribute(Qt::WA_DeleteOnClose); - descriptionLabel = new QLabel(tr("Which warning would you like to send?")); - nameWarning = new QLineEdit(userName); - nameWarning->setMaxLength(MAX_NAME_LENGTH); - warnClientID = new QLineEdit(clientID); - warnClientID->setMaxLength(MAX_NAME_LENGTH); - warningOption = new QComboBox(); - warningOption->addItem("", ""); - - deleteMessages = new QCheckBox(tr("Redact all messages from this user in all rooms")); - - QPushButton *okButton = new QPushButton(tr("&OK")); - okButton->setAutoDefault(true); - connect(okButton, &QPushButton::clicked, this, &WarningDialog::okClicked); - QPushButton *cancelButton = new QPushButton(tr("&Cancel")); - connect(cancelButton, &QPushButton::clicked, this, &WarningDialog::reject); - - QHBoxLayout *buttonLayout = new QHBoxLayout; - buttonLayout->addStretch(); - buttonLayout->addWidget(okButton); - buttonLayout->addWidget(cancelButton); - - QVBoxLayout *vbox = new QVBoxLayout; - vbox->addWidget(descriptionLabel); - vbox->addWidget(nameWarning); - vbox->addWidget(warningOption); - vbox->addWidget(deleteMessages); - vbox->addLayout(buttonLayout); - setLayout(vbox); - setWindowTitle(tr("Warn user for misconduct")); -} - -void WarningDialog::okClicked() -{ - if (nameWarning->text().simplified().isEmpty()) { - QMessageBox::critical(this, tr("Error"), - tr("User name to send a warning to can not be blank, please specify a user to warn.")); - return; - } - - if (warningOption->currentData().toString().simplified().isEmpty()) { - QMessageBox::critical(this, tr("Error"), - tr("Warning to use can not be blank, please select a valid warning to send.")); - return; - } - - accept(); -} - -QString WarningDialog::getName() const -{ - return nameWarning->text().simplified(); -} - -QString WarningDialog::getWarnID() const -{ - return warnClientID->text().simplified(); -} - -QString WarningDialog::getReason() const -{ - return warningOption->currentData().toString().simplified(); -} - -int WarningDialog::getDeleteMessages() const -{ - return deleteMessages->isChecked() ? -1 : 0; -} - -void WarningDialog::addWarningOption(const QString &warning, int startingIl) -{ - if (startingIl > 1) { - warningOption->addItem(tr("%1 (IL %2)").arg(warning).arg(startingIl), warning); - } else { - warningOption->addItem(warning, warning); - } -} - -void BanDialog::okClicked() -{ - if (!nameBanCheckBox->isChecked() && !ipBanCheckBox->isChecked() && !idBanCheckBox->isChecked()) { - QMessageBox::critical(this, tr("Error"), - tr("You have to select a name-based, IP-based, clientId based, or some combination of " - "the three to place a ban.")); - return; - } - - if (nameBanCheckBox->isChecked()) { - if (nameBanEdit->text().simplified() == "") { - QMessageBox::critical(this, tr("Error"), - tr("You must have a value in the name ban when selecting the name ban checkbox.")); - return; - } - } - - if (ipBanCheckBox->isChecked()) { - if (ipBanEdit->text().simplified() == "") { - QMessageBox::critical(this, tr("Error"), - tr("You must have a value in the ip ban when selecting the ip ban checkbox.")); - return; - } - } - - if (idBanCheckBox->isChecked()) { - if (idBanEdit->text().simplified() == "") { - QMessageBox::critical( - this, tr("Error"), - tr("You must have a value in the clientid ban when selecting the clientid ban checkbox.")); - return; - } - } - - accept(); -} - -void BanDialog::enableTemporaryEdits(bool enabled) -{ - daysLabel->setEnabled(enabled); - daysEdit->setEnabled(enabled); - hoursLabel->setEnabled(enabled); - hoursEdit->setEnabled(enabled); - minutesLabel->setEnabled(enabled); - minutesEdit->setEnabled(enabled); -} - -QString BanDialog::getBanId() const -{ - return idBanCheckBox->isChecked() ? idBanEdit->text() : QString(); -} - -QString BanDialog::getBanName() const -{ - return nameBanCheckBox->isChecked() ? nameBanEdit->text() : QString(); -} - -QString BanDialog::getBanIP() const -{ - return ipBanCheckBox->isChecked() ? ipBanEdit->text() : QString(); -} - -int BanDialog::getMinutes() const -{ - return permanentRadio->isChecked() ? 0 - : (daysEdit->value() * 24 * 60 + hoursEdit->value() * 60 + minutesEdit->value()); -} - -QString BanDialog::getReason() const -{ - return reasonEdit->toPlainText(); -} - -QString BanDialog::getVisibleReason() const -{ - return visibleReasonEdit->toPlainText(); -} - -int BanDialog::getDeleteMessages() const -{ - return deleteMessages->isChecked() ? -1 : 0; -} - -AdminNotesDialog::AdminNotesDialog(const QString &_userName, const QString &_notes, QWidget *_parent) - : QDialog(_parent), userName(_userName) -{ - setAttribute(Qt::WA_DeleteOnClose); - - auto *updateButton = new QPushButton(tr("Update Notes")); - updateButton->setEnabled(false); - connect(updateButton, &QPushButton::clicked, this, &AdminNotesDialog::accept); - - notes = new QPlainTextEdit(_notes); - notes->setMinimumWidth(500); - connect(notes, &QPlainTextEdit::textChanged, this, [=]() { updateButton->setEnabled(true); }); - - auto *vbox = new QVBoxLayout; - vbox->addWidget(notes); - vbox->addWidget(updateButton); - - setLayout(vbox); - setWindowTitle(tr("Admin Notes for %1").arg(_userName)); -} - -QString AdminNotesDialog::getNotes() const -{ - return notes->toPlainText(); -} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/server/user/user_list_dialog.h b/cockatrice/src/interface/widgets/server/user/user_list_dialog.h deleted file mode 100644 index fa7d5de92..000000000 --- a/cockatrice/src/interface/widgets/server/user/user_list_dialog.h +++ /dev/null @@ -1,79 +0,0 @@ -#ifndef COCKATRICE_USER_LIST_DIALOG_H -#define COCKATRICE_USER_LIST_DIALOG_H - -#include -#include - -class QComboBox; -class QLabel; -class QPlainTextEdit; -class QRadioButton; -class QSpinBox; -class QLineEdit; -class QCheckBox; - -class BanDialog : public QDialog -{ - Q_OBJECT - - QLabel *daysLabel, *hoursLabel, *minutesLabel; - QCheckBox *nameBanCheckBox, *ipBanCheckBox, *idBanCheckBox, *deleteMessages; - QLineEdit *nameBanEdit, *ipBanEdit, *idBanEdit; - QSpinBox *daysEdit, *hoursEdit, *minutesEdit; - QRadioButton *permanentRadio, *temporaryRadio; - QPlainTextEdit *reasonEdit, *visibleReasonEdit; - -private slots: - void okClicked(); - void enableTemporaryEdits(bool enabled); - -public: - explicit BanDialog(const ServerInfo_User &info, QWidget *parent = nullptr); - [[nodiscard]] QString getBanName() const; - [[nodiscard]] QString getBanIP() const; - [[nodiscard]] QString getBanId() const; - [[nodiscard]] int getMinutes() const; - [[nodiscard]] QString getReason() const; - [[nodiscard]] QString getVisibleReason() const; - [[nodiscard]] int getDeleteMessages() const; -}; - -class WarningDialog : public QDialog -{ - Q_OBJECT - - QLabel *descriptionLabel; - QLineEdit *nameWarning; - QComboBox *warningOption; - QLineEdit *warnClientID; - QCheckBox *deleteMessages; - -private slots: - void okClicked(); - -public: - WarningDialog(const QString &userName, const QString &clientID, QWidget *parent = nullptr); - [[nodiscard]] QString getName() const; - [[nodiscard]] QString getWarnID() const; - [[nodiscard]] QString getReason() const; - [[nodiscard]] int getDeleteMessages() const; - void addWarningOption(const QString &warning, int startingIl = 1); -}; - -class AdminNotesDialog : public QDialog -{ - Q_OBJECT - - QString userName; - QPlainTextEdit *notes; - -public: - explicit AdminNotesDialog(const QString &_userName, const QString &_notes, QWidget *_parent = nullptr); - [[nodiscard]] QString getName() const - { - return userName; - } - [[nodiscard]] QString getNotes() const; -}; - -#endif // COCKATRICE_USER_LIST_DIALOG_H diff --git a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp index 34a3d6ae1..5c65b090d 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_list_painter.cpp @@ -49,8 +49,6 @@ QColor UserListPainter::getAccentColor(const UserLevelFlags &userLevel, bool onl if (userLevel.testFlag(ServerInfo_User::IsAdmin)) { accentColor = QColor(245, 158, 11); - } else if (userLevel.testFlag(ServerInfo_User::IsDeveloper)) { - accentColor = QColor(185, 28, 28); } else if (userLevel.testFlag(ServerInfo_User::IsModerator)) { accentColor = QColor(59, 130, 246); } else if (userLevel.testFlag(ServerInfo_User::IsJudge)) { @@ -301,8 +299,6 @@ QList UserListPainter::buildBadges(const UserLevelFlags if (userLevel.testFlag(ServerInfo_User::IsAdmin)) { badges << Badge{"ADMIN", QColor(245, 158, 11)}; - } else if (userLevel.testFlag(ServerInfo_User::IsDeveloper)) { - badges << Badge{"DEV", QColor(185, 28, 28)}; } else if (userLevel.testFlag(ServerInfo_User::IsModerator)) { badges << Badge{"MOD", QColor(59, 130, 246)}; } else if (userLevel.testFlag(ServerInfo_User::IsJudge)) { @@ -389,9 +385,9 @@ void UserListPainter::paint(QPainter *painter, const QString userName = QString::fromStdString(userInfo.name()); const QString privLevel = QString::fromStdString(userInfo.privlevel()); const QColor accentColor = getAccentColor(userLevel, online); - const bool hasRole = - userLevel.testFlag(ServerInfo_User::IsAdmin) || userLevel.testFlag(ServerInfo_User::IsDeveloper) || - userLevel.testFlag(ServerInfo_User::IsModerator) || userLevel.testFlag(ServerInfo_User::IsJudge); + const bool hasRole = userLevel.testFlag(ServerInfo_User::IsAdmin) || + userLevel.testFlag(ServerInfo_User::IsModerator) || + userLevel.testFlag(ServerInfo_User::IsJudge); const QRectF cardRect = QRectF(rect).adjusted(3, 2, -3, -2); const int cardRight = getCardRight(option, rect); diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp index 1bb7c5288..e7570ab26 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.cpp @@ -1,21 +1,335 @@ #include "user_list_widget.h" #include "../../../../client/settings/cache_settings.h" +#include "../../../card_picture_loader/card_picture_loader.h" +#include "../../cards/art_crop_attribution.h" #include "../../interface/pixel_map_generator.h" #include "../../interface/theme_manager.h" +#include "../../interface/widgets/tabs/tab_account.h" #include "../../interface/widgets/tabs/tab_supervisor.h" +#include "../game_selector.h" #include "user_context_menu.h" #include "user_list_painter.h" -#include +#include +#include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include #include +#include #include #include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include + +BanDialog::BanDialog(const ServerInfo_User &info, QWidget *parent) : QDialog(parent) +{ + setAttribute(Qt::WA_DeleteOnClose); + + nameBanCheckBox = new QCheckBox(tr("ban &user name")); + nameBanCheckBox->setChecked(true); + nameBanEdit = new QLineEdit(QString::fromStdString(info.name())); + nameBanEdit->setMaxLength(MAX_NAME_LENGTH); + ipBanCheckBox = new QCheckBox(tr("ban &IP address")); + ipBanCheckBox->setChecked(true); + ipBanEdit = new QLineEdit(QString::fromStdString(info.address())); + ipBanEdit->setMaxLength(MAX_NAME_LENGTH); + idBanCheckBox = new QCheckBox(tr("ban client I&D")); + idBanCheckBox->setChecked(true); + idBanEdit = new QLineEdit(QString::fromStdString(info.clientid())); + idBanEdit->setMaxLength(MAX_NAME_LENGTH); + if (QString::fromStdString(info.clientid()).isEmpty()) { + idBanCheckBox->setChecked(false); + } + + QGridLayout *banTypeGrid = new QGridLayout; + banTypeGrid->addWidget(nameBanCheckBox, 0, 0); + banTypeGrid->addWidget(nameBanEdit, 0, 1); + banTypeGrid->addWidget(ipBanCheckBox, 1, 0); + banTypeGrid->addWidget(ipBanEdit, 1, 1); + banTypeGrid->addWidget(idBanCheckBox, 2, 0); + banTypeGrid->addWidget(idBanEdit, 2, 1); + QGroupBox *banTypeGroupBox = new QGroupBox(tr("Ban type")); + banTypeGroupBox->setLayout(banTypeGrid); + + permanentRadio = new QRadioButton(tr("&permanent ban")); + temporaryRadio = new QRadioButton(tr("&temporary ban")); + temporaryRadio->setChecked(true); + connect(temporaryRadio, &QRadioButton::toggled, this, &BanDialog::enableTemporaryEdits); + daysLabel = new QLabel(tr("&Days:")); + daysEdit = new QSpinBox; + daysEdit->setMinimum(0); + daysEdit->setValue(0); + daysEdit->setMaximum(10000); + daysLabel->setBuddy(daysEdit); + hoursLabel = new QLabel(tr("&Hours:")); + hoursEdit = new QSpinBox; + hoursEdit->setMinimum(0); + hoursEdit->setValue(0); + hoursEdit->setMaximum(24); + hoursLabel->setBuddy(hoursEdit); + minutesLabel = new QLabel(tr("&Minutes:")); + minutesEdit = new QSpinBox; + minutesEdit->setMinimum(0); + minutesEdit->setValue(5); + minutesEdit->setMaximum(60); + minutesLabel->setBuddy(minutesEdit); + QGridLayout *durationLayout = new QGridLayout; + durationLayout->addWidget(permanentRadio, 0, 0, 1, 6); + durationLayout->addWidget(temporaryRadio, 1, 0, 1, 6); + durationLayout->addWidget(daysLabel, 2, 0); + durationLayout->addWidget(daysEdit, 2, 1); + durationLayout->addWidget(hoursLabel, 2, 2); + durationLayout->addWidget(hoursEdit, 2, 3); + durationLayout->addWidget(minutesLabel, 2, 4); + durationLayout->addWidget(minutesEdit, 2, 5); + QGroupBox *durationGroupBox = new QGroupBox(tr("Duration of the ban")); + durationGroupBox->setLayout(durationLayout); + + QLabel *reasonLabel = new QLabel(tr("Please enter the reason for the ban.\nThis is only saved for moderators and " + "cannot be seen by the banned person.")); + reasonEdit = new QPlainTextEdit; + + QLabel *visibleReasonLabel = + new QLabel(tr("Please enter the reason for the ban that will be visible to the banned person.")); + visibleReasonEdit = new QPlainTextEdit; + + deleteMessages = new QCheckBox(tr("Redact all messages from this user in all rooms")); + + QPushButton *okButton = new QPushButton(tr("&OK")); + okButton->setAutoDefault(true); + connect(okButton, &QPushButton::clicked, this, &BanDialog::okClicked); + QPushButton *cancelButton = new QPushButton(tr("&Cancel")); + connect(cancelButton, &QPushButton::clicked, this, &BanDialog::reject); + + QHBoxLayout *buttonLayout = new QHBoxLayout; + buttonLayout->addStretch(); + buttonLayout->addWidget(okButton); + buttonLayout->addWidget(cancelButton); + + QVBoxLayout *vbox = new QVBoxLayout; + vbox->addWidget(banTypeGroupBox); + vbox->addWidget(durationGroupBox); + vbox->addWidget(reasonLabel); + vbox->addWidget(reasonEdit); + vbox->addWidget(visibleReasonLabel); + vbox->addWidget(visibleReasonEdit); + vbox->addWidget(deleteMessages); + vbox->addLayout(buttonLayout); + + setLayout(vbox); + setWindowTitle(tr("Ban user from server")); +} + +WarningDialog::WarningDialog(const QString userName, const QString clientID, QWidget *parent) : QDialog(parent) +{ + setAttribute(Qt::WA_DeleteOnClose); + descriptionLabel = new QLabel(tr("Which warning would you like to send?")); + nameWarning = new QLineEdit(userName); + nameWarning->setMaxLength(MAX_NAME_LENGTH); + warnClientID = new QLineEdit(clientID); + warnClientID->setMaxLength(MAX_NAME_LENGTH); + warningOption = new QComboBox(); + warningOption->addItem("", ""); + + deleteMessages = new QCheckBox(tr("Redact all messages from this user in all rooms")); + + QPushButton *okButton = new QPushButton(tr("&OK")); + okButton->setAutoDefault(true); + connect(okButton, &QPushButton::clicked, this, &WarningDialog::okClicked); + QPushButton *cancelButton = new QPushButton(tr("&Cancel")); + connect(cancelButton, &QPushButton::clicked, this, &WarningDialog::reject); + + QHBoxLayout *buttonLayout = new QHBoxLayout; + buttonLayout->addStretch(); + buttonLayout->addWidget(okButton); + buttonLayout->addWidget(cancelButton); + + QVBoxLayout *vbox = new QVBoxLayout; + vbox->addWidget(descriptionLabel); + vbox->addWidget(nameWarning); + vbox->addWidget(warningOption); + vbox->addWidget(deleteMessages); + vbox->addLayout(buttonLayout); + setLayout(vbox); + setWindowTitle(tr("Warn user for misconduct")); +} + +void WarningDialog::okClicked() +{ + if (nameWarning->text().simplified().isEmpty()) { + QMessageBox::critical(this, tr("Error"), + tr("User name to send a warning to can not be blank, please specify a user to warn.")); + return; + } + + if (warningOption->currentData().toString().simplified().isEmpty()) { + QMessageBox::critical(this, tr("Error"), + tr("Warning to use can not be blank, please select a valid warning to send.")); + return; + } + + accept(); +} + +QString WarningDialog::getName() const +{ + return nameWarning->text().simplified(); +} + +QString WarningDialog::getWarnID() const +{ + return warnClientID->text().simplified(); +} + +QString WarningDialog::getReason() const +{ + return warningOption->currentData().toString().simplified(); +} + +int WarningDialog::getDeleteMessages() const +{ + return deleteMessages->isChecked() ? -1 : 0; +} + +void WarningDialog::addWarningOption(const QString warning, int startingIl) +{ + if (startingIl > 1) { + warningOption->addItem(tr("%1 (IL %2)").arg(warning).arg(startingIl), warning); + } else { + warningOption->addItem(warning, warning); + } +} + +void BanDialog::okClicked() +{ + if (!nameBanCheckBox->isChecked() && !ipBanCheckBox->isChecked() && !idBanCheckBox->isChecked()) { + QMessageBox::critical(this, tr("Error"), + tr("You have to select a name-based, IP-based, clientId based, or some combination of " + "the three to place a ban.")); + return; + } + + if (nameBanCheckBox->isChecked()) { + if (nameBanEdit->text().simplified() == "") { + QMessageBox::critical(this, tr("Error"), + tr("You must have a value in the name ban when selecting the name ban checkbox.")); + return; + } + } + + if (ipBanCheckBox->isChecked()) { + if (ipBanEdit->text().simplified() == "") { + QMessageBox::critical(this, tr("Error"), + tr("You must have a value in the ip ban when selecting the ip ban checkbox.")); + return; + } + } + + if (idBanCheckBox->isChecked()) { + if (idBanEdit->text().simplified() == "") { + QMessageBox::critical( + this, tr("Error"), + tr("You must have a value in the clientid ban when selecting the clientid ban checkbox.")); + return; + } + } + + accept(); +} + +void BanDialog::enableTemporaryEdits(bool enabled) +{ + daysLabel->setEnabled(enabled); + daysEdit->setEnabled(enabled); + hoursLabel->setEnabled(enabled); + hoursEdit->setEnabled(enabled); + minutesLabel->setEnabled(enabled); + minutesEdit->setEnabled(enabled); +} + +QString BanDialog::getBanId() const +{ + return idBanCheckBox->isChecked() ? idBanEdit->text() : QString(); +} + +QString BanDialog::getBanName() const +{ + return nameBanCheckBox->isChecked() ? nameBanEdit->text() : QString(); +} + +QString BanDialog::getBanIP() const +{ + return ipBanCheckBox->isChecked() ? ipBanEdit->text() : QString(); +} + +int BanDialog::getMinutes() const +{ + return permanentRadio->isChecked() ? 0 + : (daysEdit->value() * 24 * 60 + hoursEdit->value() * 60 + minutesEdit->value()); +} + +QString BanDialog::getReason() const +{ + return reasonEdit->toPlainText(); +} + +QString BanDialog::getVisibleReason() const +{ + return visibleReasonEdit->toPlainText(); +} + +int BanDialog::getDeleteMessages() const +{ + return deleteMessages->isChecked() ? -1 : 0; +} + +AdminNotesDialog::AdminNotesDialog(const QString &_userName, const QString &_notes, QWidget *_parent) + : QDialog(_parent), userName(_userName) +{ + setAttribute(Qt::WA_DeleteOnClose); + + auto *updateButton = new QPushButton(tr("Update Notes")); + updateButton->setEnabled(false); + connect(updateButton, &QPushButton::clicked, this, &AdminNotesDialog::accept); + + notes = new QPlainTextEdit(_notes); + notes->setMinimumWidth(500); + connect(notes, &QPlainTextEdit::textChanged, this, [=]() { updateButton->setEnabled(true); }); + + auto *vbox = new QVBoxLayout; + vbox->addWidget(notes); + vbox->addWidget(updateButton); + + setLayout(vbox); + setWindowTitle(tr("Admin Notes for %1").arg(_userName)); +} + +QString AdminNotesDialog::getNotes() const +{ + return notes->toPlainText(); +} namespace UserListRoles { @@ -234,11 +548,9 @@ bool UserListTWI::operator<(const QTreeWidgetItem &other) const const auto &lhsUserLevelFlags = UserLevelFlags(data(0, Qt::UserRole).toInt()); const auto &rhsUserLevelFlags = UserLevelFlags(other.data(0, Qt::UserRole).toInt()); - // Admins, Developers & Mods need no additional comparison checks, just to see if they're an admin, a developer - // or a moderator + // Admins & Mods need no additional comparison checks, just to see if they're an admin or a moderator static const QList userLevelWithNoOtherPrefOrder = { - ServerInfo_User_UserLevelFlag_IsAdmin, ServerInfo_User_UserLevelFlag_IsDeveloper, - ServerInfo_User_UserLevelFlag_IsModerator}; + ServerInfo_User_UserLevelFlag_IsAdmin, ServerInfo_User_UserLevelFlag_IsModerator}; for (const auto &userLevelEntry : userLevelWithNoOtherPrefOrder) { if (lhsUserLevelFlags.testFlag(userLevelEntry) && lhsUserLevelFlags.testFlag(userLevelEntry) == rhsUserLevelFlags.testFlag(userLevelEntry)) { @@ -347,11 +659,6 @@ UserListWidget::UserListWidget(TabSupervisor *_tabSupervisor, &cardArtProvider->cache(), &cardArtParamsMap, window()); // parented to main window so it floats above siblings - // The invite availability is scoped to the room this list belongs to, - // and gated on the room's buddy-only setting for the hovered user. - userInfoPopup->setGameInviteAvailable( - [this](const QString &userName) { return userContextMenu->hasGameInviteLink(userName); }); - userInfoPopup->hide(); userInfoPopup->setWindowOpacity(0.0); userInfoPopup->installEventFilter(this); @@ -669,8 +976,6 @@ void UserListWidget::connectPopupSignals() // Wire all action signals to UserContextMenu::exec*() connect(userInfoPopup, &UserInfoPopup::chatRequested, userContextMenu, &UserContextMenu::execChat); - connect(userInfoPopup, &UserInfoPopup::inviteRequested, this, - [this](const QString &userName) { userContextMenu->execInvite(userName); }); connect(userInfoPopup, &UserInfoPopup::detailsRequested, userContextMenu, &UserContextMenu::execDetails); connect(userInfoPopup, &UserInfoPopup::showGamesRequested, userContextMenu, &UserContextMenu::execShowGames); connect(userInfoPopup, &UserInfoPopup::addBuddyRequested, userContextMenu, &UserContextMenu::execAddToBuddy); diff --git a/cockatrice/src/interface/widgets/server/user/user_list_widget.h b/cockatrice/src/interface/widgets/server/user/user_list_widget.h index 412271160..5fed54573 100644 --- a/cockatrice/src/interface/widgets/server/user/user_list_widget.h +++ b/cockatrice/src/interface/widgets/server/user/user_list_widget.h @@ -16,7 +16,9 @@ #include "user_list_painter.h" #include +#include #include +#include #include #include #include @@ -29,12 +31,80 @@ class QTreeWidget; class ServerInfo_User; class AbstractClient; class TabSupervisor; +class QLabel; +class QCheckBox; +class QSpinBox; +class QRadioButton; +class QPlainTextEdit; class Response; class CommandContainer; class UserContextMenu; class UserListWidget; class QShowEvent; +class BanDialog : public QDialog +{ + Q_OBJECT +private: + QLabel *daysLabel, *hoursLabel, *minutesLabel; + QCheckBox *nameBanCheckBox, *ipBanCheckBox, *idBanCheckBox, *deleteMessages; + QLineEdit *nameBanEdit, *ipBanEdit, *idBanEdit; + QSpinBox *daysEdit, *hoursEdit, *minutesEdit; + QRadioButton *permanentRadio, *temporaryRadio; + QPlainTextEdit *reasonEdit, *visibleReasonEdit; +private slots: + void okClicked(); + void enableTemporaryEdits(bool enabled); + +public: + explicit BanDialog(const ServerInfo_User &info, QWidget *parent = nullptr); + [[nodiscard]] QString getBanName() const; + [[nodiscard]] QString getBanIP() const; + [[nodiscard]] QString getBanId() const; + [[nodiscard]] int getMinutes() const; + [[nodiscard]] QString getReason() const; + [[nodiscard]] QString getVisibleReason() const; + [[nodiscard]] int getDeleteMessages() const; +}; + +class WarningDialog : public QDialog +{ + Q_OBJECT +private: + QLabel *descriptionLabel; + QLineEdit *nameWarning; + QComboBox *warningOption; + QLineEdit *warnClientID; + QCheckBox *deleteMessages; +private slots: + void okClicked(); + +public: + WarningDialog(const QString userName, const QString clientID, QWidget *parent = nullptr); + [[nodiscard]] QString getName() const; + [[nodiscard]] QString getWarnID() const; + [[nodiscard]] QString getReason() const; + [[nodiscard]] int getDeleteMessages() const; + void addWarningOption(const QString warning, int startingIl = 1); +}; + +class AdminNotesDialog : public QDialog +{ + Q_OBJECT + +private: + QString userName; + QPlainTextEdit *notes; + +public: + explicit AdminNotesDialog(const QString &_userName, const QString &_notes, QWidget *_parent = nullptr); + [[nodiscard]] QString getName() const + { + return userName; + } + [[nodiscard]] QString getNotes() const; +}; + class UserListItemDelegate : public QStyledItemDelegate { QTreeWidget *tree; diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp index f161f0f19..881c54167 100644 --- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.cpp @@ -59,8 +59,8 @@ AppearanceSettingsPage::AppearanceSettingsPage() connect(&schemeCombo, &QComboBox::currentIndexChanged, this, [this] { themeManager->setColorScheme(schemeCombo.currentData().toString()); }); - // Qt widget style; "System" lets the application decide - styleCombo.addItem(tr("System"), QStringLiteral("System")); + // Qt widget style; "Default" lets the application decide + styleCombo.addItem(tr("Default"), QStringLiteral("Default")); for (const QString &key : QStyleFactory::keys()) { styleCombo.addItem(key, key); } @@ -132,10 +132,6 @@ AppearanceSettingsPage::AppearanceSettingsPage() connect(&homeTabDisplayCardNameCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.appearance(), &AppearanceSettings::setHomeTabDisplayCardName); - homeTabBackgroundDimCheckBox.setChecked(settings.appearance().getHomeTabBackgroundDim()); - connect(&homeTabBackgroundDimCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.appearance(), - &AppearanceSettings::setHomeTabBackgroundDim); - for (const auto &entry : HomeTabButtonColor::all()) { homeTabButtonColorSourceBox.addItem(QObject::tr(entry.trKey)); } @@ -154,53 +150,10 @@ AppearanceSettingsPage::AppearanceSettingsPage() homeTabGrid->addWidget(&homeTabDisplayCardNameCheckBox, 2, 0, 1, 2); homeTabGrid->addWidget(&homeTabButtonColorSourceLabel, 3, 0); homeTabGrid->addWidget(&homeTabButtonColorSourceBox, 3, 1); - homeTabGrid->addWidget(&homeTabBackgroundDimCheckBox, 4, 0, 1, 2); homeTabGroupBox = new QGroupBox; homeTabGroupBox->setLayout(homeTabGrid); - // Playmat settings - playmatVisibilityCombo.addItem(tr("Show all playmats"), PlaymatVisibilityAll); - playmatVisibilityCombo.addItem(tr("Show own playmat only"), PlaymatVisibilityOwnOnly); - playmatVisibilityCombo.addItem(tr("Don't use playmats"), PlaymatVisibilityNone); - int visIdx = playmatVisibilityCombo.findData(settings.userInterface().getPlaymatVisibility()); - if (visIdx >= 0) { - playmatVisibilityCombo.setCurrentIndex(visIdx); - } - connect(&playmatVisibilityCombo, qOverload(&QComboBox::currentIndexChanged), this, [this](int index) { - SettingsCache::instance().userInterface().setPlaymatVisibility(playmatVisibilityCombo.itemData(index).toInt()); - }); - playmatVisibilityLabel.setBuddy(&playmatVisibilityCombo); - - // Playmat mode: Override / Fallback / Deck-only - playmatModeCombo.addItem(tr("Override deck playmat"), PlaymatModeOverrideDeck); - playmatModeCombo.addItem(tr("Fallback if deck has none"), PlaymatModeFallback); - playmatModeCombo.addItem(tr("Deck only, ignore collection"), PlaymatModeDeckOnly); - int modeIdx = playmatModeCombo.findData(settings.userInterface().getPlaymatMode()); - if (modeIdx >= 0) { - playmatModeCombo.setCurrentIndex(modeIdx); - } - connect(&playmatModeCombo, qOverload(&QComboBox::currentIndexChanged), this, [this](int index) { - SettingsCache::instance().userInterface().setPlaymatMode(playmatModeCombo.itemData(index).toInt()); - }); - playmatModeLabel.setBuddy(&playmatModeCombo); - - // User-level playmat settings: fallback collection. - connect(&playmatDefaultEditButton, &QPushButton::clicked, this, - &AppearanceSettingsPage::openPlaymatCollectionDialog); - - auto *playmatGrid = new QGridLayout; - playmatGrid->addWidget(&playmatVisibilityLabel, 0, 0, 1, 1); - playmatGrid->addWidget(&playmatVisibilityCombo, 0, 1, 1, 1); - playmatGrid->addWidget(&playmatModeLabel, 1, 0, 1, 1); - playmatGrid->addWidget(&playmatModeCombo, 1, 1, 1, 1); - playmatGrid->addWidget(&playmatDefaultLabel, 2, 0, 1, 1); - playmatGrid->addWidget(&playmatDefaultEditButton, 2, 1, 1, 1); - - playmatGroupBox = new QGroupBox; - playmatGroupBox->setLayout(playmatGrid); - - // Styling settings styleUserListCheckBox.setChecked(settings.appearance().getStyleUserList()); connect(&styleUserListCheckBox, &QCheckBox::QT_STATE_CHANGED, &settings.appearance(), &AppearanceSettings::setStyleUserList); @@ -306,6 +259,7 @@ AppearanceSettingsPage::AppearanceSettingsPage() cardLayoutGroupBox->setLayout(cardLayoutGrid); // Card counter colors + auto *cardCounterColorsLayout = new QGridLayout; cardCounterColorsLayout->setColumnStretch(1, 1); cardCounterColorsLayout->setColumnStretch(3, 1); @@ -385,6 +339,47 @@ AppearanceSettingsPage::AppearanceSettingsPage() tableGroupBox = new QGroupBox; tableGroupBox->setLayout(tableGrid); + // Playmat settings + playmatVisibilityCombo.addItem(tr("Show all playmats"), PlaymatVisibilityAll); + playmatVisibilityCombo.addItem(tr("Show own playmat only"), PlaymatVisibilityOwnOnly); + playmatVisibilityCombo.addItem(tr("Don't use playmats"), PlaymatVisibilityNone); + int visIdx = playmatVisibilityCombo.findData(settings.userInterface().getPlaymatVisibility()); + if (visIdx >= 0) { + playmatVisibilityCombo.setCurrentIndex(visIdx); + } + connect(&playmatVisibilityCombo, qOverload(&QComboBox::currentIndexChanged), this, [this](int index) { + SettingsCache::instance().userInterface().setPlaymatVisibility(playmatVisibilityCombo.itemData(index).toInt()); + }); + playmatVisibilityLabel.setBuddy(&playmatVisibilityCombo); + + // Playmat mode: Override / Fallback / Deck-only + playmatModeCombo.addItem(tr("Override deck playmat"), PlaymatModeOverrideDeck); + playmatModeCombo.addItem(tr("Fallback if deck has none"), PlaymatModeFallback); + playmatModeCombo.addItem(tr("Deck only, ignore collection"), PlaymatModeDeckOnly); + int modeIdx = playmatModeCombo.findData(settings.userInterface().getPlaymatMode()); + if (modeIdx >= 0) { + playmatModeCombo.setCurrentIndex(modeIdx); + } + connect(&playmatModeCombo, qOverload(&QComboBox::currentIndexChanged), this, [this](int index) { + SettingsCache::instance().userInterface().setPlaymatMode(playmatModeCombo.itemData(index).toInt()); + }); + playmatModeLabel.setBuddy(&playmatModeCombo); + + // User-level playmat settings: fallback collection. + connect(&playmatDefaultEditButton, &QPushButton::clicked, this, + &AppearanceSettingsPage::openPlaymatCollectionDialog); + + auto *playmatGrid = new QGridLayout; + playmatGrid->addWidget(&playmatVisibilityLabel, 0, 0, 1, 1); + playmatGrid->addWidget(&playmatVisibilityCombo, 0, 1, 1, 1); + playmatGrid->addWidget(&playmatModeLabel, 1, 0, 1, 1); + playmatGrid->addWidget(&playmatModeCombo, 1, 1, 1, 1); + playmatGrid->addWidget(&playmatDefaultLabel, 2, 0, 1, 1); + playmatGrid->addWidget(&playmatDefaultEditButton, 2, 1, 1, 1); + + playmatGroupBox = new QGroupBox; + playmatGroupBox->setLayout(playmatGrid); + // putting it all together auto *mainLayout = new QVBoxLayout; mainLayout->addWidget(themeGroupBox); @@ -513,18 +508,9 @@ void AppearanceSettingsPage::retranslateUi() homeTabBackgroundShuffleFrequencyLabel.setText(tr("Home tab background shuffle frequency:")); homeTabBackgroundShuffleFrequencySpinBox.setSpecialValueText(tr("Disabled")); homeTabDisplayCardNameCheckBox.setText(tr("Display card name of background in bottom right")); - homeTabBackgroundDimCheckBox.setText(tr("Dim the home tab background")); - homeTabBackgroundDimCheckBox.setToolTip( - tr("Draw a translucent overlay over the home tab background so buttons and text stand out")); homeTabButtonColorSourceLabel.setText(tr("Home tab button color:")); homeTabButtonColorSourceBox.setToolTip( - tr("Use the theme's identity accent colors, or extract colors from the background image")); - - playmatGroupBox->setTitle(tr("Playmat settings")); - playmatVisibilityLabel.setText(tr("Playmat visibility:")); - playmatModeLabel.setText(tr("Default collection behavior:")); - playmatDefaultLabel.setText(tr("Default playmat collection:")); - playmatDefaultEditButton.setText(tr("Edit...")); + tr("Automatic: extract from background if present, otherwise use theme default")); stylingGroupBox->setTitle(tr("Styling settings")); styleUserListCheckBox.setText(tr("Style user list")); @@ -568,4 +554,9 @@ void AppearanceSettingsPage::retranslateUi() tableGroupBox->setTitle(tr("Table grid layout")); invertVerticalCoordinateCheckBox.setText(tr("Invert vertical coordinate")); minPlayersForMultiColumnLayoutLabel.setText(tr("Minimum player count for multi-column layout:")); + playmatGroupBox->setTitle(tr("Playmat settings")); + playmatVisibilityLabel.setText(tr("Playmat visibility:")); + playmatModeLabel.setText(tr("Default collection behavior:")); + playmatDefaultLabel.setText(tr("Default playmat collection:")); + playmatDefaultEditButton.setText(tr("Edit...")); } diff --git a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h index bec4cd72f..6b0369694 100644 --- a/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h +++ b/cockatrice/src/interface/widgets/settings_page/appearance_settings_page.h @@ -41,59 +41,49 @@ private: QLabel homeTabBackgroundShuffleFrequencyLabel; QSpinBox homeTabBackgroundShuffleFrequencySpinBox; QCheckBox homeTabDisplayCardNameCheckBox; - QCheckBox homeTabBackgroundDimCheckBox; QLabel homeTabButtonColorSourceLabel; QComboBox homeTabButtonColorSourceBox; - QLabel playmatVisibilityLabel; - QComboBox playmatVisibilityCombo; - QLabel playmatModeLabel; - QComboBox playmatModeCombo; - QLabel playmatDefaultLabel; - QPushButton playmatDefaultEditButton; - QCheckBox styleUserListCheckBox; - QCheckBox showShortcutsCheckBox; QCheckBox showGameSelectorFilterToolbarCheckBox; - + QLabel minPlayersForMultiColumnLayoutLabel; + QLabel maxFontSizeForCardsLabel; QCheckBox overrideAllCardArtWithPersonalPreferenceCheckBox; QCheckBox bumpSetsWithCardsInDeckToTopCheckBox; - QCheckBox displayCardNamesCheckBox; QCheckBox autoRotateSidewaysLayoutCardsCheckBox; QCheckBox cardScalingCheckBox; QCheckBox roundCardCornersCheckBox; - QLabel maxFontSizeForCardsLabel; - QSpinBox maxFontSizeForCardsEdit; - QLabel verticalCardOverlapPercentLabel; QSpinBox verticalCardOverlapPercentBox; QLabel cardViewInitialRowsMaxLabel; QSpinBox cardViewInitialRowsMaxBox; QLabel cardViewExpandedRowsMaxLabel; QSpinBox cardViewExpandedRowsMaxBox; - - QList cardCounterNames; - QCheckBox horizontalHandCheckBox; QCheckBox leftJustifiedHandCheckBox; - QCheckBox invertVerticalCoordinateCheckBox; - QLabel minPlayersForMultiColumnLayoutLabel; - QSpinBox minPlayersForMultiColumnLayoutEdit; - + QLabel playmatVisibilityLabel; + QComboBox playmatVisibilityCombo; + QLabel playmatModeLabel; + QComboBox playmatModeCombo; + QLabel playmatDefaultLabel; + QPushButton playmatDefaultEditButton; QGroupBox *themeGroupBox; QGroupBox *homeTabGroupBox; - QGroupBox *playmatGroupBox; QGroupBox *stylingGroupBox; QGroupBox *menuGroupBox; QGroupBox *printingsGroupBox; QGroupBox *cardsGroupBox; QGroupBox *cardLayoutGroupBox; - QGroupBox *cardCountersGroupBox; QGroupBox *handGroupBox; + QGroupBox *playmatGroupBox; QGroupBox *tableGroupBox; + QGroupBox *cardCountersGroupBox; + QList cardCounterNames; + QSpinBox minPlayersForMultiColumnLayoutEdit; + QSpinBox maxFontSizeForCardsEdit; public: AppearanceSettingsPage(); diff --git a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp index f3eac05b8..f425afe60 100644 --- a/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/deck_editor_settings_page.cpp @@ -1,7 +1,6 @@ #include "deck_editor_settings_page.h" #include "../../../client/settings/cache_settings.h" -#include "../../pixel_map_generator.h" #include "update/card_spoiler/spoiler_background_updater.h" #include @@ -54,15 +53,15 @@ DeckEditorSettingsPage::DeckEditorSettingsPage() urlList->addItems(SettingsCache::instance().downloads().getAllURLs()); aAdd = new QAction(this); - aAdd->setIcon(themePixmap(QStringLiteral("icons/increment"))); + aAdd->setIcon(QPixmap("theme:icons/increment")); connect(aAdd, &QAction::triggered, this, &DeckEditorSettingsPage::actAddURL); aEdit = new QAction(this); - aEdit->setIcon(themePixmap(QStringLiteral("icons/pencil"))); + aEdit->setIcon(QPixmap("theme:icons/pencil")); connect(aEdit, &QAction::triggered, this, &DeckEditorSettingsPage::actEditURL); aRemove = new QAction(this); - aRemove->setIcon(themePixmap(QStringLiteral("icons/decrement"))); + aRemove->setIcon(QPixmap("theme:icons/decrement")); connect(aRemove, &QAction::triggered, this, &DeckEditorSettingsPage::actRemoveURL); auto *urlToolBar = new QToolBar; diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp index b0fd0e018..a293660f9 100644 --- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp @@ -1,21 +1,15 @@ #include "general_settings_page.h" #include "../../../client/settings/cache_settings.h" -#include "../interface/card_picture_loader/card_picture_loader.h" #include "../main.h" #include "../server/user/user_info_connection.h" #include "update/client/release_channel.h" #include -#include #include #include #include -#include #include -#include -#include -#include #include #include #include @@ -52,40 +46,10 @@ GeneralSettingsPage::GeneralSettingsPage() connect(&languageBox, qOverload(&QComboBox::currentIndexChanged), this, &GeneralSettingsPage::languageBoxChanged); - // card text & images language, independent of the UI language - cardLanguageBox.addItem(tr("English"), "en"); - for (const QString &code : CardLocalization::supportedLanguages()) { - cardLanguageBox.addItem(CardLocalization::languageDisplayName(code), code); - } - const int cardLangIndex = cardLanguageBox.findData(SettingsCache::instance().cardsDisplay().getCardLang()); - cardLanguageBox.setCurrentIndex(cardLangIndex < 0 ? 0 : cardLangIndex); - - connect(&cardLanguageBox, qOverload(&QComboBox::currentIndexChanged), this, - &GeneralSettingsPage::cardLanguageBoxChanged); - - // card search language, independent of the card display language - cardSearchLanguageBox.addItem(""); // texts set in retranslateUi - cardSearchLanguageBox.addItem(""); - cardSearchLanguageBox.addItem(""); - const int cardSearchLanguageIndex = SettingsCache::instance().cardsDisplay().getCardSearchLanguage(); - cardSearchLanguageBox.setCurrentIndex(cardSearchLanguageIndex < 0 ? static_cast(SearchLanguageMode::English) - : cardSearchLanguageIndex); - - connect(&cardSearchLanguageBox, qOverload(&QComboBox::currentIndexChanged), this, - &GeneralSettingsPage::cardSearchLanguageBoxChanged); - auto *languageGrid = new QGridLayout; languageGrid->addWidget(&languageLabel, 0, 0); languageGrid->addWidget(&languageBox, 0, 1); - languageGrid->addWidget(&cardLanguageLabel, 1, 0); - languageGrid->addWidget(&cardLanguageBox, 1, 1); - languageGrid->addWidget(&cardLanguageNoteLabel, 2, 1); - languageGrid->addWidget(&cardSearchLanguageLabel, 3, 0); - languageGrid->addWidget(&cardSearchLanguageBox, 3, 1); - languageGrid->addWidget(&advertiseTranslationPageLabel, 4, 1, Qt::AlignRight); - - cardLanguageNoteLabel.setWordWrap(true); - cardLanguageNoteLabel.setAlignment(Qt::AlignLeft | Qt::AlignVCenter); + languageGrid->addWidget(&advertiseTranslationPageLabel, 1, 1, Qt::AlignRight); languageGroupBox = new QGroupBox; languageGroupBox->setLayout(languageGrid); @@ -448,57 +412,6 @@ void GeneralSettingsPage::languageBoxChanged(int index) SettingsCache::instance().personal().setLang(languageBox.itemData(index).toString()); } -void GeneralSettingsPage::cardLanguageBoxChanged(int index) -{ - const QString lang = cardLanguageBox.itemData(index).toString(); - SettingsCache::instance().cardsDisplay().setCardLang(lang); - - // Switching to a non-default language only takes effect after the card - // database is re-imported with that language selected; English data is always - // present, so switching back to English needs no prompt. - if (lang == "en") { - return; - } - - // The binary cache does not track the language its entries were imported in, - // and the downloaded pictures were fetched with English art names, so both are - // stale until Oracle re-imports the database in the new language: drop them. - QFile::remove(SettingsCache::instance().getCardDatabasePath() + ".cache"); - CardPictureLoader::clearNetworkCache(); - CardPictureLoader::clearPixmapCache(); - - // Art is resolved by the translated card name for non-English languages, so the - // matching Scryfall URL is added to the top of the download list. It stays - // visible in the deck editor settings, where it can be removed or reordered. - const bool localizedUrlAdded = SettingsCache::instance().downloads().addLocalizedScryfallUrl(); - - QString message = tr("

The card database only contains English card data. To see cards in %1, " - "Oracle must run once with this language selected and re-import the card " - "database.

" - "

The cached database and the downloaded card pictures have been cleared, so a " - "re-import is picked up without stale entries.

") - .arg(cardLanguageBox.itemText(index)); - if (localizedUrlAdded) { - message += tr("

The Scryfall URL that resolves card art by translated name was added to the top of your " - "download list. You can remove or reorder it any time.

"); - } - message += tr("

Run Oracle now?

"); - - const QMessageBox::StandardButton answer = QMessageBox::question( - this, tr("Card text & images language changed"), message, QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); - - // The answer only controls whether Oracle starts right away; the caches stay - // cleared so the next import or launch rebuilds them in the new language. - if (answer == QMessageBox::Yes) { - emit cardDatabaseUpdateRequested(); - } -} - -void GeneralSettingsPage::cardSearchLanguageBoxChanged(int index) -{ - SettingsCache::instance().cardsDisplay().setCardSearchLanguage(index); -} - void GeneralSettingsPage::updateStartupServerControlsVisibility() { const int index = startupTabSelector.currentIndex(); @@ -512,38 +425,29 @@ void GeneralSettingsPage::updateStartupServerControlsVisibility() void GeneralSettingsPage::retranslateUi() { - const auto &settings = SettingsCache::instance(); - languageGroupBox->setTitle(tr("Language settings")); languageLabel.setText(tr("Language:")); - cardLanguageBox.setItemText(0, tr("English")); - cardLanguageLabel.setText(tr("Card text & images language:")); - cardLanguageNoteLabel.setText( - tr("Foreign card names, text and art apply after you update the card database (Oracle).")); - cardSearchLanguageLabel.setText(tr("Language used in card search:")); - cardSearchLanguageBox.setItemText(static_cast(SearchLanguageMode::English), tr("English")); - cardSearchLanguageBox.setItemText(static_cast(SearchLanguageMode::Selected), - tr("Selected card language (untranslated cards still match in English)")); - cardSearchLanguageBox.setItemText(static_cast(SearchLanguageMode::Both), - tr("English and selected card language")); - advertiseTranslationPageLabel.setText( - QString("%2").arg(WIKI_TRANSLATION_FAQ).arg(tr("How to help with translations"))); versionGroupBox->setTitle(tr("Version settings")); + cardDatabaseGroupBox->setTitle(tr("Card database")); + startupGroupBox->setTitle(tr("Startup settings")); + + if (SettingsCache::instance().getIsPortableBuild()) { + pathsGroupBox->setTitle(tr("Paths (editing disabled in portable mode)")); + } else { + pathsGroupBox->setTitle(tr("Paths")); + } + advertiseTranslationPageLabel.setText( + QString("%2").arg(WIKI_TRANSLATION_FAQ).arg(tr("How to help with translations"))); + deckPathLabel.setText(tr("Decks directory:")); + filtersPathLabel.setText(tr("Filters directory:")); + replaysPathLabel.setText(tr("Replays directory:")); + picsPathLabel.setText(tr("Pictures directory:")); + cardDatabasePathLabel.setText(tr("Card database:")); + customCardDatabasePathLabel.setText(tr("Custom database directory:")); + tokenDatabasePathLabel.setText(tr("Token database:")); updateReleaseChannelLabel.setText(tr("Update channel")); startupUpdateCheckCheckBox.setText(tr("Check for client updates on startup")); - updateNotificationCheckBox.setText(tr("Notify if a feature supported by the server is missing in my client")); - newVersionOracleCheckBox.setText(tr("Automatically run Oracle when running a new version of Cockatrice")); - - // We can't change the strings after they're put into the QComboBox, so this is our workaround - int oldIndex = updateReleaseChannelBox.currentIndex(); - updateReleaseChannelBox.clear(); - for (ReleaseChannel *chan : settings.getUpdateReleaseChannels()) { - updateReleaseChannelBox.addItem(tr(chan->getName().toUtf8())); - } - updateReleaseChannelBox.setCurrentIndex(oldIndex); - - cardDatabaseGroupBox->setTitle(tr("Card database")); startupCardUpdateCheckBehaviorLabel.setText(tr("Check for card database updates on startup")); startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexNone, tr("Don't check")); startupCardUpdateCheckBehaviorSelector.setItemText(startupCardUpdateCheckBehaviorIndexPrompt, @@ -552,13 +456,8 @@ void GeneralSettingsPage::retranslateUi() tr("Always update in the background")); cardUpdateCheckIntervalLabel.setText(tr("Check for card database updates every")); cardUpdateCheckIntervalSpinBox.setSuffix(tr(" days")); - - QDate lastCheckDate = settings.updates().getLastCardUpdateCheck(); - int daysAgo = lastCheckDate.daysTo(QDate::currentDate()); - lastCardUpdateCheckDateLabel.setText( - tr("Last update check on %1 (%2 days ago)").arg(lastCheckDate.toString()).arg(daysAgo)); - - startupGroupBox->setTitle(tr("Startup settings")); + updateNotificationCheckBox.setText(tr("Notify if a feature supported by the server is missing in my client")); + newVersionOracleCheckBox.setText(tr("Automatically run Oracle when running a new version of Cockatrice")); showTipsOnStartup.setText(tr("Show tips on startup")); startupTabLabel.setText(tr("Startup tab:")); startupTabSelector.setItemText(StartupTab::StartupTabHome, tr("Home")); @@ -574,18 +473,21 @@ void GeneralSettingsPage::retranslateUi() startupServerLabel.setText(tr("Server:")); startupRoomLabel.setText(tr("Room:")); startupRoomNameEdit->setPlaceholderText(tr("Room name")); - - if (settings.getIsPortableBuild()) { - pathsGroupBox->setTitle(tr("Paths (editing disabled in portable mode)")); - } else { - pathsGroupBox->setTitle(tr("Paths")); - } - deckPathLabel.setText(tr("Decks directory:")); - filtersPathLabel.setText(tr("Filters directory:")); - replaysPathLabel.setText(tr("Replays directory:")); - picsPathLabel.setText(tr("Pictures directory:")); - cardDatabasePathLabel.setText(tr("Card database:")); - customCardDatabasePathLabel.setText(tr("Custom database directory:")); - tokenDatabasePathLabel.setText(tr("Token database:")); resetAllPathsButton->setText(tr("Reset all paths")); -} + + const auto &settings = SettingsCache::instance(); + + QDate lastCheckDate = settings.updates().getLastCardUpdateCheck(); + int daysAgo = lastCheckDate.daysTo(QDate::currentDate()); + + lastCardUpdateCheckDateLabel.setText( + tr("Last update check on %1 (%2 days ago)").arg(lastCheckDate.toString()).arg(daysAgo)); + + // We can't change the strings after they're put into the QComboBox, so this is our workaround + int oldIndex = updateReleaseChannelBox.currentIndex(); + updateReleaseChannelBox.clear(); + for (ReleaseChannel *chan : settings.getUpdateReleaseChannels()) { + updateReleaseChannelBox.addItem(tr(chan->getName().toUtf8())); + } + updateReleaseChannelBox.setCurrentIndex(oldIndex); +} \ No newline at end of file diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h index 07e0ba3a9..8dd7e8798 100644 --- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.h +++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.h @@ -23,10 +23,6 @@ public: static QStringList findQmFiles(); static QString languageName(const QString &lang); -signals: - /// Request to re-import the card database with the newly selected card language - void cardDatabaseUpdateRequested(); - private slots: void deckPathButtonClicked(); void filtersPathButtonClicked(); @@ -37,8 +33,6 @@ private slots: void tokenDatabasePathButtonClicked(); void resetAllPathsClicked(); void languageBoxChanged(int index); - void cardLanguageBoxChanged(int index); - void cardSearchLanguageBoxChanged(int index); void updateStartupServerControlsVisibility(); private: @@ -48,44 +42,6 @@ private: QGroupBox *startupGroupBox; QGroupBox *pathsGroupBox; - QLabel languageLabel; - QComboBox languageBox; - QLabel advertiseTranslationPageLabel; - - QLabel cardLanguageLabel; - QComboBox cardLanguageBox; - QLabel cardLanguageNoteLabel; - - QLabel cardSearchLanguageLabel; - QComboBox cardSearchLanguageBox; - - QLabel updateReleaseChannelLabel; - QComboBox updateReleaseChannelBox; - QCheckBox startupUpdateCheckCheckBox; - QCheckBox updateNotificationCheckBox; - QCheckBox newVersionOracleCheckBox; - - QLabel startupCardUpdateCheckBehaviorLabel; - QComboBox startupCardUpdateCheckBehaviorSelector; - QLabel cardUpdateCheckIntervalLabel; - QSpinBox cardUpdateCheckIntervalSpinBox; - QLabel lastCardUpdateCheckDateLabel; - - QCheckBox showTipsOnStartup; - QLabel startupTabLabel; - QComboBox startupTabSelector; - QLabel startupServerLabel; - QComboBox startupServerSelector; - QLabel startupRoomLabel; - QLineEdit *startupRoomNameEdit; - - QLabel deckPathLabel; - QLabel filtersPathLabel; - QLabel replaysPathLabel; - QLabel picsPathLabel; - QLabel cardDatabasePathLabel; - QLabel customCardDatabasePathLabel; - QLabel tokenDatabasePathLabel; QLineEdit *deckPathEdit; QLineEdit *filtersPathEdit; QLineEdit *replaysPathEdit; @@ -95,6 +51,33 @@ private: QLineEdit *tokenDatabasePathEdit; QPushButton *resetAllPathsButton; QLabel *allPathsResetLabel; + QComboBox languageBox; + QCheckBox startupUpdateCheckCheckBox; + QLabel startupCardUpdateCheckBehaviorLabel; + QComboBox startupCardUpdateCheckBehaviorSelector; + QLabel cardUpdateCheckIntervalLabel; + QSpinBox cardUpdateCheckIntervalSpinBox; + QLabel lastCardUpdateCheckDateLabel; + QCheckBox updateNotificationCheckBox; + QCheckBox newVersionOracleCheckBox; + QComboBox updateReleaseChannelBox; + QLabel languageLabel; + QLabel deckPathLabel; + QLabel filtersPathLabel; + QLabel replaysPathLabel; + QLabel picsPathLabel; + QLabel cardDatabasePathLabel; + QLabel customCardDatabasePathLabel; + QLabel tokenDatabasePathLabel; + QLabel updateReleaseChannelLabel; + QLabel advertiseTranslationPageLabel; + QCheckBox showTipsOnStartup; + QLabel startupTabLabel; + QComboBox startupTabSelector; + QLabel startupServerLabel; + QComboBox startupServerSelector; + QLabel startupRoomLabel; + QLineEdit *startupRoomNameEdit; }; #endif // COCKATRICE_GENERAL_SETTINGS_PAGE_H diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp index a3b89f8c4..e4f24ab73 100644 --- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.cpp @@ -1,7 +1,6 @@ #include "messages_settings_page.h" #include "../../../client/settings/cache_settings.h" -#include "../../pixel_map_generator.h" #include "../interface/widgets/utility/get_text_with_max.h" #include @@ -60,10 +59,6 @@ MessagesSettingsPage::MessagesSettingsPage() connect(&roomHistory, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(), &ChatSettings::setRoomHistory); - ignoreAllPrivateMessagesCheckBox.setChecked(SettingsCache::instance().chat().getIgnoreAllPrivateMessages()); - connect(&ignoreAllPrivateMessagesCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().chat(), - &ChatSettings::setIgnoreAllPrivateMessages); - customAlertString = new QLineEdit(); customAlertString->setText(SettingsCache::instance().chat().getHighlightWords()); connect(customAlertString, &QLineEdit::textChanged, &SettingsCache::instance().chat(), @@ -81,7 +76,6 @@ MessagesSettingsPage::MessagesSettingsPage() chatGrid->addWidget(&messagePopups, 5, 0); chatGrid->addWidget(&mentionPopups, 6, 0); chatGrid->addWidget(&roomHistory, 7, 0); - chatGrid->addWidget(&ignoreAllPrivateMessagesCheckBox, 8, 0); chatGroupBox = new QGroupBox; chatGroupBox->setLayout(chatGrid); @@ -108,15 +102,15 @@ MessagesSettingsPage::MessagesSettingsPage() } aAdd = new QAction(this); - aAdd->setIcon(themePixmap(QStringLiteral("icons/increment"))); + aAdd->setIcon(QPixmap("theme:icons/increment")); connect(aAdd, &QAction::triggered, this, &MessagesSettingsPage::actAdd); aEdit = new QAction(this); - aEdit->setIcon(themePixmap(QStringLiteral("icons/pencil"))); + aEdit->setIcon(QPixmap("theme:icons/pencil")); connect(aEdit, &QAction::triggered, this, &MessagesSettingsPage::actEdit); aRemove = new QAction(this); - aRemove->setIcon(themePixmap(QStringLiteral("icons/decrement"))); + aRemove->setIcon(QPixmap("theme:icons/decrement")); connect(aRemove, &QAction::triggered, this, &MessagesSettingsPage::actRemove); auto *messageToolBar = new QToolBar; @@ -262,7 +256,6 @@ void MessagesSettingsPage::retranslateUi() messagePopups.setText(tr("Enable desktop notifications for private messages")); mentionPopups.setText(tr("Enable desktop notification for mentions")); roomHistory.setText(tr("Enable room message history on join")); - ignoreAllPrivateMessagesCheckBox.setText(tr("Ignore all private messages")); hexLabel.setText(tr("(Color is hexadecimal)")); hexHighlightLabel.setText(tr("(Color is hexadecimal)")); customAlertStringLabel.setText(tr("Separate words with a space, alphanumeric characters only")); diff --git a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h index 436ebbad9..e98ae0592 100644 --- a/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h +++ b/cockatrice/src/interface/widgets/settings_page/messages_settings_page.h @@ -40,7 +40,6 @@ private: QCheckBox messagePopups; QCheckBox mentionPopups; QCheckBox roomHistory; - QCheckBox ignoreAllPrivateMessagesCheckBox; QGroupBox *chatGroupBox; QGroupBox *highlightGroupBox; QGroupBox *messageGroupBox; diff --git a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp index 1277d0e49..1f1867f7c 100644 --- a/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/shortcut_settings_page.cpp @@ -3,7 +3,6 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcut_treeview.h" #include "../../../client/settings/shortcuts_settings.h" -#include "../../pixel_map_generator.h" #include "../interface/widgets/utility/custom_line_edit.h" #include "../interface/widgets/utility/sequence_edit.h" @@ -48,8 +47,8 @@ ShortcutSettingsPage::ShortcutSettingsPage() btnResetAll = new QPushButton(this); btnClearAll = new QPushButton(this); - btnResetAll->setIcon(themePixmap(QStringLiteral("icons/update"))); - btnClearAll->setIcon(themePixmap(QStringLiteral("icons/clearsearch"))); + btnResetAll->setIcon(QPixmap("theme:icons/update")); + btnClearAll->setIcon(QPixmap("theme:icons/clearsearch")); // layout auto *_editLayout = new QGridLayout; diff --git a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp index 2c6e062da..182e75aac 100644 --- a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.cpp @@ -20,7 +20,26 @@ enum visualDeckStoragePromptForConversionIndex UserInterfaceSettingsPage::UserInterfaceSettingsPage() { - // general settings + // general settings and notification settings + notificationsEnabledCheckBox.setChecked(SettingsCache::instance().userInterface().getNotificationsEnabled()); + connect(¬ificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(), + &InterfaceSettings::setNotificationsEnabled); + connect(¬ificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, this, + &UserInterfaceSettingsPage::setNotificationEnabled); + + specNotificationsEnabledCheckBox.setChecked( + SettingsCache::instance().userInterface().getSpectatorNotificationsEnabled()); + specNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().userInterface().getNotificationsEnabled()); + connect(&specNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(), + &InterfaceSettings::setSpectatorNotificationsEnabled); + + buddyConnectNotificationsEnabledCheckBox.setChecked( + SettingsCache::instance().userInterface().getBuddyConnectNotificationsEnabled()); + buddyConnectNotificationsEnabledCheckBox.setEnabled( + SettingsCache::instance().userInterface().getNotificationsEnabled()); + connect(&buddyConnectNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, + &SettingsCache::instance().userInterface(), &InterfaceSettings::setBuddyConnectNotificationsEnabled); + doubleClickToPlayCheckBox.setChecked(SettingsCache::instance().userInterface().getDoubleClickToPlay()); connect(&doubleClickToPlayCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(), &InterfaceSettings::setDoubleClickToPlay); @@ -84,26 +103,6 @@ UserInterfaceSettingsPage::UserInterfaceSettingsPage() generalGroupBox = new QGroupBox; generalGroupBox->setLayout(generalGrid); - // notification settings - notificationsEnabledCheckBox.setChecked(SettingsCache::instance().userInterface().getNotificationsEnabled()); - connect(¬ificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(), - &InterfaceSettings::setNotificationsEnabled); - connect(¬ificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, this, - &UserInterfaceSettingsPage::setNotificationEnabled); - - specNotificationsEnabledCheckBox.setChecked( - SettingsCache::instance().userInterface().getSpectatorNotificationsEnabled()); - specNotificationsEnabledCheckBox.setEnabled(SettingsCache::instance().userInterface().getNotificationsEnabled()); - connect(&specNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().userInterface(), - &InterfaceSettings::setSpectatorNotificationsEnabled); - - buddyConnectNotificationsEnabledCheckBox.setChecked( - SettingsCache::instance().userInterface().getBuddyConnectNotificationsEnabled()); - buddyConnectNotificationsEnabledCheckBox.setEnabled( - SettingsCache::instance().userInterface().getNotificationsEnabled()); - connect(&buddyConnectNotificationsEnabledCheckBox, &QCheckBox::QT_STATE_CHANGED, - &SettingsCache::instance().userInterface(), &InterfaceSettings::setBuddyConnectNotificationsEnabled); - auto *notificationsGrid = new QGridLayout; notificationsGrid->addWidget(¬ificationsEnabledCheckBox, 0, 0); notificationsGrid->addWidget(&specNotificationsEnabledCheckBox, 1, 0); @@ -356,7 +355,6 @@ void UserInterfaceSettingsPage::retranslateUi() notificationsEnabledCheckBox.setText(tr("Enable notifications in taskbar")); specNotificationsEnabledCheckBox.setText(tr("Notify in the taskbar for game events while you are spectating")); buddyConnectNotificationsEnabledCheckBox.setText(tr("Notify in the taskbar when users in your buddy list connect")); - animationGroupBox->setTitle(tr("Animation settings")); enableAllAnimationsButton.setText(tr("&Enable all animations")); disableAllAnimationsButton.setText(tr("&Disable all animations")); @@ -364,7 +362,6 @@ void UserInterfaceSettingsPage::retranslateUi() arrowDrawAnimationCheckBox.setText(tr("&Arrow draw animation")); lifeCounterAnimationsCheckBox.setText(tr("Life counter flash")); battlefieldFlashCheckBox.setText(tr("Battlefield flash on damage")); - deckEditorGroupBox->setTitle(tr("Deck editor/storage settings")); openDeckInNewTabCheckBox.setText(tr("Open deck in new tab by default")); visualDeckStorageInGameCheckBox.setText(tr("Use visual deck storage in game lobby")); @@ -400,8 +397,8 @@ void UserInterfaceSettingsPage::retranslateUi() 0, CommanderBracketNames::CommanderSpellbookBracketNames); commanderSpellbookIntegrationBracketNamingSelector.setItemText( 1, CommanderBracketNames::OfficialCommanderBracketNames); - commanderSpellbookIntegrationUseOfficialBracketNamesExplainer.setToolTip(CommanderBracketNames::Explainer); + commanderSpellbookIntegrationUseOfficialBracketNamesExplainer.setToolTip(CommanderBracketNames::Explainer); replayGroupBox->setTitle(tr("Replay settings")); rewindBufferingMsLabel.setText(tr("Buffer time for backwards skip via shortcut:")); rewindBufferingMsBox.setSuffix(" ms"); diff --git a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h index e8a30fb1f..0dc4cf4e8 100644 --- a/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h +++ b/cockatrice/src/interface/widgets/settings_page/user_interface_settings_page.h @@ -23,6 +23,9 @@ private slots: void updateCommanderSpellbookUiState(); private: + QCheckBox notificationsEnabledCheckBox; + QCheckBox specNotificationsEnabledCheckBox; + QCheckBox buddyConnectNotificationsEnabledCheckBox; QCheckBox doubleClickToPlayCheckBox; QCheckBox clickPlaysAllSelectedCheckBox; QCheckBox playToStackCheckBox; @@ -34,18 +37,12 @@ private: QCheckBox showTotalSelectionCountCheckBox; QCheckBox useTearOffMenusCheckBox; QCheckBox keepGameChatFocusCheckBox; - - QCheckBox notificationsEnabledCheckBox; - QCheckBox specNotificationsEnabledCheckBox; - QCheckBox buddyConnectNotificationsEnabledCheckBox; - QPushButton enableAllAnimationsButton; QPushButton disableAllAnimationsButton; QCheckBox tapAnimationCheckBox; QCheckBox arrowDrawAnimationCheckBox; QCheckBox lifeCounterAnimationsCheckBox; QCheckBox battlefieldFlashCheckBox; - QCheckBox openDeckInNewTabCheckBox; QLabel visualDeckStoragePromptForConversionLabel; QComboBox visualDeckStoragePromptForConversionSelector; @@ -60,10 +57,8 @@ private: QLabel commanderSpellbookIntegrationUseOfficialBracketNamesLabel; QToolButton commanderSpellbookIntegrationUseOfficialBracketNamesExplainer; QComboBox commanderSpellbookIntegrationBracketNamingSelector; - QLabel rewindBufferingMsLabel; QSpinBox rewindBufferingMsBox; - QGroupBox *generalGroupBox; QGroupBox *notificationsGroupBox; QGroupBox *animationGroupBox; diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp index 6423c581b..f80649eba 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp @@ -11,7 +11,6 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" -#include "../cards/additional_info/deck_color_identity.h" #include "../client/network/interfaces/deck_stats_interface.h" #include "../client/network/interfaces/tapped_out_interface.h" #include "../deck_editor/deck_state_manager.h" @@ -20,7 +19,6 @@ #include "../interface/widgets/dialogs/dlg_load_deck.h" #include "../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h" #include "../interface/widgets/dialogs/dlg_load_deck_from_website.h" -#include "../interface/widgets/dialogs/dlg_share_deck.h" #include "../utility/visibility_change_listener.h" #include "tab_supervisor.h" @@ -325,7 +323,6 @@ bool AbstractTabDeckEditor::actSaveDeck() Command_DeckUpload cmd; cmd.set_deck_id(static_cast(loadedDeck.lastLoadInfo.remoteDeckId)); cmd.set_deck_list(deckString.toStdString()); - cmd.set_color_identity(getDeckColorIdentity(loadedDeck.deckList, CardDatabaseManager::query()).toStdString()); PendingCommand *pend = AbstractClient::prepareSessionCommand(cmd); connect(pend, &PendingCommand::finished, this, &AbstractTabDeckEditor::saveDeckRemoteFinished); @@ -385,27 +382,6 @@ bool AbstractTabDeckEditor::actSaveDeckAs() return true; } -/** - * @brief Opens the deck share dialog with the current deck preselected. - */ -void AbstractTabDeckEditor::actShareDeck() -{ - AbstractClient *client = tabSupervisor->getServerClient(); - if (client->getStatus() != StatusLoggedIn) { - QMessageBox::information(this, tr("Share deck"), tr("You must be connected to the server to share a deck.")); - return; - } - - const QSharedPointer deck = deckStateManager->getDeckListShared(); - if (deck->isBlankDeck()) { - QMessageBox::information(this, tr("Share deck"), tr("The deck is empty. Add cards before sharing it.")); - return; - } - - DlgShareDeck shareDialog(client, deck, this); - shareDialog.exec(); -} - /** * @brief Callback for remote deck save completion. * @param response Server response. diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h index dae8f5b0a..a3cda2bfc 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h @@ -214,9 +214,6 @@ protected slots: /** @brief Saves the current deck under a new name. */ virtual bool actSaveDeckAs(); - /** @brief Opens the deck share dialog for the current deck. */ - void actShareDeck(); - /** @brief Loads a deck from the clipboard. */ virtual void actLoadDeckFromClipboard(); diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp index 657ef3dbe..66b68d823 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp @@ -1,6 +1,5 @@ #include "archidekt_api_response_deck_display_widget.h" -#include "../../../../../../client/settings/cache_settings.h" #include "../../../../../deck_loader/card_node_function.h" #include "../../../../../deck_loader/deck_loader.h" #include "../../../../cards/card_size_widget.h" @@ -11,7 +10,6 @@ #include #include -#include ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWidget *parent, ArchidektApiResponseDeck _response, @@ -122,9 +120,6 @@ ArchidektApiResponseDeckDisplayWidget::ArchidektApiResponseDeckDisplayWidget(QWi } model = new DeckListModel(this); - model->setDisplayLanguage(SettingsCache::instance().cardsDisplay().getCardLang()); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, model, - [this](const QString &lang) { model->setDisplayLanguage(lang); }); connect(model, &DeckListModel::modelReset, this, &ArchidektApiResponseDeckDisplayWidget::decklistModelReset); auto decklist = QSharedPointer(new DeckList); diff --git a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp index 888197f53..98b21d0f1 100644 --- a/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/archidekt/tab_archidekt.cpp @@ -1,7 +1,6 @@ #include "tab_archidekt.h" #include "../../../../../client/settings/cache_settings.h" -#include "../../../../pixel_map_generator.h" #include "../../../cards/additional_info/mana_symbol_widget.h" #include "../../../utility/completer_utils.h" #include "../../tab_supervisor.h" @@ -214,7 +213,7 @@ void TabArchidekt::setupFilterWidgets() // Format filter (collapsible) formatButton = new SettingsButtonWidget(secondaryToolbar); formatButton->setButtonText(tr("Formats")); - formatButton->setButtonIcon(themePixmap(QStringLiteral("icons/scale_balanced"))); + formatButton->setButtonIcon(QPixmap("theme:icons/scale_balanced")); QWidget *formatContainer = new QWidget(secondaryToolbar); QGridLayout *formatLayout = new QGridLayout(formatContainer); diff --git a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp index 2cbbedfa4..4f50e38a6 100644 --- a/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/commander_spellbook/commander_bracket_widget.cpp @@ -1,7 +1,6 @@ #include "commander_bracket_widget.h" #include "../../../../../client/settings/cache_settings.h" -#include "../../../../pixel_map_generator.h" #include "commander_bracket_service.h" #include @@ -31,7 +30,7 @@ CommanderBracketWidget::CommanderBracketWidget(QWidget *parent) : QWidget(parent bracketInfoButton->setEnabled(false); bracketRefreshButton = new QToolButton(this); - bracketRefreshButton->setIcon(themePixmap(QStringLiteral("icons/reload"))); + bracketRefreshButton->setIcon(QPixmap("theme:icons/reload")); bracketRefreshButton->setAutoRaise(true); connect(bracketRefreshButton, &QToolButton::clicked, this, &CommanderBracketWidget::requestBracketEstimate); diff --git a/cockatrice/src/interface/widgets/tabs/tab_account.cpp b/cockatrice/src/interface/widgets/tabs/tab_account.cpp index dbcf50966..410a48d40 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_account.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_account.cpp @@ -137,11 +137,6 @@ void TabAccount::retranslateUi() buddyList->retranslateUi(); ignoreList->retranslateUi(); userInfoBox->retranslateUi(); - - buddyList->setToolTip(tr("Buddies are marked with a star in chat, a sound plays when they join or leave the " - "server, and they can be invited to buddy-only games.")); - ignoreList->setToolTip(tr("Ignored users' chat messages are hidden from you, and they cannot send you private " - "messages or join your games.")); } void TabAccount::processListUsersResponse(const Response &response) diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp index 62769d0e3..49e42e4cf 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp @@ -2,55 +2,35 @@ #include "../../../client/settings/cache_settings.h" #include "../../deck_loader/deck_loader.h" -#include "../../pixel_map_generator.h" -#include "../cards/additional_info/deck_color_identity.h" -#include "../deck_share/deck_share_utils.h" -#include "../deck_share/share_bar_widget.h" #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h" #include "../interface/widgets/utility/get_text_with_max.h" #include #include -#include #include #include #include #include -#include #include #include -#include #include -#include #include #include #include #include -#include #include #include #include #include #include -#include -#include #include #include #include -#include #include #include -#include #include #include -namespace -{ -// How long to wait after the last visibility change before reading back the -// Public/Private column, in milliseconds. -constexpr int VISIBILITY_REFRESH_DELAY = 500; -} // namespace - TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo) @@ -111,34 +91,8 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, serverDirView = new RemoteDeckList_TreeWidget(client); connect(serverDirView, &QTreeView::doubleClicked, this, &TabDeckStorage::actRemoteDoubleClick); - connect(serverDirView->selectionModel(), &QItemSelectionModel::selectionChanged, this, - [this] { onServerSelectionChanged(); }); - - // Share bar for creating a share link from the selected server decks/folders. - shareBar = new ShareBarWidget(this); - connect(shareBar, &ShareBarWidget::createRequested, this, &TabDeckStorage::actShareSelection); - connect(shareBar, &ShareBarWidget::cancelRequested, this, &TabDeckStorage::cancelShareDecks); - shareBar->setVisible(false); - - shareTimeoutTimer = new QTimer(this); - shareTimeoutTimer->setSingleShot(true); - shareTimeoutTimer->setInterval( - static_cast((static_cast(SettingsCache::instance().network().getTimeOut()) + 1) * - SettingsCache::instance().network().getKeepAlive() * 1000)); - connect(shareTimeoutTimer, &QTimer::timeout, this, &TabDeckStorage::onShareFromTreeTimeout); - - // Restartable single-shot refresh for the Public/Private column. It is - // armed with the full network timeout when a publish is sent (so a dropped - // reply still drains once) and re-armed with the short delay every time a - // reply lands, so the drain cannot fire while a slow round trip is still in - // flight. Either way the tree is re-read once things quiet down. - visibilityRefreshTimer = new QTimer(this); - visibilityRefreshTimer->setSingleShot(true); - visibilityRefreshTimer->setInterval(VISIBILITY_REFRESH_DELAY); - connect(visibilityRefreshTimer, &QTimer::timeout, this, &TabDeckStorage::onVisibilityRefreshTimeout); QVBoxLayout *rightVbox = new QVBoxLayout; - rightVbox->addWidget(shareBar); rightVbox->addWidget(serverDirView); rightVbox->addLayout(rightToolBarLayout); rightGroupBox = new QGroupBox; @@ -151,19 +105,19 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, // Left side actions aOpenLocalDeck = new QAction(this); - aOpenLocalDeck->setIcon(themePixmap(QStringLiteral("icons/pencil"))); + aOpenLocalDeck->setIcon(QPixmap("theme:icons/pencil")); connect(aOpenLocalDeck, &QAction::triggered, this, &TabDeckStorage::actOpenLocalDeck); aRenameLocal = new QAction(this); - aRenameLocal->setIcon(themePixmap(QStringLiteral("icons/rename"))); + aRenameLocal->setIcon(QPixmap("theme:icons/rename")); connect(aRenameLocal, &QAction::triggered, this, &TabDeckStorage::actRenameLocal); aUpload = new QAction(this); - aUpload->setIcon(themePixmap(QStringLiteral("icons/arrow_right_green"))); + aUpload->setIcon(QPixmap("theme:icons/arrow_right_green")); connect(aUpload, &QAction::triggered, this, &TabDeckStorage::actUpload); aNewLocalFolder = new QAction(this); aNewLocalFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder)); connect(aNewLocalFolder, &QAction::triggered, this, &TabDeckStorage::actNewLocalFolder); aDeleteLocalDeck = new QAction(this); - aDeleteLocalDeck->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); + aDeleteLocalDeck->setIcon(QPixmap("theme:icons/remove_row")); connect(aDeleteLocalDeck, &QAction::triggered, this, &TabDeckStorage::actDeleteLocalDeck); aOpenDecksFolder = new QAction(this); @@ -172,26 +126,18 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, // Right side actions aOpenRemoteDeck = new QAction(this); - aOpenRemoteDeck->setIcon(themePixmap(QStringLiteral("icons/pencil"))); + aOpenRemoteDeck->setIcon(QPixmap("theme:icons/pencil")); connect(aOpenRemoteDeck, &QAction::triggered, this, &TabDeckStorage::actOpenRemoteDeck); aDownload = new QAction(this); - aDownload->setIcon(themePixmap(QStringLiteral("icons/arrow_left_green"))); + aDownload->setIcon(QPixmap("theme:icons/arrow_left_green")); connect(aDownload, &QAction::triggered, this, &TabDeckStorage::actDownload); aNewFolder = new QAction(this); aNewFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder)); connect(aNewFolder, &QAction::triggered, this, &TabDeckStorage::actNewFolder); aDeleteRemoteDeck = new QAction(this); - aDeleteRemoteDeck->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); + aDeleteRemoteDeck->setIcon(QPixmap("theme:icons/remove_row")); connect(aDeleteRemoteDeck, &QAction::triggered, this, &TabDeckStorage::actDeleteRemoteDeck); - aShareDecks = new QAction(this); - aShareDecks->setIcon(themePixmap(QStringLiteral("icons/share"))); - connect(aShareDecks, &QAction::triggered, this, &TabDeckStorage::actShareDecks); - - aPublishDeck = new QAction(this); - aPublishDeck->setIcon(QPixmap("theme:icons/lock")); - connect(aPublishDeck, &QAction::triggered, this, &TabDeckStorage::actPublishDeck); - // Add actions to toolbars leftToolBar->addAction(aOpenLocalDeck); leftToolBar->addAction(aRenameLocal); @@ -203,8 +149,6 @@ TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, rightToolBar->addAction(aOpenRemoteDeck); rightToolBar->addAction(aDownload); - rightToolBar->addAction(aShareDecks); - rightToolBar->addAction(aPublishDeck); rightToolBar->addAction(aNewFolder); rightToolBar->addAction(aDeleteRemoteDeck); @@ -233,13 +177,7 @@ void TabDeckStorage::retranslateUi() aNewFolder->setText(tr("New folder")); aDeleteLocalDeck->setText(tr("Delete")); aDeleteRemoteDeck->setText(tr("Delete")); - aShareDecks->setText(tr("Share decks")); - aPublishDeck->setText(tr("Publish/unpublish deck")); aOpenDecksFolder->setText(tr("Open decks folder")); - shareBar->retranslateUi(); - if (shareBar->isVisible()) { - onServerSelectionChanged(); - } } QString TabDeckStorage::getTargetPath() const @@ -272,8 +210,6 @@ void TabDeckStorage::handleConnected(const ServerInfo_User &userInfo) void TabDeckStorage::handleConnectionChanged(ClientStatus status) { if (status == StatusDisconnected) { - visibilityRefreshTimer->stop(); - visibilityRefreshStarted = false; setRemoteEnabled(false); } } @@ -283,15 +219,12 @@ void TabDeckStorage::setRemoteEnabled(bool enabled) aUpload->setEnabled(enabled); aOpenRemoteDeck->setEnabled(enabled); aDownload->setEnabled(enabled); - aShareDecks->setEnabled(enabled); - aPublishDeck->setEnabled(enabled); aNewFolder->setEnabled(enabled); aDeleteRemoteDeck->setEnabled(enabled); if (enabled) { serverDirView->refreshTree(); } else { - setShareModeEnabled(false); serverDirView->clearTree(); } } @@ -413,8 +346,6 @@ void TabDeckStorage::uploadDeck(const QString &filePath, const QString &targetPa cmd.set_path(targetPath.toStdString()); cmd.set_deck_list(deckString.toStdString()); - cmd.set_color_identity(getDeckColorIdentity(deck, CardDatabaseManager::query()).toStdString()); - PendingCommand *pend = client->prepareSessionCommand(cmd); connect(pend, &PendingCommand::finished, this, &TabDeckStorage::uploadFinished); client->sendCommand(pend); @@ -694,241 +625,3 @@ void TabDeckStorage::deleteFolderFinished(const Response &response, const Comman serverDirView->removeNode(toDelete); } } - -void TabDeckStorage::actShareDecks() -{ - setShareModeEnabled(true); -} - -void TabDeckStorage::cancelShareDecks() -{ - setShareModeEnabled(false); -} - -void TabDeckStorage::setShareModeEnabled(bool enabled) -{ - shareBar->setVisible(enabled); - if (enabled) { - shareBar->setCreateEnabled(true); - shareBar->setName(tr("Shared decks")); - onServerSelectionChanged(); - shareBar->focusName(); - } else { - // Abandon any in-flight request: otherwise the timer keeps running and a late - // response reports the share as created after the user already backed out. - shareTimeoutTimer->stop(); - shareInFlightSeq = 0; - serverDirView->clearSelection(); - } -} - -void TabDeckStorage::onServerSelectionChanged() -{ - if (!shareBar->isVisible()) { - return; - } - const auto selection = serverDirView->getCurrentSelection(); - int folders = 0; - int files = 0; - for (const auto *node : selection) { - if (dynamic_cast(node)) { - ++folders; - } else { - ++files; - } - } - - QString hint; - if (folders > 1) { - hint = tr("Only one folder can be shared at a time."); - } else if (folders > 0 && files > 0) { - hint = tr("Share either a folder or decks, not both."); - } else if (folders == 0 && files == 0) { - hint = tr("Select folders or decks in the tree to share."); - } - shareBar->setHintText(hint, !hint.isEmpty()); - - QStringList parts; - if (folders > 0) { - parts << tr("%n folder(s)", "", folders); - } - if (files > 0) { - parts << tr("%n deck(s)", "", files); - } - shareBar->setCountText(parts.isEmpty() ? tr("No decks selected") - : tr("Selected: %1").arg(parts.join(QStringLiteral(", ")))); -} - -void TabDeckStorage::actShareSelection() -{ - const auto selection = serverDirView->getCurrentSelection(); - QString sharedFolder; - bool hasFile = false; - bool hasFolder = false; - for (const auto *node : selection) { - if (const auto *dirNode = dynamic_cast(node)) { - hasFolder = true; - if (!sharedFolder.isEmpty()) { - showShareNotice(tr("Only one folder can be shared at a time."), true); - return; - } - sharedFolder = dirNode->getPath(); - } else { - hasFile = true; - } - } - - if (hasFile && hasFolder) { - showShareNotice(tr("Share either a folder or decks, not both."), true); - return; - } - if (hasFolder && sharedFolder.isEmpty()) { - showShareNotice(tr("The root folder cannot be shared."), true); - return; - } - - Command_DeckShareCreate cmd; - cmd.set_name(shareBar->name().toStdString()); - if (cmd.name().empty()) { - cmd.set_name(tr("Shared decks").toStdString()); - } - - if (!sharedFolder.isEmpty()) { - cmd.set_folder_path(sharedFolder.toStdString()); - } else { - for (const auto *node : selection) { - if (const auto *fileNode = dynamic_cast(node)) { - DeckShareItem *item = cmd.add_items(); - item->set_deck_id(fileNode->getId()); - } - } - } - - if (cmd.items_size() == 0 && cmd.folder_path().empty()) { - showShareNotice(tr("Select decks to share."), true); - return; - } - - shareBar->setCreateEnabled(false); - const int seq = ++shareRequestSeq; - shareInFlightSeq = seq; - PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, - [this, seq](const Response &response, const CommandContainer &commandContainer) { - if (shareInFlightSeq != seq) { - return; // the user cancelled or a newer request superseded this one - } - shareInFlightSeq = 0; - shareFromTreeFinished(response, commandContainer); - }); - client->sendCommand(pend); - shareTimeoutTimer->start(); -} - -void TabDeckStorage::shareFromTreeFinished(const Response &response, const CommandContainer & /*commandContainer*/) -{ - shareTimeoutTimer->stop(); - shareBar->setCreateEnabled(true); - if (response.response_code() != Response::RespOk) { - qWarning() << "failed to create deck share:" << response.response_code(); - showShareNotice(tr("Failed to create the share link (server response code %1).") - .arg(QString::number(static_cast(response.response_code()))), - true); - return; - } - const DeckShareUtils::ShareResponse share = DeckShareUtils::handleShareResponse(client, response); - - showShareNotice( - tr("Share link copied to the clipboard.\nExpires on %1.").arg(DeckShareUtils::formatShareExpiry(share.expiry))); - setShareModeEnabled(false); -} - -void TabDeckStorage::showShareNotice(const QString &message, bool warning) -{ - QMessageBox box(warning ? QMessageBox::Warning : QMessageBox::Information, tr("Share link"), message, - QMessageBox::Ok, this); - box.exec(); -} - -void TabDeckStorage::onShareFromTreeTimeout() -{ - if (shareInFlightSeq == 0) { - return; // share mode was left while the request was still outstanding - } - shareInFlightSeq = 0; - shareBar->setCreateEnabled(true); - showShareNotice(tr("The server did not respond in time. Try again."), true); -} - -void TabDeckStorage::actPublishDeck() -{ - visibilityFailures.clear(); - // Arm the drain with the full network timeout so a lost reply still costs - // one refresh instead of a dead column; each reply shrinks it to the short - // delay below, so a slow round trip is never drained before it lands. - const int visibilityFailSafeDelay = - static_cast((static_cast(SettingsCache::instance().network().getTimeOut()) + 1) * - SettingsCache::instance().network().getKeepAlive() * 1000); - - const auto selection = serverDirView->getCurrentSelection(); - for (const auto *node : selection) { - Command_DeckSetVisibility cmd; - if (const auto *fileNode = dynamic_cast(node)) { - cmd.set_deck_id(fileNode->getId()); - } else if (const auto *dirNode = dynamic_cast(node)) { - const QString path = dirNode->getPath(); - if (path.isEmpty()) { - continue; // the root folder cannot be published - } - cmd.set_folder_path(path.toStdString()); - } else { - continue; - } - // Toggle the node's own visibility bit (what the server persists); the - // effective visibility shown by the column may additionally be inherited - // from a parent folder. - cmd.set_is_public(!node->isPublic()); - - PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, &TabDeckStorage::setVisibilityFinished); - visibilityRefreshStarted = true; - visibilityRefreshTimer->setInterval(visibilityFailSafeDelay); - visibilityRefreshTimer->start(); - client->sendCommand(pend); - } -} - -void TabDeckStorage::setVisibilityFinished(const Response &r, const CommandContainer & /*commandContainer*/) -{ - if (r.response_code() == Response::RespOk) { - if (visibilityRefreshStarted) { - visibilityRefreshTimer->setInterval(VISIBILITY_REFRESH_DELAY); - visibilityRefreshTimer->start(); - } - return; - } - - // Collect batch failures and surface them once, when publishing quiets - // down, instead of stacking one modal dialog per rejected node. - const QString message = tr("Failed to change deck visibility on server (response code %1).") - .arg(QString::number(static_cast(r.response_code()))); - if (visibilityRefreshStarted) { - visibilityFailures.append(message); - visibilityRefreshTimer->setInterval(VISIBILITY_REFRESH_DELAY); - visibilityRefreshTimer->start(); - } else { - QMessageBox::critical(this, tr("Error"), message); - } -} - -void TabDeckStorage::onVisibilityRefreshTimeout() -{ - visibilityRefreshStarted = false; - if (!visibilityFailures.isEmpty()) { - QMessageBox::critical( - this, tr("Error"), - tr("Failed to change the visibility of %n selected deck(s).", "", visibilityFailures.size())); - visibilityFailures.clear(); - } - serverDirView->refreshTree(); -} diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h index f8d585880..a863e0625 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.h @@ -11,7 +11,6 @@ #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h" #include "tab.h" -#include #include struct LoadedDeck; @@ -23,10 +22,8 @@ class QToolBar; class QTreeWidget; class QTreeWidgetItem; class QGroupBox; -class QTimer; class CommandContainer; class Response; -class ShareBarWidget; class TabDeckStorage : public Tab { @@ -38,25 +35,14 @@ private: QToolBar *leftToolBar, *rightToolBar; RemoteDeckList_TreeWidget *serverDirView; QGroupBox *leftGroupBox, *rightGroupBox; - ShareBarWidget *shareBar; - QTimer *shareTimeoutTimer; - int shareRequestSeq = 0; - int shareInFlightSeq = 0; QAction *aOpenLocalDeck, *aRenameLocal, *aUpload, *aNewLocalFolder, *aDeleteLocalDeck; QAction *aOpenDecksFolder; - QAction *aOpenRemoteDeck, *aDownload, *aShareDecks, *aPublishDeck, *aNewFolder, *aDeleteRemoteDeck; - bool visibilityRefreshStarted = false; - QTimer *visibilityRefreshTimer; - QStringList visibilityFailures; + QAction *aOpenRemoteDeck, *aDownload, *aNewFolder, *aDeleteRemoteDeck; QString getTargetPath() const; void setRemoteEnabled(bool enabled); - void showShareNotice(const QString &message, bool warning = false); - - void setShareModeEnabled(bool enabled); - void uploadDeck(const QString &filePath, const QString &targetPath); void deleteRemoteDeck(const RemoteDeckList_TreeModel::Node *node); @@ -89,17 +75,6 @@ private slots: void actNewFolder(); void newFolderFinished(const Response &response, const CommandContainer &commandContainer); - void actShareDecks(); - void actShareSelection(); - void cancelShareDecks(); - void onServerSelectionChanged(); - void shareFromTreeFinished(const Response &r, const CommandContainer &commandContainer); - void onShareFromTreeTimeout(); - - void actPublishDeck(); - void setVisibilityFinished(const Response &r, const CommandContainer &commandContainer); - void onVisibilityRefreshTimeout(); - void actDeleteRemoteDeck(); void deleteFolderFinished(const Response &response, const CommandContainer &commandContainer); void deleteDeckFinished(const Response &response, const CommandContainer &commandContainer); diff --git a/cockatrice/src/interface/widgets/tabs/tab_developer.cpp b/cockatrice/src/interface/widgets/tabs/tab_developer.cpp deleted file mode 100644 index 39652ef7d..000000000 --- a/cockatrice/src/interface/widgets/tabs/tab_developer.cpp +++ /dev/null @@ -1,261 +0,0 @@ -/** - * @file tab_developer.cpp - * @ingroup ServerTabs - */ -//! \todo Document this file. - -#include "tab_developer.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static constexpr int DEFAULT_AUTO_REFRESH_INTERVAL_SECS = 30; - -TabDeveloper::TabDeveloper(TabSupervisor *_tabSupervisor, AbstractClient *_client) - : Tab(_tabSupervisor), client(_client) -{ - statsTable = new QTableWidget(0, 2); - statsTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - statsTable->setEditTriggers(QAbstractItemView::NoEditTriggers); - statsTable->setSelectionBehavior(QAbstractItemView::SelectRows); - statsTable->setSelectionMode(QAbstractItemView::SingleSelection); - statsTable->verticalHeader()->setVisible(false); - statsTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Interactive); - statsTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Interactive); - statsTable->horizontalHeader()->setStretchLastSection(true); - - commandTable = new QTableWidget(0, 4); - commandTable->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - commandTable->setEditTriggers(QAbstractItemView::NoEditTriggers); - commandTable->setSelectionBehavior(QAbstractItemView::SelectRows); - commandTable->setSelectionMode(QAbstractItemView::SingleSelection); - commandTable->verticalHeader()->setVisible(false); - commandTable->horizontalHeader()->setSectionResizeMode(0, QHeaderView::Interactive); - commandTable->horizontalHeader()->setSectionResizeMode(1, QHeaderView::Interactive); - commandTable->horizontalHeader()->setSectionResizeMode(2, QHeaderView::Interactive); - commandTable->horizontalHeader()->setSectionResizeMode(3, QHeaderView::Interactive); - - statusLabel = new QLabel; - - autoRefreshCheckBox = new QCheckBox; - autoRefreshCheckBox->setChecked(false); - - refreshIntervalSpinBox = new QSpinBox; - refreshIntervalSpinBox->setRange(5, 3600); - refreshIntervalSpinBox->setValue(DEFAULT_AUTO_REFRESH_INTERVAL_SECS); - refreshIntervalSpinBox->setEnabled(false); - - autoRefreshTimer = new QTimer(this); - connect(autoRefreshTimer, &QTimer::timeout, this, &TabDeveloper::refreshClicked); - connect(autoRefreshCheckBox, &QCheckBox::toggled, this, &TabDeveloper::autoRefreshToggled); - connect(refreshIntervalSpinBox, QOverload::of(&QSpinBox::valueChanged), this, - &TabDeveloper::refreshIntervalChanged); - - refreshButton = new QPushButton; - refreshButton->setAutoDefault(true); - connect(refreshButton, &QPushButton::clicked, this, &TabDeveloper::refreshClicked); - - auto *buttonLayout = new QHBoxLayout; - buttonLayout->addWidget(statusLabel, 1, Qt::AlignLeft); - buttonLayout->addWidget(autoRefreshCheckBox, 0, Qt::AlignRight); - buttonLayout->addWidget(refreshIntervalSpinBox, 0, Qt::AlignRight); - buttonLayout->addWidget(refreshButton, 0, Qt::AlignRight); - - auto *tableLayout = new QHBoxLayout; - tableLayout->addWidget(statsTable, 1); - tableLayout->addWidget(commandTable, 2); - - auto *mainLayout = new QVBoxLayout; - mainLayout->addLayout(tableLayout, 1); - mainLayout->addLayout(buttonLayout); - - auto *central = new QWidget; - central->setLayout(mainLayout); - setCentralWidget(central); - - retranslateUi(); -} - -void TabDeveloper::retranslateUi() -{ - autoRefreshCheckBox->setText(tr("Auto-refresh")); - autoRefreshCheckBox->setToolTip(tr("Automatically request fresh server statistics at a fixed interval.")); - refreshIntervalSpinBox->setSuffix(tr(" s")); - refreshIntervalSpinBox->setToolTip(tr("Seconds between automatic refreshes.")); - refreshButton->setText(tr("Refresh server stats")); - statsTable->setHorizontalHeaderLabels(QString(tr("Statistic;Value")).split(";")); - commandTable->setHorizontalHeaderLabels(QString(tr("Command;Count;Total ms;Avg ms")).split(";")); - if (statsTable->rowCount() == 0) { - statusLabel->clear(); - } -} - -QString TabDeveloper::formatBytes(quint64 bytes) -{ - const quint64 kib = 1024; - const quint64 mib = 1024 * kib; - const quint64 gib = 1024 * mib; - if (bytes >= gib) { - return tr("%1 GiB").arg(QString::number(bytes / static_cast(gib), 'f', 2)); - } - if (bytes >= mib) { - return tr("%1 MiB").arg(QString::number(bytes / static_cast(mib), 'f', 2)); - } - if (bytes >= kib) { - return tr("%1 KiB").arg(QString::number(bytes / static_cast(kib), 'f', 2)); - } - return tr("%1 bytes").arg(bytes); -} - -QString TabDeveloper::formatDurationMs(qint64 ms) -{ - if (ms >= 1000) { - return tr("%1 s").arg(QString::number(ms / 1000.0, 'f', 2)); - } - return tr("%1 ms").arg(ms); -} - -void TabDeveloper::appendStatRow(const QString &name, const QString &value) -{ - const int row = statsTable->rowCount(); - statsTable->insertRow(row); - statsTable->setItem(row, 0, new QTableWidgetItem(name)); - statsTable->setItem(row, 1, new QTableWidgetItem(value)); -} - -void TabDeveloper::appendSeparatorRow(const QString §ionTitle) -{ - const int row = statsTable->rowCount(); - statsTable->insertRow(row); - auto *labelItem = new QTableWidgetItem(sectionTitle); - auto font = labelItem->font(); - font.setBold(true); - labelItem->setFont(font); - labelItem->setFlags(labelItem->flags() & ~Qt::ItemIsSelectable); - statsTable->setItem(row, 0, labelItem); - statsTable->setItem(row, 1, new QTableWidgetItem(QString())); -} - -void TabDeveloper::refreshClicked() -{ - if (requestPending) { - return; - } - requestPending = true; - Command_GetServerStats cmd; - PendingCommand *pend = client->prepareDeveloperCommand(cmd); - connect(pend, &PendingCommand::finished, this, &TabDeveloper::serverStatsResponse); - client->sendCommand(pend); -} - -void TabDeveloper::autoRefreshToggled(bool checked) -{ - refreshIntervalSpinBox->setEnabled(checked); - if (checked) { - refreshIntervalChanged(); - refreshClicked(); - } else { - autoRefreshTimer->stop(); - } -} - -void TabDeveloper::refreshIntervalChanged() -{ - if (autoRefreshCheckBox->isChecked()) { - autoRefreshTimer->start(refreshIntervalSpinBox->value() * 1000); - } -} - -void TabDeveloper::serverStatsResponse(const Response &resp) -{ - requestPending = false; - if (resp.response_code() != Response::RespOk) { - statusLabel->setText(tr("No server statistics available yet.")); - return; - } - - const Response_GetServerStats &response = resp.GetExtension(Response_GetServerStats::ext); - - statsTable->setRowCount(0); - - // Overview section - appendStatRow(tr("Registered users online"), QString::number(response.users_count())); - appendStatRow(tr("Moderators online"), QString::number(response.mods_count())); - appendStatRow(tr("Games running"), QString::number(response.games_count())); - appendStatRow(tr("Traffic sent (last tick)"), formatBytes(response.tx_bytes())); - appendStatRow(tr("Traffic received (last tick)"), formatBytes(response.rx_bytes())); - - const qint64 uptime = static_cast(response.uptime_secs()); - const int days = static_cast(uptime / 86400); - const int hours = static_cast((uptime % 86400) / 3600); - const int minutes = static_cast((uptime % 3600) / 60); - appendStatRow(tr("Server uptime"), days > 0 ? tr("%1d %2h %3m").arg(days).arg(hours).arg(minutes) - : tr("%1h %2m").arg(hours).arg(minutes)); - - const QDateTime snapshotTime = QDateTime::fromSecsSinceEpoch(static_cast(response.timest())); - appendStatRow(tr("Snapshot taken"), snapshotTime.toLocalTime().toString("yyyy-MM-dd HH:mm")); - - // Live metrics section - appendSeparatorRow(tr("Live Metrics")); - appendStatRow(tr("Cards in live games"), QString::number(response.cards_in_games())); - appendStatRow(tr("Total commands processed"), QString::number(response.total_commands())); - - if (response.total_commands() > 0) { - const double avgMs = static_cast(response.total_command_time_ms()) / response.total_commands(); - appendStatRow(tr("Avg command time"), QString::number(avgMs, 'f', 2) + " ms"); - } - appendStatRow(tr("Active command types"), QString::number(response.active_command_types())); - - appendStatRow(tr("Event loop stalls"), QString::number(response.eventloop_stalls_total())); - appendStatRow(tr("Last stall overshoot"), formatDurationMs(response.eventloop_last_stall_ms())); - appendStatRow(tr("Worst stall overshoot"), formatDurationMs(response.eventloop_max_stall_ms())); - - if (response.game_start_count() > 0) { - appendStatRow(tr("Game starts"), QString::number(response.game_start_count())); - const double avgStartMs = static_cast(response.game_start_total_ms()) / response.game_start_count(); - appendStatRow(tr("Avg game start time"), QString::number(avgStartMs, 'f', 1) + " ms"); - } - - // Per-command breakdown table - QList sortedStats(response.command_stats().begin(), response.command_stats().end()); - std::sort(sortedStats.begin(), sortedStats.end(), - [](const auto &a, const auto &b) { return a.total_ms() > b.total_ms(); }); - - commandTable->setRowCount(0); - for (const auto &cs : sortedStats) { - const int row = commandTable->rowCount(); - commandTable->insertRow(row); - commandTable->setItem(row, 0, new QTableWidgetItem(QString::fromStdString(cs.command_name()))); - - auto *countItem = new QTableWidgetItem(QString::number(cs.count())); - countItem->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter); - commandTable->setItem(row, 1, countItem); - - auto *totalItem = new QTableWidgetItem(QString::number(cs.total_ms())); - totalItem->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter); - commandTable->setItem(row, 2, totalItem); - - const double avg = cs.count() > 0 ? static_cast(cs.total_ms()) / cs.count() : 0.0; - auto *avgItem = new QTableWidgetItem(QString::number(avg, 'f', 2)); - avgItem->setTextAlignment(Qt::AlignRight | Qt::AlignVCenter); - commandTable->setItem(row, 3, avgItem); - } - commandTable->resizeColumnsToContents(); - statsTable->resizeColumnsToContents(); - commandTable->resizeColumnsToContents(); - - statusLabel->setText(tr("Updated %1").arg(QDateTime::currentDateTime().toString("yyyy-MM-dd HH:mm"))); -} diff --git a/cockatrice/src/interface/widgets/tabs/tab_developer.h b/cockatrice/src/interface/widgets/tabs/tab_developer.h deleted file mode 100644 index 727a56bcb..000000000 --- a/cockatrice/src/interface/widgets/tabs/tab_developer.h +++ /dev/null @@ -1,55 +0,0 @@ -/** - * @file tab_developer.h - * @ingroup ServerTabs - */ -//! \todo Document this file. - -#ifndef TAB_DEVELOPER_H -#define TAB_DEVELOPER_H - -#include "tab.h" - -class AbstractClient; -class QCheckBox; -class QLabel; -class QPushButton; -class QSpinBox; -class QTableWidget; -class QTimer; -class Response; - -class TabDeveloper : public Tab -{ - Q_OBJECT -private: - AbstractClient *client; - QTableWidget *statsTable; - QTableWidget *commandTable; - QPushButton *refreshButton; - QLabel *statusLabel; - QCheckBox *autoRefreshCheckBox; - QSpinBox *refreshIntervalSpinBox; - QTimer *autoRefreshTimer; - bool requestPending = false; - - void appendStatRow(const QString &name, const QString &value); - void appendSeparatorRow(const QString §ionTitle); - static QString formatBytes(quint64 bytes); - static QString formatDurationMs(qint64 ms); - -private slots: - void refreshClicked(); - void serverStatsResponse(const Response &resp); - void autoRefreshToggled(bool checked); - void refreshIntervalChanged(); - -public: - explicit TabDeveloper(TabSupervisor *_tabSupervisor, AbstractClient *_client); - void retranslateUi() override; - [[nodiscard]] QString getTabText() const override - { - return tr("Developer"); - } -}; - -#endif diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp index 035ab1004..196ea4526 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp @@ -266,10 +266,6 @@ void TabGame::resetChatAndPhase() // reset phase markers game->getGameState()->setCurrentPhase(-1); - - // reset spectator state so the replay can rebuild it from the start - game->getPlayerManager()->clearSpectators(); - playerListWidget->clearSpectators(); } void TabGame::emitUserEvent() diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp index f73d06b57..e3678a903 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_logs.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_logs.cpp @@ -19,8 +19,7 @@ #include #include -TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _canUseDeveloperCommands) - : Tab(_tabSupervisor), client(_client), canUseDeveloperCommands(_canUseDeveloperCommands) +TabLog::TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client) : Tab(_tabSupervisor), client(_client) { roomTable = new QTableWidget(); roomTable->setColumnCount(6); @@ -81,9 +80,7 @@ void TabLog::getClicked() if (!mainRoom->isChecked() && !gameRoom->isChecked() && !privateChat->isChecked()) { mainRoom->setChecked(true); gameRoom->setChecked(true); - if (!canUseDeveloperCommands) { - privateChat->setChecked(true); - } + privateChat->setChecked(true); } if (maximumResults->value() == 0) { @@ -120,15 +117,7 @@ void TabLog::getClicked() }; cmd.set_date_range(dateRange); cmd.set_maximum_results(maximumResults->value()); - - PendingCommand *pend; - if (canUseDeveloperCommands) { - // Developers query logs through the developer command family. - pend = client->prepareDeveloperCommand(cmd); - } else { - pend = client->prepareModeratorCommand(cmd); - } - + PendingCommand *pend = client->prepareModeratorCommand(cmd); connect(pend, &PendingCommand::finished, this, &TabLog::viewLogHistory_processResponse); client->sendCommand(pend); } @@ -182,14 +171,6 @@ void TabLog::createDock() mainRoom = new QCheckBox(tr("Main Room")); gameRoom = new QCheckBox(tr("Game Room")); privateChat = new QCheckBox(tr("Private Chat")); - if (canUseDeveloperCommands) { - // Developers cannot query private conversations. - privateChat->setVisible(false); - // The developer family ignores the IP filter server-side, so showing - // the field would silently unfilter the result by it. Hide it. - labelFindIPAddress->setVisible(false); - findIPAddress->setVisible(false); - } pastDays = new QRadioButton(tr("Past X Days: ")); today = new QRadioButton(tr("Today")); diff --git a/cockatrice/src/interface/widgets/tabs/tab_logs.h b/cockatrice/src/interface/widgets/tabs/tab_logs.h index 8e914ea64..5d164dc92 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_logs.h +++ b/cockatrice/src/interface/widgets/tabs/tab_logs.h @@ -33,7 +33,6 @@ class TabLog : public Tab Q_OBJECT private: AbstractClient *client; - bool canUseDeveloperCommands; QLabel *labelFindUserName, *labelFindIPAddress, *labelFindGameName, *labelFindGameID, *labelMessage, *labelMaximum, *labelDescription; LineEditUnfocusable *findUsername, *findIPAddress, *findGameName, *findGameID, *findMessage; @@ -59,7 +58,7 @@ private slots: void restartLayout(); public: - TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client, bool _canUseDeveloperCommands = false); + TabLog(TabSupervisor *_tabSupervisor, AbstractClient *_client); ~TabLog() override; void retranslateUi() override; [[nodiscard]] QString getTabText() const override diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.cpp b/cockatrice/src/interface/widgets/tabs/tab_message.cpp index 418843178..9506d96f3 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_message.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_message.cpp @@ -98,12 +98,6 @@ void TabMessage::closeEvent(QCloseEvent *event) void TabMessage::sendPrivateMessage(const QString &text) { - if (tabSupervisor->getUserListManager()->isUserIgnored(getUserName())) { - chatView->appendMessage(tr("You have ignored %1; your messages are not delivered.") - .arg(QString::fromStdString(otherUserInfo->name()))); - return; - } - Command_Message cmd; cmd.set_user_name(otherUserInfo->name()); cmd.set_message(text.toStdString()); diff --git a/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp b/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp index b9c37f1af..077b876d2 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_moderation.cpp @@ -381,9 +381,6 @@ void TabModeration::moderatorLoginsResponse(const Response &response) if (login.user_level() & ServerInfo_User::IsAdmin) { levels << tr("Admin"); } - if (login.user_level() & ServerInfo_User::IsDeveloper) { - levels << tr("Developer"); - } if (login.user_level() & ServerInfo_User::IsModerator) { levels << tr("Moderator"); } diff --git a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp b/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp deleted file mode 100644 index 35389d3bf..000000000 --- a/cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp +++ /dev/null @@ -1,251 +0,0 @@ -#include "tab_public_decks.h" - -#include "../../../client/settings/cache_settings.h" -#include "../../deck_loader/deck_loader.h" -#include "../general/layout_containers/flow_widget.h" -#include "../visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h" -#include "../visual_deck_storage/deck_preview/public_deck_preview_widget.h" -#include "../visual_deck_storage/remote_public_decks_model.h" -#include "../visual_deck_storage/visual_deck_storage_quick_settings_widget.h" -#include "../visual_deck_storage/visual_deck_storage_search_widget.h" -#include "../visual_deck_storage/visual_deck_storage_tag_filter_widget.h" -#include "tab_supervisor.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -TabPublicDecks::TabPublicDecks(TabSupervisor *_tabSupervisor, AbstractClient *_client, const QString &_userName) - : Tab(_tabSupervisor), client(_client), userName(_userName) -{ - model = new RemotePublicDecksModel(client, this); - cardSize = SettingsCache::instance().cardsDisplay().getVisualDeckStorageCardSize(); - - titleLabel = new QLabel(tr("Public decks of %1").arg(userName.toHtmlEscaped()), this); - QFont titleFont = titleLabel->font(); - titleFont.setBold(true); - titleLabel->setFont(titleFont); - - auto *headerLayout = new QHBoxLayout; - headerLayout->addWidget(titleLabel); - headerLayout->addStretch(1); - - // Filter/toolbar row, matching the Visual Deck Storage: color identity filter - // first, the search bar stretching in the middle, and the quick settings - // cogwheel at the end. The card size slider lives inside the cogwheel popup. - emptyLabel = new QLabel(tr("This user has not published any decks."), this); - emptyLabel->setAlignment(Qt::AlignCenter); - emptyLabel->setVisible(false); - - statusLabel = new QLabel(this); - statusLabel->setAlignment(Qt::AlignCenter); - statusLabel->setVisible(false); - - flowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded); - flowWidget->setSpacing(8, 8); - - colorIdentityFilter = new DeckPreviewColorIdentityFilterWidget(this); - searchWidget = new VisualDeckStorageSearchWidget(this); - refreshButton = new QToolButton(this); - refreshButton->setIcon(QPixmap("theme:icons/reload")); - refreshButton->setFixedSize(32, 32); - quickSettingsWidget = new VisualDeckStorageQuickSettingsWidget(this); - quickSettingsWidget->setPublicDecksMode(true); - - auto *filterLayout = new QHBoxLayout; - filterLayout->addWidget(colorIdentityFilter); - filterLayout->addWidget(searchWidget, 1); - filterLayout->addWidget(refreshButton); - filterLayout->addWidget(quickSettingsWidget); - - tagFilterWidget = new VisualDeckStorageTagFilterWidget(this); - tagFilterWidget->setAllTagsProvider([this] { return model->allTags(); }); - updateTagsVisibility(quickSettingsWidget->getShowTagFilter()); - - auto *layout = new QVBoxLayout; - layout->addLayout(headerLayout); - layout->addLayout(filterLayout); - layout->addWidget(tagFilterWidget); - layout->addWidget(statusLabel); - layout->addWidget(emptyLabel); - layout->addWidget(flowWidget, 1); - - auto *mainWidget = new QWidget(this); - mainWidget->setLayout(layout); - setCentralWidget(mainWidget); - - connect(refreshButton, &QToolButton::clicked, this, [this] { model->refresh(userName); }); - connect(model, &QAbstractItemModel::modelReset, this, &TabPublicDecks::rebuildGrid); - connect(model, &RemotePublicDecksModel::loadingChanged, this, &TabPublicDecks::updateLoadingState); - connect(model, &RemotePublicDecksModel::loadFailed, this, [this](const QString &message) { - lastFailureMessage = message; - statusLabel->setText(message); - statusLabel->setVisible(true); - flowWidget->setVisible(false); - emptyLabel->setVisible(false); - }); - connect(searchWidget, &VisualDeckStorageSearchWidget::searchTextChanged, this, - [this](const QString &text) { model->setSearchText(text); }); - connect(colorIdentityFilter, &DeckPreviewColorIdentityFilterWidget::activeColorsChanged, this, - &TabPublicDecks::updateColorFilter); - connect(colorIdentityFilter, &DeckPreviewColorIdentityFilterWidget::filterModeChanged, this, - &TabPublicDecks::updateColorFilter); - connect(tagFilterWidget, &VisualDeckStorageTagFilterWidget::filterChanged, this, &TabPublicDecks::updateTagFilter); - connect(quickSettingsWidget, &VisualDeckStorageQuickSettingsWidget::cardSizeChanged, this, - &TabPublicDecks::updateCardSize); - connect(quickSettingsWidget, &VisualDeckStorageQuickSettingsWidget::showTagFilterChanged, this, - &TabPublicDecks::updateTagsVisibility); - - retranslateUi(); - model->refresh(userName); -} - -QString TabPublicDecks::getTabText() const -{ - return tr("Public decks of %1").arg(userName); -} - -void TabPublicDecks::retranslateUi() -{ - // The username is another user's data, so escape it for the AutoText QLabel. - titleLabel->setText(tr("Public decks of %1").arg(userName.toHtmlEscaped())); - // The same choice rebuildGrid makes, so a language change does not swap - // the "no match" variant for the "nothing published" one. - emptyLabel->setText(model->totalCount() > 0 ? tr("No decks match your filters.") - : tr("This user has not published any decks.")); - refreshButton->setToolTip(tr("Refresh")); - refreshButton->setAccessibleName(tr("Refresh")); - quickSettingsWidget->setToolTip(tr("Public Decks Settings")); - // Re-show whatever the status label is showing so a language change picks up - // the new language or, for a failure message, at least does not hide it. - if (model->isLoading()) { - updateLoadingState(true); - } else if (!lastFailureMessage.isEmpty()) { - statusLabel->setText(lastFailureMessage); - statusLabel->setVisible(true); - flowWidget->setVisible(false); - emptyLabel->setVisible(false); - } else { - updateLoadingState(false); - } - emit tabTextChanged(this, getTabText()); -} - -bool TabPublicDecks::closeRequest() -{ - emit closing(this); - return Tab::closeRequest(); -} - -void TabPublicDecks::rebuildGrid() -{ - flowWidget->clearLayout(); - - const int count = model->rowCount(); - if (count == 0) { - emptyLabel->setText(model->totalCount() > 0 ? tr("No decks match your filters.") - : tr("This user has not published any decks.")); - } - emptyLabel->setVisible(count == 0); - for (int i = 0; i < count; ++i) { - auto *tile = new PublicDeckPreviewWidget(flowWidget, model->entryAt(i)); - tile->setScaleFactor(cardSize); - connect(tile, &PublicDeckPreviewWidget::openDeckRequested, this, &TabPublicDecks::openDeck); - flowWidget->addWidget(tile); - } - - // The deck set changed, so the tag filter chips are re-gathered from it. - tagFilterWidget->refreshTags(); -} - -void TabPublicDecks::updateColorFilter() -{ - model->setColorFilter(colorIdentityFilter->getFilterMode(), colorIdentityFilter->getActiveColors()); -} - -void TabPublicDecks::updateTagFilter() -{ - const QStringList selectedTags = tagFilterWidget->selectedTags(); - const QStringList excludedTags = tagFilterWidget->excludedTags(); - model->setTagFilter(QSet(selectedTags.cbegin(), selectedTags.cend()), - QSet(excludedTags.cbegin(), excludedTags.cend())); - tagFilterWidget->refreshTags(); -} - -void TabPublicDecks::updateTagsVisibility(bool visible) -{ - tagFilterWidget->setVisible(visible); -} - -void TabPublicDecks::updateLoadingState(bool loading) -{ - if (loading) { - // A new attempt is under way, so the previously shown failure, if any, - // no longer describes the current state. - lastFailureMessage.clear(); - statusLabel->setText(tr("Loading public decks…")); - statusLabel->setVisible(true); - flowWidget->setVisible(false); - emptyLabel->setVisible(false); - } else { - statusLabel->setVisible(false); - flowWidget->setVisible(true); - } -} - -void TabPublicDecks::updateCardSize(int scale) -{ - cardSize = scale; - applyCardSize(scale); -} - -void TabPublicDecks::applyCardSize(int scale) -{ - const auto tiles = flowWidget->findChildren(); - for (PublicDeckPreviewWidget *tile : tiles) { - tile->setScaleFactor(scale); - } - flowWidget->setMinimumSizeToMaxSizeHint(); -} - -void TabPublicDecks::openDeck(int deckId) -{ - Command_DeckDownloadPublic cmd; - cmd.set_deck_id(deckId); - - PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, &TabPublicDecks::openDeckFinished); - client->sendCommand(pend); -} - -void TabPublicDecks::openDeckFinished(const Response &response, const CommandContainer & /*commandContainer*/) -{ - if (response.response_code() != Response::RespOk) { - QMessageBox::warning(this, tr("Open public deck"), - tr("Failed to open the public deck (server response code %1).") - .arg(QString::number(static_cast(response.response_code())))); - return; - } - - const Response_DeckDownload &resp = response.GetExtension(Response_DeckDownload::ext); - std::optional deckOpt = - DeckLoader::loadFromRemote(QString::fromStdString(resp.deck()), LoadedDeck::LoadInfo::NON_REMOTE_ID); - if (!deckOpt) { - QMessageBox::warning(this, tr("Open public deck"), tr("The public deck could not be parsed.")); - return; - } - - tabSupervisor->openDeckInNewTab(deckOpt.value()); -} diff --git a/cockatrice/src/interface/widgets/tabs/tab_public_decks.h b/cockatrice/src/interface/widgets/tabs/tab_public_decks.h deleted file mode 100644 index 492fdeafa..000000000 --- a/cockatrice/src/interface/widgets/tabs/tab_public_decks.h +++ /dev/null @@ -1,80 +0,0 @@ -/** - * @file tab_public_decks.h - * @ingroup Tabs - */ - -#ifndef TAB_PUBLIC_DECKS_H -#define TAB_PUBLIC_DECKS_H - -#include "tab.h" - -class AbstractClient; -class CommandContainer; -class DeckPreviewColorIdentityFilterWidget; -class FlowWidget; -class PublicDeckPreviewWidget; -class QLabel; -class QToolButton; -class RemotePublicDecksModel; -class Response; -class VisualDeckStorageQuickSettingsWidget; -class VisualDeckStorageSearchWidget; -class VisualDeckStorageTagFilterWidget; - -/** - * @brief A visual grid of the public decks published by another user. - * - * The grid is rendered from the preview metadata the server stores for the - * decks, so browsing costs no downloads; the deck list is fetched via - * Command_DeckDownloadPublic only when the user opens a deck. Multiple users - * can be browsed simultaneously; each gets its own tab. - */ -class TabPublicDecks final : public Tab -{ - Q_OBJECT - -public: - TabPublicDecks(TabSupervisor *tabSupervisor, AbstractClient *client, const QString &userName); - - [[nodiscard]] QString getTabText() const override; - void retranslateUi() override; - bool closeRequest() override; - - [[nodiscard]] QString getUserName() const - { - return userName; - } - -signals: - void closing(TabPublicDecks *tab); - -private slots: - void openDeck(int deckId); - void openDeckFinished(const Response &response, const CommandContainer &commandContainer); - void updateColorFilter(); - void updateTagFilter(); - void updateCardSize(int scale); - void updateTagsVisibility(bool visible); - void updateLoadingState(bool loading); - -private: - void rebuildGrid(); - void applyCardSize(int scale); - - AbstractClient *client; - QString userName; - RemotePublicDecksModel *model; - FlowWidget *flowWidget; - VisualDeckStorageSearchWidget *searchWidget; - DeckPreviewColorIdentityFilterWidget *colorIdentityFilter; - VisualDeckStorageTagFilterWidget *tagFilterWidget; - QToolButton *refreshButton; - VisualDeckStorageQuickSettingsWidget *quickSettingsWidget; - QLabel *titleLabel; - QLabel *statusLabel; - QLabel *emptyLabel; - QString lastFailureMessage; ///< Last load-failure text, re-shown on retranslate. - int cardSize = 100; -}; - -#endif // TAB_PUBLIC_DECKS_H diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp index ac4b2cbe9..5618604df 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp @@ -1,7 +1,6 @@ #include "tab_replays.h" #include "../../../client/settings/cache_settings.h" -#include "../../pixel_map_generator.h" #include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h" #include "tab_game.h" @@ -103,17 +102,17 @@ QGroupBox *TabReplays::createLeftLayout() // Left side actions aOpenLocalReplay = new QAction(this); - aOpenLocalReplay->setIcon(themePixmap(QStringLiteral("icons/view"))); + aOpenLocalReplay->setIcon(QPixmap("theme:icons/view")); connect(aOpenLocalReplay, &QAction::triggered, this, &TabReplays::actOpenLocalReplay); connect(localDirView, &QTreeView::doubleClicked, this, &TabReplays::actOpenLocalReplay); aRenameLocal = new QAction(this); - aRenameLocal->setIcon(themePixmap(QStringLiteral("icons/rename"))); + aRenameLocal->setIcon(QPixmap("theme:icons/rename")); connect(aRenameLocal, &QAction::triggered, this, &TabReplays::actRenameLocal); aNewLocalFolder = new QAction(this); aNewLocalFolder->setIcon(qApp->style()->standardIcon(QStyle::SP_FileDialogNewFolder)); connect(aNewLocalFolder, &QAction::triggered, this, &TabReplays::actNewLocalFolder); aDeleteLocalReplay = new QAction(this); - aDeleteLocalReplay->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); + aDeleteLocalReplay->setIcon(QPixmap("theme:icons/remove_row")); connect(aDeleteLocalReplay, &QAction::triggered, this, &TabReplays::actDeleteLocalReplay); aOpenReplaysFolder = new QAction(this); @@ -165,24 +164,24 @@ QGroupBox *TabReplays::createRightLayout() // Right side actions aOpenRemoteReplay = new QAction(this); - aOpenRemoteReplay->setIcon(themePixmap(QStringLiteral("icons/view"))); + aOpenRemoteReplay->setIcon(QPixmap("theme:icons/view")); connect(aOpenRemoteReplay, &QAction::triggered, this, &TabReplays::actOpenRemoteReplay); connect(serverDirView, &QTreeView::doubleClicked, this, &TabReplays::actOpenRemoteReplay); aDownload = new QAction(this); - aDownload->setIcon(themePixmap(QStringLiteral("icons/arrow_left_green"))); + aDownload->setIcon(QPixmap("theme:icons/arrow_left_green")); connect(aDownload, &QAction::triggered, this, &TabReplays::actDownload); aKeep = new QAction(this); - aKeep->setIcon(themePixmap(QStringLiteral("icons/lock"))); + aKeep->setIcon(QPixmap("theme:icons/lock")); connect(aKeep, &QAction::triggered, this, &TabReplays::actKeepRemoteReplay); aDeleteRemoteReplay = new QAction(this); - aDeleteRemoteReplay->setIcon(themePixmap(QStringLiteral("icons/remove_row"))); + aDeleteRemoteReplay->setIcon(QPixmap("theme:icons/remove_row")); connect(aDeleteRemoteReplay, &QAction::triggered, this, &TabReplays::actDeleteRemoteReplay); aGetReplayCode = new QAction(this); - aGetReplayCode->setIcon(themePixmap(QStringLiteral("icons/share"))); + aGetReplayCode->setIcon(QPixmap("theme:icons/share")); connect(aGetReplayCode, &QAction::triggered, this, &TabReplays::actGetReplayCode); aSubmitReplayCode = new QAction(this); - aSubmitReplayCode->setIcon(themePixmap(QStringLiteral("icons/search"))); + aSubmitReplayCode->setIcon(QPixmap("theme:icons/search")); connect(aSubmitReplayCode, &QAction::triggered, this, &TabReplays::actSubmitReplayCode); // Add actions to toolbars diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp index 866324367..6245b5301 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp @@ -2,7 +2,6 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" -#include "../../pixel_map_generator.h" #include "../interface/widgets/dialogs/dlg_settings.h" #include "../interface/widgets/server/chat_view/chat_view.h" #include "../interface/widgets/server/game_link.h" @@ -99,7 +98,7 @@ TabRoom::TabRoom(TabSupervisor *_tabSupervisor, connect(aOpenChatSettings, &QAction::triggered, this, &TabRoom::actOpenChatSettings); auto *chatSettingsButton = new QToolButton; - chatSettingsButton->setIcon(themePixmap(QStringLiteral("icons/settings"))); + chatSettingsButton->setIcon(QPixmap("theme:icons/settings")); chatSettingsButton->setMenu(chatSettingsMenu); chatSettingsButton->setPopupMode(QToolButton::InstantPopup); diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.cpp b/cockatrice/src/interface/widgets/tabs/tab_server.cpp index fca32094c..13a77e957 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_server.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_server.cpp @@ -13,7 +13,6 @@ #include #include #include -#include #include #include @@ -186,37 +185,25 @@ void TabServer::processServerMessageEvent(const Event_ServerMessage &event) void TabServer::joinRoom(int id, bool setCurrent) { TabRoom *room = tabSupervisor->getRoomTabs().value(id); - if (room) { - if (setCurrent) { - tabSupervisor->setCurrentWidget((QWidget *)room); - } + if (!room) { + Command_JoinRoom cmd; + cmd.set_room_id(id); + + PendingCommand *pend = client->prepareSessionCommand(cmd); + pend->setExtraData(setCurrent); + connect(pend, &PendingCommand::finished, this, + [this, id](const Response &r, const CommandContainer &c, const QVariant &v) { + joinRoomFinished(r, c, v, id); + }); + + client->sendCommand(pend); + return; } - auto pendingIt = pendingRoomJoins.find(id); - if (pendingIt != pendingRoomJoins.end()) { - // A join for this room is already in flight: the room tab opens when its response - // arrives. Fold the new request into the pending one so that, for example, clicking - // a room the selector is auto-joining does not send a second Command_JoinRoom - the - // server would reject that duplicate with RespContextError. - if (setCurrent) { - pendingIt.value() = true; - } - return; + if (setCurrent) { + tabSupervisor->setCurrentWidget((QWidget *)room); } - - pendingRoomJoins.insert(id, setCurrent); - - Command_JoinRoom cmd; - cmd.set_room_id(id); - - PendingCommand *pend = client->prepareSessionCommand(cmd); - pend->setExtraData(setCurrent); - connect( - pend, &PendingCommand::finished, this, - [this, id](const Response &r, const CommandContainer &c, const QVariant &v) { joinRoomFinished(r, c, v, id); }); - - client->sendCommand(pend); } void TabServer::joinRoomFinished(const Response &r, @@ -224,72 +211,34 @@ void TabServer::joinRoomFinished(const Response &r, const QVariant &extraData, int roomId) { - const bool setCurrent = pendingRoomJoins.value(roomId, extraData.toBool()); - pendingRoomJoins.remove(roomId); - const bool healedJoin = healedRoomJoins.contains(roomId); - healedRoomJoins.remove(roomId); - switch (r.response_code()) { case Response::RespOk: break; case Response::RespNameNotFound: - if (setCurrent) { - QMessageBox::critical(this, tr("Error"), - tr("Failed to join the server room: it doesn't exist on the server.")); - } + QMessageBox::critical(this, tr("Error"), + tr("Failed to join the server room: it doesn't exist on the server.")); emit roomJoinFailed(roomId); return; case Response::RespContextError: - if (healedJoin) { - // The rejoin below was already answered and the server still rejects the join, so - // the stale-membership heal cannot help: surface the error. The guard was already - // released above so a later user-initiated join may try a fresh heal. - if (setCurrent) { - QMessageBox::critical( - this, tr("Error"), - tr("The server thinks you are in the server room but your client is unable to display it. " - "Try restarting your client.")); - } - emit roomJoinFailed(roomId); - return; - } - // The server already had us registered in the room even though no tab was open, - // usually because two join attempts for the same room overlapped. Leaving and - // rejoining makes the server reply with a fresh RespOk so the tab is displayed - // without requiring a client restart. The guard above covers exactly the rejoin that - // leaveAndRejoinRoom triggers, so a server that keeps replying with RespContextError - // gets one heal attempt per join instead of an endless recursion. - healedRoomJoins.insert(roomId); - leaveAndRejoinRoom(roomId, setCurrent); + QMessageBox::critical( + this, tr("Error"), + tr("The server thinks you are in the server room but your client is unable to display it. " + "Try restarting your client.")); + emit roomJoinFailed(roomId); return; case Response::RespUserLevelTooLow: - if (setCurrent) { - QMessageBox::critical(this, tr("Error"), - tr("You do not have the required permission to join this server room.")); - } + QMessageBox::critical(this, tr("Error"), + tr("You do not have the required permission to join this server room.")); emit roomJoinFailed(roomId); return; default: - if (setCurrent) { - QMessageBox::critical( - this, tr("Error"), - tr("Failed to join the server room due to an unknown error: %1.").arg(r.response_code())); - } + QMessageBox::critical( + this, tr("Error"), + tr("Failed to join the server room due to an unknown error: %1.").arg(r.response_code())); emit roomJoinFailed(roomId); return; } const Response_JoinRoom &resp = r.GetExtension(Response_JoinRoom::ext); - emit roomJoined(resp.room_info(), setCurrent); -} - -void TabServer::leaveAndRejoinRoom(int roomId, bool setCurrent) -{ - // Clear the stale room membership server-side. The leave is sent before the rejoin below, - // so the server no longer considers us a member by the time the join arrives. The leave - // response is intentionally not awaited: commands are processed in send order on the - // connection, and a failed leave (RespNotInRoom) only means the membership was already gone. - client->sendCommand(client->prepareRoomCommand(Command_LeaveRoom(), roomId)); - - joinRoom(roomId, setCurrent); + emit roomJoined(resp.room_info(), extraData.toBool()); } diff --git a/cockatrice/src/interface/widgets/tabs/tab_server.h b/cockatrice/src/interface/widgets/tabs/tab_server.h index 121ff814d..c10b7945b 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_server.h +++ b/cockatrice/src/interface/widgets/tabs/tab_server.h @@ -10,8 +10,6 @@ #include "tab.h" #include -#include -#include #include #include @@ -60,17 +58,10 @@ private slots: int roomId); private: - void leaveAndRejoinRoom(int roomId, bool setCurrent); - AbstractClient *client; RoomSelector *roomSelector; QTextBrowser *serverInfoBox; bool shouldEmitUpdate = false; - /** Room ids with a join command in flight, mapped to whether the tab should be focused once it opens. */ - QHash pendingRoomJoins; - /** Room ids for which a stale-membership heal (leave + rejoin) is currently in flight. Released as soon as the - * rejoin has been answered, so a heal is attempted at most once per join. */ - QSet healedRoomJoins; public: TabServer(TabSupervisor *_tabSupervisor, AbstractClient *_client); diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp index c9bda7703..f96c139b3 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp @@ -15,13 +15,11 @@ #include "tab_card_art_rules.h" #include "tab_deck_editor.h" #include "tab_deck_storage.h" -#include "tab_developer.h" #include "tab_game.h" #include "tab_home.h" #include "tab_logs.h" #include "tab_message.h" #include "tab_moderation.h" -#include "tab_public_decks.h" #include "tab_replays.h" #include "tab_report.h" #include "tab_room.h" @@ -118,10 +116,9 @@ void CloseButton::paintEvent(QPaintEvent * /*event*/) } TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget *parent) - : QTabWidget(parent), userInfo(nullptr), client(_client), tabsMenu(tabsMenu), tabHome(nullptr), - tabVisualDeckStorage(nullptr), tabServer(nullptr), tabAccount(nullptr), tabDeckStorage(nullptr), - tabReplays(nullptr), tabAdmin(nullptr), tabCardArtRules(nullptr), tabLog(nullptr), tabReport(nullptr), - tabModeration(nullptr), tabDeveloper(nullptr), isLocalGame(false) + : QTabWidget(parent), userInfo(nullptr), client(_client), tabsMenu(tabsMenu), tabVisualDeckStorage(nullptr), + tabServer(nullptr), tabAccount(nullptr), tabDeckStorage(nullptr), tabReplays(nullptr), tabAdmin(nullptr), + tabLog(nullptr), tabReport(nullptr), tabModeration(nullptr), isLocalGame(false) { setElideMode(Qt::ElideRight); setMovable(true); @@ -207,10 +204,6 @@ TabSupervisor::TabSupervisor(AbstractClient *_client, QMenu *tabsMenu, QWidget * aTabModeration->setCheckable(true); connect(aTabModeration, &QAction::triggered, this, &TabSupervisor::actTabModeration); - aTabDeveloper = new QAction(this); - aTabDeveloper->setCheckable(true); - connect(aTabDeveloper, &QAction::triggered, this, &TabSupervisor::actTabDeveloper); - connect(&SettingsCache::instance().shortcuts(), &ShortcutsSettings::shortCutChanged, this, &TabSupervisor::refreshShortcuts); refreshShortcuts(); @@ -252,8 +245,6 @@ void TabSupervisor::retranslateUi() aTabLog->setText(tr("Logs")); aTabReport->setText(tr("Report Queue")); aTabModeration->setText(tr("Moderation")); - aTabCardArtRules->setText(tr("Card Art Rules")); - aTabDeveloper->setText(tr("Developer")); // tabs QList tabs; @@ -265,8 +256,6 @@ void TabSupervisor::retranslateUi() tabs.append(tabLog); tabs.append(tabReport); tabs.append(tabModeration); - tabs.append(tabCardArtRules); - tabs.append(tabDeveloper); QMapIterator roomIterator(roomTabs); while (roomIterator.hasNext()) { tabs.append(roomIterator.next().value()); @@ -275,10 +264,6 @@ void TabSupervisor::retranslateUi() while (gameIterator.hasNext()) { tabs.append(gameIterator.next().value()); } - QMapIterator publicDecksIterator(publicDecksTabs); - while (publicDecksIterator.hasNext()) { - tabs.append(publicDecksIterator.next().value()); - } QListIterator replayIterator(replayTabs); while (replayIterator.hasNext()) { tabs.append(replayIterator.next()); @@ -535,22 +520,7 @@ void TabSupervisor::start(const ServerInfo_User &_userInfo) if (SettingsCache::instance().tabs().getTabModerationOpen()) { openTabModeration(); } - if (SettingsCache::instance().tabs().getTabCardArtRulesOpen()) { - openTabCardArtRules(); - } - } - - if (userInfo->user_level() & ServerInfo_User::IsDeveloper) { - tabsMenu->addSeparator(); - tabsMenu->addAction(aTabDeveloper); - // Developers without moderation rights get log access through their - // own role. Moderators already have the Logs entry from above. - if (!(userInfo->user_level() & ServerInfo_User::IsModerator)) { - tabsMenu->addAction(aTabLog); - if (SettingsCache::instance().tabs().getTabLogOpen()) { - openTabLog(); - } - } + openTabCardArtRules(); } retranslateUi(); @@ -565,7 +535,6 @@ void TabSupervisor::startLocal(const QList &_clients) tabLog = nullptr; tabReport = nullptr; tabModeration = nullptr; - tabDeveloper = nullptr; isLocalGame = true; userInfo = new ServerInfo_User; localClients = _clients; @@ -613,12 +582,6 @@ void TabSupervisor::stop() if (tabModeration) { tabModeration->close(); } - if (tabCardArtRules) { - tabCardArtRules->close(); - } - if (tabDeveloper) { - tabDeveloper->close(); - } } QList tabsToDelete; @@ -631,10 +594,6 @@ void TabSupervisor::stop() tabsToDelete << i.value(); } - for (auto i = publicDecksTabs.cbegin(), end = publicDecksTabs.cend(); i != end; ++i) { - tabsToDelete << i.value(); - } - for (const auto tab : tabsToDelete) { tab->close(); } @@ -681,7 +640,7 @@ void TabSupervisor::actTabVisualDeckStorage(bool checked) void TabSupervisor::openTabVisualDeckStorage() { - tabVisualDeckStorage = new TabDeckStorageVisual(this, client); + tabVisualDeckStorage = new TabDeckStorageVisual(this); myAddTab(tabVisualDeckStorage, aTabVisualDeckStorage); connect(tabVisualDeckStorage, &QObject::destroyed, this, [this] { tabVisualDeckStorage = nullptr; @@ -816,7 +775,6 @@ void TabSupervisor::openTabAdmin() void TabSupervisor::actTabCardArtRules(bool checked) { - SettingsCache::instance().tabs().setTabCardArtRulesOpen(checked); if (checked && !tabCardArtRules) { openTabCardArtRules(); setCurrentWidget(tabCardArtRules); @@ -852,13 +810,7 @@ void TabSupervisor::actTabLog(bool checked) void TabSupervisor::openTabLog() { - // Developers query logs through the developer command family, so tell the - // tab which family to use. The moderator family is strictly stronger, so a - // moderator who also holds the developer bit keeps the moderator path — the - // developer bit only selects the (narrowed) developer family on its own. - const bool useDeveloperCommands = (userInfo->user_level() & ServerInfo_User::IsDeveloper) && - !(userInfo->user_level() & ServerInfo_User::IsModerator); - tabLog = new TabLog(this, client, useDeveloperCommands); + tabLog = new TabLog(this, client); myAddTab(tabLog, aTabLog); connect(tabLog, &QObject::destroyed, this, [this] { tabLog = nullptr; @@ -920,27 +872,6 @@ void TabSupervisor::openTabModeration(const QString &userName) aTabModeration->setChecked(true); } -void TabSupervisor::actTabDeveloper(bool checked) -{ - if (checked && !tabDeveloper) { - openTabDeveloper(); - setCurrentWidget(tabDeveloper); - } else if (!checked && tabDeveloper) { - tabDeveloper->closeRequest(); - } -} - -void TabSupervisor::openTabDeveloper() -{ - tabDeveloper = new TabDeveloper(this, client); - myAddTab(tabDeveloper, aTabDeveloper); - connect(tabDeveloper, &QObject::destroyed, this, [this] { - tabDeveloper = nullptr; - aTabDeveloper->setChecked(false); - }); - aTabDeveloper->setChecked(true); -} - void TabSupervisor::updatePingTime(int value, int max) { if (!tabServer) { @@ -1046,30 +977,6 @@ void TabSupervisor::roomLeft(TabRoom *tab) removeTab(indexOf(tab)); } -void TabSupervisor::openTabPublicDecks(const QString &userName) -{ - if (auto *existing = publicDecksTabs.value(userName, nullptr)) { - setCurrentWidget(existing); - return; - } - - auto *tab = new TabPublicDecks(this, client, userName); - connect(tab, &TabPublicDecks::closing, this, &TabSupervisor::publicDecksClosed); - myAddTab(tab); - publicDecksTabs.insert(userName, tab); - setCurrentWidget(tab); -} - -void TabSupervisor::publicDecksClosed(TabPublicDecks *tab) -{ - if (tab == currentWidget()) { - emit setMenu(); - } - - publicDecksTabs.remove(tab->getUserName()); - removeTab(indexOf(tab)); -} - void TabSupervisor::switchToFirstAvailableNetworkTab() { if (!roomTabs.isEmpty()) { @@ -1147,13 +1054,6 @@ TabMessage *TabSupervisor::addMessageTab(const QString &receiverName, bool focus return tab; } - if (focus && userListManager->isUserIgnored(receiverName)) { - QMessageBox::information( - this, tr("Ignored user"), - tr("You have ignored %1. Remove them from your ignore list to open a private chat.").arg(receiverName)); - return nullptr; - } - tab = new TabMessage(this, client, *userInfo, otherUser, userOnline); connect(tab, &TabMessage::talkClosing, this, &TabSupervisor::talkLeft); connect(tab, &TabMessage::maximizeClient, this, &TabSupervisor::maximizeMainWindow); @@ -1191,8 +1091,7 @@ QList TabSupervisor::getGameInviteLinksForRoom(int roomId) con // The inviter may be in several games of the same room (hosting one and // spectating another, for example). Return every game so the caller can // let the user choose which one to invite to. - for (auto it = gameTabs.cbegin(); it != gameTabs.cend(); ++it) { - TabGame *tab = it.value(); + for (TabGame *tab : gameTabs) { GameMetaInfo *metaInfo = tab->getGame()->getGameMetaInfo(); if (metaInfo->proto().room_id() != roomId) { continue; @@ -1333,7 +1232,7 @@ void TabSupervisor::tabUserEvent(bool globalEvent) auto *tab = static_cast(sender()); if (tab != currentWidget()) { tab->setContentsChanged(true); - setTabIcon(indexOf(tab), themePixmap(QStringLiteral("icons/tab_changed"))); + setTabIcon(indexOf(tab), QPixmap("theme:icons/tab_changed")); } if (globalEvent && SettingsCache::instance().userInterface().getNotificationsEnabled()) { QApplication::alert(this); @@ -1368,21 +1267,7 @@ void TabSupervisor::processGameEventContainer(const GameEventContainer &cont) void TabSupervisor::processUserMessageEvent(const Event_UserMessage &event) { - // "Ignore all private messages" silences every PM, including messages to - // already-open tabs — unlike the unregistered/non-buddy filters below, - // which only apply when creating a new tab. Messages from moderators/admins - // are exempt to ensure warnings still reach users. QString senderName = QString::fromStdString(event.sender_name()); - if (SettingsCache::instance().chat().getIgnoreAllPrivateMessages()) { - const ServerInfo_User *onlineUserInfo = userListManager->getOnlineUser(senderName); - if (!onlineUserInfo) { - return; - } - const UserLevelFlags userLevel(onlineUserInfo->user_level()); - if (!userLevel.testFlag(ServerInfo_User::IsModerator) && !userLevel.testFlag(ServerInfo_User::IsAdmin)) { - return; - } - } TabMessage *tab = messageTabs.value(senderName); if (!tab) { tab = messageTabs.value(QString::fromStdString(event.receiver_name())); @@ -1484,11 +1369,6 @@ bool TabSupervisor::getAdminLocked() const return tabAdmin->getLocked(); } -bool TabSupervisor::canOverrideGameRestrictions() const -{ - return !getAdminLocked() || (userInfo->user_level() & ServerInfo_User::IsJudge); -} - void TabSupervisor::processNotifyUserEvent(const Event_NotifyUser &event) { diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h index 066c84a77..b389bad3e 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h +++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h @@ -45,9 +45,7 @@ class TabReport; class TabModeration; class TabAccount; class TabDeckEditor; -class TabDeveloper; class TabLog; -class TabPublicDecks; class RoomEvent; class GameEventContainer; class Event_GameJoined; @@ -110,18 +108,16 @@ private: TabLog *tabLog; TabReport *tabReport; TabModeration *tabModeration; - TabDeveloper *tabDeveloper; QMap roomTabs; QMap gameTabs; QList replayTabs; QMap messageTabs; - QMap publicDecksTabs; QList deckEditorTabs; bool isLocalGame; QAction *aTabHome, *aTabDeckEditor, *aTabVisualDeckEditor, *aTabEdhRec, *aTabArchidekt, *aTabVisualDeckStorage, *aTabVisualDatabaseDisplay, *aTabServer, *aTabAccount, *aTabDeckStorage, *aTabReplays, *aTabAdmin, - *aTabCardArtRules, *aTabLog, *aTabReport, *aTabModeration, *aTabDeveloper; + *aTabCardArtRules, *aTabLog, *aTabReport, *aTabModeration; int myAddTab(Tab *tab, QAction *manager = nullptr); void addCloseButtonToTab(Tab *tab, int tabIndex, QAction *manager); @@ -154,10 +150,6 @@ public: return userInfo; } [[nodiscard]] AbstractClient *getClient() const; - [[nodiscard]] AbstractClient *getServerClient() const - { - return client; - } [[nodiscard]] UserListManager *getUserListManager() const { return userListManager; @@ -177,7 +169,6 @@ public: [[nodiscard]] QList getGameInviteLinksForRoom(int roomId) const; void sendInviteToUser(const QString &userName, const QString &inviteText); [[nodiscard]] bool getAdminLocked() const; - [[nodiscard]] bool canOverrideGameRestrictions() const; void closeEvent(QCloseEvent *event) override; bool switchToGameTabIfAlreadyExists(const int gameId); static void actShowPopup(const QString &message); @@ -205,7 +196,6 @@ public slots: void actTabReplays(bool checked); void openTabServer(); void addRoomTab(const ServerInfo_Room &info, bool setCurrent); - void openTabPublicDecks(const QString &userName); private slots: void refreshShortcuts(); @@ -217,7 +207,6 @@ private slots: void actTabLog(bool checked); void actTabReport(bool checked); void actTabModeration(bool checked); - void actTabDeveloper(bool checked); void openTabVisualDeckStorage(); void openTabHome(); @@ -229,7 +218,6 @@ private slots: void openTabCardArtRules(); void openTabLog(); void openTabReport(); - void openTabDeveloper(); void updateCurrent(int index); void updatePingTime(int value, int max); @@ -238,7 +226,6 @@ private slots: void localGameJoined(const Event_GameJoined &event); void gameLeft(TabGame *tab); void roomLeft(TabRoom *tab); - void publicDecksClosed(TabPublicDecks *tab); TabMessage *addMessageTab(const QString &userName, bool focus); void replayLeft(TabGame *tab); void processUserLeft(const QString &userName); diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index 0f43893d3..209a30642 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -4,7 +4,6 @@ #include "../../../../client/settings/shortcuts_settings.h" #include "../../cards/card_info_display_widget.h" #include "../../deck_editor/deck_state_manager.h" -#include "../../deck_editor/deck_zone_dialog.h" #include "../../filters/filter_builder.h" #include "../../interface/pixel_map_generator.h" #include "../../interface/widgets/cards/card_info_frame_widget.h" @@ -85,7 +84,6 @@ void TabDeckEditorVisual::createCentralFrame() connect(tabContainer, &TabDeckEditorVisualTabWidget::printingSelectorRequested, this, &TabDeckEditorVisual::showPrintingSelector); connect(tabContainer, &TabDeckEditorVisualTabWidget::cardInfoRequested, this, &TabDeckEditorVisual::updateCardInfo); - tabContainer->visualDatabaseDisplay->setNewZoneCreator([this] { return createNewZone(); }); centralFrame->addWidget(tabContainer); setCentralWidget(centralWidget); @@ -271,19 +269,6 @@ bool TabDeckEditorVisual::actSaveDeckAs() return result; } -/** @brief Prompts for and creates a new custom deck zone. Returns the name of the created zone. */ -QString TabDeckEditorVisual::createNewZone() -{ - QString boardName; - const QString zoneName = DeckZoneDialog::promptForNewZone(this, {}, &boardName, [this](const QString &candidate) { - return deckStateManager->validateNewZoneName(candidate); - }); - if (!zoneName.isEmpty()) { - deckStateManager->createCustomZone(boardName, zoneName); - } - return zoneName; -} - /** @brief Refreshes keyboard shortcuts for this tab from settings. */ void TabDeckEditorVisual::refreshShortcuts() { diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h index fb09578c4..21335d2d0 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.h @@ -165,12 +165,6 @@ public slots: */ bool actSaveDeckAs() override; - /** - * @brief Prompts for and creates a new custom deck zone. - * @return The name of the created zone, or an empty string if creation was cancelled. - */ - QString createNewZone(); - private: /** * @brief Sets the deck for this tab and selects the sub-tab to open on diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp index 03df76b03..0cbcb641a 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp @@ -1,78 +1,25 @@ #include "tab_deck_storage_visual.h" -#include "../../../../client/settings/cache_settings.h" -#include "../../../deck_loader/deck_loader.h" -#include "../../cards/additional_info/deck_color_identity.h" -#include "../../deck_share/deck_share_utils.h" #include "../../interface/widgets/visual_deck_storage/visual_deck_storage_widget.h" #include "../tab_supervisor.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include -TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor, AbstractClient *_client) - : Tab(_tabSupervisor), visualDeckStorageWidget(new VisualDeckStorageWidget(this)), client(_client), - shareTimeoutTimer(new QTimer(this)) +TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor) + : Tab(_tabSupervisor), visualDeckStorageWidget(new VisualDeckStorageWidget(this)) { connect(this, &TabDeckStorageVisual::openDeckEditor, tabSupervisor, &TabSupervisor::openDeckInNewTab); connect(visualDeckStorageWidget, &VisualDeckStorageWidget::deckLoadRequested, this, &TabDeckStorageVisual::actOpenLocalDeck); connect(visualDeckStorageWidget, &VisualDeckStorageWidget::openDeckEditor, this, &TabDeckStorageVisual::openDeckEditor); - connect(visualDeckStorageWidget, &VisualDeckStorageWidget::shareDeckRequested, this, - &TabDeckStorageVisual::actShareDeck); - connect(visualDeckStorageWidget, &VisualDeckStorageWidget::shareSelectionChanged, this, - &TabDeckStorageVisual::onShareSelectionChanged); - connect(visualDeckStorageWidget, &VisualDeckStorageWidget::shareRequested, this, [this] { - if (shareDeckAvailable) { - enterShareMode(); - } - }); auto *widget = new QWidget(this); auto *layout = new QVBoxLayout(widget); - layout->setContentsMargins(0, 0, 0, 0); - layout->setSpacing(0); widget->setLayout(layout); this->setCentralWidget(widget); layout->addWidget(visualDeckStorageWidget); - - shareBar = new ShareBarWidget(this); - connect(shareBar, &ShareBarWidget::createRequested, this, &TabDeckStorageVisual::actShareSelected); - connect(shareBar, &ShareBarWidget::cancelRequested, this, &TabDeckStorageVisual::exitShareMode); - - layout->insertWidget(0, shareBar); - shareBar->setVisible(false); - - connect(client, &AbstractClient::statusChanged, this, &TabDeckStorageVisual::handleConnectionChanged); - shareDeckAvailable = (client->getStatus() == StatusLoggedIn); - visualDeckStorageWidget->setShareAvailable(shareDeckAvailable); - - shareTimeoutTimer->setSingleShot(true); - shareTimeoutTimer->setInterval( - static_cast((static_cast(SettingsCache::instance().network().getTimeOut()) + 1) * - SettingsCache::instance().network().getKeepAlive() * 1000)); - connect(shareTimeoutTimer, &QTimer::timeout, this, &TabDeckStorageVisual::onShareTimeout); - - retranslateUi(); -} - -void TabDeckStorageVisual::retranslateUi() -{ - visualDeckStorageWidget->retranslateUi(); - shareBar->retranslateUi(); - if (shareBar->isVisible()) { - updateShareHint(); - } } void TabDeckStorageVisual::actOpenLocalDeck(const QString &filePath) @@ -86,144 +33,3 @@ void TabDeckStorageVisual::actOpenLocalDeck(const QString &filePath) emit openDeckEditor(deckOpt.value()); } - -void TabDeckStorageVisual::enterShareMode(const QStringList &preselectFiles) -{ - if (!shareDeckAvailable) { - return; // sharing is gated on being logged in - } - shareBar->setCreateEnabled(true); - visualDeckStorageWidget->setShareSelectable(true); - visualDeckStorageWidget->setShareSelectedFiles(preselectFiles); - shareBar->setName(tr("Shared decks")); - shareBar->setVisible(true); - updateShareHint(); - shareBar->focusName(); -} - -void TabDeckStorageVisual::exitShareMode() -{ - // Abandon any in-flight request: otherwise the timer keeps running and a late - // response reports the share as created after the user already backed out. - shareTimeoutTimer->stop(); - shareInFlightSeq = 0; - visualDeckStorageWidget->setShareSelectable(false); - visualDeckStorageWidget->clearShareSelection(); - shareBar->setVisible(false); -} - -void TabDeckStorageVisual::actShareDeck(const QString &filePath) -{ - if (!shareDeckAvailable) { - QMessageBox::information(this, tr("Share deck"), tr("You must be connected to the server to share a deck.")); - return; - } - enterShareMode({filePath}); -} - -void TabDeckStorageVisual::onShareSelectionChanged() -{ - if (shareBar->isVisible()) { - updateShareHint(); - } -} - -void TabDeckStorageVisual::updateShareHint() -{ - const int count = visualDeckStorageWidget->selectedFilePaths().size(); - shareBar->setCountText(tr("%n deck(s)", "", count)); - if (count == 0) { - shareBar->setHintText(tr("Click deck tiles to select the decks you want to share."), true); - } else if (count == 1) { - shareBar->setHintText(tr("One deck selected. Create the link to share it with other players."), true); - } else { - shareBar->setHintText(tr("%n decks selected. Create the link to share them with other players.", "", count), - true); - } -} - -void TabDeckStorageVisual::actShareSelected() -{ - const QStringList filePaths = visualDeckStorageWidget->selectedFilePaths(); - if (filePaths.isEmpty()) { - QMessageBox::warning(this, tr("Share decks"), tr("Select at least one deck to share.")); - return; - } - - Command_DeckShareCreate cmd; - cmd.set_name(shareBar->name().toStdString()); - if (cmd.name().empty()) { - cmd.set_name(tr("Shared decks").toStdString()); - } - - for (const QString &filePath : filePaths) { - std::optional deckOpt = - DeckLoader::loadFromFile(filePath, DeckFileFormat::getFormatFromName(filePath), true); - if (!deckOpt) { - QMessageBox::warning(this, tr("Share decks"), tr("Unable to load deck file %1").arg(filePath)); - return; - } - DeckShareItem *item = cmd.add_items(); - item->set_deck_list(deckOpt->deckList.writeToString_Native().toStdString()); - item->set_color_identity(getDeckColorIdentity(deckOpt->deckList, CardDatabaseManager::query()).toStdString()); - } - - shareBar->setCreateEnabled(false); - const int seq = ++shareRequestSeq; - shareInFlightSeq = seq; - PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, - [this, seq](const Response &response, const CommandContainer &commandContainer) { - if (shareInFlightSeq != seq) { - return; // the user cancelled or a newer request superseded this one - } - shareInFlightSeq = 0; - shareFinished(response, commandContainer); - }); - client->sendCommand(pend); - shareTimeoutTimer->start(); -} - -void TabDeckStorageVisual::shareFinished(const Response &response, const CommandContainer & /*commandContainer*/) -{ - shareTimeoutTimer->stop(); - shareBar->setCreateEnabled(true); - if (response.response_code() != Response::RespOk) { - showShareNotice(tr("Failed to create the share link (server response code %1).") - .arg(QString::number(static_cast(response.response_code()))), - true); - return; - } - - const DeckShareUtils::ShareResponse share = DeckShareUtils::handleShareResponse(client, response); - - showShareNotice( - tr("Share link copied to the clipboard.\nExpires on %1.").arg(DeckShareUtils::formatShareExpiry(share.expiry))); - exitShareMode(); -} - -void TabDeckStorageVisual::handleConnectionChanged(ClientStatus status) -{ - shareDeckAvailable = (status == StatusLoggedIn); - visualDeckStorageWidget->setShareAvailable(shareDeckAvailable); - if (!shareDeckAvailable && shareBar->isVisible()) { - exitShareMode(); - } -} - -void TabDeckStorageVisual::showShareNotice(const QString &message, bool warning) -{ - QMessageBox box(warning ? QMessageBox::Warning : QMessageBox::Information, tr("Share link"), message, - QMessageBox::Ok, this); - box.exec(); -} - -void TabDeckStorageVisual::onShareTimeout() -{ - if (shareInFlightSeq == 0) { - return; // share mode was left while the request was still outstanding - } - shareInFlightSeq = 0; - shareBar->setCreateEnabled(true); - showShareNotice(tr("The server did not respond in time. Try again."), true); -} diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h index 7cd4e7d17..d3f64e23d 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.h @@ -7,19 +7,14 @@ #ifndef TAB_DECK_STORAGE_VISUAL_H #define TAB_DECK_STORAGE_VISUAL_H -#include "../../deck_share/share_bar_widget.h" #include "../tab.h" -#include -#include - struct LoadedDeck; class AbstractClient; class CommandContainer; class DeckPreviewWidget; class QFileSystemModel; class QGroupBox; -class QTimer; class QToolBar; class QTreeView; class QTreeWidget; @@ -31,55 +26,23 @@ class TabDeckStorageVisual final : public Tab { Q_OBJECT public: - explicit TabDeckStorageVisual(TabSupervisor *_tabSupervisor, AbstractClient *_client); - void retranslateUi() override; - + explicit TabDeckStorageVisual(TabSupervisor *_tabSupervisor); + void retranslateUi() override + { + } [[nodiscard]] QString getTabText() const override { return tr("Visual Deck Storage"); } - /** - * @brief Enters share-selection mode, optionally preselecting the given deck files. - */ - void enterShareMode(const QStringList &preselectFiles = {}); - - /** - * @brief Leaves share-selection mode and clears the selection. - */ - void exitShareMode(); - - [[nodiscard]] bool isShareModeActive() const - { - return shareBar->isVisible(); - } - public slots: void actOpenLocalDeck(const QString &filePath); - void actShareDeck(const QString &filePath); signals: void openDeckEditor(const LoadedDeck &deck); -private slots: - void actShareSelected(); - void shareFinished(const Response &response, const CommandContainer &commandContainer); - void onShareTimeout(); - void onShareSelectionChanged(); - void handleConnectionChanged(ClientStatus status); - private: - void showShareNotice(const QString &message, bool warning = false); - void updateShareHint(); - VisualDeckStorageWidget *visualDeckStorageWidget; - - ShareBarWidget *shareBar = nullptr; - AbstractClient *client; - QTimer *shareTimeoutTimer; - int shareRequestSeq = 0; - int shareInFlightSeq = 0; - bool shareDeckAvailable = false; }; #endif diff --git a/cockatrice/src/interface/widgets/utility/completer_utils.cpp b/cockatrice/src/interface/widgets/utility/completer_utils.cpp index 23ddb30b0..16d5cfd13 100644 --- a/cockatrice/src/interface/widgets/utility/completer_utils.cpp +++ b/cockatrice/src/interface/widgets/utility/completer_utils.cpp @@ -1,6 +1,5 @@ #include "completer_utils.h" -#include "../../../client/settings/cache_settings.h" #include "card_completer_styler.h" #include @@ -8,26 +7,13 @@ #include #include #include -#include #include #include #include -#include - -namespace -{ -void applyCardSearchLanguage(CardSearchModel *searchModel) -{ - const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay(); - searchModel->setSearchLanguage(CardSearchLanguage{ - cardsDisplay.getCardLang(), static_cast(cardsDisplay.getCardSearchLanguage())}); -} -} // namespace CardCompleterSetup createCardCompleter(CardDatabaseDisplayModel *displayModel, QObject *parent, int maxVisibleItems) { auto *searchModel = new CardSearchModel(displayModel, parent); - applyCardSearchLanguage(searchModel); auto *proxyModel = new CardCompleterProxyModel(parent); proxyModel->setSourceModel(searchModel); @@ -41,12 +27,6 @@ CardCompleterSetup createCardCompleter(CardDatabaseDisplayModel *displayModel, Q completer->setMaxVisibleItems(maxVisibleItems); CardCompleterStyler::apply(completer); - auto *cardsDisplay = &SettingsCache::instance().cardsDisplay(); - QObject::connect(cardsDisplay, &CardsDisplaySettings::cardLangChanged, searchModel, - [searchModel] { applyCardSearchLanguage(searchModel); }); - QObject::connect(cardsDisplay, &CardsDisplaySettings::cardSearchLanguageChanged, searchModel, - [searchModel] { applyCardSearchLanguage(searchModel); }); - return {searchModel, proxyModel, completer}; } diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp index 06561a41d..c6bf289ba 100644 --- a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp +++ b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp @@ -2,7 +2,6 @@ #include "../../../client/settings/cache_settings.h" #include "../../../client/settings/shortcuts_settings.h" -#include "../../pixel_map_generator.h" #include #include @@ -15,8 +14,8 @@ SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWid defaultButton = new QPushButton("", this); lineEdit->setMinimumWidth(70); - clearButton->setIcon(themePixmap(QStringLiteral("icons/clearsearch"))); - defaultButton->setIcon(themePixmap(QStringLiteral("icons/update"))); + clearButton->setIcon(QPixmap("theme:icons/clearsearch")); + defaultButton->setIcon(QPixmap("theme:icons/update")); auto *layout = new QHBoxLayout(this); layout->setContentsMargins(0, 0, 0, 0); diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp index a59a068dd..4a558a5e0 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_toolbar_widget.cpp @@ -1,6 +1,5 @@ #include "visual_database_display_filter_toolbar_widget.h" -#include "../../pixel_map_generator.h" #include "../deck_editor/card_database_view.h" #include "visual_database_display_widget.h" @@ -61,22 +60,22 @@ VisualDatabaseDisplayFilterToolbarWidget::VisualDatabaseDisplayFilterToolbarWidg }); quickFilterSaveLoadWidget = new SettingsButtonWidget(this); - quickFilterSaveLoadWidget->setButtonIcon(themePixmap(QStringLiteral("icons/floppy_disk"))); + quickFilterSaveLoadWidget->setButtonIcon(QPixmap("theme:icons/floppy_disk")); quickFilterNameWidget = new SettingsButtonWidget(this); - quickFilterNameWidget->setButtonIcon(themePixmap(QStringLiteral("icons/pen_to_square"))); + quickFilterNameWidget->setButtonIcon(QPixmap("theme:icons/pen_to_square")); quickFilterMainTypeWidget = new SettingsButtonWidget(this); - quickFilterMainTypeWidget->setButtonIcon(themePixmap(QStringLiteral("icons/circle_half_stroke"))); + quickFilterMainTypeWidget->setButtonIcon(QPixmap("theme:icons/circle_half_stroke")); quickFilterSubTypeWidget = new SettingsButtonWidget(this); - quickFilterSubTypeWidget->setButtonIcon(themePixmap(QStringLiteral("icons/dragon"))); + quickFilterSubTypeWidget->setButtonIcon(QPixmap("theme:icons/dragon")); quickFilterSetWidget = new SettingsButtonWidget(this); - quickFilterSetWidget->setButtonIcon(themePixmap(QStringLiteral("icons/scroll"))); + quickFilterSetWidget->setButtonIcon(QPixmap("theme:icons/scroll")); quickFilterFormatLegalityWidget = new SettingsButtonWidget(this); - quickFilterFormatLegalityWidget->setButtonIcon(themePixmap(QStringLiteral("icons/scale_balanced"))); + quickFilterFormatLegalityWidget->setButtonIcon(QPixmap("theme:icons/scale_balanced")); retranslateUi(); } diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp index a20d56f63..0cdf60d5d 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp @@ -21,7 +21,6 @@ #include #include #include -#include #include #include @@ -41,17 +40,6 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, databaseDisplayModel->setSourceModel(database_model); databaseDisplayModel->setFilterKeyColumn(0); - const auto applyCardSearchLanguage = [this]() { - const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay(); - databaseDisplayModel->setSearchLanguage(CardSearchLanguage{ - cardsDisplay.getCardLang(), static_cast(cardsDisplay.getCardSearchLanguage())}); - }; - applyCardSearchLanguage(); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardLangChanged, this, - applyCardSearchLanguage); - connect(&SettingsCache::instance().cardsDisplay(), &CardsDisplaySettings::cardSearchLanguageChanged, this, - applyCardSearchLanguage); - cards = new QList; connect(databaseDisplayModel, &CardDatabaseDisplayModel::modelDirty, this, &VisualDatabaseDisplayWidget::modelDirty); @@ -77,7 +65,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, searchEdit->setPlaceholderText(tr("Search by card name (or search expressions)")); searchEdit->setClearButtonEnabled(true); searchEdit->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); - auto help = searchEdit->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); + auto help = searchEdit->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition); connect(help, &QAction::triggered, this, [this] { createSearchSyntaxHelpWindow(searchEdit); }); setFocusProxy(searchEdit); @@ -101,19 +89,6 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, databaseView->setItemDelegate(nullptr); databaseView->setVisible(false); - // Without a deck model there is nothing to add cards to, so the zone menu stays hidden. - if (deckListModel) { - databaseView->setZoneMenuProvider( - [deckListModel]() -> QList> { - QList> result; - for (const QString &boardName : InnerDecklistNode::boardZoneNames()) { - result.append({boardName, deckListModel->getCustomZoneNames(boardName)}); - } - return result; - }, - [this] { return newZoneCreator ? newZoneCreator() : QString(); }); - } - searchEdit->setTreeView(databaseView); searchEdit->installEventFilter(databaseView->getKeySignals()); @@ -132,7 +107,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, clearFilterWidget = new QToolButton(); clearFilterWidget->setFixedSize(32, 32); - clearFilterWidget->setIcon(themePixmap(QStringLiteral("icons/delete"))); + clearFilterWidget->setIcon(QPixmap("theme:icons/delete")); connect(clearFilterWidget, &QToolButton::clicked, this, [this] { filterModel->blockSignals(true); filterModel->filterTree()->blockSignals(true); @@ -220,11 +195,6 @@ void VisualDatabaseDisplayWidget::showEvent(QShowEvent *event) initializeFilters(); } -void VisualDatabaseDisplayWidget::setNewZoneCreator(const std::function &creator) -{ - newZoneCreator = creator; -} - void VisualDatabaseDisplayWidget::retranslateUi() { databaseLoadIndicator->setText(tr("Loading database ...")); diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h index d161ce362..6e4d87876 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h @@ -22,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -47,12 +46,6 @@ public: void sortCardList(const QStringList &properties, Qt::SortOrder order) const; void setDeckList(const DeckList &new_deck_list_model); - /** - * @brief Sets the callback used to create a custom zone from the add-to-zone menu. - * The callback returns the name of the created zone, or an empty string if creation was cancelled. - */ - void setNewZoneCreator(const std::function &creator); - CardDatabaseDisplayModel *getDatabaseDisplayModel() { return databaseDisplayModel; @@ -113,7 +106,6 @@ private: VisualDatabaseDisplayFilterToolbarWidget *filterContainer; CardDatabaseDisplayModel *databaseDisplayModel; CardDatabaseView *databaseView; - std::function newZoneCreator; QList *cards; QVBoxLayout *mainLayout; QScrollArea *scrollArea; diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp index 28abe480e..f44c9c3ef 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_display_options_widget.cpp @@ -1,6 +1,5 @@ #include "visual_deck_display_options_widget.h" -#include "../../pixel_map_generator.h" #include "../tabs/visual_deck_editor/tab_deck_editor_visual.h" #include @@ -48,7 +47,7 @@ VisualDeckDisplayOptionsWidget::VisualDeckDisplayOptionsWidget(QWidget *parent) sortByLabel = new QLabel(this); sortCriteriaButton = new SettingsButtonWidget(this); - sortCriteriaButton->setButtonIcon(themePixmap(QStringLiteral("icons/sort_arrow_down"))); + sortCriteriaButton->setButtonIcon(QPixmap("theme:icons/sort_arrow_down")); sortLabel = new QLabel(sortCriteriaButton); sortLabel->setWordWrap(true); @@ -93,7 +92,7 @@ void VisualDeckDisplayOptionsWidget::retranslateUi() sortLabel->setText(tr("Click and drag to change the sort order within the groups")); sortCriteriaButton->setToolTip(tr("Configure how cards are sorted within their groups")); displayTypeButton->setButtonText(tr("Toggle Layout: Overlap")); - displayTypeButton->setButtonIcon(themePixmap(QStringLiteral("icons/scales"))); + displayTypeButton->setButtonIcon(QPixmap("theme:icons/scales")); displayTypeButton->setToolTip( tr("Change how cards are displayed within zones (i.e. overlapped or fully visible.)")); } @@ -118,11 +117,11 @@ void VisualDeckDisplayOptionsWidget::updateDisplayType() switch (currentDisplayType) { case DisplayType::Flat: displayTypeButton->setButtonText(tr("Toggle Layout: Flat")); - displayTypeButton->setButtonIcon(themePixmap(QStringLiteral("icons/scroll"))); + displayTypeButton->setButtonIcon(QPixmap("theme:icons/scroll")); break; case DisplayType::Overlap: displayTypeButton->setButtonText(tr("Toggle Layout: Overlap")); - displayTypeButton->setButtonIcon(themePixmap(QStringLiteral("icons/scales"))); + displayTypeButton->setButtonIcon(QPixmap("theme:icons/scales")); break; } emit displayTypeChanged(currentDisplayType); diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index 064fbed5d..e3261b346 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -4,7 +4,6 @@ #include "../../../main.h" #include "../../deck_loader/deck_loader.h" #include "../../layouts/overlap_layout.h" -#include "../../pixel_map_generator.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/deck_card_zone_display_widget.h" #include "../general/layout_containers/flow_widget.h" @@ -132,7 +131,7 @@ void VisualDeckEditorWidget::initializeSearchBarAndCompleter() // Search button functionality searchPushButton = new CompactPushButton(searchContainer); - searchPushButton->setButtonIcon(themePixmap(QStringLiteral("icons/search"))); + searchPushButton->setButtonIcon(QPixmap("theme:icons/search")); connect(searchPushButton, &QPushButton::clicked, this, [=, this]() { ExactCard card = CardDatabaseManager::query()->getCard({searchBar->text()}); if (card) { diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp index d1a780c38..fd529ff69 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.cpp @@ -1,10 +1,11 @@ #include "deck_preview_color_identity_filter_widget.h" #include "../../cards/additional_info/mana_symbol_widget.h" +#include "../visual_deck_storage_widget.h" #include -DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(QWidget *parent) +DeckPreviewColorIdentityFilterWidget::DeckPreviewColorIdentityFilterWidget(VisualDeckStorageWidget *parent) : QWidget(parent), layout(new QHBoxLayout(this)) { setLayout(layout); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h index d54984bcf..def45de66 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h @@ -14,12 +14,14 @@ #include #include +class VisualDeckStorageWidget; + class DeckPreviewColorIdentityFilterWidget : public QWidget { Q_OBJECT public: - explicit DeckPreviewColorIdentityFilterWidget(QWidget *parent = nullptr); + explicit DeckPreviewColorIdentityFilterWidget(VisualDeckStorageWidget *parent); void retranslateUi(); /** diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp index a7fef5031..db466b77a 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.cpp @@ -48,7 +48,6 @@ QSize DeckPreviewTagDisplayWidget::sizeHint() const void DeckPreviewTagDisplayWidget::mousePressEvent(QMouseEvent *event) { - const TagState previousState = state; switch (event->button()) { case Qt::LeftButton: setState(state != TagState::Selected ? TagState::Selected : TagState::NotSelected); @@ -63,12 +62,7 @@ void DeckPreviewTagDisplayWidget::mousePressEvent(QMouseEvent *event) break; } - // Only announce a change when the state was actually toggled, so a click that falls - // through the switch (e.g. a button the widget does not react to) does not drive a - // full tag-filter update and layout pass for nothing. - if (state != previousState) { - emit tagClicked(); - } + emit tagClicked(); QWidget::mousePressEvent(event); } diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h index df2a6b404..980741c5d 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_display_widget.h @@ -48,10 +48,7 @@ public: signals: /** - * @brief Emitted when a click toggles the chip's selection/exclusion state. - * - * Not emitted for clicks that leave the state unchanged. Connected handlers use - * this as the trigger to update filters built from selectedTags()/excludedTags(). + * @brief Emitted when the tag is clicked. */ void tagClicked(); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 53fe32314..04dcdf7f2 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -10,8 +10,9 @@ #include "../visual_deck_storage_widget.h" #include "deck_preview_deck_tags_display_widget.h" +#include +#include #include -#include #include #include #include @@ -28,7 +29,7 @@ DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent, VisualDeckStorageWidget *_visualDeckStorageWidget, VisualDeckStorageModel *_model, const QString &_filePath) - : QWidget(_parent), filePath(_filePath), visualDeckStorageWidget(_visualDeckStorageWidget), model(_model) + : QWidget(_parent), visualDeckStorageWidget(_visualDeckStorageWidget), model(_model), filePath(_filePath) { layout = new QVBoxLayout(this); setLayout(layout); @@ -37,8 +38,6 @@ DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent, new DeckPreviewCardPictureWidget(this, false, visualDeckStorageWidget->deckPreviewSelectionAnimationEnabled); pictureWidget->setFontSize(24); connect(pictureWidget, &DeckPreviewCardPictureWidget::imageClicked, this, &DeckPreviewWidget::imageClickedEvent); - connect(pictureWidget, &DeckPreviewCardPictureWidget::imageSingleClicked, this, - &DeckPreviewWidget::imageSingleClicked); connect(pictureWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this, &DeckPreviewWidget::imageDoubleClickedEvent); bannerCardDisplayWidget = pictureWidget; @@ -102,15 +101,6 @@ DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent, // to keep the resize handler from searching the widget tree on every layout pass. fixedWidthChildren = {bannerCardDisplayWidget, colorIdentityWidget, deckTagsDisplayWidget, bannerCardLabel, bannerCardComboBox}; - - // Child of the banner widget so the frame tracks the banner's selection animation - // (which animates the banner's position) instead of staying at a stale static offset. - selectionFrame = new QFrame(bannerCardDisplayWidget); - selectionFrame->setAttribute(Qt::WA_TransparentForMouseEvents); - selectionFrame->setStyleSheet(QStringLiteral( - "QFrame { border: 2px solid palette(highlight); border-radius: 4px; background: transparent; }")); - selectionFrame->setVisible(false); - bannerCardDisplayWidget->installEventFilter(this); } void DeckPreviewWidget::retranslateUi() @@ -134,63 +124,6 @@ void DeckPreviewWidget::resizeEvent(QResizeEvent *event) for (QWidget *widget : fixedWidthChildren) { widget->setMaximumWidth(width); } - updateSelectionFrameGeometry(); -} - -bool DeckPreviewWidget::eventFilter(QObject *watched, QEvent *event) -{ - if (watched == bannerCardDisplayWidget && (event->type() == QEvent::Resize || event->type() == QEvent::Move)) { - updateSelectionFrameGeometry(); - } - return QWidget::eventFilter(watched, event); -} - -void DeckPreviewWidget::setShareSelectable(bool selectable) -{ - shareSelectable = selectable; - if (!selectable) { - setShareSelected(false); - } - updateSelectionStyle(); -} - -void DeckPreviewWidget::setShareSelected(bool selected) -{ - if (shareSelected == selected) { - return; - } - shareSelected = selected; - updateSelectionStyle(); - emit shareSelectionToggled(selected); -} - -bool DeckPreviewWidget::isShareSelected() const -{ - return shareSelected; -} - -bool DeckPreviewWidget::isShareSelectable() const -{ - return shareSelectable; -} - -void DeckPreviewWidget::updateSelectionFrameGeometry() -{ - if (selectionFrame == nullptr || bannerCardDisplayWidget == nullptr) { - return; - } - // Frame is a child of the banner, so it is positioned in banner coordinates and - // tracks the banner's selection animation automatically. A small inset keeps the - // highlight visible around the card art without occluding it. - selectionFrame->setGeometry(bannerCardDisplayWidget->rect().adjusted(1, 1, -1, -1)); - selectionFrame->raise(); -} - -void DeckPreviewWidget::updateSelectionStyle() -{ - if (selectionFrame != nullptr) { - selectionFrame->setVisible(shareSelectable && isShareSelected()); - } } void DeckPreviewWidget::enterEvent(QEnterEvent *event) @@ -406,20 +339,10 @@ void DeckPreviewWidget::imageClickedEvent(QMouseEvent *event, DeckPreviewCardPic } } -void DeckPreviewWidget::imageSingleClicked() -{ - if (isShareSelectable()) { - setShareSelected(!isShareSelected()); - } -} - void DeckPreviewWidget::imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance) { Q_UNUSED(event); Q_UNUSED(instance); - if (isShareSelectable()) { - return; // in share mode a double click would just toggle a single selection - } emit deckLoadRequested(filePath); } @@ -444,9 +367,6 @@ QMenu *DeckPreviewWidget::createRightClickMenu() } }); - connect(menu->addAction(tr("Share deck...")), &QAction::triggered, this, - [this] { emit shareDeckRequested(filePath); }); - connect(menu->addAction(tr("Edit Tags")), &QAction::triggered, deckTagsDisplayWidget, &DeckPreviewDeckTagsDisplayWidget::openTagEditDlg); @@ -579,6 +499,21 @@ void DeckPreviewWidget::actDeleteFile() // The folder widget removes this preview once the row is gone. } +static bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath) +{ + QFileInfo fileInfo(filePath); + QString newFileName = QDir::toNativeSeparators(fileInfo.path() + "/" + fileInfo.completeBaseName() + ".cod"); + + if (QFile::exists(newFileName)) { + QMessageBox::StandardButton reply = + QMessageBox::question(parent, QObject::tr("Overwrite Existing File?"), + QObject::tr("A .cod version of this deck already exists. Overwrite it?"), + QMessageBox::Yes | QMessageBox::No); + return reply == QMessageBox::Yes; + } + return true; // Safe to proceed +} + /** * Checks if the deck's file format supports tags. * If not, then prompt the user for file conversion. @@ -586,8 +521,45 @@ void DeckPreviewWidget::actDeleteFile() */ bool DeckPreviewWidget::promptFileConversionIfRequired() { - return DialogConvertDeckToCodFormat::promptIfRequired(this, filePath, [this] { + if (DeckFileFormat::getFormatFromName(filePath) == DeckFileFormat::Cockatrice) { + return true; + } + + // Retrieve saved preference if the prompt is disabled + if (!SettingsCache::instance().visualDeckStorage().getVisualDeckStoragePromptForConversion()) { + if (!SettingsCache::instance().visualDeckStorage().getVisualDeckStorageAlwaysConvert()) { + return false; + } + + if (!confirmOverwriteIfExists(this, filePath)) { + return false; + } + model->convertToCockatriceFormat(row()); return true; - }); + } + + // Show the dialog to the user + DialogConvertDeckToCodFormat conversionDialog(this); + if (conversionDialog.exec() != QDialog::Accepted) { + SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion( + !conversionDialog.dontAskAgain()); + SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(false); + + return false; + } + + // Try to convert file + if (!confirmOverwriteIfExists(this, filePath)) { + return false; + } + + model->convertToCockatriceFormat(row()); + + if (conversionDialog.dontAskAgain()) { + SettingsCache::instance().visualDeckStorage().setVisualDeckStoragePromptForConversion(false); + SettingsCache::instance().visualDeckStorage().setVisualDeckStorageAlwaysConvert(true); + } + + return true; } diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h index f4909eda8..7bb69f9b9 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h @@ -17,7 +17,6 @@ #include class QEnterEvent; -class QFrame; class QLabel; class QMenu; class QMouseEvent; @@ -42,19 +41,9 @@ public: */ DeckPreviewCardPictureWidget *bannerCardDisplayWidget; - /** @brief The path of the deck file backing this preview. */ - QString filePath; - - void setShareSelectable(bool selectable); - void setShareSelected(bool selected); - [[nodiscard]] bool isShareSelected() const; - [[nodiscard]] bool isShareSelectable() const; - signals: void deckLoadRequested(const QString &filePath); void openDeckEditor(const LoadedDeck &deck); - void shareDeckRequested(const QString &filePath); - void shareSelectionToggled(bool selected); public slots: /** @@ -77,7 +66,6 @@ public slots: protected: void enterEvent(QEnterEvent *event) override; void resizeEvent(QResizeEvent *event) override; - bool eventFilter(QObject *watched, QEvent *event) override; private: [[nodiscard]] int row() const; @@ -88,7 +76,6 @@ private: QMenu *createRightClickMenu(); void addSetBannerCardMenu(QMenu *menu); void imageClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance); - void imageSingleClicked(); void imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance); void actRenameDeck(); @@ -97,6 +84,7 @@ private: VisualDeckStorageWidget *visualDeckStorageWidget; VisualDeckStorageModel *model; + QString filePath; QVBoxLayout *layout; ColorIdentityWidget *colorIdentityWidget; DeckPreviewDeckTagsDisplayWidget *deckTagsDisplayWidget; @@ -104,12 +92,6 @@ private: QComboBox *bannerCardComboBox; QList fixedWidthChildren; ///< Children clamped to the picture width on resize. int lastKnownBannerWidth = -1; ///< The picture width last applied to the children. - QFrame *selectionFrame = nullptr; - bool shareSelectable = false; - bool shareSelected = false; - - void updateSelectionStyle(); - void updateSelectionFrameGeometry(); }; class NoScrollFilter : public QObject diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp deleted file mode 100644 index b49d6f9f4..000000000 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.cpp +++ /dev/null @@ -1,167 +0,0 @@ -#include "public_deck_preview_widget.h" - -#include "../../../../client/settings/cache_settings.h" -#include "../../cards/additional_info/color_identity_widget.h" -#include "../../cards/deck_preview_card_picture_widget.h" -#include "../../general/layout_containers/flow_widget.h" -#include "deck_preview_tag_display_widget.h" - -#include -#include -#include -#include -#include -#include -#include - -PublicDeckPreviewWidget::PublicDeckPreviewWidget(QWidget *parent, const RemotePublicDecksModel::DeckEntry &entry) - : QWidget(parent) -{ - bannerCardDisplayWidget = new DeckPreviewCardPictureWidget(this); - bannerCardDisplayWidget->setFontSize(24); - - // The whole tile is a single focusable, keyboard-operable control: Tab lands - // on it and Space/Enter opens the deck, mirroring the shared-deck preview tile. - setFocusPolicy(Qt::StrongFocus); - - uploadTimeLabel = new QLabel(this); - uploadTimeLabel->setAlignment(Qt::AlignHCenter); - - colorIdentityWidget = new ColorIdentityWidget(this); - - tagsFlowWidget = new FlowWidget(this, Qt::Horizontal, Qt::ScrollBarAlwaysOff, Qt::ScrollBarAsNeeded); - tagsFlowWidget->setSpacing(3, 3); - - auto *layout = new QVBoxLayout(this); - layout->setContentsMargins(0, 0, 0, 0); - layout->addWidget(bannerCardDisplayWidget); - layout->addWidget(uploadTimeLabel); - layout->addWidget(colorIdentityWidget); - layout->addWidget(tagsFlowWidget); - setLayout(layout); - - connect(&SettingsCache::instance().visualDeckStorage(), - &VisualDeckStorageSettings::visualDeckStorageShowColorIdentityChanged, this, - &PublicDeckPreviewWidget::updateColorIdentityVisibility); - connect(&SettingsCache::instance().visualDeckStorage(), - &VisualDeckStorageSettings::visualDeckStorageShowTagsOnDeckPreviewsChanged, this, - &PublicDeckPreviewWidget::updateTagsVisibility); - connect(&SettingsCache::instance().visualDeckStorage(), - &VisualDeckStorageSettings::visualDeckStorageShowUploadTimeChanged, this, - &PublicDeckPreviewWidget::updateUploadTimeVisibility); - - setEntry(entry); - - connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageClicked, this, - &PublicDeckPreviewWidget::imageClickedEvent); - connect(bannerCardDisplayWidget, &DeckPreviewCardPictureWidget::imageDoubleClicked, this, - &PublicDeckPreviewWidget::imageDoubleClickedEvent); - - // resizeEvent clamps every child to the banner picture's width, so collect them - // once here to keep the resize handler from searching the widget tree on every pass. - fixedWidthChildren = {bannerCardDisplayWidget, uploadTimeLabel, colorIdentityWidget, tagsFlowWidget}; -} - -void PublicDeckPreviewWidget::resizeEvent(QResizeEvent *event) -{ - QWidget::resizeEvent(event); - if (bannerCardDisplayWidget == nullptr) { - return; - } - - const int width = bannerCardDisplayWidget->width(); - if (width == lastKnownBannerWidth) { - return; - } - lastKnownBannerWidth = width; - - for (QWidget *widget : fixedWidthChildren) { - widget->setMaximumWidth(width); - } -} - -void PublicDeckPreviewWidget::setEntry(const RemotePublicDecksModel::DeckEntry &entry) -{ - deckId = entry.id; - - hasColorIdentity = !entry.colorIdentity.isEmpty(); - colorIdentityWidget->setColorIdentity(entry.colorIdentity); - updateColorIdentityVisibility(); - - const ExactCard bannerCard = - entry.bannerCardName.isEmpty() - ? ExactCard() - : CardDatabaseManager::query()->getCard(CardRef{entry.bannerCardName, entry.bannerCardProvider}); - bannerCardDisplayWidget->setCard(bannerCard); - - // The deck name is the overlay text on the banner, like the local preview. - bannerCardDisplayWidget->setOverlayText(entry.name); - // The deck name comes from another user's record, and Qt tooltips are - // rendered as AutoText, so escape and bound it to keep it readable text - // (the overlay painted onto the banner is already a plain painter draw). - setToolTip(entry.name.left(200).toHtmlEscaped()); - setBaseAccessibleName(entry.name); - - tagsFlowWidget->clearLayout(); - for (const QString &tag : entry.tags) { - auto *chip = new DeckPreviewTagDisplayWidget(tagsFlowWidget, tag); - chip->setAttribute(Qt::WA_TransparentForMouseEvents); - tagsFlowWidget->addWidget(chip); - } - hasTags = !entry.tags.isEmpty(); - updateTagsVisibility(); - - uploadTimeLabel->setText(tr("Uploaded %1").arg(entry.uploadTime.toString(Qt::TextDate))); - hasUploadTime = !entry.uploadTime.isNull(); - updateUploadTimeVisibility(); -} - -void PublicDeckPreviewWidget::updateColorIdentityVisibility() -{ - colorIdentityWidget->setVisible( - hasColorIdentity && SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowColorIdentity()); -} - -void PublicDeckPreviewWidget::updateTagsVisibility() -{ - tagsFlowWidget->setVisible( - hasTags && SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowTagsOnDeckPreviews()); -} - -void PublicDeckPreviewWidget::updateUploadTimeVisibility() -{ - uploadTimeLabel->setVisible(hasUploadTime && - SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowUploadTime()); -} - -void PublicDeckPreviewWidget::keyPressEvent(QKeyEvent *event) -{ - if (event->key() == Qt::Key_Space || event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return) { - event->accept(); - emit openDeckRequested(deckId); - return; - } - QWidget::keyPressEvent(event); -} - -void PublicDeckPreviewWidget::setBaseAccessibleName(const QString &name) -{ - baseAccessibleName = name; - setAccessibleName(name); -} - -void PublicDeckPreviewWidget::setScaleFactor(int scale) -{ - bannerCardDisplayWidget->setScaleFactor(scale); -} - -void PublicDeckPreviewWidget::imageClickedEvent(QMouseEvent * /*event*/, DeckPreviewCardPictureWidget * /*instance*/) -{ - // Reserved: clicking could show a card popup for the banner card. -} - -void PublicDeckPreviewWidget::imageDoubleClickedEvent(QMouseEvent * /*event*/, - DeckPreviewCardPictureWidget * /*instance*/) -{ - emit openDeckRequested(deckId); -} diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h deleted file mode 100644 index a0e5dd43a..000000000 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/public_deck_preview_widget.h +++ /dev/null @@ -1,75 +0,0 @@ -/** - * @file public_deck_preview_widget.h - * @ingroup VisualDeckPreviewWidgets - */ - -#ifndef PUBLIC_DECK_PREVIEW_WIDGET_H -#define PUBLIC_DECK_PREVIEW_WIDGET_H - -#include "../remote_public_decks_model.h" - -#include -#include -#include - -class ColorIdentityWidget; -class DeckPreviewCardPictureWidget; -class FlowWidget; -class QKeyEvent; -class QLabel; -class QMouseEvent; -class QResizeEvent; - -/** - * @brief A preview tile for a public deck published by another user. - * - * Renders the banner card picture (looked up by name/provider in the card - * database) with the deck name overlaid, the color identity, the deck's tags - * (read-only) and its upload time, all from the metadata the server stores for - * the deck, so no deck list is downloaded until the user actually opens the - * deck. Double-clicking the banner requests opening it. - */ -class PublicDeckPreviewWidget final : public QWidget -{ - Q_OBJECT - -public: - explicit PublicDeckPreviewWidget(QWidget *parent, const RemotePublicDecksModel::DeckEntry &entry); - - void setEntry(const RemotePublicDecksModel::DeckEntry &entry); - - /** @brief Sets the accessible name announced to assistive technologies. */ - void setBaseAccessibleName(const QString &name); - - /** @brief Scales the banner card picture, mirroring the Visual Deck Storage. */ - void setScaleFactor(int scale); - -signals: - void openDeckRequested(int deckId); - -protected: - void resizeEvent(QResizeEvent *event) override; - void keyPressEvent(QKeyEvent *event) override; - -private slots: - void imageClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance); - void imageDoubleClickedEvent(QMouseEvent *event, DeckPreviewCardPictureWidget *instance); - void updateColorIdentityVisibility(); - void updateTagsVisibility(); - void updateUploadTimeVisibility(); - -private: - int deckId = 0; - QString baseAccessibleName; - bool hasColorIdentity = false; - bool hasTags = false; - bool hasUploadTime = false; - int lastKnownBannerWidth = 0; - QList fixedWidthChildren; - DeckPreviewCardPictureWidget *bannerCardDisplayWidget; - ColorIdentityWidget *colorIdentityWidget; - FlowWidget *tagsFlowWidget; - QLabel *uploadTimeLabel; -}; - -#endif // PUBLIC_DECK_PREVIEW_WIDGET_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp deleted file mode 100644 index a1cabd729..000000000 --- a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.cpp +++ /dev/null @@ -1,220 +0,0 @@ -#include "remote_public_decks_model.h" - -#include "../../../client/settings/cache_settings.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -RemotePublicDecksModel::RemotePublicDecksModel(AbstractClient *_client, QObject *parent) - : QAbstractListModel(parent), client(_client) -{ - // The ping sweep can drop a pending command without ever emitting finished, - // so loading must not be a latch: time it out and clear it when the client - // goes away, or the tab is stuck on the loading state for the session. - loadingTimeoutTimer = new QTimer(this); - loadingTimeoutTimer->setSingleShot(true); - loadingTimeoutTimer->setInterval( - static_cast((static_cast(SettingsCache::instance().network().getTimeOut()) + 1) * - SettingsCache::instance().network().getKeepAlive() * 1000)); - connect(loadingTimeoutTimer, &QTimer::timeout, this, &RemotePublicDecksModel::onLoadingTimeout); - connect(client, &AbstractClient::statusChanged, this, [this](ClientStatus status) { - if (status == StatusDisconnected) { - loadingTimeoutTimer->stop(); - setLoading(false); - } - }); -} - -int RemotePublicDecksModel::rowCount(const QModelIndex &parent) const -{ - return parent.isValid() ? 0 : visibleIndices.size(); -} - -QVariant RemotePublicDecksModel::data(const QModelIndex &index, int role) const -{ - if (!index.isValid() || index.row() < 0 || index.row() >= visibleIndices.size()) { - return QVariant(); - } - if (role == Qt::DisplayRole || role == Qt::ToolTipRole) { - return decks.at(visibleIndices.at(index.row())).name; - } - return QVariant(); -} - -RemotePublicDecksModel::DeckEntry RemotePublicDecksModel::entryAt(int row) const -{ - if (row < 0 || row >= visibleIndices.size()) { - return DeckEntry{}; - } - return decks.at(visibleIndices.at(row)); -} - -void RemotePublicDecksModel::setSearchText(const QString &text) -{ - searchText = text.trimmed(); - rebuildVisibleIndices(); -} - -void RemotePublicDecksModel::setColorFilter(VisualDeckStorageSortFilterProxyModel::FilterMode mode, - const QSet &colors) -{ - colorFilterMode = mode; - activeColors = colors; - rebuildVisibleIndices(); -} - -void RemotePublicDecksModel::setTagFilter(const QSet &selected, const QSet &excluded) -{ - includedTags = selected; - excludedTags = excluded; - rebuildVisibleIndices(); -} - -QSet RemotePublicDecksModel::allTags() const -{ - QSet all; - for (const DeckEntry &entry : decks) { - all.unite(QSet(entry.tags.cbegin(), entry.tags.cend())); - } - return all; -} - -void RemotePublicDecksModel::rebuildVisibleIndices() -{ - QList newIndices; - newIndices.reserve(decks.size()); - for (int row = 0; row < decks.size(); ++row) { - const DeckEntry &entry = decks.at(row); - - if (!searchText.isEmpty() && !entry.name.contains(searchText, Qt::CaseInsensitive)) { - continue; - } - - if (!activeColors.isEmpty()) { - const QString &identity = entry.colorIdentity; - if (!colorIdentityMatches(colorFilterMode, activeColors, identity)) { - continue; - } - } - - if (!includedTags.isEmpty()) { - const QSet entryTags(entry.tags.cbegin(), entry.tags.cend()); - bool hasAll = std::all_of(includedTags.begin(), includedTags.end(), - [&entryTags](const QString &tag) { return entryTags.contains(tag); }); - if (!hasAll) { - continue; - } - } - - if (!excludedTags.isEmpty() && std::any_of(excludedTags.begin(), excludedTags.end(), - [&entry](const QString &tag) { return entry.tags.contains(tag); })) { - continue; - } - - newIndices.append(row); - } - - beginResetModel(); - visibleIndices = newIndices; - endResetModel(); -} - -void RemotePublicDecksModel::refresh(const QString &userName) -{ - if (loading) { - return; - } - // Every refresh captures its own request id so a reply that lands after its - // loading timeout (the reverse of the ping sweep dropping the command) is - // recognised as stale: it must not stop the newer request's timer or paint - // the grid with out-of-date data. - const int seq = ++requestSequence; - setLoading(true); - loadingTimeoutTimer->start(); - Command_DeckListOtherUser cmd; - cmd.set_user_name(userName.toStdString()); - PendingCommand *pend = client->prepareSessionCommand(cmd); - connect(pend, &PendingCommand::finished, this, - [this, seq](const Response &response, const CommandContainer &commandContainer) { - if (seq != requestSequence) { - return; // a newer refresh superseded this one - } - decksReceived(response, commandContainer); - }); - client->sendCommand(pend); -} - -void RemotePublicDecksModel::onLoadingTimeout() -{ - setLoading(false); - emit loadFailed(tr("The server did not respond in time. Try again.")); -} - -void RemotePublicDecksModel::clear() -{ - decks.clear(); - rebuildVisibleIndices(); -} - -void RemotePublicDecksModel::setLoading(bool value) -{ - if (loading == value) { - return; - } - loading = value; - emit loadingChanged(loading); -} - -void RemotePublicDecksModel::decksReceived(const Response &response, const CommandContainer & /*commandContainer*/) -{ - setLoading(false); - loadingTimeoutTimer->stop(); - if (response.response_code() != Response::RespOk) { - emit loadFailed(tr("Failed to load the user's public decks (server response code %1).") - .arg(QString::number(static_cast(response.response_code())))); - return; - } - - const Response_DeckList &resp = response.GetExtension(Response_DeckList::ext); - decks.clear(); - addFolder(resp.root()); - rebuildVisibleIndices(); -} - -void RemotePublicDecksModel::addFolder(const ServerInfo_DeckStorage_Folder &folder) -{ - const int itemCount = folder.items_size(); - for (int i = 0; i < itemCount; ++i) { - addTreeItem(folder.items(i)); - } -} - -void RemotePublicDecksModel::addTreeItem(const ServerInfo_DeckStorage_TreeItem &item) -{ - if (item.has_folder()) { - addFolder(item.folder()); - return; - } - - const ServerInfo_DeckStorage_File &file = item.file(); - DeckEntry entry; - entry.id = item.id(); - entry.name = QString::fromStdString(item.name()); - entry.uploadTime = QDateTime::fromSecsSinceEpoch(file.creation_time()); - entry.bannerCardName = QString::fromStdString(file.banner_card_name()); - entry.bannerCardProvider = QString::fromStdString(file.banner_card_provider()); - entry.colorIdentity = QString::fromStdString(file.color_identity()); - QStringList tags; - for (const auto &tag : file.tags()) { - tags.append(QString::fromStdString(tag)); - } - entry.tags = tags; - decks.append(entry); -} diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h b/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h deleted file mode 100644 index eeb606442..000000000 --- a/cockatrice/src/interface/widgets/visual_deck_storage/remote_public_decks_model.h +++ /dev/null @@ -1,129 +0,0 @@ -/** - * @file remote_public_decks_model.h - * @ingroup DeckStorageWidgets - */ - -#ifndef REMOTE_PUBLIC_DECKS_MODEL_H -#define REMOTE_PUBLIC_DECKS_MODEL_H - -#include "visual_deck_storage_sort_filter_proxy_model.h" - -#include -#include -#include -#include -#include - -class AbstractClient; -class CommandContainer; -class QTimer; -class Response; -class ServerInfo_DeckStorage_Folder; -class ServerInfo_DeckStorage_TreeItem; - -/** - * @brief Flat, read-only list of the public decks published by another user. - * - * Fetches the target user's public decks via Command_DeckListOtherUser and - * flattens the response tree into entries carrying the preview metadata stored - * on the server (banner card name/provider and color identity). No deck list is - * downloaded until the user actually opens a deck. - * - * Name and color-identity filtering is applied against this metadata, mirroring - * the Visual Deck Storage's filter semantics, so the grid can be narrowed like - * the local deck storage. - */ -class RemotePublicDecksModel : public QAbstractListModel -{ - Q_OBJECT - -public: - struct DeckEntry - { - int id = 0; - QString name; - QDateTime uploadTime; - QString bannerCardName; - QString bannerCardProvider; - QString colorIdentity; - QStringList tags; - }; - - /** - * @brief The color identity filter mode, shared with the Visual Deck Storage. - */ - using FilterMode = VisualDeckStorageSortFilterProxyModel::FilterMode; - - explicit RemotePublicDecksModel(AbstractClient *client, QObject *parent = nullptr); - - [[nodiscard]] int rowCount(const QModelIndex &parent = QModelIndex()) const override; - [[nodiscard]] QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; - - /** @brief Fetches the public decks of another user, replacing the current contents. */ - void refresh(const QString &userName); - void clear(); - - /** @brief Sets a case-insensitive substring filter on the deck name. */ - void setSearchText(const QString &text); - - /** @brief Sets the active color identity filter and mode. */ - void setColorFilter(FilterMode mode, const QSet &colors); - - /** @brief Filters decks by required (`selected`) and forbidden (`excluded`) tags. */ - void setTagFilter(const QSet &selected, const QSet &excluded); - - /** @brief All tags present across all loaded decks, for building filter chips. */ - [[nodiscard]] QSet allTags() const; - - /** @brief The number of decks after filtering. */ - [[nodiscard]] int filteredCount() const - { - return visibleIndices.size(); - } - - /** @brief The number of decks before filtering. */ - [[nodiscard]] int totalCount() const - { - return decks.size(); - } - - /** @brief True while a refresh request is in flight and the grid has no data yet. */ - [[nodiscard]] bool isLoading() const - { - return loading; - } - - [[nodiscard]] DeckEntry entryAt(int row) const; - -signals: - /** @brief Emitted when a refresh starts, completes, or fails (see loading()). */ - void loadingChanged(bool loading); - - /** @brief Emitted when the last refresh failed; contains a user-facing message. */ - void loadFailed(const QString &message); - -private slots: - void decksReceived(const Response &response, const CommandContainer &commandContainer); - void onLoadingTimeout(); - -private: - void addFolder(const ServerInfo_DeckStorage_Folder &folder); - void addTreeItem(const ServerInfo_DeckStorage_TreeItem &item); - void rebuildVisibleIndices(); - void setLoading(bool value); - - AbstractClient *client; - QTimer *loadingTimeoutTimer; - QList decks; - QList visibleIndices; ///< Row indices into `decks` that pass the current filters. - bool loading = false; - int requestSequence = 0; ///< Monotonically increases per refresh; only the newest request may update the grid. - - QString searchText; - VisualDeckStorageSortFilterProxyModel::FilterMode colorFilterMode = VisualDeckStorageSortFilterProxyModel::Includes; - QSet activeColors; - QSet includedTags; - QSet excludedTags; -}; - -#endif // REMOTE_PUBLIC_DECKS_MODEL_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp index 911f3dee9..fbaabf90f 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp @@ -125,11 +125,8 @@ void VisualDeckStorageFolderDisplayWidget::continueDeckPass() } const bool matches = index.data(VisualDeckStorageRoles::FilterMatchRole).toBool(); - deckPreviewWidget->setVisible(matches); - if (!matches) { - // A deck that no longer matches the filters is dropped from the selection so its - // highlight cannot linger on an invisible preview or be counted in the share. - deckPreviewWidget->setShareSelected(false); + if (matches == deckPreviewWidget->isHidden()) { + deckPreviewWidget->setVisible(matches); } if (matches) { ++visibleDeckCount; @@ -214,11 +211,6 @@ DeckPreviewWidget *VisualDeckStorageFolderDisplayWidget::createDeckPreviewWidget &VisualDeckStorageWidget::deckLoadRequested); connect(deckPreviewWidget, &DeckPreviewWidget::openDeckEditor, visualDeckStorageWidget, &VisualDeckStorageWidget::openDeckEditor); - connect(deckPreviewWidget, &DeckPreviewWidget::shareDeckRequested, visualDeckStorageWidget, - &VisualDeckStorageWidget::shareDeckRequested); - connect(deckPreviewWidget, &DeckPreviewWidget::shareSelectionToggled, visualDeckStorageWidget, - &VisualDeckStorageWidget::shareSelectionChanged); - deckPreviewWidget->setShareSelectable(visualDeckStorageWidget->isShareSelectable()); connect(visualDeckStorageWidget->settings(), &VisualDeckStorageQuickSettingsWidget::cardSizeChanged, deckPreviewWidget->bannerCardDisplayWidget, &CardInfoPictureWidget::setScaleFactor); deckPreviewWidget->bannerCardDisplayWidget->setScaleFactor(visualDeckStorageWidget->settings()->getCardSize()); @@ -226,18 +218,6 @@ DeckPreviewWidget *VisualDeckStorageFolderDisplayWidget::createDeckPreviewWidget return deckPreviewWidget; } -void VisualDeckStorageFolderDisplayWidget::setShareSelectable(bool selectable) -{ - const auto previews = flowWidget->findChildren(); - for (DeckPreviewWidget *preview : previews) { - preview->setShareSelectable(selectable); - } - const auto subFolders = findChildren(); - for (VisualDeckStorageFolderDisplayWidget *subFolder : subFolders) { - subFolder->setShareSelectable(selectable); - } -} - /** * @brief Creates, removes and keeps in sync the subfolder widgets of this folder. * diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h index 5a81457b0..257ce1778 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.h @@ -51,7 +51,6 @@ public slots: */ void scheduleReconcile(); void updateShowFolders(bool enabled); - void setShareSelectable(bool selectable); signals: /** diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp index daca55fc8..5d0006539 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.cpp @@ -1,7 +1,6 @@ #include "visual_deck_storage_model.h" #include "../../deck_loader/deck_loader.h" -#include "../cards/additional_info/deck_color_identity.h" #include #include @@ -120,6 +119,8 @@ DeckScanResult scanDeckDirectory(const QString &deckPath) } } // namespace +static QString computeColorIdentity(const LoadedDeck &deck); + VisualDeckStorageModel::VisualDeckStorageModel(QObject *parent) : QAbstractListModel(parent) { } @@ -305,7 +306,7 @@ void VisualDeckStorageModel::beginLoad(int row) } // Color identity walks every card through the database, so compute it here to // keep the completion handler on the UI thread cheap. - const QString colorIdentity = getDeckColorIdentity(deck->deckList, CardDatabaseManager::query()); + const QString colorIdentity = computeColorIdentity(*deck); return DeckLoadResult{std::move(*deck), QFileInfo(filePath).lastModified(), colorIdentity}; })); } @@ -366,6 +367,40 @@ void VisualDeckStorageModel::drainPendingLoads() } } +/** + * @brief Computes the color identity of a deck in WUBRG order. + */ +static QString computeColorIdentity(const LoadedDeck &deck) +{ + QStringList cardList = deck.deckList.getCardList({DECK_ZONE_MAIN, DECK_ZONE_SIDE}); + if (cardList.isEmpty()) { + return {}; + } + + QSet colorSet; // A set to collect unique color symbols (e.g., W, U, B, R, G) + + for (const QString &cardName : cardList) { + CardInfoPtr currentCard = CardDatabaseManager::query()->getCardInfo(cardName); + if (currentCard) { + const QString colors = currentCard->getColors(); // Something like "WUB" + for (const QChar &color : colors) { + colorSet.insert(color); + } + } + } + + // Ensure the color identity is in WUBRG order + QString colorIdentity; + const QString wubrgOrder = "WUBRG"; + for (const QChar &color : wubrgOrder) { + if (colorSet.contains(color)) { + colorIdentity.append(color); + } + } + + return colorIdentity; +} + /** * @brief Recomputes all derived metadata of a row from its loaded deck. */ @@ -379,7 +414,7 @@ void VisualDeckStorageModel::recomputeDeckMetadata(DeckPreviewData &data, bool r data.lastLoaded = QDateTime::fromString(deckList.getLastLoadedTimestamp()); data.bannerCard = deckList.getBannerCard(); if (recomputeColorIdentity) { - data.colorIdentity = getDeckColorIdentity(data.deck.deckList, CardDatabaseManager::query()); + data.colorIdentity = computeColorIdentity(data.deck); } } diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp index c19ac0fec..478431703 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp @@ -50,15 +50,6 @@ VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidg &SettingsCache::instance().visualDeckStorage(), &VisualDeckStorageSettings::setVisualDeckStorageShowTagsOnDeckPreviews); - // show upload time on DeckPreviewWidget checkbox - showUploadTimeCheckBox = new QCheckBox(this); - showUploadTimeCheckBox->setChecked( - SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowUploadTime()); - connect(showUploadTimeCheckBox, &QCheckBox::QT_STATE_CHANGED, this, - &VisualDeckStorageQuickSettingsWidget::showUploadTimeChanged); - connect(showUploadTimeCheckBox, &QCheckBox::QT_STATE_CHANGED, &SettingsCache::instance().visualDeckStorage(), - &VisualDeckStorageSettings::setVisualDeckStorageShowUploadTime); - // show banner card selector checkbox showBannerCardComboBoxCheckBox = new QCheckBox(this); showBannerCardComboBoxCheckBox->setChecked( @@ -103,7 +94,7 @@ VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidg unusedColorIdentityOpacityLayout->addWidget(unusedColorIdentitiesOpacitySpinBox); // tooltip selector - deckPreviewTooltipWidget = new QWidget(this); + auto deckPreviewTooltipWidget = new QWidget(this); deckPreviewTooltipLabel = new QLabel(deckPreviewTooltipWidget); deckPreviewTooltipComboBox = new QComboBox(deckPreviewTooltipWidget); @@ -137,7 +128,6 @@ VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidg this->addSettingsWidget(showTagFilterCheckBox); this->addSettingsWidget(showColorIdentityCheckBox); this->addSettingsWidget(showTagsOnDeckPreviewsCheckBox); - this->addSettingsWidget(showUploadTimeCheckBox); this->addSettingsWidget(showBannerCardComboBoxCheckBox); this->addSettingsWidget(drawUnusedColorIdentitiesCheckBox); this->addSettingsWidget(unusedColorIdentityOpacityWidget); @@ -155,7 +145,6 @@ void VisualDeckStorageQuickSettingsWidget::retranslateUi() showTagFilterCheckBox->setText(tr("Show Tag Filter")); showColorIdentityCheckBox->setText(tr("Show Color Identity")); showTagsOnDeckPreviewsCheckBox->setText(tr("Show Tags On Deck Previews")); - showUploadTimeCheckBox->setText(tr("Show Upload Time")); showBannerCardComboBoxCheckBox->setText(tr("Show Banner Card Selection Option")); drawUnusedColorIdentitiesCheckBox->setText(tr("Draw unused Color Identities")); unusedColorIdentitiesOpacityLabel->setText(tr("Unused Color Identities Opacity")); @@ -166,14 +155,6 @@ void VisualDeckStorageQuickSettingsWidget::retranslateUi() deckPreviewTooltipComboBox->setItemText(1, tr("Filepath")); } -void VisualDeckStorageQuickSettingsWidget::setPublicDecksMode(bool enabled) -{ - const bool hidden = enabled; - showFoldersCheckBox->setVisible(!hidden); - showBannerCardComboBoxCheckBox->setVisible(!hidden); - deckPreviewTooltipWidget->setVisible(!hidden); -} - bool VisualDeckStorageQuickSettingsWidget::getShowFolders() const { return showFoldersCheckBox->isChecked(); @@ -204,11 +185,6 @@ bool VisualDeckStorageQuickSettingsWidget::getShowTagsOnDeckPreviews() const return showTagsOnDeckPreviewsCheckBox->isChecked(); } -bool VisualDeckStorageQuickSettingsWidget::getShowUploadTime() const -{ - return showUploadTimeCheckBox->isChecked(); -} - int VisualDeckStorageQuickSettingsWidget::getUnusedColorIdentitiesOpacity() const { return unusedColorIdentitiesOpacitySpinBox->value(); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h index fc250cb20..ea4330a15 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.h @@ -27,12 +27,10 @@ class VisualDeckStorageQuickSettingsWidget : public SettingsButtonWidget QCheckBox *showBannerCardComboBoxCheckBox; QCheckBox *showTagFilterCheckBox; QCheckBox *showTagsOnDeckPreviewsCheckBox; - QCheckBox *showUploadTimeCheckBox; QLabel *unusedColorIdentitiesOpacityLabel; QSpinBox *unusedColorIdentitiesOpacitySpinBox; QLabel *deckPreviewTooltipLabel; QComboBox *deckPreviewTooltipComboBox; - QWidget *deckPreviewTooltipWidget; CardSizeWidget *cardSizeWidget; public: @@ -48,15 +46,6 @@ public: explicit VisualDeckStorageQuickSettingsWidget(QWidget *parent = nullptr); - /** - * @brief Hides the controls that do not apply to the public decks tab. - * - * The public decks tab reuses this widget for its quick settings menu but - * has no folders, banner selection or per-deck tooltip, so those controls - * are hidden while every shared key keeps syncing with SettingsCache. - */ - void setPublicDecksMode(bool enabled); - void retranslateUi(); [[nodiscard]] bool getShowFolders() const; @@ -65,7 +54,6 @@ public: [[nodiscard]] bool getShowBannerCardComboBox() const; [[nodiscard]] bool getShowTagFilter() const; [[nodiscard]] bool getShowTagsOnDeckPreviews() const; - [[nodiscard]] bool getShowUploadTime() const; [[nodiscard]] int getUnusedColorIdentitiesOpacity() const; [[nodiscard]] TooltipType getDeckPreviewTooltip() const; [[nodiscard]] int getCardSize() const; @@ -77,7 +65,6 @@ signals: void showBannerCardComboBoxChanged(bool enabled); void showTagFilterChanged(bool enabled); void showTagsOnDeckPreviewsChanged(bool enabled); - void showUploadTimeChanged(bool enabled); void unusedColorIdentitiesOpacityChanged(int opacity); void deckPreviewTooltipChanged(TooltipType tooltip); void cardSizeChanged(int scale); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp index 406527893..baa5e5792 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp @@ -25,7 +25,7 @@ VisualDeckStorageSearchWidget::VisualDeckStorageSearchWidget(QWidget *parent) : searchBar->setClearButtonEnabled(true); searchBar->addAction(loadColorAdjustedPixmap("theme:icons/search"), QLineEdit::LeadingPosition); - auto help = searchBar->addAction(themePixmap(QStringLiteral("icons/info")), QLineEdit::TrailingPosition); + auto help = searchBar->addAction(QPixmap("theme:icons/info"), QLineEdit::TrailingPosition); connect(help, &QAction::triggered, this, [this] { createDeckSearchSyntaxHelpWindow(searchBar); }); layout->addWidget(searchBar); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp index 0ad6ebcb2..c05da1cb3 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp @@ -1,12 +1,9 @@ #include "visual_deck_storage_sort_filter_proxy_model.h" -#include "../../../client/settings/cache_settings.h" #include "../../filters/deck_filter_string.h" #include #include -#include -#include VisualDeckStorageSortFilterProxyModel::VisualDeckStorageSortFilterProxyModel(QObject *parent) : QSortFilterProxyModel(parent) @@ -14,34 +11,6 @@ VisualDeckStorageSortFilterProxyModel::VisualDeckStorageSortFilterProxyModel(QOb setDynamicSortFilter(false); } -bool colorIdentityMatches(VisualDeckStorageSortFilterProxyModel::FilterMode mode, - const QSet &colors, - const QString &identity) -{ - switch (mode) { - case VisualDeckStorageSortFilterProxyModel::ExactMatch: { - QSet activeColorSet; - for (const QChar &color : colors) { - activeColorSet.insert(color.toUpper()); - } - - QSet colorIdentitySet; - for (const QChar &color : identity) { - colorIdentitySet.insert(color.toUpper()); - } - - return activeColorSet == colorIdentitySet; - } - case VisualDeckStorageSortFilterProxyModel::Includes: - return std::all_of(colors.begin(), colors.end(), - [&identity](const QChar &color) { return identity.contains(color); }); - case VisualDeckStorageSortFilterProxyModel::Excludes: - return std::none_of(colors.begin(), colors.end(), - [&identity](const QChar &color) { return identity.contains(color); }); - } - return false; -} - void VisualDeckStorageSortFilterProxyModel::setSourceModel(QAbstractItemModel *model) { if (QAbstractItemModel *oldModel = sourceModel()) { @@ -218,10 +187,7 @@ void VisualDeckStorageSortFilterProxyModel::updateSearchMatches() return; } - const auto &cardsDisplay = SettingsCache::instance().cardsDisplay(); - DeckFilterString filterString( - searchText, CardSearchLanguage{cardsDisplay.getCardLang(), - static_cast(cardsDisplay.getCardSearchLanguage())}); + DeckFilterString filterString(searchText); for (int row = 0; row < count; ++row) { const DeckPreviewData &data = source->dataForRow(row); @@ -289,7 +255,34 @@ void VisualDeckStorageSortFilterProxyModel::updateColorMatches() for (int row = 0; row < count; ++row) { const QString colorIdentity = source->dataForRow(row).colorIdentity; - colorMatches[row] = colorIdentityMatches(colorFilterMode, activeColors, colorIdentity); + + bool matches = true; + switch (colorFilterMode) { + case ExactMatch: { + QSet activeColorSet; + for (const QChar &color : activeColors) { + activeColorSet.insert(color.toUpper()); + } + + QSet colorIdentitySet; + for (const QChar &color : colorIdentity) { + colorIdentitySet.insert(color.toUpper()); + } + + matches = activeColorSet == colorIdentitySet; + break; + } + case Includes: + matches = std::all_of(activeColors.begin(), activeColors.end(), + [&colorIdentity](const QChar &color) { return colorIdentity.contains(color); }); + break; + case Excludes: + matches = std::none_of(activeColors.begin(), activeColors.end(), + [&colorIdentity](const QChar &color) { return colorIdentity.contains(color); }); + break; + } + + colorMatches[row] = matches; } } diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h index a6c40a2d7..7e771f6a9 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.h @@ -102,14 +102,4 @@ private: QList colorMatches; ///< Per-row color identity match. }; -/** - * @brief Whether an identity string matches the active color-identity filter. - * - * The single source of truth for the color identity matching rule, shared by - * the Visual Deck Storage proxy and the remote public decks model. - */ -[[nodiscard]] bool colorIdentityMatches(VisualDeckStorageSortFilterProxyModel::FilterMode mode, - const QSet &colors, - const QString &identity); - #endif // VISUAL_DECK_STORAGE_SORT_FILTER_PROXY_MODEL_H diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp index 6f954b01b..ba52cf8e9 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.cpp @@ -2,10 +2,14 @@ #include "../general/layout_containers/flow_widget.h" #include "deck_preview/deck_preview_tag_display_widget.h" +#include "visual_deck_storage_model.h" +#include "visual_deck_storage_sort_filter_proxy_model.h" +#include "visual_deck_storage_widget.h" #include -VisualDeckStorageTagFilterWidget::VisualDeckStorageTagFilterWidget(QWidget *parent) : QWidget(parent) +VisualDeckStorageTagFilterWidget::VisualDeckStorageTagFilterWidget(VisualDeckStorageWidget *_parent) + : QWidget(_parent), parent(_parent) { setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum); @@ -21,72 +25,99 @@ VisualDeckStorageTagFilterWidget::VisualDeckStorageTagFilterWidget(QWidget *pare layout->addWidget(flowWidget); } -void VisualDeckStorageTagFilterWidget::setAllTagsProvider(const std::function()> &provider) -{ - allTagsProvider = provider; -} - void VisualDeckStorageTagFilterWidget::showEvent(QShowEvent *event) { QWidget::showEvent(event); refreshTags(); } +/** + * @brief The tags of all decks currently accepted by the proxy model. + */ +QSet VisualDeckStorageTagFilterWidget::gatherAllTags() const +{ + QSet allTags; + auto *proxy = parent->proxyModel(); + + for (int proxyRow = 0; proxyRow < proxy->rowCount(); ++proxyRow) { + const QModelIndex index = proxy->index(proxyRow, 0); + if (!index.data(VisualDeckStorageRoles::FilterMatchRole).toBool()) { + continue; + } + const QStringList deckTags = index.data(VisualDeckStorageRoles::TagsRole).toStringList(); + for (const QString &tag : deckTags) { + allTags.insert(tag); + } + } + + return allTags; +} + void VisualDeckStorageTagFilterWidget::refreshTags() { - const QSet allTags = allTagsProvider ? allTagsProvider() : QSet(); + QSet allTags = gatherAllTags(); + removeTagsNotInList(allTags); + addTagsIfNotPresent(allTags); + sortTags(); +} - // Existing chips survive if their tag is still part of the deck set, or if the chip - // is currently selected/excluded. Everything else is dropped. Dropped chips must NOT - // be re-added to the layout afterwards: they are reparented to nullptr and scheduled - // for a deferred delete (QWidget::setParent(nullptr) also hides them), and the flow - // layout would keep a dangling reference to them once the deletion runs on the next - // event-loop cycle. - QList chips; +void VisualDeckStorageTagFilterWidget::removeTagsNotInList(const QSet &tags) +{ for (DeckPreviewTagDisplayWidget *tagWidget : findChildren()) { - if (tagWidget->getState() != TagState::NotSelected || allTags.contains(tagWidget->getTagName())) { - chips.append(tagWidget); - } else { + const QString &tagName = tagWidget->getTagName(); + + // Keep the tag widget if it is either selected or excluded + if (!tags.contains(tagName) && tagWidget->getState() == TagState::NotSelected) { flowWidget->removeWidget(tagWidget); - tagWidget->setParent(nullptr); tagWidget->deleteLater(); } } +} - // Add chips for tags that are not shown yet. - QSet existingTags; - for (DeckPreviewTagDisplayWidget *tagWidget : chips) { - existingTags.insert(tagWidget->getTagName()); +void VisualDeckStorageTagFilterWidget::addTagsIfNotPresent(const QSet &tags) +{ + for (const QString &tag : tags) { + addTagIfNotPresent(tag); } - for (const QString &tag : allTags) { - if (!existingTags.contains(tag)) { - auto *newTagWidget = new DeckPreviewTagDisplayWidget(this, tag); - connect(newTagWidget, &DeckPreviewTagDisplayWidget::tagClicked, this, - &VisualDeckStorageTagFilterWidget::filterChanged); - flowWidget->addWidget(newTagWidget); - chips.append(newTagWidget); +} + +void VisualDeckStorageTagFilterWidget::addTagIfNotPresent(const QString &tag) +{ + // Check if the tag already exists in the flow widget + bool tagExists = false; + for (DeckPreviewTagDisplayWidget *tagWidget : findChildren()) { + if (tagWidget->getTagName() == tag) { + tagExists = true; + break; } } - // Sort, but skip the full remove/re-add when the order already matches the layout. - // FlowWidget inherits QLayout::removeWidget's linear scan, so rebuilding an unchanged - // order would be quadratic plus a full relayout on every chip click and load batch. - std::sort(chips.begin(), chips.end(), [](DeckPreviewTagDisplayWidget *a, DeckPreviewTagDisplayWidget *b) { - const QString aName = a->getTagName(); - const QString bName = b->getTagName(); - const int compared = aName.compare(bName, Qt::CaseInsensitive); - return compared != 0 ? compared < 0 : aName < bName; - }); - if (chips == currentChipOrder) { - return; + // If the tag doesn't exist, add a new DeckPreviewTagDisplayWidget + if (!tagExists) { + auto *newTagWidget = new DeckPreviewTagDisplayWidget(this, tag); + connect(newTagWidget, &DeckPreviewTagDisplayWidget::tagClicked, parent, + &VisualDeckStorageWidget::updateTagFilter); + flowWidget->addWidget(newTagWidget); } - for (DeckPreviewTagDisplayWidget *tagWidget : chips) { +} + +void VisualDeckStorageTagFilterWidget::sortTags() +{ + // Get all tag widgets + QList tagWidgets = findChildren(); + + // Sort widgets by tag name + std::sort(tagWidgets.begin(), tagWidgets.end(), [](DeckPreviewTagDisplayWidget *a, DeckPreviewTagDisplayWidget *b) { + return a->getTagName().toLower() < b->getTagName().toLower(); + }); + + // Clear and re-add widgets in sorted order + for (DeckPreviewTagDisplayWidget *tagWidget : tagWidgets) { flowWidget->removeWidget(tagWidget); } - for (DeckPreviewTagDisplayWidget *tagWidget : chips) { + for (DeckPreviewTagDisplayWidget *tagWidget : tagWidgets) { flowWidget->addWidget(tagWidget); } - currentChipOrder = chips; } QStringList VisualDeckStorageTagFilterWidget::selectedTags() const diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h index 5e3cb398c..337c053c7 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_tag_filter_widget.h @@ -9,28 +9,26 @@ #include #include #include -#include -class DeckPreviewTagDisplayWidget; class FlowWidget; - +class VisualDeckStorageWidget; class VisualDeckStorageTagFilterWidget : public QWidget { Q_OBJECT + VisualDeckStorageWidget *parent; FlowWidget *flowWidget; - std::function()> allTagsProvider; - QList currentChipOrder; + + [[nodiscard]] QSet gatherAllTags() const; + void removeTagsNotInList(const QSet &tags); + void addTagsIfNotPresent(const QSet &tags); + void addTagIfNotPresent(const QString &tag); + void sortTags(); public: - explicit VisualDeckStorageTagFilterWidget(QWidget *parent = nullptr); + explicit VisualDeckStorageTagFilterWidget(VisualDeckStorageWidget *_parent); [[nodiscard]] QStringList getAllKnownTags() const; - /** - * @brief Sets a provider for the full set of tags to draw chips from. - */ - void setAllTagsProvider(const std::function()> &provider); - /** * @brief The tags currently in "selected" state. */ @@ -41,18 +39,9 @@ public: */ [[nodiscard]] QStringList excludedTags() const; -signals: - /** - * Emitted when a chip's selection or exclusion state changes. - * - * The chip only emits when its state actually changed, so this fires once per - * effective toggle rather than on every click. - */ - void filterChanged(); - public slots: /** - * @brief Rebuilds the tag chips from the currently available tags. + * @brief Rebuilds the tag chips from the tags of the currently visible decks. */ void refreshTags(); void showEvent(QShowEvent *event) override; diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index c7218f195..acb0dcab2 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp @@ -1,7 +1,6 @@ #include "visual_deck_storage_widget.h" #include "../../../client/settings/cache_settings.h" -#include "../../pixel_map_generator.h" #include "../quick_settings/settings_button_widget.h" #include "deck_preview/deck_preview_color_identity_filter_widget.h" #include "deck_preview/deck_preview_widget.h" @@ -15,7 +14,6 @@ #include #include #include -#include #include #include @@ -45,16 +43,10 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare searchWidget = new VisualDeckStorageSearchWidget(this); refreshButton = new QToolButton(this); - refreshButton->setIcon(themePixmap(QStringLiteral("icons/reload"))); + refreshButton->setIcon(QPixmap("theme:icons/reload")); refreshButton->setFixedSize(32, 32); connect(refreshButton, &QPushButton::clicked, this, &VisualDeckStorageWidget::refreshIfPossible); - shareButton = new QToolButton(this); - shareButton->setIcon(themePixmap(QStringLiteral("icons/share"))); - shareButton->setFixedSize(32, 32); - shareButton->setVisible(false); - connect(shareButton, &QPushButton::clicked, this, &VisualDeckStorageWidget::shareRequested); - quickSettingsWidget = new VisualDeckStorageQuickSettingsWidget(this); connect(quickSettingsWidget, &VisualDeckStorageQuickSettingsWidget::showFoldersChanged, this, &VisualDeckStorageWidget::updateShowFolders); @@ -65,14 +57,10 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare searchAndSortLayout->addWidget(sortWidget); searchAndSortLayout->addWidget(searchWidget); searchAndSortLayout->addWidget(refreshButton); - searchAndSortLayout->addWidget(shareButton); searchAndSortLayout->addWidget(quickSettingsWidget); // tag filter box tagFilterWidget = new VisualDeckStorageTagFilterWidget(this); - tagFilterWidget->setAllTagsProvider([this] { return gatherVisibleTags(); }); - connect(tagFilterWidget, &VisualDeckStorageTagFilterWidget::filterChanged, this, - &VisualDeckStorageWidget::updateTagFilter); updateTagsVisibility(SettingsCache::instance().visualDeckStorage().getVisualDeckStorageShowTagFilter()); deckPreviewSelectionAnimationEnabled = @@ -119,13 +107,6 @@ VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(pare connect(searchWidget, &VisualDeckStorageSearchWidget::searchTextChanged, this, &VisualDeckStorageWidget::updateSearchFilter); - // The deck content search matches card names in the configured card language; - // re-run it whenever that setting changes so active searches follow immediately. - CardsDisplaySettings *cardsDisplay = &SettingsCache::instance().cardsDisplay(); - const auto reapplySearchForLanguage = [this] { storageProxyModel->reapplyFilters(); }; - connect(cardsDisplay, &CardsDisplaySettings::cardLangChanged, this, reapplySearchForLanguage); - connect(cardsDisplay, &CardsDisplaySettings::cardSearchLanguageChanged, this, reapplySearchForLanguage); - connect(CardDatabaseManager::getInstance(), &CardDatabase::cardDatabaseLoadingFinished, this, &VisualDeckStorageWidget::createRootFolderWidget); @@ -173,71 +154,11 @@ void VisualDeckStorageWidget::retranslateUi() databaseLoadIndicator->setText(tr("Loading database ...")); refreshButton->setToolTip(tr("Refresh loaded files")); - shareButton->setToolTip(tr("Select decks to share")); quickSettingsWidget->setToolTip(tr("Visual Deck Storage Settings")); sortWidget->retranslateUi(); } -void VisualDeckStorageWidget::setShareSelectable(bool selectable) -{ - if (shareSelectable == selectable) { - return; - } - shareSelectable = selectable; - if (folderWidget != nullptr) { - folderWidget->setShareSelectable(selectable); - } - emit shareSelectionChanged(); -} - -bool VisualDeckStorageWidget::isShareSelectable() const -{ - return shareSelectable; -} - -QStringList VisualDeckStorageWidget::selectedFilePaths() const -{ - QStringList selectedPaths; - if (folderWidget != nullptr) { - const auto previews = folderWidget->findChildren(); - for (DeckPreviewWidget *preview : previews) { - // Filtered-out previews stay alive hidden in their sorted place, so only decks the - // user can actually see are part of the share. - if (preview->isVisible() && preview->isShareSelected()) { - selectedPaths.append(preview->filePath); - } - } - } - return selectedPaths; -} - -void VisualDeckStorageWidget::clearShareSelection() -{ - if (folderWidget != nullptr) { - const auto previews = folderWidget->findChildren(); - for (DeckPreviewWidget *preview : previews) { - preview->setShareSelected(false); - } - } -} - -void VisualDeckStorageWidget::setShareAvailable(bool available) -{ - shareButton->setVisible(available); - shareButton->setEnabled(available); -} - -void VisualDeckStorageWidget::setShareSelectedFiles(const QStringList &paths) -{ - if (folderWidget != nullptr) { - const auto previews = folderWidget->findChildren(); - for (DeckPreviewWidget *preview : previews) { - preview->setShareSelected(paths.contains(preview->filePath)); - } - } -} - /** * Gets a const pointer to the quick settings so that the values can be accessed. */ @@ -295,25 +216,6 @@ void VisualDeckStorageWidget::updateTagFilter() tagFilterWidget->refreshTags(); } -/** - * @brief The tags of all decks currently accepted by the proxy model. - */ -QSet VisualDeckStorageWidget::gatherVisibleTags() const -{ - QSet allTags; - for (int proxyRow = 0; proxyRow < storageProxyModel->rowCount(); ++proxyRow) { - const QModelIndex index = storageProxyModel->index(proxyRow, 0); - if (!index.data(VisualDeckStorageRoles::FilterMatchRole).toBool()) { - continue; - } - const QStringList deckTags = index.data(VisualDeckStorageRoles::TagsRole).toStringList(); - for (const QString &tag : deckTags) { - allTags.insert(tag); - } - } - return allTags; -} - /** * Pushes the color identity filter widget's state into the proxy model. */ diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h index dfb715bea..fe6389414 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h @@ -33,12 +33,6 @@ public: explicit VisualDeckStorageWidget(QWidget *parent); void refreshIfPossible(); void retranslateUi(); - void setShareSelectable(bool selectable); - [[nodiscard]] bool isShareSelectable() const; - [[nodiscard]] QStringList selectedFilePaths() const; - void setShareSelectedFiles(const QStringList &paths); - void clearShareSelection(); - void setShareAvailable(bool available); VisualDeckStorageTagFilterWidget *tagFilterWidget; bool deckPreviewSelectionAnimationEnabled; @@ -69,9 +63,6 @@ public slots: signals: void deckLoadRequested(const QString &filePath); void openDeckEditor(const LoadedDeck &deck); - void shareDeckRequested(const QString &filePath); - void shareSelectionChanged(); - void shareRequested(); protected: void resizeEvent(QResizeEvent *event) override; @@ -79,7 +70,6 @@ protected: private: void reapplySortAndFilters(); - [[nodiscard]] QSet gatherVisibleTags() const; private: QVBoxLayout *layout; @@ -90,14 +80,12 @@ private: VisualDeckStorageSearchWidget *searchWidget; DeckPreviewColorIdentityFilterWidget *deckPreviewColorIdentityFilterWidget; QToolButton *refreshButton; - QToolButton *shareButton; VisualDeckStorageQuickSettingsWidget *quickSettingsWidget; QScrollArea *scrollArea; VisualDeckStorageFolderDisplayWidget *folderWidget = nullptr; VisualDeckStorageModel *storageModel = nullptr; VisualDeckStorageSortFilterProxyModel *storageProxyModel = nullptr; QTimer *refreshTimer = nullptr; ///< Coalesces the re-apply/refresh burst following a batch of deck loads. - bool shareSelectable = false; }; #endif // VISUAL_DECK_STORAGE_WIDGET_H diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index 595d38d5b..4567991c8 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -33,7 +33,6 @@ #include "../interface/widgets/dialogs/dlg_update.h" #include "../interface/widgets/dialogs/dlg_view_log.h" #include "../interface/widgets/onboarding/first_run_wizard.h" -#include "../interface/widgets/settings_page/general_settings_page.h" #include "../interface/widgets/tabs/tab_game.h" #include "../interface/widgets/tabs/tab_server.h" #include "../interface/widgets/tabs/tab_supervisor.h" @@ -45,7 +44,6 @@ #include "intents/intent_open_server_room_by_name.h" #include "intents/url_parser.h" #include "logger.h" -#include "pixel_map_generator.h" #include "version_string.h" #include "widgets/dialogs/dlg_connect.h" #include "widgets/server/handle_public_servers.h" @@ -93,8 +91,8 @@ #include #define GITHUB_PAGES_URL "https://cockatrice.github.io" -#define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors" -#define GITHUB_CONTRIBUTE_URL "https://github.com/Cockatrice/Cockatrice#" +#define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors?type=c" +#define GITHUB_CONTRIBUTE_URL "https://github.com/Cockatrice/Cockatrice#cockatrice" #define GITHUB_TRANSIFEX_TRANSLATORS_URL "https://github.com/Cockatrice/Cockatrice/wiki/Translator-Hall-of-Fame" #define GITHUB_TRANSLATOR_FAQ_URL "https://github.com/Cockatrice/Cockatrice/wiki/Translation-FAQ" #define GITHUB_ISSUES_URL "https://github.com/Cockatrice/Cockatrice/issues" @@ -247,8 +245,6 @@ void MainWindow::actFullScreen(bool checked) void MainWindow::actSettings() { DlgSettings dlg(this); - auto *generalPage = qobject_cast(dlg.page(DlgSettings::GeneralPage)); - connect(generalPage, &GeneralSettingsPage::cardDatabaseUpdateRequested, this, &MainWindow::actCheckCardUpdates); dlg.exec(); } @@ -275,8 +271,7 @@ void MainWindow::actAbout() GITHUB_TROUBLESHOOTING_URL + "'>" + tr("Troubleshooting") + "
" + "" + tr("F.A.Q.") + "
"), QMessageBox::Ok, this); - mb.setIconPixmap( - themePixmap(QStringLiteral("cockatrice")).scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation)); + mb.setIconPixmap(QPixmap("theme:cockatrice").scaled(64, 64, Qt::KeepAspectRatio, Qt::SmoothTransformation)); mb.setTextInteractionFlags(Qt::TextBrowserInteraction); mb.exec(); } @@ -328,7 +323,7 @@ void MainWindow::retranslateUi() aRegister->setText(tr("&Register to server...")); aForgotPassword->setText(tr("&Restore password...")); aSettings->setText(tr("&Settings...")); - aSettings->setIcon(themePixmap(QStringLiteral("icons/settings"))); + aSettings->setIcon(QPixmap("theme:icons/settings")); aExit->setText(tr("&Exit")); #if defined(__APPLE__) /* For OSX */ @@ -512,7 +507,6 @@ MainWindow::MainWindow(QWidget *parent) connectionController = new ConnectionController(this, this); urlParser = new IntentUrlParser(this, this); - connect(urlParser, &IntentUrlParser::urlChainFinished, this, &MainWindow::onUrlChainFinished); createActions(); createMenus(); @@ -688,7 +682,6 @@ void MainWindow::runFirstRunWizard() connect(wizard, &FirstRunWizard::cardDatabaseUpdateRequested, this, &MainWindow::actCheckCardUpdatesBackground); connect(wizard, &FirstRunWizard::manualCardDatabaseSetupRequested, this, &MainWindow::actCheckCardUpdates); connect(this, &MainWindow::cardDatabaseUpdateFinished, wizard, &FirstRunWizard::onCardDatabaseUpdateFinished); - connect(this, &MainWindow::cardDatabaseUpdateProgress, wizard, &FirstRunWizard::onCardDatabaseUpdateProgress); connect(wizard, &FirstRunWizard::registerRequested, connectionController, &ConnectionController::registerToServer); connect(wizard, &FirstRunWizard::connectRequested, connectionController, &ConnectionController::connectToServer); @@ -708,12 +701,6 @@ void MainWindow::applyStartupDestination() return; } - // A cockatrice:// link owns the startup connection while its chain runs; - // connecting here would race (and tear down) the link's own connection. - if (skipStartupAutoConnect) { - return; - } - const int destination = SettingsCache::instance().tabs().getStartupTabIndex(); if (destination != StartupTab::StartupTabServer && destination != StartupTab::StartupTabServerRoom) { return; @@ -735,7 +722,6 @@ void MainWindow::applyStartupDestination() connect(credentials, &Intent::finished, connector, &Intent::execute); connect(credentials, &Intent::failed, this, &MainWindow::startupDestinationFailed); - connect(credentials, &Intent::cancelled, this, [this]() { startupDestinationFailed(tr("Sign-in cancelled")); }); connect(connector, &Intent::finished, this, [this, destination, serverContext]() { onStartupDestinationConnected(destination, *serverContext); }); connect(connector, &Intent::failed, this, &MainWindow::startupDestinationFailed); @@ -830,7 +816,7 @@ void MainWindow::createTrayIcon() trayIcon = new QSystemTrayIcon(this); trayIcon->setContextMenu(trayIconMenu); - trayIcon->setIcon(themePixmap(QStringLiteral("cockatrice"))); + trayIcon->setIcon(QPixmap("theme:cockatrice")); trayIcon->show(); } @@ -857,17 +843,6 @@ void MainWindow::closeEvent(QCloseEvent *event) } bClosingDown = true; - if (cardUpdateProcess && cardUpdateProcess->state() != QProcess::NotRunning) { - if (QMessageBox::question(this, tr("Are you sure?"), - tr("A card database update is still running. Quitting now will cancel it.\n" - "Are you sure you want to quit?"), - QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::No) { - event->ignore(); - bClosingDown = false; - return; - } - } - if (!tabSupervisor->close()) { event->ignore(); bClosingDown = false; @@ -887,7 +862,18 @@ void MainWindow::changeEvent(QEvent *event) } else if (event->type() == QEvent::ActivationChange) { if (isActiveWindow() && !bHasActivated) { bHasActivated = true; - attemptStartupAutoConnect(); + if (!connectTo.isEmpty()) { + qCInfo(WindowMainStartupAutoconnectLog) << "Command line connect to " << connectTo; + connectionController->connectToServerDirect(connectTo.host(), connectTo.port(), connectTo.userName(), + connectTo.password()); + } else if (SettingsCache::instance().servers().getAutoConnect() && + !SettingsCache::instance().debug().getLocalGameOnStartup() && + !startupDestinationConnectsToServer()) { + qCInfo(WindowMainStartupAutoconnectLog) << "Attempting auto-connect..."; + DlgConnect dlg(this); + connectionController->connectToServerDirect(dlg.getHost(), static_cast(dlg.getPort()), + dlg.getPlayerName(), dlg.getPassword()); + } } } @@ -913,59 +899,6 @@ void MainWindow::handleCockatriceLink(const QString &url) urlParser->handle(url); } -void MainWindow::attemptStartupAutoConnect() -{ - if (startupAutoConnectAttempted || skipStartupAutoConnect) { - return; - } - startupAutoConnectAttempted = true; - - if (!connectTo.isEmpty()) { - qCInfo(WindowMainStartupAutoconnectLog) << "Command line connect to " << connectTo; - connectionController->connectToServerDirect(connectTo.host(), connectTo.port(), connectTo.userName(), - connectTo.password()); - } else if (SettingsCache::instance().servers().getAutoConnect() && - !SettingsCache::instance().debug().getLocalGameOnStartup() && !startupDestinationConnectsToServer()) { - qCInfo(WindowMainStartupAutoconnectLog) << "Attempting auto-connect..."; - DlgConnect dlg(this); - connectionController->connectToServerDirect(dlg.getHost(), static_cast(dlg.getPort()), - dlg.getPlayerName(), dlg.getPassword()); - } -} - -void MainWindow::onUrlChainFinished(bool connected) -{ - // A cockatrice:// link owns the startup connection while it runs. When its - // chain ended without connecting (declined, invalid, offline), fall back to - // the startup connection so the activation launch still behaves like a - // normal launch. - if (connected) { - // The launch link connected, so the startup fallback has served its - // purpose: drop the skip so a later mid-session link that ends declined - // or offline cannot silently fire auto-connect or applyStartupDestination - // again. - skipStartupAutoConnect = false; - return; - } - - if (!skipStartupAutoConnect || getRemoteClient()->getStatus() != StatusDisconnected) { - return; - } - - if (startupDestinationConnectsToServer()) { - // Users whose startup tab is a Server / Server Room connect through the - // startup destination, not through auto-connect; retry that instead. - qCInfo(WindowMainStartupAutoconnectLog) << "URL chain ended without a connection; retrying startup destination"; - skipStartupAutoConnect = false; - applyStartupDestination(); - return; - } - - qCInfo(WindowMainStartupAutoconnectLog) << "URL chain ended without a connection; retrying startup connect"; - skipStartupAutoConnect = false; - attemptStartupAutoConnect(); -} - void MainWindow::cardDatabaseLoadingFailed() { if (askedForDbUpdater) { @@ -1103,7 +1036,7 @@ void MainWindow::createCardUpdateProcess(bool background) if (dir.exists(binaryName)) { updaterCmd = dir.absoluteFilePath(binaryName); - } else { // try and find the directory Oracle is stored in the build directory + } else { // try and find the directory oracle is stored in the build directory QDir findLocalDir(dir); findLocalDir.cdUp(); findLocalDir.cd(getCardUpdaterBinaryName()); @@ -1124,45 +1057,11 @@ void MainWindow::createCardUpdateProcess(bool background) if (!background) { cardUpdateProcess->start(updaterCmd, QStringList()); } else { - cardUpdateOutputBuffer.clear(); - connect(cardUpdateProcess, &QProcess::readyReadStandardOutput, this, &MainWindow::cardUpdateProgressOutput); cardUpdateProcess->start(updaterCmd, QStringList("-b")); statusBar()->showMessage(tr("Card database update running.")); } } -void MainWindow::cardUpdateProgressOutput() -{ - if (!cardUpdateProcess) { - return; - } - cardUpdateOutputBuffer.append(cardUpdateProcess->readAllStandardOutput()); - while (true) { - const int newline = cardUpdateOutputBuffer.indexOf('\n'); - if (newline < 0) { - break; - } - const QByteArray line = cardUpdateOutputBuffer.left(newline).trimmed(); - cardUpdateOutputBuffer.remove(0, newline + 1); - // Protocol emitted by `oracle -b`: "PROGRESS " - if (!line.startsWith("PROGRESS ")) { - continue; - } - const QList parts = line.split(' '); - if (parts.size() != 4) { - continue; - } - bool doneOk = false; - bool totalOk = false; - const qint64 done = parts.at(2).toLongLong(&doneOk); - const qint64 total = parts.at(3).toLongLong(&totalOk); - if (!doneOk || !totalOk || done < 0 || total < 0) { - continue; - } - emit cardDatabaseUpdateProgress(QString::fromLatin1(parts.at(1)), done, total); - } -} - void MainWindow::exitCardDatabaseUpdate() { if (!cardUpdateProcess) { @@ -1210,8 +1109,6 @@ void MainWindow::cardUpdateError(QProcess::ProcessError err) void MainWindow::cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus) { - cardUpdateProgressOutput(); // drain any progress lines not yet parsed - const bool success = (exitStatus == QProcess::NormalExit) && (exitCode == 0); if (exitStatus == QProcess::NormalExit) { SettingsCache::instance().updates().setLastCardUpdateCheck(QDateTime::currentDateTime().date()); diff --git a/cockatrice/src/interface/window_main.h b/cockatrice/src/interface/window_main.h index 9e45a4c3e..920145552 100644 --- a/cockatrice/src/interface/window_main.h +++ b/cockatrice/src/interface/window_main.h @@ -68,11 +68,6 @@ signals: /** @brief Emitted after the background card-database update subprocess exits. */ void cardDatabaseUpdateFinished(bool success); - /** @brief Emitted while the background card-database update subprocess runs. - * @p stage is one of "download", "scan" or "import"; @p done/@p total - * are byte counts for the first two stages and set indices for "import". */ - void cardDatabaseUpdateProgress(const QString &stage, qint64 done, qint64 total); - public slots: void actCheckCardUpdates(); void actCheckCardUpdatesBackground(); @@ -80,7 +75,6 @@ public slots: void actCheckClientUpdates(); void actConnect(); void actExit(); - void handleCockatriceLink(const QString &url); private slots: void updateTabMenu(const QList &newMenuList); void statusChanged(ClientStatus _status); @@ -98,11 +92,10 @@ private slots: void actOpenSettingsFolder(); void actShow(); void showWindowIfHidden(); - void onUrlChainFinished(bool connected); + void handleCockatriceLink(const QString &url); void cardUpdateError(QProcess::ProcessError err); void cardUpdateFinished(int exitCode, QProcess::ExitStatus exitStatus); - void cardUpdateProgressOutput(); void refreshShortcuts(); void cardDatabaseLoadingFailed(); void cardDatabaseNewSetsFound(int numUnknownSets, QStringList unknownSetsNames); @@ -127,8 +120,6 @@ private slots: void startupDestinationFailed(const QString &reason); [[nodiscard]] bool startupDestinationConnectsToServer() const; - void attemptStartupAutoConnect(); - private: static const QString appName; static const QStringList fileNameFilters; @@ -167,10 +158,7 @@ private: LagMonitor lagMonitor; ///< watches the main thread for event loop stalls LatencyStatusWidget *latencyStatus = nullptr; ///< status bar widget with live round-trip stats and history graph bool bHasActivated, askedForDbUpdater; - bool skipStartupAutoConnect = false; - bool startupAutoConnectAttempted = false; QProcess *cardUpdateProcess; - QByteArray cardUpdateOutputBuffer; DlgViewLog *logviewDialog; GameReplay *replay; DlgTipOfTheDay *tip; @@ -182,16 +170,6 @@ public: { connectTo = QUrl(QString("cockatrice://%1").arg(url)); } - // When set, the window's own startup connection (--connect or auto-connect - // on first activation) is skipped. Used for activation launches: the intent - // chain triggered by a cockatrice:// URL owns the connection, and letting - // auto-connect race against it caused two connectToServer calls to tear - // each other down. onUrlChainFinished() clears this and retries the startup - // connection when the link's chain ended without connecting. - void setSkipStartupAutoConnect(bool skip) - { - skipStartupAutoConnect = skip; - } ~MainWindow() override; RemoteClient *getRemoteClient() const diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index b9c30d1ad..84d5d175f 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -26,6 +26,7 @@ #include "client/url_scheme_event_filter.h" #include "database/interface/settings_card_preference_provider.h" #include "interface/intents/intent_open_local_deck.h" +#include "interface/intents/url_parser.h" #include "interface/logger.h" #include "interface/pixel_map_generator.h" #include "interface/theme_manager.h" @@ -44,8 +45,6 @@ #include #include #include -#include -#include #include #include #include @@ -54,7 +53,6 @@ #include #include #include -#include QTranslator *translator, *qtTranslator; RNG_Abstract *rng; @@ -178,18 +176,6 @@ QString const generateClientID() return strClientID; } -static QString redactActivationUrl(const QString &url) -{ - // Activation URLs carry secrets in their query string (e.g. the deck share - // token); log only the scheme and the action (cockatrice://opendeck), never - // the parameters. - if (!url.startsWith(QStringLiteral("cockatrice://"))) { - return url; - } - const QUrl parsed(url); - return parsed.scheme() + "://" + parsed.host(); -} - int main(int argc, char *argv[]) { #ifdef Q_OS_WIN @@ -244,7 +230,7 @@ int main(int argc, char *argv[]) // These values are only used by the settings loader/saver // Wrong or outdated values are kept to not break things QCoreApplication::setOrganizationName("Cockatrice"); - QCoreApplication::setOrganizationDomain("cockatrice.github.io"); + QCoreApplication::setOrganizationDomain("cockatrice.de"); QCoreApplication::setApplicationName("Cockatrice"); QCoreApplication::setApplicationVersion(VERSION_STRING); @@ -263,7 +249,7 @@ int main(int argc, char *argv[]) // Command-line parser QCommandLineParser parser; - parser.setApplicationDescription("Cockatrice Client"); + parser.setApplicationDescription("Cockatrice"); parser.addHelpOption(); parser.addVersionOption(); @@ -286,17 +272,10 @@ int main(int argc, char *argv[]) SingleInstanceManager instance; if (hasActivationFiles) { - QStringList redactedFiles; - redactedFiles.reserve(startupFiles.size()); - for (const QString &file : startupFiles) { - redactedFiles.append(redactActivationUrl(file)); - } - qCInfo(MainLog) << "Activation launch, files:" << redactedFiles; // Activation launch: hand off to the primary instance if one is // running, otherwise become the primary ourselves. Do this before // constructing the main window so a hand-off exits cheaply. if (!instance.tryRun(startupFiles)) { - qInfo() << "Handed off to a running instance, exiting"; // Sent successfully → exit return 0; } @@ -313,7 +292,7 @@ int main(int argc, char *argv[]) } } - rng = new RNG_SFMT(CryptoUtil::randomUInt64()); + rng = new RNG_SFMT; themeManager = new ThemeManager; soundEngine = new SoundEngine; @@ -345,30 +324,10 @@ int main(int argc, char *argv[]) MainWindow ui; - // A URL launch must own the connection: the intent chain triggered by the - // URL connects to the server named in the URL, so the window's own startup - // auto-connect must not race against it (two connectToServer calls tear - // each other down via doDisconnectFromServer). - bool hasUrlActivation = std::any_of(startupFiles.begin(), startupFiles.end(), [](const QString &file) { - return file.startsWith(QStringLiteral("cockatrice://")); - }); -#ifdef Q_OS_MAC - // On macOS the launch can arrive through the URL scheme instead of as a - // positional argument (captured in pendingMacUrls); count those too or the - // window would auto-connect into the link's own connection attempt. - hasUrlActivation = hasUrlActivation || - std::any_of(pendingMacUrls.cbegin(), pendingMacUrls.cend(), - [](const QString &url) { return url.startsWith(QStringLiteral("cockatrice://")); }); -#endif - ui.setSkipStartupAutoConnect(hasUrlActivation); - auto handleActivation = [&ui](const QString &file) { if (file.startsWith("cockatrice://")) { - qCInfo(MainLog) << "Handling URL activation:" << redactActivationUrl(file); - // Route through the window's persistent url parser: it serializes - // link chains so activations handed over while another chain is - // still connecting do not connect concurrently. - ui.handleCockatriceLink(file); + auto urlParser = new IntentUrlParser(&ui, &ui); + urlParser->handle(file); } else if (QFileInfo(file).exists()) { auto openDeckIntent = new IntentOpenLocalDeck(ui.getTabSupervisor(), file); QObject::connect(openDeckIntent, &Intent::failed, &ui, [&ui](const QString &reason) { @@ -389,9 +348,9 @@ int main(int argc, char *argv[]) } qCInfo(MainLog) << "MainWindow constructor finished"; - ui.setWindowIcon(themePixmap(QStringLiteral("cockatrice"))); - // Set name of the app desktop file; used by wayland to load the window icon - QGuiApplication::setDesktopFileName("Cockatrice"); + ui.setWindowIcon(QPixmap("theme:cockatrice")); + // set name of the app desktop file; used by wayland to load the window icon + QGuiApplication::setDesktopFileName("cockatrice"); SettingsCache::instance().network().setClientID(generateClientID()); diff --git a/cockatrice/src/single_instance_manager.cpp b/cockatrice/src/single_instance_manager.cpp index eff0e6586..aca23160c 100644 --- a/cockatrice/src/single_instance_manager.cpp +++ b/cockatrice/src/single_instance_manager.cpp @@ -2,14 +2,6 @@ #include -namespace -{ -// Sent by the primary instance after it has read a forwarded payload. Without -// an acknowledgment, a second instance cannot tell a live primary apart from a -// stale socket left behind by a process that is still shutting down. -const QByteArray ACK_MESSAGE = QByteArrayLiteral("COCKATRICE_ACK"); -} // namespace - SingleInstanceManager::SingleInstanceManager(QObject *parent) : QObject(parent) { } @@ -28,15 +20,9 @@ bool SingleInstanceManager::tryRun(const QStringList &filesToSend) } serverName = QStringLiteral("CockatriceSingleInstance-%1").arg(userName); - // Hand off to an already-running primary instance if one exists. Never steal - // the socket of a busy primary: it is alive and will act on the payload. - switch (forwardToPrimary(filesToSend)) { - case ForwardResult::Delivered: - return false; - case ForwardResult::PrimaryBusy: - return false; - case ForwardResult::NoPrimary: - break; + // Hand off to an already-running primary instance if one exists. + if (forwardToPrimary(filesToSend)) { + return false; } // No primary instance is currently reachable, so become the primary. @@ -49,18 +35,12 @@ bool SingleInstanceManager::tryRun(const QStringList &filesToSend) // Another instance may have started while we were probing; hand off to it // instead of stealing its socket. - switch (forwardToPrimary(filesToSend)) { - case ForwardResult::Delivered: - return false; - case ForwardResult::PrimaryBusy: - return false; - case ForwardResult::NoPrimary: - break; + if (forwardToPrimary(filesToSend)) { + return false; } - // The socket is stale (left over by a crashed instance), so no primary is - // holding it: remove it and retry. If that still fails, another instance - // just took the name. + // The socket is stale (left over by a crashed instance): remove it and + // retry. If that still fails, another instance just took the name. QLocalServer::removeServer(serverName); if (server->listen(serverName)) { return true; @@ -70,12 +50,12 @@ bool SingleInstanceManager::tryRun(const QStringList &filesToSend) return false; } -SingleInstanceManager::ForwardResult SingleInstanceManager::forwardToPrimary(const QStringList &filesToSend) +bool SingleInstanceManager::forwardToPrimary(const QStringList &filesToSend) { QLocalSocket socket; socket.connectToServer(serverName); if (!socket.waitForConnected(200)) { - return ForwardResult::NoPrimary; + return false; } // Serialize payload with length prefix @@ -92,23 +72,7 @@ SingleInstanceManager::ForwardResult SingleInstanceManager::forwardToPrimary(con socket.flush(); socket.waitForBytesWritten(1000); - // A plain launch has nothing for the primary to act on, so there is nothing - // to acknowledge. Waiting here would block the new instance for seconds if - // the primary is busy in a modal dialog, so only the activation path (which - // needs the ACK to avoid stealing a live primary's socket) waits below. - if (filesToSend.isEmpty()) { - return ForwardResult::Delivered; - } - - // Only report a successful hand-off once the primary has acknowledged that - // it actually read the payload. A socket that connects but is still working - // on an earlier payload is alive but busy, not dead: give it more room - // before giving up, so a slow handler does not make a live primary look - // dead (which would lead to stealing its socket). - if (!socket.waitForReadyRead(1000) && !socket.waitForReadyRead(4000)) { - return ForwardResult::PrimaryBusy; - } - return socket.readAll() == ACK_MESSAGE ? ForwardResult::Delivered : ForwardResult::PrimaryBusy; + return true; } void SingleInstanceManager::handleNewConnection() @@ -147,23 +111,12 @@ void SingleInstanceManager::handleNewConnection() QStringList files; payloadStream >> files; - // Acknowledge receipt as soon as the payload is parsed, before the - // primary starts handling it. The handlers run synchronously and can - // take longer than the sender's readiness timeout (e.g. a modal - // confirmation box), which would otherwise make a live primary look - // dead and cause duplicate handling. - socket->write(ACK_MESSAGE); - socket->flush(); + emit filesReceived(files); - // Drop the payload from the buffer before handling it: the handlers - // run synchronously and can spin a nested event loop (e.g. a modal - // dialog) that re-reads this socket, which would re-parse and re-emit - // the same files. + // Reset buffer (single message use-case) buffer->clear(); *expectedSize = 0; - emit filesReceived(files); - socket->disconnectFromServer(); return; } diff --git a/cockatrice/src/single_instance_manager.h b/cockatrice/src/single_instance_manager.h index d3884a60f..55bff0e80 100644 --- a/cockatrice/src/single_instance_manager.h +++ b/cockatrice/src/single_instance_manager.h @@ -23,14 +23,7 @@ private slots: void handleNewConnection(); private: - enum class ForwardResult - { - Delivered, // a live primary acknowledged the payload - NoPrimary, // no connectable primary socket exists - PrimaryBusy // a primary exists but did not acknowledge in time - }; - - ForwardResult forwardToPrimary(const QStringList &filesToSend); + bool forwardToPrimary(const QStringList &filesToSend); QString serverName; QLocalServer *server = nullptr; diff --git a/cockatrice/themes/CMakeLists.txt b/cockatrice/themes/CMakeLists.txt index 70344d95a..577977551 100644 --- a/cockatrice/themes/CMakeLists.txt +++ b/cockatrice/themes/CMakeLists.txt @@ -2,7 +2,7 @@ # # add themes subfolders -set(defthemes Fabric Fusion Leather Plasma VelvetMarble System) +set(defthemes Default Fabric Fusion Leather Plasma VelvetMarble) if(UNIX) if(APPLE) diff --git a/cockatrice/themes/System/palette-default-dark.toml b/cockatrice/themes/Default/palette-default-dark.toml similarity index 96% rename from cockatrice/themes/System/palette-default-dark.toml rename to cockatrice/themes/Default/palette-default-dark.toml index e101935b4..3ee174a2f 100644 --- a/cockatrice/themes/System/palette-default-dark.toml +++ b/cockatrice/themes/Default/palette-default-dark.toml @@ -61,7 +61,3 @@ ToolTipBase = #ffffffdc ToolTipText = #ff000000 PlaceholderText = #6effffff - -[AppColors] -AccentStrong = #ff148c3c -AccentSoft = #ff78c850 diff --git a/cockatrice/themes/System/theme.cfg b/cockatrice/themes/Default/theme.cfg similarity index 73% rename from cockatrice/themes/System/theme.cfg rename to cockatrice/themes/Default/theme.cfg index 4b756a5e8..d2016a238 100644 --- a/cockatrice/themes/System/theme.cfg +++ b/cockatrice/themes/Default/theme.cfg @@ -2,4 +2,4 @@ ColorScheme = Light [Style] -Name = System +Name = Default diff --git a/cockatrice/themes/Fabric/backgrounds/home-dark.png b/cockatrice/themes/Fabric/backgrounds/home-dark.png deleted file mode 100644 index 8d9514626..000000000 Binary files a/cockatrice/themes/Fabric/backgrounds/home-dark.png and /dev/null differ diff --git a/cockatrice/themes/Fabric/backgrounds/home-light.png b/cockatrice/themes/Fabric/backgrounds/home-light.png deleted file mode 100644 index 78f51a686..000000000 Binary files a/cockatrice/themes/Fabric/backgrounds/home-light.png and /dev/null differ diff --git a/cockatrice/themes/Fabric/palette-default-dark.toml b/cockatrice/themes/Fabric/palette-default-dark.toml deleted file mode 100644 index cad18921a..000000000 --- a/cockatrice/themes/Fabric/palette-default-dark.toml +++ /dev/null @@ -1,74 +0,0 @@ -# Fabric — dark identity palette (navy-cloth chrome) -[Palette] -WindowText = #e8ecf2 -Button = #2b374a -Light = #3a4759 -Midlight = #333f50 -Dark = #141a23 -Mid = #252c38 -Text = #e8ecf2 -BrightText = #8ec2ff -ButtonText = #f2f4f8 -Base = #222c3d -Window = #18202e -Shadow = #0b0f15 -Highlight = #4a82e6 -HighlightedText = #ffffff -Link = #7fb0f2 -LinkVisited = #a98ad9 -AlternateBase = #1d2636 -ToolTipBase = #2b3546 -ToolTipText = #f2f4f8 -PlaceholderText = #6ee8ecf2 -Accent = #4a82e6 - -[Palette.Disabled] -WindowText = #9d9d9d -Button = #18202e -Light = #3a4759 -Midlight = #333f50 -Dark = #141a23 -Mid = #252c38 -Text = #9d9d9d -BrightText = #8ec2ff -ButtonText = #787878 -Base = #18202e -Window = #18202e -Shadow = #0b0f15 -Highlight = #222d40 -HighlightedText = #9d9d9d -Link = #308cc6 -LinkVisited = #b450ff -AlternateBase = #1d2636 -ToolTipBase = #2b3546 -ToolTipText = #f2f4f8 -PlaceholderText = #6ee8ecf2 -Accent = #9d9d9d - -[Palette.Inactive] -WindowText = #e8ecf2 -Button = #2b374a -Light = #3a4759 -Midlight = #333f50 -Dark = #141a23 -Mid = #252c38 -Text = #e8ecf2 -BrightText = #8ec2ff -ButtonText = #f2f4f8 -Base = #222c3d -Window = #18202e -Shadow = #0b0f15 -Highlight = #222d40 -HighlightedText = #ffffff -Link = #7fb0f2 -LinkVisited = #a98ad9 -AlternateBase = #1d2636 -ToolTipBase = #2b3546 -ToolTipText = #f2f4f8 -PlaceholderText = #6ee8ecf2 -Accent = #4a82e6 - -[AppColors] -AccentStrong = #3a6fd6 -AccentSoft = #8fb8f2 - diff --git a/cockatrice/themes/Fabric/palette-default-light.toml b/cockatrice/themes/Fabric/palette-default-light.toml deleted file mode 100644 index f5151af3e..000000000 --- a/cockatrice/themes/Fabric/palette-default-light.toml +++ /dev/null @@ -1,74 +0,0 @@ -# Fabric — light identity palette (navy-cloth chrome) -[Palette] -WindowText = #1c2330 -Button = #c8d6ea -Light = #ffffff -Midlight = #b9c6dc -Dark = #8fa0bd -Mid = #a3b3cd -Text = #1c2330 -BrightText = #1d4fa0 -ButtonText = #141c29 -Base = #f6f8fc -Window = #dbe3ef -Shadow = #5a6a85 -Highlight = #2f6fd6 -HighlightedText = #ffffff -Link = #2555b0 -LinkVisited = #6a4bb8 -AlternateBase = #e9eef7 -ToolTipBase = #e9eff8 -ToolTipText = #141c29 -PlaceholderText = #7a1c2330 -Accent = #2f6fd6 - -[Palette.Disabled] -WindowText = #787878 -Button = #dbe3ef -Light = #ffffff -Midlight = #b9c6dc -Dark = #8fa0bd -Mid = #a3b3cd -Text = #787878 -BrightText = #1d4fa0 -ButtonText = #969696 -Base = #dbe3ef -Window = #dbe3ef -Shadow = #5a6a85 -Highlight = #cdd8e9 -HighlightedText = #787878 -Link = #0000ff -LinkVisited = #ff00ff -AlternateBase = #e9eef7 -ToolTipBase = #e9eff8 -ToolTipText = #141c29 -PlaceholderText = #7a1c2330 -Accent = #787878 - -[Palette.Inactive] -WindowText = #1c2330 -Button = #c8d6ea -Light = #ffffff -Midlight = #b9c6dc -Dark = #8fa0bd -Mid = #a3b3cd -Text = #1c2330 -BrightText = #1d4fa0 -ButtonText = #141c29 -Base = #f6f8fc -Window = #dbe3ef -Shadow = #5a6a85 -Highlight = #cdd8e9 -HighlightedText = #000000 -Link = #2555b0 -LinkVisited = #6a4bb8 -AlternateBase = #e9eef7 -ToolTipBase = #e9eff8 -ToolTipText = #141c29 -PlaceholderText = #7a1c2330 -Accent = #2f6fd6 - -[AppColors] -AccentStrong = #3a6fd6 -AccentSoft = #8fb8f2 - diff --git a/cockatrice/themes/Fabric/theme.cfg b/cockatrice/themes/Fabric/theme.cfg deleted file mode 100644 index 55b916e71..000000000 --- a/cockatrice/themes/Fabric/theme.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[Appearance] -ColorScheme = System - -[Style] -Name = Fusion \ No newline at end of file diff --git a/cockatrice/themes/Fabric/zones/handzone-light.png b/cockatrice/themes/Fabric/zones/handzone-light.png deleted file mode 100644 index a87f9e292..000000000 Binary files a/cockatrice/themes/Fabric/zones/handzone-light.png and /dev/null differ diff --git a/cockatrice/themes/Fabric/zones/handzone.png b/cockatrice/themes/Fabric/zones/handzone.png index a5b72286c..25d22b070 100644 Binary files a/cockatrice/themes/Fabric/zones/handzone.png and b/cockatrice/themes/Fabric/zones/handzone.png differ diff --git a/cockatrice/themes/Fabric/zones/playerzone-light.png b/cockatrice/themes/Fabric/zones/playerzone-light.png deleted file mode 100644 index 05da3ea9b..000000000 Binary files a/cockatrice/themes/Fabric/zones/playerzone-light.png and /dev/null differ diff --git a/cockatrice/themes/Fabric/zones/playerzone.png b/cockatrice/themes/Fabric/zones/playerzone.png index 7fa977249..728fccdfa 100644 Binary files a/cockatrice/themes/Fabric/zones/playerzone.png and b/cockatrice/themes/Fabric/zones/playerzone.png differ diff --git a/cockatrice/themes/Fabric/zones/stackzone-light.png b/cockatrice/themes/Fabric/zones/stackzone-light.png deleted file mode 100644 index dcd6dc045..000000000 Binary files a/cockatrice/themes/Fabric/zones/stackzone-light.png and /dev/null differ diff --git a/cockatrice/themes/Fabric/zones/stackzone.png b/cockatrice/themes/Fabric/zones/stackzone.png index 9046aa049..89e2080f8 100644 Binary files a/cockatrice/themes/Fabric/zones/stackzone.png and b/cockatrice/themes/Fabric/zones/stackzone.png differ diff --git a/cockatrice/themes/Fabric/zones/tablezone-light.png b/cockatrice/themes/Fabric/zones/tablezone-light.png deleted file mode 100644 index cb297e7e1..000000000 Binary files a/cockatrice/themes/Fabric/zones/tablezone-light.png and /dev/null differ diff --git a/cockatrice/themes/Fabric/zones/tablezone.png b/cockatrice/themes/Fabric/zones/tablezone.png index 8048a4cc1..6a2ce68e1 100644 Binary files a/cockatrice/themes/Fabric/zones/tablezone.png and b/cockatrice/themes/Fabric/zones/tablezone.png differ diff --git a/cockatrice/themes/Fusion/palette-default-dark.toml b/cockatrice/themes/Fusion/palette-default-dark.toml index b180e9b63..c1d83a4cd 100644 --- a/cockatrice/themes/Fusion/palette-default-dark.toml +++ b/cockatrice/themes/Fusion/palette-default-dark.toml @@ -11,15 +11,15 @@ ButtonText = #ffffffff Base = #ff2d2d2d Window = #ff1e1e1e Shadow = #ff000000 -Highlight = #ff139740 +Highlight = #ff148c3c HighlightedText = #ffffffff -Link = #ffc9fd62 -LinkVisited = #ff9ad43e +Link = #ff00f652 +LinkVisited = #ff00d346 AlternateBase = #ff353535 ToolTipBase = #ff3c3c3c ToolTipText = #ffd4d4d4 PlaceholderText = #80ffffff -Accent = #ffc9fd62 +Accent = #ff00d346 [Palette.Disabled] WindowText = #ff9d9d9d @@ -34,7 +34,7 @@ ButtonText = #ff9d9d9d Base = #ff1e1e1e Window = #ff1e1e1e Shadow = #ff000000 -Highlight = #ff139740 +Highlight = #ff148c3c HighlightedText = #ffffffff Link = #ff308cc6 LinkVisited = #ffff00ff @@ -59,15 +59,11 @@ Window = #ff1e1e1e Shadow = #ff000000 Highlight = #ff1e1e1e HighlightedText = #ffffffff -Link = #ffc9fd62 -LinkVisited = #ff9ad43e +Link = #ff00f652 +LinkVisited = #ff00d346 AlternateBase = #ff353535 ToolTipBase = #ff3c3c3c ToolTipText = #ffd4d4d4 PlaceholderText = #80ffffff Accent = #ff1e1e1e - -[AppColors] -AccentStrong = #ff139740 -AccentSoft = #ffc9fd62 diff --git a/cockatrice/themes/Fusion/palette-default-light.toml b/cockatrice/themes/Fusion/palette-default-light.toml index 5a1163a2b..86c41be78 100644 --- a/cockatrice/themes/Fusion/palette-default-light.toml +++ b/cockatrice/themes/Fusion/palette-default-light.toml @@ -11,15 +11,15 @@ ButtonText = #ff000000 Base = #ffffffff Window = #fff0f0f0 Shadow = #ff696969 -Highlight = #ff139740 +Highlight = #ff148c3c HighlightedText = #ffffffff -Link = #ff0e6b31 -LinkVisited = #ff0a521f +Link = #ff0d5f28 +LinkVisited = #ff08401b AlternateBase = #ffe9e7e3 ToolTipBase = #ffffffdc ToolTipText = #ff000000 PlaceholderText = #80000000 -Accent = #ff139740 +Accent = #ff107532 [Palette.Disabled] WindowText = #ff787878 @@ -34,7 +34,7 @@ ButtonText = #ff787878 Base = #fff0f0f0 Window = #fff0f0f0 Shadow = #ff000000 -Highlight = #ff139740 +Highlight = #ff148c3c HighlightedText = #ffffffff Link = #ff0000ff LinkVisited = #ffff00ff @@ -59,15 +59,11 @@ Window = #fff0f0f0 Shadow = #ff696969 Highlight = #fff0f0f0 HighlightedText = #ff000000 -Link = #ff0e6b31 -LinkVisited = #ff0a521f +Link = #ff0d5f28 +LinkVisited = #ff08401b AlternateBase = #ffe9e7e3 ToolTipBase = #ffffffdc ToolTipText = #ff000000 PlaceholderText = #80000000 Accent = #fff0f0f0 - -[AppColors] -AccentStrong = #ff139740 -AccentSoft = #ffc9fd62 diff --git a/cockatrice/themes/Leather/backgrounds/home-dark.png b/cockatrice/themes/Leather/backgrounds/home-dark.png deleted file mode 100644 index 20d16a27f..000000000 Binary files a/cockatrice/themes/Leather/backgrounds/home-dark.png and /dev/null differ diff --git a/cockatrice/themes/Leather/backgrounds/home-light.png b/cockatrice/themes/Leather/backgrounds/home-light.png deleted file mode 100644 index ee1da361d..000000000 Binary files a/cockatrice/themes/Leather/backgrounds/home-light.png and /dev/null differ diff --git a/cockatrice/themes/Leather/palette-default-dark.toml b/cockatrice/themes/Leather/palette-default-dark.toml deleted file mode 100644 index b0db0e90a..000000000 --- a/cockatrice/themes/Leather/palette-default-dark.toml +++ /dev/null @@ -1,74 +0,0 @@ -# Leather — dark identity palette (black-brown chrome with brass accents) -[Palette] -WindowText = #eee9e2 -Button = #332d26 -Light = #4a4239 -Midlight = #3d3730 -Dark = #131009 -Mid = #26221c -Text = #eee9e2 -BrightText = #e3c27e -ButtonText = #f5f1ea -Base = #26221d -Window = #1d1a16 -Shadow = #0d0b07 -Highlight = #4a5f8f -HighlightedText = #ffffff -Link = #cfa263 -LinkVisited = #9a7db8 -AlternateBase = #211d19 -ToolTipBase = #37302a -ToolTipText = #f5f1ea -PlaceholderText = #6eeee9e2 -Accent = #c9995a - -[Palette.Disabled] -WindowText = #9d9d9d -Button = #1d1a16 -Light = #4a4239 -Midlight = #3d3730 -Dark = #131009 -Mid = #26221c -Text = #9d9d9d -BrightText = #e3c27e -ButtonText = #787878 -Base = #1d1a16 -Window = #1d1a16 -Shadow = #0d0b07 -Highlight = #2d2822 -HighlightedText = #9d9d9d -Link = #308cc6 -LinkVisited = #b450ff -AlternateBase = #211d19 -ToolTipBase = #37302a -ToolTipText = #f5f1ea -PlaceholderText = #6eeee9e2 -Accent = #9d9d9d - -[Palette.Inactive] -WindowText = #eee9e2 -Button = #332d26 -Light = #4a4239 -Midlight = #3d3730 -Dark = #131009 -Mid = #26221c -Text = #eee9e2 -BrightText = #e3c27e -ButtonText = #f5f1ea -Base = #26221d -Window = #1d1a16 -Shadow = #0d0b07 -Highlight = #2d2822 -HighlightedText = #ffffff -Link = #cfa263 -LinkVisited = #9a7db8 -AlternateBase = #211d19 -ToolTipBase = #37302a -ToolTipText = #f5f1ea -PlaceholderText = #6eeee9e2 -Accent = #c9995a - -[AppColors] -AccentStrong = #b7823b -AccentSoft = #e4c58f - diff --git a/cockatrice/themes/Leather/palette-default-light.toml b/cockatrice/themes/Leather/palette-default-light.toml deleted file mode 100644 index ff122db76..000000000 --- a/cockatrice/themes/Leather/palette-default-light.toml +++ /dev/null @@ -1,74 +0,0 @@ -# Leather — light identity palette (black-brown chrome with brass accents) -[Palette] -WindowText = #2a2114 -Button = #dfcbb0 -Light = #ffffff -Midlight = #c6b08c -Dark = #a18a64 -Mid = #b29a74 -Text = #2a2114 -BrightText = #7a531c -ButtonText = #1f1710 -Base = #fdf8ee -Window = #f0e2cb -Shadow = #5d4d33 -Highlight = #34508c -HighlightedText = #ffffff -Link = #8a5e1e -LinkVisited = #6b5190 -AlternateBase = #f5ebd7 -ToolTipBase = #fff7e8 -ToolTipText = #1f1710 -PlaceholderText = #7a2a2114 -Accent = #a5712f - -[Palette.Disabled] -WindowText = #787878 -Button = #f0e2cb -Light = #ffffff -Midlight = #c6b08c -Dark = #a18a64 -Mid = #b29a74 -Text = #787878 -BrightText = #7a531c -ButtonText = #969696 -Base = #f0e2cb -Window = #f0e2cb -Shadow = #5d4d33 -Highlight = #ecd9bb -HighlightedText = #787878 -Link = #0000ff -LinkVisited = #ff00ff -AlternateBase = #f5ebd7 -ToolTipBase = #fff7e8 -ToolTipText = #1f1710 -PlaceholderText = #7a2a2114 -Accent = #787878 - -[Palette.Inactive] -WindowText = #2a2114 -Button = #dfcbb0 -Light = #ffffff -Midlight = #c6b08c -Dark = #a18a64 -Mid = #b29a74 -Text = #2a2114 -BrightText = #7a531c -ButtonText = #1f1710 -Base = #fdf8ee -Window = #f0e2cb -Shadow = #5d4d33 -Highlight = #ecd9bb -HighlightedText = #000000 -Link = #8a5e1e -LinkVisited = #6b5190 -AlternateBase = #f5ebd7 -ToolTipBase = #fff7e8 -ToolTipText = #1f1710 -PlaceholderText = #7a2a2114 -Accent = #a5712f - -[AppColors] -AccentStrong = #b7823b -AccentSoft = #e4c58f - diff --git a/cockatrice/themes/Leather/theme.cfg b/cockatrice/themes/Leather/theme.cfg deleted file mode 100644 index 55b916e71..000000000 --- a/cockatrice/themes/Leather/theme.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[Appearance] -ColorScheme = System - -[Style] -Name = Fusion \ No newline at end of file diff --git a/cockatrice/themes/Leather/zones/handzone-light.png b/cockatrice/themes/Leather/zones/handzone-light.png deleted file mode 100644 index b2c9bba34..000000000 Binary files a/cockatrice/themes/Leather/zones/handzone-light.png and /dev/null differ diff --git a/cockatrice/themes/Leather/zones/handzone.png b/cockatrice/themes/Leather/zones/handzone.png index 5f803df74..aba879683 100644 Binary files a/cockatrice/themes/Leather/zones/handzone.png and b/cockatrice/themes/Leather/zones/handzone.png differ diff --git a/cockatrice/themes/Leather/zones/playerzone-light.png b/cockatrice/themes/Leather/zones/playerzone-light.png deleted file mode 100644 index a26f96a5e..000000000 Binary files a/cockatrice/themes/Leather/zones/playerzone-light.png and /dev/null differ diff --git a/cockatrice/themes/Leather/zones/playerzone.png b/cockatrice/themes/Leather/zones/playerzone.png index cccbb3fd3..4f42ee41d 100644 Binary files a/cockatrice/themes/Leather/zones/playerzone.png and b/cockatrice/themes/Leather/zones/playerzone.png differ diff --git a/cockatrice/themes/Leather/zones/stackzone-light.png b/cockatrice/themes/Leather/zones/stackzone-light.png deleted file mode 100644 index 117c738f7..000000000 Binary files a/cockatrice/themes/Leather/zones/stackzone-light.png and /dev/null differ diff --git a/cockatrice/themes/Leather/zones/stackzone.png b/cockatrice/themes/Leather/zones/stackzone.png index d9cff892b..c02e2284a 100644 Binary files a/cockatrice/themes/Leather/zones/stackzone.png and b/cockatrice/themes/Leather/zones/stackzone.png differ diff --git a/cockatrice/themes/Leather/zones/tablezone-light.png b/cockatrice/themes/Leather/zones/tablezone-light.png deleted file mode 100644 index 912cbfb94..000000000 Binary files a/cockatrice/themes/Leather/zones/tablezone-light.png and /dev/null differ diff --git a/cockatrice/themes/Leather/zones/tablezone.png b/cockatrice/themes/Leather/zones/tablezone.png index 8af4c853d..152f4f7e9 100644 Binary files a/cockatrice/themes/Leather/zones/tablezone.png and b/cockatrice/themes/Leather/zones/tablezone.png differ diff --git a/cockatrice/themes/Plasma/backgrounds/home-dark.png b/cockatrice/themes/Plasma/backgrounds/home-dark.png deleted file mode 100644 index ce1469e2b..000000000 Binary files a/cockatrice/themes/Plasma/backgrounds/home-dark.png and /dev/null differ diff --git a/cockatrice/themes/Plasma/backgrounds/home-light.png b/cockatrice/themes/Plasma/backgrounds/home-light.png deleted file mode 100644 index 2e9000bd6..000000000 Binary files a/cockatrice/themes/Plasma/backgrounds/home-light.png and /dev/null differ diff --git a/cockatrice/themes/Plasma/palette-default-dark.toml b/cockatrice/themes/Plasma/palette-default-dark.toml deleted file mode 100644 index 222456f4f..000000000 --- a/cockatrice/themes/Plasma/palette-default-dark.toml +++ /dev/null @@ -1,74 +0,0 @@ -# Plasma — dark identity palette (electric violet chrome with cyan sparks) -[Palette] -WindowText = #eeebff -Button = #2a2440 -Light = #453d63 -Midlight = #383252 -Dark = #0e0c16 -Mid = #211e31 -Text = #eeebff -BrightText = #7fd7ff -ButtonText = #f6f4ff -Base = #1e1a2e -Window = #151220 -Shadow = #08070e -Highlight = #6a4df0 -HighlightedText = #ffffff -Link = #37c7e8 -LinkVisited = #9b7aff -AlternateBase = #1a1726 -ToolTipBase = #2c2745 -ToolTipText = #f6f4ff -PlaceholderText = #6eeeebff -Accent = #6a4df0 - -[Palette.Disabled] -WindowText = #9d9d9d -Button = #151220 -Light = #453d63 -Midlight = #383252 -Dark = #0e0c16 -Mid = #211e31 -Text = #9d9d9d -BrightText = #7fd7ff -ButtonText = #787878 -Base = #151220 -Window = #151220 -Shadow = #08070e -Highlight = #211c32 -HighlightedText = #9d9d9d -Link = #308cc6 -LinkVisited = #b450ff -AlternateBase = #1a1726 -ToolTipBase = #2c2745 -ToolTipText = #f6f4ff -PlaceholderText = #6eeeebff -Accent = #9d9d9d - -[Palette.Inactive] -WindowText = #eeebff -Button = #2a2440 -Light = #453d63 -Midlight = #383252 -Dark = #0e0c16 -Mid = #211e31 -Text = #eeebff -BrightText = #7fd7ff -ButtonText = #f6f4ff -Base = #1e1a2e -Window = #151220 -Shadow = #08070e -Highlight = #211c32 -HighlightedText = #ffffff -Link = #37c7e8 -LinkVisited = #9b7aff -AlternateBase = #1a1726 -ToolTipBase = #2c2745 -ToolTipText = #f6f4ff -PlaceholderText = #6eeeebff -Accent = #6a4df0 - -[AppColors] -AccentStrong = #5b3ee0 -AccentSoft = #a28bf7 - diff --git a/cockatrice/themes/Plasma/palette-default-light.toml b/cockatrice/themes/Plasma/palette-default-light.toml deleted file mode 100644 index d54db31d2..000000000 --- a/cockatrice/themes/Plasma/palette-default-light.toml +++ /dev/null @@ -1,74 +0,0 @@ -# Plasma — light identity palette (electric violet chrome with cyan sparks) -[Palette] -WindowText = #1d1830 -Button = #cfc6f0 -Light = #ffffff -Midlight = #b7adde -Dark = #9589c8 -Mid = #a49ad2 -Text = #1d1830 -BrightText = #10406e -ButtonText = #120d26 -Base = #f9f7ff -Window = #e3dcf7 -Shadow = #554c85 -Highlight = #5a3ee2 -HighlightedText = #ffffff -Link = #0f8fb5 -LinkVisited = #6a45d6 -AlternateBase = #ece8fa -ToolTipBase = #f5f3ff -ToolTipText = #120d26 -PlaceholderText = #7a1d1830 -Accent = #5a3ee2 - -[Palette.Disabled] -WindowText = #787878 -Button = #e3dcf7 -Light = #ffffff -Midlight = #b7adde -Dark = #9589c8 -Mid = #a49ad2 -Text = #787878 -BrightText = #10406e -ButtonText = #969696 -Base = #e3dcf7 -Window = #e3dcf7 -Shadow = #554c85 -Highlight = #d6ccf3 -HighlightedText = #787878 -Link = #0000ff -LinkVisited = #ff00ff -AlternateBase = #ece8fa -ToolTipBase = #f5f3ff -ToolTipText = #120d26 -PlaceholderText = #7a1d1830 -Accent = #787878 - -[Palette.Inactive] -WindowText = #1d1830 -Button = #cfc6f0 -Light = #ffffff -Midlight = #b7adde -Dark = #9589c8 -Mid = #a49ad2 -Text = #1d1830 -BrightText = #10406e -ButtonText = #120d26 -Base = #f9f7ff -Window = #e3dcf7 -Shadow = #554c85 -Highlight = #d6ccf3 -HighlightedText = #000000 -Link = #0f8fb5 -LinkVisited = #6a45d6 -AlternateBase = #ece8fa -ToolTipBase = #f5f3ff -ToolTipText = #120d26 -PlaceholderText = #7a1d1830 -Accent = #5a3ee2 - -[AppColors] -AccentStrong = #5b3ee0 -AccentSoft = #a28bf7 - diff --git a/cockatrice/themes/Plasma/theme.cfg b/cockatrice/themes/Plasma/theme.cfg deleted file mode 100644 index 55b916e71..000000000 --- a/cockatrice/themes/Plasma/theme.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[Appearance] -ColorScheme = System - -[Style] -Name = Fusion \ No newline at end of file diff --git a/cockatrice/themes/Plasma/zones/handzone-light.png b/cockatrice/themes/Plasma/zones/handzone-light.png deleted file mode 100644 index 89fa7e6d4..000000000 Binary files a/cockatrice/themes/Plasma/zones/handzone-light.png and /dev/null differ diff --git a/cockatrice/themes/Plasma/zones/handzone.png b/cockatrice/themes/Plasma/zones/handzone.png index 82debb405..543571d8a 100644 Binary files a/cockatrice/themes/Plasma/zones/handzone.png and b/cockatrice/themes/Plasma/zones/handzone.png differ diff --git a/cockatrice/themes/Plasma/zones/playerzone-light.png b/cockatrice/themes/Plasma/zones/playerzone-light.png deleted file mode 100644 index 9034818f2..000000000 Binary files a/cockatrice/themes/Plasma/zones/playerzone-light.png and /dev/null differ diff --git a/cockatrice/themes/Plasma/zones/playerzone.png b/cockatrice/themes/Plasma/zones/playerzone.png index 4623524f6..eebcd1f84 100644 Binary files a/cockatrice/themes/Plasma/zones/playerzone.png and b/cockatrice/themes/Plasma/zones/playerzone.png differ diff --git a/cockatrice/themes/Plasma/zones/stackzone-light.png b/cockatrice/themes/Plasma/zones/stackzone-light.png deleted file mode 100644 index 2607b3389..000000000 Binary files a/cockatrice/themes/Plasma/zones/stackzone-light.png and /dev/null differ diff --git a/cockatrice/themes/Plasma/zones/stackzone.png b/cockatrice/themes/Plasma/zones/stackzone.png index 144d991f3..1845c7091 100644 Binary files a/cockatrice/themes/Plasma/zones/stackzone.png and b/cockatrice/themes/Plasma/zones/stackzone.png differ diff --git a/cockatrice/themes/Plasma/zones/tablezone-light.png b/cockatrice/themes/Plasma/zones/tablezone-light.png deleted file mode 100644 index dcf2ef95e..000000000 Binary files a/cockatrice/themes/Plasma/zones/tablezone-light.png and /dev/null differ diff --git a/cockatrice/themes/Plasma/zones/tablezone.png b/cockatrice/themes/Plasma/zones/tablezone.png index 4dc36ec2d..8f998d4bb 100644 Binary files a/cockatrice/themes/Plasma/zones/tablezone.png and b/cockatrice/themes/Plasma/zones/tablezone.png differ diff --git a/cockatrice/themes/System/palette-default-light.toml b/cockatrice/themes/System/palette-default-light.toml deleted file mode 100644 index 14c215cdf..000000000 --- a/cockatrice/themes/System/palette-default-light.toml +++ /dev/null @@ -1,67 +0,0 @@ -[Palette] -WindowText = #ff000000 -Button = #fff0f0f0 -Light = #ffffffff -Midlight = #ffe3e3e3 -Dark = #ffa0a0a0 -Mid = #ffa0a0a0 -Text = #ff000000 -BrightText = #ffffffff -ButtonText = #ff000000 -Base = #ffffffff -Window = #fff0f0f0 -Shadow = #ff696969 -HighlightedText = #ffffffff -Link = #ff0d5f28 -LinkVisited = #ff08401b -AlternateBase = #ffe9e7e3 -ToolTipBase = #ffffffdc -ToolTipText = #ff000000 -PlaceholderText = #80000000 - -[Palette.Disabled] -WindowText = #ff787878 -Button = #fff0f0f0 -Light = #ffffffff -Midlight = #fff7f7f7 -Dark = #ffa0a0a0 -Mid = #ffa0a0a0 -Text = #ff787878 -BrightText = #ffffffff -ButtonText = #ff787878 -Base = #fff0f0f0 -Window = #fff0f0f0 -Shadow = #ff000000 -HighlightedText = #ffffffff -Link = #ff0000ff -LinkVisited = #ffff00ff -AlternateBase = #fff7f7f7 -ToolTipBase = #ffffffdc -ToolTipText = #ff000000 -PlaceholderText = #80000000 - -[Palette.Inactive] -WindowText = #ff000000 -Button = #fff0f0f0 -Light = #ffffffff -Midlight = #ffe3e3e3 -Dark = #ffa0a0a0 -Mid = #ffa0a0a0 -Text = #ff000000 -BrightText = #ffffffff -ButtonText = #ff000000 -Base = #ffffffff -Window = #fff0f0f0 -Shadow = #ff696969 -HighlightedText = #ff000000 -Link = #ff0d5f28 -LinkVisited = #ff08401b -AlternateBase = #ffe9e7e3 -ToolTipBase = #ffffffdc -ToolTipText = #ff000000 -PlaceholderText = #80000000 - - -[AppColors] -AccentStrong = #ff148c3c -AccentSoft = #ff78c850 \ No newline at end of file diff --git a/cockatrice/themes/VelvetMarble/backgrounds/home-dark.png b/cockatrice/themes/VelvetMarble/backgrounds/home-dark.png deleted file mode 100644 index 34738090f..000000000 Binary files a/cockatrice/themes/VelvetMarble/backgrounds/home-dark.png and /dev/null differ diff --git a/cockatrice/themes/VelvetMarble/backgrounds/home-light.png b/cockatrice/themes/VelvetMarble/backgrounds/home-light.png deleted file mode 100644 index de783e086..000000000 Binary files a/cockatrice/themes/VelvetMarble/backgrounds/home-light.png and /dev/null differ diff --git a/cockatrice/themes/VelvetMarble/palette-default-dark.toml b/cockatrice/themes/VelvetMarble/palette-default-dark.toml deleted file mode 100644 index 496943931..000000000 --- a/cockatrice/themes/VelvetMarble/palette-default-dark.toml +++ /dev/null @@ -1,74 +0,0 @@ -# VelvetMarble — dark identity palette (charcoal-velvet chrome with slate marble) -[Palette] -WindowText = #e8eaee -Button = #262a31 -Light = #3a3f47 -Midlight = #31363d -Dark = #0e1013 -Mid = #1f2329 -Text = #e8eaee -BrightText = #c3d8f2 -ButtonText = #f2f3f6 -Base = #1b1e23 -Window = #131519 -Shadow = #08090b -Highlight = #8fa6c0 -HighlightedText = #101318 -Link = #a9c6e8 -LinkVisited = #b9a8d9 -AlternateBase = #171a1f -ToolTipBase = #2d323a -ToolTipText = #f2f3f6 -PlaceholderText = #6ee8eaee -Accent = #8fa6c0 - -[Palette.Disabled] -WindowText = #9d9d9d -Button = #131519 -Light = #3a3f47 -Midlight = #31363d -Dark = #0e1013 -Mid = #1f2329 -Text = #9d9d9d -BrightText = #c3d8f2 -ButtonText = #787878 -Base = #131519 -Window = #131519 -Shadow = #08090b -Highlight = #1f2229 -HighlightedText = #9d9d9d -Link = #308cc6 -LinkVisited = #b450ff -AlternateBase = #171a1f -ToolTipBase = #2d323a -ToolTipText = #f2f3f6 -PlaceholderText = #6ee8eaee -Accent = #9d9d9d - -[Palette.Inactive] -WindowText = #e8eaee -Button = #262a31 -Light = #3a3f47 -Midlight = #31363d -Dark = #0e1013 -Mid = #1f2329 -Text = #e8eaee -BrightText = #c3d8f2 -ButtonText = #f2f3f6 -Base = #1b1e23 -Window = #131519 -Shadow = #08090b -Highlight = #1f2229 -HighlightedText = #ffffff -Link = #a9c6e8 -LinkVisited = #b9a8d9 -AlternateBase = #171a1f -ToolTipBase = #2d323a -ToolTipText = #f2f3f6 -PlaceholderText = #6ee8eaee -Accent = #8fa6c0 - -[AppColors] -AccentStrong = #54687e -AccentSoft = #9db0c4 - diff --git a/cockatrice/themes/VelvetMarble/palette-default-light.toml b/cockatrice/themes/VelvetMarble/palette-default-light.toml deleted file mode 100644 index 5323fd320..000000000 --- a/cockatrice/themes/VelvetMarble/palette-default-light.toml +++ /dev/null @@ -1,74 +0,0 @@ -# VelvetMarble — light identity palette (charcoal-velvet chrome with slate marble) -[Palette] -WindowText = #1b1d21 -Button = #c7d1dd -Light = #ffffff -Midlight = #b3becb -Dark = #93a0b1 -Mid = #a1adbc -Text = #1b1d21 -BrightText = #26465f -ButtonText = #121418 -Base = #f7f9fb -Window = #d9e0ea -Shadow = #57626f -Highlight = #54687e -HighlightedText = #ffffff -Link = #2e4d6b -LinkVisited = #5d4a78 -AlternateBase = #e6ebf2 -ToolTipBase = #f2f4f6 -ToolTipText = #121418 -PlaceholderText = #7a1b1d21 -Accent = #54687e - -[Palette.Disabled] -WindowText = #787878 -Button = #d9e0ea -Light = #ffffff -Midlight = #b3becb -Dark = #93a0b1 -Mid = #a1adbc -Text = #787878 -BrightText = #26465f -ButtonText = #969696 -Base = #d9e0ea -Window = #d9e0ea -Shadow = #57626f -Highlight = #ccd5e3 -HighlightedText = #787878 -Link = #0000ff -LinkVisited = #ff00ff -AlternateBase = #e6ebf2 -ToolTipBase = #f2f4f6 -ToolTipText = #121418 -PlaceholderText = #7a1b1d21 -Accent = #787878 - -[Palette.Inactive] -WindowText = #1b1d21 -Button = #c7d1dd -Light = #ffffff -Midlight = #b3becb -Dark = #93a0b1 -Mid = #a1adbc -Text = #1b1d21 -BrightText = #26465f -ButtonText = #121418 -Base = #f7f9fb -Window = #d9e0ea -Shadow = #57626f -Highlight = #ccd5e3 -HighlightedText = #000000 -Link = #2e4d6b -LinkVisited = #5d4a78 -AlternateBase = #e6ebf2 -ToolTipBase = #f2f4f6 -ToolTipText = #121418 -PlaceholderText = #7a1b1d21 -Accent = #54687e - -[AppColors] -AccentStrong = #54687e -AccentSoft = #9db0c4 - diff --git a/cockatrice/themes/VelvetMarble/theme.cfg b/cockatrice/themes/VelvetMarble/theme.cfg deleted file mode 100644 index 55b916e71..000000000 --- a/cockatrice/themes/VelvetMarble/theme.cfg +++ /dev/null @@ -1,5 +0,0 @@ -[Appearance] -ColorScheme = System - -[Style] -Name = Fusion \ No newline at end of file diff --git a/cockatrice/themes/VelvetMarble/zones/handzone-light.png b/cockatrice/themes/VelvetMarble/zones/handzone-light.png deleted file mode 100644 index b21e78e61..000000000 Binary files a/cockatrice/themes/VelvetMarble/zones/handzone-light.png and /dev/null differ diff --git a/cockatrice/themes/VelvetMarble/zones/handzone.jpg b/cockatrice/themes/VelvetMarble/zones/handzone.jpg new file mode 100644 index 000000000..2ec9b37fe Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/handzone.jpg differ diff --git a/cockatrice/themes/VelvetMarble/zones/handzone.png b/cockatrice/themes/VelvetMarble/zones/handzone.png deleted file mode 100644 index 3e2b7ebea..000000000 Binary files a/cockatrice/themes/VelvetMarble/zones/handzone.png and /dev/null differ diff --git a/cockatrice/themes/VelvetMarble/zones/playerzone-light.png b/cockatrice/themes/VelvetMarble/zones/playerzone-light.png deleted file mode 100644 index 630aac6eb..000000000 Binary files a/cockatrice/themes/VelvetMarble/zones/playerzone-light.png and /dev/null differ diff --git a/cockatrice/themes/VelvetMarble/zones/playerzone.jpg b/cockatrice/themes/VelvetMarble/zones/playerzone.jpg new file mode 100644 index 000000000..dd13cab78 Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/playerzone.jpg differ diff --git a/cockatrice/themes/VelvetMarble/zones/playerzone.png b/cockatrice/themes/VelvetMarble/zones/playerzone.png deleted file mode 100644 index dcf21ba38..000000000 Binary files a/cockatrice/themes/VelvetMarble/zones/playerzone.png and /dev/null differ diff --git a/cockatrice/themes/VelvetMarble/zones/stackzone-light.png b/cockatrice/themes/VelvetMarble/zones/stackzone-light.png deleted file mode 100644 index 62027827c..000000000 Binary files a/cockatrice/themes/VelvetMarble/zones/stackzone-light.png and /dev/null differ diff --git a/cockatrice/themes/VelvetMarble/zones/stackzone.jpg b/cockatrice/themes/VelvetMarble/zones/stackzone.jpg new file mode 100644 index 000000000..b63aa0902 Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/stackzone.jpg differ diff --git a/cockatrice/themes/VelvetMarble/zones/stackzone.png b/cockatrice/themes/VelvetMarble/zones/stackzone.png deleted file mode 100644 index a47f7bf9d..000000000 Binary files a/cockatrice/themes/VelvetMarble/zones/stackzone.png and /dev/null differ diff --git a/cockatrice/themes/VelvetMarble/zones/tablezone-light.png b/cockatrice/themes/VelvetMarble/zones/tablezone-light.png deleted file mode 100644 index 5a9014f9d..000000000 Binary files a/cockatrice/themes/VelvetMarble/zones/tablezone-light.png and /dev/null differ diff --git a/cockatrice/themes/VelvetMarble/zones/tablezone.jpg b/cockatrice/themes/VelvetMarble/zones/tablezone.jpg new file mode 100644 index 000000000..9f511491a Binary files /dev/null and b/cockatrice/themes/VelvetMarble/zones/tablezone.jpg differ diff --git a/cockatrice/themes/VelvetMarble/zones/tablezone.png b/cockatrice/themes/VelvetMarble/zones/tablezone.png deleted file mode 100644 index 1523d0821..000000000 Binary files a/cockatrice/themes/VelvetMarble/zones/tablezone.png and /dev/null differ diff --git a/doc/carddatabase_v4/cards.xsd b/doc/carddatabase_v4/cards.xsd index 82aed32ab..59ca3e560 100644 --- a/doc/carddatabase_v4/cards.xsd +++ b/doc/carddatabase_v4/cards.xsd @@ -35,13 +35,6 @@ - - - - - - - @@ -56,13 +49,6 @@ - - - - - - - diff --git a/doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md b/doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md index c4c335b00..b606f9e4b 100644 --- a/doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md +++ b/doc/doxygen/extra-pages/developer_documentation/loading_card_pictures.md @@ -33,178 +33,20 @@ issue a load request, which will first look for local images on-disk and then co found, use the stored binary data from the network cache to populate the in-memory pixmap cache under the card's cache key. If it is not found, it will then proceed with issuing a network request. -The size of both of these caches can be configured by the user on the "Storage" settings page. +The size of both of these caches can be configured by the user in the "Card Sources" settings page. # PixmapCacheKeys and ProviderIDs -Every card picture that is loaded ends up in the QPixmapCache under a key that identifies the exact printing it belongs -to. The key is produced by ExactCard::getPixmapCacheKey() and has the following shape: - -```text -card__ -``` - -For example, the _Example Card_ printing with provider ID `0b23cdc8-d413-4fb1-8470-474221b10fe2` is stored -under `card_Example Card_0b23cdc8-d413-4fb1-8470-474221b10fe2`. If the printing has no provider ID, the key -drops the suffix and falls back to `card_`. - -The **provider ID** is the Scryfall UUID of the printing. Oracle maps the `scryfallId` of every printing to the `uuid` -property when building the card database, and deck files persist it as the `uuid` attribute of each card entry. Because -the provider ID is part of the pixmap cache key, two different printings of the same card never share a cache entry. -This is exactly what allows the printing selector and exact-card lookups to display the picture of the precise printing -a card was added as. - -The base key holds the full-size image. When a widget asks for a scaled version, the scaled pixmap is stored under an -additional key of the form `_x`, with the size adjusted for the device pixel ratio of the screen, -so each widget size is only ever scaled once. - -The cache key is also used for bookkeeping outside of the pixmap cache itself: - -- CardPictureLoaderWorker keeps a set of keys that are currently being loaded so the same card is never queued twice. -- CardPictureLoader tracks, per key, the last time loading failed. A failed load stores a NULL pixmap under the key; as - long as that marker is present, subsequent requests for the card show the "failed" card back and are only re-queued - after the retry interval of 300 seconds has passed. -- When the CardInfo of a loaded card is destroyed, its cache entries and failure markers are removed. +TODO # The Redirect Cache -Many picture URLs - in particular the Gatherer and Scryfall URLs from the default set of templates - redirect to a CDN -or to a different host. To avoid following the same redirect for every single card, CardPictureLoaderWorker remembers -redirects and applies them without an extra network round trip. - -The redirect cache is a hash map from original URL to redirect URL plus timestamp. It is persisted to a `cache.ini` -file (Qt's INI format, under the `redirects` array) inside the redirect cache directory -(`SettingsCache::instance().paths().getRedirectCachePath()`, i.e. `/redirects/`). The cache is loaded when the worker -starts, pruned of entries older than the configured TTL, and written back to disk when the application quits. - -Entries are added whenever a network reply reports a redirection (see below) and are consulted before any request is -made: both CardPictureLoaderWorker::queueRequest() and CardPictureLoaderWorker::makeRequest() check for a cached -redirect first and jump straight to the final URL. - -The TTL is the "Redirect Cache TTL" setting on the "Storage" settings page and defaults to 30 days. Lowering it makes -Cockatrice re-resolve redirects sooner, which can help when a download URL changed its redirect target. - -Because Cockatrice tracks redirects itself, the QNetworkAccessManager is configured with Qt's `ManualRedirectPolicy`. -Redirects found in a reply are handled manually: - -- A recursive redirect (a URL redirecting to itself) is treated as a failed load. -- Otherwise the redirect is recorded in the redirect cache and the request is re-issued against the target URL. -- A successful reply with one of the redirect status codes 301, 302, 303, 305, 307 or 308 is handled the same way. - -Clearing the network cache (CardPictureLoader::clearNetworkCache()) also clears the redirect cache. +TODO # Local Image Loading -Before any network request is issued, CardPictureLoaderWorker hands the ExactCard to CardPictureLoaderLocal, which -tries to find a matching picture on disk. If a local picture is found, it is used and no network request is made. - -CardPictureLoaderLocal searches three locations: - -- The **CUSTOM folder** (`/CUSTOM/`). Every file in it is indexed recursively by its base name - (both `baseName` and `completeBaseName`, so a file named `ExampleCard.jpg` is indexed as `ExampleCard`). The index is rebuilt - every 10 seconds, so new files are picked up without restarting the - client (changing the configured pictures directory only reassigns the search paths; the next timer tick rebuilds the index). -- The **set-named subfolders** of the pictures directory: `//` and - `/downloadedPics//`. -- The **root of the `downloadedPics` folder** (`/downloadedPics/`). The export naming schemes without a - set-folder part write their files straight into `downloadedPics/`, so this is where flat-scheme downloads and the - local overrides described below are matched. - -For each candidate folder, the loader generates file-name variants from the card's corrected name, set code, collector -number and provider ID using the import naming schemes (Card Name + Provider ID, Card Name + Set + Collector, -Set + Collector + Card Name, Card Name + Set, Card Name), each tried with both `_` and `-` as separator. A file is -accepted when its name without the extension *equals* the variant exactly - the extension itself is free - and the -first variant that yields a readable image wins. For example, the file `Example Card_EXM_43.png` in the `EXM` set -folder matches the card with corrected name `Example Card`, set code `EXM` and collector number `43`. - -\attention The file-name variants use the *corrected* card name, so split cards are stored under their joined name: the -"Example // Card" card is matched by a file named `ExampleCard.*`. - -The naming schemes are also documented in the user-facing page @ref custom_card_pictures, which additionally covers -the CUSTOM folder workflow, `picurl` and download URL templates. - -When the filesystem cache method is selected on the "Storage" settings page, downloaded images are additionally written -into `/downloadedPics/` using the configured export naming scheme (as `.png` files). The two export -schemes with a set-folder part (`Set Folder / Name + Provider ID` and `Set Folder / Name + Set Name + Collector`) write -into `downloadedPics//`; the three flat schemes write directly into `downloadedPics/`. Automatic cache writes -never overwrite an existing file, so a provider outage can permanently leave an outdated image in that folder until it -is deleted manually - the user-facing troubleshooting guide @ref fixing_card_pictures covers how to do this. Explicit -image overrides (see below) are the exception and always overwrite. - -# Local Image Overrides - -Beyond the generic on-disk lookup above, individual printings can be given explicit artwork that wins over every other -source without touching the CUSTOM folder or any download URL. This is the "Image Overrides" submenu of the context menu -that opens when you right-click a card in the deck editor's printing selector. - -- **Load Custom Image...** asks for a picture file and installs it for the card through - CardPictureLoader::saveCardImageToLocalStorage() with `allowOverwrite == true`. -- **One entry per alternate printing** (labeled ` `): selecting one hands the card to - CardPictureLoader::installPrintingOverride(), which resolves that printing's artwork - enqueueing a load and waiting - for the `CardInfo::pixmapUpdated` signal if it is not cached yet - and persists it for the card. -- **Clear Custom Image** calls CardPictureLoader::deleteAllLocalOverrides() to remove every stored override image of the - card, after which normal resolution resumes. The entry is only enabled while CardPictureLoader::hasLocalOverrides() - reports at least one stored file. - -Overrides are stored as `.png` files in `downloadedPics/` under the export naming scheme configured on the "Storage" -settings page - which is exactly why the local matcher also looks into the `downloadedPics/` root (see above). They are -written with `allowOverwrite == true`, so an override always replaces whatever the filesystem cache previously saved for -that spelling; only *automatic* cache writes are prevented from clobbering it. Overriding a card with its own current -printing is a no-op (the UI omits it from the menu), and an override whose artwork fails to resolve surfaces the -"failed" card back instead of a silent no-op while any override already on disk is left in place and re-displayed. +TODO # URL Generation and Resolution -When no local image is available and downloading is enabled, the network loader starts working through a list of -candidate URLs. This list is managed by CardPictureToLoad and is built in two steps. - -First, CardPictureToLoad::extractSetsSorted() collects all sets the card has printings in and sorts them by set -priority. Unless the user disabled per-printing art ("Override all card art with personal set preference (Pre-ProviderID -change behavior)"), the set that -matches the requested printing's provider ID is moved to the front, so the exact printing is always attempted first. - -For each set, CardPictureToLoad::populateSetUrls() builds an ordered URL list: - -1. A custom URL defined for that printing via the `picurl` property in the card database, if present. -2. The configured download URL templates, in priority order (Deck Editor → "URL Download Priority"). - -URL templates are transformed into concrete URLs by CardPictureToLoad::transformUrl(), which substitutes reference -points. `!name!`, `!setcode!` and friends substitute card and printing data, while the `!set:!` and -`!prop:!` reference points resolve a property of the printing or of the card respectively. The canonical list -of all reference points with examples, including the `_fill_with_` and `_substr_` modifiers, lives in -@ref custom_card_pictures. - -The `!set:...!` and `!prop:...!` reference points also support two modifiers: - -- `_fill_with_` pads the value with the given text, right-aligned, e.g. `!set:num_fill_with_000!` turns collector - number `1` into `001`. If the value is longer than the fill text, the template is invalidated. -- `_substr__` extracts a substring, e.g. `!set:num_substr_2_2!` takes two characters starting at the - third. If the substring would extend past the end of the value, the template is invalidated. - -Substituted values are percent-encoded. If a template asks for a property the card or printing does not have (or one of -the modifiers invalidates it), the template yields no URL and is skipped; the next template is tried instead. - -\attention Custom URLs should start with `http://` or `https://`. The scheme is not validated before the URL is handed -to QNetworkAccessManager, so a template without an absolute scheme may silently fail to download; prefer HTTPS where the -provider allows it. - -The resolution order is: for the current set, try each URL in the list; when all URLs for a set are exhausted, move to -the next set; when every set is exhausted, the load fails. A failed load is reported through the NULL-pixmap mechanism -described in the PixmapCacheKeys and ProviderIDs section above. - -Several mechanisms influence the resolution process: - -- **Rate limiting.** The worker allows roughly 10 requests per second globally. A server that answers with HTTP 429 - gets its per-host allowance halved; the first 429 for a host is waited out (honoring the `Retry-After` header if - present) and the same URL retried, while a second 429 makes the loader fall through to the other configured sources. - When all sources are exhausted the request is deferred with some random jitter and retried once the back-off expires. -- **Redirects.** Replies with a redirect status (301, 302, 303, 305, 307, 308) are followed and recorded in the - redirect cache as described in the Redirect Cache section above. -- **Blacklisted images.** Gatherer returns the card back image for cards it does not know. A few known MD5 hashes of - that image are blacklisted, so such a "successful" download is treated as not found instead of being shown. -- **WebP.** Images detected as WebP (RIFF/WEBP header) are decoded through QMovie instead of QImageReader. -- **Downloads disabled.** When "Download card pictures on the fly" is disabled and the network cache method is active, - requests use Qt's `AlwaysCache` policy so that only previously cached images are served. - -A user-facing reference for writing download URL templates, including more worked examples, is available at -@ref custom_card_pictures. +TODO \ No newline at end of file diff --git a/doc/doxygen/extra-pages/user_documentation/card_pictures/custom_card_pictures.md b/doc/doxygen/extra-pages/user_documentation/card_pictures/custom_card_pictures.md deleted file mode 100644 index 3f1079661..000000000 --- a/doc/doxygen/extra-pages/user_documentation/card_pictures/custom_card_pictures.md +++ /dev/null @@ -1,135 +0,0 @@ -@page custom_card_pictures Custom Card Pictures - -There are four ways to make Cockatrice use custom artwork for your cards: - -- Placing image files in the **CUSTOM pictures folder**. -- Providing a **custom card database** that points each printing at a picture URL via the `picurl` property. -- Writing your **own download URL templates**. -- Setting an **image override** for a single card from inside the deck editor. - -Each of these is described below. If pictures are missing or wrong, see @ref fixing_card_pictures instead. - -# Custom Pictures Folder (CUSTOM) - -Any image file placed in the CUSTOM folder is used as the card picture, and no download is attempted for cards that -match a file there. - -- The folder is `/CUSTOM/`. The pictures directory is configured on the 'General' settings tab, - under 'Directories' → 'Pictures directory'. -- Any image format Qt can decode is accepted (PNG, JPG/JPEG, WebP, GIF, BMP, ...); the file extension is not filtered, - so even an extension-less file is picked up if the decoder recognizes its content. -- Files are indexed by their name, so you can organize them into subfolders freely. -- New or changed files are picked up automatically within a few seconds — no client restart is required. - -The file name must match the card using one of the naming schemes below. Both `_` and `-` are accepted as separators, -and the file extension is ignored when matching: - -| Scheme | Example file name | -| --------------------------- | ------------------------------------------------------- | -| Card Name | `Example Card.png` | -| Card Name + Set | `Example Card_DDL.png` | -| Card Name + Set + Collector | `Example Card_DDL_43.png` | -| Set + Collector + Card Name | `DDL_43_Example Card.png` | -| Card Name + Provider ID | `Example Card_0b23cdc8-d413-4fb1-8470-474221b10fe2.png` | - -The name used for matching is the *corrected* card name. Correction removes the split-card separator ` // ` and the -characters reserved in Windows file names (`* < > : " \ ?` and control characters), and turns `/` into a space, so the -"Example // Card" card is matched by a file named `ExampleCard.png`, not `Example // Card.png`. Most other punctuation -(commas, apostrophes, `!`, ...) is left untouched. - -\attention A file in the CUSTOM folder always wins over downloaded pictures, even if it is the wrong image. Delete the -file if you want to see the downloaded artwork again. - -The naming conventions are the same as those recognized in the set-named subfolders and in `downloadedPics`, and are -documented for developers in @ref loading_card_pictures. - -# Custom Card Database (picurl) - -If you maintain your own card database (see the -[Custom Cards & Sets](https://github.com/Cockatrice/Cockatrice/wiki/Custom-Cards-&-Sets) wiki), each printing's `` -tag can carry a `picurl` attribute containing a full URL for that printing's picture: - -```xml - -``` - -Cockatrice tries this URL **before** the configured download URL templates, so it is the most direct way to provide -custom artwork for a specific printing. - -- The URL should start with `http://` or `https://`; the scheme is not validated, so make sure it is absolute or the - download may silently fail. -- When you change a `picurl` for a card whose picture was already downloaded and cached, delete the stored images - (Storage tab → 'Delete Saved Images' / 'Delete Cached Images') so Cockatrice fetches the new URL. - -# Custom Download URL Templates - -The built-in download URLs are templates: Cockatrice replaces reference points in the URL with information about the -card and its printing. You can write your own templates in 'Cockatrice → Settings' (Ctrl + Shift + P by default), on -the 'Deck Editor' tab, in the 'URL Download Priority' section. - -The following reference points are available: - -| Reference point | Description | Example | -| ------------------------------- | ------------------------------- | -------------- | -| `!name!` | Card name | `Example Card` | -| `!name_lower!` | Card name, lower case | `example card` | -| `!corrected_name!` | Corrected card name | `ExampleCard` (instead of "Example // Card") | -| `!corrected_name_lower!` | Corrected card name, lower case | `examplecard` | -| `!sflang!` | Scryfall language code for the current client language; defaults to English when the language has no localized images | `en`, `zhs` | -| `!setcode!` / `!setcode_lower!` | Set code | `EXM` / `exm` | -| `!setname!` / `!setname_lower!` | Full set name | `Exemplary Set` / `exemplary set` | -| `!set:!` | A property of this printing, e.g. `muid` (Gatherer multiverse ID), `uuid` (Scryfall UUID), `num` (collector number), `rarity` | `373549` | -| `!prop:!` | A property of the card, e.g. `side` (front/back), `colors`, `cmc`, `coloridentity`, `type`, `pt`, and the format legality statuses | `front` | - -The `!set:...!` and `!prop:...!` reference points support two modifiers: - -- `_fill_with_` pads the value with the given text, right-aligned, e.g. `!set:num_fill_with_000!` turns collector - number `1` into `001`. If the value is longer than the fill text, the template is skipped. -- `_substr__` extracts a substring, e.g. `!set:num_substr_2_2!` takes two characters starting at the - third. If the substring would extend past the end of the value, the template is skipped. - -Substituted values are URL-encoded. A template that asks for a property the card or printing does not have is skipped, -and the next template in the list is tried instead. - -\attention Custom URLs should start with `http://` or `https://`. As with `picurl`, the scheme is not validated before -the URL is handed to QNetworkAccessManager, so use an absolute URL or the download may silently fail. - -Some working examples: - -```text -https://cards.scryfall.io/large/!prop:side!/!set:uuid_substr_0_1!/!set:uuid_substr_1_1!/!set:uuid!.jpg -https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side! -https://api.scryfall.com/cards/multiverse/!set:muid!?format=image -https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card -https://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card -``` - -See the [Custom Picture Download URLs](https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs) -wiki for more examples and ideas. - -\attention Keep in mind that templates using `!name!` or `!set:muid!` resolve by name or multiverse ID, not by the -exact printing. Only the Scryfall `!set:uuid!` templates always return the exact printing requested. See -@ref fixing_card_pictures for more on this. - -# Image Overrides - -The quickest way to give one card custom art is an image override: right-click the card in the deck editor's printing -selector and open the **Image Overrides** submenu of the context menu. - -- **Load Custom Image...** — choose a picture file (the dialog suggests PNG, JPG/JPEG and WebP); it becomes that card's - artwork immediately. -- **One entry per alternate printing** of the card, labeled ` ` (hovering an entry previews that - printing's artwork). Selecting one makes the card use that exact printing's picture, so e.g. a basic land can be shown - with any of its artworks. -- **Clear Custom Image** — removes the stored override and returns the card to normal resolution. It is only available - while the card has a stored override. - -Overrides are stored as `.png` files in `/downloadedPics/`, under the "Naming scheme" configured on -the Storage settings page, and are matched the same way as downloaded images. Because local files are checked before any -URL is requested, an override always wins over downloaded artwork and `picurl` for that card. The override exists only on -the machine it was created on - it is not part of the deck file - so a card with a stored override shows normally on -another computer. - -\attention If you also keep a matching file in the CUSTOM folder, that file is matched before the override. When you -change an override, use **Clear Custom Image** so the stored `.png` is replaced; manually deleting the file in -`downloadedPics/` has the same effect. diff --git a/doc/doxygen/extra-pages/user_documentation/index.md b/doc/doxygen/extra-pages/user_documentation/index.md index b55d00fcd..468a28f8d 100644 --- a/doc/doxygen/extra-pages/user_documentation/index.md +++ b/doc/doxygen/extra-pages/user_documentation/index.md @@ -11,10 +11,6 @@ - @subpage beta_release -## Card Pictures - -- @subpage custom_card_pictures - ## Troubleshooting - @subpage fixing_card_pictures diff --git a/doc/doxygen/extra-pages/user_documentation/troubleshooting/fixing_card_pictures.md b/doc/doxygen/extra-pages/user_documentation/troubleshooting/fixing_card_pictures.md index 7f761c020..78ba5586b 100644 --- a/doc/doxygen/extra-pages/user_documentation/troubleshooting/fixing_card_pictures.md +++ b/doc/doxygen/extra-pages/user_documentation/troubleshooting/fixing_card_pictures.md @@ -28,8 +28,7 @@ valid URLs. If you suspect the list has been modified or corrupted, press 'Reset defaults. For information on how to add your own custom URL templates, see the 'How to add a custom URL' link in the same -settings section, or @ref custom_card_pictures for a full reference of the URL reference points, the CUSTOM -pictures folder, and custom card databases. +settings section. # Check Your Local Picture Folder @@ -42,12 +41,8 @@ Cockatrice checks the following locations, in order: - The custom pictures folder (recursively indexed by file name). - `//` - `/downloadedPics//` -- `/downloadedPics/` (for export naming schemes without a set folder) -A file only matches when its name without the extension equals one of the recognized scheme patterns exactly. - -The following import naming schemes are recognized (using both `_` and `-` as separators). The canonical table with -concrete example file names is on @ref custom_card_pictures: +The following import naming schemes are recognized (using both `_` and `-` as separators): | Scheme | Pattern | | --------------------------- | -------------------------- | @@ -61,10 +56,6 @@ If a picture you downloaded or placed manually is wrong, stale, or corrupted, de attention to the `downloadedPics` subfolder: this is where the filesystem caching method writes downloaded images, and after a provider outage it can permanently contain the wrong printing until you delete it manually. -If a card persistently shows artwork you assigned yourself, you may have an **image override** set for it. Right-click -the card in the deck editor's printing selector and use 'Image Overrides' → 'Clear Custom Image' to remove it (or -delete the stored `.png` in `downloadedPics/`). See @ref custom_card_pictures for details. - See @ref loading_card_pictures for details on how local images are loaded. # Clear Caches diff --git a/format.sh b/format.sh index 9e3a6069b..3fa435be1 100755 --- a/format.sh +++ b/format.sh @@ -18,11 +18,11 @@ include=("cockatrice/src" \ libcockatrice_* \ "oracle/src" \ "servatrice/src" \ -"cmake/pch" \ "tests") exclude=("libcockatrice_rng/libcockatrice/rng/sfmt/" \ "libcockatrice_utility/libcockatrice/utility/peglib.h" \ "oracle/src/lzma/" \ +"oracle/src/qt-json/" \ "oracle/src/zip/" \ "servatrice/src/smtp/") exts=("cpp" "h" "proto") diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt index 15388ecfc..081e6fd05 100644 --- a/libcockatrice_card/CMakeLists.txt +++ b/libcockatrice_card/CMakeLists.txt @@ -5,7 +5,6 @@ set(CMAKE_AUTORCC ON) set(HEADERS libcockatrice/card/card_info.h libcockatrice/card/card_info_comparator.h - libcockatrice/card/card_localization.h libcockatrice/card/lazy_properties_hash.h libcockatrice/card/database/card_database.h libcockatrice/card/database/card_database_loader.h @@ -28,7 +27,6 @@ add_library( ${MOC_SOURCES} libcockatrice/card/card_info.cpp libcockatrice/card/card_info_comparator.cpp - libcockatrice/card/card_localization.cpp libcockatrice/card/lazy_properties_hash.cpp libcockatrice/card/database/card_database.cpp libcockatrice/card/database/card_database_cache.cpp diff --git a/libcockatrice_card/libcockatrice/card/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp index 56c737793..786e17950 100644 --- a/libcockatrice_card/libcockatrice/card/card_info.cpp +++ b/libcockatrice_card/libcockatrice/card/card_info.cpp @@ -40,11 +40,8 @@ CardInfo::CardInfo(const QString &_name, const QList &_relatedCards, const QList &_reverseRelatedCards, SetToPrintingsMap _sets, - const UiAttributes _uiAttributes, - QMap _localizedNames, - QMap _localizedTexts) - : name(_name), text(_text), isToken(_isToken), localizedNames(std::move(_localizedNames)), - localizedTexts(std::move(_localizedTexts)), properties(LazyPropertiesHash(_properties)), + const UiAttributes _uiAttributes) + : name(_name), text(_text), isToken(_isToken), properties(LazyPropertiesHash(_properties)), relatedCards(_relatedCards), reverseRelatedCards(_reverseRelatedCards), setsToPrintings(std::move(_sets)), uiAttributes(_uiAttributes) { @@ -62,11 +59,8 @@ CardInfo::CardInfo(const QString &_name, SetToPrintingsMap _sets, const UiAttributes _uiAttributes, QString _simpleName, - QSet _altNames, - QMap _localizedNames, - QMap _localizedTexts) + QSet _altNames) : name(_name), simpleName(std::move(_simpleName)), text(_text), isToken(_isToken), - localizedNames(std::move(_localizedNames)), localizedTexts(std::move(_localizedTexts)), properties(LazyPropertiesHash(_propertiesBlob)), relatedCards(_relatedCards), reverseRelatedCards(_reverseRelatedCards), setsToPrintings(std::move(_sets)), uiAttributes(_uiAttributes), altNames(std::move(_altNames)) @@ -89,12 +83,10 @@ CardInfoPtr CardInfo::newInstance(const QString &_name, const QList &_relatedCards, const QList &_reverseRelatedCards, SetToPrintingsMap _sets, - const UiAttributes _uiAttributes, - QMap _localizedNames, - QMap _localizedTexts) + const UiAttributes _uiAttributes) { - CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, _properties, _relatedCards, _reverseRelatedCards, _sets, - _uiAttributes, std::move(_localizedNames), std::move(_localizedTexts))); + CardInfoPtr ptr( + new CardInfo(_name, _text, _isToken, _properties, _relatedCards, _reverseRelatedCards, _sets, _uiAttributes)); ptr->setSmartPointer(ptr); for (const auto &printings : _sets) { @@ -117,13 +109,11 @@ CardInfoPtr CardInfo::newInstance(const QString &_name, const UiAttributes _uiAttributes, QString _simpleName, QSet _altNames, - bool _appendToSets, - QMap _localizedNames, - QMap _localizedTexts) + bool _appendToSets) { CardInfoPtr ptr(new CardInfo(_name, _text, _isToken, std::move(_propertiesBlob), _relatedCards, _reverseRelatedCards, _sets, _uiAttributes, std::move(_simpleName), - std::move(_altNames), std::move(_localizedNames), std::move(_localizedTexts))); + std::move(_altNames))); ptr->setSmartPointer(ptr); if (_appendToSets) { diff --git a/libcockatrice_card/libcockatrice/card/card_info.h b/libcockatrice_card/libcockatrice/card/card_info.h index 17894cec5..392dc3849 100644 --- a/libcockatrice_card/libcockatrice/card/card_info.h +++ b/libcockatrice_card/libcockatrice/card/card_info.h @@ -77,9 +77,6 @@ private: QString text; ///< Text description or rules text of the card. bool isToken; ///< Whether this card is a token or not. - QMap localizedNames; ///< Localized card names, keyed by language code. - QMap localizedTexts; ///< Localized rules text, keyed by language code. - LazyPropertiesHash properties; ///< Key-value store of dynamic card properties. QList relatedCards; ///< Forward references to related cards. @@ -103,8 +100,6 @@ public: * @param _reverseRelatedCards Backward references to related cards. * @param _sets Map of set names to printing information. * @param _uiAttributes Attributes that affect display and game logic - * @param _localizedNames Localized card names, keyed by language code. - * @param _localizedTexts Localized rules text, keyed by language code. */ explicit CardInfo(const QString &_name, const QString &_text, @@ -113,9 +108,7 @@ public: const QList &_relatedCards, const QList &_reverseRelatedCards, SetToPrintingsMap _sets, - UiAttributes _uiAttributes, - QMap _localizedNames = {}, - QMap _localizedTexts = {}); + UiAttributes _uiAttributes); /** * @brief Constructs a CardInfo from a cache snapshot with precomputed derived @@ -137,8 +130,6 @@ public: * @param _uiAttributes Attributes that affect display and game logic. * @param _simpleName Precomputed simplified name. * @param _altNames Precomputed alternate names. - * @param _localizedNames Localized card names, keyed by language code. - * @param _localizedTexts Localized rules text, keyed by language code. */ explicit CardInfo(const QString &_name, const QString &_text, @@ -149,9 +140,7 @@ public: SetToPrintingsMap _sets, UiAttributes _uiAttributes, QString _simpleName, - QSet _altNames, - QMap _localizedNames = {}, - QMap _localizedTexts = {}); + QSet _altNames); /** * @brief Copy constructor for CardInfo. @@ -162,8 +151,7 @@ public: */ CardInfo(const CardInfo &other) : QObject(other.parent()), name(other.name), simpleName(other.simpleName), text(other.text), - isToken(other.isToken), localizedNames(other.localizedNames), localizedTexts(other.localizedTexts), - properties(other.properties), relatedCards(other.relatedCards), + isToken(other.isToken), properties(other.properties), relatedCards(other.relatedCards), reverseRelatedCards(other.reverseRelatedCards), reverseRelatedCardsToMe(other.reverseRelatedCardsToMe), setsToPrintings(other.setsToPrintings), uiAttributes(other.uiAttributes), setsNames(other.setsNames), altNames(other.altNames) @@ -191,8 +179,6 @@ public: * @param _reverseRelatedCards Reverse relationships. * @param _sets Printing information per set. * @param _uiAttributes Attributes that affect display and game logic - * @param _localizedNames Localized card names, keyed by language code. - * @param _localizedTexts Localized rules text, keyed by language code. * @return Shared pointer to the new CardInfo instance. */ static CardInfoPtr newInstance(const QString &_name, @@ -202,9 +188,7 @@ public: const QList &_relatedCards, const QList &_reverseRelatedCards, SetToPrintingsMap _sets, - UiAttributes _uiAttributes, - QMap _localizedNames = {}, - QMap _localizedTexts = {}); + UiAttributes _uiAttributes); /** * @brief Creates a new instance from a cache snapshot with precomputed @@ -224,8 +208,6 @@ public: * its CardSets. Pass false when building cards in parallel so the * (non-thread-safe) set membership is populated in a later * single-threaded pass. - * @param _localizedNames Localized card names, keyed by language code. - * @param _localizedTexts Localized rules text, keyed by language code. * @return Shared pointer to the new CardInfo instance. */ static CardInfoPtr newInstance(const QString &_name, @@ -238,9 +220,7 @@ public: UiAttributes _uiAttributes, QString _simpleName, QSet _altNames, - bool _appendToSets = true, - QMap _localizedNames = {}, - QMap _localizedTexts = {}); + bool _appendToSets = true); /** * @brief Clones the current CardInfo instance. @@ -290,96 +270,6 @@ public: text = _text; emit cardInfoChanged(smartThis); } - - /** - * @brief Returns the card name in the given language, falling back to the - * English name when no localization is available. - * - * @param lang Language code (e.g. "de", "ja", "zhs"). - * @return The localized name, or the English name as fallback. - */ - [[nodiscard]] const QString &getLocalizedName(const QString &lang) const - { - const auto it = localizedNames.constFind(lang); - return it != localizedNames.constEnd() ? it.value() : name; - } - - /** - * @brief Returns the rules text in the given language, falling back to the - * English text when no localization is available. - * - * @param lang Language code (e.g. "de", "ja", "zhs"). - * @return The localized text, or the English text as fallback. - */ - [[nodiscard]] const QString &getLocalizedText(const QString &lang) const - { - const auto it = localizedTexts.constFind(lang); - return it != localizedTexts.constEnd() ? it.value() : text; - } - - /** - * @brief Returns the localized card names keyed by language code. - * - * Only languages that have an entry are present; there is no English - * fallback in this map. - */ - [[nodiscard]] const QMap &getLocalizedNames() const - { - return localizedNames; - } - - /** - * @brief Returns the localized rules text keyed by language code. - * - * Only languages that have an entry are present; there is no English - * fallback in this map. - */ - [[nodiscard]] const QMap &getLocalizedTexts() const - { - return localizedTexts; - } - - /** - * @brief Sets the card name for the given language. - * - * @param lang Language code. - * @param _localizedName The localized card name. - */ - void setLocalizedName(const QString &lang, const QString &_localizedName) - { - if (localizedNames.value(lang) == _localizedName) { - return; - } - localizedNames.insert(lang, _localizedName); - emit cardInfoChanged(smartThis); - } - - /** - * @brief Sets the rules text for the given language. - * - * @param lang Language code. - * @param _localizedText The localized rules text. - */ - void setLocalizedText(const QString &lang, const QString &_localizedText) - { - if (localizedTexts.value(lang) == _localizedText) { - return; - } - localizedTexts.insert(lang, _localizedText); - emit cardInfoChanged(smartThis); - } - - /** - * @brief Returns the language codes for which this card has a localized - * name or rules text. - */ - [[nodiscard]] QStringList localizationLanguages() const - { - QStringList languages = localizedNames.keys(); - languages.append(localizedTexts.keys()); - languages.removeDuplicates(); - return languages; - } [[nodiscard]] bool getIsToken() const { return isToken; diff --git a/libcockatrice_card/libcockatrice/card/card_localization.cpp b/libcockatrice_card/libcockatrice/card/card_localization.cpp deleted file mode 100644 index 03c6c659b..000000000 --- a/libcockatrice_card/libcockatrice/card/card_localization.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#include "card_localization.h" - -#include -#include -#include - -namespace CardLocalization -{ -const QStringList &supportedLanguages() -{ - static const QStringList languages = {"cs", "de", "es", "fr", "it", "ja", "ko", "pt", "ru", "zhs", "zht", "he"}; - return languages; -} - -QString languageDisplayName(const QString &lang) -{ - static const QHash displayNames = { - {"cs", "Česky (Czech)"}, - {"de", "Deutsch (German)"}, - {"es", "Español (Spanish)"}, - {"fr", "Français (French)"}, - {"it", "Italiano (Italian)"}, - {"ja", "日本語 (Japanese)"}, - {"ko", "한국어 (Korean)"}, - {"pt", "Português (Portuguese)"}, - {"ru", "Русский (Russian)"}, - {"he", "עברית (Hebrew)"}, - {"zhs", "简体中文 (Chinese Simplified)"}, - {"zht", "繁體中文 (Chinese Traditional)"}, - }; - const QString displayName = displayNames.value(lang); - if (!displayName.isEmpty()) { - return displayName; - } - const QString nativeName = QLocale(lang).nativeLanguageName(); - return nativeName.isEmpty() ? lang : nativeName; -} -} // namespace CardLocalization \ No newline at end of file diff --git a/libcockatrice_card/libcockatrice/card/card_localization.h b/libcockatrice_card/libcockatrice/card/card_localization.h deleted file mode 100644 index 1bde506cb..000000000 --- a/libcockatrice_card/libcockatrice/card/card_localization.h +++ /dev/null @@ -1,79 +0,0 @@ -#ifndef CARD_LOCALIZATION_H -#define CARD_LOCALIZATION_H - -#include -#include - -/** - * @brief The card languages card search should run against. - */ -enum class SearchLanguageMode -{ - English, ///< Only search the English card names and texts. - Selected, ///< Search the selected card language (untranslated cards still match in English). - Both ///< Search both the English and the selected card language names and texts. -}; - -/** - * @brief The card language and matching mode searches run against. - * - * Bundles the card language code configured in the settings with the - * SearchLanguageMode, so entry points take one value instead of two related - * parameters. - */ -struct CardSearchLanguage -{ - QString language; ///< Card language code (e.g. "de"); empty means the English fallback. - SearchLanguageMode mode = SearchLanguageMode::English; ///< How the language participates in the search. - - /** - * @brief Whether only the English card data is searched. - * - * @return True when no card language is selected or English itself is selected. - */ - [[nodiscard]] bool isEnglishOnly() const - { - return language.isEmpty() || language == QLatin1String("en"); - } - - bool operator==(const CardSearchLanguage &) const = default; - bool operator!=(const CardSearchLanguage &) const = default; -}; - -/** - * @namespace CardLocalization - * @ingroup Cards - * - * @brief Shared language metadata for localized card text and images. - * - * Lists the language codes Cockatrice can display localized card data for and - * provides human-readable names. The list is shared between Oracle (which - * imports the selected language's card data) and the client settings UI (which - * offers the language choice). - */ -namespace CardLocalization -{ -/** - * @brief Language codes for which localized card data can be imported/displayed. - * - * Matches the languages Scryfall can serve localized card images for. "en" is - * always available as the default/fallback and is not listed here. - * - * @return The list of supported language codes. - */ -[[nodiscard]] const QStringList &supportedLanguages(); - -/** - * @brief Human-readable name for a language code. - * - * Follows the same "native name (English name)" format the UI language list - * uses (e.g. "日本語 (Japanese)"), so the English fallback is always visible. - * - * @param lang Language code (e.g. "de", "ja", "zhs"). - * @return The language's native name with its English name in parentheses, or - * the code itself if it cannot be resolved. - */ -[[nodiscard]] QString languageDisplayName(const QString &lang); -} // namespace CardLocalization - -#endif // CARD_LOCALIZATION_H \ No newline at end of file diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp index 3165ff871..2b27f50f8 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp +++ b/libcockatrice_card/libcockatrice/card/database/card_database_cache.cpp @@ -17,7 +17,7 @@ namespace { constexpr quint32 CACHE_MAGIC = 0x43445243; // "CDRC" -constexpr quint32 CACHE_VERSION = 3; +constexpr quint32 CACHE_VERSION = 2; // ---- Primitives ----------------------------------------------------------- @@ -71,35 +71,6 @@ QDate readDate(QDataStream &in) return d; } -void writeStringMap(QDataStream &out, const QMap &map) -{ - out << static_cast(map.size()); - for (auto it = map.constBegin(); it != map.constEnd(); ++it) { - writeString(out, it.key()); - writeString(out, it.value()); - } -} - -QMap readStringMap(QDataStream &in) -{ - QMap map; - quint32 count = 0; - in >> count; - if (in.status() != QDataStream::Ok) { - return map; - } - for (quint32 i = 0; i < count; ++i) { - QString key = readString(in); - QString value = readString(in); - if (in.status() != QDataStream::Ok) { - map.clear(); - return map; - } - map.insert(key, value); - } - return map; -} - // ---- CardRelation ---------------------------------------------------------- void writeRelation(QDataStream &out, const CardRelation *rel) @@ -224,10 +195,6 @@ void writeCard(QDataStream &out, const CardInfoPtr &card) for (const CardRelation *rel : reverse) { writeRelation(out, rel); } - - // localized card data - writeStringMap(out, card->getLocalizedNames()); - writeStringMap(out, card->getLocalizedTexts()); } CardInfoPtr readCard(QDataStream &in, const SetNameMap &sets) @@ -301,19 +268,8 @@ CardInfoPtr readCard(QDataStream &in, const SetNameMap &sets) reverse.append(readRelation(in)); } - const QMap localizedNames = readStringMap(in); - if (in.status() != QDataStream::Ok) { - return nullptr; - } - const QMap localizedTexts = readStringMap(in); - if (in.status() != QDataStream::Ok) { - return nullptr; - } - - CardInfoPtr card = CardInfo::newInstance(name, text, isToken, propertiesBlob, related, reverse, cardSets, ui, - simpleName, altNames, false, localizedNames, localizedTexts); - - return card; + return CardInfo::newInstance(name, text, isToken, propertiesBlob, related, reverse, cardSets, ui, simpleName, + altNames, false); } // ---- FormatRules ----------------------------------------------------------- diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp index 19e972a7a..ec460d685 100644 --- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp +++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp @@ -273,8 +273,6 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) QString name = QString(""); QString text = QString(""); QHash properties; - QMap localizedNames; - QMap localizedTexts; QList relatedCards, reverseRelatedCards; auto _sets = SetToPrintingsMap(); int tableRow = 0; @@ -300,44 +298,6 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) // generic properties } else if (xmlName == "prop") { properties = loadCardPropertiesFromXml(xml); - // localized card data - } else if (xmlName == "localizations") { - while (!xml.atEnd()) { - if (xml.readNextStartElement()) { - const QString elementName = xml.name().toString(); - if (elementName == "localization") { - const QString lang = xml.attributes().value("lang").toString(); - QString localizedName; - QString localizedText; - while (!xml.atEnd()) { - if (xml.readNext() == QXmlStreamReader::EndElement) { - break; - } - if (xml.isStartElement()) { - const QString childName = xml.name().toString(); - QString value = xml.readElementText(QXmlStreamReader::IncludeChildElements); - if (childName == "name") { - localizedName = value; - } else if (childName == "text") { - localizedText = value; - } - } - } - if (!lang.isEmpty()) { - if (!localizedName.isEmpty()) { - localizedNames.insert(lang, localizedName); - } - if (!localizedText.isEmpty()) { - localizedTexts.insert(lang, localizedText); - } - } - } else { - xml.skipCurrentElement(); - } - } else { - break; - } - } // positioning info } else if (xmlName == "tablerow") { tableRow = xml.readElementText(QXmlStreamReader::IncludeChildElements).toInt(); @@ -439,9 +399,8 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) .landscapeOrientation = landscapeOrientation, .tableRow = tableRow, .upsideDownArt = upsideDown}; - CardInfoPtr newCard = - CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, _sets, - attributes, std::move(localizedNames), std::move(localizedTexts)); + CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards, + reverseRelatedCards, _sets, attributes); if (targetData) { // Mirror CardDatabase::addCard: if a card with this name already // exists, merge the new printings into it instead of replacing. @@ -558,26 +517,6 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in } xml.writeEndElement(); - // localized card data - const QStringList localizedLanguages = info->localizationLanguages(); - if (!localizedLanguages.isEmpty()) { - xml.writeStartElement("localizations"); - const QMap &localizedNames = info->getLocalizedNames(); - const QMap &localizedTexts = info->getLocalizedTexts(); - for (const QString &lang : localizedLanguages) { - xml.writeStartElement("localization"); - xml.writeAttribute("lang", lang); - if (localizedNames.contains(lang)) { - xml.writeTextElement("name", localizedNames.value(lang)); - } - if (localizedTexts.contains(lang)) { - xml.writeTextElement("text", localizedTexts.value(lang)); - } - xml.writeEndElement(); - } - xml.writeEndElement(); - } - // sets for (const auto &printings : info->getSets()) { for (const PrintingInfo &set : printings) { diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt index 0c487466c..c7a54a390 100644 --- a/libcockatrice_deck_list/CMakeLists.txt +++ b/libcockatrice_deck_list/CMakeLists.txt @@ -11,7 +11,6 @@ set(HEADERS libcockatrice/deck_list/deck_list_history_manager.h libcockatrice/deck_list/deck_list_node_tree.h libcockatrice/deck_list/deck_list_memento.h - libcockatrice/deck_list/deck_list_plain_text_parser.h libcockatrice/deck_list/playmat_resolver.h libcockatrice/deck_list/sideboard_plan.h ) @@ -28,7 +27,6 @@ add_library( libcockatrice/deck_list/deck_list.cpp libcockatrice/deck_list/deck_list_history_manager.cpp libcockatrice/deck_list/deck_list_node_tree.cpp - libcockatrice/deck_list/deck_list_plain_text_parser.cpp libcockatrice/deck_list/playmat_resolver.cpp libcockatrice/deck_list/sideboard_plan.cpp ) diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp index 90f63c09d..1a3876cd3 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp @@ -1,7 +1,6 @@ #include "deck_list.h" #include "deck_list_memento.h" -#include "deck_list_plain_text_parser.h" #include "tree/abstract_deck_list_node.h" #include "tree/deck_list_card_node.h" #include "tree/inner_deck_list_node.h" @@ -9,138 +8,26 @@ #include #include #include +#include #include #include #include +#if QT_VERSION < 0x050600 +// qHash on QRegularExpression was added in 5.6, FIX IT +uint qHash(const QRegularExpression &key, uint seed) noexcept +{ + return qHash(key.pattern(), seed); // call qHash on pattern QString instead +} +#endif + static const QString CURRENT_SIDEBOARD_PLAN_KEY = ""; -/** - * @brief Parses a floating point XML attribute into a clamped playmat parameter. - * - * Falls back to @p fallback when the attribute is missing or malformed, so - * malformed deck files cannot produce degenerate art rectangles (e.g. a zoom - * of 0 dividing by zero). - * - * @param valueString Raw attribute text. - * @param fallback Value used when the text cannot be parsed. - * @param min Lower clamp bound. - * @param max Upper clamp bound. - * @return The parsed value clamped to [min, max], or @p fallback. - */ -static double parseClampedParam(const QString &valueString, double fallback, double min, double max) -{ - bool ok = false; - const double value = valueString.toDouble(&ok); - if (!ok) { - return fallback; - } - return qBound(min, value, max); -} - -/** - * @brief Reads a `bannerCard` element from the XML stream. - * - * @param xml Reader positioned at the element. - * @return The referenced card. - */ -static CardRef readBannerCard(QXmlStreamReader *xml) -{ - QString providerId = xml->attributes().value("providerId").toString(); - QString cardName = xml->readElementText(); - return {cardName, providerId}; -} - -/** - * @brief Reads a `playmatCard` element from the XML stream. - * - * Attribute values are read before readElementText consumes the element, and - * the params are clamped to the same ranges as the settings dialog and the - * remote player-properties path so malformed deck files cannot produce - * degenerate art rectangles (e.g. a zoom of 0 dividing by zero). - * - * @param xml Reader positioned at the element. - * @return The referenced card plus its clamped positioning parameters. - */ -static PlaymatInfo readPlaymatCard(QXmlStreamReader *xml) -{ - QString providerId = xml->attributes().value("providerId").toString(); - QString marginLStr = xml->attributes().value("marginPctL").toString(); - QString marginRStr = xml->attributes().value("marginPctR").toString(); - QString vOffStr = xml->attributes().value("verticalOffset").toString(); - QString zoomStr = xml->attributes().value("zoom").toString(); - QString cardName = xml->readElementText(); - - return { - .card = {cardName, providerId}, - .params = {.marginPctL = parseClampedParam(marginLStr, 0.07, 0.0, 0.95), - .marginPctR = parseClampedParam(marginRStr, 0.07, 0.0, 0.95), - .verticalOffset = parseClampedParam(vOffStr, 0.33, 0.0, 1.0), - .zoom = parseClampedParam(zoomStr, 1.0, 0.1, 4.0)}, - }; -} - bool DeckList::Metadata::isEmpty() const { return name.isEmpty() && comments.isEmpty() && bannerCard.isEmpty() && tags.isEmpty() && playmat.card.isEmpty(); } -bool DeckList::Metadata::readElement(QXmlStreamReader *xml, const QString &childName) -{ - if (childName == "lastLoadedTimestamp") { - lastLoadedTimestamp = xml->readElementText(); - } else if (childName == "deckname") { - name = xml->readElementText(); - } else if (childName == "format") { - gameFormat = xml->readElementText(); - } else if (childName == "comments") { - comments = xml->readElementText(); - } else if (childName == "bannerCard") { - bannerCard = readBannerCard(xml); - } else if (childName == "playmatCard") { - playmat = readPlaymatCard(xml); - } else if (childName == "tags") { - tags.clear(); // Clear existing tags - while (xml->readNextStartElement()) { - if (xml->name().toString() == "tag") { - tags.append(xml->readElementText()); - } - } - } else { - return false; - } - return true; -} - -void DeckList::Metadata::write(QXmlStreamWriter *xml) const -{ - xml->writeTextElement("lastLoadedTimestamp", lastLoadedTimestamp); - xml->writeTextElement("deckname", name); - xml->writeTextElement("format", gameFormat); - xml->writeStartElement("bannerCard"); - xml->writeAttribute("providerId", bannerCard.providerId); - xml->writeCharacters(bannerCard.name); - xml->writeEndElement(); - if (!playmat.card.isEmpty()) { - xml->writeStartElement("playmatCard"); - xml->writeAttribute("providerId", playmat.card.providerId); - xml->writeAttribute("marginPctL", QString::number(playmat.params.marginPctL, 'f', 4)); - xml->writeAttribute("marginPctR", QString::number(playmat.params.marginPctR, 'f', 4)); - xml->writeAttribute("verticalOffset", QString::number(playmat.params.verticalOffset, 'f', 4)); - xml->writeAttribute("zoom", QString::number(playmat.params.zoom, 'f', 4)); - xml->writeCharacters(playmat.card.name); - xml->writeEndElement(); - } - xml->writeTextElement("comments", comments); - - // Write tags - xml->writeStartElement("tags"); - for (const QString &tag : tags) { - xml->writeTextElement("tag", tag); - } - xml->writeEndElement(); -} - DeckList::DeckList() { } @@ -175,10 +62,56 @@ bool DeckList::readElement(QXmlStreamReader *xml) { const QString childName = xml->name().toString(); if (xml->isStartElement()) { - if (metadata.readElement(xml, childName)) { - return true; - } - if (childName == "zone") { + if (childName == "lastLoadedTimestamp") { + metadata.lastLoadedTimestamp = xml->readElementText(); + } else if (childName == "deckname") { + metadata.name = xml->readElementText(); + } else if (childName == "format") { + metadata.gameFormat = xml->readElementText(); + } else if (childName == "comments") { + metadata.comments = xml->readElementText(); + } else if (childName == "bannerCard") { + QString providerId = xml->attributes().value("providerId").toString(); + QString cardName = xml->readElementText(); + metadata.bannerCard = {cardName, providerId}; + } else if (childName == "playmatCard") { + QString providerId = xml->attributes().value("providerId").toString(); + bool ok; + QString marginLStr = xml->attributes().value("marginPctL").toString(); + QString marginRStr = xml->attributes().value("marginPctR").toString(); + QString vOffStr = xml->attributes().value("verticalOffset").toString(); + QString zoomStr = xml->attributes().value("zoom").toString(); + QString cardName = xml->readElementText(); + PlaymatInfo playmat; + playmat.card = {cardName, providerId}; + // Clamp to the same ranges as the settings dialog and the remote + // player-properties path so malformed deck files cannot produce + // degenerate art rectangles (e.g. a zoom of 0 dividing by zero). + playmat.params.marginPctL = qBound(0.0, marginLStr.toDouble(&ok), 0.95); + if (!ok) { + playmat.params.marginPctL = 0.07; + } + playmat.params.marginPctR = qBound(0.0, marginRStr.toDouble(&ok), 0.95); + if (!ok) { + playmat.params.marginPctR = 0.07; + } + playmat.params.verticalOffset = qBound(0.0, vOffStr.toDouble(&ok), 1.0); + if (!ok) { + playmat.params.verticalOffset = 0.33; + } + playmat.params.zoom = qBound(0.1, zoomStr.toDouble(&ok), 4.0); + if (!ok) { + playmat.params.zoom = 1.0; + } + metadata.playmat = playmat; + } else if (childName == "tags") { + metadata.tags.clear(); // Clear existing tags + while (xml->readNextStartElement()) { + if (xml->name().toString() == "tag") { + metadata.tags.append(xml->readElementText()); + } + } + } else if (childName == "zone") { tree.readZoneElement(xml); } else if (childName == "sideboard_plan") { SideboardPlan newSideboardPlan; @@ -192,12 +125,41 @@ bool DeckList::readElement(QXmlStreamReader *xml) return true; } +static void writeMetadata(QXmlStreamWriter *xml, const DeckList::Metadata &metadata) +{ + xml->writeTextElement("lastLoadedTimestamp", metadata.lastLoadedTimestamp); + xml->writeTextElement("deckname", metadata.name); + xml->writeTextElement("format", metadata.gameFormat); + xml->writeStartElement("bannerCard"); + xml->writeAttribute("providerId", metadata.bannerCard.providerId); + xml->writeCharacters(metadata.bannerCard.name); + xml->writeEndElement(); + if (!metadata.playmat.card.isEmpty()) { + xml->writeStartElement("playmatCard"); + xml->writeAttribute("providerId", metadata.playmat.card.providerId); + xml->writeAttribute("marginPctL", QString::number(metadata.playmat.params.marginPctL, 'f', 4)); + xml->writeAttribute("marginPctR", QString::number(metadata.playmat.params.marginPctR, 'f', 4)); + xml->writeAttribute("verticalOffset", QString::number(metadata.playmat.params.verticalOffset, 'f', 4)); + xml->writeAttribute("zoom", QString::number(metadata.playmat.params.zoom, 'f', 4)); + xml->writeCharacters(metadata.playmat.card.name); + xml->writeEndElement(); + } + xml->writeTextElement("comments", metadata.comments); + + // Write tags + xml->writeStartElement("tags"); + for (const QString &tag : metadata.tags) { + xml->writeTextElement("tag", tag); + } + xml->writeEndElement(); +} + void DeckList::write(QXmlStreamWriter *xml) const { xml->writeStartElement("cockatrice_deck"); xml->writeAttribute("version", "1"); - metadata.write(xml); + writeMetadata(xml, metadata); // Write zones tree.write(xml); @@ -210,27 +172,6 @@ void DeckList::write(QXmlStreamWriter *xml) const xml->writeEndElement(); // Close "cockatrice_deck" } -bool DeckList::seekToNextElement(QXmlStreamReader *xml) -{ - while (!xml->atEnd()) { - xml->readNext(); - if (xml->isStartElement()) { - return true; - } - } - return false; -} - -void DeckList::readDeckBody(QXmlStreamReader *xml) -{ - while (!xml->atEnd()) { - xml->readNext(); - if (!readElement(xml)) { - break; - } - } -} - bool DeckList::loadFromXml(QXmlStreamReader *xml) { if (xml->error()) { @@ -239,11 +180,19 @@ bool DeckList::loadFromXml(QXmlStreamReader *xml) } cleanList(); - while (seekToNextElement(xml)) { - if (xml->name().toString() != "cockatrice_deck") { - return false; + while (!xml->atEnd()) { + xml->readNext(); + if (xml->isStartElement()) { + if (xml->name().toString() != "cockatrice_deck") { + return false; + } + while (!xml->atEnd()) { + xml->readNext(); + if (!readElement(xml)) { + break; + } + } } - readDeckBody(xml); } refreshDeckHash(); if (xml->error()) { @@ -299,12 +248,160 @@ bool DeckList::loadFromStream_Plain(QTextStream &in, bool preserveMetadata, const std::function &cardNameNormalizer) { - if (!preserveMetadata) { - metadata = {}; + const QRegularExpression reCardLine(R"(^\s*[\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption); + const QRegularExpression reEmpty("^\\s*$"); + const QRegularExpression reComment(R"([\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption); + const QRegularExpression reSBMark("^\\s*sb:\\s*(.+)", QRegularExpression::CaseInsensitiveOption); + const QRegularExpression reSBComment("^sideboard\\b.*$", QRegularExpression::CaseInsensitiveOption); + const QRegularExpression reDeckComment("^((main)?deck(list)?|mainboard)\\b", + QRegularExpression::CaseInsensitiveOption); + + // Regex for advanced card parsing + const QRegularExpression reMultiplier(R"(^[xX\(\[]*(\d+)[xX\*\)\]]* ?(.+))"); + + // Regex for extracting set code and collector number with attached symbols + const QRegularExpression reHyphenFormat(R"(\((\w{3,})\)\s+(\w{3,})-(\d+[^\w\s]*))"); + const QRegularExpression reRegularFormat(R"(\((\w{3,})\)\s+(\d+[^\w\s]*))"); + + cleanList(preserveMetadata); + + auto inputs = in.readAll().trimmed().split('\n'); + auto max_line = inputs.size(); + + // Start at the first empty line before the first card line + auto deckStart = inputs.indexOf(reCardLine); + if (deckStart == -1) { + if (inputs.indexOf(reComment) == -1) { + return false; // Input is empty + } + deckStart = max_line; + } else { + deckStart = inputs.lastIndexOf(reEmpty, deckStart); + if (deckStart == -1) { + deckStart = 0; + } } - bool ok = DeckListPlainText::parse(in, cardNameNormalizer, metadata, tree); + + // find sideboard position, if marks are used this won't be needed + int sBStart = -1; + if (inputs.indexOf(reSBMark, deckStart) == -1) { + sBStart = inputs.indexOf(reSBComment, deckStart); + if (sBStart == -1) { + sBStart = inputs.indexOf(reEmpty, deckStart + 1); + if (sBStart == -1) { + sBStart = max_line; + } + auto nextCard = inputs.indexOf(reCardLine, sBStart + 1); + if (inputs.indexOf(reEmpty, nextCard + 1) != -1) { + sBStart = max_line; + } + } + } + + int index = 0; + QRegularExpressionMatch match; + + // Parse name and comments + while (index < deckStart) { + const auto ¤t = inputs.at(index++); + if (!current.contains(reEmpty)) { + match = reComment.match(current); + metadata.name = match.captured(); + break; + } + } + while (index < deckStart) { + const auto ¤t = inputs.at(index++); + if (!current.contains(reEmpty)) { + match = reComment.match(current); + metadata.comments += match.captured() + '\n'; + } + } + metadata.comments.chop(1); + + // Discard empty lines + while (index < max_line && inputs.at(index).contains(reEmpty)) { + ++index; + } + + // Discard line if it starts with deck or mainboard, all cards until the sideboard starts are in the mainboard + if (inputs.at(index).contains(reDeckComment)) { + ++index; + } + + // Parse decklist + for (; index < max_line; ++index) { + // check if line is a card + match = reCardLine.match(inputs.at(index)); + if (!match.hasMatch()) { + continue; + } + + QString cardName = match.captured().simplified(); + bool sideboard = false; + + // Sideboard detection + if (sBStart < 0) { + match = reSBMark.match(cardName); + if (match.hasMatch()) { + sideboard = true; + cardName = match.captured(1); + } + } else { + if (index == sBStart) { + continue; + } + sideboard = index > sBStart; + } + + // Extract set code, collector number, and foil + QString setCode; + QString collectorNumber; + bool isFoil = false; + + // Check for foil status at the end of the card name + if (cardName.endsWith("*F*", Qt::CaseInsensitive)) { + isFoil = true; + cardName.chop(3); // Remove the "*F*" from the card name + } + Q_UNUSED(isFoil); + + // Attempt to match the hyphen-separated format (PLST-2094) + match = reHyphenFormat.match(cardName); + if (match.hasMatch()) { + setCode = match.captured(2).toUpper(); + collectorNumber = match.captured(3); + cardName = cardName.left(match.capturedStart()).trimmed(); + } else { + // Attempt to match the regular format (PLST) 2094 + match = reRegularFormat.match(cardName); + if (match.hasMatch()) { + setCode = match.captured(1).toUpper(); + collectorNumber = match.captured(2); + cardName = cardName.left(match.capturedStart()).trimmed(); + } + } + + // check if a specific amount is mentioned + int amount = 1; + match = reMultiplier.match(cardName); + if (match.hasMatch()) { + amount = match.captured(1).toInt(); + cardName = match.captured(2); + } + + // Normalize the card name + cardName = cardNameNormalizer(cardName); + + // Determine the zone (mainboard/sideboard) + QString zoneName = sideboard ? DECK_ZONE_SIDE : DECK_ZONE_MAIN; + + // make new entry in decklist + tree.addCard(cardName, amount, zoneName, -1, setCode, collectorNumber); + } + refreshDeckHash(); - return ok; + return true; } bool DeckList::loadFromFile_Plain(QIODevice *device, const std::function &cardNameNormalizer) diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h index 199d3a9a8..475d99560 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h @@ -76,23 +76,6 @@ public: * @brief Checks if all values (except for lastLoadedTimestamp) in the metadata is empty. */ bool isEmpty() const; - - /** - * @brief Reads a single deck metadata element from a Cockatrice deck XML stream. - * - * @param xml Reader positioned at the element. - * @param childName Name of the current element. - * @return true if a metadata element was consumed, false if @p childName is - * not a metadata element. - */ - bool readElement(QXmlStreamReader *xml, const QString &childName); - - /** - * @brief Writes the deck metadata section of a Cockatrice deck XML file. - * - * @param xml Writer to append the metadata elements to. - */ - void write(QXmlStreamWriter *xml) const; }; private: @@ -106,22 +89,6 @@ private: */ mutable QString cachedDeckHash; - /** @name XML load helpers */ - ///@{ - /** - * @brief Advances to the next element in the XML stream. - * @param xml Reader to advance past non-element tokens. - * @return true when a start element was reached, false at end of stream. - */ - bool seekToNextElement(QXmlStreamReader *xml); - - /** - * @brief Reads the contents of a `cockatrice_deck` element into this deck. - * @param xml Reader positioned at the deck element, stopped at its end. - */ - void readDeckBody(QXmlStreamReader *xml); - ///@} - public: /** @name Metadata setters */ ///@{ diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp index b6d0687b4..acf4707ab 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.cpp @@ -14,32 +14,42 @@ void DeckListHistoryManager::clear() emit undoRedoStateChanged(); } -void DeckListHistoryManager::restoreAndSwap(QStack &source, - QStack &target, - DeckList *deck) +void DeckListHistoryManager::undo(DeckList *deck) { - if (source.isEmpty()) { + if (undoStack.isEmpty()) { return; } - // The reason is read before the source is popped. - const QString reason = source.top().getReason(); + // Peek at the memento we are going to restore + const DeckListMemento &mementoToRestore = undoStack.top(); - // Save the current state so the opposite direction can return to it. - target.push(deck->createMemento(reason)); + // Save current state for redo + DeckListMemento currentState = deck->createMemento(mementoToRestore.getReason()); + redoStack.push(currentState); - // Apply the state we are moving to. - deck->restoreMemento(source.pop()); + // Pop the last state from undo stack and restore it + DeckListMemento memento = undoStack.pop(); + deck->restoreMemento(memento); emit undoRedoStateChanged(); } -void DeckListHistoryManager::undo(DeckList *deck) -{ - restoreAndSwap(undoStack, redoStack, deck); -} - void DeckListHistoryManager::redo(DeckList *deck) { - restoreAndSwap(redoStack, undoStack, deck); + if (redoStack.isEmpty()) { + return; + } + + // Peek at the memento we are going to restore + const DeckListMemento &mementoToRestore = redoStack.top(); + + // Save current state for undo + DeckListMemento currentState = deck->createMemento(mementoToRestore.getReason()); + undoStack.push(currentState); + + // Pop the next state from redo stack and restore it + DeckListMemento memento = redoStack.pop(); + deck->restoreMemento(memento); + + emit undoRedoStateChanged(); } diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h index 6acdb199e..e6bd27e2d 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_history_manager.h @@ -47,13 +47,6 @@ public: } private: - /** - * @brief Moves one state from @p source to @p target, applying it to @p deck. - * - * Used by both undo (undoStack -> redoStack) and redo (redoStack -> undoStack). - */ - void restoreAndSwap(QStack &source, QStack &target, DeckList *deck); - QStack undoStack; QStack redoStack; }; diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp index 66f228d19..efe20595b 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.cpp @@ -5,86 +5,6 @@ #include #include -static constexpr int MAX_DECK_SIZE = 1e5; - -namespace -{ - -/** - * @brief Expands card nodes into one lowercase name entry per copy. - * - * @param nodes The card nodes to expand. - * @param prefix Optional prefix prepended to every entry (e.g. "SB:" for the sideboard). - * @return One entry per copy, in node order. - */ -QStringList cardNodesToCopies(const QList &nodes, const QString &prefix = {}) -{ - QStringList result; - for (auto node : nodes) { - for (int i = 0; i < node->getNumber(); ++i) { - result.append(prefix + node->getName().toLower()); - } - } - return result; -} - -/** - * @brief Packs the first five bytes of a SHA-1 digest into a compact base-32 number. - * - * The bytes are placed in most-significant-byte-first order (byte 0 shifted by 32, - * byte 4 unshifted) so decks that only differ in their low-order hash bytes still - * produce distinct identifiers. - * - * @return The 8-character base-32 representation of the packed number. - */ -QString encodeDeckHash(const QByteArray &digest) -{ - quint64 number = 0; - for (int i = 0; i < 5; ++i) { - number |= static_cast(static_cast(digest[i])) << (32 - 8 * i); - } - return QString::number(number, 32).rightJustified(8, '0'); -} - -/** - * @brief Collects every card node in @p node's subtree, in tree order. - * - * @return The collected card nodes. - */ -QList collectCardsRecursive(const InnerDecklistNode *node) -{ - QList result; - for (int i = 0; i < node->size(); i++) { - if (auto *card = dynamic_cast(node->at(i))) { - result.append(card); - } else if (auto *inner = dynamic_cast(node->at(i))) { - result.append(collectCardsRecursive(inner)); - } - } - return result; -} - -/** - * @brief Invokes @p func on every card in @p node's subtree. - * - * Cards nested in custom zones are reported with their top-level @p boardZone - * so that callers can classify cards by board (main/side/maybeboard/tokens). - */ -void forEachCardInNode(InnerDecklistNode *boardZone, - InnerDecklistNode *node, - const std::function &func) -{ - for (int i = 0; i < node->size(); i++) { - if (auto *card = dynamic_cast(node->at(i))) { - func(boardZone, card); - } else if (auto *inner = dynamic_cast(node->at(i))) { - forEachCardInNode(boardZone, inner, func); - } - } -} - -} // namespace - DecklistNodeTree::DecklistNodeTree() : root(new InnerDecklistNode()) { } @@ -121,8 +41,19 @@ QList DecklistNodeTree::getCardNodes(const QSet result; + std::function collectCards = [&collectCards, + &result](const InnerDecklistNode *node) { + for (int i = 0; i < node->size(); i++) { + if (auto *card = dynamic_cast(node->at(i))) { + result.append(card); + } else if (auto *inner = dynamic_cast(node->at(i))) { + collectCards(inner); + } + } + }; + for (auto *zoneNode : getZoneNodes(restrictToZones)) { - result.append(collectCardsRecursive(zoneNode)); + collectCards(zoneNode); } return result; @@ -150,11 +81,25 @@ QString DecklistNodeTree::computeDeckHash() const auto mainDeckNodes = getCardNodes({DECK_ZONE_MAIN}); auto sideDeckNodes = getCardNodes({DECK_ZONE_SIDE}); - QStringList cardList = cardNodesToCopies(mainDeckNodes) + cardNodesToCopies(sideDeckNodes, "SB:"); + static auto nodesToCardList = [](const QList &nodes, const QString &prefix = {}) { + QStringList result; + for (auto node : nodes) { + for (int i = 0; i < node->getNumber(); ++i) { + result.append(prefix + node->getName().toLower()); + } + } + return result; + }; + + QStringList cardList = nodesToCardList(mainDeckNodes) + nodesToCardList(sideDeckNodes, "SB:"); cardList.sort(); QByteArray deckHashArray = QCryptographicHash::hash(cardList.join(";").toUtf8(), QCryptographicHash::Sha1); - return encodeDeckHash(deckHashArray); + quint64 number = (((quint64)(unsigned char)deckHashArray[0]) << 32) + + (((quint64)(unsigned char)deckHashArray[1]) << 24) + + (((quint64)(unsigned char)deckHashArray[2] << 16)) + + (((quint64)(unsigned char)deckHashArray[3]) << 8) + (quint64)(unsigned char)deckHashArray[4]; + return QString::number(number, 32).rightJustified(8, '0'); } void DecklistNodeTree::write(QXmlStreamWriter *xml) const @@ -168,7 +113,7 @@ void DecklistNodeTree::readZoneElement(QXmlStreamReader *xml) { QString zoneName = xml->attributes().value("name").toString(); InnerDecklistNode *newZone = getZoneObjFromName(zoneName); - totalCards += newZone->readElement(xml, MAX_DECK_SIZE - totalCards); + newZone->readElement(xml); } DecklistCardNode *DecklistNodeTree::addCard(const QString &cardName, @@ -180,8 +125,6 @@ DecklistCardNode *DecklistNodeTree::addCard(const QString &cardName, const QString &cardProviderId, const bool formatLegal) { - amount = qMin(amount, MAX_DECK_SIZE - totalCards); - totalCards += amount; auto *zoneNode = getZoneObjFromName(zoneName); auto *node = new DecklistCardNode(cardName, amount, zoneNode, position, cardSetName, cardSetCollectorNumber, cardProviderId, formatLegal); @@ -201,7 +144,11 @@ bool DecklistNodeTree::deleteNode(AbstractDecklistNode *node, InnerDecklistNode int index = rootNode->indexOf(node); if (index != -1) { delete rootNode->takeAt(index); - pruneEmptyBoardZone(rootNode); + + if (rootNode->empty()) { + deleteNode(rootNode, rootNode->getParent()); + } + return true; } @@ -217,175 +164,39 @@ bool DecklistNodeTree::deleteNode(AbstractDecklistNode *node, InnerDecklistNode return false; } -void DecklistNodeTree::pruneEmptyBoardZone(InnerDecklistNode *container) -{ - if (container->isEmpty() && container->getParent() == root) { - deleteNode(container, container->getParent()); - } -} - void DecklistNodeTree::forEachCard(const std::function &func) const { + // Cards nested in custom zones are reported with their top-level board zone + // so that callers can classify cards by board (main/side/maybeboard/tokens). + std::function walk = [&func, &walk](InnerDecklistNode *boardZone, + InnerDecklistNode *node) { + for (int i = 0; i < node->size(); i++) { + if (auto *card = dynamic_cast(node->at(i))) { + func(boardZone, card); + } else if (auto *inner = dynamic_cast(node->at(i))) { + walk(boardZone, inner); + } + } + }; + for (int i = 0; i < root->size(); i++) { if (auto *zone = dynamic_cast(root->at(i))) { - forEachCardInNode(zone, zone, func); + walk(zone, zone); } } } /** * Gets the InnerDecklistNode that is the root node for the given zone, creating a new node if it doesn't exist. - * - * Top-level zones take precedence, then deck-unique custom zones nested under boards - * are resolved. Unknown names create a new top-level zone (legacy behavior). */ -InnerDecklistNode *DecklistNodeTree::getZoneObjFromName(const QString &zoneName) +InnerDecklistNode *DecklistNodeTree::getZoneObjFromName(const QString &zoneName) const { for (int i = 0; i < root->size(); i++) { auto *node = dynamic_cast(root->at(i)); - if (node && node->getName() == zoneName) { + if (node->getName() == zoneName) { return node; } } - if (auto *customZone = findCustomZoneByName(zoneName)) { - return customZone; - } - return new InnerDecklistNode(zoneName, root); } - -InnerDecklistNode *DecklistNodeTree::findBoardZone(const QString &boardZoneName) const -{ - return dynamic_cast(root->findChild(boardZoneName)); -} - -InnerDecklistNode *DecklistNodeTree::findOrCreateBoardZone(const QString &boardZoneName) -{ - auto *boardZone = findBoardZone(boardZoneName); - if (!boardZone && - (boardZoneName == DECK_ZONE_MAYBEBOARD || boardZoneName == DECK_ZONE_MAIN || boardZoneName == DECK_ZONE_SIDE)) { - // The boards are lazy zones: they only exist once cards or custom zones need them. - boardZone = new InnerDecklistNode(boardZoneName, root); - } - return boardZone; -} - -InnerDecklistNode *DecklistNodeTree::addCustomZone(const QString &boardZoneName, const QString &zoneName) -{ - if (hasZoneName(zoneName)) { - return nullptr; - } - - auto *boardZone = findOrCreateBoardZone(boardZoneName); - - if (!boardZone) { - return nullptr; - } - - return new InnerDecklistNode(zoneName, boardZone); -} - -bool DecklistNodeTree::renameCustomZone(const QString &oldZoneName, const QString &newZoneName) -{ - if (hasZoneName(newZoneName)) { - return false; - } - - auto *zone = findCustomZoneByName(oldZoneName); - if (!zone) { - return false; - } - - zone->setName(newZoneName); - return true; -} - -bool DecklistNodeTree::moveCustomZone(const QString &zoneName, const QString &newBoardZoneName) -{ - auto *zone = findCustomZoneByName(zoneName); - if (!zone) { - return false; - } - - auto *currentBoardZone = zone->getParent(); - if (currentBoardZone && currentBoardZone->getName() == newBoardZoneName) { - return true; - } - - auto *newBoardZone = findOrCreateBoardZone(newBoardZoneName); - if (!newBoardZone) { - return false; - } - - currentBoardZone->removeOne(zone); - newBoardZone->append(zone); - zone->setParent(newBoardZone); - return true; -} - -bool DecklistNodeTree::removeCustomZone(const QString &zoneName) -{ - auto *zone = findCustomZoneByName(zoneName); - if (!zone) { - return false; - } - - // Detach and delete without pruning the board zone. - auto *boardZone = zone->getParent(); - boardZone->removeOne(zone); - delete zone; - return true; -} - -QList DecklistNodeTree::getCustomZones(const QString &boardZoneName) const -{ - QList result; - - auto *boardZone = findBoardZone(boardZoneName); - if (!boardZone) { - return result; - } - - for (int i = 0; i < boardZone->size(); i++) { - if (auto *customZone = dynamic_cast(boardZone->at(i))) { - result.append(customZone); - } - } - - return result; -} - -InnerDecklistNode *DecklistNodeTree::findCustomZoneByName(const QString &zoneName) const -{ - for (int i = 0; i < root->size(); i++) { - auto *boardZone = dynamic_cast(root->at(i)); - if (!boardZone) { - continue; - } - - for (int j = 0; j < boardZone->size(); j++) { - auto *customZone = dynamic_cast(boardZone->at(j)); - if (customZone && customZone->getName() == zoneName) { - return customZone; - } - } - } - - return nullptr; -} - -bool DecklistNodeTree::hasZoneName(const QString &zoneName) const -{ - // The standard zones are reserved names even before they are created lazily. - if (zoneName == DECK_ZONE_MAIN || zoneName == DECK_ZONE_SIDE || zoneName == DECK_ZONE_MAYBEBOARD || - zoneName == DECK_ZONE_TOKENS) { - return true; - } - - if (root->findChild(zoneName)) { - return true; - } - - return findCustomZoneByName(zoneName) != nullptr; -} diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h index 2c66b34ff..eae20aa23 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_node_tree.h @@ -10,7 +10,6 @@ class DecklistNodeTree { InnerDecklistNode *root; ///< Root of the deck tree (zones + cards). - int totalCards = 0; public: /** @brief Constructs an empty DecklistNodeTree. */ @@ -78,62 +77,6 @@ public: const bool formatLegal = true); bool deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNode = nullptr); - /** - * @brief Creates a new custom zone nested under a board zone. - * - * Custom zone names must be unique across the whole deck so that cards can be - * added to a custom zone without specifying its board zone. - * - * @param boardZoneName Name of the board zone (e.g. DECK_ZONE_MAIN). - * @param zoneName Name of the custom zone. - * @return The created zone node, or nullptr if the name is already in use. - */ - InnerDecklistNode *addCustomZone(const QString &boardZoneName, const QString &zoneName); - - /** - * @brief Renames a custom zone. - * @return true on success, false if the zone was not found or the new name is taken. - */ - bool renameCustomZone(const QString &oldZoneName, const QString &newZoneName); - - /** - * @brief Moves a custom zone (and all its cards) to another board zone. - * @return true on success, false if the zone or the new board zone was not found. - */ - bool moveCustomZone(const QString &zoneName, const QString &newBoardZoneName); - - /** - * @brief Removes a custom zone and all its cards. - * @return true if the zone was found and removed. - */ - bool removeCustomZone(const QString &zoneName); - - /** - * @brief Gets all custom zones nested under a board zone. - * @param boardZoneName Name of the board zone. - * @return The custom zones, in insertion order. - */ - QList getCustomZones(const QString &boardZoneName) const; - - /** - * @brief Checks whether a zone name is taken anywhere in the deck. - * - * Covers the standard board names and any top-level or nested custom zone. - * @param zoneName The checked name. - * @return true if the name is reserved or already in use. - */ - bool hasZoneName(const QString &zoneName) const; - - /** - * @brief Finds a custom zone anywhere in the deck by name. - * - * Walks the children of every top-level zone, so a zone nested under any - * board (and not just the standard ones) is found. - * @param zoneName The zone name to find. - * @return The matching zone node, or nullptr if none exists. - */ - InnerDecklistNode *findCustomZoneByName(const QString &zoneName) const; - /** * @brief Applies a function to every card in the deck tree. This can modify the cards. * @@ -144,17 +87,7 @@ public: private: // Helpers for traversing the tree - InnerDecklistNode *getZoneObjFromName(const QString &zoneName); - InnerDecklistNode *findBoardZone(const QString &boardZoneName) const; - InnerDecklistNode *findOrCreateBoardZone(const QString &boardZoneName); - - /** - * @brief Recursively removes @p container when it is an empty board zone. - * - * Empty custom zones are kept while empty board zones get pruned, so a - * board zone disappears once its last card or custom zone goes away. - */ - void pruneEmptyBoardZone(InnerDecklistNode *container); + InnerDecklistNode *getZoneObjFromName(const QString &zoneName) const; }; #endif // COCKATRICE_DECKLIST_NODE_TREE_H diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp deleted file mode 100644 index de50d743b..000000000 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.cpp +++ /dev/null @@ -1,172 +0,0 @@ -#include "deck_list_plain_text_parser.h" - -#include "deck_list_node_tree.h" -#include "tree/inner_deck_list_node.h" - -#include -#include - -namespace DeckListPlainText -{ - -bool parse(QTextStream &in, - const std::function &cardNameNormalizer, - DeckList::Metadata &metadata, - DecklistNodeTree &tree) -{ - tree.clear(); - - static const QRegularExpression reCardLine(R"(^\s*[\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption); - static const QRegularExpression reEmpty("^\\s*$"); - static const QRegularExpression reComment(R"([\w\[\(\{].*$)", QRegularExpression::UseUnicodePropertiesOption); - static const QRegularExpression reSBMark("^\\s*sb:\\s*(.+)", QRegularExpression::CaseInsensitiveOption); - static const QRegularExpression reSBComment("^sideboard\\b.*$", QRegularExpression::CaseInsensitiveOption); - static const QRegularExpression reDeckComment("^((main)?deck(list)?|mainboard)\\b", - QRegularExpression::CaseInsensitiveOption); - - // Regex for advanced card parsing - static const QRegularExpression reMultiplier(R"(^[xX\(\[]*(\d+)[xX\*\)\]]* ?(.+))"); - - // Regex for extracting set code and collector number with attached symbols - static const QRegularExpression reHyphenFormat(R"(\((\w{3,})\)\s+(\w{3,})-(\d+[^\w\s]*))"); - static const QRegularExpression reRegularFormat(R"(\((\w{3,})\)\s+(\d+[^\w\s]*))"); - - auto inputs = in.readAll().trimmed().split('\n'); - auto max_line = inputs.size(); - - // Start at the first empty line before the first card line - auto deckStart = inputs.indexOf(reCardLine); - if (deckStart == -1) { - if (inputs.indexOf(reComment) == -1) { - return false; // Input is empty - } - deckStart = max_line; - } else { - deckStart = inputs.lastIndexOf(reEmpty, deckStart); - if (deckStart == -1) { - deckStart = 0; - } - } - - // find sideboard position, if marks are used this won't be needed - int sBStart = -1; - if (inputs.indexOf(reSBMark, deckStart) == -1) { - sBStart = inputs.indexOf(reSBComment, deckStart); - if (sBStart == -1) { - sBStart = inputs.indexOf(reEmpty, deckStart + 1); - if (sBStart == -1) { - sBStart = max_line; - } - auto nextCard = inputs.indexOf(reCardLine, sBStart + 1); - if (inputs.indexOf(reEmpty, nextCard + 1) != -1) { - sBStart = max_line; - } - } - } - - int index = 0; - QRegularExpressionMatch match; - - // Parse name and comments - while (index < deckStart) { - const auto ¤t = inputs.at(index++); - if (!current.contains(reEmpty)) { - match = reComment.match(current); - metadata.name = match.captured(); - break; - } - } - while (index < deckStart) { - const auto ¤t = inputs.at(index++); - if (!current.contains(reEmpty)) { - match = reComment.match(current); - metadata.comments += match.captured() + '\n'; - } - } - metadata.comments.chop(1); - - // Discard empty lines - while (index < max_line && inputs.at(index).contains(reEmpty)) { - ++index; - } - - // Discard line if it starts with deck or mainboard, all cards until the sideboard starts are in the mainboard - if (inputs.at(index).contains(reDeckComment)) { - ++index; - } - - // Parse decklist - for (; index < max_line; ++index) { - // check if line is a card - match = reCardLine.match(inputs.at(index)); - if (!match.hasMatch()) { - continue; - } - - QString cardName = match.captured().simplified(); - bool sideboard = false; - - // Sideboard detection - if (sBStart < 0) { - match = reSBMark.match(cardName); - if (match.hasMatch()) { - sideboard = true; - cardName = match.captured(1); - } - } else { - if (index == sBStart) { - continue; - } - sideboard = index > sBStart; - } - - // Extract set code, collector number, and foil - QString setCode; - QString collectorNumber; - bool isFoil = false; - - // Check for foil status at the end of the card name - if (cardName.endsWith("*F*", Qt::CaseInsensitive)) { - isFoil = true; - cardName.chop(3); // Remove the "*F*" from the card name - } - Q_UNUSED(isFoil); - - // Attempt to match the hyphen-separated format (PLST-2094) - match = reHyphenFormat.match(cardName); - if (match.hasMatch()) { - setCode = match.captured(2).toUpper(); - collectorNumber = match.captured(3); - cardName = cardName.left(match.capturedStart()).trimmed(); - } else { - // Attempt to match the regular format (PLST) 2094 - match = reRegularFormat.match(cardName); - if (match.hasMatch()) { - setCode = match.captured(1).toUpper(); - collectorNumber = match.captured(2); - cardName = cardName.left(match.capturedStart()).trimmed(); - } - } - - // check if a specific amount is mentioned - int amount = 1; - match = reMultiplier.match(cardName); - if (match.hasMatch()) { - amount = match.captured(1).toInt(); - cardName = match.captured(2); - } - - // Normalize the card name - cardName = cardNameNormalizer(cardName); - - // Determine the zone (mainboard/sideboard) - QString zoneName = sideboard ? DECK_ZONE_SIDE : DECK_ZONE_MAIN; - - // make new entry in decklist - tree.addCard(cardName, amount, zoneName, -1, setCode, collectorNumber); - } - - return true; -} - -} // namespace DeckListPlainText \ No newline at end of file diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h deleted file mode 100644 index e0f456a18..000000000 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_plain_text_parser.h +++ /dev/null @@ -1,33 +0,0 @@ -#ifndef COCKATRICE_DECK_LIST_PLAIN_TEXT_PARSER_H -#define COCKATRICE_DECK_LIST_PLAIN_TEXT_PARSER_H - -#include "deck_list.h" - -#include -#include - -class QTextStream; - -namespace DeckListPlainText -{ - -/** - * @brief Parses a plain-text deck list into a tree and its metadata. - * - * Clears the tree first, then fills both from the text. - * - * @param in The text to load - * @param cardNameNormalizer Function that takes the parsed card name string - * in the text and returns the name to store - * @param metadata Deck metadata written by the parser - * @param tree Deck tree the parser adds cards to - * @return False if the input was empty, true otherwise. - */ -bool parse(QTextStream &in, - const std::function &cardNameNormalizer, - DeckList::Metadata &metadata, - DecklistNodeTree &tree); - -} // namespace DeckListPlainText - -#endif // COCKATRICE_DECK_LIST_PLAIN_TEXT_PARSER_H \ No newline at end of file diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp index 855062c18..a76fed619 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/sideboard_plan.cpp @@ -2,32 +2,6 @@ #include -namespace -{ - -void readMoveCardToZone(QXmlStreamReader *xml, QList &moveList) -{ - MoveCard_ToZone move; - while (!xml->atEnd()) { - xml->readNext(); - const QString childName = xml->name().toString(); - if (xml->isStartElement()) { - if (childName == "card_name") { - move.set_card_name(xml->readElementText().toStdString()); - } else if (childName == "start_zone") { - move.set_start_zone(xml->readElementText().toStdString()); - } else if (childName == "target_zone") { - move.set_target_zone(xml->readElementText().toStdString()); - } - } else if (xml->isEndElement() && (childName == "move_card_to_zone")) { - moveList.append(move); - return; - } - } -} - -} // namespace - SideboardPlan::SideboardPlan(const QString &_name, const QList &_moveList) : name(_name), moveList(_moveList) { @@ -47,7 +21,23 @@ bool SideboardPlan::readElement(QXmlStreamReader *xml) if (childName == "name") { name = xml->readElementText(); } else if (childName == "move_card_to_zone") { - readMoveCardToZone(xml, moveList); + MoveCard_ToZone m; + while (!xml->atEnd()) { + xml->readNext(); + const QString childName2 = xml->name().toString(); + if (xml->isStartElement()) { + if (childName2 == "card_name") { + m.set_card_name(xml->readElementText().toStdString()); + } else if (childName2 == "start_zone") { + m.set_start_zone(xml->readElementText().toStdString()); + } else if (childName2 == "target_zone") { + m.set_target_zone(xml->readElementText().toStdString()); + } + } else if (xml->isEndElement() && (childName2 == "move_card_to_zone")) { + moveList.append(m); + break; + } + } } } else if (xml->isEndElement() && (childName == "sideboard_plan")) { return true; diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp index 685238d53..705dfae4c 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.cpp @@ -34,6 +34,17 @@ bool AbstractDecklistCardNode::compareName(AbstractDecklistNode *other) const } } +bool AbstractDecklistCardNode::readElement(QXmlStreamReader *xml) +{ + while (!xml->atEnd()) { + xml->readNext(); + if (xml->isEndElement() && xml->name().toString() == "card") { + return false; + } + } + return true; +} + void AbstractDecklistCardNode::writeElement(QXmlStreamWriter *xml) { xml->writeEmptyElement("card"); @@ -49,4 +60,4 @@ void AbstractDecklistCardNode::writeElement(QXmlStreamWriter *xml) if (!getCardProviderId().isEmpty()) { xml->writeAttribute("uuid", getCardProviderId()); } -} +} \ No newline at end of file diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h index 0942a4601..df903a168 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h @@ -134,6 +134,15 @@ public: */ bool compareName(AbstractDecklistNode *other) const; + /** + * @brief Deserialize this node’s properties from XML. + * @param xml QXmlStreamReader positioned at the element. + * @return true if parsing succeeded. + * + * This supports loading deck files from Cockatrice’s XML format. + */ + bool readElement(QXmlStreamReader *xml) override; + /** * @brief Serialize this node’s properties to XML. * @param xml Writer to append this node’s XML element. diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h index 38d1d44b8..a39f0e7b2 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_node.h @@ -142,12 +142,6 @@ public: return parent; } - /** @param newParent Reparent this node. The new parent takes ownership. */ - void setParent(InnerDecklistNode *newParent) - { - parent = newParent; - } - /** * @brief Compute the depth of this node in the tree. * @return Distance from the root (root = 0, children = 1, etc.). @@ -179,10 +173,11 @@ public: /** * @name XML serialization - * This method supports writing this node and its children to the + * These methods support reading and writing decks from/to * Cockatrice deck XML format. * @{ */ + virtual bool readElement(QXmlStreamReader *xml) = 0; virtual void writeElement(QXmlStreamWriter *xml) = 0; /// @} }; diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp index 86f7f5363..1f470695d 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.cpp @@ -43,13 +43,6 @@ void InnerDecklistNode::setSortMethod(DeckSortMethod method) } } -const QList &InnerDecklistNode::boardZoneNames() -{ - static const QList names = {QString(DECK_ZONE_MAIN), QString(DECK_ZONE_SIDE), - QString(DECK_ZONE_MAYBEBOARD)}; - return names; -} - QString InnerDecklistNode::getVisibleName() const { return visibleNameFromName(name); @@ -94,9 +87,6 @@ AbstractDecklistNode *InnerDecklistNode::findCardChildByNameProviderIdAndNumber( int InnerDecklistNode::height() const { - if (isEmpty()) { - return 1; - } return at(0)->height() + 1; } @@ -151,35 +141,27 @@ bool InnerDecklistNode::compareName(AbstractDecklistNode *other) const } } -int InnerDecklistNode::readCardElement(QXmlStreamReader *xml, int remainingBudget) +bool InnerDecklistNode::readElement(QXmlStreamReader *xml) { - const int amount = qMin(xml->attributes().value("number").toString().toInt(), remainingBudget); - new DecklistCardNode(xml->attributes().value("name").toString(), amount, this, -1, - xml->attributes().value("setShortName").toString(), - xml->attributes().value("collectorNumber").toString(), - xml->attributes().value("uuid").toString()); - return amount; -} - -int InnerDecklistNode::readElement(QXmlStreamReader *xml, int limit) -{ - int totalCards = 0; while (!xml->atEnd()) { xml->readNext(); const QString childName = xml->name().toString(); - const int remainingBudget = limit - totalCards; if (xml->isStartElement()) { if (childName == "zone") { auto *newZone = new InnerDecklistNode(xml->attributes().value("name").toString(), this); - totalCards += newZone->readElement(xml, remainingBudget); + newZone->readElement(xml); } else if (childName == "card") { - totalCards += readCardElement(xml, remainingBudget); + auto *newCard = new DecklistCardNode( + xml->attributes().value("name").toString(), xml->attributes().value("number").toString().toInt(), + this, -1, xml->attributes().value("setShortName").toString(), + xml->attributes().value("collectorNumber").toString(), xml->attributes().value("uuid").toString()); + newCard->readElement(xml); } } else if (xml->isEndElement() && (childName == "zone")) { - return totalCards; + return false; } } - return totalCards; + return true; } void InnerDecklistNode::writeElement(QXmlStreamWriter *xml) @@ -192,35 +174,31 @@ void InnerDecklistNode::writeElement(QXmlStreamWriter *xml) xml->writeEndElement(); // zone } -QVector> InnerDecklistNode::indexedSnapshot() const -{ - QVector> snapshot(size()); - for (int i = size() - 1; i >= 0; --i) { - snapshot[i].first = i; - snapshot[i].second = at(i); - } - return snapshot; -} - -QVector> InnerDecklistNode::applySortedOrder(const QVector> &sorted) -{ - QVector> result(size()); - for (int i = size() - 1; i >= 0; --i) { - result[i].first = sorted[i].first; - result[i].second = i; - replace(i, sorted[i].second); - } - return result; -} - QVector> InnerDecklistNode::sort(Qt::SortOrder order) { - auto snapshot = indexedSnapshot(); + QVector> result(size()); + // Initialize temporary list with contents of current list + QVector> tempList(size()); + for (int i = size() - 1; i >= 0; --i) { + tempList[i].first = i; + tempList[i].second = at(i); + } + + // Sort temporary list auto cmp = [order](const auto &a, const auto &b) { return (order == Qt::AscendingOrder) ? (b.second->compare(a.second)) : (a.second->compare(b.second)); }; - std::sort(snapshot.begin(), snapshot.end(), cmp); - return applySortedOrder(snapshot); -} + std::sort(tempList.begin(), tempList.end(), cmp); + + // Map old indexes to new indexes and + // copy temporary list to the current one + for (int i = size() - 1; i >= 0; --i) { + result[i].first = tempList[i].first; + result[i].second = i; + replace(i, tempList[i].second); + } + + return result; +} \ No newline at end of file diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h index 8404d7116..f8fdedf30 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h @@ -18,9 +18,6 @@ #include "abstract_deck_list_node.h" -#include -#include - /** @brief Constant for the "main" deck zone name. */ #define DECK_ZONE_MAIN "main" /** @brief Constant for the "sideboard" zone name. */ @@ -121,13 +118,6 @@ public: */ static QString visibleNameFromName(const QString &_name); - /** - * @brief The standard board zone names, in display order. - * - * @return main, side and maybeboard. - */ - static const QList &boardZoneNames(); - /** * @brief Get this node’s display-friendly name. * @return Human-readable name (zone/group name). @@ -223,45 +213,18 @@ public: */ QVector> sort(Qt::SortOrder order = Qt::AscendingOrder); -private: - /** - * @brief Snapshots the current children as (old index, node) pairs. - */ - QVector> indexedSnapshot() const; - - /** - * @brief Replaces this node's children with @p sorted and maps old indexes to new ones. - * - * @return A list of (old index, new index) pairs for each reordered child. - */ - QVector> applySortedOrder(const QVector> &sorted); - -public: /** * @brief Deserialize this node and its children from XML. * @param xml Reader positioned at this element. - * @param limit The maximum amount of cards to read - * @return the amount of cards found + * @return true if parsing succeeded. */ - int readElement(QXmlStreamReader *xml, int limit); + bool readElement(QXmlStreamReader *xml) override; /** * @brief Serialize this node and its children to XML. * @param xml Writer to append elements to. */ void writeElement(QXmlStreamWriter *xml) override; - -private: - /** - * @brief Reads a single `card` element and appends it to this node. - * - * The card's quantity is capped at @p remainingBudget so a malicious or - * oversized deck file cannot push the total card count past the deck size - * limit. - * - * @return The amount of cards actually added. - */ - int readCardElement(QXmlStreamReader *xml, int remainingBudget); }; #endif // COCKATRICE_INNER_DECK_LIST_NODE_H diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp index df0c70ae7..25e8e97db 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp +++ b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp @@ -5,7 +5,6 @@ #include #include #include -#include #include static peg::parser search(R"( @@ -20,8 +19,7 @@ SomewhatComplexQueryPart <- [(] QueryPartList [)] / QueryPart QueryPart <- NotQuery / SetQuery / RarityQuery / CMCQuery / FormatQuery / PowerQuery / ToughnessQuery / ColorQuery / TypeQuery / OracleQuery / FieldQuery / GenericQuery NotQuery <- ('NOT' ws/'-') SomewhatComplexQueryPart -SetQuery <- ('e'/'set') SetQueryValue -SetQueryValue <- ([=:] FlexStringValue) / (<[!][=]?> FlexStringValue) / SetExpression +SetQuery <- ('e'/'set') [:] FlexStringValue OracleQuery <- 'o' [:] MatcherString @@ -66,8 +64,6 @@ RegexMatcherString <- ('\\/' / !'/' .)+ FlexStringValue <- CompactStringSet / String / [(] StringList [)] CompactStringSet <- StringListString ([,+] StringListString)+ -SetExpression <- NumericOperator ws? String - NumericExpression <- NumericOperator ws? NumericValue NumericOperator <- [=:] / <[> NumericValue <- [0-9]+ @@ -75,36 +71,6 @@ NumericValue <- [0-9]+ static std::once_flag init; -// The peglib parser rules (and therefore their rule actions) are set up once per -// process, so a rule action cannot capture per-instance state. The card language -// plain-text name and text queries search in is therefore handed to the GenericQuery -// and OracleQuery rule actions through this thread-local context, which is live only -// while a FilterString is being parsed. The rule actions copy it into the filter -// closures they produce, so card evaluation never reads process-global state. -thread_local CardSearchLanguage searchLanguageContext; - -namespace -{ -bool matchesInSearchLanguage(const QString &english, - const QString &localized, - const CardSearchLanguage &searchLanguage, - const StringMatcher &matcher) -{ - if (searchLanguage.mode == SearchLanguageMode::English) { - return matcher(english); - } - - if (searchLanguage.mode == SearchLanguageMode::Both) { - if (!searchLanguage.isEnglishOnly() && matcher(localized)) { - return true; - } - return matcher(english); - } - - return searchLanguage.isEnglishOnly() ? matcher(english) : matcher(localized); -} -} // namespace - static void setupParserRules() { auto passthru = [](const peg::SemanticValues &sv) -> Filter { @@ -134,35 +100,13 @@ static void setupParserRules() const auto matcher = std::any_cast(sv[0]); return [=](const CardData &x) -> bool { return matcher(x->getCardType()); }; }; - search["SetQueryValue"] = [](const peg::SemanticValues &sv) -> Filter { - if (sv.choice() == 0) { - auto matcher = std::any_cast(sv[0]); - return [=](const CardData &x) -> bool { - QList sets = x->getSets().keys(); - - auto matchesSet = [&matcher](const QString &set) { return matcher(set); }; - return std::any_of(sets.begin(), sets.end(), matchesSet); - }; - } - if (sv.choice() == 1) { - auto matcher = std::any_cast(sv[0]); - return [=](const CardData &x) -> bool { - QList sets = x->getSets().keys(); - - auto matchesSet = [&matcher](const QString &set) { return matcher(set); }; - return std::none_of(sets.begin(), sets.end(), matchesSet); - }; - } - - auto matcher = std::any_cast(sv[0]); + search["SetQuery"] = [](const peg::SemanticValues &sv) -> Filter { + auto matcher = std::any_cast(sv[0]); return [=](const CardData &x) -> bool { - const auto &sets = x->getSets().values(); - auto matchesSet = [&](const PrintingInfo &printing) { - return printing.getSet()->getEnabled() && matcher(printing.getSet()->getReleaseDate().toJulianDay()); - }; - return std::any_of(sets.begin(), sets.end(), [&](const auto &printings) { - return std::any_of(printings.begin(), printings.end(), matchesSet); - }); + QList sets = x->getSets().keys(); + + auto matchesSet = [&matcher](const QString &set) { return matcher(set); }; + return std::any_of(sets.begin(), sets.end(), matchesSet); }; }; search["Rarity"] = [](const peg::SemanticValues &sv) -> QString { @@ -303,54 +247,40 @@ static void setupParserRules() return QString::fromStdString(std::string(sv.sv())); }; - search["NumericOperator"] = [](const peg::SemanticValues &sv) -> NumberComparer { - const auto op = QString::fromStdString(std::string(sv.sv())); + search["NumericExpression"] = [](const peg::SemanticValues &sv) -> NumberMatcher { + const auto arg = std::any_cast(sv[1]); + const auto op = std::any_cast(sv[0]); if (op == ">") { - return [=](const int s, const int arg) { return s > arg; }; + return [=](const int s) { return s > arg; }; } if (op == ">=") { - return [=](const int s, const int arg) { return s >= arg; }; + return [=](const int s) { return s >= arg; }; } if (op == "<") { - return [=](const int s, const int arg) { return s < arg; }; + return [=](const int s) { return s < arg; }; } if (op == "<=") { - return [=](const int s, const int arg) { return s <= arg; }; + return [=](const int s) { return s <= arg; }; } if (op == "=") { - return [=](const int s, const int arg) { return s == arg; }; + return [=](const int s) { return s == arg; }; } if (op == ":") { - return [=](const int s, const int arg) { return s == arg; }; + return [=](const int s) { return s == arg; }; } if (op == "!=") { - return [=](const int s, const int arg) { return s != arg; }; + return [=](const int s) { return s != arg; }; } - return [](int, int) { return false; }; + return [](int) { return false; }; }; search["NumericValue"] = [](const peg::SemanticValues &sv) -> int { return QString::fromStdString(std::string(sv.sv())).toInt(); }; - search["NumericExpression"] = [](const peg::SemanticValues &sv) -> NumberMatcher { - const auto comparer = std::any_cast(sv[0]); - const auto arg = std::any_cast(sv[1]); - return [=](int s) { return comparer(s, arg); }; - }; - - search["SetExpression"] = [](const peg::SemanticValues &sv) -> NumberMatcher { - const auto comparer = std::any_cast(sv[0]); - const auto setCode = std::any_cast(sv[1]); - const auto allSets = CardDatabaseManager::getInstance()->getSetList(); - for (auto &set : allSets) { - if (set->getShortName() == setCode) { - const int releaseDate = set->getReleaseDate().toJulianDay(); - return [=](int s) { return comparer(s, releaseDate); }; - } - } - return [](int) { return false; }; + search["NumericOperator"] = [](const peg::SemanticValues &sv) -> QString { + return QString::fromStdString(std::string(sv.sv())); }; search["NormalMatcher"] = [](const peg::SemanticValues &sv) -> StringMatcher { @@ -373,11 +303,7 @@ static void setupParserRules() search["OracleQuery"] = [](const peg::SemanticValues &sv) -> Filter { const auto matcher = std::any_cast(sv[0]); - const CardSearchLanguage searchLanguage = searchLanguageContext; - return [=](const CardData &x) { - return matchesInSearchLanguage(x->getText(), x->getLocalizedText(searchLanguage.language), searchLanguage, - matcher); - }; + return [=](const CardData &x) { return matcher(x->getText()); }; }; search["ColorQuery"] = [](const peg::SemanticValues &sv) -> Filter { @@ -454,11 +380,7 @@ static void setupParserRules() }; search["GenericQuery"] = [](const peg::SemanticValues &sv) -> Filter { const auto matcher = std::any_cast(sv[0]); - const CardSearchLanguage searchLanguage = searchLanguageContext; - return [=](const CardData &x) { - return matchesInSearchLanguage(x->getName(), x->getLocalizedName(searchLanguage.language), searchLanguage, - matcher); - }; + return [=](const CardData &x) { return matcher(x->getName()); }; }; search["Color"] = [](const peg::SemanticValues &sv) -> char { return "WUBRGU"[sv.choice()]; }; @@ -473,7 +395,7 @@ FilterString::FilterString() _error = "Not initialized"; } -FilterString::FilterString(const QString &expr, const CardSearchLanguage &searchLanguage) +FilterString::FilterString(const QString &expr) { QByteArray ba = expr.simplified().toUtf8(); @@ -486,8 +408,6 @@ FilterString::FilterString(const QString &expr, const CardSearchLanguage &search return; } - searchLanguageContext = searchLanguage; - search.set_logger([&](size_t /*ln*/, size_t col, const std::string &msg) { _error = QString("Error at position %1: %2").arg(col).arg(QString::fromStdString(msg)); }); diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.h b/libcockatrice_filters/libcockatrice/filters/filter_string.h index 015df0cf4..71a99f7b5 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_string.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_string.h @@ -14,7 +14,6 @@ #include #include #include -#include #include inline Q_LOGGING_CATEGORY(FilterStringLog, "filter_string"); @@ -23,7 +22,6 @@ typedef CardInfoPtr CardData; typedef std::function Filter; typedef std::function StringMatcher; typedef std::function NumberMatcher; -typedef std::function NumberComparer; namespace peg { @@ -36,7 +34,7 @@ class FilterString { public: FilterString(); - explicit FilterString(const QString &exp, const CardSearchLanguage &searchLanguage = {}); + explicit FilterString(const QString &exp); [[nodiscard]] bool check(const CardData &card) const { if (card.isNull()) { diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp index a5d91d9d3..8502db50b 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp +++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp @@ -100,16 +100,14 @@ FilterTreeNode *FilterItemList::termNode(const QString &term) return childNodes.at(i); } -bool FilterItemList::testTypeAnd(const CardInfoPtr info, - CardFilter::Attr attr, - const CardSearchLanguage &searchLanguage) const +bool FilterItemList::testTypeAnd(const CardInfoPtr info, CardFilter::Attr attr) const { for (auto i = childNodes.constBegin(); i != childNodes.constEnd(); i++) { if (!(*i)->isEnabled()) { continue; } - if (!(*i)->acceptCardAttr(info, attr, searchLanguage)) { + if (!(*i)->acceptCardAttr(info, attr)) { return false; } } @@ -117,17 +115,13 @@ bool FilterItemList::testTypeAnd(const CardInfoPtr info, return true; } -bool FilterItemList::testTypeAndNot(const CardInfoPtr info, - CardFilter::Attr attr, - const CardSearchLanguage &searchLanguage) const +bool FilterItemList::testTypeAndNot(const CardInfoPtr info, CardFilter::Attr attr) const { // if any one in the list is true, return false - return !testTypeOr(info, attr, searchLanguage); + return !testTypeOr(info, attr); } -bool FilterItemList::testTypeOr(const CardInfoPtr info, - CardFilter::Attr attr, - const CardSearchLanguage &searchLanguage) const +bool FilterItemList::testTypeOr(const CardInfoPtr info, CardFilter::Attr attr) const { bool noChildEnabledChild = true; @@ -140,7 +134,7 @@ bool FilterItemList::testTypeOr(const CardInfoPtr info, noChildEnabledChild = false; } - if ((*i)->acceptCardAttr(info, attr, searchLanguage)) { + if ((*i)->acceptCardAttr(info, attr)) { return true; } } @@ -148,58 +142,20 @@ bool FilterItemList::testTypeOr(const CardInfoPtr info, return noChildEnabledChild; } -bool FilterItemList::testTypeOrNot(const CardInfoPtr info, - CardFilter::Attr attr, - const CardSearchLanguage &searchLanguage) const +bool FilterItemList::testTypeOrNot(const CardInfoPtr info, CardFilter::Attr attr) const { // if any one in the list is false, return true - return !testTypeAnd(info, attr, searchLanguage); + return !testTypeAnd(info, attr); } -bool FilterItem::acceptName(const CardInfoPtr info, const CardSearchLanguage &searchLanguage) const +bool FilterItem::acceptName(const CardInfoPtr info) const { - const QString &englishName = info->getName(); - const QString &localizedName = info->getLocalizedName(searchLanguage.language); - - switch (searchLanguage.mode) { - case SearchLanguageMode::English: - return englishName.contains(term, Qt::CaseInsensitive); - case SearchLanguageMode::Both: - if (englishName.contains(term, Qt::CaseInsensitive)) { - return true; - } - return !searchLanguage.isEnglishOnly() && localizedName.contains(term, Qt::CaseInsensitive); - case SearchLanguageMode::Selected: - if (searchLanguage.isEnglishOnly()) { - return englishName.contains(term, Qt::CaseInsensitive); - } - return localizedName.contains(term, Qt::CaseInsensitive); - } - - return false; + return info->getName().contains(term, Qt::CaseInsensitive); } -bool FilterItem::acceptNameExact(const CardInfoPtr info, const CardSearchLanguage &searchLanguage) const +bool FilterItem::acceptNameExact(const CardInfoPtr info) const { - const QString &englishName = info->getName(); - const QString &localizedName = info->getLocalizedName(searchLanguage.language); - - switch (searchLanguage.mode) { - case SearchLanguageMode::English: - return englishName == term; - case SearchLanguageMode::Both: - if (englishName == term) { - return true; - } - return !searchLanguage.isEnglishOnly() && localizedName == term; - case SearchLanguageMode::Selected: - if (searchLanguage.isEnglishOnly()) { - return englishName == term; - } - return localizedName == term; - } - - return false; + return info->getName() == term; } bool FilterItem::acceptType(const CardInfoPtr info) const @@ -257,27 +213,9 @@ bool FilterItem::acceptColor(const CardInfoPtr info) const return match_count == converted_term.length(); } -bool FilterItem::acceptText(const CardInfoPtr info, const CardSearchLanguage &searchLanguage) const +bool FilterItem::acceptText(const CardInfoPtr info) const { - const QString &englishText = info->getText(); - const QString &localizedText = info->getLocalizedText(searchLanguage.language); - - switch (searchLanguage.mode) { - case SearchLanguageMode::English: - return englishText.contains(term, Qt::CaseInsensitive); - case SearchLanguageMode::Both: - if (englishText.contains(term, Qt::CaseInsensitive)) { - return true; - } - return !searchLanguage.isEnglishOnly() && localizedText.contains(term, Qt::CaseInsensitive); - case SearchLanguageMode::Selected: - if (searchLanguage.isEnglishOnly()) { - return englishText.contains(term, Qt::CaseInsensitive); - } - return localizedText.contains(term, Qt::CaseInsensitive); - } - - return false; + return info->getText().contains(term, Qt::CaseInsensitive); } bool FilterItem::acceptSet(const CardInfoPtr info) const @@ -464,21 +402,19 @@ bool FilterItem::relationCheck(int cardInfo) const return result; } -bool FilterItem::acceptCardAttr(const CardInfoPtr info, - CardFilter::Attr attr, - const CardSearchLanguage &searchLanguage) const +bool FilterItem::acceptCardAttr(const CardInfoPtr info, CardFilter::Attr attr) const { switch (attr) { case CardFilter::AttrName: - return acceptName(info, searchLanguage); + return acceptName(info); case CardFilter::AttrNameExact: - return acceptNameExact(info, searchLanguage); + return acceptNameExact(info); case CardFilter::AttrType: return acceptType(info); case CardFilter::AttrColor: return acceptColor(info); case CardFilter::AttrText: - return acceptText(info, searchLanguage); + return acceptText(info); case CardFilter::AttrSet: return acceptSet(info); case CardFilter::AttrManaCost: @@ -548,18 +484,18 @@ FilterTreeNode *FilterTree::termNode(const CardFilter *f) return termNode(f->attr(), f->type(), f->term()); } -bool FilterTree::testAttr(const CardInfoPtr info, const LogicMap *lm, const CardSearchLanguage &searchLanguage) const +bool FilterTree::testAttr(const CardInfoPtr info, const LogicMap *lm) const { const FilterItemList *fil; bool status = true; fil = lm->findTypeList(CardFilter::TypeAnd); - if (fil && fil->isEnabled() && !fil->testTypeAnd(info, lm->attr, searchLanguage)) { + if (fil && fil->isEnabled() && !fil->testTypeAnd(info, lm->attr)) { return false; } fil = lm->findTypeList(CardFilter::TypeAndNot); - if (fil && fil->isEnabled() && !fil->testTypeAndNot(info, lm->attr, searchLanguage)) { + if (fil && fil->isEnabled() && !fil->testTypeAndNot(info, lm->attr)) { return false; } @@ -568,23 +504,23 @@ bool FilterTree::testAttr(const CardInfoPtr info, const LogicMap *lm, const Card status = false; // if this is true we can return because it is OR'd with the OrNot list - if (fil->testTypeOr(info, lm->attr, searchLanguage)) { + if (fil->testTypeOr(info, lm->attr)) { return true; } } fil = lm->findTypeList(CardFilter::TypeOrNot); - if (fil && fil->isEnabled() && fil->testTypeOrNot(info, lm->attr, searchLanguage)) { + if (fil && fil->isEnabled() && fil->testTypeOrNot(info, lm->attr)) { return true; } return status; } -bool FilterTree::acceptsCard(const CardInfoPtr info, const CardSearchLanguage &searchLanguage) const +bool FilterTree::acceptsCard(const CardInfoPtr info) const { for (auto i = childNodes.constBegin(); i != childNodes.constEnd(); i++) { - if ((*i)->isEnabled() && !testAttr(info, *i, searchLanguage)) { + if ((*i)->isEnabled() && !testAttr(info, *i)) { return false; } } diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.h b/libcockatrice_filters/libcockatrice/filters/filter_tree.h index dd47a1ebc..aac1777e0 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_tree.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.h @@ -11,7 +11,6 @@ #include #include -#include #include #include @@ -168,14 +167,10 @@ public: return CardFilter::typeName(type); } - [[nodiscard]] bool - testTypeAnd(CardInfoPtr info, CardFilter::Attr attr, const CardSearchLanguage &searchLanguage) const; - [[nodiscard]] bool - testTypeAndNot(CardInfoPtr info, CardFilter::Attr attr, const CardSearchLanguage &searchLanguage) const; - [[nodiscard]] bool - testTypeOr(CardInfoPtr info, CardFilter::Attr attr, const CardSearchLanguage &searchLanguage) const; - [[nodiscard]] bool - testTypeOrNot(CardInfoPtr info, CardFilter::Attr attr, const CardSearchLanguage &searchLanguage) const; + [[nodiscard]] bool testTypeAnd(CardInfoPtr info, CardFilter::Attr attr) const; + [[nodiscard]] bool testTypeAndNot(CardInfoPtr info, CardFilter::Attr attr) const; + [[nodiscard]] bool testTypeOr(CardInfoPtr info, CardFilter::Attr attr) const; + [[nodiscard]] bool testTypeOrNot(CardInfoPtr info, CardFilter::Attr attr) const; }; class FilterItem : public FilterTreeNode @@ -212,21 +207,20 @@ public: return true; } - [[nodiscard]] bool acceptName(CardInfoPtr info, const CardSearchLanguage &searchLanguage) const; - [[nodiscard]] bool acceptNameExact(CardInfoPtr info, const CardSearchLanguage &searchLanguage) const; + [[nodiscard]] bool acceptName(CardInfoPtr info) const; + [[nodiscard]] bool acceptNameExact(CardInfoPtr info) const; [[nodiscard]] bool acceptType(CardInfoPtr info) const; [[nodiscard]] bool acceptMainType(CardInfoPtr info) const; [[nodiscard]] bool acceptSubType(CardInfoPtr info) const; [[nodiscard]] bool acceptColor(CardInfoPtr info) const; - [[nodiscard]] bool acceptText(CardInfoPtr info, const CardSearchLanguage &searchLanguage) const; + [[nodiscard]] bool acceptText(CardInfoPtr info) const; [[nodiscard]] bool acceptSet(CardInfoPtr info) const; [[nodiscard]] bool acceptManaCost(CardInfoPtr info) const; [[nodiscard]] bool acceptCmc(CardInfoPtr info) const; [[nodiscard]] bool acceptPowerToughness(CardInfoPtr info, CardFilter::Attr attr) const; [[nodiscard]] bool acceptLoyalty(CardInfoPtr info) const; [[nodiscard]] bool acceptRarity(CardInfoPtr info) const; - [[nodiscard]] bool - acceptCardAttr(CardInfoPtr info, CardFilter::Attr attr, const CardSearchLanguage &searchLanguage) const; + [[nodiscard]] bool acceptCardAttr(CardInfoPtr info, CardFilter::Attr attr) const; [[nodiscard]] bool acceptFormat(CardInfoPtr info) const; [[nodiscard]] bool relationCheck(int cardInfo) const; }; @@ -246,7 +240,7 @@ private: LogicMap *attrLogicMap(CardFilter::Attr attr); FilterItemList *attrTypeList(CardFilter::Attr attr, CardFilter::Type type); - bool testAttr(CardInfoPtr info, const LogicMap *lm, const CardSearchLanguage &searchLanguage) const; + bool testAttr(CardInfoPtr info, const LogicMap *lm) const; void nodeChanged() const override { @@ -285,7 +279,7 @@ public: return 0; } - [[nodiscard]] bool acceptsCard(CardInfoPtr info, const CardSearchLanguage &searchLanguage) const; + [[nodiscard]] bool acceptsCard(CardInfoPtr info) const; void removeFiltersByAttr(CardFilter::Attr filterType); void removeFilter(const CardFilter *toRemove); void clear(); diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h index 900f51f2b..3f2cbbe8e 100644 --- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h +++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_cards_display_settings_provider.h @@ -1,8 +1,6 @@ #ifndef COCKATRICE_INTERFACE_CARDS_DISPLAY_SETTINGS_PROVIDER_H #define COCKATRICE_INTERFACE_CARDS_DISPLAY_SETTINGS_PROVIDER_H -#include - class ICardsDisplaySettingsProvider { public: @@ -28,8 +26,6 @@ public: [[nodiscard]] virtual int getEDHRecCardSize() const = 0; [[nodiscard]] virtual int getArchidektPreviewSize() const = 0; [[nodiscard]] virtual int getSampleHandSize() const = 0; - [[nodiscard]] virtual QString getCardLang() const = 0; - [[nodiscard]] virtual int getCardSearchLanguage() const = 0; }; #endif // COCKATRICE_INTERFACE_CARDS_DISPLAY_SETTINGS_PROVIDER_H diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_chat_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_chat_settings_provider.h index cdf2da5eb..cd9ad29e1 100644 --- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_chat_settings_provider.h +++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_chat_settings_provider.h @@ -20,7 +20,6 @@ public: [[nodiscard]] virtual bool getShowMessagePopup() const = 0; [[nodiscard]] virtual bool getShowMentionPopup() const = 0; [[nodiscard]] virtual bool getRoomHistory() const = 0; - [[nodiscard]] virtual bool getIgnoreAllPrivateMessages() const = 0; [[nodiscard]] virtual QString getHighlightWords() const = 0; }; diff --git a/libcockatrice_interfaces/libcockatrice/interfaces/interface_tabs_settings_provider.h b/libcockatrice_interfaces/libcockatrice/interfaces/interface_tabs_settings_provider.h index 054c4cd72..a81616cb0 100644 --- a/libcockatrice_interfaces/libcockatrice/interfaces/interface_tabs_settings_provider.h +++ b/libcockatrice_interfaces/libcockatrice/interfaces/interface_tabs_settings_provider.h @@ -21,7 +21,6 @@ public: [[nodiscard]] virtual bool getTabLogOpen() const = 0; [[nodiscard]] virtual bool getTabReportOpen() const = 0; [[nodiscard]] virtual bool getTabModerationOpen() const = 0; - [[nodiscard]] virtual bool getTabCardArtRulesOpen() const = 0; }; #endif // COCKATRICE_INTERFACE_TABS_SETTINGS_PROVIDER_H diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp index 3a734ed37..621f28983 100644 --- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp +++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp @@ -65,31 +65,25 @@ void CardSearchModel::updateSearchResults(const QString &query) continue; } - // The completer suggestions match against the same languages the card - // search uses, so typing a localized name finds the card. In Both mode - // either language can match. - for (const QString &matchName : searchableNames(card)) { - const QString lowerName = matchName.toLower(); - if (!lowerName.contains(lowerQuery)) { - continue; - } + const QString lowerName = card->getName().toLower(); + if (!lowerName.contains(lowerQuery)) { + continue; + } - const int distance = levenshteinDistance(lowerQuery, lowerName); + const int distance = levenshteinDistance(lowerQuery, lowerName); - if (lowerName.startsWith(lowerQuery)) { - prefixMatches.append({card, distance}); - } else { - containsMatches.append({card, distance}); - } - break; + if (lowerName.startsWith(lowerQuery)) { + prefixMatches.append({card, distance}); + } else { + containsMatches.append({card, distance}); } } - auto sortByDistanceThenLength = [this](const SearchResult &a, const SearchResult &b) { + auto sortByDistanceThenLength = [](const SearchResult &a, const SearchResult &b) { if (a.distance != b.distance) { return a.distance < b.distance; } - return sortableName(a.card).size() < sortableName(b.card).size(); + return a.card->getName().size() < b.card->getName().size(); }; std::sort(prefixMatches.begin(), prefixMatches.end(), sortByDistanceThenLength); @@ -107,25 +101,3 @@ void CardSearchModel::updateSearchResults(const QString &query) endResetModel(); } - -QStringList CardSearchModel::searchableNames(const CardInfoPtr &card) const -{ - if (searchLanguage.isEnglishOnly()) { - return {card->getName()}; - } - - const QString localizedName = card->getLocalizedName(searchLanguage.language); - if (searchLanguage.mode == SearchLanguageMode::Selected) { - return {localizedName}; - } - - return {card->getName(), localizedName}; -} - -QString CardSearchModel::sortableName(const CardInfoPtr &card) const -{ - if (searchLanguage.isEnglishOnly()) { - return card->getName(); - } - return card->getLocalizedName(searchLanguage.language); -} diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h index b877a9385..646bf7e61 100644 --- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h @@ -27,14 +27,6 @@ public: void updateSearchResults(const QString &query); // Update results based on input - void setSearchLanguage(const CardSearchLanguage &searchLang) - { - if (searchLanguage == searchLang) { - return; - } - searchLanguage = searchLang; - } - private: struct SearchResult { @@ -42,15 +34,8 @@ private: int distance; }; - /** @brief The names a card is searched by with the current search language. */ - [[nodiscard]] QStringList searchableNames(const CardInfoPtr &card) const; - - /** @brief The name used to break distance ties when sorting suggestions. */ - [[nodiscard]] QString sortableName(const CardInfoPtr &card) const; - CardDatabaseDisplayModel *sourceModel; QList searchResults; - CardSearchLanguage searchLanguage; }; #endif // CARD_SEARCH_MODEL_H diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp index 7f89677c8..724ee61f2 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp +++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp @@ -179,7 +179,7 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex } if (filterString != nullptr) { - if (filterTree != nullptr && !filterTree->acceptsCard(info, searchLanguage)) { + if (filterTree != nullptr && !filterTree->acceptsCard(info)) { return false; } return filterString->check(info); @@ -190,14 +190,8 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex bool CardDatabaseDisplayModel::rowMatchesCardName(CardInfoPtr info) const { - if (!cardName.isEmpty()) { - const bool matchesEnglish = info->getName().contains(cardName, Qt::CaseInsensitive); - const bool matchesLocalized = - !searchLanguage.isEnglishOnly() && - info->getLocalizedName(searchLanguage.language).contains(cardName, Qt::CaseInsensitive); - if (!matchesEnglish && !matchesLocalized) { - return false; - } + if (!cardName.isEmpty() && !info->getName().contains(cardName, Qt::CaseInsensitive)) { + return false; } if (!cardNameSet.isEmpty() && !cardNameSet.contains(info->getName())) { @@ -205,7 +199,7 @@ bool CardDatabaseDisplayModel::rowMatchesCardName(CardInfoPtr info) const } if (filterTree != nullptr) { - return filterTree->acceptsCard(info, searchLanguage); + return filterTree->acceptsCard(info); } return true; @@ -241,28 +235,6 @@ void CardDatabaseDisplayModel::setFilterTree(FilterTree *_filterTree) invalidate(); } -void CardDatabaseDisplayModel::setStringFilter(const QString &_src) -{ - searchText = _src; - delete filterString; - filterString = new FilterString(_src, searchLanguage); - dirty(); -} - -void CardDatabaseDisplayModel::setSearchLanguage(const CardSearchLanguage &searchLang) -{ - if (searchLanguage == searchLang) { - return; - } - - searchLanguage = searchLang; - - if (filterString != nullptr) { - setStringFilter(searchText); - } - dirty(); -} - void CardDatabaseDisplayModel::filterTreeChanged() { invalidate(); diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h index e6aadd8c6..c3145c356 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h @@ -10,7 +10,6 @@ #include #include -#include #include class FilterTree; @@ -33,8 +32,6 @@ private: FilterString *filterString; int loadedRowCount; QTimer dirtyTimer; - CardSearchLanguage searchLanguage; - QString searchText; /** The translation table that will be used for sanitizeCardName. */ static QMap characterTranslation; @@ -58,13 +55,17 @@ public: cardName = sanitizeCardName(_cardName, characterTranslation); dirty(); } - void setStringFilter(const QString &_src); + void setStringFilter(const QString &_src) + { + delete filterString; + filterString = new FilterString(_src); + dirty(); + } void setCardNameSet(const QSet &_cardNameSet) { cardNameSet = _cardNameSet; dirty(); } - void setSearchLanguage(const CardSearchLanguage &searchLang); void dirty() { diff --git a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt index a6ab2a204..d4aee3686 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt +++ b/libcockatrice_models/libcockatrice/models/deck_list/CMakeLists.txt @@ -7,8 +7,7 @@ set(HEADERS deck_list_model.h deck_list_sort_filter_proxy_model.h) qt6_wrap_cpp(MOC_SOURCES ${HEADERS}) add_library( - libcockatrice_models_deck_list STATIC ${MOC_SOURCES} deck_list_model.cpp deck_list_model_custom_zones.cpp - deck_list_sort_filter_proxy_model.cpp + libcockatrice_models_deck_list STATIC ${MOC_SOURCES} deck_list_model.cpp deck_list_sort_filter_proxy_model.cpp ) target_include_directories(libcockatrice_models_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp index a5628a844..9b43281c1 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp @@ -28,16 +28,6 @@ DeckListModel::~DeckListModel() delete root; } -void DeckListModel::setDisplayLanguage(const QString &lang) -{ - if (displayLang == lang) { - return; - } - displayLang = lang; - emit layoutAboutToBeChanged(); - emit layoutChanged(); -} - /** * @brief Extract the value from the card that is used for the group criteria. * @param info Pointer to card information. @@ -76,8 +66,7 @@ void DeckListModel::rebuildTree() for (int j = 0; j < currentZone->size(); j++) { auto *currentCard = dynamic_cast(currentZone->at(j)); - // Non-card children are custom zones; they are mirrored in a single - // pass below so each is mirrored exactly once. + //! \todo Better sanity checking. if (currentCard == nullptr) { continue; } @@ -93,19 +82,8 @@ void DeckListModel::rebuildTree() new DecklistModelCardNode(currentCard, groupNode); } - - // Custom zones nested under the board zone are mirrored as-is, with their - // cards as direct children (no further grouping). - DeckListModelCustomZones::mirrorCustomZones(currentZone, node); } - // The shadow tree was built in deck file order. Apply the active sort while - // the reset is still open so every consumer (tree view and visual editor) - // sees the canonical order from the start. sortShadowTree emits no signals, - // which is only valid before endResetModel closes the reset. - root->setSortMethod(lastKnownColumn == 0 ? DeckSortMethod::ByNumber : DeckSortMethod::ByName); - sortShadowTree(root, lastKnownOrder); - endResetModel(); refreshCardFormatLegalities(); @@ -176,9 +154,6 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const case DeckRoles::IsLegalRole: return true; - case DeckRoles::IsCustomZoneRole: - return DeckListModelCustomZones::isCustomZone(group); - default: return {}; } @@ -191,15 +166,8 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const switch (index.column()) { case DeckListModelColumns::CARD_AMOUNT: return card->getNumber(); - case DeckListModelColumns::CARD_NAME: { - if (role == Qt::DisplayRole) { - CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(card->getName()); - if (info) { - return info->getLocalizedName(displayLang); - } - } + case DeckListModelColumns::CARD_NAME: return card->getName(); - } case DeckListModelColumns::CARD_SET: return card->getCardSetShortName(); case DeckListModelColumns::CARD_COLLECTOR_NUMBER: @@ -222,10 +190,6 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const return card->getFormatLegality(); } - case DeckRoles::IsCustomZoneRole: { - return false; - } - default: { return {}; } @@ -363,13 +327,6 @@ bool DeckListModel::removeRows(int row, int count, const QModelIndex &parent) return false; } - // Custom zone rows are managed through the deck tree, never removed as model rows. - for (int i = 0; i < count; i++) { - if (DeckListModelCustomZones::isCustomZone(node->at(row + i))) { - return false; - } - } - beginRemoveRows(parent, row, row + count - 1); for (int i = 0; i < count; i++) { AbstractDecklistNode *toDelete = node->takeAt(row); @@ -380,8 +337,7 @@ bool DeckListModel::removeRows(int row, int count, const QModelIndex &parent) } endRemoveRows(); - // Empty criteria groups get pruned, but custom zones stay until explicitly deleted. - if (node->empty() && (node != root) && !DeckListModelCustomZones::isCustomZone(node)) { + if (node->empty() && (node != root)) { removeRows(parent.row(), 1, parent.parent()); } else { emitRecursiveUpdates(parent); @@ -395,8 +351,7 @@ bool DeckListModel::removeRows(int row, int count, const QModelIndex &parent) InnerDecklistNode *DeckListModel::createNodeIfNeeded(const QString &name, InnerDecklistNode *parent) { - // Group lookups must not resolve a mirrored custom zone that shares the name. - auto *newNode = DeckListModelCustomZones::findGroupChild(parent, name); + auto *newNode = dynamic_cast(parent->findChild(name)); if (!newNode) { beginInsertRows(nodeToIndex(parent), parent->size(), parent->size()); newNode = new InnerDecklistNode(name, parent); @@ -410,44 +365,24 @@ DecklistModelCardNode *DeckListModel::findCardNode(const QString &cardName, const QString &providerId, const QString &cardNumber) const { + InnerDecklistNode *zoneNode = dynamic_cast(root->findChild(zoneName)); + if (!zoneNode) { + return nullptr; + } + CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(cardName); if (!info) { return nullptr; } - // 1. Board zone lookup: search the criteria groups, then the custom zones - // nested under the board. - if (auto *zoneNode = dynamic_cast(root->findChild(zoneName))) { - QString groupCriteria = extractGroupCriteriaValue(info, activeGroupCriteria); - if (auto *groupNode = DeckListModelCustomZones::findGroupChild(zoneNode, groupCriteria)) { - if (auto *card = dynamic_cast( - groupNode->findCardChildByNameProviderIdAndNumber(cardName, providerId, cardNumber))) { - return card; - } - } - - for (auto *child : *zoneNode) { - if (!DeckListModelCustomZones::isCustomZone(child)) { - continue; - } - auto *customZone = dynamic_cast(child); - if (!customZone) { - continue; - } - if (auto *card = dynamic_cast( - customZone->findCardChildByNameProviderIdAndNumber(cardName, providerId, cardNumber))) { - return card; - } - } + QString groupCriteria = extractGroupCriteriaValue(info, activeGroupCriteria); + InnerDecklistNode *groupNode = dynamic_cast(zoneNode->findChild(groupCriteria)); + if (!groupNode) { + return nullptr; } - // 2. Custom zone lookup by name (custom zone names are deck-unique). - if (auto *customZone = DeckListModelCustomZones::findSubZoneByName(root, zoneName)) { - return dynamic_cast( - customZone->findCardChildByNameProviderIdAndNumber(cardName, providerId, cardNumber)); - } - - return nullptr; + return dynamic_cast( + groupNode->findCardChildByNameProviderIdAndNumber(cardName, providerId, cardNumber)); } QModelIndex DeckListModel::findCard(const QString &cardName, @@ -488,95 +423,29 @@ QModelIndex DeckListModel::addCard(const ExactCard &card, const QString &zoneNam return {}; } + InnerDecklistNode *zoneNode = createNodeIfNeeded(zoneName, root); + CardInfoPtr cardInfo = card.getCardPtr(); PrintingInfo printingInfo = card.getPrinting(); - InnerDecklistNode *cardParent = nullptr; + QString groupCriteria = extractGroupCriteriaValue(cardInfo, activeGroupCriteria); + InnerDecklistNode *groupNode = createNodeIfNeeded(groupCriteria, zoneNode); - auto *boardNode = dynamic_cast(root->findChild(zoneName)); - auto *customZoneNode = boardNode ? nullptr : DeckListModelCustomZones::findSubZoneByName(root, zoneName); - - // Mirroring flattens nested deck sub-zones into shadow rows, so a shadow row - // index is only usable as a deck-tree position while both sides have the same - // direct-children shape. When they diverge, the card is appended to the deck - // zone instead of being written out of range. - InnerDecklistNode *deckCardParent = nullptr; - bool customZoneNeedsAppend = false; - - if (boardNode) { - // Board zone: cards are grouped by the active criteria. - QString groupCriteria = extractGroupCriteriaValue(cardInfo, activeGroupCriteria); - cardParent = createNodeIfNeeded(groupCriteria, boardNode); - } else if (customZoneNode) { - // Custom zone: cards live flat inside the zone. - cardParent = customZoneNode; - auto *listRoot = deckList->getTree()->getRoot(); - for (int i = 0; i < listRoot->size(); ++i) { - auto *boardZone = dynamic_cast(listRoot->at(i)); - if (!boardZone) { - continue; - } - deckCardParent = dynamic_cast(boardZone->findChild(zoneName)); - if (deckCardParent) { - break; - } - } - // A deck custom zone holding nested sub-zones mirrors with flattened rows, - // so a shadow row index does not map onto its direct children. - if (deckCardParent) { - for (int i = 0; i < deckCardParent->size(); ++i) { - if (dynamic_cast(deckCardParent->at(i))) { - customZoneNeedsAppend = true; - break; - } - } - } - } else { - // Not present in the shadow tree. The deck tree may still hold a custom - // zone that has not been mirrored (callers can add a zone and then a - // card without a rebuild). Check before falling back to creating a - // top-level zone the deck does not actually have. - auto *listRoot = deckList->getTree()->getRoot(); - bool hasDeckZone = false; - for (int i = 0; i < listRoot->size(); ++i) { - if (auto *boardZone = dynamic_cast(listRoot->at(i))) { - // Only real zones count: a card sitting directly under the board - // shares the name comparison but is not a zone, and treating it as - // one would recurse forever without mirroring anything. - if (dynamic_cast(boardZone->findChild(zoneName))) { - hasDeckZone = true; - break; - } - } - } - - if (hasDeckZone) { - rebuildTree(); - return addCard(card, zoneName); - } - - // Unknown zone: create a top-level zone (legacy behavior). - QString groupCriteria = extractGroupCriteriaValue(cardInfo, activeGroupCriteria); - auto *newZone = createNodeIfNeeded(zoneName, root); - cardParent = createNodeIfNeeded(groupCriteria, newZone); - } - - const QModelIndex parentIndex = nodeToIndex(cardParent); - auto *cardNode = dynamic_cast(cardParent->findCardChildByNameProviderIdAndNumber( + const QModelIndex parentIndex = nodeToIndex(groupNode); + auto *cardNode = dynamic_cast(groupNode->findCardChildByNameProviderIdAndNumber( card.getName(), printingInfo.getUuid(), printingInfo.getProperty("num"))); const auto cardSetName = printingInfo.getSet().isNull() ? "" : printingInfo.getSet()->getCorrectedShortName(); bool cardNodeAdded = false; if (!cardNode) { // Determine the correct index - int insertRow = findSortedInsertRow(cardParent, cardInfo); - int deckInsertRow = customZoneNeedsAppend ? -1 : insertRow; + int insertRow = findSortedInsertRow(groupNode, cardInfo); - auto *decklistCard = deckList->addCard(cardInfo->getName(), zoneName, deckInsertRow, cardSetName, + auto *decklistCard = deckList->addCard(cardInfo->getName(), zoneName, insertRow, cardSetName, printingInfo.getProperty("num"), printingInfo.getProperty("uuid")); beginInsertRows(parentIndex, insertRow, insertRow); - cardNode = new DecklistModelCardNode(decklistCard, cardParent, insertRow); + cardNode = new DecklistModelCardNode(decklistCard, groupNode, insertRow); endInsertRows(); cardNodeAdded = true; @@ -707,41 +576,21 @@ QModelIndex DeckListModel::nodeToIndex(AbstractDecklistNode *node) const return createIndex(node->getParent()->indexOf(node), 0, node); } -/** - * @brief Sorts a freshly built shadow subtree without emitting model signals. - * - * Used by rebuildTree while the model reset is still open (emitting layout - * changes during a reset is invalid). Reorders every node just like - * sortHelper does, but ignores the movement mapping because there are no - * persistent indices established yet. - */ -void DeckListModel::sortShadowTree(InnerDecklistNode *node, Qt::SortOrder order) -{ - // The mapping is not needed: fresh shadow nodes have no persistent indices yet. - (void)DeckListModelCustomZones::sortWithCustomZonesLast(root, node, order); - - for (int i = node->size() - 1; i >= 0; --i) { - if (auto *subNode = dynamic_cast(node->at(i))) { - sortShadowTree(subNode, order); - } - } -} - void DeckListModel::sortHelper(InnerDecklistNode *node, Qt::SortOrder order) { - // Sort children (custom zones always sorted after groups within a board) and - // use the movement mapping to update the list of persistent indices. - const auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(root, node, order); + // Sort children of node and save the information needed to + // update the list of persistent indexes. + QVector> sortResult = node->sort(order); QModelIndexList from, to; int columns = columnCount(); - for (const auto &move : mapping) { - const int preSortRow = move.first; - const int finalRow = move.second; - AbstractDecklistNode *temp = node->at(finalRow); + for (int i = sortResult.size() - 1; i >= 0; --i) { + const int fromRow = sortResult[i].first; + const int toRow = sortResult[i].second; + AbstractDecklistNode *temp = node->at(toRow); for (int j = 0; j < columns; ++j) { - from << createIndex(preSortRow, j, temp); - to << createIndex(finalRow, j, temp); + from << createIndex(fromRow, j, temp); + to << createIndex(toRow, j, temp); } } changePersistentIndexList(from, to); @@ -855,15 +704,6 @@ QList DeckListModel::getZones() const return zones; } -QStringList DeckListModel::getCustomZoneNames(const QString &boardZoneName) const -{ - QStringList zoneNames; - for (const auto *customZone : deckList->getTree()->getCustomZones(boardZoneName)) { - zoneNames.append(customZone->getName()); - } - return zoneNames; -} - static int maxAllowedForLegality(const FormatRules &format, const QString &legality) { for (const AllowedCount &c : format.allowedCounts) { diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h index ce6d7f8cb..209ec8c42 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h @@ -1,8 +1,6 @@ #ifndef DECKLISTMODEL_H #define DECKLISTMODEL_H -#include "deck_list_model_custom_zones.h" - #include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/abstract_deck_list_card_node.h> #include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h> #include @@ -32,8 +30,7 @@ enum { IsCardRole = Qt::UserRole + 1, /**< Indicates whether the item represents a card. */ DepthRole, /**< Depth level within the deck's grouping hierarchy. */ - IsLegalRole, /**< Whether the card is legal in the current deck format. */ - IsCustomZoneRole /**< Whether the item represents a custom zone nested under a board zone. */ + IsLegalRole /**< Whether the card is legal in the current deck format. */ }; } // namespace DeckRoles @@ -287,16 +284,6 @@ public: explicit DeckListModel(QObject *parent, const QSharedPointer &deckList); ~DeckListModel() override; - /** - * @brief Selects the language code for localized card names in the display role. - * - * The model never reads global settings itself; callers wire this to the card - * language setting (including reacting to its changes) rather than the model - * querying it. - * @param lang Language code; "en" shows the canonical English names. - */ - void setDisplayLanguage(const QString &lang); - /** * @brief Returns the root index of the model. * @return QModelIndex representing the root node. @@ -404,21 +391,12 @@ public: */ [[nodiscard]] QList getZones() const; - /** - * @brief Gets the names of the custom zones nested under the given board zone. - * - * @param boardZoneName The board zone to query (main/side/maybeboard) - * @return The custom zone names, in deck order - */ - [[nodiscard]] QStringList getCustomZoneNames(const QString &boardZoneName) const; - private: QSharedPointer deckList; /**< Pointer to the decklist providing the underlying data. */ InnerDecklistNode *root; /**< Root node of the model tree. */ DeckListModelGroupCriteria::Type activeGroupCriteria = DeckListModelGroupCriteria::MAIN_TYPE; int lastKnownColumn; /**< Last column used for sorting. */ Qt::SortOrder lastKnownOrder; /**< Last known sort order. */ - QString displayLang = "en"; /**< Language code for localized card names in the display role. */ InnerDecklistNode *createNodeIfNeeded(const QString &name, InnerDecklistNode *parent); QModelIndex nodeToIndex(AbstractDecklistNode *node) const; @@ -449,7 +427,6 @@ private: void emitRecursiveUpdates(const QModelIndex &index); void sortHelper(InnerDecklistNode *node, Qt::SortOrder order); - void sortShadowTree(InnerDecklistNode *node, Qt::SortOrder order); template T getNode(const QModelIndex &index) const { diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp deleted file mode 100644 index 1dc745e63..000000000 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.cpp +++ /dev/null @@ -1,152 +0,0 @@ -#include "deck_list_model_custom_zones.h" - -#include "deck_list_model.h" - -#include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/deck_list_card_node.h> -#include -#include - -namespace DeckListModelCustomZones -{ - -bool isCustomZone(const AbstractDecklistNode *node) -{ - return dynamic_cast(node) != nullptr; -} - -namespace -{ - -/** - * @brief Flattens every card under @p zone into @p shadowZone, preserving order. - * - * Custom zones mirror as a single row level: cards nested in sub-zones of any - * depth are added as direct children of the mirrored zone so no card is left - * without a model row. - */ -void flattenCards(const InnerDecklistNode *zone, InnerDecklistNode *shadowZone) -{ - for (int k = 0; k < zone->size(); k++) { - if (auto *zoneCard = dynamic_cast(zone->at(k))) { - new DecklistModelCardNode(zoneCard, shadowZone); - } else if (auto *subZone = dynamic_cast(zone->at(k))) { - flattenCards(subZone, shadowZone); - } - } -} - -} // namespace - -void mirrorCustomZones(const InnerDecklistNode *deckBoardZone, InnerDecklistNode *shadowBoardZone) -{ - for (int j = 0; j < deckBoardZone->size(); j++) { - auto *customZone = dynamic_cast(deckBoardZone->at(j)); - if (!customZone) { - continue; - } - - auto *shadowZone = new DecklistModelSubZoneNode(customZone->getName(), shadowBoardZone); - flattenCards(customZone, shadowZone); - } -} - -InnerDecklistNode *findGroupChild(InnerDecklistNode *parent, const QString &name) -{ - for (int i = 0; i < parent->size(); i++) { - AbstractDecklistNode *child = parent->at(i); - if (isCustomZone(child)) { - continue; - } - auto *group = dynamic_cast(child); - if (group && group->getName() == name) { - return group; - } - } - return nullptr; -} - -DecklistModelSubZoneNode *findSubZoneByName(InnerDecklistNode *root, const QString &zoneName) -{ - for (int i = 0; i < root->size(); i++) { - auto *boardZone = dynamic_cast(root->at(i)); - if (!boardZone) { - continue; - } - - for (int j = 0; j < boardZone->size(); j++) { - auto *customZone = dynamic_cast(boardZone->at(j)); - if (customZone && customZone->getName() == zoneName) { - return customZone; - } - } - } - - return nullptr; -} - -namespace -{ - -/** - * @brief Sorts a node's children and returns the (preSortRow, finalRow) mapping. - */ -QList> plainSort(InnerDecklistNode *node, Qt::SortOrder order) -{ - const QVector> sortResult = node->sort(order); - - QList> mapping; - mapping.reserve(node->size()); - for (int i = 0; i < node->size(); ++i) { - mapping.append({sortResult[i].first, i}); - } - return mapping; -} - -/** - * @brief Sorts a board zone's children, then stably moves custom zones to the end. - * - * @return The (preSortRow, finalRow) mapping covering both the sort and the shift. - */ -QList> boardSort(InnerDecklistNode *node, Qt::SortOrder order) -{ - const QVector> sortResult = node->sort(order); - - QVector groups; - QVector customZones; - QHash preSortRowOf; - - groups.reserve(node->size()); - customZones.reserve(node->size()); - - for (int i = 0; i < node->size(); ++i) { - AbstractDecklistNode *child = node->at(i); - preSortRowOf.insert(child, sortResult[i].first); - if (isCustomZone(child)) { - customZones.append(child); - } else { - groups.append(child); - } - } - - QVector ordered = groups + customZones; - for (int i = 0; i < ordered.size(); ++i) { - node->replace(i, ordered[i]); - } - - QList> mapping; - mapping.reserve(ordered.size()); - for (int i = 0; i < ordered.size(); ++i) { - mapping.append({preSortRowOf.value(ordered[i]), i}); - } - return mapping; -} - -} // namespace - -QList> sortWithCustomZonesLast(InnerDecklistNode *root, InnerDecklistNode *node, Qt::SortOrder order) -{ - const bool isBoardZone = (node != root) && (node->getParent() == root); - return isBoardZone ? boardSort(node, order) : plainSort(node, order); -} - -} // namespace DeckListModelCustomZones diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h deleted file mode 100644 index 518a9e1d2..000000000 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model_custom_zones.h +++ /dev/null @@ -1,98 +0,0 @@ -#ifndef DECK_LIST_MODEL_CUSTOM_ZONES_H -#define DECK_LIST_MODEL_CUSTOM_ZONES_H - -#include <../../../../libcockatrice_deck_list/libcockatrice/deck_list/tree/inner_deck_list_node.h> -#include -#include -#include - -/** - * @class DecklistModelSubZoneNode - * @ingroup DeckModels - * @brief Model node representing a custom zone nested under a board zone. - * - * Custom zones group cards by user-defined names (e.g. "Removal", "Utility") - * inside a board zone. They are mirrored from the underlying deck tree so that - * they can be told apart from criteria group nodes by type. - */ -class DecklistModelSubZoneNode : public InnerDecklistNode -{ -public: - using InnerDecklistNode::InnerDecklistNode; -}; - -/** - * @namespace DeckListModelCustomZones - * @ingroup DeckModels - * @brief Tree-level helpers for the deck list model's custom-zone shadow nodes. - * - * The deck list model keeps a second "shadow" tree of InnerDecklistNode that - * mirrors the canonical deck tree for grouping and sorting. Custom zones add a - * layer of bookkeeping to that shadow tree: they must be mirrored alongside - * criteria groups, always sort after the groups within a board, and be - * resolvable by deck-unique name. - * - * This namespace centralizes every "what is / where is a custom zone" decision - * so the model itself only wires the results into Qt model signals. - */ -namespace DeckListModelCustomZones -{ - -/** - * @brief Whether the given node is a custom zone (as opposed to a criteria group). - */ -[[nodiscard]] bool isCustomZone(const AbstractDecklistNode *node); - -/** - * @brief Finds a criteria-group child of @p parent by name, skipping custom zones. - * - * The shadow tree keeps criteria groups and mirrored custom zones as siblings - * under a board zone, and `InnerDecklistNode::findChild` matches both by name. - * Group lookups must not resolve a custom zone that happens to share the group - * name (e.g. a zone called "Creature"), so this searches only non-custom - * children. - * - * @param parent The shadow node whose children are searched. - * @param name The group name to find. - * @return The matching group node, or nullptr if none exists. - */ -[[nodiscard]] InnerDecklistNode *findGroupChild(InnerDecklistNode *parent, const QString &name); - -/** - * @brief Mirrors the custom zones of a deck board zone into its shadow board node. - * - * Each custom zone becomes a DecklistModelSubZoneNode under @p shadowBoardZone - * with its cards as direct (un-grouped) children. - * - * @param deckBoardZone The board zone in the canonical deck tree. - * @param shadowBoardZone The matching board zone in the model's shadow tree. - */ -void mirrorCustomZones(const InnerDecklistNode *deckBoardZone, InnerDecklistNode *shadowBoardZone); - -/** - * @brief Finds a custom zone in the shadow tree by deck-unique name. - * @param root Root of the shadow tree. - * @param zoneName The custom zone name to find. - * @return The matching custom zone node, or nullptr if not found. - */ -[[nodiscard]] DecklistModelSubZoneNode *findSubZoneByName(InnerDecklistNode *root, const QString &zoneName); - -/** - * @brief Sorts a shadow node's children, keeping a board's custom zones last. - * - * Sorting alone would interleave custom zones with criteria groups by name, but - * custom zones must always stay after the groups within a board, regardless of - * name. This applies the sort and, for board zones, stably moves the custom - * zones to the end. - * - * @param root Root of the shadow tree (used to classify board zones). - * @param node The shadow node whose children are reordered. - * @param order Sort order to apply. - * @return A list of (preSortRow, finalRow) pairs describing how each node moved. - */ -[[nodiscard]] QList> -sortWithCustomZonesLast(InnerDecklistNode *root, InnerDecklistNode *node, Qt::SortOrder order); - -} // namespace DeckListModelCustomZones - -#endif // DECK_LIST_MODEL_CUSTOM_ZONES_H diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp index 687d93666..d6316deb3 100644 --- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp +++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.cpp @@ -253,24 +253,3 @@ PendingCommand *AbstractClient::prepareAdminCommand(const ::google::protobuf::Me c->GetReflection()->MutableMessage(c, cmd.GetDescriptor()->FindExtensionByName("ext"))->CopyFrom(cmd); return new PendingCommand(cont); } - -PendingCommand *AbstractClient::prepareDeveloperCommand(const ::google::protobuf::Message &cmd) -{ - CommandContainer cont; - DeveloperCommand *c = cont.add_developer_command(); - // A developer command message may also be usable through other command - // families, so select the extension scoped to DeveloperCommand rather than - // guessing by name. - const ::google::protobuf::Descriptor *cmdDescriptor = cmd.GetDescriptor(); - const ::google::protobuf::Descriptor *developerDescriptor = DeveloperCommand::descriptor(); - const ::google::protobuf::FieldDescriptor *developerExtension = nullptr; - for (int i = 0; i < cmdDescriptor->extension_count(); ++i) { - if (cmdDescriptor->extension(i)->containing_type() == developerDescriptor) { - developerExtension = cmdDescriptor->extension(i); - break; - } - } - Q_ASSERT(developerExtension != nullptr); - c->GetReflection()->MutableMessage(c, developerExtension)->CopyFrom(cmd); - return new PendingCommand(cont); -} diff --git a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h index af22a5c9d..1ef9a31e4 100644 --- a/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h +++ b/libcockatrice_network/libcockatrice/network/client/abstract/abstract_client.h @@ -173,7 +173,6 @@ public: static PendingCommand *prepareRoomCommand(const ::google::protobuf::Message &cmd, int roomId); static PendingCommand *prepareModeratorCommand(const ::google::protobuf::Message &cmd); static PendingCommand *prepareAdminCommand(const ::google::protobuf::Message &cmd); - static PendingCommand *prepareDeveloperCommand(const ::google::protobuf::Message &cmd); QMap clientFeatures; }; diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp index 6b4101a99..957a89792 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.cpp @@ -66,15 +66,6 @@ Server_AbstractPlayer::Server_AbstractPlayer(Server_Game *_game, Server_AbstractPlayer::~Server_AbstractPlayer() = default; -int Server_AbstractPlayer::getCardCount() const -{ - int result = 0; - for (auto *zone : zones) { - result += zone->getCards().size(); - } - return result; -} - void Server_AbstractPlayer::prepareDestroy() { delete deck; diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h index 4cc79c5fe..85fbc0557 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_abstract_player.h @@ -43,8 +43,6 @@ public: Server_AbstractUserInterface *_handler); ~Server_AbstractPlayer() override; void prepareDestroy() override; - /// Total cards across all of this player's zones. The caller must hold the game's mutex. - int getCardCount() const; const DeckList *getDeckList() const { return deck; diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp index 131ff1077..43209e994 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.cpp @@ -32,7 +32,6 @@ #include "server_spectator.h" #include -#include #include #include #include @@ -239,17 +238,6 @@ int Server_Game::getPlayerCount() const return participants.size() - getSpectatorCount(); } -int Server_Game::getCardsInGame() const -{ - QMutexLocker locker(&gameMutex); - - int result = 0; - for (auto *player : getPlayers()) { - result += player->getCardCount(); - } - return result; -} - int Server_Game::getSpectatorCount() const { QMutexLocker locker(&gameMutex); @@ -342,9 +330,6 @@ void Server_Game::doStartGameIfReady(bool forceStartGame) } } - // Only actual starts are timed. The early returns above are no-ops. - QElapsedTimer startupTimer; - startupTimer.start(); players = getPlayers(); // players could have been kicked, get new list of players if (lifecycleStrategy->onGameStarting(this) == Server_GameLifecycleStrategy::StartAction::Handled) { locker.unlock(); @@ -388,7 +373,6 @@ void Server_Game::doStartGameIfReady(bool forceStartGame) activePlayer = -1; nextTurn(); - room->getServer()->observeGameStartDurationMs(startupTimer.nsecsElapsed() / 1000000); locker.unlock(); @@ -465,7 +449,7 @@ Response::ResponseCode Server_Game::checkJoin(ServerInfo_User *user, if (asJudge && !(user->user_level() & ServerInfo_User::IsJudge)) { return Response::RespUserLevelTooLow; } - if (!(overrideRestrictions && (user->user_level() & (ServerInfo_User::IsModerator | ServerInfo_User::IsJudge)))) { + if (!(overrideRestrictions && (user->user_level() & ServerInfo_User::IsModerator))) { if ((_password != password) && !(spectator && !spectatorsNeedPassword)) { return Response::RespWrongPassword; } diff --git a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h index 1ed4fe4ca..1b9f651bd 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/game/server_game.h @@ -123,8 +123,6 @@ public: return gameStarted; } int getPlayerCount() const; - /// Total cards across all players' zones. Takes gameMutex itself. - int getCardsInGame() const; int getSpectatorCount() const; QMap getPlayers() const; Server_AbstractPlayer *getPlayer(int id) const; diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server.h b/libcockatrice_network/libcockatrice/network/server/remote/server.h index 3d27f4210..0ded27afa 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/server.h @@ -180,11 +180,6 @@ public: { return false; } - /// Called once per actual game start with how long bringing every player's - /// zones online took, so servers can spot deck sizes that wedge threads. - virtual void observeGameStartDurationMs(qint64 /* elapsedMs */) - { - } Server_DatabaseInterface *getDatabaseInterface() const; int getNextLocalGameId() diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp index 8422d703d..899df6529 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.cpp @@ -388,33 +388,6 @@ Response::ResponseCode Server_ProtocolHandler::processAdminCommandContainer(cons return finalResponseCode; } -Response::ResponseCode Server_ProtocolHandler::processDeveloperCommandContainer(const CommandContainer &cont, - ResponseContainer &rc) -{ - if (!userInfo) { - return Response::RespLoginNeeded; - } - if (!(userInfo->user_level() & ServerInfo_User::IsDeveloper)) { - return Response::RespLoginNeeded; - } - - resetIdleTimer(); - - Response::ResponseCode finalResponseCode = Response::RespOk; - for (int i = cont.developer_command_size() - 1; i >= 0; --i) { - Response::ResponseCode resp = Response::RespInvalidCommand; - const DeveloperCommand &sc = cont.developer_command(i); - const int num = getPbExtension(sc); - logDebugMessage(getSafeDebugString(sc)); - - resp = processExtendedDeveloperCommand(num, sc, rc); - if (resp != Response::RespOk) { - finalResponseCode = resp; - } - } - return finalResponseCode; -} - void Server_ProtocolHandler::processCommandContainer(const CommandContainer &cont) { // Command processing must be disabled after prepareDestroy() has been called. @@ -437,8 +410,6 @@ void Server_ProtocolHandler::processCommandContainer(const CommandContainer &con finalResponseCode = processModeratorCommandContainer(cont, responseContainer); } else if (cont.admin_command_size()) { finalResponseCode = processAdminCommandContainer(cont, responseContainer); - } else if (cont.developer_command_size()) { - finalResponseCode = processDeveloperCommandContainer(cont, responseContainer); } else { finalResponseCode = Response::RespInvalidCommand; } @@ -483,12 +454,11 @@ void Server_ProtocolHandler::pingClockTimeout() prepareDestroy(); } - // PrivLevel users, Moderators, Admins, and Developers are not subject to the server idle timeout policy + // PrivLevel users, Moderators, and Admins are not subject to the server idle timeout policy const bool hasPrivLevel = userInfo && QString::fromStdString(userInfo->privlevel()).toLower() != "none"; - const bool isStaff = - userInfo && (userInfo->user_level() & - (ServerInfo_User::IsModerator | ServerInfo_User::IsAdmin | ServerInfo_User::IsDeveloper)); - if (!hasPrivLevel && !isStaff) { + const bool isModOrAdmin = + userInfo && (userInfo->user_level() & (ServerInfo_User::IsModerator | ServerInfo_User::IsAdmin)); + if (!hasPrivLevel && !isModOrAdmin) { if ((server->getIdleClientTimeout() > 0) && (idleClientWarningSent)) { if (timeRunning - lastActionReceived > server->getIdleClientTimeout()) { prepareDestroy(); diff --git a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h index 2c8efe50e..0d05b91c8 100644 --- a/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h +++ b/libcockatrice_network/libcockatrice/network/server/remote/server_protocolhandler.h @@ -27,7 +27,6 @@ class CommandContainer; class SessionCommand; class ModeratorCommand; class AdminCommand; -class DeveloperCommand; class Command_Ping; class Command_Login; @@ -99,12 +98,6 @@ private: { return Response::RespFunctionNotAllowed; } - Response::ResponseCode processDeveloperCommandContainer(const CommandContainer &cont, ResponseContainer &rc); - virtual Response::ResponseCode - processExtendedDeveloperCommand(int /* cmdType */, const DeveloperCommand & /* cmd */, ResponseContainer & /* rc */) - { - return Response::RespFunctionNotAllowed; - } void resetIdleTimer(); private slots: @@ -136,7 +129,7 @@ public: return timeRunning - lastDataReceived; } bool addSaidMessageSize(int size); - virtual void processCommandContainer(const CommandContainer &cont); + void processCommandContainer(const CommandContainer &cont); void sendProtocolItem(const Response &item); void sendProtocolItem(const SessionEvent &item); diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt index bc4814d5e..3a193ae3c 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/CMakeLists.txt @@ -15,17 +15,9 @@ set(PROTO_FILES command_deck_del.proto command_deck_del_dir.proto command_deck_download.proto - command_deck_download_public.proto command_deck_list.proto - command_deck_list_other_user.proto command_deck_new_dir.proto command_deck_select.proto - command_deck_set_visibility.proto - command_deck_share_create.proto - command_deck_share_download.proto - command_deck_share_list.proto - command_deck_share_list_mine.proto - command_deck_share_remove.proto command_deck_upload.proto command_del_counter.proto command_delete_arrow.proto @@ -33,7 +25,6 @@ set(PROTO_FILES command_dump_zone.proto command_flip_card.proto command_game_say.proto - command_get_server_stats.proto command_inc_card_counter.proto command_inc_counter.proto command_kick_from_game.proto @@ -80,7 +71,6 @@ set(PROTO_FILES context_ready_start.proto context_set_sideboard_lock.proto context_undo_draw.proto - developer_commands.proto event_add_to_list.proto event_attach_card.proto event_change_zone_properties.proto @@ -100,6 +90,7 @@ set(PROTO_FILES event_game_log_notice.proto event_game_say.proto event_game_state_changed.proto + event_game_state_changed.proto event_join.proto event_join_room.proto event_kicked.proto @@ -145,16 +136,11 @@ set(PROTO_FILES response_card_art_rule_entry.proto response_deck_download.proto response_deck_list.proto - response_deck_share_create.proto - response_deck_share_download.proto - response_deck_share_list.proto - response_deck_share_list_mine.proto response_deck_upload.proto response_dump_zone.proto response_forgotpasswordrequest.proto response_get_admin_notes.proto response_get_games_of_user.proto - response_get_server_stats.proto response_get_user_info.proto response_join_room.proto response_list_users.proto @@ -187,8 +173,6 @@ set(PROTO_FILES serverinfo_cardcounter.proto serverinfo_chat_message.proto serverinfo_counter.proto - serverinfo_deck_share_item.proto - serverinfo_deck_share_summary.proto serverinfo_deckstorage.proto serverinfo_game.proto serverinfo_gametype.proto diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto index f1f85e376..f8b34b3f8 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/admin_commands.proto @@ -37,7 +37,6 @@ message Command_AdjustMod { required string user_name = 1; optional bool should_be_mod = 2; optional bool should_be_judge = 3; - optional bool should_be_developer = 4; } message Command_ResetUserPassword { diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download_public.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download_public.proto deleted file mode 100644 index a5592ef51..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_download_public.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto2"; -import "session_commands.proto"; - -message Command_DeckDownloadPublic { - extend SessionCommand { - optional Command_DeckDownloadPublic ext = 1031; - } - optional uint32 deck_id = 1; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list_other_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list_other_user.proto deleted file mode 100644 index 2459608e2..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_list_other_user.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto2"; -import "session_commands.proto"; - -message Command_DeckListOtherUser { - extend SessionCommand { - optional Command_DeckListOtherUser ext = 1029; - } - optional string user_name = 1; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_set_visibility.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_set_visibility.proto deleted file mode 100644 index 3ada87973..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_set_visibility.proto +++ /dev/null @@ -1,13 +0,0 @@ -syntax = "proto2"; -import "session_commands.proto"; - -message Command_DeckSetVisibility { - extend SessionCommand { - optional Command_DeckSetVisibility ext = 1030; - } - // Set the public visibility of a single deck (mutually exclusive with folder_path). - optional uint32 deck_id = 1; - // Set the public visibility of a folder (all decks under it inherit). - optional string folder_path = 2; - optional bool is_public = 3; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_create.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_create.proto deleted file mode 100644 index 9cebf8eae..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_create.proto +++ /dev/null @@ -1,24 +0,0 @@ -syntax = "proto2"; -import "session_commands.proto"; - -message DeckShareItem { - // Reference an existing deck in the sharer's personal deck storage. - // Mutually exclusive with deck_list. - optional uint32 deck_id = 1; - // Inline deck content in the native format. - // Mutually exclusive with deck_id. - optional string deck_list = 2; - // Color identity of the deck (e.g. "WUBRG"), computed by the sharing client. - optional string color_identity = 3; -} - -message Command_DeckShareCreate { - extend SessionCommand { - optional Command_DeckShareCreate ext = 1026; - } - optional string name = 1; - repeated DeckShareItem items = 2; - // Path of a folder in the sharer's personal deck storage. When set, all - // decks in that folder are shared (resolved by the server). - optional string folder_path = 3; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_download.proto deleted file mode 100644 index 251a662b3..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_download.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto2"; -import "session_commands.proto"; - -message Command_DeckShareDownload { - extend SessionCommand { - optional Command_DeckShareDownload ext = 1028; - } - optional string token = 1; - optional uint32 item_id = 2; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list.proto deleted file mode 100644 index b75fd65f9..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto2"; -import "session_commands.proto"; - -message Command_DeckShareList { - extend SessionCommand { - optional Command_DeckShareList ext = 1027; - } - optional string token = 1; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list_mine.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list_mine.proto deleted file mode 100644 index 75bc30714..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_list_mine.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto2"; -import "session_commands.proto"; - -// Requests the list of share bundles created by the calling user, so they can -// be reviewed and revoked before they expire. -message Command_DeckShareListMine { - extend SessionCommand { - optional Command_DeckShareListMine ext = 1032; - } -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_remove.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_remove.proto deleted file mode 100644 index 348996da9..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_share_remove.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto2"; -import "session_commands.proto"; - -// Revokes one of the calling user's own share bundles. The referenced items -// are removed by cascade. -message Command_DeckShareRemove { - extend SessionCommand { - optional Command_DeckShareRemove ext = 1033; - } - optional uint32 share_id = 1; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto index 1a5d44e9e..63d9c80ef 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/command_deck_upload.proto @@ -8,10 +8,4 @@ message Command_DeckUpload { optional string path = 1; // to upload a new deck optional uint32 deck_id = 2; // to replace an existing deck optional string deck_list = 3; - optional bool is_public = 4; // mark the deck public on upload (publish) - // The server derives the banner card and tags from deck_list, so clients only - // need to send the color identity, which cannot be computed server-side. - reserved 5, 6, 8; - reserved "banner_card_name", "banner_card_provider", "tags"; - optional string color_identity = 7; } diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/command_get_server_stats.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/command_get_server_stats.proto deleted file mode 100644 index 33c56293b..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/command_get_server_stats.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto2"; -import "developer_commands.proto"; - -message Command_GetServerStats { - extend DeveloperCommand { - optional Command_GetServerStats ext = 1000; - } -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto index 964407819..b6eaf6733 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/commands.proto @@ -4,7 +4,6 @@ import "game_commands.proto"; import "room_commands.proto"; import "moderator_commands.proto"; import "admin_commands.proto"; -import "developer_commands.proto"; message CommandContainer { optional uint64 cmd_id = 1; @@ -17,5 +16,4 @@ message CommandContainer { repeated RoomCommand room_command = 102; repeated ModeratorCommand moderator_command = 103; repeated AdminCommand admin_command = 104; - repeated DeveloperCommand developer_command = 105; } diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/developer_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/developer_commands.proto deleted file mode 100644 index bed47d44c..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/developer_commands.proto +++ /dev/null @@ -1,8 +0,0 @@ -syntax = "proto2"; -message DeveloperCommand { - enum DeveloperCommandType { - GET_SERVER_STATS = 1000; - VIEWLOG_HISTORY = 1001; - } - extensions 100 to max; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto index 4f1e80c27..685408830 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/moderator_commands.proto @@ -1,5 +1,4 @@ syntax = "proto2"; -import "developer_commands.proto"; message ModeratorCommand { enum ModeratorCommandType { BAN_FROM_SERVER = 1000; @@ -81,9 +80,6 @@ message Command_ViewLogHistory { extend ModeratorCommand { optional Command_ViewLogHistory ext = 1005; } - extend DeveloperCommand { - optional Command_ViewLogHistory dev_ext = 1001; - } optional string user_name = 1; // user that created message optional string ip_address = 2; // ip address of user that created message optional string game_name = 3; // client id of user that created the message diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto index caf9febde..14ba737b5 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/response.proto @@ -77,14 +77,9 @@ message Response { FORGOT_PASSWORD_REQUEST = 1016; // Response to password reset request PASSWORD_SALT = 1017; // Response containing password salt GET_ADMIN_NOTES = 1018; // Response with admin notes - GET_SERVER_STATS = 1019; // Response with server status statistics REPLAY_LIST = 1100; // Response listing replays REPLAY_DOWNLOAD = 1101; // Response for replay download REPLAY_GET_CODE = 1102; // Response containing replay code - DECK_SHARE_CREATE = 1103; // Response to deck share creation - DECK_SHARE_LIST = 1104; // Response listing shared decks - DECK_SHARE_DOWNLOAD = 1105; // Response for shared deck download - DECK_SHARE_LIST_MINE = 1106; // Response listing the caller's own shares CARD_ART_RULE_LIST = 1200; // Response containing a list of card art rules } diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_create.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_create.proto deleted file mode 100644 index 574c02eb6..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_create.proto +++ /dev/null @@ -1,11 +0,0 @@ -syntax = "proto2"; -import "response.proto"; - -message Response_DeckShareCreate { - extend Response { - optional Response_DeckShareCreate ext = 1103; - } - optional string token = 1; - optional uint64 expires_at = 2; - optional uint32 item_count = 3; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_download.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_download.proto deleted file mode 100644 index def0ccbe6..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_download.proto +++ /dev/null @@ -1,9 +0,0 @@ -syntax = "proto2"; -import "response.proto"; - -message Response_DeckShareDownload { - extend Response { - optional Response_DeckShareDownload ext = 1105; - } - optional string deck = 1; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list.proto deleted file mode 100644 index 3edffa8ac..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list.proto +++ /dev/null @@ -1,12 +0,0 @@ -syntax = "proto2"; -import "response.proto"; -import "serverinfo_deck_share_item.proto"; - -message Response_DeckShareList { - extend Response { - optional Response_DeckShareList ext = 1104; - } - optional string name = 1; - optional uint64 expires_at = 2; - repeated ServerInfo_DeckShareItem items = 3; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list_mine.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list_mine.proto deleted file mode 100644 index e3cbf83b9..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/response_deck_share_list_mine.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto2"; -import "response.proto"; -import "serverinfo_deck_share_summary.proto"; - -message Response_DeckShareListMine { - extend Response { - optional Response_DeckShareListMine ext = 1106; - } - repeated ServerInfo_DeckShareSummary shares = 1; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_server_stats.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_server_stats.proto deleted file mode 100644 index bb8ff3c43..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/response_get_server_stats.proto +++ /dev/null @@ -1,41 +0,0 @@ -syntax = "proto2"; -import "response.proto"; - -message CommandStats { - optional uint32 kind_index = 1; // 0=session, 1=room, 2=game, 3=moderator, 4=admin, 5=developer - optional uint32 extension_number = 2; // protobuf extension number within the kind - optional string command_name = 3; // e.g. "session/Command_Ping" - optional uint64 count = 4; // number of times observed - optional uint64 total_ms = 5; // cumulative processing milliseconds -} - -message Response_GetServerStats { - extend Response { - optional Response_GetServerStats ext = 1220; - } - - optional uint64 users_count = 1; - optional uint64 mods_count = 2; - optional uint64 games_count = 3; - - // Traffic recorded during the last status update tick - optional uint64 tx_bytes = 4; - optional uint64 rx_bytes = 5; - - optional uint64 uptime_secs = 6; - optional uint64 timest = 7; // unix timestamp of the snapshot - - // Live metrics from MetricsRegistry (reset on server restart) - optional uint64 cards_in_games = 8; - optional uint64 eventloop_stalls_total = 9; - optional uint64 eventloop_last_stall_ms = 10; - optional uint64 eventloop_max_stall_ms = 11; - optional uint64 total_commands = 12; - optional uint64 total_command_time_ms = 13; - optional int32 active_command_types = 14; - optional uint64 game_start_count = 15; - optional uint64 game_start_total_ms = 16; - - // Per-command breakdown (only types with count > 0) - repeated CommandStats command_stats = 20; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_item.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_item.proto deleted file mode 100644 index bac025419..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_item.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto2"; - -message ServerInfo_DeckShareItem { - optional uint32 id = 1; - optional string name = 2; - repeated string tags = 3; - optional string banner_card = 4; - optional string game_format = 5; - optional string color_identity = 6; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_summary.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_summary.proto deleted file mode 100644 index 43273a54f..000000000 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deck_share_summary.proto +++ /dev/null @@ -1,10 +0,0 @@ -syntax = "proto2"; - -// A share bundle created by a user, as reported by a "list my shares" query. -message ServerInfo_DeckShareSummary { - optional uint32 id = 1; - optional string name = 2; - optional uint64 creation_time = 3; - optional uint64 expires_at = 4; - optional uint32 item_count = 5; -} diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto index b04d676d8..16e3f28e3 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_deckstorage.proto @@ -1,21 +1,10 @@ syntax = "proto2"; message ServerInfo_DeckStorage_File { optional uint32 creation_time = 1; - optional bool is_public = 2; - // Preview metadata computed by the uploading client, so other clients can - // render this deck (e.g. in a visual storage grid) without downloading the - // full deck list. Empty for decks uploaded before the metadata columns. - optional string banner_card_name = 3; - optional string banner_card_provider = 4; - optional string color_identity = 5; - // Tag names associated with the deck. Empty for decks uploaded before the - // tags column existed. - repeated string tags = 6; } message ServerInfo_DeckStorage_Folder { repeated ServerInfo_DeckStorage_TreeItem items = 1; - optional bool is_public = 2; } message ServerInfo_DeckStorage_TreeItem { diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto index ea3f56705..98cc3ce6a 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/serverinfo_user.proto @@ -8,7 +8,6 @@ message ServerInfo_User { IsModerator = 4; IsAdmin = 8; IsJudge = 16; - IsDeveloper = 32; }; message PawnColorsOverride { optional string left_side = 1; diff --git a/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto b/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto index 4b7fe9c85..fee8c36a8 100644 --- a/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto +++ b/libcockatrice_protocol/libcockatrice/protocol/pb/session_commands.proto @@ -28,14 +28,6 @@ message SessionCommand { FORGOT_PASSWORD_CHALLENGE = 1023; REQUEST_PASSWORD_SALT = 1024; SET_CARD_ART_PARAMS = 1025; - DECK_SHARE_CREATE = 1026; - DECK_SHARE_LIST = 1027; - DECK_SHARE_DOWNLOAD = 1028; - DECK_LIST_OTHER_USER = 1029; - DECK_SET_VISIBILITY = 1030; - DECK_DOWNLOAD_PUBLIC = 1031; - DECK_SHARE_LIST_MINE = 1032; - DECK_SHARE_REMOVE = 1033; REPLAY_LIST = 1100; REPLAY_DOWNLOAD = 1101; REPLAY_MODIFY_MATCH = 1102; diff --git a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp index 4c578b4e4..5b38deb3f 100644 --- a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp +++ b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.cpp @@ -1,5 +1,6 @@ #include "rng_sfmt.h" +#include #include #include #include @@ -10,11 +11,10 @@ #define UINT64_MAX (~(uint64_t)0) #endif -RNG_SFMT::RNG_SFMT(uint64_t seed, QObject *parent) : RNG_Abstract(parent) +RNG_SFMT::RNG_SFMT(QObject *parent) : RNG_Abstract(parent) { - // initialize the random number generator with a 64bit seed, e.g. from a CSPRNG - uint32_t seedArray[2] = {static_cast(seed), static_cast(seed >> 32)}; - sfmt_init_by_array(&sfmt, seedArray, 2); + // initialize the random number generator with a 32bit integer seed (timestamp) + sfmt_init_gen_rand(&sfmt, QDateTime::currentDateTime().toSecsSinceEpoch()); } /** diff --git a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h index a180dad99..7e9f53df3 100644 --- a/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h +++ b/libcockatrice_rng/libcockatrice/rng/rng_sfmt.h @@ -36,7 +36,7 @@ private: unsigned int cdf(unsigned int min, unsigned int max); public: - explicit RNG_SFMT(uint64_t seed, QObject *parent = nullptr); + explicit RNG_SFMT(QObject *parent = nullptr); unsigned int rand(int min, int max) override; }; diff --git a/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp b/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp index 839e33be4..2f19d6224 100644 --- a/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/appearance_settings.cpp @@ -70,17 +70,6 @@ void AppearanceSettings::setHomeTabDisplayCardName(bool _displayCardName) emit homeTabDisplayCardNameChanged(); } -bool AppearanceSettings::getHomeTabBackgroundDim() const -{ - return getValue("homeTabBackgroundDim", QString(), QString(), true).toBool(); -} - -void AppearanceSettings::setHomeTabBackgroundDim(bool _dimBackground) -{ - setValue(_dimBackground, "homeTabBackgroundDim"); - emit homeTabBackgroundDimChanged(); -} - int AppearanceSettings::getHomeTabButtonColorSourceIndex() const { return getValue("homeTabButtonColorSource", "", "", 0).toInt(); diff --git a/libcockatrice_settings/libcockatrice/settings/appearance_settings.h b/libcockatrice_settings/libcockatrice/settings/appearance_settings.h index a4504798e..3a63f0df0 100644 --- a/libcockatrice_settings/libcockatrice/settings/appearance_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/appearance_settings.h @@ -27,8 +27,6 @@ public: void setHomeTabBackgroundShuffleFrequency(int _frequency); [[nodiscard]] bool getHomeTabDisplayCardName() const; void setHomeTabDisplayCardName(bool _displayCardName); - [[nodiscard]] bool getHomeTabBackgroundDim() const; - void setHomeTabBackgroundDim(bool _dimBackground); [[nodiscard]] int getHomeTabButtonColorSourceIndex() const; void setHomeTabButtonColorSourceIndex(int index); @@ -38,7 +36,6 @@ signals: void homeTabBackgroundSourceChanged(); void homeTabBackgroundShuffleFrequencyChanged(); void homeTabDisplayCardNameChanged(); - void homeTabBackgroundDimChanged(); void homeTabButtonColorChanged(); public: diff --git a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp index 94e888504..f528a7c4b 100644 --- a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp @@ -105,16 +105,6 @@ int CardsDisplaySettings::getSampleHandSize() const return getValue("sampleHandSize", "cards", "cardSize", 7).toInt(); } -QString CardsDisplaySettings::getCardLang() const -{ - return getValue("cardLang", QString(), QString(), "en").toString(); -} - -int CardsDisplaySettings::getCardSearchLanguage() const -{ - return getValue("cardSearchLanguage", QString(), QString(), static_cast(SearchLanguageMode::English)).toInt(); -} - void CardsDisplaySettings::setDisplayCardNames(bool _displayCardNames) { setValue(_displayCardNames, "displayCardNames"); @@ -234,25 +224,3 @@ void CardsDisplaySettings::setSampleHandSize(int _sampleHandSize) setValue(_sampleHandSize, "sampleHandSize", "cards", "cardSize"); emit sampleHandSizeChanged(_sampleHandSize); } - -void CardsDisplaySettings::setCardLang(const QString &_cardLang) -{ - if (_cardLang == getCardLang()) { - return; - } - setValue(_cardLang, "cardLang"); - // Flush to disk immediately: the Oracle tool is a separate process that - // reads this value to decide which foreignData to import, so it must not - // observe a stale (pre-change) value. - sync(); - emit cardLangChanged(_cardLang); -} - -void CardsDisplaySettings::setCardSearchLanguage(int _cardSearchLanguage) -{ - if (_cardSearchLanguage == getCardSearchLanguage()) { - return; - } - setValue(_cardSearchLanguage, "cardSearchLanguage"); - emit cardSearchLanguageChanged(_cardSearchLanguage); -} diff --git a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h index 85eb5adbd..dbafa32ae 100644 --- a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.h @@ -3,7 +3,6 @@ #include "settings_manager.h" -#include #include class CardsDisplaySettings : public SettingsManager, public ICardsDisplaySettingsProvider @@ -32,8 +31,6 @@ public: [[nodiscard]] int getEDHRecCardSize() const override; [[nodiscard]] int getArchidektPreviewSize() const override; [[nodiscard]] int getSampleHandSize() const override; - [[nodiscard]] QString getCardLang() const override; - [[nodiscard]] int getCardSearchLanguage() const override; void setDisplayCardNames(bool _displayCardNames); void setRoundCardCorners(bool _roundCardCorners); @@ -55,8 +52,6 @@ public: void setEDHRecCardSize(int _edhrecCardSize); void setArchidektPreviewCardSize(int _archidektPreviewCardSize); void setSampleHandSize(int _sampleHandSize); - void setCardLang(const QString &_cardLang); - void setCardSearchLanguage(int _cardSearchLanguage); signals: void displayCardNamesChanged(); @@ -73,8 +68,6 @@ signals: void edhRecCardSizeChanged(); void archidektPreviewSizeChanged(); void sampleHandSizeChanged(int amount); - void cardLangChanged(const QString &lang); - void cardSearchLanguageChanged(int cardSearchLanguage); public: explicit CardsDisplaySettings(const QString &settingPath, QObject *parent = nullptr); diff --git a/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp b/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp index 974173371..5e1102473 100644 --- a/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/chat_settings.cpp @@ -65,11 +65,6 @@ bool ChatSettings::getRoomHistory() const return getValue("roomHistory", QString(), QString(), true).toBool(); } -bool ChatSettings::getIgnoreAllPrivateMessages() const -{ - return getValue("ignoreAllPrivateMessages", QString(), QString(), false).toBool(); -} - QString ChatSettings::getHighlightWords() const { return getValue("highlightWords").toString(); @@ -136,11 +131,6 @@ void ChatSettings::setRoomHistory(bool _roomHistory) setValue(_roomHistory, "roomHistory"); } -void ChatSettings::setIgnoreAllPrivateMessages(bool _ignoreAllPrivateMessages) -{ - setValue(_ignoreAllPrivateMessages, "ignoreAllPrivateMessages"); -} - void ChatSettings::setHighlightWords(const QString &_highlightWords) { setValue(_highlightWords, "highlightWords"); diff --git a/libcockatrice_settings/libcockatrice/settings/chat_settings.h b/libcockatrice_settings/libcockatrice/settings/chat_settings.h index 9566671e2..7cf4be3f6 100644 --- a/libcockatrice_settings/libcockatrice/settings/chat_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/chat_settings.h @@ -23,7 +23,6 @@ public: [[nodiscard]] bool getShowMessagePopup() const override; [[nodiscard]] bool getShowMentionPopup() const override; [[nodiscard]] bool getRoomHistory() const override; - [[nodiscard]] bool getIgnoreAllPrivateMessages() const override; [[nodiscard]] QString getHighlightWords() const override; void setChatMention(bool _chatMention); @@ -38,7 +37,6 @@ public: void setShowMessagePopups(bool _showMessagePopups); void setShowMentionPopups(bool _showMentionPopups); void setRoomHistory(bool _roomHistory); - void setIgnoreAllPrivateMessages(bool _ignoreAllPrivateMessages); void setHighlightWords(const QString &_highlightWords); signals: diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.cpp b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp index eb73e58ee..cfa1c054e 100644 --- a/libcockatrice_settings/libcockatrice/settings/download_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/download_settings.cpp @@ -4,14 +4,11 @@ const QStringList DownloadSettings::DEFAULT_DOWNLOAD_URLS = { "https://cards.scryfall.io/large/!prop:side!/!set:uuid_substr_0_1!/!set:uuid_substr_1_1!/!set:uuid!.jpg", - "https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!&lang=!sflang!", - "https://api.scryfall.com/cards/multiverse/!set:muid!?format=image&lang=!sflang!", + "https://api.scryfall.com/cards/!set:uuid!?format=image&face=!prop:side!", + "https://api.scryfall.com/cards/multiverse/!set:muid!?format=image", "https://gatherer.wizards.com/Handlers/Image.ashx?multiverseid=!set:muid!&type=card", "https://gatherer.wizards.com/Handlers/Image.ashx?name=!name!&type=card"}; -const QString DownloadSettings::SCRYFALL_NAMED_LOCALIZED_URL = - "https://api.scryfall.com/cards/named?fuzzy=!localizedName!&lang=!sflang!&format=image&face=!prop:side!"; - DownloadSettings::DownloadSettings(const QString &settingPath, QObject *parent = nullptr) : SettingsManager(settingPath + "downloads.ini", "downloads", QString(), parent) { @@ -32,18 +29,6 @@ void DownloadSettings::resetToDefaultURLs() setValue(QVariant::fromValue(DEFAULT_DOWNLOAD_URLS), "urls"); } -bool DownloadSettings::addLocalizedScryfallUrl() -{ - const QStringList urls = getAllURLs(); - if (urls.contains(SCRYFALL_NAMED_LOCALIZED_URL)) { - return false; - } - QStringList updated = urls; - updated.prepend(SCRYFALL_NAMED_LOCALIZED_URL); - setDownloadUrls(updated); - return true; -} - bool DownloadSettings::getPicDownload() const { return getValue("pictureDownload", QString(), QString(), true).toBool(); diff --git a/libcockatrice_settings/libcockatrice/settings/download_settings.h b/libcockatrice_settings/libcockatrice/settings/download_settings.h index ae49884f0..a3a6f4ca9 100644 --- a/libcockatrice_settings/libcockatrice/settings/download_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/download_settings.h @@ -15,7 +15,6 @@ class DownloadSettings : public SettingsManager friend class SettingsCache; static const QStringList DEFAULT_DOWNLOAD_URLS; - static const QString SCRYFALL_NAMED_LOCALIZED_URL; public: explicit DownloadSettings(const QString &, QObject *); @@ -23,7 +22,6 @@ public: QStringList getAllURLs() const; void setDownloadUrls(const QStringList &downloadURLs); void resetToDefaultURLs(); - [[nodiscard]] bool addLocalizedScryfallUrl(); [[nodiscard]] bool getPicDownload() const; void setPicDownload(bool _picDownload); [[nodiscard]] bool getDownloadSpoilersStatus() const; diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp index 436e260c5..811b0c842 100644 --- a/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.cpp @@ -171,12 +171,7 @@ void ServersSettings::addNewServer(const QString &saveName, bool savePassword, const QString &site) { - // Match the exact host-plus-port server the caller is adding, so a link or - // public-server list entry cannot clobber the port (and credentials) of an - // unrelated entry that happens to share the same hostname. - const int existingIndex = findServerIndex(serv, port); - if (existingIndex >= 0) { - updateServerFields(existingIndex, saveName, username, password, savePassword, site); + if (updateExistingServer(saveName, serv, port, username, password, savePassword, site)) { return; } @@ -276,7 +271,22 @@ bool ServersSettings::updateExistingServer(QString saveName, for (int i = 0; i <= size; ++i) { if (serv == getValue(QString("server%1").arg(i), "server", "server_details").toString()) { setValue(port, QString("port%1").arg(i), "server", "server_details"); - updateServerFields(i, saveName, username, password, savePassword, site); + if (!username.isEmpty()) { + setValue(username, QString("username%1").arg(i), "server", "server_details"); + } + + if (savePassword && !password.isEmpty()) { + setValue(password, QString("password%1").arg(i), "server", "server_details"); + } else { + setValue(QString(), QString("password%1").arg(i), "server", "server_details"); + } + + if (!site.isEmpty()) { + setValue(site, QString("site%1").arg(i), "server", "server_details"); + } + + setValue(savePassword, QString("savePassword%1").arg(i), "server", "server_details"); + setValue(saveName, QString("saveName%1").arg(i), "server", "server_details"); return true; } @@ -284,31 +294,6 @@ bool ServersSettings::updateExistingServer(QString saveName, return false; } -void ServersSettings::updateServerFields(int index, - const QString &saveName, - const QString &username, - const QString &password, - bool savePassword, - const QString &site) -{ - if (!username.isEmpty()) { - setValue(username, QString("username%1").arg(index), "server", "server_details"); - } - - if (savePassword && !password.isEmpty()) { - setValue(password, QString("password%1").arg(index), "server", "server_details"); - } else { - setValue(QString(), QString("password%1").arg(index), "server", "server_details"); - } - - if (!site.isEmpty()) { - setValue(site, QString("site%1").arg(index), "server", "server_details"); - } - - setValue(savePassword, QString("savePassword%1").arg(index), "server", "server_details"); - setValue(saveName, QString("saveName%1").arg(index), "server", "server_details"); -} - int ServersSettings::findServerIndex(const QString &host, const QString &port) const { int size = getValue("totalServers", "server", "server_details").toInt(); @@ -325,21 +310,6 @@ int ServersSettings::findServerIndex(const QString &host, const QString &port) c return -1; } -int ServersSettings::findHostIndex(const QString &host) const -{ - int size = getValue("totalServers", "server", "server_details").toInt(); - - for (int i = 0; i <= size; ++i) { - QString storedHost = getValue(QString("server%1").arg(i), "server", "server_details").toString(); - - if (storedHost.compare(host, Qt::CaseInsensitive) == 0) { - return i; - } - } - - return -1; -} - bool ServersSettings::hasUsername(const QString &host, const QString &port) const { int index = findServerIndex(host, port); diff --git a/libcockatrice_settings/libcockatrice/settings/servers_settings.h b/libcockatrice_settings/libcockatrice/settings/servers_settings.h index 93651c813..f9803a158 100644 --- a/libcockatrice_settings/libcockatrice/settings/servers_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/servers_settings.h @@ -61,14 +61,7 @@ public: QString password, bool savePassword, QString site = QString()); - void updateServerFields(int index, - const QString &saveName, - const QString &username, - const QString &password, - bool savePassword, - const QString &site); int findServerIndex(const QString &host, const QString &port) const; - int findHostIndex(const QString &host) const; bool hasUsername(const QString &host, const QString &port) const; bool hasCredentials(const QString &host, const QString &port) const; bool hasLoginData(const QString &host, const QString &port) const; diff --git a/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp index f6e107dad..37dc9a0a0 100644 --- a/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp +++ b/libcockatrice_settings/libcockatrice/settings/settings_migration.cpp @@ -374,11 +374,7 @@ static void migrateAppearanceSettings(const QString &settingsPath, QSettings &gl QSettings appearanceIni(settingsPath + "appearance.ini", QSettings::IniFormat); for (auto it = appearanceKeyMap.constBegin(); it != appearanceKeyMap.constEnd(); ++it) { if (globalIni.contains(it.key())) { - QVariant value = globalIni.value(it.key()); - if (it.key() == "theme/name" && value.toString() == "Default") { - value = "System"; - } - appearanceIni.setValue(it.value(), value); + appearanceIni.setValue(it.value(), globalIni.value(it.key())); } } } diff --git a/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp b/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp index cf5bfd81a..85a1424a6 100644 --- a/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/tabs_settings.cpp @@ -106,11 +106,6 @@ bool TabsSettings::getTabModerationOpen() const return getValue("moderation", QString(), QString(), false).toBool(); } -bool TabsSettings::getTabCardArtRulesOpen() const -{ - return getValue("cardArtRules", QString(), QString(), false).toBool(); -} - void TabsSettings::setTabVisualDeckStorageOpen(bool value) { setValue(value, "visualDeckStorage"); @@ -155,8 +150,3 @@ void TabsSettings::setTabModerationOpen(bool value) { setValue(value, "moderation"); } - -void TabsSettings::setTabCardArtRulesOpen(bool value) -{ - setValue(value, "cardArtRules"); -} diff --git a/libcockatrice_settings/libcockatrice/settings/tabs_settings.h b/libcockatrice_settings/libcockatrice/settings/tabs_settings.h index eb78d311b..365d91af7 100644 --- a/libcockatrice_settings/libcockatrice/settings/tabs_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/tabs_settings.h @@ -43,7 +43,6 @@ public: [[nodiscard]] bool getTabLogOpen() const override; [[nodiscard]] bool getTabReportOpen() const override; [[nodiscard]] bool getTabModerationOpen() const override; - [[nodiscard]] bool getTabCardArtRulesOpen() const override; void setStartupTabIndex(int value); void setStartupServerHost(const QString &host); @@ -58,7 +57,6 @@ public: void setTabLogOpen(bool value); void setTabReportOpen(bool value); void setTabModerationOpen(bool value); - void setTabCardArtRulesOpen(bool value); signals: void startupTabIndexChanged(int index); diff --git a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp index 3320598d8..1b21af58e 100644 --- a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.cpp @@ -130,11 +130,6 @@ bool VisualDeckStorageSettings::getVisualDeckStorageShowTagsOnDeckPreviews() con return getValue("showTagsOnDeckPreviews", "interface", "visualDeckStorage", true).toBool(); } -bool VisualDeckStorageSettings::getVisualDeckStorageShowUploadTime() const -{ - return getValue("showUploadTime", "interface", "visualDeckStorage", true).toBool(); -} - bool VisualDeckStorageSettings::getVisualDeckStorageDrawUnusedColorIdentities() const { return getValue("drawUnusedColorIdentities", "interface", "visualDeckStorage", true).toBool(); @@ -225,12 +220,6 @@ void VisualDeckStorageSettings::setVisualDeckStorageShowTagsOnDeckPreviews(bool emit visualDeckStorageShowTagsOnDeckPreviewsChanged(_showTags); } -void VisualDeckStorageSettings::setVisualDeckStorageShowUploadTime(bool value) -{ - setValue(value, "showUploadTime", "interface", "visualDeckStorage"); - emit visualDeckStorageShowUploadTimeChanged(value); -} - void VisualDeckStorageSettings::setVisualDeckStorageDrawUnusedColorIdentities(bool _draw) { setValue(_draw, "drawUnusedColorIdentities", "interface", "visualDeckStorage"); diff --git a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h index 9bc9d4172..fd2a76663 100644 --- a/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/visual_deck_storage_settings.h @@ -20,7 +20,6 @@ public: [[nodiscard]] bool getVisualDeckStorageShowColorIdentity() const override; [[nodiscard]] bool getVisualDeckStorageShowBannerCardComboBox() const override; [[nodiscard]] bool getVisualDeckStorageShowTagsOnDeckPreviews() const override; - [[nodiscard]] bool getVisualDeckStorageShowUploadTime() const; [[nodiscard]] bool getVisualDeckStorageDrawUnusedColorIdentities() const override; [[nodiscard]] int getVisualDeckStorageUnusedColorIdentitiesOpacity() const override; [[nodiscard]] int getVisualDeckStorageTooltipType() const override; @@ -39,7 +38,6 @@ public: void setVisualDeckStorageShowColorIdentity(bool value); void setVisualDeckStorageShowBannerCardComboBox(bool _showBannerCardComboBox); void setVisualDeckStorageShowTagsOnDeckPreviews(bool _showTags); - void setVisualDeckStorageShowUploadTime(bool value); void setVisualDeckStorageDrawUnusedColorIdentities(bool _draw); void setVisualDeckStorageUnusedColorIdentitiesOpacity(int _opacity); void setVisualDeckStorageTooltipType(int value); @@ -56,7 +54,6 @@ signals: void visualDeckStorageShowColorIdentityChanged(bool _visible); void visualDeckStorageShowBannerCardComboBoxChanged(bool _visible); void visualDeckStorageShowTagsOnDeckPreviewsChanged(bool _visible); - void visualDeckStorageShowUploadTimeChanged(bool _visible); void visualDeckStorageDrawUnusedColorIdentitiesChanged(bool _visible); void visualDeckStorageUnusedColorIdentitiesOpacityChanged(bool value); void visualDeckStorageInGameChanged(bool enabled); diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt index db23f7951..c6411ea76 100644 --- a/libcockatrice_utility/CMakeLists.txt +++ b/libcockatrice_utility/CMakeLists.txt @@ -6,15 +6,13 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(UTILITY_SOURCES - libcockatrice/utility/cryptoutil.cpp libcockatrice/utility/expression.cpp libcockatrice/utility/levenshtein.cpp - libcockatrice/utility/passwordhasher.cpp libcockatrice/utility/server_rate_limiter.cpp - libcockatrice/utility/warning_categories.cpp + libcockatrice/utility/expression.cpp libcockatrice/utility/levenshtein.cpp libcockatrice/utility/passwordhasher.cpp + libcockatrice/utility/server_rate_limiter.cpp libcockatrice/utility/warning_categories.cpp ) set(UTILITY_HEADERS libcockatrice/utility/card_ref.h libcockatrice/utility/color.h - libcockatrice/utility/cryptoutil.h libcockatrice/utility/expression.h libcockatrice/utility/levenshtein.h libcockatrice/utility/macros.h @@ -34,9 +32,7 @@ add_library(libcockatrice_utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS}) target_include_directories(libcockatrice_utility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -find_package(OpenSSL REQUIRED) - -target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng OpenSSL::Crypto ${QT_CORE_MODULE}) +target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng ${QT_CORE_MODULE}) set(ORACLE_LIBS) diff --git a/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp b/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp deleted file mode 100644 index 416ef261b..000000000 --- a/libcockatrice_utility/libcockatrice/utility/cryptoutil.cpp +++ /dev/null @@ -1,25 +0,0 @@ -#include "cryptoutil.h" - -#include - -namespace CryptoUtil -{ -QByteArray randomBytes(int count) -{ - QByteArray bytes(count, '\0'); - if (RAND_bytes(reinterpret_cast(bytes.data()), count) != 1) { - // Randomness failure is fatal: never fall back to a predictable source. - qFatal("CryptoUtil::randomBytes: RAND_bytes failed"); - } - return bytes; -} - -quint64 randomUInt64() -{ - quint64 value; - if (RAND_bytes(reinterpret_cast(&value), sizeof(value)) != 1) { - qFatal("CryptoUtil::randomUInt64: RAND_bytes failed"); - } - return value; -} -} // namespace CryptoUtil diff --git a/libcockatrice_utility/libcockatrice/utility/cryptoutil.h b/libcockatrice_utility/libcockatrice/utility/cryptoutil.h deleted file mode 100644 index dba9dc37d..000000000 --- a/libcockatrice_utility/libcockatrice/utility/cryptoutil.h +++ /dev/null @@ -1,13 +0,0 @@ -#ifndef CRYPTOUTIL_H -#define CRYPTOUTIL_H - -#include -#include - -namespace CryptoUtil -{ -QByteArray randomBytes(int count); -quint64 randomUInt64(); -} // namespace CryptoUtil - -#endif diff --git a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp index 1c22fdcfa..c40c5f94f 100644 --- a/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp +++ b/libcockatrice_utility/libcockatrice/utility/passwordhasher.cpp @@ -1,7 +1,7 @@ #include "passwordhasher.h" #include -#include +#include QString PasswordHasher::computeHash(const QString &password, const QString &salt) { @@ -21,28 +21,12 @@ QString PasswordHasher::generateRandomSalt(const int len) static const char alphanum[] = "0123456789" "ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz"; - const int size = sizeof(alphanum) - 1; - - // Two bytes per character, corrected for modulo bias via rejection sampling. - const int bucketSize = 65536 / size; - const int limit = bucketSize * size; QString ret; - ret.reserve(len); - QByteArray random = CryptoUtil::randomBytes(len * 2); - int bytesUsed = 0; + int size = sizeof(alphanum) - 1; + for (int i = 0; i < len; ++i) { - unsigned int value; - do { - if (bytesUsed >= random.size()) { - random = CryptoUtil::randomBytes(len * 2); - bytesUsed = 0; - } - value = static_cast(static_cast(random.at(bytesUsed))) << 8 | - static_cast(static_cast(random.at(bytesUsed + 1))); - bytesUsed += 2; - } while (value >= limit); - ret.append(alphanum[value / bucketSize]); + ret.append(alphanum[rng->rand(0, size)]); } return ret; @@ -50,5 +34,5 @@ QString PasswordHasher::generateRandomSalt(const int len) QString PasswordHasher::generateActivationToken() { - return QString(CryptoUtil::randomBytes(16).toBase64().left(16)); + return QCryptographicHash::hash(generateRandomSalt().toUtf8(), QCryptographicHash::Md5).toBase64().left(16); } diff --git a/oracle/CMakeLists.txt b/oracle/CMakeLists.txt index a942870b7..0736db7f5 100644 --- a/oracle/CMakeLists.txt +++ b/oracle/CMakeLists.txt @@ -23,12 +23,11 @@ set(oracle_SOURCES src/pages.cpp src/pagetemplates.cpp src/parsehelpers.cpp - src/raw_json_scanner.cpp + src/qt-json/json.cpp ../cockatrice/src/client/settings/cache_settings.cpp ../cockatrice/src/client/settings/card_counter_settings.cpp ../cockatrice/src/client/settings/shortcuts_settings.cpp ../cockatrice/src/client/network/update/client/release_channel.cpp - ../cockatrice/src/interface/pixel_map_generator.cpp ../cockatrice/src/interface/theme_config.cpp ../cockatrice/src/interface/theme_manager.cpp ../cockatrice/src/interface/widgets/quick_settings/settings_button_widget.cpp @@ -114,8 +113,6 @@ qt6_add_executable( MANUAL_FINALIZATION ) -target_precompile_headers(oracle PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtwidgets_pch.h") - # ------------------------ # Link libraries # ------------------------ @@ -213,19 +210,10 @@ if(WIN32) list(APPEND libSearchDirs ${QT_LIBRARY_DIR}) install( - DIRECTORY "$/" + DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/" DESTINATION ./ FILES_MATCHING PATTERN "*.dll" - PATTERN "*.pdb" EXCLUDE - PATTERN "*.dir*" EXCLUDE - PATTERN "*_autogen*" EXCLUDE - PATTERN "*.tlog*" EXCLUDE - PATTERN "CMakeFiles*" EXCLUDE - PATTERN "x64*" EXCLUDE - PATTERN ".qt*" EXCLUDE - PATTERN ".qsb*" EXCLUDE - PATTERN ".lupdate*" EXCLUDE ) # Qt plugins: iconengines, platforms, styles, tls (Qt6) diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp index 0f962f9be..bb88153b1 100644 --- a/oracle/src/main.cpp +++ b/oracle/src/main.cpp @@ -50,8 +50,8 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); QCoreApplication::setOrganizationName("Cockatrice"); - QCoreApplication::setOrganizationDomain("Cockatrice"); - // This can't be changed, as it influences the default save path for cards.xml + QCoreApplication::setOrganizationDomain("cockatrice"); + // this can't be changed, as it influences the default save path for cards.xml QCoreApplication::setApplicationName("Cockatrice"); // If the program is opened with the -s flag, it will only do spoilers. Otherwise it will do MTGJSON/Tokens @@ -83,7 +83,7 @@ int main(int argc, char *argv[]) QIcon icon("theme:appicon.svg"); wizard.setWindowIcon(icon); // set name of the app desktop file; used by wayland to load the window icon - QGuiApplication::setDesktopFileName("Oracle"); + QGuiApplication::setDesktopFileName("oracle"); wizard.show(); diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 88b522197..fdb32bb8d 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -3,16 +3,12 @@ #include "libcockatrice/interfaces/noop_card_preference_provider.h" #include "libcockatrice/interfaces/noop_card_set_priority_controller.h" #include "parsehelpers.h" +#include "qt-json/json.h" #include -#include -#include -#include #include -#include #include #include -#include #include #include @@ -23,9 +19,8 @@ static const QList kSingletonCounts = {{1, "legal"}, {0, "banned"} SplitCardPart::SplitCardPart(const QString &_name, const QString &_text, const QHash &_properties, - const PrintingInfo &_printingInfo, - const QString &_localizedText) - : name(_name), text(_text), localizedText(_localizedText), properties(_properties), printingInfo(_printingInfo) + const PrintingInfo &_printingInfo) + : name(_name), text(_text), properties(_properties), printingInfo(_printingInfo) { } @@ -35,42 +30,6 @@ OracleImporter::OracleImporter(QObject *parent) : QObject(parent) { } -void OracleImporter::setCardLang(const QString &lang) -{ - cardLang = lang.trimmed().toLower(); - localizationEnabled = cardLang != "en" && CardLocalization::supportedLanguages().contains(cardLang); -} - -/** - * @brief Maps the MTGJSON foreignData language names to the short codes used by - * Scryfall and stored in cards.xml (e.g. "German" -> "de"). - * @param language The language name found in the MTGJSON foreignData entries. - * @return The short language code, or an empty string if unknown. - */ -static QString mtgjsonLanguageToCode(const QString &language) -{ - static const QHash map = { - {"Chinese Simplified", "zhs"}, - {"Chinese Traditional", "zht"}, - {"English", "en"}, - {"French", "fr"}, - {"German", "de"}, - {"Greek", "grc"}, - {"Ancient Greek", "grc"}, - {"Hebrew", "he"}, - {"Italian", "it"}, - {"Japanese", "ja"}, - {"Korean", "ko"}, - {"Latin", "la"}, - {"Phyrexian", "ph"}, - {"Portuguese (Brazil)", "pt"}, - {"Russian", "ru"}, - {"Sanskrit", "sa"}, - {"Spanish", "es"}, - }; - return map.value(language); -} - static CardSet::Priority getSetPriority(const QString &setType, const QString &shortName) { if (!setTypePriorities.contains(setType.toLower())) { @@ -83,37 +42,31 @@ static CardSet::Priority getSetPriority(const QString &setType, const QString &s return priority; } -bool OracleImporter::readSetsFromByteArray(QByteArray data) +bool OracleImporter::readSetsFromByteArray(const QByteArray &data) { - const RawJson::ScanProgressCallback progress = - progressReporting - ? [this]( - qsizetype bytesRead, - qsizetype - totalBytes) { emit dataReadProgress(static_cast(bytesRead), static_cast(totalBytes)); } - : RawJson::ScanProgressCallback{}; - - RawJson::ScanError error; - const QList ranges = RawJson::scanSetRanges(data, &error, progress); - if (error.isError()) { - qDebug() << "error: RawJson::scanSetRanges():" << error.message; + bool ok; + auto setsMap = QtJson::Json::parse(QString(data), ok).toMap().value("data").toMap(); + if (!ok) { + qDebug() << "error: QtJson::Json::parse()"; return false; } QList newSetList; - newSetList.reserve(ranges.size()); - for (const RawJson::SetRange &range : ranges) { - QString shortName = range.code.toUpper(); - QString longName = range.name; - QString setType = range.type; - QDate releaseDate = QDate::fromString(range.releaseDate, Qt::ISODate); + QListIterator it(setsMap.values()); + + while (it.hasNext()) { + QVariantMap map = it.next().toMap(); + QString shortName = map.value("code").toString().toUpper(); + QString longName = map.value("name").toString(); + QList setCards = map.value("cards").toList(); + QString setType = map.value("type").toString(); + QDate releaseDate = map.value("releaseDate").toDate(); CardSet::Priority priority = getSetPriority(setType, shortName); // capitalize set type if (setType.length() > 0) { // basic grammar for words that aren't capitalized, like in "From the Vault" - static const QStringList noCapitalize = {"the", "a", "an", "on", "to", "for", - "of", "in", "and", "with", "or"}; + const QStringList noCapitalize = {"the", "a", "an", "on", "to", "for", "of", "in", "and", "with", "or"}; QStringList words = setType.split("_"); setType.clear(); bool first = false; @@ -121,15 +74,13 @@ bool OracleImporter::readSetsFromByteArray(QByteArray data) if (first && noCapitalize.contains(item)) { setType += item + QString(" "); } else { - setType += item[0].toUpper() + item.mid(1) + QString(" "); + setType += item[0].toUpper() + item.mid(1, -1) + QString(" "); first = true; } } setType = setType.trimmed(); } - SetToDownload set(shortName, longName, priority, setType, releaseDate); - set.setRawRange(range.dataRange); - newSetList.append(set); + newSetList.append(SetToDownload(shortName, longName, setCards, priority, setType, releaseDate)); } std::sort(newSetList.begin(), newSetList.end()); @@ -138,34 +89,19 @@ bool OracleImporter::readSetsFromByteArray(QByteArray data) return false; } allSets = newSetList; - rawSetsData = std::move(data); return true; } -/** - * The priority order used to pick a card's main type when a card has multiple - * types (e.g. "Artifact Creature") or multiple faces (e.g. split/adventure cards). - * A lower index means a higher priority. - */ -static const QStringList MAIN_CARD_TYPE_PRIORITY = {"Planeswalker", "Creature", "Land", "Sorcery", - "Instant", "Artifact", "Enchantment"}; - -/** - * Returns the priority (index) of the given main card type. Known types map to their - * position in {@link mainCardTypePriority()}, unknown types map to -1 (lowest priority). - */ -static int mainCardTypePriority(const QString &mainCardType) -{ - return MAIN_CARD_TYPE_PRIORITY.indexOf(mainCardType); -} - static QString getMainCardType(const QStringList &typeList) { if (typeList.isEmpty()) { return {}; } - for (const auto &type : MAIN_CARD_TYPE_PRIORITY) { + static const QStringList typePriority = {"Planeswalker", "Creature", "Land", "Sorcery", + "Instant", "Artifact", "Enchantment"}; + + for (const auto &type : typePriority) { if (typeList.contains(type)) { return type; } @@ -186,8 +122,14 @@ static void sortAndReduceColors(QString &colors) std::sort(colors.begin(), colors.end(), [](const QChar a, const QChar b) { return colorOrder.value(a, INT_MAX) < colorOrder.value(b, INT_MAX); }); // reduce - auto last = std::unique(colors.begin(), colors.end()); - colors.erase(last, colors.end()); + QChar lastChar = '\0'; + for (int i = 0; i < colors.size(); ++i) { + if (colors.at(i) == lastChar) { + colors.remove(i, 1); + } else { + lastChar = colors.at(i); + } + } } CardInfoPtr OracleImporter::addCard(QString name, @@ -200,12 +142,9 @@ CardInfoPtr OracleImporter::addCard(QString name, // Workaround for card name weirdness name = name.replace("Æ", "AE"); name = name.replace("’", "'"); - auto existingIt = cards.constFind(name); - if (existingIt != cards.constEnd()) { - CardInfoPtr card = existingIt.value(); + if (cards.contains(name)) { + CardInfoPtr card = cards.value(name); card->addToSet(printingInfo.getSet(), printingInfo); - // Only merge legalities when the card has none yet, so multi-format - // printings don't overwrite each other's legality lists. if (card->getProperties().filter(formatRegex).empty()) { card->combineLegalities(properties); } @@ -243,9 +182,8 @@ CardInfoPtr OracleImporter::addCard(QString name, // DETECT CARD POSITIONING INFO - QString layoutVal = properties.value("layout"); - bool landscapeOrientation = - properties.value("maintype") == "Battle" || layoutVal == "split" || layoutVal == "planar"; + bool landscapeOrientation = properties.value("maintype") == "Battle" || properties.value("layout") == "split" || + properties.value("layout") == "planar"; // cards that enter the field tapped bool cipt = parseCipt(name, text) || landscapeOrientation; @@ -284,110 +222,12 @@ CardInfoPtr OracleImporter::addCard(QString name, return newCard; } -static QString getJsonString(const QJsonObject &obj, const QString &key) +static QString getStringPropertyFromMap(const QVariantMap &card, const QString &propertyName) { - // QVariant coerces numbers and booleans to text, while QJsonValue::toString() - // returns a null string for them — some MTGJSON fields (manaValue, - // convertedManaCost, isOnlineOnly, isRebalanced) carry those types. - return obj.value(key).toVariant().toString(); + return card.contains(propertyName) ? card.value(propertyName).toString() : QString(""); } -static QString normalizeCardName(QString name) -{ - // Mirror of the name cleanup applied in addCard(), so collected localization - // keys line up with the card map keys (Æ → AE, curly apostrophe → straight). - name = name.replace("Æ", "AE"); - name = name.replace("’", "'"); - return name; -} - -static QString matchingForeignEntryText(const QJsonObject &card, const QString &cardLang) -{ - // Multi-face cards (split/aftermath/adventure/prepare) expose each face as a - // separate card object, each with its own foreignData entry carrying that - // face's rules text; single-face cards carry the full text in one entry. - const QJsonArray foreignData = card.value("foreignData").toArray(); - for (const QJsonValue &entryValue : foreignData) { - const QJsonObject entry = entryValue.toObject(); - // MTGJSON reports languages by long-form name ("German"); match the - // short code ("de") that Scryfall and cards.xml use. - if (mtgjsonLanguageToCode(getJsonString(entry, "language")) == cardLang) { - return getJsonString(entry, "text"); - } - } - return QString(); -} - -void OracleImporter::collectForeignData(const QString &cardKey, - const CardSetPtr ¤tSet, - const QJsonObject &card, - bool collectText) -{ - if (!localizationEnabled) { - return; - } - - LocalizedCardEntry incoming; - bool found = false; - const QJsonArray foreignData = card.value("foreignData").toArray(); - for (const QJsonValue &entryValue : foreignData) { - const QJsonObject entry = entryValue.toObject(); - // MTGJSON reports languages by long-form name ("German"); match the - // short code ("de") that Scryfall and cards.xml use. - if (mtgjsonLanguageToCode(getJsonString(entry, "language")) != cardLang) { - continue; - } - incoming.name = getJsonString(entry, "name"); - incoming.text = collectText ? getJsonString(entry, "text") : QString(); - found = true; - break; - } - if (!found) { - return; - } - - // Prefer the entry from the highest-priority set (lower enum value = more - // authoritative); printings of equal priority keep the first one seen. - incoming.priority = currentSet->getPriority(); - const auto existing = localizedEntries.constFind(cardKey); - if (existing == localizedEntries.constEnd() || incoming.priority < existing->priority) { - localizedEntries.insert(cardKey, incoming); - } -} - -void OracleImporter::applyLocalizedData() -{ - if (!localizationEnabled) { - return; - } - for (auto it = localizedEntries.constBegin(); it != localizedEntries.constEnd(); ++it) { - CardInfoPtr card = cards.value(it.key()); - if (card.isNull()) { - continue; - } - const LocalizedCardEntry &entry = it.value(); - if (!entry.name.isEmpty()) { - card->setLocalizedName(cardLang, entry.name); - } - if (!entry.text.isEmpty()) { - card->setLocalizedText(cardLang, entry.text); - } - } - localizedEntries.clear(); - - for (auto it = splitLocalizedTexts.constBegin(); it != splitLocalizedTexts.constEnd(); ++it) { - CardInfoPtr card = cards.value(it.key()); - if (card.isNull()) { - continue; - } - if (!it.value().text.isEmpty()) { - card->setLocalizedText(cardLang, it.value().text); - } - } - splitLocalizedTexts.clear(); -} - -int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJsonArray &cardsList) +int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QList &cardsList) { // mtgjson name => xml name static const QMap cardProperties{ @@ -408,7 +248,7 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJson static const QString ptSeparator = "/"; static constexpr bool isToken = false; - static const QSet setsWithCardsWithSameNameButDifferentText = {"UST"}; + static const QList setsWithCardsWithSameNameButDifferentText = {"UST"}; int numCards = 0; @@ -416,16 +256,16 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJson QMap, QString>> splitCards; // Keeps track of all names encountered so far - QSet allNameProps; + QList allNameProps; - for (const QJsonValue &cardVal : cardsList) { - QJsonObject card = cardVal.toObject(); + for (const QVariant &cardVar : cardsList) { + QVariantMap card = cardVar.toMap(); /* Currently used layouts are: * augment, double_faced_token, flip, host, leveler, meld, normal, planar, * saga, scheme, split, token, transform, vanguard */ - QString layout = getJsonString(card, "layout"); + QString layout = getStringPropertyFromMap(card, "layout"); // don't import tokens from the json file if (layout == "token") { @@ -433,9 +273,9 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJson } // normal cards handling - QString name = getJsonString(card, "name"); - QString text = getJsonString(card, "text"); - QString faceName = getJsonString(card, "faceName"); + QString name = getStringPropertyFromMap(card, "name"); + QString text = getStringPropertyFromMap(card, "text"); + QString faceName = getStringPropertyFromMap(card, "faceName"); if (faceName.isEmpty()) { faceName = name; } @@ -443,34 +283,39 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJson // card properties QHash properties; for (auto i = cardProperties.cbegin(), end = cardProperties.cend(); i != end; ++i) { - QString propertyValue = getJsonString(card, i.key()); + QString mtgjsonProperty = i.key(); + QString xmlPropertyName = i.value(); + QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty); if (!propertyValue.isEmpty()) { - properties.insert(i.value(), propertyValue); + properties.insert(xmlPropertyName, propertyValue); } } // per-set properties QHash printingProps; for (auto i = setInfoProperties.cbegin(), end = setInfoProperties.cend(); i != end; ++i) { - QString propertyValue = getJsonString(card, i.key()); + QString mtgjsonProperty = i.key(); + QString xmlPropertyName = i.value(); + QString propertyValue = getStringPropertyFromMap(card, mtgjsonProperty); if (!propertyValue.isEmpty()) { - printingProps.insert(i.value(), propertyValue); + printingProps.insert(xmlPropertyName, propertyValue); } } // handle flavorNames specially due to double-faced cards - QString faceFlavorName = getJsonString(card, "faceFlavorName"); - QString flavorName = !faceFlavorName.isEmpty() ? faceFlavorName : getJsonString(card, "flavorName"); + QString faceFlavorName = getStringPropertyFromMap(card, "faceFlavorName"); + QString flavorName = !faceFlavorName.isEmpty() ? faceFlavorName : getStringPropertyFromMap(card, "flavorName"); if (!flavorName.isEmpty()) { printingProps.insert("flavorName", flavorName); } // Identifiers - QJsonObject identifiers = card.value("identifiers").toObject(); for (auto i = identifierProperties.cbegin(), end = identifierProperties.cend(); i != end; ++i) { - QString propertyValue = getJsonString(identifiers, i.key()); + QString mtgjsonProperty = i.key(); + QString xmlPropertyName = i.value(); + QString propertyValue = getStringPropertyFromMap(card.value("identifiers").toMap(), mtgjsonProperty); if (!propertyValue.isEmpty()) { - printingProps.insert(i.value(), propertyValue); + printingProps.insert(xmlPropertyName, propertyValue); } } @@ -486,26 +331,21 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJson allNameProps.contains(faceName) && layout == "normal" && lastChar.isLetter()) { numComponent = " (" + QString(lastChar).toLower() + ")"; } - allNameProps.insert(faceName); + allNameProps.append(faceName); // special handling properties - QString colors; - for (const QJsonValue &color : card.value("colors").toArray()) { - colors += color.toString(); - } + QString colors = card.value("colors").toStringList().join(""); if (!colors.isEmpty()) { properties.insert("colors", colors); } - QString colorIdentity; - for (const QJsonValue &color : card.value("colorIdentity").toArray()) { - colorIdentity += color.toString(); - } + // special handling properties + QString colorIdentity = card.value("colorIdentity").toStringList().join(""); if (!colorIdentity.isEmpty()) { properties.insert("coloridentity", colorIdentity); } - const auto &mainCardType = getMainCardType(card.value("types").toVariant().toStringList()); + const auto &mainCardType = getMainCardType(card.value("types").toStringList()); if (mainCardType.isEmpty()) { qDebug() << "warning: no mainCardType for card:" << name; } else { @@ -514,47 +354,39 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJson // Depending on whether power and/or toughness are present, the format // is either P/T (most common), P (no toughness), or /T (no power). - QString power = getJsonString(card, "power"); - QString toughness = getJsonString(card, "toughness"); + QString power = getStringPropertyFromMap(card, "power"); + QString toughness = getStringPropertyFromMap(card, "toughness"); if (toughness.isEmpty() && !power.isEmpty()) { properties.insert("pt", power); } else if (!toughness.isEmpty()) { properties.insert("pt", power + ptSeparator + toughness); } - auto legalities = card.value("legalities").toObject(); - for (auto i = legalities.constBegin(), end = legalities.constEnd(); i != end; ++i) { + auto legalities = card.value("legalities").toMap(); + for (auto i = legalities.cbegin(), end = legalities.cend(); i != end; ++i) { properties.insert(QString("format-%1").arg(i.key()), i.value().toString().toLower()); } // split cards are considered a single card, enqueue for later merging if (layout == "split" || layout == "aftermath" || layout == "adventure" || layout == "prepare") { - auto _faceName = getJsonString(card, "faceName"); - // MTGJSON exposes each face as a separate card object, each with its - // own foreignData entry holding that face's rules text; collect it so - // the per-face texts can be joined the same way as the English text. - const QString faceLocalizedText = - localizationEnabled ? matchingForeignEntryText(card, cardLang) : QString(); - SplitCardPart split(_faceName, text, properties, printingInfo, faceLocalizedText); + auto _faceName = getStringPropertyFromMap(card, "faceName"); + SplitCardPart split(_faceName, text, properties, printingInfo); auto found_iter = splitCards.find(name + numProperty); if (found_iter == splitCards.end()) { splitCards.insert(name + numProperty, {{split}, name}); } else { found_iter->first.append(split); } - // MTGJSON's foreignData name is the joined name present on every - // face, so collect the name once. - collectForeignData(normalizeCardName(name), currentSet, card, false); } else { // relations QList relatedCards; // add other face for split cards as card relation - if (!getJsonString(card, "side").isEmpty()) { - auto faceManaValue = getJsonString(card, "faceManaValue"); + if (!getStringPropertyFromMap(card, "side").isEmpty()) { + auto faceManaValue = getStringPropertyFromMap(card, "faceManaValue"); if (faceManaValue.isEmpty()) { // check the old name for the property, for backwards compatibility purposes - faceManaValue = getJsonString(card, "faceConvertedManaCost"); + faceManaValue = getStringPropertyFromMap(card, "faceConvertedManaCost"); } properties["cmc"] = faceManaValue; @@ -574,23 +406,20 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJson name = faceName; } - // mtgjson related cards - QJsonObject givenRelated = card.value("relatedCards").toObject(); - if (!givenRelated.isEmpty()) { + // mtgjon related cards + if (card.contains("relatedCards")) { + QVariantMap givenRelated = card.value("relatedCards").toMap(); // conjured cards from a spellbook - QJsonArray spellbook = givenRelated.value("spellbook").toArray(); - if (!spellbook.isEmpty()) { - for (const QJsonValue &spbkVal : spellbook) { - relatedCards.append(new CardRelation(spbkVal.toString(), CardRelationType::DoesNotAttach, false, - false, 1, true)); + if (givenRelated.contains("spellbook")) { + auto spbk = givenRelated.value("spellbook").toStringList(); + for (const QString &spbkName : spbk) { + relatedCards.append( + new CardRelation(spbkName, CardRelationType::DoesNotAttach, false, false, 1, true)); } } } - collectForeignData(normalizeCardName(name + numComponent), currentSet, card); - - CardInfoPtr newCard = - addCard(name + numComponent, text, isToken, std::move(properties), relatedCards, printingInfo); + CardInfoPtr newCard = addCard(name + numComponent, text, isToken, properties, relatedCards, printingInfo); numCards++; } } @@ -598,12 +427,11 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJson // split cards handling static const QString splitCardPropSeparator = QString(" // "); static const QString splitCardTextSeparator = QString("\n\n---\n\n"); + static const QList noRelatedCards = {}; QList, QString>> partsAndNames = splitCards.values(); for (auto [splitCardParts, name] : partsAndNames) { QString text; - QString localizedText; - bool localizedTextComplete = true; QHash properties; PrintingInfo printingInfo; @@ -613,21 +441,6 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJson } text.append(tmp.getText()); - // Build the cardLang text by joining each face's translated text with - // the same separator as the English text. Any face missing a complete - // translation abandons the whole join, falling back to the English text. - if (localizedTextComplete) { - const QString partLocalizedText = tmp.getLocalizedText(); - if (partLocalizedText.isEmpty()) { - localizedTextComplete = false; - } else { - if (!localizedText.isEmpty()) { - localizedText.append(splitCardTextSeparator); - } - localizedText.append(partLocalizedText); - } - } - if (properties.isEmpty()) { properties = tmp.getProperties(); printingInfo = tmp.getPrintingInfo(); @@ -640,17 +453,10 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJson if (!thisCardPropertyValue.isEmpty() && originalPropertyValue != thisCardPropertyValue) { if (originalPropertyValue.isEmpty()) { // don't create //es if one field is empty properties.insert(prop, thisCardPropertyValue); - } else if (prop == "colors" || prop == "coloridentity") { // the card is both colors + } else if (prop == "colors") { // the card is both colors properties.insert(prop, originalPropertyValue + thisCardPropertyValue); - } else if (prop == "maintype") { - // Use the same priority as getMainCardType() to pick the - // "best" type across faces — e.g. Creature over Instant - // for adventure cards like Bonecrusher Giant. - int currentPriority = mainCardTypePriority(originalPropertyValue); - int newPriority = mainCardTypePriority(thisCardPropertyValue); - if (newPriority >= 0 && (currentPriority < 0 || newPriority < currentPriority)) { - properties.insert(prop, thisCardPropertyValue); - } + } else if (prop == "maintype") { // don't create maintypes with //es in them + continue; } else { properties.insert(prop, originalPropertyValue + splitCardPropSeparator + thisCardPropertyValue); @@ -659,32 +465,20 @@ int OracleImporter::importCardsFromSet(const CardSetPtr ¤tSet, const QJson } } } - CardInfoPtr newCard = addCard(name, text, isToken, std::move(properties), {}, printingInfo); - if (localizationEnabled && localizedTextComplete && !localizedText.isEmpty()) { - // Same priority policy as collectForeignData(): the joined text from the - // highest-priority set seen so far wins, applied once all printings are in. - LocalizedCardEntry entry; - entry.text = localizedText; - entry.priority = currentSet->getPriority(); - const QString entryKey = normalizeCardName(name); - const auto existing = splitLocalizedTexts.constFind(entryKey); - if (existing == splitLocalizedTexts.constEnd() || entry.priority < existing->priority) { - splitLocalizedTexts.insert(entryKey, entry); - } - } + CardInfoPtr newCard = addCard(name, text, isToken, properties, noRelatedCards, printingInfo); numCards++; } return numCards; } -static FormatRulesNameMap buildDefaultMagicFormats() +FormatRulesNameMap OracleImporter::createDefaultMagicFormats() { // Predefined common exceptions CardCondition superTypeIsBasic; superTypeIsBasic.field = "type"; superTypeIsBasic.matchType = "regex"; - superTypeIsBasic.value = R"(\bBasic\b[^—]+\bLand\b)"; + superTypeIsBasic.value = "\bBasic\b[^—]+\bLand\b"; ExceptionRule basicLands; basicLands.conditions.append(superTypeIsBasic); @@ -697,6 +491,7 @@ static FormatRulesNameMap buildDefaultMagicFormats() ExceptionRule mayContainAnyNumber; mayContainAnyNumber.conditions.append(anyNumberAllowed); + // Map to store default rules FormatRulesNameMap defaultFormatRulesNameMap; // ----------------- Helper lambda to create format ----------------- @@ -742,29 +537,10 @@ static FormatRulesNameMap buildDefaultMagicFormats() return defaultFormatRulesNameMap; } -const FormatRulesNameMap &OracleImporter::createDefaultMagicFormats() -{ - static const FormatRulesNameMap cached = buildDefaultMagicFormats(); - return cached; -} - int OracleImporter::startImport() { static ICardSetPriorityController *noOpController = new NoopCardSetPriorityController(); - importCancelled.storeRelease(0); - - // Pre-allocate the cards hash to avoid rehashing during import. Keys are - // distinct card names while raw ranges only count printings (AllPrintings - // ~100k printings vs ~35k names), so this over-reserves somewhat; an exact - // distinct-name count would require eagerly parsing, which the lazy reader - // deliberately avoids. It's a capacity hint, so the overshoot is harmless. - int estimatedCards = 0; - for (const SetToDownload &curSetToParse : allSets) { - estimatedCards += curSetToParse.getRawRange().cardCount; - } - cards.reserve(estimatedCards); - // add an empty set for tokens CardSetPtr tokenSet = CardSet::newInstance(noOpController, CardSet::TOKENS_SETNAME, tr("Dummy set containing tokens"), "Tokens"); @@ -773,61 +549,20 @@ int OracleImporter::startImport() int setIndex = 0; for (const SetToDownload &curSetToParse : allSets) { - if (importCancelled.loadAcquire()) { - // The wizard was closed mid-import: stop at the next set boundary so - // the caller can wait for this future without processing every set. - break; - } - CardSetPtr newSet = CardSet::newInstance(noOpController, curSetToParse.getShortName(), curSetToParse.getLongName(), curSetToParse.getSetType(), curSetToParse.getReleaseDate(), curSetToParse.getPriority()); - - // parse only this set's slice of the raw document so the whole JSON tree is - // never kept in memory at once - const RawJson::SetDataRange &rawRange = curSetToParse.getRawRange(); - const qsizetype rangeEnd = rawRange.start + rawRange.length; - if (rawRange.start < 0 || rawRange.length <= 0 || rangeEnd > rawSetsData.size()) { - // rawSetsData is cleared by releaseSetData() while SetToDownload copies - // taken from getSets() keep their ranges, and nothing else enforces the - // pairing — so never index past the buffer on stale/mismatched ranges. - qWarning() << "error: out-of-bounds raw range for set" << curSetToParse.getShortName() << "skipping"; - ++setIndex; - emit setIndexChanged(0, setIndex, curSetToParse.getLongName()); - continue; - } - // sliced() shares the buffer instead of deep-copying the slice; the largest - // sets in AllPrintings are tens of MB, so the copy is worth avoiding here. - const QByteArray setBytes = rawSetsData.sliced(rawRange.start, rawRange.length); - QJsonParseError parseError; - const QJsonDocument setDoc = QJsonDocument::fromJson(setBytes, &parseError); - if (parseError.error != QJsonParseError::NoError) { - qWarning() << "error: parsing card data for set" << curSetToParse.getShortName() << ":" - << parseError.errorString(); - ++setIndex; - // Keep the progress accounting honest: a set that failed to parse - // still advanced the index, so report it (with zero imported cards) - // rather than letting SaveSetsPage's bar stall per failed set. - emit setIndexChanged(0, setIndex, curSetToParse.getLongName()); - continue; - } - - // Only add the set to the database once its slice parsed cleanly; - // a set that fails here must not persist as an empty set in cards.xml. if (!sets.contains(newSet->getShortName())) { sets.insert(newSet->getShortName(), newSet); } - const QJsonArray setCards = setDoc.object().value("cards").toArray(); - int numCardsInSet = importCardsFromSet(newSet, setCards); + int numCardsInSet = importCardsFromSet(newSet, curSetToParse.getCards()); ++setIndex; emit setIndexChanged(numCardsInSet, setIndex, curSetToParse.getLongName()); } - applyLocalizedData(); - emit setIndexChanged(0, setIndex, QString()); // total number of sets @@ -841,18 +576,9 @@ bool OracleImporter::saveToFile(const QString &fileName, const QString &sourceUr return parser.saveToFile(createDefaultMagicFormats(), sets, cards, fileName, sourceUrl, sourceVersion); } -void OracleImporter::releaseSetData() -{ - allSets.clear(); - rawSetsData.clear(); -} - void OracleImporter::clear() { sets.clear(); cards.clear(); allSets.clear(); - rawSetsData.clear(); - localizedEntries.clear(); - splitLocalizedTexts.clear(); } diff --git a/oracle/src/oracleimporter.h b/oracle/src/oracleimporter.h index c8d3a19bf..99644f9ce 100644 --- a/oracle/src/oracleimporter.h +++ b/oracle/src/oracleimporter.h @@ -1,12 +1,6 @@ #ifndef ORACLEIMPORTER_H #define ORACLEIMPORTER_H -#include "raw_json_scanner.h" - -#include -#include -#include -#include #include #include #include @@ -50,12 +44,10 @@ class SetToDownload { private: QString shortName, longName; + QList cards; QDate releaseDate; QString setType; CardSet::Priority priority; - // Byte range of this set's object within the importer's raw JSON text. Parsing - // one set at a time keeps peak memory low instead of holding the whole document. - RawJson::SetDataRange rawRange; public: const QString &getShortName() const @@ -66,6 +58,10 @@ public: { return longName; } + const QList &getCards() const + { + return cards; + } const QString &getSetType() const { return setType; @@ -78,23 +74,16 @@ public: { return priority; } - const RawJson::SetDataRange &getRawRange() const - { - return rawRange; - } SetToDownload(QString _shortName, QString _longName, + QList _cards, CardSet::Priority _priority, QString _setType = QString(), const QDate &_releaseDate = QDate()) - : shortName(std::move(_shortName)), longName(std::move(_longName)), releaseDate(_releaseDate), - setType(std::move(_setType)), priority(_priority) + : shortName(std::move(_shortName)), longName(std::move(_longName)), cards(std::move(_cards)), + releaseDate(_releaseDate), setType(std::move(_setType)), priority(_priority) { } - void setRawRange(const RawJson::SetDataRange &_rawRange) - { - rawRange = _rawRange; - } bool operator<(const SetToDownload &set) const { return longName.compare(set.longName, Qt::CaseInsensitive) < 0; @@ -107,8 +96,7 @@ public: SplitCardPart(const QString &_name, const QString &_text, const QHash &_properties, - const PrintingInfo &_printingInfo, - const QString &_localizedText = QString()); + const PrintingInfo &_printingInfo); inline const QString &getName() const { return name; @@ -117,13 +105,6 @@ public: { return text; } - /** - * @brief The cardLang rules text of this face's foreignData entry, if any. - */ - inline const QString &getLocalizedText() const - { - return localizedText; - } inline const QHash &getProperties() const { return properties; @@ -136,18 +117,10 @@ public: private: QString name; QString text; - QString localizedText; QHash properties; PrintingInfo printingInfo; }; -struct LocalizedCardEntry -{ - QString name; - QString text; - CardSet::Priority priority = CardSet::PriorityLowest; -}; - class OracleImporter : public QObject { Q_OBJECT @@ -166,130 +139,23 @@ private: QList allSets; - /** - * The raw JSON text of the source document, retained for lazy per-set - * parsing during startImport(). Frees the card data as each set is imported. - */ - QByteArray rawSetsData; - - /** - * Whether readSetsFromByteArray() should report scan progress via - * dataReadProgress. A background run routes that signal to stdout (for the - * hosting Cockatrice client to parse); the flag exists to skip the scanner - * instrumentation entirely when no consumer needs it. - */ - bool progressReporting = true; - - /** - * Atomic "please stop importing" flag. startImport() checks it between sets - * so a wizard being closed mid-import can be torn down without waiting for - * the whole import (or racing it). - */ - QAtomicInt importCancelled; - - /** - * The ISO-639 language code whose foreignData is imported; "en" by default. - */ - QString cardLang = "en"; - - /** - * Whether cardLang is a supported language other than English, so per-card - * foreignData scanning can be skipped entirely when disabled. - */ - bool localizationEnabled = false; - - /** - * Localized name/text collected per imported card key while parsing sets, - * applied to the CardInfo objects by applyLocalizedData() once all - * printings have been seen so the best-priority one wins. - */ - QMap localizedEntries; - - /** - * cardLang rules text collected for split-card names while parsing sets, - * applied by applyLocalizedData(). Kept apart from localizedEntries because - * MTGJSON emits each split face as its own card object with the joined name - * on every foreignData entry: names and the per-face text join have different - * completeness and must not overwrite each other under the same key. - */ - QMap splitLocalizedTexts; - CardInfoPtr addCard(QString name, const QString &text, bool isToken, QHash properties, const QList &relatedCards, const PrintingInfo &printingInfo); - - /** - * Records the first foreignData entry matching cardLang for the given card - * key, keeping the entry from the highest-priority set seen so far. - * - * Multi-face cards (split, adventure, aftermath, prepare) pass collectText = - * false: MTGJSON emits one foreignData entry per face with the same joined - * name but only that face's text, so the name is collected here while the - * per-face texts are joined during the split-card merge. - */ - void collectForeignData(const QString &cardKey, - const CardSetPtr ¤tSet, - const QJsonObject &card, - bool collectText = true); signals: void setIndexChanged(int cardsImported, int setIndex, const QString &setName); void dataReadProgress(int bytesRead, int totalBytes); public: explicit OracleImporter(QObject *parent = nullptr); - /** - * @brief Controls whether readSetsFromByteArray() instruments the raw scan. - * - * When enabled (the default) the raw scanner reports progress via - * dataReadProgress(), which an interactive wizard shows on its progress bar - * and a background run routes to stdout for the hosting client. Switch it - * off only when nothing will consume scan progress. - */ - void setProgressReporting(bool enabled) - { - progressReporting = enabled; - } - /** - * Selects the ISO-639 language code whose foreignData is imported. - * English (the default) and unsupported codes disable localization. - */ - void setCardLang(const QString &lang); - const QString &getCardLang() const - { - return cardLang; - } - /** - * Scans the given JSON document for set metadata. Takes the data by value so - * the wizard can hand over its decompressed buffer without copying it. - */ - bool readSetsFromByteArray(QByteArray data); + bool readSetsFromByteArray(const QByteArray &data); int startImport(); - /** - * @brief Requests an in-flight startImport() to stop at the next set boundary. - * - * Works by setting an atomic flag that startImport() polls between sets, so - * cancelImport() followed by a short waitForFinished() on the running future is - * safe the moment the wizard is about to be destroyed. - */ - void cancelImport() - { - importCancelled.storeRelease(1); - } - /** - * Applies the collected localized names/texts to the imported cards. - * Called automatically at the end of startImport(); exposed separately so - * tests can drive it after importing sets directly. - */ - void applyLocalizedData(); bool saveToFile(const QString &fileName, const QString &sourceUrl, const QString &sourceVersion); - int importCardsFromSet(const CardSetPtr ¤tSet, const QJsonArray &cardsList); - /** - * @brief Returns the default format rules. The result is memoized on first use and must be treated as immutable. - */ - const FormatRulesNameMap &createDefaultMagicFormats(); + int importCardsFromSet(const CardSetPtr ¤tSet, const QList &cardsList); + FormatRulesNameMap createDefaultMagicFormats(); const CardNameMap &getCardList() const { return cards; @@ -298,11 +164,6 @@ public: { return allSets; } - const QByteArray &getRawSetsData() const - { - return rawSetsData; - } - void releaseSetData(); void clear(); }; diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index 9ce0d7b51..11200dfc5 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -15,7 +15,6 @@ #include #include #include -#include #include OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent) @@ -38,9 +37,6 @@ OracleWizard::OracleWizard(QWidget *parent) : QWizard(parent) connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &OracleWizard::updateLanguage); importer = new OracleImporter(this); - // Import card text in the language the client displays, if supported: - // foreignData for any other language is never imported. - importer->setCardLang(SettingsCache::instance().cardsDisplay().getCardLang()); nam = new QNetworkAccessManager(this); @@ -114,24 +110,6 @@ void OracleWizard::accept() QDialog::accept(); } -void OracleWizard::reject() -{ - // The wizard is being closed while a page may still run a worker on the - // importer. Ask it to stop before the wizard (and the importer child) is - // destroyed, so the worker thread never touches freed memory. - if (auto *active = dynamic_cast(currentPage())) { - active->cancelWork(); - } - QWizard::reject(); -} - -void OracleWizard::runInBackground() -{ - backgroundMode = true; - hide(); - currentPage()->initializePage(); -} - void OracleWizard::enableButtons() { button(QWizard::NextButton)->setDisabled(false); diff --git a/oracle/src/oraclewizard.h b/oracle/src/oraclewizard.h index 9a509ce5e..78427175c 100644 --- a/oracle/src/oraclewizard.h +++ b/oracle/src/oraclewizard.h @@ -23,7 +23,6 @@ class OracleWizard : public QWizard public: explicit OracleWizard(QWidget *parent = nullptr); void accept() override; - void reject() override; void enableButtons(); void disableButtons(); void retranslateUi(); @@ -53,7 +52,12 @@ public: } bool saveTokensToFile(const QString &fileName); - void runInBackground(); + void runInBackground() + { + backgroundMode = true; + hide(); + currentPage()->initializePage(); + } public: OracleImporter *importer; diff --git a/oracle/src/pages.cpp b/oracle/src/pages.cpp index df0c3f51d..df4d1a98c 100644 --- a/oracle/src/pages.cpp +++ b/oracle/src/pages.cpp @@ -12,7 +12,6 @@ #include #include #include -#include #include #include #include @@ -21,17 +20,14 @@ #include #include #include -#include #include #include #include #include #include #include -#include #include #include -#include #include #ifdef HAS_LZMA @@ -57,115 +53,6 @@ #define ALLSETS_URL "https://www.mtgjson.com/api/v5/AllPrintings.json" #endif -/** - * @brief Emits one machine-readable background-run progress line to stdout. - * - * Used only in background mode, so the hosting Cockatrice client can parse these - * lines to drive a determinate progress bar. stderr stays reserved for - * human-readable log output. - */ -static void emitBackgroundProgress(const char *stage, qint64 done, qint64 total) -{ - QTextStream out(stdout); - out << "PROGRESS " << stage << ' ' << done << ' ' << total << '\n'; - out.flush(); -} - -namespace -{ - -/** - * @brief Decompresses and dispatches a sets-file payload on a worker thread. - * - * Iteratively unwraps xz/zip compression, then either hands the JSON to the - * importer (which reports scan progress via dataReadProgress) or returns the raw - * XML for the plain-XML path. Must never touch the wizard or the page: the caller - * consumes the returned LoadSetsResult on the UI thread in importFinished(). - */ -LoadSetsResult loadSetsData(const QPointer &importer, QByteArray data) -{ - LoadSetsResult result; - - while (true) { - if (data.startsWith(XZ_SIGNATURE)) { -#ifdef HAS_LZMA - QBuffer inBuffer(&data); - QByteArray decompressed; - QBuffer outBuffer(&decompressed); - inBuffer.open(QBuffer::ReadOnly); - outBuffer.open(QBuffer::WriteOnly); - XzDecompressor xz; - if (!xz.decompress(&inBuffer, &outBuffer)) { - result.errorMessage = LoadSetsPage::tr("Xz extraction failed."); - result.offerUncompressedFallback = true; - return result; - } - data = decompressed; - continue; -#else - result.errorMessage = - LoadSetsPage::tr("Sorry, this version of Oracle does not support xz compressed files."); - result.offerUncompressedFallback = true; - return result; -#endif - } - - if (data.startsWith(ZIP_SIGNATURE)) { -#ifdef HAS_ZLIB - QBuffer inBuffer(&data); - UnZip uz; - const UnZip::ErrorCode openEc = uz.openArchive(&inBuffer); - if (openEc != UnZip::Ok) { - result.errorMessage = LoadSetsPage::tr("Failed to open Zip archive: %1.").arg(uz.formatError(openEc)); - result.offerUncompressedFallback = true; - return result; - } - if (uz.fileList().size() != 1) { - result.errorMessage = - LoadSetsPage::tr("Zip extraction failed: the Zip archive doesn't contain exactly one file."); - result.offerUncompressedFallback = true; - return result; - } - const QString fileName = uz.fileList().at(0); - QByteArray decompressed; - QBuffer outBuffer(&decompressed); - outBuffer.open(QBuffer::ReadWrite); - const UnZip::ErrorCode ec = uz.extractFile(fileName, &outBuffer); - uz.closeArchive(); - if (ec != UnZip::Ok) { - result.errorMessage = LoadSetsPage::tr("Zip extraction failed: %1.").arg(uz.formatError(ec)); - result.offerUncompressedFallback = true; - return result; - } - data = decompressed; - continue; -#else - result.errorMessage = LoadSetsPage::tr("Sorry, this version of Oracle does not support zipped files."); - result.offerUncompressedFallback = true; - return result; -#endif - } - break; - } - - if (data.startsWith("<")) { - result.ok = true; - result.plainXml = true; - result.xmlData = std::move(data); - return result; - } - - if (data.startsWith("{")) { - result.ok = importer && importer->readSetsFromByteArray(std::move(data)); - return result; - } - - result.errorMessage = LoadSetsPage::tr("Failed to interpret downloaded data."); - return result; -} - -} // namespace - #define TOKENS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Token/master/tokens.xml" #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml" @@ -295,11 +182,6 @@ LoadSetsPage::LoadSetsPage(QWidget *parent) : OracleWizardPage(parent) setLayout(layout); } -bool LoadSetsPage::isComplete() const -{ - return !loadActive; -} - void LoadSetsPage::initializePage() { urlLineEdit->setText(wizard()->settings->value("allsetsurl", ALLSETS_URL).toString()); @@ -378,7 +260,7 @@ bool LoadSetsPage::validatePage() return false; } - progressLabel->setText(tr("Downloading (0 MB)")); + progressLabel->setText(tr("Downloading (0MB)")); // show an infinite progressbar progressBar->setMaximum(0); progressBar->setMinimum(0); @@ -397,13 +279,18 @@ bool LoadSetsPage::validatePage() return false; } + if (!setsFile.open(QIODevice::ReadOnly)) { + QMessageBox::critical(nullptr, tr("Error"), tr("Cannot open file '%1'.").arg(fileLineEdit->text())); + return false; + } + wizard()->disableButtons(); setEnabled(false); wizard()->setCardSourceUrl(setsFile.fileName()); wizard()->setCardSourceVersion("unknown"); - readSetsFromFile(setsFile.fileName()); + readSetsFromByteArray(setsFile.readAll()); } return false; @@ -452,14 +339,11 @@ void LoadSetsPage::downloadSetsFile(const QUrl &url) void LoadSetsPage::actDownloadProgressSetsFile(qint64 received, qint64 total) { - if (wizard()->backgroundMode) { - emitBackgroundProgress("download", received, total); - } if (total > 0) { progressBar->setMaximum(static_cast(total)); progressBar->setValue(static_cast(received)); } - progressLabel->setText(tr("Downloading (%1 MB)").arg((int)received / (1024 * 1024))); + progressLabel->setText(tr("Downloading (%1MB)").arg((int)received / (1024 * 1024))); } void LoadSetsPage::actDownloadFinishedSetsFile() @@ -500,97 +384,106 @@ void LoadSetsPage::actDownloadFinishedSetsFile() reply->deleteLater(); } -void LoadSetsPage::updateParsingProgress(int bytesRead, int totalBytes) +void LoadSetsPage::readSetsFromByteArray(QByteArray _data) { - if (totalBytes <= 0) { - return; - } - progressBar->setRange(0, totalBytes); - progressBar->setValue(bytesRead); - const int percent = static_cast((100.0 * bytesRead) / totalBytes); - progressLabel->setText(tr("Parsing file (%1%)").arg(percent)); -} - -void LoadSetsPage::scanProgressToStdout(int bytesRead, int totalBytes) -{ - emitBackgroundProgress("scan", bytesRead, totalBytes); -} - -void LoadSetsPage::beginLoadSets(bool compressedFile) -{ - // Show an infinite progressbar while the worker decompresses; the scan - // steals the label via dataReadProgress as soon as it starts. + // show an infinite progressbar progressBar->setMaximum(0); progressBar->setMinimum(0); progressBar->setValue(0); - progressLabel->setText(compressedFile ? tr("Extracting file...") : tr("Parsing file")); + progressLabel->setText(tr("Parsing file")); progressLabel->show(); progressBar->show(); - // Keep Next disabled (via completeChanged) until the worker reports in; - // updateButtonStates() re-evaluates button state whenever we re-enable. - loadActive = true; - emit completeChanged(); - wizard()->downloadedPlainXml = false; wizard()->xmlData.clear(); - - if (wizard()->backgroundMode) { - connect(wizard()->importer, &OracleImporter::dataReadProgress, this, &LoadSetsPage::scanProgressToStdout, - Qt::UniqueConnection); - } else { - connect(wizard()->importer, &OracleImporter::dataReadProgress, this, &LoadSetsPage::updateParsingProgress, - Qt::UniqueConnection); - } + readSetsFromByteArrayRef(_data); } -void LoadSetsPage::readSetsFromByteArray(QByteArray _data) +void LoadSetsPage::readSetsFromByteArrayRef(QByteArray &_data) { - const bool compressed = _data.startsWith(XZ_SIGNATURE) || _data.startsWith(ZIP_SIGNATURE); - beginLoadSets(compressed); - - // Decompress and scan off the UI thread so a large download can't freeze the window. - const QPointer importer = wizard()->importer; - future = QtConcurrent::run( - [importer, data = std::move(_data)]() mutable { return loadSetsData(importer, std::move(data)); }); - watcher.setFuture(future); -} - -void LoadSetsPage::readSetsFromFile(const QString &fileName) -{ - // Peek at the header on the UI thread so the status text can distinguish - // "Extracting file..." from a plain JSON parse; the full read happens in the worker. - QFile headerFile(fileName); - bool compressed = false; - if (headerFile.open(QIODevice::ReadOnly)) { - const QByteArray header = headerFile.read(6); - compressed = header.startsWith(XZ_SIGNATURE) || header.startsWith(ZIP_SIGNATURE); - } - beginLoadSets(compressed); - - // Read, decompress and scan off the UI thread (a plain JSON can be hundreds - // of MB, so even the read itself must not block the window). - const QPointer importer = wizard()->importer; - future = QtConcurrent::run([importer, fileName]() mutable -> LoadSetsResult { - QFile file(fileName); - if (!file.open(QIODevice::ReadOnly)) { - LoadSetsResult readError; - readError.errorMessage = LoadSetsPage::tr("Cannot open file '%1'.").arg(fileName); - return readError; + // unzip the file if needed + if (_data.startsWith(XZ_SIGNATURE)) { +#ifdef HAS_LZMA + // zipped file + auto *inBuffer = new QBuffer(&_data); + auto newData = QByteArray(); + auto *outBuffer = new QBuffer(&newData); + inBuffer->open(QBuffer::ReadOnly); + outBuffer->open(QBuffer::WriteOnly); + XzDecompressor xz; + if (!xz.decompress(inBuffer, outBuffer)) { + zipDownloadFailed(tr("Xz extraction failed.")); + return; } - return loadSetsData(importer, file.readAll()); - }); - watcher.setFuture(future); -} + _data.clear(); + readSetsFromByteArrayRef(newData); + return; +#else + zipDownloadFailed(tr("Sorry, this version of Oracle does not support xz compressed files.")); -void LoadSetsPage::cancelWork() -{ - // The scan is short-lived; just wait it out before the wizard (and its - // importer) can be torn down underneath the worker thread. - if (future.isRunning()) { - future.cancel(); - watcher.cancel(); - future.waitForFinished(); + wizard()->enableButtons(); + setEnabled(true); + progressLabel->hide(); + progressBar->hide(); + return; +#endif + } else if (_data.startsWith(ZIP_SIGNATURE)) { +#ifdef HAS_ZLIB + // zipped file + auto *inBuffer = new QBuffer(&_data); + auto newData = QByteArray(); + auto *outBuffer = new QBuffer(&newData); + QString fileName; + UnZip::ErrorCode ec; + UnZip uz; + + ec = uz.openArchive(inBuffer); + if (ec != UnZip::Ok) { + zipDownloadFailed(tr("Failed to open Zip archive: %1.").arg(uz.formatError(ec))); + return; + } + + if (uz.fileList().size() != 1) { + zipDownloadFailed(tr("Zip extraction failed: the Zip archive doesn't contain exactly one file.")); + return; + } + fileName = uz.fileList().at(0); + + outBuffer->open(QBuffer::ReadWrite); + ec = uz.extractFile(fileName, outBuffer); + if (ec != UnZip::Ok) { + zipDownloadFailed(tr("Zip extraction failed: %1.").arg(uz.formatError(ec))); + uz.closeArchive(); + return; + } + _data.clear(); + readSetsFromByteArrayRef(newData); + return; +#else + zipDownloadFailed(tr("Sorry, this version of Oracle does not support zipped files.")); + + wizard()->enableButtons(); + setEnabled(true); + progressLabel->hide(); + progressBar->hide(); + return; +#endif + } else if (_data.startsWith("{")) { + // Start the computation. + jsonData = std::move(_data); + future = QtConcurrent::run([this] { return wizard()->importer->readSetsFromByteArray(std::move(jsonData)); }); + watcher.setFuture(future); + } else if (_data.startsWith("<")) { + // save xml file and don't do any processing + wizard()->downloadedPlainXml = true; + wizard()->xmlData = std::move(_data); + importFinished(); + } else { + wizard()->enableButtons(); + setEnabled(true); + progressLabel->hide(); + progressBar->hide(); + QMessageBox::critical(this, tr("Error"), tr("Failed to interpret downloaded data.")); } } @@ -616,65 +509,17 @@ void LoadSetsPage::zipDownloadFailed(const QString &message) void LoadSetsPage::importFinished() { - loadActive = false; - emit completeChanged(); wizard()->enableButtons(); setEnabled(true); + progressLabel->hide(); + progressBar->hide(); - const LoadSetsResult result = watcher.result(); - - if (result.plainXml) { - wizard()->downloadedPlainXml = true; - wizard()->xmlData = result.xmlData; + if (wizard()->downloadedPlainXml || watcher.future().result()) { + wizard()->next(); + } else { + QMessageBox::critical(this, tr("Error"), + tr("The file was retrieved successfully, but it does not contain any sets data.")); } - - if (wizard()->backgroundMode) { - progressLabel->hide(); - progressBar->hide(); - if (!result.errorMessage.isEmpty()) { - qWarning() << result.errorMessage; - } else if (!result.ok && !result.plainXml) { - qWarning() << tr("The file was retrieved successfully, but it does not contain any sets data."); - } - emit readyToContinue(); - return; - } - - const auto fail = [this](const QString &message) { - progressLabel->hide(); - progressBar->hide(); - QMessageBox::critical(this, tr("Error"), message); - }; - - if (!result.errorMessage.isEmpty()) { - if (result.offerUncompressedFallback) { - zipDownloadFailed(result.errorMessage); - return; - } - fail(result.errorMessage); - return; - } - - if (!result.ok && !result.plainXml) { - fail(tr("The file was retrieved successfully, but it does not contain any sets data.")); - return; - } - - // Snap the bar to 100% and hold it there for a moment so the completed state - // is actually visible before the next page's own import progress takes over - // (a zero-length deferral can still fire before the repaint is delivered). - progressBar->setMaximum(1); - progressBar->setValue(1); - progressLabel->setText(tr("Parsing file (100%)")); - QTimer::singleShot(500, this, [this] { - if (wizard()->currentPage() == this) { - // Leave the page pristine: hide the completed load bar so a later - // Back from the save page doesn't show stale progress. - progressLabel->hide(); - progressBar->hide(); - wizard()->next(); - } - }); } SaveSetsPage::SaveSetsPage(QWidget *parent) : OracleWizardPage(parent) @@ -682,113 +527,46 @@ SaveSetsPage::SaveSetsPage(QWidget *parent) : OracleWizardPage(parent) pathLabel = new QLabel(this); saveLabel = new QLabel(this); - progressBar = new QProgressBar(this); - progressBar->hide(); - defaultPathCheckBox = new QCheckBox(this); messageLog = new QTextEdit(this); messageLog->setReadOnly(true); auto *layout = new QGridLayout(this); - layout->addWidget(progressBar, 0, 0); - layout->addWidget(messageLog, 1, 0); - layout->addWidget(saveLabel, 2, 0); - layout->addWidget(pathLabel, 3, 0); - layout->addWidget(defaultPathCheckBox, 4, 0); + layout->addWidget(messageLog, 0, 0); + layout->addWidget(saveLabel, 1, 0); + layout->addWidget(pathLabel, 2, 0); + layout->addWidget(defaultPathCheckBox, 3, 0); setLayout(layout); } -bool SaveSetsPage::isComplete() const -{ - return !importActive; -} - void SaveSetsPage::cleanupPage() { - cancelWork(); - disconnect(wizard()->importer, &OracleImporter::setIndexChanged, this, &SaveSetsPage::updateTotalProgress); - disconnect(&importWatcher, &QFutureWatcher::finished, this, &SaveSetsPage::importFinished); wizard()->importer->clear(); + disconnect(wizard()->importer, &OracleImporter::setIndexChanged, nullptr, nullptr); } void SaveSetsPage::initializePage() { + messageLog->clear(); + retranslateUi(); if (wizard()->downloadedPlainXml) { messageLog->hide(); - progressBar->hide(); - if (wizard()->backgroundMode) { - emit readyToContinue(); + } else { + messageLog->show(); + connect(wizard()->importer, &OracleImporter::setIndexChanged, this, &SaveSetsPage::updateTotalProgress); + + int setsImported = wizard()->importer->startImport(); + + if (setsImported == 0) { + QMessageBox::critical(this, tr("Error"), tr("No set has been imported.")); } - return; - } - - messageLog->clear(); - messageLog->show(); - progressBar->show(); - - totalSets = wizard()->importer->getSets().size(); - progressBar->setRange(0, totalSets); - progressBar->setValue(0); - - connect(wizard()->importer, &OracleImporter::setIndexChanged, this, &SaveSetsPage::updateTotalProgress, - Qt::UniqueConnection); - connect(&importWatcher, &QFutureWatcher::finished, this, &SaveSetsPage::importFinished, Qt::UniqueConnection); - - wizard()->disableButtons(); - importActive = true; - emit completeChanged(); - - const QPointer importer = wizard()->importer; - importFuture = QtConcurrent::run([importer] { return importer ? importer->startImport() : 0; }); - importWatcher.setFuture(importFuture); -} - -void SaveSetsPage::cancelWork() -{ - if (!importActive) { - return; - } - // Ask the worker to stop at the next set boundary, then wait it out so the - // wizard (and the importer it owns) is never torn down under a running thread. - importActive = false; - emit completeChanged(); - wizard()->importer->cancelImport(); - importFuture.cancel(); - importWatcher.cancel(); - importFuture.waitForFinished(); -} - -void SaveSetsPage::importFinished() -{ - if (!importActive) { - return; - } - importActive = false; - emit completeChanged(); - - wizard()->enableButtons(); - - const int setsImported = importWatcher.result(); - const QPointer importer = wizard()->importer; - if (importer) { - importer->releaseSetData(); } if (wizard()->backgroundMode) { - if (setsImported == 0) { - qWarning() << tr("No set has been imported."); - } emit readyToContinue(); - return; - } - - progressBar->setValue(progressBar->maximum()); - - if (setsImported == 0) { - QMessageBox::critical(this, tr("Error"), tr("No set has been imported.")); } } @@ -796,7 +574,7 @@ void SaveSetsPage::retranslateUi() { setTitle(tr("Sets imported")); if (wizard()->downloadedPlainXml) { - setSubTitle(tr("A Cockatrice card database file of %1 MB has been downloaded.") + setSubTitle(tr("A cockatrice database file of %1 MB has been downloaded.") .arg(qRound(wizard()->xmlData.size() / 1000000.0))); } else { setSubTitle(tr("The following sets have been found:")); @@ -810,28 +588,13 @@ void SaveSetsPage::retranslateUi() setButtonText(QWizard::NextButton, tr("&Save")); } -void SaveSetsPage::updateTotalProgress(int cardsImported, int setIndex, const QString &setName) +void SaveSetsPage::updateTotalProgress(int cardsImported, int /* setIndex */, const QString &setName) { - if (!importActive) { - return; - } if (setName.isEmpty()) { - progressBar->setValue(progressBar->maximum()); - const int cardCount = wizard()->importer->getCardList().size(); - if (wizard()->backgroundMode) { - qInfo() << tr("Import finished: %1 cards.").arg(cardCount); - emitBackgroundProgress("import", totalSets, totalSets); - } else { - messageLog->append("" + tr("Import finished: %1 cards.").arg(cardCount) + ""); - } + messageLog->append("" + tr("Import finished: %1 cards.").arg(wizard()->importer->getCardList().size()) + + ""); } else { - progressBar->setValue(setIndex); - if (wizard()->backgroundMode) { - qInfo() << tr("%1: %2 cards imported").arg(setName).arg(cardsImported); - emitBackgroundProgress("import", setIndex, totalSets); - } else { - messageLog->append(tr("%1: %2 cards imported").arg(setName).arg(cardsImported)); - } + messageLog->append(tr("%1: %2 cards imported").arg(setName).arg(cardsImported)); } messageLog->verticalScrollBar()->setValue(messageLog->verticalScrollBar()->maximum()); @@ -977,4 +740,4 @@ void LoadSpoilersPage::retranslateUi() pathLabel->setText(tr("The spoiler database will be saved at the following location:") + "
" + SettingsCache::instance().getSpoilerCardDatabasePath()); defaultPathCheckBox->setText(tr("Save to a custom path (not recommended)")); -} +} \ No newline at end of file diff --git a/oracle/src/pages.h b/oracle/src/pages.h index d0a9fcd43..066cc2e1b 100644 --- a/oracle/src/pages.h +++ b/oracle/src/pages.h @@ -3,10 +3,8 @@ #include "pagetemplates.h" -#include #include #include -#include #include #include #include @@ -59,31 +57,19 @@ protected: void initializePage() override; }; -/** @brief Result of a worker-thread sets-file load (read + decompress + dispatch). */ -struct LoadSetsResult -{ - bool ok = false; ///< JSON scan produced set data (or plain XML was handled) - bool plainXml = false; ///< input was a plain Cockatrice XML database - QByteArray xmlData; ///< raw XML for the plain-XML path - QString errorMessage; ///< set when the input could not be processed - bool offerUncompressedFallback = false; ///< decompression-only failure: offer the uncompressed URL -}; - class LoadSetsPage : public OracleWizardPage { Q_OBJECT public: explicit LoadSetsPage(QWidget *parent = nullptr); void retranslateUi() override; - bool isComplete() const override; protected: void initializePage() override; bool validatePage() override; void readSetsFromByteArray(QByteArray _data); - void readSetsFromFile(const QString &fileName); + void readSetsFromByteArrayRef(QByteArray &_data); void downloadSetsFile(const QUrl &url); - void cancelWork() override; private: QRadioButton *urlRadioButton; @@ -95,19 +81,15 @@ private: QLabel *progressLabel; QProgressBar *progressBar; - QFutureWatcher watcher; - QFuture future; - bool loadActive = false; - - void beginLoadSets(bool compressedFile = false); + QFutureWatcher watcher; + QFuture future; + QByteArray jsonData; private slots: void actLoadSetsFile(); void actRestoreDefaultUrl(); void actDownloadProgressSetsFile(qint64 received, qint64 total); void actDownloadFinishedSetsFile(); - void updateParsingProgress(int bytesRead, int totalBytes); - void scanProgressToStdout(int bytesRead, int totalBytes); void importFinished(); void zipDownloadFailed(const QString &message); }; @@ -118,28 +100,19 @@ class SaveSetsPage : public OracleWizardPage public: explicit SaveSetsPage(QWidget *parent = nullptr); void retranslateUi() override; - bool isComplete() const override; private: QTextEdit *messageLog; - QProgressBar *progressBar; QCheckBox *defaultPathCheckBox; QLabel *pathLabel; QLabel *saveLabel; - QFutureWatcher importWatcher; - QFuture importFuture; - int totalSets = 0; - bool importActive = false; - protected: void initializePage() override; void cleanupPage() override; bool validatePage() override; - void cancelWork() override; private slots: - void importFinished(); void updateTotalProgress(int cardsImported, int setIndex, const QString &setName); }; diff --git a/oracle/src/pagetemplates.cpp b/oracle/src/pagetemplates.cpp index 0ffeabbb3..4a27fef30 100644 --- a/oracle/src/pagetemplates.cpp +++ b/oracle/src/pagetemplates.cpp @@ -112,7 +112,7 @@ bool SimpleDownloadFilePage::validatePage() return false; } - progressLabel->setText(tr("Downloading (0 MB)")); + progressLabel->setText(tr("Downloading (0MB)")); // show an infinite progressbar progressBar->setMaximum(0); progressBar->setMinimum(0); diff --git a/oracle/src/pagetemplates.h b/oracle/src/pagetemplates.h index ccad7ec62..6e79c867e 100644 --- a/oracle/src/pagetemplates.h +++ b/oracle/src/pagetemplates.h @@ -20,14 +20,6 @@ public: } virtual void retranslateUi() = 0; - /** - * @brief Asks an active page to stop any background worker before the wizard - * (and its importer) can be torn down underneath it. Default is a no-op. - */ - virtual void cancelWork() - { - } - signals: void readyToContinue(); diff --git a/oracle/src/parsehelpers.cpp b/oracle/src/parsehelpers.cpp index ee7c4eb2e..a97bf67c9 100644 --- a/oracle/src/parsehelpers.cpp +++ b/oracle/src/parsehelpers.cpp @@ -20,7 +20,7 @@ * Note that "...enters tapped unless..." returns false. * * @param name The name of the card - * @param text The Oracle text of the card + * @param text The oracle text of the card */ bool parseCipt(const QString &name, const QString &text) { diff --git a/oracle/src/qt-json/AUTHORS b/oracle/src/qt-json/AUTHORS new file mode 100644 index 000000000..29a85929f --- /dev/null +++ b/oracle/src/qt-json/AUTHORS @@ -0,0 +1,3 @@ +Eeli Reilin +Luis Gustavo S. Barreto +Stephen Kockentiedt diff --git a/oracle/src/qt-json/LICENSE b/oracle/src/qt-json/LICENSE new file mode 100644 index 000000000..3c42b515a --- /dev/null +++ b/oracle/src/qt-json/LICENSE @@ -0,0 +1,27 @@ +Copyright 2011 Eeli Reilin. All rights reserved. + +Redistribution and use in source and binary forms, with or without modification, +are permitted provided that the following conditions are met: + + 1. Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY ''AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO +EVENT SHALL EELI REILIN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, +OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF +LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF +ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation +are those of the authors and should not be interpreted as representing +official policies, either expressed or implied, of Eeli Reilin. + diff --git a/oracle/src/qt-json/README b/oracle/src/qt-json/README new file mode 100644 index 000000000..b60c1599b --- /dev/null +++ b/oracle/src/qt-json/README @@ -0,0 +1,96 @@ +######################################################################## +1. INTRODUCTION + +The Json class is a simple class for parsing JSON data into a QVariant +hierarchies. Now, we can also reverse the process and serialize +QVariant hierarchies into valid JSON data. + + +######################################################################## +2. HOW TO USE + +The parser is really easy to use. Let's say we have the following +QString of JSON data: + +------------------------------------------------------------------------ +{ + "encoding" : "UTF-8", + "plug-ins" : [ + "python", + "c++", + "ruby" + ], + "indent" : { + "length" : 3, + "use_space" : true + } +} +------------------------------------------------------------------------ + +We would first call the parse-method: + +------------------------------------------------------------------------ +//Say that we're using the QtJson namespace +using namespace QtJson; +bool ok; +//json is a QString containing the JSON data +QVariantMap result = Json::parse(json, ok).toMap(); + +if(!ok) { + qFatal("An error occurred during parsing"); + exit(1); +} +------------------------------------------------------------------------ + +Assuming the parsing process completed without errors, we would then +go through the hierarchy: + +------------------------------------------------------------------------ +qDebug() << "encoding:" << result["encoding"].toString(); +qDebug() << "plugins:"; + +foreach(QVariant plugin, result["plug-ins"].toList()) { + qDebug() << "\t-" << plugin.toString(); +} + +QVariantMap nestedMap = result["indent"].toMap(); +qDebug() << "length:" << nestedMap["length"].toInt(); +qDebug() << "use_space:" << nestedMap["use_space"].toBool(); +------------------------------------------------------------------------ + +The previous code would print out the following: + +------------------------------------------------------------------------ +encoding: "UTF-8" +plugins: + - "python" + - "c++" + - "ruby" +length: 3 +use_space: true +------------------------------------------------------------------------ + +To write JSON data from Qt object is as simple as parsing: + +------------------------------------------------------------------------ +QVariantMap map; +map["name"] = "Name"; +map["age"] = 22; + +QByteArray data = Json::serialize(map); +------------------------------------------------------------------------ + +The byte array 'data' contains valid JSON data: + +------------------------------------------------------------------------ +{ + name: "Luis Gustavo", + age: 22, +} +------------------------------------------------------------------------ + + +######################################################################## +4. CONTRIBUTING + +The code is available to download at GitHub. Contribute if you dare! diff --git a/oracle/src/qt-json/json.cpp b/oracle/src/qt-json/json.cpp new file mode 100644 index 000000000..ff739b49d --- /dev/null +++ b/oracle/src/qt-json/json.cpp @@ -0,0 +1,545 @@ +/* Copyright 2011 Eeli Reilin. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY ''AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + * EVENT SHALL EELI REILIN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, + * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation + * are those of the authors and should not be interpreted as representing + * official policies, either expressed or implied, of Eeli Reilin. + */ + +/** + * \file json.cpp + */ + +#include "json.h" + +#include +#include + +namespace QtJson +{ + +static QString sanitizeString(QString str) +{ + str.replace(QLatin1String("\\"), QLatin1String("\\\\")); + str.replace(QLatin1String("\""), QLatin1String("\\\"")); + str.replace(QLatin1String("\b"), QLatin1String("\\b")); + str.replace(QLatin1String("\f"), QLatin1String("\\f")); + str.replace(QLatin1String("\n"), QLatin1String("\\n")); + str.replace(QLatin1String("\r"), QLatin1String("\\r")); + str.replace(QLatin1String("\t"), QLatin1String("\\t")); + return QString(QLatin1String("\"%1\"")).arg(str); +} + +static QByteArray join(const QList &list, const QByteArray &sep) +{ + QByteArray res; + for (const QByteArray &i : list) { + if (!res.isEmpty()) { + res += sep; + } + res += i; + } + return res; +} + +/** + * parse + */ +QVariant Json::parse(const QString &json) +{ + bool success = true; + return Json::parse(json, success); +} + +/** + * parse + */ +QVariant Json::parse(const QString &json, bool &success) +{ + success = true; + + // Return an empty QVariant if the JSON data is either null or empty + if (!json.isNull() || !json.isEmpty()) { + // We'll start from index 0 + int index = 0; + + // Parse the first value + QVariant value = Json::parseValue(json, index, success); + + // Return the parsed value + return value; + } else { + // Return the empty QVariant + return QVariant(); + } +} + +QByteArray Json::serialize(const QVariant &data) +{ + bool success = true; + return Json::serialize(data, success); +} + +QByteArray Json::serialize(const QVariant &data, bool &success) +{ + QByteArray str; + success = true; + + if (!data.isValid()) // invalid or null? + { + str = "null"; + } + else if ((data.typeId() == QMetaType::Type::QVariantList) || + (data.typeId() == QMetaType::Type::QStringList)) // variant is a list? + { + QList values; + const QVariantList list = data.toList(); + for (const QVariant &v : list) { + QByteArray serializedValue = serialize(v); + if (serializedValue.isNull()) { + success = false; + break; + } + values << serializedValue; + } + + str = "[ " + join(values, ", ") + " ]"; + } + else if ((data.typeId() == QMetaType::Type::QVariantHash)) // variant is a hash? + { + const QVariantHash vhash = data.toHash(); + QHashIterator it(vhash); + str = "{ "; + QList pairs; + + while (it.hasNext()) { + it.next(); + QByteArray serializedValue = serialize(it.value()); + + if (serializedValue.isNull()) { + success = false; + break; + } + + pairs << sanitizeString(it.key()).toUtf8() + " : " + serializedValue; + } + + str += join(pairs, ", "); + str += " }"; + } + else if ((data.typeId() == QMetaType::Type::QVariantMap)) // variant is a map? + { + const QVariantMap vmap = data.toMap(); + QMapIterator it(vmap); + str = "{ "; + QList pairs; + while (it.hasNext()) { + it.next(); + QByteArray serializedValue = serialize(it.value()); + if (serializedValue.isNull()) { + success = false; + break; + } + pairs << sanitizeString(it.key()).toUtf8() + " : " + serializedValue; + } + str += join(pairs, ", "); + str += " }"; + } + else if ((data.typeId() == QMetaType::Type::QString) || + (data.typeId() == QMetaType::Type::QByteArray)) // a string or a byte array? + { + str = sanitizeString(data.toString()).toUtf8(); + } + else if (data.typeId() == QMetaType::Type::Double) // double? + { + str = QByteArray::number(data.toDouble(), 'g', 20); + if (!str.contains(".") && !str.contains("e")) { + str += ".0"; + } + } + else if (data.typeId() == QMetaType::Type::Bool) // boolean value? + { + str = data.toBool() ? "true" : "false"; + } + else if (data.typeId() == QMetaType::Type::ULongLong) // large unsigned number? + { + str = QByteArray::number(data.value()); + } else if (data.canConvert()) // any signed number? + { + str = QByteArray::number(data.value()); + } else if (data.canConvert()) { + str = QString::number(data.value()).toUtf8(); + } else if (data.canConvert()) // can value be converted to string? + { + // this will catch QDate, QDateTime, QUrl, ... + str = sanitizeString(data.toString()).toUtf8(); + } else { + success = false; + } + if (success) { + return str; + } else { + return QByteArray(); + } +} + +/** + * parseValue + */ +QVariant Json::parseValue(const QString &json, int &index, bool &success) +{ + // Determine what kind of data we should parse by + // checking out the upcoming token + switch (Json::lookAhead(json, index)) { + case JsonTokenString: + return Json::parseString(json, index, success); + case JsonTokenNumber: + return Json::parseNumber(json, index); + case JsonTokenCurlyOpen: + return Json::parseObject(json, index, success); + case JsonTokenSquaredOpen: + return Json::parseArray(json, index, success); + case JsonTokenTrue: + Json::nextToken(json, index); + return QVariant(true); + case JsonTokenFalse: + Json::nextToken(json, index); + return QVariant(false); + case JsonTokenNull: + Json::nextToken(json, index); + return QVariant(); + case JsonTokenNone: + break; + } + + // If there were no tokens, flag the failure and return an empty QVariant + success = false; + return QVariant(); +} + +/** + * parseObject + */ +QVariant Json::parseObject(const QString &json, int &index, bool &success) +{ + QVariantMap map; + int token; + + // Get rid of the whitespace and increment index + Json::nextToken(json, index); + + // Loop through all of the key/value pairs of the object + bool done = false; + while (!done) { + // Get the upcoming token + token = Json::lookAhead(json, index); + + if (token == JsonTokenNone) { + success = false; + return QVariantMap(); + } else if (token == JsonTokenComma) { + Json::nextToken(json, index); + } else if (token == JsonTokenCurlyClose) { + Json::nextToken(json, index); + return map; + } else { + // Parse the key/value pair's name + QString name = Json::parseString(json, index, success).toString(); + + if (!success) { + return QVariantMap(); + } + + // Get the next token + token = Json::nextToken(json, index); + + // If the next token is not a colon, flag the failure + // return an empty QVariant + if (token != JsonTokenColon) { + success = false; + return QVariant(QVariantMap()); + } + + // Parse the key/value pair's value + QVariant value = Json::parseValue(json, index, success); + + if (!success) { + return QVariantMap(); + } + + // Assign the value to the key in the map + map[name] = value; + } + } + + // Return the map successfully + return QVariant(map); +} + +/** + * parseArray + */ +QVariant Json::parseArray(const QString &json, int &index, bool &success) +{ + QVariantList list; + + Json::nextToken(json, index); + + bool done = false; + while (!done) { + int token = Json::lookAhead(json, index); + + if (token == JsonTokenNone) { + success = false; + return QVariantList(); + } else if (token == JsonTokenComma) { + Json::nextToken(json, index); + } else if (token == JsonTokenSquaredClose) { + Json::nextToken(json, index); + break; + } else { + QVariant value = Json::parseValue(json, index, success); + + if (!success) { + return QVariantList(); + } + + list.push_back(value); + } + } + + return QVariant(list); +} + +/** + * parseString + */ +QVariant Json::parseString(const QString &json, int &index, bool &success) +{ + QString s; + QChar c; + + Json::eatWhitespace(json, index); + + c = json[index++]; + + bool complete = false; + while (!complete) { + if (index == json.size()) { + break; + } + + c = json[index++]; + + if (c == '\"') { + complete = true; + break; + } else if (c == '\\') { + if (index == json.size()) { + break; + } + + c = json[index++]; + + if (c == '\"') { + s.append('\"'); + } else if (c == '\\') { + s.append('\\'); + } else if (c == '/') { + s.append('/'); + } else if (c == 'b') { + s.append('\b'); + } else if (c == 'f') { + s.append('\f'); + } else if (c == 'n') { + s.append('\n'); + } else if (c == 'r') { + s.append('\r'); + } else if (c == 't') { + s.append('\t'); + } else if (c == 'u') { + int remainingLength = json.size() - index; + + if (remainingLength >= 4) { + QString unicodeStr = json.mid(index, 4); + + int symbol = unicodeStr.toInt(0, 16); + + s.append(QChar(symbol)); + + index += 4; + } else { + break; + } + } + } else { + s.append(c); + } + } + + if (!complete) { + success = false; + return QVariant(); + } + + return QVariant(s); +} + +/** + * parseNumber + */ +QVariant Json::parseNumber(const QString &json, int &index) +{ + Json::eatWhitespace(json, index); + + int lastIndex = Json::lastIndexOfNumber(json, index); + int charLength = (lastIndex - index) + 1; + QString numberStr; + + numberStr = json.mid(index, charLength); + + index = lastIndex + 1; + + if (numberStr.contains('.')) { + return QVariant(numberStr.toDouble(NULL)); + } else if (numberStr.startsWith('-')) { + return QVariant(numberStr.toLongLong(NULL)); + } else { + return QVariant(numberStr.toULongLong(NULL)); + } +} + +/** + * lastIndexOfNumber + */ +int Json::lastIndexOfNumber(const QString &json, int index) +{ + static const QString numericCharacters("0123456789+-.eE"); + int lastIndex; + + for (lastIndex = index; lastIndex < json.size(); lastIndex++) { + if (numericCharacters.indexOf(json[lastIndex]) == -1) { + break; + } + } + + return lastIndex - 1; +} + +/** + * eatWhitespace + */ +void Json::eatWhitespace(const QString &json, int &index) +{ + static const QString whitespaceChars(" \t\n\r"); + for (; index < json.size(); index++) { + if (whitespaceChars.indexOf(json[index]) == -1) { + break; + } + } +} + +/** + * lookAhead + */ +int Json::lookAhead(const QString &json, int index) +{ + int saveIndex = index; + return Json::nextToken(json, saveIndex); +} + +/** + * nextToken + */ +int Json::nextToken(const QString &json, int &index) +{ + Json::eatWhitespace(json, index); + + if (index == json.size()) { + return JsonTokenNone; + } + + QChar c = json[index]; + index++; + switch (c.toLatin1()) { + case '{': + return JsonTokenCurlyOpen; + case '}': + return JsonTokenCurlyClose; + case '[': + return JsonTokenSquaredOpen; + case ']': + return JsonTokenSquaredClose; + case ',': + return JsonTokenComma; + case '"': + return JsonTokenString; + case '0': + case '1': + case '2': + case '3': + case '4': + case '5': + case '6': + case '7': + case '8': + case '9': + case '-': + return JsonTokenNumber; + case ':': + return JsonTokenColon; + } + + index--; + + int remainingLength = json.size() - index; + + // True + if (remainingLength >= 4) { + if (json[index] == 't' && json[index + 1] == 'r' && json[index + 2] == 'u' && json[index + 3] == 'e') { + index += 4; + return JsonTokenTrue; + } + } + + // False + if (remainingLength >= 5) { + if (json[index] == 'f' && json[index + 1] == 'a' && json[index + 2] == 'l' && json[index + 3] == 's' && + json[index + 4] == 'e') { + index += 5; + return JsonTokenFalse; + } + } + + // Null + if (remainingLength >= 4) { + if (json[index] == 'n' && json[index + 1] == 'u' && json[index + 2] == 'l' && json[index + 3] == 'l') { + index += 4; + return JsonTokenNull; + } + } + + return JsonTokenNone; +} + +} // namespace QtJson diff --git a/oracle/src/qt-json/json.h b/oracle/src/qt-json/json.h new file mode 100644 index 000000000..cf0499d4e --- /dev/null +++ b/oracle/src/qt-json/json.h @@ -0,0 +1,204 @@ +/* Copyright 2011 Eeli Reilin. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY ''AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO + * EVENT SHALL EELI REILIN OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, + * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, + * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * + * The views and conclusions contained in the software and documentation + * are those of the authors and should not be interpreted as representing + * official policies, either expressed or implied, of Eeli Reilin. + */ + +/** + * \file json.h + */ + +#ifndef JSON_H +#define JSON_H + +#include +#include + +namespace QtJson +{ + +/** + * \enum JsonToken + */ +enum JsonToken +{ + JsonTokenNone = 0, + JsonTokenCurlyOpen = 1, + JsonTokenCurlyClose = 2, + JsonTokenSquaredOpen = 3, + JsonTokenSquaredClose = 4, + JsonTokenColon = 5, + JsonTokenComma = 6, + JsonTokenString = 7, + JsonTokenNumber = 8, + JsonTokenTrue = 9, + JsonTokenFalse = 10, + JsonTokenNull = 11 +}; + +/** + * \class Json + * \brief A JSON data parser + * + * Json parses a JSON data into a QVariant hierarchy. + */ +class Json +{ + public: + /** + * Parse a JSON string + * + * \param json The JSON data + */ + static QVariant parse(const QString &json); + + /** + * Parse a JSON string + * + * \param json The JSON data + * \param success The success of the parsing + */ + static QVariant parse(const QString &json, bool &success); + + /** + * This method generates a textual JSON representation + * + * \param data The JSON data generated by the parser. + * \param success The success of the serialization + */ + static QByteArray serialize(const QVariant &data); + + /** + * This method generates a textual JSON representation + * + * \param data The JSON data generated by the parser. + * \param success The success of the serialization + * + * \return QByteArray Textual JSON representation + */ + static QByteArray serialize(const QVariant &data, bool &success); + + private: + /** + * Parses a value starting from index + * + * \param json The JSON data + * \param index The start index + * \param success The success of the parse process + * + * \return QVariant The parsed value + */ + static QVariant parseValue(const QString &json, int &index, + bool &success); + + /** + * Parses an object starting from index + * + * \param json The JSON data + * \param index The start index + * \param success The success of the object parse + * + * \return QVariant The parsed object map + */ + static QVariant parseObject(const QString &json, int &index, + bool &success); + + /** + * Parses an array starting from index + * + * \param json The JSON data + * \param index The starting index + * \param success The success of the array parse + * + * \return QVariant The parsed variant array + */ + static QVariant parseArray(const QString &json, int &index, + bool &success); + + /** + * Parses a string starting from index + * + * \param json The JSON data + * \param index The starting index + * \param success The success of the string parse + * + * \return QVariant The parsed string + */ + static QVariant parseString(const QString &json, int &index, + bool &success); + + /** + * Parses a number starting from index + * + * \param json The JSON data + * \param index The starting index + * + * \return QVariant The parsed number + */ + static QVariant parseNumber(const QString &json, int &index); + + /** + * Get the last index of a number starting from index + * + * \param json The JSON data + * \param index The starting index + * + * \return The last index of the number + */ + static int lastIndexOfNumber(const QString &json, int index); + + /** + * Skip unwanted whitespace symbols starting from index + * + * \param json The JSON data + * \param index The start index + */ + static void eatWhitespace(const QString &json, int &index); + + /** + * Check what token lies ahead + * + * \param json The JSON data + * \param index The starting index + * + * \return int The upcoming token + */ + static int lookAhead(const QString &json, int index); + + /** + * Get the next JSON token + * + * \param json The JSON data + * \param index The starting index + * + * \return int The next JSON token + */ + static int nextToken(const QString &json, int &index); +}; + + +} //end namespace + +#endif //JSON_H diff --git a/oracle/src/raw_json_scanner.cpp b/oracle/src/raw_json_scanner.cpp deleted file mode 100644 index 8c4633598..000000000 --- a/oracle/src/raw_json_scanner.cpp +++ /dev/null @@ -1,677 +0,0 @@ -#include "raw_json_scanner.h" - -#include -#include - -namespace -{ - -// Nesting cap matching QJsonDocument's limit, so a pathologically deep document -// fails shallowly instead of overflowing the stack through the recursive -// skipValue/skipArray/skipObject walk (Qt's parser caps at 1024 for the same -// reason and reports DeepNesting). -constexpr int kMaxNestingDepth = 1024; - -/** - * @brief Throttled byte-position reporting for scanSetRanges(). - * - * Threaded through the skip walk so progress can be reported without materializing - * the whole document. Reports are rate-limited so a GUI showing progress isn't - * flooded with interrupts: a callback is invoked at most ~100 times per scan - * regardless of element count. The closing stretch (the last ~1%) is reported - * more finely so a large document doesn't stall the progress bar on the final - * percent before the scan wraps up. - */ -struct ScanProgress -{ - const char *begin = nullptr; - qsizetype size = 0; - RawJson::ScanProgressCallback callback; - qsizetype step = 1; - qsizetype lastReported = 0; - - /** - * @brief Reports the scanner's absolute offset, unless within @p step bytes - * of the previous report and not yet at the end of the document. - */ - void report(const char *p) - { - if (!callback) { - return; - } - const qsizetype offset = p - begin; - if (offset == lastReported) { - return; // the final element often already sits exactly at the end - } - const qsizetype reportingStep = offset >= size - step ? std::max(1, step / 16) : step; - if (offset - lastReported < reportingStep && offset < size) { - return; - } - lastReported = offset; - callback(offset, size); - } -}; - -inline bool isWhitespace(char c) -{ - return c == ' ' || c == '\t' || c == '\r' || c == '\n'; -} - -const char *skipWhitespace(const char *p, const char *end) -{ - while (p < end && isWhitespace(*p)) { - ++p; - } - return p; -} - -inline bool isHexDigit(char c) -{ - return (c >= '0' && c <= '9') || (c >= 'a' && c <= 'f') || (c >= 'A' && c <= 'F'); -} - -inline quint8 hexValue(char c) -{ - if (c >= '0' && c <= '9') { - return c - '0'; - } - if (c >= 'a' && c <= 'f') { - return c - 'a' + 10; - } - return c - 'A' + 10; -} - -/** - * @brief Skips past a JSON string without decoding it, validating escapes. - * @param p In: pointing at the opening quote. Out: pointing past the closing quote. - */ -bool skipString(const char *&p, const char *end) -{ - ++p; // opening quote - for (;;) { - const void *quote = memchr(p, '"', static_cast(end - p)); - if (!quote) { - return false; // unterminated string - } - // Backslash escapes can only appear before the closing quote, so bound - // the scan to the string extent instead of the rest of the document. - const void *backslash = memchr(p, '\\', static_cast(static_cast(quote) - p)); - if (!backslash) { - p = static_cast(quote) + 1; - return true; - } - const char *b = static_cast(backslash); - if (end - b < 2) { - return false; - } - const char escaped = b[1]; - if (escaped == 'u') { - if (end - b < 6) { - return false; - } - quint32 codepoint = 0; - for (int i = 0; i < 4; ++i) { - if (!isHexDigit(b[2 + i])) { - return false; - } - codepoint = codepoint * 16 + hexValue(b[2 + i]); - } - p = b + 6; - if (codepoint >= 0xD800 && codepoint <= 0xDBFF) { - // expect the low-surrogate escape for the second half - if (end - p < 6 || p[0] != '\\' || p[1] != 'u') { - return false; // unpaired high surrogate - } - quint32 low = 0; - for (int i = 0; i < 4; ++i) { - if (!isHexDigit(p[2 + i])) { - return false; - } - low = low * 16 + hexValue(p[2 + i]); - } - if (low < 0xDC00 || low > 0xDFFF) { - return false; - } - p += 6; - } else if (codepoint >= 0xDC00 && codepoint <= 0xDFFF) { - return false; // unpaired low surrogate - } - continue; - } - switch (escaped) { - case '"': - case '\\': - case '/': - case 'b': - case 'f': - case 'n': - case 'r': - case 't': - p = b + 2; - continue; - default: - return false; // invalid escape - } - } -} - -/** - * @brief Decodes a JSON string into @p out, validating it as it goes. - * @param p In: pointing at the opening quote. Out: pointing past the closing quote. - */ -bool decodeString(const char *&p, const char *end, QString &out) -{ - out.clear(); - QByteArray utf8; - auto flush = [&out, &utf8]() { - if (!utf8.isEmpty()) { - out += QString::fromUtf8(utf8); - utf8.clear(); - } - }; - - ++p; // opening quote - while (p < end) { - const char c = *p; - if (c == '\\') { - flush(); - ++p; // escaped character - if (p >= end) { - return false; - } - const char escaped = *p; - if (escaped == 'u') { - ++p; // first hex digit - if (p + 4 > end) { - return false; - } - quint32 codepoint = 0; - for (int i = 0; i < 4; ++i) { - if (!isHexDigit(p[i])) { - return false; - } - codepoint = codepoint * 16 + hexValue(p[i]); - } - p += 4; - if (codepoint >= 0xD800 && codepoint <= 0xDBFF) { - // expect a low-surrogate escape for the second half - if (p + 6 > end || p[0] != '\\' || p[1] != 'u') { - return false; // unpaired high surrogate - } - quint32 low = 0; - for (int i = 0; i < 4; ++i) { - if (!isHexDigit(p[2 + i])) { - return false; - } - low = low * 16 + hexValue(p[2 + i]); - } - if (low < 0xDC00 || low > 0xDFFF) { - return false; - } - out += QChar(codepoint); - out += QChar(low); - p += 6; - } else if (codepoint >= 0xDC00 && codepoint <= 0xDFFF) { - return false; // unpaired low surrogate - } else { - out += QChar(codepoint); - } - continue; - } - switch (escaped) { - case '"': - out += '"'; - break; - case '\\': - out += '\\'; - break; - case '/': - out += '/'; - break; - case 'b': - out += '\b'; - break; - case 'f': - out += '\f'; - break; - case 'n': - out += '\n'; - break; - case 'r': - out += '\r'; - break; - case 't': - out += '\t'; - break; - default: - return false; - } - ++p; - continue; - } - if (c == '"') { - ++p; - flush(); - return true; - } - // Deliberately accept unescaped control characters (e.g. a tab inside - // a set name): QJsonDocument and skipString accept them too, so - // rejecting them here would fail the whole document on a byte that - // Qt is fine with — the very total-failure mode this scanner avoids. - utf8 += c; - ++p; - } - return false; -} - -/** - * @brief Reads a set-metadata field, tolerating null and non-string values. - * - * A set's metadata may carry null or non-string values in otherwise-valid - * payloads ("releaseDate": null, "type": 7). The token itself was already - * structurally validated by skipValue, so a non-string value is accepted and - * leaves @p out at its default (empty) — one bad set must not abort the - * import of every other set in the document. - */ -bool decodeStringMember(const char *&fs, const char *&fe, QString &out) -{ - if (fs >= fe) { - return false; - } - if (*fs != '"') { - return true; - } - return decodeString(fs, fe, out); -} - -bool matchLiteral(const char *&p, const char *end, const char *literal, int length) -{ - if (end - p < length || memcmp(p, literal, static_cast(length)) != 0) { - return false; - } - const char *after = p + length; - if (after < end && (QChar::isLetter(*after) || QChar::isDigit(*after) || *after == '_')) { - return false; - } - p = after; - return true; -} - -bool skipNumber(const char *&p, const char *end) -{ - // JSON number: -?(0|[1-9][0-9]*)(\.[0-9]+)?([eE][+-]?[0-9]+)? - if (p < end && *p == '-') { - ++p; - } - if (p < end && *p == '0') { - ++p; - } else if (p < end && *p >= '1' && *p <= '9') { - ++p; - while (p < end && QChar::isDigit(*p)) { - ++p; - } - } else { - return false; - } - if (p < end && *p == '.') { - ++p; - if (p >= end || !QChar::isDigit(*p)) { - return false; - } - while (p < end && QChar::isDigit(*p)) { - ++p; - } - } - if (p < end && (*p == 'e' || *p == 'E')) { - ++p; - if (p < end && (*p == '+' || *p == '-')) { - ++p; - } - if (p >= end || !QChar::isDigit(*p)) { - return false; - } - while (p < end && QChar::isDigit(*p)) { - ++p; - } - } - return true; -} - -bool skipValue(const char *&p, const char *end, int depth, ScanProgress &scan); -bool skipObject(const char *&p, const char *end, int depth, ScanProgress &scan); -bool skipArray(const char *&p, const char *end, int depth, ScanProgress &scan); - -bool skipPrimitive(const char *&p, const char *end) -{ - if (p >= end) { - return false; - } - const char c = *p; - if (c == '"') { - return skipString(p, end); - } - if (c == 't') { - return matchLiteral(p, end, "true", 4); - } - if (c == 'f') { - return matchLiteral(p, end, "false", 5); - } - if (c == 'n') { - return matchLiteral(p, end, "null", 4); - } - if (c == '-' || (c >= '0' && c <= '9')) { - return skipNumber(p, end); - } - return false; -} - -bool skipObject(const char *&p, const char *end, int depth, ScanProgress &scan) -{ - if (depth <= 0) { - return false; // nest deeper than the cap - } - ++p; // '{' - p = skipWhitespace(p, end); - if (p < end && *p == '}') { - ++p; - return true; - } - for (;;) { - p = skipWhitespace(p, end); - if (p >= end || *p != '"') { - return false; - } - if (!skipString(p, end)) { - return false; - } - p = skipWhitespace(p, end); - if (p >= end || *p != ':') { - return false; - } - ++p; - if (!skipValue(p, end, depth - 1, scan)) { - return false; - } - scan.report(p); - p = skipWhitespace(p, end); - if (p >= end) { - return false; - } - if (*p == ',') { - ++p; - continue; - } - if (*p == '}') { - ++p; - return true; - } - return false; - } -} - -bool skipArray(const char *&p, const char *end, int depth, ScanProgress &scan) -{ - if (depth <= 0) { - return false; // nest deeper than the cap - } - ++p; // '[' - p = skipWhitespace(p, end); - if (p < end && *p == ']') { - ++p; - return true; - } - for (;;) { - if (!skipValue(p, end, depth - 1, scan)) { - return false; - } - scan.report(p); - p = skipWhitespace(p, end); - if (p >= end) { - return false; - } - if (*p == ',') { - ++p; - continue; - } - if (*p == ']') { - ++p; - return true; - } - return false; - } -} - -bool skipValue(const char *&p, const char *end, int depth, ScanProgress &scan) -{ - p = skipWhitespace(p, end); - if (p >= end) { - return false; - } - const char c = *p; - if (c == '{') { - // pass depth through: skipObject consumes the single decrement for this level - return skipObject(p, end, depth, scan); - } - if (c == '[') { - return skipArray(p, end, depth, scan); - } - // a primitive is a leaf, so it never wastes a nesting level - return skipPrimitive(p, end); -} - -/** - * @brief Iterates the members of the object starting at @p p. - * - * For each member invokes @p memberCallback with the key and the byte range of - * its value. Advancing @p p is unaffected by the callback. - */ -template -bool forEachObjectMember(const char *&p, const char *end, int depth, F &&memberCallback, ScanProgress &scan) -{ - if (depth <= 0) { - return false; // nest deeper than the cap - } - ++p; // '{' - p = skipWhitespace(p, end); - if (p < end && *p == '}') { - ++p; - return true; - } - for (;;) { - p = skipWhitespace(p, end); - if (p >= end || *p != '"') { - return false; - } - QString key; - if (!decodeString(p, end, key)) { - return false; - } - p = skipWhitespace(p, end); - if (p >= end || *p != ':') { - return false; - } - ++p; - const char *valueStart = skipWhitespace(p, end); - const char *valueEnd = valueStart; - if (!skipValue(valueEnd, end, depth - 1, scan)) { - return false; - } - if (!memberCallback(key, valueStart, valueEnd)) { - return false; - } - p = valueEnd; - p = skipWhitespace(p, end); - if (p >= end) { - return false; - } - if (*p == ',') { - ++p; - continue; - } - if (*p == '}') { - ++p; - return true; - } - return false; - } -} - -// Counts the direct elements of an array value; returns -1 if the array is malformed. -int countArrayElements(const char *p, const char *end, int depth, ScanProgress &scan) -{ - if (depth <= 0) { - return -1; // nest deeper than the cap - } - ++p; // '[' - p = skipWhitespace(p, end); - int count = 0; - if (p < end && *p == ']') { - return 0; - } - for (;;) { - if (!skipValue(p, end, depth - 1, scan)) { - return -1; - } - scan.report(p); - ++count; - p = skipWhitespace(p, end); - if (p >= end) { - return -1; - } - if (*p == ',') { - ++p; - continue; - } - if (*p == ']') { - return count; - } - return -1; - } -} - -} // namespace - -namespace RawJson -{ - -QList scanSetRanges(const QByteArray &json, ScanError *error, const ScanProgressCallback &progress) -{ - QList ranges; - if (error) { - *error = ScanError{}; - } - - const auto fail = [&](const QString &message) -> QList { - if (error) { - error->message = message; - } - return {}; - }; - - const char *begin = json.constData(); - const char *end = begin + json.size(); - if (begin >= end) { - return fail(QStringLiteral("empty JSON document")); - } - - // Throttle reports to ~100 per scan so a GUI thread unthrottling them never - // drowns under per-card interrupts, whatever the document size. - ScanProgress scan; - scan.begin = begin; - scan.size = end - begin; - scan.step = std::max(1, scan.size / 100); - scan.callback = progress; - - const char *p = skipWhitespace(begin, end); - if (p >= end || *p != '{') { - return fail(QStringLiteral("top-level JSON must be an object")); - } - - bool foundData = false; - bool malformedSetData = false; - - const auto topLevelCallback = [&](const QString &key, const char *valueStart, const char *valueEnd) { - if (key == QStringLiteral("data")) { - foundData = true; - if (valueStart >= valueEnd || *valueStart != '{') { - malformedSetData = true; - return false; - } - const char *setP = valueStart; - const bool ok = forEachObjectMember( - setP, valueEnd, kMaxNestingDepth - 1, - [&](const QString &setCode, const char *setStart, const char *setEnd) { - if (setStart >= setEnd || *setStart != '{') { - malformedSetData = true; - return false; - } - SetRange range; - range.dataRange.start = setStart - begin; - range.dataRange.length = setEnd - setStart; - range.code = setCode; - - const char *memberP = setStart; - const bool metaOk = forEachObjectMember( - memberP, setEnd, kMaxNestingDepth - 2, - [&](const QString &field, const char *fs, const char *fe) { - if (field == QStringLiteral("code")) { - return decodeStringMember(fs, fe, range.code); - } - if (field == QStringLiteral("name")) { - return decodeStringMember(fs, fe, range.name); - } - if (field == QStringLiteral("type")) { - return decodeStringMember(fs, fe, range.type); - } - if (field == QStringLiteral("releaseDate")) { - return decodeStringMember(fs, fe, range.releaseDate); - } - if (field == QStringLiteral("cards")) { - if (fs >= fe) { - return false; - } - if (*fs != '[') { - // e.g. "cards": null — treat as an empty array, - // matching Qt's tolerance. - return true; - } - range.dataRange.cardCount = countArrayElements(fs, fe, kMaxNestingDepth - 2, scan); - return range.dataRange.cardCount >= 0; - } - return true; - }, - scan); - if (!metaOk) { - malformedSetData = true; - return false; - } - ranges.append(range); - return true; - }, - scan); - if (!ok) { - malformedSetData = true; - return false; - } - } - return true; - }; - - if (!forEachObjectMember(p, end, kMaxNestingDepth, topLevelCallback, scan)) { - return fail(malformedSetData ? QStringLiteral("malformed set data") : QStringLiteral("malformed JSON")); - } - p = skipWhitespace(p, end); - if (p != end) { - return fail(QStringLiteral("trailing content after top-level JSON object")); - } - if (!foundData) { - return fail(QStringLiteral("missing \"data\" object")); - } - if (ranges.isEmpty()) { - return fail(QStringLiteral("no sets found in \"data\"")); - } - scan.report(end); - return ranges; -} - -} // namespace RawJson \ No newline at end of file diff --git a/oracle/src/raw_json_scanner.h b/oracle/src/raw_json_scanner.h deleted file mode 100644 index 04fcc52e4..000000000 --- a/oracle/src/raw_json_scanner.h +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef RAW_JSON_SCANNER_H -#define RAW_JSON_SCANNER_H - -#include -#include -#include -#include - -namespace RawJson -{ - -/** - * @brief The byte extent of a set's object inside the scanned document, plus - * the size of its cards array. This is the slice SetToDownload needs for lazy - * per-set parsing; the metadata strings live in SetRange alongside it. - */ -struct SetDataRange -{ - /** @brief Byte offset of the set's object within the scanned buffer. */ - qsizetype start = -1; - /** @brief Byte length of the set's object, including the surrounding braces. */ - qsizetype length = 0; - /** @brief Number of entries in the set's "cards" array. */ - int cardCount = 0; -}; - -struct SetRange -{ - /** @brief The byte slice of this set within the document. */ - SetDataRange dataRange; - QString code; - QString name; - QString type; - QString releaseDate; -}; - -struct ScanError -{ - bool isError() const - { - return !message.isEmpty(); - } - QString message; -}; - -/** - * @brief Optional progress callback receiving @c (bytesRead, totalBytes) while - * the document is walked. Invoked from the scanning thread; the caller decides - * how the throttled offsets are relayed to a GUI event loop. - */ -using ScanProgressCallback = std::function; - -/** - * @brief Scans a full MTGJSON document without materializing the JSON tree. - * - * Splits the top-level "data" object into per-set byte ranges and reads each - * set's metadata directly from the raw bytes. The Oracle importer can then - * parse one set at a time during import, keeping peak memory far below a single - * QJsonDocument::fromJson() over the whole file. - * - * The whole document is structurally validated while scanning (strings, - * escapes, braces, and a trailing-content check) and nesting depth is capped at - * 1024 to match QJsonDocument, so pathologically deep documents fail shallowly - * instead of exhausting the stack. Verdicts agree with QJsonDocument::fromJson - * on structurally malformed input; unlike Qt, string metadata fields - * ("name", "type", "releaseDate", "code") tolerate null / non-string values by - * defaulting to empty rather than rejecting the whole document, so one broken - * set cannot abort the import of the rest. - * - * Following QJsonDocument::fromJson's convention, the parsed ranges are - * returned by value and any failure is reported through the @p error out - * parameter. - * - * @param json The raw MTGJSON document bytes. - * @param error Out parameter. Set to an error ScanError when the document - * cannot be parsed, otherwise left empty. Passing a null - * pointer disables error reporting. - * @param progress Optional progress callback. When non-empty it is invoked as - * the scanner advances through the document, throttled to a - * tiny fraction of the total size. - * @return The detected per-set ranges, or an empty list on failure. - */ -QList scanSetRanges(const QByteArray &json, - ScanError *error = nullptr, - const ScanProgressCallback &progress = ScanProgressCallback()); - -} // namespace RawJson - -#endif // RAW_JSON_SCANNER_H \ No newline at end of file diff --git a/servatrice/CMakeLists.txt b/servatrice/CMakeLists.txt index 21f71a908..aba63800c 100644 --- a/servatrice/CMakeLists.txt +++ b/servatrice/CMakeLists.txt @@ -6,9 +6,7 @@ project(Servatrice VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${ set(servatrice_SOURCES src/email_parser.cpp - src/event_loop_watchdog.cpp src/main.cpp - src/metrics_registry.cpp src/servatrice.cpp src/servatrice_connection_pool.cpp src/servatrice_database_interface.cpp @@ -97,8 +95,6 @@ set(DESKTOPDIR # Build servatrice binary and link it add_executable(servatrice MACOSX_BUNDLE ${servatrice_MOC_SRCS} ${servatrice_RESOURCES_RCC} ${servatrice_SOURCES}) -target_precompile_headers(servatrice PRIVATE "${CMAKE_SOURCE_DIR}/cmake/pch/qtcore_pch.h") - if(CMAKE_HOST_SYSTEM MATCHES "FreeBSD") target_link_libraries( servatrice libcockatrice_deck_list libcockatrice_network_server_remote Threads::Threads ${SERVATRICE_QT_MODULES} @@ -184,19 +180,10 @@ if(WIN32) set(qtconf_dest_dir .) install( - DIRECTORY "$/" + DIRECTORY "${CMAKE_BINARY_DIR}/${PROJECT_NAME}/${CMAKE_BUILD_TYPE}/" DESTINATION ./ FILES_MATCHING PATTERN "*.dll" - PATTERN "*.pdb" EXCLUDE - PATTERN "*.dir*" EXCLUDE - PATTERN "*_autogen*" EXCLUDE - PATTERN "*.tlog*" EXCLUDE - PATTERN "CMakeFiles*" EXCLUDE - PATTERN "x64*" EXCLUDE - PATTERN ".qt*" EXCLUDE - PATTERN ".qsb*" EXCLUDE - PATTERN ".lupdate*" EXCLUDE ) # Qt plugins: platforms, sqldrivers, tls (Qt6) diff --git a/servatrice/migrations/servatrice_0036_to_0037.sql b/servatrice/migrations/servatrice_0036_to_0037.sql deleted file mode 100644 index 576ab53b4..000000000 --- a/servatrice/migrations/servatrice_0036_to_0037.sql +++ /dev/null @@ -1,71 +0,0 @@ --- Servatrice db migration from version 36 to version 37 - --- Deck sharing (temporary share links + permanent public decks). --- --- This feature was developed behind several intermediate migrations that have --- never shipped, so they are folded into this single 36 -> 37 migration: --- temporary share links, permanent public-deck visibility, preview metadata, --- and per-deck tags. - --- 1. Temporary deck shares: a named bundle of decks that can be fetched by --- anyone who knows the (unguessable) token, until the share expires. -CREATE TABLE IF NOT EXISTS `cockatrice_deck_share` ( - `id` int(7) unsigned zerofill NOT NULL auto_increment, - `token` varchar(64) COLLATE utf8mb4_bin NOT NULL, - `name` varchar(64) NOT NULL, - `created_by` int(7) unsigned NULL, - `created_at` datetime NOT NULL, - `expires_at` datetime NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `token` (`token`), - KEY `expires_at` (`expires_at`), - FOREIGN KEY(`created_by`) REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; - --- Individual decks inside a share bundle. Content is materialized at share --- time so expiring/deleting a share can cascade cleanly. The metadata columns --- are nullable because Qt's MySQL driver binds empty QStrings as NULL when --- using prepared statements. -CREATE TABLE IF NOT EXISTS `cockatrice_deck_share_item` ( - `id` int(7) unsigned zerofill NOT NULL auto_increment, - `share_id` int(7) unsigned zerofill NOT NULL, - `name` varchar(50) NOT NULL, - `tags` text NULL, - `banner_card` varchar(255) NULL, - `game_format` varchar(50) NULL, - `color_identity` varchar(5) NULL, - `content` text NOT NULL, - `position` int(7) NOT NULL, - PRIMARY KEY (`id`), - KEY `share_id` (`share_id`), - FOREIGN KEY(`share_id`) REFERENCES `cockatrice_deck_share`(`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; - --- 2. Permanent deck sharing: add public visibility flags to the deck storage --- tables. A deck is visible to other users if it is marked public, or if any --- ancestor folder is marked public (inherited). Existing decks default to --- private, so the upgrade does not expose any data. -ALTER TABLE `cockatrice_decklist_files` - ADD COLUMN `is_public` tinyint(1) NOT NULL DEFAULT 0 AFTER `content`; - -ALTER TABLE `cockatrice_decklist_folders` - ADD COLUMN `is_public` tinyint(1) NOT NULL DEFAULT 0 AFTER `name`; - --- 3. Per-deck preview metadata so clients can render another user's public --- decks (e.g. in a visual deck storage grid) without downloading each deck --- list. The metadata is derived by the server from the deck content (the color --- identity is supplied by the uploading client); decks uploaded before this --- migration have empty values until they are re-uploaded. -ALTER TABLE `cockatrice_decklist_files` - ADD COLUMN `banner_card_name` varchar(255) NULL AFTER `is_public`, - ADD COLUMN `banner_card_provider` varchar(32) NULL AFTER `banner_card_name`, - ADD COLUMN `color_identity` varchar(5) NULL AFTER `banner_card_provider`; - --- 4. Per-deck tags for public decks. The server renders the deck's own tags --- into a JSON array, so another user's public decks can filter by tag without --- downloading each deck list. Decks uploaded before this migration have NULL --- tags until they are re-uploaded. -ALTER TABLE `cockatrice_decklist_files` - ADD COLUMN `tags` text NULL AFTER `color_identity`; - -UPDATE cockatrice_schema_version SET version=37 WHERE version=36; diff --git a/servatrice/servatrice.ini.example b/servatrice/servatrice.ini.example index ccd4f3c3f..c1940c22f 100644 --- a/servatrice/servatrice.ini.example +++ b/servatrice/servatrice.ini.example @@ -382,19 +382,6 @@ max_reports_per_day=10 ; Maximum number of report comments a single user can post per hour; default is 30; set to 0 to disable the limit max_comments_per_hour=30 -[metrics] -; Command containers that take longer than this many milliseconds are logged -; as slow commands. Set to 0 to disable the log line. A latency spike produces -; one warning per slow container with no rate limiting of its own -- a bad -; patch can briefly flood the log, which is how you notice it. -slow_command_ms=500 - -; Each socket pool thread runs a watchdog heartbeat. If a heartbeat arrives -; this many milliseconds late, the stall is logged and exposed as -; servatrice_eventloop_* metrics in the Developer tab. Set to 0 to disable -; the watchdogs. -stall_warn_ms=2000 - [logging] ; Admin/Moderators can query the stored logs for information when looking up reports by various players. This ; option can allow or disallow them from doing so. @@ -452,24 +439,3 @@ ssl_cert=ssl_cert.pem ; Filename of the private key for the server-to-server certificate ssl_key=ssl_key.pem - - -[deck_share] - -; How many days a created deck share link remains valid before it expires. -; Default: 7 -expiry_days=7 - -; How often (in minutes) the server checks for and removes expired deck shares. -; A value of 0 disables the automatic cleanup. -; Default: 60 -cleanup_interval=60 - -; Maximum number of decks a single share link can contain. -; Default: 50 -max_decks_per_share=50 - -; Maximum number of share links a single user may create per day. -; A value of 0 disables the limit. -; Default: 50 -max_shares_per_day=50 diff --git a/servatrice/servatrice.sql b/servatrice/servatrice.sql index 4fbc1d8bd..5dbf69cbc 100644 --- a/servatrice/servatrice.sql +++ b/servatrice/servatrice.sql @@ -20,14 +20,11 @@ CREATE TABLE IF NOT EXISTS `cockatrice_schema_version` ( PRIMARY KEY (`version`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; -INSERT INTO cockatrice_schema_version VALUES(37); +INSERT INTO cockatrice_schema_version VALUES(36); -- users and user data tables CREATE TABLE IF NOT EXISTS `cockatrice_users` ( `id` int(7) unsigned zerofill NOT NULL auto_increment, - -- Bitfield of staff levels: 1 = admin (implies moderator), 2 = moderator, - -- 4 = judge, 8 = developer. Operators set these by hand with - -- "UPDATE cockatrice_users SET admin = ...". `admin` tinyint(1) NOT NULL, `name` varchar(35) NOT NULL, `realname` varchar(255) NOT NULL, @@ -66,56 +63,16 @@ CREATE TABLE IF NOT EXISTS `cockatrice_decklist_files` ( `name` varchar(50) NOT NULL, `upload_time` datetime NOT NULL, `content` text NOT NULL, - `is_public` tinyint(1) NOT NULL DEFAULT 0, - `banner_card_name` varchar(255) NULL, - `banner_card_provider` varchar(32) NULL, - `color_identity` varchar(5) NULL, - `tags` text NULL, PRIMARY KEY (`id`), KEY `FolderPlusUser` (`id_folder`,`id_user`), FOREIGN KEY(`id_user`) REFERENCES `cockatrice_users`(`id`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; --- Temporary deck shares: a named bundle of decks that can be fetched by --- anyone who knows the (unguessable) token, until the share expires. -CREATE TABLE IF NOT EXISTS `cockatrice_deck_share` ( - `id` int(7) unsigned zerofill NOT NULL auto_increment, - `token` varchar(64) COLLATE utf8mb4_bin NOT NULL, - `name` varchar(64) NOT NULL, - `created_by` int(7) unsigned NULL, - `created_at` datetime NOT NULL, - `expires_at` datetime NOT NULL, - PRIMARY KEY (`id`), - UNIQUE KEY `token` (`token`), - KEY `expires_at` (`expires_at`), - FOREIGN KEY(`created_by`) REFERENCES `cockatrice_users`(`id`) ON DELETE SET NULL ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; - --- Individual decks inside a share bundle. Content is materialized at share --- time so expiring/deleting a share can cascade cleanly. The metadata columns --- are nullable because Qt's MySQL driver binds empty QStrings as NULL when --- using prepared statements. -CREATE TABLE IF NOT EXISTS `cockatrice_deck_share_item` ( - `id` int(7) unsigned zerofill NOT NULL auto_increment, - `share_id` int(7) unsigned zerofill NOT NULL, - `name` varchar(50) NOT NULL, - `tags` text NULL, - `banner_card` varchar(255) NULL, - `game_format` varchar(50) NULL, - `color_identity` varchar(5) NULL, - `content` text NOT NULL, - `position` int(7) NOT NULL, - PRIMARY KEY (`id`), - KEY `share_id` (`share_id`), - FOREIGN KEY(`share_id`) REFERENCES `cockatrice_deck_share`(`id`) ON DELETE CASCADE ON UPDATE CASCADE -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 DEFAULT COLLATE utf8mb4_unicode_ci; - CREATE TABLE IF NOT EXISTS `cockatrice_decklist_folders` ( `id` int(7) unsigned zerofill NOT NULL auto_increment, `id_parent` int(7) unsigned zerofill NOT NULL, `id_user` int(7) unsigned NULL, `name` varchar(30) NOT NULL, - `is_public` tinyint(1) NOT NULL DEFAULT 0, PRIMARY KEY (`id`), KEY `ParentPlusUser` (`id_parent`,`id_user`), FOREIGN KEY(`id_user`) REFERENCES `cockatrice_users`(`id`) ON DELETE CASCADE ON UPDATE CASCADE diff --git a/servatrice/src/deck_tag_serialization.h b/servatrice/src/deck_tag_serialization.h deleted file mode 100644 index 162b0604d..000000000 --- a/servatrice/src/deck_tag_serialization.h +++ /dev/null @@ -1,39 +0,0 @@ -#ifndef DECK_TAG_SERIALIZATION_H -#define DECK_TAG_SERIALIZATION_H - -#include -#include -#include -#include -#include - -/** - * @brief Encodes deck tags as a compact JSON array for storage in a text column. - * - * Deck tags are stored as JSON (rather than a delimited string) so tag names may - * contain any character, and decoded uniformly everywhere they are read. - */ -inline QString serializeDeckTags(const QStringList &tags) -{ - QJsonArray array; - for (const QString &tag : tags) { - array.append(tag); - } - return QString::fromUtf8(QJsonDocument(array).toJson(QJsonDocument::Compact)); -} - -/** @brief Decodes deck tags previously written by serializeDeckTags. */ -inline QStringList deserializeDeckTags(const QString &serialized) -{ - QStringList tags; - if (serialized.isEmpty()) { - return tags; - } - const QJsonArray array = QJsonDocument::fromJson(serialized.toUtf8()).array(); - for (const QJsonValue &tag : array) { - tags.append(tag.toString()); - } - return tags; -} - -#endif // DECK_TAG_SERIALIZATION_H diff --git a/servatrice/src/event_loop_watchdog.cpp b/servatrice/src/event_loop_watchdog.cpp deleted file mode 100644 index e50bd4201..000000000 --- a/servatrice/src/event_loop_watchdog.cpp +++ /dev/null @@ -1,34 +0,0 @@ -/** - * @file event_loop_watchdog.cpp - * @ingroup Servatrice - */ - -#include "event_loop_watchdog.h" - -#include "servatrice.h" - -#include - -EventLoopWatchdog::EventLoopWatchdog(Servatrice *_servatrice, QString _threadName) - : QObject(nullptr), servatrice(_servatrice), threadName(std::move(_threadName)) -{ -} - -void EventLoopWatchdog::start() -{ - heartbeatTimer = new QTimer(this); - sinceLastTick.start(); - connect(heartbeatTimer, &QTimer::timeout, this, &EventLoopWatchdog::checkHeartbeat); - heartbeatTimer->start(HeartbeatIntervalMs); -} - -void EventLoopWatchdog::checkHeartbeat() -{ - const qint64 elapsedMs = sinceLastTick.restart(); - const qint64 overshootMs = qMax(0, elapsedMs - HeartbeatIntervalMs); - if (overshootMs < servatrice->getMetricsStallWarnMs()) { - return; - } - - servatrice->observeEventLoopStall(threadName, overshootMs); -} diff --git a/servatrice/src/event_loop_watchdog.h b/servatrice/src/event_loop_watchdog.h deleted file mode 100644 index b9061ff97..000000000 --- a/servatrice/src/event_loop_watchdog.h +++ /dev/null @@ -1,50 +0,0 @@ -/** - * @file event_loop_watchdog.h - * @ingroup Servatrice - */ - -#ifndef EVENT_LOOP_WATCHDOG_H -#define EVENT_LOOP_WATCHDOG_H - -#include -#include -#include - -class Servatrice; -class QTimer; - -/** - * @brief Detects blocked or overloaded worker event loops. - * - * One instance lives in each socket pool thread. A heartbeat timer tick that - * arrives late means the loop spent that time elsewhere: busy work, a queued - * slot, or a hard wedge. Overshoots past the configured threshold bump - * lock-free counters on the metrics registry and log one warning per stall, - * so a stuck pool thread becomes visible instead of silent lag. - */ -class EventLoopWatchdog : public QObject -{ - Q_OBJECT -public: - /// How often the heartbeat expects to fire. Small enough to catch short stalls. - static constexpr int HeartbeatIntervalMs = 500; - - EventLoopWatchdog(Servatrice *_servatrice, QString _threadName); - - /** - * Starts the heartbeat timer. Must be invoked queued after the instance - * was moved to its target thread so the timer lives there too. - */ - void start(); - -private slots: - void checkHeartbeat(); - -private: - Servatrice *servatrice; - QString threadName; - QElapsedTimer sinceLastTick; - QTimer *heartbeatTimer = nullptr; -}; - -#endif diff --git a/servatrice/src/main.cpp b/servatrice/src/main.cpp index 13bf95a82..9e7fe38d9 100644 --- a/servatrice/src/main.cpp +++ b/servatrice/src/main.cpp @@ -33,7 +33,6 @@ #include #include #include -#include #include RNG_Abstract *rng; @@ -170,7 +169,7 @@ int main(int argc, char *argv[]) signalhandler = new SignalHandler(); - rng = new RNG_SFMT(CryptoUtil::randomUInt64()); + rng = new RNG_SFMT; std::cerr << "Servatrice " << VERSION_STRING << " starting." << std::endl; std::cerr << "-------------------------" << std::endl; diff --git a/servatrice/src/metrics_registry.cpp b/servatrice/src/metrics_registry.cpp deleted file mode 100644 index 99ce390f1..000000000 --- a/servatrice/src/metrics_registry.cpp +++ /dev/null @@ -1,70 +0,0 @@ -#include "metrics_registry.h" - -#include - -void MetricsRegistry::observeCommand(int typeId, qint64 elapsedMs) -{ - if (typeId < 0 || typeId >= MaxTypes) { - typeId = MaxTypes - 1; // overflow slot keeps misrouted ids visible - } - if (elapsedMs < 0) { - elapsedMs = 0; - } - - TypeStats &stats = slotFor(typeId); - stats.count.fetch_add(1, std::memory_order_relaxed); - stats.totalMs.fetch_add(elapsedMs, std::memory_order_relaxed); - totalCommandsCounter.fetch_add(1, std::memory_order_relaxed); - totalTimeCounter.fetch_add(elapsedMs, std::memory_order_relaxed); -} - -void MetricsRegistry::observeGameStartDurationMs(qint64 elapsedMs) -{ - if (elapsedMs < 0) { - elapsedMs = 0; - } - - gameStartStats.count.fetch_add(1, std::memory_order_relaxed); - gameStartStats.totalMs.fetch_add(elapsedMs, std::memory_order_relaxed); -} - -MetricsRegistry::TypeStats &MetricsRegistry::slotFor(int typeId) -{ - return typeSlots[static_cast(typeId)]; -} - -const MetricsRegistry::TypeStats &MetricsRegistry::slotFor(int typeId) const -{ - return typeSlots[static_cast(typeId)]; -} - -int MetricsRegistry::activeTypeCount() const -{ - int active = 0; - for (int type = 0; type < MaxTypes; ++type) { - if (slotFor(type).count.load(std::memory_order_relaxed) > 0) { - ++active; - } - } - return active; -} - -QList MetricsRegistry::collectActiveStats() const -{ - QList result; - for (int type = 0; type < MaxTypes; ++type) { - const TypeStats &stats = slotFor(type); - const qint64 count = stats.count.load(std::memory_order_relaxed); - if (count == 0) { - continue; - } - result.append({type, count, stats.totalMs.load(std::memory_order_relaxed)}); - } - return result; -} - -MetricsRegistry::GameStartSnapshot MetricsRegistry::getGameStartSnapshot() const -{ - return {gameStartStats.count.load(std::memory_order_relaxed), - gameStartStats.totalMs.load(std::memory_order_relaxed)}; -} \ No newline at end of file diff --git a/servatrice/src/metrics_registry.h b/servatrice/src/metrics_registry.h deleted file mode 100644 index 4df1057c2..000000000 --- a/servatrice/src/metrics_registry.h +++ /dev/null @@ -1,120 +0,0 @@ -/** - * @file metrics_registry.h - * @ingroup Servatrice - */ - -#ifndef METRICS_REGISTRY_H -#define METRICS_REGISTRY_H - -#include -#include -#include -#include - -/** - * @brief Lock-free accumulation of command processing statistics. - * - * observeCommand() is called once per processed command from whichever socket - * thread handled it. It uses relaxed atomic adds on preallocated storage only, - * so it introduces no locks, allocations, or shared cache-line ping-pong - * beyond the unavoidable counter updates. - * - * Reading happens rarely (metrics scraping), accepts momentary tears between - * related counters, and therefore also needs no synchronization. - * - * Only counts and totals are retained. An earlier Prometheus-style cumulative - * histogram (per-type, time-bucketed) was cut because nothing in the server - * ever wrote it out; it belongs to the future /metrics exporter that needs it. - */ -class MetricsRegistry -{ -public: - /** - * Extension numbers are only unique per command kind, so recorded ids - * combine the kind index with the protobuf extension number. - * - * The stride is only as wide as it needs to be: 1280 is the first round - * number above the largest extension actually in use (ModeratorCommand = - * 1206) and keeps the preallocated TypeStats array small. Bump it if a new - * command exceeds it. - */ - static constexpr int KindStride = 1280; - - static constexpr int NumKinds = 6; - - static constexpr const char *KindNames[NumKinds] = {"session", "room", "game", "moderator", "admin", "developer"}; - - /// Upper bound on distinct command type ids (see typeIdFor). - static constexpr int MaxTypes = NumKinds * KindStride; - - /// Guard against typeIdFor() overflowing into the neighbouring kind's slots. - static_assert(KindStride > 1206, "KindStride must exceed the highest command extension number in use"); - - static int typeIdFor(int kindIndex, int extensionNumber) - { - return kindIndex * KindStride + extensionNumber; - } - - void observeCommand(int typeId, qint64 elapsedMs); - - /** - * Records how long one game start took to bring every player's zones - * online. Kept separate from command timings because it is triggered by - * the server itself and can dwarf any single command when decks are huge. - */ - void observeGameStartDurationMs(qint64 elapsedMs); - - /// Total number of observed commands across all types. - qint64 totalCommands() const - { - return totalCommandsCounter.load(std::memory_order_relaxed); - } - - /// Cumulative processing milliseconds across all types. - qint64 totalTimeMs() const - { - return totalTimeCounter.load(std::memory_order_relaxed); - } - - /// Number of distinct type slots that have seen at least one sample. - int activeTypeCount() const; - - struct ActiveTypeStats - { - int typeId; - qint64 count; - qint64 totalMs; - }; - - /** - * Returns stats for every type slot that has seen at least one sample. - * Callers resolve the numeric type id to a human-readable label via - * typeIdFor()/KindNames as needed. - */ - QList collectActiveStats() const; - - struct GameStartSnapshot - { - qint64 count; - qint64 totalMs; - }; - - GameStartSnapshot getGameStartSnapshot() const; - -private: - struct TypeStats - { - std::atomic count{0}; - std::atomic totalMs{0}; - }; - - TypeStats &slotFor(int typeId); - const TypeStats &slotFor(int typeId) const; - - std::array typeSlots{}; - TypeStats gameStartStats{}; - std::atomic totalCommandsCounter{0}; - std::atomic totalTimeCounter{0}; -}; - -#endif \ No newline at end of file diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index 3dd7ab510..db8751658 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -20,7 +20,6 @@ #include "servatrice.h" #include "email_parser.h" -#include "event_loop_watchdog.h" #include "isl_interface.h" #include "main.h" #include "servatrice_connection_pool.h" @@ -39,7 +38,6 @@ #include #include #include -#include #include #include #include @@ -65,7 +63,6 @@ Servatrice_GameServer::Servatrice_GameServer(Servatrice *_server, server->addDatabaseInterface(newThread, newDatabaseInterface); newThread->start(); - server->watchWorkerThread(newThread); QMetaObject::invokeMethod(newDatabaseInterface, "initDatabase", Qt::BlockingQueuedConnection, Q_ARG(QSqlDatabase, _sqlDatabase)); @@ -89,6 +86,7 @@ void Servatrice_GameServer::incomingConnection(qintptr socketDescriptor) Servatrice_ConnectionPool *pool = findLeastUsedConnectionPool(); auto ssi = new TcpServerSocketInterface(server, pool->getDatabaseInterface()); + connect(ssi, SIGNAL(incTxBytes(qint64)), this, SLOT(incTxBytes(qint64))); ssi->moveToThread(pool->thread()); pool->addClient(); connect(ssi, SIGNAL(destroyed()), pool, SLOT(removeClient())); @@ -133,7 +131,6 @@ Servatrice_WebsocketGameServer::Servatrice_WebsocketGameServer(Servatrice *_serv server->addDatabaseInterface(newThread, newDatabaseInterface); newThread->start(); - server->watchWorkerThread(newThread); QMetaObject::invokeMethod(newDatabaseInterface, "initDatabase", Qt::BlockingQueuedConnection, Q_ARG(QSqlDatabase, _sqlDatabase)); @@ -159,6 +156,7 @@ void Servatrice_WebsocketGameServer::onNewConnection() Servatrice_ConnectionPool *pool = findLeastUsedConnectionPool(); auto ssi = new WebsocketServerSocketInterface(server, pool->getDatabaseInterface()); + connect(ssi, SIGNAL(incTxBytes(quint64)), this, SLOT(incTxBytes(quint64))); /* * Due to a Qt limitation, websockets can't be moved to another thread. * This will hopefully change in Qt6 if QtWebSocket will be integrated in QtNetwork @@ -228,13 +226,6 @@ bool Servatrice::initServer() { serverId = getServerID(); - - // METRICS (always active. Slow-command logging and stall watchdogs are - // controlled by their respective thresholds below). Read up front so the - // values are available before any pool thread is started and watchdogged. - metricsSlowCommandMs = settingsCache->value("metrics/slow_command_ms", 500).toInt(); - metricsStallWarnMs = qMax(0, settingsCache->value("metrics/stall_warn_ms", 2000).toInt()); - if (getAuthenticationMethodString() == "sql") { qDebug() << "Authenticating method: sql"; authenticationMethod = AuthenticationSql; @@ -437,14 +428,6 @@ bool Servatrice::initServer() statusUpdateClock->start(getServerStatusUpdateTime()); } - deckShareCleanupClock = new QTimer(this); - connect(deckShareCleanupClock, SIGNAL(timeout()), this, SLOT(cleanupExpiredDeckShares())); - const int deckShareCleanupInterval = getDeckShareCleanupInterval(); - if (deckShareCleanupInterval > 0) { - qDebug() << "Starting deck share cleanup clock, interval" << deckShareCleanupInterval << "ms"; - deckShareCleanupClock->start(deckShareCleanupInterval); - } - // SOCKET SERVER if (getNumberOfTCPPools() > 0) { gameServer = @@ -487,55 +470,9 @@ bool Servatrice::initServer() } setRequiredFeatures(getRequiredFeatures()); - return true; } -void Servatrice::observeGameStartDurationMs(qint64 elapsedMs) -{ - metricsRegistry.observeGameStartDurationMs(elapsedMs); -} - -void Servatrice::observeEventLoopStall(const QString &threadName, qint64 overshootMs) -{ - eventLoopStallsTotal.fetch_add(1, std::memory_order_relaxed); - eventLoopLastStallMs.store(overshootMs, std::memory_order_relaxed); - qint64 prevMax = eventLoopMaxStallMs.load(std::memory_order_relaxed); - while (overshootMs > prevMax && - !eventLoopMaxStallMs.compare_exchange_weak(prevMax, overshootMs, std::memory_order_relaxed)) { - // retry until the max is at least as high as the new sample - } - - qWarning() << "Event loop stall in" << threadName << "- heartbeat overshot by" << overshootMs << "ms"; -} - -void Servatrice::watchWorkerThread(QThread *thread) -{ - if (metricsStallWarnMs <= 0) { - return; // watchdogs disabled via metrics/stall_warn_ms = 0 - } - - auto *watchdog = new EventLoopWatchdog(this, thread->objectName()); - connect(thread, &QThread::finished, watchdog, &QObject::deleteLater); - watchdog->moveToThread(thread); - QMetaObject::invokeMethod(watchdog, &EventLoopWatchdog::start, Qt::QueuedConnection); -} - -qint64 Servatrice::getCardsInGamesTotal() const -{ - qint64 total = 0; - QReadLocker roomsLocker(&roomsLock); // locking order: roomsLock before gamesLock/gameMutex - QMapIterator roomIterator(rooms); - while (roomIterator.hasNext()) { - Server_Room *room = roomIterator.next().value(); - QReadLocker gamesLocker(&room->gamesLock); - for (auto *game : room->getGames()) { - total += game->getCardsInGame(); - } - } - return total; -} - void Servatrice::addDatabaseInterface(QThread *thread, Servatrice_DatabaseInterface *databaseInterface) { databaseInterfaces.insert(thread, databaseInterface); @@ -663,11 +600,6 @@ void Servatrice::setRequiredFeatures(const QString &featureList) qDebug() << "Set required client features to:" << serverRequiredFeatureList; } -void Servatrice::cleanupExpiredDeckShares() -{ - servatriceDatabaseInterface->cleanupExpiredDeckShares(); -} - void Servatrice::statusUpdate() { if (!servatriceDatabaseInterface->checkSql()) { @@ -1080,27 +1012,6 @@ int Servatrice::getServerStatusUpdateTime() const return settingsCache->value("server/statusupdate", 15000).toInt(); } -int Servatrice::getDeckShareExpiryDays() const -{ - return qMax(1, settingsCache->value("deck_share/expiry_days", 7).toInt()); -} - -int Servatrice::getDeckShareCleanupInterval() const -{ - // default: every 60 minutes - return settingsCache->value("deck_share/cleanup_interval", 60).toInt() * 60000; -} - -int Servatrice::getDeckShareMaxDecksPerShare() const -{ - return settingsCache->value("deck_share/max_decks_per_share", 50).toInt(); -} - -int Servatrice::getDeckShareMaxSharesPerDay() const -{ - return settingsCache->value("deck_share/max_shares_per_day", 50).toInt(); -} - int Servatrice::getNumberOfTCPPools() const { return settingsCache->value("server/number_pools", 1).toInt(); diff --git a/servatrice/src/servatrice.h b/servatrice/src/servatrice.h index f39a44d51..8b0f5ad60 100644 --- a/servatrice/src/servatrice.h +++ b/servatrice/src/servatrice.h @@ -20,8 +20,6 @@ #ifndef SERVATRICE_H #define SERVATRICE_H -#include "metrics_registry.h" - #include #include #include @@ -32,7 +30,6 @@ #include #include #include -#include #include #include #include @@ -146,7 +143,6 @@ public: private slots: void statusUpdate(); void shutdownTimeout(); - void cleanupExpiredDeckShares(); protected: void doSendIslMessage(const IslMessage &msg, int _serverId) override; @@ -160,7 +156,6 @@ private: AuthenticationMethod authenticationMethod; DatabaseType databaseType; QTimer *pingClock, *statusUpdateClock; - QTimer *deckShareCleanupClock; Servatrice_GameServer *gameServer; Servatrice_WebsocketGameServer *websocketGameServer; Servatrice_IslServer *islServer; @@ -175,12 +170,6 @@ private: int uptime; QMutex txBytesMutex, rxBytesMutex; quint64 txBytes, rxBytes; - MetricsRegistry metricsRegistry; - int metricsSlowCommandMs = 500; - int metricsStallWarnMs = 2000; - std::atomic eventLoopStallsTotal{0}; ///< heartbeat overshoots past the warn threshold - std::atomic eventLoopLastStallMs{0}; ///< overshoot of the most recent stall - std::atomic eventLoopMaxStallMs{0}; ///< worst overshoot seen since process start QString shutdownReason; int shutdownMinutes; @@ -278,10 +267,6 @@ public: int getMaxGameInactivityTime() const override; int getMaxPlayerInactivityTime() const override; int getClientKeepAlive() const override; - int getDeckShareExpiryDays() const; - int getDeckShareCleanupInterval() const; - int getDeckShareMaxDecksPerShare() const; - int getDeckShareMaxSharesPerDay() const; int getMaxUsersPerAddress() const; int getMessageCountingInterval() const override; int getMaxMessageCountPerInterval() const override; @@ -301,49 +286,6 @@ public: void incRxBytes(quint64 num); void addDatabaseInterface(QThread *thread, Servatrice_DatabaseInterface *databaseInterface); - // Metrics (see [metrics] section in servatrice.ini.example) - MetricsRegistry &getMetricsRegistry() - { - return metricsRegistry; - } - /** - * Sums cards across all zones of all running games. Each game takes its - * own gameMutex -- the hot per-game lock every game action contends on -- - * and then iterates every player's zones, so the scrape cost is really - * O(total cards in play) plus one mutex acquisition per live game. Keep - * scrapes infrequent in big multiplayer rooms. - */ - qint64 getCardsInGamesTotal() const; - int getMetricsSlowCommandMs() const - { - return metricsSlowCommandMs; - } - /// Heartbeat overshoot that counts as a stall. A value of 0 disables the watchdogs. - int getMetricsStallWarnMs() const - { - return metricsStallWarnMs; - } - void observeGameStartDurationMs(qint64 elapsedMs) override; - qint64 getEventLoopStallsTotal() const - { - return eventLoopStallsTotal.load(std::memory_order_relaxed); - } - qint64 getEventLoopLastStallMs() const - { - return eventLoopLastStallMs.load(std::memory_order_relaxed); - } - qint64 getEventLoopMaxStallMs() const - { - return eventLoopMaxStallMs.load(std::memory_order_relaxed); - } - /// Records one heartbeat overshoot and logs a single warning for it. - void observeEventLoopStall(const QString &threadName, qint64 overshootMs); - /** - * Installs an EventLoopWatchdog in @p thread. Called once per socket pool - * thread right after it starts. - */ - void watchWorkerThread(QThread *thread); - bool islConnectionExists(int _serverId) const; void addIslInterface(int _serverId, IslInterface *interface); void removeIslInterface(int _serverId); diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index bb67d78eb..847be61da 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -1,6 +1,5 @@ #include "servatrice_database_interface.h" -#include "deck_tag_serialization.h" #include "servatrice.h" #include "serversocketinterface.h" #include "settingscache.h" @@ -8,13 +7,11 @@ #include #include #include -#include #include #include #include #include #include -#include #include #include #include @@ -89,10 +86,9 @@ bool Servatrice_DatabaseInterface::openDatabase() << dbversion << "to version" << expectedversion; return false; } else if (dbversion > expectedversion) { - qCCritical(DatabaseInterfaceLog) - << poolStr << "Error opening database: the database schema version" << dbversion - << "is too new, you need to update Servatrice" << "(Currently running Servatrice actually uses version" - << expectedversion << ")"; + qCCritical(DatabaseInterfaceLog) << poolStr << "Error opening database: the database schema version" + << dbversion << "is too new, you need to update servatrice" + << "(this servatrice actually uses version" << expectedversion << ")"; return false; } } else { @@ -102,59 +98,12 @@ bool Servatrice_DatabaseInterface::openDatabase() return false; } - if (sqlDatabase.driverName() != "QMYSQL") { - qCCritical(DatabaseInterfaceLog) - << poolStr - << "Error opening database: connection is not a MySQL/MariaDB database, Servatrice only " - "supports the QMYSQL driver (actual driver:" - << sqlDatabase.driverName() << ")."; - return false; - } - - bool strictModeCheckOk = false; - const bool strictModeEnabled = isStrictModeEnabled(strictModeCheckOk); - if (!strictModeCheckOk) { - qCCritical(DatabaseInterfaceLog) << poolStr - << "Error opening database: unable to determine whether MySQL/MariaDB strict " - "mode is enabled"; - return false; - } - if (strictModeEnabled) { - qCCritical(DatabaseInterfaceLog) << poolStr - << "Error opening database: MySQL/MariaDB strict mode is enabled, which " - "breaks most Servatrice database operations. Please disable strict mode " - "by removing STRICT_TRANS_TABLES and STRICT_ALL_TABLES from sql_mode, " - "for example by adding 'sql_mode=NO_ENGINE_SUBSTITUTION' under [mysqld] " - "in your my.cnf (or my.ini on Windows) and restarting the database " - "server."; - return false; - } - // reset all prepared statements qDeleteAll(preparedStatements); preparedStatements.clear(); return true; } -bool Servatrice_DatabaseInterface::isStrictModeEnabled(bool &ok) const -{ - ok = true; - - QSqlQuery query(sqlDatabase); - if (!query.exec("SELECT @@GLOBAL.sql_mode")) { - ok = false; - return false; - } - - const QStringList modes = query.next() ? query.value(0).toString().split(',') : QStringList(); - for (const QString &mode : modes) { - if (mode.trimmed() == "STRICT_TRANS_TABLES" || mode.trimmed() == "STRICT_ALL_TABLES") { - return true; - } - } - return false; -} - bool Servatrice_DatabaseInterface::checkSql() { if (!sqlDatabase.isValid()) { @@ -692,10 +641,6 @@ ServerInfo_User Servatrice_DatabaseInterface::evalUserQueryResult(const QSqlQuer userLevel |= ServerInfo_User::IsJudge; } - if (is_admin & 8) { - userLevel |= ServerInfo_User::IsDeveloper; - } - result.set_user_level(userLevel); const QString country = query->value(3).toString(); @@ -1081,183 +1026,6 @@ DeckList *Servatrice_DatabaseInterface::getDeckFromDatabase(int deckId, int user return deck; } -bool Servatrice_DatabaseInterface::createDeckShare(const QString &token, - const QString &name, - int userId, - const QList &items, - int expiryDays, - qint64 &expiresAt) -{ - checkSql(); - - if (items.isEmpty()) { - return false; - } - - if (!sqlDatabase.transaction()) { - return false; - } - - QSqlQuery *query = prepareQuery("insert into {prefix}_deck_share (token, name, created_by, created_at, expires_at) " - "values (:token, :name, :created_by, NOW(), DATE_ADD(NOW(), INTERVAL :days DAY))"); - query->bindValue(":token", token); - query->bindValue(":name", name); - query->bindValue(":created_by", userId < 1 ? QVariant() : userId); - query->bindValue(":days", expiryDays); - if (!execSqlQuery(query)) { - // A failed execSqlQuery has already closed and reopened the connection, - // which implicitly discards the transaction; rollback below is a no-op. - sqlDatabase.rollback(); - return false; - } - - const int shareId = query->lastInsertId().toInt(); - - // Read the expiry back from the database so the value returned to the client - // matches the server clock rather than being approximated client-side. - QSqlQuery *expiryQuery = prepareQuery("select UNIX_TIMESTAMP(expires_at) from {prefix}_deck_share where id = :id"); - expiryQuery->bindValue(":id", shareId); - if (!execSqlQuery(expiryQuery) || !expiryQuery->next()) { - // See the note above: after a failed execSqlQuery the transaction is - // already gone because the connection was torn down. - sqlDatabase.rollback(); - return false; - } - expiresAt = expiryQuery->value(0).toLongLong(); - - for (int i = 0; i < items.size(); ++i) { - const DeckShareItemRecord &item = items.at(i); - QSqlQuery *itemQuery = prepareQuery("insert into {prefix}_deck_share_item (share_id, name, tags, banner_card, " - "game_format, color_identity, content, position) values (:share_id, :name, " - ":tags, :banner_card, :game_format, :color_identity, :content, :position)"); - itemQuery->bindValue(":share_id", shareId); - itemQuery->bindValue(":name", item.name); - itemQuery->bindValue(":tags", serializeDeckTags(item.tags)); - itemQuery->bindValue(":banner_card", item.bannerCard); - itemQuery->bindValue(":game_format", item.gameFormat); - itemQuery->bindValue(":color_identity", item.colorIdentity); - itemQuery->bindValue(":content", item.content); - itemQuery->bindValue(":position", i); - if (!execSqlQuery(itemQuery)) { - // See the note above: the transaction is already gone after the - // reconnect performed by a failed execSqlQuery. - sqlDatabase.rollback(); - return false; - } - } - - if (!sqlDatabase.commit()) { - sqlDatabase.rollback(); - return false; - } - return true; -} - -bool Servatrice_DatabaseInterface::getDeckShareList(const QString &token, - QString &name, - qint64 &expiresAt, - QList &items) -{ - checkSql(); - - QSqlQuery *query = - prepareQuery("select id, name, UNIX_TIMESTAMP(expires_at) from {prefix}_deck_share where token = " - ":token and expires_at > now()"); - query->bindValue(":token", token); - execSqlQuery(query); - if (!query->next()) { - return false; - } - - const int shareId = query->value(0).toInt(); - name = query->value(1).toString(); - expiresAt = query->value(2).toLongLong(); - items.clear(); - - QSqlQuery *itemQuery = - prepareQuery("select id, name, tags, banner_card, game_format, color_identity from {prefix}_deck_share_item " - "where share_id = :share_id order by position"); - itemQuery->bindValue(":share_id", shareId); - execSqlQuery(itemQuery); - while (itemQuery->next()) { - DeckShareItemRecord item; - item.id = itemQuery->value(0).toInt(); - item.name = itemQuery->value(1).toString(); - item.tags = deserializeDeckTags(itemQuery->value(2).toString()); - item.bannerCard = itemQuery->value(3).toString(); - item.gameFormat = itemQuery->value(4).toString(); - item.colorIdentity = itemQuery->value(5).toString(); - items.append(item); - } - - return true; -} - -bool Servatrice_DatabaseInterface::getDeckShareItem(const QString &token, int itemId, QString &content) -{ - checkSql(); - - QSqlQuery *query = prepareQuery("select i.content from {prefix}_deck_share_item i join {prefix}_deck_share s on " - "s.id = i.share_id where s.token = :token and s.expires_at > now() and i.id = :id"); - query->bindValue(":token", token); - query->bindValue(":id", itemId); - execSqlQuery(query); - if (!query->next()) { - return false; - } - - content = query->value(0).toString(); - return true; -} - -void Servatrice_DatabaseInterface::cleanupExpiredDeckShares() -{ - checkSql(); - - QSqlQuery *query = prepareQuery("delete from {prefix}_deck_share where expires_at < now()"); - execSqlQuery(query); -} - -bool Servatrice_DatabaseInterface::getDeckSharesForUser(int userId, QList &shares) -{ - checkSql(); - - QSqlQuery *query = prepareQuery("select s.id, s.name, UNIX_TIMESTAMP(s.created_at), " - "UNIX_TIMESTAMP(s.expires_at), count(i.id) from {prefix}_deck_share s left join " - "{prefix}_deck_share_item i on i.share_id = s.id " - "where s.created_by = :created_by and s.expires_at > now() " - "group by s.id, s.name, s.created_at, s.expires_at order by s.created_at desc"); - query->bindValue(":created_by", userId); - if (!execSqlQuery(query)) { - return false; - } - - shares.clear(); - while (query->next()) { - DeckShareSummaryRecord summary; - summary.id = query->value(0).toInt(); - summary.name = query->value(1).toString(); - summary.creationTime = query->value(2).toLongLong(); - summary.expiresAt = query->value(3).toLongLong(); - summary.itemCount = query->value(4).toInt(); - shares.append(summary); - } - return true; -} - -bool Servatrice_DatabaseInterface::deleteDeckShare(int shareId, int userId) -{ - checkSql(); - - QSqlQuery *query = prepareQuery("delete from {prefix}_deck_share where id = :id and created_by = :created_by"); - query->bindValue(":id", shareId); - query->bindValue(":created_by", userId); - if (!execSqlQuery(query)) { - return false; - } - return query->numRowsAffected() > 0; -} - void Servatrice_DatabaseInterface::logMessage(const int senderId, const QString &senderName, const QString &senderIp, @@ -1680,7 +1448,7 @@ QList Servatrice_DatabaseInterface::getModeratorLastL QSqlQuery *query = prepareQuery("SELECT u.name, u.admin, UNIX_TIMESTAMP(a.last_login) " "FROM {prefix}_users u " "LEFT JOIN {prefix}_user_analytics a ON a.id = u.id " - "WHERE (u.admin & 15) <> 0 ORDER BY u.name"); + "WHERE (u.admin & 7) <> 0 ORDER BY u.name"); if (!execSqlQuery(query)) { qCWarning(DatabaseInterfaceLog) << "Failed to collect moderator login information: SQL Error"; @@ -1701,9 +1469,6 @@ QList Servatrice_DatabaseInterface::getModeratorLastL if (isAdmin & 4) { userLevel |= ServerInfo_User::IsJudge; } - if (isAdmin & 8) { - userLevel |= ServerInfo_User::IsDeveloper; - } loginDetails.set_user_level(userLevel); if (!query->value(2).isNull()) { @@ -1715,38 +1480,6 @@ QList Servatrice_DatabaseInterface::getModeratorLastL return results; } -Servatrice_DatabaseInterface::UptimeSnapshot Servatrice_DatabaseInterface::getLatestUptimeSnapshot(int serverId) -{ - UptimeSnapshot snapshot; - - if (!checkSql()) { - return snapshot; - } - - QSqlQuery *query = prepareQuery("SELECT users_count, mods_count, games_count, tx_bytes, rx_bytes, uptime, " - "UNIX_TIMESTAMP(timest) FROM {prefix}_uptime " - "WHERE id_server = :id_server ORDER BY timest DESC LIMIT 1"); - query->bindValue(":id_server", serverId); - - if (!execSqlQuery(query)) { - qCWarning(DatabaseInterfaceLog) << "Failed to collect server stats snapshot: SQL Error"; - return snapshot; - } - - if (query->next()) { - snapshot.valid = true; - snapshot.usersCount = query->value(0).toULongLong(); - snapshot.modsCount = query->value(1).toULongLong(); - snapshot.gamesCount = query->value(2).toULongLong(); - snapshot.txBytes = query->value(3).toULongLong(); - snapshot.rxBytes = query->value(4).toULongLong(); - snapshot.uptimeSecs = query->value(5).toULongLong(); - snapshot.timest = query->value(6).toULongLong(); - } - - return snapshot; -} - bool Servatrice_DatabaseInterface::removeUserAvatar(const QString &userName) { if (!checkSql()) { diff --git a/servatrice/src/servatrice_database_interface.h b/servatrice/src/servatrice_database_interface.h index ce51a2474..cd76ae288 100644 --- a/servatrice/src/servatrice_database_interface.h +++ b/servatrice/src/servatrice_database_interface.h @@ -13,32 +13,10 @@ #include #include -#define DATABASE_SCHEMA_VERSION 37 +#define DATABASE_SCHEMA_VERSION 36 class Servatrice; -/** @brief Metadata of a single deck inside a temporary deck share bundle. */ -struct DeckShareItemRecord -{ - int id = -1; ///< Database id, used for downloads. - QString name; ///< Deck name. - QStringList tags; ///< Deck tags. - QString bannerCard; ///< Banner card name (deck image). - QString gameFormat; ///< Game format the deck was built for. - QString colorIdentity; ///< Color identity, e.g. "WUBRG". - QString content; ///< Deck content (native format); empty in list queries. -}; - -/** @brief Summary of a share bundle owned by a user. */ -struct DeckShareSummaryRecord -{ - int id = -1; ///< Database id, used for revocation. - QString name; ///< Share name. - qint64 creationTime = 0; ///< Unix timestamp at which the share was created. - qint64 expiresAt = 0; ///< Unix timestamp at which the share expires. - int itemCount = 0; ///< Number of decks in the bundle. -}; - class Servatrice_DatabaseInterface : public Server_DatabaseInterface { Q_OBJECT @@ -54,7 +32,6 @@ private: bool checkUserIsIpBanned(const QString &ipAddress, QString &banReason, int &banSecondsRemaining); /** Must be called after checkSql and server is known to be in auth mode. */ bool checkUserIsNameBanned(QString const &userName, QString &banReason, int &banSecondsRemaining); - bool isStrictModeEnabled(bool &ok) const; protected: AuthenticationResult checkUserPassword(Server_ProtocolHandler *handler, @@ -102,37 +79,6 @@ public: const QList &replayList) override; DeckList *getDeckFromDatabase(int deckId, int userId) override; - /** - * @brief Creates a new temporary deck share bundle. - * @param expiresAt Receives the actual expiry read back from the database. - * @return false on failure. - */ - bool createDeckShare(const QString &token, - const QString &name, - int userId, - const QList &items, - int expiryDays, - qint64 &expiresAt); - /** @brief Lists the share bundles created by a user, newest first. */ - bool getDeckSharesForUser(int userId, QList &shares); - /** - * @brief Deletes one of a user's own share bundles (cascades to its items). - * @return false if no such bundle belongs to the user. - */ - bool deleteDeckShare(int shareId, int userId); - /** - * @brief Looks up a valid (non-expired) share bundle by token. - * @return false if the token is unknown or expired. - */ - bool getDeckShareList(const QString &token, QString &name, qint64 &expiresAt, QList &items); - /** - * @brief Fetches the content of one item of a valid share bundle. - * @return false if the token is unknown/expired or the item does not belong to the bundle. - */ - bool getDeckShareItem(const QString &token, int itemId, QString &content); - /** @brief Deletes all expired share bundles (cascades to their items). */ - void cleanupExpiredDeckShares(); - int getNextGameId() override; int getNextReplayId() override; int getActiveUserCount(QString connectionType = QString()) override; @@ -194,21 +140,6 @@ public: QList getUserSessions(const QString &userName, int limit); QList getUserAlts(const QString &userName); QList getModeratorLastLogins(); - - // Uptime snapshot as recorded by Servatrice::statusUpdate() into the - // {prefix}_uptime table. valid is false when no snapshot exists yet. - struct UptimeSnapshot - { - bool valid = false; - quint64 usersCount = 0; - quint64 modsCount = 0; - quint64 gamesCount = 0; - quint64 txBytes = 0; - quint64 rxBytes = 0; - quint64 uptimeSecs = 0; - quint64 timest = 0; - }; - UptimeSnapshot getLatestUptimeSnapshot(int serverId); bool removeUserAvatar(const QString &userName); bool addForgotPassword(const QString &user); bool removeForgotPassword(const QString &user) override; diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index c82a8dd73..2a8b5f0a4 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -20,7 +20,6 @@ #include "serversocketinterface.h" -#include "deck_tag_serialization.h" #include "email_parser.h" #include "main.h" #include "servatrice.h" @@ -31,37 +30,23 @@ #include #include -#include #include #include #include #include -#include #include #include #include #include -#include #include -#include #include #include -#include #include #include #include -#include #include -#include #include -#include -#include -#include -#include -#include -#include #include -#include #include #include #include @@ -92,14 +77,9 @@ #include #include #include -#include -#include -#include -#include #include #include #include -#include #include #include #include @@ -210,77 +190,6 @@ void AbstractServerSocketInterface::logDebugMessage(const QString &message) logger->logMessage(message, this); } -void AbstractServerSocketInterface::processCommandContainer(const CommandContainer &cont) -{ - QElapsedTimer timer; - timer.start(); - Server_ProtocolHandler::processCommandContainer(cont); - const qint64 elapsedMs = timer.nsecsElapsed() / 1000000; - - // The base dispatch is an if/else-if chain — at most one family is - // actually processed. Recording every family in the container would - // let an unauthenticated client stampforge developer/moderator/admin - // samples by batching them alongside a session command the server - // actually runs. Mirror the base's selection and skip entirely when - // deleted or when no family matched. - if (deleted) { - return; - } - - // When getPbExtension returns -1 (no extension set) and the kind is - // non-zero, typeIdFor wraps into the previous kind's range instead of - // hitting the typeId < 0 guard in observeCommand. Skip such entries. - int kind = -1; - if (cont.game_command_size()) { - kind = 2; - } else if (cont.room_command_size()) { - kind = 1; - } else if (cont.session_command_size()) { - kind = 0; - } else if (cont.moderator_command_size()) { - kind = 3; - } else if (cont.admin_command_size()) { - kind = 4; - } else if (cont.developer_command_size()) { - kind = 5; - } - - if (kind >= 0) { - auto recordDispatched = [&](int familyKind, const auto &cmds) { - for (const auto &cmd : cmds) { - const int ext = getPbExtension(cmd); - if (ext >= 0) { - servatrice->getMetricsRegistry().observeCommand(MetricsRegistry::typeIdFor(familyKind, ext), - elapsedMs); - } - } - }; - - if (kind == 0) { - recordDispatched(kind, cont.session_command()); - } else if (kind == 1) { - recordDispatched(kind, cont.room_command()); - } else if (kind == 2) { - recordDispatched(kind, cont.game_command()); - } else if (kind == 3) { - recordDispatched(kind, cont.moderator_command()); - } else if (kind == 4) { - recordDispatched(kind, cont.admin_command()); - } else { - recordDispatched(kind, cont.developer_command()); - } - } - - const int slowCommandMs = servatrice->getMetricsSlowCommandMs(); - if (slowCommandMs > 0 && elapsedMs >= slowCommandMs) { - const ServerInfo_User *info = getUserInfo(); - const QString user = authState == PasswordRight && info ? QString::fromStdString(info->name()) - : QStringLiteral("unauthenticated"); - qCWarning(AbstractServerSocketInterfaceLog) << "slow command container from" << user << "processed in" - << elapsedMs << "ms (" << cont.ByteSizeLong() << "bytes)"; - } -} - Response::ResponseCode AbstractServerSocketInterface::processExtendedSessionCommand(int cmdType, const SessionCommand &cmd, ResponseContainer &rc) @@ -292,12 +201,6 @@ Response::ResponseCode AbstractServerSocketInterface::processExtendedSessionComm return cmdRemoveFromList(cmd.GetExtension(Command_RemoveFromList::ext), rc); case SessionCommand::DECK_LIST: return cmdDeckList(cmd.GetExtension(Command_DeckList::ext), rc); - case SessionCommand::DECK_LIST_OTHER_USER: - return cmdDeckListOtherUser(cmd.GetExtension(Command_DeckListOtherUser::ext), rc); - case SessionCommand::DECK_SET_VISIBILITY: - return cmdDeckSetVisibility(cmd.GetExtension(Command_DeckSetVisibility::ext), rc); - case SessionCommand::DECK_DOWNLOAD_PUBLIC: - return cmdDeckDownloadPublic(cmd.GetExtension(Command_DeckDownloadPublic::ext), rc); case SessionCommand::DECK_NEW_DIR: return cmdDeckNewDir(cmd.GetExtension(Command_DeckNewDir::ext), rc); case SessionCommand::DECK_DEL_DIR: @@ -341,16 +244,6 @@ Response::ResponseCode AbstractServerSocketInterface::processExtendedSessionComm return cmdAccountImage(cmd.GetExtension(Command_AccountImage::ext), rc); case SessionCommand::SET_CARD_ART_PARAMS: return cmdSetCardArtParams(cmd.GetExtension(Command_SetCardArtParams::ext), rc); - case SessionCommand::DECK_SHARE_CREATE: - return cmdDeckShareCreate(cmd.GetExtension(Command_DeckShareCreate::ext), rc); - case SessionCommand::DECK_SHARE_LIST: - return cmdDeckShareList(cmd.GetExtension(Command_DeckShareList::ext), rc); - case SessionCommand::DECK_SHARE_LIST_MINE: - return cmdDeckShareListMine(cmd.GetExtension(Command_DeckShareListMine::ext), rc); - case SessionCommand::DECK_SHARE_REMOVE: - return cmdDeckShareRemove(cmd.GetExtension(Command_DeckShareRemove::ext), rc); - case SessionCommand::DECK_SHARE_DOWNLOAD: - return cmdDeckShareDownload(cmd.GetExtension(Command_DeckShareDownload::ext), rc); case SessionCommand::ACCOUNT_PASSWORD: return cmdAccountPassword(cmd.GetExtension(Command_AccountPassword::ext), rc); case SessionCommand::REQUEST_PASSWORD_SALT: @@ -391,7 +284,7 @@ Response::ResponseCode AbstractServerSocketInterface::processExtendedModeratorCo case ModeratorCommand::REPORT_RESOLVE: return cmdReportResolve(cmd.GetExtension(Command_ReportResolve::ext), rc); case ModeratorCommand::VIEWLOG_HISTORY: - return cmdGetLogHistory(cmd.GetExtension(Command_ViewLogHistory::ext), rc, true); + return cmdGetLogHistory(cmd.GetExtension(Command_ViewLogHistory::ext), rc); case ModeratorCommand::GRANT_REPLAY_ACCESS: return cmdGrantReplayAccess(cmd.GetExtension(Command_GrantReplayAccess::ext), rc); case ModeratorCommand::REPLAY_DOWNLOAD_BY_GAME_ID: @@ -444,26 +337,6 @@ AbstractServerSocketInterface::processExtendedAdminCommand(int cmdType, const Ad } } -// DEVELOPER FUNCTIONS. -// Permission is checked by processDeveloperCommandContainer. Only stats-style -// queries live here, never community moderation or server administration. -Response::ResponseCode AbstractServerSocketInterface::processExtendedDeveloperCommand(int cmdType, - const DeveloperCommand &cmd, - ResponseContainer &rc) -{ - switch ((DeveloperCommand::DeveloperCommandType)cmdType) { - case DeveloperCommand::GET_SERVER_STATS: - return cmdGetServerStats(cmd.GetExtension(Command_GetServerStats::ext), rc); - case DeveloperCommand::VIEWLOG_HISTORY: { - // Same query as the moderator log view, carried by the developer - // command family, but narrows out private chats and sender IPs. - return cmdGetLogHistory(cmd.GetExtension(Command_ViewLogHistory::dev_ext), rc, false); - } - default: - return Response::RespFunctionNotAllowed; - } -} - Response::ResponseCode AbstractServerSocketInterface::cmdAddToList(const Command_AddToList &cmd, ResponseContainer &rc) { if (authState != PasswordRight) { @@ -597,73 +470,46 @@ int AbstractServerSocketInterface::getDeckPathId(const QString &path) return getDeckPathId(0, path.split("/")); } -bool AbstractServerSocketInterface::deckListHelper(int folderId, - ServerInfo_DeckStorage_Folder *folder, - int userId, - bool inheritedPublic, - bool publicOnly) +bool AbstractServerSocketInterface::deckListHelper(int folderId, ServerInfo_DeckStorage_Folder *folder) { - QSqlQuery *query = sqlInterface->prepareQuery("select id, name, is_public from {prefix}_decklist_folders where " - "id_parent = :id_parent and id_user = :id_user"); + QSqlQuery *query = sqlInterface->prepareQuery( + "select id, name from {prefix}_decklist_folders where id_parent = :id_parent and id_user = :id_user"); query->bindValue(":id_parent", folderId); - query->bindValue(":id_user", userId); + query->bindValue(":id_user", userInfo->id()); if (!sqlInterface->execSqlQuery(query)) { return false; } - QList>> folderRows; + QMap results; while (query->next()) { - folderRows.append({query->value(0).toInt(), {query->value(1).toString(), query->value(2).toBool()}}); + results[query->value(0).toInt()] = query->value(1).toString(); } - std::sort(folderRows.begin(), folderRows.end(), [](const auto &a, const auto &b) { return a.first < b.first; }); - - for (const auto &[folderIdValue, folderInfo] : folderRows) { - const QString name = folderInfo.first; - const bool ownPublic = folderInfo.second; - const bool effectivePublic = inheritedPublic || ownPublic; + for (int key : results.keys()) { ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items(); - newItem->set_id(folderIdValue); - newItem->set_name(name.toStdString()); - newItem->mutable_folder()->set_is_public(ownPublic); + newItem->set_id(key); + newItem->set_name(results.value(key).toStdString()); - if (!deckListHelper(newItem->id(), newItem->mutable_folder(), userId, effectivePublic, publicOnly)) { + if (!deckListHelper(newItem->id(), newItem->mutable_folder())) { return false; } - - if (publicOnly && !effectivePublic && newItem->mutable_folder()->items_size() == 0) { - folder->mutable_items()->RemoveLast(); - } } - query = sqlInterface->prepareQuery("select id, name, upload_time, is_public, banner_card_name, " - "banner_card_provider, color_identity, tags from {prefix}_decklist_files where " - "id_folder = :id_folder and id_user = :id_user"); + query = sqlInterface->prepareQuery("select id, name, upload_time from {prefix}_decklist_files where id_folder = " + ":id_folder and id_user = :id_user"); query->bindValue(":id_folder", folderId); - query->bindValue(":id_user", userId); + query->bindValue(":id_user", userInfo->id()); if (!sqlInterface->execSqlQuery(query)) { return false; } while (query->next()) { - const bool ownPublic = query->value(3).toBool(); - if (publicOnly && !(inheritedPublic || ownPublic)) { - continue; - } - ServerInfo_DeckStorage_TreeItem *newItem = folder->add_items(); newItem->set_id(query->value(0).toInt()); newItem->set_name(query->value(1).toString().toStdString()); ServerInfo_DeckStorage_File *newFile = newItem->mutable_file(); newFile->set_creation_time(query->value(2).toDateTime().toSecsSinceEpoch()); - newFile->set_is_public(ownPublic); - newFile->set_banner_card_name(query->value(4).toString().toStdString()); - newFile->set_banner_card_provider(query->value(5).toString().toStdString()); - newFile->set_color_identity(query->value(6).toString().toStdString()); - for (const QString &tag : deserializeDeckTags(query->value(7).toString())) { - newFile->add_tags(tag.toStdString()); - } } return true; @@ -684,7 +530,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckList(const Command_ Response_DeckList *re = new Response_DeckList; ServerInfo_DeckStorage_Folder *root = re->mutable_root(); - if (!deckListHelper(0, root, userInfo->id(), false, false)) { + if (!deckListHelper(0, root)) { return Response::RespContextError; } @@ -692,160 +538,6 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckList(const Command_ return Response::RespOk; } -Response::ResponseCode AbstractServerSocketInterface::cmdDeckListOtherUser(const Command_DeckListOtherUser &cmd, - ResponseContainer &rc) -{ - if (authState != PasswordRight) { - return Response::RespFunctionNotAllowed; - } - - sqlInterface->checkSql(); - - const QString userName = nameFromStdString(cmd.user_name()); - const int userId = sqlInterface->getUserIdInDB(userName); - if (userId == -1) { - return Response::RespNameNotFound; - } - - Response_DeckList *re = new Response_DeckList; - ServerInfo_DeckStorage_Folder *root = re->mutable_root(); - - if (!deckListHelper(0, root, userId, false, true)) { - return Response::RespContextError; - } - - rc.setResponseExtension(re); - return Response::RespOk; -} - -int AbstractServerSocketInterface::getDeckOwnerId(int deckId) -{ - QSqlQuery *query = sqlInterface->prepareQuery("select id_user from {prefix}_decklist_files where id = :id"); - query->bindValue(":id", deckId); - if (!sqlInterface->execSqlQuery(query)) { - return -1; - } - if (!query->next()) { - return -1; - } - return query->value(0).toInt(); -} - -bool AbstractServerSocketInterface::isDeckEffectivelyPublic(int deckId) -{ - QSqlQuery *query = - sqlInterface->prepareQuery("select is_public, id_folder from {prefix}_decklist_files where id = :id"); - query->bindValue(":id", deckId); - if (!sqlInterface->execSqlQuery(query)) { - return false; - } - if (!query->next()) { - return false; - } - if (query->value(0).toBool()) { - return true; - } - - int folderId = query->value(1).toInt(); - int guard = 0; - while (folderId != 0 && guard < 100) { - QSqlQuery *folderQuery = - sqlInterface->prepareQuery("select is_public, id_parent from {prefix}_decklist_folders where id = :id"); - folderQuery->bindValue(":id", folderId); - if (!sqlInterface->execSqlQuery(folderQuery)) { - return false; - } - if (!folderQuery->next()) { - return false; - } - if (folderQuery->value(0).toBool()) { - return true; - } - folderId = folderQuery->value(1).toInt(); - ++guard; - } - return false; -} - -Response::ResponseCode AbstractServerSocketInterface::cmdDeckSetVisibility(const Command_DeckSetVisibility &cmd, - ResponseContainer & /*rc*/) -{ - if (authState != PasswordRight) { - return Response::RespFunctionNotAllowed; - } - - sqlInterface->checkSql(); - - if (cmd.has_deck_id()) { - QSqlQuery *query = - sqlInterface->prepareQuery("select 1 from {prefix}_decklist_files where id = :id and id_user = :id_user"); - query->bindValue(":id", cmd.deck_id()); - query->bindValue(":id_user", userInfo->id()); - sqlInterface->execSqlQuery(query); - if (!query->next()) { - return Response::RespNameNotFound; - } - - query = sqlInterface->prepareQuery("update {prefix}_decklist_files set is_public = :is_public where id = :id " - "and id_user = :id_user"); - query->bindValue(":is_public", cmd.is_public() ? 1 : 0); - query->bindValue(":id", cmd.deck_id()); - query->bindValue(":id_user", userInfo->id()); - if (!sqlInterface->execSqlQuery(query)) { - return Response::RespContextError; - } - } else if (cmd.has_folder_path()) { - const int folderId = getDeckPathId(nameFromStdString(cmd.folder_path())); - if (folderId == -1 || folderId == 0) { - return Response::RespNameNotFound; - } - - QSqlQuery *query = - sqlInterface->prepareQuery("update {prefix}_decklist_folders set is_public = :is_public where id = :id " - "and id_user = :id_user"); - query->bindValue(":is_public", cmd.is_public() ? 1 : 0); - query->bindValue(":id", folderId); - query->bindValue(":id_user", userInfo->id()); - if (!sqlInterface->execSqlQuery(query)) { - return Response::RespContextError; - } - } else { - return Response::RespInvalidData; - } - - return Response::RespOk; -} - -Response::ResponseCode AbstractServerSocketInterface::cmdDeckDownloadPublic(const Command_DeckDownloadPublic &cmd, - ResponseContainer &rc) -{ - if (authState != PasswordRight) { - return Response::RespFunctionNotAllowed; - } - - sqlInterface->checkSql(); - - const int deckId = cmd.deck_id(); - const int ownerId = getDeckOwnerId(deckId); - if (ownerId == -1 || !isDeckEffectivelyPublic(deckId)) { - return Response::RespNameNotFound; - } - - DeckList *deck; - try { - deck = sqlInterface->getDeckFromDatabase(deckId, ownerId); - } catch (Response::ResponseCode &r) { - return r; - } - - Response_DeckDownload *re = new Response_DeckDownload; - re->set_deck(deck->writeToString_Native().toStdString()); - rc.setResponseExtension(re); - delete deck; - - return Response::RespOk; -} - Response::ResponseCode AbstractServerSocketInterface::cmdDeckNewDir(const Command_DeckNewDir &cmd, ResponseContainer & /*rc*/) { @@ -954,22 +646,6 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckDel(const Command_D return Response::RespOk; } -namespace -{ -/** @brief Keeps only the WUBRG colors from a color identity string, deduplicated. */ -QString sanitizeColorIdentity(const QString &colorIdentity) -{ - QString sanitized; - for (const QChar &color : colorIdentity) { - const QChar upper = color.toUpper(); - if (QStringLiteral("WUBRG").contains(upper) && !sanitized.contains(upper)) { - sanitized.append(upper); - } - } - return sanitized; -} -} // namespace - Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Command_DeckUpload &cmd, ResponseContainer &rc) { @@ -994,14 +670,6 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman deckName = "Unnamed deck"; } - // The server derives the banner card and tags from the deck itself. Only the - // color identity must come from the client, since the server has no card - // database to compute it. All values are bounded to the column sizes. - const QString bannerCardName = deck.getBannerCard().name.left(255); - const QString bannerCardProvider = deck.getBannerCard().providerId.left(32); - const QString tagsJson = serializeDeckTags(deck.getTags()); - const QString colorIdentity = sanitizeColorIdentity(nameFromStdString(cmd.color_identity())); - if (cmd.has_path()) { int folderId = getDeckPathId(nameFromStdString(cmd.path())); if (folderId == -1) { @@ -1010,74 +678,38 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckUpload(const Comman QSqlQuery *query = sqlInterface->prepareQuery("insert into {prefix}_decklist_files (id_folder, id_user, name, upload_time, " - "content, is_public, banner_card_name, banner_card_provider, color_identity, " - "tags) values(:id_folder, :id_user, :name, NOW(), :content, :is_public, " - ":banner_card_name, :banner_card_provider, :color_identity, :tags)"); + "content) values(:id_folder, :id_user, :name, NOW(), :content)"); query->bindValue(":id_folder", folderId); query->bindValue(":id_user", userInfo->id()); query->bindValue(":name", deckName); query->bindValue(":content", deckStr); - query->bindValue(":is_public", cmd.has_is_public() && cmd.is_public() ? 1 : 0); - query->bindValue(":banner_card_name", bannerCardName); - query->bindValue(":banner_card_provider", bannerCardProvider); - query->bindValue(":color_identity", colorIdentity); - query->bindValue(":tags", tagsJson); - if (!sqlInterface->execSqlQuery(query)) { - return Response::RespContextError; - } + sqlInterface->execSqlQuery(query); Response_DeckUpload *re = new Response_DeckUpload; ServerInfo_DeckStorage_TreeItem *fileInfo = re->mutable_new_file(); fileInfo->set_id(query->lastInsertId().toInt()); fileInfo->set_name(deckName.toStdString()); fileInfo->mutable_file()->set_creation_time(QDateTime::currentDateTime().toSecsSinceEpoch()); - fileInfo->mutable_file()->set_is_public(cmd.has_is_public() && cmd.is_public()); rc.setResponseExtension(re); } else if (cmd.has_deck_id()) { - QString updateQuery = "update {prefix}_decklist_files set name=:name, upload_time=NOW(), content=:content, " - "banner_card_name=:banner_card_name, banner_card_provider=:banner_card_provider, " - "color_identity=:color_identity, tags=:tags"; - if (cmd.has_is_public()) { - updateQuery += ", is_public=:is_public"; - } - updateQuery += " where id = :id_deck and id_user = :id_user"; - - QSqlQuery *query = sqlInterface->prepareQuery(updateQuery); + QSqlQuery *query = + sqlInterface->prepareQuery("update {prefix}_decklist_files set name=:name, upload_time=NOW(), " + "content=:content where id = :id_deck and id_user = :id_user"); query->bindValue(":id_deck", cmd.deck_id()); query->bindValue(":id_user", userInfo->id()); query->bindValue(":name", deckName); query->bindValue(":content", deckStr); - query->bindValue(":banner_card_name", bannerCardName); - query->bindValue(":banner_card_provider", bannerCardProvider); - query->bindValue(":color_identity", colorIdentity); - query->bindValue(":tags", tagsJson); - if (cmd.has_is_public()) { - query->bindValue(":is_public", cmd.is_public() ? 1 : 0); - } - if (!sqlInterface->execSqlQuery(query)) { - return Response::RespContextError; - } + sqlInterface->execSqlQuery(query); if (query->numRowsAffected() == 0) { return Response::RespNameNotFound; } - QSqlQuery *visibilityQuery = - sqlInterface->prepareQuery("select is_public from {prefix}_decklist_files where id = :id and " - "id_user = :id_user"); - visibilityQuery->bindValue(":id", cmd.deck_id()); - visibilityQuery->bindValue(":id_user", userInfo->id()); - if (!sqlInterface->execSqlQuery(visibilityQuery)) { - return Response::RespContextError; - } - const bool isPublic = visibilityQuery->next() && visibilityQuery->value(0).toBool(); - Response_DeckUpload *re = new Response_DeckUpload; ServerInfo_DeckStorage_TreeItem *fileInfo = re->mutable_new_file(); fileInfo->set_id(cmd.deck_id()); fileInfo->set_name(deckName.toStdString()); fileInfo->mutable_file()->set_creation_time(QDateTime::currentDateTime().toSecsSinceEpoch()); - fileInfo->mutable_file()->set_is_public(isPublic); rc.setResponseExtension(re); } else { return Response::RespInvalidData; @@ -1108,248 +740,6 @@ Response::ResponseCode AbstractServerSocketInterface::cmdDeckDownload(const Comm return Response::RespOk; } -namespace -{ -/** @brief Builds a cryptographically random, URL-safe share token. */ -QString generateShareToken() -{ - QByteArray bytes(32, Qt::Uninitialized); - QRandomGenerator::system()->fillRange(reinterpret_cast(bytes.data()), bytes.size() / sizeof(quint32)); - return QString::fromLatin1(bytes.toBase64(QByteArray::Base64UrlEncoding | QByteArray::OmitTrailingEquals)); -} - -/** @brief Extracts the share metadata for a deck, materializing its content. */ -DeckShareItemRecord makeShareItemFromDeck(const DeckList &deck, const QString &colorIdentity) -{ - DeckShareItemRecord item; - item.name = deck.getName(); - if (item.name.isEmpty()) { - item.name = "Unnamed deck"; - } - item.tags = deck.getTags(); - item.bannerCard = deck.getBannerCard().name; - item.gameFormat = deck.getGameFormat(); - item.colorIdentity = sanitizeColorIdentity(colorIdentity); - item.content = deck.writeToString_Native(); - return item; -} -} // namespace - -Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareCreate(const Command_DeckShareCreate &cmd, - ResponseContainer &rc) -{ - if (authState != PasswordRight) { - return Response::RespFunctionNotAllowed; - } - - sqlInterface->checkSql(); - - const int maxItems = servatrice->getDeckShareMaxDecksPerShare(); - if (maxItems > 0 && cmd.items_size() > maxItems) { - return Response::RespInvalidData; - } - - // Per-user rate limit so share links cannot be used to build an unbounded - // word-of-mouth leak of public decks. - const int maxSharesPerDay = servatrice->getDeckShareMaxSharesPerDay(); - if (maxSharesPerDay > 0) { - QSqlQuery *countQuery = sqlInterface->prepareQuery("select count(*) from {prefix}_deck_share where " - "created_by = :created_by and created_at >= " - "DATE_SUB(NOW(), INTERVAL 1 DAY)"); - countQuery->bindValue(":created_by", userInfo->id()); - if (!sqlInterface->execSqlQuery(countQuery) || !countQuery->next()) { - return Response::RespContextError; - } - if (countQuery->value(0).toInt() >= maxSharesPerDay) { - return Response::RespTooManyRequests; - } - } - - QList items; - if (cmd.items_size() > 0) { - for (const DeckShareItem &shareItem : cmd.items()) { - if (shareItem.has_deck_list()) { - DeckList deck; - if (!deck.loadFromString_Native(fileFromStdString(shareItem.deck_list()))) { - return Response::RespContextError; - } - items.append(makeShareItemFromDeck(deck, nameFromStdString(shareItem.color_identity()))); - } else if (shareItem.has_deck_id()) { - DeckList *deck; - try { - deck = sqlInterface->getDeckFromDatabase(shareItem.deck_id(), userInfo->id()); - } catch (Response::ResponseCode &r) { - return r; - } - items.append(makeShareItemFromDeck(*deck, nameFromStdString(shareItem.color_identity()))); - delete deck; - } else { - return Response::RespInvalidData; - } - } - } else if (cmd.has_folder_path()) { - const int folderId = getDeckPathId(nameFromStdString(cmd.folder_path())); - if (folderId == -1) { - return Response::RespNameNotFound; - } - - // Drain the deck list before resolving each deck: getDeckFromDatabase - // issues its own query on the same cached statement set. - QSqlQuery *query = - sqlInterface->prepareQuery("select id, color_identity from {prefix}_decklist_files where id_folder = " - ":id_folder and id_user = :id_user"); - query->bindValue(":id_folder", folderId); - query->bindValue(":id_user", userInfo->id()); - if (!sqlInterface->execSqlQuery(query)) { - return Response::RespContextError; - } - QList> deckRows; - while (query->next()) { - deckRows.append({query->value(0).toInt(), query->value(1).toString()}); - } - for (const auto &[deckId, colorIdentity] : deckRows) { - DeckList *deck; - try { - deck = sqlInterface->getDeckFromDatabase(deckId, userInfo->id()); - } catch (Response::ResponseCode &r) { - return r; - } - items.append(makeShareItemFromDeck(*deck, colorIdentity)); - delete deck; - } - } else { - return Response::RespInvalidData; - } - - if (items.isEmpty() || (maxItems > 0 && items.size() > maxItems)) { - return Response::RespInvalidData; - } - - QString shareName = nameFromStdString(cmd.name()); - if (shareName.isEmpty()) { - shareName = "Shared decks"; - } - - const QString token = generateShareToken(); - qint64 expiresAt = 0; - if (!sqlInterface->createDeckShare(token, shareName, userInfo->id(), items, servatrice->getDeckShareExpiryDays(), - expiresAt)) { - return Response::RespInvalidData; - } - - Response_DeckShareCreate *re = new Response_DeckShareCreate; - re->set_token(token.toStdString()); - re->set_expires_at(expiresAt); - re->set_item_count(items.size()); - rc.setResponseExtension(re); - - return Response::RespOk; -} - -Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareListMine(const Command_DeckShareListMine & /*cmd*/, - ResponseContainer &rc) -{ - if (authState != PasswordRight) { - return Response::RespFunctionNotAllowed; - } - - sqlInterface->checkSql(); - - QList shares; - if (!sqlInterface->getDeckSharesForUser(userInfo->id(), shares)) { - return Response::RespContextError; - } - - Response_DeckShareListMine *re = new Response_DeckShareListMine; - for (const DeckShareSummaryRecord &share : shares) { - ServerInfo_DeckShareSummary *summary = re->add_shares(); - summary->set_id(share.id); - summary->set_name(share.name.toStdString()); - summary->set_creation_time(share.creationTime); - summary->set_expires_at(share.expiresAt); - summary->set_item_count(share.itemCount); - } - rc.setResponseExtension(re); - - return Response::RespOk; -} - -Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareRemove(const Command_DeckShareRemove &cmd, - ResponseContainer & /*rc*/) -{ - if (authState != PasswordRight) { - return Response::RespFunctionNotAllowed; - } - - if (!cmd.has_share_id()) { - return Response::RespInvalidData; - } - - sqlInterface->checkSql(); - - if (!sqlInterface->deleteDeckShare(cmd.share_id(), userInfo->id())) { - return Response::RespNameNotFound; - } - - return Response::RespOk; -} - -Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareList(const Command_DeckShareList &cmd, - ResponseContainer &rc) -{ - if (authState != PasswordRight) { - return Response::RespFunctionNotAllowed; - } - - sqlInterface->checkSql(); - - QString name; - qint64 expiresAt = 0; - QList items; - if (!sqlInterface->getDeckShareList(nameFromStdString(cmd.token()), name, expiresAt, items)) { - return Response::RespNameNotFound; - } - - Response_DeckShareList *re = new Response_DeckShareList; - re->set_name(name.toStdString()); - re->set_expires_at(expiresAt); - for (const DeckShareItemRecord &item : items) { - ServerInfo_DeckShareItem *itemInfo = re->add_items(); - itemInfo->set_id(item.id); - itemInfo->set_name(item.name.toStdString()); - for (const QString &tag : item.tags) { - itemInfo->add_tags(tag.toStdString()); - } - itemInfo->set_banner_card(item.bannerCard.toStdString()); - itemInfo->set_game_format(item.gameFormat.toStdString()); - itemInfo->set_color_identity(item.colorIdentity.toStdString()); - } - rc.setResponseExtension(re); - - return Response::RespOk; -} - -Response::ResponseCode AbstractServerSocketInterface::cmdDeckShareDownload(const Command_DeckShareDownload &cmd, - ResponseContainer &rc) -{ - if (authState != PasswordRight) { - return Response::RespFunctionNotAllowed; - } - - sqlInterface->checkSql(); - - QString content; - if (!sqlInterface->getDeckShareItem(nameFromStdString(cmd.token()), cmd.item_id(), content)) { - return Response::RespNameNotFound; - } - - Response_DeckShareDownload *re = new Response_DeckShareDownload; - re->set_deck(content.toStdString()); - rc.setResponseExtension(re); - - return Response::RespOk; -} - Response::ResponseCode AbstractServerSocketInterface::cmdReplayList(const Command_ReplayList & /*cmd*/, ResponseContainer &rc) { @@ -1630,13 +1020,12 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReplaySubmitCode(const // MODERATOR FUNCTIONS. // May be called by admins and moderators. Permission is checked by the calling function. Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Command_ViewLogHistory &cmd, - ResponseContainer &rc, - bool allowPrivateChat) + ResponseContainer &rc) { QList messageList; QString userName = nameFromStdString(cmd.user_name()); - QString ipAddress = allowPrivateChat ? nameFromStdString(cmd.ip_address()) : QString(); + QString ipAddress = nameFromStdString(cmd.ip_address()); QString gameName = nameFromStdString(cmd.game_name()); QString gameID = nameFromStdString(cmd.game_id()); QString message = textFromStdString(cmd.message()); @@ -1651,21 +1040,11 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com if (nameFromStdString(cmd.log_location(i)).simplified() == "game") { gameType = true; } - if (nameFromStdString(cmd.log_location(i)).simplified() == "chat" && allowPrivateChat) { + if (nameFromStdString(cmd.log_location(i)).simplified() == "chat") { chatType = true; } } - // For callers that must not see private conversations, never leave the - // target-type filter empty: if the request only asked for "chat" (or for - // nothing at all) the query below would carry no target_type restriction - // and would return every row, private messages included. Fall back to the - // game/room diagnostics the caller is allowed to see. - if (!allowPrivateChat && !gameType && !roomType) { - gameType = true; - roomType = true; - } - int dateRange = cmd.date_range(); int maximumResults = cmd.maximum_results(); @@ -1675,11 +1054,7 @@ Response::ResponseCode AbstractServerSocketInterface::cmdGetLogHistory(const Com QListIterator messageIterator(sqlInterface->getMessageLogHistory( userName, ipAddress, gameName, gameID, message, chatType, gameType, roomType, dateRange, maximumResults)); while (messageIterator.hasNext()) { - ServerInfo_ChatMessage chatMessage = messageIterator.next(); - if (!allowPrivateChat) { - chatMessage.clear_sender_ip(); - } - re->add_log_message()->CopyFrom(chatMessage); + re->add_log_message()->CopyFrom(messageIterator.next()); } } else { ServerInfo_ChatMessage chatMessage; @@ -2268,79 +1643,6 @@ Response::ResponseCode AbstractServerSocketInterface::cmdReportUserInfo(const Co return Response::RespOk; } -Response::ResponseCode AbstractServerSocketInterface::cmdGetServerStats(const Command_GetServerStats & /*cmd */, - ResponseContainer &rc) -{ - if (!sqlInterface->checkSql()) { - return Response::RespInternalError; - } - - // Servatrice::statusUpdate() periodically snapshots server health into the - // uptime table. Serve the freshest snapshot for this server. - const auto snapshot = sqlInterface->getLatestUptimeSnapshot(servatrice->getServerID()); - if (!snapshot.valid) { - // No snapshot yet (fresh server, or statusUpdate() has not ticked). - return Response::RespInternalError; - } - - auto *re = new Response_GetServerStats; - re->set_users_count(snapshot.usersCount); - re->set_mods_count(snapshot.modsCount); - re->set_games_count(snapshot.gamesCount); - re->set_tx_bytes(snapshot.txBytes); - re->set_rx_bytes(snapshot.rxBytes); - re->set_uptime_secs(snapshot.uptimeSecs); - re->set_timest(snapshot.timest); - - // Live metrics from the in-process MetricsRegistry (resets on server restart) - re->set_cards_in_games(static_cast(servatrice->getCardsInGamesTotal())); - re->set_eventloop_stalls_total(static_cast(servatrice->getEventLoopStallsTotal())); - re->set_eventloop_last_stall_ms(static_cast(servatrice->getEventLoopLastStallMs())); - re->set_eventloop_max_stall_ms(static_cast(servatrice->getEventLoopMaxStallMs())); - re->set_total_commands(static_cast(servatrice->getMetricsRegistry().totalCommands())); - re->set_total_command_time_ms( - static_cast(servatrice->getMetricsRegistry().totalTimeMs())); - re->set_active_command_types(servatrice->getMetricsRegistry().activeTypeCount()); - - const auto gameStart = servatrice->getMetricsRegistry().getGameStartSnapshot(); - re->set_game_start_count(static_cast(gameStart.count)); - re->set_game_start_total_ms(static_cast(gameStart.totalMs)); - - // Per-command breakdown: resolve protobuf extension names via the descriptor pool - static const char *messageNames[] = {"SessionCommand", "RoomCommand", "GameCommand", - "ModeratorCommand", "AdminCommand", "DeveloperCommand"}; - const auto activeStats = servatrice->getMetricsRegistry().collectActiveStats(); - for (const auto &stat : activeStats) { - const int kind = stat.typeId / MetricsRegistry::KindStride; - const int number = stat.typeId % MetricsRegistry::KindStride; - - QString label; - if (kind >= 0 && kind < MetricsRegistry::NumKinds) { - const google::protobuf::DescriptorPool *pool = google::protobuf::DescriptorPool::generated_pool(); - const google::protobuf::Descriptor *message = pool->FindMessageTypeByName(messageNames[kind]); - const google::protobuf::FieldDescriptor *extension = - message ? pool->FindExtensionByNumber(message, number) : nullptr; - if (extension) { - label = QString::fromLatin1(MetricsRegistry::KindNames[kind]) + QStringLiteral("/") + - QString::fromStdString(std::string(extension->message_type()->name())); - } - } - if (label.isEmpty()) { - label = QString::number(stat.typeId); - } - - CommandStats *cs = re->add_command_stats(); - cs->set_kind_index(static_cast(kind)); - cs->set_extension_number(static_cast(number)); - cs->set_command_name(label.toStdString()); - cs->set_count(static_cast(stat.count)); - cs->set_total_ms(static_cast(stat.totalMs)); - } - - rc.setResponseExtension(re); - return Response::RespOk; -} - Response::ResponseCode AbstractServerSocketInterface::cmdReportStats(const Command_ReportStats & /*cmd */, ResponseContainer &rc) { @@ -3913,7 +3215,7 @@ bool AbstractServerSocketInterface::removeAdminFlagFromUser(const QString &userN if (user) { Event_ConnectionClosed event; event.set_reason(Event_ConnectionClosed::DEMOTED); - event.set_reason_str("Your moderator, judge, and/or developer status has been revoked."); + event.set_reason_str("Your moderator and/or judge status has been revoked."); event.set_end_time(QDateTime::currentDateTime().toSecsSinceEpoch()); SessionEvent *se = user->prepareSessionEvent(event); @@ -3955,18 +3257,6 @@ Response::ResponseCode AbstractServerSocketInterface::cmdAdjustMod(const Command } } - if (cmd.has_should_be_developer()) { - if (cmd.should_be_developer()) { - if (!addAdminFlagToUser(userName, 8)) { - return Response::RespInternalError; - } - } else { - if (!removeAdminFlagFromUser(userName, 8)) { - return Response::RespInternalError; - } - } - } - return Response::RespOk; } diff --git a/servatrice/src/serversocketinterface.h b/servatrice/src/serversocketinterface.h index 36b900d28..600796b5f 100644 --- a/servatrice/src/serversocketinterface.h +++ b/servatrice/src/serversocketinterface.h @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -45,19 +44,11 @@ class ServerInfo_DeckStorage_Folder; class Command_AddToList; class Command_RemoveFromList; class Command_DeckList; -class Command_DeckListOtherUser; class Command_DeckNewDir; class Command_DeckDelDir; class Command_DeckDel; class Command_DeckDownload; -class Command_DeckDownloadPublic; class Command_DeckUpload; -class Command_DeckSetVisibility; -class Command_DeckShareCreate; -class Command_DeckShareList; -class Command_DeckShareListMine; -class Command_DeckShareRemove; -class Command_DeckShareDownload; class Command_ReplayList; class Command_ReplayDownload; class Command_ReplayModifyMatch; @@ -89,7 +80,6 @@ signals: protected: void logDebugMessage(const QString &message) override; bool tooManyRegistrationAttempts(const QString &ipAddress); - void processCommandContainer(const CommandContainer &cont) override; virtual void writeToSocket(QByteArray &data) = 0; virtual void flushSocket() = 0; @@ -105,16 +95,8 @@ private: Response::ResponseCode cmdRemoveFromList(const Command_RemoveFromList &cmd, ResponseContainer &rc); int getDeckPathId(int basePathId, QStringList path); int getDeckPathId(const QString &path); - bool deckListHelper(int folderId, - ServerInfo_DeckStorage_Folder *folder, - int userId, - bool inheritedPublic, - bool publicOnly); - int getDeckOwnerId(int deckId); - bool isDeckEffectivelyPublic(int deckId); + bool deckListHelper(int folderId, ServerInfo_DeckStorage_Folder *folder); Response::ResponseCode cmdDeckList(const Command_DeckList &cmd, ResponseContainer &rc); - Response::ResponseCode cmdDeckListOtherUser(const Command_DeckListOtherUser &cmd, ResponseContainer &rc); - Response::ResponseCode cmdDeckSetVisibility(const Command_DeckSetVisibility &cmd, ResponseContainer &rc); Response::ResponseCode cmdDeckNewDir(const Command_DeckNewDir &cmd, ResponseContainer &rc); void deckDelDirHelper(int basePathId); void sendServerMessage(const QString userName, const QString message); @@ -123,12 +105,6 @@ private: Response::ResponseCode cmdDeckUpload(const Command_DeckUpload &cmd, ResponseContainer &rc); DeckList *getDeckFromDatabase(int deckId); Response::ResponseCode cmdDeckDownload(const Command_DeckDownload &cmd, ResponseContainer &rc); - Response::ResponseCode cmdDeckDownloadPublic(const Command_DeckDownloadPublic &cmd, ResponseContainer &rc); - Response::ResponseCode cmdDeckShareCreate(const Command_DeckShareCreate &cmd, ResponseContainer &rc); - Response::ResponseCode cmdDeckShareList(const Command_DeckShareList &cmd, ResponseContainer &rc); - Response::ResponseCode cmdDeckShareListMine(const Command_DeckShareListMine &cmd, ResponseContainer &rc); - Response::ResponseCode cmdDeckShareRemove(const Command_DeckShareRemove &cmd, ResponseContainer &rc); - Response::ResponseCode cmdDeckShareDownload(const Command_DeckShareDownload &cmd, ResponseContainer &rc); Response::ResponseCode cmdReplayList(const Command_ReplayList &cmd, ResponseContainer &rc); Response::ResponseCode cmdReplayDownload(const Command_ReplayDownload &cmd, ResponseContainer &rc); Response::ResponseCode cmdReplayModifyMatch(const Command_ReplayModifyMatch &cmd, ResponseContainer &rc); @@ -139,8 +115,7 @@ private: Response::ResponseCode cmdBanFromServer(const Command_BanFromServer &cmd, ResponseContainer &rc); Response::ResponseCode cmdReportList(const Command_ReportList &cmd, ResponseContainer &rc); Response::ResponseCode cmdWarnUser(const Command_WarnUser &cmd, ResponseContainer &rc); - Response::ResponseCode - cmdGetLogHistory(const Command_ViewLogHistory &cmd, ResponseContainer &rc, bool allowPrivateChat); + Response::ResponseCode cmdGetLogHistory(const Command_ViewLogHistory &cmd, ResponseContainer &rc); Response::ResponseCode cmdGetBanHistory(const Command_GetBanHistory &cmd, ResponseContainer &rc); Response::ResponseCode cmdGetWarnList(const Command_GetWarnList &cmd, ResponseContainer &rc); Response::ResponseCode cmdGetWarnHistory(const Command_GetWarnHistory &cmd, ResponseContainer &rc); @@ -176,8 +151,6 @@ private: processExtendedModeratorCommand(int cmdType, const ModeratorCommand &cmd, ResponseContainer &rc) override; Response::ResponseCode processExtendedAdminCommand(int cmdType, const AdminCommand &cmd, ResponseContainer &rc) override; - Response::ResponseCode - processExtendedDeveloperCommand(int cmdType, const DeveloperCommand &cmd, ResponseContainer &rc) override; Response::ResponseCode cmdAccountEdit(const Command_AccountEdit &cmd, ResponseContainer &rc); Response::ResponseCode cmdAccountImage(const Command_AccountImage &cmd, ResponseContainer &rc); @@ -199,8 +172,6 @@ private: Response::ResponseCode cmdResetUserPassword(const Command_ResetUserPassword &cmd, ResponseContainer &rc); Response::ResponseCode cmdRemoveUserAvatar(const Command_RemoveUserAvatar &cmd, ResponseContainer &rc); - Response::ResponseCode cmdGetServerStats(const Command_GetServerStats &cmd, ResponseContainer &rc); - bool addAdminFlagToUser(const QString &user, int flag); bool removeAdminFlagFromUser(const QString &user, int flag); diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 7bb834d7e..29caf257e 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -11,16 +11,12 @@ add_test(NAME playmat_resolver_test COMMAND playmat_resolver_test) add_test(NAME server_card_counter_test COMMAND server_card_counter_test) add_test(NAME server_counter_test COMMAND server_counter_test) add_test(NAME server_rate_limiter_test COMMAND server_rate_limiter_test) -add_test(NAME server_developer_role_test COMMAND server_developer_role_test) -add_test(NAME server_game_join_test COMMAND server_game_join_test) add_test(NAME warning_categories_test COMMAND warning_categories_test) add_test(NAME lag_monitor_test COMMAND lag_monitor_test) add_test(NAME latency_tracker_test COMMAND latency_tracker_test) -add_test(NAME metrics_registry_test COMMAND metrics_registry_test) -add_test(NAME loader_local_matching_test COMMAND loader_local_matching_test) add_test(NAME deck_hash_performance_test COMMAND deck_hash_performance_test) -set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 15) +set_tests_properties(deck_hash_performance_test PROPERTIES TIMEOUT 5) # Find GTest @@ -34,24 +30,10 @@ add_executable(deck_hash_performance_test deck_hash_performance_test.cpp) add_executable(server_card_counter_test server_card_counter_test.cpp) add_executable(server_counter_test server_counter_test.cpp) add_executable(server_rate_limiter_test server_rate_limiter_test.cpp) -add_executable(server_developer_role_test server_developer_role_test.cpp) -add_executable(server_game_join_test server_game_join_test.cpp) add_executable(warning_categories_test warning_categories_test.cpp) add_executable(lag_monitor_test ${CMAKE_SOURCE_DIR}/cockatrice/src/client/lag_monitor.cpp lag_monitor_test.cpp) target_include_directories(lag_monitor_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src) add_executable(latency_tracker_test latency_tracker_test.cpp) -add_executable(metrics_registry_test ../servatrice/src/metrics_registry.cpp metrics_registry_test.cpp) -add_executable( - loader_local_matching_test - ${CMAKE_SOURCE_DIR}/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp - ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/cache_settings.cpp - ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/card_counter_settings.cpp - ${CMAKE_SOURCE_DIR}/cockatrice/src/client/settings/shortcuts_settings.cpp - ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network/update/client/release_channel.cpp - ${VERSION_STRING_CPP} - loader_local_matching_test.cpp -) -target_include_directories(loader_local_matching_test PRIVATE ${CMAKE_SOURCE_DIR}/cockatrice/src) find_package(GTest) @@ -88,13 +70,9 @@ if(NOT GTEST_FOUND) add_dependencies(server_card_counter_test gtest) add_dependencies(server_counter_test gtest) add_dependencies(server_rate_limiter_test gtest) - add_dependencies(server_developer_role_test gtest) - add_dependencies(server_game_join_test gtest) add_dependencies(warning_categories_test gtest) add_dependencies(lag_monitor_test gtest) add_dependencies(latency_tracker_test gtest) - add_dependencies(metrics_registry_test gtest) - add_dependencies(loader_local_matching_test gtest) endif() include_directories(${GTEST_INCLUDE_DIRS}) @@ -126,14 +104,6 @@ target_link_libraries( target_link_libraries( server_rate_limiter_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} ) -target_link_libraries( - server_developer_role_test libcockatrice_network libcockatrice_rng Threads::Threads ${GTEST_BOTH_LIBRARIES} - ${TEST_QT_MODULES} -) -target_link_libraries( - server_game_join_test libcockatrice_network_server_remote libcockatrice_rng Threads::Threads ${GTEST_BOTH_LIBRARIES} - ${TEST_QT_MODULES} -) target_link_libraries( warning_categories_test libcockatrice_utility Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} ) @@ -141,16 +111,9 @@ target_link_libraries(lag_monitor_test Threads::Threads ${GTEST_BOTH_LIBRARIES} target_link_libraries( latency_tracker_test libcockatrice_network Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} ) -target_include_directories(metrics_registry_test PRIVATE ${CMAKE_SOURCE_DIR}/servatrice/src) -target_link_libraries(metrics_registry_test ${TEST_QT_MODULES} Threads::Threads ${GTEST_BOTH_LIBRARIES}) -target_link_libraries( - loader_local_matching_test libcockatrice_settings Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} -) add_subdirectory(card_zone_algorithms) add_subdirectory(carddatabase) -add_subdirectory(deck_list_model) -add_subdirectory(deck_list_zones) add_subdirectory(loading_from_clipboard) add_subdirectory(movecard_tests) add_subdirectory(oracle) diff --git a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp index 8fab42566..cc098cae9 100644 --- a/tests/card_zone_algorithms/card_zone_algorithms_test.cpp +++ b/tests/card_zone_algorithms/card_zone_algorithms_test.cpp @@ -134,35 +134,6 @@ TEST_F(AddCardAlgorithmTest, MidListInsertionPreservesOrder) EXPECT_EQ(knownList.at(2), &b); } -// Reconnecting to a game rebuilds zones from a ServerInfo_Zone. Non-coordinate zones -// (hand, piles, stack) report x == 0 on every card, so inserting each rebuilt card at -// that index would reverse the received server order. Appending (-1) keeps it. -TEST_F(AddCardAlgorithmTest, RebuildInsertAtZeroReversesServerOrder) -{ - MockCard a, b, c; - CardZoneAlgorithms::addCardToList(knownList, &a, 0, false); - CardZoneAlgorithms::addCardToList(knownList, &b, 0, false); - CardZoneAlgorithms::addCardToList(knownList, &c, 0, false); - - EXPECT_EQ(knownList.size(), 3); - EXPECT_EQ(knownList.at(0), &c); - EXPECT_EQ(knownList.at(1), &b); - EXPECT_EQ(knownList.at(2), &a); -} - -TEST_F(AddCardAlgorithmTest, RebuildAppendPreservesServerOrder) -{ - MockCard a, b, c; - CardZoneAlgorithms::addCardToList(knownList, &a, -1, false); - CardZoneAlgorithms::addCardToList(knownList, &b, -1, false); - CardZoneAlgorithms::addCardToList(knownList, &c, -1, false); - - EXPECT_EQ(knownList.size(), 3); - EXPECT_EQ(knownList.at(0), &a); - EXPECT_EQ(knownList.at(1), &b); - EXPECT_EQ(knownList.at(2), &c); -} - TEST_F(AddCardAlgorithmTest, KeepAnnotationsFalsePassedThrough) { MockCard card; diff --git a/tests/carddatabase/carddatabase_test.cpp b/tests/carddatabase/carddatabase_test.cpp index 392f6395a..3fa0e3834 100644 --- a/tests/carddatabase/carddatabase_test.cpp +++ b/tests/carddatabase/carddatabase_test.cpp @@ -2,14 +2,9 @@ #include "test_card_database_path_provider.h" #include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include #include #include + namespace { @@ -38,49 +33,6 @@ TEST(CardDatabaseTest, LoadXml) ASSERT_EQ(0, db->query()->getAllMainCardTypes().size()) << "Types not empty after clear"; ASSERT_EQ(NotLoaded, db->getLoadStatus()) << "Incorrect status after clear"; } - -TEST(CardDatabaseTest, Xml4LocalizedDataRoundTrip) -{ - NoopCardSetPriorityController controller; - CardSetPtr set = - CardSet::newInstance(&controller, "TST", "Test Set", "expansion", QDate(), CardSet::PriorityPrimary); - - QHash props; - props["manacost"] = "1R"; - PrintingInfo printing(set, LazyPropertiesHash(props)); - SetToPrintingsMap setsInfo; - setsInfo["TST"].append(printing); - - CardInfo::UiAttributes attributes = {.tableRow = 1}; - CardInfoPtr card = - CardInfo::newInstance("Lightning Bolt", "Deal 3 damage.", false, {}, {}, {}, setsInfo, attributes); - card->setLocalizedName("de", "Blitzschlag"); - card->setLocalizedText("de", "Blitzschlag fügt 3 Schadenspunkte zu."); - - SetNameMap sets; - sets.insert("TST", set); - CardNameMap cards; - cards.insert("Lightning Bolt", card); - - QTemporaryDir tempDir; - const QString fileName = tempDir.filePath("cards.xml"); - NoopCardPreferenceProvider prefProvider; - CockatriceXml4Parser writer(&prefProvider, &controller); - ASSERT_TRUE(writer.saveToFile({}, sets, cards, fileName)); - - CardDatabaseData data; - CockatriceXml4Parser parser(&prefProvider, &controller); - QFile file(fileName); - ASSERT_TRUE(file.open(QIODevice::ReadOnly)); - parser.parseFileInto(file, data); - - CardInfoPtr loaded = data.cards.value("Lightning Bolt"); - ASSERT_FALSE(loaded.isNull()); - ASSERT_EQ(loaded->getName(), "Lightning Bolt"); - ASSERT_EQ(loaded->getLocalizedName("de"), "Blitzschlag"); - ASSERT_EQ(loaded->getLocalizedText("de"), "Blitzschlag fügt 3 Schadenspunkte zu."); - ASSERT_EQ(loaded->getLocalizedText("fr"), "Deal 3 damage."); -} } // namespace int main(int argc, char **argv) diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp index dcf1cf0a2..c6d68be1f 100644 --- a/tests/carddatabase/filter_string_test.cpp +++ b/tests/carddatabase/filter_string_test.cpp @@ -2,9 +2,6 @@ #include "test_card_database_path_provider.h" #include "gtest/gtest.h" -#include -#include -#include #include #include #include @@ -74,142 +71,10 @@ QUERY(Color2, cat, "c:gw", true) QUERY(Color3, cat, "c!g", true) QUERY(Color4, cat, "c!gw", false) -QUERY(SetCodeCaseInsensitive1, cat, "set:cat", true) -QUERY(SetCodeCaseInsensitive2, cat, "set:CAT", true) -QUERY(SetCodeCaseInsensitive3, cat, "set:CAt", true) -QUERY(SetCodeShortForm, cat, "e:cat", true) -QUERY(SetCodeWrongSet, cat, "set:who", false) -QUERY(SetCodeWrongSet2, doctor, "set:cat", false) - QUERY(BracketNextToUnquotedString, cat, "(o:woof OR o:meow)", true) -CardInfoPtr localizedCat() -{ - CardInfoPtr localized = CardInfo::newInstance("Cat", "Meow!", false, {}, {}, {}, {}, {}); - localized->setLocalizedName("de", "Kater"); - localized->setLocalizedText("de", "miaut"); - return localized; -} - -TEST_F(CardQuery, SearchLanguageEnglishMatchesOnlyEnglish) -{ - const CardData localized = localizedCat(); - ASSERT_TRUE(FilterString("Cat", CardSearchLanguage{"de", SearchLanguageMode::English}).check(localized)); - ASSERT_FALSE(FilterString("Kater", CardSearchLanguage{"de", SearchLanguageMode::English}).check(localized)); -} - -TEST_F(CardQuery, SearchLanguageSelectedMatchesLocalizedNameAndText) -{ - const CardData localized = localizedCat(); - ASSERT_TRUE(FilterString("Kater", CardSearchLanguage{"de", SearchLanguageMode::Selected}).check(localized)); - ASSERT_TRUE(FilterString("o:miaut", CardSearchLanguage{"de", SearchLanguageMode::Selected}).check(localized)); - ASSERT_FALSE(FilterString("Cat", CardSearchLanguage{"de", SearchLanguageMode::Selected}).check(localized)); -} - -TEST_F(CardQuery, SearchLanguageSelectedFallsBackToEnglishForUntranslatedCards) -{ - const CardData localized = localizedCat(); - ASSERT_TRUE(FilterString("Cat", CardSearchLanguage{"fr", SearchLanguageMode::Selected}).check(localized)); - ASSERT_FALSE(FilterString("Kater", CardSearchLanguage{"fr", SearchLanguageMode::Selected}).check(localized)); -} - -TEST_F(CardQuery, SearchLanguageBothMatchesEitherLanguage) -{ - const CardData localized = localizedCat(); - ASSERT_TRUE(FilterString("Cat", CardSearchLanguage{"de", SearchLanguageMode::Both}).check(localized)); - ASSERT_TRUE(FilterString("Kater", CardSearchLanguage{"de", SearchLanguageMode::Both}).check(localized)); -} - -TEST_F(CardQuery, SearchLanguageIsBoundPerInstance) -{ - const CardData localized = localizedCat(); - - FilterString germanQuery("Kater", CardSearchLanguage{"de", SearchLanguageMode::Selected}); - ASSERT_TRUE(germanQuery.check(localized)); - - // Constructing an English-bound instance afterwards must not change the - // language the earlier instance searches in. - FilterString englishQuery("Kater", CardSearchLanguage{"", SearchLanguageMode::English}); - ASSERT_FALSE(englishQuery.check(localized)); - ASSERT_TRUE(germanQuery.check(localized)); -} - } // namespace -class SetQuery : public ::testing::Test -{ -protected: - void SetUp() override - { - // EOE and EOC share a release date, like a set and its Commander counterpart. - const QDate sharedReleaseDate(2026, 3, 13); - mainSet = CardSet::newInstance(&controller, "EOE", "Edge of Eternities", "expansion", sharedReleaseDate, - CardSet::PriorityPrimary); - commanderSet = CardSet::newInstance(&controller, "EOC", "Edge of Eternities Commander", "commander", - sharedReleaseDate, CardSet::PrioritySecondary); - oldSet = CardSet::newInstance(&controller, "OLD", "Older Set", "expansion", QDate(2020, 1, 1), - CardSet::PriorityPrimary); - - inBothSets = newCardWithPrintings({{"EOE", mainSet}, {"EOC", commanderSet}}); - onlyInCommanderSet = newCardWithPrintings({{"EOC", commanderSet}}); - onlyInOldSet = newCardWithPrintings({{"OLD", oldSet}}); - - // SetExpression resolves set codes to release dates through the global set list. - auto *database = CardDatabaseManager::getInstance(); - database->addSet(mainSet); - database->addSet(commanderSet); - database->addSet(oldSet); - } - - CardInfoPtr newCardWithPrintings(const QList> &printings) - { - SetToPrintingsMap setsInfo; - for (const auto &printing : printings) { - setsInfo[printing.first].append(PrintingInfo(printing.second)); - } - return CardInfo::newInstance("Test Card", "", false, {}, {}, {}, setsInfo, CardInfo::UiAttributes()); - } - - NoopCardSetPriorityController controller; - CardSetPtr mainSet; - CardSetPtr commanderSet; - CardSetPtr oldSet; - CardInfoPtr inBothSets; - CardInfoPtr onlyInCommanderSet; - CardInfoPtr onlyInOldSet; -}; - -TEST_F(SetQuery, ExactMatchSeparatesSameDaySets) -{ - EXPECT_TRUE(FilterString("set:EOE").check(inBothSets)); - EXPECT_TRUE(FilterString("e:EOE").check(inBothSets)); - EXPECT_TRUE(FilterString("set:EOC").check(inBothSets)); - EXPECT_FALSE(FilterString("set:EOE").check(onlyInCommanderSet)); - EXPECT_TRUE(FilterString("set:EOC").check(onlyInCommanderSet)); -} - -TEST_F(SetQuery, ExactMatchIsCaseInsensitive) -{ - EXPECT_TRUE(FilterString("set:eoe").check(inBothSets)); - EXPECT_TRUE(FilterString("set:EoE").check(inBothSets)); - EXPECT_FALSE(FilterString("set:eoe").check(onlyInCommanderSet)); -} - -TEST_F(SetQuery, NotEqualsMatchesPrintingsOutsideTheSet) -{ - EXPECT_FALSE(FilterString("set!EOE").check(inBothSets)); - EXPECT_TRUE(FilterString("set!EOE").check(onlyInCommanderSet)); -} - -TEST_F(SetQuery, ComparisonMatchesByReleaseDate) -{ - // OLD (2020) predates EOE/EOC (2026-03-13), so comparison operators still use release dates. - EXPECT_TRUE(FilterString("setEOE").check(onlyInOldSet)); - EXPECT_TRUE(FilterString("set>=EOE").check(inBothSets)); - EXPECT_FALSE(FilterString("set -#include -#include -#include - -namespace -{ - -DecklistModelCardNode *cardNode(InnerDecklistNode *parent, const QString &name, int number) -{ - // The underlying data node is detached; only the model wrapper is attached to the shadow tree. - auto *data = new DecklistCardNode(name, number, nullptr); - return new DecklistModelCardNode(data, parent); -} - -QStringList childNames(const InnerDecklistNode *node) -{ - QStringList names; - for (int i = 0; i < node->size(); ++i) { - names.append(node->at(i)->getName()); - } - return names; -} - -} // namespace - -// ===================================================================================================================== -// isCustomZone -// ===================================================================================================================== - -TEST(DeckListModelCustomZones, IsCustomZoneDistinguishesZoneFromGroup) -{ - InnerDecklistNode root; - auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root); - auto *group = new InnerDecklistNode("Creature", board); - auto *zone = new DecklistModelSubZoneNode("Removal", board); - - auto *card = cardNode(group, "A", 1); - - EXPECT_FALSE(DeckListModelCustomZones::isCustomZone(board)); - EXPECT_FALSE(DeckListModelCustomZones::isCustomZone(group)); - EXPECT_FALSE(DeckListModelCustomZones::isCustomZone(card)); - EXPECT_TRUE(DeckListModelCustomZones::isCustomZone(zone)); -} - -// ===================================================================================================================== -// findSubZoneByName -// ===================================================================================================================== - -TEST(DeckListModelCustomZones, FindSubZoneByNameFindsAcrossBoards) -{ - InnerDecklistNode root; - auto *main = new InnerDecklistNode(DECK_ZONE_MAIN, &root); - auto *side = new InnerDecklistNode(DECK_ZONE_SIDE, &root); - new DecklistModelSubZoneNode("Removal", main); - new DecklistModelSubZoneNode("Utility", side); - new InnerDecklistNode("Plain", main); // not a custom zone - - auto *removal = DeckListModelCustomZones::findSubZoneByName(&root, "Removal"); - ASSERT_NE(removal, nullptr); - EXPECT_EQ(removal->getName(), QString("Removal")); - - auto *utility = DeckListModelCustomZones::findSubZoneByName(&root, "Utility"); - ASSERT_NE(utility, nullptr); - EXPECT_EQ(utility->getName(), QString("Utility")); - - // Names are deck-unique; a plain group or built-in board is not matched. - EXPECT_EQ(DeckListModelCustomZones::findSubZoneByName(&root, "Plain"), nullptr); - EXPECT_EQ(DeckListModelCustomZones::findSubZoneByName(&root, DECK_ZONE_MAIN), nullptr); - EXPECT_EQ(DeckListModelCustomZones::findSubZoneByName(&root, "Missing"), nullptr); -} - -// ===================================================================================================================== -// mirrorCustomZones -// ===================================================================================================================== - -TEST(DeckListModelCustomZones, MirrorCustomZonesCopiesCardsFlat) -{ - // Deck-tree board zone: one direct card plus one nested custom zone. - auto *deckBoard = new InnerDecklistNode(DECK_ZONE_MAIN); - new DecklistCardNode("Direct", 2, deckBoard); - - auto *deckZone = new InnerDecklistNode("Removal", deckBoard); - auto *deckCard1 = new DecklistCardNode("Bolt", 3, deckZone); - auto *deckCard2 = new DecklistCardNode("Swords", 1, deckZone); - - InnerDecklistNode shadowRoot; - auto *shadowBoard = new InnerDecklistNode(DECK_ZONE_MAIN, &shadowRoot); - - DeckListModelCustomZones::mirrorCustomZones(deckBoard, shadowBoard); - - // Only the custom zone is mirrored as a sub-zone; the direct card is not. - ASSERT_EQ(shadowBoard->size(), 1); - auto *shadowZone = dynamic_cast(shadowBoard->at(0)); - ASSERT_NE(shadowZone, nullptr); - EXPECT_EQ(shadowZone->getName(), QString("Removal")); - - // Cards live flat (un-grouped) inside the mirrored zone, wrapping the same data nodes. - ASSERT_EQ(shadowZone->size(), 2); - auto *shadowCard1 = dynamic_cast(shadowZone->at(0)); - auto *shadowCard2 = dynamic_cast(shadowZone->at(1)); - ASSERT_NE(shadowCard1, nullptr); - ASSERT_NE(shadowCard2, nullptr); - EXPECT_EQ(shadowCard1->getDataNode(), deckCard1); - EXPECT_EQ(shadowCard2->getDataNode(), deckCard2); -} - -TEST(DeckListModelCustomZones, MirrorCustomZonesWithNoCustomZonesIsNoop) -{ - // A board zone with only direct cards has nothing to mirror. - auto *deckBoard = new InnerDecklistNode(DECK_ZONE_MAIN); - new DecklistCardNode("Direct", 2, deckBoard); - - InnerDecklistNode shadowRoot; - auto *shadowBoard = new InnerDecklistNode(DECK_ZONE_MAIN, &shadowRoot); - - DeckListModelCustomZones::mirrorCustomZones(deckBoard, shadowBoard); - EXPECT_EQ(shadowBoard->size(), 0); -} - -TEST(DeckListModelCustomZones, MirrorCustomZonesFlattensNestedSubzones) -{ - // Cards deeper than one level under a custom zone still get a model row. - auto *deckBoard = new InnerDecklistNode(DECK_ZONE_MAIN); - auto *deckZone = new InnerDecklistNode("Removal", deckBoard); - auto *deckCard1 = new DecklistCardNode("Bolt", 1, deckZone); - auto *deeper = new InnerDecklistNode("Deeper", deckZone); - auto *deckCard2 = new DecklistCardNode("Swords", 1, deeper); - - InnerDecklistNode shadowRoot; - auto *shadowBoard = new InnerDecklistNode(DECK_ZONE_MAIN, &shadowRoot); - - DeckListModelCustomZones::mirrorCustomZones(deckBoard, shadowBoard); - - ASSERT_EQ(shadowBoard->size(), 1); - auto *shadowZone = dynamic_cast(shadowBoard->at(0)); - ASSERT_NE(shadowZone, nullptr); - EXPECT_EQ(shadowZone->getName(), QString("Removal")); - - // Both cards are flattened into the mirrored zone, preserving order. - ASSERT_EQ(shadowZone->size(), 2); - auto *shadowCard1 = dynamic_cast(shadowZone->at(0)); - auto *shadowCard2 = dynamic_cast(shadowZone->at(1)); - ASSERT_NE(shadowCard1, nullptr); - ASSERT_NE(shadowCard2, nullptr); - EXPECT_EQ(shadowCard1->getDataNode(), deckCard1); - EXPECT_EQ(shadowCard2->getDataNode(), deckCard2); -} - -// ===================================================================================================================== -// findGroupChild -// ===================================================================================================================== - -TEST(DeckListModelCustomZones, FindGroupChildSkipsCustomZones) -{ - InnerDecklistNode root; - auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root); - auto *group = new InnerDecklistNode("Creature", board); - new DecklistModelSubZoneNode("Creature", board); - - EXPECT_EQ(DeckListModelCustomZones::findGroupChild(board, "Creature"), group); - EXPECT_EQ(DeckListModelCustomZones::findGroupChild(board, "Missing"), nullptr); - EXPECT_EQ(DeckListModelCustomZones::findGroupChild(&root, DECK_ZONE_MAIN), board); -} - -// ===================================================================================================================== -// sortWithCustomZonesLast -// ===================================================================================================================== - -TEST(DeckListModelCustomZones, SortBoardKeepsCustomZonesAfterGroupsAscending) -{ - InnerDecklistNode root; - auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root); - new DecklistModelSubZoneNode("Zebra", board); - new InnerDecklistNode("Creature", board); - new InnerDecklistNode("Instant", board); - new DecklistModelSubZoneNode("Alpha", board); - - root.setSortMethod(DeckSortMethod::ByName); - - auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::AscendingOrder); - - // Groups sort first (by name), then custom zones (by name), always after groups. - EXPECT_EQ(childNames(board), (QStringList{"Creature", "Instant", "Alpha", "Zebra"})); - - // Some non-identity movement occurred. - EXPECT_FALSE(mapping.isEmpty()); -} - -TEST(DeckListModelCustomZones, SortBoardKeepsCustomZonesAfterGroupsDescending) -{ - InnerDecklistNode root; - auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root); - new DecklistModelSubZoneNode("Zebra", board); - new InnerDecklistNode("Creature", board); - new InnerDecklistNode("Instant", board); - new DecklistModelSubZoneNode("Alpha", board); - - root.setSortMethod(DeckSortMethod::ByName); - - (void)DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::DescendingOrder); - - // Groups still lead (descending), custom zones still last. - EXPECT_EQ(childNames(board), (QStringList{"Instant", "Creature", "Zebra", "Alpha"})); -} - -TEST(DeckListModelCustomZones, SortBoardMappingIsConsistent) -{ - InnerDecklistNode root; - auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root); - - QList originalOrder; - auto *g0 = new InnerDecklistNode("Creature", board); - originalOrder.append(g0); - auto *z0 = new DecklistModelSubZoneNode("Zebra", board); - originalOrder.append(z0); - auto *g1 = new InnerDecklistNode("Instant", board); - originalOrder.append(g1); - auto *z1 = new DecklistModelSubZoneNode("Alpha", board); - originalOrder.append(z1); - - root.setSortMethod(DeckSortMethod::ByName); - - auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(&root, board, Qt::AscendingOrder); - - // The mapping reports, for each final row, the original row of the node now sitting there. - ASSERT_EQ(mapping.size(), board->size()); - for (const auto &move : mapping) { - const int preSortRow = move.first; - const int finalRow = move.second; - ASSERT_GE(preSortRow, 0); - ASSERT_LT(preSortRow, originalOrder.size()); - EXPECT_EQ(board->at(finalRow), originalOrder[preSortRow]) << "row " << finalRow; - } - - // Final order sanity: groups first in name order, then custom zones. - EXPECT_EQ(childNames(board), (QStringList{"Creature", "Instant", "Alpha", "Zebra"})); -} - -TEST(DeckListModelCustomZones, SortPlainNodeDoesNotReorderCustomZones) -{ - // A non-board node (e.g. a group whose children are cards) is sorted plainly; - // custom zones are not a special case there. Cards sort by name. - InnerDecklistNode root; - auto *board = new InnerDecklistNode(DECK_ZONE_MAIN, &root); - auto *group = new InnerDecklistNode("Creature", board); - cardNode(group, "Swords", 1); - cardNode(group, "Bolt", 3); - - root.setSortMethod(DeckSortMethod::ByName); - - auto mapping = DeckListModelCustomZones::sortWithCustomZonesLast(&root, group, Qt::AscendingOrder); - EXPECT_EQ(childNames(group), (QStringList{"Bolt", "Swords"})); - ASSERT_EQ(mapping.size(), 2); - EXPECT_EQ(mapping[0].first, 1); // "Bolt" was originally at row 1 - EXPECT_EQ(mapping[0].second, 0); - EXPECT_EQ(mapping[1].first, 0); - EXPECT_EQ(mapping[1].second, 1); -} - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/deck_list_model/deck_list_model_zone_integration_test.cpp b/tests/deck_list_model/deck_list_model_zone_integration_test.cpp deleted file mode 100644 index a4562c95d..000000000 --- a/tests/deck_list_model/deck_list_model_zone_integration_test.cpp +++ /dev/null @@ -1,283 +0,0 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ - -int totalCustomZoneRows(const DeckListModel &model) -{ - int count = 0; - const int rootRows = model.rowCount(QModelIndex()); - for (int r = 0; r < rootRows; ++r) { - const QModelIndex board = model.index(r, 0, QModelIndex()); - const int childRows = model.rowCount(board); - for (int c = 0; c < childRows; ++c) { - const QModelIndex child = model.index(c, 0, board); - if (child.data(DeckRoles::IsCustomZoneRole).toBool()) { - ++count; - } - } - } - return count; -} - -QModelIndex findBoardIndex(const DeckListModel &model, const QString &boardName) -{ - for (int r = 0; r < model.rowCount(QModelIndex()); ++r) { - const QModelIndex idx = model.index(r, 0, QModelIndex()); - if (idx.data(DeckRoles::IsCardRole).toBool()) { - continue; - } - const QString name = idx.sibling(idx.row(), DeckListModelColumns::CARD_NAME).data(Qt::EditRole).toString(); - if (name == boardName) { - return idx; - } - } - return {}; -} - -QModelIndex findZoneRow(const DeckListModel &model, const QModelIndex &board) -{ - for (int r = 0; r < model.rowCount(board); ++r) { - const QModelIndex child = model.index(r, 0, board); - if (child.data(DeckRoles::IsCustomZoneRole).toBool()) { - return child; - } - } - return {}; -} - -} // namespace - -// The "Add to Zone" combobox/submenu lists getCustomZoneNames(), which reads the -// deck tree. These verify the source data a freshly-created zone populates. - -TEST(DeckListModelZoneIntegration, CreateZoneThenReadCustomZoneNames) -{ - QSharedPointer deck(new DeckList()); - DeckListModel model(nullptr, deck); - auto *tree = deck->getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - EXPECT_EQ(model.getCustomZoneNames(DECK_ZONE_MAIN), (QStringList{"Removal"})); -} - -TEST(DeckListModelZoneIntegration, CreateTwoZonesThenReadBoth) -{ - QSharedPointer deck(new DeckList()); - DeckListModel model(nullptr, deck); - auto *tree = deck->getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Utility"), nullptr); - EXPECT_EQ(model.getCustomZoneNames(DECK_ZONE_MAIN), (QStringList{"Removal", "Utility"})); -} - -// Mirroring regression: rebuildTree must mirror each custom zone exactly once. -TEST(DeckListModelZoneIntegration, RebuildTreeMirrorsEachZoneOnce) -{ - QSharedPointer deck(new DeckList()); - DeckListModel model(nullptr, deck); - auto *tree = deck->getTree(); - - // One direct mainboard card plus two nested custom zones. - tree->addCard("Lightning Bolt", 2, DECK_ZONE_MAIN, -1); - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - tree->addCard("Swords to Plowshares", 1, "Removal", -1); - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Utility"), nullptr); - - model.rebuildTree(); - - EXPECT_EQ(model.getCustomZoneNames(DECK_ZONE_MAIN), (QStringList{"Removal", "Utility"})); - EXPECT_EQ(totalCustomZoneRows(model), 2); -} - -// ===================================================================================================================== -// Model behaviour: addCard routing, findCard lookup, removeRows guard, empty-zone survival. -// ===================================================================================================================== - -TEST(DeckListModelZoneIntegration, AddCardRoutesIntoMirroredCustomZone) -{ - QSharedPointer deck(new DeckList()); - DeckListModel model(nullptr, deck); - auto *tree = deck->getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - model.rebuildTree(); - - QModelIndex added = model.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), "Removal"); - ASSERT_TRUE(added.isValid()); - - // The card is a direct child of the mirrored custom zone, not a new top-level zone. - const QModelIndex zoneParent = added.parent(); - ASSERT_TRUE(zoneParent.isValid()); - EXPECT_TRUE(zoneParent.data(DeckRoles::IsCustomZoneRole).toBool()); - EXPECT_EQ(zoneParent.sibling(zoneParent.row(), DeckListModelColumns::CARD_NAME).data(Qt::DisplayRole).toString(), - QString("Removal")); - - // No "Removal" top-level zone appeared in the deck tree. - auto *listRoot = tree->getRoot(); - bool topLevelRemoval = false; - for (int i = 0; i < listRoot->size(); ++i) { - if (auto *zone = dynamic_cast(listRoot->at(i))) { - topLevelRemoval |= zone->getName() == "Removal"; - } - } - EXPECT_FALSE(topLevelRemoval); -} - -TEST(DeckListModelZoneIntegration, AddCardToUnmirroredCustomZoneRebuildsNotCreatesTopLevel) -{ - QSharedPointer deck(new DeckList()); - DeckListModel model(nullptr, deck); - auto *tree = deck->getTree(); - - // The zone exists on the deck tree but the shadow tree has never mirrored it. - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - - QModelIndex added = model.addCard(ExactCard(CardInfo::newInstance("Lightning Bolt")), "Removal"); - ASSERT_TRUE(added.isValid()); - - const QModelIndex zoneParent = added.parent(); - ASSERT_TRUE(zoneParent.isValid()); - EXPECT_TRUE(zoneParent.data(DeckRoles::IsCustomZoneRole).toBool()); - EXPECT_EQ(zoneParent.sibling(zoneParent.row(), DeckListModelColumns::CARD_NAME).data(Qt::DisplayRole).toString(), - QString("Removal")); -} - -TEST(DeckListModelZoneIntegration, AddCardCreatesGroupSeparatelyFromSameNamedZone) -{ - QSharedPointer deck(new DeckList()); - DeckListModel model(nullptr, deck); - auto *tree = deck->getTree(); - - // A custom zone named exactly like a grouping criterion. - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Creature"), nullptr); - model.rebuildTree(); - - CardInfoPtr bear = CardInfo::newInstance("Grizzly Bears"); - bear->setProperty(Mtg::MainCardType, "Creature"); - - QModelIndex added = model.addCard(ExactCard(bear), DECK_ZONE_MAIN); - ASSERT_TRUE(added.isValid()); - - // The card lands in a *group* node called "Creature", not swallowed by the custom zone. - const QModelIndex groupParent = added.parent(); - ASSERT_TRUE(groupParent.isValid()); - EXPECT_FALSE(groupParent.data(DeckRoles::IsCustomZoneRole).toBool()); - EXPECT_EQ(groupParent.sibling(groupParent.row(), DeckListModelColumns::CARD_NAME).data(Qt::DisplayRole).toString(), - QString("Creature")); - - // The board keeps both rows: the "Creature" group and the "Creature" custom zone. - const QModelIndex boardIndex = groupParent.parent(); - ASSERT_TRUE(boardIndex.isValid()); - EXPECT_EQ(model.rowCount(boardIndex), 2); -} - -TEST(DeckListModelZoneIntegration, FindCardResolvesCardInsideCustomZone) -{ - QSharedPointer deck(new DeckList()); - DeckListModel model(nullptr, deck); - auto *tree = deck->getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - model.rebuildTree(); - - // findCard resolves through the card database; register the card we add. - const QString cardName = "Swords to Plowshares"; - CardInfoPtr info = CardInfo::newInstance(cardName); - CardDatabaseManager::getInstance()->addCard(info); - - QModelIndex added = model.addCard(ExactCard(info), "Removal"); - ASSERT_TRUE(added.isValid()); - - QModelIndex found = model.findCard(cardName, "Removal"); - EXPECT_TRUE(found.isValid()); - EXPECT_EQ(found, added); -} - -TEST(DeckListModelZoneIntegration, RemoveRowsRefusesCustomZoneRow) -{ - QSharedPointer deck(new DeckList()); - DeckListModel model(nullptr, deck); - auto *tree = deck->getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - tree->addCard("Lightning Bolt", 2, DECK_ZONE_MAIN, -1); - model.rebuildTree(); - - const QModelIndex mainIndex = findBoardIndex(model, DECK_ZONE_MAIN); - ASSERT_TRUE(mainIndex.isValid()); - const QModelIndex zoneRow = findZoneRow(model, mainIndex); - ASSERT_TRUE(zoneRow.isValid()); - - EXPECT_FALSE(model.removeRow(zoneRow.row(), zoneRow.parent())); - EXPECT_EQ(model.rowCount(mainIndex), 2); // the zone survives, alongside the card group -} - -TEST(DeckListModelZoneIntegration, EmptyCustomZoneSurvivesMirrorAndPruning) -{ - QSharedPointer deck(new DeckList()); - DeckListModel model(nullptr, deck); - auto *tree = deck->getTree(); - - // An empty custom zone must be mirrored (the stack deliberately keeps it alive). - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - model.rebuildTree(); - - const QModelIndex mainIndex = findBoardIndex(model, DECK_ZONE_MAIN); - ASSERT_TRUE(mainIndex.isValid()); - EXPECT_EQ(model.rowCount(mainIndex), 1); - EXPECT_TRUE(findZoneRow(model, mainIndex).isValid()); -} - -// Regression: a board card named like the requested zone must not be mistaken for -// a zone. Previously `findChild` matched any child by name, so a mainboard card -// called "Lightning Bolt" made addCard believe a "Lightning Bolt" zone existed and -// recurse through rebuildTree forever. -TEST(DeckListModelZoneIntegration, AddCardToCardNamedZoneDoesNotRecurse) -{ - QSharedPointer deck(new DeckList()); - DeckListModel model(nullptr, deck); - auto *tree = deck->getTree(); - - tree->addCard("Lightning Bolt", 2, DECK_ZONE_MAIN, -1); - - QModelIndex added = model.addCard(ExactCard(CardInfo::newInstance("Swords to Plowshares")), "Lightning Bolt"); - ASSERT_TRUE(added.isValid()); -} - -// Regression: adding to a custom zone that holds a nested sub-zone mirrored the -// nested cards as flattened shadow rows, so the sorted shadow row index pointed -// past the deck zone's direct children. The card must be appended to the deck -// zone instead of being written out of range. -TEST(DeckListModelZoneIntegration, AddCardToCustomZoneWithNestedSubZoneAppends) -{ - QSharedPointer deck(new DeckList()); - DeckListModel model(nullptr, deck); - auto *tree = deck->getTree(); - - auto *removal = tree->addCustomZone(DECK_ZONE_MAIN, "Removal"); - ASSERT_NE(removal, nullptr); - auto *deeper = new InnerDecklistNode("Deeper", removal); - new DecklistCardNode("Lightning Bolt", 2, deeper, -1); - model.rebuildTree(); - - QModelIndex added = model.addCard(ExactCard(CardInfo::newInstance("Swords to Plowshares")), "Removal"); - ASSERT_TRUE(added.isValid()); - ASSERT_TRUE(added.parent().data(DeckRoles::IsCustomZoneRole).toBool()); -} - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/deck_list_zones/CMakeLists.txt b/tests/deck_list_zones/CMakeLists.txt deleted file mode 100644 index 0710be94d..000000000 --- a/tests/deck_list_zones/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -add_executable(deck_list_zones_test deck_list_zones_test.cpp) - -if(NOT GTEST_FOUND) - add_dependencies(deck_list_zones_test gtest) -endif() - -target_link_libraries( - deck_list_zones_test libcockatrice_deck_list Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES} -) -add_test(NAME deck_list_zones_test COMMAND deck_list_zones_test) diff --git a/tests/deck_list_zones/deck_list_zones_test.cpp b/tests/deck_list_zones/deck_list_zones_test.cpp deleted file mode 100644 index 801f226a9..000000000 --- a/tests/deck_list_zones/deck_list_zones_test.cpp +++ /dev/null @@ -1,392 +0,0 @@ -/** - * @file deck_list_zones_test.cpp - * @brief Tests for custom deck zones (deck-unique zones nested under a board zone). - * - * Custom zones allow players to organize cards within a board (e.g. "Removal" under - * the mainboard) without changing the board semantics: cards in a custom zone under - * "main" are still mainboard cards for hashing, sideboard size, legality and export. - */ - -#include -#include -#include -#include -#include -#include - -namespace -{ - -/** - * @brief Collects (board zone name, card node) pairs via forEachCard. - */ -struct BoardCardPair -{ - QString boardZone; - QString cardName; - int amount; -}; - -QList collectBoardCardPairs(const DeckList &deck) -{ - QList result; - deck.forEachCard([&result](InnerDecklistNode *boardZone, DecklistCardNode *card) { - result.append({boardZone->getName(), card->getName(), card->getNumber()}); - }); - return result; -} - -bool hasPair(const QList &pairs, const QString &boardZone, const QString &cardName) -{ - for (const auto &pair : pairs) { - if (pair.boardZone == boardZone && pair.cardName == cardName) { - return true; - } - } - return false; -} - -int totalCards(const QList &pairs) -{ - int total = 0; - for (const auto &pair : pairs) { - total += pair.amount; - } - return total; -} - -} // namespace - -// ===================================================================================================================== -// Zone creation -// ===================================================================================================================== - -TEST(DeckListZones, AddCustomZoneNestsUnderBoard) -{ - DeckList deck; - auto *tree = deck.getTree(); - - auto *zone = tree->addCustomZone(DECK_ZONE_MAIN, "Removal"); - ASSERT_NE(zone, nullptr); - EXPECT_EQ(zone->getName(), QString("Removal")); - ASSERT_NE(zone->getParent(), nullptr); - EXPECT_EQ(zone->getParent()->getName(), QString(DECK_ZONE_MAIN)); - - // The custom zone is nested, not a new top-level zone. - auto topLevelZones = tree->getZoneNodes(); - QStringList topLevelNames; - for (auto *node : topLevelZones) { - topLevelNames.append(node->getName()); - } - EXPECT_FALSE(topLevelNames.contains("Removal")); - - // It is discoverable through the board zone. - auto customZones = tree->getCustomZones(DECK_ZONE_MAIN); - ASSERT_EQ(customZones.size(), 1); - EXPECT_EQ(customZones.first()->getName(), QString("Removal")); -} - -TEST(DeckListZones, CustomZoneNamesAreDeckUnique) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - // Same name on a different board is rejected. - EXPECT_EQ(tree->addCustomZone(DECK_ZONE_SIDE, "Removal"), nullptr); - // A name that collides with a built-in board zone is rejected. - EXPECT_EQ(tree->addCustomZone(DECK_ZONE_MAIN, DECK_ZONE_MAIN), nullptr); - EXPECT_EQ(tree->addCustomZone(DECK_ZONE_MAIN, DECK_ZONE_SIDE), nullptr); - EXPECT_EQ(tree->addCustomZone(DECK_ZONE_MAIN, DECK_ZONE_MAYBEBOARD), nullptr); - EXPECT_EQ(tree->addCustomZone(DECK_ZONE_MAIN, DECK_ZONE_TOKENS), nullptr); -} - -TEST(DeckListZones, AddCustomZoneUnknownBoardFails) -{ - DeckList deck; - auto *tree = deck.getTree(); - - EXPECT_EQ(tree->addCustomZone("not_a_board", "Removal"), nullptr); -} - -TEST(DeckListZones, MaybeboardIsLazilyCreated) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAYBEBOARD, "Candidates"), nullptr); - - // The maybeboard board zone now exists, with the custom zone nested inside. - auto customZones = tree->getCustomZones(DECK_ZONE_MAYBEBOARD); - ASSERT_EQ(customZones.size(), 1); - EXPECT_EQ(customZones.first()->getName(), QString("Candidates")); -} - -// ===================================================================================================================== -// Card placement -// ===================================================================================================================== - -TEST(DeckListZones, AddCardToCustomZoneKeepsBoardSemantics) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - tree->addCard("Lightning Bolt", 4, "Removal", -1); - - // The card is reported as a mainboard card. - auto pairs = collectBoardCardPairs(deck); - EXPECT_TRUE(hasPair(pairs, DECK_ZONE_MAIN, "Lightning Bolt")); - EXPECT_FALSE(hasPair(pairs, DECK_ZONE_SIDE, "Lightning Bolt")); - - // It is physically nested inside the custom zone. - auto customZones = tree->getCustomZones(DECK_ZONE_MAIN); - ASSERT_EQ(customZones.size(), 1); - ASSERT_EQ(customZones.first()->size(), 1); - auto *card = dynamic_cast(customZones.first()->at(0)); - ASSERT_NE(card, nullptr); - EXPECT_EQ(card->getName(), QString("Lightning Bolt")); - EXPECT_EQ(card->getNumber(), 4); - - // Zone-scoped queries include it. - EXPECT_TRUE(deck.getCardList({DECK_ZONE_MAIN}).contains("Lightning Bolt")); - EXPECT_FALSE(deck.getCardList({DECK_ZONE_SIDE}).contains("Lightning Bolt")); - EXPECT_EQ(deck.getCardNodes({DECK_ZONE_MAIN}).size(), 1); -} - -TEST(DeckListZones, LegacyTopLevelZoneStillWorks) -{ - DeckList deck; - auto *tree = deck.getTree(); - - // Unknown zone names create a legacy top-level zone (backwards compatibility). - tree->addCard("Legacy Card", 2, "custom_legacy_zone", -1); - - auto pairs = collectBoardCardPairs(deck); - EXPECT_TRUE(hasPair(pairs, "custom_legacy_zone", "Legacy Card")); - EXPECT_EQ(deck.getCardList({}).count("Legacy Card"), 1); -} - -// ===================================================================================================================== -// Zone management -// ===================================================================================================================== - -TEST(DeckListZones, RenameCustomZone) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - tree->addCard("Lightning Bolt", 2, "Removal", -1); - - EXPECT_TRUE(tree->renameCustomZone("Removal", "Bolt Zone")); - EXPECT_TRUE(hasPair(collectBoardCardPairs(deck), DECK_ZONE_MAIN, "Lightning Bolt")); - EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).size(), 1); - EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).first()->getName(), QString("Bolt Zone")); - - // Renaming to a taken name fails. - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Other"), nullptr); - EXPECT_FALSE(tree->renameCustomZone("Bolt Zone", "Other")); - // Renaming a nonexistent zone fails. - EXPECT_FALSE(tree->renameCustomZone("Ghost Zone", "Whatever")); -} - -TEST(DeckListZones, MoveCustomZoneMovesCards) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - tree->addCard("Lightning Bolt", 2, "Removal", -1); - - EXPECT_TRUE(tree->moveCustomZone("Removal", DECK_ZONE_SIDE)); - - auto pairs = collectBoardCardPairs(deck); - EXPECT_TRUE(hasPair(pairs, DECK_ZONE_SIDE, "Lightning Bolt")); - EXPECT_FALSE(hasPair(pairs, DECK_ZONE_MAIN, "Lightning Bolt")); - - // The custom zone is now nested under side. - EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).size(), 0); - EXPECT_EQ(tree->getCustomZones(DECK_ZONE_SIDE).size(), 1); - - // Moving to an unknown board fails. - EXPECT_FALSE(tree->moveCustomZone("Removal", "not_a_board")); -} - -TEST(DeckListZones, MoveCustomZoneFailsForUnknownBoard) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - tree->addCard("Lightning Bolt", 2, "Removal", -1); - - EXPECT_FALSE(tree->moveCustomZone("Removal", "not_a_board")); - - // The zone is still under main. - EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).size(), 1); -} - -// Regression: findCustomZoneByName walks every top-level zone, so a custom zone -// an imported deck carries under a non-standard board (tokens) is still found and -// movable. The pre-fix manager-level moveCustomZone only scanned the standard -// boards and returned false for these with no feedback. -TEST(DeckListZones, MoveCustomZoneNestedUnderTokensBoard) -{ - DeckList deck; - auto *tree = deck.getTree(); - auto *root = tree->getRoot(); - - auto *tokens = new InnerDecklistNode(DECK_ZONE_TOKENS, root); - auto *removal = new InnerDecklistNode("Removal", tokens); - new DecklistCardNode("Lightning Bolt", 2, removal, -1); - - EXPECT_TRUE(tree->findCustomZoneByName("Removal")); - EXPECT_TRUE(tree->moveCustomZone("Removal", DECK_ZONE_SIDE)); - - auto pairs = collectBoardCardPairs(deck); - EXPECT_FALSE(hasPair(pairs, DECK_ZONE_TOKENS, "Lightning Bolt")); - EXPECT_TRUE(hasPair(pairs, DECK_ZONE_SIDE, "Lightning Bolt")); -} - -TEST(DeckListZones, RemoveCustomZoneRemovesCards) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - tree->addCard("Lightning Bolt", 2, "Removal", -1); - - EXPECT_TRUE(tree->removeCustomZone("Removal")); - EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).size(), 0); - EXPECT_TRUE(deck.getCardList({DECK_ZONE_MAIN}).isEmpty()); - EXPECT_FALSE(tree->removeCustomZone("Removal")); -} - -TEST(DeckListZones, EmptyCustomZoneIsKeptOnCardDeletion) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - auto *card = tree->addCard("Lightning Bolt", 1, "Removal", -1); - - // Deleting the last card must not delete the empty custom zone. - EXPECT_TRUE(tree->deleteNode(card)); - EXPECT_EQ(tree->getCustomZones(DECK_ZONE_MAIN).size(), 1); -} - -// ===================================================================================================================== -// Deck-wide behavior -// ===================================================================================================================== - -TEST(DeckListZones, HashCountsCustomZoneCardsByBoard) -{ - // Deck A: cards directly in main and side. - DeckList direct; - direct.addCard("Mountain", DECK_ZONE_MAIN); - direct.addCard("Lightning Bolt", DECK_ZONE_MAIN); - direct.addCard("Island", DECK_ZONE_SIDE); - - // Deck B: identical, but organized in custom zones. - DeckList organized; - auto *tree = organized.getTree(); - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Lands"), nullptr); - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - ASSERT_NE(tree->addCustomZone(DECK_ZONE_SIDE, "Side Tech"), nullptr); - tree->addCard("Mountain", 1, "Lands", -1); - tree->addCard("Lightning Bolt", 1, "Removal", -1); - tree->addCard("Island", 1, "Side Tech", -1); - - EXPECT_EQ(direct.getDeckHash(), organized.getDeckHash()); -} - -TEST(DeckListZones, SideboardSizeCountsCustomZoneCards) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_SIDE, "Side Tech"), nullptr); - tree->addCard("Island", 3, "Side Tech", -1); - tree->addCard("Forest", 2, DECK_ZONE_SIDE, -1); - - EXPECT_EQ(deck.getSideboardSize(), 5); -} - -TEST(DeckListZones, PlainExportIncludesMainAndSideCustomZones) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - ASSERT_NE(tree->addCustomZone(DECK_ZONE_SIDE, "Side Tech"), nullptr); - tree->addCard("Lightning Bolt", 2, "Removal", -1); - tree->addCard("Island", 1, "Side Tech", -1); - - const QString plain = deck.writeToString_Plain(false, false); - EXPECT_TRUE(plain.contains("2 Lightning Bolt")); - EXPECT_TRUE(plain.contains("1 Island")); -} - -TEST(DeckListZones, PlainExportSkipsMaybeboardCustomZones) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAYBEBOARD, "Candidates"), nullptr); - tree->addCard("Wish Card", 4, "Candidates", -1); - tree->addCard("Mountain", 1, DECK_ZONE_MAIN, -1); - - const QString plain = deck.writeToString_Plain(false, false); - EXPECT_FALSE(plain.contains("Wish Card")); - EXPECT_TRUE(plain.contains("1 Mountain")); -} - -TEST(DeckListZones, NativeRoundTripPreservesCustomZones) -{ - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAIN, "Removal"), nullptr); - ASSERT_NE(tree->addCustomZone(DECK_ZONE_SIDE, "Side Tech"), nullptr); - tree->addCard("Lightning Bolt", 2, "Removal", -1); - tree->addCard("Island", 3, "Side Tech", -1); - tree->addCard("Mountain", 1, DECK_ZONE_MAIN, -1); - - // Round-trip through the native format. - DeckList restored(deck.writeToString_Native()); - auto *restoredTree = restored.getTree(); - - EXPECT_EQ(restored.getDeckHash(), deck.getDeckHash()); - EXPECT_EQ(restoredTree->getCustomZones(DECK_ZONE_MAIN).size(), 1); - EXPECT_EQ(restoredTree->getCustomZones(DECK_ZONE_MAIN).first()->getName(), QString("Removal")); - EXPECT_EQ(restoredTree->getCustomZones(DECK_ZONE_SIDE).size(), 1); - - auto pairs = collectBoardCardPairs(restored); - EXPECT_TRUE(hasPair(pairs, DECK_ZONE_MAIN, "Lightning Bolt")); - EXPECT_TRUE(hasPair(pairs, DECK_ZONE_SIDE, "Island")); - EXPECT_TRUE(hasPair(pairs, DECK_ZONE_MAIN, "Mountain")); - EXPECT_EQ(totalCards(pairs), 6); -} - -TEST(DeckListZones, MaybeboardCustomZoneCardsAreExcludedFromHash) -{ - // Maybeboard cards are editor-only and must never affect the deck hash. - DeckList deck; - auto *tree = deck.getTree(); - - ASSERT_NE(tree->addCustomZone(DECK_ZONE_MAYBEBOARD, "Candidates"), nullptr); - tree->addCard("Wish Card", 4, "Candidates", -1); - tree->addCard("Mountain", 1, DECK_ZONE_MAIN, -1); - - DeckList expected; - expected.addCard("Mountain", DECK_ZONE_MAIN); - - EXPECT_EQ(deck.getDeckHash(), expected.getDeckHash()); -} - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/loader_local_matching_test.cpp b/tests/loader_local_matching_test.cpp deleted file mode 100644 index 7ffa7157d..000000000 --- a/tests/loader_local_matching_test.cpp +++ /dev/null @@ -1,187 +0,0 @@ -#include "client/settings/cache_settings.h" -#include "interface/card_picture_loader/card_picture_loader_local.h" - -#include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -namespace -{ - -/** - * @brief Builds an ExactCard with the requested identity fields. - * - * Mirrors how the client constructs cards: the set short name feeds tryLoad()'s - * setName, and the "num" printing property feeds the collector number. - */ -ExactCard cardFor(const QString &name, const QString &setShortName, const QString &collectorNumber) -{ - CardSetPtr set; - if (!setShortName.isEmpty()) { - set = CardSet::newInstance(new NoopCardSetPriorityController(), setShortName, setShortName); - } - - LazyPropertiesHash properties; - if (!collectorNumber.isEmpty()) { - properties.insert("num", collectorNumber); - } - - return ExactCard(CardInfo::newInstance(name), PrintingInfo(set, properties)); -} - -class LocalMatcherTest : public ::testing::Test -{ -protected: - QTemporaryDir tempDir; ///< Sandboxed "pics" root for every test. - CardPictureLoaderLocal *loader = nullptr; ///< Constructed per test against the sandboxed paths. - - QString picsPath() const - { - return tempDir.path() + "/pics"; - } - - void SetUp() override - { - // The loader ctor snapshots the global picture paths once, so point them at the - // sandbox before constructing it. - SettingsCache::instance().paths().setPicsPath(picsPath()); - SettingsCache::instance().paths().setCustomPicsPath(picsPath() + "/CUSTOM/"); - - loader = new CardPictureLoaderLocal(nullptr); - } - - void TearDown() override - { - delete loader; - loader = nullptr; - } - - /** - * @brief Writes a valid 1x1 PNG under the sandboxed pics path. - */ - void writePngUnderPics(const QString &relativePath, const QColor &color = Qt::red) - { - const QString fullPath = picsPath() + "/" + relativePath; - ASSERT_TRUE(QDir().mkpath(QFileInfo(fullPath).absolutePath())); - - QImage image(1, 1, QImage::Format_RGB32); - image.fill(color); - - QImageWriter writer(fullPath, "PNG"); - ASSERT_TRUE(writer.write(image)); - } -}; - -TEST_F(LocalMatcherTest, ExactMatchBareFileWinsOverSuffixedCompanion) -{ - writePngUnderPics("downloadedPics/TestCard.png"); - writePngUnderPics("downloadedPics/TestCard (1).png"); - - const QImage image = loader->tryLoad(cardFor("TestCard", "", "")); - - EXPECT_FALSE(image.isNull()) << "The bare TestCard.png must be picked over its suffixed companion"; -} - -TEST_F(LocalMatcherTest, SuffixedFileWithoutExactMatchIsNotLoaded) -{ - // The pre-refactor prefix match would have accepted "TestCard (1).png" for "TestCard". - writePngUnderPics("downloadedPics/TestCard (1).png"); - - const QImage image = loader->tryLoad(cardFor("TestCard", "", "")); - - EXPECT_TRUE(image.isNull()) << "A suffixed file must not satisfy an exact card-name lookup"; -} - -TEST_F(LocalMatcherTest, SetFolderLookupIgnoresSuffixedFiles) -{ - writePngUnderPics("M10/TestCard (1).png"); - - const QImage image = loader->tryLoad(cardFor("TestCard", "M10", "")); - - EXPECT_TRUE(image.isNull()) << "Set-folder lookups must also require an exact name match"; -} - -TEST_F(LocalMatcherTest, SetFolderLookupStillResolvesExactFile) -{ - writePngUnderPics("M10/TestCard.png"); - writePngUnderPics("M10/TestCard (1).png"); - - const QImage image = loader->tryLoad(cardFor("TestCard", "M10", "")); - - EXPECT_FALSE(image.isNull()) << "The exact file in the set folder must still resolve"; -} - -TEST_F(LocalMatcherTest, RootDownloadedPicsFallbackResolvesSchemeFilename) -{ - // Non-set-folder export schemes (Name_Set_Collector) write straight into downloadedPics/. - writePngUnderPics("downloadedPics/TestCard_M10_1.png"); - - const QImage image = loader->tryLoad(cardFor("TestCard", "M10", "1")); - - EXPECT_FALSE(image.isNull()) << "downloadedPics/TestCard_M10_1.png must resolve via the root fallback"; -} - -TEST_F(LocalMatcherTest, RootFallbackResolvesDashSeparatedVariant) -{ - writePngUnderPics("downloadedPics/TestCard-M10-1.png"); - - const QImage image = loader->tryLoad(cardFor("TestCard", "M10", "1")); - - EXPECT_FALSE(image.isNull()) << "The dash-separated import variant must resolve via the root fallback"; -} - -TEST_F(LocalMatcherTest, DownloadedPicsSetSubfolderStillResolves) -{ - writePngUnderPics("downloadedPics/M10/TestCard_M10_1.png"); - - const QImage image = loader->tryLoad(cardFor("TestCard", "M10", "1")); - - EXPECT_FALSE(image.isNull()) << "The set-subfolder export scheme must keep resolving"; -} - -TEST_F(LocalMatcherTest, SetFolderCandidateTakesPrecedenceOverRootFallback) -{ - writePngUnderPics("M10/TestCard_M10_1.png", Qt::red); - writePngUnderPics("downloadedPics/TestCard_M10_1.png", Qt::blue); - - const QImage image = loader->tryLoad(cardFor("TestCard", "M10", "1")); - - ASSERT_FALSE(image.isNull()); - EXPECT_EQ(image.pixelColor(0, 0), QColor(Qt::red)) << "The set-folder candidate must be preferred"; -} - -} // namespace - -int main(int argc, char **argv) -{ - // Redirect SettingsCache reads/writes (app-data location) away from the real user profile. - QStandardPaths::setTestModeEnabled(true); - - // Some CI containers run as a uid without a passwd entry (e.g. GitHub's docker - // runner), so HOME resolves to "/" and the test-mode qttest data dir cannot be - // created. SettingsCache's QSettings then silently drops every write, reads come - // back empty, and the paths the loader searches are "". Give the test a writable - // HOME for the duration of the run so settings behave like on a normal machine. - QTemporaryDir home; - if (home.isValid()) { - qputenv("HOME", home.path().toLocal8Bit()); - } - - QCoreApplication app(argc, argv); - QLoggingCategory::setFilterRules("card_picture_loader.*=false\nsettings_cache.*=false"); - - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} \ No newline at end of file diff --git a/tests/metrics_registry_test.cpp b/tests/metrics_registry_test.cpp deleted file mode 100644 index 1abef58e1..000000000 --- a/tests/metrics_registry_test.cpp +++ /dev/null @@ -1,83 +0,0 @@ -#include -#include -#include -#include - -TEST(MetricsRegistryTest, EmptyRegistryHasZeroedCounters) -{ - MetricsRegistry registry; - - EXPECT_EQ(0, registry.totalCommands()); - EXPECT_EQ(0, registry.totalTimeMs()); - EXPECT_EQ(0, registry.activeTypeCount()); - EXPECT_EQ(0, registry.getGameStartSnapshot().count); -} - -TEST(MetricsRegistryTest, SampleIsRecordedInTotalsAndSlot) -{ - MetricsRegistry registry; - registry.observeCommand(MetricsRegistry::typeIdFor(0, 1000), 7); - - EXPECT_EQ(1, registry.totalCommands()); - EXPECT_EQ(7, registry.totalTimeMs()); - EXPECT_EQ(1, registry.activeTypeCount()); - - const auto stats = registry.collectActiveStats(); - ASSERT_EQ(1, stats.size()); - EXPECT_EQ(MetricsRegistry::typeIdFor(0, 1000), stats[0].typeId); - EXPECT_EQ(1, stats[0].count); - EXPECT_EQ(7, stats[0].totalMs); -} - -TEST(MetricsRegistryTest, KindEncodingSeparatesSameExtensionNumber) -{ - MetricsRegistry registry; - const int sessionPing = MetricsRegistry::typeIdFor(0, 1000); - const int roomLeaveRoom = MetricsRegistry::typeIdFor(1, 1000); - ASSERT_NE(sessionPing, roomLeaveRoom); - - registry.observeCommand(sessionPing, 1); - registry.observeCommand(roomLeaveRoom, 5000); - - EXPECT_EQ(2, registry.activeTypeCount()); -} - -TEST(MetricsRegistryTest, OutOfRangeIdsLandInOverflowSlot) -{ - MetricsRegistry registry; - registry.observeCommand(-1, 4); - registry.observeCommand(MetricsRegistry::MaxTypes + 12345, 4); - - EXPECT_EQ(2, registry.totalCommands()); - EXPECT_EQ(1, registry.activeTypeCount()); // both collapsed into one slot - EXPECT_EQ(8, registry.totalTimeMs()); -} - -TEST(MetricsRegistryTest, NegativeDurationsAreClamped) -{ - MetricsRegistry registry; - registry.observeCommand(MetricsRegistry::typeIdFor(0, 1000), -50); - - EXPECT_EQ(0, registry.totalTimeMs()); -} - -TEST(MetricsRegistryTest, GameStartTrackedSeparatelyFromCommands) -{ - MetricsRegistry registry; - registry.observeGameStartDurationMs(120); - - EXPECT_EQ(0, registry.totalCommands()); - EXPECT_EQ(0, registry.totalTimeMs()); - EXPECT_EQ(0, registry.activeTypeCount()); - - const auto snapshot = registry.getGameStartSnapshot(); - EXPECT_EQ(1, snapshot.count); - EXPECT_EQ(120, snapshot.totalMs); -} - -int main(int argc, char **argv) -{ - QCoreApplication app(argc, argv); - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} \ No newline at end of file diff --git a/tests/oracle/CMakeLists.txt b/tests/oracle/CMakeLists.txt index 9bc5ee5be..c5c1e9097 100644 --- a/tests/oracle/CMakeLists.txt +++ b/tests/oracle/CMakeLists.txt @@ -7,63 +7,3 @@ endif() target_link_libraries(parse_cipt_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES}) add_test(NAME parse_cipt_test COMMAND parse_cipt_test) - -# Oracle importer unit tests -add_executable( - oracle_importer_test ${VERSION_STRING_CPP} ../../oracle/src/oracleimporter.cpp ../../oracle/src/parsehelpers.cpp - ../../oracle/src/raw_json_scanner.cpp oracle_importer_test.cpp -) - -if(NOT GTEST_FOUND) - add_dependencies(oracle_importer_test gtest) -endif() - -target_link_libraries( - oracle_importer_test libcockatrice_card libcockatrice_interfaces Threads::Threads ${GTEST_BOTH_LIBRARIES} - ${TEST_QT_MODULES} -) - -add_test(NAME oracle_importer_test COMMAND oracle_importer_test) - -# Oracle importer benchmark tests (manual, not run in CI, incl. RAM benchmark) -# Optional compression libs, mirrored from oracle/CMakeLists.txt, so the benchmark -# can download and decompress whatever AllPrintings format the default URL selects. -find_package(ZLIB) -if(ZLIB_FOUND) - add_definitions("-DHAS_ZLIB") - set(_ORACLE_BENCH_EXTRA_SOURCES ../../oracle/src/zip/unzip.cpp ../../oracle/src/zip/zipglobal.cpp) - set(_ORACLE_BENCH_EXTRA_LIBRARIES ${ZLIB_LIBRARIES}) - include_directories(${ZLIB_INCLUDE_DIRS}) -else() - message(STATUS "Oracle tests: zlib not found; zip download benchmark disabled") -endif() - -find_package(LibLZMA) -if(LIBLZMA_FOUND) - add_definitions("-DHAS_LZMA") - list(APPEND _ORACLE_BENCH_EXTRA_SOURCES ../../oracle/src/lzma/decompress.cpp) - list(APPEND _ORACLE_BENCH_EXTRA_LIBRARIES ${LIBLZMA_LIBRARIES}) - include_directories(${LIBLZMA_INCLUDE_DIRS}) -else() - message(STATUS "Oracle tests: LibLZMA not found; xz download benchmark disabled") -endif() - -add_executable( - oracle_importer_benchmark_test - ${VERSION_STRING_CPP} ../../oracle/src/oracleimporter.cpp ../../oracle/src/parsehelpers.cpp - ../../oracle/src/raw_json_scanner.cpp oracle_importer_benchmark_test.cpp ${_ORACLE_BENCH_EXTRA_SOURCES} -) - -if(NOT GTEST_FOUND) - add_dependencies(oracle_importer_benchmark_test gtest) -endif() - -target_link_libraries( - oracle_importer_benchmark_test - libcockatrice_card - libcockatrice_interfaces - Threads::Threads - ${GTEST_BOTH_LIBRARIES} - ${TEST_QT_MODULES} - ${_ORACLE_BENCH_EXTRA_LIBRARIES} -) diff --git a/tests/oracle/oracle_importer_benchmark_test.cpp b/tests/oracle/oracle_importer_benchmark_test.cpp deleted file mode 100644 index 633c9e40a..000000000 --- a/tests/oracle/oracle_importer_benchmark_test.cpp +++ /dev/null @@ -1,578 +0,0 @@ -#include "../../oracle/src/oracleimporter.h" - -#include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if defined(HAS_LZMA) -#include "../../oracle/src/lzma/decompress.h" -#endif -#if defined(HAS_ZLIB) -#include "../../oracle/src/zip/unzip.h" -#endif -#if defined(Q_OS_MACOS) -#include -#include -#endif - -// Helper: build a synthetic MTGJSON-style JSON with the given number of sets and cards per set -static QByteArray buildSyntheticData(int numSets, int cardsPerSet) -{ - QJsonObject dataObj; - for (int s = 0; s < numSets; ++s) { - QJsonArray cardsArray; - for (int c = 0; c < cardsPerSet; ++c) { - QJsonObject card; - card["name"] = QString("Card %1").arg(s * cardsPerSet + c); - card["text"] = "This is a test card with some rules text."; - card["layout"] = "normal"; - card["manaCost"] = "{W}"; - card["type"] = "Creature — Human"; - card["power"] = "2"; - card["toughness"] = "2"; - card["colors"] = QJsonArray{"W"}; - card["colorIdentity"] = QJsonArray{"W"}; - card["types"] = QJsonArray{"Creature"}; - // Real MTGJSON types: floats and booleans, not strings. This - // exercises the QVariant coercion in the property reader. - card["convertedManaCost"] = 1.0; - card["manaValue"] = 1.0; - card["isOnlineOnly"] = false; - card["isRebalanced"] = false; - - QJsonObject legalities; - legalities["standard"] = "legal"; - legalities["modern"] = "legal"; - legalities["legacy"] = "legal"; - legalities["vintage"] = "legal"; - legalities["commander"] = "legal"; - card["legalities"] = legalities; - - QJsonObject identifiers; - identifiers["scryfallId"] = QString("id-%1-%2").arg(s).arg(c); - card["identifiers"] = identifiers; - - // In AllPrintings, number and rarity are flat fields on the card - // object, exactly as set below. - card["number"] = QString::number(c + 1); - card["rarity"] = "common"; - - cardsArray.append(card); - } - - QJsonObject setObj; - setObj["code"] = QString("T%1").arg(s, 2, 10, QChar('0')); - setObj["name"] = QString("Test Set %1").arg(s); - setObj["type"] = "expansion"; - setObj["releaseDate"] = "2024-01-01"; - setObj["cards"] = cardsArray; - - dataObj[QString("T%1").arg(s, 2, 10, QChar('0'))] = setObj; - } - - QJsonObject root; - root["data"] = dataObj; - return QJsonDocument(root).toJson(QJsonDocument::Compact); -} - -// ============================================================================ -// Import throughput benchmark -// ============================================================================ - -TEST(OracleBenchmark, ImportThroughput) -{ - static constexpr int numSets = 10; - static constexpr int cardsPerSet = 500; - - QByteArray data = buildSyntheticData(numSets, cardsPerSet); - - OracleImporter importer; - - // Phase 1: Parse JSON - QElapsedTimer timer; - timer.start(); - bool ok = importer.readSetsFromByteArray(data); - ASSERT_TRUE(ok); - qint64 parseMs = timer.elapsed(); - - // Phase 2: Import cards - timer.restart(); - int importedSets = importer.startImport(); - qint64 importMs = timer.elapsed(); - - int totalImported = 0; - for (const auto &card : importer.getCardList()) { - Q_UNUSED(card); - totalImported++; - } - - // The fixture generates globally unique card names, so the expected - // counts are exact: a regression here means cards were dropped. - ASSERT_EQ(importedSets, numSets); - ASSERT_EQ(totalImported, numSets * cardsPerSet); - // Real-data probe: numeric convertedManaCost must be coerced to text - // (regression for the QJsonValue::toString() reader in #7214). - auto probeCard = importer.getCardList().value("Card 0"); - ASSERT_FALSE(probeCard.isNull()); - ASSERT_EQ(probeCard->getProperty("cmc"), "1"); - - qDebug().noquote() - << QString("Oracle Import Benchmark: %1 sets, %2 unique cards").arg(importedSets).arg(totalImported); - qDebug().noquote() << QString(" JSON parse: %1 ms").arg(parseMs); - qDebug().noquote() << QString(" Card import: %1 ms").arg(importMs); - qDebug().noquote() << QString(" Total: %1 ms").arg(parseMs + importMs); - if (importMs > 0) { - qDebug().noquote() << QString(" Throughput: %1 cards/sec") - .arg(static_cast(totalImported) / importMs * 1000.0, 0, 'f', 0); - } -} - -// ============================================================================ -// readSetsFromByteArray benchmark -// ============================================================================ - -TEST(OracleBenchmark, ParseJsonThroughput) -{ - static constexpr int numSets = 20; - static constexpr int cardsPerSet = 1000; - - QByteArray data = buildSyntheticData(numSets, cardsPerSet); - - // Run 5 iterations and report average - static constexpr int iterations = 5; - qint64 totalMs = 0; - - for (int i = 0; i < iterations; ++i) { - OracleImporter importer; - QByteArray source = data; - QElapsedTimer timer; - timer.start(); - bool ok = importer.readSetsFromByteArray(std::move(source)); - ASSERT_TRUE(ok); - totalMs += timer.elapsed(); - } - - qint64 avgMs = totalMs / iterations; - qDebug().noquote() << QString("Parse Benchmark (%1 iterations): avg %2 ms for %3 sets x %4 cards") - .arg(iterations) - .arg(avgMs) - .arg(numSets) - .arg(cardsPerSet); -} - -// ============================================================================ -// Split card merging benchmark -// ============================================================================ - -TEST(OracleBenchmark, SplitCardMerging) -{ - static constexpr int numSplitCards = 1000; - - QJsonArray cardsList; - for (int i = 0; i < numSplitCards; ++i) { - QJsonObject face1; - face1["name"] = QString("Fire %1 // Ice %1").arg(i); - face1["text"] = "Fire side text."; - face1["layout"] = "split"; - face1["side"] = "a"; - face1["faceName"] = QString("Fire %1").arg(i); - face1["colors"] = QJsonArray{"R"}; - face1["colorIdentity"] = QJsonArray{"R"}; - face1["types"] = QJsonArray{"Instant"}; - face1["manaCost"] = "{R}"; - face1["legalities"] = QJsonObject{{"standard", "not_legal"}}; - face1["identifiers"] = QJsonObject{{"scryfallId", QString("f-%1").arg(i)}}; - face1["number"] = QString::number(i + 1); - face1["rarity"] = "uncommon"; - - QJsonObject face2; - face2["name"] = QString("Fire %1 // Ice %1").arg(i); - face2["text"] = "Ice side text."; - face2["layout"] = "split"; - face2["side"] = "b"; - face2["faceName"] = QString("Ice %1").arg(i); - face2["colors"] = QJsonArray{"U"}; - face2["colorIdentity"] = QJsonArray{"U"}; - face2["types"] = QJsonArray{"Instant"}; - face2["manaCost"] = "{U}"; - face2["legalities"] = QJsonObject{{"standard", "not_legal"}}; - face2["identifiers"] = QJsonObject{{"scryfallId", QString("i-%1").arg(i)}}; - face2["number"] = QString::number(i + 1); - face2["rarity"] = "uncommon"; - - cardsList.append(face1); - cardsList.append(face2); - } - - NoopCardSetPriorityController controller; - OracleImporter importer; - CardSetPtr set = CardSet::newInstance(&controller, "TST", "Split Test"); - - QElapsedTimer timer; - timer.start(); - int count = importer.importCardsFromSet(set, cardsList); - qint64 ms = timer.elapsed(); - - ASSERT_EQ(count, numSplitCards); - qDebug().noquote() << QString("Split Card Merge Benchmark: %1 cards in %2 ms (%3 cards/sec)") - .arg(count) - .arg(ms) - .arg(ms > 0 ? static_cast(count) / ms * 1000.0 : 0.0, 0, 'f', 0); -} - -// ============================================================================ -// sortAndReduceColors microbenchmark -// ============================================================================ - -// We can't call sortAndReduceColors directly (it's static), so we benchmark -// through importCardsFromSet with color properties. - -TEST(OracleBenchmark, ImportCardsWithColors) -{ - static constexpr int numCards = 10000; - - NoopCardSetPriorityController controller; - OracleImporter importer; - CardSetPtr set = CardSet::newInstance(&controller, "TST", "Color Test"); - - QJsonArray cardsList; - for (int i = 0; i < numCards; ++i) { - QJsonObject card; - card["name"] = QString("Color Card %1").arg(i); - card["text"] = "Rules text."; - card["layout"] = "normal"; - card["manaCost"] = "{W}"; - card["type"] = "Creature — Human"; - card["types"] = QJsonArray{"Creature"}; - card["colors"] = QJsonArray{"B", "R", "G", "W", "U"}; - card["colorIdentity"] = QJsonArray{"B", "R", "G", "W", "U"}; - card["number"] = QString::number(i + 1); - card["rarity"] = "common"; - card["legalities"] = QJsonObject{{"standard", "legal"}}; - card["identifiers"] = QJsonObject{{"scryfallId", QString("c-%1").arg(i)}}; - cardsList.append(card); - } - - QElapsedTimer timer; - timer.start(); - int count = importer.importCardsFromSet(set, cardsList); - qint64 ms = timer.elapsed(); - - ASSERT_EQ(count, numCards); - qDebug().noquote() << QString("Import with Colors Benchmark: %1 cards in %2 ms (%3 cards/sec)") - .arg(count) - .arg(ms) - .arg(ms > 0 ? static_cast(count) / ms * 1000.0 : 0.0, 0, 'f', 0); -} - -// ============================================================================ -// RAM usage measurement -// ============================================================================ - -// Mirrors the default AllPrintings URL selection in oracle/src/pages.cpp. -#if defined(HAS_LZMA) -static const QUrl kDefaultAllPrintingsUrl("https://www.mtgjson.com/api/v5/AllPrintings.json.xz"); -#elif defined(HAS_ZLIB) -static const QUrl kDefaultAllPrintingsUrl("https://www.mtgjson.com/api/v5/AllPrintings.json.zip"); -#else -static const QUrl kDefaultAllPrintingsUrl("https://www.mtgjson.com/api/v5/AllPrintings.json"); -#endif - -// Magic bytes also from oracle/src/pages.cpp -static const QByteArray kXzSignature("\xFD\x37\x7A\x58\x5A", 6); -static const QByteArray kZipSignature("PK"); - -struct MemorySnapshot -{ - qint64 peakRssKb = -1; // process high-water mark (VmHWM on Linux, ru_maxrss on macOS) - qint64 rssKb = -1; // current resident set size - bool available = false; - - static MemorySnapshot current() - { - MemorySnapshot snap; -#if defined(Q_OS_LINUX) - QFile statusFile("/proc/self/status"); - if (statusFile.open(QIODevice::ReadOnly | QIODevice::Text)) { - // /proc files report size() == 0, so atEnd() is immediately true: read everything first. - const QList lines = statusFile.readAll().split('\n'); - for (const QByteArray &line : lines) { - if (line.startsWith("VmHWM:")) { - snap.peakRssKb = line.mid(6).trimmed().split(' ').value(0).toLongLong(); - } else if (line.startsWith("VmRSS:")) { - snap.rssKb = line.mid(6).trimmed().split(' ').value(0).toLongLong(); - } - } - snap.available = snap.peakRssKb >= 0; - } -#elif defined(Q_OS_MACOS) - struct rusage usage; - if (getrusage(RUSAGE_SELF, &usage) == 0) { - snap.peakRssKb = usage.ru_maxrss / 1024; // bytes -> kB - snap.available = snap.peakRssKb >= 0; - } - // getrusage has no current-RSS equivalent; task_info's resident_size - // is the closest macOS analog to Linux VmRSS. - mach_task_basic_info info = {}; - mach_msg_type_number_t count = MACH_TASK_BASIC_INFO_COUNT; - if (task_info(mach_task_self(), MACH_TASK_BASIC_INFO, reinterpret_cast(&info), &count) == - KERN_SUCCESS) { - snap.rssKb = info.resident_size / 1024; - } -#endif - return snap; - } -}; - -static QString formatKb(qint64 kb) -{ - if (kb < 0) { - return "N/A"; - } - return QString("%1 MB").arg(kb / 1024.0, 0, 'f', 1); -} - -static void logRamPhase(const QString &phase, const MemorySnapshot &baseline, const MemorySnapshot ¤t) -{ - if (!baseline.available || !current.available) { - qDebug().noquote() << QString(" %1: memory stats unavailable on this platform").arg(phase); - return; - } - // VmHWM / ru_maxrss are monotonically non-decreasing high-water marks, so a - // peak-based delta between phases is ~0.0 MB by construction once the - // fixture build has set the process peak. The live signals are current RSS - // and the process peak; the delta is meaningful only where the baseline was - // taken immediately before the phase it measures (e.g. the import phase, - // which compares afterParse against afterImport). - QString rssDelta = "N/A"; - if (current.rssKb >= 0 && baseline.rssKb >= 0) { - rssDelta = formatKb(current.rssKb - baseline.rssKb); - } - qDebug().noquote() << QString(" %1: current RSS %2 | delta vs baseline %3 | process peak %4") - .arg(phase) - .arg(formatKb(current.rssKb)) - .arg(rssDelta) - .arg(formatKb(current.peakRssKb)); -} - -// Decompresses the download payload when the default URL is a compressed build, -// mirroring the wizard's magic-byte handling in oracle/src/pages.cpp. -static QByteArray decompressSetsData(const QByteArray &payload) -{ - if (payload.startsWith(kXzSignature)) { -#if defined(HAS_LZMA) - QBuffer inBuffer(const_cast(&payload)); - QByteArray out; - QBuffer outBuffer(&out); - inBuffer.open(QIODevice::ReadOnly); - outBuffer.open(QIODevice::WriteOnly); - XzDecompressor xz; - if (!xz.decompress(&inBuffer, &outBuffer)) { - qDebug() << "RAM benchmark: xz decompression failed"; - return {}; - } - return out; -#else - qDebug() << "RAM benchmark: download is xz-compressed but this build has no LZMA support"; - return {}; -#endif - } - if (payload.startsWith(kZipSignature)) { -#if defined(HAS_ZLIB) - QBuffer inBuffer(const_cast(&payload)); - inBuffer.open(QIODevice::ReadOnly); - UnZip unzip; - if (unzip.openArchive(&inBuffer) != UnZip::Ok) { - qDebug() << "RAM benchmark: zip archive open failed"; - return {}; - } - if (unzip.fileList().size() != 1) { - qDebug() << "RAM benchmark: zip archive doesn't contain exactly one file"; - return {}; - } - QByteArray out; - QBuffer outBuffer(&out); - outBuffer.open(QIODevice::WriteOnly); - const auto errorCode = unzip.extractFile(unzip.fileList().value(0), &outBuffer); - unzip.closeArchive(); - if (errorCode != UnZip::Ok) { - qDebug() << "RAM benchmark: zip extraction failed"; - return {}; - } - return out; -#else - qDebug() << "RAM benchmark: download is zip-compressed but this build has no zlib support"; - return {}; -#endif - } - return payload; -} - -TEST(OracleBenchmark, ImportRamUsage) -{ - static constexpr int numSets = 30; - static constexpr int cardsPerSet = 2000; // ~60k cards, roughly AllPrintings scale - - // Baseline must precede the fixture build: a high-water mark set while - // generating the synthetic JSON would otherwise mask the importer phases. - // Where memory stats are unavailable (Windows), skip before doing the - // 60k-card fixture build, which would otherwise be pure wasted work. - const MemorySnapshot baseline = MemorySnapshot::current(); - if (!baseline.available) { - GTEST_SKIP() << "Memory stats unavailable on this platform"; - } - - const QByteArray data = buildSyntheticData(numSets, cardsPerSet); - - // The fixture build leaves freed-but-unreturned arenas behind (current RSS - // rarely falls once glibc allocates). Baseline immediately after it so the - // parse phase measures only the importer's own growth (~40 MB) rather than - // swallowing the fixture builder's spike. - const MemorySnapshot afterFixture = MemorySnapshot::current(); - logRamPhase("fixture build", baseline, afterFixture); - - NoopCardSetPriorityController controller; - OracleImporter importer; - - QElapsedTimer timer; - timer.start(); - ASSERT_TRUE(importer.readSetsFromByteArray(std::move(data))); - const qint64 parseMs = timer.elapsed(); - const MemorySnapshot afterParse = MemorySnapshot::current(); - - timer.restart(); - const int importedSets = importer.startImport(); - const qint64 importMs = timer.elapsed(); - const MemorySnapshot afterImport = MemorySnapshot::current(); - - importer.releaseSetData(); - const MemorySnapshot afterRelease = MemorySnapshot::current(); - - const int totalCards = importer.getCardList().size(); - qDebug().noquote() << QString("Oracle RAM Benchmark (synthetic): %1 sets, %2 cards, %3 MB JSON") - .arg(importedSets) - .arg(totalCards) - .arg(data.size() / (1024.0 * 1024.0), 0, 'f', 1); - qDebug().noquote() << QString(" JSON parse: %1 ms").arg(parseMs); - qDebug().noquote() << QString(" Card import: %1 ms").arg(importMs); - logRamPhase("parse", afterFixture, afterParse); - logRamPhase("import", afterParse, afterImport); - logRamPhase("after releaseSetData()", afterImport, afterRelease); - - // Freeing the parsed tree rarely moves current RSS (allocator reuse), so the - // meaningful signal that release actually dropped the buffers is emptiness, - // not an RSS delta. - ASSERT_TRUE(importer.getSets().isEmpty()); -} - -TEST(OracleBenchmark, ImportRamUsageAllPrintings) -{ - // Only "1" enables the download: unset (the default and the CI setup) and - // an explicit "0" both disable it. - bool envOk = false; - const int enabled = qEnvironmentVariableIntValue("COCKATRICE_ORACLE_RAM_BENCHMARK", &envOk); - if (!envOk || enabled == 0) { - GTEST_SKIP() << "Set COCKATRICE_ORACLE_RAM_BENCHMARK=1 to download the real AllPrintings dataset for this " - "RAM benchmark. Default URL: " - << kDefaultAllPrintingsUrl.toDisplayString().toStdString(); - } - - // Baseline must precede the request so the phase covers the download + - // decompress step, including the payload materialized by readAll(). - const MemorySnapshot baseline = MemorySnapshot::current(); - if (!baseline.available) { - GTEST_SKIP() << "Memory stats unavailable on this platform"; - } - - QNetworkAccessManager nam; - QNetworkRequest request(kDefaultAllPrintingsUrl); - request.setHeader(QNetworkRequest::UserAgentHeader, "Cockatrice Oracle RAM benchmark"); - QNetworkReply *reply = nam.get(request); - - QEventLoop loop; - QTimer timeoutTimer; - timeoutTimer.setSingleShot(true); - bool timedOut = false; - QObject::connect(reply, &QNetworkReply::finished, &loop, &QEventLoop::quit); - QObject::connect(&timeoutTimer, &QTimer::timeout, &loop, [&] { - timedOut = true; - reply->abort(); - }); - timeoutTimer.start(10 * 60 * 1000); - loop.exec(); - timeoutTimer.stop(); - - // abort() leaves reply->error() as OperationCanceledError, so a timed-out - // download takes the same GTEST_SKIP path as any other network error - // instead of reading a truncated body and failing the parse below. - if (timedOut || reply->error() != QNetworkReply::NoError) { - GTEST_SKIP() << "Download failed: " << reply->errorString().toStdString(); - } - const QByteArray payload = reply->readAll(); - reply->deleteLater(); - - // mtgjson can answer 200 with an HTML page (mirrors the wizard's '<' check - // in pages.cpp); reject it before trying to decompress/parse. - if (payload.startsWith("<")) { - GTEST_SKIP() << "Download returned a non-JSON body (HTML page instead of data), skipping"; - } - - const QByteArray setsData = decompressSetsData(payload); - const MemorySnapshot afterDownload = MemorySnapshot::current(); - if (setsData.isEmpty()) { - GTEST_SKIP() << "No data to import (download or decompression failed)"; - } - - NoopCardSetPriorityController controller; - OracleImporter importer; - - QElapsedTimer timer; - timer.start(); - ASSERT_TRUE(importer.readSetsFromByteArray(std::move(setsData))); - const qint64 parseMs = timer.elapsed(); - const MemorySnapshot afterParse = MemorySnapshot::current(); - - timer.restart(); - const int importedSets = importer.startImport(); - const qint64 importMs = timer.elapsed(); - const MemorySnapshot afterImport = MemorySnapshot::current(); - - importer.releaseSetData(); - const MemorySnapshot afterRelease = MemorySnapshot::current(); - - const int totalCards = importer.getCardList().size(); - qDebug().noquote() << QString("Oracle RAM Benchmark (real AllPrintings): %1 sets, %2 unique cards") - .arg(importedSets) - .arg(totalCards); - qDebug().noquote() << QString(" URL: %1").arg(kDefaultAllPrintingsUrl.toDisplayString()); - qDebug().noquote() << QString(" Downloaded: %1 MB, decompressed: %2 MB") - .arg(payload.size() / (1024.0 * 1024.0), 0, 'f', 1) - .arg(setsData.size() / (1024.0 * 1024.0), 0, 'f', 1); - qDebug().noquote() << QString(" JSON parse: %1 ms").arg(parseMs); - qDebug().noquote() << QString(" Card import: %1 ms").arg(importMs); - logRamPhase("download+decompress", baseline, afterDownload); - logRamPhase("parse", afterDownload, afterParse); - logRamPhase("import", afterParse, afterImport); - logRamPhase("after releaseSetData()", afterImport, afterRelease); -} - -int main(int argc, char **argv) -{ - // Required for the event loop used by the real-AllPrintings download benchmark - QCoreApplication app(argc, argv); - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/oracle/oracle_importer_test.cpp b/tests/oracle/oracle_importer_test.cpp deleted file mode 100644 index f66616e37..000000000 --- a/tests/oracle/oracle_importer_test.cpp +++ /dev/null @@ -1,1128 +0,0 @@ -#include "../../oracle/src/oracleimporter.h" - -#include "gtest/gtest.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -class OracleImporterTest : public ::testing::Test -{ -protected: - void SetUp() override - { - controller = new NoopCardSetPriorityController(); - importer = new OracleImporter(); - set = CardSet::newInstance(controller, "TST", "Test Set"); - } - - void TearDown() override - { - delete importer; - delete controller; - } - - // Helper: build a minimal card JSON object - QJsonObject makeCard(const QString &name, - const QString &colors = "", - const QString &colorIdentity = "", - const QVariantMap &legalities = {}) - { - QJsonObject card; - card["name"] = name; - card["text"] = "Rules text."; - card["layout"] = "normal"; - card["manaCost"] = "{W}"; - card["type"] = "Creature — Human"; - card["types"] = QJsonArray{"Creature"}; - card["number"] = "1"; - card["rarity"] = "common"; - - if (!colors.isEmpty()) { - QJsonArray arr; - for (const QChar &c : colors) { - arr.append(QString(c)); - } - card["colors"] = arr; - } - if (!colorIdentity.isEmpty()) { - QJsonArray arr; - for (const QChar &c : colorIdentity) { - arr.append(QString(c)); - } - card["colorIdentity"] = arr; - } - if (!legalities.isEmpty()) { - QJsonObject legalObj; - for (auto it = legalities.constBegin(); it != legalities.constEnd(); ++it) { - legalObj[it.key()] = it.value().toString(); - } - card["legalities"] = legalObj; - } - - QJsonObject identifiers; - identifiers["scryfallId"] = QUuid::createUuid().toString(QUuid::WithoutBraces); - card["identifiers"] = identifiers; - - return card; - } - - // Helper: build a single MTGJSON foreignData entry - QJsonObject makeForeignEntry(const QString &language, const QString &name, const QString &text) - { - QJsonObject entry; - entry["language"] = language; - entry["name"] = name; - if (!text.isEmpty()) { - entry["text"] = text; - } - return entry; - } - - NoopCardSetPriorityController *controller; - OracleImporter *importer; - CardSetPtr set; -}; - -// ============================================================================ -// sortAndReduceColors tests (tested via importCardsFromSet) -// ============================================================================ - -TEST_F(OracleImporterTest, SortAndReduceColorsSingleColor) -{ - QJsonArray cards{makeCard("Red Card", "R", "R")}; - importer->importCardsFromSet(set, cards); - - auto card = importer->getCardList().value("Red Card"); - ASSERT_FALSE(card.isNull()); - ASSERT_EQ(card->getProperty("colors"), "R"); -} - -TEST_F(OracleImporterTest, SortAndReduceColorsDeduplicates) -{ - QJsonArray cards{makeCard("Dedup Card", "WWUUB", "WU")}; - importer->importCardsFromSet(set, cards); - - auto card = importer->getCardList().value("Dedup Card"); - ASSERT_FALSE(card.isNull()); - ASSERT_EQ(card->getProperty("colors"), "WUB"); -} - -TEST_F(OracleImporterTest, SortAndReduceColorsSortsWUBRG) -{ - QJsonArray cards{makeCard("Sort Card", "RGW", "RGW")}; - importer->importCardsFromSet(set, cards); - - auto card = importer->getCardList().value("Sort Card"); - ASSERT_FALSE(card.isNull()); - ASSERT_EQ(card->getProperty("colors"), "WRG"); -} - -TEST_F(OracleImporterTest, SortAndReduceColorsAllFive) -{ - QJsonArray cards{makeCard("Five Color", "BRGWU", "BRGWU")}; - importer->importCardsFromSet(set, cards); - - auto card = importer->getCardList().value("Five Color"); - ASSERT_FALSE(card.isNull()); - ASSERT_EQ(card->getProperty("colors"), "WUBRG"); -} - -TEST_F(OracleImporterTest, SortAndReduceColorIdentity) -{ - QJsonArray cards{makeCard("Color Id Card", "W", "GWR")}; - importer->importCardsFromSet(set, cards); - - auto card = importer->getCardList().value("Color Id Card"); - ASSERT_FALSE(card.isNull()); - ASSERT_EQ(card->getProperty("coloridentity"), "WRG"); -} - -TEST_F(OracleImporterTest, SingleColorNotSorted) -{ - QJsonArray cards{makeCard("Single Card", "B", "B")}; - importer->importCardsFromSet(set, cards); - - auto card = importer->getCardList().value("Single Card"); - ASSERT_FALSE(card.isNull()); - ASSERT_EQ(card->getProperty("colors"), "B"); -} - -// ============================================================================ -// Legality guard tests -// ============================================================================ - -TEST_F(OracleImporterTest, NewCardKeepsLegalityProperties) -{ - // Verifies that format-* properties survive addCard on a fresh card - // (not the combineLegalities guard, which only runs on existing printings). - QVariantMap leg; - leg["standard"] = "legal"; - leg["modern"] = "legal"; - QJsonArray cards{makeCard("Legal Card", "", "", leg)}; - - importer->importCardsFromSet(set, cards); - auto card = importer->getCardList().value("Legal Card"); - ASSERT_FALSE(card.isNull()); - ASSERT_EQ(card->getProperty("format-standard"), "legal"); - ASSERT_EQ(card->getProperty("format-modern"), "legal"); -} - -TEST_F(OracleImporterTest, LegalityMergeAllowedWhenCardHasNoLegalities) -{ - // First printing carries no legalities at all, so the guard's - // `properties.filter(formatRegex).empty()` predicate is true and the - // second printing's legalities must be merged in. - QJsonArray cards1{makeCard("Unmerged Card")}; - importer->importCardsFromSet(set, cards1); - - CardSetPtr set2 = CardSet::newInstance(controller, "TS2", "Second Set"); - QVariantMap leg; - leg["standard"] = "legal"; - QJsonArray cards2{makeCard("Unmerged Card", "", "", leg)}; - importer->importCardsFromSet(set2, cards2); - - auto card = importer->getCardList().value("Unmerged Card"); - ASSERT_FALSE(card.isNull()); - ASSERT_EQ(card->getProperty("format-standard"), "legal"); -} - -TEST_F(OracleImporterTest, LegalityGuardPreservesFirstPrinting) -{ - // First printing: standard=legal, modern=legal - QVariantMap leg1; - leg1["standard"] = "legal"; - leg1["modern"] = "legal"; - QJsonArray cards1{makeCard("Guarded Card", "", "", leg1)}; - importer->importCardsFromSet(set, cards1); - - // Second printing: standard=banned, modern=not_legal - CardSetPtr set2 = CardSet::newInstance(controller, "TS2", "Second Set"); - QVariantMap leg2; - leg2["standard"] = "banned"; - leg2["modern"] = "not_legal"; - QJsonArray cards2{makeCard("Guarded Card", "", "", leg2)}; - importer->importCardsFromSet(set2, cards2); - - auto card = importer->getCardList().value("Guarded Card"); - ASSERT_FALSE(card.isNull()); - // Guard should preserve first printing's legalities - ASSERT_EQ(card->getProperty("format-standard"), "legal"); - ASSERT_EQ(card->getProperty("format-modern"), "legal"); -} - -// ============================================================================ -// createDefaultMagicFormats tests -// ============================================================================ - -TEST_F(OracleImporterTest, CreateDefaultMagicFormatsContainsExpectedFormats) -{ - auto formats = importer->createDefaultMagicFormats(); - ASSERT_TRUE(formats.contains("standard")); - ASSERT_TRUE(formats.contains("modern")); - ASSERT_TRUE(formats.contains("legacy")); - ASSERT_TRUE(formats.contains("vintage")); - ASSERT_TRUE(formats.contains("commander")); - ASSERT_TRUE(formats.contains("pauper")); - ASSERT_TRUE(formats.contains("pioneer")); - ASSERT_TRUE(formats.contains("brawl")); - ASSERT_TRUE(formats.contains("historic")); - ASSERT_TRUE(formats.contains("timeless")); - ASSERT_TRUE(formats.contains("duel")); - ASSERT_TRUE(formats.contains("oathbreaker")); -} - -TEST_F(OracleImporterTest, CreateDefaultMagicFormatsSingletonDeckSizes) -{ - auto formats = importer->createDefaultMagicFormats(); - auto commander = formats.value("commander"); - ASSERT_FALSE(commander.isNull()); - ASSERT_EQ(commander->minDeckSize, 100); - ASSERT_EQ(commander->maxDeckSize, 100); - ASSERT_EQ(commander->maxSideboardSize, 15); - - auto brawl = formats.value("brawl"); - ASSERT_FALSE(brawl.isNull()); - ASSERT_EQ(brawl->minDeckSize, 60); - ASSERT_EQ(brawl->maxDeckSize, 60); -} - -TEST_F(OracleImporterTest, CreateDefaultMagicFormatsVintageHasRestricted) -{ - auto formats = importer->createDefaultMagicFormats(); - auto vintage = formats.value("vintage"); - ASSERT_FALSE(vintage.isNull()); - bool hasRestricted = false; - for (const auto &ac : vintage->allowedCounts) { - if (ac.label == "restricted") { - hasRestricted = true; - ASSERT_EQ(ac.max, 1); - } - } - ASSERT_TRUE(hasRestricted); -} - -TEST_F(OracleImporterTest, CreateDefaultMagicFormatsRegexMatchesBasicLands) -{ - auto formats = importer->createDefaultMagicFormats(); - auto standard = formats.value("standard"); - ASSERT_FALSE(standard.isNull()); - ASSERT_FALSE(standard->exceptions.isEmpty()); - - auto &basicLandsException = standard->exceptions.first(); - ASSERT_FALSE(basicLandsException.conditions.isEmpty()); - - auto &condition = basicLandsException.conditions.first(); - ASSERT_EQ(condition.field, "type"); - ASSERT_EQ(condition.matchType, "regex"); - - // Verify the regex actually works (was broken before: \b = backspace, not word boundary) - QRegularExpression regex(condition.value); - ASSERT_TRUE(regex.isValid()); - ASSERT_TRUE(regex.match("Basic Land — Forest").hasMatch()); - ASSERT_TRUE(regex.match("Basic Snow Land — Mountain").hasMatch()); - ASSERT_FALSE(regex.match("Creature — Elf Warrior").hasMatch()); -} - -TEST_F(OracleImporterTest, CreateDefaultMagicFormatsCaching) -{ - // The memoized map returns the same FormatRulesPtr instances, so the - // shared pointers must be identical across calls. This is the only - // observable effect of the cache: contents would match either way. - auto first = importer->createDefaultMagicFormats(); - auto second = importer->createDefaultMagicFormats(); - ASSERT_EQ(first.value("standard").data(), second.value("standard").data()); -} - -// ============================================================================ -// readSetsFromByteArray tests -// ============================================================================ - -TEST_F(OracleImporterTest, ReadSetsFromByteArrayValidJson) -{ - QJsonObject setObj; - setObj["code"] = "tst"; - setObj["name"] = "Test Set"; - setObj["type"] = "expansion"; - setObj["releaseDate"] = "2024-01-01"; - setObj["cards"] = QJsonArray(); - - QJsonObject root; - root["data"] = QJsonObject{{"TST", setObj}}; - - QByteArray data = QJsonDocument(root).toJson(); - ASSERT_TRUE(importer->readSetsFromByteArray(data)); - ASSERT_EQ(importer->getSets().size(), 1); - ASSERT_EQ(importer->getSets().first().getShortName(), "TST"); -} - -TEST_F(OracleImporterTest, ReadSetsFromByteArrayInvalidJson) -{ - QByteArray data = "not valid json"; - ASSERT_FALSE(importer->readSetsFromByteArray(data)); -} - -TEST_F(OracleImporterTest, ReadSetsFromByteArrayEmptyData) -{ - QJsonObject root; - root["data"] = QJsonObject(); - - QByteArray data = QJsonDocument(root).toJson(); - ASSERT_FALSE(importer->readSetsFromByteArray(data)); -} - -TEST_F(OracleImporterTest, ReadSetsFromByteArrayCapitalizesSetType) -{ - QJsonObject setObj; - setObj["code"] = "ftv"; - setObj["name"] = "From The Vault"; - setObj["type"] = "from_the_vault"; - setObj["releaseDate"] = "2024-01-01"; - setObj["cards"] = QJsonArray(); - - QJsonObject root; - root["data"] = QJsonObject{{"FTV", setObj}}; - - QByteArray data = QJsonDocument(root).toJson(); - ASSERT_TRUE(importer->readSetsFromByteArray(data)); - ASSERT_EQ(importer->getSets().first().getSetType(), "From the Vault"); -} - -TEST_F(OracleImporterTest, ReadSetsFromByteArraySortsSetsByName) -{ - // QJsonObject iterates keys in lexicographic order ("AAA" before "ZZZ"), - // so leaving the natural order matching the alphabetical sort makes the - // assertion pass trivially. Inverting it keeps the sort meaningful: - // iteration yields "AAA" (Zeta Set) first, then the sort by name must - // promote "ZZZ" (Alpha Set) to the front. - QJsonObject setA; - setA["code"] = "aaa"; - setA["name"] = "Zeta Set"; - setA["type"] = "expansion"; - setA["releaseDate"] = "2024-01-01"; - setA["cards"] = QJsonArray(); - - QJsonObject setB; - setB["code"] = "zzz"; - setB["name"] = "Alpha Set"; - setB["type"] = "expansion"; - setB["releaseDate"] = "2024-01-01"; - setB["cards"] = QJsonArray(); - - QJsonObject root; - root["data"] = QJsonObject{{"AAA", setA}, {"ZZZ", setB}}; - - QByteArray data = QJsonDocument(root).toJson(); - ASSERT_TRUE(importer->readSetsFromByteArray(data)); - auto sets = importer->getSets(); - ASSERT_GE(sets.size(), 2); - ASSERT_EQ(sets.first().getShortName(), "ZZZ"); -} - -// ============================================================================ -// Split card coloridentity tests -// ============================================================================ - -TEST_F(OracleImporterTest, SplitCardColorIdentityConcatenated) -{ - QJsonObject leg{{"standard", "not_legal"}}; - - QJsonObject face1; - face1["name"] = "Fire // Ice"; - face1["text"] = "Fire deals 2 damage."; - face1["layout"] = "split"; - face1["side"] = "a"; - face1["faceName"] = "Fire"; - face1["colors"] = QJsonArray{"R"}; - face1["colorIdentity"] = QJsonArray{"R"}; - face1["types"] = QJsonArray{"Instant"}; - face1["manaCost"] = "{R}"; - face1["legalities"] = leg; - face1["identifiers"] = QJsonObject{{"scryfallId", "aaa"}}; - face1["number"] = "1"; - face1["rarity"] = "uncommon"; - - QJsonObject face2; - face2["name"] = "Fire // Ice"; - face2["text"] = "Ice taps target artifact."; - face2["layout"] = "split"; - face2["side"] = "b"; - face2["faceName"] = "Ice"; - face2["colors"] = QJsonArray{"U"}; - face2["colorIdentity"] = QJsonArray{"U"}; - face2["types"] = QJsonArray{"Instant"}; - face2["manaCost"] = "{U}"; - face2["legalities"] = leg; - face2["identifiers"] = QJsonObject{{"scryfallId", "bbb"}}; - face2["number"] = "1"; - face2["rarity"] = "uncommon"; - - QJsonArray cardsList{face1, face2}; - int count = importer->importCardsFromSet(set, cardsList); - ASSERT_EQ(count, 1); - - auto card = importer->getCardList().value("Fire // Ice"); - ASSERT_FALSE(card.isNull()); - - // coloridentity should be "RU" (concatenated), then sorted to "UR" - // by sortAndReduceColors when it reaches addCard - ASSERT_EQ(card->getProperty("coloridentity"), "UR"); -} - -TEST_F(OracleImporterTest, SplitCardColorsConcatenated) -{ - QJsonObject leg{{"standard", "not_legal"}}; - - QJsonObject face1; - face1["name"] = "Fire // Ice"; - face1["text"] = "Fire deals 2 damage."; - face1["layout"] = "split"; - face1["side"] = "a"; - face1["faceName"] = "Fire"; - face1["colors"] = QJsonArray{"R"}; - face1["colorIdentity"] = QJsonArray{"R"}; - face1["types"] = QJsonArray{"Instant"}; - face1["manaCost"] = "{R}"; - face1["legalities"] = leg; - face1["identifiers"] = QJsonObject{{"scryfallId", "aaa"}}; - face1["number"] = "1"; - face1["rarity"] = "uncommon"; - - QJsonObject face2; - face2["name"] = "Fire // Ice"; - face2["text"] = "Ice taps target artifact."; - face2["layout"] = "split"; - face2["side"] = "b"; - face2["faceName"] = "Ice"; - face2["colors"] = QJsonArray{"U"}; - face2["colorIdentity"] = QJsonArray{"U"}; - face2["types"] = QJsonArray{"Instant"}; - face2["manaCost"] = "{U}"; - face2["legalities"] = leg; - face2["identifiers"] = QJsonObject{{"scryfallId", "bbb"}}; - face2["number"] = "1"; - face2["rarity"] = "uncommon"; - - QJsonArray cardsList{face1, face2}; - importer->importCardsFromSet(set, cardsList); - - auto card = importer->getCardList().value("Fire // Ice"); - ASSERT_FALSE(card.isNull()); - - QString colors = card->getProperty("colors"); - ASSERT_FALSE(colors.contains("//")) << "colors should not contain '//', got: " << colors.toStdString(); - ASSERT_TRUE(colors.contains("R")); - ASSERT_TRUE(colors.contains("U")); -} - -// ============================================================================ -// Mana cost formatting tests -// ============================================================================ - -TEST_F(OracleImporterTest, ManaCostStripsBraces) -{ - QJsonObject card = makeCard("Mana Card"); - card["manaCost"] = "{2}{W}{B}"; - QJsonArray cards{card}; - - importer->importCardsFromSet(set, cards); - auto result = importer->getCardList().value("Mana Card"); - ASSERT_FALSE(result.isNull()); - ASSERT_EQ(result->getProperty("manacost"), "2WB"); -} - -// cmc comes through as a JSON number ("convertedManaCost"/"manaValue" are -// floats in AllPrintings), so this pins the number-to-text coercion that -// QJsonValue::toString() dropped in #7214. -TEST_F(OracleImporterTest, NumericManaValueCoercedToCmc) -{ - QJsonObject card = makeCard("Cmc Card"); - card["manaValue"] = 3; - QJsonArray cards{card}; - - importer->importCardsFromSet(set, cards); - auto result = importer->getCardList().value("Cmc Card"); - ASSERT_FALSE(result.isNull()); - ASSERT_EQ(result->getProperty("cmc"), "3"); -} - -TEST_F(OracleImporterTest, LegacyConvertedManaCostCoercedToCmc) -{ - QJsonObject card = makeCard("Legacy Cmc Card"); - card["convertedManaCost"] = 3.0; - QJsonArray cards{card}; - - importer->importCardsFromSet(set, cards); - auto result = importer->getCardList().value("Legacy Cmc Card"); - ASSERT_FALSE(result.isNull()); - ASSERT_EQ(result->getProperty("cmc"), "3"); -} - -// ============================================================================ -// Card deduplication tests -// ============================================================================ - -TEST_F(OracleImporterTest, DuplicateCardNameReturnsExisting) -{ - QJsonArray cards{makeCard("Dupe Card")}; - importer->importCardsFromSet(set, cards); - - CardSetPtr set2 = CardSet::newInstance(controller, "TS2", "Second Set"); - QJsonArray cards2{makeCard("Dupe Card")}; - importer->importCardsFromSet(set2, cards2); - - ASSERT_EQ(importer->getCardList().size(), 1); -} - -TEST_F(OracleImporterTest, AELigatureReplaced) -{ - QJsonObject card = makeCard(QString::fromUtf8("\xC3\x86ther Vial")); // Æther Vial - QJsonArray cards{card}; - - importer->importCardsFromSet(set, cards); - // Æ is replaced with AE, resulting in "AEther Vial" - ASSERT_FALSE(importer->getCardList().contains(QString::fromUtf8("\xC3\x86ther Vial"))); - ASSERT_TRUE(importer->getCardList().contains("AEther Vial")); -} - -TEST_F(OracleImporterTest, ApostropheNormalized) -{ - QJsonObject card = makeCard(QString::fromUtf8("Jace\u2019s Ingenuity")); - QJsonArray cards{card}; - - importer->importCardsFromSet(set, cards); - ASSERT_TRUE(importer->getCardList().contains("Jace's Ingenuity")); -} - -// ============================================================================ -// RawJson scanner tests -// ============================================================================ - -TEST_F(OracleImporterTest, ScanSetRangesMatchFullJsonParse) -{ - QJsonObject root; - QJsonObject data; - data["AAA"] = makeCard("Alpha Card"); - data["BBB"] = makeCard("Beta Card"); - root["data"] = data; - - const QByteArray bytes = QJsonDocument(root).toJson(QJsonDocument::Compact); - - RawJson::ScanError error; - const QList ranges = RawJson::scanSetRanges(bytes, &error); - ASSERT_FALSE(error.isError()) << error.message.toStdString(); - ASSERT_EQ(ranges.size(), 2); - - const QJsonObject wholeData = QJsonDocument::fromJson(bytes).object().value("data").toObject(); - for (const RawJson::SetRange &range : ranges) { - QJsonParseError parseError; - const QJsonDocument sliceDoc = QJsonDocument::fromJson( - QByteArray(bytes.constData() + range.dataRange.start, range.dataRange.length), &parseError); - ASSERT_EQ(parseError.error, QJsonParseError::NoError) - << range.code.toStdString() << ": " << parseError.errorString().toStdString(); - ASSERT_EQ(sliceDoc.object(), wholeData.value(range.code).toObject()) << "set " << range.code.toStdString(); - } -} - -TEST_F(OracleImporterTest, ScanSetRangesDecodesEscapesAndCountsCards) -{ - const QByteArray json = "{\"data\":{\"KEY\":{\"code\":\"zzz\",\"name\":\"\\u00c9tude \\ud83d\\ude00\"," - "\"type\":\"expansion\",\"releaseDate\":\"2024-01-05\"," - "\"cards\":[{\"name\":\"a\"},{\"name\":\"b\"},{\"name\":\"c\"}]}}}"; - - RawJson::ScanError error; - const QList ranges = RawJson::scanSetRanges(json, &error); - ASSERT_FALSE(error.isError()); - ASSERT_EQ(ranges.size(), 1); - - const RawJson::SetRange &range = ranges.first(); - ASSERT_EQ(range.code, "zzz"); // inner "code" wins over the object key - const QString expectedName = QString::fromUtf8("\xC3\x89tude ") + QChar(0xD83D) + QChar(0xDE00); - ASSERT_EQ(range.name, expectedName); - ASSERT_EQ(range.type, "expansion"); - ASSERT_EQ(range.releaseDate, "2024-01-05"); - ASSERT_EQ(range.dataRange.cardCount, 3); - - QJsonParseError parseError; - const QJsonDocument sliceDoc = QJsonDocument::fromJson( - QByteArray(json.constData() + range.dataRange.start, range.dataRange.length), &parseError); - ASSERT_EQ(parseError.error, QJsonParseError::NoError); - ASSERT_EQ(sliceDoc.object().value("name").toString(), expectedName); - ASSERT_EQ(sliceDoc.object().value("cards").toArray().size(), 3); -} - -TEST_F(OracleImporterTest, ScanSetRangesRejectsInvalidJson) -{ - const QList invalid = {"not json", - "[]", - "{\"data\":[]}", - "{\"data\":{}}", - "{\"other\":{}}", - "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"ok\",\"type\":\"x\"," - "\"releaseDate\":\"2024-01-01\",\"cards\":[]}}} trailing", - "{\"data\":{\"A\":{\"cards\":[{\"name\":\"\\uZZZZ\"}]}}}", - "{\"data\":{\"A\":{\"cards\":[{\"name\":\"bad \\q escape\"}]}}}", - "{\"data\":{\"A\":{\"cards\":[{\"name\":\"\\ud800\"}]}}}"}; - - for (const QByteArray &json : invalid) { - RawJson::ScanError error; - RawJson::scanSetRanges(json, &error); - EXPECT_TRUE(error.isError()) << "expected failure for: " << json.constData(); - } -} - -TEST_F(OracleImporterTest, ScanSetRangesMatchesFullJsonParseVerdicts) -{ - // Verdicts must agree with QJsonDocument::fromJson for the inputs below — - // including the metadata quirks ("name": null, "type": 7, "releaseDate": null, - // "cards": null) that used to make the scanner reject sets Qt accepts. - const QList inputs = { - "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"ok\",\"type\":\"x\",\"releaseDate\":\"2024-01-01\",\"cards\":[{" - "\"n\":1}]}}}", - "{\"data\":{\"A\":{\"code\":\"a\",\"name\":null,\"type\":\"x\",\"releaseDate\":\"2024-01-01\",\"cards\":[]}}}", - "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"ok\",\"type\":null,\"releaseDate\":\"2024-01-01\",\"cards\":[]}}}", - "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"ok\",\"type\":7,\"releaseDate\":\"2024-01-01\",\"cards\":null}}}", - "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"ok\",\"releaseDate\":\"2024-01-01\",\"cards\":[1,2,3]}}}", - // unescaped control character inside a string: QJsonDocument and - // skipString both accept it, so the scanner must not reject the whole doc - "{\"data\":{\"A\":{\"code\":\"a\",\"name\":\"N\tX\",\"releaseDate\":\"2024-01-01\",\"cards\":[{\"n\":1}]}}}", - // structurally invalid JSON (both parsers must reject) - "not json", - "{\"data\":{\"A\":{\"name\":\"unterminated}}", - }; - - for (const QByteArray &input : inputs) { - QJsonParseError qtError; - QJsonDocument::fromJson(input, &qtError); - const bool qtOk = qtError.error == QJsonParseError::NoError; - - RawJson::ScanError scanError; - const QList ranges = RawJson::scanSetRanges(input, &scanError); - EXPECT_EQ(qtOk, !scanError.isError()) << "verdict mismatch for: " << input.constData(); - if (scanError.isError()) { - continue; - } - for (const RawJson::SetRange &range : ranges) { - QJsonParseError sliceError; - QJsonDocument::fromJson(QByteArray(input.constData() + range.dataRange.start, range.dataRange.length), - &sliceError); - EXPECT_EQ(sliceError.error, QJsonParseError::NoError) << "bad range slice for: " << input.constData(); - } - } -} - -TEST_F(OracleImporterTest, ScanSetRangesRejectsDeepNesting) -{ - // Far beyond the shared 1024 container cap: Qt reports DeepNesting and the - // scanner must reject too, without overflowing the stack through its - // recursive skipValue walk. - QString nesting; - nesting.reserve(10000); - for (int i = 0; i < 5000; ++i) { - nesting += '['; - } - for (int i = 0; i < 5000; ++i) { - nesting += ']'; - } - const QByteArray json = ("{\"data\":{\"A\":{\"code\":\"a\",\"cards\":" + nesting + "}}}").toUtf8(); - - QJsonParseError qtError; - QJsonDocument::fromJson(json, &qtError); - ASSERT_NE(qtError.error, QJsonParseError::NoError) << "expected Qt to reject deep nesting"; - - RawJson::ScanError scanError; - RawJson::scanSetRanges(json, &scanError); - ASSERT_TRUE(scanError.isError()) << "scanner accepted a document Qt rejects as too deeply nested"; -} - -TEST_F(OracleImporterTest, ScanSetRangesAcceptsQtMaxNesting) -{ - // Pins the boundary rather than only the far-past case: a depth Qt still - // accepts must be accepted by the scanner too. Before the fix the scanner's - // cap was roughly half of Qt's (each level cost two decrements), so a - // depth of 1000 here was rejected even though QJsonDocument parses it. - constexpr int depth = 1000; - QString nesting; - nesting.reserve(2 * depth); - for (int i = 0; i < depth; ++i) { - nesting += '['; - } - for (int i = 0; i < depth; ++i) { - nesting += ']'; - } - const QByteArray json = ("{\"data\":{\"A\":{\"code\":\"a\",\"cards\":" + nesting + "}}}").toUtf8(); - - QJsonParseError qtError; - QJsonDocument::fromJson(json, &qtError); - ASSERT_EQ(qtError.error, QJsonParseError::NoError) << "expected Qt to accept depth " << depth; - - RawJson::ScanError scanError; - RawJson::scanSetRanges(json, &scanError); - ASSERT_FALSE(scanError.isError()) << "scanner rejected a document Qt accepts at depth " << depth; -} - -// ============================================================================ -// Lazy per-set parsing tests -// ============================================================================ - -TEST_F(OracleImporterTest, StartImportParsesSetsLazily) -{ - QJsonObject setObj = makeCard("Lazy Import Card"); - QJsonArray cards; - cards.append(setObj); - QJsonObject dataSet; - dataSet["code"] = "tst"; - dataSet["name"] = "Test Set"; - dataSet["type"] = "expansion"; - dataSet["releaseDate"] = "2024-01-01"; - dataSet["cards"] = cards; - - QJsonObject root; - root["data"] = QJsonObject{{"TST", dataSet}}; - - const QByteArray data = QJsonDocument(root).toJson(QJsonDocument::Compact); - ASSERT_TRUE(importer->readSetsFromByteArray(data)); - ASSERT_FALSE(importer->getRawSetsData().isEmpty()); - - const int importedSets = importer->startImport(); - ASSERT_EQ(importedSets, 1); - ASSERT_EQ(importer->getCardList().size(), 1); - ASSERT_FALSE(importer->getCardList().value("Lazy Import Card").isNull()); -} - -// ============================================================================ -// Scan progress reporting tests -// ============================================================================ - -TEST(OracleScanProgress, ScanProgressReportsMonotonicBytesToTotal) -{ - QJsonObject setObj; - setObj["code"] = "tst"; - setObj["name"] = "Test Set"; - setObj["type"] = "expansion"; - setObj["releaseDate"] = "2024-01-01"; - QJsonArray cards; - for (int i = 0; i < 40; ++i) { - QJsonObject card; - card["name"] = QString("Card %1").arg(i); - card["text"] = "Some rules text used to bulk up the card payload."; - card["layout"] = "normal"; - cards.append(card); - } - setObj["cards"] = cards; - - QJsonObject root; - root["data"] = QJsonObject{{"TST", setObj}}; - - const QByteArray data = QJsonDocument(root).toJson(QJsonDocument::Compact); - - QList> reports; - RawJson::ScanError error; - const QList ranges = - RawJson::scanSetRanges(data, &error, [&reports](qsizetype bytesRead, qsizetype totalBytes) { - reports.append({bytesRead, totalBytes}); - }); - - ASSERT_FALSE(error.isError()) << error.message.toStdString(); - ASSERT_EQ(ranges.size(), 1); - ASSERT_FALSE(reports.isEmpty()); - ASSERT_GT(reports.size(), 1); - - qsizetype last = 0; - for (const auto &[bytesRead, totalBytes] : reports) { - ASSERT_EQ(totalBytes, data.size()); - ASSERT_GE(bytesRead, last) << "scan progress must be monotonic"; - ASSERT_LE(bytesRead, totalBytes) << "scan progress must not overshoot the document size"; - last = bytesRead; - } - ASSERT_EQ(reports.constLast().first, data.size()) << "scan must end at 100%"; - ASSERT_LE(reports.size(), 160) << "scan reports must be throttled"; -} - -TEST(OracleScanProgress, ScanWithoutCallbackStillParses) -{ - QJsonObject setObj; - setObj["code"] = "tst"; - setObj["name"] = "Test Set"; - setObj["type"] = "expansion"; - setObj["releaseDate"] = "2024-01-01"; - setObj["cards"] = QJsonArray(); - - QJsonObject root; - root["data"] = QJsonObject{{"TST", setObj}}; - - const QByteArray data = QJsonDocument(root).toJson(QJsonDocument::Compact); - - RawJson::ScanError error; - const QList ranges = RawJson::scanSetRanges(data, &error); - - ASSERT_FALSE(error.isError()) << error.message.toStdString(); - ASSERT_EQ(ranges.size(), 1); - ASSERT_EQ(ranges.first().code, "tst"); -} - -TEST_F(OracleImporterTest, ReadSetsFromByteArrayEmitsScanProgress) -{ - QJsonObject setObj; - setObj["code"] = "tst"; - setObj["name"] = "Test Set"; - setObj["type"] = "expansion"; - setObj["releaseDate"] = "2024-01-01"; - QJsonArray cards; - for (int i = 0; i < 40; ++i) { - QJsonObject card; - card["name"] = QString("Card %1").arg(i); - cards.append(card); - } - setObj["cards"] = cards; - - QJsonObject root; - root["data"] = QJsonObject{{"TST", setObj}}; - - const QByteArray data = QJsonDocument(root).toJson(QJsonDocument::Compact); - - QList> emissions; - QObject::connect(importer, &OracleImporter::dataReadProgress, - [&emissions](int bytesRead, int totalBytes) { emissions.append({bytesRead, totalBytes}); }); - - ASSERT_TRUE(importer->readSetsFromByteArray(data)); - ASSERT_FALSE(emissions.isEmpty()); - for (const auto &[bytesRead, totalBytes] : emissions) { - ASSERT_EQ(totalBytes, data.size()); - ASSERT_GE(bytesRead, 0); - ASSERT_LE(bytesRead, totalBytes); - } - ASSERT_EQ(emissions.constLast().first, data.size()); -} - -TEST_F(OracleImporterTest, DisablingProgressReportingSuppressesScanEmissions) -{ - QJsonObject setObj; - setObj["code"] = "tst"; - setObj["name"] = "Test Set"; - setObj["type"] = "expansion"; - setObj["releaseDate"] = "2024-01-01"; - setObj["cards"] = QJsonArray(); - QJsonObject root; - root["data"] = QJsonObject{{"TST", setObj}}; - const QByteArray data = QJsonDocument(root).toJson(QJsonDocument::Compact); - - int emissions = 0; - QObject::connect(importer, &OracleImporter::dataReadProgress, [&emissions](int, int) { ++emissions; }); - - importer->setProgressReporting(false); - ASSERT_TRUE(importer->readSetsFromByteArray(data)); - ASSERT_EQ(emissions, 0); - - importer->setProgressReporting(true); - ASSERT_TRUE(importer->readSetsFromByteArray(data)); - ASSERT_GT(emissions, 0); -} - -// Localized card text tests -// ============================================================================ - -TEST_F(OracleImporterTest, ImportsLocalizedTextForRequestedLanguage) -{ - QJsonObject card = makeCard("Lightning Bolt"); - card["foreignData"] = - QJsonArray{makeForeignEntry("German", "Blitzschlag", "Blitzschlag fügt 3 Schadenspunkte zu.")}; - QJsonArray cards{card}; - - importer->setCardLang("de"); - importer->importCardsFromSet(set, cards); - importer->applyLocalizedData(); - - auto result = importer->getCardList().value("Lightning Bolt"); - ASSERT_FALSE(result.isNull()); - ASSERT_EQ(result->getLocalizedName("de"), "Blitzschlag"); - ASSERT_EQ(result->getLocalizedText("de"), "Blitzschlag fügt 3 Schadenspunkte zu."); - // English identity untouched - ASSERT_EQ(result->getName(), "Lightning Bolt"); - ASSERT_EQ(result->getText(), "Rules text."); -} - -TEST_F(OracleImporterTest, ImportsLocalizedNameAndTextForMultiFaceCards) -{ - // MTGJSON reports multi-face cards (adventure/split/aftermath/prepare) as one - // card object per face; every face carries the joined name but only its own - // face's rules text in foreignData. The importer joins the per-face texts with - // the same separator as the English merge. - QJsonObject front = makeCard("Disruptive Stormbrood // Petty Revenge"); - front["layout"] = "adventure"; - front["faceName"] = "Disruptive Stormbrood"; - front["side"] = "a"; - front["foreignData"] = QJsonArray{ - makeForeignEntry("German", "Disruptive Stormbrood // Kleinliche Rache", - "Fliegend\nWenn diese Kreatur ins Spiel kommt, zerstöre bis zu ein Artefakt oder eine " - "Verzauberung deiner Wahl.")}; - QJsonObject back = makeCard("Disruptive Stormbrood // Petty Revenge"); - back["layout"] = "adventure"; - back["faceName"] = "Petty Revenge"; - back["side"] = "b"; - back["text"] = "Destroy target creature."; - back["foreignData"] = QJsonArray{makeForeignEntry("German", "Disruptive Stormbrood // Kleinliche Rache", - "Zerstöre eine Kreatur deiner Wahl mit Stärke 3 oder weniger.")}; - QJsonArray cards{front, back}; - - importer->setCardLang("de"); - importer->importCardsFromSet(set, cards); - importer->applyLocalizedData(); - - auto result = importer->getCardList().value("Disruptive Stormbrood // Petty Revenge"); - ASSERT_FALSE(result.isNull()); - ASSERT_EQ(result->getLocalizedName("de"), "Disruptive Stormbrood // Kleinliche Rache"); - ASSERT_EQ(result->getLocalizedText("de"), - "Fliegend\nWenn diese Kreatur ins Spiel kommt, zerstöre bis zu ein Artefakt oder eine Verzauberung " - "deiner Wahl.\n\n---\n\nZerstöre eine Kreatur deiner Wahl mit Stärke 3 oder weniger."); - // English identity untouched - ASSERT_EQ(result->getName(), "Disruptive Stormbrood // Petty Revenge"); - ASSERT_EQ(result->getText(), "Rules text.\n\n---\n\nDestroy target creature."); -} - -TEST_F(OracleImporterTest, MultiFaceCardsWithoutCompleteForeignTextKeepEnglishText) -{ - // Both faces must carry a foreignData text for the joined text; otherwise the - // rules text stays English while the localized name (from a later complete - // printing) is still applied. - QJsonObject front = makeCard("Wear // Tear"); - front["layout"] = "split"; - front["faceName"] = "Wear"; - front["side"] = "a"; - front["foreignData"] = QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "Verschleiß-Text.")}; - QJsonObject back = makeCard("Wear // Tear"); - back["layout"] = "split"; - back["faceName"] = "Tear"; - back["side"] = "b"; - back["text"] = "Tear rules text."; - back["foreignData"] = QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "")}; - QJsonArray cards{front, back}; - - importer->setCardLang("de"); - importer->importCardsFromSet(set, cards); - importer->applyLocalizedData(); - - auto result = importer->getCardList().value("Wear // Tear"); - ASSERT_FALSE(result.isNull()); - // The joined name is still applied. - ASSERT_EQ(result->getLocalizedName("de"), "Verschleiß // Zerrreißung"); - // The incomplete text must not become the card's localized text. - ASSERT_TRUE(result->getLocalizedTexts().isEmpty()); - ASSERT_EQ(result->getText(), "Rules text.\n\n---\n\nTear rules text."); -} - -TEST_F(OracleImporterTest, DefaultLanguageSkipsForeignData) -{ - QJsonObject card = makeCard("Lightning Bolt"); - card["foreignData"] = - QJsonArray{makeForeignEntry("German", "Blitzschlag", "Blitzschlag fügt 3 Schadenspunkte zu.")}; - QJsonArray cards{card}; - - // cardLang defaults to "en" — foreignData must never be imported - importer->importCardsFromSet(set, cards); - importer->applyLocalizedData(); - - auto result = importer->getCardList().value("Lightning Bolt"); - ASSERT_FALSE(result.isNull()); - ASSERT_TRUE(result->getLocalizedNames().isEmpty()); - ASSERT_TRUE(result->getLocalizedTexts().isEmpty()); -} - -TEST_F(OracleImporterTest, UnsupportedLanguageSkipsForeignData) -{ - QJsonObject card = makeCard("Lightning Bolt"); - card["foreignData"] = QJsonArray{makeForeignEntry("xx", "Kochanie", "Grzmot uderza.")}; - QJsonArray cards{card}; - - importer->setCardLang("xx"); - importer->importCardsFromSet(set, cards); - importer->applyLocalizedData(); - - auto result = importer->getCardList().value("Lightning Bolt"); - ASSERT_FALSE(result.isNull()); - ASSERT_TRUE(result->getLocalizedNames().isEmpty()); -} - -TEST_F(OracleImporterTest, NonMatchingLanguageNotCollected) -{ - QJsonObject card = makeCard("Lightning Bolt"); - card["foreignData"] = QJsonArray{makeForeignEntry("French", "Éclair", "L'Éclair inflige 3 blessures.")}; - QJsonArray cards{card}; - - importer->setCardLang("de"); - importer->importCardsFromSet(set, cards); - importer->applyLocalizedData(); - - auto result = importer->getCardList().value("Lightning Bolt"); - ASSERT_FALSE(result.isNull()); - ASSERT_TRUE(result->getLocalizedNames().isEmpty()); -} - -TEST_F(OracleImporterTest, HigherPrioritySetWinsForReprint) -{ - // First printing in a reprint set, then another in a (more authoritative) - // core set: the core set's German text must win even though it was seen later. - QJsonObject reprintCard = makeCard("Lightning Bolt"); - reprintCard["foreignData"] = QJsonArray{makeForeignEntry("German", "Blitzschlag", "Älterer deutscher Text.")}; - CardSetPtr reprintSet = - CardSet::newInstance(controller, "TS2", "Second Set", QString(), QDate(), CardSet::PriorityReprint); - importer->setCardLang("de"); - importer->importCardsFromSet(reprintSet, QJsonArray{reprintCard}); - - QJsonObject primaryCard = makeCard("Lightning Bolt"); - primaryCard["foreignData"] = - QJsonArray{makeForeignEntry("German", "Blitzschlag", "Blitzschlag fügt 3 Schadenspunkte zu.")}; - CardSetPtr primarySet = - CardSet::newInstance(controller, "TS3", "Third Set", QString(), QDate(), CardSet::PriorityPrimary); - importer->importCardsFromSet(primarySet, QJsonArray{primaryCard}); - importer->applyLocalizedData(); - - auto result = importer->getCardList().value("Lightning Bolt"); - ASSERT_FALSE(result.isNull()); - ASSERT_EQ(result->getLocalizedName("de"), "Blitzschlag"); - ASSERT_EQ(result->getLocalizedText("de"), "Blitzschlag fügt 3 Schadenspunkte zu."); - ASSERT_EQ(importer->getCardList().size(), 1); -} - -TEST_F(OracleImporterTest, HigherPrioritySplitSetWinsForReprint) -{ - // Split cards print each face as its own card object; the joined text is - // collected per set with the same priority policy as single-face cards, so a - // reprint set's German text must yield to the core set's even when reprints - // are imported first. - QJsonObject reprintFront = makeCard("Wear // Tear"); - reprintFront["layout"] = "split"; - reprintFront["faceName"] = "Wear"; - reprintFront["side"] = "a"; - reprintFront["foreignData"] = - QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "Wear alter Text.")}; - QJsonObject reprintBack = makeCard("Wear // Tear"); - reprintBack["layout"] = "split"; - reprintBack["faceName"] = "Tear"; - reprintBack["side"] = "b"; - reprintBack["foreignData"] = - QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "Tear alter Text.")}; - CardSetPtr reprintSet = - CardSet::newInstance(controller, "TS2", "Second Set", QString(), QDate(), CardSet::PriorityReprint); - importer->setCardLang("de"); - importer->importCardsFromSet(reprintSet, QJsonArray{reprintFront, reprintBack}); - - QJsonObject primaryFront = makeCard("Wear // Tear"); - primaryFront["layout"] = "split"; - primaryFront["faceName"] = "Wear"; - primaryFront["side"] = "a"; - primaryFront["foreignData"] = - QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "Wear neuer Text.")}; - QJsonObject primaryBack = makeCard("Wear // Tear"); - primaryBack["layout"] = "split"; - primaryBack["faceName"] = "Tear"; - primaryBack["side"] = "b"; - primaryBack["foreignData"] = - QJsonArray{makeForeignEntry("German", "Verschleiß // Zerrreißung", "Tear neuer Text.")}; - CardSetPtr primarySet = - CardSet::newInstance(controller, "TS3", "Third Set", QString(), QDate(), CardSet::PriorityPrimary); - importer->importCardsFromSet(primarySet, QJsonArray{primaryFront, primaryBack}); - importer->applyLocalizedData(); - - auto result = importer->getCardList().value("Wear // Tear"); - ASSERT_FALSE(result.isNull()); - ASSERT_EQ(result->getLocalizedName("de"), "Verschleiß // Zerrreißung"); - ASSERT_EQ(result->getLocalizedText("de"), "Wear neuer Text.\n\n---\n\nTear neuer Text."); - ASSERT_EQ(importer->getCardList().size(), 1); -} - -TEST_F(OracleImporterTest, StartImportAppliesLocalizedData) -{ - QJsonObject card = makeCard("Lightning Bolt"); - card["foreignData"] = - QJsonArray{makeForeignEntry("Portuguese (Brazil)", "Raio", "Raio causa 3 de dano a qualquer alvo.")}; - QJsonObject dataSet; - dataSet["code"] = "tst"; - dataSet["name"] = "Test Set"; - dataSet["type"] = "expansion"; - dataSet["releaseDate"] = "2024-01-01"; - dataSet["cards"] = QJsonArray{card}; - - QJsonObject root; - root["data"] = QJsonObject{{"TST", dataSet}}; - - importer->setCardLang("pt"); - ASSERT_TRUE(importer->readSetsFromByteArray(QJsonDocument(root).toJson(QJsonDocument::Compact))); - ASSERT_EQ(importer->startImport(), 1); - - auto result = importer->getCardList().value("Lightning Bolt"); - ASSERT_FALSE(result.isNull()); - ASSERT_EQ(result->getLocalizedName("pt"), "Raio"); - ASSERT_EQ(result->getLocalizedText("pt"), "Raio causa 3 de dano a qualquer alvo."); -} - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/password_hash_test.cpp b/tests/password_hash_test.cpp index 2b8f8bdb7..38d9b6315 100644 --- a/tests/password_hash_test.cpp +++ b/tests/password_hash_test.cpp @@ -1,9 +1,25 @@ #include "gtest/gtest.h" -#include +#include +#include #include +RNG_Abstract *rng; + namespace { +class PasswordHashTest : public ::testing::Test +{ +protected: + void SetUp() override + { + rng = new RNG_SFMT; + } + + void TearDown() override + { + delete rng; + } +}; TEST(PasswordHashTest, RegressionTest) { @@ -13,29 +29,6 @@ TEST(PasswordHashTest, RegressionTest) QString hash = PasswordHasher::computeHash(password, salt); ASSERT_EQ(hash, salt + expected) << "The computed hash value remains the same"; } - -TEST(PasswordHashTest, SaltUsesAlphanumericCharset) -{ - static const char alphanum[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; - const QString salt = PasswordHasher::generateRandomSalt(); - ASSERT_EQ(salt.size(), 16); - for (const QChar &c : salt) { - ASSERT_NE(strchr(alphanum, c.toLatin1()), nullptr); - } -} - -TEST(PasswordHashTest, SaltsAreUnique) -{ - const QString salt1 = PasswordHasher::generateRandomSalt(); - const QString salt2 = PasswordHasher::generateRandomSalt(); - ASSERT_NE(salt1, salt2); -} - -TEST(PasswordHashTest, TokenHasExpectedLength) -{ - const QString token = PasswordHasher::generateActivationToken(); - ASSERT_EQ(token.size(), 16); -} } // namespace int main(int argc, char **argv) diff --git a/tests/server_developer_role_test.cpp b/tests/server_developer_role_test.cpp deleted file mode 100644 index 127f606a8..000000000 --- a/tests/server_developer_role_test.cpp +++ /dev/null @@ -1,137 +0,0 @@ -/** @file server_developer_role_test.cpp - * @brief Tests for the developer staff role authorization and dispatch. - * @ingroup Tests - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -// The server_remote library references the global RNG, which is normally -// defined by the servatrice/client executable main(). Provide a stub so the -// unit test can link against it. -RNG_Abstract *rng = nullptr; - -namespace -{ - -class TestDeveloperHandler : public Server_ProtocolHandler -{ -public: - explicit TestDeveloperHandler(Server *_server) : Server_ProtocolHandler(_server, nullptr) - { - } - - QString getAddress() const override - { - return {}; - } - QString getConnectionType() const override - { - return {}; - } - - // Buffer the last response code sent to the client so tests can assert on - // the outcome of processCommandContainer(). - Response::ResponseCode lastResponseCode = Response::RespNothing; - int dispatchCount = 0; - -protected: - void transmitProtocolItem(const ServerMessage &item) override - { - if (item.message_type() == ServerMessage::RESPONSE) { - lastResponseCode = item.response().response_code(); - } - } - - Response::ResponseCode - processExtendedDeveloperCommand(int cmdType, const DeveloperCommand &, ResponseContainer &) override - { - ++dispatchCount; - // Fail closed for anything not explicitly handled. - if (cmdType != DeveloperCommand::GET_SERVER_STATS) { - return Response::RespFunctionNotAllowed; - } - return Response::RespOk; - } -}; - -class DeveloperRoleTest : public ::testing::Test -{ -protected: - Server server; - TestDeveloperHandler handler{&server}; - - void setUserLevel(uint32_t level) - { - ServerInfo_User user; - user.set_user_level(level); - handler.setUserInfo(user); - } -}; - -TEST_F(DeveloperRoleTest, RejectsWhenNotLoggedIn) -{ - CommandContainer cont; - cont.add_developer_command(); - handler.processCommandContainer(cont); - EXPECT_EQ(handler.lastResponseCode, Response::RespLoginNeeded); - EXPECT_EQ(handler.dispatchCount, 0); -} - -TEST_F(DeveloperRoleTest, RejectsPlainUser) -{ - setUserLevel(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered); - - CommandContainer cont; - cont.add_developer_command(); - handler.processCommandContainer(cont); - EXPECT_EQ(handler.lastResponseCode, Response::RespLoginNeeded); - EXPECT_EQ(handler.dispatchCount, 0); -} - -TEST_F(DeveloperRoleTest, RejectsModeratorThatIsNotDeveloper) -{ - setUserLevel(ServerInfo_User::IsModerator); - - CommandContainer cont; - cont.add_developer_command(); - handler.processCommandContainer(cont); - EXPECT_EQ(handler.lastResponseCode, Response::RespLoginNeeded); -} - -TEST_F(DeveloperRoleTest, DispatchesToDeveloperCommandForDeveloper) -{ - setUserLevel(ServerInfo_User::IsDeveloper); - - CommandContainer cont; - DeveloperCommand *cmd = cont.add_developer_command(); - cmd->MutableExtension(Command_GetServerStats::ext); - handler.processCommandContainer(cont); - EXPECT_EQ(handler.lastResponseCode, Response::RespOk); - EXPECT_EQ(handler.dispatchCount, 1); -} - -TEST_F(DeveloperRoleTest, FailClosedForUnknownDeveloperCommand) -{ - setUserLevel(ServerInfo_User::IsDeveloper); - - CommandContainer cont; - cont.add_developer_command(); // no extension set -> getPbExtension() returns -1 - handler.processCommandContainer(cont); - EXPECT_EQ(handler.lastResponseCode, Response::RespFunctionNotAllowed); - EXPECT_EQ(handler.dispatchCount, 1); -} - -} // namespace - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} diff --git a/tests/server_game_join_test.cpp b/tests/server_game_join_test.cpp deleted file mode 100644 index c84e4e066..000000000 --- a/tests/server_game_join_test.cpp +++ /dev/null @@ -1,174 +0,0 @@ -/** @file server_game_join_test.cpp - * @brief Tests for the moderator/judge game-entry restriction override in Server_Game::checkJoin. - * @ingroup Tests - */ - -#include "game/server_game.h" -#include "server.h" -#include "server_database_interface.h" -#include "server_room.h" - -#include -#include -#include - -RNG_Abstract *rng = nullptr; // referenced by the server_remote library - -namespace -{ - -class MockDatabaseInterface : public Server_DatabaseInterface -{ -public: - AuthenticationResult checkUserPassword(Server_ProtocolHandler *, - const QString &, - const QString &, - const QString &, - QString &, - int &, - bool) override - { - return NotLoggedIn; - } - int getNextReplayId() override - { - return 1; - } - int getNextGameId() override - { - return 1; - } - int getActiveUserCount(QString) override - { - return 0; - } - ServerInfo_User getUserData(const QString &, bool) override - { - return ServerInfo_User(); - } -}; - -class FakeServer : public Server -{ -public: - FakeServer() - { - setDatabaseInterface(new MockDatabaseInterface()); - } -}; - -class GameJoinOverrideTest : public ::testing::Test -{ -protected: - FakeServer server; - Server_Room room{0, 0, "", "", "", "", false, "", {}, &server}; - ServerInfo_User creator; - ServerInfo_User plainUser; - ServerInfo_User unregisteredJudge; - ServerInfo_User moderator; - ServerInfo_User judge; - Server_Game *game = nullptr; - - void SetUp() override - { - creator.set_name("creator"); - creator.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered); - plainUser.set_name("plain-user"); - plainUser.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered); - unregisteredJudge.set_name("unregistered-judge"); - unregisteredJudge.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsJudge); - moderator.set_name("moderator"); - moderator.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered | - ServerInfo_User::IsModerator); - judge.set_name("judge"); - judge.set_user_level(ServerInfo_User::IsUser | ServerInfo_User::IsRegistered | ServerInfo_User::IsJudge); - } - - void TearDown() override - { - delete game; - } - - Server_Game *makeGame(bool passwordProtected, bool onlyRegistered, bool onlyBuddies, bool spectatorsAllowed) - { - GameConfig config{.creatorInfo = creator, - .gameId = 1, - .description = QString(), - .password = passwordProtected ? "secret" : QString(), - .maxPlayers = 2, - .gameTypes = QList(), - .onlyBuddies = onlyBuddies, - .onlyRegistered = onlyRegistered, - .spectatorsAllowed = spectatorsAllowed, - .spectatorsNeedPassword = true, - .spectatorsCanTalk = false, - .spectatorsSeeEverything = false, - .startingLifeTotal = 20, - .shareDecklistsOnLoad = false}; - return new Server_Game(config, &room); - } -}; - -TEST_F(GameJoinOverrideTest, StaffBypassPasswordRestriction) -{ - game = makeGame(true, false, false, true); - - // A plain user cannot override the password even with the override flag set. - EXPECT_EQ(game->checkJoin(&plainUser, "wrong", false, true, false), Response::RespWrongPassword); - // Moderators and judges may enter any game regardless of the password. - EXPECT_EQ(game->checkJoin(&moderator, "wrong", false, true, false), Response::RespOk); - EXPECT_EQ(game->checkJoin(&judge, "wrong", false, true, false), Response::RespOk); - // Without the override flag judges are still subject to the password. - EXPECT_EQ(game->checkJoin(&judge, "wrong", false, false, true), Response::RespWrongPassword); - EXPECT_EQ(game->checkJoin(&judge, "secret", false, false, true), Response::RespOk); -} - -TEST_F(GameJoinOverrideTest, StaffBypassRegisteredOnlyRestriction) -{ - game = makeGame(false, true, false, true); - - // Without the override flag the only-registered restriction still applies. - EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), false, false, false), Response::RespUserLevelTooLow); - // An unregistered judge may enter when overriding restrictions. - EXPECT_EQ(game->checkJoin(&unregisteredJudge, QString(), false, true, false), Response::RespOk); -} - -TEST_F(GameJoinOverrideTest, StaffBypassBuddiesOnlyRestriction) -{ - game = makeGame(false, false, true, true); - - // A plain user who is not on the creator's buddy list gets rejected. - EXPECT_EQ(game->checkJoin(&plainUser, QString(), false, true, false), Response::RespOnlyBuddies); - // Moderators and judges bypass the buddies-only restriction. - EXPECT_EQ(game->checkJoin(&moderator, QString(), false, true, false), Response::RespOk); - EXPECT_EQ(game->checkJoin(&judge, QString(), false, true, false), Response::RespOk); -} - -TEST_F(GameJoinOverrideTest, StaffBypassSpectatorsNotAllowedRestriction) -{ - game = makeGame(false, false, false, false); - - // A plain user cannot spectate when the game disallows spectators. - EXPECT_EQ(game->checkJoin(&plainUser, QString(), true, false, false), Response::RespSpectatorsNotAllowed); - // Moderators and judges may spectate any game regardless of the password - // and the spectator restriction. - EXPECT_EQ(game->checkJoin(&moderator, "wrong", true, true, false), Response::RespOk); - EXPECT_EQ(game->checkJoin(&judge, "wrong", true, true, false), Response::RespOk); -} - -TEST_F(GameJoinOverrideTest, JudgeOverrideDoesNotGrantJudgeJoinToPlainUser) -{ - game = makeGame(false, false, false, true); - - // joining with join_as_judge still requires the judge flag even when overriding. - EXPECT_EQ(game->checkJoin(&plainUser, QString(), false, true, true), Response::RespUserLevelTooLow); - EXPECT_EQ(game->checkJoin(&judge, QString(), false, true, true), Response::RespOk); -} - -} // namespace - -int main(int argc, char **argv) -{ - ::testing::InitGoogleTest(&argc, argv); - return RUN_ALL_TESTS(); -} \ No newline at end of file diff --git a/tests/settings/settings_defaults_test.cpp b/tests/settings/settings_defaults_test.cpp index 6e674cb86..6c79d5227 100644 --- a/tests/settings/settings_defaults_test.cpp +++ b/tests/settings/settings_defaults_test.cpp @@ -238,12 +238,6 @@ TEST_F(SettingsDefaultsTest, Tabs_ModerationOpen_Default) ASSERT_EQ(s.getTabModerationOpen(), false); } -TEST_F(SettingsDefaultsTest, Tabs_CardArtRulesOpen_Default) -{ - TabsSettings s(settingsPath, nullptr); - ASSERT_EQ(s.getTabCardArtRulesOpen(), false); -} - // --- ChatSettings --- TEST_F(SettingsDefaultsTest, Chat_Mention_Default) @@ -300,12 +294,6 @@ TEST_F(SettingsDefaultsTest, Chat_RoomHistory_Default) ASSERT_EQ(s.getRoomHistory(), true); } -TEST_F(SettingsDefaultsTest, Chat_IgnoreAllPrivateMessages_Default) -{ - ChatSettings s(settingsPath, nullptr); - ASSERT_EQ(s.getIgnoreAllPrivateMessages(), false); -} - // --- PersonalSettings --- TEST_F(SettingsDefaultsTest, Personal_Lang_Default) @@ -386,19 +374,6 @@ TEST_F(SettingsDefaultsTest, Appearance_HomeTabDisplayCardName_Default) ASSERT_EQ(s.getHomeTabDisplayCardName(), true); } -TEST_F(SettingsDefaultsTest, Appearance_HomeTabBackgroundDim_Default) -{ - AppearanceSettings s(settingsPath, nullptr); - ASSERT_EQ(s.getHomeTabBackgroundDim(), true); -} - -TEST_F(SettingsDefaultsTest, Appearance_HomeTabBackgroundDim_SetAndGet) -{ - AppearanceSettings s(settingsPath, nullptr); - s.setHomeTabBackgroundDim(false); - ASSERT_EQ(s.getHomeTabBackgroundDim(), false); -} - // --- InterfaceSettings --- TEST_F(SettingsDefaultsTest, Interface_ShowStatusBar_Default) @@ -562,32 +537,6 @@ TEST_F(SettingsDefaultsTest, CardsDisplay_ArrowDrawAnimation_Default) ASSERT_EQ(s.getArrowDrawAnimation(), true); } -TEST_F(SettingsDefaultsTest, CardsDisplay_CardLang_Default) -{ - CardsDisplaySettings s(settingsPath, nullptr); - ASSERT_EQ(s.getCardLang(), QString("en")); -} - -TEST_F(SettingsDefaultsTest, CardsDisplay_CardLang_SetAndGet) -{ - CardsDisplaySettings s(settingsPath, nullptr); - s.setCardLang("de"); - ASSERT_EQ(s.getCardLang(), QString("de")); -} - -TEST_F(SettingsDefaultsTest, CardsDisplay_CardSearchLanguage_Default) -{ - CardsDisplaySettings s(settingsPath, nullptr); - ASSERT_EQ(s.getCardSearchLanguage(), static_cast(SearchLanguageMode::English)); -} - -TEST_F(SettingsDefaultsTest, CardsDisplay_CardSearchLanguage_SetAndGet) -{ - CardsDisplaySettings s(settingsPath, nullptr); - s.setCardSearchLanguage(static_cast(SearchLanguageMode::Selected)); - ASSERT_EQ(s.getCardSearchLanguage(), static_cast(SearchLanguageMode::Selected)); -} - // --- VisualDeckStorageSettings --- TEST_F(SettingsDefaultsTest, VisualDeckStorage_SortingOrder_Default) @@ -616,19 +565,6 @@ TEST_F(SettingsDefaultsTest, VisualDeckStorage_DefaultTagsList_SetAndGet) ASSERT_EQ(s.getVisualDeckStorageDefaultTagsList(), custom); } -TEST_F(SettingsDefaultsTest, VisualDeckStorage_ShowUploadTime_Default) -{ - VisualDeckStorageSettings s(settingsPath, nullptr); - ASSERT_EQ(s.getVisualDeckStorageShowUploadTime(), true); -} - -TEST_F(SettingsDefaultsTest, VisualDeckStorage_ShowUploadTime_SetAndGet) -{ - VisualDeckStorageSettings s(settingsPath, nullptr); - s.setVisualDeckStorageShowUploadTime(false); - ASSERT_EQ(s.getVisualDeckStorageShowUploadTime(), false); -} - } // namespace int main(int argc, char **argv)