-
Notifications
You must be signed in to change notification settings - Fork 46
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: redesigned plugin action management, replacing "templates" with…
… "batches"; resolves #15 (#51) * progress: break a bunch of stuff for actionmanager refactor * progress: more refactor changes * progress: more refactoring * progress: compiling and sort-of-functioning multi-threaded batches * progress: make batch creation easier and more flexible in the GUI * test: convert all tests to use new batch system * progress: update cli options for GUI * progress: finish replacing old template references and capabilities
- Loading branch information
1 parent
cec3cd6
commit 78da500
Showing
62 changed files
with
2,029 additions
and
1,867 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,147 @@ | ||
| #include "analyzerrunner.h" | ||
| #include "pluginaction.h" | ||
| #include "pluginactionlineage.h" | ||
| #include "pluginactionmanager.h" | ||
| #include "settingsmanager.h" | ||
|
|
||
| QSharedPointer<AnalyzerRunner> AnalyzerRunner::create( | ||
| QSharedPointer<const HobbitsPluginManager> pluginManager, | ||
| QSharedPointer<const PluginAction> action) | ||
| { | ||
| if (action->getPluginType() != PluginAction::Analyzer) { | ||
| return nullptr; | ||
| } | ||
| auto plugin = pluginManager->getAnalyzer(action->getPluginName()); | ||
| if (!plugin) { | ||
| return nullptr; | ||
| } | ||
|
|
||
| auto runner = QSharedPointer<AnalyzerRunner>(new AnalyzerRunner()); | ||
|
|
||
| runner->m_id = QUuid::createUuid(); | ||
| runner->m_analyzer = plugin; | ||
| runner->m_action = action; | ||
| runner->m_pluginFileLocation = pluginManager->getPluginLocation(plugin->getName()); | ||
|
|
||
| return runner; | ||
| } | ||
|
|
||
| QUuid AnalyzerRunner::id() const | ||
| { | ||
| return m_id; | ||
| } | ||
|
|
||
| QSharedPointer<ActionWatcher<QSharedPointer<const AnalyzerResult>>> AnalyzerRunner::getWatcher() | ||
| { | ||
| return m_actionWatcher; | ||
| } | ||
|
|
||
| QSharedPointer<BitContainer> AnalyzerRunner::container() const | ||
| { | ||
| return m_container; | ||
| } | ||
|
|
||
| QSharedPointer<ActionWatcher<QSharedPointer<const AnalyzerResult>>> AnalyzerRunner::run(QSharedPointer<BitContainer> container) | ||
| { | ||
|
|
||
| if (!m_actionWatcher.isNull() && m_actionWatcher->watcher()->future().isRunning()) { | ||
| emit reportError(m_id, QString("Analyzer runner is already running")); | ||
| return QSharedPointer<ActionWatcher<QSharedPointer<const AnalyzerResult>>>(); | ||
| } | ||
|
|
||
| auto pluginState = m_action->getPluginState(); | ||
| if (pluginState.isEmpty()) { | ||
| pluginState = m_analyzer->getStateFromUi(); | ||
| if (pluginState.isEmpty() || pluginState.contains("error")) { | ||
| if (pluginState.contains("error")) { | ||
| emit reportError(m_id, QString("Plugin '%1' reported an error with its current state: '%2'").arg( | ||
| m_analyzer->getName()).arg(pluginState.value("error").toString())); | ||
| } | ||
| else if (pluginState.isEmpty()) { | ||
| emit reportError(m_id, QString( | ||
| "Plugin '%1' is in an invalid state and can't be executed. Double check the input fields.").arg( | ||
| m_analyzer->getName())); | ||
| } | ||
| return QSharedPointer<ActionWatcher<QSharedPointer<const AnalyzerResult>>>(); | ||
| } | ||
| } | ||
|
|
||
| QSharedPointer<ActionProgress> progress(new ActionProgress()); | ||
|
|
||
| QVariant previousRunning = SettingsManager::getInstance().getPrivateSetting(SettingsData::PLUGINS_RUNNING_KEY); | ||
| QStringList runningPlugins; | ||
| if (previousRunning.isValid() && previousRunning.canConvert<QStringList>()) { | ||
| runningPlugins = previousRunning.toStringList(); | ||
| } | ||
| runningPlugins.append(m_pluginFileLocation); | ||
| SettingsManager::getInstance().setPrivateSetting(SettingsData::PLUGINS_RUNNING_KEY, QVariant(runningPlugins)); | ||
|
|
||
| auto future = QtConcurrent::run( | ||
| QThreadPool::globalInstance(), | ||
| AnalyzerRunner::analyzerCall, | ||
| m_analyzer, | ||
| container, | ||
| pluginState, | ||
| progress); | ||
|
|
||
| m_actionWatcher = QSharedPointer<ActionWatcher<QSharedPointer<const AnalyzerResult>>>( | ||
| new ActionWatcher<QSharedPointer<const AnalyzerResult>>( | ||
| future, | ||
| progress)); | ||
|
|
||
| m_container = container; | ||
|
|
||
| connect(m_actionWatcher->watcher(), SIGNAL(finished()), this, SLOT(postProcess())); | ||
| connect(m_actionWatcher->progress().data(), &ActionProgress::progressPercentChanged, [this](int progress) { | ||
| this->progress(m_id, progress); | ||
| }); | ||
|
|
||
| return m_actionWatcher; | ||
| } | ||
|
|
||
| void AnalyzerRunner::postProcess() | ||
| { | ||
| disconnect(m_actionWatcher->watcher(), SIGNAL(finished()), this, SLOT(postProcess())); | ||
| disconnect(m_actionWatcher->progress().data(), &ActionProgress::progressPercentChanged, nullptr, nullptr); | ||
|
|
||
| QSharedPointer<const AnalyzerResult> result = m_actionWatcher->watcher()->future().result(); | ||
|
|
||
| if (result.isNull()) { | ||
| QString errorString = QString("Plugin '%1' failed to execute. Double check the input fields.").arg( | ||
| m_analyzer->getName()); | ||
| emit reportError(m_id, errorString); | ||
| emit finished(m_id); | ||
| return; | ||
| } | ||
|
|
||
| if (result->getPluginState().contains("error")) { | ||
| QString errorString = QString("Plugin '%1' reported an error with its processing: %2").arg(m_analyzer->getName()).arg( | ||
| result->getPluginState().value("error").toString()); | ||
| emit reportError(m_id, errorString); | ||
| emit finished(m_id); | ||
| return; | ||
| } | ||
|
|
||
| QSharedPointer<PluginAction> action = | ||
| QSharedPointer<PluginAction>( | ||
| new PluginAction( | ||
| PluginAction::Analyzer, | ||
| m_analyzer->getName(), | ||
| result->getPluginState())); | ||
| PluginActionLineage::recordLineage(action, {m_container}, {m_container}); | ||
|
|
||
| if (!result->bitInfo().isNull()) { | ||
| m_container->setBitInfo(result->bitInfo()); | ||
| } | ||
|
|
||
| emit finished(m_id); | ||
| } | ||
|
|
||
| QSharedPointer<const AnalyzerResult> AnalyzerRunner::analyzerCall( | ||
| QSharedPointer<AnalyzerInterface> analyzer, | ||
| QSharedPointer<const BitContainer> bits, | ||
| QJsonObject pluginState, | ||
| QSharedPointer<ActionProgress> progressTracker) | ||
| { | ||
| return analyzer->analyzeBits(bits, pluginState, progressTracker); | ||
| } |
Oops, something went wrong.