Add CScriptsOfThread::GetAutomaticPluginByFilter() function

--HG--
branch : stable

diff --git a/Src/FileTransform.cpp b/Src/FileTransform.cpp
index 5ce2482..7e55c1d 100644 (file)
--- a/Src/FileTransform.cpp
+++ b/Src/FileTransform.cpp
@@ -183,21 +183,9 @@ bool FileTransform_Unpacking(String & filepath, const String& filteredText, Pack
        // control value
        bool bHandled = false;
 
-       // get the scriptlet files
-       PluginArray * piFileScriptArray = 
-               CAllThreadsScripts::GetActiveSet()->GetAvailableScripts(L"FILE_PACK_UNPACK");
-
-       // MAIN LOOP : call each handler, 
-       // stop as soon as we have a success
-       int step;
-       for (step = 0 ; bHandled == false && step < piFileScriptArray->size() ; step ++)
+       PluginInfo * plugin = CAllThreadsScripts::GetActiveSet()->GetAutomaticPluginByFilter(L"FILE_PACK_UNPACK", filteredText);
+       if (plugin)
        {
-               const PluginInfoPtr & plugin = piFileScriptArray->at(step);
-               if (plugin->m_bAutomatic == false)
-                       continue;
-               if (plugin->TestAgainstRegList(filteredText) == false)
-                       continue;
-
                handler->pluginName = plugin->m_name;
                handler->bWithFile = true;
                // use a temporary dest name
@@ -214,27 +202,19 @@ bool FileTransform_Unpacking(String & filepath, const String& filteredText, Pack
        // We can not assume that the file is text, so use a safearray and not a BSTR
        // TODO : delete this event ?   Is anyone going to use this ?
 
-       // get the scriptlet files
-       PluginArray * piBufferScriptArray = 
-               CAllThreadsScripts::GetActiveSet()->GetAvailableScripts(L"BUFFER_PACK_UNPACK");
-
-       // MAIN LOOP : call each handler, 
-       // stop as soon as we have a success
-       for (step = 0 ; bHandled == false && step < piBufferScriptArray->size() ; step ++)
+       if (!bHandled)
        {
-               const PluginInfoPtr & plugin = piBufferScriptArray->at(step);
-               if (plugin->m_bAutomatic == false)
-                       continue;
-               if (plugin->TestAgainstRegList(filteredText) == false)
-                       continue;
-
-               handler->pluginName = plugin->m_name;
-               handler->bWithFile = false;
-               bHandled = InvokeUnpackBuffer(*bufferData.GetDataBufferAnsi(),
-                       bufferData.GetNChanged(),
-                       plugin->m_lpDispatch, handler->subcode);
-               if (bHandled)
-                       bufferData.ValidateNewBuffer();
+               plugin = CAllThreadsScripts::GetActiveSet()->GetAutomaticPluginByFilter(L"BUFFER_PACK_UNPACK", filteredText);
+               if (plugin)
+               {
+                       handler->pluginName = plugin->m_name;
+                       handler->bWithFile = false;
+                       bHandled = InvokeUnpackBuffer(*bufferData.GetDataBufferAnsi(),
+                               bufferData.GetNChanged(),
+                               plugin->m_lpDispatch, handler->subcode);
+                       if (bHandled)
+                               bufferData.ValidateNewBuffer();
+               }
        }
 
        if (bHandled == false)
@@ -338,21 +318,9 @@ bool FileTransform_Prediffing(String & filepath, const String& filteredText, Pre
        // control value
        bool bHandled = false;
 
-       // get the scriptlet files
-       PluginArray * piFileScriptArray = 
-               CAllThreadsScripts::GetActiveSet()->GetAvailableScripts(L"FILE_PREDIFF");
-
-       // MAIN LOOP : call each handler, 
-       // stop as soon as we have a success
-       int step;
-       for (step = 0 ; bHandled == false && step < piFileScriptArray->size() ; step ++)
+       PluginInfo * plugin = CAllThreadsScripts::GetActiveSet()->GetAutomaticPluginByFilter(L"FILE_PREDIFF", filteredText);
+       if (plugin)
        {
-               const PluginInfoPtr & plugin = piFileScriptArray->at(step);
-               if (plugin->m_bAutomatic == false)
-                       continue;
-               if (plugin->TestAgainstRegList(filteredText) == false)
-                       continue;
-
                handler->pluginName = plugin->m_name;
                handler->bWithFile = true;
                // use a temporary dest name
@@ -366,28 +334,20 @@ bool FileTransform_Prediffing(String & filepath, const String& filteredText, Pre
                        bufferData.ValidateNewFile();
        }
 
-       // get the scriptlet files
-       PluginArray * piBufferScriptArray = 
-               CAllThreadsScripts::GetActiveSet()->GetAvailableScripts(L"BUFFER_PREDIFF");
-
-       // MAIN LOOP : call each handler, 
-       // stop as soon as we have a success
-       for (step = 0 ; bHandled == false && step < piBufferScriptArray->size() ; step ++)
+       if (!bHandled)
        {
-               const PluginInfoPtr & plugin = piBufferScriptArray->at(step);
-               if (plugin->m_bAutomatic == false)
-                       continue;
-               if (plugin->TestAgainstRegList(filteredText) == false)
-                       continue;
-
-               handler->pluginName = plugin->m_name;
-               handler->bWithFile = false;
-               // probably it is for VB/VBscript so use a BSTR as argument
-               bHandled = InvokePrediffBuffer(*bufferData.GetDataBufferUnicode(),
-                       bufferData.GetNChanged(),
-                       plugin->m_lpDispatch);
-               if (bHandled)
-                       bufferData.ValidateNewBuffer();
+               plugin = CAllThreadsScripts::GetActiveSet()->GetAutomaticPluginByFilter(L"BUFFER_PREDIFF", filteredText);
+               if (plugin)
+               {
+                       handler->pluginName = plugin->m_name;
+                       handler->bWithFile = false;
+                       // probably it is for VB/VBscript so use a BSTR as argument
+                       bHandled = InvokePrediffBuffer(*bufferData.GetDataBufferUnicode(),
+                               bufferData.GetNChanged(),
+                               plugin->m_lpDispatch);
+                       if (bHandled)
+                               bufferData.ValidateNewBuffer();
+               }
        }
 
        if (bHandled == false)

diff --git a/Src/Plugins.cpp b/Src/Plugins.cpp
index 0f388f6..aae51a0 100644 (file)
--- a/Src/Plugins.cpp
+++ b/Src/Plugins.cpp
@@ -766,6 +766,20 @@ void CScriptsOfThread::FreeScriptsForEvent(const wchar_t *transformationEvent)
                }
 }
 
+PluginInfo *CScriptsOfThread::GetAutomaticPluginByFilter(const wchar_t *transformationEvent, const String& filteredText)
+{
+       PluginArray * piFileScriptArray = GetAvailableScripts(transformationEvent);
+       for (int step = 0 ; step < piFileScriptArray->size() ; step ++)
+       {
+               const PluginInfoPtr & plugin = piFileScriptArray->at(step);
+               if (plugin->m_bAutomatic == false)
+                       continue;
+               if (plugin->TestAgainstRegList(filteredText) == false)
+                       continue;
+               return plugin.get();
+       }
+       return NULL;
+}
 
 PluginInfo * CScriptsOfThread::GetPluginByName(const wchar_t *transformationEvent, const String& name)
 {

diff --git a/Src/Plugins.h b/Src/Plugins.h
index b531d96..0fad0cc 100644 (file)
--- a/Src/Plugins.h
+++ b/Src/Plugins.h
@@ -109,6 +109,7 @@ friend class CAssureScriptsForThread;
 friend class CAllThreadsScripts;
 public:
        PluginArray * GetAvailableScripts(const wchar_t *transformationEvent);
+       PluginInfo * GetAutomaticPluginByFilter(const wchar_t *transformationEvent, const String& filteredText);
        PluginInfo * GetPluginByName(const wchar_t *transformationEvent, const String& name);
        PluginInfo * GetPluginInfo(LPDISPATCH piScript);