From 1e9a596908ba85dea974e6d041b53c675f8d7b78 Mon Sep 17 00:00:00 2001
From: Trial97 <alexandru.tripon97@gmail.com>
Date: Sun, 16 Jul 2023 14:18:17 +0300
Subject: simplified code in cat packs
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
---
launcher/ui/themes/CatPack.cpp | 43 +++++++++++++++---------------------------
1 file changed, 15 insertions(+), 28 deletions(-)
(limited to 'launcher/ui/themes/CatPack.cpp')
diff --git a/launcher/ui/themes/CatPack.cpp b/launcher/ui/themes/CatPack.cpp
index 435ccdb8..e1f2caf3 100644
--- a/launcher/ui/themes/CatPack.cpp
+++ b/launcher/ui/themes/CatPack.cpp
@@ -61,37 +61,24 @@ QString BasicCatPack::path()
JsonCatPack::JsonCatPack(QFileInfo& manifestInfo) : BasicCatPack(manifestInfo.dir().dirName())
{
- QString path = FS::PathCombine("catpacks", m_id);
+ QString path = manifestInfo.path();
+ try {
+ auto doc = Json::requireDocument(manifestInfo.absoluteFilePath(), "CatPack JSON file");
+ const auto root = doc.object();
+ m_name = Json::requireString(root, "name", "Catpack name");
+ m_defaultPath = FS::PathCombine(path, Json::requireString(root, "default", "Default Cat"));
+ auto variants = Json::ensureArray(root, "variants", QJsonArray(), "Catpack Variants");
+ for (auto v : variants) {
+ auto variant = Json::ensureObject(v, QJsonObject(), "Cat variant");
+ m_variants << Variant{ FS::PathCombine(path, Json::requireString(variant, "path", "Variant path")),
+ PartialDate(Json::requireString(variant, "startTime", "Variant startTime")),
+ PartialDate(Json::requireString(variant, "endTime", "Variant endTime")) };
+ }
- if (!FS::ensureFolderPathExists(path)) {
- themeWarningLog() << "couldn't create folder for catpack!";
+ } catch (const Exception& e) {
+ themeWarningLog() << "Couldn't load catpack json:" << e.cause();
return;
}
-
- if (manifestInfo.exists() && manifestInfo.isFile()) {
- try {
- auto doc = Json::requireDocument(manifestInfo.absoluteFilePath(), "CatPack JSON file");
- const auto root = doc.object();
- m_name = Json::requireString(root, "name", "Catpack name");
- auto id = Json::ensureString(root, "id", "", "Catpack ID");
- if (!id.isEmpty())
- m_id = id;
- m_defaultPath = FS::PathCombine(path, Json::requireString(root, "default", "Deafult Cat"));
- auto variants = Json::ensureArray(root, "variants", QJsonArray(), "Catpack Variants");
- for (auto v : variants) {
- auto variant = Json::ensureObject(v, QJsonObject(), "Cat variant");
- m_variants << Variant{ FS::PathCombine(path, Json::requireString(variant, "path", "Variant path")),
- PartialDate(Json::requireString(variant, "startTime", "Variant startTime")),
- PartialDate(Json::requireString(variant, "endTime", "Variant endTime")) };
- }
-
- } catch (const Exception& e) {
- themeWarningLog() << "Couldn't load catpack json: " << e.cause();
- return;
- }
- } else {
- themeDebugLog() << "No catpack json present.";
- }
}
QString JsonCatPack::path()
--
cgit