CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

added catpacks tests

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97
2023-08-27 23:40:32 +03:00
parent 9110fbf282
commit 07d8598638
4 changed files with 92 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
launcher/ui/themes/CatPack.cpp
View File

@ -99,18 +99,22 @@ QDate ensureDay(int year, int month, int day)
QString JsonCatPack::path()
{
const QDate now = QDate::currentDate();
return path(QDate::currentDate());
}
QString JsonCatPack::path(QDate now)
{
for (auto var : m_variants) {
QDate startDate = ensureDay(now.year(), var.startTime.month, var.startTime.day);
QDate endDate = ensureDay(now.year(), var.endTime.month, var.endTime.day);
if (startDate > endDate) { // it's spans over multiple years
if (endDate <= now) // end date is in the past so jump one year into the future for endDate
if (endDate < now) // end date is in the past so jump one year into the future for endDate
endDate = endDate.addYears(1);
else // end date is in the future so jump one year into the past for startDate
startDate = startDate.addYears(-1);
}
if (startDate >= now && now >= endDate)
if (startDate <= now && now <= endDate)
return var.path;
}
return m_defaultPath;

9
launcher/ui/themes/CatPack.h
View File

@ -52,9 +52,9 @@ class BasicCatPack : public CatPack {
public:
BasicCatPack(QString id, QString name) : m_id(id), m_name(name) {}
BasicCatPack(QString id) : BasicCatPack(id, id) {}
virtual QString id() { return m_id; }
virtual QString name() { return m_name; }
virtual QString path();
virtual QString id() override { return m_id; }
virtual QString name() override { return m_name; }
virtual QString path() override;
protected:
QString m_id;
@ -83,7 +83,8 @@ class JsonCatPack : public BasicCatPack {
PartialDate endTime;
};
JsonCatPack(QFileInfo& manifestInfo);
virtual QString path();
virtual QString path() override;
QString path(QDate now);
private:
QString m_defaultPath;