mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-01-06 04:58:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

reworking queue (continued): merged url queue into main download queue: urls added to queue are now immediately shown in web-interface; urls can be reordered and deleted; when urls are fetched the downloaded nzb-files are put into queue at the positions of their urls; this solves the problem with fetched nzb-files ordered differently than the urls if the fetching of upper (position wise) urls were completed after of the lower urls; removed options "ReloadUrlQueue" and "ReloadPostQueue" since there are no separate url- and post-queues anymore; nzb-files added via urls have new field "URL" which can be accessed via RPC-methods "listgroups" and "history"; new env. var. "NZBNP_URL", "NZBNA_URL" and "NZBPP_URL" passed to NzbProcess, NzbAddedProcess and PostProcess-scripts; removed remote command "--list U", urls are now shown as groups by command "--list G"; RPC-method "urlqueue" is still supported for compatibility but should not be used since the urls are now returned by method "listgroups", the entries have new field "Kind" which can be "NZB" or "URL"

Browse Source
This commit is contained in:
Andrey Prygunkov
2014-03-18 22:35:58 +00:00
parent e28da0d7fd
commit bf66500aac
36 changed files with 797 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/queue/QueueScript.cpp
View File

@@ -81,8 +81,9 @@ void QueueScriptController::PrepareEnvParameters(NZBParameterList* pParameters,
}
void NZBScriptController::ExecuteScript(const char* szScript, const char* szNZBFilename, const char* szDirectory,
char** pNZBName, char** pCategory, int* iPriority, NZBParameterList* pParameters, bool* bAddTop, bool* bAddPaused)
void NZBScriptController::ExecuteScript(const char* szScript, const char* szNZBFilename,
const char* szUrl, const char* szDirectory, char** pNZBName, char** pCategory,
int* iPriority, NZBParameterList* pParameters, bool* bAddTop, bool* bAddPaused)
{
info("Executing nzb-process-script for %s", Util::BaseFileName(szNZBFilename));
@@ -101,6 +102,7 @@ void NZBScriptController::ExecuteScript(const char* szScript, const char* szNZBF
pScriptController->SetInfoName(szInfoName);
pScriptController->SetEnvVar("NZBNP_FILENAME", szNZBFilename);
pScriptController->SetEnvVar("NZBNP_URL", szUrl);
pScriptController->SetEnvVar("NZBNP_NZBNAME", strlen(*pNZBName) > 0 ? *pNZBName : Util::BaseFileName(szNZBFilename));
pScriptController->SetEnvVar("NZBNP_CATEGORY", *pCategory);
pScriptController->SetIntEnvVar("NZBNP_PRIORITY", *iPriority);
@@ -198,6 +200,7 @@ void NZBAddedScriptController::StartScript(DownloadQueue* pDownloadQueue, NZBInf
pScriptController->SetEnvVar("NZBNA_NAME", pNZBInfo->GetName());
pScriptController->SetIntEnvVar("NZBPP_NZBID", pNZBInfo->GetID());
pScriptController->SetEnvVar("NZBNA_FILENAME", pNZBInfo->GetFilename());
pScriptController->SetEnvVar("NZBNA_URL", pNZBInfo->GetURL());
pScriptController->SetEnvVar("NZBNA_CATEGORY", pNZBInfo->GetCategory());
pScriptController->SetIntEnvVar("NZBNA_LASTID", pNZBInfo->GetID());
pScriptController->SetIntEnvVar("NZBNA_PRIORITY", pNZBInfo->GetPriority());