Mirrors/eepp
1
0
Fork 0
mirror of https://github.com/SpartanJ/eepp.git synced 2026-05-30 01:56:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

eepp:

Browse Source 
Added Sys::execute and Sys::getProcessFilePath (not tested on macOS, could be broken).
ecode:
Optimized document search (now is async).
Improved auto-reload of plugins, should solve some issues.
Added "New Window" option on Settings Menu.
This commit is contained in:
Martín Lucas Golini
2023-10-28 01:09:00 -03:00
parent 7d2fbc4678
commit b7bdfd33ba
16 changed files with 313 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/tools/ecode/plugins/pluginmanager.cpp
View File

@@ -22,6 +22,7 @@ PluginManager::~PluginManager() {
Log::debug( "PluginManager: unloading plugin %s", plugin.second->getTitle().c_str() );
eeDelete( plugin.second );
}
unsubscribeFileSystemListener();
}
void PluginManager::registerPlugin( const PluginDefinition& def ) {
@@ -65,12 +66,18 @@ bool PluginManager::isEnabled( const std::string& id ) const {
}
bool PluginManager::reload( const std::string& id ) {
if ( !isPluginReloadEnabled() ) {
Log::warning( "PluginManager: tried to reload a plugin but plugin reload is not enabled." );
return false;
}
if ( isEnabled( id ) ) {
Log::warning( "PluginManager: reloading plugin %s", id.c_str() );
Log::warning( "PluginManager: reloading plugin %s from process %u", id.c_str(),
Sys::getProcessID() );
setEnabled( id, false );
setEnabled( id, true );
return true;
}
Log::warning( "PluginManager: tried to reload a plugin but plugin is not enabled." );
return false;
}
@@ -254,6 +261,31 @@ void PluginManager::setFileSystemListener( FileSystemListener* listener ) {
mFileSystemListener = listener;
sendBroadcast( PluginMessageType::FileSystemListenerReady, PluginMessageFormat::Empty,
nullptr );
subscribeFileSystemListener();
}
void PluginManager::subscribeFileSystemListener( Plugin* plugin ) {
mPluginsFSSubs.insert( plugin );
}
void PluginManager::unsubscribeFileSystemListener( Plugin* plugin ) {
mPluginsFSSubs.erase( plugin );
}
void PluginManager::subscribeFileSystemListener() {
if ( mFileSystemListenerCb != 0 || mFileSystemListener == nullptr )
return;
mFileSystemListenerCb =
mFileSystemListener->addListener( [this]( const FileEvent& ev, const FileInfo& file ) {
for ( Plugin* plugin : mPluginsFSSubs )
plugin->onFileSystemEvent( ev, file );
} );
}
void PluginManager::unsubscribeFileSystemListener() {
if ( mFileSystemListenerCb != 0 && mFileSystemListener )
mFileSystemListener->removeListener( mFileSystemListenerCb );
}
void PluginManager::sendBroadcast( const PluginMessageType& notification,
@@ -456,45 +488,6 @@ Plugin::Plugin( PluginManager* manager ) :
// avoid concurrency issues
{}
void Plugin::subscribeFileSystemListener() {
if ( mFileSystemListenerCb != 0 || mManager->getFileSystemListener() == nullptr )
return;
mConfigFileInfo = FileInfo( mConfigPath );
mFileSystemListenerCb = mManager->getFileSystemListener()->addListener(
[this]( const FileEvent& ev, const FileInfo& file ) {
if ( ev.type != FileSystemEventType::Modified )
return;
if ( !mShuttingDown && !isLoading() && file.getFilepath() == mConfigPath &&
file.getModificationTime() != mConfigFileInfo.getModificationTime() ) {
std::string fileContents;
FileSystem::fileGet( file.getFilepath(), fileContents );
if ( getConfigFileHash() != String::hash( fileContents ) ) {
if ( mManager->isPluginReloadEnabled() && !isLoading() && isReady() ) {
mConfigFileInfo = file;
mManager->getFileSystemListener()->removeListener( mFileSystemListenerCb );
mFileSystemListenerCb = 0;
mManager->reload( getId() );
} else {
Log::debug( "Plugin %s: Configuration file has been modified: %s. But "
"plugin reload is not enabled.",
getTitle().c_str(), mConfigPath.c_str() );
}
} else {
Log::debug( "Plugin %s: Configuration file has been modified: %s. But contents "
"are the same.",
getTitle().c_str(), mConfigPath.c_str() );
}
}
} );
}
void Plugin::unsubscribeFileSystemListener() {
if ( mFileSystemListenerCb != 0 && mManager->getFileSystemListener() )
mManager->getFileSystemListener()->removeListener( mFileSystemListenerCb );
}
bool Plugin::isReady() const {
return mReady;
}
@@ -511,6 +504,15 @@ bool Plugin::hasFileConfig() {
return !mConfigPath.empty();
}
void Plugin::subscribeFileSystemListener() {
mConfigFileInfo = FileInfo( mConfigPath );
mManager->subscribeFileSystemListener( this );
}
void Plugin::unsubscribeFileSystemListener() {
mManager->unsubscribeFileSystemListener( this );
}
std::string Plugin::getFileConfigPath() {
return mConfigPath;
}
@@ -519,9 +521,38 @@ PluginManager* Plugin::getManager() const {
return mManager;
}
void Plugin::onFileSystemEvent( const FileEvent& ev, const FileInfo& file ) {
if ( ev.type != FileSystemEventType::Modified || mShuttingDown || isLoading() )
return;
if ( file.getFilepath() != mConfigPath ||
file.getModificationTime() == mConfigFileInfo.getModificationTime() )
return;
std::string fileContents;
FileSystem::fileGet( file.getFilepath(), fileContents );
if ( getConfigFileHash() != String::hash( fileContents ) ) {
if ( mManager->isPluginReloadEnabled() && !isLoading() && isReady() ) {
mConfigFileInfo = file;
unsubscribeFileSystemListener();
mManager->reload( getId() );
} else {
Log::debug( "Plugin %s: Configuration file has been modified: %s. But "
"plugin reload is not enabled.",
getTitle().c_str(), mConfigPath.c_str() );
}
} else {
Log::debug( "Plugin %s: Configuration file has been modified: %s. But contents "
"are the same.",
getTitle().c_str(), mConfigPath.c_str() );
}
}
void Plugin::setReady() {
if ( mReady )
Log::info( "Plugin: %s loaded and ready.", getTitle().c_str() );
if ( mReady ) {
Log::info( "Plugin: %s loaded and ready from process %u", getTitle().c_str(),
Sys::getProcessID() );
}
}
PluginBase::~PluginBase() {