mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-05-24 12:44:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

added support for detection of bad downloads (fakes, etc.): extended queue-scripts with new event "UNPACK", scripts are called before unpack and have a chance to detect bad downloads before unpacking; queue-scripts and post-processing scripts can mark downloads as bad by printing special command; marked downloads become status "FAILURE/BAD" and are processed by the program as failures (triggering duplicate handling); scripts executed thereafter see the new status and can react accordingly (inform an indexer or a third-party automation tool); new env. var "NZBNA_DIRECTORY" passed to queue scripts

Browse Source
This commit is contained in:
Andrey Prygunkov
2014-08-11 23:15:58 +00:00
parent 9090fe5fc9
commit 6a14353391
7 changed files with 109 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
daemon/queue/QueueScript.cpp
View File

@@ -264,9 +264,10 @@ QueueScriptController::~QueueScriptController()
free(m_szNZBFilename);
free(m_szUrl);
free(m_szCategory);
free(m_szDestDir);
}
void QueueScriptController::StartScripts(DownloadQueue* pDownloadQueue, NZBInfo *pNZBInfo)
void QueueScriptController::StartScripts(NZBInfo *pNZBInfo, EEvent eEvent, bool bSyncMode)
{
QueueScriptController* pScriptController = new QueueScriptController();
@@ -274,13 +275,25 @@ void QueueScriptController::StartScripts(DownloadQueue* pDownloadQueue, NZBInfo
pScriptController->m_szNZBFilename = strdup(pNZBInfo->GetFilename());
pScriptController->m_szUrl = strdup(pNZBInfo->GetURL());
pScriptController->m_szCategory = strdup(pNZBInfo->GetCategory());
pScriptController->m_szDestDir = strdup(pNZBInfo->GetDestDir());
pScriptController->m_iID = pNZBInfo->GetID();
pScriptController->m_iPriority = pNZBInfo->GetPriority();
pScriptController->m_Parameters.CopyFrom(pNZBInfo->GetParameters());
pScriptController->m_eEvent = eEvent;
pScriptController->m_iPrefixLen = 0;
pScriptController->SetAutoDestroy(true);
pScriptController->Start();
if (bSyncMode)
{
pScriptController->m_pNZBInfo = pNZBInfo;
pScriptController->Run();
delete pScriptController;
}
else
{
pScriptController->m_pNZBInfo = NULL;
pScriptController->SetAutoDestroy(true);
pScriptController->Start();
}
}
void QueueScriptController::Run()
@@ -306,6 +319,7 @@ void QueueScriptController::ExecuteScript(Options::Script* pScript)
SetInfoName(szInfoName);
SetLogPrefix(pScript->GetDisplayName());
m_iPrefixLen = strlen(pScript->GetDisplayName()) + 2; // 2 = strlen(": ");
PrepareParams(pScript->GetName());
Execute();
@@ -320,11 +334,40 @@ void QueueScriptController::PrepareParams(const char* szScriptName)
SetEnvVar("NZBNA_NZBNAME", m_szNZBName);
SetIntEnvVar("NZBNA_NZBID", m_iID);
SetEnvVar("NZBNA_FILENAME", m_szNZBFilename);
SetEnvVar("NZBNA_DIRECTORY", m_szDestDir);
SetEnvVar("NZBNA_URL", m_szUrl);
SetEnvVar("NZBNA_EVENT", "NZB_ADDED");
SetEnvVar("NZBNA_CATEGORY", m_szCategory);
SetIntEnvVar("NZBNA_PRIORITY", m_iPriority);
SetIntEnvVar("NZBNA_LASTID", m_iID); // deprecated
const char* szEventName[] = { "NZB_ADDED", "UNPACK" };
SetEnvVar("NZBNA_EVENT", szEventName[m_eEvent]);
PrepareEnvScript(&m_Parameters, szScriptName);
}
void QueueScriptController::AddMessage(Message::EKind eKind, const char* szText)
{
const char* szMsgText = szText + m_iPrefixLen;
if (!strncmp(szMsgText, "[NZB] ", 6))
{
debug("Command %s detected", szMsgText + 6);
if (!strncmp(szMsgText + 6, "MARK=BAD", 8))
{
if (m_pNZBInfo)
{
PrintMessage(Message::mkWarning, "Marking %s as bad", m_szNZBName);
m_pNZBInfo->SetMarkStatus(NZBInfo::ksBad);
}
}
else
{
error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
}
}
else
{
ScriptController::AddMessage(eKind, szText);
}
}