flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Updated plugin list format (#4557)

Browse Source
This commit is contained in:
Mat 2020-03-27 14:47:04 +02:00 committed by GitHub
parent ea386eaab1
commit 7d8da81b92
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Bindings/PluginManager.cpp
View File

@ -154,8 +154,9 @@ void cPluginManager::ReloadPluginsNow(cSettingsRepositoryInterface & a_Settings)
void cPluginManager::InsertDefaultPlugins(cSettingsRepositoryInterface & a_Settings) void cPluginManager::InsertDefaultPlugins(cSettingsRepositoryInterface & a_Settings)
{ {
a_Settings.AddKeyName("Plugins"); a_Settings.AddKeyName("Plugins");
a_Settings.AddValue("Plugins", "Plugin", "Core"); a_Settings.AddValue("Plugins", "Core", "1");
a_Settings.AddValue("Plugins", "Plugin", "ChatLog"); a_Settings.AddValue("Plugins", "ChatLog", "1");
a_Settings.AddValue("Plugins", "ProtectionAreas", "0");
} }
@ -1733,22 +1734,40 @@ AStringVector cPluginManager::GetFoldersToLoad(cSettingsRepositoryInterface & a_
InsertDefaultPlugins(a_Settings); InsertDefaultPlugins(a_Settings);
} }
// Get the list of plugins to load:
AStringVector res; AStringVector res;
auto Values = a_Settings.GetValues("Plugins");
for (auto NameValue : Values) // Get the old format plugin list, and migrate it.
// Upgrade path added on 2020-03-27
auto OldValues = a_Settings.GetValues("Plugins");
for (auto NameValue : OldValues)
{ {
AString ValueName = NameValue.first; AString ValueName = NameValue.first;
if (ValueName.compare("Plugin") == 0) if (ValueName.compare("Plugin") == 0)
{ {
AString PluginFile = NameValue.second; AString PluginFile = NameValue.second;
if (!PluginFile.empty()) if (
!PluginFile.empty() &&
(PluginFile != "0") &&
(PluginFile != "1")
)
{ {
res.push_back(PluginFile); a_Settings.DeleteValue("Plugins", ValueName);
a_Settings.SetValue("Plugins", PluginFile, "1");
} }
} }
} // for i - ini values } // for i - ini values
// Get the list of plugins to load:
auto Values = a_Settings.GetValues("Plugins");
for (auto NameValue : Values)
{
AString Enabled = NameValue.second;
if (Enabled == "1")
{
res.push_back(NameValue.first);
}
} // for i - ini values
return res; return res;
} }