Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-22 22:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added missing file error checking to BadgeComponent for custom badges and controller images.

Browse source
This commit is contained in:
Leon Styhre 2022-11-02 21:18:17 +01:00
parent 71b8eba9ce
commit 3ead13ad29
1 changed files with 43 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
es-core/src/components/BadgeComponent.cpp
View file

@ -311,8 +311,18 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
if (std::find(mBadgeTypes.cbegin(), mBadgeTypes.cend(), slot) != mBadgeTypes.end()) { if (std::find(mBadgeTypes.cbegin(), mBadgeTypes.cend(), slot) != mBadgeTypes.end()) {
// The "badge_" string is required as ThemeData adds this as a prefix to avoid // The "badge_" string is required as ThemeData adds this as a prefix to avoid
// name collisions when using XML attributes. // name collisions when using XML attributes.
if (properties & PATH && elem->has("badge_" + slot)) if (properties & PATH && elem->has("badge_" + slot)) {
mBadgeIcons[slot] = elem->get<std::string>("badge_" + slot); const std::string path {elem->get<std::string>("badge_" + slot)};
if (Utils::FileSystem::exists(path) && !Utils::FileSystem::isDirectory(path)) {
mBadgeIcons[slot] = path;
}
else {
LOG(LogWarning)
<< "BadgeComponent: Invalid theme configuration, property "
"\"customBadgeIcon\" for element \""
<< element.substr(7) << "\", image does not exist: \"" << path << "\"";
}
}
FlexboxComponent::FlexboxItem item; FlexboxComponent::FlexboxItem item;
item.label = slot; item.label = slot;
@ -323,10 +333,24 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
item.overlayImage = ImageComponent {false, false}; item.overlayImage = ImageComponent {false, false};
if (slot == "folder") { if (slot == "folder") {
if (elem->has("customFolderLinkIcon")) std::string folderLinkPath {":/graphics/badge_folderlink_overlay.svg"};
item.overlayImage.setImage(elem->get<std::string>("customFolderLinkIcon"));
else if (elem->has("customFolderLinkIcon")) {
item.overlayImage.setImage(":/graphics/badge_folderlink_overlay.svg"); const std::string path {elem->get<std::string>("customFolderLinkIcon")};
if (Utils::FileSystem::exists(path) &&
!Utils::FileSystem::isDirectory(path)) {
folderLinkPath = path;
}
else {
LOG(LogWarning)
<< "BadgeComponent: Invalid theme configuration, property "
"\"customFolderLinkIcon\" for element \""
<< element.substr(7) << "\", image does not exist: \"" << path
<< "\"";
}
}
item.overlayImage.setImage(folderLinkPath);
if (elem->has("folderLinkPos")) { if (elem->has("folderLinkPos")) {
glm::vec2 folderLinkPos {elem->get<glm::vec2>("folderLinkPos")}; glm::vec2 folderLinkPos {elem->get<glm::vec2>("folderLinkPos")};
@ -360,9 +384,19 @@ void BadgeComponent::applyTheme(const std::shared_ptr<ThemeData>& theme,
} }
for (auto& gameController : sGameControllers) { for (auto& gameController : sGameControllers) {
if (properties & PATH && elem->has("controller_" + gameController.shortName)) if (properties & PATH && elem->has("controller_" + gameController.shortName)) {
gameController.fileName = const std::string path {
elem->get<std::string>("controller_" + gameController.shortName); elem->get<std::string>("controller_" + gameController.shortName)};
if (Utils::FileSystem::exists(path) && !Utils::FileSystem::isDirectory(path)) {
gameController.fileName = path;
}
else {
LOG(LogWarning)
<< "BadgeComponent: Invalid theme configuration, property "
"\"customControllerIcon\" for element \""
<< element.substr(7) << "\", image does not exist: \"" << path << "\"";
}
}
} }
GuiComponent::applyTheme(theme, view, element, properties); GuiComponent::applyTheme(theme, view, element, properties);