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

2479: Working Url traversal

Browse source 
Url checking is now working as expected.  In set order,
starting with custom sets, then going in priority
order by url template order, Urls will checked, and the
first successful one will be used.
This commit is contained in:
Andrew Zwicky 2018-08-09 23:50:01 -05:00
parent 8239539946
commit cbd430555f
2 changed files with 81 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cockatrice/src/pictureloader.h
View file

@ -19,9 +19,7 @@ private:
CardInfoPtr card;
QList<CardSetPtr> sortedSets;
QList<QString> urlTemplates;
QString currentUrl;
bool customSetPicturesChecked;
bool urlInitialized;
QList<QString> currentSetUrls;
int setIndex;
int urlIndex;
@ -36,11 +34,12 @@ public:
card.clear();
}
CardSetPtr getCurrentSet() const;
QString getCurrentUrl();
QString getCurrentUrl() const;
QString getSetName() const;
QString transformUrl() const;
QString transformUrl(QString urlTemplate) const;
bool nextSet();
bool nextUrl();
void populateSetUrls();
};
class PictureLoaderWorker : public QObject