From e1edf0adfac853e47d60e87623f755e83f94fbb6 Mon Sep 17 00:00:00 2001
From: Xavier Jouslin de Noray <xavier.jouslindenoray@savoirfairelinux.com>
Date: Mon, 7 Aug 2023 10:47:34 -0400
Subject: [PATCH] Id: add id to identify a plugin
Change-Id: I668a3719630b57eb567e5da781f611ddcb7ed987
---
src/plugin/jamipluginmanager.cpp | 2 +-
src/plugin/pluginsutils.cpp | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/plugin/jamipluginmanager.cpp b/src/plugin/jamipluginmanager.cpp
index 73d3ac0e4c..ed0ffa1c58 100644
--- a/src/plugin/jamipluginmanager.cpp
+++ b/src/plugin/jamipluginmanager.cpp
@@ -84,7 +84,7 @@ JamiPluginManager::getPluginDetails(const std::string& rootPath)
auto itImage = details.find("backgroundPath");
itImage->second.insert(0, rootPath + DIR_SEPARATOR_CH + "data" + DIR_SEPARATOR_CH);
- details["soPath"] = rootPath + DIR_SEPARATOR_CH + LIB_PREFIX + details["name"] + LIB_TYPE;
+ details["soPath"] = rootPath + DIR_SEPARATOR_CH + LIB_PREFIX + details["id"] + LIB_TYPE;
details["author"] = getPluginAuthor(rootPath, details["name"]);
detailsIt = pluginDetailsMap_.emplace(rootPath, std::move(details)).first;
return detailsIt->second;
diff --git a/src/plugin/pluginsutils.cpp b/src/plugin/pluginsutils.cpp
index a40d21df44..cdb67f167a 100644
--- a/src/plugin/pluginsutils.cpp
+++ b/src/plugin/pluginsutils.cpp
@@ -91,12 +91,15 @@ std::map<std::string, std::string>
checkManifestJsonContentValidity(const Json::Value& root)
{
std::string name = root.get("name", "").asString();
+ std::string id = root.get("id", name).asString();
std::string description = root.get("description", "").asString();
std::string version = root.get("version", "").asString();
std::string iconPath = root.get("iconPath", "icon.png").asString();
std::string background = root.get("backgroundPath", "background.jpg").asString();
if (!name.empty() || !version.empty()) {
- return {{"name", name},
+ return {
+ {"id", id},
+ {"name", name},
{"description", description},
{"version", version},
{"iconPath", iconPath},
--
GitLab