mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 13:04:28 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use MultiMap instead of Map

Browse Source
This commit is contained in:
Luis Ángel San Martín
2021-10-07 22:24:37 +02:00
parent ec95f8f5c3
commit 6f1f8198d9
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
YACReaderLibrary/comic_vine/comic_vine_dialog.cpp
View File

@ -533,14 +533,14 @@ ComicDB ComicVineDialog::parseComicInfo(ComicDB &comic, const QString &json, int
comic.info.volume = result.value("volume").toMap().value("name"); comic.info.volume = result.value("volume").toMap().value("name");
if (result.contains("person_credits") && !result.value("person_credits").isNull()) { if (result.contains("person_credits") && !result.value("person_credits").isNull()) {
QMap<QString, QString> authors = getAuthors(result.value("person_credits")); auto authors = getAuthors(result.value("person_credits"));
QString writer = QStringList(authors.values("writer")).join("\n"); QString writer = authors.values("writer").join("\n");
QString penciller = QStringList(authors.values("penciller")).join("\n"); QString penciller = authors.values("penciller").join("\n");
QString inker = QStringList(authors.values("inker")).join("\n"); QString inker = authors.values("inker").join("\n");
QString colorist = QStringList(authors.values("colorist")).join("\n"); QString colorist = authors.values("colorist").join("\n");
QString letterer = QStringList(authors.values("letterer")).join("\n"); QString letterer = authors.values("letterer").join("\n");
QString coverArtist = QStringList(authors.values("cover")).join("\n"); QString coverArtist = authors.values("cover").join("\n");
comic.info.writer = writer; comic.info.writer = writer;
comic.info.penciller = penciller; comic.info.penciller = penciller;
@ -612,9 +612,9 @@ QString ComicVineDialog::getCharacters(const QVariant &json_characters)
return (characters.isEmpty()) ? "" : (characters.join("\n") + "\n"); return (characters.isEmpty()) ? "" : (characters.join("\n") + "\n");
} }
QMap<QString, QString> ComicVineDialog::getAuthors(const QVariant &json_authors) QMultiMap<QString, QString> ComicVineDialog::getAuthors(const QVariant &json_authors)
{ {
QMap<QString, QString> authors; QMultiMap<QString, QString> authors;
QListIterator<QVariant> it(json_authors.toList()); QListIterator<QVariant> it(json_authors.toList());
QVariantMap resultsValue; QVariantMap resultsValue;
@ -626,17 +626,17 @@ QMap<QString, QString> ComicVineDialog::getAuthors(const QVariant &json_authors)
QStringList roles = resultsValue.value("role").toString().split(","); QStringList roles = resultsValue.value("role").toString().split(",");
foreach (QString role, roles) { foreach (QString role, roles) {
if (role.trimmed() == "writer") if (role.trimmed() == "writer")
authors.insertMulti("writer", authorName); authors.insert("writer", authorName);
else if (role.trimmed() == "inker") else if (role.trimmed() == "inker")
authors.insertMulti("inker", authorName); authors.insert("inker", authorName);
else if (role.trimmed() == "penciler" || role.trimmed() == "penciller") else if (role.trimmed() == "penciler" || role.trimmed() == "penciller")
authors.insertMulti("penciller", authorName); authors.insert("penciller", authorName);
else if (role.trimmed() == "colorist") else if (role.trimmed() == "colorist")
authors.insertMulti("colorist", authorName); authors.insert("colorist", authorName);
else if (role.trimmed() == "letterer") else if (role.trimmed() == "letterer")
authors.insertMulti("letterer", authorName); authors.insert("letterer", authorName);
else if (role.trimmed() == "cover") else if (role.trimmed() == "cover")
authors.insertMulti("cover", authorName); authors.insert("cover", authorName);
} }
} }

2
YACReaderLibrary/comic_vine/comic_vine_dialog.h
View File

@ -64,7 +64,7 @@ protected slots:
private: private:
QString getCharacters(const QVariant &json_characters); QString getCharacters(const QVariant &json_characters);
QMap<QString, QString> getAuthors(const QVariant &json_authors); QMultiMap<QString, QString> getAuthors(const QVariant &json_authors);
QPair<QString, QString> getFirstStoryArcIdAndName(const QVariant &json_story_arcs); QPair<QString, QString> getFirstStoryArcIdAndName(const QVariant &json_story_arcs);
QPair<QString, QString> getArcNumberAndArcCount(const QString &storyArcId, const QString &comicId); QPair<QString, QString> getArcNumberAndArcCount(const QString &storyArcId, const QString &comicId);