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

[DeckList] Extract deck metadata element readers (#7325)

Browse source 
Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>
This commit is contained in:
BruebachL 2026-09-19 10:35:05 +02:00 • committed by GitHub
parent ec39ec611b
commit cb19922e55
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 44 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

62
libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
View file

@ -38,6 +38,48 @@ static double parseClampedParam(const QString &valueString, double fallback, dou
return qBound(min, value, max); return qBound(min, value, max);
} }
/**
* @brief Reads a `bannerCard` element from the XML stream.
*
* @param xml Reader positioned at the element.
* @return The referenced card.
*/
static CardRef readBannerCard(QXmlStreamReader *xml)
{
QString providerId = xml->attributes().value("providerId").toString();
QString cardName = xml->readElementText();
return {cardName, providerId};
}
/**
* @brief Reads a `playmatCard` element from the XML stream.
*
* Attribute values are read before readElementText consumes the element, and
* the params are clamped to the same ranges as the settings dialog and the
* remote player-properties path so malformed deck files cannot produce
* degenerate art rectangles (e.g. a zoom of 0 dividing by zero).
*
* @param xml Reader positioned at the element.
* @return The referenced card plus its clamped positioning parameters.
*/
static PlaymatInfo readPlaymatCard(QXmlStreamReader *xml)
{
QString providerId = xml->attributes().value("providerId").toString();
QString marginLStr = xml->attributes().value("marginPctL").toString();
QString marginRStr = xml->attributes().value("marginPctR").toString();
QString vOffStr = xml->attributes().value("verticalOffset").toString();
QString zoomStr = xml->attributes().value("zoom").toString();
QString cardName = xml->readElementText();
return {
.card = {cardName, providerId},
.params = {.marginPctL = parseClampedParam(marginLStr, 0.07, 0.0, 0.95),
.marginPctR = parseClampedParam(marginRStr, 0.07, 0.0, 0.95),
.verticalOffset = parseClampedParam(vOffStr, 0.33, 0.0, 1.0),
.zoom = parseClampedParam(zoomStr, 1.0, 0.1, 4.0)},
};
}
bool DeckList::Metadata::isEmpty() const bool DeckList::Metadata::isEmpty() const
{ {
return name.isEmpty() && comments.isEmpty() && bannerCard.isEmpty() && tags.isEmpty() && playmat.card.isEmpty(); return name.isEmpty() && comments.isEmpty() && bannerCard.isEmpty() && tags.isEmpty() && playmat.card.isEmpty();
@ -54,25 +96,9 @@ bool DeckList::Metadata::readElement(QXmlStreamReader *xml, const QString &child
} else if (childName == "comments") { } else if (childName == "comments") {
comments = xml->readElementText(); comments = xml->readElementText();
} else if (childName == "bannerCard") { } else if (childName == "bannerCard") {
QString providerId = xml->attributes().value("providerId").toString(); bannerCard = readBannerCard(xml);
QString cardName = xml->readElementText();
bannerCard = {cardName, providerId};
} else if (childName == "playmatCard") { } else if (childName == "playmatCard") {
QString providerId = xml->attributes().value("providerId").toString(); playmat = readPlaymatCard(xml);
// Attributes are read before readElementText consumes the element.
QString marginLStr = xml->attributes().value("marginPctL").toString();
QString marginRStr = xml->attributes().value("marginPctR").toString();
QString vOffStr = xml->attributes().value("verticalOffset").toString();
QString zoomStr = xml->attributes().value("zoom").toString();
QString cardName = xml->readElementText();
playmat.card = {cardName, providerId};
// Clamp to the same ranges as the settings dialog and the remote
// player-properties path so malformed deck files cannot produce
// degenerate art rectangles (e.g. a zoom of 0 dividing by zero).
playmat.params.marginPctL = parseClampedParam(marginLStr, 0.07, 0.0, 0.95);
playmat.params.marginPctR = parseClampedParam(marginRStr, 0.07, 0.0, 0.95);
playmat.params.verticalOffset = parseClampedParam(vOffStr, 0.33, 0.0, 1.0);
playmat.params.zoom = parseClampedParam(zoomStr, 1.0, 0.1, 4.0);
} else if (childName == "tags") { } else if (childName == "tags") {
tags.clear(); // Clear existing tags tags.clear(); // Clear existing tags
while (xml->readNextStartElement()) { while (xml->readNextStartElement()) {