Fix the 'model' token to also include the 'idol' type (fix #1501)

Bionus · Nov 12, 2018 · 67239d2 · 67239d2
1 parent f2fe916
commit 67239d2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/lib/src/models/image.cpp b/lib/src/models/image.cpp
@@ -1013,7 +1013,7 @@ QMap<QString, Token> Image::generateTokens(Profile *profile) const
 	tokens.insert("artist", Token(details["artist"], "replaceAll", "anonymous", "multiple artists"));
 	tokens.insert("copyright", Token(details["copyright"], "replaceAll", "misc", "crossover"));
 	tokens.insert("character", Token(details["character"], "replaceAll", "unknown", "group"));
-	tokens.insert("model", Token(details["model"], "replaceAll", "unknown", "multiple"));
+	tokens.insert("model", Token(details["model"] + details["idol"], "replaceAll", "unknown", "multiple"));
 	tokens.insert("species", Token(details["species"], "replaceAll", "unknown", "multiple"));
 	tokens.insert("meta", Token(details["meta"], "replaceAll", "none", "multiple"));
 	tokens.insert("allos", Token(details["allos"]));

diff --git a/lib/src/tags/tag.cpp b/lib/src/tags/tag.cpp
@@ -64,6 +64,8 @@ QString Tag::GetType(QString type, QMap<int, QString> ids)
 	if (type.contains(", "))
 		type = type.split(", ").at(0).trimmed();
 
+	if (type == QLatin1String("idol"))
+		return QStringLiteral("model");
 	if (type == QLatin1String("series"))
 		return QStringLiteral("copyright");
 	if (type == QLatin1String("mangaka"))