jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-03 20:13:56 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

[PictureLoader] Periodically refresh the local images index (#5997)

Browse source
This commit is contained in:
RickyRister 2025-06-22 15:25:04 -07:00 • committed by GitHub
parent b69091a51a
commit c1f12f52ae
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 15 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cockatrice/src/client/ui/picture_loader/picture_loader_local.cpp
View file

@ -7,6 +7,8 @@
#include <QDirIterator> #include <QDirIterator>
#include <QMovie> #include <QMovie>
static constexpr int REFRESH_INTERVAL_MS = 10 * 1000;
PictureLoaderLocal::PictureLoaderLocal(QObject *parent) PictureLoaderLocal::PictureLoaderLocal(QObject *parent)
: QObject(parent), picsPath(SettingsCache::instance().getPicsPath()), : QObject(parent), picsPath(SettingsCache::instance().getPicsPath()),
customPicsPath(SettingsCache::instance().getCustomPicsPath()), customPicsPath(SettingsCache::instance().getCustomPicsPath()),
@ -17,11 +19,17 @@ PictureLoaderLocal::PictureLoaderLocal(QObject *parent)
connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this, connect(&SettingsCache::instance(), &SettingsCache::overrideAllCardArtWithPersonalPreferenceChanged, this,
&PictureLoaderLocal::setOverrideAllCardArtWithPersonalPreference); &PictureLoaderLocal::setOverrideAllCardArtWithPersonalPreference);
createIndex(); refreshIndex();
refreshTimer = new QTimer(this);
connect(refreshTimer, &QTimer::timeout, this, &PictureLoaderLocal::refreshIndex);
refreshTimer->start(REFRESH_INTERVAL_MS);
} }
void PictureLoaderLocal::createIndex() void PictureLoaderLocal::refreshIndex()
{ {
customFolderIndex.clear();
QDirIterator it(customPicsPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks); QDirIterator it(customPicsPath, QDirIterator::Subdirectories | QDirIterator::FollowSymlinks);
// Recursively check all subdirectories of the CUSTOM folder // Recursively check all subdirectories of the CUSTOM folder
@ -37,8 +45,8 @@ void PictureLoaderLocal::createIndex()
} }
} }
qCInfo(PictureLoaderLocalLog) << "Finished indexing local image folder CUSTOM; map now has" qCDebug(PictureLoaderLocalLog) << "Finished indexing local image folder CUSTOM; map now has"
<< customFolderIndex.size() << "entries."; << customFolderIndex.size() << "entries.";
} }
/** /**

4
cockatrice/src/client/ui/picture_loader/picture_loader_local.h
View file

@ -5,6 +5,7 @@
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QObject> #include <QObject>
#include <QTimer>
inline Q_LOGGING_CATEGORY(PictureLoaderLocalLog, "picture_loader.local"); inline Q_LOGGING_CATEGORY(PictureLoaderLocalLog, "picture_loader.local");
@ -26,8 +27,9 @@ private:
bool overrideAllCardArtWithPersonalPreference; bool overrideAllCardArtWithPersonalPreference;
QMultiHash<QString, QString> customFolderIndex; // multimap of cardName to picPaths QMultiHash<QString, QString> customFolderIndex; // multimap of cardName to picPaths
QTimer *refreshTimer;
void createIndex(); void refreshIndex();
QImage QImage
tryLoadCardImageFromDisk(const QString &setName, const QString &correctedCardName, bool searchCustomPics) const; tryLoadCardImageFromDisk(const QString &setName, const QString &correctedCardName, bool searchCustomPics) const;