jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-04 04:23:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "[WIP] Fallback on 404" (#3364)

Browse source
This commit is contained in:
Zach H 2018-08-11 09:06:18 -04:00 • committed by GitHub
parent e09ea1e683
commit e341337ce0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/src/pictureloader.h
View file

@ -18,10 +18,7 @@ private:
CardInfoPtr card;
QList<CardSetPtr> sortedSets;
QList<QString> urlTemplates;
QList<QString> currentSetUrls;
int setIndex;
int urlIndex;
public:
PictureToLoad(CardInfoPtr _card = CardInfoPtr());
@ -34,12 +31,8 @@ public:
card.clear();
}
CardSetPtr getCurrentSet() const;
QString getCurrentUrl() const;
QString getSetName() const;
QString transformUrl(QString urlTemplate) const;
bool nextSet();
bool nextUrl();
void populateSetUrls();
};
class PictureLoaderWorker : public QObject
@ -64,7 +57,7 @@ private:
PictureToLoad cardBeingDownloaded;
bool picDownload, downloadRunning, loadQueueRunning;
void startNextPicDownload();
QList<QString> getAllPicUrls();
QString getPicUrl();
bool cardImageExistsOnDisk(QString &setName, QString &correctedCardname);
bool imageIsBlackListed(const QByteArray &picData);
private slots: