Skip to content

Commit

Permalink
Update Plugin Installer to get latest version from compatible versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@anjaldoshi
anjaldoshi committed Jan 31, 2025
1 parent cf817b7 commit 10a19bc
Showing 1 changed file with 55 additions and 11 deletions.
66 changes: 55 additions & 11 deletions Source/UI/PluginInstaller.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ void PluginInstaller::installPluginAndDependency (const String& plugin, String v
String response = URL (baseUrl).readEntireTextStream();

if (response.isEmpty())
LOGD ("Unable to fetch plugins! Please check your internet connection and try again.")
LOGE ("Unable to fetch plugins! Please check your internet connection and try again.")

var gatewayData;
Result result = JSON::parse (response, gatewayData);
Expand All @@ -191,7 +191,7 @@ void PluginInstaller::installPluginAndDependency (const String& plugin, String v

if (! pluginFound)
{
LOGC ("Automated Plugin Installation Failed! Plugin not found!")
LOGE ("Automated Plugin Installation Failed! Plugin not found!")
return;
}

Expand All @@ -210,7 +210,6 @@ void PluginInstaller::installPluginAndDependency (const String& plugin, String v
requiredPluginInfo.pluginName = pluginData[pIndex].getProperty ("name", "NULL").toString();
requiredPluginInfo.displayName = plugin;
requiredPluginInfo.type = pluginData[pIndex].getProperty ("type", "NULL").toString();
requiredPluginInfo.latestVersion = pluginData[pIndex].getProperty ("latest_version", "NULL");

auto allVersions = pluginData[pIndex].getProperty ("versions", "NULL").getArray();

Expand All @@ -235,7 +234,28 @@ void PluginInstaller::installPluginAndDependency (const String& plugin, String v
{
if (pluginData[i].getProperty ("name", "NULL").toString().equalsIgnoreCase (dependency))
{
requiredPluginInfo.dependencyVersions.add (pluginData[i].getProperty ("latest_version", "NULL").toString());
// Get the latest compatible version of the dependency
auto allDepVersions = pluginData[i].getProperty ("versions", "NULL").getArray();
StringArray compatibleVersions;
for (String depVersion : *allDepVersions)
{
String apiVer = depVersion.substring (depVersion.indexOf ("I") + 1);

if (apiVer.equalsIgnoreCase (String (PLUGIN_API_VER)))
compatibleVersions.add (depVersion);
}

if (! compatibleVersions.isEmpty())
{
compatibleVersions.sort (false);
requiredPluginInfo.dependencyVersions.add (compatibleVersions[compatibleVersions.size() - 1]);
}
else
{
LOGE ("Automated Plugin Installation Failed! Compatible plugin version not found!")
return;
}

break;
}
}
Expand All @@ -262,7 +282,7 @@ void PluginInstaller::installPluginAndDependency (const String& plugin, String v
}
else
{
LOGC ("Automated Plugin Installation Failed! Compatible plugin version not found!")
LOGE ("Automated Plugin Installation Failed! Compatible plugin version not found!")
return;
}
}
Expand Down Expand Up @@ -444,7 +464,27 @@ void PluginInstallerComponent::run()
{
if (gatewayData[i].getProperty ("name", "NULL").toString().equalsIgnoreCase (pName))
{
latestVer = gatewayData[i].getProperty ("latest_version", "NULL");
// Get the latest compatible version
auto allVersions = gatewayData[i].getProperty ("versions", "NULL").getArray();
StringArray compatibleVersions;
for (String depVersion : *allVersions)
{
String apiVer = depVersion.substring (depVersion.indexOf ("I") + 1);

if (apiVer.equalsIgnoreCase (String (PLUGIN_API_VER)))
compatibleVersions.add (depVersion);
}

if (! compatibleVersions.isEmpty())
{
compatibleVersions.sort (false);
latestVer = compatibleVersions[compatibleVersions.size() - 1];
}
else
{
latestVer = "0.0.0-API" + String (PLUGIN_API_VER);
}

break;
}
}
Expand Down Expand Up @@ -683,16 +723,16 @@ void PluginListBoxComponent::run()
}
else
{
String ver = pluginData[i].getProperty ("latest_version", "NULL").toString();
dependencyVersion.set (pluginName, ver);
compatibleVersions.sort (false);
dependencyVersion.set (pluginName, compatibleVersions[compatibleVersions.size() - 1]);
}
}

//setProgress ((i + 1) / (double) numRows);
}

const MessageManagerLock mmLock;
setNumRows (pluginArray.size());
MessageManager::callAsync ([this]
{ setNumRows (pluginArray.size()); });
}

bool PluginListBoxComponent::loadPluginInfo (const String& pluginName)
Expand Down Expand Up @@ -720,7 +760,6 @@ bool PluginListBoxComponent::loadPluginInfo (const String& pluginName)
selectedPluginInfo.displayName = displayNames[pluginName];
selectedPluginInfo.type = pluginLabels[pluginName];
selectedPluginInfo.developers = pluginData[pIndex].getProperty ("developers", "NULL");
selectedPluginInfo.latestVersion = pluginData[pIndex].getProperty ("latest_version", "NULL");
String updated = pluginData[pIndex].getProperty ("updated", "NULL");
selectedPluginInfo.lastUpdated = updated.substring (0, updated.indexOf ("T"));
selectedPluginInfo.description = pluginData[pIndex].getProperty ("desc", "NULL");
Expand All @@ -739,6 +778,11 @@ bool PluginListBoxComponent::loadPluginInfo (const String& pluginName)
selectedPluginInfo.versions.add (version);
}

// Set the latest version from the list of compatible versions
auto sortedVersions = selectedPluginInfo.versions;
sortedVersions.sort (false);
selectedPluginInfo.latestVersion = sortedVersions[sortedVersions.size() - 1];

selectedPluginInfo.dependencies.clear();
auto dependencies = pluginData[pIndex].getProperty ("dependencies", "NULL").getArray();
for (String dependency : *dependencies)
Expand Down

0 comments on commit 10a19bc

Please sign in to comment.