From d4d958018dadabe44b1543a88e40f6366c902c7e Mon Sep 17 00:00:00 2001 From: Qudix <17361645+Qudix@users.noreply.github.com> Date: Thu, 24 Feb 2022 17:57:23 -0600 Subject: [PATCH 1/3] Add `isMasterFlagged` `isLight` `isLightFlagged` --- src/runner/pythonrunner.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 5aefe00..d51b3de 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -803,6 +803,9 @@ BOOST_PYTHON_MODULE(mobase) .def("setPriority", &MOBase::IPluginList::setPriority, (bpy::arg("name"), "priority")) .def("loadOrder", &MOBase::IPluginList::loadOrder, bpy::arg("name")) .def("isMaster", &MOBase::IPluginList::isMaster, bpy::arg("name")) + .def("isMasterFlagged", &MOBase::IPluginList::isMasterFlagged, bpy::arg("name")) + .def("isLight", &MOBase::IPluginList::isLight, bpy::arg("name")) + .def("isLightFlagged", &MOBase::IPluginList::isLightFlagged, bpy::arg("name")) .def("masters", &MOBase::IPluginList::masters, bpy::arg("name")) .def("origin", &MOBase::IPluginList::origin, bpy::arg("name")) .def("onRefreshed", &MOBase::IPluginList::onRefreshed, bpy::arg("callback")) From 0423ccb9ca4536ddbe3315a7e85d539fd6072318 Mon Sep 17 00:00:00 2001 From: Qudix <17361645+Qudix@users.noreply.github.com> Date: Thu, 24 Feb 2022 20:00:56 -0600 Subject: [PATCH 2/3] Rename isX to isXFile and deprecate isMaster --- src/runner/pythonrunner.cpp | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index d51b3de..0f9276c 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -802,30 +802,31 @@ BOOST_PYTHON_MODULE(mobase) .def("priority", &MOBase::IPluginList::priority, bpy::arg("name")) .def("setPriority", &MOBase::IPluginList::setPriority, (bpy::arg("name"), "priority")) .def("loadOrder", &MOBase::IPluginList::loadOrder, bpy::arg("name")) - .def("isMaster", &MOBase::IPluginList::isMaster, bpy::arg("name")) + .def("isMasterFile", &MOBase::IPluginList::isMasterFile, bpy::arg("name")) .def("isMasterFlagged", &MOBase::IPluginList::isMasterFlagged, bpy::arg("name")) - .def("isLight", &MOBase::IPluginList::isLight, bpy::arg("name")) + .def("isLightFile", &MOBase::IPluginList::isLightFile, bpy::arg("name")) .def("isLightFlagged", &MOBase::IPluginList::isLightFlagged, bpy::arg("name")) .def("masters", &MOBase::IPluginList::masters, bpy::arg("name")) .def("origin", &MOBase::IPluginList::origin, bpy::arg("name")) .def("onRefreshed", &MOBase::IPluginList::onRefreshed, bpy::arg("callback")) .def("onPluginMoved", &MOBase::IPluginList::onPluginMoved, bpy::arg("callback")) - - // Kept but deprecated for backward compatibility: - .def("onPluginStateChanged", +[](IPluginList* modList, const std::function& fn) { - utils::show_deprecation_warning("onPluginStateChanged", - "onPluginStateChanged(Callable[[str, IPluginList.PluginStates], None]) is deprecated, " - "use onPluginStateChanged(Callable[[Dict[str, IPluginList.PluginStates], None]) instead."); - return modList->onPluginStateChanged([fn](auto const& map) { - for (const auto& entry : map) { - fn(entry.first, entry.second); - } - }); - }, bpy::arg("callback")) .def("onPluginStateChanged", &MOBase::IPluginList::onPluginStateChanged, bpy::arg("callback")) .def("pluginNames", &MOBase::IPluginList::pluginNames) .def("setState", &MOBase::IPluginList::setState, (bpy::arg("name"), "state")) .def("setLoadOrder", &MOBase::IPluginList::setLoadOrder, bpy::arg("loadorder")) + + // DEPRECATED + .def("isMaster", &MOBase::IPluginList::isMaster, bpy::arg("name")) + .def("onPluginStateChanged", +[](IPluginList* modList, const std::function& fn) { + utils::show_deprecation_warning("onPluginStateChanged", + "onPluginStateChanged(Callable[[str, IPluginList.PluginStates], None]) is deprecated, " + "use onPluginStateChanged(Callable[[Dict[str, IPluginList.PluginStates], None]) instead."); + return modList->onPluginStateChanged([fn](auto const& map) { + for (const auto& entry : map) { + fn(entry.first, entry.second); + } + }); + }, bpy::arg("callback")) ; bpy::enum_("ModState") From f3b43a5375f87f867614657d9bed528c445cf12f Mon Sep 17 00:00:00 2001 From: Qudix <17361645+Qudix@users.noreply.github.com> Date: Sat, 19 Mar 2022 19:47:35 -0500 Subject: [PATCH 3/3] Change `isXFile` to `hasXExtension` --- src/runner/pythonrunner.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/runner/pythonrunner.cpp b/src/runner/pythonrunner.cpp index 0f9276c..79b896c 100644 --- a/src/runner/pythonrunner.cpp +++ b/src/runner/pythonrunner.cpp @@ -802,9 +802,9 @@ BOOST_PYTHON_MODULE(mobase) .def("priority", &MOBase::IPluginList::priority, bpy::arg("name")) .def("setPriority", &MOBase::IPluginList::setPriority, (bpy::arg("name"), "priority")) .def("loadOrder", &MOBase::IPluginList::loadOrder, bpy::arg("name")) - .def("isMasterFile", &MOBase::IPluginList::isMasterFile, bpy::arg("name")) + .def("hasMasterExtension", &MOBase::IPluginList::hasMasterExtension, bpy::arg("name")) + .def("hasLightExtension", &MOBase::IPluginList::hasLightExtension, bpy::arg("name")) .def("isMasterFlagged", &MOBase::IPluginList::isMasterFlagged, bpy::arg("name")) - .def("isLightFile", &MOBase::IPluginList::isLightFile, bpy::arg("name")) .def("isLightFlagged", &MOBase::IPluginList::isLightFlagged, bpy::arg("name")) .def("masters", &MOBase::IPluginList::masters, bpy::arg("name")) .def("origin", &MOBase::IPluginList::origin, bpy::arg("name")) @@ -818,15 +818,15 @@ BOOST_PYTHON_MODULE(mobase) // DEPRECATED .def("isMaster", &MOBase::IPluginList::isMaster, bpy::arg("name")) .def("onPluginStateChanged", +[](IPluginList* modList, const std::function& fn) { - utils::show_deprecation_warning("onPluginStateChanged", + utils::show_deprecation_warning("onPluginStateChanged", "onPluginStateChanged(Callable[[str, IPluginList.PluginStates], None]) is deprecated, " "use onPluginStateChanged(Callable[[Dict[str, IPluginList.PluginStates], None]) instead."); - return modList->onPluginStateChanged([fn](auto const& map) { + return modList->onPluginStateChanged([fn](auto const& map) { for (const auto& entry : map) { - fn(entry.first, entry.second); + fn(entry.first, entry.second); } - }); - }, bpy::arg("callback")) + }); + }, bpy::arg("callback")) ; bpy::enum_("ModState")