tests: add manual picture loader benchmark against the real card hosts

(cherry picked from commit 588d71d3b9a8278ab98b847802908f322c1035b7)

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"

cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp

@@ -11,7 +11,6 @@
 #include <QDirIterator>
 #include <QFileInfo>
 #include <QMainWindow>
-#include <QMetaObject>
 #include <QMovie>
 #include <QNetworkRequest>
 #include <QPainter>
@@ -56,14 +55,7 @@ CardPictureLoader::CardPictureLoader() : QObject(nullptr)
 
 CardPictureLoader::~CardPictureLoader()
 {
-    if (worker) {
-        // Capture the thread first: shutdownThread() blocks until the worker has been freed by the
-        // finished() -> deleteLater chain, after which the worker pointer must not be dereferenced.
-        QThread *pictureLoaderThread = worker->workerThread();
-        worker->shutdownThread();
-        worker = nullptr;
-        delete pictureLoaderThread;
-    }
+    worker->deleteLater();
 }
 
 void CardPictureLoader::getCardBackPixmap(QPixmap &pixmap, QSize size)
@@ -303,15 +295,7 @@ void CardPictureLoader::clearPixmapCache()
 
 void CardPictureLoader::clearNetworkCache()
 {
-    auto &worker = *getInstance().worker;
-    // The disk cache and redirect cache are owned by the worker thread; clearing them from the
-    // UI thread would race with the worker's cache reads/writes. Block until the worker thread
-    // has executed the clear so the "Cached card pictures have been reset." message is truthful.
-    if (worker.isRunning()) {
-        QMetaObject::invokeMethod(&worker, "clearNetworkCache", Qt::BlockingQueuedConnection);
-    } else {
-        worker.clearNetworkCache();
-    }
+    getInstance().worker->clearNetworkCache();
 }
 
 void CardPictureLoader::cacheCardPixmaps(const QList<ExactCard> &cards)

cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp

@@ -60,9 +60,6 @@ CardPictureLoaderWorker::CardPictureLoaderWorker()
     localLoader = new CardPictureLoaderLocal(this);
 
     pictureLoaderThread = new QThread;
-    // The worker object frees itself once its thread finishes, so no event loop is left
-    // running and the QThread is never destroyed while still executing.
-    connect(pictureLoaderThread, &QThread::finished, this, &QObject::deleteLater);
     pictureLoaderThread->start(QThread::LowPriority);
     moveToThread(pictureLoaderThread);
 
@@ -86,28 +83,7 @@ CardPictureLoaderWorker::CardPictureLoaderWorker()
 CardPictureLoaderWorker::~CardPictureLoaderWorker()
 {
     saveRedirectCache();
-}
-
-void CardPictureLoaderWorker::shutdownThread()
-{
-    // The finished() -> deleteLater chain (wired in the constructor) frees this worker as soon as
-    // its event loop exits, so nothing - not even a member read - may run once wait() returns.
-    // QThread::quit() and QThread::wait() are thread-safe and may be called from the owning thread.
-    QThread *thread = pictureLoaderThread;
-    if (thread) {
-        thread->quit();
-        thread->wait();
-    }
-}
-
-QThread *CardPictureLoaderWorker::workerThread() const
-{
-    return pictureLoaderThread;
-}
-
-bool CardPictureLoaderWorker::isRunning() const
-{
-    return pictureLoaderThread != nullptr && pictureLoaderThread->isRunning();
+    pictureLoaderThread->deleteLater();
 }
 
 void CardPictureLoaderWorker::queueRequest(const QUrl &url, CardPictureLoaderWorkerWork *worker)

cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.h

@@ -74,37 +74,10 @@ public:
      */
     void onHostRateLimited(const QString &host);
 
-    /**
-     * @brief Stops the worker thread and releases it.
-     *
-     * Called from the owning thread (CardPictureLoader) on its way out. QThread::quit() posts an
-     * exit request to the worker's event loop and QThread::wait() blocks until the loop has
-     * returned and the thread finished. Only QThread members are touched here, so this method is
-     * safe to call from the owning thread. The worker object itself is freed by the finished() ->
-     * deleteLater chain (see the constructor); the QThread object is deleted afterwards by the
-     * owner (CardPictureLoader::~CardPictureLoader), not by this method.
-     */
-    void shutdownThread();
-
-    /** @return Whether the worker's thread is currently running. */
-    bool isRunning() const;
-
-    /**
-     * @brief Returns the worker's QThread.
-     * @return The worker thread
-     *
-     * Only meaningful while the worker object is alive; capture it before calling shutdownThread().
-     */
-    QThread *workerThread() const;
+    /** @brief Clears the network cache and redirect cache. */
+    void clearNetworkCache();
 
 public slots:
-    /**
-     * @brief Clears the network cache and redirect cache.
-     *
-     * Runs on the worker thread; invoke it via a queued call when coming from another thread,
-     * since both caches are owned by the worker thread.
-     */
-    void clearNetworkCache();
     /**
      * @brief Makes a network request for the given URL using the specified worker.
      * @param url URL to load

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

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;

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.

cockatrice/src/interface/theme_manager.cpp

@@ -224,7 +224,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)) {

cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp

@@ -478,13 +478,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:

cockatrice/src/interface/window_main.cpp

@@ -92,8 +92,8 @@
 #include <libcockatrice/settings/updates_settings.h>
 
 #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"
@@ -1050,7 +1050,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());

cockatrice/src/main.cpp

@@ -231,7 +231,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);
 
@@ -250,7 +250,7 @@ int main(int argc, char *argv[])
 
     // Command-line parser
     QCommandLineParser parser;
-    parser.setApplicationDescription("Cockatrice Client");
+    parser.setApplicationDescription("Cockatrice");
     parser.addHelpOption();
     parser.addVersionOption();
 
@@ -350,8 +350,8 @@ 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");
+    // set name of the app desktop file; used by wayland to load the window icon
+    QGuiApplication::setDesktopFileName("cockatrice");
 
     SettingsCache::instance().network().setClientID(generateClientID());
 

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();
 

oracle/src/pages.cpp

@@ -796,7 +796,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:"));

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)
 {

oracle/src/raw_json_scanner.h

@@ -54,7 +54,7 @@ using ScanProgressCallback = std::function<void(qsizetype bytesRead, qsizetype t
  * @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
+ * 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.
  *

servatrice/src/servatrice_database_interface.cpp

@@ -86,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 {