mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-01-02 19:17:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

queue scripts can now define what events they are interested in; this avoids unnecessary calling of the scripts which do not process certain events

Browse Source
This commit is contained in:
Andrey Prygunkov
2014-10-20 21:17:54 +00:00
parent c89cb3d287
commit e6f4f8c05e
3 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
daemon/queue/QueueScript.cpp
View File

@@ -50,6 +50,8 @@
extern Options* g_pOptions;
extern QueueScriptCoordinator* g_pQueueScriptCoordinator;
static const char* QUEUE_EVENT_NAMES[] = { "FILE_DOWNLOADED", "NZB_ADDED", "NZB_DOWNLOADED" };
class QueueScriptController : public Thread, public NZBScriptController
{
private:
@@ -242,9 +244,7 @@ void QueueScriptController::PrepareParams(const char* szScriptName)
SetEnvVar("NZBNA_CATEGORY", m_szCategory);
SetIntEnvVar("NZBNA_PRIORITY", m_iPriority);
SetIntEnvVar("NZBNA_LASTID", m_iID); // deprecated
const char* szEventName[] = { "FILE_DOWNLOADED", "NZB_ADDED", "NZB_DOWNLOADED" };
SetEnvVar("NZBNA_EVENT", szEventName[m_eEvent]);
SetEnvVar("NZBNA_EVENT", QUEUE_EVENT_NAMES[m_eEvent]);
PrepareEnvScript(&m_Parameters, szScriptName);
}
@@ -409,7 +409,9 @@ void QueueScriptCoordinator::EnqueueScript(NZBInfo* pNZBInfo, EEvent eEvent)
NZBParameter* pParameter = *it;
const char* szVarname = pParameter->GetName();
if (strlen(szVarname) > 0 && szVarname[0] != '*' && szVarname[strlen(szVarname)-1] == ':' &&
(!strcasecmp(pParameter->GetValue(), "yes") || !strcasecmp(pParameter->GetValue(), "on") || !strcasecmp(pParameter->GetValue(), "1")))
(!strcasecmp(pParameter->GetValue(), "yes") ||
!strcasecmp(pParameter->GetValue(), "on") ||
!strcasecmp(pParameter->GetValue(), "1")))
{
char szScriptName[1024];
strncpy(szScriptName, szVarname, 1024);
@@ -424,6 +426,8 @@ void QueueScriptCoordinator::EnqueueScript(NZBInfo* pNZBInfo, EEvent eEvent)
}
}
bUseScript &= Util::EmptyStr(pScript->GetQueueEvents()) || strstr(pScript->GetQueueEvents(), QUEUE_EVENT_NAMES[eEvent]);
if (bUseScript)
{
bool bAlreadyQueued = false;