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

simplified code in cat packs

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-07-16 14:18:17 +03:00
parent 35ccfdb799
commit 1e9a596908
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
2 changed files with 26 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,36 +61,23 @@ QString BasicCatPack::path()
JsonCatPack::JsonCatPack(QFileInfo& manifestInfo) : BasicCatPack(manifestInfo.dir().dirName()) JsonCatPack::JsonCatPack(QFileInfo& manifestInfo) : BasicCatPack(manifestInfo.dir().dirName())
{ {
QString path = FS::PathCombine("catpacks", m_id); QString path = manifestInfo.path();
try {
if (!FS::ensureFolderPathExists(path)) { auto doc = Json::requireDocument(manifestInfo.absoluteFilePath(), "CatPack JSON file");
themeWarningLog() << "couldn't create folder for catpack!"; const auto root = doc.object();
return; 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");
if (manifestInfo.exists() && manifestInfo.isFile()) { for (auto v : variants) {
try { auto variant = Json::ensureObject(v, QJsonObject(), "Cat variant");
auto doc = Json::requireDocument(manifestInfo.absoluteFilePath(), "CatPack JSON file"); m_variants << Variant{ FS::PathCombine(path, Json::requireString(variant, "path", "Variant path")),
const auto root = doc.object(); PartialDate(Json::requireString(variant, "startTime", "Variant startTime")),
m_name = Json::requireString(root, "name", "Catpack name"); PartialDate(Json::requireString(variant, "endTime", "Variant endTime")) };
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."; } catch (const Exception& e) {
themeWarningLog() << "Couldn't load catpack json:" << e.cause();
return;
} }
} }

15
launcher/ui/themes/ThemeManager.cpp
View File

@ -21,6 +21,7 @@
#include <QDir> #include <QDir>
#include <QDirIterator> #include <QDirIterator>
#include <QIcon> #include <QIcon>
#include <QImageReader>
#include "ui/themes/BrightTheme.h" #include "ui/themes/BrightTheme.h"
#include "ui/themes/CatPack.h" #include "ui/themes/CatPack.h"
#include "ui/themes/CustomTheme.h" #include "ui/themes/CustomTheme.h"
@ -179,13 +180,17 @@ void ThemeManager::initializeCatPacks()
for (auto [id, name] : defaultCats) { for (auto [id, name] : defaultCats) {
addCatPack(std::unique_ptr<CatPack>(new BasicCatPack(id, name))); addCatPack(std::unique_ptr<CatPack>(new BasicCatPack(id, name)));
} }
QDir catpacksDir("./catpacks/"); QDir catpacksDir("catpacks");
QString catpacksFolder = catpacksDir.absoluteFilePath(""); QString catpacksFolder = catpacksDir.absoluteFilePath("");
themeDebugLog() << "CatPacks Folder Path: " << catpacksFolder; themeDebugLog() << "CatPacks Folder Path:" << catpacksFolder;
auto loadFiles = [this](QDir dir) { QStringList supportedImageFormats;
for (auto format : QImageReader::supportedImageFormats()) {
supportedImageFormats.append("*." + format);
}
auto loadFiles = [this, supportedImageFormats](QDir dir) {
// Load image files directly // Load image files directly
QDirIterator ImageFileIterator(dir.absoluteFilePath(""), { "*.png", "*.gif", "*.jpg", "*.apng", "*.jxl", "*.avif" }, QDir::Files); QDirIterator ImageFileIterator(dir.absoluteFilePath(""), supportedImageFormats, QDir::Files);
while (ImageFileIterator.hasNext()) { while (ImageFileIterator.hasNext()) {
QFile customCatFile(ImageFileIterator.next()); QFile customCatFile(ImageFileIterator.next());
QFileInfo customCatFileInfo(customCatFile); QFileInfo customCatFileInfo(customCatFile);
@ -200,7 +205,7 @@ void ThemeManager::initializeCatPacks()
while (directoryIterator.hasNext()) { while (directoryIterator.hasNext()) {
QDir dir(directoryIterator.next()); QDir dir(directoryIterator.next());
QFileInfo manifest(dir.absoluteFilePath("catpack.json")); QFileInfo manifest(dir.absoluteFilePath("catpack.json"));
if (manifest.exists()) { if (manifest.isFile()) {
// Load background manifest // Load background manifest
themeDebugLog() << "Loading background manifest from:" << manifest.absoluteFilePath(); themeDebugLog() << "Loading background manifest from:" << manifest.absoluteFilePath();
addCatPack(std::unique_ptr<CatPack>(new JsonCatPack(manifest))); addCatPack(std::unique_ptr<CatPack>(new JsonCatPack(manifest)));