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

Minor Tweaks

Browse source
This commit is contained in:
ZeldaZach 2024-11-22 18:59:52 -05:00
parent fb9e7c536f
commit 19e45ce929
No known key found for this signature in database
2 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cockatrice/src/client/ui/picture_loader.cpp
View file

@ -1,17 +1,14 @@
#include "picture_loader.h"
#include "../../game/cards/card_database.h"
#include "../../game/cards/card_database_manager.h"
#include "../../settings/cache_settings.h"
#include "theme_manager.h"
#include <QApplication>
#include <QBuffer>
#include <QCryptographicHash>
#include <QDebug>
#include <QDir>
#include <QDirIterator>
#include <QFile>
#include <QFileInfo>
#include <QImageReader>
#include <QMovie>
#include <QNetworkAccessManager>
@ -23,7 +20,6 @@
#include <QRegularExpression>
#include <QScreen>
#include <QSet>
#include <QSvgRenderer>
#include <QThread>
#include <QUrl>
#include <algorithm>
@ -505,7 +501,7 @@ QUrl PictureLoaderWorker::getCachedRedirect(const QUrl &originalUrl) const
if (redirectCache.contains(originalUrl)) {
return redirectCache[originalUrl].first;
}
return QUrl();
return {};
}
void PictureLoaderWorker::loadRedirectCache()
@ -513,7 +509,7 @@ void PictureLoaderWorker::loadRedirectCache()
QSettings settings(cacheFilePath, QSettings::IniFormat);
redirectCache.clear();
int size = settings.beginReadArray("redirects");
int size = settings.beginReadArray(REDIRECT_HEADER_NAME);
for (int i = 0; i < size; ++i) {
settings.setArrayIndex(i);
QUrl originalUrl = settings.value(REDIRECT_ORIGINAL_URL).toUrl();
@ -531,7 +527,7 @@ void PictureLoaderWorker::saveRedirectCache() const
{
QSettings settings(cacheFilePath, QSettings::IniFormat);
settings.beginWriteArray("redirects", redirectCache.size());
settings.beginWriteArray(REDIRECT_HEADER_NAME, static_cast<int>(redirectCache.size()));
int index = 0;
for (auto it = redirectCache.cbegin(); it != redirectCache.cend(); ++it) {
settings.setArrayIndex(index++);

3
cockatrice/src/client/ui/picture_loader.h
View file

@ -11,6 +11,7 @@ class QNetworkAccessManager;
class QNetworkReply;
class QThread;
#define REDIRECT_HEADER_NAME "redirects"
#define REDIRECT_ORIGINAL_URL "original"
#define REDIRECT_URL "redirect"
#define REDIRECT_TIMESTAMP "timestamp"
@ -90,7 +91,7 @@ private:
QNetworkAccessManager *networkManager;
QHash<QUrl, QPair<QUrl, QDateTime>> redirectCache; // Stores redirect and timestamp
QString cacheFilePath; // Path to persistent storage
static constexpr int CacheTTLInDays = 30;
static constexpr int CacheTTLInDays = 30; // TODO: Make user configurable
QList<PictureToLoad> cardsToDownload;
PictureToLoad cardBeingLoaded;
PictureToLoad cardBeingDownloaded;