mirror/nzbget
1
0
Fork 0
mirror of https://github.com/nzbget/nzbget.git synced 2026-02-06 12:11:09 -05:00
Code Issues Packages Projects Releases Wiki Activity

improvement in support for detection of bad downloads (fakes, etc.): scripts supporting two modes (post-processing-mode and queue-mode) are now executed if selected in post-processing parameters: either in options "PostScript" and "CategoryX.PostScript" or manually on page "Postprocess" of download details dialog in web-interface; it is not necessary to select dual-mode scripts in option "QueueScript"; that provides more flexibility: the scripts can be selected per-category or activated/deactivated for each nzb individually

Browse Source
This commit is contained in:
Andrey Prygunkov
2014-08-17 23:07:48 +00:00
parent 6ecdfc25fd
commit dd22ec68fc
8 changed files with 226 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
daemon/queue/QueueScript.h
View File

@@ -26,6 +26,8 @@
#ifndef QUEUESCRIPT_H
#define QUEUESCRIPT_H
#include <list>
#include "Script.h"
#include "Thread.h"
#include "DownloadInfo.h"
@@ -34,7 +36,6 @@
class NZBScriptController : public ScriptController
{
protected:
Options::Script* m_pScript;
void PrepareEnvParameters(NZBParameterList* pParameters, const char* szStripPrefix);
void PrepareEnvScript(NZBParameterList* pParameters, const char* szScriptName);
void ExecuteScriptList(const char* szScriptList);
@@ -72,26 +73,41 @@ class QueueScriptCoordinator
public:
enum EEvent
{
qeNzbDownloaded, // highest priority
qeNzbAdded,
qeFileDownloaded, // lowest priority
qeFirst = qeNzbDownloaded,
qeLast = qeFileDownloaded
qeNzbAdded,
qeNzbDownloaded // highest priority
};
private:
typedef std::deque<int> IDList;
class QueueItem
{
private:
int m_iNZBID;
Options::Script* m_pScript;
EEvent m_eEvent;
public:
QueueItem(int iNZBID, Options::Script* pScript, EEvent eEvent);
int GetNZBID() { return m_iNZBID; }
Options::Script* GetScript() { return m_pScript; }
EEvent GetEvent() { return m_eEvent; }
};
IDList m_Queues[qeLast - qeFirst + 1];
typedef std::list<QueueItem*> Queue;
Queue m_Queue;
Mutex m_mutexQueue;
int m_iCurrentNZBID;
QueueItem* m_pCurItem;
bool m_bHasQueueScripts;
Options::ScriptList m_ScriptList;
void Remove(IDList* pQueue, int iNZBID);
void StartScript(NZBInfo* pNZBInfo, EEvent eEvent);
//void Remove(IDList* pQueue, int iNZBID);
void StartScript(NZBInfo* pNZBInfo, QueueItem* pQueueItem);
public:
QueueScriptCoordinator();
void EnqueueScript(NZBInfo* pNZBInfo, EEvent eEvent, bool bWaitDone);
~QueueScriptCoordinator();
void InitOptions();
void EnqueueScript(NZBInfo* pNZBInfo, EEvent eEvent);
void CheckQueue();
bool HasJob(int iNZBID);
};