version 12.0 (2 Jan. 2014)

AUTHORS

@@ -1,27 +1,4 @@
-NZBGet:
-	Andrey Prygunkov <hugbug@users.sourceforge.net>		    (versions 0.3.0 and later)
-	Bo Cordes Petersen <placebodk@users.sourceforge.net>	(versions ? - 0.2.3)
+nzbget:
 	Sven Henkel <sidddy@users.sourceforge.net>				(versions 0.1.0 - ?)
-
-PAR2:
-	Peter Brian Clements <peterbclements@users.sourceforge.net>
-
-PAR2 library API:
-	Francois Lesueur <flesueur@users.sourceforge.net>
-
-jQuery:
-	John Resig <http://jquery.com>
-	The Dojo Foundation <http://sizzlejs.com>
-
-Bootstrap:
-	Twitter, Inc <http://twitter.github.com/bootstrap>
-
-Raphaël:
-	Dmitry Baranovskiy <http://raphaeljs.com>
-	Sencha Labs <http://sencha.com>
-
-Elycharts:
-	Void Labs s.n.c. <http://void.it>
-
-iconSweets:
-	Yummygum <http://yummygum.com>
+	Bo Cordes Petersen <placebodk@users.sourceforge.net>	(versions ? - 0.2.3)
+	Andrey Prygunkov <hugbug@users.sourceforge.net>		    (versions 0.3.0 and later)

ArticleDownloader.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,7 +34,6 @@
 #include "Thread.h"
 #include "NNTPConnection.h"
 #include "Decoder.h"
-#include "ArticleWriter.h"
 
 class ArticleDownloader : public Thread, public Subject
 {
@@ -48,20 +47,13 @@ public:
 		adFailed,
 		adRetry,
 		adCrcError,
+		adDecoding,
+		adJoining,
+		adJoined,
 		adNotFound,
 		adConnectError,
 		adFatalError
 	};
-
-	class ArticleWriterImpl : public ArticleWriter
-	{
-	private:
-		 ArticleDownloader*		m_pOwner;
-	protected:
-		virtual void	SetLastUpdateTimeNow() { m_pOwner->SetLastUpdateTimeNow(); } 
-	public:
-		void			SetOwner(ArticleDownloader* pOwner) { m_pOwner = pOwner; }
-	};
 			
 private:
 	FileInfo*			m_pFileInfo;
@@ -69,29 +61,35 @@ private:
 	NNTPConnection* 	m_pConnection;
 	EStatus				m_eStatus;
 	Mutex			 	m_mutexConnection;
-	char*				m_szInfoName;
-	char				m_szConnectionName[250];
+	const char*			m_szResultFilename;
+	char*				m_szTempFilename;
 	char*				m_szArticleFilename;
+	char*				m_szInfoName;
+	char*				m_szOutputFilename;
 	time_t				m_tLastUpdateTime;
 	Decoder::EFormat	m_eFormat;
 	YDecoder			m_YDecoder;
 	UDecoder			m_UDecoder;
-	ArticleWriterImpl	m_ArticleWriter;
+	FILE*				m_pOutFile;
+	bool				m_bDuplicate;
 	ServerStatList		m_ServerStats;
-	bool				m_bWritingStarted;
-	int					m_iDownloadedSize;
 
 	EStatus				Download();
+	bool				Write(char* szLine, int iLen);
+	bool				PrepareFile(char* szLine);
+	bool				CreateOutputFile(int iSize);
+	void				BuildOutputFilename();
 	EStatus				DecodeCheck();
 	void				FreeConnection(bool bKeepConnected);
 	EStatus				CheckResponse(const char* szResponse, const char* szComment);
 	void				SetStatus(EStatus eStatus) { m_eStatus = eStatus; }
-	bool				Write(char* szLine, int iLen);
-	void				AddServerData();
+	const char* 		GetTempFilename() { return m_szTempFilename; }
+	void 				SetTempFilename(const char* v);
+	void 				SetOutputFilename(const char* v);
 
 public:
 						ArticleDownloader();
-	virtual				~ArticleDownloader();
+						~ArticleDownloader();
 	void				SetFileInfo(FileInfo* pFileInfo) { m_pFileInfo = pFileInfo; }
 	FileInfo*			GetFileInfo() { return m_pFileInfo; }
 	void				SetArticleInfo(ArticleInfo* pArticleInfo) { m_pArticleInfo = pArticleInfo; }
@@ -104,14 +102,21 @@ public:
 	time_t				GetLastUpdateTime() { return m_tLastUpdateTime; }
 	void				SetLastUpdateTimeNow() { m_tLastUpdateTime = ::time(NULL); }
 	const char* 		GetArticleFilename() { return m_szArticleFilename; }
-	void				SetInfoName(const char* szInfoName);
+	void				SetInfoName(const char* v);
 	const char*			GetInfoName() { return m_szInfoName; }
-	const char*			GetConnectionName() { return m_szConnectionName; }
+	void				CompleteFileParts();
+	static bool			MoveCompletedFiles(NZBInfo* pNZBInfo, const char* szOldDestDir);
 	void				SetConnection(NNTPConnection* pConnection) { m_pConnection = pConnection; }
-	void				CompleteFileParts() { m_ArticleWriter.CompleteFileParts(); }
-	int					GetDownloadedSize() { return m_iDownloadedSize; }
 
 	void				LogDebugInfo();
 };
 
+class DownloadSpeedMeter
+{
+public:
+	virtual				~DownloadSpeedMeter() {};
+	virtual int			CalcCurrentDownloadSpeed() = 0;
+	virtual void		AddSpeedReading(int iBytes) = 0;
+};
+
 #endif

BinRpc.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -46,22 +46,26 @@
 #include "BinRpc.h"
 #include "Log.h"
 #include "Options.h"
+#include "QueueCoordinator.h"
+#include "UrlCoordinator.h"
 #include "QueueEditor.h"
+#include "PrePostProcessor.h"
 #include "Util.h"
 #include "DownloadInfo.h"
 #include "Scanner.h"
-#include "StatMeter.h"
 
 extern Options* g_pOptions;
+extern QueueCoordinator* g_pQueueCoordinator;
+extern UrlCoordinator* g_pUrlCoordinator;
+extern PrePostProcessor* g_pPrePostProcessor;
 extern Scanner* g_pScanner;
-extern StatMeter* g_pStatMeter;
 extern void ExitProc();
 extern void Reload();
 
 const char* g_szMessageRequestNames[] =
     { "N/A", "Download", "Pause/Unpause", "List", "Set download rate", "Dump debug", 
 		"Edit queue", "Log", "Quit", "Reload", "Version", "Post-queue", "Write log", "Scan", 
-		"Pause/Unpause postprocessor", "History", "Download URL" };
+		"Pause/Unpause postprocessor", "History", "Download URL", "URL-queue" };
 
 const unsigned int g_iMessageRequestSizes[] =
     { 0,
@@ -79,7 +83,8 @@ const unsigned int g_iMessageRequestSizes[] =
 		sizeof(SNZBWriteLogRequest),
 		sizeof(SNZBScanRequest),
 		sizeof(SNZBHistoryRequest),
-		sizeof(SNZBDownloadUrlRequest)
+		sizeof(SNZBDownloadUrlRequest),
+		sizeof(SNZBUrlQueueRequest)
     };
 
 //*****************************************************************
@@ -186,6 +191,10 @@ void BinRpcProcessor::Dispatch()
 			command = new DownloadUrlBinCommand();
 			break;
 
+		case eRemoteRequestUrlQueue:
+			command = new UrlQueueBinCommand();
+			break;
+
 		default:
 			error("Received unsupported request %i", ntohl(m_MessageBase.m_iType));
 			break;
@@ -250,6 +259,10 @@ void PauseUnpauseBinCommand::Execute()
 			g_pOptions->SetPauseDownload(ntohl(PauseUnpauseRequest.m_bPause));
 			break;
 
+		case eRemotePauseUnpauseActionDownload2:
+			g_pOptions->SetPauseDownload2(ntohl(PauseUnpauseRequest.m_bPause));
+			break;
+
 		case eRemotePauseUnpauseActionPostProcess:
 			g_pOptions->SetPausePostProcess(ntohl(PauseUnpauseRequest.m_bPause));
 			break;
@@ -282,7 +295,8 @@ void DumpDebugBinCommand::Execute()
 		return;
 	}
 
-	g_pLog->LogDebugInfo();
+	g_pQueueCoordinator->LogDebugInfo();
+	g_pUrlCoordinator->LogDebugInfo();
 	SendBoolResponse(true, "Debug-Command completed successfully");
 }
 
@@ -344,7 +358,7 @@ void DownloadBinCommand::Execute()
 	bool bAddTop = ntohl(DownloadRequest.m_bAddFirst);
 
 	bool bOK = g_pScanner->AddExternalFile(DownloadRequest.m_szFilename, DownloadRequest.m_szCategory,
-		iPriority, NULL, 0, dmScore, NULL, bAddTop, bAddPaused, NULL, NULL, pRecvBuffer, iBufLen, NULL) != Scanner::asFailed;
+		iPriority, NULL, 0, dmScore, NULL, bAddTop, bAddPaused, NULL, pRecvBuffer, iBufLen) != Scanner::asFailed;
 
 	char tmp[1024];
 	snprintf(tmp, 1024, bOK ? "Collection %s added to queue" : "Download Request failed for %s",
@@ -388,13 +402,13 @@ void ListBinCommand::Execute()
 		}
 
 		// Make a data structure and copy all the elements of the list into it
-		DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+		DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
 
 		// calculate required buffer size for nzbs
-		int iNrNZBEntries = pDownloadQueue->GetQueue()->size();
+		int iNrNZBEntries = pDownloadQueue->GetNZBInfoList()->size();
 		int iNrPPPEntries = 0;
 		bufsize += iNrNZBEntries * sizeof(SNZBListResponseNZBEntry);
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+		for (NZBInfoList::iterator it = pDownloadQueue->GetNZBInfoList()->begin(); it != pDownloadQueue->GetNZBInfoList()->end(); it++)
 		{
 			NZBInfo* pNZBInfo = *it;
 			bufsize += strlen(pNZBInfo->GetFilename()) + 1;
@@ -419,48 +433,29 @@ void ListBinCommand::Execute()
 		}
 
 		// calculate required buffer size for files
-		int iNrFileEntries = 0;
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+		int iNrFileEntries = pDownloadQueue->GetFileQueue()->size();
+		bufsize += iNrFileEntries * sizeof(SNZBListResponseFileEntry);
+		for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
 		{
-			NZBInfo* pNZBInfo = *it;
-			for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++)
-			{
-				FileInfo* pFileInfo = *it2;
-				iNrFileEntries++;
-				bufsize += sizeof(SNZBListResponseFileEntry);
-				bufsize += strlen(pFileInfo->GetSubject()) + 1;
-				bufsize += strlen(pFileInfo->GetFilename()) + 1;
-				// align struct to 4-bytes, needed by ARM-processor (and may be others)
-				bufsize += bufsize % 4 > 0 ? 4 - bufsize % 4 : 0;
-			}
+			FileInfo* pFileInfo = *it;
+			bufsize += strlen(pFileInfo->GetSubject()) + 1;
+			bufsize += strlen(pFileInfo->GetFilename()) + 1;
+			// align struct to 4-bytes, needed by ARM-processor (and may be others)
+			bufsize += bufsize % 4 > 0 ? 4 - bufsize % 4 : 0;
 		}
 
 		buf = (char*) malloc(bufsize);
 		char* bufptr = buf;
 
 		// write nzb entries
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+		for (NZBInfoList::iterator it = pDownloadQueue->GetNZBInfoList()->begin(); it != pDownloadQueue->GetNZBInfoList()->end(); it++)
 		{
+			unsigned long iSizeHi, iSizeLo;
 			NZBInfo* pNZBInfo = *it;
-
 			SNZBListResponseNZBEntry* pListAnswer = (SNZBListResponseNZBEntry*) bufptr;
-
-			unsigned long iSizeHi, iSizeLo, iRemainingSizeHi, iRemainingSizeLo, iPausedSizeHi, iPausedSizeLo;
 			Util::SplitInt64(pNZBInfo->GetSize(), &iSizeHi, &iSizeLo);
-			Util::SplitInt64(pNZBInfo->GetRemainingSize(), &iRemainingSizeHi, &iRemainingSizeLo);
-			Util::SplitInt64(pNZBInfo->GetPausedSize(), &iPausedSizeHi, &iPausedSizeLo);
-
-			pListAnswer->m_iID					= htonl(pNZBInfo->GetID());
-			pListAnswer->m_iKind				= htonl(pNZBInfo->GetKind());
 			pListAnswer->m_iSizeLo				= htonl(iSizeLo);
 			pListAnswer->m_iSizeHi				= htonl(iSizeHi);
-			pListAnswer->m_iRemainingSizeLo		= htonl(iRemainingSizeLo);
-			pListAnswer->m_iRemainingSizeHi		= htonl(iRemainingSizeHi);
-			pListAnswer->m_iPausedSizeLo		= htonl(iPausedSizeLo);
-			pListAnswer->m_iPausedSizeHi		= htonl(iPausedSizeHi);
-			pListAnswer->m_iPausedCount			= htonl(pNZBInfo->GetPausedFileCount());
-			pListAnswer->m_iRemainingParCount	= htonl(pNZBInfo->GetRemainingParCount());
-			pListAnswer->m_iPriority			= htonl(pNZBInfo->GetPriority());
 			pListAnswer->m_bMatch				= htonl(bMatchGroup && (!pRegEx || pRegEx->Match(pNZBInfo->GetName())));
 			pListAnswer->m_iFilenameLen			= htonl(strlen(pNZBInfo->GetFilename()) + 1);
 			pListAnswer->m_iNameLen				= htonl(strlen(pNZBInfo->GetName()) + 1);
@@ -489,7 +484,7 @@ void ListBinCommand::Execute()
 
 		// write ppp entries
 		int iNZBIndex = 1;
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++, iNZBIndex++)
+		for (NZBInfoList::iterator it = pDownloadQueue->GetNZBInfoList()->begin(); it != pDownloadQueue->GetNZBInfoList()->end(); it++, iNZBIndex++)
 		{
 			NZBInfo* pNZBInfo = *it;
 			for (NZBParameterList::iterator it = pNZBInfo->GetParameters()->begin(); it != pNZBInfo->GetParameters()->end(); it++)
@@ -515,62 +510,58 @@ void ListBinCommand::Execute()
 		}
 
 		// write file entries
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+		for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
 		{
-			NZBInfo* pNZBInfo = *it;
-			for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++)
+			unsigned long iSizeHi, iSizeLo;
+			FileInfo* pFileInfo = *it;
+			SNZBListResponseFileEntry* pListAnswer = (SNZBListResponseFileEntry*) bufptr;
+			pListAnswer->m_iID = htonl(pFileInfo->GetID());
+
+			int iNZBIndex = 0;
+			for (unsigned int i = 0; i < pDownloadQueue->GetNZBInfoList()->size(); i++)
 			{
-				FileInfo* pFileInfo = *it2;
-
-				unsigned long iSizeHi, iSizeLo;
-				SNZBListResponseFileEntry* pListAnswer = (SNZBListResponseFileEntry*) bufptr;
-				pListAnswer->m_iID = htonl(pFileInfo->GetID());
-
-				int iNZBIndex = 0;
-				for (unsigned int i = 0; i < pDownloadQueue->GetQueue()->size(); i++)
+				iNZBIndex++;
+				if (pDownloadQueue->GetNZBInfoList()->at(i) == pFileInfo->GetNZBInfo())
 				{
-					iNZBIndex++;
-					if (pDownloadQueue->GetQueue()->at(i) == pFileInfo->GetNZBInfo())
-					{
-						break;
-					}
+					break;
 				}
-				pListAnswer->m_iNZBIndex		= htonl(iNZBIndex);
+			}
+			pListAnswer->m_iNZBIndex		= htonl(iNZBIndex);
 
-				if (pRegEx && !bMatchGroup)
-				{
-					char szFilename[MAX_PATH];
-					snprintf(szFilename, sizeof(szFilename) - 1, "%s/%s", pFileInfo->GetNZBInfo()->GetName(), Util::BaseFileName(pFileInfo->GetFilename()));
-					pListAnswer->m_bMatch = htonl(pRegEx->Match(szFilename));
-				}
+			if (pRegEx && !bMatchGroup)
+			{
+				char szFilename[MAX_PATH];
+				snprintf(szFilename, sizeof(szFilename) - 1, "%s/%s", pFileInfo->GetNZBInfo()->GetName(), Util::BaseFileName(pFileInfo->GetFilename()));
+				pListAnswer->m_bMatch = htonl(pRegEx->Match(szFilename));
+			}
 
-				Util::SplitInt64(pFileInfo->GetSize(), &iSizeHi, &iSizeLo);
-				pListAnswer->m_iFileSizeLo		= htonl(iSizeLo);
-				pListAnswer->m_iFileSizeHi		= htonl(iSizeHi);
-				Util::SplitInt64(pFileInfo->GetRemainingSize(), &iSizeHi, &iSizeLo);
-				pListAnswer->m_iRemainingSizeLo	= htonl(iSizeLo);
-				pListAnswer->m_iRemainingSizeHi	= htonl(iSizeHi);
-				pListAnswer->m_bFilenameConfirmed = htonl(pFileInfo->GetFilenameConfirmed());
-				pListAnswer->m_bPaused			= htonl(pFileInfo->GetPaused());
-				pListAnswer->m_iActiveDownloads	= htonl(pFileInfo->GetActiveDownloads());
-				pListAnswer->m_iSubjectLen		= htonl(strlen(pFileInfo->GetSubject()) + 1);
-				pListAnswer->m_iFilenameLen		= htonl(strlen(pFileInfo->GetFilename()) + 1);
-				bufptr += sizeof(SNZBListResponseFileEntry);
-				strcpy(bufptr, pFileInfo->GetSubject());
-				bufptr += ntohl(pListAnswer->m_iSubjectLen);
-				strcpy(bufptr, pFileInfo->GetFilename());
-				bufptr += ntohl(pListAnswer->m_iFilenameLen);
-				// align struct to 4-bytes, needed by ARM-processor (and may be others)
-				if ((size_t)bufptr % 4 > 0)
-				{
-					pListAnswer->m_iFilenameLen = htonl(ntohl(pListAnswer->m_iFilenameLen) + 4 - (size_t)bufptr % 4);
-					memset(bufptr, 0, 4 - (size_t)bufptr % 4); //suppress valgrind warning "uninitialized data"
-					bufptr += 4 - (size_t)bufptr % 4;
-				}
+			Util::SplitInt64(pFileInfo->GetSize(), &iSizeHi, &iSizeLo);
+			pListAnswer->m_iFileSizeLo		= htonl(iSizeLo);
+			pListAnswer->m_iFileSizeHi		= htonl(iSizeHi);
+			Util::SplitInt64(pFileInfo->GetRemainingSize(), &iSizeHi, &iSizeLo);
+			pListAnswer->m_iRemainingSizeLo	= htonl(iSizeLo);
+			pListAnswer->m_iRemainingSizeHi	= htonl(iSizeHi);
+			pListAnswer->m_bFilenameConfirmed = htonl(pFileInfo->GetFilenameConfirmed());
+			pListAnswer->m_bPaused			= htonl(pFileInfo->GetPaused());
+			pListAnswer->m_iActiveDownloads	= htonl(pFileInfo->GetActiveDownloads());
+			pListAnswer->m_iPriority		= htonl(pFileInfo->GetPriority());
+			pListAnswer->m_iSubjectLen		= htonl(strlen(pFileInfo->GetSubject()) + 1);
+			pListAnswer->m_iFilenameLen		= htonl(strlen(pFileInfo->GetFilename()) + 1);
+			bufptr += sizeof(SNZBListResponseFileEntry);
+			strcpy(bufptr, pFileInfo->GetSubject());
+			bufptr += ntohl(pListAnswer->m_iSubjectLen);
+			strcpy(bufptr, pFileInfo->GetFilename());
+			bufptr += ntohl(pListAnswer->m_iFilenameLen);
+			// align struct to 4-bytes, needed by ARM-processor (and may be others)
+			if ((size_t)bufptr % 4 > 0)
+			{
+				pListAnswer->m_iFilenameLen = htonl(ntohl(pListAnswer->m_iFilenameLen) + 4 - (size_t)bufptr % 4);
+				memset(bufptr, 0, 4 - (size_t)bufptr % 4); //suppress valgrind warning "uninitialized data"
+				bufptr += 4 - (size_t)bufptr % 4;
 			}
 		}
 
-		DownloadQueue::Unlock();
+		g_pQueueCoordinator->UnlockQueue();
 
 		delete pRegEx;
 
@@ -582,33 +573,25 @@ void ListBinCommand::Execute()
 
 	if (htonl(ListRequest.m_bServerState))
 	{
-		DownloadQueue *pDownloadQueue = DownloadQueue::Lock();
-		int iPostJobCount = 0;
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
-		{
-			NZBInfo* pNZBInfo = *it;
-			iPostJobCount += pNZBInfo->GetPostInfo() ? 1 : 0;
-		}
-		long long lRemainingSize;
-		pDownloadQueue->CalcRemainingSize(&lRemainingSize, NULL);
-		DownloadQueue::Unlock();
-
 		unsigned long iSizeHi, iSizeLo;
-		ListResponse.m_iDownloadRate = htonl(g_pStatMeter->CalcCurrentDownloadSpeed());
-		Util::SplitInt64(lRemainingSize, &iSizeHi, &iSizeLo);
+		ListResponse.m_iDownloadRate = htonl(g_pQueueCoordinator->CalcCurrentDownloadSpeed());
+		Util::SplitInt64(g_pQueueCoordinator->CalcRemainingSize(), &iSizeHi, &iSizeLo);
 		ListResponse.m_iRemainingSizeHi = htonl(iSizeHi);
 		ListResponse.m_iRemainingSizeLo = htonl(iSizeLo);
 		ListResponse.m_iDownloadLimit = htonl(g_pOptions->GetDownloadRate());
 		ListResponse.m_bDownloadPaused = htonl(g_pOptions->GetPauseDownload());
+		ListResponse.m_bDownload2Paused = htonl(g_pOptions->GetPauseDownload2());
 		ListResponse.m_bPostPaused = htonl(g_pOptions->GetPausePostProcess());
 		ListResponse.m_bScanPaused = htonl(g_pOptions->GetPauseScan());
 		ListResponse.m_iThreadCount = htonl(Thread::GetThreadCount() - 1); // not counting itself
-		ListResponse.m_iPostJobCount = htonl(iPostJobCount);
+		PostQueue* pPostQueue = g_pQueueCoordinator->LockQueue()->GetPostQueue();
+		ListResponse.m_iPostJobCount = htonl(pPostQueue->size());
+		g_pQueueCoordinator->UnlockQueue();
 
 		int iUpTimeSec, iDnTimeSec;
 		long long iAllBytes;
 		bool bStandBy;
-		g_pStatMeter->CalcTotalStat(&iUpTimeSec, &iDnTimeSec, &iAllBytes, &bStandBy);
+		g_pQueueCoordinator->CalcStat(&iUpTimeSec, &iDnTimeSec, &iAllBytes, &bStandBy);
 		ListResponse.m_iUpTimeSec = htonl(iUpTimeSec);
 		ListResponse.m_iDownloadTimeSec = htonl(iDnTimeSec);
 		ListResponse.m_bDownloadStandBy = htonl(bStandBy);
@@ -732,6 +715,7 @@ void EditQueueBinCommand::Execute()
 	int iMatchMode = ntohl(EditQueueRequest.m_iMatchMode);
 	int iOffset = ntohl(EditQueueRequest.m_iOffset);
 	int iTextLen = ntohl(EditQueueRequest.m_iTextLen);
+	bool bSmartOrder = ntohl(EditQueueRequest.m_bSmartOrder);
 	unsigned int iBufLength = ntohl(EditQueueRequest.m_iTrailingDataLength);
 
 	if (iNrIDEntries * sizeof(int32_t) + iTextLen + iNameEntriesLen != iBufLength)
@@ -781,12 +765,19 @@ void EditQueueBinCommand::Execute()
 		}
 	}
 
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-	bool bOK = pDownloadQueue->EditList(
-		iNrIDEntries > 0 ? &cIDList : NULL,
-		iNrNameEntries > 0 ? &cNameList : NULL,
-		(DownloadQueue::EMatchMode)iMatchMode, (DownloadQueue::EEditAction)iAction, iOffset, szText);
-	DownloadQueue::Unlock();
+	bool bOK = false;
+	
+	if (iAction < eRemoteEditActionPostMoveOffset)
+	{
+		bOK = g_pQueueCoordinator->GetQueueEditor()->EditList(
+			iNrIDEntries > 0 ? &cIDList : NULL,
+			iNrNameEntries > 0 ? &cNameList : NULL,
+			(QueueEditor::EMatchMode)iMatchMode, bSmartOrder, (QueueEditor::EEditAction)iAction, iOffset, szText);
+	}
+	else
+	{
+		bOK = g_pPrePostProcessor->QueueEditList(&cIDList, (PrePostProcessor::EEditAction)iAction, iOffset, szText);
+	}
 
 	free(pBuf);
 
@@ -825,23 +816,17 @@ void PostQueueBinCommand::Execute()
 	int bufsize = 0;
 
 	// Make a data structure and copy all the elements of the list into it
-	NZBList* pNZBList = DownloadQueue::Lock()->GetQueue();
+	PostQueue* pPostQueue = g_pQueueCoordinator->LockQueue()->GetPostQueue();
+
+	int NrEntries = pPostQueue->size();
 
 	// calculate required buffer size
-	int NrEntries = 0;
-	for (NZBList::iterator it = pNZBList->begin(); it != pNZBList->end(); it++)
+	bufsize = NrEntries * sizeof(SNZBPostQueueResponseEntry);
+	for (PostQueue::iterator it = pPostQueue->begin(); it != pPostQueue->end(); it++)
 	{
-		NZBInfo* pNZBInfo = *it;
-		PostInfo* pPostInfo = pNZBInfo->GetPostInfo();
-		if (!pPostInfo)
-		{
-			continue;
-		}
-
-		NrEntries++;
-		bufsize += sizeof(SNZBPostQueueResponseEntry);
+		PostInfo* pPostInfo = *it;
 		bufsize += strlen(pPostInfo->GetNZBInfo()->GetFilename()) + 1;
-		bufsize += strlen(pPostInfo->GetNZBInfo()->GetName()) + 1;
+		bufsize += strlen(pPostInfo->GetInfoName()) + 1;
 		bufsize += strlen(pPostInfo->GetNZBInfo()->GetDestDir()) + 1;
 		bufsize += strlen(pPostInfo->GetProgressLabel()) + 1;
 		// align struct to 4-bytes, needed by ARM-processor (and may be others)
@@ -852,30 +837,24 @@ void PostQueueBinCommand::Execute()
 	buf = (char*) malloc(bufsize);
 	char* bufptr = buf;
 
-	for (NZBList::iterator it = pNZBList->begin(); it != pNZBList->end(); it++)
+	for (PostQueue::iterator it = pPostQueue->begin(); it != pPostQueue->end(); it++)
 	{
-		NZBInfo* pNZBInfo = *it;
-		PostInfo* pPostInfo = pNZBInfo->GetPostInfo();
-		if (!pPostInfo)
-		{
-			continue;
-		}
-
+		PostInfo* pPostInfo = *it;
 		SNZBPostQueueResponseEntry* pPostQueueAnswer = (SNZBPostQueueResponseEntry*) bufptr;
-		pPostQueueAnswer->m_iID				= htonl(pNZBInfo->GetID());
+		pPostQueueAnswer->m_iID				= htonl(pPostInfo->GetID());
 		pPostQueueAnswer->m_iStage			= htonl(pPostInfo->GetStage());
 		pPostQueueAnswer->m_iStageProgress	= htonl(pPostInfo->GetStageProgress());
 		pPostQueueAnswer->m_iFileProgress	= htonl(pPostInfo->GetFileProgress());
 		pPostQueueAnswer->m_iTotalTimeSec	= htonl((int)(pPostInfo->GetStartTime() ? tCurTime - pPostInfo->GetStartTime() : 0));
 		pPostQueueAnswer->m_iStageTimeSec	= htonl((int)(pPostInfo->GetStageTime() ? tCurTime - pPostInfo->GetStageTime() : 0));
 		pPostQueueAnswer->m_iNZBFilenameLen		= htonl(strlen(pPostInfo->GetNZBInfo()->GetFilename()) + 1);
-		pPostQueueAnswer->m_iInfoNameLen		= htonl(strlen(pPostInfo->GetNZBInfo()->GetName()) + 1);
+		pPostQueueAnswer->m_iInfoNameLen		= htonl(strlen(pPostInfo->GetInfoName()) + 1);
 		pPostQueueAnswer->m_iDestDirLen			= htonl(strlen(pPostInfo->GetNZBInfo()->GetDestDir()) + 1);
 		pPostQueueAnswer->m_iProgressLabelLen	= htonl(strlen(pPostInfo->GetProgressLabel()) + 1);
 		bufptr += sizeof(SNZBPostQueueResponseEntry);
 		strcpy(bufptr, pPostInfo->GetNZBInfo()->GetFilename());
 		bufptr += ntohl(pPostQueueAnswer->m_iNZBFilenameLen);
-		strcpy(bufptr, pPostInfo->GetNZBInfo()->GetName());
+		strcpy(bufptr, pPostInfo->GetInfoName());
 		bufptr += ntohl(pPostQueueAnswer->m_iInfoNameLen);
 		strcpy(bufptr, pPostInfo->GetNZBInfo()->GetDestDir());
 		bufptr += ntohl(pPostQueueAnswer->m_iDestDirLen);
@@ -890,7 +869,7 @@ void PostQueueBinCommand::Execute()
 		}
 	}
 
-	DownloadQueue::Unlock();
+	g_pQueueCoordinator->UnlockQueue();
 
 	PostQueueResponse.m_iNrTrailingEntries = htonl(NrEntries);
 	PostQueueResponse.m_iTrailingDataLength = htonl(bufsize);
@@ -982,12 +961,12 @@ void HistoryBinCommand::Execute()
 	int bufsize = 0;
 
 	// Make a data structure and copy all the elements of the list into it
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
 
 	// calculate required buffer size for nzbs
-	int iNrEntries = pDownloadQueue->GetHistory()->size();
+	int iNrEntries = pDownloadQueue->GetHistoryList()->size();
 	bufsize += iNrEntries * sizeof(SNZBHistoryResponseEntry);
-	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+	for (HistoryList::iterator it = pDownloadQueue->GetHistoryList()->begin(); it != pDownloadQueue->GetHistoryList()->end(); it++)
 	{
 		HistoryInfo* pHistoryInfo = *it;
 		char szNicename[1024];
@@ -1001,7 +980,7 @@ void HistoryBinCommand::Execute()
 	char* bufptr = buf;
 
 	// write nzb entries
-	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+	for (HistoryList::iterator it = pDownloadQueue->GetHistoryList()->begin(); it != pDownloadQueue->GetHistoryList()->end(); it++)
 	{
 		HistoryInfo* pHistoryInfo = *it;
 		SNZBHistoryResponseEntry* pListAnswer = (SNZBHistoryResponseEntry*) bufptr;
@@ -1013,7 +992,7 @@ void HistoryBinCommand::Execute()
 		pHistoryInfo->GetName(szNicename, sizeof(szNicename));
 		pListAnswer->m_iNicenameLen			= htonl(strlen(szNicename) + 1);
 
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo)
 		{
 			NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
 			unsigned long iSizeHi, iSizeLo;
@@ -1024,10 +1003,10 @@ void HistoryBinCommand::Execute()
 			pListAnswer->m_iParStatus			= htonl(pNZBInfo->GetParStatus());
 			pListAnswer->m_iScriptStatus		= htonl(pNZBInfo->GetScriptStatuses()->CalcTotalStatus());
 		}
-		else if (pHistoryInfo->GetKind() == HistoryInfo::hkUrl)
+		else if (pHistoryInfo->GetKind() == HistoryInfo::hkUrlInfo)
 		{
-			NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
-			pListAnswer->m_iUrlStatus			= htonl(pNZBInfo->GetUrlStatus());
+			UrlInfo* pUrlInfo = pHistoryInfo->GetUrlInfo();
+			pListAnswer->m_iUrlStatus			= htonl(pUrlInfo->GetStatus());
 		}
 
 		bufptr += sizeof(SNZBHistoryResponseEntry);
@@ -1042,7 +1021,7 @@ void HistoryBinCommand::Execute()
 		}
 	}
 
-	DownloadQueue::Unlock();
+	g_pQueueCoordinator->UnlockQueue();
 
 	HistoryResponse.m_iNrTrailingEntries = htonl(iNrEntries);
 	HistoryResponse.m_iTrailingDataLength = htonl(bufsize);
@@ -1077,18 +1056,15 @@ void DownloadUrlBinCommand::Execute()
 		return;
 	}
 
-	NZBInfo* pNZBInfo = new NZBInfo();
-	pNZBInfo->SetKind(NZBInfo::nkUrl);
-	pNZBInfo->SetURL(DownloadUrlRequest.m_szURL);
-	pNZBInfo->SetFilename(DownloadUrlRequest.m_szNZBFilename);
-	pNZBInfo->SetCategory(DownloadUrlRequest.m_szCategory);
-	pNZBInfo->SetPriority(ntohl(DownloadUrlRequest.m_iPriority));
-	pNZBInfo->SetAddUrlPaused(ntohl(DownloadUrlRequest.m_bAddPaused));
+	UrlInfo* pUrlInfo = new UrlInfo();
+	pUrlInfo->SetURL(DownloadUrlRequest.m_szURL);
+	pUrlInfo->SetNZBFilename(DownloadUrlRequest.m_szNZBFilename);
+	pUrlInfo->SetCategory(DownloadUrlRequest.m_szCategory);
+	pUrlInfo->SetPriority(ntohl(DownloadUrlRequest.m_iPriority));
+	pUrlInfo->SetAddTop(ntohl(DownloadUrlRequest.m_bAddFirst));
+	pUrlInfo->SetAddPaused(ntohl(DownloadUrlRequest.m_bAddPaused));
 
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-	pDownloadQueue->GetQueue()->Add(pNZBInfo, ntohl(DownloadUrlRequest.m_bAddFirst));
-	pDownloadQueue->Save();
-	DownloadQueue::Unlock();
+	g_pUrlCoordinator->AddUrlToQueue(pUrlInfo, ntohl(DownloadUrlRequest.m_bAddFirst));
 
 	info("Request: Queue url %s", DownloadUrlRequest.m_szURL);
 
@@ -1097,3 +1073,77 @@ void DownloadUrlBinCommand::Execute()
 	tmp[1024-1] = '\0';
 	SendBoolResponse(true, tmp);
 }
+
+void UrlQueueBinCommand::Execute()
+{
+	SNZBUrlQueueRequest UrlQueueRequest;
+	if (!ReceiveRequest(&UrlQueueRequest, sizeof(UrlQueueRequest)))
+	{
+		return;
+	}
+
+	SNZBUrlQueueResponse UrlQueueResponse;
+	memset(&UrlQueueResponse, 0, sizeof(UrlQueueResponse));
+	UrlQueueResponse.m_MessageBase.m_iSignature = htonl(NZBMESSAGE_SIGNATURE);
+	UrlQueueResponse.m_MessageBase.m_iStructSize = htonl(sizeof(UrlQueueResponse));
+	UrlQueueResponse.m_iEntrySize = htonl(sizeof(SNZBUrlQueueResponseEntry));
+
+	char* buf = NULL;
+	int bufsize = 0;
+
+	// Make a data structure and copy all the elements of the list into it
+	UrlQueue* pUrlQueue = g_pQueueCoordinator->LockQueue()->GetUrlQueue();
+
+	int NrEntries = pUrlQueue->size();
+
+	// calculate required buffer size
+	bufsize = NrEntries * sizeof(SNZBUrlQueueResponseEntry);
+	for (UrlQueue::iterator it = pUrlQueue->begin(); it != pUrlQueue->end(); it++)
+	{
+		UrlInfo* pUrlInfo = *it;
+		bufsize += strlen(pUrlInfo->GetURL()) + 1;
+		bufsize += strlen(pUrlInfo->GetNZBFilename()) + 1;
+		// align struct to 4-bytes, needed by ARM-processor (and may be others)
+		bufsize += bufsize % 4 > 0 ? 4 - bufsize % 4 : 0;
+	}
+
+	buf = (char*) malloc(bufsize);
+	char* bufptr = buf;
+
+	for (UrlQueue::iterator it = pUrlQueue->begin(); it != pUrlQueue->end(); it++)
+	{
+		UrlInfo* pUrlInfo = *it;
+		SNZBUrlQueueResponseEntry* pUrlQueueAnswer = (SNZBUrlQueueResponseEntry*) bufptr;
+		pUrlQueueAnswer->m_iID				= htonl(pUrlInfo->GetID());
+		pUrlQueueAnswer->m_iURLLen			= htonl(strlen(pUrlInfo->GetURL()) + 1);
+		pUrlQueueAnswer->m_iNZBFilenameLen		= htonl(strlen(pUrlInfo->GetNZBFilename()) + 1);
+		bufptr += sizeof(SNZBUrlQueueResponseEntry);
+		strcpy(bufptr, pUrlInfo->GetURL());
+		bufptr += ntohl(pUrlQueueAnswer->m_iURLLen);
+		strcpy(bufptr, pUrlInfo->GetNZBFilename());
+		bufptr += ntohl(pUrlQueueAnswer->m_iNZBFilenameLen);
+		// align struct to 4-bytes, needed by ARM-processor (and may be others)
+		if ((size_t)bufptr % 4 > 0)
+		{
+			pUrlQueueAnswer->m_iNZBFilenameLen = htonl(ntohl(pUrlQueueAnswer->m_iNZBFilenameLen) + 4 - (size_t)bufptr % 4);
+			memset(bufptr, 0, 4 - (size_t)bufptr % 4); //suppress valgrind warning "uninitialized data"
+			bufptr += 4 - (size_t)bufptr % 4;
+		}
+	}
+
+	g_pQueueCoordinator->UnlockQueue();
+
+	UrlQueueResponse.m_iNrTrailingEntries = htonl(NrEntries);
+	UrlQueueResponse.m_iTrailingDataLength = htonl(bufsize);
+
+	// Send the request answer
+	m_pConnection->Send((char*) &UrlQueueResponse, sizeof(UrlQueueResponse));
+
+	// Send the data
+	if (bufsize > 0)
+	{
+		m_pConnection->Send(buf, bufsize);
+	}
+
+	free(buf);
+}

ColoredFrontend.cpp

@@ -76,7 +76,7 @@ void ColoredFrontend::PrintStatus()
 	timeString[0] = '\0';
 	int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
 
-	if (iCurrentDownloadSpeed > 0 && !m_bPauseDownload)
+	if (iCurrentDownloadSpeed > 0 && !(m_bPauseDownload || m_bPauseDownload2))
 	{
 		long long remain_sec = (long long)(m_lRemainingSize / iCurrentDownloadSpeed);
 		int h = (int)(remain_sec / 3600);
@@ -115,7 +115,7 @@ void ColoredFrontend::PrintStatus()
 	snprintf(tmp, 1024, " %d threads, %.*f KB/s, %.2f MB remaining%s%s%s%s%s\n", 
 		m_iThreadCount, (iCurrentDownloadSpeed >= 10*1024 ? 0 : 1), (float)iCurrentDownloadSpeed / 1024.0, 
 		(float)(Util::Int64ToFloat(m_lRemainingSize) / 1024.0 / 1024.0), timeString, szPostStatus, 
-		m_bPauseDownload ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
+		m_bPauseDownload || m_bPauseDownload2 ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
 		szDownloadLimit, szControlSeq);
 	tmp[1024-1] = '\0';
 	printf("%s", tmp);

Connection.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -117,20 +117,19 @@ Connection::Connection(const char* szHost, int iPort, bool bTLS)
 {
 	debug("Creating Connection");
 
-	m_szHost = NULL;
-	m_iPort = iPort;
-	m_bTLS = bTLS;
-	m_szCipher = NULL;
-	m_eStatus = csDisconnected;
-	m_iSocket = INVALID_SOCKET;
-	m_iBufAvail = 0;
-	m_iTimeout = 60;
-	m_bSuppressErrors = true;
-	m_szReadBuf = (char*)malloc(CONNECTION_READBUFFER_SIZE + 1);
-	m_iTotalBytesRead = 0;
+	m_szHost			= NULL;
+	m_iPort				= iPort;
+	m_bTLS				= bTLS;
+	m_szCipher			= NULL;
+	m_eStatus			= csDisconnected;
+	m_iSocket			= INVALID_SOCKET;
+	m_iBufAvail			= 0;
+	m_iTimeout			= 60;
+	m_bSuppressErrors	= true;
+	m_szReadBuf			= (char*)malloc(CONNECTION_READBUFFER_SIZE + 1);
 #ifndef DISABLE_TLS
-	m_pTLSSocket = NULL;
-	m_bTLSError = false;
+	m_pTLSSocket		= NULL;
+	m_bTLSError			= false;
 #endif
 
 	if (szHost)
@@ -439,9 +438,7 @@ char* Connection::ReadLine(char* pBuffer, int iSize, int* pBytesRead)
 	{
 		*pBytesRead = iBytesRead;
 	}
-
-	m_iTotalBytesRead += iBytesRead;
-
+	
 	if (pBufPtr == pBuffer)
 	{
 		return NULL;
@@ -861,10 +858,3 @@ const char* Connection::GetRemoteAddr()
 	
 	return m_szRemoteAddr;
 }
-
-int Connection::FetchTotalBytesRead()
-{
-	int iTotal = m_iTotalBytesRead;
-	m_iTotalBytesRead = 0;
-	return iTotal;
-}

Connection.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -60,7 +60,6 @@ protected:
 	int					m_iTimeout;
 	bool				m_bSuppressErrors;
 	char				m_szRemoteAddr[20];
-	int					m_iTotalBytesRead;
 #ifndef DISABLE_TLS
 	TLSSocket*			m_pTLSSocket;
 	bool				m_bTLSError;
@@ -113,7 +112,6 @@ public:
 #ifndef DISABLE_TLS
 	bool				StartTLS(bool bIsClient, const char* szCertFile, const char* szKeyFile);
 #endif
-	int					FetchTotalBytesRead();
 };
 
 #endif

Decoder.cpp

@@ -1,7 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -44,11 +45,14 @@
 #include "Util.h"
 
 const char* Decoder::FormatNames[] = { "Unknown", "yEnc", "UU" };
+unsigned int YDecoder::crc_tab[256];
 
 Decoder::Decoder()
 {
 	debug("Creating Decoder");
 
+	m_szSrcFilename		= NULL;
+	m_szDestFilename	= NULL;
 	m_szArticleFilename	= NULL;
 }
 
@@ -103,6 +107,17 @@ Decoder::EFormat Decoder::DetectFormat(const char* buffer, int len)
   * YDecoder: fast implementation of yEnc-Decoder
   */
 
+void YDecoder::Init()
+{
+	debug("Initializing global decoder");
+	crc32gentab();
+}
+
+void YDecoder::Final()
+{
+	debug("Finalizing global Decoder");
+}
+
 YDecoder::YDecoder()
 {
 	Clear();
@@ -120,13 +135,69 @@ void YDecoder::Clear()
 	m_lExpectedCRC = 0;
 	m_lCalculatedCRC = 0xFFFFFFFF;
 	m_iBegin = 0;
-	m_iEnd = 0;
+	m_iEnd = 0xFFFFFFFF;
 	m_iSize = 0;
 	m_iEndSize = 0;
+	m_bAutoSeek = false;
+	m_bNeedSetPos = false;
 	m_bCrcCheck = false;
 }
 
-int YDecoder::DecodeBuffer(char* buffer, int len)
+/* from crc32.c (http://www.koders.com/c/fid699AFE0A656F0022C9D6B9D1743E697B69CE5815.aspx)
+ *
+ * (c) 1999,2000 Krzysztof Dabrowski
+ * (c) 1999,2000 ElysiuM deeZine
+ * Released under GPL (thanks)
+ *
+ * chksum_crc32gentab() --      to a global crc_tab[256], this one will
+ *				calculate the crcTable for crc32-checksums.
+ *				it is generated to the polynom [..]
+ */
+void YDecoder::crc32gentab()
+{
+	unsigned long crc, poly;
+	int i, j;
+
+	poly = 0xEDB88320L;
+	for (i = 0; i < 256; i++)
+	{
+		crc = i;
+		for (j = 8; j > 0; j--)
+		{
+			if (crc & 1)
+			{
+				crc = (crc >> 1) ^ poly;
+			}
+			else
+			{
+				crc >>= 1;
+			}
+		}
+		crc_tab[i] = crc;
+	}
+}
+
+/* This is modified version of chksum_crc() from
+ * crc32.c (http://www.koders.com/c/fid699AFE0A656F0022C9D6B9D1743E697B69CE5815.aspx)
+ * (c) 1999,2000 Krzysztof Dabrowski
+ * (c) 1999,2000 ElysiuM deeZine
+ *
+ * chksum_crc() -- to a given block, this one calculates the
+ *				crc32-checksum until the length is
+ *				reached. the crc32-checksum will be
+ *				the result.
+ */
+unsigned long YDecoder::crc32m(unsigned long startCrc, unsigned char *block, unsigned int length)
+{
+	register unsigned long crc = startCrc;
+	for (unsigned long i = 0; i < length; i++)
+	{
+		crc = ((crc >> 8) & 0x00FFFFFF) ^ crc_tab[(crc ^ *block++) & 0xFF];
+	}
+	return crc;
+}
+
+unsigned int YDecoder::DecodeBuffer(char* buffer)
 {
 	if (m_bBody && !m_bEnd)
 	{
@@ -144,7 +215,7 @@ int YDecoder::DecodeBuffer(char* buffer, int len)
 			if (pb) 
 			{
 				pb += 6; //=strlen(" size=")
-				m_iEndSize = (long long)atoll(pb);
+				m_iEndSize = (int)atoi(pb);
 			}
 			return 0;
 		}
@@ -176,9 +247,9 @@ BreakLoop:
 
 		if (m_bCrcCheck)
 		{
-			m_lCalculatedCRC = Util::Crc32m(m_lCalculatedCRC, (unsigned char *)buffer, (unsigned int)(optr - buffer));
+			m_lCalculatedCRC = crc32m(m_lCalculatedCRC, (unsigned char *)buffer, (unsigned int)(optr - buffer));
 		}
-		return optr - buffer;
+		return (unsigned int)(optr - buffer);
 	}
 	else 
 	{
@@ -200,7 +271,7 @@ BreakLoop:
 			if (pb) 
 			{
 				pb += 6; //=strlen(" size=")
-				m_iSize = (long long)atoll(pb);
+				m_iSize = (int)atoi(pb);
 			}
 			m_bPart = strstr(buffer, " part=");
 			if (!m_bPart)
@@ -218,13 +289,13 @@ BreakLoop:
 			if (pb) 
 			{
 				pb += 7; //=strlen(" begin=")
-				m_iBegin = (long long)atoll(pb);
+				m_iBegin = (int)atoi(pb);
 			}
 			pb = strstr(buffer, " end=");
 			if (pb) 
 			{
 				pb += 5; //=strlen(" end=")
-				m_iEnd = (long long)atoll(pb);
+				m_iEnd = (int)atoi(pb);
 			}
 		}
 	}
@@ -232,6 +303,28 @@ BreakLoop:
 	return 0;
 }
 
+bool YDecoder::Write(char* buffer, int len, FILE* outfile)
+{
+	unsigned int wcnt = DecodeBuffer(buffer);
+	if (wcnt > 0)
+	{
+		if (m_bNeedSetPos)
+		{
+			if (m_iBegin == 0 || m_iEnd == 0xFFFFFFFF || !outfile)
+			{
+				return false;
+			}
+			if (fseek(outfile, m_iBegin - 1, SEEK_SET))
+			{
+				return false;
+			}
+			m_bNeedSetPos = false;
+		}
+		fwrite(buffer, 1, wcnt, outfile);
+	}
+	return true;
+}
+
 Decoder::EStatus YDecoder::Check()
 {
 	m_lCalculatedCRC ^= 0xFFFFFFFF;
@@ -286,7 +379,7 @@ void UDecoder::Clear()
 
 #define UU_DECODE_CHAR(c) (c == '`' ? 0 : (((c) - ' ') & 077))
 
-int UDecoder::DecodeBuffer(char* buffer, int len)
+unsigned int UDecoder::DecodeBuffer(char* buffer, int len)
 {
 	if (!m_bBody)
 	{
@@ -353,12 +446,22 @@ int UDecoder::DecodeBuffer(char* buffer, int len)
 			}
 		}
 
-		return optr - buffer;
+		return (unsigned int)(optr - buffer);
 	}
 
 	return 0;
 }
 
+bool UDecoder::Write(char* buffer, int len, FILE* outfile)
+{
+	unsigned int wcnt = DecodeBuffer(buffer, len);
+	if (wcnt > 0)
+	{
+		fwrite(buffer, 1, wcnt, outfile);
+	}
+	return true;
+}
+
 Decoder::EStatus UDecoder::Check()
 {
 	if (!m_bBody)

Decoder.h

@@ -1,7 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -49,6 +50,8 @@ public:
 	static const char* FormatNames[];
 
 protected:
+	const char*				m_szSrcFilename;
+	const char*				m_szDestFilename;
 	char*					m_szArticleFilename;
 
 public:
@@ -56,7 +59,9 @@ public:
 	virtual					~Decoder();
 	virtual EStatus			Check() = 0;
 	virtual void			Clear();
-	virtual int				DecodeBuffer(char* buffer, int len) = 0;
+	virtual bool			Write(char* buffer, int len, FILE* outfile) = 0;
+	void					SetSrcFilename(const char* szSrcFilename) { m_szSrcFilename = szSrcFilename; }
+	void					SetDestFilename(const char* szDestFilename) { m_szDestFilename = szDestFilename; }
 	const char*				GetArticleFilename() { return m_szArticleFilename; }
 	static EFormat			DetectFormat(const char* buffer, int len);
 };
@@ -64,6 +69,7 @@ public:
 class YDecoder: public Decoder
 {
 protected:
+	static unsigned int		crc_tab[256];
 	bool					m_bBegin;
 	bool					m_bPart;
 	bool					m_bBody;
@@ -71,23 +77,28 @@ protected:
 	bool					m_bCrc;
 	unsigned long			m_lExpectedCRC;
 	unsigned long			m_lCalculatedCRC;
-	long long				m_iBegin;
-	long long				m_iEnd;
-	long long				m_iSize;
-	long long				m_iEndSize;
+	unsigned long			m_iBegin;
+	unsigned long			m_iEnd;
+	unsigned long			m_iSize;
+	unsigned long			m_iEndSize;
+	bool					m_bAutoSeek;
+	bool					m_bNeedSetPos;
 	bool					m_bCrcCheck;
 
+	unsigned int			DecodeBuffer(char* buffer);
+	static void				crc32gentab();
+	unsigned long			crc32m(unsigned long startCrc, unsigned char *block, unsigned int length);
+
 public:
 							YDecoder();
 	virtual EStatus			Check();
 	virtual void			Clear();
-	virtual int				DecodeBuffer(char* buffer, int len);
+	virtual bool			Write(char* buffer, int len, FILE* outfile);
+	void					SetAutoSeek(bool bAutoSeek) { m_bAutoSeek = m_bNeedSetPos = bAutoSeek; }
 	void					SetCrcCheck(bool bCrcCheck) { m_bCrcCheck = bCrcCheck; }
-	long long				GetBegin() { return m_iBegin; }
-	long long				GetEnd() { return m_iEnd; }
-	long long				GetSize() { return m_iSize; }
-	unsigned long			GetExpectedCrc() { return m_lExpectedCRC; }
-	unsigned long			GetCalculatedCrc() { return m_lCalculatedCRC; }
+
+	static void				Init();
+	static void				Final();
 };
 
 class UDecoder: public Decoder
@@ -96,11 +107,13 @@ private:
 	bool					m_bBody;
 	bool					m_bEnd;
 
+	unsigned int			DecodeBuffer(char* buffer, int len);
+
 public:
 							UDecoder();
 	virtual EStatus			Check();
 	virtual void			Clear();
-	virtual int				DecodeBuffer(char* buffer, int len);
+	virtual bool			Write(char* buffer, int len, FILE* outfile);
 };
 
 #endif

DiskState.h

@@ -0,0 +1,80 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *                                                          
+ */
+
+
+#ifndef DISKSTATE_H
+#define DISKSTATE_H
+
+#include "DownloadInfo.h"
+#include "FeedInfo.h"
+#include "NewsServer.h"
+
+class DiskState
+{
+private:
+	int					fscanf(FILE* infile, const char* Format, ...);
+	int					ParseFormatVersion(const char* szFormatSignature);
+	bool				SaveFileInfo(FileInfo* pFileInfo, const char* szFilename);
+	bool				LoadFileInfo(FileInfo* pFileInfo, const char* szFilename, bool bFileSummary, bool bArticles);
+	void				SaveNZBList(DownloadQueue* pDownloadQueue, FILE* outfile);
+	bool				LoadNZBList(DownloadQueue* pDownloadQueue, FILE* infile, int iFormatVersion);
+	void				SaveFileQueue(DownloadQueue* pDownloadQueue, FileQueue* pFileQueue, FILE* outfile);
+	bool				LoadFileQueue(DownloadQueue* pDownloadQueue, FileQueue* pFileQueue, FILE* infile, int iFormatVersion);
+	void				SavePostQueue(DownloadQueue* pDownloadQueue, FILE* outfile);
+	bool				LoadPostQueue(DownloadQueue* pDownloadQueue, FILE* infile, int iFormatVersion);
+	bool				LoadOldPostQueue(DownloadQueue* pDownloadQueue);
+	void				SaveUrlQueue(DownloadQueue* pDownloadQueue, FILE* outfile);
+	bool				LoadUrlQueue(DownloadQueue* pDownloadQueue, FILE* infile, int iFormatVersion);
+	void				SaveUrlInfo(UrlInfo* pUrlInfo, FILE* outfile);
+	bool				LoadUrlInfo(UrlInfo* pUrlInfo, FILE* infile, int iFormatVersion);
+	void				SaveDupInfo(DupInfo* pDupInfo, FILE* outfile);
+	bool				LoadDupInfo(DupInfo* pDupInfo, FILE* infile, int iFormatVersion);
+	void				SaveHistory(DownloadQueue* pDownloadQueue, FILE* outfile);
+	bool				LoadHistory(DownloadQueue* pDownloadQueue, FILE* infile, int iFormatVersion);
+	int					FindNZBInfoIndex(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	bool				SaveFeedStatus(Feeds* pFeeds, FILE* outfile);
+	bool				LoadFeedStatus(Feeds* pFeeds, FILE* infile, int iFormatVersion);
+	bool				SaveFeedHistory(FeedHistory* pFeedHistory, FILE* outfile);
+	bool				LoadFeedHistory(FeedHistory* pFeedHistory, FILE* infile, int iFormatVersion);
+	void				CalcCriticalHealth(DownloadQueue* pDownloadQueue);
+	bool				SaveServerStats(Servers* pServers, FILE* outfile);
+	bool				LoadServerStats(Servers* pServers, FILE* infile, int iFormatVersion);
+	void				ConvertDupeKey(char* buf, int bufsize);
+
+public:
+	bool				DownloadQueueExists();
+	bool				SaveDownloadQueue(DownloadQueue* pDownloadQueue);
+	bool				LoadDownloadQueue(DownloadQueue* pDownloadQueue);
+	bool				SaveFile(FileInfo* pFileInfo);
+	bool				LoadArticles(FileInfo* pFileInfo);
+	void				DiscardDownloadQueue();
+	bool				DiscardFile(FileInfo* pFileInfo);
+	bool				SaveFeeds(Feeds* pFeeds, FeedHistory* pFeedHistory);
+	bool				LoadFeeds(Feeds* pFeeds, FeedHistory* pFeedHistory);
+	bool				SaveStats(Servers* pServers);
+	bool				LoadStats(Servers* pServers);
+	void				CleanupTempDir(DownloadQueue* pDownloadQueue);
+};
+
+#endif

DownloadInfo.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -31,48 +31,11 @@
 #include <deque>
 #include <time.h>
 
-#include "Observer.h"
 #include "Log.h"
 #include "Thread.h"
 
 class NZBInfo;
 class DownloadQueue;
-class PostInfo;
-
-class ServerStat
-{
-private:
-	int					m_iServerID;
-	int					m_iSuccessArticles;
-	int					m_iFailedArticles;
-
-public:
-						ServerStat(int iServerID);
-	int					GetServerID() { return m_iServerID; }
-	int					GetSuccessArticles() { return m_iSuccessArticles; }
-	void				SetSuccessArticles(int iSuccessArticles) { m_iSuccessArticles = iSuccessArticles; }
-	int					GetFailedArticles() { return m_iFailedArticles; }
-	void				SetFailedArticles(int iFailedArticles) { m_iFailedArticles = iFailedArticles; }
-};
-
-typedef std::vector<ServerStat*>	ServerStatListBase;
-
-class ServerStatList : public ServerStatListBase
-{
-public:
-	enum EStatOperation
-	{
-		soSet,
-		soAdd,
-		soSubtract
-	};
-	
-public:
-						~ServerStatList();
-	void				StatOp(int iServerID, int iSuccessArticles, int iFailedArticles, EStatOperation eStatOperation);
-	void				ListOp(ServerStatList* pServerStats, EStatOperation eStatOperation);
-	void				Clear();
-};
 
 class ArticleInfo
 {
@@ -89,12 +52,8 @@ private:
 	int					m_iPartNumber;
 	char*				m_szMessageID;
 	int					m_iSize;
-	char*				m_pSegmentContent;
-	long long			m_iSegmentOffset;
-	int					m_iSegmentSize;
 	EStatus				m_eStatus;
 	char*				m_szResultFilename;
-	unsigned long		m_lCrc;
 
 public:
 						ArticleInfo();
@@ -103,21 +62,12 @@ public:
 	int 				GetPartNumber() { return m_iPartNumber; }
 	const char* 		GetMessageID() { return m_szMessageID; }
 	void 				SetMessageID(const char* szMessageID);
-	void 				SetSize(int iSize) { m_iSize = iSize; }
+	void 				SetSize(int s) { m_iSize = s; }
 	int 				GetSize() { return m_iSize; }
-	void				AttachSegment(char* pContent, long long iOffset, int iSize);
-	void				DiscardSegment();
-	const char* 		GetSegmentContent() { return m_pSegmentContent; }
-	void				SetSegmentOffset(long long iSegmentOffset) { m_iSegmentOffset = iSegmentOffset; }
-	long long			GetSegmentOffset() { return m_iSegmentOffset; }
-	void 				SetSegmentSize(int iSegmentSize) { m_iSegmentSize = iSegmentSize; }
-	int 				GetSegmentSize() { return m_iSegmentSize; }
 	EStatus				GetStatus() { return m_eStatus; }
 	void				SetStatus(EStatus Status) { m_eStatus = Status; }
 	const char*			GetResultFilename() { return m_szResultFilename; }
 	void 				SetResultFilename(const char* v);
-	unsigned long		GetCrc() { return m_lCrc; }
-	void				SetCrc(unsigned long lCrc) { m_lCrc = lCrc; }
 };
 
 class FileInfo
@@ -131,7 +81,6 @@ private:
 	NZBInfo*			m_pNZBInfo;
 	Articles			m_Articles;
 	Groups				m_Groups;
-	ServerStatList		m_ServerStats;
 	char* 				m_szSubject;
 	char*				m_szFilename;
 	long long 			m_lSize;
@@ -148,29 +97,26 @@ private:
 	bool				m_bDeleted;
 	bool				m_bFilenameConfirmed;
 	bool				m_bParFile;
-	int					m_iCompletedArticles;
+	int					m_iCompleted;
 	bool				m_bOutputInitialized;
 	char*				m_szOutputFilename;
 	Mutex*				m_pMutexOutputFile;
+	int					m_iPriority;
 	bool				m_bExtraPriority;
 	int					m_iActiveDownloads;
 	bool				m_bAutoDeleted;
-	int					m_iCachedArticles;
-	bool				m_bPartialChanged;
 
 	static int			m_iIDGen;
 	static int			m_iIDMax;
 
-	friend class CompletedFile;
-
 public:
-						FileInfo(int iID = 0);
+						FileInfo();
 						~FileInfo();
 	int					GetID() { return m_iID; }
 	void				SetID(int iID);
 	static void			ResetGenID(bool bMax);
 	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
-	void				SetNZBInfo(NZBInfo* pNZBInfo) { m_pNZBInfo = pNZBInfo; }
+	void				SetNZBInfo(NZBInfo* pNZBInfo);
 	Articles* 			GetArticles() { return &m_Articles; }
 	Groups* 			GetGroups() { return &m_Groups; }
 	const char*			GetSubject() { return m_szSubject; }
@@ -201,11 +147,11 @@ public:
 	time_t				GetTime() { return m_tTime; }
 	void				SetTime(time_t tTime) { m_tTime = tTime; }
 	bool				GetPaused() { return m_bPaused; }
-	void				SetPaused(bool bPaused);
+	void				SetPaused(bool Paused) { m_bPaused = Paused; }
 	bool				GetDeleted() { return m_bDeleted; }
 	void				SetDeleted(bool Deleted) { m_bDeleted = Deleted; }
-	int					GetCompletedArticles() { return m_iCompletedArticles; }
-	void				SetCompletedArticles(int iCompletedArticles) { m_iCompletedArticles = iCompletedArticles; }
+	int					GetCompleted() { return m_iCompleted; }
+	void				SetCompleted(int iCompleted) { m_iCompleted = iCompleted; }
 	bool				GetParFile() { return m_bParFile; }
 	void				SetParFile(bool bParFile) { m_bParFile = bParFile; }
 	void				ClearArticles();
@@ -215,60 +161,64 @@ public:
 	void 				SetOutputFilename(const char* szOutputFilename);
 	bool				GetOutputInitialized() { return m_bOutputInitialized; }
 	void				SetOutputInitialized(bool bOutputInitialized) { m_bOutputInitialized = bOutputInitialized; }
+	int					GetPriority() { return m_iPriority; }
+	void				SetPriority(int iPriority) { m_iPriority = iPriority; }
 	bool				GetExtraPriority() { return m_bExtraPriority; }
-	void				SetExtraPriority(bool bExtraPriority) { m_bExtraPriority = bExtraPriority; }
+	void				SetExtraPriority(bool bExtraPriority) { m_bExtraPriority = bExtraPriority; };
 	int					GetActiveDownloads() { return m_iActiveDownloads; }
 	void				SetActiveDownloads(int iActiveDownloads);
 	bool				GetAutoDeleted() { return m_bAutoDeleted; }
 	void				SetAutoDeleted(bool bAutoDeleted) { m_bAutoDeleted = bAutoDeleted; }
-	int					GetCachedArticles() { return m_iCachedArticles; }
-	void				SetCachedArticles(int iCachedArticles) { m_iCachedArticles = iCachedArticles; }
-	bool				GetPartialChanged() { return m_bPartialChanged; }
-	void				SetPartialChanged(bool bPartialChanged) { m_bPartialChanged = bPartialChanged; }
-	ServerStatList*		GetServerStats() { return &m_ServerStats; }
 };
                               
-typedef std::deque<FileInfo*> FileListBase;
+typedef std::deque<FileInfo*> FileQueue;
 
-class FileList : public FileListBase
+class GroupInfo
 {
 private:
-	bool				m_bOwnObjects;
+	NZBInfo*			m_pNZBInfo;
+	int					m_iFirstID;
+	int					m_iLastID;
+	int		 			m_iRemainingFileCount;
+	int					m_iPausedFileCount;
+	long long 			m_lRemainingSize;
+	long long 			m_lPausedSize;
+	int					m_iRemainingParCount;
+	time_t				m_tMinTime;
+	time_t				m_tMaxTime;
+	int					m_iMinPriority;
+	int					m_iMaxPriority;
+	int					m_iActiveDownloads;
+
+	friend class DownloadQueue;
+
 public:
-						FileList(bool bOwnObjects = false) { m_bOwnObjects = bOwnObjects; }
-						~FileList();
+						GroupInfo();
+						~GroupInfo();
+	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
+	int					GetFirstID() { return m_iFirstID; }
+	int					GetLastID() { return m_iLastID; }
+	long long 			GetRemainingSize() { return m_lRemainingSize; }
+	long long 			GetPausedSize() { return m_lPausedSize; }
+	int					GetRemainingFileCount() { return m_iRemainingFileCount; }
+	int					GetPausedFileCount() { return m_iPausedFileCount; }
+	int					GetRemainingParCount() { return m_iRemainingParCount; }
+	time_t				GetMinTime() { return m_tMinTime; }
+	time_t				GetMaxTime() { return m_tMaxTime; }
+	int					GetMinPriority() { return m_iMinPriority; }
+	int					GetMaxPriority() { return m_iMaxPriority; }
+	int					GetActiveDownloads() { return m_iActiveDownloads; }
+};
+
+typedef std::deque<GroupInfo*> GroupQueueBase;
+
+class GroupQueue : public GroupQueueBase
+{
+public:
+						~GroupQueue();
 	void				Clear();
-	void				Remove(FileInfo* pFileInfo);
 };
 
-class CompletedFile
-{
-public:
-	enum EStatus
-	{
-		cfUnknown,
-		cfSuccess,
-		cfPartial,
-		cfFailure
-	};
-
-private:
-	int					m_iID;
-	char*				m_szFileName;
-	EStatus				m_eStatus;
-	unsigned long		m_lCrc;
-
-public:
-						CompletedFile(int iID, const char* szFileName, EStatus eStatus, unsigned long lCrc);
-						~CompletedFile();
-	int					GetID() { return m_iID; }
-	void				SetFileName(const char* szFileName);
-	const char*			GetFileName() { return m_szFileName; }
-	EStatus				GetStatus() { return m_eStatus; }
-	unsigned long		GetCrc() { return m_lCrc; }
-};
-
-typedef std::deque<CompletedFile*>	CompletedFiles;
 
 class NZBParameter
 {
@@ -312,7 +262,7 @@ public:
 private:
 	char* 				m_szName;
 	EStatus				m_eStatus;
-
+	
 	friend class ScriptStatusList;
 	
 public:
@@ -333,6 +283,33 @@ public:
 	ScriptStatus::EStatus	CalcTotalStatus();
 };
 
+class ServerStat
+{
+private:
+	int					m_iServerID;
+	int					m_iSuccessArticles;
+	int					m_iFailedArticles;
+
+public:
+						ServerStat(int iServerID);
+	int					GetServerID() { return m_iServerID; }
+	int					GetSuccessArticles() { return m_iSuccessArticles; }
+	void				SetSuccessArticles(int iSuccessArticles) { m_iSuccessArticles = iSuccessArticles; }
+	int					GetFailedArticles() { return m_iFailedArticles; }
+	void				SetFailedArticles(int iFailedArticles) { m_iFailedArticles = iFailedArticles; }
+};
+
+typedef std::vector<ServerStat*>	ServerStatListBase;
+
+class ServerStatList : public ServerStatListBase
+{
+public:
+						~ServerStatList();
+	void				SetStat(int iServerID, int iSuccessArticles, int iFailedArticles, bool bAdd);
+	void				Add(ServerStatList* pServerStats);
+	void				Clear();
+};
+
 enum EDupeMode
 {
 	dmScore,
@@ -340,6 +317,8 @@ enum EDupeMode
 	dmForce
 };
 
+class NZBInfoList;
+
 class NZBInfo
 {
 public:
@@ -390,8 +369,7 @@ public:
 		dsNone,
 		dsManual,
 		dsHealth,
-		dsDupe,
-		dsBad
+		dsDupe
 	};
 
 	enum EMarkStatus
@@ -401,33 +379,12 @@ public:
 		ksGood
 	};
 
-	enum EUrlStatus
-	{
-		lsNone,
-		lsRunning,
-		lsFinished,
-		lsFailed,
-		lsRetry,
-		lsScanSkipped,
-		lsScanFailed
-	};
-
-	enum EKind
-	{
-		nkNzb,
-		nkUrl
-	};
-
+	typedef std::vector<char*>			Files;
 	typedef std::deque<Message*>		Messages;
 
-	static const int FORCE_PRIORITY = 900;
-
-	friend class DupInfo;
-
 private:
 	int					m_iID;
-	EKind				m_eKind;
-	char*				m_szURL;
+	int					m_iRefCount;
 	char* 				m_szFilename;
 	char*				m_szName;
 	char* 				m_szDestDir;
@@ -436,11 +393,6 @@ private:
 	int		 			m_iFileCount;
 	int		 			m_iParkedFileCount;
 	long long 			m_lSize;
-	long long 			m_lRemainingSize;
-	int					m_iPausedFileCount;
-	long long 			m_lPausedSize;
-	int					m_iRemainingParCount;
-	int					m_iActiveDownloads;
 	long long			m_lSuccessSize;
 	long long			m_lFailedSize;
 	long long			m_lCurrentSuccessSize;
@@ -453,12 +405,8 @@ private:
 	int					m_iTotalArticles;
 	int					m_iSuccessArticles;
 	int					m_iFailedArticles;
-	int					m_iCurrentSuccessArticles;
-	int					m_iCurrentFailedArticles;
-	time_t				m_tMinTime;
-	time_t				m_tMaxTime;
-	int					m_iPriority;
-	CompletedFiles		m_completedFiles;
+	Files				m_completedFiles;
+	bool				m_bPostProcess;
 	ERenameStatus		m_eRenameStatus;
 	EParStatus			m_eParStatus;
 	EUnpackStatus		m_eUnpackStatus;
@@ -466,8 +414,6 @@ private:
 	EMoveStatus			m_eMoveStatus;
 	EDeleteStatus		m_eDeleteStatus;
 	EMarkStatus			m_eMarkStatus;
-	EUrlStatus			m_eUrlStatus;
-	bool				m_bAddUrlPaused;
 	bool				m_bDeletePaused;
 	bool				m_bManyDupeFiles;
 	char*				m_szQueuedFilename;
@@ -483,44 +429,30 @@ private:
 	EDupeMode			m_eDupeMode;
 	unsigned int		m_iFullContentHash;
 	unsigned int		m_iFilteredContentHash;
-	FileList			m_FileList;
+	NZBInfoList*		m_Owner;
 	NZBParameterList	m_ppParameters;
 	ScriptStatusList	m_scriptStatuses;
 	ServerStatList		m_ServerStats;
-	ServerStatList		m_CurrentServerStats;
 	Mutex				m_mutexLog;
 	Messages			m_Messages;
 	int					m_iIDMessageGen;
-	PostInfo*			m_pPostInfo;
-	long long 			m_lDownloadedSize;
-	time_t				m_tDownloadStartTime;
-	int					m_iDownloadSec;
-	int					m_iPostTotalSec;
-	int					m_iParSec;
-	int					m_iRepairSec;
-	int					m_iUnpackSec;
-	bool				m_bReprocess;
-	time_t				m_tQueueScriptTime;
-	bool				m_bParFull;
 
 	static int			m_iIDGen;
 	static int			m_iIDMax;
 
+	friend class NZBInfoList;
+
 public:
-						NZBInfo();
+						NZBInfo(bool bPersistent = true);
 						~NZBInfo();
+	void				Retain();
+	void				Release();
 	int					GetID() { return m_iID; }
 	void				SetID(int iID);
 	static void			ResetGenID(bool bMax);
-	static int			GenerateID();
-	EKind				GetKind() { return m_eKind; }
-	void				SetKind(EKind eKind) { m_eKind = eKind; }
-	const char*			GetURL() { return m_szURL; }			// needs locking (for shared objects)
-	void				SetURL(const char* szURL);				// needs locking (for shared objects)
 	const char*			GetFilename() { return m_szFilename; }
 	void				SetFilename(const char* szFilename);
 	static void			MakeNiceNZBName(const char* szNZBFilename, char* szBuffer, int iSize, bool bRemoveExt);
-	static void			MakeNiceUrlName(const char* szURL, const char* szNZBFilename, char* szBuffer, int iSize);
 	const char*			GetDestDir() { return m_szDestDir; }   // needs locking (for shared objects)
 	void				SetDestDir(const char* szDestDir);     // needs locking (for shared objects)
 	const char*			GetFinalDir() { return m_szFinalDir; }   // needs locking (for shared objects)
@@ -535,16 +467,6 @@ public:
 	void 				SetParkedFileCount(int iParkedFileCount) { m_iParkedFileCount = iParkedFileCount; }
 	long long 			GetSize() { return m_lSize; }
 	void 				SetSize(long long lSize) { m_lSize = lSize; }
-	long long 			GetRemainingSize() { return m_lRemainingSize; }
-	void	 			SetRemainingSize(long long lRemainingSize) { m_lRemainingSize = lRemainingSize; }
-	long long 			GetPausedSize() { return m_lPausedSize; }
-	void	 			SetPausedSize(long long lPausedSize) { m_lPausedSize = lPausedSize; }
-	int					GetPausedFileCount() { return m_iPausedFileCount; }
-	void 				SetPausedFileCount(int iPausedFileCount) { m_iPausedFileCount = iPausedFileCount; }
-	int					GetRemainingParCount() { return m_iRemainingParCount; }
-	void 				SetRemainingParCount(int iRemainingParCount) { m_iRemainingParCount = iRemainingParCount; }
-	int					GetActiveDownloads() { return m_iActiveDownloads; }
-	void				SetActiveDownloads(int iActiveDownloads);
 	long long			GetSuccessSize() { return m_lSuccessSize; }
 	void 				SetSuccessSize(long long lSuccessSize) { m_lSuccessSize = lSuccessSize; }
 	long long			GetFailedSize() { return m_lFailedSize; }
@@ -569,21 +491,12 @@ public:
 	void 				SetSuccessArticles(int iSuccessArticles) { m_iSuccessArticles = iSuccessArticles; }
 	int					GetFailedArticles() { return m_iFailedArticles; }
 	void 				SetFailedArticles(int iFailedArticles) { m_iFailedArticles = iFailedArticles; }
-	int					GetCurrentSuccessArticles() { return m_iCurrentSuccessArticles; }
-	void 				SetCurrentSuccessArticles(int iCurrentSuccessArticles) { m_iCurrentSuccessArticles = iCurrentSuccessArticles; }
-	int					GetCurrentFailedArticles() { return m_iCurrentFailedArticles; }
-	void 				SetCurrentFailedArticles(int iCurrentFailedArticles) { m_iCurrentFailedArticles = iCurrentFailedArticles; }
-	int					GetPriority() { return m_iPriority; }
-	void				SetPriority(int iPriority) { m_iPriority = iPriority; }
-	bool				GetForcePriority() { return m_iPriority >= FORCE_PRIORITY; }
-	time_t				GetMinTime() { return m_tMinTime; }
-	void				SetMinTime(time_t tMinTime) { m_tMinTime = tMinTime; }
-	time_t				GetMaxTime() { return m_tMaxTime; }
-	void				SetMaxTime(time_t tMaxTime) { m_tMaxTime = tMaxTime; }
 	void				BuildDestDirName();
 	void				BuildFinalDirName(char* szFinalDirBuf, int iBufSize);
-	CompletedFiles*		GetCompletedFiles() { return &m_completedFiles; }		// needs locking (for shared objects)
+	Files*				GetCompletedFiles() { return &m_completedFiles; }		// needs locking (for shared objects)
 	void				ClearCompletedFiles();
+	bool				GetPostProcess() { return m_bPostProcess; }
+	void				SetPostProcess(bool bPostProcess) { m_bPostProcess = bPostProcess; }
 	ERenameStatus		GetRenameStatus() { return m_eRenameStatus; }
 	void				SetRenameStatus(ERenameStatus eRenameStatus) { m_eRenameStatus = eRenameStatus; }
 	EParStatus			GetParStatus() { return m_eParStatus; }
@@ -598,8 +511,6 @@ public:
 	void				SetDeleteStatus(EDeleteStatus eDeleteStatus) { m_eDeleteStatus = eDeleteStatus; }
 	EMarkStatus			GetMarkStatus() { return m_eMarkStatus; }
 	void				SetMarkStatus(EMarkStatus eMarkStatus) { m_eMarkStatus = eMarkStatus; }
-	EUrlStatus			GetUrlStatus() { return m_eUrlStatus; }
-	void				SetUrlStatus(EUrlStatus eUrlStatus) { m_eUrlStatus = eUrlStatus; }
 	const char*			GetQueuedFilename() { return m_szQueuedFilename; }
 	void				SetQueuedFilename(const char* szQueuedFilename);
 	bool				GetDeleting() { return m_bDeleting; }
@@ -618,15 +529,11 @@ public:
 	void				SetCleanupDisk(bool bCleanupDisk) { m_bCleanupDisk = bCleanupDisk; }
 	bool				GetUnpackCleanedUpDisk() { return m_bUnpackCleanedUpDisk; }
 	void				SetUnpackCleanedUpDisk(bool bUnpackCleanedUpDisk) { m_bUnpackCleanedUpDisk = bUnpackCleanedUpDisk; }
-	bool				GetAddUrlPaused() { return m_bAddUrlPaused; }
-	void				SetAddUrlPaused(bool bAddUrlPaused) { m_bAddUrlPaused = bAddUrlPaused; }
-	FileList*			GetFileList() { return &m_FileList; }					// needs locking (for shared objects)
 	NZBParameterList*	GetParameters() { return &m_ppParameters; }				// needs locking (for shared objects)
 	ScriptStatusList*	GetScriptStatuses() { return &m_scriptStatuses; }        // needs locking (for shared objects)
 	ServerStatList*		GetServerStats() { return &m_ServerStats; }
-	ServerStatList*		GetCurrentServerStats() { return &m_CurrentServerStats; }
 	int					CalcHealth();
-	int					CalcCriticalHealth(bool bAllowEstimation);
+	int					CalcCriticalHealth();
 	const char*			GetDupeKey() { return m_szDupeKey; }					// needs locking (for shared objects)
 	void				SetDupeKey(const char* szDupeKey);						// needs locking (for shared objects)
 	int					GetDupeScore() { return m_iDupeScore; }
@@ -637,53 +544,19 @@ public:
 	void				SetFullContentHash(unsigned int iFullContentHash) { m_iFullContentHash = iFullContentHash; }
 	unsigned int		GetFilteredContentHash() { return m_iFilteredContentHash; }
 	void				SetFilteredContentHash(unsigned int iFilteredContentHash) { m_iFilteredContentHash = iFilteredContentHash; }
-	long long 			GetDownloadedSize() { return m_lDownloadedSize; }
-	void 				SetDownloadedSize(long long lDownloadedSize) { m_lDownloadedSize = lDownloadedSize; }
-	int					GetDownloadSec() { return m_iDownloadSec; }
-	void 				SetDownloadSec(int iDownloadSec) { m_iDownloadSec = iDownloadSec; }
-	int					GetPostTotalSec() { return m_iPostTotalSec; }
-	void 				SetPostTotalSec(int iPostTotalSec) { m_iPostTotalSec = iPostTotalSec; }
-	int					GetParSec() { return m_iParSec; }
-	void 				SetParSec(int iParSec) { m_iParSec = iParSec; }
-	int					GetRepairSec() { return m_iRepairSec; }
-	void 				SetRepairSec(int iRepairSec) { m_iRepairSec = iRepairSec; }
-	int					GetUnpackSec() { return m_iUnpackSec; }
-	void 				SetUnpackSec(int iUnpackSec) { m_iUnpackSec = iUnpackSec; }
-	time_t				GetDownloadStartTime() { return m_tDownloadStartTime; }
-	void 				SetDownloadStartTime(time_t tDownloadStartTime) { m_tDownloadStartTime = tDownloadStartTime; }
-	void				SetReprocess(bool bReprocess) { m_bReprocess = bReprocess; }
-	bool				GetReprocess() { return m_bReprocess; }
-	time_t				GetQueueScriptTime() { return m_tQueueScriptTime; }
-	void 				SetQueueScriptTime(time_t tQueueScriptTime) { m_tQueueScriptTime = tQueueScriptTime; }
-	void				SetParFull(bool bParFull) { m_bParFull = bParFull; }
-	bool				GetParFull() { return m_bParFull; }
-
-	void				CopyFileList(NZBInfo* pSrcNZBInfo);
-	void				UpdateMinMaxTime();
-	PostInfo*			GetPostInfo() { return m_pPostInfo; }
-	void				EnterPostProcess();
-	void				LeavePostProcess();
-	bool				IsDupeSuccess();
-	const char*			MakeTextStatus(bool bIgnoreScriptStatus);
-
 	void				AppendMessage(Message::EKind eKind, time_t tTime, const char* szText);
 	Messages*			LockMessages();
 	void				UnlockMessages();
 };
 
-typedef std::deque<NZBInfo*> NZBQueueBase;
+typedef std::deque<NZBInfo*> NZBInfoListBase;
 
-class NZBList : public NZBQueueBase
+class NZBInfoList : public NZBInfoListBase
 {
-private:
-	bool				m_bOwnObjects;
 public:
-						NZBList(bool bOwnObjects = false) { m_bOwnObjects = bOwnObjects; }
-						~NZBList();
-	void				Clear();
-	void				Add(NZBInfo* pNZBInfo, bool bAddTop);
+	void				Add(NZBInfo* pNZBInfo);
 	void				Remove(NZBInfo* pNZBInfo);
-	NZBInfo*			Find(int iID);
+	void				ReleaseAll();
 };
 
 class PostInfo
@@ -704,15 +577,14 @@ public:
 	};
 
 	typedef std::deque<Message*>	Messages;
-	typedef std::vector<char*>		ParredFiles;
 
 private:
+	int					m_iID;
 	NZBInfo*			m_pNZBInfo;
+	char*				m_szInfoName;
 	bool				m_bWorking;
 	bool				m_bDeleted;
 	bool				m_bRequestParCheck;
-	bool				m_bForceParFull;
-	bool				m_bForceRepair;
 	EStage				m_eStage;
 	char*				m_szProgressLabel;
 	int					m_iFileProgress;
@@ -724,13 +596,18 @@ private:
 	Mutex				m_mutexLog;
 	Messages			m_Messages;
 	int					m_iIDMessageGen;
-	ParredFiles			m_ParredFiles;
+
+	static int			m_iIDGen;
+	static int			m_iIDMax;
 
 public:
 						PostInfo();
 						~PostInfo();
+	int					GetID() { return m_iID; }
 	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
-	void				SetNZBInfo(NZBInfo* pNZBInfo) { m_pNZBInfo = pNZBInfo; }
+	void				SetNZBInfo(NZBInfo* pNZBInfo);
+	const char*			GetInfoName() { return m_szInfoName; }
+	void				SetInfoName(const char* szInfoName);
 	EStage				GetStage() { return m_eStage; }
 	void				SetStage(EStage eStage) { m_eStage = eStage; }
 	void				SetProgressLabel(const char* szProgressLabel);
@@ -749,22 +626,84 @@ public:
 	void				SetDeleted(bool bDeleted) { m_bDeleted = bDeleted; }
 	bool				GetRequestParCheck() { return m_bRequestParCheck; }
 	void				SetRequestParCheck(bool bRequestParCheck) { m_bRequestParCheck = bRequestParCheck; }
-	bool				GetForceParFull() { return m_bForceParFull; }
-	void				SetForceParFull(bool bForceParFull) { m_bForceParFull = bForceParFull; }
-	bool				GetForceRepair() { return m_bForceRepair; }
-	void				SetForceRepair(bool bForceRepair) { m_bForceRepair = bForceRepair; }
+	void				AppendMessage(Message::EKind eKind, const char* szText);
 	Thread*				GetPostThread() { return m_pPostThread; }
 	void				SetPostThread(Thread* pPostThread) { m_pPostThread = pPostThread; }
-	void				AppendMessage(Message::EKind eKind, const char* szText);
 	Messages*			LockMessages();
 	void				UnlockMessages();
-	ParredFiles*		GetParredFiles() { return &m_ParredFiles; }
 };
 
+typedef std::deque<PostInfo*> PostQueue;
+
 typedef std::vector<int> IDList;
 
 typedef std::vector<char*> NameList;
 
+class UrlInfo
+{
+public:
+	enum EStatus
+	{
+		aiUndefined,
+		aiRunning,
+		aiFinished,
+		aiFailed,
+		aiRetry,
+		aiScanSkipped,
+		aiScanFailed
+	};
+
+private:
+	int					m_iID;
+	char*				m_szURL;
+	char*				m_szNZBFilename;
+	char* 				m_szCategory;
+	int					m_iPriority;
+	char*				m_szDupeKey;
+	int					m_iDupeScore;
+	EDupeMode			m_eDupeMode;
+	bool				m_bAddTop;
+	bool				m_bAddPaused;
+	bool				m_bForce;
+	EStatus				m_eStatus;
+
+	static int			m_iIDGen;
+	static int			m_iIDMax;
+
+public:
+						UrlInfo();
+						~UrlInfo();
+	int					GetID() { return m_iID; }
+	void				SetID(int iID);
+	static void			ResetGenID(bool bMax);
+	const char*			GetURL() { return m_szURL; }			// needs locking (for shared objects)
+	void				SetURL(const char* szURL);				// needs locking (for shared objects)
+	const char*			GetNZBFilename() { return m_szNZBFilename; }		// needs locking (for shared objects)
+	void				SetNZBFilename(const char* szNZBFilename);			// needs locking (for shared objects)
+	const char*			GetCategory() { return m_szCategory; }	// needs locking (for shared objects)
+	void				SetCategory(const char* szCategory);	// needs locking (for shared objects)
+	int					GetPriority() { return m_iPriority; }
+	void				SetPriority(int iPriority) { m_iPriority = iPriority; }
+	const char*			GetDupeKey() { return m_szDupeKey; }
+	void				SetDupeKey(const char* szDupeKey);
+	int					GetDupeScore() { return m_iDupeScore; }
+	void				SetDupeScore(int iDupeScore) { m_iDupeScore = iDupeScore; }
+	EDupeMode			GetDupeMode() { return m_eDupeMode; }
+	void				SetDupeMode(EDupeMode eDupeMode) { m_eDupeMode = eDupeMode; }
+	bool				GetAddTop() { return m_bAddTop; }
+	void				SetAddTop(bool bAddTop) { m_bAddTop = bAddTop; }
+	bool				GetAddPaused() { return m_bAddPaused; }
+	void				SetAddPaused(bool bAddPaused) { m_bAddPaused = bAddPaused; }
+	void				GetName(char* szBuffer, int iSize);		// needs locking (for shared objects)
+	static void			MakeNiceName(const char* szURL, const char* szNZBFilename, char* szBuffer, int iSize);
+	bool				GetForce() { return m_bForce; }
+	void				SetForce(bool bForce) { m_bForce = bForce; }
+	EStatus				GetStatus() { return m_eStatus; }
+	void				SetStatus(EStatus Status) { m_eStatus = Status; }
+};
+
+typedef std::deque<UrlInfo*> UrlQueue;
+
 class DupInfo
 {
 public:
@@ -780,7 +719,6 @@ public:
 	};
 
 private:
-	int					m_iID;
 	char*				m_szName;
 	char*				m_szDupeKey;
 	int					m_iDupeScore;
@@ -793,8 +731,6 @@ private:
 public:
 						DupInfo();
 						~DupInfo();
-	int					GetID() { return m_iID; }
-	void				SetID(int iID);
 	const char*			GetName() { return m_szName; }			// needs locking (for shared objects)
 	void				SetName(const char* szName);			// needs locking (for shared objects)
 	const char*			GetDupeKey() { return m_szDupeKey; }	// needs locking (for shared objects)
@@ -819,25 +755,33 @@ public:
 	enum EKind
 	{
 		hkUnknown,
-		hkNzb,
-		hkUrl,
-		hkDup
+		hkNZBInfo,
+		hkUrlInfo,
+		hkDupInfo
 	};
 
 private:
+	int					m_iID;
 	EKind				m_eKind;
 	void*				m_pInfo;
 	time_t				m_tTime;
 
+	static int			m_iIDGen;
+	static int			m_iIDMax;
+
 public:
 						HistoryInfo(NZBInfo* pNZBInfo);
+						HistoryInfo(UrlInfo* pUrlInfo);
 						HistoryInfo(DupInfo* pDupInfo);
 						~HistoryInfo();
+	int					GetID() { return m_iID; }
+	void				SetID(int iID);
+	static void			ResetGenID(bool bMax);
 	EKind				GetKind() { return m_eKind; }
-	int					GetID();
 	NZBInfo*			GetNZBInfo() { return (NZBInfo*)m_pInfo; }
+	UrlInfo*			GetUrlInfo() { return (UrlInfo*)m_pInfo; }
 	DupInfo*			GetDupInfo() { return (DupInfo*)m_pInfo; }
-	void				DiscardNZBInfo() { m_pInfo = NULL; }
+	void				DiscardUrlInfo() { m_pInfo = NULL; }
 	time_t				GetTime() { return m_tTime; }
 	void				SetTime(time_t tTime) { m_tTime = tTime; }
 	void				GetName(char* szBuffer, int iSize);		// needs locking (for shared objects)
@@ -845,105 +789,32 @@ public:
 
 typedef std::deque<HistoryInfo*> HistoryList;
 
-class DownloadQueue : public Subject
+class DownloadQueue
+{
+protected:
+	NZBInfoList			m_NZBInfoList;
+	FileQueue			m_FileQueue;
+	PostQueue			m_PostQueue;
+	HistoryList			m_HistoryList;
+	FileQueue			m_ParkedFiles;
+	UrlQueue			m_UrlQueue;
+
+public:
+	NZBInfoList*		GetNZBInfoList() { return &m_NZBInfoList; }
+	FileQueue*			GetFileQueue() { return &m_FileQueue; }
+	PostQueue*			GetPostQueue() { return &m_PostQueue; }
+	HistoryList*		GetHistoryList() { return &m_HistoryList; }
+	FileQueue*			GetParkedFiles() { return &m_ParkedFiles; }
+	UrlQueue*			GetUrlQueue() { return &m_UrlQueue; }
+	void				BuildGroups(GroupQueue* pGroupQueue);
+};
+
+class DownloadQueueHolder
 {
 public:
-	enum EAspectAction
-	{
-		eaNzbFound,
-		eaNzbAdded,
-		eaNzbDeleted,
-		eaFileCompleted,
-		eaFileDeleted,
-		eaUrlCompleted
-	};
-
-	struct Aspect
-	{
-		EAspectAction eAction;
-		DownloadQueue* pDownloadQueue;
-		NZBInfo* pNZBInfo;
-		FileInfo* pFileInfo;
-	};
-
-	enum EEditAction
-	{
-		eaFileMoveOffset = 1,	// move files to m_iOffset relative to the current position in download-queue
-		eaFileMoveTop,			// move files to the top of download-queue
-		eaFileMoveBottom,		// move files to the bottom of download-queue
-		eaFilePause,			// pause files
-		eaFileResume,			// resume (unpause) files
-		eaFileDelete,			// delete files
-		eaFilePauseAllPars,		// pause only (all) pars (does not affect other files)
-		eaFilePauseExtraPars,	// pause only (almost all) pars, except main par-file (does not affect other files)
-		eaFileReorder,			// set file order
-		eaFileSplit,			// split - create new group from selected files
-		eaGroupMoveOffset,		// move group to m_iOffset relative to the current position in download-queue
-		eaGroupMoveTop,			// move group to the top of download-queue
-		eaGroupMoveBottom,		// move group to the bottom of download-queue
-		eaGroupPause,			// pause group
-		eaGroupResume,			// resume (unpause) group
-		eaGroupDelete,			// delete group and put to history
-		eaGroupDupeDelete,		// delete group, put to history and mark as duplicate
-		eaGroupFinalDelete,		// delete group without adding to history
-		eaGroupPauseAllPars,	// pause only (all) pars (does not affect other files) in group
-		eaGroupPauseExtraPars,	// pause only (almost all) pars in group, except main par-file (does not affect other files)
-		eaGroupSetPriority,		// set priority for groups
-		eaGroupSetCategory,		// set or change category for a group
-		eaGroupApplyCategory,	// set or change category for a group and reassign pp-params according to category settings
-		eaGroupMerge,			// merge groups
-		eaGroupSetParameter,	// set post-process parameter for group
-		eaGroupSetName,			// set group name (rename group)
-		eaGroupSetDupeKey,		// set duplicate key
-		eaGroupSetDupeScore,	// set duplicate score
-		eaGroupSetDupeMode,		// set duplicate mode
-		eaPostDelete,			// cancel post-processing
-		eaHistoryDelete,		// hide history-item
-		eaHistoryFinalDelete,	// delete history-item
-		eaHistoryReturn,		// move history-item back to download queue
-		eaHistoryProcess,		// move history-item back to download queue and start postprocessing
-		eaHistoryRedownload,	// move history-item back to download queue for redownload
-		eaHistorySetParameter,	// set post-process parameter for history-item
-		eaHistorySetDupeKey,	// set duplicate key
-		eaHistorySetDupeScore,	// set duplicate score
-		eaHistorySetDupeMode,	// set duplicate mode
-		eaHistorySetDupeBackup,	// set duplicate backup flag
-		eaHistoryMarkBad,		// mark history-item as bad (and download other duplicate)
-		eaHistoryMarkGood		// mark history-item as good (and push it into dup-history)
-	};
-
-	enum EMatchMode
-	{
-		mmID = 1,
-		mmName,
-		mmRegEx
-	};
-
-private:
-	NZBList					m_Queue;
-	HistoryList				m_History;
-	Mutex	 				m_LockMutex;
-
-	static DownloadQueue*	g_pDownloadQueue;
-	static bool				g_bLoaded;
-
-protected:
-							DownloadQueue() : m_Queue(true) {}
-	static void				Init(DownloadQueue* pGlobalInstance) { g_pDownloadQueue = pGlobalInstance; }
-	static void				Final() { g_pDownloadQueue = NULL; }
-	static void				Loaded() { g_bLoaded = true; }
-
-public:
-	virtual					~DownloadQueue() {}
-	static bool				IsLoaded() { return g_bLoaded; }
-	static DownloadQueue*	Lock();
-	static void				Unlock();
-	NZBList*				GetQueue() { return &m_Queue; }
-	HistoryList*			GetHistory() { return &m_History; }
-	virtual bool			EditEntry(int ID, EEditAction eAction, int iOffset, const char* szText) = 0;
-	virtual bool			EditList(IDList* pIDList, NameList* pNameList, EMatchMode eMatchMode, EEditAction eAction, int iOffset, const char* szText) = 0;
-	virtual void			Save() = 0;
-	void					CalcRemainingSize(long long* pRemaining, long long* pRemainingForced);
+	virtual					~DownloadQueueHolder() {};
+	virtual DownloadQueue*	LockQueue() = 0;
+	virtual void			UnlockQueue() = 0;
 };
 
 #endif

DupeCoordinator.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -46,12 +46,28 @@
 #include "Options.h"
 #include "Log.h"
 #include "Util.h"
+#include "DiskState.h"
 #include "NZBFile.h"
-#include "HistoryCoordinator.h"
+#include "QueueCoordinator.h"
 #include "DupeCoordinator.h"
 
-extern HistoryCoordinator* g_pHistoryCoordinator;
+extern QueueCoordinator* g_pQueueCoordinator;
 extern Options* g_pOptions;
+extern DiskState* g_pDiskState;
+
+bool DupeCoordinator::IsDupeSuccess(NZBInfo* pNZBInfo)
+{
+	bool bFailure =
+		pNZBInfo->GetDeleteStatus() != NZBInfo::dsNone ||
+		pNZBInfo->GetMarkStatus() == NZBInfo::ksBad ||
+		pNZBInfo->GetParStatus() == NZBInfo::psFailure ||
+		pNZBInfo->GetUnpackStatus() == NZBInfo::usFailure ||
+		pNZBInfo->GetUnpackStatus() == NZBInfo::usPassword ||
+		(pNZBInfo->GetParStatus() == NZBInfo::psSkipped &&
+		 pNZBInfo->GetUnpackStatus() == NZBInfo::usSkipped &&
+		 pNZBInfo->CalcHealth() < pNZBInfo->CalcCriticalHealth());
+	return !bFailure;
+}
 
 bool DupeCoordinator::SameNameOrKey(const char* szName1, const char* szDupeKey1,
 	const char* szName2, const char* szDupeKey2)
@@ -79,79 +95,65 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 {
 	debug("Checking duplicates for %s", pNZBInfo->GetName());
 
+	GroupQueue groupQueue;
+	pDownloadQueue->BuildGroups(&groupQueue);
+
 	// find duplicates in download queue with exactly same content
-	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+	for (GroupQueue::iterator it = groupQueue.begin(); it != groupQueue.end(); it++)
 	{
-		NZBInfo* pQueuedNZBInfo = *it;
+		GroupInfo* pGroupInfo = *it;
+		NZBInfo* pGroupNZBInfo = pGroupInfo->GetNZBInfo();
 		bool bSameContent = (pNZBInfo->GetFullContentHash() > 0 &&
-			pNZBInfo->GetFullContentHash() == pQueuedNZBInfo->GetFullContentHash()) ||
+			pNZBInfo->GetFullContentHash() == pGroupNZBInfo->GetFullContentHash()) ||
 			(pNZBInfo->GetFilteredContentHash() > 0 &&
-			 pNZBInfo->GetFilteredContentHash() == pQueuedNZBInfo->GetFilteredContentHash());
+			 pNZBInfo->GetFilteredContentHash() == pGroupNZBInfo->GetFilteredContentHash());
 
 		// if there is a duplicate with exactly same content (via hash-check) 
 		// in queue - the new item is skipped
-		if (pQueuedNZBInfo != pNZBInfo && bSameContent && pNZBInfo->GetKind() == NZBInfo::nkNzb)
+		if (pGroupNZBInfo != pNZBInfo && bSameContent)
 		{
-			if (!strcmp(pNZBInfo->GetName(), pQueuedNZBInfo->GetName()))
+			if (!strcmp(pNZBInfo->GetName(), pGroupNZBInfo->GetName()))
 			{
 				warn("Skipping duplicate %s, already queued", pNZBInfo->GetName());
 			}
 			else
 			{
 				warn("Skipping duplicate %s, already queued as %s",
-					pNZBInfo->GetName(), pQueuedNZBInfo->GetName());
+					pNZBInfo->GetName(), pGroupNZBInfo->GetName());
 			}
 			// Flag saying QueueCoordinator to skip nzb-file
 			pNZBInfo->SetDeleteStatus(NZBInfo::dsManual);
-			g_pHistoryCoordinator->DeleteDiskFiles(pNZBInfo);
+			DeleteQueuedFile(pNZBInfo->GetQueuedFilename());
 			return;
 		}
 	}
 
-	// if download has empty dupekey and empty dupescore - check if download queue
-	// or history have an item with the same name and non empty dupekey or dupescore and
-	// take these properties from this item
-	if (Util::EmptyStr(pNZBInfo->GetDupeKey()) && pNZBInfo->GetDupeScore() == 0)
+	// find duplicates in post queue with exactly same content
+	for (PostQueue::iterator it = pDownloadQueue->GetPostQueue()->begin(); it != pDownloadQueue->GetPostQueue()->end(); it++)
 	{
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+		PostInfo* pPostInfo = *it;
+		bool bSameContent = (pNZBInfo->GetFullContentHash() > 0 &&
+			pNZBInfo->GetFullContentHash() == pPostInfo->GetNZBInfo()->GetFullContentHash()) ||
+			(pNZBInfo->GetFilteredContentHash() > 0 &&
+			 pNZBInfo->GetFilteredContentHash() == pPostInfo->GetNZBInfo()->GetFilteredContentHash());
+
+		// if there is a duplicate with exactly same content (via hash-check) 
+		// in queue - the new item is skipped;
+		if (bSameContent)
 		{
-			NZBInfo* pQueuedNZBInfo = *it;
-			if (!strcmp(pQueuedNZBInfo->GetName(), pNZBInfo->GetName()) &&
-				(!Util::EmptyStr(pQueuedNZBInfo->GetDupeKey()) || pQueuedNZBInfo->GetDupeScore() != 0))
+			if (!strcmp(pNZBInfo->GetName(), pPostInfo->GetNZBInfo()->GetName()))
 			{
-				pNZBInfo->SetDupeKey(pQueuedNZBInfo->GetDupeKey());
-				pNZBInfo->SetDupeScore(pQueuedNZBInfo->GetDupeScore());
-				info("Assigning dupekey %s and dupescore %i to %s from existing queue item with the same name",
-					 pNZBInfo->GetDupeKey(), pNZBInfo->GetDupeScore(), pNZBInfo->GetName());
-				break;
+				warn("Skipping duplicate %s, already queued", pNZBInfo->GetName());
 			}
-		}
-	}
-	if (Util::EmptyStr(pNZBInfo->GetDupeKey()) && pNZBInfo->GetDupeScore() == 0)
-	{
-		for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
-		{
-			HistoryInfo* pHistoryInfo = *it;
-			if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
-				!strcmp(pHistoryInfo->GetNZBInfo()->GetName(), pNZBInfo->GetName()) &&
-				(!Util::EmptyStr(pHistoryInfo->GetNZBInfo()->GetDupeKey()) || pHistoryInfo->GetNZBInfo()->GetDupeScore() != 0))
+			else
 			{
-				pNZBInfo->SetDupeKey(pHistoryInfo->GetNZBInfo()->GetDupeKey());
-				pNZBInfo->SetDupeScore(pHistoryInfo->GetNZBInfo()->GetDupeScore());
-				info("Assigning dupekey %s and dupescore %i to %s from existing history item with the same name",
-					 pNZBInfo->GetDupeKey(), pNZBInfo->GetDupeScore(), pNZBInfo->GetName());
-				break;
-			}
-			if (pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
-				!strcmp(pHistoryInfo->GetDupInfo()->GetName(), pNZBInfo->GetName()) &&
-				(!Util::EmptyStr(pHistoryInfo->GetDupInfo()->GetDupeKey()) || pHistoryInfo->GetDupInfo()->GetDupeScore() != 0))
-			{
-				pNZBInfo->SetDupeKey(pHistoryInfo->GetDupInfo()->GetDupeKey());
-				pNZBInfo->SetDupeScore(pHistoryInfo->GetDupInfo()->GetDupeScore());
-				info("Assigning dupekey %s and dupescore %i to %s from existing history item with the same name",
-					 pNZBInfo->GetDupeKey(), pNZBInfo->GetDupeScore(), pNZBInfo->GetName());
-				break;
+				warn("Skipping duplicate %s, already queued as %s",
+					pNZBInfo->GetName(), pPostInfo->GetNZBInfo()->GetName());
 			}
+			// Flag saying QueueCoordinator to skip nzb-file
+			pNZBInfo->SetDeleteStatus(NZBInfo::dsManual);
+			DeleteQueuedFile(pNZBInfo->GetQueuedFilename());
+			return;
 		}
 	}
 
@@ -165,11 +167,11 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 	// find duplicates in queue having exactly same content
 	// also: nzb-files having duplicates marked as good are skipped
 	// also (only in score mode): nzb-files having success-duplicates in dup-history but don't having duplicates in recent history are skipped
-	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+	for (HistoryList::iterator it = pDownloadQueue->GetHistoryList()->begin(); it != pDownloadQueue->GetHistoryList()->end(); it++)
 	{
 		HistoryInfo* pHistoryInfo = *it;
 
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo &&
 			((pNZBInfo->GetFullContentHash() > 0 &&
 			pNZBInfo->GetFullContentHash() == pHistoryInfo->GetNZBInfo()->GetFullContentHash()) ||
 			(pNZBInfo->GetFilteredContentHash() > 0 &&
@@ -181,7 +183,7 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 			break;
 		}
 
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkDupInfo &&
 			((pNZBInfo->GetFullContentHash() > 0 &&
 			  pNZBInfo->GetFullContentHash() == pHistoryInfo->GetDupInfo()->GetFullContentHash()) ||
 			 (pNZBInfo->GetFilteredContentHash() > 0 &&
@@ -193,7 +195,7 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 			break;
 		}
 
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo &&
 			pHistoryInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
 			pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksGood &&
 			SameNameOrKey(pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey(),
@@ -205,7 +207,7 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 			break;
 		}
 
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkDupInfo &&
 			pHistoryInfo->GetDupInfo()->GetDupeMode() != dmForce &&
 			(pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsGood ||
 			 (pNZBInfo->GetDupeMode() == dmScore &&
@@ -224,15 +226,15 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 	if (!bSameContent && !bGood && pNZBInfo->GetDupeMode() == dmScore)
 	{
 		// nzb-files having success-duplicates in recent history (with different content) are added to history for backup
-		for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+		for (HistoryList::iterator it = pDownloadQueue->GetHistoryList()->begin(); it != pDownloadQueue->GetHistoryList()->end(); it++)
 		{
 			HistoryInfo* pHistoryInfo = *it;
-			if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+			if (pHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo &&
 				pHistoryInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
 				SameNameOrKey(pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey(),
 					pNZBInfo->GetName(), pNZBInfo->GetDupeKey()) &&
 				pNZBInfo->GetDupeScore() <= pHistoryInfo->GetNZBInfo()->GetDupeScore() &&
-				pHistoryInfo->GetNZBInfo()->IsDupeSuccess())
+				IsDupeSuccess(pHistoryInfo->GetNZBInfo()))
 			{
 				// Flag saying QueueCoordinator to skip nzb-file
 				pNZBInfo->SetDeleteStatus(NZBInfo::dsDupe);
@@ -258,7 +260,7 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 
 		// Flag saying QueueCoordinator to skip nzb-file
 		pNZBInfo->SetDeleteStatus(NZBInfo::dsManual);
-		g_pHistoryCoordinator->DeleteDiskFiles(pNZBInfo);
+		DeleteQueuedFile(pNZBInfo->GetQueuedFilename());
 		return;
 	}
 
@@ -267,53 +269,82 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 	if (pNZBInfo->GetDupeMode() == dmScore)
 	{
 		// find duplicates in download queue
-		int index = 0;
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); index++)
+		for (GroupQueue::iterator it = groupQueue.begin(); it != groupQueue.end(); it++)
 		{
-			NZBInfo* pQueuedNZBInfo = *it++;
-			if (pQueuedNZBInfo != pNZBInfo &&
-				pQueuedNZBInfo->GetKind() == NZBInfo::nkNzb &&
-				pQueuedNZBInfo->GetDupeMode() != dmForce &&
-				SameNameOrKey(pQueuedNZBInfo->GetName(), pQueuedNZBInfo->GetDupeKey(),
+			GroupInfo* pGroupInfo = *it;
+			NZBInfo* pGroupNZBInfo = pGroupInfo->GetNZBInfo();
+
+			if (pGroupNZBInfo != pNZBInfo &&
+				pGroupNZBInfo->GetDupeMode() != dmForce &&
+				SameNameOrKey(pGroupNZBInfo->GetName(), pGroupNZBInfo->GetDupeKey(),
 					pNZBInfo->GetName(), pNZBInfo->GetDupeKey()))
 			{
 				// if queue has a duplicate with the same or higher score - the new item
 				// is moved to history as dupe-backup
-				if (pNZBInfo->GetDupeScore() <= pQueuedNZBInfo->GetDupeScore())
+				if (pNZBInfo->GetDupeScore() <= pGroupNZBInfo->GetDupeScore())
 				{
 					// Flag saying QueueCoordinator to skip nzb-file
 					pNZBInfo->SetDeleteStatus(NZBInfo::dsDupe);
-					info("Collection %s is duplicate to %s", pNZBInfo->GetName(), pQueuedNZBInfo->GetName());
+					info("Collection %s is duplicate to %s", pNZBInfo->GetName(), pGroupNZBInfo->GetName());
 					return;
 				}
-
 				// if queue has a duplicate with lower score - the existing item is moved
 				// to history as dupe-backup (unless it is in post-processing stage) and
-				// the new item is added to queue (unless it is in post-processing stage)
-				if (!pQueuedNZBInfo->GetPostInfo())
+				// the new item is added to queue
+				else
 				{
-					// the existing queue item is moved to history as dupe-backup
-					info("Moving collection %s with lower duplicate score to history", pQueuedNZBInfo->GetName());
-					pQueuedNZBInfo->SetDeleteStatus(NZBInfo::dsDupe);
-					pDownloadQueue->EditEntry(pQueuedNZBInfo->GetID(),
-						DownloadQueue::eaGroupDelete, 0, NULL);
-					it = pDownloadQueue->GetQueue()->begin() + index;
+					// unless it is in post-processing stage
+					bool bPostProcess = false;
+					for (PostQueue::iterator it = pDownloadQueue->GetPostQueue()->begin(); it != pDownloadQueue->GetPostQueue()->end(); it++)
+					{
+						PostInfo* pPostInfo = *it;
+						if (pPostInfo->GetNZBInfo() == pGroupNZBInfo)
+						{
+							bPostProcess = true;
+							break;
+						}
+					}
+					if (!bPostProcess)
+					{
+						// the existing queue item is moved to history as dupe-backup
+						info("Moving collection %s with lower duplicate score to history", pGroupNZBInfo->GetName());
+						pGroupNZBInfo->SetDeleteStatus(NZBInfo::dsDupe);
+						g_pQueueCoordinator->GetQueueEditor()->LockedEditEntry(pDownloadQueue, pGroupInfo->GetLastID(), false, QueueEditor::eaGroupDelete, 0, NULL);
+					}
 				}
 			}
 		}
+
+		// find duplicates in post queue
+		for (PostQueue::iterator it = pDownloadQueue->GetPostQueue()->begin(); it != pDownloadQueue->GetPostQueue()->end(); it++)
+		{
+			PostInfo* pPostInfo = *it;
+			// if queue has a duplicate with the same or higher score - the new item
+			// is moved to history as dupe-backup;
+			if (pPostInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
+				pNZBInfo->GetDupeScore() <= pPostInfo->GetNZBInfo()->GetDupeScore() &&
+				SameNameOrKey(pPostInfo->GetNZBInfo()->GetName(), pPostInfo->GetNZBInfo()->GetDupeKey(),
+					pNZBInfo->GetName(), pNZBInfo->GetDupeKey()))
+			{
+				// Flag saying QueueCoordinator to skip nzb-file
+				pNZBInfo->SetDeleteStatus(NZBInfo::dsDupe);
+				info("Collection %s is duplicate to %s", pNZBInfo->GetName(), pPostInfo->GetNZBInfo()->GetName());
+				return;
+			}
+		}
 	}
 }
 
 /**
   - if download of an item fails and there are duplicates in history -
-    return the best duplicate from history to queue for download;
+    return the best duplicate from historyto queue for download;
   - if download of an item completes successfully - nothing extra needs to be done;
 */
 void DupeCoordinator::NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 {
 	debug("Processing duplicates for %s", pNZBInfo->GetName());
 
-	if (pNZBInfo->GetDupeMode() == dmScore && !pNZBInfo->IsDupeSuccess())
+	if (pNZBInfo->GetDupeMode() == dmScore && !IsDupeSuccess(pNZBInfo))
 	{
 		ReturnBestDupe(pDownloadQueue, pNZBInfo, pNZBInfo->GetName(), pNZBInfo->GetDupeKey());
 	}
@@ -327,14 +358,14 @@ void DupeCoordinator::ReturnBestDupe(DownloadQueue* pDownloadQueue, NZBInfo* pNZ
 	// check if history (recent or dup) has other success-duplicates or good-duplicates
 	bool bHistoryDupe = false;
 	int iHistoryScore = 0;
-	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+	for (HistoryList::iterator it = pDownloadQueue->GetHistoryList()->begin(); it != pDownloadQueue->GetHistoryList()->end(); it++)
 	{
 		HistoryInfo* pHistoryInfo = *it;
 		bool bGoodDupe = false;
 
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo &&
 			pHistoryInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
-			(pHistoryInfo->GetNZBInfo()->IsDupeSuccess() ||
+			(IsDupeSuccess(pHistoryInfo->GetNZBInfo()) ||
 			 pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksGood) &&
 			SameNameOrKey(pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey(), szNZBName, szDupeKey))
 		{
@@ -346,7 +377,7 @@ void DupeCoordinator::ReturnBestDupe(DownloadQueue* pDownloadQueue, NZBInfo* pNZ
 			bGoodDupe = pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksGood;
 		}
 
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkDupInfo &&
 			pHistoryInfo->GetDupInfo()->GetDupeMode() != dmForce &&
 			(pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsSuccess ||
 			 pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsGood) &&
@@ -367,19 +398,37 @@ void DupeCoordinator::ReturnBestDupe(DownloadQueue* pDownloadQueue, NZBInfo* pNZ
 		}
 	}
 
+	// check if duplicates exist in post-processing queue
+	bool bPostDupe = false;
+	int iPostScore = 0;
+	for (PostQueue::iterator it = pDownloadQueue->GetPostQueue()->begin(); it != pDownloadQueue->GetPostQueue()->end(); it++)
+	{
+		PostInfo* pPostInfo = *it;
+		if (pPostInfo->GetNZBInfo() != pNZBInfo &&
+			pPostInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
+			SameNameOrKey(pPostInfo->GetNZBInfo()->GetName(), pPostInfo->GetNZBInfo()->GetDupeKey(), szNZBName, szDupeKey) &&
+			(!bPostDupe || pPostInfo->GetNZBInfo()->GetDupeScore() > iPostScore))
+		{
+			iPostScore = pPostInfo->GetNZBInfo()->GetDupeScore();
+			bPostDupe = true;
+		}
+	}
+
 	// check if duplicates exist in download queue
+	GroupQueue groupQueue;
+	pDownloadQueue->BuildGroups(&groupQueue);
 	bool bQueueDupe = false;
 	int iQueueScore = 0;
-	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+	for (GroupQueue::iterator it = groupQueue.begin(); it != groupQueue.end(); it++)
 	{
-		NZBInfo* pQueuedNZBInfo = *it;
-		if (pQueuedNZBInfo != pNZBInfo &&
-			pQueuedNZBInfo->GetKind() == NZBInfo::nkNzb &&
-			pQueuedNZBInfo->GetDupeMode() != dmForce &&
-			SameNameOrKey(pQueuedNZBInfo->GetName(), pQueuedNZBInfo->GetDupeKey(), szNZBName, szDupeKey) &&
-			(!bQueueDupe || pQueuedNZBInfo->GetDupeScore() > iQueueScore))
+		GroupInfo* pGroupInfo = *it;
+		NZBInfo* pGroupNZBInfo = pGroupInfo->GetNZBInfo();
+		if (pGroupNZBInfo != pNZBInfo &&
+			pGroupNZBInfo->GetDupeMode() != dmForce &&
+			SameNameOrKey(pGroupNZBInfo->GetName(), pGroupNZBInfo->GetDupeKey(), szNZBName, szDupeKey) &&
+			(!bQueueDupe || pGroupNZBInfo->GetDupeScore() > iQueueScore))
 		{
-			iQueueScore = pQueuedNZBInfo->GetDupeScore();
+			iQueueScore = pGroupNZBInfo->GetDupeScore();
 			bQueueDupe = true;
 		}
 	}
@@ -387,15 +436,16 @@ void DupeCoordinator::ReturnBestDupe(DownloadQueue* pDownloadQueue, NZBInfo* pNZ
 	// find dupe-backup with highest score, whose score is also higher than other
 	// success-duplicates and higher than already queued items
 	HistoryInfo* pHistoryDupe = NULL;
-	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+	for (HistoryList::iterator it = pDownloadQueue->GetHistoryList()->begin(); it != pDownloadQueue->GetHistoryList()->end(); it++)
 	{
 		HistoryInfo* pHistoryInfo = *it;
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo &&
 			pHistoryInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
 			pHistoryInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsDupe &&
-			pHistoryInfo->GetNZBInfo()->CalcHealth() >= pHistoryInfo->GetNZBInfo()->CalcCriticalHealth(true) &&
+			pHistoryInfo->GetNZBInfo()->CalcHealth() >= pHistoryInfo->GetNZBInfo()->CalcCriticalHealth() &&
 			pHistoryInfo->GetNZBInfo()->GetMarkStatus() != NZBInfo::ksBad &&
 			(!bHistoryDupe || pHistoryInfo->GetNZBInfo()->GetDupeScore() > iHistoryScore) &&
+			(!bPostDupe || pHistoryInfo->GetNZBInfo()->GetDupeScore() > iPostScore) &&
 			(!bQueueDupe || pHistoryInfo->GetNZBInfo()->GetDupeScore() > iQueueScore) &&
 			(!pHistoryDupe || pHistoryInfo->GetNZBInfo()->GetDupeScore() > pHistoryDupe->GetNZBInfo()->GetDupeScore()) &&
 			SameNameOrKey(pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey(), szNZBName, szDupeKey))
@@ -408,7 +458,7 @@ void DupeCoordinator::ReturnBestDupe(DownloadQueue* pDownloadQueue, NZBInfo* pNZ
 	if (pHistoryDupe)
 	{
 		info("Found duplicate %s for %s", pHistoryDupe->GetNZBInfo()->GetName(), szNZBName);
-		g_pHistoryCoordinator->Redownload(pDownloadQueue, pHistoryDupe);
+		HistoryRedownload(pDownloadQueue, pHistoryDupe);
 	}
 }
 
@@ -419,11 +469,11 @@ void DupeCoordinator::HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pH
 
 	info("Marking %s as %s", szNZBName, (bGood ? "good" : "bad"));
 
-	if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
+	if (pHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo)
 	{
 		pHistoryInfo->GetNZBInfo()->SetMarkStatus(bGood ? NZBInfo::ksGood : NZBInfo::ksBad);
 	}
-	else if (pHistoryInfo->GetKind() == HistoryInfo::hkDup)
+	else if (pHistoryInfo->GetKind() == HistoryInfo::hkDupInfo)
 	{
 		pHistoryInfo->GetDupInfo()->SetStatus(bGood ? DupInfo::dsGood : DupInfo::dsBad);
 	}
@@ -434,9 +484,9 @@ void DupeCoordinator::HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pH
 	}
 
 	if (!g_pOptions->GetDupeCheck() ||
-		(pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+		(pHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo &&
 		 pHistoryInfo->GetNZBInfo()->GetDupeMode() == dmForce) ||
-		(pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
+		(pHistoryInfo->GetKind() == HistoryInfo::hkDupInfo &&
 		 pHistoryInfo->GetDupInfo()->GetDupeMode() == dmForce))
 	{
 		return;
@@ -451,8 +501,8 @@ void DupeCoordinator::HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pH
 	else
 	{
 		// mark as bad
-		const char* szDupeKey = pHistoryInfo->GetKind() == HistoryInfo::hkNzb ? pHistoryInfo->GetNZBInfo()->GetDupeKey() :
-			pHistoryInfo->GetKind() == HistoryInfo::hkDup ? pHistoryInfo->GetDupInfo()->GetDupeKey() :
+		const char* szDupeKey = pHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo ? pHistoryInfo->GetNZBInfo()->GetDupeKey() :
+			pHistoryInfo->GetKind() == HistoryInfo::hkDupInfo ? pHistoryInfo->GetDupInfo()->GetDupeKey() :
 			NULL;
 		ReturnBestDupe(pDownloadQueue, NULL, szNZBName, szDupeKey);
 	}
@@ -460,30 +510,30 @@ void DupeCoordinator::HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pH
 
 void DupeCoordinator::HistoryCleanup(DownloadQueue* pDownloadQueue, HistoryInfo* pMarkHistoryInfo)
 {
-	const char* szDupeKey = pMarkHistoryInfo->GetKind() == HistoryInfo::hkNzb ? pMarkHistoryInfo->GetNZBInfo()->GetDupeKey() :
-		pMarkHistoryInfo->GetKind() == HistoryInfo::hkDup ? pMarkHistoryInfo->GetDupInfo()->GetDupeKey() :
+	const char* szDupeKey = pMarkHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo ? pMarkHistoryInfo->GetNZBInfo()->GetDupeKey() :
+		pMarkHistoryInfo->GetKind() == HistoryInfo::hkDupInfo ? pMarkHistoryInfo->GetDupInfo()->GetDupeKey() :
 		NULL;
-	const char* szNZBName = pMarkHistoryInfo->GetKind() == HistoryInfo::hkNzb ? pMarkHistoryInfo->GetNZBInfo()->GetName() :
-		pMarkHistoryInfo->GetKind() == HistoryInfo::hkDup ? pMarkHistoryInfo->GetDupInfo()->GetName() :
+	const char* szNZBName = pMarkHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo ? pMarkHistoryInfo->GetNZBInfo()->GetName() :
+		pMarkHistoryInfo->GetKind() == HistoryInfo::hkDupInfo ? pMarkHistoryInfo->GetDupInfo()->GetName() :
 		NULL;
 	bool bChanged = false;
 	int index = 0;
 
 	// traversing in a reverse order to delete items in order they were added to history
 	// (just to produce the log-messages in a more logical order)
-	for (HistoryList::reverse_iterator it = pDownloadQueue->GetHistory()->rbegin(); it != pDownloadQueue->GetHistory()->rend(); )
+	for (HistoryList::reverse_iterator it = pDownloadQueue->GetHistoryList()->rbegin(); it != pDownloadQueue->GetHistoryList()->rend(); )
 	{
 		HistoryInfo* pHistoryInfo = *it;
 
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo &&
 			pHistoryInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
 			pHistoryInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsDupe &&
 			pHistoryInfo != pMarkHistoryInfo &&
 			SameNameOrKey(pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey(), szNZBName, szDupeKey))
 		{
-			g_pHistoryCoordinator->HistoryHide(pDownloadQueue, pHistoryInfo, index);
+			HistoryTransformToDup(pDownloadQueue, pHistoryInfo, index);
 			index++;
-			it = pDownloadQueue->GetHistory()->rbegin() + index;
+			it = pDownloadQueue->GetHistoryList()->rbegin() + index;
 			bChanged = true;
 		}
 		else
@@ -493,72 +543,41 @@ void DupeCoordinator::HistoryCleanup(DownloadQueue* pDownloadQueue, HistoryInfo*
 		}
 	}
 
-	if (bChanged)
+	if (bChanged && g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
 	{
-		pDownloadQueue->Save();
+		g_pDiskState->SaveDownloadQueue(pDownloadQueue);
 	}
 }
 
-DupeCoordinator::EDupeStatus DupeCoordinator::GetDupeStatus(DownloadQueue* pDownloadQueue,
-	const char* szName, const char* szDupeKey)
+void DupeCoordinator::HistoryTransformToDup(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, int rindex)
 {
-	EDupeStatus eStatuses = dsNone;
+	char szNiceName[1024];
+	pHistoryInfo->GetName(szNiceName, 1024);
 
-	// find duplicates in download queue
-	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
-	{
-		NZBInfo* pNZBInfo = *it;
-		if (SameNameOrKey(szName, szDupeKey, pNZBInfo->GetName(), pNZBInfo->GetDupeKey()))
-		{
-			if (pNZBInfo->GetSuccessArticles() + pNZBInfo->GetFailedArticles() > 0)
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsDownloading);
-			}
-			else
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsQueued);
-			}
-		}
-	}
+	// replace history element
+	DupInfo* pDupInfo = new DupInfo();
+	pDupInfo->SetName(pHistoryInfo->GetNZBInfo()->GetName());
+	pDupInfo->SetDupeKey(pHistoryInfo->GetNZBInfo()->GetDupeKey());
+	pDupInfo->SetDupeScore(pHistoryInfo->GetNZBInfo()->GetDupeScore());
+	pDupInfo->SetDupeMode(pHistoryInfo->GetNZBInfo()->GetDupeMode());
+	pDupInfo->SetSize(pHistoryInfo->GetNZBInfo()->GetSize());
+	pDupInfo->SetFullContentHash(pHistoryInfo->GetNZBInfo()->GetFullContentHash());
+	pDupInfo->SetFilteredContentHash(pHistoryInfo->GetNZBInfo()->GetFilteredContentHash());
 
-	// find duplicates in history
-	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
-	{
-		HistoryInfo* pHistoryInfo = *it;
+	pDupInfo->SetStatus(
+		pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksGood ? DupInfo::dsGood :
+		pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksBad ? DupInfo::dsBad :
+		pHistoryInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsDupe ? DupInfo::dsDupe :
+		pHistoryInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsManual ? DupInfo::dsDeleted :
+		IsDupeSuccess(pHistoryInfo->GetNZBInfo()) ? DupInfo::dsSuccess :
+		DupInfo::dsFailed);
 
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
-			SameNameOrKey(szName, szDupeKey, pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey()))
-		{
-			const char* szTextStatus = pHistoryInfo->GetNZBInfo()->MakeTextStatus(true);
-			if (!strncasecmp(szTextStatus, "SUCCESS", 7))
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsSuccess);
-			}
-			else if (!strncasecmp(szTextStatus, "FAILURE", 7))
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsFailure);
-			}
-			else if (!strncasecmp(szTextStatus, "WARNING", 7))
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsWarning);
-			}
-		}
+	HistoryInfo* pNewHistoryInfo = new HistoryInfo(pDupInfo);
+	pNewHistoryInfo->SetTime(pHistoryInfo->GetTime());
+	(*pDownloadQueue->GetHistoryList())[pDownloadQueue->GetHistoryList()->size() - 1 - rindex] = pNewHistoryInfo;
 
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
-			SameNameOrKey(szName, szDupeKey, pHistoryInfo->GetDupInfo()->GetName(), pHistoryInfo->GetDupInfo()->GetDupeKey()))
-		{
-			if (pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsSuccess ||
-				pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsGood)
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsSuccess);
-			}
-			else if (pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsFailed ||
-					 pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsBad)
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsFailure);
-			}
-		}
-	}
+	DeleteQueuedFile(pHistoryInfo->GetNZBInfo()->GetQueuedFilename());
 
-	return eStatuses;
+	delete pHistoryInfo;
+	info("Collection %s removed from history", szNiceName);
 }

DupeCoordinator.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -26,31 +26,28 @@
 #ifndef DUPECOORDINATOR_H
 #define DUPECOORDINATOR_H
 
+#include <deque>
+
 #include "DownloadInfo.h"
 
 class DupeCoordinator
 {
-public:
-	enum EDupeStatus
-	{
-		dsNone = 0,
-		dsQueued = 1,
-		dsDownloading = 2,
-		dsSuccess = 4,
-		dsWarning = 8,
-		dsFailure = 16
-	};
-
 private:
+	bool				IsDupeSuccess(NZBInfo* pNZBInfo);
 	void				ReturnBestDupe(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, const char* szNZBName, const char* szDupeKey);
+	void				HistoryReturnDupe(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo);
 	void				HistoryCleanup(DownloadQueue* pDownloadQueue, HistoryInfo* pMarkHistoryInfo);
 	bool				SameNameOrKey(const char* szName1, const char* szDupeKey1, const char* szName2, const char* szDupeKey2);
 
+protected:
+	virtual void		HistoryRedownload(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo) = 0;
+	virtual void		DeleteQueuedFile(const char* szQueuedFile) = 0;
+
 public:
 	void				NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
 	void				NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
 	void				HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, bool bGood);
-	EDupeStatus			GetDupeStatus(DownloadQueue* pDownloadQueue, const char* szName, const char* szDupeKey);
+	void				HistoryTransformToDup(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, int rindex);
 };
 
 #endif

FeedCoordinator.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -44,14 +44,18 @@
 #include "FeedCoordinator.h"
 #include "Options.h"
 #include "WebDownloader.h"
+#include "Log.h"
 #include "Util.h"
 #include "FeedFile.h"
 #include "FeedFilter.h"
+#include "UrlCoordinator.h"
 #include "DiskState.h"
 
 extern Options* g_pOptions;
+extern UrlCoordinator* g_pUrlCoordinator;
 extern DiskState* g_pDiskState;
 
+
 FeedCoordinator::FeedCacheItem::FeedCacheItem(const char* szUrl, int iCacheTimeSec,const char* szCacheId,
 	time_t tLastUsage, FeedItemInfos* pFeedItemInfos)
 {
@@ -76,12 +80,8 @@ FeedCoordinator::FeedCoordinator()
 	m_bForce = false;
 	m_bSave = false;
 
-	g_pLog->RegisterDebuggable(this);
-
-	m_DownloadQueueObserver.m_pOwner = this;
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-	pDownloadQueue->Attach(&m_DownloadQueueObserver);
-	DownloadQueue::Unlock();
+	m_UrlCoordinatorObserver.m_pOwner = this;
+	g_pUrlCoordinator->Attach(&m_UrlCoordinatorObserver);
 }
 
 FeedCoordinator::~FeedCoordinator()
@@ -89,8 +89,6 @@ FeedCoordinator::~FeedCoordinator()
 	debug("Destroying FeedCoordinator");
 	// Cleanup
 
-	g_pLog->UnregisterDebuggable(this);
-
 	debug("Deleting FeedDownloaders");
 	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
 	{
@@ -124,17 +122,12 @@ void FeedCoordinator::Run()
 {
 	debug("Entering FeedCoordinator-loop");
 
-	while (!DownloadQueue::IsLoaded())
-	{
-		usleep(20 * 1000);
-	}
-
+	m_mutexDownloads.Lock();
 	if (g_pOptions->GetServerMode() && g_pOptions->GetSaveQueue() && g_pOptions->GetReloadQueue())
 	{
-		m_mutexDownloads.Lock();
 		g_pDiskState->LoadFeeds(&m_Feeds, &m_FeedHistory);
-		m_mutexDownloads.Unlock();
 	}
+	m_mutexDownloads.Unlock();
 
 	int iSleepInterval = 100;
 	int iUpdateCounter = 0;
@@ -149,7 +142,7 @@ void FeedCoordinator::Run()
 		{
 			// this code should not be called too often, once per second is OK
 
-			if (!g_pOptions->GetPauseDownload() || m_bForce || g_pOptions->GetUrlForce())
+			if (!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()) || m_bForce || g_pOptions->GetUrlForce())
 			{
 				m_mutexDownloads.Lock();
 				time_t tCurrent = time(NULL);
@@ -265,10 +258,11 @@ void FeedCoordinator::ResetHangingDownloads()
 
 void FeedCoordinator::LogDebugInfo()
 {
-	info("   ---------- FeedCoordinator");
+	debug("   FeedCoordinator");
+	debug("   ----------------");
 
 	m_mutexDownloads.Lock();
-	info("    Active Downloads: %i", m_ActiveDownloads.size());
+	debug("    Active Downloads: %i", m_ActiveDownloads.size());
 	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
 	{
 		FeedDownloader* pFeedDownloader = *it;
@@ -279,7 +273,7 @@ void FeedCoordinator::LogDebugInfo()
 
 void FeedCoordinator::StartFeedDownload(FeedInfo* pFeedInfo, bool bForce)
 {
-	debug("Starting new FeedDownloader for %s", pFeedInfo->GetName());
+	debug("Starting new FeedDownloader for %", pFeedInfo->GetName());
 
 	FeedDownloader* pFeedDownloader = new FeedDownloader();
 	pFeedDownloader->SetAutoDestroy(true);
@@ -293,7 +287,7 @@ void FeedCoordinator::StartFeedDownload(FeedInfo* pFeedInfo, bool bForce)
 	else
 	{
 		char szUrlName[1024];
-		NZBInfo::MakeNiceUrlName(pFeedInfo->GetUrl(), "", szUrlName, sizeof(szUrlName));
+		UrlInfo::MakeNiceName(pFeedInfo->GetUrl(), "", szUrlName, sizeof(szUrlName));
 		pFeedDownloader->SetInfoName(szUrlName);
 	}
 	pFeedDownloader->SetForce(bForce || g_pOptions->GetUrlForce());
@@ -364,27 +358,19 @@ void FeedCoordinator::FeedCompleted(FeedDownloader* pFeedDownloader)
 			FeedFile* pFeedFile = FeedFile::Create(pFeedInfo->GetOutputFilename());
 			remove(pFeedInfo->GetOutputFilename());
 
-			NZBList addedNZBs;
-
 			m_mutexDownloads.Lock();
+
 			if (pFeedFile)
 			{
-				ProcessFeed(pFeedInfo, pFeedFile->GetFeedItemInfos(), &addedNZBs);
+				ProcessFeed(pFeedInfo, pFeedFile->GetFeedItemInfos());
 				delete pFeedFile;
 			}
+
 			pFeedInfo->SetLastUpdate(time(NULL));
 			pFeedInfo->SetForce(false);
+
 			m_bSave = true;
 			m_mutexDownloads.Unlock();
-
-			DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-			for (NZBList::iterator it = addedNZBs.begin(); it != addedNZBs.end(); it++)
-			{
-				NZBInfo* pNZBInfo = *it;
-				pDownloadQueue->GetQueue()->Add(pNZBInfo, false);
-			}
-			pDownloadQueue->Save();
-			DownloadQueue::Unlock();
 		}
 		pFeedInfo->SetStatus(FeedInfo::fsFinished);
 	}
@@ -424,7 +410,7 @@ void FeedCoordinator::FilterFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemIn
 	delete pFeedFilter;
 }
 
-void FeedCoordinator::ProcessFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemInfos, NZBList* pAddedNZBs)
+void FeedCoordinator::ProcessFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemInfos)
 {
 	debug("Process feed %s", pFeedInfo->GetName());
 
@@ -446,8 +432,7 @@ void FeedCoordinator::ProcessFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemI
 			}
 			else if (!pFeedHistoryInfo)
 			{
-				NZBInfo* pNZBInfo = CreateNZBInfo(pFeedInfo, pFeedItemInfo);
-				pAddedNZBs->Add(pNZBInfo, false);
+				DownloadItem(pFeedInfo, pFeedItemInfo);
 				eStatus = FeedHistoryInfo::hsFetched;
 				iAdded++;
 			}
@@ -473,13 +458,12 @@ void FeedCoordinator::ProcessFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemI
 	}
 }
 
-NZBInfo* FeedCoordinator::CreateNZBInfo(FeedInfo* pFeedInfo, FeedItemInfo* pFeedItemInfo)
+void FeedCoordinator::DownloadItem(FeedInfo* pFeedInfo, FeedItemInfo* pFeedItemInfo)
 {
 	debug("Download %s from %s", pFeedItemInfo->GetUrl(), pFeedInfo->GetName());
 
-	NZBInfo* pNZBInfo = new NZBInfo();
-	pNZBInfo->SetKind(NZBInfo::nkUrl);
-	pNZBInfo->SetURL(pFeedItemInfo->GetUrl());
+	UrlInfo* pUrlInfo = new UrlInfo();
+	pUrlInfo->SetURL(pFeedItemInfo->GetUrl());
 
 	// add .nzb-extension if not present
 	char szNZBName[1024];
@@ -495,17 +479,17 @@ NZBInfo* FeedCoordinator::CreateNZBInfo(FeedInfo* pFeedInfo, FeedItemInfo* pFeed
 	Util::MakeValidFilename(szNZBName2, '_', false);
 	if (strlen(szNZBName) > 0)
 	{
-		pNZBInfo->SetFilename(szNZBName2);
+		pUrlInfo->SetNZBFilename(szNZBName2);
 	}
 
-	pNZBInfo->SetCategory(pFeedItemInfo->GetAddCategory());
-	pNZBInfo->SetPriority(pFeedItemInfo->GetPriority());
-	pNZBInfo->SetAddUrlPaused(pFeedItemInfo->GetPauseNzb());
-	pNZBInfo->SetDupeKey(pFeedItemInfo->GetDupeKey());
-	pNZBInfo->SetDupeScore(pFeedItemInfo->GetDupeScore());
-	pNZBInfo->SetDupeMode(pFeedItemInfo->GetDupeMode());
-
-	return pNZBInfo;
+	pUrlInfo->SetCategory(pFeedItemInfo->GetAddCategory());
+	pUrlInfo->SetPriority(pFeedItemInfo->GetPriority());
+	pUrlInfo->SetAddPaused(pFeedItemInfo->GetPauseNzb());
+	pUrlInfo->SetDupeKey(pFeedItemInfo->GetDupeKey());
+	pUrlInfo->SetDupeScore(pFeedItemInfo->GetDupeScore());
+	pUrlInfo->SetDupeMode(pFeedItemInfo->GetDupeMode());
+	pUrlInfo->SetForce(pFeedInfo->GetForce() || g_pOptions->GetUrlForce());
+	g_pUrlCoordinator->AddUrlToQueue(pUrlInfo, false);
 }
 
 bool FeedCoordinator::ViewFeed(int iID, FeedItemInfos** ppFeedItemInfos)
@@ -643,22 +627,22 @@ void FeedCoordinator::FetchFeed(int iID)
 	m_mutexDownloads.Unlock();
 }
 
-void FeedCoordinator::DownloadQueueUpdate(Subject* pCaller, void* pAspect)
+void FeedCoordinator::UrlCoordinatorUpdate(Subject* pCaller, void* pAspect)
 {
 	debug("Notification from URL-Coordinator received");
 
-	DownloadQueue::Aspect* pQueueAspect = (DownloadQueue::Aspect*)pAspect;
-	if (pQueueAspect->eAction == DownloadQueue::eaUrlCompleted)
+	UrlCoordinator::Aspect* pUrlAspect = (UrlCoordinator::Aspect*)pAspect;
+	if (pUrlAspect->eAction == UrlCoordinator::eaUrlCompleted)
 	{
 		m_mutexDownloads.Lock();
-		FeedHistoryInfo* pFeedHistoryInfo = m_FeedHistory.Find(pQueueAspect->pNZBInfo->GetURL());
+		FeedHistoryInfo* pFeedHistoryInfo = m_FeedHistory.Find(pUrlAspect->pUrlInfo->GetURL());
 		if (pFeedHistoryInfo)
 		{
 			pFeedHistoryInfo->SetStatus(FeedHistoryInfo::hsFetched);
 		}
 		else
 		{
-			m_FeedHistory.Add(pQueueAspect->pNZBInfo->GetURL(), FeedHistoryInfo::hsFetched, time(NULL));
+			m_FeedHistory.Add(pUrlAspect->pUrlInfo->GetURL(), FeedHistoryInfo::hsFetched, time(NULL));
 		}
 		m_bSave = true;
 		m_mutexDownloads.Unlock();
@@ -705,7 +689,7 @@ void FeedCoordinator::CleanupHistory()
 		}
 	}
 
-	time_t tBorderDate = tOldestUpdate - g_pOptions->GetFeedHistory() * 60*60*24;
+	time_t tBorderDate = tOldestUpdate - g_pOptions->GetFeedHistory();
 	int i = 0;
 	for (FeedHistory::iterator it = m_FeedHistory.begin(); it != m_FeedHistory.end(); )
 	{

FeedCoordinator.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #include <list>
 #include <time.h>
 
-#include "Log.h"
 #include "Thread.h"
 #include "WebDownloader.h"
 #include "DownloadInfo.h"
@@ -40,14 +39,17 @@
 
 class FeedDownloader;
 
-class FeedCoordinator : public Thread, public Observer, public Subject, public Debuggable
+class FeedCoordinator : public Thread, public Observer, public Subject
 {
+public:
+	typedef std::list<FeedDownloader*>	ActiveDownloads;
+
 private:
-	class DownloadQueueObserver: public Observer
+	class UrlCoordinatorObserver: public Observer
 	{
 	public:
 		FeedCoordinator*	m_pOwner;
-		virtual void		Update(Subject* pCaller, void* pAspect) { m_pOwner->DownloadQueueUpdate(pCaller, pAspect); }
+		virtual void		Update(Subject* pCaller, void* pAspect) { m_pOwner->UrlCoordinatorUpdate(pCaller, pAspect); }
 	};
 
 	class FeedCacheItem
@@ -72,14 +74,13 @@ private:
 	};
 
 	typedef std::deque<FeedCacheItem*>	FeedCache;
-	typedef std::list<FeedDownloader*>	ActiveDownloads;
 
 private:
 	Feeds					m_Feeds;
 	ActiveDownloads			m_ActiveDownloads;
 	FeedHistory				m_FeedHistory;
 	Mutex					m_mutexDownloads;
-	DownloadQueueObserver	m_DownloadQueueObserver;
+	UrlCoordinatorObserver	m_UrlCoordinatorObserver;
 	bool					m_bForce;
 	bool					m_bSave;
 	FeedCache				m_FeedCache;
@@ -87,17 +88,14 @@ private:
 	void					StartFeedDownload(FeedInfo* pFeedInfo, bool bForce);
 	void					FeedCompleted(FeedDownloader* pFeedDownloader);
 	void					FilterFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemInfos);
-	void					ProcessFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemInfos, NZBList* pAddedNZBs);
-	NZBInfo*				CreateNZBInfo(FeedInfo* pFeedInfo, FeedItemInfo* pFeedItemInfo);
+	void					ProcessFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemInfos);
+	void					DownloadItem(FeedInfo* pFeedInfo, FeedItemInfo* pFeedItemInfo);
 	void					ResetHangingDownloads();
-	void					DownloadQueueUpdate(Subject* pCaller, void* pAspect);
+	void					UrlCoordinatorUpdate(Subject* pCaller, void* pAspect);
 	void					CleanupHistory();
 	void					CleanupCache();
 	void					CheckSaveFeeds();
 
-protected:
-	virtual void			LogDebugInfo();
-
 public:
 							FeedCoordinator();                
 	virtual					~FeedCoordinator();
@@ -112,6 +110,8 @@ public:
 	void					FetchFeed(int iID);
 	bool					HasActiveDownloads();
 	Feeds*					GetFeeds() { return &m_Feeds; }
+
+	void					LogDebugInfo();
 };
 
 class FeedDownloader : public WebDownloader

FeedFile.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -84,7 +84,7 @@ FeedFile::~FeedFile()
 
 void FeedFile::LogDebugInfo()
 {
-    info(" FeedFile %s", m_szFileName);
+    debug(" FeedFile %s", m_szFileName);
 }
 
 void FeedFile::AddItem(FeedItemInfo* pFeedItemInfo)

FeedFilter.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -153,17 +153,22 @@ bool FeedFilter::Term::MatchText(const char* szStrValue)
 		// Word-search
 
 		// split szStrValue into tokens
-		Tokenizer tok(szStrValue, WORD_SEPARATORS);
-		while (const char* szWord = tok.Next())
+		char* szStrValue2 = strdup(szStrValue);
+		char* saveptr;
+		char* szWord = strtok_r(szStrValue2, WORD_SEPARATORS, &saveptr);
+		while (szWord)
 		{
+			szWord = Util::Trim(szWord);
 			WildMask mask(m_szParam, m_pRefValues != NULL);
-			bMatch = mask.Match(szWord);
+			bMatch = *szWord && mask.Match(szWord);
 			if (bMatch)
 			{
 				FillWildMaskRefValues(szWord, &mask, 0);
 				break;
 			}
+			szWord = strtok_r(NULL, WORD_SEPARATORS, &saveptr);
 		}
+		free(szStrValue2);
 	}
 	else
 	{
@@ -330,7 +335,7 @@ bool FeedFilter::Term::Compile(char* szToken)
 }
 
 /*
- * If pFeedItemInfo is NULL, only field name is validated
+ * If pFeedItemInfo is NULL, only field type info is returned
  */
 bool FeedFilter::Term::GetFieldData(const char* szField, FeedItemInfo* pFeedItemInfo,
 	const char** StrValue, long long* IntValue)
@@ -408,11 +413,6 @@ bool FeedFilter::Term::GetFieldData(const char* szField, FeedItemInfo* pFeedItem
 		*IntValue = pFeedItemInfo ? pFeedItemInfo->GetDupeScore() : 0;
 		return true;
 	}
-	else if (!strcasecmp(szField, "dupestatus"))
-	{
-		*StrValue = pFeedItemInfo ? pFeedItemInfo->GetDupeStatus() : NULL;
-		return true;
-	}
 	else if (!strncasecmp(szField, "attr-", 5))
 	{
 		if (pFeedItemInfo)
@@ -732,139 +732,146 @@ char* FeedFilter::Rule::CompileOptions(char* szRule)
 
 	// split command into tokens
 	*p = '\0';
-	Tokenizer tok(szRule, ",", true);
-	while (char* szOption = tok.Next())
+	char* saveptr;
+	char* szToken = strtok_r(szRule, ",", &saveptr);
+	while (szToken)
 	{
-		const char* szValue = "";
-		char* szColon = strchr(szOption, ':');
-		if (szColon)
+		szToken = Util::Trim(szToken);
+		if (*szToken)
 		{
-			*szColon = '\0';
-			szValue = Util::Trim(szColon + 1);
-		}
+			char* szOption = szToken;
+			const char* szValue = "";
+			char* szColon = strchr(szToken, ':');
+			if (szColon)
+			{
+				*szColon = '\0';
+				szValue = Util::Trim(szColon + 1);
+			}
 
-		if (!strcasecmp(szOption, "category") || !strcasecmp(szOption, "cat") || !strcasecmp(szOption, "c"))
-		{
-			m_bHasCategory = true;
-			free(m_szCategory);
-			m_szCategory = strdup(szValue);
-			m_bPatCategory = strstr(szValue, "${");
-		}
-		else if (!strcasecmp(szOption, "pause") || !strcasecmp(szOption, "p"))
-		{
-			m_bHasPause = true;
-			m_bPause = !*szValue || !strcasecmp(szValue, "yes") || !strcasecmp(szValue, "y");
-			if (!m_bPause && !(!strcasecmp(szValue, "no") || !strcasecmp(szValue, "n")))
+			if (!strcasecmp(szOption, "category") || !strcasecmp(szOption, "cat") || !strcasecmp(szOption, "c"))
 			{
-				// error
-				return NULL;
+				m_bHasCategory = true;
+				free(m_szCategory);
+				m_szCategory = strdup(szValue);
+				m_bPatCategory = strstr(szValue, "${");
 			}
-		}
-		else if (!strcasecmp(szOption, "priority") || !strcasecmp(szOption, "pr") || !strcasecmp(szOption, "r"))
-		{
-			if (!strchr("0123456789-+", *szValue))
+			else if (!strcasecmp(szOption, "pause") || !strcasecmp(szOption, "p"))
 			{
-				// error
-				return NULL;
+				m_bHasPause = true;
+				m_bPause = !*szValue || !strcasecmp(szValue, "yes") || !strcasecmp(szValue, "y");
+				if (!m_bPause && !(!strcasecmp(szValue, "no") || !strcasecmp(szValue, "n")))
+				{
+					// error
+					return NULL;
+				}
 			}
-			m_bHasPriority = true;
-			m_iPriority = atoi(szValue);
-		}
-		else if (!strcasecmp(szOption, "priority+") || !strcasecmp(szOption, "pr+") || !strcasecmp(szOption, "r+"))
-		{
-			if (!strchr("0123456789-+", *szValue))
+			else if (!strcasecmp(szOption, "priority") || !strcasecmp(szOption, "pr") || !strcasecmp(szOption, "r"))
 			{
-				// error
-				return NULL;
+				if (!strchr("0123456789-+", *szValue))
+				{
+					// error
+					return NULL;
+				}
+				m_bHasPriority = true;
+				m_iPriority = atoi(szValue);
 			}
-			m_bHasAddPriority = true;
-			m_iAddPriority = atoi(szValue);
-		}
-		else if (!strcasecmp(szOption, "dupescore") || !strcasecmp(szOption, "ds") || !strcasecmp(szOption, "s"))
-		{
-			if (!strchr("0123456789-+", *szValue))
+			else if (!strcasecmp(szOption, "priority+") || !strcasecmp(szOption, "pr+") || !strcasecmp(szOption, "r+"))
 			{
-				// error
-				return NULL;
+				if (!strchr("0123456789-+", *szValue))
+				{
+					// error
+					return NULL;
+				}
+				m_bHasAddPriority = true;
+				m_iAddPriority = atoi(szValue);
 			}
-			m_bHasDupeScore = true;
-			m_iDupeScore = atoi(szValue);
-		}
-		else if (!strcasecmp(szOption, "dupescore+") || !strcasecmp(szOption, "ds+") || !strcasecmp(szOption, "s+"))
-		{
-			if (!strchr("0123456789-+", *szValue))
+			else if (!strcasecmp(szOption, "dupescore") || !strcasecmp(szOption, "ds") || !strcasecmp(szOption, "s"))
 			{
-				// error
-				return NULL;
+				if (!strchr("0123456789-+", *szValue))
+				{
+					// error
+					return NULL;
+				}
+				m_bHasDupeScore = true;
+				m_iDupeScore = atoi(szValue);
 			}
-			m_bHasAddDupeScore = true;
-			m_iAddDupeScore = atoi(szValue);
-		}
-		else if (!strcasecmp(szOption, "dupekey") || !strcasecmp(szOption, "dk") || !strcasecmp(szOption, "k"))
-		{
-			m_bHasDupeKey = true;
-			free(m_szDupeKey);
-			m_szDupeKey = strdup(szValue);
-			m_bPatDupeKey = strstr(szValue, "${");
-		}
-		else if (!strcasecmp(szOption, "dupekey+") || !strcasecmp(szOption, "dk+") || !strcasecmp(szOption, "k+"))
-		{
-			m_bHasAddDupeKey = true;
-			free(m_szAddDupeKey);
-			m_szAddDupeKey = strdup(szValue);
-			m_bPatAddDupeKey = strstr(szValue, "${");
-		}
-		else if (!strcasecmp(szOption, "dupemode") || !strcasecmp(szOption, "dm") || !strcasecmp(szOption, "m"))
-		{
-			m_bHasDupeMode = true;
-			if (!strcasecmp(szValue, "score") || !strcasecmp(szValue, "s"))
+			else if (!strcasecmp(szOption, "dupescore+") || !strcasecmp(szOption, "ds+") || !strcasecmp(szOption, "s+"))
 			{
-				m_eDupeMode = dmScore;
+				if (!strchr("0123456789-+", *szValue))
+				{
+					// error
+					return NULL;
+				}
+				m_bHasAddDupeScore = true;
+				m_iAddDupeScore = atoi(szValue);
 			}
-			else if (!strcasecmp(szValue, "all") || !strcasecmp(szValue, "a"))
+			else if (!strcasecmp(szOption, "dupekey") || !strcasecmp(szOption, "dk") || !strcasecmp(szOption, "k"))
 			{
-				m_eDupeMode = dmAll;
+				m_bHasDupeKey = true;
+				free(m_szDupeKey);
+				m_szDupeKey = strdup(szValue);
+				m_bPatDupeKey = strstr(szValue, "${");
 			}
-			else if (!strcasecmp(szValue, "force") || !strcasecmp(szValue, "f"))
+			else if (!strcasecmp(szOption, "dupekey+") || !strcasecmp(szOption, "dk+") || !strcasecmp(szOption, "k+"))
 			{
-				m_eDupeMode = dmForce;
+				m_bHasAddDupeKey = true;
+				free(m_szAddDupeKey);
+				m_szAddDupeKey = strdup(szValue);
+				m_bPatAddDupeKey = strstr(szValue, "${");
+			}
+			else if (!strcasecmp(szOption, "dupemode") || !strcasecmp(szOption, "dm") || !strcasecmp(szOption, "m"))
+			{
+				m_bHasDupeMode = true;
+				if (!strcasecmp(szValue, "score") || !strcasecmp(szValue, "s"))
+				{
+					m_eDupeMode = dmScore;
+				}
+				else if (!strcasecmp(szValue, "all") || !strcasecmp(szValue, "a"))
+				{
+					m_eDupeMode = dmAll;
+				}
+				else if (!strcasecmp(szValue, "force") || !strcasecmp(szValue, "f"))
+				{
+					m_eDupeMode = dmForce;
+				}
+				else
+				{
+					// error
+					return NULL;
+				}
+			}
+			else if (!strcasecmp(szOption, "rageid"))
+			{
+				m_bHasRageId = true;
+				free(m_szRageId);
+				m_szRageId = strdup(szValue);
+			}
+			else if (!strcasecmp(szOption, "series"))
+			{
+				m_bHasSeries = true;
+				free(m_szSeries);
+				m_szSeries = strdup(szValue);
+			}
+
+			// for compatibility with older version we support old commands too
+			else if (!strcasecmp(szOption, "paused") || !strcasecmp(szOption, "unpaused"))
+			{
+				m_bHasPause = true;
+				m_bPause = !strcasecmp(szOption, "paused");
+			}
+			else if (strchr("0123456789-+", *szOption))
+			{
+				m_bHasPriority = true;
+				m_iPriority = atoi(szOption);
 			}
 			else
 			{
-				// error
-				return NULL;
+				m_bHasCategory = true;
+				free(m_szCategory);
+				m_szCategory = strdup(szOption);
 			}
 		}
-		else if (!strcasecmp(szOption, "rageid"))
-		{
-			m_bHasRageId = true;
-			free(m_szRageId);
-			m_szRageId = strdup(szValue);
-		}
-		else if (!strcasecmp(szOption, "series"))
-		{
-			m_bHasSeries = true;
-			free(m_szSeries);
-			m_szSeries = strdup(szValue);
-		}
-
-		// for compatibility with older version we support old commands too
-		else if (!strcasecmp(szOption, "paused") || !strcasecmp(szOption, "unpaused"))
-		{
-			m_bHasPause = true;
-			m_bPause = !strcasecmp(szOption, "paused");
-		}
-		else if (strchr("0123456789-+", *szOption))
-		{
-			m_bHasPriority = true;
-			m_iPriority = atoi(szOption);
-		}
-		else
-		{
-			m_bHasCategory = true;
-			free(m_szCategory);
-			m_szCategory = strdup(szOption);
-		}
+		szToken = strtok_r(NULL, ",", &saveptr);
 	}
 
 	szRule = p + 1;

FeedInfo.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -39,10 +39,8 @@
 
 #include "nzbget.h"
 #include "FeedInfo.h"
-#include "DupeCoordinator.h"
 #include "Util.h"
 
-extern DupeCoordinator* g_pDupeCoordinator;
 
 FeedInfo::FeedInfo(int iID, const char* szName, const char* szUrl, int iInterval,
 	const char* szFilter, bool bPauseNzb, const char* szCategory, int iPriority)
@@ -51,7 +49,7 @@ FeedInfo::FeedInfo(int iID, const char* szName, const char* szUrl, int iInterval
 	m_szName = strdup(szName ? szName : "");
 	m_szUrl = strdup(szUrl ? szUrl : "");
 	m_szFilter = strdup(szFilter ? szFilter : "");
-	m_iFilterHash = Util::HashBJ96(m_szFilter, strlen(m_szFilter), 0);
+	m_iFilterHash = Util::HashBJ96(szFilter, strlen(szFilter), 0);
 	m_szCategory = strdup(szCategory ? szCategory : "");
 	m_iInterval = iInterval;
 	m_bPauseNzb = bPauseNzb;
@@ -147,7 +145,6 @@ FeedItemInfo::FeedItemInfo()
 	m_szDupeKey = NULL;
 	m_iDupeScore = 0;
 	m_eDupeMode = dmScore;
-	m_szDupeStatus = NULL;
 }
 
 FeedItemInfo::~FeedItemInfo()
@@ -161,7 +158,6 @@ FeedItemInfo::~FeedItemInfo()
 	free(m_szEpisode);
 	free(m_szAddCategory);
 	free(m_szDupeKey);
-	free(m_szDupeStatus);
 }
 
 void FeedItemInfo::SetTitle(const char* szTitle)
@@ -323,37 +319,6 @@ void FeedItemInfo::ParseSeasonEpisode()
 	}
 }
 
-const char* FeedItemInfo::GetDupeStatus()
-{
-	if (!m_szDupeStatus)
-	{
-		const char* szDupeStatusName[] = { "", "QUEUED", "DOWNLOADING", "3", "SUCCESS", "5", "6", "7", "WARNING",
-			"9", "10", "11", "12", "13", "14", "15", "FAILURE" };
-		char szStatuses[200];
-		szStatuses[0] = '\0';
-
-		DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-		DupeCoordinator::EDupeStatus eDupeStatus = g_pDupeCoordinator->GetDupeStatus(pDownloadQueue, m_szTitle, m_szDupeKey);
-		DownloadQueue::Unlock();
-
-		for (int i = 1; i <= (int)DupeCoordinator::dsFailure; i = i << 1)
-		{
-			if (eDupeStatus & i)
-			{
-				if (*szStatuses)
-				{
-					strcat(szStatuses, ",");
-				}
-				strcat(szStatuses, szDupeStatusName[i]);
-			}
-		}
-
-		m_szDupeStatus = strdup(szStatuses);
-	}
-
-	return m_szDupeStatus;
-}
-
 
 FeedHistoryInfo::FeedHistoryInfo(const char* szUrl, FeedHistoryInfo::EStatus eStatus, time_t tLastSeen)
 {

FeedInfo.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -165,7 +165,6 @@ private:
 	char*				m_szDupeKey;
 	int					m_iDupeScore;
 	EDupeMode			m_eDupeMode;
-	char*				m_szDupeStatus;
 	SharedFeedData*		m_pSharedFeedData;
 	Attributes			m_Attributes;
 
@@ -220,7 +219,6 @@ public:
 	void				SetDupeScore(int iDupeScore) { m_iDupeScore = iDupeScore; }
 	EDupeMode			GetDupeMode() { return m_eDupeMode; }
 	void				SetDupeMode(EDupeMode eDupeMode) { m_eDupeMode = eDupeMode; }
-	const char*			GetDupeStatus();
 	Attributes*			GetAttributes() { return &m_Attributes; }
 };
 

Frontend.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,12 +47,12 @@
 #include "Log.h"
 #include "Connection.h"
 #include "MessageBase.h"
+#include "QueueCoordinator.h"
 #include "RemoteClient.h"
 #include "Util.h"
-#include "StatMeter.h"
 
+extern QueueCoordinator* g_pQueueCoordinator;
 extern Options* g_pOptions;
-extern StatMeter* g_pStatMeter;
 
 Frontend::Frontend()
 {
@@ -65,6 +65,7 @@ Frontend::Frontend()
 	m_iCurrentDownloadSpeed = 0;
 	m_lRemainingSize = 0;
 	m_bPauseDownload = false;
+	m_bPauseDownload2 = false;
 	m_iDownloadLimit = 0;
 	m_iThreadCount = 0;
 	m_iPostJobCount = 0;
@@ -94,22 +95,16 @@ bool Frontend::PrepareData()
 	{
 		if (m_bSummary)
 		{
-			m_iCurrentDownloadSpeed = g_pStatMeter->CalcCurrentDownloadSpeed();
+			m_iCurrentDownloadSpeed = g_pQueueCoordinator->CalcCurrentDownloadSpeed();
+			m_lRemainingSize = g_pQueueCoordinator->CalcRemainingSize();
 			m_bPauseDownload = g_pOptions->GetPauseDownload();
+			m_bPauseDownload2 = g_pOptions->GetPauseDownload2();
 			m_iDownloadLimit = g_pOptions->GetDownloadRate();
 			m_iThreadCount = Thread::GetThreadCount();
-			g_pStatMeter->CalcTotalStat(&m_iUpTimeSec, &m_iDnTimeSec, &m_iAllBytes, &m_bStandBy);
-
-			DownloadQueue *pDownloadQueue = DownloadQueue::Lock();
-			m_iPostJobCount = 0;
-			for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
-			{
-				NZBInfo* pNZBInfo = *it;
-				m_iPostJobCount += pNZBInfo->GetPostInfo() ? 1 : 0;
-			}
-			pDownloadQueue->CalcRemainingSize(&m_lRemainingSize, NULL);
-			DownloadQueue::Unlock();
-
+			PostQueue* pPostQueue = g_pQueueCoordinator->LockQueue()->GetPostQueue();
+			m_iPostJobCount = pPostQueue->size();
+			g_pQueueCoordinator->UnlockQueue();
+			g_pQueueCoordinator->CalcStat(&m_iUpTimeSec, &m_iDnTimeSec, &m_iAllBytes, &m_bStandBy);
 		}
 	}
 	return true;
@@ -125,13 +120,15 @@ void Frontend::FreeData()
 		}
 		m_RemoteMessages.clear();
 
-		DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-		pDownloadQueue->GetQueue()->Clear();
-		DownloadQueue::Unlock();
+		for (FileQueue::iterator it = m_RemoteQueue.GetFileQueue()->begin(); it != m_RemoteQueue.GetFileQueue()->end(); it++)
+		{
+			delete *it;
+		}
+		m_RemoteQueue.GetFileQueue()->clear();
 	}
 }
 
-Log::Messages* Frontend::LockMessages()
+Log::Messages * Frontend::LockMessages()
 {
 	if (IsRemoteMode())
 	{
@@ -153,12 +150,22 @@ void Frontend::UnlockMessages()
 
 DownloadQueue* Frontend::LockQueue()
 {
-	return DownloadQueue::Lock();
+	if (IsRemoteMode())
+	{
+		return &m_RemoteQueue;
+	}
+	else
+	{
+		return g_pQueueCoordinator->LockQueue();
+	}
 }
 
 void Frontend::UnlockQueue()
 {
-	DownloadQueue::Unlock();
+	if (!IsRemoteMode())
+	{
+		g_pQueueCoordinator->UnlockQueue();
+	}
 }
 
 bool Frontend::IsRemoteMode()
@@ -166,16 +173,23 @@ bool Frontend::IsRemoteMode()
 	return g_pOptions->GetRemoteClientMode();
 }
 
-void Frontend::ServerPauseUnpause(bool bPause)
+void Frontend::ServerPauseUnpause(bool bPause, bool bSecondRegister)
 {
 	if (IsRemoteMode())
 	{
-		RequestPauseUnpause(bPause);
+		RequestPauseUnpause(bPause, bSecondRegister);
 	}
 	else
 	{
 		g_pOptions->SetResumeTime(0);
-		g_pOptions->SetPauseDownload(bPause);
+		if (bSecondRegister)
+		{
+			g_pOptions->SetPauseDownload2(bPause);
+		}
+		else
+		{
+			g_pOptions->SetPauseDownload(bPause);
+		}
 	}
 }
 
@@ -191,18 +205,27 @@ void Frontend::ServerSetDownloadRate(int iRate)
 	}
 }
 
-bool Frontend::ServerEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iID)
+void Frontend::ServerDumpDebug()
 {
 	if (IsRemoteMode())
 	{
-		return RequestEditQueue(eAction, iOffset, iID);
+		RequestDumpDebug();
 	}
 	else
 	{
-		DownloadQueue* pDownloadQueue = LockQueue();
-		bool bOK = pDownloadQueue->EditEntry(iID, eAction, iOffset, NULL);
-		UnlockQueue();
-		return bOK;
+		g_pQueueCoordinator->LogDebugInfo();
+	}
+}
+
+bool Frontend::ServerEditQueue(QueueEditor::EEditAction eAction, int iOffset, int iID)
+{
+	if (IsRemoteMode())
+	{
+		return RequestEditQueue((eRemoteEditAction)eAction, iOffset, iID);
+	}
+	else
+	{
+		return g_pQueueCoordinator->GetQueueEditor()->EditEntry(iID, true, eAction, iOffset, NULL);
 	}
 	return false;
 }
@@ -337,6 +360,7 @@ bool Frontend::RequestFileList()
 	if (m_bSummary)
 	{
 		m_bPauseDownload = ntohl(ListResponse.m_bDownloadPaused);
+		m_bPauseDownload2 = ntohl(ListResponse.m_bDownload2Paused);
 		m_lRemainingSize = Util::JoinInt64(ntohl(ListResponse.m_iRemainingSizeHi), ntohl(ListResponse.m_iRemainingSizeLo));
 		m_iCurrentDownloadSpeed = ntohl(ListResponse.m_iDownloadRate);
 		m_iDownloadLimit = ntohl(ListResponse.m_iDownloadLimit);
@@ -352,10 +376,7 @@ bool Frontend::RequestFileList()
 	{
 		RemoteClient client;
 		client.SetVerbose(false);
-		
-		DownloadQueue* pDownloadQueue = LockQueue();
-		client.BuildFileList(&ListResponse, pBuf, pDownloadQueue);
-		UnlockQueue();
+		client.BuildFileList(&ListResponse, pBuf, &m_RemoteQueue);
 	}
 
 	if (pBuf)
@@ -366,11 +387,11 @@ bool Frontend::RequestFileList()
 	return true;
 }
 
-bool Frontend::RequestPauseUnpause(bool bPause)
+bool Frontend::RequestPauseUnpause(bool bPause, bool bSecondRegister)
 {
 	RemoteClient client;
 	client.SetVerbose(false);
-	return client.RequestServerPauseUnpause(bPause, eRemotePauseUnpauseActionDownload);
+	return client.RequestServerPauseUnpause(bPause, bSecondRegister ? eRemotePauseUnpauseActionDownload2 : eRemotePauseUnpauseActionDownload);
 }
 
 bool Frontend::RequestSetDownloadRate(int iRate)
@@ -380,9 +401,16 @@ bool Frontend::RequestSetDownloadRate(int iRate)
 	return client.RequestServerSetDownloadRate(iRate);
 }
 
-bool Frontend::RequestEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iID)
+bool Frontend::RequestDumpDebug()
 {
 	RemoteClient client;
 	client.SetVerbose(false);
-	return client.RequestServerEditQueue(eAction, iOffset, NULL, &iID, 1, NULL, eRemoteMatchModeID);
+	return client.RequestServerDumpDebug();
+}
+
+bool Frontend::RequestEditQueue(eRemoteEditAction iAction, int iOffset, int iID)
+{
+	RemoteClient client;
+	client.SetVerbose(false);
+	return client.RequestServerEditQueue(iAction, iOffset, NULL, &iID, 1, NULL, eRemoteMatchModeID, false);
 }

Frontend.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,6 +37,7 @@ class Frontend : public Thread
 {
 private:
 	Log::Messages		m_RemoteMessages;
+	DownloadQueue		m_RemoteQueue;
 
 	bool				RequestMessages();
 	bool				RequestFileList();
@@ -52,6 +53,7 @@ protected:
 	int					m_iCurrentDownloadSpeed;
 	long long 			m_lRemainingSize;
 	bool				m_bPauseDownload;
+	bool				m_bPauseDownload2;
 	int					m_iDownloadLimit;
 	int					m_iThreadCount;
 	int					m_iPostJobCount;
@@ -68,12 +70,14 @@ protected:
 	void				UnlockQueue();
 	bool				IsRemoteMode();
 	void				InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int iSize);
-	void				ServerPauseUnpause(bool bPause);
-	bool				RequestPauseUnpause(bool bPause);
+	void				ServerPauseUnpause(bool bPause, bool bSecondRegister);
+	bool				RequestPauseUnpause(bool bPause, bool bSecondRegister);
 	void				ServerSetDownloadRate(int iRate);
 	bool				RequestSetDownloadRate(int iRate);
-	bool 				ServerEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iEntry);
-	bool 				RequestEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iID);
+	void				ServerDumpDebug();
+	bool				RequestDumpDebug();
+	bool 				ServerEditQueue(QueueEditor::EEditAction eAction, int iOffset, int iEntry);
+	bool 				RequestEditQueue(eRemoteEditAction iAction, int iOffset, int iID);
 
 public:
 						Frontend();

Log.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@
 #include "win32.h"
 #else
 #include <pthread.h>
-#include <unistd.h>
 #endif
 
 #include <stdlib.h>
@@ -53,7 +52,6 @@ Log::Log()
 	m_Messages.clear();
 	m_iIDGen = 0;
 	m_szLogFilename = NULL;
-	m_tLastWritten = 0;
 #ifdef DEBUG
 	m_bExtraDebug = Util::FileExists("extradebug");
 #endif
@@ -65,76 +63,50 @@ Log::~Log()
 	free(m_szLogFilename);
 }
 
-void Log::LogDebugInfo()
-{
-	info("--------------------------------------------");
-	info("Dumping debug info to log");
-	info("--------------------------------------------");
-	
-	m_mutexDebug.Lock();
-	for (Debuggables::iterator it = m_Debuggables.begin(); it != m_Debuggables.end(); it++)
-	{
-        Debuggable* pDebuggable = *it;
-		pDebuggable->LogDebugInfo();
-	}
-	m_mutexDebug.Unlock();
-
-	info("--------------------------------------------");
-}
-
 void Log::Filelog(const char* msg, ...)
 {
-	if (!m_szLogFilename)
+	if (m_szLogFilename)
 	{
-		return;
-	}
+		char tmp2[1024];
 
-	char tmp2[1024];
+		va_list ap;
+		va_start(ap, msg);
+		vsnprintf(tmp2, 1024, msg, ap);
+		tmp2[1024-1] = '\0';
+		va_end(ap);
 
-	va_list ap;
-	va_start(ap, msg);
-	vsnprintf(tmp2, 1024, msg, ap);
-	tmp2[1024-1] = '\0';
-	va_end(ap);
-
-	time_t rawtime = time(NULL) + g_pOptions->GetTimeCorrection();
-	
-	char szTime[50];
+		time_t rawtime;
+		time(&rawtime);
+		rawtime += g_pOptions->GetTimeCorrection();
+		
+		char szTime[50];
 #ifdef HAVE_CTIME_R_3
-	ctime_r(&rawtime, szTime, 50);
+		ctime_r(&rawtime, szTime, 50);
 #else
-	ctime_r(&rawtime, szTime);
+		ctime_r(&rawtime, szTime);
 #endif
-	szTime[50-1] = '\0';
-	szTime[strlen(szTime) - 1] = '\0'; // trim LF
+		szTime[50-1] = '\0';
+		szTime[strlen(szTime) - 1] = '\0'; // trim LF
 
-	if ((int)rawtime/86400 != (int)m_tLastWritten/86400 && g_pOptions->GetWriteLog() == Options::wlRotate)
-	{
-		RotateLog();
-	}
-
-	m_tLastWritten = rawtime;
-
-	FILE* file = fopen(m_szLogFilename, FOPEN_ABP);
-	if (file)
-	{
+		FILE* file = fopen(m_szLogFilename, "ab+");
+		if (file)
+		{
 #ifdef WIN32
-		unsigned long iProcessId = GetCurrentProcessId();
-		unsigned long iThreadId = GetCurrentThreadId();
+			unsigned long iThreadId = GetCurrentThreadId();
 #else
-		unsigned long iProcessId = (unsigned long)getpid();
-		unsigned long iThreadId = (unsigned long)pthread_self();
+			unsigned long iThreadId = (unsigned long)pthread_self();
 #endif
 #ifdef DEBUG
-		fprintf(file, "%s\t%lu\t%lu\t%s%s", szTime, iProcessId, iThreadId, tmp2, LINE_ENDING);
+			fprintf(file, "%s\t%lu\t%s%s", szTime, iThreadId, tmp2, LINE_ENDING);
 #else
-		fprintf(file, "%s\t%s%s", szTime, tmp2, LINE_ENDING);
+			fprintf(file, "%s\t%s%s", szTime, tmp2, LINE_ENDING);
 #endif
-		fclose(file);
-	}
-	else
-	{
-		perror(m_szLogFilename);
+			fclose(file);
+		}
+		else
+		{
+			perror(m_szLogFilename);
+		}
 	}
 }
 
@@ -177,14 +149,14 @@ void debug(const char* msg, ...)
 	}
 
 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetDebugTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AppendMessage(Message::mkDebug, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("DEBUG\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkDebug, tmp2);
+	}
 
 	g_pLog->m_mutexLog.Unlock();
 }
@@ -203,14 +175,14 @@ void error(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();
 
 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetErrorTarget() : Options::mtBoth;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AppendMessage(Message::mkError, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("ERROR\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkError, tmp2);
+	}
 
 	g_pLog->m_mutexLog.Unlock();
 }
@@ -228,14 +200,14 @@ void warn(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();
 
 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetWarningTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AppendMessage(Message::mkWarning, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("WARNING\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkWarning, tmp2);
+	}
 
 	g_pLog->m_mutexLog.Unlock();
 }
@@ -253,14 +225,14 @@ void info(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();
 
 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetInfoTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AppendMessage(Message::mkInfo, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("INFO\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkInfo, tmp2);
+	}
 
 	g_pLog->m_mutexLog.Unlock();
 }
@@ -278,14 +250,14 @@ void detail(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();
 
 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetDetailTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AppendMessage(Message::mkDetail, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("DETAIL\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkDetail, tmp2);
+	}
 
 	g_pLog->m_mutexLog.Unlock();
 }
@@ -377,82 +349,6 @@ void Log::ResetLog()
 	remove(g_pOptions->GetLogFile());
 }
 
-void Log::RotateLog()
-{
-	char szDirectory[1024];
-	strncpy(szDirectory, g_pOptions->GetLogFile(), 1024);
-	szDirectory[1024-1] = '\0';
-
-	// split the full filename into path, basename and extension
-	char* szBaseName = Util::BaseFileName(szDirectory);
-	if (szBaseName > szDirectory)
-	{
-		szBaseName[-1] = '\0';
-	}
-
-	char szBaseExt[250];
-	char* szExt = strrchr(szBaseName, '.');
-	if (szExt && szExt > szBaseName)
-	{
-		strncpy(szBaseExt, szExt, 250);
-		szBaseExt[250-1] = '\0';
-		szExt[0] = '\0';
-	}
-	else
-	{
-		szBaseExt[0] = '\0';
-	}
-
-	char szFileMask[1024];
-	snprintf(szFileMask, 1024, "%s-####-##-##%s", szBaseName, szBaseExt);
-	szFileMask[1024-1] = '\0';
-
-	time_t tCurTime = time(NULL) + g_pOptions->GetTimeCorrection();
-	int iCurDay = (int)tCurTime / 86400;
-	char szFullFilename[1024];
-
-	WildMask mask(szFileMask, true);
-	DirBrowser dir(szDirectory);
-	while (const char* filename = dir.Next())
-	{
-		if (mask.Match(filename))
-		{
-			snprintf(szFullFilename, 1024, "%s%c%s", szDirectory, PATH_SEPARATOR, filename);
-			szFullFilename[1024-1] = '\0';
-
-			struct tm tm;
-			memset(&tm, 0, sizeof(tm));
-			tm.tm_year = atoi(filename + mask.GetMatchStart(0)) - 1900;
-			tm.tm_mon = atoi(filename + mask.GetMatchStart(1)) - 1;
-			tm.tm_mday = atoi(filename + mask.GetMatchStart(2));
-			time_t tFileTime = Util::Timegm(&tm);
-			int iFileDay = (int)tFileTime / 86400;
-
-			if (iFileDay <= iCurDay - g_pOptions->GetRotateLog())
-			{
-				char szMessage[1024];
-				snprintf(szMessage, 1024, "Deleting old log-file %s\n", filename);
-				szMessage[1024-1] = '\0';
-				g_pLog->AppendMessage(Message::mkInfo, szMessage);
-
-				remove(szFullFilename);
-			}
-		}
-	}
-
-	struct tm tm;
-	gmtime_r(&tCurTime, &tm);
-	snprintf(szFullFilename, 1024, "%s%c%s-%i-%.2i-%.2i%s", szDirectory, PATH_SEPARATOR,
-		szBaseName, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, szBaseExt);
-	szFullFilename[1024-1] = '\0';
-
-	free(m_szLogFilename);
-	m_szLogFilename = strdup(szFullFilename);
-#ifdef WIN32
-	WebUtil::Utf8ToAnsi(m_szLogFilename, strlen(m_szLogFilename) + 1);
-#endif
-}
-
 /*
 * During intializing stage (when options were not read yet) all messages
 * are saved in screen log, even if they shouldn't (according to options).
@@ -466,17 +362,12 @@ void Log::InitOptions()
 {
 	const char* szMessageType[] = { "INFO", "WARNING", "ERROR", "DEBUG", "DETAIL"};
 
-	if (g_pOptions->GetWriteLog() != Options::wlNone && g_pOptions->GetLogFile())
+	if (g_pOptions->GetCreateLog() && g_pOptions->GetLogFile())
 	{
 		m_szLogFilename = strdup(g_pOptions->GetLogFile());
 #ifdef WIN32
 		WebUtil::Utf8ToAnsi(m_szLogFilename, strlen(m_szLogFilename) + 1);
 #endif
-
-		if (g_pOptions->GetServerMode() && g_pOptions->GetWriteLog() == Options::wlReset)
-		{
-			g_pLog->ResetLog();
-		}
 	}
 
 	m_iIDGen = 0;
@@ -521,17 +412,3 @@ void Log::InitOptions()
 		}
 	}
 }
-
-void Log::RegisterDebuggable(Debuggable* pDebuggable)
-{
-	m_mutexDebug.Lock();
-	m_Debuggables.push_back(pDebuggable);
-	m_mutexDebug.Unlock();
-}
-
-void Log::UnregisterDebuggable(Debuggable* pDebuggable)
-{
-	m_mutexDebug.Lock();
-	m_Debuggables.remove(pDebuggable);
-	m_mutexDebug.Unlock();
-}

Log.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -28,7 +28,6 @@
 #define LOG_H
 
 #include <deque>
-#include <list>
 #include <time.h>
 
 #include "Thread.h"
@@ -76,34 +75,22 @@ public:
 	const char*			GetText() { return m_szText; }
 };
 
-class Debuggable
-{
-protected:
-	virtual void		LogDebugInfo() = 0;
-	friend class Log;
-};
-
 class Log
 {
 public:
 	typedef std::deque<Message*>	Messages;
-	typedef std::list<Debuggable*>	Debuggables;
 
 private:
 	Mutex				m_mutexLog;
 	Messages			m_Messages;
-	Debuggables			m_Debuggables;
-	Mutex				m_mutexDebug;
 	char*				m_szLogFilename;
 	unsigned int		m_iIDGen;
-	time_t				m_tLastWritten;
 #ifdef DEBUG
 	bool				m_bExtraDebug;
 #endif
 
 	void				Filelog(const char* msg, ...);
 	void				AppendMessage(Message::EKind eKind, const char* szText);
-	void				RotateLog();
 
 	friend void error(const char* msg, ...);
 	friend void warn(const char* msg, ...);
@@ -126,9 +113,6 @@ public:
 	void				Clear();
 	void				ResetLog();
 	void				InitOptions();
-	void				RegisterDebuggable(Debuggable* pDebuggable);
-	void				UnregisterDebuggable(Debuggable* pDebuggable);
-	void				LogDebugInfo();
 };
 
 #ifdef DEBUG

Maintenance.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -44,11 +44,11 @@
 #include "Log.h"
 #include "Util.h"
 #include "Maintenance.h"
-#include "Options.h"
 
 extern Options* g_pOptions;
 extern Maintenance* g_pMaintenance;
 
+
 Maintenance::Maintenance()
 {
 	m_iIDMessageGen = 0;
@@ -229,9 +229,6 @@ bool Maintenance::ReadPackageInfoStr(const char* szKey, char** pValue)
 
 void UpdateScriptController::Run()
 {
-	// the update-script should not be automatically terminated when the program quits
-	UnregisterRunningScript();
-
 	m_iPrefixLen = 0;
 	PrintMessage(Message::mkInfo, "Executing update-script %s", GetScript());
 

Maintenance.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -26,10 +26,11 @@
 #define MAINTENANCE_H
 
 #include "Thread.h"
-#include "Script.h"
+#include "ScriptController.h"
 #include "Log.h"
 #include "Util.h"
 
+
 class UpdateScriptController;
 
 class Maintenance

Makefile.am

@@ -1,7 +1,7 @@
 #
-#  This file is part of nzbget
+#  This file if part of nzbget
 #
-# Copyright (C) 2008-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+# Copyright (C) 2008-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,255 +22,67 @@
 bin_PROGRAMS = nzbget
 
 nzbget_SOURCES = \
-	daemon/connect/Connection.cpp \
-	daemon/connect/Connection.h \
-	daemon/connect/TLS.cpp \
-	daemon/connect/TLS.h \
-	daemon/connect/WebDownloader.cpp \
-	daemon/connect/WebDownloader.h \
-	daemon/feed/FeedCoordinator.cpp \
-	daemon/feed/FeedCoordinator.h \
-	daemon/feed/FeedFile.cpp \
-	daemon/feed/FeedFile.h \
-	daemon/feed/FeedFilter.cpp \
-	daemon/feed/FeedFilter.h \
-	daemon/feed/FeedInfo.cpp \
-	daemon/feed/FeedInfo.h \
-	daemon/frontend/ColoredFrontend.cpp \
-	daemon/frontend/ColoredFrontend.h \
-	daemon/frontend/Frontend.cpp \
-	daemon/frontend/Frontend.h \
-	daemon/frontend/LoggableFrontend.cpp \
-	daemon/frontend/LoggableFrontend.h \
-	daemon/frontend/NCursesFrontend.cpp \
-	daemon/frontend/NCursesFrontend.h \
-	daemon/main/Maintenance.cpp \
-	daemon/main/Maintenance.h \
-	daemon/main/nzbget.cpp \
-	daemon/main/nzbget.h \
-	daemon/main/Options.cpp \
-	daemon/main/Options.h \
-	daemon/main/Scheduler.cpp \
-	daemon/main/Scheduler.h \
-	daemon/main/StackTrace.cpp \
-	daemon/main/StackTrace.h \
-	daemon/nntp/ArticleDownloader.cpp \
-	daemon/nntp/ArticleDownloader.h \
-	daemon/nntp/ArticleWriter.cpp \
-	daemon/nntp/ArticleWriter.h \
-	daemon/nntp/Decoder.cpp \
-	daemon/nntp/Decoder.h \
-	daemon/nntp/NewsServer.cpp \
-	daemon/nntp/NewsServer.h \
-	daemon/nntp/NNTPConnection.cpp \
-	daemon/nntp/NNTPConnection.h \
-	daemon/nntp/ServerPool.cpp \
-	daemon/nntp/ServerPool.h \
-	daemon/nntp/StatMeter.cpp \
-	daemon/nntp/StatMeter.h \
-	daemon/postprocess/ParChecker.cpp \
-	daemon/postprocess/ParChecker.h \
-	daemon/postprocess/ParCoordinator.cpp \
-	daemon/postprocess/ParCoordinator.h \
-	daemon/postprocess/ParRenamer.cpp \
-	daemon/postprocess/ParRenamer.h \
-	daemon/postprocess/PostScript.cpp \
-	daemon/postprocess/PostScript.h \
-	daemon/postprocess/PrePostProcessor.cpp \
-	daemon/postprocess/PrePostProcessor.h \
-	daemon/postprocess/Unpack.cpp \
-	daemon/postprocess/Unpack.h \
-	daemon/queue/DiskState.cpp \
-	daemon/queue/DiskState.h \
-	daemon/queue/DownloadInfo.cpp \
-	daemon/queue/DownloadInfo.h \
-	daemon/queue/DupeCoordinator.cpp \
-	daemon/queue/DupeCoordinator.h \
-	daemon/queue/HistoryCoordinator.cpp \
-	daemon/queue/HistoryCoordinator.h \
-	daemon/queue/NZBFile.cpp \
-	daemon/queue/NZBFile.h \
-	daemon/queue/QueueCoordinator.cpp \
-	daemon/queue/QueueCoordinator.h \
-	daemon/queue/QueueEditor.cpp \
-	daemon/queue/QueueEditor.h \
-	daemon/queue/QueueScript.cpp \
-	daemon/queue/QueueScript.h \
-	daemon/queue/Scanner.cpp \
-	daemon/queue/Scanner.h \
-	daemon/queue/UrlCoordinator.cpp \
-	daemon/queue/UrlCoordinator.h \
-	daemon/remote/BinRpc.cpp \
-	daemon/remote/BinRpc.h \
-	daemon/remote/MessageBase.h \
-	daemon/remote/RemoteClient.cpp \
-	daemon/remote/RemoteClient.h \
-	daemon/remote/RemoteServer.cpp \
-	daemon/remote/RemoteServer.h \
-	daemon/remote/WebServer.cpp \
-	daemon/remote/WebServer.h \
-	daemon/remote/XmlRpc.cpp \
-	daemon/remote/XmlRpc.h \
-	daemon/util/Log.cpp \
-	daemon/util/Log.h \
-	daemon/util/Observer.cpp \
-	daemon/util/Observer.h \
-	daemon/util/Script.cpp \
-	daemon/util/Script.h \
-	daemon/util/Thread.cpp \
-	daemon/util/Thread.h \
-	daemon/util/Util.cpp \
-	daemon/util/Util.h \
-	svn_version.cpp
-
-if WITH_PAR2
-nzbget_SOURCES += \
-	lib/par2/commandline.cpp \
-	lib/par2/commandline.h \
-	lib/par2/crc.cpp \
-	lib/par2/crc.h \
-	lib/par2/creatorpacket.cpp \
-	lib/par2/creatorpacket.h \
-	lib/par2/criticalpacket.cpp \
-	lib/par2/criticalpacket.h \
-	lib/par2/datablock.cpp \
-	lib/par2/datablock.h \
-	lib/par2/descriptionpacket.cpp \
-	lib/par2/descriptionpacket.h \
-	lib/par2/diskfile.cpp \
-	lib/par2/diskfile.h \
-	lib/par2/filechecksummer.cpp \
-	lib/par2/filechecksummer.h \
-	lib/par2/galois.cpp \
-	lib/par2/galois.h \
-	lib/par2/letype.h \
-	lib/par2/mainpacket.cpp \
-	lib/par2/mainpacket.h \
-	lib/par2/md5.cpp \
-	lib/par2/md5.h \
-	lib/par2/par2cmdline.h \
-	lib/par2/par2creatorsourcefile.cpp \
-	lib/par2/par2creatorsourcefile.h \
-	lib/par2/par2fileformat.cpp \
-	lib/par2/par2fileformat.h \
-	lib/par2/par2repairer.cpp \
-	lib/par2/par2repairer.h \
-	lib/par2/par2repairersourcefile.cpp \
-	lib/par2/par2repairersourcefile.h \
-	lib/par2/parheaders.cpp \
-	lib/par2/parheaders.h \
-	lib/par2/recoverypacket.cpp \
-	lib/par2/recoverypacket.h \
-	lib/par2/reedsolomon.cpp \
-	lib/par2/reedsolomon.h \
-	lib/par2/verificationhashtable.cpp \
-	lib/par2/verificationhashtable.h \
-	lib/par2/verificationpacket.cpp \
-	lib/par2/verificationpacket.h
-endif
-
-AM_CPPFLAGS = \
-	-I$(srcdir)/daemon/connect \
-	-I$(srcdir)/daemon/feed \
-	-I$(srcdir)/daemon/frontend \
-	-I$(srcdir)/daemon/main \
-	-I$(srcdir)/daemon/nntp \
-	-I$(srcdir)/daemon/postprocess \
-	-I$(srcdir)/daemon/queue \
-	-I$(srcdir)/daemon/remote \
-	-I$(srcdir)/daemon/util \
-	-I$(srcdir)/lib/par2
+	ArticleDownloader.cpp ArticleDownloader.h BinRpc.cpp BinRpc.h \
+	ColoredFrontend.cpp ColoredFrontend.h Connection.cpp Connection.h Decoder.cpp Decoder.h \
+	DiskState.cpp DiskState.h DownloadInfo.cpp DownloadInfo.h DupeCoordinator.cpp DupeCoordinator.h \
+	Frontend.cpp Frontend.h FeedCoordinator.cpp FeedCoordinator.h FeedFile.cpp FeedFile.h \
+	FeedFilter.cpp FeedFilter.h FeedInfo.cpp FeedInfo.h Log.cpp Log.h LoggableFrontend.cpp \
+	LoggableFrontend.h Maintenance.cpp Maintenance.h MessageBase.h NCursesFrontend.cpp \
+	NCursesFrontend.h NNTPConnection.cpp \
+	NNTPConnection.h NZBFile.cpp NZBFile.h NewsServer.cpp NewsServer.h Observer.cpp \
+	Observer.h Options.cpp Options.h ParChecker.cpp ParChecker.h ParRenamer.cpp ParRenamer.h \
+	ParCoordinator.cpp ParCoordinator.h PrePostProcessor.cpp PrePostProcessor.h QueueCoordinator.cpp \
+	QueueCoordinator.h QueueEditor.cpp QueueEditor.h RemoteClient.cpp RemoteClient.h \
+	RemoteServer.cpp RemoteServer.h Scanner.cpp Scanner.h Scheduler.cpp Scheduler.h ScriptController.cpp \
+	ScriptController.h ServerPool.cpp ServerPool.h svn_version.cpp TLS.cpp TLS.h Thread.cpp Thread.h \
+	Util.cpp Util.h XmlRpc.cpp XmlRpc.h WebDownloader.cpp WebDownloader.h WebServer.cpp WebServer.h \
+	UrlCoordinator.cpp UrlCoordinator.h Unpack.cpp Unpack.h nzbget.cpp nzbget.h
 
 EXTRA_DIST = \
-	Makefile.cvs \
-	nzbgetd \
-	$(windows_FILES) \
-	$(osx_FILES)
+	Makefile.cvs nzbgetd \
+	$(patches_FILES) $(windows_FILES) $(osx_FILES)
+
+patches_FILES = \
+	libpar2-0.2-bugfixes.patch libpar2-0.2-cancel.patch \
+	libpar2-0.2-MSVC8.patch libsigc++-2.0.18-MSVC8.patch
 
 windows_FILES = \
-	daemon/windows/NTService.cpp \
-	daemon/windows/NTService.h \
-	daemon/windows/win32.h \
-	nzbget.sln \
-	nzbget.vcproj \
-	nzbget-shell.bat
+	win32.h NTService.cpp NTService.h nzbget.sln nzbget.vcproj nzbget-shell.bat
 
 osx_FILES = \
-	osx/App_Prefix.pch \
-	osx/NZBGet-Info.plist \
-	osx/DaemonController.h \
-	osx/DaemonController.m \
-	osx/MainApp.h \
-	osx/MainApp.m \
-	osx/MainApp.xib \
-	osx/PFMoveApplication.h \
-	osx/PFMoveApplication.m \
-	osx/PreferencesDialog.h \
-	osx/PreferencesDialog.m \
-	osx/PreferencesDialog.xib \
-	osx/RPC.h \
-	osx/RPC.m \
-	osx/WebClient.h \
-	osx/WebClient.m \
-	osx/WelcomeDialog.h \
-	osx/WelcomeDialog.m \
-	osx/WelcomeDialog.xib \
+	osx/App_Prefix.pch osx/NZBGet-Info.plist \
+	osx/DaemonController.h osx/DaemonController.m \
+	osx/MainApp.h osx/MainApp.m osx/MainApp.xib \
+	osx/PFMoveApplication.h osx/PFMoveApplication.m \
+	osx/PreferencesDialog.h osx/PreferencesDialog.m osx/PreferencesDialog.xib \
+	osx/RPC.h osx/RPC.m osx/WebClient.h osx/WebClient.m \
+	osx/WelcomeDialog.h osx/WelcomeDialog.m osx/WelcomeDialog.xib \
 	osx/NZBGet.xcodeproj/project.pbxproj \
-	osx/Resources/Images/mainicon.icns \
-	osx/Resources/Images/statusicon.png \
-	osx/Resources/Images/statusicon@2x.png \
-	osx/Resources/licenses/license-bootstrap.txt \
-	osx/Resources/licenses/license-jquery-GPL.txt \
-	osx/Resources/licenses/license-jquery-MIT.txt \
-	osx/Resources/Credits.rtf \
-	osx/Resources/Localizable.strings \
-	osx/Resources/Welcome.rtf
+	osx/Resources/Images/mainicon.icns osx/Resources/Images/statusicon.png \
+	osx/Resources/Images/statusicon@2x.png osx/Resources/Images/statusicon-inv.png \
+	osx/Resources/Images/statusicon-inv@2x.png osx/Resources/licenses/license-bootstrap.txt \
+	osx/Resources/licenses/license-jquery-GPL.txt osx/Resources/licenses/license-jquery-MIT.txt \
+	osx/Resources/Credits.rtf osx/Resources/Localizable.strings osx/Resources/Welcome.rtf
 
 doc_FILES = \
-	README \
-	ChangeLog \
-	COPYING \
-	lib/par2/AUTHORS \
-	lib/par2/README
+	README ChangeLog COPYING
 
 exampleconf_FILES = \
 	nzbget.conf
 
 webui_FILES = \
-	webui/index.html \
-	webui/index.js \
-	webui/downloads.js \
-	webui/edit.js \
-	webui/fasttable.js \
-	webui/history.js \
-	webui/messages.js \
-	webui/status.js \
-	webui/style.css \
-	webui/upload.js \
-	webui/util.js \
-	webui/config.js \
-	webui/feed.js \
-	webui/lib/bootstrap.js \
-	webui/lib/bootstrap.min.js \
-	webui/lib/bootstrap.css  \
-	webui/lib/jquery.js \
-	webui/lib/jquery.min.js \
-	webui/lib/raphael.js \
-	webui/lib/raphael.min.js \
-	webui/lib/elycharts.js \
-	webui/lib/elycharts.min.js \
-	webui/img/icons.png \
-	webui/img/icons-2x.png \
-	webui/img/transmit.gif \
-	webui/img/transmit-file.gif \
-	webui/img/favicon.ico \
-	webui/img/download-anim-green-2x.png \
-	webui/img/download-anim-orange-2x.png \
+	webui/index.html webui/index.js webui/downloads.js webui/edit.js webui/fasttable.js \
+	webui/history.js webui/messages.js webui/status.js webui/style.css webui/upload.js \
+	webui/util.js webui/config.js webui/feed.js \
+	webui/lib/bootstrap.js webui/lib/bootstrap.min.js webui/lib/bootstrap.css  \
+	webui/lib/jquery.js webui/lib/jquery.min.js \
+	webui/img/icons.png webui/img/icons-2x.png \
+	webui/img/transmit.gif webui/img/transmit-file.gif webui/img/favicon.ico \
+	webui/img/download-anim-green-2x.png webui/img/download-anim-orange-2x.png \
 	webui/img/transmit-reload-2x.gif
 
-scripts_FILES = \
-	scripts/EMail.py \
-	scripts/Logger.py
+ppscripts_FILES = \
+	ppscripts/EMail.py ppscripts/Logger.py
 
 # Install
 sbin_SCRIPTS = nzbgetd
@@ -279,8 +91,8 @@ exampleconfdir = $(datadir)/nzbget
 dist_exampleconf_DATA = $(exampleconf_FILES)
 webuidir = $(datadir)/nzbget
 nobase_dist_webui_DATA = $(webui_FILES)
-scriptsdir = $(datadir)/nzbget
-nobase_dist_scripts_SCRIPTS = $(scripts_FILES)
+ppscriptsdir = $(datadir)/nzbget
+nobase_dist_ppscripts_SCRIPTS = $(ppscripts_FILES)
 
 # Note about "sed": 
 # We need to make some changes in installed files.
@@ -306,7 +118,7 @@ install-data-hook:
 	sed 's:configuration file (typically installed:configuration file (installed:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
 	sed 's:/usr/local/share/nzbget/nzbget.conf):$(exampleconfdir)/nzbget.conf):' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
 	sed 's:^WebDir=:WebDir=$(webuidir)/webui:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:typically installed to /usr/local/share/nzbget/scripts:installed to $(scriptsdir)/scripts:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
+	sed 's:typically installed to /usr/local/share/nzbget/ppscripts:installed to $(ppscriptsdir)/ppscripts:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
 	rm "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
 
 # Install configuration files into /etc
@@ -366,7 +178,6 @@ clean-bak: rm *~
 
 # Fix premissions
 dist-hook:
-	find $(distdir)/daemon -type f -print -exec chmod -x {} \;
+	chmod -x $(distdir)/*.cpp $(distdir)/*.h
 	find $(distdir)/webui -type f -print -exec chmod -x {} \;
-	find $(distdir)/lib -type f -print -exec chmod -x {} \;
 

MessageBase.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 #ifndef MESSAGEBASE_H
 #define MESSAGEBASE_H
 
-static const int32_t NZBMESSAGE_SIGNATURE = 0x6E7A6225; // = "nzb-XX" (protocol version)
+static const int32_t NZBMESSAGE_SIGNATURE = 0x6E7A621B; // = "nzb-XX" (protocol version)
 static const int NZBREQUESTFILENAMESIZE = 512;
 static const int NZBREQUESTPASSWORDSIZE = 32;
 
@@ -62,13 +62,67 @@ enum eRemoteRequest
 	eRemoteRequestWriteLog,
 	eRemoteRequestScan,
 	eRemoteRequestHistory,
-	eRemoteRequestDownloadUrl
+	eRemoteRequestDownloadUrl,
+	eRemoteRequestUrlQueue
+};
+
+// Possible values for field "m_iAction" of struct "SNZBEditQueueRequest":
+// File-Actions affect one file, Group-Actions affect all files in group.
+// Group is a list of files, added to queue from one NZB-File.
+enum eRemoteEditAction
+{
+	eRemoteEditActionFileMoveOffset = 1,	// move files to m_iOffset relative to the current position in download-queue
+	eRemoteEditActionFileMoveTop,			// move files to the top of download-queue
+	eRemoteEditActionFileMoveBottom,		// move files to the bottom of download-queue
+	eRemoteEditActionFilePause,				// pause files
+	eRemoteEditActionFileResume,			// resume (unpause) files
+	eRemoteEditActionFileDelete,			// delete files
+	eRemoteEditActionFilePauseAllPars,		// pause only (all) pars (does not affect other files)
+	eRemoteEditActionFilePauseExtraPars,	// pause only (almost all) pars, except main par-file (does not affect other files)
+	eRemoteEditActionFileSetPriority,		// set priority for files
+	eRemoteEditActionFileReorder,			// (not supported)
+	eRemoteEditActionFileSplit,				// split - create new group from selected files
+	eRemoteEditActionGroupMoveOffset,		// move group to m_iOffset relative to the current position in download-queue
+	eRemoteEditActionGroupMoveTop,			// move group to the top of download-queue
+	eRemoteEditActionGroupMoveBottom,		// move group to the bottom of download-queue
+	eRemoteEditActionGroupPause,			// pause group
+	eRemoteEditActionGroupResume,			// resume (unpause) group
+	eRemoteEditActionGroupDelete,			// delete group
+	eRemoteEditActionGroupDupeDelete,		// delete group
+	eRemoteEditActionGroupFinalDelete,		// delete group
+	eRemoteEditActionGroupPauseAllPars,		// pause only (all) pars (does not affect other files) in group
+	eRemoteEditActionGroupPauseExtraPars,	// pause only (almost all) pars in group, except main par-file (does not affect other files)
+	eRemoteEditActionGroupSetPriority,		// set priority for groups
+	eRemoteEditActionGroupSetCategory,		// set or change category for a group
+	eRemoteEditActionGroupMerge,			// merge group
+	eRemoteEditActionGroupSetParameter,		// set post-process parameter for group
+	eRemoteEditActionGroupSetName,			// set group name (rename group)
+	eRemoteEditActionGroupSetDupeKey,		// (reserved)
+	eRemoteEditActionGroupSetDupeScore,		// (reserved)
+	eRemoteEditActionGroupSetDupeMode,		// (reserved)
+	eRemoteEditActionPostMoveOffset = 51,	// move post-job to m_iOffset relative to the current position in post-queue
+	eRemoteEditActionPostMoveTop,			// move post-job to the top of post-queue
+	eRemoteEditActionPostMoveBottom,		// move post-job to the bottom of post-queue
+	eRemoteEditActionPostDelete,			// delete post-job
+	eRemoteEditActionHistoryDelete,			// hide history-item
+	eRemoteEditActionHistoryFinalDelete,	// delete history-item
+	eRemoteEditActionHistoryReturn,			// move history-item back to download queue
+	eRemoteEditActionHistoryProcess,		// move history-item back to download queue and start postprocessing
+	eRemoteEditActionHistoryRedownload,		// move history-item back to download queue for redownload
+	eRemoteEditActionHistorySetParameter,	// set post-process parameter for history-item
+	eRemoteEditActionHistorySetDupeKey,		// (reserved)
+	eRemoteEditActionHistorySetDupeScore,	// (reserved)
+	eRemoteEditActionHistorySetDupeMode,	// (reserved)
+	eRemoteEditActionHistorySetDupeBackup,	// (reserved)
+	eRemoteEditActionHistoryMarkBad,		// mark history-item as bad (and download other duplicate)
+	eRemoteEditActionHistoryMarkGood		// mark history-item as good (and push it into dup-history)
 };
 
 // Possible values for field "m_iAction" of struct "SNZBPauseUnpauseRequest":
 enum eRemotePauseUnpauseAction
 {
 	eRemotePauseUnpauseActionDownload = 1,	// pause/unpause download queue
+	eRemotePauseUnpauseActionDownload2,		// pause/unpause download queue (second pause-register)
 	eRemotePauseUnpauseActionPostProcess,	// pause/unpause post-processor queue
 	eRemotePauseUnpauseActionScan			// pause/unpause scan of incoming nzb-directory
 };
@@ -164,17 +218,8 @@ struct SNZBListResponse
 // A list response nzb entry
 struct SNZBListResponseNZBEntry
 {
-	int32_t					m_iID;					// NZB-ID
-	int32_t					m_iKind;				// Item Kind (see NZBInfo::Kind)
 	int32_t					m_iSizeLo;				// Size of all files in bytes, Low 32-bits of 64-bit value
 	int32_t					m_iSizeHi;				// Size of all files in bytes, High 32-bits of 64-bit value
-	int32_t					m_iRemainingSizeLo;		// Size of remaining (unpaused) files in bytes, Low 32-bits of 64-bit value
-	int32_t					m_iRemainingSizeHi;		// Size of remaining (unpaused) files in bytes, High 32-bits of 64-bit value
-	int32_t					m_iPausedSizeLo;		// Size of npaused files in bytes, Low 32-bits of 64-bit value
-	int32_t					m_iPausedSizeHi;		// Size of paused files in bytes, High 32-bits of 64-bit value
-	int32_t					m_iPausedCount;			// Number of paused files
-	int32_t					m_iRemainingParCount;	// Number of remaining par-files
-	int32_t					m_iPriority;			// Download priority
 	int32_t					m_bMatch;				// 1 - group matches the pattern (only when Request has eRemoteMatchModeRegEx)
 	int32_t					m_iFilenameLen;			// Length of Filename-string (m_szFilename), following to this record
 	int32_t					m_iNameLen;				// Length of Name-string (m_szName), following to this record
@@ -209,6 +254,7 @@ struct SNZBListResponseFileEntry
 	int32_t					m_iRemainingSizeHi;		// Remaining size in bytes, High 32-bits of 64-bit value
 	int32_t					m_bPaused;				// 1 - file is paused
 	int32_t					m_bFilenameConfirmed;	// 1 - Filename confirmed (read from article body), 0 - Filename parsed from subject (can be changed after reading of article)
+	int32_t					m_iPriority;			// Download priority
 	int32_t					m_iActiveDownloads;		// Number of active downloads for this file
 	int32_t					m_bMatch;				// 1 - file matches the pattern (only when Request has eRemoteMatchModeRegEx)
 	int32_t					m_iSubjectLen;			// Length of Subject-string (m_szSubject), following to this record
@@ -282,8 +328,10 @@ struct SNZBSetDownloadRateResponse
 struct SNZBEditQueueRequest
 {
 	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iAction;				// Action to be executed, see enum DownloadQueue::EEditAction
+	int32_t					m_iAction;				// Action to be executed, see enum eRemoteEditAction
 	int32_t					m_iOffset;				// Offset to move (for m_iAction = 0)
+	int32_t					m_bSmartOrder;			// For Move-Actions: 0 - execute action for each ID in order they are placed in array;
+													// 1 - smart execute to ensure that the relative order of all affected IDs are not changed.
 	int32_t					m_iMatchMode;				// File/Group match mode, see enum eRemoteMatchMode
 	int32_t					m_iNrTrailingIDEntries;		// Number of ID-entries, following to this structure
 	int32_t					m_iNrTrailingNameEntries;	// Number of Name-entries, following to this structure
@@ -463,7 +511,7 @@ struct SNZBHistoryResponseEntry
 	int32_t					m_iParStatus;			// See NZBInfo::EParStatus
 	int32_t					m_iScriptStatus;		// See NZBInfo::EScriptStatus
 	// for URL items (m_iKind = 2)
-	int32_t					m_iUrlStatus;			// See NZBInfo::EUrlStatus
+	int32_t					m_iUrlStatus;			// See UrlInfo::EStatus
 	// trailing data
 	//char					m_szNicename[m_iNicenameLen];				// variable sized
 };
@@ -489,4 +537,30 @@ struct SNZBDownloadUrlResponse
 	//char					m_szText[m_iTrailingDataLength];	// variable sized
 };
 
+// UrlQueue request
+struct SNZBUrlQueueRequest
+{
+	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
+};
+
+// UrlQueue response
+struct SNZBUrlQueueResponse
+{
+	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
+	int32_t					m_iEntrySize;			// Size of the SNZBUrlQueueResponseEntry-struct
+	int32_t					m_iNrTrailingEntries;	// Number of UrlQueue-entries, following to this structure
+	int32_t					m_iTrailingDataLength;	// Length of all UrlQueue-entries, following to this structure
+	// SNZBUrlQueueResponseEntry m_Entries[m_iNrTrailingEntries]		// variable sized
+};
+
+// UrlQueue response entry
+struct SNZBUrlQueueResponseEntry
+{
+	int32_t					m_iID;					// ID of Url-entry
+	int32_t					m_iURLLen;				// Length of URL-string (m_szURL), following to this record
+	int32_t					m_iNZBFilenameLen;		// Length of NZBFilename-string (m_szNZBFilename), following to this record
+	//char					m_szURL[m_iURLLen];					// variable sized
+	//char					m_szNZBFilename[m_iNZBFilenameLen];	// variable sized
+};
+
 #endif

NCursesFrontend.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -43,7 +43,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #ifndef WIN32
 #include <unistd.h>
 #endif
@@ -270,6 +269,7 @@ void NCursesFrontend::Run()
     }
 
     FreeData();
+	ClearGroupQueue();
 	
     debug("Exiting NCursesFrontend-loop");
 }
@@ -288,11 +288,13 @@ void NCursesFrontend::Update(int iKey)
     if (m_iDataUpdatePos <= 0)
     {
         FreeData();
+		ClearGroupQueue();
 		m_iNeededLogEntries = m_iMessagesWinClientHeight;
         if (!PrepareData())
         {
             return;
         }
+		PrepareGroupQueue();
 
 		// recalculate frame sizes
 		CalcWindowSizes();
@@ -385,22 +387,17 @@ void NCursesFrontend::CalcWindowSizes()
 
 int NCursesFrontend::CalcQueueSize()
 {
-	int iQueueSize = 0;
-	DownloadQueue* pDownloadQueue = LockQueue();
 	if (m_bGroupFiles)
 	{
-		iQueueSize = pDownloadQueue->GetQueue()->size();
+		return m_groupQueue.size();
 	}
 	else
 	{
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
-		{
-			NZBInfo* pNZBInfo = *it;
-			iQueueSize += pNZBInfo->GetFileList()->size();
-		}
+		DownloadQueue* pDownloadQueue = LockQueue();
+		int iQueueSize = pDownloadQueue->GetFileQueue()->size();
+		UnlockQueue();
+		return iQueueSize;
 	}
-	UnlockQueue();
-	return iQueueSize;
 }
 
 void NCursesFrontend::PlotLine(const char * szString, int iRow, int iPos, int iColorPair)
@@ -614,7 +611,7 @@ void NCursesFrontend::PrintStatus()
     timeString[0] = '\0';
 
 	int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
-    if (iCurrentDownloadSpeed > 0 && !m_bPauseDownload)
+    if (iCurrentDownloadSpeed > 0 && !(m_bPauseDownload || m_bPauseDownload2))
     {
         long long remain_sec = (long long)(m_lRemainingSize / iCurrentDownloadSpeed);
 		int h = (int)(remain_sec / 3600);
@@ -645,10 +642,12 @@ void NCursesFrontend::PrintStatus()
 
 	float fAverageSpeed = (float)(Util::Int64ToFloat(m_iDnTimeSec > 0 ? m_iAllBytes / m_iDnTimeSec : 0) / 1024.0);
 
-	snprintf(tmp, MAX_SCREEN_WIDTH, " %d threads, %.*f KB/s, %.2f MB remaining%s%s%s%s, Avg. %.*f KB/s", 
+	snprintf(tmp, MAX_SCREEN_WIDTH, " %d threads, %.*f KB/s, %.2f MB remaining%s%s%s%s%s, Avg. %.*f KB/s", 
 		m_iThreadCount, (iCurrentDownloadSpeed >= 10*1024 ? 0 : 1), (float)iCurrentDownloadSpeed / 1024.0, 
 		(float)(Util::Int64ToFloat(m_lRemainingSize) / 1024.0 / 1024.0), timeString, szPostStatus, 
-		m_bPauseDownload ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
+		m_bPauseDownload || m_bPauseDownload2 ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
+		m_bPauseDownload || m_bPauseDownload2 ? 
+			(m_bPauseDownload && m_bPauseDownload2 ? " (+2)" : m_bPauseDownload2 ? " (2)" : "") : "",
 		szDownloadLimit, (fAverageSpeed >= 10 ? 0 : 1), fAverageSpeed);
 	tmp[MAX_SCREEN_WIDTH - 1] = '\0';
     PlotLine(tmp, iStatusRow, 0, NCURSES_COLORPAIR_STATUS);
@@ -744,24 +743,31 @@ void NCursesFrontend::PrintQueue()
 
 void NCursesFrontend::PrintFileQueue()
 {
+	int iLineNr = m_iQueueWinTop;
+			
     DownloadQueue* pDownloadQueue = LockQueue();
+	if (pDownloadQueue->GetFileQueue()->empty())
+    {
+		char szBuffer[MAX_SCREEN_WIDTH];
+		snprintf(szBuffer, sizeof(szBuffer), "%s Files for downloading", m_bUseColor ? "" : "*** ");
+		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
+		PrintTopHeader(szBuffer, iLineNr++, true);
+        PlotLine("Ready to receive nzb-job", iLineNr++, 0, NCURSES_COLORPAIR_TEXT);
+    }
+    else
+    {
+		iLineNr++;
+		long long lRemaining = 0;
+		long long lPaused = 0;
+		int iPausedFiles = 0;
+		int i = 0;
+        for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++, i++)
+        {
+            FileInfo* pFileInfo = *it;
 
-	int iLineNr = m_iQueueWinTop + 1;
-	long long lRemaining = 0;
-	long long lPaused = 0;
-	int iPausedFiles = 0;
-	int iFileNum = 0;
-
-	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
-	{
-		NZBInfo* pNZBInfo = *it;
-		for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++, iFileNum++)
-		{
-			FileInfo* pFileInfo = *it2;
-
-			if (iFileNum >= m_iQueueScrollOffset && iFileNum < m_iQueueScrollOffset + m_iQueueWinHeight -1)
+			if (i >= m_iQueueScrollOffset && i < m_iQueueScrollOffset + m_iQueueWinHeight -1)
 			{
-				PrintFilename(pFileInfo, iLineNr++, iFileNum == m_iSelectedQueueEntry);
+				PrintFilename(pFileInfo, iLineNr++, i == m_iSelectedQueueEntry);
 			}
 
 			if (pFileInfo->GetPaused())
@@ -770,11 +776,8 @@ void NCursesFrontend::PrintFileQueue()
 				lPaused += pFileInfo->GetRemainingSize();
 			}
 			lRemaining += pFileInfo->GetRemainingSize();
-		}
-	}
-
-	if (iFileNum > 0)
-	{
+        }
+		
 		char szRemaining[20];
 		Util::FormatFileSize(szRemaining, sizeof(szRemaining), lRemaining);
 
@@ -783,21 +786,11 @@ void NCursesFrontend::PrintFileQueue()
 		
 		char szBuffer[MAX_SCREEN_WIDTH];
 		snprintf(szBuffer, sizeof(szBuffer), " %sFiles for downloading - %i / %i files in queue - %s / %s", 
-			m_bUseColor ? "" : "*** ", iFileNum,
-			iFileNum - iPausedFiles, szRemaining, szUnpaused);
+			m_bUseColor ? "" : "*** ", (int)pDownloadQueue->GetFileQueue()->size(),
+			(int)pDownloadQueue->GetFileQueue()->size() - iPausedFiles, szRemaining, szUnpaused);
 		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
 		PrintTopHeader(szBuffer, m_iQueueWinTop, true);
     }
-	else
-	{
-		iLineNr--;
-		char szBuffer[MAX_SCREEN_WIDTH];
-		snprintf(szBuffer, sizeof(szBuffer), "%s Files for downloading", m_bUseColor ? "" : "*** ");
-		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
-		PrintTopHeader(szBuffer, iLineNr++, true);
-        PlotLine("Ready to receive nzb-job", iLineNr++, 0, NCURSES_COLORPAIR_TEXT);
-	}
-
     UnlockQueue();
 }
 
@@ -828,9 +821,9 @@ void NCursesFrontend::PrintFilename(FileInfo * pFileInfo, int iRow, bool bSelect
 
 	char szPriority[100];
 	szPriority[0] = '\0';
-	if (pFileInfo->GetNZBInfo()->GetPriority() != 0)
+	if (pFileInfo->GetPriority() != 0)
 	{
-		sprintf(szPriority, " [%+i]", pFileInfo->GetNZBInfo()->GetPriority());
+		sprintf(szPriority, " [%+i]", pFileInfo->GetPriority());
 	}
 
 	char szCompleted[20];
@@ -927,8 +920,9 @@ void NCursesFrontend::PrintGroupQueue()
 {
 	int iLineNr = m_iQueueWinTop;
 
-    DownloadQueue* pDownloadQueue = LockQueue();
-	if (pDownloadQueue->GetQueue()->empty())
+    LockQueue();
+	GroupQueue* pGroupQueue = &m_groupQueue;
+	if (pGroupQueue->empty())
     {
 		char szBuffer[MAX_SCREEN_WIDTH];
 		snprintf(szBuffer, sizeof(szBuffer), "%s NZBs for downloading", m_bUseColor ? "" : "*** ");
@@ -943,27 +937,30 @@ void NCursesFrontend::PrintGroupQueue()
 		ResetColWidths();
 		int iCalcLineNr = iLineNr;
 		int i = 0;
-        for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++, i++)
+        for (GroupQueue::iterator it = pGroupQueue->begin(); it != pGroupQueue->end(); it++, i++)
         {
-            NZBInfo* pNZBInfo = *it;
+            GroupInfo* pGroupInfo = *it;
+
 			if (i >= m_iQueueScrollOffset && i < m_iQueueScrollOffset + m_iQueueWinHeight -1)
 			{
-				PrintGroupname(pNZBInfo, iCalcLineNr++, false, true);
+				PrintGroupname(pGroupInfo, iCalcLineNr++, false, true);
 			}
         }
 
 		long long lRemaining = 0;
 		long long lPaused = 0;
 		i = 0;
-        for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++, i++)
+        for (GroupQueue::iterator it = pGroupQueue->begin(); it != pGroupQueue->end(); it++, i++)
         {
-            NZBInfo* pNZBInfo = *it;
+            GroupInfo* pGroupInfo = *it;
+
 			if (i >= m_iQueueScrollOffset && i < m_iQueueScrollOffset + m_iQueueWinHeight -1)
 			{
-				PrintGroupname(pNZBInfo, iLineNr++, i == m_iSelectedQueueEntry, false);
+				PrintGroupname(pGroupInfo, iLineNr++, i == m_iSelectedQueueEntry, false);
 			}
-			lRemaining += pNZBInfo->GetRemainingSize();
-			lPaused += pNZBInfo->GetPausedSize();
+
+			lRemaining += pGroupInfo->GetRemainingSize();
+			lPaused += pGroupInfo->GetPausedSize();
         }
 		
 		char szRemaining[20];
@@ -974,7 +971,7 @@ void NCursesFrontend::PrintGroupQueue()
 		
 		char szBuffer[MAX_SCREEN_WIDTH];
 		snprintf(szBuffer, sizeof(szBuffer), " %sNZBs for downloading - %i NZBs in queue - %s / %s", 
-			m_bUseColor ? "" : "*** ", (int)pDownloadQueue->GetQueue()->size(), szRemaining, szUnpaused);
+			m_bUseColor ? "" : "*** ", (int)pGroupQueue->size(), szRemaining, szUnpaused);
 		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
 		PrintTopHeader(szBuffer, m_iQueueWinTop, false);
     }
@@ -988,7 +985,7 @@ void NCursesFrontend::ResetColWidths()
 	m_iColWidthLeft = 0;
 }
 
-void NCursesFrontend::PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected, bool bCalcColWidth)
+void NCursesFrontend::PrintGroupname(GroupInfo * pGroupInfo, int iRow, bool bSelected, bool bCalcColWidth)
 {
 	int color = NCURSES_COLORPAIR_TEXT;
 	char chBrace1 = '[';
@@ -1004,21 +1001,28 @@ void NCursesFrontend::PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected
 	}
 
 	const char* szDownloading = "";
-	if (pNZBInfo->GetActiveDownloads() > 0)
+	if (pGroupInfo->GetActiveDownloads() > 0)
 	{
 		szDownloading = " *";
 	}
 
-	long long lUnpausedRemainingSize = pNZBInfo->GetRemainingSize() - pNZBInfo->GetPausedSize();
+	long long lUnpausedRemainingSize = pGroupInfo->GetRemainingSize() - pGroupInfo->GetPausedSize();
 
 	char szRemaining[20];
 	Util::FormatFileSize(szRemaining, sizeof(szRemaining), lUnpausedRemainingSize);
 
 	char szPriority[100];
 	szPriority[0] = '\0';
-	if (pNZBInfo->GetPriority() != 0)
+	if (pGroupInfo->GetMinPriority() != 0 || pGroupInfo->GetMaxPriority() != 0)
 	{
-		sprintf(szPriority, " [%+i]", pNZBInfo->GetPriority());
+		if (pGroupInfo->GetMinPriority() == pGroupInfo->GetMaxPriority())
+		{
+			sprintf(szPriority, " [%+i]", pGroupInfo->GetMinPriority());
+		}
+		else
+		{
+			sprintf(szPriority, " [%+i..%+i]", pGroupInfo->GetMinPriority(), pGroupInfo->GetMaxPriority());
+		}
 	}
 
 	char szBuffer[MAX_SCREEN_WIDTH];
@@ -1042,26 +1046,26 @@ void NCursesFrontend::PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected
 	if (bPrintFormatted)
 	{
 		char szFiles[20];
-		snprintf(szFiles, 20, "%i/%i", (int)pNZBInfo->GetFileList()->size(), pNZBInfo->GetPausedFileCount());
+		snprintf(szFiles, 20, "%i/%i", pGroupInfo->GetRemainingFileCount(), pGroupInfo->GetPausedFileCount());
 		szFiles[20-1] = '\0';
 		
 		char szTotal[20];
-		Util::FormatFileSize(szTotal, sizeof(szTotal), pNZBInfo->GetSize());
+		Util::FormatFileSize(szTotal, sizeof(szTotal), pGroupInfo->GetNZBInfo()->GetSize());
 
 		char szNameWithIds[1024];
-		snprintf(szNameWithIds, 1024, "%c%i%c%s%s %s", chBrace1, pNZBInfo->GetID(), chBrace2, 
-			szPriority, szDownloading, pNZBInfo->GetName());
+		snprintf(szNameWithIds, 1024, "%c%i-%i%c%s%s %s", chBrace1, pGroupInfo->GetFirstID(), pGroupInfo->GetLastID(), chBrace2, 
+			szPriority, szDownloading, pGroupInfo->GetNZBInfo()->GetName());
 		szNameWithIds[iNameLen] = '\0';
 
 		char szTime[100];
 		szTime[0] = '\0';
 		int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
-		if (pNZBInfo->GetPausedSize() > 0 && lUnpausedRemainingSize == 0)
+		if (pGroupInfo->GetPausedSize() > 0 && lUnpausedRemainingSize == 0)
 		{
 			snprintf(szTime, 100, "[paused]");
-			Util::FormatFileSize(szRemaining, sizeof(szRemaining), pNZBInfo->GetRemainingSize());
+			Util::FormatFileSize(szRemaining, sizeof(szRemaining), pGroupInfo->GetRemainingSize());
 		}
-		else if (iCurrentDownloadSpeed > 0 && !m_bPauseDownload)
+		else if (iCurrentDownloadSpeed > 0 && !(m_bPauseDownload || m_bPauseDownload2))
 		{
 			long long remain_sec = (long long)(lUnpausedRemainingSize / iCurrentDownloadSpeed);
 			int h = (int)(remain_sec / 3600);
@@ -1095,8 +1099,8 @@ void NCursesFrontend::PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected
 	}
 	else
 	{
-		snprintf(szBuffer, MAX_SCREEN_WIDTH, "%c%i%c%s %s", chBrace1, pNZBInfo->GetID(), 
-			chBrace2, szDownloading, pNZBInfo->GetName());
+		snprintf(szBuffer, MAX_SCREEN_WIDTH, "%c%i-%i%c%s %s", chBrace1, pGroupInfo->GetFirstID(), 
+			pGroupInfo->GetLastID(), chBrace2, szDownloading, pGroupInfo->GetNZBInfo()->GetName());
 	}
 
 	szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
@@ -1107,73 +1111,75 @@ void NCursesFrontend::PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected
 	}
 }
 
-bool NCursesFrontend::EditQueue(DownloadQueue::EEditAction eAction, int iOffset)
+void NCursesFrontend::PrepareGroupQueue()
+{
+	m_groupQueue.clear();
+
+    DownloadQueue* pDownloadQueue = LockQueue();
+	pDownloadQueue->BuildGroups(&m_groupQueue);
+	UnlockQueue();
+}
+
+void NCursesFrontend::ClearGroupQueue()
+{
+	m_groupQueue.Clear();
+}
+
+bool NCursesFrontend::EditQueue(QueueEditor::EEditAction eAction, int iOffset)
 {
 	int ID = 0;
 
 	if (m_bGroupFiles)
 	{
-		DownloadQueue* pDownloadQueue = LockQueue();
-		if (m_iSelectedQueueEntry >= 0 && m_iSelectedQueueEntry < (int)pDownloadQueue->GetQueue()->size())
+		if (m_iSelectedQueueEntry >= 0 && m_iSelectedQueueEntry < (int)m_groupQueue.size())
 		{
-			NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->at(m_iSelectedQueueEntry);
-			ID = pNZBInfo->GetID();
-			if (eAction == DownloadQueue::eaFilePause)
+			GroupInfo* pGroupInfo = m_groupQueue[m_iSelectedQueueEntry];
+			ID = pGroupInfo->GetLastID();
+			if (eAction == QueueEditor::eaFilePause)
 			{
-				if (pNZBInfo->GetRemainingSize() == pNZBInfo->GetPausedSize())
+				if (pGroupInfo->GetRemainingSize() == pGroupInfo->GetPausedSize())
 				{
-					eAction = DownloadQueue::eaFileResume;
+					eAction = QueueEditor::eaFileResume;
 				}
-				else if (pNZBInfo->GetPausedSize() == 0 && (pNZBInfo->GetRemainingParCount() > 0) &&
+				else if (pGroupInfo->GetPausedSize() == 0 && (pGroupInfo->GetRemainingParCount() > 0) &&
 					!(m_bLastPausePars && m_iLastEditEntry == m_iSelectedQueueEntry))
 				{
-					eAction = DownloadQueue::eaFilePauseExtraPars;
+					eAction = QueueEditor::eaFilePauseExtraPars;
 					m_bLastPausePars = true;
 				}
 				else
 				{
-					eAction = DownloadQueue::eaFilePause;
+					eAction = QueueEditor::eaFilePause;
 					m_bLastPausePars = false;
 				}
 			}
 		}
-		UnlockQueue();
 
 		// map file-edit-actions to group-edit-actions
-		 DownloadQueue::EEditAction FileToGroupMap[] = {
-			(DownloadQueue::EEditAction)0,
-			DownloadQueue::eaGroupMoveOffset, 
-			DownloadQueue::eaGroupMoveTop, 
-			DownloadQueue::eaGroupMoveBottom, 
-			DownloadQueue::eaGroupPause, 
-			DownloadQueue::eaGroupResume, 
-			DownloadQueue::eaGroupDelete,
-			DownloadQueue::eaGroupPauseAllPars,
-			DownloadQueue::eaGroupPauseExtraPars };
+		QueueEditor::EEditAction FileToGroupMap[] = {
+			(QueueEditor::EEditAction)0,
+			QueueEditor::eaGroupMoveOffset, 
+			QueueEditor::eaGroupMoveTop, 
+			QueueEditor::eaGroupMoveBottom, 
+			QueueEditor::eaGroupPause, 
+			QueueEditor::eaGroupResume, 
+			QueueEditor::eaGroupDelete,
+			QueueEditor::eaGroupPauseAllPars,
+			QueueEditor::eaGroupPauseExtraPars };
 		eAction = FileToGroupMap[eAction];
 	}
 	else
 	{
 		DownloadQueue* pDownloadQueue = LockQueue();
-
-		int iFileNum = 0;
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+		if (m_iSelectedQueueEntry >= 0 && m_iSelectedQueueEntry < (int)pDownloadQueue->GetFileQueue()->size())
 		{
-			NZBInfo* pNZBInfo = *it;
-			for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++, iFileNum++)
+			FileInfo* pFileInfo = pDownloadQueue->GetFileQueue()->at(m_iSelectedQueueEntry);
+			ID = pFileInfo->GetID();
+			if (eAction == QueueEditor::eaFilePause)
 			{
-				if (m_iSelectedQueueEntry == iFileNum)
-				{
-					FileInfo* pFileInfo = *it2;
-					ID = pFileInfo->GetID();
-					if (eAction == DownloadQueue::eaFilePause)
-					{
-						eAction = !pFileInfo->GetPaused() ? DownloadQueue::eaFilePause : DownloadQueue::eaFileResume;
-					}
-				}
+				eAction = !pFileInfo->GetPaused() ? QueueEditor::eaFilePause : QueueEditor::eaFileResume;
 			}
 		}
-
 		UnlockQueue();
 	}
 
@@ -1290,9 +1296,12 @@ void NCursesFrontend::UpdateInput(int initialKey)
 				// Key 'p' for pause
 				if (!IsRemoteMode())
 				{
-					info(m_bPauseDownload ? "Unpausing download" : "Pausing download");
+					info(m_bPauseDownload || m_bPauseDownload2 ? "Unpausing download" : "Pausing download");
 				}
-				ServerPauseUnpause(!m_bPauseDownload);
+				ServerPauseUnpause(!(m_bPauseDownload || m_bPauseDownload2), m_bPauseDownload2 && !m_bPauseDownload);
+				break;
+			case '\'':
+				ServerDumpDebug();
 				break;
 			case 'e':
 			case 10: // return
@@ -1378,38 +1387,38 @@ void NCursesFrontend::UpdateInput(int initialKey)
 				break;
 			case 'p':
 				// Key 'p' for pause
-				EditQueue(DownloadQueue::eaFilePause, 0);
+				EditQueue(QueueEditor::eaFilePause, 0);
 				break;
 			case 'd':
 				SetHint(" Use Uppercase \"D\" for delete");
 				break;
 			case 'D':
 				// Delete entry
-				if (EditQueue(DownloadQueue::eaFileDelete, 0))
+				if (EditQueue(QueueEditor::eaFileDelete, 0))
 				{
 					SetCurrentQueueEntry(m_iSelectedQueueEntry);
 				}
 				break;
 			case 'u':
-				if (EditQueue(DownloadQueue::eaFileMoveOffset, -1))
+				if (EditQueue(QueueEditor::eaFileMoveOffset, -1))
 				{
 					SetCurrentQueueEntry(m_iSelectedQueueEntry - 1);
 				}
 				break;
 			case 'n':
-				if (EditQueue(DownloadQueue::eaFileMoveOffset, +1))
+				if (EditQueue(QueueEditor::eaFileMoveOffset, +1))
 				{
 					SetCurrentQueueEntry(m_iSelectedQueueEntry + 1);
 				}
 				break;
 			case 't':
-				if (EditQueue(DownloadQueue::eaFileMoveTop, 0))
+				if (EditQueue(QueueEditor::eaFileMoveTop, 0))
 				{
 					SetCurrentQueueEntry(0);
 				}
 				break;
 			case 'b':
-				if (EditQueue(DownloadQueue::eaFileMoveBottom, 0))
+				if (EditQueue(QueueEditor::eaFileMoveBottom, 0))
 				{
 					SetCurrentQueueEntry(iQueueSize > 0 ? iQueueSize - 1 : 0);
 				}

NCursesFrontend.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -62,6 +62,7 @@ private:
 	int					m_iLastEditEntry;
 	bool				m_bLastPausePars;
 	int					m_iQueueScrollOffset;
+	GroupQueue			m_groupQueue;
 	char*				m_szHint;
 	time_t				m_tStartHint;
 	int					m_iColWidthFiles;
@@ -98,8 +99,10 @@ private:
 	void			PrintFilename(FileInfo* pFileInfo, int iRow, bool bSelected);
 	void			PrintGroupQueue();
 	void			ResetColWidths();
-	void			PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected, bool bCalcColWidth);
+	void			PrintGroupname(GroupInfo * pGroupInfo, int iRow, bool bSelected, bool bCalcColWidth);
+	void			PrepareGroupQueue();
 	void			PrintTopHeader(char* szHeader, int iLineNr, bool bUpTime);
+	void			ClearGroupQueue();
 	int				PrintMessage(Message* Msg, int iRow, int iMaxLines);
 	void			PrintKeyInputBar();
 	void 			PrintStatus();
@@ -111,7 +114,7 @@ private:
 	int				ReadConsoleKey();
 	int				CalcQueueSize();
 	void			NeedUpdateData();
-	bool			EditQueue(DownloadQueue::EEditAction eAction, int iOffset);
+	bool			EditQueue(QueueEditor::EEditAction eAction, int iOffset);
 	void			SetHint(const char* szHint);
 
 protected:

NTService.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #include "win32.h"
 
 #include <string.h>
-#include <stdio.h>
 
 #include "nzbget.h"
 #include "Log.h"

NZBFile.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -64,6 +64,7 @@ NZBFile::NZBFile(const char* szFileName, const char* szCategory)
     m_szFileName = strdup(szFileName);
 	m_szPassword = NULL;
 	m_pNZBInfo = new NZBInfo();
+	m_pNZBInfo->Retain();
 	m_pNZBInfo->SetFilename(szFileName);
 	m_pNZBInfo->SetCategory(szCategory);
 	m_pNZBInfo->BuildDestDirName();
@@ -75,6 +76,8 @@ NZBFile::NZBFile(const char* szFileName, const char* szCategory)
 	m_szTagContent = NULL;
 	m_iTagContentLen = 0;
 #endif
+
+    m_FileInfos.clear();
 }
 
 NZBFile::~NZBFile()
@@ -85,17 +88,31 @@ NZBFile::~NZBFile()
     free(m_szFileName);
     free(m_szPassword);
 
+    for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
+    {
+        delete *it;
+    }
+    m_FileInfos.clear();
+
+	if (m_pNZBInfo)
+	{
+		m_pNZBInfo->Release();
+	}
+
 #ifndef WIN32
 	delete m_pFileInfo;
 	free(m_szTagContent);
 #endif
-
-	delete m_pNZBInfo;
 }
 
 void NZBFile::LogDebugInfo()
 {
-    info(" NZBFile %s", m_szFileName);
+    debug(" NZBFile %s", m_szFileName);
+}
+
+void NZBFile::DetachFileInfos()
+{
+    m_FileInfos.clear();
 }
 
 void NZBFile::AddArticle(FileInfo* pFileInfo, ArticleInfo* pArticleInfo)
@@ -161,7 +178,7 @@ void NZBFile::AddFileInfo(FileInfo* pFileInfo)
 
 	lMissedSize += iUncountedArticles * lOneSize;
 	lSize += lMissedSize;
-	m_pNZBInfo->GetFileList()->push_back(pFileInfo);
+	m_FileInfos.push_back(pFileInfo);
 	pFileInfo->SetNZBInfo(m_pNZBInfo);
 	pFileInfo->SetSize(lSize);
 	pFileInfo->SetRemainingSize(lSize - lMissedSize);
@@ -284,11 +301,11 @@ void NZBFile::ParseSubject(FileInfo* pFileInfo, bool TryQuotes)
 
 bool NZBFile::HasDuplicateFilenames()
 {
-	for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
+	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
     {
         FileInfo* pFileInfo1 = *it;
 		int iDupe = 1;
-		for (FileList::iterator it2 = it + 1; it2 != m_pNZBInfo->GetFileList()->end(); it2++)
+		for (FileInfos::iterator it2 = it + 1; it2 != m_FileInfos.end(); it2++)
 		{
 			FileInfo* pFileInfo2 = *it2;
 			if (!strcmp(pFileInfo1->GetFilename(), pFileInfo2->GetFilename()) &&
@@ -304,7 +321,7 @@ bool NZBFile::HasDuplicateFilenames()
 		// false "duplicate files"-alarm.
 		// It's Ok for just two files to have the same filename, this is 
 		// an often case by posting-errors to repost bad files
-		if (iDupe > 2 || (iDupe == 2 && m_pNZBInfo->GetFileList()->size() == 2))
+		if (iDupe > 2 || (iDupe == 2 && m_FileInfos.size() == 2))
 		{
 			return true;
 		}
@@ -318,7 +335,7 @@ bool NZBFile::HasDuplicateFilenames()
  */
 void NZBFile::BuildFilenames()
 {
-	for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
+	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
     {
         FileInfo* pFileInfo = *it;
 		ParseSubject(pFileInfo, true);
@@ -326,7 +343,7 @@ void NZBFile::BuildFilenames()
 
 	if (HasDuplicateFilenames())
     {
-		for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
+		for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
 		{
 			FileInfo* pFileInfo = *it;
 			ParseSubject(pFileInfo, false);
@@ -336,7 +353,7 @@ void NZBFile::BuildFilenames()
 	if (HasDuplicateFilenames())
     {
 		m_pNZBInfo->SetManyDupeFiles(true);
-		for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
+		for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
 		{
 			FileInfo* pFileInfo = *it;
 			pFileInfo->SetFilename(pFileInfo->GetSubject());
@@ -351,26 +368,49 @@ bool CompareFileInfo(FileInfo* pFirst, FileInfo* pSecond)
 
 void NZBFile::CalcHashes()
 {
-	TempFileList fileList;
+	FileInfoList fileList;
 
-	for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
+	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
 	{
 		fileList.push_back(*it);
 	}
 
 	fileList.sort(CompareFileInfo);
 
+	// split ExtCleanupDisk into tokens and create a list
+	ExtList extList;
+	char* szExtCleanupDisk = strdup(g_pOptions->GetExtCleanupDisk());
+	char* saveptr;
+	char* szExt = strtok_r(szExtCleanupDisk, ",; ", &saveptr);
+	while (szExt)
+	{
+		extList.push_back(szExt);
+		szExt = strtok_r(NULL, ",; ", &saveptr);
+	}
+
 	unsigned int iFullContentHash = 0;
 	unsigned int iFilteredContentHash = 0;
 	int iUseForFilteredCount = 0;
 
-	for (TempFileList::iterator it = fileList.begin(); it != fileList.end(); it++)
+	for (FileInfoList::iterator it = fileList.begin(); it != fileList.end(); it++)
 	{
 		FileInfo* pFileInfo = *it;
 
 		// check file extension
-		bool bSkip = !pFileInfo->GetParFile() &&
-			Util::MatchFileExt(pFileInfo->GetFilename(), g_pOptions->GetExtCleanupDisk(), ",;");
+		int iFilenameLen = strlen(pFileInfo->GetFilename());
+		bool bSkip = false;
+		for (ExtList::iterator it = extList.begin(); it != extList.end(); it++)
+		{
+			const char* szExt = *it;
+			int iExtLen = strlen(szExt);
+			if (iFilenameLen >= iExtLen && !strcasecmp(szExt, pFileInfo->GetFilename() + iFilenameLen - iExtLen))
+			{
+				bSkip = true;
+				break;
+			}
+		}
+
+		bSkip = bSkip && !pFileInfo->GetParFile();
 
 		for (FileInfo::Articles::iterator it = pFileInfo->GetArticles()->begin(); it != pFileInfo->GetArticles()->end(); it++)
 		{
@@ -385,6 +425,8 @@ void NZBFile::CalcHashes()
 		}
 	}
 
+	free(szExtCleanupDisk);
+
 	// if filtered hash is based on less than a half of files - do not use filtered hash at all
 	if (iUseForFilteredCount < (int)fileList.size() / 2)
 	{
@@ -399,7 +441,7 @@ void NZBFile::ProcessFiles()
 {
 	BuildFilenames();
 
-	for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
+	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
 	{
 		FileInfo* pFileInfo = *it;
 		pFileInfo->MakeValidFilename();
@@ -413,7 +455,6 @@ void NZBFile::ProcessFiles()
 		m_pNZBInfo->SetFileCount(m_pNZBInfo->GetFileCount() + 1);
 		m_pNZBInfo->SetTotalArticles(m_pNZBInfo->GetTotalArticles() + pFileInfo->GetTotalArticles());
 		m_pNZBInfo->SetSize(m_pNZBInfo->GetSize() + pFileInfo->GetSize());
-		m_pNZBInfo->SetRemainingSize(m_pNZBInfo->GetRemainingSize() + pFileInfo->GetRemainingSize());
 		m_pNZBInfo->SetFailedSize(m_pNZBInfo->GetFailedSize() + pFileInfo->GetMissedSize());
 		m_pNZBInfo->SetCurrentFailedSize(m_pNZBInfo->GetFailedSize());
 
@@ -423,17 +464,14 @@ void NZBFile::ProcessFiles()
 			m_pNZBInfo->SetParSize(m_pNZBInfo->GetParSize() + pFileInfo->GetSize());
 			m_pNZBInfo->SetParFailedSize(m_pNZBInfo->GetParFailedSize() + pFileInfo->GetMissedSize());
 			m_pNZBInfo->SetParCurrentFailedSize(m_pNZBInfo->GetParFailedSize());
-			m_pNZBInfo->SetRemainingParCount(m_pNZBInfo->GetRemainingParCount() + 1);
 		}
 	}
 
-	m_pNZBInfo->UpdateMinMaxTime();
-
 	CalcHashes();
 
 	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
 	{
-		for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
+		for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
 		{
 			FileInfo* pFileInfo = *it;
 			g_pDiskState->SaveFile(pFileInfo);
@@ -453,7 +491,7 @@ void NZBFile::ProcessFiles()
  */
 void NZBFile::ReadPassword()
 {
-    FILE* pFile = fopen(m_szFileName, FOPEN_RB);
+    FILE* pFile = fopen(m_szFileName, "rb");
     if (!pFile)
     {
         return;
@@ -461,7 +499,7 @@ void NZBFile::ReadPassword()
 
     // obtain file size.
     fseek(pFile , 0 , SEEK_END);
-    int iSize  = (int)ftell(pFile);
+    int iSize  = ftell(pFile);
     rewind(pFile);
 
 	// reading first 4KB of the file
@@ -682,12 +720,6 @@ void NZBFile::Parse_StartElement(const char *name, const char **atts)
 		m_pFileInfo = new FileInfo();
 		m_pFileInfo->SetFilename(m_szFileName);
 
-		if (!atts)
-		{
-			warn("Malformed nzb-file, tag <%s> must have attributes", name);
-			return;
-		}
-
     	for (int i = 0; atts[i]; i += 2)
     	{
     		const char* attrname = atts[i];
@@ -706,16 +738,10 @@ void NZBFile::Parse_StartElement(const char *name, const char **atts)
 	{
 		if (!m_pFileInfo)
 		{
-			warn("Malformed nzb-file, tag <segment> without tag <file>");
+			// error: bad nzb-file
 			return;
 		}
-
-		if (!atts)
-		{
-			warn("Malformed nzb-file, tag <%s> must have attributes", name);
-			return;
-		}
-
+	
 		long long lsize = -1;
 		int partNumber = -1;
 
@@ -744,11 +770,6 @@ void NZBFile::Parse_StartElement(const char *name, const char **atts)
 	}
 	else if (!strcmp("meta", name))
 	{
-		if (!atts)
-		{
-			warn("Malformed nzb-file, tag <%s> must have attributes", name);
-			return;
-		}
 		m_bPassword = atts[0] && atts[1] && !strcmp("type", atts[0]) && !strcmp("password", atts[1]);
 	}
 }

NZBFile.h

@@ -27,6 +27,7 @@
 #ifndef NZBFILE_H
 #define NZBFILE_H
 
+#include <vector>
 #include <list>
 
 #include "DownloadInfo.h"
@@ -34,9 +35,12 @@
 class NZBFile
 {
 public:
-	typedef std::list<FileInfo*>	TempFileList;
+	typedef std::vector<FileInfo*>	FileInfos;
+	typedef std::list<FileInfo*>	FileInfoList;
+	typedef std::list<char*>		ExtList;
 
 private:
+	FileInfos			m_FileInfos;
 	NZBInfo*			m_pNZBInfo;
 	char*				m_szFileName;
 	char*				m_szPassword;
@@ -75,9 +79,10 @@ public:
 	virtual 			~NZBFile();
 	static NZBFile*		Create(const char* szFileName, const char* szCategory);
 	const char* 		GetFileName() const { return m_szFileName; }
+	FileInfos*			GetFileInfos() { return &m_FileInfos; }
 	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
 	const char*			GetPassword() { return m_szPassword; }
-	void				DetachNZBInfo() { m_pNZBInfo = NULL; }
+	void				DetachFileInfos();
 
 	void				LogDebugInfo();
 };

Observer.cpp

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -40,23 +40,23 @@ Subject::Subject()
 	m_Observers.clear();
 }
 
-void Subject::Attach(Observer* pObserver)
+void Subject::Attach(Observer* Observer)
 {
-	m_Observers.push_back(pObserver);
+	m_Observers.push_back(Observer);
 }
 
-void Subject::Detach(Observer* pObserver)
+void Subject::Detach(Observer* Observer)
 {
-	m_Observers.remove(pObserver);
+	m_Observers.remove(Observer);
 }
 
-void Subject::Notify(void* pAspect)
+void Subject::Notify(void* Aspect)
 {
 	debug("Notifying observers");
 	
 	for (std::list<Observer*>::iterator it = m_Observers.begin(); it != m_Observers.end(); it++)
 	{
         Observer* Observer = *it;
-		Observer->Update(this, pAspect);
+		Observer->Update(this, Aspect);
 	}
 }

Observer.h

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,16 +38,16 @@ private:
 
 public:
 					Subject();
-	void 			Attach(Observer* pObserver);
-	void 			Detach(Observer* pObserver);
-	void 			Notify(void* pAspect);
+	void 			Attach(Observer* Observer);
+	void 			Detach(Observer* Observer);
+	void 			Notify(void* Aspect);
 };
 
 class Observer
 {
-protected:
-	virtual void	Update(Subject* pCaller, void* pAspect) = 0;
-	friend class Subject;
+public:
+	virtual			~Observer() {};
+	virtual void	Update(Subject* Caller, void* Aspect) = 0;
 };
 
 #endif

Options.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -57,19 +57,15 @@ public:
 		opClientRequestScanAsync,
 		opClientRequestDownloadPause,
 		opClientRequestDownloadUnpause,
+		opClientRequestDownload2Pause,
+		opClientRequestDownload2Unpause,
 		opClientRequestPostPause,
 		opClientRequestPostUnpause,
 		opClientRequestScanPause,
 		opClientRequestScanUnpause,
 		opClientRequestHistory,
-		opClientRequestDownloadUrl
-	};
-	enum EWriteLog
-	{
-		wlNone,
-		wlAppend,
-		wlReset,
-		wlRotate
+		opClientRequestDownloadUrl,
+		opClientRequestUrlQueue
 	};
 	enum EMessageTarget
 	{
@@ -87,7 +83,6 @@ public:
 	enum EParCheck
 	{
 		pcAuto,
-		pcAlways,
 		pcForce,
 		pcManual
 	};
@@ -103,6 +98,15 @@ public:
 		hcDelete,
 		hcNone
 	};
+	enum EScriptLogKind
+	{
+		slNone,
+		slDetail,
+		slInfo,
+		slWarning,
+		slError,
+		slDebug
+	};
 	enum EMatchMode
 	{
 		mmID = 1,
@@ -143,6 +147,31 @@ public:
 		OptEntry*		FindOption(const char* szName);
 	};
 
+	class ConfigTemplate
+	{
+	private:
+		char*			m_szName;
+		char*			m_szDisplayName;
+		char*			m_szTemplate;
+
+		friend class Options;
+
+	public:
+						ConfigTemplate(const char* szName, const char* szDisplayName, const char* szTemplate);
+						~ConfigTemplate();
+		const char*		GetName() { return m_szName; }
+		const char*		GetDisplayName() { return m_szDisplayName; }
+		const char*		GetTemplate() { return m_szTemplate; }
+	};
+	
+	typedef std::vector<ConfigTemplate*>  ConfigTemplatesBase;
+
+	class ConfigTemplates: public ConfigTemplatesBase
+	{
+	public:
+						~ConfigTemplates();
+	};
+
 	typedef std::vector<char*>  NameList;
 
 	class Category
@@ -151,16 +180,16 @@ public:
 		char*			m_szName;
 		char*			m_szDestDir;
 		bool			m_bUnpack;
-		char*			m_szPostScript;
+		char*			m_szDefScript;
 		NameList		m_Aliases;
 
 	public:
-						Category(const char* szName, const char* szDestDir, bool bUnpack, const char* szPostScript);
+						Category(const char* szName, const char* szDestDir, bool bUnpack, const char* szDefScript);
 						~Category();
 		const char*		GetName() { return m_szName; }
 		const char*		GetDestDir() { return m_szDestDir; }
 		bool			GetUnpack() { return m_bUnpack; }
-		const char*		GetPostScript() { return m_szPostScript; }
+		const char*		GetDefScript() { return m_szDefScript; }
 		NameList*		GetAliases() { return &m_Aliases; }
 	};
 	
@@ -179,11 +208,6 @@ public:
 		char*			m_szName;
 		char*			m_szLocation;
 		char*			m_szDisplayName;
-		bool			m_bPostScript;
-		bool			m_bScanScript;
-		bool			m_bQueueScript;
-		bool			m_bSchedulerScript;
-		char*			m_szQueueEvents;
 
 	public:
 						Script(const char* szName, const char* szLocation);
@@ -192,58 +216,22 @@ public:
 		const char*		GetLocation() { return m_szLocation; }
 		void			SetDisplayName(const char* szDisplayName);
 		const char*		GetDisplayName() { return m_szDisplayName; }
-		bool			GetPostScript() { return m_bPostScript; }
-		void			SetPostScript(bool bPostScript) { m_bPostScript = bPostScript; }
-		bool			GetScanScript() { return m_bScanScript; }
-		void			SetScanScript(bool bScanScript) { m_bScanScript = bScanScript; }
-		bool			GetQueueScript() { return m_bQueueScript; }
-		void			SetQueueScript(bool bQueueScript) { m_bQueueScript = bQueueScript; }
-		bool			GetSchedulerScript() { return m_bSchedulerScript; }
-		void			SetSchedulerScript(bool bSchedulerScript) { m_bSchedulerScript = bSchedulerScript; }
-		void			SetQueueEvents(const char* szQueueEvents);
-		const char*		GetQueueEvents() { return m_szQueueEvents; }
 	};
 
-	typedef std::list<Script*>  ScriptsBase;
+	typedef std::list<Script*>  ScriptListBase;
 
-	class Scripts: public ScriptsBase
+	class ScriptList: public ScriptListBase
 	{
 	public:
-						~Scripts();
-		void			Clear();
+						~ScriptList();
 		Script*			Find(const char* szName);	
 	};
 
-	class ConfigTemplate
-	{
-	private:
-		Script*			m_pScript;
-		char*			m_szTemplate;
-
-		friend class Options;
-
-	public:
-						ConfigTemplate(Script* pScript, const char* szTemplate);
-						~ConfigTemplate();
-		Script*			GetScript() { return m_pScript; }
-		const char*		GetTemplate() { return m_szTemplate; }
-	};
-	
-	typedef std::vector<ConfigTemplate*>  ConfigTemplatesBase;
-
-	class ConfigTemplates: public ConfigTemplatesBase
-	{
-	public:
-						~ConfigTemplates();
-	};
-
 private:
 	OptEntries			m_OptEntries;
 	bool				m_bConfigInitialized;
 	Mutex				m_mutexOptEntries;
 	Categories			m_Categories;
-	Scripts				m_Scripts;
-	ConfigTemplates		m_ConfigTemplates;
 
 	// Options
 	bool				m_bConfigErrors;
@@ -264,8 +252,8 @@ private:
 	EMessageTarget		m_eDetailTarget;
 	bool				m_bDecode;
 	bool				m_bCreateBrokenLog;
-	int					m_iArticleTimeout;
-	int					m_iUrlTimeout;
+	bool				m_bResetLog;
+	int					m_iConnectionTimeout;
 	int					m_iTerminateTimeout;
 	bool				m_bAppendCategoryDir;
 	bool				m_bContinuePartial;
@@ -286,23 +274,21 @@ private:
 	char*				m_szDaemonUsername;
 	EOutputMode			m_eOutputMode;
 	bool				m_bReloadQueue;
+	bool				m_bReloadUrlQueue;
+	bool				m_bReloadPostQueue;
 	int					m_iUrlConnections;
 	int					m_iLogBufferSize;
-	EWriteLog			m_eWriteLog;
-	int					m_iRotateLog;
+	bool				m_bCreateLog;
 	char*				m_szLogFile;
 	EParCheck			m_eParCheck;
 	bool				m_bParRepair;
 	EParScan			m_eParScan;
-	bool				m_bParQuick;
 	bool				m_bParRename;
-	int					m_iParBuffer;
-	int					m_iParThreads;
 	EHealthCheck		m_eHealthCheck;
-	char*				m_szPostScript;
+	char*				m_szDefScript;
 	char*				m_szScriptOrder;
-	char*				m_szScanScript;
-	char*				m_szQueueScript;
+	char*				m_szNZBProcess;
+	char*				m_szNZBAddedProcess;
 	bool				m_bNoConfig;
 	int					m_iUMask;
 	int					m_iUpdateInterval;
@@ -311,7 +297,7 @@ private:
 	bool				m_bCursesGroup;
 	bool				m_bCrcCheck;
 	bool				m_bDirectWrite;
-	int					m_iWriteBuffer;
+	int					m_iWriteBufferSize;
 	int					m_iNzbDirInterval;
 	int					m_iNzbDirFileAge;
 	bool				m_bParCleanupQueue;
@@ -331,13 +317,9 @@ private:
 	char*				m_szSevenZipCmd;
 	bool				m_bUnpackPauseQueue;
 	char*				m_szExtCleanupDisk;
-	char*				m_szParIgnoreExt;
 	int					m_iFeedHistory;
 	bool				m_bUrlForce;
 	int					m_iTimeCorrection;
-	int					m_iPropagationDelay;
-	int					m_iArticleCache;
-	int					m_iEventInterval;
 
 	// Parsed command-line parameters
 	bool				m_bServerMode;
@@ -365,13 +347,12 @@ private:
 
 	// Current state
 	bool				m_bPauseDownload;
+	bool				m_bPauseDownload2;
 	bool				m_bPausePostProcess;
 	bool				m_bPauseScan;
-	bool				m_bTempPauseDownload;
 	int					m_iDownloadRate;
 	EClientOperation	m_eClientOperation;
 	time_t				m_tResumeTime;
-	int					m_iLocalTimeOffset;
 
 	void				InitDefault();
 	void				InitOptFile();
@@ -382,8 +363,6 @@ private:
 	void				InitCategories();
 	void				InitScheduler();
 	void				InitFeeds();
-	void				InitScripts();
-	void				InitConfigTemplates();
 	void				CheckOptions();
 	void				PrintUsage(char* com);
 	void				Dump();
@@ -395,22 +374,20 @@ private:
 	void				SetOption(const char* optname, const char* value);
 	bool				SetOptionString(const char* option);
 	bool				SplitOptionString(const char* option, char** pOptName, char** pOptValue);
-	bool				ValidateOptionName(const char* optname, const char* optvalue);
+	bool				ValidateOptionName(const char* optname);
 	void				LoadConfigFile();
-	void				CheckDir(char** dir, const char* szOptionName, const char* szParentDir,
-							bool bAllowEmpty, bool bCreate);
+	void				CheckDir(char** dir, const char* szOptionName, bool bAllowEmpty, bool bCreate);
 	void				ParseFileIDList(int argc, char* argv[], int optind);
 	void				ParseFileNameList(int argc, char* argv[], int optind);
-	bool				ParseTime(const char* szTime, int* pHours, int* pMinutes);
+	bool				ParseTime(const char** pTime, int* pHours, int* pMinutes);
 	bool				ParseWeekDays(const char* szWeekDays, int* pWeekDaysBits);
 	void				ConfigError(const char* msg, ...);
 	void				ConfigWarn(const char* msg, ...);
 	void				LocateOptionSrcPos(const char *szOptionName);
 	void				ConvertOldOption(char *szOption, int iOptionBufLen, char *szValue, int iValueBufLen);
 	static bool			CompareScripts(Script* pScript1, Script* pScript2);
-	void				LoadScriptDir(Scripts* pScripts, const char* szDirectory, bool bIsSubDir);
-	void				BuildScriptDisplayNames(Scripts* pScripts);
-	void				LoadScripts(Scripts* pScripts);
+	void				LoadScriptDir(ScriptList* pScriptList, const char* szDirectory, bool bIsSubDir);
+	void				BuildScriptDisplayNames(ScriptList* pScriptList);
 
 public:
 						Options(int argc, char* argv[]);
@@ -419,8 +396,7 @@ public:
 	bool				LoadConfig(OptEntries* pOptEntries);
 	bool				SaveConfig(OptEntries* pOptEntries);
 	bool				LoadConfigTemplates(ConfigTemplates* pConfigTemplates);
-	Scripts*			GetScripts() { return &m_Scripts; }
-	ConfigTemplates*	GetConfigTemplates() { return &m_ConfigTemplates; }
+	void				LoadScriptList(ScriptList* pScriptList);
 
 	// Options
 	OptEntries*			LockOptEntries();
@@ -435,13 +411,13 @@ public:
 	const char*			GetConfigTemplate() { return m_szConfigTemplate; }
 	const char*			GetScriptDir() { return m_szScriptDir; }
 	bool				GetCreateBrokenLog() const { return m_bCreateBrokenLog; }
+	bool				GetResetLog() const { return m_bResetLog; }
 	EMessageTarget		GetInfoTarget() const { return m_eInfoTarget; }
 	EMessageTarget		GetWarningTarget() const { return m_eWarningTarget; }
 	EMessageTarget		GetErrorTarget() const { return m_eErrorTarget; }
 	EMessageTarget		GetDebugTarget() const { return m_eDebugTarget; }
 	EMessageTarget		GetDetailTarget() const { return m_eDetailTarget; }
-	int					GetArticleTimeout() { return m_iArticleTimeout; }
-	int					GetUrlTimeout() { return m_iUrlTimeout; }
+	int					GetConnectionTimeout() { return m_iConnectionTimeout; }
 	int					GetTerminateTimeout() { return m_iTerminateTimeout; }
 	bool				GetDecode() { return m_bDecode; };
 	bool				GetAppendCategoryDir() { return m_bAppendCategoryDir; }
@@ -450,7 +426,7 @@ public:
 	int					GetRetryInterval() { return m_iRetryInterval; }
 	bool				GetSaveQueue() { return m_bSaveQueue; }
 	bool				GetDupeCheck() { return m_bDupeCheck; }
-	const char*			GetControlIP();
+	const char*			GetControlIP() { return m_szControlIP; }
 	const char*			GetControlUsername() { return m_szControlUsername; }
 	const char*			GetControlPassword() { return m_szControlPassword; }
 	int					GetControlPort() { return m_iControlPort; }
@@ -463,23 +439,21 @@ public:
 	const char*			GetDaemonUsername() { return m_szDaemonUsername; }
 	EOutputMode			GetOutputMode() { return m_eOutputMode; }
 	bool				GetReloadQueue() { return m_bReloadQueue; }
+	bool				GetReloadUrlQueue() { return m_bReloadUrlQueue; }
+	bool				GetReloadPostQueue() { return m_bReloadPostQueue; }
 	int					GetUrlConnections() { return m_iUrlConnections; }
 	int					GetLogBufferSize() { return m_iLogBufferSize; }
-	EWriteLog			GetWriteLog() { return m_eWriteLog; }
+	bool				GetCreateLog() { return m_bCreateLog; }
 	const char*			GetLogFile() { return m_szLogFile; }
-	int					GetRotateLog() { return m_iRotateLog; }
 	EParCheck			GetParCheck() { return m_eParCheck; }
 	bool				GetParRepair() { return m_bParRepair; }
 	EParScan			GetParScan() { return m_eParScan; }
-	bool				GetParQuick() { return m_bParQuick; }
 	bool				GetParRename() { return m_bParRename; }
-	int					GetParBuffer() { return m_iParBuffer; }
-	int					GetParThreads() { return m_iParThreads; }
 	EHealthCheck		GetHealthCheck() { return m_eHealthCheck; }
 	const char*			GetScriptOrder() { return m_szScriptOrder; }
-	const char*			GetPostScript() { return m_szPostScript; }
-	const char*			GetScanScript() { return m_szScanScript; }
-	const char*			GetQueueScript() { return m_szQueueScript; }
+	const char*			GetDefScript() { return m_szDefScript; }
+	const char*			GetNZBProcess() { return m_szNZBProcess; }
+	const char*			GetNZBAddedProcess() { return m_szNZBAddedProcess; }
 	int					GetUMask() { return m_iUMask; }
 	int					GetUpdateInterval() {return m_iUpdateInterval; }
 	bool				GetCursesNZBName() { return m_bCursesNZBName; }
@@ -487,7 +461,7 @@ public:
 	bool				GetCursesGroup() { return m_bCursesGroup; }
 	bool				GetCrcCheck() { return m_bCrcCheck; }
 	bool				GetDirectWrite() { return m_bDirectWrite; }
-	int					GetWriteBuffer() { return m_iWriteBuffer; }
+	int					GetWriteBufferSize() { return m_iWriteBufferSize; }
 	int					GetNzbDirInterval() { return m_iNzbDirInterval; }
 	int					GetNzbDirFileAge() { return m_iNzbDirFileAge; }
 	bool				GetParCleanupQueue() { return m_bParCleanupQueue; }
@@ -507,13 +481,9 @@ public:
 	const char*			GetSevenZipCmd() { return m_szSevenZipCmd; }
 	bool				GetUnpackPauseQueue() { return m_bUnpackPauseQueue; }
 	const char*			GetExtCleanupDisk() { return m_szExtCleanupDisk; }
-	const char*			GetParIgnoreExt() { return m_szParIgnoreExt; }
 	int					GetFeedHistory() { return m_iFeedHistory; }
 	bool				GetUrlForce() { return m_bUrlForce; }
 	int					GetTimeCorrection() { return m_iTimeCorrection; }
-	int					GetPropagationDelay() { return m_iPropagationDelay; }
-	int					GetArticleCache() { return m_iArticleCache; }
-	int					GetEventInterval() { return m_iEventInterval; }
 
 	Category*			FindCategory(const char* szName, bool bSearchAliases) { return m_Categories.FindCategory(szName, bSearchAliases); }
 
@@ -544,18 +514,16 @@ public:
 	// Current state
 	void				SetPauseDownload(bool bPauseDownload) { m_bPauseDownload = bPauseDownload; }
 	bool				GetPauseDownload() const { return m_bPauseDownload; }
+	void				SetPauseDownload2(bool bPauseDownload2) { m_bPauseDownload2 = bPauseDownload2; }
+	bool				GetPauseDownload2() const { return m_bPauseDownload2; }
 	void				SetPausePostProcess(bool bPausePostProcess) { m_bPausePostProcess = bPausePostProcess; }
 	bool				GetPausePostProcess() const { return m_bPausePostProcess; }
 	void				SetPauseScan(bool bPauseScan) { m_bPauseScan = bPauseScan; }
 	bool				GetPauseScan() const { return m_bPauseScan; }
-	void				SetTempPauseDownload(bool bTempPauseDownload) { m_bTempPauseDownload = bTempPauseDownload; }
-	bool				GetTempPauseDownload() const { return m_bTempPauseDownload; }
 	void				SetDownloadRate(int iRate) { m_iDownloadRate = iRate; }
 	int					GetDownloadRate() const { return m_iDownloadRate; }
 	void				SetResumeTime(time_t tResumeTime) { m_tResumeTime = tResumeTime; }
 	time_t				GetResumeTime() const { return m_tResumeTime; }
-	void				SetLocalTimeOffset(int iLocalTimeOffset) { m_iLocalTimeOffset = iLocalTimeOffset; }
-	int					GetLocalTimeOffset() { return m_iLocalTimeOffset; }
 };
 
 #endif

ParChecker.cpp

@@ -0,0 +1,997 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#ifndef DISABLE_PARCHECK
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <ctype.h>
+#ifdef WIN32
+#include <par2cmdline.h>
+#include <par2repairer.h>
+#else
+#include <unistd.h>
+#include <libpar2/par2cmdline.h>
+#include <libpar2/par2repairer.h>
+#endif
+#include <algorithm>
+
+#include "nzbget.h"
+#include "ParChecker.h"
+#include "ParCoordinator.h"
+#include "Log.h"
+#include "Options.h"
+#include "Util.h"
+
+extern Options* g_pOptions;
+
+const char* Par2CmdLineErrStr[] = { "OK",
+	"data files are damaged and there is enough recovery data available to repair them",
+	"data files are damaged and there is insufficient recovery data available to be able to repair them",
+	"there was something wrong with the command line arguments",
+	"the PAR2 files did not contain sufficient information about the data files to be able to verify them",
+	"repair completed but the data files still appear to be damaged",
+	"an error occured when accessing files",
+	"internal error occurred",
+	"out of memory" };
+
+
+class Repairer : public Par2Repairer
+{
+private:
+    CommandLine	commandLine;
+
+public:
+	Result		PreProcess(const char *szParFilename);
+	Result		Process(bool dorepair);
+
+	friend class ParChecker;
+};
+
+Result Repairer::PreProcess(const char *szParFilename)
+{
+#ifdef HAVE_PAR2_BUGFIXES_V2
+	// Ensure linking against the patched version of libpar2
+	BugfixesPatchVersion2();
+#endif
+
+	if (g_pOptions->GetParScan() == Options::psFull)
+	{
+		char szWildcardParam[1024];
+		strncpy(szWildcardParam, szParFilename, 1024);
+		szWildcardParam[1024-1] = '\0';
+		char* szBasename = Util::BaseFileName(szWildcardParam);
+		if (szBasename != szWildcardParam && strlen(szBasename) > 0)
+		{
+			szBasename[0] = '*';
+			szBasename[1] = '\0';
+		}
+
+		const char* argv[] = { "par2", "r", "-v", "-v", szParFilename, szWildcardParam };
+		if (!commandLine.Parse(6, (char**)argv))
+		{
+			return eInvalidCommandLineArguments;
+		}
+	}
+	else
+	{
+		const char* argv[] = { "par2", "r", "-v", "-v", szParFilename };
+		if (!commandLine.Parse(5, (char**)argv))
+		{
+			return eInvalidCommandLineArguments;
+		}
+	}
+
+	return Par2Repairer::PreProcess(commandLine);
+}
+
+Result Repairer::Process(bool dorepair)
+{
+	return Par2Repairer::Process(commandLine, dorepair);
+}
+
+
+class MissingFilesComparator
+{
+private:
+	const char* m_szBaseParFilename;
+public:
+	MissingFilesComparator(const char* szBaseParFilename) : m_szBaseParFilename(szBaseParFilename) {}
+	bool operator()(CommandLine::ExtraFile* pFirst, CommandLine::ExtraFile* pSecond) const;
+};
+
+
+/*
+ * Files with the same name as in par-file (and a differnt extension) are
+ * placed at the top of the list to be scanned first.
+ */
+bool MissingFilesComparator::operator()(CommandLine::ExtraFile* pFile1, CommandLine::ExtraFile* pFile2) const
+{
+	char name1[1024];
+	strncpy(name1, Util::BaseFileName(pFile1->FileName().c_str()), 1024);
+	name1[1024-1] = '\0';
+	if (char* ext = strrchr(name1, '.')) *ext = '\0'; // trim extension
+
+	char name2[1024];
+	strncpy(name2, Util::BaseFileName(pFile2->FileName().c_str()), 1024);
+	name2[1024-1] = '\0';
+	if (char* ext = strrchr(name2, '.')) *ext = '\0'; // trim extension
+
+	return strcmp(name1, m_szBaseParFilename) == 0 && strcmp(name1, name2) != 0;
+}
+
+
+ParChecker::ParChecker()
+{
+    debug("Creating ParChecker");
+
+	m_eStatus = psFailed;
+	m_szDestDir = NULL;
+	m_szNZBName = NULL;
+	m_szParFilename = NULL;
+	m_szInfoName = NULL;
+	m_szErrMsg = NULL;
+	m_szProgressLabel = (char*)malloc(1024);
+	m_pRepairer = NULL;
+	m_iFileProgress = 0;
+	m_iStageProgress = 0;
+	m_iExtraFiles = 0;
+	m_bVerifyingExtraFiles = false;
+	m_bCancelled = false;
+	m_eStage = ptLoadingPars;
+}
+
+ParChecker::~ParChecker()
+{
+    debug("Destroying ParChecker");
+
+	free(m_szDestDir);
+	free(m_szNZBName);
+	free(m_szInfoName);
+	free(m_szProgressLabel);
+
+	Cleanup();
+}
+
+void ParChecker::Cleanup()
+{
+	delete (Repairer*)m_pRepairer;
+	m_pRepairer = NULL;
+
+	for (FileList::iterator it = m_QueuedParFiles.begin(); it != m_QueuedParFiles.end() ;it++)
+	{
+		free(*it);
+	}
+	m_QueuedParFiles.clear();
+
+	for (FileList::iterator it = m_ProcessedFiles.begin(); it != m_ProcessedFiles.end() ;it++)
+	{
+		free(*it);
+	}
+	m_ProcessedFiles.clear();
+
+	m_sourceFiles.clear();
+
+	free(m_szErrMsg);
+	m_szErrMsg = NULL;
+}
+
+void ParChecker::SetDestDir(const char * szDestDir)
+{
+	free(m_szDestDir);
+	m_szDestDir = strdup(szDestDir);
+}
+
+void ParChecker::SetNZBName(const char * szNZBName)
+{
+	free(m_szNZBName);
+	m_szNZBName = strdup(szNZBName);
+}
+
+void ParChecker::SetInfoName(const char * szInfoName)
+{
+	free(m_szInfoName);
+	m_szInfoName = strdup(szInfoName);
+}
+
+void ParChecker::Run()
+{
+	ParCoordinator::FileList fileList;
+	if (!ParCoordinator::FindMainPars(m_szDestDir, &fileList))
+	{
+		PrintMessage(Message::mkError, "Could not start par-check for %s. Could not find any par-files", m_szNZBName);
+		m_eStatus = psFailed;
+		Completed();
+		return;
+	}
+
+	m_eStatus = psRepairNotNeeded;
+	m_bCancelled = false;
+
+	for (ParCoordinator::FileList::iterator it = fileList.begin(); it != fileList.end(); it++)
+	{
+		char* szParFilename = *it;
+		debug("Found par: %s", szParFilename);
+
+		if (!IsStopped() && !m_bCancelled)
+		{
+			char szFullParFilename[1024];
+			snprintf(szFullParFilename, 1024, "%s%c%s", m_szDestDir, (int)PATH_SEPARATOR, szParFilename);
+			szFullParFilename[1024-1] = '\0';
+
+			char szInfoName[1024];
+			int iBaseLen = 0;
+			ParCoordinator::ParseParFilename(szParFilename, &iBaseLen, NULL);
+			int maxlen = iBaseLen < 1024 ? iBaseLen : 1024 - 1;
+			strncpy(szInfoName, szParFilename, maxlen);
+			szInfoName[maxlen] = '\0';
+			
+			char szParInfoName[1024];
+			snprintf(szParInfoName, 1024, "%s%c%s", m_szNZBName, (int)PATH_SEPARATOR, szInfoName);
+			szParInfoName[1024-1] = '\0';
+
+			SetInfoName(szParInfoName);
+
+			EStatus eStatus = RunParCheck(szFullParFilename);
+
+			// accumulate total status, the worst status has priority
+			if (m_eStatus > eStatus)
+			{
+				m_eStatus = eStatus;
+			}
+
+			if (g_pOptions->GetCreateBrokenLog())
+			{
+				WriteBrokenLog(eStatus);
+			}
+		}
+
+		free(szParFilename);
+	}
+
+	Completed();
+}
+
+ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
+{
+	Cleanup();
+	m_szParFilename = szParFilename;
+	m_eStage = ptLoadingPars;
+	m_iProcessedFiles = 0;
+	m_iExtraFiles = 0;
+	m_bVerifyingExtraFiles = false;
+	EStatus eStatus = psFailed;
+
+	PrintMessage(Message::mkInfo, "Verifying %s", m_szInfoName);
+
+    debug("par: %s", m_szParFilename);
+	
+	snprintf(m_szProgressLabel, 1024, "Verifying %s", m_szInfoName);
+	m_szProgressLabel[1024-1] = '\0';
+	m_iFileProgress = 0;
+	m_iStageProgress = 0;
+	UpdateProgress();
+
+    Result res = (Result)PreProcessPar();
+	if (IsStopped() || res != eSuccess)
+	{
+		Cleanup();
+		return psFailed;
+	}
+	
+	m_eStage = ptVerifyingSources;
+	Repairer* pRepairer = (Repairer*)m_pRepairer;
+	res = pRepairer->Process(false);
+    debug("ParChecker: Process-result=%i", res);
+
+	if (!IsStopped() && pRepairer->missingfilecount > 0 && g_pOptions->GetParScan() == Options::psAuto && AddMissingFiles())
+	{
+		res = pRepairer->Process(false);
+		debug("ParChecker: Process-result=%i", res);
+	}
+
+	if (!IsStopped() && res == eRepairNotPossible && CheckSplittedFragments())
+	{
+		pRepairer->UpdateVerificationResults();
+		res = pRepairer->Process(false);
+		debug("ParChecker: Process-result=%i", res);
+	}
+
+	if (!IsStopped() && res == eRepairNotPossible)
+	{
+		res = (Result)ProcessMorePars();
+	}
+
+	if (IsStopped())
+	{
+		Cleanup();
+		return psFailed;
+	}
+	
+	eStatus = psFailed;
+	
+	if (res == eSuccess)
+	{
+    	PrintMessage(Message::mkInfo, "Repair not needed for %s", m_szInfoName);
+		eStatus = psRepairNotNeeded;
+	}
+	else if (res == eRepairPossible)
+	{
+		eStatus = psRepairPossible;
+		if (g_pOptions->GetParRepair())
+		{
+			PrintMessage(Message::mkInfo, "Repairing %s", m_szInfoName);
+
+			SaveSourceList();
+			snprintf(m_szProgressLabel, 1024, "Repairing %s", m_szInfoName);
+			m_szProgressLabel[1024-1] = '\0';
+			m_iFileProgress = 0;
+			m_iStageProgress = 0;
+			m_iProcessedFiles = 0;
+			m_eStage = ptRepairing;
+			m_iFilesToRepair = pRepairer->damagedfilecount + pRepairer->missingfilecount;
+			UpdateProgress();
+
+			res = pRepairer->Process(true);
+    		debug("ParChecker: Process-result=%i", res);
+			if (res == eSuccess)
+			{
+    			PrintMessage(Message::mkInfo, "Successfully repaired %s", m_szInfoName);
+				eStatus = psRepaired;
+				DeleteLeftovers();
+			}
+		}
+		else
+		{
+    		PrintMessage(Message::mkInfo, "Repair possible for %s", m_szInfoName);
+		}
+	}
+	
+	if (m_bCancelled)
+	{
+		if (m_eStage >= ptRepairing)
+		{
+			PrintMessage(Message::mkWarning, "Repair cancelled for %s", m_szInfoName);
+			m_szErrMsg = strdup("repair cancelled");
+			eStatus = psRepairPossible;
+		}
+		else
+		{
+			PrintMessage(Message::mkWarning, "Par-check cancelled for %s", m_szInfoName);
+			m_szErrMsg = strdup("par-check cancelled");
+			eStatus = psFailed;
+		}
+	}
+	else if (eStatus == psFailed)
+	{
+		if (!m_szErrMsg && (int)res >= 0 && (int)res <= 8)
+		{
+			m_szErrMsg = strdup(Par2CmdLineErrStr[res]);
+		}
+		PrintMessage(Message::mkError, "Repair failed for %s: %s", m_szInfoName, m_szErrMsg ? m_szErrMsg : "");
+	}
+	
+	Cleanup();
+	return eStatus;
+}
+
+int ParChecker::PreProcessPar()
+{
+	Result res = eRepairFailed;
+	while (!IsStopped() && res != eSuccess)
+	{
+		Cleanup();
+
+		Repairer* pRepairer = new Repairer();
+		m_pRepairer = pRepairer;
+		pRepairer->sig_filename.connect(sigc::mem_fun(*this, &ParChecker::signal_filename));
+		pRepairer->sig_progress.connect(sigc::mem_fun(*this, &ParChecker::signal_progress));
+		pRepairer->sig_done.connect(sigc::mem_fun(*this, &ParChecker::signal_done));
+
+		res = pRepairer->PreProcess(m_szParFilename);
+		debug("ParChecker: PreProcess-result=%i", res);
+
+		if (IsStopped())
+		{
+			PrintMessage(Message::mkError, "Could not verify %s: stopping", m_szInfoName);
+			m_szErrMsg = strdup("par-check was stopped");
+			return eRepairFailed;
+		}
+
+		if (res == eInvalidCommandLineArguments)
+		{
+			PrintMessage(Message::mkError, "Could not start par-check for %s. Par-file: %s", m_szInfoName, m_szParFilename);
+			m_szErrMsg = strdup("Command line could not be parsed");
+			return res;
+		}
+
+		if (res != eSuccess)
+		{
+			PrintMessage(Message::mkWarning, "Could not verify %s: par2-file could not be processed", m_szInfoName);
+			PrintMessage(Message::mkInfo, "Requesting more par2-files for %s", m_szInfoName);
+			bool bHasMorePars = LoadMainParBak();
+			if (!bHasMorePars)
+			{
+				PrintMessage(Message::mkWarning, "No more par2-files found");
+				break;
+			}
+		}
+	}
+
+	if (res != eSuccess)
+	{
+		PrintMessage(Message::mkError, "Could not verify %s: par2-file could not be processed", m_szInfoName);
+		m_szErrMsg = strdup("par2-file could not be processed");
+		return res;
+	}
+
+	return res;
+}
+
+bool ParChecker::LoadMainParBak()
+{
+	while (!IsStopped())
+	{
+		m_mutexQueuedParFiles.Lock();
+        bool hasMorePars = !m_QueuedParFiles.empty();
+		for (FileList::iterator it = m_QueuedParFiles.begin(); it != m_QueuedParFiles.end() ;it++)
+		{
+			free(*it);
+		}
+		m_QueuedParFiles.clear();
+		m_mutexQueuedParFiles.Unlock();
+
+		if (hasMorePars)
+		{
+			return true;
+		}
+
+		int iBlockFound = 0;
+		bool requested = RequestMorePars(1, &iBlockFound);
+		if (requested)
+		{
+			strncpy(m_szProgressLabel, "Awaiting additional par-files", 1024);
+			m_szProgressLabel[1024-1] = '\0';
+			m_iFileProgress = 0;
+			UpdateProgress();
+		}
+
+		m_mutexQueuedParFiles.Lock();
+		hasMorePars = !m_QueuedParFiles.empty();
+		m_bQueuedParFilesChanged = false;
+		m_mutexQueuedParFiles.Unlock();
+
+		if (!requested && !hasMorePars)
+		{
+			return false;
+		}
+
+		if (!hasMorePars)
+		{
+			// wait until new files are added by "AddParFile" or a change is signaled by "QueueChanged"
+			bool bQueuedParFilesChanged = false;
+			while (!bQueuedParFilesChanged && !IsStopped())
+			{
+				m_mutexQueuedParFiles.Lock();
+				bQueuedParFilesChanged = m_bQueuedParFilesChanged;
+				m_mutexQueuedParFiles.Unlock();
+				usleep(100 * 1000);
+			}
+		}
+	}
+
+	return false;
+}
+
+int ParChecker::ProcessMorePars()
+{
+	Result res = eRepairNotPossible;
+	Repairer* pRepairer = (Repairer*)m_pRepairer;
+
+	bool bMoreFilesLoaded = true;
+	while (!IsStopped() && res == eRepairNotPossible)
+	{
+		int missingblockcount = pRepairer->missingblockcount - pRepairer->recoverypacketmap.size();
+		if (bMoreFilesLoaded)
+		{
+			PrintMessage(Message::mkInfo, "Need more %i par-block(s) for %s", missingblockcount, m_szInfoName);
+		}
+		
+		m_mutexQueuedParFiles.Lock();
+        bool hasMorePars = !m_QueuedParFiles.empty();
+		m_mutexQueuedParFiles.Unlock();
+		
+		if (!hasMorePars)
+		{
+			int iBlockFound = 0;
+			bool requested = RequestMorePars(missingblockcount, &iBlockFound);
+			if (requested)
+			{
+				strncpy(m_szProgressLabel, "Awaiting additional par-files", 1024);
+				m_szProgressLabel[1024-1] = '\0';
+				m_iFileProgress = 0;
+				UpdateProgress();
+			}
+			
+			m_mutexQueuedParFiles.Lock();
+			hasMorePars = !m_QueuedParFiles.empty();
+			m_bQueuedParFilesChanged = false;
+			m_mutexQueuedParFiles.Unlock();
+			
+			if (!requested && !hasMorePars)
+			{
+				m_szErrMsg = (char*)malloc(1024);
+				snprintf(m_szErrMsg, 1024, "not enough par-blocks, %i block(s) needed, but %i block(s) available", missingblockcount, iBlockFound);
+                m_szErrMsg[1024-1] = '\0';
+				break;
+			}
+			
+			if (!hasMorePars)
+			{
+				// wait until new files are added by "AddParFile" or a change is signaled by "QueueChanged"
+				bool bQueuedParFilesChanged = false;
+				while (!bQueuedParFilesChanged && !IsStopped())
+				{
+					m_mutexQueuedParFiles.Lock();
+					bQueuedParFilesChanged = m_bQueuedParFilesChanged;
+					m_mutexQueuedParFiles.Unlock();
+					usleep(100 * 1000);
+				}
+			}
+		}
+
+		if (IsStopped())
+		{
+			break;
+		}
+
+		bMoreFilesLoaded = LoadMorePars();
+		if (bMoreFilesLoaded)
+		{
+			pRepairer->UpdateVerificationResults();
+			res = pRepairer->Process(false);
+			debug("ParChecker: Process-result=%i", res);
+		}
+	}
+
+	return res;
+}
+
+bool ParChecker::LoadMorePars()
+{
+	m_mutexQueuedParFiles.Lock();
+	FileList moreFiles;
+	moreFiles.assign(m_QueuedParFiles.begin(), m_QueuedParFiles.end());
+	m_QueuedParFiles.clear();
+	m_mutexQueuedParFiles.Unlock();
+	
+	for (FileList::iterator it = moreFiles.begin(); it != moreFiles.end() ;it++)
+	{
+		char* szParFilename = *it;
+		bool loadedOK = ((Repairer*)m_pRepairer)->LoadPacketsFromFile(szParFilename);
+		if (loadedOK)
+		{
+			PrintMessage(Message::mkInfo, "File %s successfully loaded for par-check", Util::BaseFileName(szParFilename), m_szInfoName);
+		}
+		else
+		{
+			PrintMessage(Message::mkInfo, "Could not load file %s for par-check", Util::BaseFileName(szParFilename), m_szInfoName);
+		}
+		free(szParFilename);
+	}
+
+	return !moreFiles.empty();
+}
+
+void ParChecker::AddParFile(const char * szParFilename)
+{
+	m_mutexQueuedParFiles.Lock();
+	m_QueuedParFiles.push_back(strdup(szParFilename));
+	m_bQueuedParFilesChanged = true;
+	m_mutexQueuedParFiles.Unlock();
+}
+
+void ParChecker::QueueChanged()
+{
+	m_mutexQueuedParFiles.Lock();
+	m_bQueuedParFilesChanged = true;
+	m_mutexQueuedParFiles.Unlock();
+}
+
+bool ParChecker::CheckSplittedFragments()
+{
+	bool bFragmentsAdded = false;
+
+	for (std::vector<Par2RepairerSourceFile*>::iterator it = ((Repairer*)m_pRepairer)->sourcefiles.begin();
+		it != ((Repairer*)m_pRepairer)->sourcefiles.end(); it++)
+	{
+		Par2RepairerSourceFile *sourcefile = *it;
+		if (AddSplittedFragments(sourcefile->TargetFileName().c_str()))
+		{
+			bFragmentsAdded = true;
+		}
+	}
+
+	return bFragmentsAdded;
+}
+
+bool ParChecker::AddSplittedFragments(const char* szFilename)
+{
+	char szDirectory[1024];
+	strncpy(szDirectory, szFilename, 1024);
+	szDirectory[1024-1] = '\0';
+
+	char* szBasename = Util::BaseFileName(szDirectory);
+	if (szBasename == szDirectory)
+	{
+		return false;
+	}
+	szBasename[-1] = '\0';
+	int iBaseLen = strlen(szBasename);
+
+	std::list<CommandLine::ExtraFile> extrafiles;
+
+	DirBrowser dir(szDirectory);
+	while (const char* filename = dir.Next())
+	{
+		if (!strncasecmp(filename, szBasename, iBaseLen))
+		{
+			const char* p = filename + iBaseLen;
+			if (*p == '.')
+			{
+				for (p++; *p && strchr("0123456789", *p); p++) ;
+				if (!*p)
+				{
+					debug("Found splitted fragment %s", filename);
+
+					char fullfilename[1024];
+					snprintf(fullfilename, 1024, "%s%c%s", szDirectory, PATH_SEPARATOR, filename);
+					fullfilename[1024-1] = '\0';
+
+					CommandLine::ExtraFile extrafile(fullfilename, Util::FileSize(fullfilename));
+					extrafiles.push_back(extrafile);
+				}
+			}
+		}
+	}
+
+	bool bFragmentsAdded = false;
+
+	if (!extrafiles.empty())
+	{
+		m_iExtraFiles += extrafiles.size();
+		m_bVerifyingExtraFiles = true;
+		bFragmentsAdded = ((Repairer*)m_pRepairer)->VerifyExtraFiles(extrafiles);
+		m_bVerifyingExtraFiles = false;
+	}
+
+	return bFragmentsAdded;
+}
+
+bool ParChecker::AddMissingFiles()
+{
+    PrintMessage(Message::mkInfo, "Performing extra par-scan for %s", m_szInfoName);
+
+	char szDirectory[1024];
+	strncpy(szDirectory, m_szParFilename, 1024);
+	szDirectory[1024-1] = '\0';
+
+	char* szBasename = Util::BaseFileName(szDirectory);
+	if (szBasename == szDirectory)
+	{
+		return false;
+	}
+	szBasename[-1] = '\0';
+
+	std::list<CommandLine::ExtraFile*> extrafiles;
+
+	DirBrowser dir(szDirectory);
+	while (const char* filename = dir.Next())
+	{
+		if (strcmp(filename, ".") && strcmp(filename, "..") && strcmp(filename, "_brokenlog.txt"))
+		{
+			bool bAlreadyScanned = false;
+			for (FileList::iterator it = m_ProcessedFiles.begin(); it != m_ProcessedFiles.end(); it++)
+			{
+				const char* szProcessedFilename = *it;
+				if (!strcasecmp(Util::BaseFileName(szProcessedFilename), filename))
+				{
+					bAlreadyScanned = true;
+					break;
+				}
+			}
+
+			if (!bAlreadyScanned)
+			{
+				char fullfilename[1024];
+				snprintf(fullfilename, 1024, "%s%c%s", szDirectory, PATH_SEPARATOR, filename);
+				fullfilename[1024-1] = '\0';
+
+				extrafiles.push_back(new CommandLine::ExtraFile(fullfilename, Util::FileSize(fullfilename)));
+			}
+		}
+	}
+
+	// Sort the list
+	char* szBaseParFilename = strdup(Util::BaseFileName(m_szParFilename));
+	if (char* ext = strrchr(szBaseParFilename, '.')) *ext = '\0'; // trim extension
+	extrafiles.sort(MissingFilesComparator(szBaseParFilename));
+	free(szBaseParFilename);
+
+	// Scan files
+	bool bFilesAdded = false;
+	if (!extrafiles.empty())
+	{
+		m_iExtraFiles += extrafiles.size();
+		m_bVerifyingExtraFiles = true;
+
+		std::list<CommandLine::ExtraFile> extrafiles1;
+
+		// adding files one by one until all missing files are found
+
+		while (!IsStopped() && !m_bCancelled && extrafiles.size() > 0 && ((Repairer*)m_pRepairer)->missingfilecount > 0)
+		{
+			CommandLine::ExtraFile* pExtraFile = extrafiles.front();
+			extrafiles.pop_front();
+
+			extrafiles1.clear();
+			extrafiles1.push_back(*pExtraFile);
+
+			bFilesAdded = ((Repairer*)m_pRepairer)->VerifyExtraFiles(extrafiles1) || bFilesAdded;
+			((Repairer*)m_pRepairer)->UpdateVerificationResults();
+
+			delete pExtraFile;
+		}
+
+		m_bVerifyingExtraFiles = false;
+
+		// free any remaining objects
+		for (std::list<CommandLine::ExtraFile*>::iterator it = extrafiles.begin(); it != extrafiles.end() ;it++)
+		{
+			delete *it;
+		}
+	}
+
+	return bFilesAdded;
+}
+
+void ParChecker::signal_filename(std::string str)
+{
+    const char* szStageMessage[] = { "Loading file", "Verifying file", "Repairing file", "Verifying repaired file" };
+
+	if (m_eStage == ptRepairing)
+	{
+		m_eStage = ptVerifyingRepaired;
+	}
+
+	PrintMessage(Message::mkInfo, "%s %s", szStageMessage[m_eStage], str.c_str());
+
+	if (m_eStage == ptLoadingPars || m_eStage == ptVerifyingSources)
+	{
+		m_ProcessedFiles.push_back(strdup(str.c_str()));
+	}
+
+	snprintf(m_szProgressLabel, 1024, "%s %s", szStageMessage[m_eStage], str.c_str());
+	m_szProgressLabel[1024-1] = '\0';
+	m_iFileProgress = 0;
+	UpdateProgress();
+}
+
+void ParChecker::signal_progress(double progress)
+{
+	m_iFileProgress = (int)progress;
+
+	if (m_eStage == ptRepairing)
+	{
+		// calculating repair-data for all files
+		m_iStageProgress = m_iFileProgress;
+	}
+	else
+	{
+		// processing individual files
+
+		int iTotalFiles = 0;
+		if (m_eStage == ptVerifyingRepaired)
+		{
+			// repairing individual files
+			iTotalFiles = m_iFilesToRepair;
+		}
+		else
+		{
+			// verifying individual files
+			iTotalFiles = ((Repairer*)m_pRepairer)->sourcefiles.size() + m_iExtraFiles;
+		}
+
+		if (iTotalFiles > 0)
+		{
+			if (m_iFileProgress < 1000)
+			{
+				m_iStageProgress = (m_iProcessedFiles * 1000 + m_iFileProgress) / iTotalFiles;
+			}
+			else
+			{
+				m_iStageProgress = m_iProcessedFiles * 1000 / iTotalFiles;
+			}
+		}
+		else
+		{
+			m_iStageProgress = 0;
+		}
+	}
+
+	debug("Current-progres: %i, Total-progress: %i", m_iFileProgress, m_iStageProgress);
+
+	UpdateProgress();
+}
+
+void ParChecker::signal_done(std::string str, int available, int total)
+{
+	m_iProcessedFiles++;
+
+	if (m_eStage == ptVerifyingSources)
+	{
+		if (available < total && !m_bVerifyingExtraFiles)
+		{
+			bool bFileExists = true;
+
+			for (std::vector<Par2RepairerSourceFile*>::iterator it = ((Repairer*)m_pRepairer)->sourcefiles.begin();
+				it != ((Repairer*)m_pRepairer)->sourcefiles.end(); it++)
+			{
+				Par2RepairerSourceFile *sourcefile = *it;
+				if (sourcefile && !strcmp(str.c_str(), Util::BaseFileName(sourcefile->TargetFileName().c_str())) &&
+					!sourcefile->GetTargetExists())
+				{
+					bFileExists = false;
+					break;
+				}
+			}
+
+			if (bFileExists)
+			{
+				PrintMessage(Message::mkWarning, "File %s has %i bad block(s) of total %i block(s)", str.c_str(), total - available, total);
+			}
+			else
+			{
+				PrintMessage(Message::mkWarning, "File %s with %i block(s) is missing", str.c_str(), total);
+			}
+		}
+	}
+}
+
+void ParChecker::Cancel()
+{
+#ifdef HAVE_PAR2_CANCEL
+	((Repairer*)m_pRepairer)->cancelled = true;
+	m_bCancelled = true;
+#else
+	PrintMessage(Message::mkError, "Could not cancel par-repair. The program was compiled using version of libpar2 which doesn't support cancelling of par-repair. Please apply libpar2-patches supplied with NZBGet and recompile libpar2 and NZBGet (see README for details).");
+#endif
+}
+
+void ParChecker::WriteBrokenLog(EStatus eStatus)
+{
+	char szBrokenLogName[1024];
+	snprintf(szBrokenLogName, 1024, "%s%c_brokenlog.txt", m_szDestDir, (int)PATH_SEPARATOR);
+	szBrokenLogName[1024-1] = '\0';
+	
+	if (eStatus != psRepairNotNeeded || Util::FileExists(szBrokenLogName))
+	{
+		FILE* file = fopen(szBrokenLogName, "ab");
+		if (file)
+		{
+			if (eStatus == psFailed)
+			{
+				if (m_bCancelled)
+				{
+					fprintf(file, "Repair cancelled for %s\n", m_szInfoName);
+				}
+				else
+				{
+					fprintf(file, "Repair failed for %s: %s\n", m_szInfoName, m_szErrMsg ? m_szErrMsg : "");
+				}
+			}
+			else if (eStatus == psRepairPossible)
+			{
+				fprintf(file, "Repair possible for %s\n", m_szInfoName);
+			}
+			else if (eStatus == psRepaired)
+			{
+				fprintf(file, "Successfully repaired %s\n", m_szInfoName);
+			}
+			else if (eStatus == psRepairNotNeeded)
+			{
+				fprintf(file, "Repair not needed for %s\n", m_szInfoName);
+			}
+			fclose(file);
+		}
+		else
+		{
+			PrintMessage(Message::mkError, "Could not open file %s", szBrokenLogName);
+		}
+	}
+}
+
+void ParChecker::SaveSourceList()
+{
+	// Buliding a list of DiskFile-objects, marked as source-files
+	
+	for (std::vector<Par2RepairerSourceFile*>::iterator it = ((Repairer*)m_pRepairer)->sourcefiles.begin();
+		it != ((Repairer*)m_pRepairer)->sourcefiles.end(); it++)
+	{
+		Par2RepairerSourceFile* sourcefile = (Par2RepairerSourceFile*)*it;
+		vector<DataBlock>::iterator it2 = sourcefile->SourceBlocks();
+		for (int i = 0; i < (int)sourcefile->BlockCount(); i++, it2++)
+		{
+			DataBlock block = *it2;
+			DiskFile* pSourceFile = block.GetDiskFile();
+			if (pSourceFile &&
+				std::find(m_sourceFiles.begin(), m_sourceFiles.end(), pSourceFile) == m_sourceFiles.end())
+			{
+				m_sourceFiles.push_back(pSourceFile);
+			}
+		}
+	}
+}
+
+void ParChecker::DeleteLeftovers()
+{
+	// After repairing check if all DiskFile-objects saved by "SaveSourceList()" have
+	// corresponding target-files. If not - the source file was replaced. In this case
+	// the DiskFile-object points to the renamed bak-file, which we can delete.
+	
+	for (SourceList::iterator it = m_sourceFiles.begin(); it != m_sourceFiles.end(); it++)
+	{
+		DiskFile* pSourceFile = (DiskFile*)*it;
+
+		bool bFound = false;
+		for (std::vector<Par2RepairerSourceFile*>::iterator it2 = ((Repairer*)m_pRepairer)->sourcefiles.begin();
+			it2 != ((Repairer*)m_pRepairer)->sourcefiles.end(); it2++)
+		{
+			Par2RepairerSourceFile* sourcefile = *it2;
+			if (sourcefile->GetTargetFile() == pSourceFile)
+			{
+				bFound = true;
+				break;
+			}
+		}
+
+		if (!bFound)
+		{
+			PrintMessage(Message::mkInfo, "Deleting file %s", Util::BaseFileName(pSourceFile->FileName().c_str()));
+			remove(pSourceFile->FileName().c_str());
+		}
+	}
+}
+
+#endif

ParChecker.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@
 #ifndef DISABLE_PARCHECK
 
 #include <deque>
-#include <vector>
 #include <string>
 
 #include "Thread.h"
@@ -54,43 +53,8 @@ public:
 		ptVerifyingRepaired,
 	};
 
-	enum EFileStatus
-	{
-		fsUnknown,
-		fsSuccess,
-		fsPartial,
-		fsFailure
-	};
-
-	class Segment
-	{
-	private:
-		bool				m_bSuccess;
-		long long			m_iOffset;
-		int					m_iSize;
-		unsigned long		m_lCrc;
-
-	public:
-							Segment(bool bSuccess, long long iOffset, int iSize, unsigned long lCrc);
-		bool 				GetSuccess() { return m_bSuccess; }
-		long long			GetOffset() { return m_iOffset; }
-		int 				GetSize() { return m_iSize; }
-		unsigned long		GetCrc() { return m_lCrc; }
-	};
-
-	typedef std::deque<Segment*>	SegmentListBase;
-
-	class SegmentList : public SegmentListBase
-	{
-	public:
-							~SegmentList();
-	};
-
 	typedef std::deque<char*>		FileList;
 	typedef std::deque<void*>		SourceList;
-	typedef std::vector<bool>		ValidBlocks;
-
-	friend class Repairer;
 	
 private:
 	char*				m_szInfoName;
@@ -99,8 +63,7 @@ private:
 	const char*			m_szParFilename;
 	EStatus				m_eStatus;
 	EStage				m_eStage;
-	// declared as void* to prevent the including of libpar2-headers into this header-file
-	void*				m_pRepairer;
+	void*				m_pRepairer;	// declared as void* to prevent the including of libpar2-headers into this header-file
 	char*				m_szErrMsg;
 	FileList			m_QueuedParFiles;
 	Mutex			 	m_mutexQueuedParFiles;
@@ -115,35 +78,22 @@ private:
 	int					m_iStageProgress;
 	bool				m_bCancelled;
 	SourceList			m_sourceFiles;
-	std::string			m_lastFilename;
-	bool				m_bHasDamagedFiles;
-	bool				m_bParQuick;
-	bool				m_bForceRepair;
 
 	void				Cleanup();
-	EStatus				RunParCheckAll();
 	EStatus				RunParCheck(const char* szParFilename);
 	int					PreProcessPar();
 	bool				LoadMainParBak();
 	int					ProcessMorePars();
 	bool				LoadMorePars();
-	bool				AddSplittedFragments();
+	bool				CheckSplittedFragments();
+	bool				AddSplittedFragments(const char* szFilename);
 	bool				AddMissingFiles();
-	bool				IsProcessedFile(const char* szFilename);
 	void				WriteBrokenLog(EStatus eStatus);
 	void				SaveSourceList();
 	void				DeleteLeftovers();
 	void				signal_filename(std::string str);
 	void				signal_progress(double progress);
 	void				signal_done(std::string str, int available, int total);
-	// declared as void* to prevent the including of libpar2-headers into this header-file
-	// DiskFile* pDiskfile, Par2RepairerSourceFile* pSourcefile
-	EFileStatus			VerifyDataFile(void* pDiskfile, void* pSourcefile, int* pAvailableBlocks);
-	bool				VerifySuccessDataFile(void* pDiskfile, void* pSourcefile, unsigned long lDownloadCrc);
-	bool				VerifyPartialDataFile(void* pDiskfile, void* pSourcefile, SegmentList* pSegments, ValidBlocks* pValidBlocks);
-	bool				SmartCalcFileRangeCrc(FILE* pFile, long long lStart, long long lEnd, SegmentList* pSegments,
-							unsigned long* pDownloadCrc);
-	bool				DumbCalcFileRangeCrc(FILE* pFile, long long lStart, long long lEnd, unsigned long* pDownloadCrc);
 
 protected:
 	/**
@@ -155,9 +105,6 @@ protected:
 	virtual void		UpdateProgress() {}
 	virtual void		Completed() {}
 	virtual void		PrintMessage(Message::EKind eKind, const char* szFormat, ...) {}
-	virtual void		RegisterParredFile(const char* szFilename) {}
-	virtual bool		IsParredFile(const char* szFilename) { return false; }
-	virtual EFileStatus	FindFileCrc(const char* szFilename, unsigned long* lCrc, SegmentList* pSegments) { return fsUnknown; }
 	EStage				GetStage() { return m_eStage; }
 	const char*			GetProgressLabel() { return m_szProgressLabel; }
 	int					GetFileProgress() { return m_iFileProgress; }
@@ -172,10 +119,6 @@ public:
 	const char*			GetInfoName() { return m_szInfoName; }
 	void				SetInfoName(const char* szInfoName);
 	void				SetNZBName(const char* szNZBName);
-	void				SetParQuick(bool bParQuick) { m_bParQuick = bParQuick; }
-	bool				GetParQuick() { return m_bParQuick; }
-	void				SetForceRepair(bool bForceRepair) { m_bForceRepair = bForceRepair; }
-	bool				GetForceRepair() { return m_bForceRepair; }
 	EStatus				GetStatus() { return m_eStatus; }
 	void				AddParFile(const char* szParFilename);
 	void				QueueChanged();

ParCoordinator.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -45,10 +45,12 @@
 #include "nzbget.h"
 #include "ParCoordinator.h"
 #include "Options.h"
-#include "DiskState.h"
 #include "Log.h"
 #include "Util.h"
+#include "QueueCoordinator.h"
+#include "DiskState.h"
 
+extern QueueCoordinator* g_pQueueCoordinator;
 extern Options* g_pOptions;
 extern DiskState* g_pDiskState;
 
@@ -75,77 +77,6 @@ void ParCoordinator::PostParChecker::PrintMessage(Message::EKind eKind, const ch
 	m_pOwner->PrintMessage(m_pPostInfo, eKind, "%s", szText);
 }
 
-void ParCoordinator::PostParChecker::RegisterParredFile(const char* szFilename)
-{
-	m_pPostInfo->GetParredFiles()->push_back(strdup(szFilename));
-}
-
-bool ParCoordinator::PostParChecker::IsParredFile(const char* szFilename)
-{
-	for (PostInfo::ParredFiles::iterator it = m_pPostInfo->GetParredFiles()->begin(); it != m_pPostInfo->GetParredFiles()->end(); it++)
-	{
-		const char* szParredFile = *it;
-		if (!strcasecmp(szParredFile, szFilename))
-		{
-			return true;
-		}
-	}
-	return false;
-}
-
-ParChecker::EFileStatus ParCoordinator::PostParChecker::FindFileCrc(const char* szFilename,
-	unsigned long* lCrc, SegmentList* pSegments)
-{
-	CompletedFile* pCompletedFile = NULL;
-
-	for (CompletedFiles::iterator it = m_pPostInfo->GetNZBInfo()->GetCompletedFiles()->begin(); it != m_pPostInfo->GetNZBInfo()->GetCompletedFiles()->end(); it++)
-	{
-		CompletedFile* pCompletedFile2 = *it;
-		if (!strcasecmp(pCompletedFile2->GetFileName(), szFilename))
-		{
-			pCompletedFile = pCompletedFile2;
-			break;
-		}
-	}
-	if (!pCompletedFile)
-	{
-		return ParChecker::fsUnknown;
-	}
-
-	debug("Found completed file: %s, CRC: %.8x, Status: %i", Util::BaseFileName(pCompletedFile->GetFileName()), pCompletedFile->GetCrc(), (int)pCompletedFile->GetStatus());
-
-	*lCrc = pCompletedFile->GetCrc();
-
-	if (pCompletedFile->GetStatus() == CompletedFile::cfPartial && pCompletedFile->GetID() > 0 &&
-		!m_pPostInfo->GetNZBInfo()->GetReprocess())
-	{
-		FileInfo* pTmpFileInfo = new FileInfo(pCompletedFile->GetID());
-
-		if (!g_pDiskState->LoadFileState(pTmpFileInfo, NULL, true))
-		{
-			delete pTmpFileInfo;
-			return ParChecker::fsUnknown;
-		}
-
-		for (FileInfo::Articles::iterator it = pTmpFileInfo->GetArticles()->begin(); it != pTmpFileInfo->GetArticles()->end(); it++)
-		{
-			ArticleInfo* pa = *it;
-			ParChecker::Segment* pSegment = new Segment(pa->GetStatus() == ArticleInfo::aiFinished,
-				pa->GetSegmentOffset(), pa->GetSegmentSize(), pa->GetCrc());
-			pSegments->push_back(pSegment);
-		}
-
-		delete pTmpFileInfo;
-	}
-
-	return pCompletedFile->GetStatus() == CompletedFile::cfSuccess ? ParChecker::fsSuccess :
-		pCompletedFile->GetStatus() == CompletedFile::cfFailure &&
-			!m_pPostInfo->GetNZBInfo()->GetReprocess() ? ParChecker::fsFailure :
-		pCompletedFile->GetStatus() == CompletedFile::cfPartial && pSegments->size() > 0 &&
-			!m_pPostInfo->GetNZBInfo()->GetReprocess()? ParChecker::fsPartial :
-		ParChecker::fsUnknown;
-}
-
 void ParCoordinator::PostParRenamer::UpdateProgress()
 {
 	m_pOwner->UpdateParRenameProgress();
@@ -162,28 +93,6 @@ void ParCoordinator::PostParRenamer::PrintMessage(Message::EKind eKind, const ch
 	
 	m_pOwner->PrintMessage(m_pPostInfo, eKind, "%s", szText);
 }
-
-void ParCoordinator::PostParRenamer::RegisterParredFile(const char* szFilename)
-{
-	m_pPostInfo->GetParredFiles()->push_back(strdup(szFilename));
-}
-
-/**
- *  Update file name in the CompletedFiles-list of NZBInfo
- */
-void ParCoordinator::PostParRenamer::RegisterRenamedFile(const char* szOldFilename, const char* szNewFileName)
-{
-	for (CompletedFiles::iterator it = m_pPostInfo->GetNZBInfo()->GetCompletedFiles()->begin(); it != m_pPostInfo->GetNZBInfo()->GetCompletedFiles()->end(); it++)
-	{
-		CompletedFile* pCompletedFile = *it;
-		if (!strcasecmp(pCompletedFile->GetFileName(), szOldFilename))
-		{
-			pCompletedFile->SetFileName(szNewFileName);
-			break;
-		}
-	}
-}
-
 #endif
 
 ParCoordinator::ParCoordinator()
@@ -230,12 +139,20 @@ void ParCoordinator::Stop()
 void ParCoordinator::PausePars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 {
 	debug("ParCoordinator: Pausing pars");
-
-	pDownloadQueue->EditEntry(pNZBInfo->GetID(), 
-		DownloadQueue::eaGroupPauseExtraPars, 0, NULL);
+	
+	for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+	{
+		FileInfo* pFileInfo = *it;
+		if (pFileInfo->GetNZBInfo() == pNZBInfo)
+		{
+			g_pQueueCoordinator->GetQueueEditor()->LockedEditEntry(pDownloadQueue, pFileInfo->GetID(), false, 
+				QueueEditor::eaGroupPauseExtraPars, 0, NULL);
+			break;
+		}
+	}
 }
 
-bool ParCoordinator::FindMainPars(const char* szPath, ParFileList* pFileList)
+bool ParCoordinator::FindMainPars(const char* szPath, FileList* pFileList)
 {
 	if (pFileList)
 	{
@@ -255,7 +172,7 @@ bool ParCoordinator::FindMainPars(const char* szPath, ParFileList* pFileList)
 
 			// check if the base file already added to list
 			bool exists = false;
-			for (ParFileList::iterator it = pFileList->begin(); it != pFileList->end(); it++)
+			for (FileList::iterator it = pFileList->begin(); it != pFileList->end(); it++)
 			{
 				const char* filename2 = *it;
 				exists = SameParCollection(filename, filename2);
@@ -351,11 +268,7 @@ void ParCoordinator::StartParCheckJob(PostInfo* pPostInfo)
 	m_ParChecker.SetPostInfo(pPostInfo);
 	m_ParChecker.SetDestDir(pPostInfo->GetNZBInfo()->GetDestDir());
 	m_ParChecker.SetNZBName(pPostInfo->GetNZBInfo()->GetName());
-	m_ParChecker.SetParTime(time(NULL));
-	m_ParChecker.SetDownloadSec(pPostInfo->GetNZBInfo()->GetDownloadSec());
-	m_ParChecker.SetParQuick(g_pOptions->GetParQuick() && !pPostInfo->GetForceParFull());
-	m_ParChecker.SetForceRepair(pPostInfo->GetForceRepair());
-	m_ParChecker.PrintMessage(Message::mkInfo, "Checking pars for %s", pPostInfo->GetNZBInfo()->GetName());
+	m_ParChecker.PrintMessage(Message::mkInfo, "Checking pars for %s", pPostInfo->GetInfoName());
 	pPostInfo->SetWorking(true);
 	m_ParChecker.Start();
 }
@@ -379,7 +292,6 @@ void ParCoordinator::StartParRenameJob(PostInfo* pPostInfo)
 	m_ParRenamer.SetPostInfo(pPostInfo);
 	m_ParRenamer.SetDestDir(szDestDir);
 	m_ParRenamer.SetInfoName(pPostInfo->GetNZBInfo()->GetName());
-	m_ParRenamer.SetDetectMissing(pPostInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usNone);
 	m_ParRenamer.PrintMessage(Message::mkInfo, "Checking renamed files for %s", pPostInfo->GetNZBInfo()->GetName());
 	pPostInfo->SetWorking(true);
 	m_ParRenamer.Start();
@@ -389,12 +301,16 @@ bool ParCoordinator::Cancel()
 {
 	if (m_eCurrentJob == jkParCheck)
 	{
+#ifdef HAVE_PAR2_CANCEL
 		if (!m_ParChecker.GetCancelled())
 		{
 			debug("Cancelling par-repair for %s", m_ParChecker.GetInfoName());
 			m_ParChecker.Cancel();
 			return true;
 		}
+#else
+		warn("Cannot cancel par-repair for %s, used version of libpar2 does not support cancelling", m_ParChecker.GetInfoName());
+#endif
 	}
 	else if (m_eCurrentJob == jkParRename)
 	{
@@ -414,13 +330,19 @@ bool ParCoordinator::Cancel()
 bool ParCoordinator::AddPar(FileInfo* pFileInfo, bool bDeleted)
 {
 	bool bSameCollection = m_ParChecker.IsRunning() &&
-		pFileInfo->GetNZBInfo() == m_ParChecker.GetPostInfo()->GetNZBInfo();
+		pFileInfo->GetNZBInfo() == m_ParChecker.GetPostInfo()->GetNZBInfo() &&
+		SameParCollection(pFileInfo->GetFilename(), Util::BaseFileName(m_ParChecker.GetParFilename()));
 	if (bSameCollection && !bDeleted)
 	{
 		char szFullFilename[1024];
 		snprintf(szFullFilename, 1024, "%s%c%s", pFileInfo->GetNZBInfo()->GetDestDir(), (int)PATH_SEPARATOR, pFileInfo->GetFilename());
 		szFullFilename[1024-1] = '\0';
 		m_ParChecker.AddParFile(szFullFilename);
+
+		if (g_pOptions->GetParPauseQueue())
+		{
+			PauseDownload();
+		}
 	}
 	else
 	{
@@ -431,7 +353,7 @@ bool ParCoordinator::AddPar(FileInfo* pFileInfo, bool bDeleted)
 
 void ParCoordinator::ParCheckCompleted()
 {
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
 
 	PostInfo* pPostInfo = m_ParChecker.GetPostInfo();
 
@@ -452,19 +374,15 @@ void ParCoordinator::ParCheckCompleted()
 		pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psFailure);
 	}
 
-	int iWaitTime = pPostInfo->GetNZBInfo()->GetDownloadSec() - m_ParChecker.GetDownloadSec();
-	pPostInfo->SetStartTime(pPostInfo->GetStartTime() + (time_t)iWaitTime);
-	int iParSec = (int)(time(NULL) - m_ParChecker.GetParTime()) - iWaitTime;
-	pPostInfo->GetNZBInfo()->SetParSec(pPostInfo->GetNZBInfo()->GetParSec() + iParSec);
-
-	pPostInfo->GetNZBInfo()->SetParFull(!m_ParChecker.GetParQuick());
-
 	pPostInfo->SetWorking(false);
 	pPostInfo->SetStage(PostInfo::ptQueued);
 
-	pDownloadQueue->Save();
+	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+	{
+		g_pDiskState->SaveDownloadQueue(pDownloadQueue);
+	}
 
-	DownloadQueue::Unlock();
+	g_pQueueCoordinator->UnlockQueue();
 }
 
 /**
@@ -474,7 +392,7 @@ void ParCoordinator::ParCheckCompleted()
 */
 bool ParCoordinator::RequestMorePars(NZBInfo* pNZBInfo, const char* szParFilename, int iBlockNeeded, int* pBlockFound)
 {
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
 	
 	Blocks blocks;
 	blocks.clear();
@@ -548,7 +466,7 @@ bool ParCoordinator::RequestMorePars(NZBInfo* pNZBInfo, const char* szParFilenam
 		}
 	}
 
-	DownloadQueue::Unlock();
+	g_pQueueCoordinator->UnlockQueue();
 
 	if (pBlockFound)
 	{
@@ -563,6 +481,11 @@ bool ParCoordinator::RequestMorePars(NZBInfo* pNZBInfo, const char* szParFilenam
 
 	bool bOK = iBlockNeeded <= 0;
 
+	if (bOK && g_pOptions->GetParPauseQueue())
+	{
+		UnpauseDownload();
+	}
+
 	return bOK;
 }
 
@@ -586,11 +509,12 @@ void ParCoordinator::FindPars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo,
 	szMainBaseFilename[maxlen] = '\0';
 	for (char* p = szMainBaseFilename; *p; p++) *p = tolower(*p); // convert string to lowercase
 
-	for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
+	for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
 	{
 		FileInfo* pFileInfo = *it;
 		int iBlocks = 0;
-		if (ParseParFilename(pFileInfo->GetFilename(), NULL, &iBlocks) &&
+		if (pFileInfo->GetNZBInfo() == pNZBInfo &&
+			ParseParFilename(pFileInfo->GetFilename(), NULL, &iBlocks) &&
 			iBlocks > 0)
 		{
 			bool bUseFile = true;
@@ -652,7 +576,7 @@ void ParCoordinator::FindPars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo,
 
 void ParCoordinator::UpdateParCheckProgress()
 {
-	DownloadQueue::Lock();
+	g_pQueueCoordinator->LockQueue();
 
 	PostInfo* pPostInfo = m_ParChecker.GetPostInfo();
 	if (m_ParChecker.GetFileProgress() == 0)
@@ -665,22 +589,19 @@ void ParCoordinator::UpdateParCheckProgress()
 	PostInfo::EStage eStage = StageKind[m_ParChecker.GetStage()];
 	time_t tCurrent = time(NULL);
 
+	if (!pPostInfo->GetStartTime())
+	{
+		pPostInfo->SetStartTime(tCurrent);
+	}
+
 	if (pPostInfo->GetStage() != eStage)
 	{
 		pPostInfo->SetStage(eStage);
 		pPostInfo->SetStageTime(tCurrent);
-		if (pPostInfo->GetStage() == PostInfo::ptRepairing)
-		{
-			m_ParChecker.SetRepairTime(tCurrent);
-		}
-		else if (pPostInfo->GetStage() == PostInfo::ptVerifyingRepaired)
-		{
-			int iRepairSec = (int)(tCurrent - m_ParChecker.GetRepairTime());
-			pPostInfo->GetNZBInfo()->SetRepairSec(pPostInfo->GetNZBInfo()->GetRepairSec() + iRepairSec);
-		}
 	}
 
 	bool bParCancel = false;
+#ifdef HAVE_PAR2_CANCEL
 	if (!m_ParChecker.GetCancelled())
 	{
 		if ((g_pOptions->GetParTimeLimit() > 0) &&
@@ -699,31 +620,30 @@ void ParCoordinator::UpdateParCheckProgress()
 			}
 		}
 	}
+#endif
 
 	if (bParCancel)
 	{
 		m_ParChecker.Cancel();
 	}
 
-	DownloadQueue::Unlock();
+	g_pQueueCoordinator->UnlockQueue();
 	
 	CheckPauseState(pPostInfo);
 }
 
 void ParCoordinator::CheckPauseState(PostInfo* pPostInfo)
 {
-	if (g_pOptions->GetPausePostProcess() && !pPostInfo->GetNZBInfo()->GetForcePriority())
+	if (g_pOptions->GetPausePostProcess())
 	{
 		time_t tStageTime = pPostInfo->GetStageTime();
 		time_t tStartTime = pPostInfo->GetStartTime();
-		time_t tParTime = m_ParChecker.GetParTime();
-		time_t tRepairTime = m_ParChecker.GetRepairTime();
 		time_t tWaitTime = time(NULL);
 		
 		// wait until Post-processor is unpaused
-		while (g_pOptions->GetPausePostProcess() && !pPostInfo->GetNZBInfo()->GetForcePriority() && !m_bStopped)
+		while (g_pOptions->GetPausePostProcess() && !m_bStopped)
 		{
-			usleep(50 * 1000);
+			usleep(100 * 1000);
 			
 			// update time stamps
 			
@@ -733,59 +653,53 @@ void ParCoordinator::CheckPauseState(PostInfo* pPostInfo)
 			{
 				pPostInfo->SetStageTime(tStageTime + tDelta);
 			}
+			
 			if (tStartTime > 0)
 			{
 				pPostInfo->SetStartTime(tStartTime + tDelta);
 			}
-			if (tParTime > 0)
-			{
-				m_ParChecker.SetParTime(tParTime + tDelta);
-			}
-			if (tRepairTime > 0)
-			{
-				m_ParChecker.SetRepairTime(tRepairTime + tDelta);
-			}
 		}
 	}
 }
 
 void ParCoordinator::ParRenameCompleted()
 {
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
 	
 	PostInfo* pPostInfo = m_ParRenamer.GetPostInfo();
 	pPostInfo->GetNZBInfo()->SetRenameStatus(m_ParRenamer.GetStatus() == ParRenamer::psSuccess ? NZBInfo::rsSuccess : NZBInfo::rsFailure);
-
-	if (m_ParRenamer.HasMissedFiles() && pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped)
-	{
-		PrintMessage(pPostInfo, Message::mkInfo, "Requesting par-check/repair for %s to restore missing files ", m_ParRenamer.GetInfoName());
-		pPostInfo->SetRequestParCheck(true);
-	}
-
 	pPostInfo->SetWorking(false);
 	pPostInfo->SetStage(PostInfo::ptQueued);
 	
-	pDownloadQueue->Save();
-
-	DownloadQueue::Unlock();
+	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+	{
+		g_pDiskState->SaveDownloadQueue(pDownloadQueue);
+	}
+	
+	g_pQueueCoordinator->UnlockQueue();
 }
 
 void ParCoordinator::UpdateParRenameProgress()
 {
-	DownloadQueue::Lock();
+	g_pQueueCoordinator->LockQueue();
 	
 	PostInfo* pPostInfo = m_ParRenamer.GetPostInfo();
 	pPostInfo->SetProgressLabel(m_ParRenamer.GetProgressLabel());
 	pPostInfo->SetStageProgress(m_ParRenamer.GetStageProgress());
 	time_t tCurrent = time(NULL);
 	
+	if (!pPostInfo->GetStartTime())
+	{
+		pPostInfo->SetStartTime(tCurrent);
+	}
+	
 	if (pPostInfo->GetStage() != PostInfo::ptRenaming)
 	{
 		pPostInfo->SetStage(PostInfo::ptRenaming);
 		pPostInfo->SetStageTime(tCurrent);
 	}
 	
-	DownloadQueue::Unlock();
+	g_pQueueCoordinator->UnlockQueue();
 	
 	CheckPauseState(pPostInfo);
 }

ParCoordinator.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -45,26 +45,14 @@ private:
 	private:
 		ParCoordinator*	m_pOwner;
 		PostInfo*		m_pPostInfo;
-		time_t			m_tParTime;
-		time_t			m_tRepairTime;
-		int				m_iDownloadSec;
 	protected:
 		virtual bool	RequestMorePars(int iBlockNeeded, int* pBlockFound);
 		virtual void	UpdateProgress();
 		virtual void	Completed() { m_pOwner->ParCheckCompleted(); }
 		virtual void	PrintMessage(Message::EKind eKind, const char* szFormat, ...);
-		virtual void	RegisterParredFile(const char* szFilename);
-		virtual bool	IsParredFile(const char* szFilename);
-		virtual EFileStatus	FindFileCrc(const char* szFilename, unsigned long* lCrc, SegmentList* pSegments);
 	public:
 		PostInfo*		GetPostInfo() { return m_pPostInfo; }
 		void			SetPostInfo(PostInfo* pPostInfo) { m_pPostInfo = pPostInfo; }
-		time_t			GetParTime() { return m_tParTime; }
-		void			SetParTime(time_t tParTime) { m_tParTime = tParTime; }
-		time_t			GetRepairTime() { return m_tRepairTime; }
-		void			SetRepairTime(time_t tRepairTime) { m_tRepairTime = tRepairTime; }
-		int				GetDownloadSec() { return m_iDownloadSec; }
-		void			SetDownloadSec(int iDownloadSec) { m_iDownloadSec = iDownloadSec; }
 
 		friend class ParCoordinator;
 	};
@@ -78,8 +66,6 @@ private:
 		virtual void	UpdateProgress();
 		virtual void	Completed() { m_pOwner->ParRenameCompleted(); }
 		virtual void	PrintMessage(Message::EKind eKind, const char* szFormat, ...);
-		virtual void	RegisterParredFile(const char* szFilename);
-		virtual void	RegisterRenamedFile(const char* szOldFilename, const char* szNewFileName);
 	public:
 		PostInfo*		GetPostInfo() { return m_pPostInfo; }
 		void			SetPostInfo(PostInfo* pPostInfo) { m_pPostInfo = pPostInfo; }
@@ -108,6 +94,8 @@ private:
 	EJobKind			m_eCurrentJob;
 
 protected:
+	virtual bool		PauseDownload() = 0;
+	virtual bool		UnpauseDownload() = 0;
 	void				UpdateParCheckProgress();
 	void				UpdateParRenameProgress();
 	void				ParCheckCompleted();
@@ -118,12 +106,12 @@ protected:
 #endif
 
 public:
-	typedef std::deque<char*>		ParFileList;
+	typedef std::deque<char*>		FileList;
 
 public:
 						ParCoordinator();
 	virtual				~ParCoordinator();
-	static bool			FindMainPars(const char* szPath, ParFileList* pFileList);
+	static bool			FindMainPars(const char* szPath, FileList* pFileList);
 	static bool			ParseParFilename(const char* szParFilename, int* iBaseNameLen, int* iBlocks);
 	static bool			SameParCollection(const char* szFilename1, const char* szFilename2);
 	void				PausePars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);

ParRenamer.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -37,14 +37,17 @@
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
-#ifndef WIN32
+#ifdef WIN32
+#include <par2cmdline.h>
+#include <par2repairer.h>
+#include <md5.h>
+#else
 #include <unistd.h>
+#include <libpar2/par2cmdline.h>
+#include <libpar2/par2repairer.h>
+#include <libpar2/md5.h>
 #endif
 
-#include "par2cmdline.h"
-#include "par2repairer.h"
-#include "md5.h"
-
 #include "nzbget.h"
 #include "ParRenamer.h"
 #include "ParCoordinator.h"
@@ -64,7 +67,6 @@ ParRenamer::FileHash::FileHash(const char* szFilename, const char* szHash)
 {
 	m_szFilename = strdup(szFilename);
 	m_szHash = strdup(szHash);
-	m_bFileExists = false;
 }
 
 ParRenamer::FileHash::~FileHash()
@@ -75,7 +77,7 @@ ParRenamer::FileHash::~FileHash()
 
 ParRenamer::ParRenamer()
 {
-	debug("Creating ParRenamer");
+    debug("Creating ParRenamer");
 
 	m_eStatus = psFailed;
 	m_szDestDir = NULL;
@@ -83,13 +85,11 @@ ParRenamer::ParRenamer()
 	m_szProgressLabel = (char*)malloc(1024);
 	m_iStageProgress = 0;
 	m_bCancelled = false;
-	m_bHasMissedFiles = false;
-	m_bDetectMissing = false;
 }
 
 ParRenamer::~ParRenamer()
 {
-	debug("Destroying ParRenamer");
+    debug("Destroying ParRenamer");
 
 	free(m_szDestDir);
 	free(m_szInfoName);
@@ -142,7 +142,6 @@ void ParRenamer::Run()
 	m_iFileCount = 0;
 	m_iCurFile = 0;
 	m_iRenamedCount = 0;
-	m_bHasMissedFiles = false;
 	m_eStatus = psFailed;
 
 	snprintf(m_szProgressLabel, 1024, "Checking renamed files for %s", m_szInfoName);
@@ -158,23 +157,9 @@ void ParRenamer::Run()
 		debug("Checking %s", szDestDir);
 		ClearHashList();
 		LoadParFiles(szDestDir);
-
-		if (m_FileHashList.empty())
-		{
-			int iSavedCurFile = m_iCurFile;
-			CheckFiles(szDestDir, true);
-			m_iCurFile = iSavedCurFile; // restore progress indicator
-			LoadParFiles(szDestDir);
-		}
-
-		CheckFiles(szDestDir, false);
-
-		if (m_bDetectMissing)
-		{
-			CheckMissing();
-		}
+		CheckFiles(szDestDir);
 	}
-
+	
 	if (m_bCancelled)
 	{
 		PrintMessage(Message::mkWarning, "Renaming cancelled for %s", m_szInfoName);
@@ -224,10 +209,10 @@ void ParRenamer::BuildDirList(const char* szDestDir)
 
 void ParRenamer::LoadParFiles(const char* szDestDir)
 {
-	ParCoordinator::ParFileList parFileList;
+	ParCoordinator::FileList parFileList;
 	ParCoordinator::FindMainPars(szDestDir, &parFileList);
-
-	for (ParCoordinator::ParFileList::iterator it = parFileList.begin(); it != parFileList.end(); it++)
+	
+	for (ParCoordinator::FileList::iterator it = parFileList.begin(); it != parFileList.end(); it++)
 	{
 		char* szParFilename = *it;
 		
@@ -260,20 +245,14 @@ void ParRenamer::LoadParFile(const char* szParFilename)
 		}
 		
 		Par2RepairerSourceFile* sourceFile = (*it).second;
-		if (!sourceFile || !sourceFile->GetDescriptionPacket())
-		{
-			warn("Damaged par2-file detected: %s", szParFilename);
-			continue;
-		}
 		m_FileHashList.push_back(new FileHash(sourceFile->GetDescriptionPacket()->FileName().c_str(),
 			sourceFile->GetDescriptionPacket()->Hash16k().print().c_str()));
-		RegisterParredFile(sourceFile->GetDescriptionPacket()->FileName().c_str());
 	}
 
 	delete pRepairer;
 }
 
-void ParRenamer::CheckFiles(const char* szDestDir, bool bRenamePars)
+void ParRenamer::CheckFiles(const char* szDestDir)
 {
 	DirBrowser dir(szDestDir);
 	while (const char* filename = dir.Next())
@@ -292,78 +271,30 @@ void ParRenamer::CheckFiles(const char* szDestDir, bool bRenamePars)
 				UpdateProgress();
 				m_iCurFile++;
 				
-				if (bRenamePars)
-				{
-					CheckParFile(szDestDir, szFullFilename);
-				}
-				else
-				{
-					CheckRegularFile(szDestDir, szFullFilename);
-				}
+				CheckFile(szDestDir, szFullFilename);
 			}
 		}
 	}
 }
 
-void ParRenamer::CheckMissing()
-{
-	for (FileHashList::iterator it = m_FileHashList.begin(); it != m_FileHashList.end(); it++)
-	{
-		FileHash* pFileHash = *it;
-		if (!pFileHash->GetFileExists())
-		{
-			if (Util::MatchFileExt(pFileHash->GetFilename(), g_pOptions->GetParIgnoreExt(), ",;") ||
-				Util::MatchFileExt(pFileHash->GetFilename(), g_pOptions->GetExtCleanupDisk(), ",;"))
-			{
-				info("File %s is missing, ignoring", pFileHash->GetFilename());
-			}
-			else
-			{
-				info("File %s is missing", pFileHash->GetFilename());
-				m_bHasMissedFiles = true;
-			}
-		}
-	}
-}
-
-bool ParRenamer::IsSplittedFragment(const char* szFilename, const char* szCorrectName)
-{
-	bool bSplittedFragement = false;
-	const char* szDiskBasename = Util::BaseFileName(szFilename);
-	const char* szExtension = strrchr(szDiskBasename, '.');
-	int iBaseLen = strlen(szCorrectName);
-	if (szExtension && !strncasecmp(szDiskBasename, szCorrectName, iBaseLen))
-	{
-		const char* p = szDiskBasename + iBaseLen;
-		if (*p == '.')
-		{
-			for (p++; *p && strchr("0123456789", *p); p++) ;
-			bSplittedFragement = !*p;
-			bSplittedFragement = bSplittedFragement && atoi(szDiskBasename + iBaseLen + 1) <= 1; // .000 or .001
-		}
-	}
-
-	return bSplittedFragement;
-}
-
-void ParRenamer::CheckRegularFile(const char* szDestDir, const char* szFilename)
+void ParRenamer::CheckFile(const char* szDestDir, const char* szFilename)
 {
 	debug("Computing hash for %s", szFilename);
 
 	const int iBlockSize = 16*1024;
 	
-	FILE* pFile = fopen(szFilename, FOPEN_RB);
-	if (!pFile)
-	{
+    FILE* pFile = fopen(szFilename, "rb");
+    if (!pFile)
+    {
 		PrintMessage(Message::mkError, "Could not open file %s", szFilename);
-		return;
-	}
+        return;
+    }
 
 	// load first 16K of the file into buffer
 	
 	void* pBuffer = malloc(iBlockSize);
 	
-	int iReadBytes = fread(pBuffer, 1, iBlockSize, pFile);
+    int iReadBytes = fread(pBuffer, 1, iBlockSize, pFile);
 	int iError = ferror(pFile);
 	if (iReadBytes != iBlockSize && iError)
 	{
@@ -371,7 +302,7 @@ void ParRenamer::CheckRegularFile(const char* szDestDir, const char* szFilename)
 		return;
 	}
 	
-	fclose(pFile);
+    fclose(pFile);
 	
 	MD5Hash hash16k;
 	MD5Context context;
@@ -388,15 +319,22 @@ void ParRenamer::CheckRegularFile(const char* szDestDir, const char* szFilename)
 		if (!strcmp(pFileHash->GetHash(), hash16k.print().c_str()))
 		{
 			debug("Found correct filename: %s", pFileHash->GetFilename());
-			pFileHash->SetFileExists(true);
-
+			
 			char szDstFilename[1024];
 			snprintf(szDstFilename, 1024, "%s%c%s", szDestDir, PATH_SEPARATOR, pFileHash->GetFilename());
 			szDstFilename[1024-1] = '\0';
-
-			if (!Util::FileExists(szDstFilename) && !IsSplittedFragment(szFilename, pFileHash->GetFilename()))
+			
+			if (!Util::FileExists(szDstFilename))
 			{
-				RenameFile(szFilename, szDstFilename);
+				PrintMessage(Message::mkInfo, "Renaming %s to %s", Util::BaseFileName(szFilename), pFileHash->GetFilename());
+				if (Util::MoveFile(szFilename, szDstFilename))
+				{
+					m_iRenamedCount++;
+				}
+				else
+				{
+					PrintMessage(Message::mkError, "Could not rename %s to %s", szFilename, szDstFilename);
+				}
 			}
 			
 			break;
@@ -404,86 +342,4 @@ void ParRenamer::CheckRegularFile(const char* szDestDir, const char* szFilename)
 	}
 }
 
-/*
-* For files not having par2-extensions: checks if the file is a par2-file and renames
-* it according to its set-id.
-*/
-void ParRenamer::CheckParFile(const char* szDestDir, const char* szFilename)
-{
-	debug("Checking par2-header for %s", szFilename);
-
-	const char* szBasename = Util::BaseFileName(szFilename);
-	const char* szExtension = strrchr(szBasename, '.');
-	if (szExtension && !strcasecmp(szExtension, ".par2"))
-	{
-		// do not process files already having par2-extension
-		return;
-	}
-
-	FILE* pFile = fopen(szFilename, FOPEN_RB);
-	if (!pFile)
-	{
-		PrintMessage(Message::mkError, "Could not open file %s", szFilename);
-		return;
-	}
-
-	// load par2-header
-	PACKET_HEADER header;
-
-	int iReadBytes = fread(&header, 1, sizeof(header), pFile);
-	int iError = ferror(pFile);
-	if (iReadBytes != sizeof(header) && iError)
-	{
-		PrintMessage(Message::mkError, "Could not read file %s", szFilename);
-		return;
-	}
-
-	fclose(pFile);
-
-	// Check the packet header
-	if (packet_magic != header.magic ||          // not par2-file
-		sizeof(PACKET_HEADER) > header.length || // packet length is too small
-		0 != (header.length & 3) ||              // packet length is not a multiple of 4
-		Util::FileSize(szFilename) < (int)header.length)       // packet would extend beyond the end of the file
-	{
-		// not par2-file or damaged header, ignoring the file
-		return;
-	}
-
-	char szSetId[33];
-	strncpy(szSetId, header.setid.print().c_str(), sizeof(szSetId));
-	szSetId[33-1] = '\0';
-	for (char* p = szSetId; *p; p++) *p = tolower(*p); // convert string to lowercase
-
-	debug("Renaming: %s; setid: %s", Util::BaseFileName(szFilename), szSetId);
-
-	char szDestFileName[1024];
-	int iNum = 1;
-	while (iNum == 1 || Util::FileExists(szDestFileName))
-	{
-		snprintf(szDestFileName, 1024, "%s%c%s.vol%03i+01.PAR2", szDestDir, PATH_SEPARATOR, szSetId, iNum);
-		szDestFileName[1024-1] = '\0';
-		iNum++;
-	}
-
-	RenameFile(szFilename, szDestFileName);
-}
-
-void ParRenamer::RenameFile(const char* szSrcFilename, const char* szDestFileName)
-{
-	PrintMessage(Message::mkInfo, "Renaming %s to %s", Util::BaseFileName(szSrcFilename), Util::BaseFileName(szDestFileName));
-	if (!Util::MoveFile(szSrcFilename, szDestFileName))
-	{
-		char szErrBuf[256];
-		PrintMessage(Message::mkError, "Could not rename %s to %s: %s", szSrcFilename, szDestFileName,
-			Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-		return;
-	}
-
-	m_iRenamedCount++;
-
-	// notify about new file name
-	RegisterRenamedFile(Util::BaseFileName(szSrcFilename), Util::BaseFileName(szDestFileName));
-}
-
 #endif

ParRenamer.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -47,18 +47,16 @@ public:
 	private:
 		char*			m_szFilename;
 		char*			m_szHash;
-		bool			m_bFileExists;
 
 	public:
 						FileHash(const char* szFilename, const char* szHash);
 						~FileHash();
 		const char*		GetFilename() { return m_szFilename; }
 		const char*		GetHash() { return m_szHash; }
-		bool			GetFileExists() { return m_bFileExists; }
-		void			SetFileExists(bool bFileExists) { m_bFileExists = bFileExists; }
 	};
 
 	typedef std::deque<FileHash*>		FileHashList;
+
 	typedef std::deque<char*>			DirList;
 	
 private:
@@ -73,8 +71,6 @@ private:
 	int					m_iFileCount;
 	int					m_iCurFile;
 	int					m_iRenamedCount;
-	bool				m_bHasMissedFiles;
-	bool				m_bDetectMissing;
 
 	void				Cleanup();
 	void				ClearHashList();
@@ -82,19 +78,13 @@ private:
 	void				CheckDir(const char* szDestDir);
 	void				LoadParFiles(const char* szDestDir);
 	void				LoadParFile(const char* szParFilename);
-	void				CheckFiles(const char* szDestDir, bool bRenamePars);
-	void				CheckRegularFile(const char* szDestDir, const char* szFilename);
-	void				CheckParFile(const char* szDestDir, const char* szFilename);
-	bool				IsSplittedFragment(const char* szFilename, const char* szCorrectName);
-	void				CheckMissing();
-	void				RenameFile(const char* szSrcFilename, const char* szDestFileName);
+	void				CheckFiles(const char* szDestDir);
+	void				CheckFile(const char* szDestDir, const char* szFilename);
 
 protected:
 	virtual void		UpdateProgress() {}
 	virtual void		Completed() {}
 	virtual void		PrintMessage(Message::EKind eKind, const char* szFormat, ...) {}
-	virtual void		RegisterParredFile(const char* szFilename) {}
-	virtual void		RegisterRenamedFile(const char* szOldFilename, const char* szNewFileName) {}
 	const char*			GetProgressLabel() { return m_szProgressLabel; }
 	int					GetStageProgress() { return m_iStageProgress; }
 
@@ -109,8 +99,6 @@ public:
 	EStatus				GetStatus() { return m_eStatus; }
 	void				Cancel();
 	bool				GetCancelled() { return m_bCancelled; }
-	bool				HasMissedFiles() { return m_bHasMissedFiles; }
-	void				SetDetectMissing(bool bDetectMissing) { m_bDetectMissing = bDetectMissing; }
 };
 
 #endif

PrePostProcessor.h

@@ -0,0 +1,143 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef PREPOSTPROCESSOR_H
+#define PREPOSTPROCESSOR_H
+
+#include <deque>
+
+#include "Thread.h"
+#include "Observer.h"
+#include "DownloadInfo.h"
+#include "ParCoordinator.h"
+#include "DupeCoordinator.h"
+
+class PrePostProcessor : public Thread
+{
+public:
+	// NOTE: changes to this enum must be synced with "eRemoteEditAction" in unit "MessageBase.h"
+	enum EEditAction
+	{
+		eaPostMoveOffset = 51,			// move post to m_iOffset relative to the current position in post-queue
+		eaPostMoveTop,
+		eaPostMoveBottom,
+		eaPostDelete,
+		eaHistoryDelete,
+		eaHistoryFinalDelete,
+		eaHistoryReturn,
+		eaHistoryProcess,
+		eaHistoryRedownload,
+		eaHistorySetParameter,
+		eaHistorySetDupeKey,
+		eaHistorySetDupeScore,
+		eaHistorySetDupeMode,
+		eaHistorySetDupeBackup,
+		eaHistoryMarkBad,
+		eaHistoryMarkGood
+	};
+
+private:
+	class QueueCoordinatorObserver: public Observer
+	{
+	public:
+		PrePostProcessor* m_pOwner;
+		virtual void	Update(Subject* Caller, void* Aspect) { m_pOwner->QueueCoordinatorUpdate(Caller, Aspect); }
+	};
+
+	class PostParCoordinator: public ParCoordinator
+	{
+	private:
+		PrePostProcessor*	m_pOwner;
+	protected:
+		virtual bool		PauseDownload() { return m_pOwner->PauseDownload(); }
+		virtual bool		UnpauseDownload() { return m_pOwner->UnpauseDownload(); }
+		friend class PrePostProcessor;
+	};
+
+	class PostDupeCoordinator: public DupeCoordinator
+	{
+	private:
+		PrePostProcessor*	m_pOwner;
+	protected:
+		virtual void		HistoryRedownload(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo);
+		virtual void		DeleteQueuedFile(const char* szQueuedFile) { m_pOwner->DeleteQueuedFile(szQueuedFile); }
+		friend class PrePostProcessor;
+	};
+
+private:
+	PostParCoordinator	m_ParCoordinator;
+	PostDupeCoordinator	m_DupeCoordinator;
+	QueueCoordinatorObserver	m_QueueCoordinatorObserver;
+	bool				m_bHasMoreJobs;
+	bool				m_bSchedulerPauseChanged;
+	bool				m_bSchedulerPause;
+	bool				m_bPostPause;
+	const char*			m_szPauseReason;
+
+	bool				IsNZBFileCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, 
+							bool bIgnorePausedPars, bool bAllowOnlyOneDeleted);
+	void				CheckPostQueue();
+	void				JobCompleted(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
+	void				StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
+	void				SaveQueue(DownloadQueue* pDownloadQueue);
+	void				SanitisePostQueue(PostQueue* pPostQueue);
+	void				CheckDiskSpace();
+	void				ApplySchedulerState();
+	void				CheckScheduledResume();
+	void				UpdatePauseState(bool bNeedPause, const char* szReason);
+	bool				PauseDownload();
+	bool				UnpauseDownload();
+	void				NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBAdded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBDownloaded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBDeleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bSaveQueue);
+	void				DeleteQueuedFile(const char* szQueuedFile);
+	int					FindGroupID(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	bool				PostQueueMove(IDList* pIDList, EEditAction eAction, int iOffset);
+	bool				PostQueueDelete(IDList* pIDList);
+	bool				HistoryEdit(IDList* pIDList, EEditAction eAction, int iOffset, const char* szText);
+	void				HistoryDelete(DownloadQueue* pDownloadQueue, HistoryList::iterator itHistory, HistoryInfo* pHistoryInfo, bool bFinal);
+	void				HistoryReturn(DownloadQueue* pDownloadQueue, HistoryList::iterator itHistory, HistoryInfo* pHistoryInfo, bool bReprocess);
+	void				HistoryRedownload(DownloadQueue* pDownloadQueue, HistoryList::iterator itHistory, HistoryInfo* pHistoryInfo, bool bRestorePauseState);
+	void				HistorySetParameter(HistoryInfo* pHistoryInfo, const char* szText);
+	void				HistorySetDupeParam(HistoryInfo* pHistoryInfo, EEditAction eAction, const char* szText);
+	void				HistoryTransformToDup(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, int rindex);
+	void				CheckHistory();
+	void				Cleanup();
+	FileInfo*			GetQueueGroup(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				DeletePostThread(PostInfo* pPostInfo);
+
+public:
+						PrePostProcessor();
+	virtual				~PrePostProcessor();
+	virtual void		Run();
+	virtual void		Stop();
+	void				QueueCoordinatorUpdate(Subject* Caller, void* Aspect);
+	bool				HasMoreJobs() { return m_bHasMoreJobs; }
+	bool				QueueEditList(IDList* pIDList, EEditAction eAction, int iOffset, const char* szText);
+};
+
+#endif

QueueCoordinator.h

@@ -0,0 +1,138 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef QUEUECOORDINATOR_H
+#define QUEUECOORDINATOR_H
+
+#include <deque>
+#include <list>
+#include <time.h>
+
+#include "Thread.h"
+#include "NZBFile.h"
+#include "ArticleDownloader.h"
+#include "DownloadInfo.h"
+#include "Observer.h"
+#include "QueueEditor.h"
+#include "NNTPConnection.h"
+                                            
+class QueueCoordinator : public Thread, public Observer, public Subject, public DownloadSpeedMeter, public DownloadQueueHolder
+{
+public:
+	typedef std::list<ArticleDownloader*>	ActiveDownloads;
+
+	enum EAspectAction
+	{
+		eaNZBFileFound,
+		eaNZBFileAdded,
+		eaFileCompleted,
+		eaFileDeleted
+	};
+
+	struct Aspect
+	{
+		EAspectAction eAction;
+		DownloadQueue* pDownloadQueue;
+		NZBInfo* pNZBInfo;
+		FileInfo* pFileInfo;
+	};
+
+private:
+	DownloadQueue			m_DownloadQueue;
+	ActiveDownloads			m_ActiveDownloads;
+	QueueEditor				m_QueueEditor;
+	Mutex			 		m_mutexDownloadQueue;
+	bool					m_bHasMoreJobs;
+	int						m_iDownloadsLimit;
+	int						m_iServerConfigGeneration;
+
+	// statistics
+	static const int		SPEEDMETER_SLOTS = 30;    
+	static const int		SPEEDMETER_SLOTSIZE = 1;  //Split elapsed time into this number of secs.
+    int						m_iSpeedBytes[SPEEDMETER_SLOTS];
+    int                     m_iSpeedTotalBytes;
+    int 					m_iSpeedTime[SPEEDMETER_SLOTS];
+    int                     m_iSpeedStartTime; 
+	time_t					m_tSpeedCorrection;
+#ifdef HAVE_SPINLOCK
+	SpinLock				m_spinlockSpeed;
+#else
+	Mutex					m_mutexSpeed;
+#endif
+
+    int						m_iSpeedBytesIndex;
+	long long				m_iAllBytes;
+	time_t					m_tStartServer;
+	time_t					m_tLastCheck;
+	time_t					m_tStartDownload;
+	time_t					m_tPausedFrom;
+	bool					m_bStandBy;
+	Mutex					m_mutexStat;
+
+	bool					GetNextArticle(FileInfo* &pFileInfo, ArticleInfo* &pArticleInfo);
+	void					StartArticleDownload(FileInfo* pFileInfo, ArticleInfo* pArticleInfo, NNTPConnection* pConnection);
+	void					ArticleCompleted(ArticleDownloader* pArticleDownloader);
+	void					DeleteFileInfo(FileInfo* pFileInfo, bool bCompleted);
+	void					StatFileInfo(FileInfo* pFileInfo, bool bCompleted);
+	void					CheckHealth(FileInfo* pFileInfo);
+	void					ResetHangingDownloads();
+	void					ResetSpeedStat();
+	void					EnterLeaveStandBy(bool bEnter);
+	void					AdjustStartTime();
+	void					AdjustDownloadsLimit();
+
+public:
+							QueueCoordinator();                
+	virtual					~QueueCoordinator();
+	virtual void			Run();
+	virtual void 			Stop();
+	void					Update(Subject* Caller, void* Aspect);
+
+	// statistics
+	long long 				CalcRemainingSize();
+	virtual int				CalcCurrentDownloadSpeed();
+	virtual void			AddSpeedReading(int iBytes);
+	void					CalcStat(int* iUpTimeSec, int* iDnTimeSec, long long* iAllBytes, bool* bStandBy);
+
+	// Editing the queue
+	DownloadQueue*			LockQueue();
+	void					UnlockQueue() ;
+	void					AddNZBFileToQueue(NZBFile* pNZBFile, bool bAddFirst);
+	void					AddFileInfosToFileQueue(NZBFile* pNZBFile, FileQueue* pFileQueue, bool bAddFirst);
+	bool					HasMoreJobs() { return m_bHasMoreJobs; }
+	bool					GetStandBy() { return m_bStandBy; }
+	bool					DeleteQueueEntry(FileInfo* pFileInfo);
+	bool					SetQueueEntryNZBCategory(NZBInfo* pNZBInfo, const char* szCategory);
+	bool					SetQueueEntryNZBName(NZBInfo* pNZBInfo, const char* szName);
+	bool					MergeQueueEntries(NZBInfo* pDestNZBInfo, NZBInfo* pSrcNZBInfo);
+	bool					SplitQueueEntries(FileQueue* pFileList, const char* szName, NZBInfo** pNewNZBInfo);
+	void					DiscardDiskFile(FileInfo* pFileInfo);
+	QueueEditor*			GetQueueEditor() { return &m_QueueEditor; }
+
+	void					LogDebugInfo();
+};
+
+#endif

QueueEditor.h

@@ -0,0 +1,128 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef QUEUEEDITOR_H
+#define QUEUEEDITOR_H
+
+#include <vector>
+
+#include "DownloadInfo.h"
+
+class QueueEditor
+{
+public:
+	// NOTE: changes to this enum must be synced with "eRemoteEditAction" in unit "MessageBase.h"
+	enum EEditAction
+	{
+		eaFileMoveOffset = 1,			// move to m_iOffset relative to the current position in queue
+		eaFileMoveTop,
+		eaFileMoveBottom,
+		eaFilePause,
+		eaFileResume,
+		eaFileDelete,
+		eaFilePauseAllPars,
+		eaFilePauseExtraPars,
+		eaFileSetPriority,
+		eaFileReorder,
+		eaFileSplit,
+		eaGroupMoveOffset,				// move to m_iOffset relative to the current position in queue
+		eaGroupMoveTop,
+		eaGroupMoveBottom,
+		eaGroupPause,
+		eaGroupResume,
+		eaGroupDelete,
+		eaGroupDupeDelete,
+		eaGroupFinalDelete,
+		eaGroupPauseAllPars,
+		eaGroupPauseExtraPars,
+		eaGroupSetPriority,
+		eaGroupSetCategory,
+		eaGroupMerge,
+		eaGroupSetParameter,
+		eaGroupSetName,
+		eaGroupSetDupeKey,
+		eaGroupSetDupeScore,
+		eaGroupSetDupeMode
+	};
+
+	enum EMatchMode
+	{
+		mmID = 1,
+		mmName,
+		mmRegEx
+	};
+
+private:
+	class EditItem
+	{
+	public:
+		int			m_iOffset;
+		FileInfo*	m_pFileInfo;
+
+		EditItem(FileInfo* pFileInfo, int iOffset);
+	};
+
+	typedef std::vector<EditItem*> ItemList;
+	typedef std::vector<FileInfo*> FileList;
+
+private:
+	FileInfo*				FindFileInfo(DownloadQueue* pDownloadQueue, int iID);
+	int						FindFileInfoEntry(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo);
+	bool					InternEditList(DownloadQueue* pDownloadQueue, IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText);
+	void					PrepareList(DownloadQueue* pDownloadQueue, ItemList* pItemList, IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset);
+	bool					BuildIDListFromNameList(DownloadQueue* pDownloadQueue, IDList* pIDList, NameList* pNameList, EMatchMode eMatchMode, EEditAction eAction);
+	bool					EditGroup(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo, EEditAction eAction, int iOffset, const char* szText);
+	void					BuildGroupList(DownloadQueue* pDownloadQueue, FileList* pGroupList);
+	void					AlignAffectedGroups(DownloadQueue* pDownloadQueue, IDList* pIDList, bool bSmartOrder, int iOffset);
+	bool					ItemExists(FileList* pFileList, FileInfo* pFileInfo);
+	void					AlignGroup(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void					PauseParsInGroups(ItemList* pItemList, bool bExtraParsOnly);
+	void					PausePars(FileList* pFileList, bool bExtraParsOnly);
+	void					SetNZBCategory(NZBInfo* pNZBInfo, const char* szCategory);
+	void					SetNZBName(NZBInfo* pNZBInfo, const char* szName);
+	bool					CanCleanupDisk(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	bool					MergeGroups(DownloadQueue* pDownloadQueue, ItemList* pItemList);
+	bool					SplitGroup(DownloadQueue* pDownloadQueue, ItemList* pItemList, const char* szName);
+	void					ReorderFiles(DownloadQueue* pDownloadQueue, ItemList* pItemList);
+	void					SetNZBParameter(NZBInfo* pNZBInfo, const char* szParamString);
+	void					SetNZBDupeParam(NZBInfo* pNZBInfo, EEditAction eAction, const char* szText);
+
+	void					PauseUnpauseEntry(FileInfo* pFileInfo, bool bPause);
+	void					DeleteEntry(FileInfo* pFileInfo);
+	void					MoveEntry(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo, int iOffset);
+	void					SetPriorityEntry(FileInfo* pFileInfo, const char* szPriority);
+
+public:
+							QueueEditor();                
+							~QueueEditor();
+
+	bool					EditEntry(int ID, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText);
+	bool					EditList(IDList* pIDList, NameList* pNameList, EMatchMode eMatchMode, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText);
+
+	bool					LockedEditEntry(DownloadQueue* pDownloadQueue, int ID, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText);
+	bool					LockedEditList(DownloadQueue* pDownloadQueue, IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText);
+};
+
+#endif

README

@@ -4,7 +4,7 @@
 
 This is a short documentation. For more information please
 visit NZBGet home page at 
-  http://nzbget.net
+  http://nzbget.sourceforge.net
 
 Contents          
 --------
@@ -85,11 +85,15 @@ And the following libraries are optional:
    - libcurses   (usually part of commercial systems)
      or (better)
    - libncurses  (http://invisible-island.net/ncurses)
-    
+   
+ - for par-check and -repair (enabled by default):
+   - libpar2     (http://parchive.sourceforge.net)
+   - libsigc++   (http://libsigc.sourceforge.net)
+ 
  - for encrypted connections (TLS/SSL):
-   - OpenSSL     (http://www.openssl.org)
-     or
    - GnuTLS      (http://www.gnu.org/software/gnutls)
+     or
+   - OpenSSL     (http://www.openssl.org)
 
  - for gzip support in web-server and web-client (enabled by default):
    - zlib     (http://www.zlib.net)
@@ -147,13 +151,13 @@ You may run configure with additional arguments:
     if you can not use curses/ncurses.
     
   --disable-parcheck - to make without parcheck-support. Use this option
-    if you have troubles when compiling par2-module.
+    if you can not use libpar2 or libsigc++.
 
-  --with-tlslib=(OpenSSL, GnuTLS) - to select which TLS/SSL library
+  --with-tlslib=(GnuTLS, OpenSSL) - to select which TLS/SSL library
     should be used for encrypted server connections.
       
   --disable-tls - to make without TLS/SSL support. Use this option if
-    you can not neither OpenSSL nor GnuTLS.
+    you can not neither GnuTLS nor OpenSSL.
 
   --disable-gzip - to make without gzip support. Use this option
     if you can not use zlib.
@@ -164,13 +168,37 @@ You may run configure with additional arguments:
 Optional package: par-check
 ---------------------------
 NZBGet can check and repair downloaded files for you. For this purpose
-it uses library par2.
+it uses library par2 (libpar2), which needs sigc++ on its part.
 
-For your convenience the source code of libpar2 is integrated into
-NZBGet’s source tree and is compiled automatically when you make NZBGet.
+The libpar2 and libsigc++ (version 2 or later) must be installed on your
+system. On most linux distributions these libraries are available as packages.
+If you do not have these packages you can compile them yourself. 
+Following configure-parameters may be usefull:
 
-In a case errors occur during this process the inclusion of par2-module
-can be disabled using configure option "--disable-parcheck":
+  --with-libpar2-includes
+  --with-libpar2-libraries
+  --with-libsigc-includes
+  --with-libsigc-libraries
+  
+The library libsigc++ must be installed first, since libpar2 requires it.
+
+If you use nzbget on a very slow computer like NAS-device, it may be good to
+limit the time allowed for par-repair (option "ParTimeLimit" in nzbget 
+configuration file). This feature requires a patched version of libpar2.
+To compile that version download the original source code of libpar2
+(version 0.2) and apply patches "libpar2-0.2-bugfixes.patch" and 
+"libpar2-0.2-cancel.patch", provided with nzbget:
+
+  cd libpar2-0.2
+  cp ~/nzbget/libpar2-0.2-*.patch .
+  patch < libpar2-0.2-bugfixes.patch
+  patch < libpar2-0.2-cancel.patch
+  ./configure
+  make
+  make install
+
+If you are not able to use libpar2 or libsigc++ or do not want them you can
+make nzbget without support for par-check using option "--disable-parcheck":
 
   ./configure --disable-parcheck
 
@@ -178,7 +206,7 @@ Optional package: curses
 -------------------------
 For curses-outputmode you need ncurses or curses on your system.
 If you do not have one of them you can download and compile ncurses yourself.
-Following configure-parameters may be useful:
+Following configure-parameters may be usefull:
 
   --with-libcurses-includes
   --with-libcurses-libraries
@@ -191,14 +219,14 @@ make the program without support for curses using option "--disable-curses":
 Optional package: TLS
 -------------------------
 To enable encrypted server connections (TLS/SSL) you need to build the program
-with TLS/SSL support. NZBGet can use two libraries: OpenSSL or GnuTLS.
+with TLS/SSL support. NZBGet can use two libraries: GnuTLS or OpenSSL.
 Configure-script checks which library is installed and use it. If both are
-available it gives the precedence to OpenSSL. You may override that with
-the option --with-tlslib=(OpenSSL, GnuTLS). For example to build with GnuTLS:
+avialable it gives the precedence to GnuTLS. You may override that with
+the option --with-tlslib=(GnuTLS, OpenSSL). For example to build whith OpenSSL:
 
-  ./configure --with-tlslib= GnuTLS
+  ./configure --with-tlslib=OpenSSL
   
-Following configure-parameters may be useful:
+Following configure-parameters may be usefull:
 
   --with-libtls-includes
   --with-libtls-libraries
@@ -219,14 +247,28 @@ NZBGet is developed using MS Visual C++ 2005. The project file and solution
 are provided. If you use MS Visual C++ 2005 Express you need to download
 and install Platform SDK.
 
-To compile the program with TLS/SSL support you need either OpenSSL or GnuTLS:
-   - OpenSSL  (http://www.openssl.org)
-   or
+To compile the program with par-check-support you also need the following 
+libraries:
+
+   - libsigc++   (http://libsigc.sourceforge.net)
+   - libpar2     (http://parchive.sourceforge.net)
+
+Download these libaries, then use patch-files provided with NZBGet to create
+preconfigured project files and solutions for each library. 
+Look at http://gnuwin32.sourceforge.net/packages/patch.htm for info on how
+to use patch-files, if you do not familiar with this technique.
+
+To compile the program with TLS/SSL support you also need the library:
+
    - GnuTLS   (http://www.gnu.org/software/gnutls)
 
-Also required are:
-   - Regex (http://gnuwin32.sourceforge.net/packages/regex.htm)
-   - Zlib (http://gnuwin32.sourceforge.net/packages/zlib.htm)
+Download a precompiled version of GnuTLS from http://josefsson.org/gnutls4win
+and create lib-file as described there in section "Using the GnuTLS DLL from 
+your Visual Studio program".
+
+After libsigc++ and libpar2 are compiled in static libraries (.lib), the 
+library for GnuTLS is created and include- and libraries-paths are configured 
+in MS Visual C++ 2005 you should be able to compile NZBGet.   
 
 =====================================
 6. Configuration
@@ -345,18 +387,9 @@ It prints something like:
 
   [1] nzbname\filename1.rar (50.00 MB)
   [2] nzbname\filename1.r01 (50.00 MB)
-  [3] another-nzb\filename3.r01 (100.00 MB)
-  [4] another-nzb\filename3.r02 (100.00 MB)
 
-This is the list of individual files listed within nzb-file. To print
-the list of nzb-files (without content) add G-modifier to the list command:
-
-  [1] nzbname (4.56 GB)
-  [2] another-nzb (4.20 GB)
-
-The numbers in square braces are ID's of files or groups in queue.
-They can be used in edit-command. For example to move file with
-ID 2 to the top of queue:
+The numbers in square braces are ID's of files in queue. They can be used
+in edit-command. For example to move file with ID 2 to the top of queue:
 
   nzbget -E T 2
   
@@ -369,8 +402,8 @@ or to delete files from queue:
   nzbget -E D 3 10-15 20-21 16
 
 The edit-command has also a group-mode which affects all files from the
-same nzb-file. You need to pass an ID of the group. For example to delete
-the whole group 1:
+same nzb-request. You need to pass one ID of any file in the group. For
+example to delete all files from the first nzb-request:
 
   nzbget -E G D 1
 
@@ -411,10 +444,10 @@ Post processing scripts
 After the download of nzb-file is completed nzbget can call post-processing
 scripts, defined in configuration file.
 
-Example post-processing scripts are provided in directory "scripts".
+Example post-processing scripts are provided in directory "ppscripts".
 
 To use the scripts copy them into your local directory and set options
-<ScriptDir>, <PostScript> and <ScriptOrder>.
+<ScriptDir>, <DefScript> and <ScriptOrder>.
 
 For information on writing your own post-processing scripts please
 visit NZBGet web site.
@@ -436,14 +469,13 @@ and port defined in NZBGet configuration file in options "ControlIP" and
 
   http://localhost:6789/
 
-For login credentials type username and the password defined by
-options "ControlUsername" (default "nzbget") and "ControlPassword"
-(default "tegbzn6789").
+For login credentials type username "nzbget" (predefined and not changeable)
+and the password from the option "ControlPassword" (default is tegbzn6789).
 
 In a case your browser forget credentials, to prevent typing them each
 time, there is a workaround - use URL in the form:
 
-  http://localhost:6789/username:password/
+  http://localhost:6789/nzbget:password/
 
 Please note, that in this case the password is saved in a bookmark or in
 browser history in plain text and is easy to find by persons having
@@ -462,32 +494,6 @@ Bo Cordes Petersen (placebodk@users.sourceforge.net) until 2005.
 In 2007 the abandoned project was overtaken by Andrey Prygunkov.
 Since then the program has been completely rewritten.
 
-NZBGet distribution archive includes additional components
-written by other authors:
-
-PAR2:
-	Peter Brian Clements <peterbclements@users.sourceforge.net>
-
-PAR2 library API:
-	Francois Lesueur <flesueur@users.sourceforge.net>
-
-jQuery:
-	John Resig <http://jquery.com>
-	The Dojo Foundation <http://sizzlejs.com>
-
-Bootstrap:
-	Twitter, Inc <http://twitter.github.com/bootstrap>
-
-Raphaël:
-	Dmitry Baranovskiy <http://raphaeljs.com>
-	Sencha Labs <http://sencha.com>
-
-Elycharts:
-	Void Labs s.n.c. <http://void.it>
-
-iconSweets:
-	Yummygum <http://yummygum.com>
-
 =====================================
 9. Copyright
 =====================================
@@ -501,13 +507,21 @@ The complete content of license is provided in file COPYING.
 
 Additional exemption: compiling, linking, and/or using OpenSSL is allowed.
 
+Binary distribution for Windows contains code from the following libraries:
+
+   - libpar2     (http://parchive.sourceforge.net)
+   - libsigc++   (http://libsigc.sourceforge.net)
+   - GnuTLS      (http://www.gnu.org/software/gnutls)
+
+libpar2 is distributed under GPL; libsigc++ and GnuTLS - under LGPL.
+
 =====================================
 10. Contact
 =====================================
 
 If you encounter any problem, feel free to use the forum
 
-    nzbget.net/forum
+    nzbget.sourceforge.net/forum
 
 or contact me at
 

RemoteClient.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -101,12 +101,19 @@ void RemoteClient::perror(const char * msg)
 bool RemoteClient::InitConnection()
 {
 	// Create a connection to the server
-	m_pConnection = new Connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
+
+	const char *szControlIP = g_pOptions->GetControlIP();
+	if (!strcmp(szControlIP, "0.0.0.0"))
+	{
+		szControlIP = "127.0.0.1";
+	}
+
+	m_pConnection = new Connection(szControlIP, g_pOptions->GetControlPort(), false);
 
 	bool OK = m_pConnection->Connect();
 	if (!OK)
 	{
-		printf("Unable to send request to nzbget-server at %s (port %i)\n", g_pOptions->GetControlIP(), g_pOptions->GetControlPort());
+		printf("Unable to send request to nzbserver at %s (port %i)\n", szControlIP, g_pOptions->GetControlPort());
 	}
 	return OK;
 }
@@ -229,22 +236,16 @@ void RemoteClient::BuildFileList(SNZBListResponse* pListResponse, const char* pT
 				ntohl(pListAnswer->m_iNameLen) + ntohl(pListAnswer->m_iDestDirLen) + ntohl(pListAnswer->m_iCategoryLen);
 			
 			MatchedNZBInfo* pNZBInfo = new MatchedNZBInfo();
-			pNZBInfo->SetID(ntohl(pListAnswer->m_iID));
-			pNZBInfo->SetKind((NZBInfo::EKind)ntohl(pListAnswer->m_iKind));
 			pNZBInfo->SetSize(Util::JoinInt64(ntohl(pListAnswer->m_iSizeHi), ntohl(pListAnswer->m_iSizeLo)));
-			pNZBInfo->SetRemainingSize(Util::JoinInt64(ntohl(pListAnswer->m_iRemainingSizeHi), ntohl(pListAnswer->m_iRemainingSizeLo)));
-			pNZBInfo->SetPausedSize(Util::JoinInt64(ntohl(pListAnswer->m_iPausedSizeHi), ntohl(pListAnswer->m_iPausedSizeLo)));
-			pNZBInfo->SetPausedFileCount(ntohl(pListAnswer->m_iPausedCount));
-			pNZBInfo->SetRemainingParCount(ntohl(pListAnswer->m_iRemainingParCount));
 			pNZBInfo->SetFilename(szFileName);
 			pNZBInfo->SetName(szName);
 			pNZBInfo->SetDestDir(szDestDir);
 			pNZBInfo->SetCategory(szCategory);
 			pNZBInfo->SetQueuedFilename(m_szQueuedFilename);
-			pNZBInfo->SetPriority(ntohl(pListAnswer->m_iPriority));
 			pNZBInfo->m_bMatch = ntohl(pListAnswer->m_bMatch);
 
-			pDownloadQueue->GetQueue()->push_back(pNZBInfo);
+			pNZBInfo->Retain();
+			pDownloadQueue->GetNZBInfoList()->Add(pNZBInfo);
 
 			pBufPtr += sizeof(SNZBListResponseNZBEntry) + ntohl(pListAnswer->m_iFilenameLen) +
 				ntohl(pListAnswer->m_iNameLen) + ntohl(pListAnswer->m_iDestDirLen) + 
@@ -259,7 +260,7 @@ void RemoteClient::BuildFileList(SNZBListResponse* pListResponse, const char* pT
 			const char* szName = pBufPtr + sizeof(SNZBListResponsePPPEntry);
 			const char* szValue = pBufPtr + sizeof(SNZBListResponsePPPEntry) + ntohl(pListAnswer->m_iNameLen);
 
-			NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->at(ntohl(pListAnswer->m_iNZBIndex) - 1);
+			NZBInfo* pNZBInfo = pDownloadQueue->GetNZBInfoList()->at(ntohl(pListAnswer->m_iNZBIndex) - 1);
 			pNZBInfo->GetParameters()->SetParameter(szName, szValue);
 
 			pBufPtr += sizeof(SNZBListResponsePPPEntry) + ntohl(pListAnswer->m_iNameLen) +
@@ -283,16 +284,21 @@ void RemoteClient::BuildFileList(SNZBListResponse* pListResponse, const char* pT
 			pFileInfo->SetFilename(szFileName);
 			pFileInfo->SetFilenameConfirmed(ntohl(pListAnswer->m_bFilenameConfirmed));
 			pFileInfo->SetActiveDownloads(ntohl(pListAnswer->m_iActiveDownloads));
+			pFileInfo->SetPriority(ntohl(pListAnswer->m_iPriority));
 			pFileInfo->m_bMatch = ntohl(pListAnswer->m_bMatch);
 
-			NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->at(ntohl(pListAnswer->m_iNZBIndex) - 1);
+			NZBInfo* pNZBInfo = pDownloadQueue->GetNZBInfoList()->at(ntohl(pListAnswer->m_iNZBIndex) - 1);
+
 			pFileInfo->SetNZBInfo(pNZBInfo);
-			pNZBInfo->GetFileList()->push_back(pFileInfo);
+
+			pDownloadQueue->GetFileQueue()->push_back(pFileInfo);
 
 			pBufPtr += sizeof(SNZBListResponseFileEntry) + ntohl(pListAnswer->m_iSubjectLen) + 
 				ntohl(pListAnswer->m_iFilenameLen);
 		}
 	}
+
+	pDownloadQueue->GetNZBInfoList()->ReleaseAll();
 }
 
 bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPattern)
@@ -361,61 +367,61 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 			printf("Queue List\n");
 			printf("-----------------------------------\n");
 
-			DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-			BuildFileList(&ListResponse, pBuf, pDownloadQueue);
+			DownloadQueue cRemoteQueue;
+			BuildFileList(&ListResponse, pBuf, &cRemoteQueue);
 
 			long long lRemaining = 0;
 			long long lPaused = 0;
 			int iMatches = 0;
-			int iNrFileEntries = 0;
 
-			for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+			for (FileQueue::iterator it = cRemoteQueue.GetFileQueue()->begin(); it != cRemoteQueue.GetFileQueue()->end(); it++)
 			{
-				NZBInfo* pNZBInfo = *it;
-				for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++)
+				FileInfo* pFileInfo = *it;
+
+				char szPriority[100];
+				szPriority[0] = '\0';
+				if (pFileInfo->GetPriority() != 0)
 				{
-					FileInfo* pFileInfo = *it2;
-
-					iNrFileEntries++;
-
-					char szCompleted[100];
-					szCompleted[0] = '\0';
-					if (pFileInfo->GetRemainingSize() < pFileInfo->GetSize())
-					{
-						sprintf(szCompleted, ", %i%s", (int)(100 - Util::Int64ToFloat(pFileInfo->GetRemainingSize()) * 100.0 / Util::Int64ToFloat(pFileInfo->GetSize())), "%");
-					}
-
-					char szThreads[100];
-					szThreads[0] = '\0';
-					if (pFileInfo->GetActiveDownloads() > 0)
-					{
-						sprintf(szThreads, ", %i thread%s", pFileInfo->GetActiveDownloads(), (pFileInfo->GetActiveDownloads() > 1 ? "s" : ""));
-					}
-
-					char szStatus[100];
-					if (pFileInfo->GetPaused())
-					{
-						sprintf(szStatus, " (paused)");
-						lPaused += pFileInfo->GetRemainingSize();
-					}
-					else
-					{
-						szStatus[0] = '\0';
-						lRemaining += pFileInfo->GetRemainingSize();
-					}
-
-					if (!szPattern || ((MatchedFileInfo*)pFileInfo)->m_bMatch)
-					{
-						printf("[%i] %s/%s (%.2f MB%s%s)%s\n", pFileInfo->GetID(), pFileInfo->GetNZBInfo()->GetName(),
-							pFileInfo->GetFilename(),
-							(float)(Util::Int64ToFloat(pFileInfo->GetSize()) / 1024.0 / 1024.0), 
-							szCompleted, szThreads, szStatus);
-						iMatches++;
-					}
+					sprintf(szPriority, "[%+i] ", pFileInfo->GetPriority());
 				}
-			}
 
-			DownloadQueue::Unlock();
+				char szCompleted[100];
+				szCompleted[0] = '\0';
+				if (pFileInfo->GetRemainingSize() < pFileInfo->GetSize())
+				{
+					sprintf(szCompleted, ", %i%s", (int)(100 - Util::Int64ToFloat(pFileInfo->GetRemainingSize()) * 100.0 / Util::Int64ToFloat(pFileInfo->GetSize())), "%");
+				}
+
+				char szThreads[100];
+				szThreads[0] = '\0';
+				if (pFileInfo->GetActiveDownloads() > 0)
+				{
+					sprintf(szThreads, ", %i thread%s", pFileInfo->GetActiveDownloads(), (pFileInfo->GetActiveDownloads() > 1 ? "s" : ""));
+				}
+
+				char szStatus[100];
+				if (pFileInfo->GetPaused())
+				{
+					sprintf(szStatus, " (paused)");
+					lPaused += pFileInfo->GetRemainingSize();
+				}
+				else
+				{
+					szStatus[0] = '\0';
+					lRemaining += pFileInfo->GetRemainingSize();
+				}
+
+				if (!szPattern || ((MatchedFileInfo*)pFileInfo)->m_bMatch)
+				{
+					printf("[%i] %s%s/%s (%.2f MB%s%s)%s\n", pFileInfo->GetID(), szPriority, pFileInfo->GetNZBInfo()->GetName(),
+						pFileInfo->GetFilename(),
+						(float)(Util::Int64ToFloat(pFileInfo->GetSize()) / 1024.0 / 1024.0), 
+						szCompleted, szThreads, szStatus);
+					iMatches++;
+				}
+
+				delete pFileInfo;
+			}
 
 			if (iMatches == 0)
 			{
@@ -423,7 +429,7 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 			}
 
 			printf("-----------------------------------\n");
-			printf("Files: %i\n", iNrFileEntries);
+			printf("Files: %i\n", cRemoteQueue.GetFileQueue()->size());
 			if (szPattern)
 			{
 				printf("Matches: %i\n", iMatches);
@@ -451,21 +457,21 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 			printf("Queue List\n");
 			printf("-----------------------------------\n");
 
-			DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-			BuildFileList(&ListResponse, pBuf, pDownloadQueue);
+			DownloadQueue cRemoteQueue;
+			BuildFileList(&ListResponse, pBuf, &cRemoteQueue);
+
+			GroupQueue cGroupQueue;
+			cRemoteQueue.BuildGroups(&cGroupQueue);
 
 			long long lRemaining = 0;
 			long long lPaused = 0;
 			int iMatches = 0;
-			int iNrFileEntries = 0;
 
-			for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+			for (GroupQueue::iterator it = cGroupQueue.begin(); it != cGroupQueue.end(); it++)
 			{
-				NZBInfo* pNZBInfo = *it;
+				GroupInfo* pGroupInfo = *it;
 
-				iNrFileEntries += pNZBInfo->GetFileList()->size();
-
-				long long lUnpausedRemainingSize = pNZBInfo->GetRemainingSize() - pNZBInfo->GetPausedSize();
+				long long lUnpausedRemainingSize = pGroupInfo->GetRemainingSize() - pGroupInfo->GetPausedSize();
 				lRemaining += lUnpausedRemainingSize;
 
 				char szRemaining[20];
@@ -473,38 +479,45 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 
 				char szPriority[100];
 				szPriority[0] = '\0';
-				if (pNZBInfo->GetPriority() != 0)
+				if (pGroupInfo->GetMinPriority() != 0 || pGroupInfo->GetMaxPriority() != 0)
 				{
-					sprintf(szPriority, "[%+i] ", pNZBInfo->GetPriority());
+					if (pGroupInfo->GetMinPriority() == pGroupInfo->GetMaxPriority())
+					{
+						sprintf(szPriority, "[%+i] ", pGroupInfo->GetMinPriority());
+					}
+					else
+					{
+						sprintf(szPriority, "[%+i..%+i] ", pGroupInfo->GetMinPriority(), pGroupInfo->GetMaxPriority());
+					}
 				}
 
 				char szPaused[20];
 				szPaused[0] = '\0';
-				if (pNZBInfo->GetPausedSize() > 0)
+				if (pGroupInfo->GetPausedSize() > 0)
 				{
 					char szPausedSize[20];
-					Util::FormatFileSize(szPausedSize, sizeof(szPausedSize), pNZBInfo->GetPausedSize());
+					Util::FormatFileSize(szPausedSize, sizeof(szPausedSize), pGroupInfo->GetPausedSize());
 					sprintf(szPaused, " + %s paused", szPausedSize);
-					lPaused += pNZBInfo->GetPausedSize();
+					lPaused += pGroupInfo->GetPausedSize();
 				}
 
 				char szCategory[1024];
 				szCategory[0] = '\0';
-				if (pNZBInfo->GetCategory() && strlen(pNZBInfo->GetCategory()) > 0)
+				if (pGroupInfo->GetNZBInfo()->GetCategory() && strlen(pGroupInfo->GetNZBInfo()->GetCategory()) > 0)
 				{
-					sprintf(szCategory, " (%s)", pNZBInfo->GetCategory());
+					sprintf(szCategory, " (%s)", pGroupInfo->GetNZBInfo()->GetCategory());
 				}
 
 				char szThreads[100];
 				szThreads[0] = '\0';
-				if (pNZBInfo->GetActiveDownloads() > 0)
+				if (pGroupInfo->GetActiveDownloads() > 0)
 				{
-					sprintf(szThreads, ", %i thread%s", pNZBInfo->GetActiveDownloads(), (pNZBInfo->GetActiveDownloads() > 1 ? "s" : ""));
+					sprintf(szThreads, ", %i thread%s", pGroupInfo->GetActiveDownloads(), (pGroupInfo->GetActiveDownloads() > 1 ? "s" : ""));
 				}
 
 				char szParameters[1024];
 				szParameters[0] = '\0';
-				for (NZBParameterList::iterator it = pNZBInfo->GetParameters()->begin(); it != pNZBInfo->GetParameters()->end(); it++)
+				for (NZBParameterList::iterator it = pGroupInfo->GetNZBInfo()->GetParameters()->begin(); it != pGroupInfo->GetNZBInfo()->GetParameters()->end(); it++)
 				{
 					if (szParameters[0] == '\0')
 					{
@@ -524,39 +537,33 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 					strncat(szParameters, ")", sizeof(szParameters) - strlen(szParameters) - 1);
 				}
 
-				char szUrlOrFile[100];
-				if (pNZBInfo->GetKind() == NZBInfo::nkUrl)
+				if (!szPattern || ((MatchedNZBInfo*)pGroupInfo->GetNZBInfo())->m_bMatch)
 				{
-					strncpy(szUrlOrFile, "URL", sizeof(szUrlOrFile));
-				}
-				else
-				{
-					snprintf(szUrlOrFile, sizeof(szUrlOrFile), "%i file%s", (int)pNZBInfo->GetFileList()->size(),
-						pNZBInfo->GetFileList()->size() > 1 ? "s" : "");
-					szUrlOrFile[100-1] = '\0';
-				}
-
-				if (!szPattern || ((MatchedNZBInfo*)pNZBInfo)->m_bMatch)
-				{
-					printf("[%i] %s%s (%s, %s%s%s)%s%s\n", pNZBInfo->GetID(), szPriority, 
-						pNZBInfo->GetName(), szUrlOrFile, szRemaining, 
+					printf("[%i-%i] %s%s (%i file%s, %s%s%s)%s%s\n", pGroupInfo->GetFirstID(), pGroupInfo->GetLastID(), szPriority, 
+						pGroupInfo->GetNZBInfo()->GetName(), pGroupInfo->GetRemainingFileCount(),
+						pGroupInfo->GetRemainingFileCount() > 1 ? "s" : "", szRemaining, 
 						szPaused, szThreads, szCategory, szParameters);
 					iMatches++;
 				}
 			}
 
+			for (FileQueue::iterator it = cRemoteQueue.GetFileQueue()->begin(); it != cRemoteQueue.GetFileQueue()->end(); it++)
+			{
+				delete *it;
+			}
+
 			if (iMatches == 0)
 			{
 				printf("No matches founds\n");
 			}
 
 			printf("-----------------------------------\n");
-			printf("Groups: %i\n", pDownloadQueue->GetQueue()->size());
+			printf("Groups: %i\n", cGroupQueue.size());
 			if (szPattern)
 			{
 				printf("Matches: %i\n", iMatches);
 			}
-			printf("Files: %i\n", iNrFileEntries);
+			printf("Files: %i\n", cRemoteQueue.GetFileQueue()->size());
 			if (lPaused > 0)
 			{
 				printf("Remaining size: %.2f MB (+%.2f MB paused)\n", (float)(Util::Int64ToFloat(lRemaining) / 1024.0 / 1024.0), 
@@ -566,8 +573,6 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 			{
 				printf("Remaining size: %.2f MB\n", (float)(Util::Int64ToFloat(lRemaining) / 1024.0 / 1024.0));
 			}
-
-			DownloadQueue::Unlock();
 		}
 	}
 
@@ -811,8 +816,8 @@ bool RemoteClient::RequestServerDumpDebug()
 	return OK;
 }
 
-bool RemoteClient::RequestServerEditQueue(DownloadQueue::EEditAction eAction, int iOffset, const char* szText,
-	int* pIDList, int iIDCount, NameList* pNameList, eRemoteMatchMode iMatchMode)
+bool RemoteClient::RequestServerEditQueue(eRemoteEditAction iAction, int iOffset, const char* szText, 
+	int* pIDList, int iIDCount, NameList* pNameList, eRemoteMatchMode iMatchMode, bool bSmartOrder)
 {
 	if ((iIDCount <= 0 || pIDList == NULL) && (pNameList == NULL || pNameList->size() == 0))
 	{
@@ -846,9 +851,10 @@ bool RemoteClient::RequestServerEditQueue(DownloadQueue::EEditAction eAction, in
 
 	SNZBEditQueueRequest EditQueueRequest;
 	InitMessageBase(&EditQueueRequest.m_MessageBase, eRemoteRequestEditQueue, sizeof(EditQueueRequest));
-	EditQueueRequest.m_iAction = htonl(eAction);
+	EditQueueRequest.m_iAction = htonl(iAction);
 	EditQueueRequest.m_iMatchMode = htonl(iMatchMode);
 	EditQueueRequest.m_iOffset = htonl((int)iOffset);
+	EditQueueRequest.m_bSmartOrder = htonl(bSmartOrder);
 	EditQueueRequest.m_iTextLen = htonl(iTextLen);
 	EditQueueRequest.m_iNrTrailingIDEntries = htonl(iIDCount);
 	EditQueueRequest.m_iNrTrailingNameEntries = htonl(iNameCount);
@@ -1143,7 +1149,7 @@ bool RemoteClient::RequestHistory()
 			HistoryInfo::EKind eKind = (HistoryInfo::EKind)ntohl(pListAnswer->m_iKind);
 			const char* szNicename = pBufPtr + sizeof(SNZBHistoryResponseEntry);
 
-			if (eKind == HistoryInfo::hkNzb)
+			if (eKind == HistoryInfo::hkNZBInfo)
 			{
 				long long lSize = Util::JoinInt64(ntohl(pListAnswer->m_iSizeHi), ntohl(pListAnswer->m_iSizeLo));
 
@@ -1158,7 +1164,7 @@ bool RemoteClient::RequestHistory()
 					szParStatusText[ntohl(pListAnswer->m_iParStatus)], 
 					szScriptStatusText[ntohl(pListAnswer->m_iScriptStatus)]);
 			}
-			else if (eKind == HistoryInfo::hkUrl)
+			else if (eKind == HistoryInfo::hkUrlInfo)
 			{
 				const char* szUrlStatusText[] = { "", "", "Url download successful", "Url download failed", "" };
 
@@ -1218,3 +1224,76 @@ bool RemoteClient::RequestServerDownloadUrl(const char* szURL, const char* szNZB
 	m_pConnection->Disconnect();
 	return OK;
 }
+
+bool RemoteClient::RequestUrlQueue()
+{
+	if (!InitConnection()) return false;
+
+	SNZBUrlQueueRequest UrlQueueRequest;
+	InitMessageBase(&UrlQueueRequest.m_MessageBase, eRemoteRequestUrlQueue, sizeof(UrlQueueRequest));
+
+	if (!m_pConnection->Send((char*)(&UrlQueueRequest), sizeof(UrlQueueRequest)))
+	{
+		perror("m_pConnection->Send");
+		return false;
+	}
+
+	printf("Request sent\n");
+
+	// Now listen for the returned list
+	SNZBUrlQueueResponse UrlQueueResponse;
+	bool bRead = m_pConnection->Recv((char*) &UrlQueueResponse, sizeof(UrlQueueResponse));
+	if (!bRead || 
+		(int)ntohl(UrlQueueResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
+		ntohl(UrlQueueResponse.m_MessageBase.m_iStructSize) != sizeof(UrlQueueResponse))
+	{
+		printf("No response or invalid response (timeout, not nzbget-server or wrong nzbget-server version)\n");
+		return false;
+	}
+
+	char* pBuf = NULL;
+	if (ntohl(UrlQueueResponse.m_iTrailingDataLength) > 0)
+	{
+		pBuf = (char*)malloc(ntohl(UrlQueueResponse.m_iTrailingDataLength));
+		if (!m_pConnection->Recv(pBuf, ntohl(UrlQueueResponse.m_iTrailingDataLength)))
+		{
+			free(pBuf);
+			return false;
+		}
+	}
+
+	m_pConnection->Disconnect();
+
+	if (ntohl(UrlQueueResponse.m_iTrailingDataLength) == 0)
+	{
+		printf("Server has no urls queued for download\n");
+	}
+	else
+	{
+		printf("Url-Queue\n");
+		printf("-----------------------------------\n");
+
+		char* pBufPtr = (char*)pBuf;
+		for (unsigned int i = 0; i < ntohl(UrlQueueResponse.m_iNrTrailingEntries); i++)
+		{
+			SNZBUrlQueueResponseEntry* pUrlQueueAnswer = (SNZBUrlQueueResponseEntry*) pBufPtr;
+
+			const char* szURL = pBufPtr + sizeof(SNZBUrlQueueResponseEntry);
+			const char* szTitle = pBufPtr + sizeof(SNZBUrlQueueResponseEntry) + ntohl(pUrlQueueAnswer->m_iURLLen);
+
+			char szNiceName[1024];
+			UrlInfo::MakeNiceName(szURL, szTitle, szNiceName, 1024);
+
+			printf("[%i] %s\n", ntohl(pUrlQueueAnswer->m_iID), szNiceName);
+
+			pBufPtr += sizeof(SNZBUrlQueueResponseEntry) + ntohl(pUrlQueueAnswer->m_iURLLen) + 
+				ntohl(pUrlQueueAnswer->m_iNZBFilenameLen);
+		}
+
+		free(pBuf);
+
+		printf("-----------------------------------\n");
+	}
+
+	return true;
+}

RemoteClient.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -65,8 +65,8 @@ public:
 	bool			RequestServerPauseUnpause(bool bPause, eRemotePauseUnpauseAction iAction);
 	bool			RequestServerSetDownloadRate(int iRate);
 	bool			RequestServerDumpDebug();
-	bool 			RequestServerEditQueue(DownloadQueue::EEditAction eAction, int iOffset, const char* szText,
-						int* pIDList, int iIDCount, NameList* pNameList, eRemoteMatchMode iMatchMode);
+	bool 			RequestServerEditQueue(eRemoteEditAction iAction, int iOffset, const char* szText, 
+		int* pIDList, int iIDCount, NameList* pNameList, eRemoteMatchMode iMatchMode, bool bSmartOrder);
 	bool			RequestServerLog(int iLines);
 	bool			RequestServerShutdown();
 	bool			RequestServerReload();
@@ -76,6 +76,7 @@ public:
 	bool			RequestScan(bool bSyncMode);
 	bool			RequestHistory();
 	bool 			RequestServerDownloadUrl(const char* szURL, const char* szNZBFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority);
+	bool			RequestUrlQueue();
 	void			BuildFileList(SNZBListResponse* pListResponse, const char* pTrailingData, DownloadQueue* pDownloadQueue);
 };
 

RemoteServer.cpp

@@ -34,7 +34,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #ifndef WIN32
 #include <unistd.h>
 #include <sys/socket.h>
@@ -100,7 +99,7 @@ void RemoteServer::Run()
 			m_pConnection = new Connection(g_pOptions->GetControlIP(), 
 				m_bTLS ? g_pOptions->GetSecurePort() : g_pOptions->GetControlPort(),
 				m_bTLS);
-			m_pConnection->SetTimeout(g_pOptions->GetUrlTimeout());
+			m_pConnection->SetTimeout(g_pOptions->GetConnectionTimeout());
 			m_pConnection->SetSuppressErrors(false);
 			bBind = m_pConnection->Bind();
 		}
@@ -181,7 +180,7 @@ void RequestProcessor::Run()
 	int iSignature = 0;
 	if (!m_pConnection->Recv((char*)&iSignature, 4))
 	{
-		debug("Could not read request signature");
+		debug("Could not read request signature, request received on port %i from %s", m_bTLS ? g_pOptions->GetSecurePort() : g_pOptions->GetControlPort(), m_pConnection->GetRemoteAddr());
 		return;
 	}
 

Scanner.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -46,203 +46,13 @@
 #include "Options.h"
 #include "Log.h"
 #include "QueueCoordinator.h"
-#include "QueueScript.h"
+#include "ScriptController.h"
+#include "DiskState.h"
 #include "Util.h"
 
 extern QueueCoordinator* g_pQueueCoordinator;
 extern Options* g_pOptions;
-extern Scanner* g_pScanner;
-
-class ScanScriptController : public NZBScriptController
-{
-private:
-	const char*			m_szNZBFilename;
-	const char*			m_szUrl;
-	const char*			m_szDirectory;
-	char**				m_pNZBName;
-	char**				m_pCategory;
-	int*				m_iPriority;
-	NZBParameterList*	m_pParameters;
-	bool*				m_bAddTop;
-	bool*				m_bAddPaused;
-	char**				m_pDupeKey;
-	int*				m_iDupeScore;
-	EDupeMode*			m_eDupeMode;
-	int					m_iPrefixLen;
-
-	void				PrepareParams(const char* szScriptName);
-
-protected:
-	virtual void		ExecuteScript(Options::Script* pScript);
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-
-public:
-	static void			ExecuteScripts(const char* szNZBFilename, const char* szUrl,
-							const char* szDirectory, char** pNZBName, char** pCategory, int* iPriority,
-							NZBParameterList* pParameters, bool* bAddTop, bool* bAddPaused,
-							char** pDupeKey, int* iDupeScore, EDupeMode* eDupeMode);
-};
-
-
-void ScanScriptController::ExecuteScripts(const char* szNZBFilename,
-	const char* szUrl, const char* szDirectory, char** pNZBName, char** pCategory,
-	int* iPriority, NZBParameterList* pParameters, bool* bAddTop, bool* bAddPaused,
-	char** pDupeKey, int* iDupeScore, EDupeMode* eDupeMode)
-{
-	ScanScriptController* pScriptController = new ScanScriptController();
-
-	pScriptController->m_szNZBFilename = szNZBFilename;
-	pScriptController->m_szUrl = szUrl;
-	pScriptController->m_szDirectory = szDirectory;
-	pScriptController->m_pNZBName = pNZBName;
-	pScriptController->m_pCategory = pCategory;
-	pScriptController->m_pParameters = pParameters;
-	pScriptController->m_iPriority = iPriority;
-	pScriptController->m_bAddTop = bAddTop;
-	pScriptController->m_bAddPaused = bAddPaused;
-	pScriptController->m_pDupeKey = pDupeKey;
-	pScriptController->m_iDupeScore = iDupeScore;
-	pScriptController->m_eDupeMode = eDupeMode;
-	pScriptController->m_iPrefixLen = 0;
-
-	pScriptController->ExecuteScriptList(g_pOptions->GetScanScript());
-
-	delete pScriptController;
-}
-
-void ScanScriptController::ExecuteScript(Options::Script* pScript)
-{
-	if (!pScript->GetScanScript() || !Util::FileExists(m_szNZBFilename))
-	{
-		return;
-	}
-
-	PrintMessage(Message::mkInfo, "Executing scan-script %s for %s", pScript->GetName(), Util::BaseFileName(m_szNZBFilename));
-
-	SetScript(pScript->GetLocation());
-	SetArgs(NULL, false);
-
-	char szInfoName[1024];
-	snprintf(szInfoName, 1024, "scan-script %s for %s", pScript->GetName(), Util::BaseFileName(m_szNZBFilename));
-	szInfoName[1024-1] = '\0';
-	SetInfoName(szInfoName);
-
-	SetLogPrefix(pScript->GetDisplayName());
-	m_iPrefixLen = strlen(pScript->GetDisplayName()) + 2; // 2 = strlen(": ");
-	PrepareParams(pScript->GetName());
-
-	Execute();
-
-	SetLogPrefix(NULL);
-}
-
-void ScanScriptController::PrepareParams(const char* szScriptName)
-{
-	ResetEnv();
-
-	SetEnvVar("NZBNP_FILENAME", m_szNZBFilename);
-	SetEnvVar("NZBNP_URL", m_szUrl);
-	SetEnvVar("NZBNP_NZBNAME", strlen(*m_pNZBName) > 0 ? *m_pNZBName : Util::BaseFileName(m_szNZBFilename));
-	SetEnvVar("NZBNP_CATEGORY", *m_pCategory);
-	SetIntEnvVar("NZBNP_PRIORITY", *m_iPriority);
-	SetIntEnvVar("NZBNP_TOP", *m_bAddTop ? 1 : 0);
-	SetIntEnvVar("NZBNP_PAUSED", *m_bAddPaused ? 1 : 0);
-	SetEnvVar("NZBNP_DUPEKEY", *m_pDupeKey);
-	SetIntEnvVar("NZBNP_DUPESCORE", *m_iDupeScore);
-
-	const char* szDupeModeName[] = { "SCORE", "ALL", "FORCE" };
-	SetEnvVar("NZBNP_DUPEMODE", szDupeModeName[*m_eDupeMode]);
-
-	// remove trailing slash
-	char szDir[1024];
-	strncpy(szDir, m_szDirectory, 1024);
-	szDir[1024-1] = '\0';
-	int iLen = strlen(szDir);
-	if (szDir[iLen-1] == PATH_SEPARATOR)
-	{
-		szDir[iLen-1] = '\0';
-	}
-	SetEnvVar("NZBNP_DIRECTORY", szDir);
-
-	PrepareEnvScript(m_pParameters, szScriptName);
-}
-
-void ScanScriptController::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, "NZBNAME=", 8))
-		{
-			free(*m_pNZBName);
-			*m_pNZBName = strdup(szMsgText + 6 + 8);
-		}
-		else if (!strncmp(szMsgText + 6, "CATEGORY=", 9))
-		{
-			free(*m_pCategory);
-			*m_pCategory = strdup(szMsgText + 6 + 9);
-			g_pScanner->InitPPParameters(*m_pCategory, m_pParameters, true);
-		}
-		else if (!strncmp(szMsgText + 6, "NZBPR_", 6))
-		{
-			char* szParam = strdup(szMsgText + 6 + 6);
-			char* szValue = strchr(szParam, '=');
-			if (szValue)
-			{
-				*szValue = '\0';
-				m_pParameters->SetParameter(szParam, szValue + 1);
-			}
-			else
-			{
-				error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
-			}
-			free(szParam);
-		}
-		else if (!strncmp(szMsgText + 6, "PRIORITY=", 9))
-		{
-			*m_iPriority = atoi(szMsgText + 6 + 9);
-		}
-		else if (!strncmp(szMsgText + 6, "TOP=", 4))
-		{
-			*m_bAddTop = atoi(szMsgText + 6 + 4) != 0;
-		}
-		else if (!strncmp(szMsgText + 6, "PAUSED=", 7))
-		{
-			*m_bAddPaused = atoi(szMsgText + 6 + 7) != 0;
-		}
-		else if (!strncmp(szMsgText + 6, "DUPEKEY=", 8))
-		{
-			free(*m_pDupeKey);
-			*m_pDupeKey = strdup(szMsgText + 6 + 8);
-		}
-		else if (!strncmp(szMsgText + 6, "DUPESCORE=", 10))
-		{
-			*m_iDupeScore = atoi(szMsgText + 6 + 10);
-		}
-		else if (!strncmp(szMsgText + 6, "DUPEMODE=", 9))
-		{
-			const char* szDupeMode = szMsgText + 6 + 9;
-			if (strcasecmp(szDupeMode, "score") && strcasecmp(szDupeMode, "all") && strcasecmp(szDupeMode, "force"))
-			{
-				error("Invalid value \"%s\" for command \"DUPEMODE\" received from %s", szDupeMode, GetInfoName());
-				return;
-			}
-			*m_eDupeMode = !strcasecmp(szDupeMode, "all") ? dmAll :
-				!strcasecmp(szDupeMode, "force") ? dmForce : dmScore;
-		}
-		else
-		{
-			error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
-		}
-	}
-	else
-	{
-		ScriptController::AddMessage(eKind, szText);
-	}
-}
-
+extern DiskState* g_pDiskState;
 
 Scanner::FileData::FileData(const char* szFilename)
 {
@@ -259,8 +69,7 @@ Scanner::FileData::~FileData()
 
 Scanner::QueueData::QueueData(const char* szFilename, const char* szNZBName, const char* szCategory,
 	int iPriority, const char* szDupeKey, int iDupeScore, EDupeMode eDupeMode,
-	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused, NZBInfo* pUrlInfo,
-	EAddStatus* pAddStatus, int* pNZBID)
+	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused, EAddStatus* pAddStatus)
 {
 	m_szFilename = strdup(szFilename);
 	m_szNZBName = strdup(szNZBName);
@@ -271,9 +80,7 @@ Scanner::QueueData::QueueData(const char* szFilename, const char* szNZBName, con
 	m_eDupeMode = eDupeMode;
 	m_bAddTop = bAddTop;
 	m_bAddPaused = bAddPaused;
-	m_pUrlInfo = pUrlInfo;
 	m_pAddStatus = pAddStatus;
-	m_pNZBID = pNZBID;
 
 	if (pParameters)
 	{
@@ -297,14 +104,6 @@ void Scanner::QueueData::SetAddStatus(EAddStatus eAddStatus)
 	}
 }
 
-void Scanner::QueueData::SetNZBID(int iNZBID)
-{
-	if (m_pNZBID)
-	{
-		*m_pNZBID = iNZBID;
-	}
-}
-
 
 Scanner::Scanner()
 {
@@ -312,9 +111,11 @@ Scanner::Scanner()
 
 	m_bRequestedNZBDirScan = false;
 	m_bScanning = false;
-	m_iNZBDirInterval = 0;
+	m_iNZBDirInterval = g_pOptions->GetNzbDirInterval() * 1000;
 	m_iPass = 0;
-	m_bScanScript = false;
+
+	const char* szNZBScript = g_pOptions->GetNZBProcess();
+	m_bNZBScript = szNZBScript && strlen(szNZBScript) > 0;
 }
 
 Scanner::~Scanner()
@@ -330,13 +131,6 @@ Scanner::~Scanner()
 	ClearQueueList();
 }
 
-void Scanner::InitOptions()
-{
-	m_iNZBDirInterval = g_pOptions->GetNzbDirInterval() * 1000;
-	const char* szScanScript = g_pOptions->GetScanScript();
-	m_bScanScript = szScanScript && strlen(szScanScript) > 0;
-}
-
 void Scanner::ClearQueueList()
 {
 	for (QueueList::iterator it = m_QueueList.begin(); it != m_QueueList.end(); it++)
@@ -359,7 +153,7 @@ void Scanner::Check()
 		m_bRequestedNZBDirScan = false;
 		m_bScanning = true;
 		CheckIncomingNZBs(g_pOptions->GetNzbDir(), "", bCheckStat);
-		if (!bCheckStat && m_bScanScript)
+		if (!bCheckStat && m_bNZBScript)
 		{
 			// if immediate scan requested, we need second scan to process files extracted by NzbProcess-script
 			CheckIncomingNZBs(g_pOptions->GetNzbDir(), "", bCheckStat);
@@ -374,7 +168,7 @@ void Scanner::Check()
 		//   - third scan is needed to check sizes of extracted files.
 		if (g_pOptions->GetNzbDirInterval() > 0 && g_pOptions->GetNzbDirFileAge() < g_pOptions->GetNzbDirInterval())
 		{
-			int iMaxPass = m_bScanScript ? 3 : 1;
+			int iMaxPass = m_bNZBScript ? 3 : 1;
 			if (m_iPass < iMaxPass)
 			{
 				// scheduling another scan of incoming directory in NzbDirFileAge seconds.
@@ -404,28 +198,31 @@ void Scanner::CheckIncomingNZBs(const char* szDirectory, const char* szCategory,
 	DirBrowser dir(szDirectory);
 	while (const char* filename = dir.Next())
 	{
+		struct stat buffer;
 		char fullfilename[1023 + 1]; // one char reserved for the trailing slash (if needed)
 		snprintf(fullfilename, 1023, "%s%s", szDirectory, filename);
 		fullfilename[1023 - 1] = '\0';
-		bool bIsDirectory = Util::DirectoryExists(fullfilename);
-		// check subfolders
-		if (bIsDirectory && strcmp(filename, ".") && strcmp(filename, ".."))
+		if (!stat(fullfilename, &buffer))
 		{
-			fullfilename[strlen(fullfilename) + 1] = '\0';
-			fullfilename[strlen(fullfilename)] = PATH_SEPARATOR;
-			const char* szUseCategory = filename;
-			char szSubCategory[1024];
-			if (strlen(szCategory) > 0)
+			// check subfolders
+			if ((buffer.st_mode & S_IFDIR) != 0 && strcmp(filename, ".") && strcmp(filename, ".."))
 			{
-				snprintf(szSubCategory, 1023, "%s%c%s", szCategory, PATH_SEPARATOR, filename);
-				szSubCategory[1024 - 1] = '\0';
-				szUseCategory = szSubCategory;
+				fullfilename[strlen(fullfilename) + 1] = '\0';
+				fullfilename[strlen(fullfilename)] = PATH_SEPARATOR;
+				const char* szUseCategory = filename;
+				char szSubCategory[1024];
+				if (strlen(szCategory) > 0)
+				{
+					snprintf(szSubCategory, 1023, "%s%c%s", szCategory, PATH_SEPARATOR, filename);
+					szSubCategory[1024 - 1] = '\0';
+					szUseCategory = szSubCategory;
+				}
+				CheckIncomingNZBs(fullfilename, szUseCategory, bCheckStat);
+			}
+			else if ((buffer.st_mode & S_IFDIR) == 0 && CanProcessFile(fullfilename, bCheckStat))
+			{
+				ProcessIncomingFile(szDirectory, filename, fullfilename, szCategory);
 			}
-			CheckIncomingNZBs(fullfilename, szUseCategory, bCheckStat);
-		}
-		else if (!bIsDirectory && CanProcessFile(fullfilename, bCheckStat))
-		{
-			ProcessIncomingFile(szDirectory, filename, fullfilename, szCategory);
 		}
 	}
 }
@@ -541,14 +338,12 @@ void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFil
 	int iPriority = 0;
 	bool bAddTop = false;
 	bool bAddPaused = false;
-	char* szDupeKey = strdup("");
+	const char* szDupeKey = NULL;
 	int iDupeScore = 0;
 	EDupeMode eDupeMode = dmScore;
 	EAddStatus eAddStatus = asSkipped;
 	bool bAdded = false;
 	QueueData* pQueueData = NULL;
-	NZBInfo* pUrlInfo = NULL;
-	int iNZBID = 0;
 
 	for (QueueList::iterator it = m_QueueList.begin(); it != m_QueueList.end(); it++)
     {
@@ -561,27 +356,23 @@ void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFil
 			free(szNZBCategory);
 			szNZBCategory = strdup(pQueueData->GetCategory());
 			iPriority = pQueueData->GetPriority();
-			free(szDupeKey);
-			szDupeKey = strdup(pQueueData->GetDupeKey());
+			szDupeKey = pQueueData->GetDupeKey();
 			iDupeScore = pQueueData->GetDupeScore();
 			eDupeMode = pQueueData->GetDupeMode();
 			bAddTop = pQueueData->GetAddTop();
 			bAddPaused = pQueueData->GetAddPaused();
 			pParameters->CopyFrom(pQueueData->GetParameters());
-			pUrlInfo = pQueueData->GetUrlInfo();
 		}
 	}
 
-	InitPPParameters(szNZBCategory, pParameters, false);
+	InitPPParameters(szNZBCategory, pParameters);
 
 	bool bExists = true;
 
-	if (m_bScanScript && strcasecmp(szExtension, ".nzb_processed"))
+	if (m_bNZBScript && strcasecmp(szExtension, ".nzb_processed"))
 	{
-		ScanScriptController::ExecuteScripts(szFullFilename, 
-			pUrlInfo ? pUrlInfo->GetURL() : "", szDirectory,
-			&szNZBName, &szNZBCategory, &iPriority, pParameters, &bAddTop,
-			&bAddPaused, &szDupeKey, &iDupeScore, &eDupeMode);
+		NZBScriptController::ExecuteScript(g_pOptions->GetNZBProcess(), szFullFilename, szDirectory, 
+			&szNZBName, &szNZBCategory, &iPriority, pParameters, &bAddTop, &bAddPaused); 
 		bExists = Util::FileExists(szFullFilename);
 		if (bExists && strcasecmp(szExtension, ".nzb"))
 		{
@@ -602,7 +393,7 @@ void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFil
 		if (bRenameOK)
 		{
 			bAdded = AddFileToQueue(szRenamedName, szNZBName, szNZBCategory, iPriority,
-				szDupeKey, iDupeScore, eDupeMode, pParameters, bAddTop, bAddPaused, pUrlInfo, &iNZBID);
+				szDupeKey, iDupeScore, eDupeMode, pParameters, bAddTop, bAddPaused);
 		}
 		else
 		{
@@ -614,75 +405,69 @@ void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFil
 	else if (bExists && !strcasecmp(szExtension, ".nzb"))
 	{
 		bAdded = AddFileToQueue(szFullFilename, szNZBName, szNZBCategory, iPriority,
-			szDupeKey, iDupeScore, eDupeMode, pParameters, bAddTop, bAddPaused, pUrlInfo, &iNZBID);
+			szDupeKey, iDupeScore, eDupeMode, pParameters, bAddTop, bAddPaused);
 	}
 
 	delete pParameters;
 
 	free(szNZBName);
 	free(szNZBCategory);
-	free(szDupeKey);
 
 	if (pQueueData)
 	{
 		pQueueData->SetAddStatus(eAddStatus == asFailed ? asFailed : bAdded ? asSuccess : asSkipped);
-		pQueueData->SetNZBID(iNZBID);
 	}
 }
 
-void Scanner::InitPPParameters(const char* szCategory, NZBParameterList* pParameters, bool bReset)
+void Scanner::InitPPParameters(const char* szCategory, NZBParameterList* pParameters)
 {
 	bool bUnpack = g_pOptions->GetUnpack();
-	const char* szPostScript = g_pOptions->GetPostScript();
+	const char* szDefScript = g_pOptions->GetDefScript();
 	
-	if (!Util::EmptyStr(szCategory))
+	if (szCategory && *szCategory)
 	{
 		Options::Category* pCategory = g_pOptions->FindCategory(szCategory, false);
 		if (pCategory)
 		{
 			bUnpack = pCategory->GetUnpack();
-			if (!Util::EmptyStr(pCategory->GetPostScript()))
+			if (pCategory->GetDefScript() && *pCategory->GetDefScript())
 			{
-				szPostScript = pCategory->GetPostScript();
+				szDefScript = pCategory->GetDefScript();
 			}
 		}
 	}
-
-	if (bReset)
-	{
-		for (Options::Scripts::iterator it = g_pOptions->GetScripts()->begin(); it != g_pOptions->GetScripts()->end(); it++)
-		{
-			Options::Script* pScript = *it;
-			char szParam[1024];
-			snprintf(szParam, 1024, "%s:", pScript->GetName());
-			szParam[1024-1] = '\0';
-			pParameters->SetParameter(szParam, NULL);
-		}
-	}
-
+	
 	pParameters->SetParameter("*Unpack:", bUnpack ? "yes" : "no");
 	
-	if (!Util::EmptyStr(szPostScript))
+	if (szDefScript && *szDefScript)
 	{
-		// split szPostScript into tokens and create pp-parameter for each token
-		Tokenizer tok(szPostScript, ",;");
-		while (const char* szScriptName = tok.Next())
+		// split szDefScript into tokens and create pp-parameter for each token
+		char* szDefScript2 = strdup(szDefScript);
+		char* saveptr;
+		char* szScriptName = strtok_r(szDefScript2, ",;", &saveptr);
+		while (szScriptName)
 		{
-			char szParam[1024];
-			snprintf(szParam, 1024, "%s:", szScriptName);
-			szParam[1024-1] = '\0';
-			pParameters->SetParameter(szParam, "yes");
+			szScriptName = Util::Trim(szScriptName);
+			if (szScriptName[0] != '\0')
+			{
+				char szParam[1024];
+				snprintf(szParam, 1024, "%s:", szScriptName);
+				szParam[1024-1] = '\0';
+				pParameters->SetParameter(szParam, "yes");
+			}
+			szScriptName = strtok_r(NULL, ",;", &saveptr);
 		}
+		free(szDefScript2);
 	}
 }
 
 bool Scanner::AddFileToQueue(const char* szFilename, const char* szNZBName, const char* szCategory,
 	int iPriority, const char* szDupeKey, int iDupeScore, EDupeMode eDupeMode,
-	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused, NZBInfo* pUrlInfo, int* pNZBID)
+	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused)
 {
 	const char* szBasename = Util::BaseFileName(szFilename);
 
-	info("Adding collection %s to queue", szBasename);
+	info("Collection %s found", szBasename);
 
 	NZBFile* pNZBFile = NZBFile::Create(szFilename, szCategory);
 	bool bOK = pNZBFile != NULL;
@@ -701,52 +486,41 @@ bool Scanner::AddFileToQueue(const char* szFilename, const char* szNZBName, cons
 
 	if (bOK)
 	{
-		NZBInfo* pNZBInfo = pNZBFile->GetNZBInfo();
-		pNZBInfo->SetQueuedFilename(bakname2);
+		pNZBFile->GetNZBInfo()->SetQueuedFilename(bakname2);
 
 		if (szNZBName && strlen(szNZBName) > 0)
 		{
-			pNZBInfo->SetName(NULL);
+			pNZBFile->GetNZBInfo()->SetName(NULL);
 #ifdef WIN32
 			char* szAnsiFilename = strdup(szNZBName);
 			WebUtil::Utf8ToAnsi(szAnsiFilename, strlen(szAnsiFilename) + 1);
-			pNZBInfo->SetFilename(szAnsiFilename);
+			pNZBFile->GetNZBInfo()->SetFilename(szAnsiFilename);
 			free(szAnsiFilename);
 #else
-			pNZBInfo->SetFilename(szNZBName);
+			pNZBFile->GetNZBInfo()->SetFilename(szNZBName);
 #endif
-			pNZBInfo->BuildDestDirName();
+			pNZBFile->GetNZBInfo()->BuildDestDirName();
 		}
 
-		pNZBInfo->SetDupeKey(szDupeKey);
-		pNZBInfo->SetDupeScore(iDupeScore);
-		pNZBInfo->SetDupeMode(eDupeMode);
-		pNZBInfo->SetPriority(iPriority);
-		if (pUrlInfo)
-		{
-			pNZBInfo->SetURL(pUrlInfo->GetURL());
-			pNZBInfo->SetUrlStatus(pUrlInfo->GetUrlStatus());
-		}
+		pNZBFile->GetNZBInfo()->SetDupeKey(szDupeKey);
+		pNZBFile->GetNZBInfo()->SetDupeScore(iDupeScore);
+		pNZBFile->GetNZBInfo()->SetDupeMode(eDupeMode);
 
 		if (pNZBFile->GetPassword())
 		{
-			pNZBInfo->GetParameters()->SetParameter("*Unpack:Password", pNZBFile->GetPassword());
+			pNZBFile->GetNZBInfo()->GetParameters()->SetParameter("*Unpack:Password", pNZBFile->GetPassword());
 		}
 
-		pNZBInfo->GetParameters()->CopyFrom(pParameters);
+		pNZBFile->GetNZBInfo()->GetParameters()->CopyFrom(pParameters);
 
-		for (::FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
+		for (NZBFile::FileInfos::iterator it = pNZBFile->GetFileInfos()->begin(); it != pNZBFile->GetFileInfos()->end(); it++)
 		{
 			FileInfo* pFileInfo = *it;
+			pFileInfo->SetPriority(iPriority);
 			pFileInfo->SetPaused(bAddPaused);
 		}
 
-		g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, pUrlInfo, bAddTop);
-
-		if (pNZBID)
-		{
-			*pNZBID = pNZBInfo->GetID();
-		}
+		g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, bAddTop);
 	}
 
 	delete pNZBFile;
@@ -769,8 +543,8 @@ void Scanner::ScanNZBDir(bool bSyncMode)
 
 Scanner::EAddStatus Scanner::AddExternalFile(const char* szNZBName, const char* szCategory,
 	int iPriority, const char* szDupeKey, int iDupeScore,  EDupeMode eDupeMode,
-	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused, NZBInfo* pUrlInfo,
-	const char* szFileName, const char* szBuffer, int iBufSize, int* pNZBID)
+	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused,
+	const char* szFileName, const char* szBuffer, int iBufSize)
 {
 	bool bNZB = false;
 	char szTempFileName[1024];
@@ -855,8 +629,8 @@ Scanner::EAddStatus Scanner::AddExternalFile(const char* szNZBName, const char*
 	}
 
 	char* szUseCategory = strdup(szCategory ? szCategory : "");
-	Options::Category *pCategory = g_pOptions->FindCategory(szUseCategory, true);
-	if (pCategory && strcmp(szUseCategory, pCategory->GetName()))
+	Options::Category *pCategory = g_pOptions->FindCategory(szCategory, true);
+	if (pCategory && strcmp(szCategory, pCategory->GetName()))
 	{
 		free(szUseCategory);
 		szUseCategory = strdup(pCategory->GetName());
@@ -864,9 +638,8 @@ Scanner::EAddStatus Scanner::AddExternalFile(const char* szNZBName, const char*
 	}
 
 	EAddStatus eAddStatus = asSkipped;
-	QueueData* pQueueData = new QueueData(szScanFileName, szNZBName, szUseCategory, iPriority,
-		szDupeKey, iDupeScore, eDupeMode, pParameters, bAddTop, bAddPaused, pUrlInfo,
-		&eAddStatus, pNZBID);
+	QueueData* pQueueData = new QueueData(szScanFileName, szNZBName, szUseCategory,
+		iPriority, szDupeKey, iDupeScore, eDupeMode, pParameters, bAddTop, bAddPaused, &eAddStatus);
 	free(szUseCategory);
 	m_QueueList.push_back(pQueueData);
 

Scanner.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -74,15 +74,12 @@ private:
 		NZBParameterList	m_Parameters;
 		bool				m_bAddTop;
 		bool				m_bAddPaused;
-		NZBInfo*			m_pUrlInfo;
 		EAddStatus*			m_pAddStatus;
-		int*				m_pNZBID;
 
 	public:
 							QueueData(const char* szFilename, const char* szNZBName, const char* szCategory,
 								int iPriority, const char* szDupeKey, int iDupeScore, EDupeMode eDupeMode,
-								NZBParameterList* pParameters, bool bAddTop, bool bAddPaused, NZBInfo* pUrlInfo, 
-								EAddStatus* pAddStatus, int* pNZBID);
+								NZBParameterList* pParameters, bool bAddTop, bool bAddPaused, EAddStatus* pAddStatus);
 							~QueueData();
 		const char*			GetFilename() { return m_szFilename; }
 		const char*			GetNZBName() { return m_szNZBName; }
@@ -94,16 +91,14 @@ private:
 		NZBParameterList*	GetParameters() { return &m_Parameters; }
 		bool				GetAddTop() { return m_bAddTop; }
 		bool				GetAddPaused() { return m_bAddPaused; }
-		NZBInfo*			GetUrlInfo() { return m_pUrlInfo; }
 		void				SetAddStatus(EAddStatus eAddStatus);
-		void				SetNZBID(int iNZBID);
 	};
 
 	typedef std::deque<QueueData*>		QueueList;
 
 	bool				m_bRequestedNZBDirScan;
 	int					m_iNZBDirInterval;
-	bool				m_bScanScript;
+	bool				m_bNZBScript;
 	int					m_iPass;
 	FileList			m_FileList;
 	QueueList			m_QueueList;
@@ -113,24 +108,23 @@ private:
 	void				CheckIncomingNZBs(const char* szDirectory, const char* szCategory, bool bCheckStat);
 	bool				AddFileToQueue(const char* szFilename, const char* szNZBName, const char* szCategory,
 							int iPriority, const char* szDupeKey, int iDupeScore, EDupeMode eDupeMode,
-							NZBParameterList* pParameters, bool bAddTop, bool bAddPaused, NZBInfo* pUrlInfo, int* pNZBID);
+							NZBParameterList* pParameters, bool bAddTop, bool bAddPaused);
 	void				ProcessIncomingFile(const char* szDirectory, const char* szBaseFilename,
 							const char* szFullFilename, const char* szCategory);
 	bool				CanProcessFile(const char* szFullFilename, bool bCheckStat);
+	void				InitPPParameters(const char* szCategory, NZBParameterList* pParameters);
 	void				DropOldFiles();
 	void				ClearQueueList();
 
 public:
 						Scanner();
 						~Scanner();
-	void				InitOptions();
 	void				ScanNZBDir(bool bSyncMode);
 	void				Check();
 	EAddStatus			AddExternalFile(const char* szNZBName, const char* szCategory, int iPriority,
 							const char* szDupeKey, int iDupeScore, EDupeMode eDupeMode,
-							NZBParameterList* pParameters, bool bAddTop, bool bAddPaused, NZBInfo* pUrlInfo,
-							const char* szFileName, const char* szBuffer, int iBufSize, int* pNZBID);
-	void				InitPPParameters(const char* szCategory, NZBParameterList* pParameters, bool bReset);
+							NZBParameterList* pParameters, bool bAddTop, bool bAddPaused,
+							const char* szFileName, const char* szBuffer, int iBufSize);
 };
 
 #endif

Scheduler.cpp

@@ -0,0 +1,352 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2008-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#else
+#include <unistd.h>
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "nzbget.h"
+#include "Scheduler.h"
+#include "ScriptController.h"
+#include "Options.h"
+#include "Log.h"
+#include "NewsServer.h"
+#include "ServerPool.h"
+#include "FeedInfo.h"
+#include "FeedCoordinator.h"
+
+extern Options* g_pOptions;
+extern ServerPool* g_pServerPool;
+extern FeedCoordinator* g_pFeedCoordinator;
+
+Scheduler::Task::Task(int iHours, int iMinutes, int iWeekDaysBits, ECommand eCommand, const char* szParam)
+{
+	m_iHours = iHours;
+	m_iMinutes = iMinutes;
+	m_iWeekDaysBits = iWeekDaysBits;
+	m_eCommand = eCommand;
+	m_szParam = szParam ? strdup(szParam) : NULL;
+	m_tLastExecuted = 0;
+}
+
+Scheduler::Task::~Task()
+{
+	free(m_szParam);
+}
+
+
+Scheduler::Scheduler()
+{
+	debug("Creating Scheduler");
+
+	m_tLastCheck = 0;
+	m_TaskList.clear();
+}
+
+Scheduler::~Scheduler()
+{
+	debug("Destroying Scheduler");
+	
+	for (TaskList::iterator it = m_TaskList.begin(); it != m_TaskList.end(); it++)
+	{
+		delete *it;
+	}
+}
+
+void Scheduler::AddTask(Task* pTask)
+{
+	m_mutexTaskList.Lock();
+	m_TaskList.push_back(pTask);
+	m_mutexTaskList.Unlock();
+}
+
+bool Scheduler::CompareTasks(Scheduler::Task* pTask1, Scheduler::Task* pTask2)
+{
+	return (pTask1->m_iHours < pTask2->m_iHours) || 
+		((pTask1->m_iHours == pTask2->m_iHours) && (pTask1->m_iMinutes < pTask2->m_iMinutes));
+}
+
+void Scheduler::FirstCheck()
+{
+	m_mutexTaskList.Lock();
+	m_TaskList.sort(CompareTasks);
+	m_mutexTaskList.Unlock();
+
+	// check all tasks for the last week
+	time_t tCurrent = time(NULL);
+	m_tLastCheck = tCurrent - 60*60*24*7;
+	m_bDetectClockChanges = false;
+	m_bExecuteProcess = false;
+	CheckTasks();
+}
+
+void Scheduler::IntervalCheck()
+{
+	m_bDetectClockChanges = true;
+	m_bExecuteProcess = true;
+	CheckTasks();
+}
+
+void Scheduler::CheckTasks()
+{
+	PrepareLog();
+
+	m_mutexTaskList.Lock();
+
+	time_t tCurrent = time(NULL);
+
+	if (m_bDetectClockChanges)
+	{
+		// Detect large step changes of system time 
+		time_t tDiff = tCurrent - m_tLastCheck;
+		if (tDiff > 60*90 || tDiff < -60*90)
+		{
+			debug("Reset scheduled tasks (detected clock adjustment greater than 90 minutes)");
+			m_bExecuteProcess = false;
+			m_tLastCheck = tCurrent;
+
+			for (TaskList::iterator it = m_TaskList.begin(); it != m_TaskList.end(); it++)
+			{
+				Task* pTask = *it;
+				pTask->m_tLastExecuted = 0;
+			}
+		}
+	}
+
+	tm tmCurrent;
+	localtime_r(&tCurrent, &tmCurrent);
+	tm tmLastCheck;
+	localtime_r(&m_tLastCheck, &tmLastCheck);
+
+	tm tmLoop;
+	memcpy(&tmLoop, &tmLastCheck, sizeof(tmLastCheck));
+	tmLoop.tm_hour = tmCurrent.tm_hour;
+	tmLoop.tm_min = tmCurrent.tm_min;
+	tmLoop.tm_sec = tmCurrent.tm_sec;
+	time_t tLoop = mktime(&tmLoop);
+
+	while (tLoop <= tCurrent)
+	{
+		for (TaskList::iterator it = m_TaskList.begin(); it != m_TaskList.end(); it++)
+		{
+			Task* pTask = *it;
+			if (pTask->m_tLastExecuted != tLoop)
+			{
+				tm tmAppoint;
+				memcpy(&tmAppoint, &tmLoop, sizeof(tmLoop));
+				tmAppoint.tm_hour = pTask->m_iHours;
+				tmAppoint.tm_min = pTask->m_iMinutes;
+				tmAppoint.tm_sec = 0;
+
+				time_t tAppoint = mktime(&tmAppoint);
+				tAppoint -= g_pOptions->GetTimeCorrection();
+
+				int iWeekDay = tmAppoint.tm_wday;
+				if (iWeekDay == 0)
+				{
+					iWeekDay = 7;
+				}
+
+				bool bWeekDayOK = pTask->m_iWeekDaysBits == 0 || (pTask->m_iWeekDaysBits & (1 << (iWeekDay - 1)));
+				bool bDoTask = bWeekDayOK && m_tLastCheck < tAppoint && tAppoint <= tCurrent;
+
+				//debug("TEMP: 1) m_tLastCheck=%i, tCurrent=%i, tLoop=%i, tAppoint=%i, bWeekDayOK=%i, bDoTask=%i", m_tLastCheck, tCurrent, tLoop, tAppoint, (int)bWeekDayOK, (int)bDoTask);
+
+				if (bDoTask)
+				{
+					ExecuteTask(pTask);
+					pTask->m_tLastExecuted = tLoop;
+				}
+			}
+		}
+		tLoop += 60*60*24; // inc day
+		localtime_r(&tLoop, &tmLoop);
+	}
+
+	m_tLastCheck = tCurrent;
+
+	m_mutexTaskList.Unlock();
+
+	PrintLog();
+}
+
+void Scheduler::ExecuteTask(Task* pTask)
+{
+	const char* szCommandName[] = { "Pause", "Unpause", "Set download rate", "Execute program", "Pause Scan", "Unpause Scan",
+		"Enable Server", "Disable Server", "Fetch Feed" };
+	debug("Executing scheduled command: %s", szCommandName[pTask->m_eCommand]);
+
+	switch (pTask->m_eCommand)
+	{
+		case scDownloadRate:
+			if (!Util::EmptyStr(pTask->m_szParam))
+			{
+				g_pOptions->SetDownloadRate(atoi(pTask->m_szParam) * 1024);
+				m_bDownloadRateChanged = true;
+			}
+			break;
+
+		case scPauseDownload:
+		case scUnpauseDownload:
+			m_bPauseDownload = pTask->m_eCommand == scPauseDownload;
+			m_bPauseDownloadChanged = true;
+			break;
+
+		case scProcess:
+			if (m_bExecuteProcess)
+			{
+				SchedulerScriptController::StartScript(pTask->m_szParam);
+			}
+			break;
+
+		case scPauseScan:
+		case scUnpauseScan:
+			g_pOptions->SetPauseScan(pTask->m_eCommand == scPauseScan);
+			m_bPauseScanChanged = true;
+			break;
+
+		case scActivateServer:
+		case scDeactivateServer:
+			EditServer(pTask->m_eCommand == scActivateServer, pTask->m_szParam);
+			break;
+
+		case scFetchFeed:
+			if (m_bExecuteProcess)
+			{
+				FetchFeed(pTask->m_szParam);
+				break;
+			}
+	}
+}
+
+void Scheduler::PrepareLog()
+{
+	m_bDownloadRateChanged = false;
+	m_bPauseDownloadChanged = false;
+	m_bPauseScanChanged = false;
+	m_bServerChanged = false;
+}
+
+void Scheduler::PrintLog()
+{
+	if (m_bDownloadRateChanged)
+	{
+		info("Scheduler: setting download rate to %i KB/s", g_pOptions->GetDownloadRate() / 1024);
+	}
+	if (m_bPauseScanChanged)
+	{
+		info("Scheduler: %s scan", g_pOptions->GetPauseScan() ? "pausing" : "unpausing");
+	}
+	if (m_bServerChanged)
+	{
+		int index = 0;
+		for (Servers::iterator it = g_pServerPool->GetServers()->begin(); it != g_pServerPool->GetServers()->end(); it++, index++)
+		{
+			NewsServer* pServer = *it;
+			if (pServer->GetActive() != m_ServerStatusList[index])
+			{
+				info("Scheduler: %s %s", pServer->GetActive() ? "activating" : "deactivating", pServer->GetName());
+			}
+		}
+		g_pServerPool->Changed();
+	}
+}
+
+void Scheduler::EditServer(bool bActive, const char* szServerList)
+{
+	char* szServerList2 = strdup(szServerList);
+	char* saveptr;
+	char* szServer = strtok_r(szServerList2, ",;", &saveptr);
+	while (szServer)
+	{
+		szServer = Util::Trim(szServer);
+		if (!Util::EmptyStr(szServer))
+		{
+			int iID = atoi(szServer);
+			for (Servers::iterator it = g_pServerPool->GetServers()->begin(); it != g_pServerPool->GetServers()->end(); it++)
+			{
+				NewsServer* pServer = *it;
+				if ((iID > 0 && pServer->GetID() == iID) ||
+					!strcasecmp(pServer->GetName(), szServer))
+				{
+					if (!m_bServerChanged)
+					{
+						// store old server status for logging
+						m_ServerStatusList.clear();
+						m_ServerStatusList.reserve(g_pServerPool->GetServers()->size());
+						for (Servers::iterator it2 = g_pServerPool->GetServers()->begin(); it2 != g_pServerPool->GetServers()->end(); it2++)
+						{
+							NewsServer* pServer2 = *it2;
+							m_ServerStatusList.push_back(pServer2->GetActive());
+						}
+					}
+					m_bServerChanged = true;
+					pServer->SetActive(bActive);
+					break;
+				}
+			}
+		}
+		szServer = strtok_r(NULL, ",;", &saveptr);
+	}
+	free(szServerList2);
+}
+
+void Scheduler::FetchFeed(const char* szFeedList)
+{
+	char* szFeedList2 = strdup(szFeedList);
+	char* saveptr;
+	char* szFeed = strtok_r(szFeedList2, ",;", &saveptr);
+	while (szFeed)
+	{
+		szFeed = Util::Trim(szFeed);
+		if (!Util::EmptyStr(szFeed))
+		{
+			int iID = atoi(szFeed);
+			for (Feeds::iterator it = g_pFeedCoordinator->GetFeeds()->begin(); it != g_pFeedCoordinator->GetFeeds()->end(); it++)
+			{
+				FeedInfo* pFeed = *it;
+				if (pFeed->GetID() == iID ||
+					!strcasecmp(pFeed->GetName(), szFeed) ||
+					!strcasecmp("0", szFeed))
+				{
+					g_pFeedCoordinator->FetchFeed(pFeed->GetID());
+					break;
+				}
+			}
+		}
+		szFeed = strtok_r(NULL, ",;", &saveptr);
+	}
+	free(szFeedList2);
+}

Scheduler.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2008-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2008-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -39,10 +39,7 @@ public:
 	{
 		scPauseDownload,
 		scUnpauseDownload,
-		scPausePostProcess,
-		scUnpausePostProcess,
 		scDownloadRate,
-		scScript,
 		scProcess,
 		scPauseScan,
 		scUnpauseScan,
@@ -54,7 +51,6 @@ public:
 	class Task
 	{
 	private:
-		int				m_iID;
 		int				m_iHours;
 		int				m_iMinutes;
 		int				m_iWeekDaysBits;
@@ -63,7 +59,7 @@ public:
 		time_t			m_tLastExecuted;
 
 	public:
-						Task(int iID, int iHours, int iMinutes, int iWeekDaysBits, ECommand eCommand, 
+						Task(int iHours, int iMinutes, int iWeekDaysBits, ECommand eCommand, 
 							const char* szParam);
 						~Task();
 		friend class	Scheduler;
@@ -77,10 +73,11 @@ private:
 	TaskList			m_TaskList;
 	Mutex				m_mutexTaskList;
 	time_t				m_tLastCheck;
+	bool				m_bDetectClockChanges;
 	bool				m_bDownloadRateChanged;
 	bool				m_bExecuteProcess;
 	bool				m_bPauseDownloadChanged;
-	bool				m_bPausePostProcessChanged;
+	bool				m_bPauseDownload;
 	bool				m_bPauseScanChanged;
 	bool				m_bServerChanged;
 	ServerStatusList	m_ServerStatusList;
@@ -91,7 +88,6 @@ private:
 	void				PrintLog();
 	void				EditServer(bool bActive, const char* szServerList);
 	void				FetchFeed(const char* szFeedList);
-	void				CheckScheduledResume();
 
 public:
 						Scheduler();
@@ -99,6 +95,8 @@ public:
 	void				AddTask(Task* pTask);
 	void				FirstCheck();
 	void				IntervalCheck();
+	bool				GetPauseDownloadChanged() { return m_bPauseDownloadChanged; }
+	bool				GetPauseDownload() { return m_bPauseDownload; }
 };
 
 #endif

ScriptController.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,30 +38,29 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <signal.h>
-#else
-#include <io.h>
 #endif
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <algorithm>
 
 #include "nzbget.h"
-#include "Script.h"
+#include "ScriptController.h"
 #include "Log.h"
 #include "Util.h"
-#include "Options.h"
 
 // System global variable holding environments variables
 extern char** environ;
 
 extern Options* g_pOptions;
 extern char* (*g_szEnvironmentVariables)[];
+extern DownloadQueueHolder* g_pDownloadQueueHolder;
 
-ScriptController::RunningScripts ScriptController::m_RunningScripts;
-Mutex ScriptController::m_mutexRunning;
+static const int POSTPROCESS_PARCHECK = 92;
+static const int POSTPROCESS_SUCCESS = 93;
+static const int POSTPROCESS_ERROR = 94;
+static const int POSTPROCESS_NONE = 95;
 
 #ifndef WIN32
 #define CHILD_WATCHDOG 1
@@ -201,12 +200,7 @@ ScriptController::ScriptController()
 	m_szLogPrefix = NULL;
 	m_bTerminated = false;
 	m_bDetached = false;
-	m_hProcess = 0;
 	m_environmentStrings.InitFromCurrentProcess();
-
-	m_mutexRunning.Lock();
-	m_RunningScripts.push_back(this);
-	m_mutexRunning.Unlock();
 }
 
 ScriptController::~ScriptController()
@@ -219,15 +213,6 @@ ScriptController::~ScriptController()
 		}
 		free(m_szArgs);
 	}
-
-	UnregisterRunningScript();
-}
-
-void ScriptController::UnregisterRunningScript()
-{
-	m_mutexRunning.Lock();
-	m_RunningScripts.erase(std::find(m_RunningScripts.begin(), m_RunningScripts.end(), this));
-	m_mutexRunning.Unlock();
 }
 
 void ScriptController::ResetEnv()
@@ -280,6 +265,41 @@ void ScriptController::PrepareEnvOptions(const char* szStripPrefix)
 	g_pOptions->UnlockOptEntries();
 }
 
+/**
+ * If szStripPrefix is not NULL, only pp-parameters, whose names start with the prefix
+ * are processed. The prefix is then stripped from the names.
+ * If szStripPrefix is NULL, all pp-parameters are processed; without stripping.
+ */
+void ScriptController::PrepareEnvParameters(NZBInfo* pNZBInfo, const char* szStripPrefix)
+{
+	int iPrefixLen = szStripPrefix ? strlen(szStripPrefix) : 0;
+
+	for (NZBParameterList::iterator it = pNZBInfo->GetParameters()->begin(); it != pNZBInfo->GetParameters()->end(); it++)
+	{
+		NZBParameter* pParameter = *it;
+		const char* szValue = pParameter->GetValue();
+		
+#ifdef WIN32
+		char* szAnsiValue = strdup(szValue);
+		WebUtil::Utf8ToAnsi(szAnsiValue, strlen(szAnsiValue) + 1);
+		szValue = szAnsiValue;
+#endif
+
+		if (szStripPrefix && !strncmp(pParameter->GetName(), szStripPrefix, iPrefixLen) && (int)strlen(pParameter->GetName()) > iPrefixLen)
+		{
+			SetEnvVarSpecial("NZBPR", pParameter->GetName() + iPrefixLen, szValue);
+		}
+		else if (!szStripPrefix)
+		{
+			SetEnvVarSpecial("NZBPR", pParameter->GetName(), szValue);
+		}
+
+#ifdef WIN32
+		free(szAnsiValue);
+#endif
+	}
+}
+
 void ScriptController::SetEnvVarSpecial(const char* szPrefix, const char* szName, const char* szValue)
 {
 	char szVarname[1024];
@@ -577,7 +597,7 @@ int ScriptController::Execute()
 	}
 	while (pWatchDog->IsRunning())
 	{
-		usleep(5 * 1000);
+		usleep(1 * 1000);
 	}
 	delete pWatchDog;
 #endif
@@ -632,11 +652,6 @@ void ScriptController::Terminate()
 
 #ifdef WIN32
 	BOOL bOK = TerminateProcess(m_hProcess, -1);
-	if (bOK)
-	{
-		// wait 60 seconds for process to terminate
-		WaitForSingleObject(m_hProcess, 60 * 1000);
-	}
 #else
 	pid_t hKillProcess = m_hProcess;
 	if (getpgid(hKillProcess) == hKillProcess)
@@ -644,7 +659,7 @@ void ScriptController::Terminate()
 		// if the child process has its own group (setsid() was successful), kill the whole group
 		hKillProcess = -hKillProcess;
 	}
-	bool bOK = hKillProcess && kill(hKillProcess, SIGKILL) == 0;
+	bool bOK = kill(hKillProcess, SIGKILL) == 0;
 #endif
 
 	if (bOK)
@@ -659,20 +674,6 @@ void ScriptController::Terminate()
 	debug("Stopped %s", m_szInfoName);
 }
 
-void ScriptController::TerminateAll()
-{
-	m_mutexRunning.Lock();
-	for (RunningScripts::iterator it = m_RunningScripts.begin(); it != m_RunningScripts.end(); it++)
-	{
-		ScriptController* pScript = *it;
-		if (pScript->m_hProcess && !pScript->m_bDetached)
-		{
-			pScript->Terminate();
-		}
-	}
-	m_mutexRunning.Unlock();
-}
-
 void ScriptController::Detach()
 {
 	debug("Detaching %s", m_szInfoName);
@@ -777,3 +778,465 @@ void ScriptController::PrintMessage(Message::EKind eKind, const char* szFormat,
 
 	AddMessage(eKind, tmp3);
 }
+
+void PostScriptController::StartJob(PostInfo* pPostInfo)
+{
+	PostScriptController* pScriptController = new PostScriptController();
+	pScriptController->m_pPostInfo = pPostInfo;
+	pScriptController->SetWorkingDir(g_pOptions->GetDestDir());
+	pScriptController->SetAutoDestroy(false);
+	pScriptController->m_iPrefixLen = 0;
+
+	pPostInfo->SetPostThread(pScriptController);
+
+	pScriptController->Start();
+}
+
+void PostScriptController::Run()
+{
+	FileList activeList;
+
+	// the locking is needed for accessing the members of NZBInfo
+	g_pDownloadQueueHolder->LockQueue();
+	for (NZBParameterList::iterator it = m_pPostInfo->GetNZBInfo()->GetParameters()->begin(); it != m_pPostInfo->GetNZBInfo()->GetParameters()->end(); it++)
+	{
+		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")))
+		{
+			char* szScriptName = strdup(szVarname);
+			szScriptName[strlen(szScriptName)-1] = '\0'; // remove trailing ':'
+			activeList.push_back(szScriptName);
+		}
+	}
+	m_pPostInfo->GetNZBInfo()->GetScriptStatuses()->Clear();
+	g_pDownloadQueueHolder->UnlockQueue();
+
+	Options::ScriptList scriptList;
+	g_pOptions->LoadScriptList(&scriptList);
+
+	for (Options::ScriptList::iterator it = scriptList.begin(); it != scriptList.end(); it++)
+	{
+		Options::Script* pScript = *it;
+		for (FileList::iterator it2 = activeList.begin(); it2 != activeList.end(); it2++)
+		{
+			char* szActiveName = *it2;
+			// if any script has requested par-check, do not execute other scripts
+			if (Util::SameFilename(pScript->GetName(), szActiveName) && !m_pPostInfo->GetRequestParCheck())
+			{
+				ExecuteScript(pScript->GetName(), pScript->GetDisplayName(), pScript->GetLocation());
+			}
+		}
+	}
+	
+	for (FileList::iterator it = activeList.begin(); it != activeList.end(); it++)
+	{
+		free(*it);
+	}
+
+	m_pPostInfo->SetStage(PostInfo::ptFinished);
+	m_pPostInfo->SetWorking(false);
+}
+
+void PostScriptController::ExecuteScript(const char* szScriptName, const char* szDisplayName, const char* szLocation)
+{
+	PrintMessage(Message::mkInfo, "Executing post-process-script %s for %s", szScriptName, m_pPostInfo->GetInfoName());
+
+	SetScript(szLocation);
+	SetArgs(NULL, false);
+
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "post-process-script %s for %s", szScriptName, m_pPostInfo->GetInfoName());
+	szInfoName[1024-1] = '\0';
+	SetInfoName(szInfoName);
+
+	SetLogPrefix(szDisplayName);
+	m_iPrefixLen = strlen(szDisplayName) + 2; // 2 = strlen(": ");
+	PrepareParams(szScriptName);
+
+	int iExitCode = Execute();
+
+	szInfoName[0] = 'P'; // uppercase
+
+	SetLogPrefix(NULL);
+	ScriptStatus::EStatus eStatus = AnalyseExitCode(iExitCode);
+	
+	// the locking is needed for accessing the members of NZBInfo
+	g_pDownloadQueueHolder->LockQueue();
+	m_pPostInfo->GetNZBInfo()->GetScriptStatuses()->Add(szScriptName, eStatus);
+	g_pDownloadQueueHolder->UnlockQueue();
+}
+
+void PostScriptController::PrepareParams(const char* szScriptName)
+{
+	// the locking is needed for accessing the members of NZBInfo
+	g_pDownloadQueueHolder->LockQueue();
+
+	// Reset
+	ResetEnv();
+
+	SetEnvVar("NZBPP_NZBNAME", m_pPostInfo->GetNZBInfo()->GetName());
+	SetEnvVar("NZBPP_DIRECTORY", m_pPostInfo->GetNZBInfo()->GetDestDir());
+	SetEnvVar("NZBPP_NZBFILENAME", m_pPostInfo->GetNZBInfo()->GetFilename());
+	SetEnvVar("NZBPP_FINALDIR", m_pPostInfo->GetNZBInfo()->GetFinalDir());
+	SetEnvVar("NZBPP_CATEGORY", m_pPostInfo->GetNZBInfo()->GetCategory());
+	SetIntEnvVar("NZBPP_HEALTH", m_pPostInfo->GetNZBInfo()->CalcHealth());
+	SetIntEnvVar("NZBPP_CRITICALHEALTH", m_pPostInfo->GetNZBInfo()->CalcCriticalHealth());
+
+	int iParStatus[] = { 0, 0, 1, 2, 3, 4 };
+	SetIntEnvVar("NZBPP_PARSTATUS", iParStatus[m_pPostInfo->GetNZBInfo()->GetParStatus()]);
+
+	int iUnpackStatus[] = { 0, 0, 1, 2, 3, 4 };
+	SetIntEnvVar("NZBPP_UNPACKSTATUS", iUnpackStatus[m_pPostInfo->GetNZBInfo()->GetUnpackStatus()]);
+
+	SetIntEnvVar("NZBPP_NZBID", m_pPostInfo->GetNZBInfo()->GetID());
+	SetIntEnvVar("NZBPP_HEALTHDELETED", (int)m_pPostInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsHealth);
+	SetIntEnvVar("NZBPP_TOTALARTICLES", (int)m_pPostInfo->GetNZBInfo()->GetTotalArticles());
+	SetIntEnvVar("NZBPP_SUCCESSARTICLES", (int)m_pPostInfo->GetNZBInfo()->GetSuccessArticles());
+	SetIntEnvVar("NZBPP_FAILEDARTICLES", (int)m_pPostInfo->GetNZBInfo()->GetFailedArticles());
+
+	for (ServerStatList::iterator it = m_pPostInfo->GetNZBInfo()->GetServerStats()->begin(); it != m_pPostInfo->GetNZBInfo()->GetServerStats()->end(); it++)
+	{
+		ServerStat* pServerStat = *it;
+
+		char szName[50];
+
+		snprintf(szName, 50, "NZBPP_SERVER%i_SUCCESSARTICLES", pServerStat->GetServerID());
+		szName[50-1] = '\0';
+		SetIntEnvVar(szName, pServerStat->GetSuccessArticles());
+
+		snprintf(szName, 50, "NZBPP_SERVER%i_FAILEDARTICLES", pServerStat->GetServerID());
+		szName[50-1] = '\0';
+		SetIntEnvVar(szName, pServerStat->GetFailedArticles());
+	}
+
+	PrepareEnvParameters(m_pPostInfo->GetNZBInfo(), NULL);
+
+	char szParamPrefix[1024];
+	snprintf(szParamPrefix, 1024, "%s:", szScriptName);
+	szParamPrefix[1024-1] = '\0';
+	PrepareEnvParameters(m_pPostInfo->GetNZBInfo(), szParamPrefix);
+	PrepareEnvOptions(szParamPrefix);
+	
+	g_pDownloadQueueHolder->UnlockQueue();
+}
+
+ScriptStatus::EStatus PostScriptController::AnalyseExitCode(int iExitCode)
+{
+	// The ScriptStatus is accumulated for all scripts:
+	// If any script has failed the status is "failure", etc.
+
+	switch (iExitCode)
+	{
+		case POSTPROCESS_SUCCESS:
+			PrintMessage(Message::mkInfo, "%s successful", GetInfoName());
+			return ScriptStatus::srSuccess;
+
+		case POSTPROCESS_ERROR:
+		case -1: // Execute() returns -1 if the process could not be started (file not found or other problem)
+			PrintMessage(Message::mkError, "%s failed", GetInfoName());
+			return ScriptStatus::srFailure;
+
+		case POSTPROCESS_NONE:
+			PrintMessage(Message::mkInfo, "%s skipped", GetInfoName());
+			return ScriptStatus::srNone;
+
+#ifndef DISABLE_PARCHECK
+		case POSTPROCESS_PARCHECK:
+			if (m_pPostInfo->GetNZBInfo()->GetParStatus() > NZBInfo::psSkipped)
+			{
+				PrintMessage(Message::mkError, "%s requested par-check/repair, but the collection was already checked", GetInfoName());
+				return ScriptStatus::srFailure;
+			}
+			else
+			{
+				PrintMessage(Message::mkInfo, "%s requested par-check/repair", GetInfoName());
+				m_pPostInfo->SetRequestParCheck(true);
+				return ScriptStatus::srSuccess;
+			}
+			break;
+#endif
+
+		default:
+			PrintMessage(Message::mkError, "%s failed (terminated with unknown status)", GetInfoName());
+			return ScriptStatus::srFailure;
+	}
+}
+
+void PostScriptController::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, "FINALDIR=", 9))
+		{
+			g_pDownloadQueueHolder->LockQueue();
+			m_pPostInfo->GetNZBInfo()->SetFinalDir(szMsgText + 6 + 9);
+			g_pDownloadQueueHolder->UnlockQueue();
+		}
+		else if (!strncmp(szMsgText + 6, "NZBPR_", 6))
+		{
+			char* szParam = strdup(szMsgText + 6 + 6);
+			char* szValue = strchr(szParam, '=');
+			if (szValue)
+			{
+				*szValue = '\0';
+				g_pDownloadQueueHolder->LockQueue();
+				m_pPostInfo->GetNZBInfo()->GetParameters()->SetParameter(szParam, szValue + 1);
+				g_pDownloadQueueHolder->UnlockQueue();
+			}
+			else
+			{
+				error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
+			}
+			free(szParam);
+		}
+		else
+		{
+			error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
+		}
+	}
+	else if (!strncmp(szMsgText, "[HISTORY] ", 10))
+	{
+		m_pPostInfo->GetNZBInfo()->AppendMessage(eKind, 0, szMsgText);
+	}
+	else
+	{
+		ScriptController::AddMessage(eKind, szText);
+		m_pPostInfo->AppendMessage(eKind, szText);
+	}
+
+	if (g_pOptions->GetPausePostProcess())
+	{
+		time_t tStageTime = m_pPostInfo->GetStageTime();
+		time_t tStartTime = m_pPostInfo->GetStartTime();
+		time_t tWaitTime = time(NULL);
+
+		// wait until Post-processor is unpaused
+		while (g_pOptions->GetPausePostProcess() && !IsStopped())
+		{
+			usleep(100 * 1000);
+
+			// update time stamps
+
+			time_t tDelta = time(NULL) - tWaitTime;
+
+			if (tStageTime > 0)
+			{
+				m_pPostInfo->SetStageTime(tStageTime + tDelta);
+			}
+
+			if (tStartTime > 0)
+			{
+				m_pPostInfo->SetStartTime(tStartTime + tDelta);
+			}
+		}
+	}
+}
+
+void PostScriptController::Stop()
+{
+	debug("Stopping post-process-script");
+	Thread::Stop();
+	Terminate();
+}
+
+
+void NZBScriptController::ExecuteScript(const char* szScript, const char* szNZBFilename, 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));
+
+	NZBScriptController* pScriptController = new NZBScriptController();
+	pScriptController->SetScript(szScript);
+	pScriptController->m_pNZBName = pNZBName;
+	pScriptController->m_pCategory = pCategory;
+	pScriptController->m_pParameters = pParameters;
+	pScriptController->m_iPriority = iPriority;
+	pScriptController->m_bAddTop = bAddTop;
+	pScriptController->m_bAddPaused = bAddPaused;
+
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "nzb-process-script for %s", Util::BaseFileName(szNZBFilename));
+	szInfoName[1024-1] = '\0';
+	pScriptController->SetInfoName(szInfoName);
+
+	pScriptController->SetEnvVar("NZBNP_FILENAME", szNZBFilename);
+	pScriptController->SetEnvVar("NZBNP_NZBNAME", strlen(*pNZBName) > 0 ? *pNZBName : Util::BaseFileName(szNZBFilename));
+	pScriptController->SetEnvVar("NZBNP_CATEGORY", *pCategory);
+	pScriptController->SetIntEnvVar("NZBNP_PRIORITY", *iPriority);
+	pScriptController->SetIntEnvVar("NZBNP_TOP", *bAddTop ? 1 : 0);
+	pScriptController->SetIntEnvVar("NZBNP_PAUSED", *bAddPaused ? 1 : 0);
+
+	// remove trailing slash
+	char szDir[1024];
+	strncpy(szDir, szDirectory, 1024);
+	szDir[1024-1] = '\0';
+	int iLen = strlen(szDir);
+	if (szDir[iLen-1] == PATH_SEPARATOR)
+	{
+		szDir[iLen-1] = '\0';
+	}
+	pScriptController->SetEnvVar("NZBNP_DIRECTORY", szDir);
+
+	char szLogPrefix[1024];
+	strncpy(szLogPrefix, Util::BaseFileName(szScript), 1024);
+	szLogPrefix[1024-1] = '\0';
+	if (char* ext = strrchr(szLogPrefix, '.')) *ext = '\0'; // strip file extension
+	pScriptController->SetLogPrefix(szLogPrefix);
+	pScriptController->m_iPrefixLen = strlen(szLogPrefix) + 2; // 2 = strlen(": ");
+
+	pScriptController->Execute();
+
+	delete pScriptController;
+}
+
+void NZBScriptController::AddMessage(Message::EKind eKind, const char* szText)
+{
+	szText = szText + m_iPrefixLen;
+
+	if (!strncmp(szText, "[NZB] ", 6))
+	{
+		debug("Command %s detected", szText + 6);
+		if (!strncmp(szText + 6, "NZBNAME=", 8))
+		{
+			free(*m_pNZBName);
+			*m_pNZBName = strdup(szText + 6 + 8);
+		}
+		else if (!strncmp(szText + 6, "CATEGORY=", 9))
+		{
+			free(*m_pCategory);
+			*m_pCategory = strdup(szText + 6 + 9);
+		}
+		else if (!strncmp(szText + 6, "NZBPR_", 6))
+		{
+			char* szParam = strdup(szText + 6 + 6);
+			char* szValue = strchr(szParam, '=');
+			if (szValue)
+			{
+				*szValue = '\0';
+				m_pParameters->SetParameter(szParam, szValue + 1);
+			}
+			else
+			{
+				error("Invalid command \"%s\" received from %s", szText, GetInfoName());
+			}
+			free(szParam);
+		}
+		else if (!strncmp(szText + 6, "PRIORITY=", 9))
+		{
+			*m_iPriority = atoi(szText + 6 + 9);
+		}
+		else if (!strncmp(szText + 6, "TOP=", 4))
+		{
+			*m_bAddTop = atoi(szText + 6 + 4) != 0;
+		}
+		else if (!strncmp(szText + 6, "PAUSED=", 7))
+		{
+			*m_bAddPaused = atoi(szText + 6 + 7) != 0;
+		}
+		else
+		{
+			error("Invalid command \"%s\" received from %s", szText, GetInfoName());
+		}
+	}
+	else
+	{
+		ScriptController::AddMessage(eKind, szText);
+	}
+}
+
+void NZBAddedScriptController::StartScript(DownloadQueue* pDownloadQueue, NZBInfo *pNZBInfo, const char* szScript)
+{
+	NZBAddedScriptController* pScriptController = new NZBAddedScriptController();
+	pScriptController->SetScript(szScript);
+	pScriptController->m_szNZBName = strdup(pNZBInfo->GetName());
+	pScriptController->SetEnvVar("NZBNA_NZBNAME", pNZBInfo->GetName());
+	// "NZBNA_NAME" is not correct but kept for compatibility with older versions where this name was used by mistake
+	pScriptController->SetEnvVar("NZBNA_NAME", pNZBInfo->GetName());
+	pScriptController->SetEnvVar("NZBNA_FILENAME", pNZBInfo->GetFilename());
+	pScriptController->SetEnvVar("NZBNA_CATEGORY", pNZBInfo->GetCategory());
+
+	int iLastID = 0;
+	int iMaxPriority = 0;
+
+	for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+    {
+        FileInfo* pFileInfo = *it;
+		if (pFileInfo->GetNZBInfo() == pNZBInfo && ( pFileInfo->GetPriority() > iMaxPriority || iLastID == 0))
+		{
+			iMaxPriority = pFileInfo->GetPriority();
+		}
+		if (pFileInfo->GetNZBInfo() == pNZBInfo && pFileInfo->GetID() > iLastID)
+		{
+			iLastID = pFileInfo->GetID();
+		}
+	}
+
+	pScriptController->SetIntEnvVar("NZBNA_LASTID", iLastID);
+	pScriptController->SetIntEnvVar("NZBNA_PRIORITY", iMaxPriority);
+
+	pScriptController->PrepareEnvParameters(pNZBInfo, NULL);
+
+	pScriptController->SetAutoDestroy(true);
+
+	pScriptController->Start();
+}
+
+void NZBAddedScriptController::Run()
+{
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "nzb-added process-script for %s", m_szNZBName);
+	szInfoName[1024-1] = '\0';
+	SetInfoName(szInfoName);
+
+	info("Executing %s", szInfoName);
+
+	char szLogPrefix[1024];
+	strncpy(szLogPrefix, Util::BaseFileName(GetScript()), 1024);
+	szLogPrefix[1024-1] = '\0';
+	if (char* ext = strrchr(szLogPrefix, '.')) *ext = '\0'; // strip file extension
+	SetLogPrefix(szLogPrefix);
+
+	Execute();
+
+	free(m_szNZBName);
+}
+
+void SchedulerScriptController::StartScript(const char* szCommandLine)
+{
+	char** argv = NULL;
+	if (!Util::SplitCommandLine(szCommandLine, &argv))
+	{
+		error("Could not execute scheduled process-script, failed to parse command line: %s", szCommandLine);
+		return;
+	}
+
+	info("Executing scheduled process-script %s", Util::BaseFileName(argv[0]));
+
+	SchedulerScriptController* pScriptController = new SchedulerScriptController();
+	pScriptController->SetScript(argv[0]);
+	pScriptController->SetArgs((const char**)argv, true);
+	pScriptController->SetAutoDestroy(true);
+
+	pScriptController->Start();
+}
+
+void SchedulerScriptController::Run()
+{
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "scheduled process-script %s", Util::BaseFileName(GetScript()));
+	szInfoName[1024-1] = '\0';
+	SetInfoName(szInfoName);
+
+	char szLogPrefix[1024];
+	strncpy(szLogPrefix, Util::BaseFileName(GetScript()), 1024);
+	szLogPrefix[1024-1] = '\0';
+	if (char* ext = strrchr(szLogPrefix, '.')) *ext = '\0'; // strip file extension
+	SetLogPrefix(szLogPrefix);
+
+	Execute();
+}

ScriptController.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,13 +23,15 @@
  */
 
 
-#ifndef SCRIPT_H
-#define SCRIPT_H
+#ifndef SCRIPTCONTROLLER_H
+#define SCRIPTCONTROLLER_H
 
-#include <vector>
+#include <list>
 
-#include "Thread.h"
 #include "Log.h"
+#include "Thread.h"
+#include "DownloadInfo.h"
+#include "Options.h"
 
 class EnvironmentStrings
 {
@@ -72,10 +74,6 @@ private:
 	pid_t				m_hProcess;
 #endif
 
-	typedef std::vector<ScriptController*>	RunningScripts;
-	static RunningScripts	m_RunningScripts;
-	static Mutex			m_mutexRunning;
-
 protected:
 	void				ProcessOutput(char* szText);
 	virtual bool		ReadLine(char* szBuf, int iBufSize, FILE* pStream);
@@ -84,8 +82,8 @@ protected:
 	bool				GetTerminated() { return m_bTerminated; }
 	void				ResetEnv();
 	void				PrepareEnvOptions(const char* szStripPrefix);
+	void				PrepareEnvParameters(NZBInfo* pNZBInfo, const char* szStripPrefix);
 	void				PrepareArgs();
-	void				UnregisterRunningScript();
 
 public:
 						ScriptController();
@@ -93,7 +91,6 @@ public:
 	int					Execute();
 	void				Terminate();
 	void				Detach();
-	static void			TerminateAll();
 
 	void				SetScript(const char* szScript) { m_szScript = szScript; }
 	const char*			GetScript() { return m_szScript; }
@@ -107,4 +104,64 @@ public:
 	void				SetIntEnvVar(const char* szName, int iValue);
 };
 
+class PostScriptController : public Thread, public ScriptController
+{
+private:
+	PostInfo*			m_pPostInfo;
+	char				m_szNZBName[1024];
+ 	int					m_iPrefixLen;
+
+	void				ExecuteScript(const char* szScriptName, const char* szDisplayName, const char* szLocation);
+	void				PrepareParams(const char* szScriptName);
+	ScriptStatus::EStatus	AnalyseExitCode(int iExitCode);
+
+	typedef std::deque<char*>		FileList;
+
+protected:
+	virtual void		AddMessage(Message::EKind eKind, const char* szText);
+
+public:
+	virtual void		Run();
+	virtual void		Stop();
+	static void			StartJob(PostInfo* pPostInfo);
+	static void			InitParamsForNewNZB(NZBInfo* pNZBInfo);
+};
+
+class NZBScriptController : public ScriptController
+{
+private:
+	char**				m_pNZBName;
+	char**				m_pCategory;
+	int*				m_iPriority;
+	NZBParameterList*	m_pParameters;
+	bool*				m_bAddTop;
+	bool*				m_bAddPaused;
+	int					m_iPrefixLen;
+
+protected:
+	virtual void		AddMessage(Message::EKind eKind, const char* szText);
+
+public:
+	static void			ExecuteScript(const char* szScript, const char* szNZBFilename, const char* szDirectory,
+							char** pNZBName, char** pCategory, int* iPriority, NZBParameterList* pParameters,
+							bool* bAddTop, bool* bAddPaused);
+};
+
+class NZBAddedScriptController : public Thread, public ScriptController
+{
+private:
+	char*				m_szNZBName;
+
+public:
+	virtual void		Run();
+	static void			StartScript(DownloadQueue* pDownloadQueue, NZBInfo *pNZBInfo, const char* szScript);
+};
+
+class SchedulerScriptController : public Thread, public ScriptController
+{
+public:
+	virtual void		Run();
+	static void			StartScript(const char* szCommandLine);
+};
+
 #endif

ServerPool.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -42,6 +42,7 @@
 
 #include "nzbget.h"
 #include "ServerPool.h"
+#include "Log.h"
 
 static const int CONNECTION_HOLD_SECODNS = 5;
 
@@ -58,16 +59,12 @@ ServerPool::ServerPool()
 	m_iMaxNormLevel = 0;
 	m_iTimeout = 60;
 	m_iGeneration = 0;
-
-	g_pLog->RegisterDebuggable(this);
 }
 
 ServerPool::~ ServerPool()
 {
 	debug("Destroying ServerPool");
 
-	g_pLog->UnregisterDebuggable(this);
-
 	m_Levels.clear();
 
 	for (Servers::iterator it = m_Servers.begin(); it != m_Servers.end(); it++)
@@ -330,33 +327,34 @@ void ServerPool::Changed()
 
 void ServerPool::LogDebugInfo()
 {
-	info("   ---------- ServerPool");
+	debug("   ServerPool");
+	debug("   ----------------");
 
-	info("    Max-Level: %i", m_iMaxNormLevel);
+	debug("    Max-Level: %i", m_iMaxNormLevel);
 
 	m_mutexConnections.Lock();
 
-	info("    Servers: %i", m_Servers.size());
+	debug("    Servers: %i", m_Servers.size());
 	for (Servers::iterator it = m_Servers.begin(); it != m_Servers.end(); it++)
 	{
 		NewsServer*  pNewsServer = *it;
-		info("      %i) %s (%s): Level=%i, NormLevel=%i", pNewsServer->GetID(), pNewsServer->GetName(),
+		debug("      %i) %s (%s): Level=%i, NormLevel=%i", pNewsServer->GetID(), pNewsServer->GetName(),
 			pNewsServer->GetHost(), pNewsServer->GetLevel(), pNewsServer->GetNormLevel());
 	}
 
-	info("    Levels: %i", m_Levels.size());
+	debug("    Levels: %i", m_Levels.size());
 	int index = 0;
 	for (Levels::iterator it = m_Levels.begin(); it != m_Levels.end(); it++, index++)
 	{
 		int  iSize = *it;
-		info("      %i: Free connections=%i", index, iSize);
+		debug("      %i: Size=%i", index, iSize);
 	}
 
-	info("    Connections: %i", m_Connections.size());
+	debug("    Connections: %i", m_Connections.size());
 	for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
 	{
 		PooledConnection*  pConnection = *it;
-		info("      %i) %s (%s): Level=%i, NormLevel=%i, InUse:%i", pConnection->GetNewsServer()->GetID(),
+		debug("      %i) %s (%s): Level=%i, NormLevel=%i, InUse:%i", pConnection->GetNewsServer()->GetID(),
 			pConnection->GetNewsServer()->GetName(), pConnection->GetNewsServer()->GetHost(),
 			pConnection->GetNewsServer()->GetLevel(), pConnection->GetNewsServer()->GetNormLevel(),
 			(int)pConnection->GetInUse());

ServerPool.h

@@ -30,12 +30,11 @@
 #include <vector>
 #include <time.h>
 
-#include "Log.h"
 #include "Thread.h"
 #include "NewsServer.h"
 #include "NNTPConnection.h"
 
-class ServerPool : public Debuggable
+class ServerPool
 {
 private:
 	class PooledConnection : public NNTPConnection
@@ -66,9 +65,6 @@ private:
 	void				NormalizeLevels();
 	static bool			CompareServers(NewsServer* pServer1, NewsServer* pServer2);
 
-protected:
-	virtual void			LogDebugInfo();
-
 public:
 						ServerPool();
 						~ServerPool();
@@ -82,6 +78,8 @@ public:
 	void				CloseUnusedConnections();
 	void				Changed();
 	int					GetGeneration() { return m_iGeneration; }
+
+	void				LogDebugInfo();
 };
 
 #endif

Unpack.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -45,9 +45,9 @@
 #include "Log.h"
 #include "Util.h"
 #include "ParCoordinator.h"
-#include "Options.h"
 
 extern Options* g_pOptions;
+extern DownloadQueueHolder* g_pDownloadQueueHolder;
 
 void UnpackController::FileList::Clear()
 {
@@ -85,10 +85,8 @@ void UnpackController::StartJob(PostInfo* pPostInfo)
 
 void UnpackController::Run()
 {
-	time_t tStart = time(NULL);
-
 	// the locking is needed for accessing the members of NZBInfo
-	DownloadQueue::Lock();
+	g_pDownloadQueueHolder->LockQueue();
 
 	strncpy(m_szDestDir, m_pPostInfo->GetNZBInfo()->GetDestDir(), 1024);
 	m_szDestDir[1024-1] = '\0';
@@ -100,7 +98,7 @@ void UnpackController::Run()
 	m_szPassword[0] = '\0';
 	m_szFinalDir[0] = '\0';
 	m_bFinalDirCreated = false;
-
+	
 	NZBParameter* pParameter = m_pPostInfo->GetNZBInfo()->GetParameters()->Find("*Unpack:", false);
 	bool bUnpack = !(pParameter && !strcasecmp(pParameter->GetValue(), "no"));
 
@@ -111,7 +109,7 @@ void UnpackController::Run()
 		m_szPassword[1024-1] = '\0';
 	}
 	
-	DownloadQueue::Unlock();
+	g_pDownloadQueueHolder->UnlockQueue();
 
 	snprintf(m_szInfoName, 1024, "unpack for %s", m_szName);
 	m_szInfoName[1024-1] = '\0';
@@ -129,24 +127,20 @@ void UnpackController::Run()
 		CheckArchiveFiles(bScanNonStdFiles);
 	}
 
-	SetInfoName(m_szInfoName);
-	SetWorkingDir(m_szDestDir);
-
-	bool bHasFiles = m_bHasRarFiles || m_bHasNonStdRarFiles || m_bHasSevenZipFiles || m_bHasSevenZipMultiFiles || m_bHasSplittedFiles;
-
-	if (bUnpack && bHasFiles)
+	if (bUnpack && (m_bHasRarFiles || m_bHasNonStdRarFiles || m_bHasSevenZipFiles || m_bHasSevenZipMultiFiles))
 	{
-		m_bUnpackOK = true;
-		m_bUnpackStartError = false;
-		m_bUnpackSpaceError = false;
-		m_bUnpackPasswordError4 = false;
-		m_bUnpackPasswordError5 = false;
-		m_bAutoTerminated = false;
+		SetInfoName(m_szInfoName);
+		SetWorkingDir(m_szDestDir);
 
 		PrintMessage(Message::mkInfo, "Unpacking %s", m_szName);
 
 		CreateUnpackDir();
 
+		m_bUnpackOK = true;
+		m_bUnpackStartError = false;
+		m_bUnpackSpaceError = false;
+		m_bUnpackPasswordError = false;
+
 		if (m_bHasRarFiles || m_bHasNonStdRarFiles)
 		{
 			ExecuteUnrar();
@@ -162,14 +156,7 @@ void UnpackController::Run()
 			ExecuteSevenZip(true);
 		}
 
-		if (m_bHasSplittedFiles && m_bUnpackOK)
-		{
-			JoinSplittedFiles();
-		}
-
 		Completed();
-
-		m_JoinedFiles.Clear();
 	}
 	else
 	{
@@ -179,7 +166,7 @@ void UnpackController::Run()
 		if (bUnpack && m_pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped && 
 			m_pPostInfo->GetNZBInfo()->GetRenameStatus() <= NZBInfo::rsSkipped && m_bHasParFiles)
 		{
-			RequestParCheck(false);
+			RequestParCheck();
 		}
 		else
 #endif
@@ -189,9 +176,6 @@ void UnpackController::Run()
 		}
 	}
 
-	int iUnpackSec = (int)(time(NULL) - tStart);
-	m_pPostInfo->GetNZBInfo()->SetUnpackSec(m_pPostInfo->GetNZBInfo()->GetUnpackSec() + iUnpackSec);
-
 	m_pPostInfo->SetWorking(false);
 }
 
@@ -209,17 +193,11 @@ void UnpackController::ExecuteUnrar()
 	if (strlen(m_szPassword) > 0)
 	{
 		snprintf(szPasswordParam, 1024, "-p%s", m_szPassword);
-		szPasswordParam[1024-1] = '\0';
 		szArgs[3] = szPasswordParam;
 	}
 	szArgs[4] = "-o+";
 	szArgs[5] = m_bHasNonStdRarFiles ? "*.*" : "*.rar";
-
-	char szUnpackDirParam[1024];
-	snprintf(szUnpackDirParam, 1024, "%s%c", m_szUnpackDir, PATH_SEPARATOR);
-	szUnpackDirParam[1024-1] = '\0';
-	szArgs[6] = szUnpackDirParam;
-
+	szArgs[6] = m_szUnpackDir;
 	szArgs[7] = NULL;
 	SetArgs(szArgs, false);
 
@@ -228,7 +206,7 @@ void UnpackController::ExecuteUnrar()
 
 	m_bAllOKMessageReceived = false;
 	m_eUnpacker = upUnrar;
-
+	
 	SetProgressLabel("");
 	int iExitCode = Execute();
 	SetLogPrefix(NULL);
@@ -237,7 +215,7 @@ void UnpackController::ExecuteUnrar()
 	m_bUnpackOK = iExitCode == 0 && m_bAllOKMessageReceived && !GetTerminated();
 	m_bUnpackStartError = iExitCode == -1;
 	m_bUnpackSpaceError = iExitCode == 5;
-	m_bUnpackPasswordError5 |= iExitCode == 11; // only for rar5-archives
+	m_bUnpackPasswordError = iExitCode == 11; // only for rar5-archives
 
 	if (!m_bUnpackOK && iExitCode > 0)
 	{
@@ -262,13 +240,11 @@ void UnpackController::ExecuteSevenZip(bool bMultiVolumes)
 	if (strlen(m_szPassword) > 0)
 	{
 		snprintf(szPasswordParam, 1024, "-p%s", m_szPassword);
-		szPasswordParam[1024-1] = '\0';
 		szArgs[3] = szPasswordParam;
 	}
 
 	char szUnpackDirParam[1024];
 	snprintf(szUnpackDirParam, 1024, "-o%s", m_szUnpackDir);
-	szUnpackDirParam[1024-1] = '\0';
 	szArgs[4] = szUnpackDirParam;
 
 	szArgs[5] = bMultiVolumes ? "*.7z.001" : "*.7z";
@@ -296,179 +272,6 @@ void UnpackController::ExecuteSevenZip(bool bMultiVolumes)
 	}
 }
 
-void UnpackController::JoinSplittedFiles()
-{
-	SetLogPrefix("Join");
-	SetProgressLabel("");
-	m_pPostInfo->SetStageProgress(0);
-
-	// determine groups
-
-	FileList groups;
-	RegEx regExSplitExt(".*\\.[a-z,0-9]{3}\\.001$");
-
-	DirBrowser dir(m_szDestDir);
-	while (const char* filename = dir.Next())
-	{
-		char szFullFilename[1024];
-		snprintf(szFullFilename, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, filename);
-		szFullFilename[1024-1] = '\0';
-
-		if (strcmp(filename, ".") && strcmp(filename, "..") && !Util::DirectoryExists(szFullFilename))
-		{
-			if (regExSplitExt.Match(filename) && !FileHasRarSignature(szFullFilename))
-			{
-				if (!JoinFile(filename))
-				{
-					m_bUnpackOK = false;
-					break;
-				}
-			}
-		}
-	}
-
-	SetLogPrefix(NULL);
-	SetProgressLabel("");
-}
-
-bool UnpackController::JoinFile(const char* szFragBaseName)
-{
-	char szDestBaseName[1024];
-	strncpy(szDestBaseName, szFragBaseName, 1024);
-	szDestBaseName[1024-1] = '\0';
-
-	// trim extension
-	char* szExtension = strrchr(szDestBaseName, '.');
-	*szExtension = '\0';
-
-	char szFullFilename[1024];
-	snprintf(szFullFilename, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, szFragBaseName);
-	szFullFilename[1024-1] = '\0';
-	long long lFirstSegmentSize = Util::FileSize(szFullFilename);
-	long long lDifSegmentSize = 0;
-
-	// Validate joinable file:
-	//  - fragments have continuous numbers (no holes);
-	//  - fragments have the same size (except of the last fragment);
-	//  - the last fragment must be smaller than other fragments,
-	//  if it has the same size it is probably not the last and there are missing fragments.
-
-	RegEx regExSplitExt(".*\\.[a-z,0-9]{3}\\.[0-9]{3}$");
-	int iCount = 0;
-	int iMin = -1;
-	int iMax = -1;
-	int iDifSizeCount = 0;
-	int iDifSizeMin = 999999;
-	DirBrowser dir(m_szDestDir);
-	while (const char* filename = dir.Next())
-	{
-		snprintf(szFullFilename, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, filename);
-		szFullFilename[1024-1] = '\0';
-
-		if (strcmp(filename, ".") && strcmp(filename, "..") && !Util::DirectoryExists(szFullFilename) &&
-			regExSplitExt.Match(filename))
-		{
-			const char* szSegExt = strrchr(filename, '.');
-			int iSegNum = atoi(szSegExt + 1);
-			iCount++;
-			iMin = iSegNum < iMin || iMin == -1 ? iSegNum : iMin;
-			iMax = iSegNum > iMax ? iSegNum : iMax;
-			
-			long long lSegmentSize = Util::FileSize(szFullFilename);
-			if (lSegmentSize != lFirstSegmentSize)
-			{
-				iDifSizeCount++;
-				iDifSizeMin = iSegNum < iDifSizeMin ? iSegNum : iDifSizeMin;
-				lDifSegmentSize = lSegmentSize;
-			}
-		}
-	}
-
-	int iCorrectedCount = iCount - (iMin == 0 ? 1 : 0);
-	if ((iMin > 1) || iCorrectedCount != iMax ||
-		((iDifSizeMin != iCorrectedCount || iDifSizeMin > iMax) &&
-		 m_pPostInfo->GetNZBInfo()->GetParStatus() != NZBInfo::psSuccess))
-	{
-		PrintMessage(Message::mkWarning, "Could not join splitted file %s: missing fragments detected", szDestBaseName);
-		return false;
-	}
-
-	// Now can join
-	PrintMessage(Message::mkInfo, "Joining splitted file %s", szDestBaseName);
-	m_pPostInfo->SetStageProgress(0);
-
-	char szErrBuf[256];
-	char szDestFilename[1024];
-	snprintf(szDestFilename, 1024, "%s%c%s", m_szUnpackDir, PATH_SEPARATOR, szDestBaseName);
-	szDestFilename[1024-1] = '\0';
-
-	FILE* pOutFile = fopen(szDestFilename, FOPEN_WBP);
-	if (!pOutFile)
-	{
-		error("Could not create file %s: %s", szDestFilename, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-		return false;
-	}
-	if (g_pOptions->GetWriteBuffer() > 0)
-	{
-		setvbuf(pOutFile, NULL, _IOFBF, g_pOptions->GetWriteBuffer() * 1024);
-	}
-
-	long long lTotalSize = lFirstSegmentSize * (iCount - 1) + lDifSegmentSize;
-	long long lWritten = 0;
-
-	static const int BUFFER_SIZE = 1024 * 50;
-	char* buffer = (char*)malloc(BUFFER_SIZE);
-
-	bool bOK = true;
-	for (int i = iMin; i <= iMax; i++)
-	{
-		PrintMessage(Message::mkInfo, "Joining from %s.%.3i", szDestBaseName, i);
-
-		char szMessage[1024];
-		snprintf(szMessage, 1024, "Joining from %s.%.3i", szDestBaseName, i);
-		szMessage[1024-1] = '\0';
-		SetProgressLabel(szMessage);
-
-		char szFragFilename[1024];
-		snprintf(szFragFilename, 1024, "%s%c%s.%.3i", m_szDestDir, PATH_SEPARATOR, szDestBaseName, i);
-		szFragFilename[1024-1] = '\0';
-		if (!Util::FileExists(szFragFilename))
-		{
-			break;
-		}
-
-		FILE* pInFile = fopen(szFragFilename, FOPEN_RB);
-		if (pInFile)
-		{
-			int cnt = BUFFER_SIZE;
-			while (cnt == BUFFER_SIZE)
-			{
-				cnt = (int)fread(buffer, 1, BUFFER_SIZE, pInFile);
-				fwrite(buffer, 1, cnt, pOutFile);
-				lWritten += cnt;
-				m_pPostInfo->SetStageProgress(int(lWritten * 1000 / lTotalSize));
-			}
-			fclose(pInFile);
-
-			char szFragFilename[1024];
-			snprintf(szFragFilename, 1024, "%s.%.3i", szDestBaseName, i);
-			szFragFilename[1024-1] = '\0';
-			m_JoinedFiles.push_back(strdup(szFragFilename));
-		}
-		else
-		{
-			error("Could not open file %s", szFragFilename);
-			bOK = false;
-			break;
-		}
-	}
-
-	fclose(pOutFile);
-	free(buffer);
-
-	return bOK;
-}
-
 void UnpackController::Completed()
 {
 	bool bCleanupSuccess = Cleanup();
@@ -488,14 +291,11 @@ void UnpackController::Completed()
 	else
 	{
 #ifndef DISABLE_PARCHECK
-		if (!m_bUnpackOK && 
-			(m_pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped ||
-			 !m_pPostInfo->GetNZBInfo()->GetParFull()) &&
-			!m_bUnpackStartError && !m_bUnpackSpaceError &&
-			(!m_bUnpackPasswordError5 || m_bUnpackPasswordError4) &&
-			(!GetTerminated() || m_bAutoTerminated) && m_bHasParFiles)
+		if (!m_bUnpackOK && m_pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped &&
+			!m_bUnpackStartError && !m_bUnpackSpaceError && !m_bUnpackPasswordError &&
+			!GetTerminated() && m_bHasParFiles)
 		{
-			RequestParCheck(true);
+			RequestParCheck();
 		}
 		else
 #endif
@@ -503,8 +303,7 @@ void UnpackController::Completed()
 			PrintMessage(Message::mkError, "%s failed", m_szInfoNameUp);
 			m_pPostInfo->GetNZBInfo()->SetUnpackStatus(
 				m_bUnpackSpaceError ? NZBInfo::usSpace :
-				m_bUnpackPasswordError5 || (m_bUnpackPasswordError4 && 
-					m_pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psSuccess) ? NZBInfo::usPassword :
+				m_bUnpackPasswordError ? NZBInfo::usPassword :
 				NZBInfo::usFailure);
 			m_pPostInfo->SetStage(PostInfo::ptQueued);
 		}
@@ -512,11 +311,10 @@ void UnpackController::Completed()
 }
 
 #ifndef DISABLE_PARCHECK
-void UnpackController::RequestParCheck(bool bForceRepair)
+void UnpackController::RequestParCheck()
 {
 	PrintMessage(Message::mkInfo, "%s requested par-check/repair", m_szInfoNameUp);
 	m_pPostInfo->SetRequestParCheck(true);
-	m_pPostInfo->SetForceRepair(bForceRepair);
 	m_pPostInfo->SetStage(PostInfo::ptFinished);
 }
 #endif
@@ -552,14 +350,12 @@ void UnpackController::CheckArchiveFiles(bool bScanNonStdFiles)
 	m_bHasNonStdRarFiles = false;
 	m_bHasSevenZipFiles = false;
 	m_bHasSevenZipMultiFiles = false;
-	m_bHasSplittedFiles = false;
 
 	RegEx regExRar(".*\\.rar$");
 	RegEx regExRarMultiSeq(".*\\.(r|s)[0-9][0-9]$");
 	RegEx regExSevenZip(".*\\.7z$");
 	RegEx regExSevenZipMulti(".*\\.7z\\.[0-9]+$");
 	RegEx regExNumExt(".*\\.[0-9]+$");
-	RegEx regExSplitExt(".*\\.[a-z,0-9]{3}\\.[0-9]{3}$");
 
 	DirBrowser dir(m_szDestDir);
 	while (const char* filename = dir.Next())
@@ -570,9 +366,6 @@ void UnpackController::CheckArchiveFiles(bool bScanNonStdFiles)
 
 		if (strcmp(filename, ".") && strcmp(filename, "..") && !Util::DirectoryExists(szFullFilename))
 		{
-			const char* szExt = strchr(filename, '.');
-			int iExtNum = szExt ? atoi(szExt + 1) : -1;
-
 			if (regExRar.Match(filename))
 			{
 				m_bHasRarFiles = true;
@@ -585,16 +378,12 @@ void UnpackController::CheckArchiveFiles(bool bScanNonStdFiles)
 			{
 				m_bHasSevenZipMultiFiles = true;
 			}
-			else if (bScanNonStdFiles && !m_bHasNonStdRarFiles && iExtNum > 1 &&
+			else if (bScanNonStdFiles && !m_bHasNonStdRarFiles &&
 				!regExRarMultiSeq.Match(filename) && regExNumExt.Match(filename) &&
 				FileHasRarSignature(szFullFilename))
 			{
 				m_bHasNonStdRarFiles = true;
 			}
-			else if (regExSplitExt.Match(filename) && (iExtNum == 0 || iExtNum == 1))
-			{
-				m_bHasSplittedFiles = true;
-			}
 		}
 	}
 }
@@ -608,7 +397,7 @@ bool UnpackController::FileHasRarSignature(const char* szFilename)
 
 	int cnt = 0;
 	FILE* infile;
-	infile = fopen(szFilename, FOPEN_RB);
+	infile = fopen(szFilename, "rb");
 	if (infile)
 	{
 		cnt = (int)fread(fileSignature, 1, sizeof(fileSignature), infile);
@@ -655,8 +444,7 @@ bool UnpackController::Cleanup()
 
 				if (!Util::MoveFile(szSrcFile, szDstFile))
 				{
-					char szErrBuf[256];
-					PrintMessage(Message::mkError, "Could not move file %s to %s: %s", szSrcFile, szDstFile, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+					PrintMessage(Message::mkError, "Could not move file %s to %s", szSrcFile, szDstFile);
 					bOK = false;
 				}
 
@@ -665,10 +453,9 @@ bool UnpackController::Cleanup()
 		}
 	}
 
-	char szErrBuf[256];
-	if (bOK && !Util::DeleteDirectoryWithContent(m_szUnpackDir, szErrBuf, sizeof(szErrBuf)))
+	if (bOK && !Util::DeleteDirectoryWithContent(m_szUnpackDir))
 	{
-		PrintMessage(Message::mkError, "Could not delete temporary directory %s: %s", m_szUnpackDir, szErrBuf);
+		PrintMessage(Message::mkError, "Could not remove temporary directory %s", m_szUnpackDir);
 	}
 
 	if (!m_bUnpackOK && m_bFinalDirCreated)
@@ -684,7 +471,6 @@ bool UnpackController::Cleanup()
 		RegEx regExRarMultiSeq(".*\\.[r-z][0-9][0-9]$");
 		RegEx regExSevenZip(".*\\.7z$|.*\\.7z\\.[0-9]+$");
 		RegEx regExNumExt(".*\\.[0-9]+$");
-		RegEx regExSplitExt(".*\\.[a-z,0-9]{3}\\.[0-9]{3}$");
 
 		DirBrowser dir(m_szDestDir);
 		while (const char* filename = dir.Next())
@@ -697,16 +483,14 @@ bool UnpackController::Cleanup()
 				!Util::DirectoryExists(szFullFilename) &&
 				(m_bInterDir || !extractedFiles.Exists(filename)) &&
 				(regExRar.Match(filename) || regExSevenZip.Match(filename) ||
-				 (regExRarMultiSeq.Match(filename) && FileHasRarSignature(szFullFilename)) ||
-				 (m_bHasNonStdRarFiles && regExNumExt.Match(filename) && FileHasRarSignature(szFullFilename)) ||
-				 (m_bHasSplittedFiles && regExSplitExt.Match(filename) && m_JoinedFiles.Exists(filename))))
+				(regExRarMultiSeq.Match(filename) && FileHasRarSignature(szFullFilename)) ||
+				(m_bHasNonStdRarFiles && regExNumExt.Match(filename) && FileHasRarSignature(szFullFilename))))
 			{
 				PrintMessage(Message::mkInfo, "Deleting file %s", filename);
 
 				if (remove(szFullFilename) != 0)
 				{
-					char szErrBuf[256];
-					PrintMessage(Message::mkError, "Could not delete file %s: %s", szFullFilename, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+					PrintMessage(Message::mkError, "Could not delete file %s", szFullFilename);
 				}
 			}
 		}
@@ -820,35 +604,6 @@ void UnpackController::AddMessage(Message::EKind eKind, const char* szText)
 		SetProgressLabel(szText + 7);
 	}
 
-	if (m_eUnpacker == upUnrar &&
-		(!strncmp(szText, "Unrar: Checksum error in the encrypted file", 42) ||
-		 !strncmp(szText, "Unrar: CRC failed in the encrypted file", 39)))
-	{
-		m_bUnpackPasswordError4 = true;
-	}
-
-	if (m_eUnpacker == upUnrar && !strncmp(szText, "Unrar: The specified password is incorrect.'", 43))
-	{
-		m_bUnpackPasswordError5 = true;
-	}
-
-	int iLen = strlen(szText);
-	if (m_eUnpacker == upUnrar && !IsStopped() && (m_bUnpackPasswordError4 || m_bUnpackPasswordError5 ||
-		strstr(szText, " : packed data CRC failed in volume") ||
-		strstr(szText, " : packed data checksum error in volume") ||
-		(iLen > 13 && !strncmp(szText + iLen - 13, " - CRC failed", 13)) ||
-		(iLen > 18 && !strncmp(szText + iLen - 18, " - checksum failed", 18)) ||
-		!strncmp(szText, "Unrar: WARNING: You need to start extraction from a previous volume", 67)))
-	{
-		char szMsgText[1024];
-		snprintf(szMsgText, 1024, "Cancelling %s due to errors", m_szInfoName);
-		szMsgText[1024-1] = '\0';
-		ScriptController::AddMessage(Message::mkWarning, szMsgText);
-		m_pPostInfo->AppendMessage(Message::mkWarning, szMsgText);
-		m_bAutoTerminated = true;
-		Stop();
-	}
-
 	if ((m_eUnpacker == upUnrar && !strncmp(szText, "Unrar: All OK", 13)) ||
 		(m_eUnpacker == upSevenZip && !strncmp(szText, "7-Zip: Everything is Ok", 23)))
 	{
@@ -865,9 +620,9 @@ void UnpackController::Stop()
 
 void UnpackController::SetProgressLabel(const char* szProgressLabel)
 {
-	DownloadQueue::Lock();
+	g_pDownloadQueueHolder->LockQueue();
 	m_pPostInfo->SetProgressLabel(szProgressLabel);
-	DownloadQueue::Unlock();
+	g_pDownloadQueueHolder->UnlockQueue();
 }
 
 
@@ -885,7 +640,7 @@ void MoveController::StartJob(PostInfo* pPostInfo)
 void MoveController::Run()
 {
 	// the locking is needed for accessing the members of NZBInfo
-	DownloadQueue::Lock();
+	g_pDownloadQueueHolder->LockQueue();
 
 	char szNZBName[1024];
 	strncpy(szNZBName, m_pPostInfo->GetNZBInfo()->GetName(), 1024);
@@ -902,7 +657,7 @@ void MoveController::Run()
 	m_pPostInfo->GetNZBInfo()->BuildFinalDirName(m_szDestDir, 1024);
 	m_szDestDir[1024-1] = '\0';
 
-	DownloadQueue::Unlock();
+	g_pDownloadQueueHolder->UnlockQueue();
 
 	info("Moving completed files for %s", szNZBName);
 
@@ -914,10 +669,10 @@ void MoveController::Run()
 	{
 		info("%s successful", szInfoName);
 		// save new dest dir
-		DownloadQueue::Lock();
+		g_pDownloadQueueHolder->LockQueue();
 		m_pPostInfo->GetNZBInfo()->SetDestDir(m_szDestDir);
 		m_pPostInfo->GetNZBInfo()->SetMoveStatus(NZBInfo::msSuccess);
-		DownloadQueue::Unlock();
+		g_pDownloadQueueHolder->UnlockQueue();
 	}
 	else
 	{
@@ -955,15 +710,15 @@ bool MoveController::MoveFiles()
 			PrintMessage(Message::mkInfo, "Moving file %s to %s", Util::BaseFileName(szSrcFile), m_szDestDir);
 			if (!Util::MoveFile(szSrcFile, szDstFile))
 			{
-				PrintMessage(Message::mkError, "Could not move file %s to %s: %s", szSrcFile, szDstFile, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+				PrintMessage(Message::mkError, "Could not move file %s to %s! Errcode: %i", szSrcFile, szDstFile, errno);
 				bOK = false;
 			}
 		}
 	}
 
-	if (bOK && !Util::DeleteDirectoryWithContent(m_szInterDir, szErrBuf, sizeof(szErrBuf)))
+	if (bOK && !Util::DeleteDirectoryWithContent(m_szInterDir))
 	{
-		PrintMessage(Message::mkError, "Could not delete intermediate directory %s: %s", m_szInterDir, szErrBuf);
+		PrintMessage(Message::mkError, "Could not remove intermediate directory %s", m_szInterDir);
 	}
 
 	return bOK;
@@ -984,7 +739,7 @@ void CleanupController::StartJob(PostInfo* pPostInfo)
 void CleanupController::Run()
 {
 	// the locking is needed for accessing the members of NZBInfo
-	DownloadQueue::Lock();
+	g_pDownloadQueueHolder->LockQueue();
 
 	char szNZBName[1024];
 	strncpy(szNZBName, m_pPostInfo->GetNZBInfo()->GetName(), 1024);
@@ -1010,7 +765,7 @@ void CleanupController::Run()
 		m_szFinalDir[0] = '\0';
 	}
 
-	DownloadQueue::Unlock();
+	g_pDownloadQueueHolder->UnlockQueue();
 
 	info("Cleaning up %s", szNZBName);
 
@@ -1051,11 +806,36 @@ bool CleanupController::Cleanup(const char* szDestDir, bool *bDeleted)
 	*bDeleted = false;
 	bool bOK = true;
 
+	ExtList extList;
+	
+	// split ExtCleanupDisk into tokens and create a list
+	char* szExtCleanupDisk = strdup(g_pOptions->GetExtCleanupDisk());
+	
+	char* saveptr;
+	char* szExt = strtok_r(szExtCleanupDisk, ",; ", &saveptr);
+	while (szExt)
+	{
+		extList.push_back(szExt);
+		szExt = strtok_r(NULL, ",; ", &saveptr);
+	}
+	
 	DirBrowser dir(szDestDir);
 	while (const char* filename = dir.Next())
 	{
 		// check file extension
-		bool bDeleteIt = Util::MatchFileExt(filename, g_pOptions->GetExtCleanupDisk(), ",;");
+		
+		int iFilenameLen = strlen(filename);
+		bool bDeleteIt = false;
+		for (ExtList::iterator it = extList.begin(); it != extList.end(); it++)
+		{
+			const char* szExt = *it;
+			int iExtLen = strlen(szExt);
+			if (iFilenameLen >= iExtLen && !strcasecmp(szExt, filename + iFilenameLen - iExtLen))
+			{
+				bDeleteIt = true;
+				break;
+			}
+		}
 
 		if (bDeleteIt)
 		{
@@ -1066,8 +846,7 @@ bool CleanupController::Cleanup(const char* szDestDir, bool *bDeleted)
 			PrintMessage(Message::mkInfo, "Deleting file %s", filename);
 			if (remove(szFullFilename) != 0)
 			{
-				char szErrBuf[256];
-				PrintMessage(Message::mkError, "Could not delete file %s: %s", szFullFilename, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+				PrintMessage(Message::mkError, "Could not delete file %s! Errcode: %i", szFullFilename, errno);
 				bOK = false;
 			}
 
@@ -1075,5 +854,7 @@ bool CleanupController::Cleanup(const char* szDestDir, bool *bDeleted)
 		}
 	}
 
+	free(szExtCleanupDisk);
+
 	return bOK;
 }

Unpack.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@
 #include "Log.h"
 #include "Thread.h"
 #include "DownloadInfo.h"
-#include "Script.h"
+#include "ScriptController.h"
 
 class UnpackController : public Thread, public ScriptController
 {
@@ -67,32 +67,26 @@ private:
 	bool				m_bHasNonStdRarFiles;
 	bool				m_bHasSevenZipFiles;
 	bool				m_bHasSevenZipMultiFiles;
-	bool				m_bHasSplittedFiles;
 	bool				m_bUnpackOK;
 	bool				m_bUnpackStartError;
 	bool				m_bUnpackSpaceError;
-	bool				m_bUnpackPasswordError4;
-	bool				m_bUnpackPasswordError5;
+	bool				m_bUnpackPasswordError;
 	bool				m_bCleanedUpDisk;
-	bool				m_bAutoTerminated;
 	EUnpacker			m_eUnpacker;
 	bool				m_bFinalDirCreated;
-	FileList			m_JoinedFiles;
 
 protected:
 	virtual bool		ReadLine(char* szBuf, int iBufSize, FILE* pStream);
 	virtual void		AddMessage(Message::EKind eKind, const char* szText);
 	void				ExecuteUnrar();
 	void				ExecuteSevenZip(bool bMultiVolumes);
-	void				JoinSplittedFiles();
-	bool				JoinFile(const char* szFragBaseName);
 	void				Completed();
 	void				CreateUnpackDir();
 	bool				Cleanup();
 	void				CheckArchiveFiles(bool bScanNonStdFiles);
 	void				SetProgressLabel(const char* szProgressLabel);
 #ifndef DISABLE_PARCHECK
-	void				RequestParCheck(bool bForceRepair);
+	void				RequestParCheck();
 #endif
 	bool				FileHasRarSignature(const char* szFilename);
 
@@ -125,6 +119,8 @@ private:
 
 	bool				Cleanup(const char* szDestDir, bool *bDeleted);
 
+	typedef std::deque<char*>	ExtList;
+
 public:
 	virtual void		Run();
 	static void			StartJob(PostInfo* pPostInfo);

UrlCoordinator.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2012-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2012-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -44,13 +44,19 @@
 #include "UrlCoordinator.h"
 #include "Options.h"
 #include "WebDownloader.h"
+#include "DiskState.h"
+#include "Log.h"
 #include "Util.h"
 #include "NZBFile.h"
+#include "QueueCoordinator.h"
 #include "Scanner.h"
 
 extern Options* g_pOptions;
+extern DiskState* g_pDiskState;
+extern QueueCoordinator* g_pQueueCoordinator;
 extern Scanner* g_pScanner;
 
+
 UrlDownloader::UrlDownloader() : WebDownloader()
 {
 	m_szCategory = NULL;
@@ -80,7 +86,7 @@ void UrlDownloader::ProcessHeader(const char* szLine)
 		char* szValue = strchr(szModLine, ':');
 		if (szValue)
 		{
-			*szValue = '\0';
+			*szValue = NULL;
 			szValue++;
 			while (*szValue == ' ') szValue++;
 			Util::Trim(szValue);
@@ -93,7 +99,7 @@ void UrlDownloader::ProcessHeader(const char* szLine)
 			szParamName[100-1] = '\0';
 
 			char* szVal = WebUtil::Latin1ToUtf8(szValue);
-			m_pNZBInfo->GetParameters()->SetParameter(szParamName, szVal);
+			m_ppParameters.SetParameter(szParamName, szVal);
 			free(szVal);
 		}
 		free(szModLine);
@@ -105,8 +111,7 @@ UrlCoordinator::UrlCoordinator()
 	debug("Creating UrlCoordinator");
 
 	m_bHasMoreJobs = true;
-
-	g_pLog->RegisterDebuggable(this);
+	m_bForce = false;
 }
 
 UrlCoordinator::~UrlCoordinator()
@@ -114,8 +119,6 @@ UrlCoordinator::~UrlCoordinator()
 	debug("Destroying UrlCoordinator");
 	// Cleanup
 
-	g_pLog->UnregisterDebuggable(this);
-
 	debug("Deleting UrlDownloaders");
 	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
 	{
@@ -123,6 +126,14 @@ UrlCoordinator::~UrlCoordinator()
 	}
 	m_ActiveDownloads.clear();
 
+	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
+	for (UrlQueue::iterator it = pDownloadQueue->GetUrlQueue()->begin(); it != pDownloadQueue->GetUrlQueue()->end(); it++)
+	{
+		delete *it;
+	}
+	pDownloadQueue->GetUrlQueue()->clear();
+	g_pQueueCoordinator->UnlockQueue();
+
 	debug("UrlCoordinator destroyed");
 }
 
@@ -130,36 +141,34 @@ void UrlCoordinator::Run()
 {
 	debug("Entering UrlCoordinator-loop");
 
-	while (!DownloadQueue::IsLoaded())
-	{
-		usleep(20 * 1000);
-	}
-
 	int iResetCounter = 0;
 
 	while (!IsStopped())
 	{
-		bool bDownloadStarted = false;
-		if (!g_pOptions->GetPauseDownload() || g_pOptions->GetUrlForce())
+		if (!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()) || m_bForce || g_pOptions->GetUrlForce())
 		{
 			// start download for next URL
-			DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+			DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
+
 			if ((int)m_ActiveDownloads.size() < g_pOptions->GetUrlConnections())
 			{
-				NZBInfo* pNZBInfo = GetNextUrl(pDownloadQueue);
-				bool bHasMoreUrls = pNZBInfo != NULL;
+				UrlInfo* pUrlInfo;
+				bool bHasMoreUrls = GetNextUrl(pDownloadQueue, pUrlInfo);
 				bool bUrlDownloadsRunning = !m_ActiveDownloads.empty();
 				m_bHasMoreJobs = bHasMoreUrls || bUrlDownloadsRunning;
 				if (bHasMoreUrls && !IsStopped())
 				{
-					StartUrlDownload(pNZBInfo);
-					bDownloadStarted = true;
+					StartUrlDownload(pUrlInfo);
+				}
+				if (!bHasMoreUrls)
+				{
+					m_bForce = false;
 				}
 			}
-			DownloadQueue::Unlock();
+			g_pQueueCoordinator->UnlockQueue();
 		}
 
-		int iSleepInterval = bDownloadStarted ? 0 : 100;
+		int iSleepInterval = 100;
 		usleep(iSleepInterval * 1000);
 
 		iResetCounter += iSleepInterval;
@@ -176,9 +185,9 @@ void UrlCoordinator::Run()
 	bool completed = false;
 	while (!completed)
 	{
-		DownloadQueue::Lock();
+		g_pQueueCoordinator->LockQueue();
 		completed = m_ActiveDownloads.size() == 0;
-		DownloadQueue::Unlock();
+		g_pQueueCoordinator->UnlockQueue();
 		usleep(100 * 1000);
 		ResetHangingDownloads();
 	}
@@ -192,12 +201,12 @@ void UrlCoordinator::Stop()
 	Thread::Stop();
 
 	debug("Stopping UrlDownloads");
-	DownloadQueue::Lock();
+	g_pQueueCoordinator->LockQueue();
 	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
 	{
 		(*it)->Stop();
 	}
-	DownloadQueue::Unlock();
+	g_pQueueCoordinator->UnlockQueue();
 	debug("UrlDownloads are notified");
 }
 
@@ -209,8 +218,8 @@ void UrlCoordinator::ResetHangingDownloads()
 		return;
 	}
 
-	DownloadQueue::Lock();
-	time_t tm = time(NULL);
+	g_pQueueCoordinator->LockQueue();
+	time_t tm = ::time(NULL);
 
 	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end();)
 	{
@@ -218,12 +227,12 @@ void UrlCoordinator::ResetHangingDownloads()
 		if (tm - pUrlDownloader->GetLastUpdateTime() > TimeOut &&
 		   pUrlDownloader->GetStatus() == UrlDownloader::adRunning)
 		{
-			NZBInfo* pNZBInfo = pUrlDownloader->GetNZBInfo();
+			UrlInfo* pUrlInfo = pUrlDownloader->GetUrlInfo();
 			debug("Terminating hanging download %s", pUrlDownloader->GetInfoName());
 			if (pUrlDownloader->Terminate())
 			{
 				error("Terminated hanging download %s", pUrlDownloader->GetInfoName());
-				pNZBInfo->SetUrlStatus(NZBInfo::lsNone);
+				pUrlInfo->SetStatus(UrlInfo::aiUndefined);
 			}
 			else
 			{
@@ -238,87 +247,86 @@ void UrlCoordinator::ResetHangingDownloads()
 		it++;
 	}                                              
 
-	DownloadQueue::Unlock();
+	g_pQueueCoordinator->UnlockQueue();
 }
 
 void UrlCoordinator::LogDebugInfo()
 {
-	info("   ---------- UrlCoordinator");
+	debug("   UrlCoordinator");
+	debug("   ----------------");
 
-	DownloadQueue::Lock();
-	info("    Active Downloads: %i", m_ActiveDownloads.size());
+	g_pQueueCoordinator->LockQueue();
+	debug("    Active Downloads: %i", m_ActiveDownloads.size());
 	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
 	{
 		UrlDownloader* pUrlDownloader = *it;
 		pUrlDownloader->LogDebugInfo();
 	}
-	DownloadQueue::Unlock();
+	g_pQueueCoordinator->UnlockQueue();
 }
 
-void UrlCoordinator::AddUrlToQueue(NZBInfo* pNZBInfo, bool bAddTop)
+void UrlCoordinator::AddUrlToQueue(UrlInfo* pUrlInfo, bool AddFirst)
 {
 	debug("Adding NZB-URL to queue");
 
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-	if (bAddTop)
+	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
+
+	pDownloadQueue->GetUrlQueue()->push_back(pUrlInfo);
+
+	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
 	{
-		pDownloadQueue->GetQueue()->push_front(pNZBInfo);
+		g_pDiskState->SaveDownloadQueue(pDownloadQueue);
 	}
-	else
+
+	if (pUrlInfo->GetForce())
 	{
-		pDownloadQueue->GetQueue()->push_back(pNZBInfo);
+		m_bForce = true;
 	}
-	pDownloadQueue->Save();
-	DownloadQueue::Unlock();
+
+	g_pQueueCoordinator->UnlockQueue();
 }
 
 /*
  * Returns next URL for download.
  */
-NZBInfo* UrlCoordinator::GetNextUrl(DownloadQueue* pDownloadQueue)
+bool UrlCoordinator::GetNextUrl(DownloadQueue* pDownloadQueue, UrlInfo* &pUrlInfo)
 {
-	bool bPauseDownload = g_pOptions->GetPauseDownload();
+	bool bPauseDownload = g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2();
 
-	NZBInfo* pNZBInfo = NULL;
-
-	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+	for (UrlQueue::iterator at = pDownloadQueue->GetUrlQueue()->begin(); at != pDownloadQueue->GetUrlQueue()->end(); at++)
 	{
-		NZBInfo* pNZBInfo1 = *it;
-		if (pNZBInfo1->GetKind() == NZBInfo::nkUrl &&
-			pNZBInfo1->GetUrlStatus() == NZBInfo::lsNone &&
-			pNZBInfo1->GetDeleteStatus() == NZBInfo::dsNone &&
-			(!bPauseDownload || g_pOptions->GetUrlForce()) &&
-			(!pNZBInfo || pNZBInfo1->GetPriority() > pNZBInfo->GetPriority()))
+		pUrlInfo = *at;
+		if (pUrlInfo->GetStatus() == 0 && (!bPauseDownload || pUrlInfo->GetForce() || g_pOptions->GetUrlForce()))
 		{
-			pNZBInfo = pNZBInfo1;
+			return true;
+			break;
 		}
 	}
 
-	return pNZBInfo;
+	return false;
 }
 
-void UrlCoordinator::StartUrlDownload(NZBInfo* pNZBInfo)
+void UrlCoordinator::StartUrlDownload(UrlInfo* pUrlInfo)
 {
 	debug("Starting new UrlDownloader");
 
 	UrlDownloader* pUrlDownloader = new UrlDownloader();
 	pUrlDownloader->SetAutoDestroy(true);
 	pUrlDownloader->Attach(this);
-	pUrlDownloader->SetNZBInfo(pNZBInfo);
-	pUrlDownloader->SetURL(pNZBInfo->GetURL());
-	pUrlDownloader->SetForce(g_pOptions->GetUrlForce());
-	pNZBInfo->SetActiveDownloads(1);
+	pUrlDownloader->SetUrlInfo(pUrlInfo);
+	pUrlDownloader->SetURL(pUrlInfo->GetURL());
+	pUrlDownloader->SetForce(pUrlInfo->GetForce() || g_pOptions->GetUrlForce());
 
 	char tmp[1024];
 
-	pNZBInfo->MakeNiceUrlName(pNZBInfo->GetURL(), pNZBInfo->GetFilename(), tmp, 1024);
+	pUrlInfo->GetName(tmp, 1024);
 	pUrlDownloader->SetInfoName(tmp);
 
-	snprintf(tmp, 1024, "%surl-%i.tmp", g_pOptions->GetTempDir(), pNZBInfo->GetID());
+	snprintf(tmp, 1024, "%surl-%i.tmp", g_pOptions->GetTempDir(), pUrlInfo->GetID());
 	tmp[1024-1] = '\0';
 	pUrlDownloader->SetOutputFilename(tmp);
 
-	pNZBInfo->SetUrlStatus(NZBInfo::lsRunning);
+	pUrlInfo->SetStatus(UrlInfo::aiRunning);
 
 	m_ActiveDownloads.push_back(pUrlDownloader);
 	pUrlDownloader->Start();
@@ -341,8 +349,20 @@ void UrlCoordinator::UrlCompleted(UrlDownloader* pUrlDownloader)
 {
 	debug("URL downloaded");
 
-	bool bRetry = pUrlDownloader->GetStatus() == WebDownloader::adRetry;
-	NZBInfo* pNZBInfo = pUrlDownloader->GetNZBInfo();
+	UrlInfo* pUrlInfo = pUrlDownloader->GetUrlInfo();
+
+	if (pUrlDownloader->GetStatus() == WebDownloader::adFinished)
+	{
+		pUrlInfo->SetStatus(UrlInfo::aiFinished);
+	}
+	else if (pUrlDownloader->GetStatus() == WebDownloader::adFailed)
+	{
+		pUrlInfo->SetStatus(UrlInfo::aiFailed);
+	}
+	else if (pUrlDownloader->GetStatus() == WebDownloader::adRetry)
+	{
+		pUrlInfo->SetStatus(UrlInfo::aiUndefined);
+	}
 
 	char filename[1024];
 	if (pUrlDownloader->GetOriginalFilename())
@@ -352,7 +372,7 @@ void UrlCoordinator::UrlCompleted(UrlDownloader* pUrlDownloader)
 	}
 	else
 	{
-		strncpy(filename, Util::BaseFileName(pNZBInfo->GetURL()), 1024);
+		strncpy(filename, Util::BaseFileName(pUrlInfo->GetURL()), 1024);
 		filename[1024-1] = '\0';
 
 		// TODO: decode URL escaping
@@ -362,9 +382,8 @@ void UrlCoordinator::UrlCompleted(UrlDownloader* pUrlDownloader)
 
 	debug("Filename: [%s]", filename);
 
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-
 	// delete Download from active jobs
+	g_pQueueCoordinator->LockQueue();
 	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
 	{
 		UrlDownloader* pa = *it;
@@ -374,124 +393,62 @@ void UrlCoordinator::UrlCompleted(UrlDownloader* pUrlDownloader)
 			break;
 		}
 	}
-	pNZBInfo->SetActiveDownloads(0);
+	g_pQueueCoordinator->UnlockQueue();
 
-	if (pNZBInfo->GetDeleting())
-	{
-		pNZBInfo->SetDeleteStatus(NZBInfo::dsManual);
-		pNZBInfo->SetUrlStatus(NZBInfo::lsNone);
-		pNZBInfo->SetDeleting(false);
-	}
-	else if (pUrlDownloader->GetStatus() == WebDownloader::adFinished)
-	{
-		pNZBInfo->SetUrlStatus(NZBInfo::lsFinished);
-	}
-	else if (pUrlDownloader->GetStatus() == WebDownloader::adFailed)
-	{
-		pNZBInfo->SetUrlStatus(NZBInfo::lsFailed);
-	}
-	else if (pUrlDownloader->GetStatus() == WebDownloader::adRetry)
-	{
-		pNZBInfo->SetUrlStatus(NZBInfo::lsNone);
-	}
+	Aspect aspect = { eaUrlCompleted, pUrlInfo };
+	Notify(&aspect);
 
-	if (!bRetry)
-	{
-		DownloadQueue::Aspect aspect = { DownloadQueue::eaUrlCompleted, pDownloadQueue, pNZBInfo, NULL };
-		pDownloadQueue->Notify(&aspect);
-	}
-
-	DownloadQueue::Unlock();
-
-	if (bRetry)
-	{
-		return;
-	}
-
-	if (pNZBInfo->GetUrlStatus() == NZBInfo::lsFinished)
+	if (pUrlInfo->GetStatus() == UrlInfo::aiFinished)
 	{
 		// add nzb-file to download queue
 		Scanner::EAddStatus eAddStatus = g_pScanner->AddExternalFile(
-			!Util::EmptyStr(pNZBInfo->GetFilename()) ? pNZBInfo->GetFilename() : filename,
-			!Util::EmptyStr(pNZBInfo->GetCategory()) ? pNZBInfo->GetCategory() : pUrlDownloader->GetCategory(),
-			pNZBInfo->GetPriority(), pNZBInfo->GetDupeKey(), pNZBInfo->GetDupeScore(), pNZBInfo->GetDupeMode(),
-			pNZBInfo->GetParameters(), false, pNZBInfo->GetAddUrlPaused(), pNZBInfo,
-			pUrlDownloader->GetOutputFilename(), NULL, 0, NULL);
+			pUrlInfo->GetNZBFilename() && strlen(pUrlInfo->GetNZBFilename()) > 0 ? pUrlInfo->GetNZBFilename() : filename,
+			strlen(pUrlInfo->GetCategory()) > 0 ? pUrlInfo->GetCategory() : pUrlDownloader->GetCategory(),
+			pUrlInfo->GetPriority(), pUrlInfo->GetDupeKey(), pUrlInfo->GetDupeScore(), pUrlInfo->GetDupeMode(),
+			pUrlDownloader->GetParameters(), pUrlInfo->GetAddTop(), pUrlInfo->GetAddPaused(),
+			pUrlDownloader->GetOutputFilename(), NULL, 0);
 
-		if (eAddStatus == Scanner::asSuccess)
+		if (eAddStatus != Scanner::asSuccess)
 		{
-			// if scanner has successfully added nzb-file to queue, our pNZBInfo is
-			// already removed from queue and destroyed
-			return;
+			pUrlInfo->SetStatus(eAddStatus == Scanner::asFailed ? UrlInfo::aiScanFailed : UrlInfo::aiScanSkipped);
+		}
+	}
+
+	// delete Download from Url Queue
+	if (pUrlInfo->GetStatus() != UrlInfo::aiRetry)
+	{
+		DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
+
+		for (UrlQueue::iterator it = pDownloadQueue->GetUrlQueue()->begin(); it != pDownloadQueue->GetUrlQueue()->end(); it++)
+		{
+			UrlInfo* pa = *it;
+			if (pa == pUrlInfo)
+			{
+				pDownloadQueue->GetUrlQueue()->erase(it);
+				break;
+			}
 		}
 
-		pNZBInfo->SetUrlStatus(eAddStatus == Scanner::asFailed ? NZBInfo::lsScanFailed : NZBInfo::lsScanSkipped);
-	}
+		bool bDeleteObj = true;
 
-	// the rest of function is only for failed URLs or for failed scans
-
-	pDownloadQueue = DownloadQueue::Lock();
-
-	// delete URL from queue
-	pDownloadQueue->GetQueue()->Remove(pNZBInfo);
-	bool bDeleteObj = true;
-
-	// add failed URL to history
-	if (g_pOptions->GetKeepHistory() > 0 &&
-		pNZBInfo->GetUrlStatus() != NZBInfo::lsFinished &&
-		!pNZBInfo->GetAvoidHistory())
-	{
-		HistoryInfo* pHistoryInfo = new HistoryInfo(pNZBInfo);
-		pHistoryInfo->SetTime(time(NULL));
-		pDownloadQueue->GetHistory()->push_front(pHistoryInfo);
-		bDeleteObj = false;
-	}
-		
-	pDownloadQueue->Save();
-
-	DownloadQueue::Unlock();
-
-	if (bDeleteObj)
-	{
-		delete pNZBInfo;
-	}
-}
-
-bool UrlCoordinator::DeleteQueueEntry(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bAvoidHistory)
-{
-	if (pNZBInfo->GetActiveDownloads() > 0)
-	{
-		info("Deleting active URL %s", pNZBInfo->GetName());
-		pNZBInfo->SetDeleting(true);
-		pNZBInfo->SetAvoidHistory(bAvoidHistory);
-
-		for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
+		if (g_pOptions->GetKeepHistory() > 0 && pUrlInfo->GetStatus() != UrlInfo::aiFinished)
 		{
-			UrlDownloader* pUrlDownloader = *it;
-			if (pUrlDownloader->GetNZBInfo() == pNZBInfo)
-			{
-				pUrlDownloader->Stop();
-				return true;
-			}
-		}                                              
+			HistoryInfo* pHistoryInfo = new HistoryInfo(pUrlInfo);
+			pHistoryInfo->SetTime(time(NULL));
+			pDownloadQueue->GetHistoryList()->push_front(pHistoryInfo);
+			bDeleteObj = false;
+		}
+			
+		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+		{
+			g_pDiskState->SaveDownloadQueue(pDownloadQueue);
+		}
+
+		g_pQueueCoordinator->UnlockQueue();
+
+		if (bDeleteObj)
+		{
+			delete pUrlInfo;
+		}
 	}
-
-	info("Deleting URL %s", pNZBInfo->GetName());
-
-	pNZBInfo->SetDeleteStatus(NZBInfo::dsManual);
-	pNZBInfo->SetUrlStatus(NZBInfo::lsNone);
-
-	pDownloadQueue->GetQueue()->Remove(pNZBInfo);
-	if (g_pOptions->GetKeepHistory() > 0 && !bAvoidHistory)
-	{
-		HistoryInfo* pHistoryInfo = new HistoryInfo(pNZBInfo);
-		pHistoryInfo->SetTime(time(NULL));
-		pDownloadQueue->GetHistory()->push_front(pHistoryInfo);
-	}
-	else
-	{
-		delete pNZBInfo;
-	}
-
-	return true;
 }

UrlCoordinator.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2012-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2012-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #include <list>
 #include <time.h>
 
-#include "Log.h"
 #include "Thread.h"
 #include "WebDownloader.h"
 #include "DownloadInfo.h"
@@ -38,24 +37,31 @@
 
 class UrlDownloader;
 
-class UrlCoordinator : public Thread, public Observer, public Debuggable
+class UrlCoordinator : public Thread, public Observer, public Subject
 {
-private:
+public:
 	typedef std::list<UrlDownloader*>	ActiveDownloads;
+	enum EAspectAction
+	{
+		eaUrlAdded,
+		eaUrlCompleted
+	};
+	struct Aspect
+	{
+		EAspectAction eAction;
+		UrlInfo* pUrlInfo;
+	};
 
 private:
 	ActiveDownloads			m_ActiveDownloads;
 	bool					m_bHasMoreJobs;
 	bool					m_bForce;
 
-	NZBInfo*				GetNextUrl(DownloadQueue* pDownloadQueue);
-	void					StartUrlDownload(NZBInfo* pNZBInfo);
+	bool					GetNextUrl(DownloadQueue* pDownloadQueue, UrlInfo* &pUrlInfo);
+	void					StartUrlDownload(UrlInfo* pUrlInfo);
 	void					UrlCompleted(UrlDownloader* pUrlDownloader);
 	void					ResetHangingDownloads();
 
-protected:
-	virtual void			LogDebugInfo();
-
 public:
 							UrlCoordinator();                
 	virtual					~UrlCoordinator();
@@ -64,16 +70,18 @@ public:
 	void					Update(Subject* pCaller, void* pAspect);
 
 	// Editing the queue
-	void					AddUrlToQueue(NZBInfo* pNZBInfo, bool bAddTop);
+	void					AddUrlToQueue(UrlInfo* pUrlInfo, bool AddFirst);
 	bool					HasMoreJobs() { return m_bHasMoreJobs; }
-	bool					DeleteQueueEntry(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bAvoidHistory);
+
+	void					LogDebugInfo();
 };
 
 class UrlDownloader : public WebDownloader
 {
 private:
-	NZBInfo*				m_pNZBInfo;
+	UrlInfo*				m_pUrlInfo;
 	char*					m_szCategory;
+	NZBParameterList		m_ppParameters;
 
 protected:
 	virtual void			ProcessHeader(const char* szLine);
@@ -81,9 +89,10 @@ protected:
 public:
 							UrlDownloader();
 							~UrlDownloader();
-	void					SetNZBInfo(NZBInfo* pNZBInfo) { m_pNZBInfo = pNZBInfo; }
-	NZBInfo*				GetNZBInfo() { return m_pNZBInfo; }
+	void					SetUrlInfo(UrlInfo* pUrlInfo) { m_pUrlInfo = pUrlInfo; }
+	UrlInfo*				GetUrlInfo() { return m_pUrlInfo; }
 	const char*				GetCategory() { return m_szCategory; }
+	NZBParameterList*		GetParameters() { return &m_ppParameters; }
 };
 
 #endif

Util.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,14 +38,12 @@
 #include <errno.h>
 #include <ctype.h>
 #ifdef WIN32
-#include <io.h>
 #include <direct.h>
 #include <WinIoCtl.h>
 #else
 #include <unistd.h>
 #include <sys/statvfs.h>
 #include <pwd.h>
-#include <dirent.h>
 #endif
 #ifdef HAVE_REGEX_H
 #include <regex.h>
@@ -146,15 +144,15 @@ DirBrowser::DirBrowser(const char* szPath)
 	char szMask[MAX_PATH + 1];
 	snprintf(szMask, MAX_PATH + 1, "%s%c*.*", szPath, (int)PATH_SEPARATOR);
 	szMask[MAX_PATH] = '\0';
-	m_hFile = FindFirstFile(szMask, &m_FindData);
+	m_hFile = _findfirst(szMask, &m_FindData);
 	m_bFirst = true;
 }
 
 DirBrowser::~DirBrowser()
 {
-	if (m_hFile != INVALID_HANDLE_VALUE)
+	if (m_hFile != -1L)
 	{
-		FindClose(m_hFile);
+		_findclose(m_hFile);
 	}
 }
 
@@ -163,86 +161,46 @@ const char* DirBrowser::Next()
 	bool bOK = false;
 	if (m_bFirst)
 	{
-		bOK = m_hFile != INVALID_HANDLE_VALUE;
+		bOK = m_hFile != -1L;
 		m_bFirst = false;
 	}
 	else
 	{
-		bOK = FindNextFile(m_hFile, &m_FindData) != 0;
+		bOK = _findnext(m_hFile, &m_FindData) == 0;
 	}
 	if (bOK)
 	{
-		return m_FindData.cFileName;
+		return m_FindData.name;
 	}
 	return NULL;
 }
 
 #else
 
-#ifdef DIRBROWSER_SNAPSHOT
-DirBrowser::DirBrowser(const char* szPath, bool bSnapshot)
-#else
 DirBrowser::DirBrowser(const char* szPath)
-#endif
 {
-#ifdef DIRBROWSER_SNAPSHOT
-	m_bSnapshot = bSnapshot;
-	if (m_bSnapshot)
-	{
-		DirBrowser dir(szPath, false);
-		while (const char* filename = dir.Next())
-		{
-			m_Snapshot.push_back(strdup(filename));
-		}
-		m_itSnapshot = m_Snapshot.begin();
-	}
-	else
-#endif
-	{
-		m_pDir = opendir(szPath);
-	}
+	m_pDir = opendir(szPath);
 }
 
 DirBrowser::~DirBrowser()
 {
-#ifdef DIRBROWSER_SNAPSHOT
-	if (m_bSnapshot)
+	if (m_pDir)
 	{
-		for (FileList::iterator it = m_Snapshot.begin(); it != m_Snapshot.end(); it++)
-		{
-			delete *it;
-		}
-	}
-	else
-#endif
-	{
-		if (m_pDir)
-		{
-			closedir((DIR*)m_pDir);
-		}
+		closedir(m_pDir);
 	}
 }
 
 const char* DirBrowser::Next()
 {
-#ifdef DIRBROWSER_SNAPSHOT
-	if (m_bSnapshot)
+	if (m_pDir)
 	{
-		return m_itSnapshot == m_Snapshot.end() ? NULL : *m_itSnapshot++;
-	}
-	else
-#endif
-	{
-		if (m_pDir)
+		m_pFindData = readdir(m_pDir);
+		if (m_pFindData)
 		{
-			m_pFindData = readdir((DIR*)m_pDir);
-			if (m_pFindData)
-			{
-				return m_pFindData->d_name;
-			}
+			return m_pFindData->d_name;
 		}
-		return NULL;
 	}
+	return NULL;
 }
 
 #endif
@@ -428,7 +386,7 @@ bool Util::DirEmpty(const char* szDirFilename)
 
 bool Util::LoadFileIntoBuffer(const char* szFileName, char** pBuffer, int* pBufferLength)
 {
-    FILE* pFile = fopen(szFileName, FOPEN_RB);
+    FILE* pFile = fopen(szFileName, "rb");
     if (!pFile)
     {
         return false;
@@ -436,7 +394,7 @@ bool Util::LoadFileIntoBuffer(const char* szFileName, char** pBuffer, int* pBuff
 
     // obtain file size.
     fseek(pFile , 0 , SEEK_END);
-    int iSize  = (int)ftell(pFile);
+    int iSize  = ftell(pFile);
     rewind(pFile);
 
     // allocate memory to contain the whole file.
@@ -460,7 +418,7 @@ bool Util::LoadFileIntoBuffer(const char* szFileName, char** pBuffer, int* pBuff
 
 bool Util::SaveBufferIntoFile(const char* szFileName, const char* szBuffer, int iBufLen)
 {
-    FILE* pFile = fopen(szFileName, FOPEN_WB);
+    FILE* pFile = fopen(szFileName, "wb");
     if (!pFile)
     {
         return false;
@@ -472,7 +430,7 @@ bool Util::SaveBufferIntoFile(const char* szFileName, const char* szBuffer, int
 	return iWrittenBytes == iBufLen;
 }
 
-bool Util::CreateSparseFile(const char* szFilename, long long iSize)
+bool Util::CreateSparseFile(const char* szFilename, int iSize)
 {
 	bool bOK = false;
 #ifdef WIN32
@@ -484,26 +442,24 @@ bool Util::CreateSparseFile(const char* szFilename, long long iSize)
 		DWORD dwBytesReturned;
 		DeviceIoControl(hFile, FSCTL_SET_SPARSE, NULL, 0, NULL, 0, &dwBytesReturned, NULL);
 
-		LARGE_INTEGER iSize64;
-		iSize64.QuadPart = iSize;
-		SetFilePointerEx(hFile, iSize64, NULL, FILE_END);
+		SetFilePointer(hFile, iSize, NULL, FILE_END);
 		SetEndOfFile(hFile);
 		CloseHandle(hFile);
 		bOK = true;
 	}
 #else
 	// create file
-	FILE* pFile = fopen(szFilename, FOPEN_AB);
+	FILE* pFile = fopen(szFilename, "ab");
 	if (pFile)
 	{
 		fclose(pFile);
 	}
 	// there are no reliable function to expand file on POSIX, so we must try different approaches,
 	// starting with the fastest one and hoping it will work
-	// 1) set file size using function "truncate" (it is fast, if it works)
+	// 1) set file size using function "truncate" (it is fast, if works)
 	truncate(szFilename, iSize);
 	// check if it worked
-	pFile = fopen(szFilename, FOPEN_AB);
+	pFile = fopen(szFilename, "ab");
 	if (pFile)
 	{
 		fseek(pFile, 0, SEEK_END);
@@ -513,7 +469,7 @@ bool Util::CreateSparseFile(const char* szFilename, long long iSize)
 			// 2) truncate did not work, expanding the file by writing in it (it is slow)
 			fclose(pFile);
 			truncate(szFilename, 0);
-			pFile = fopen(szFilename, FOPEN_AB);
+			pFile = fopen(szFilename, "ab");
 			char c = '0';
 			fwrite(&c, 1, iSize, pFile);
 			bOK = ftell(pFile) == iSize;
@@ -528,7 +484,7 @@ bool Util::TruncateFile(const char* szFilename, int iSize)
 {
 	bool bOK = false;
 #ifdef WIN32
-	FILE *file = fopen(szFilename, FOPEN_RBP);
+	FILE *file = fopen(szFilename, "r+b");
 	fseek(file, iSize, SEEK_SET);
 	bOK = SetEndOfFile((HANDLE)_get_osfhandle(_fileno(file))) != 0;
 	fclose(file);
@@ -541,7 +497,7 @@ bool Util::TruncateFile(const char* szFilename, int iSize)
 //replace bad chars in filename
 void Util::MakeValidFilename(char* szFilename, char cReplaceChar, bool bAllowSlashes)
 {
-	const char* szReplaceChars = bAllowSlashes ? ":*?\"><\n\r\t" : "\\/:*?\"><\n\r\t";
+	const char* szReplaceChars = bAllowSlashes ? ":*?\"><'\n\r\t" : "\\/:*?\"><'\n\r\t";
 	char* p = szFilename;
 	while (*p)
 	{
@@ -698,15 +654,15 @@ bool Util::MoveFile(const char* szSrcFilename, const char* szDstFilename)
 	bool bOK = rename(szSrcFilename, szDstFilename) == 0;
 
 #ifndef WIN32
-	if (!bOK && errno == EXDEV)
+	if (!bOK && (errno == EXDEV))
 	{
-		FILE* infile = fopen(szSrcFilename, FOPEN_RB);
+		FILE* infile = fopen(szSrcFilename, "rb");
 		if (!infile)
 		{
 			return false;
 		}
 
-		FILE* outfile = fopen(szDstFilename, FOPEN_WBP);
+		FILE* outfile = fopen(szDstFilename, "wb+");
 		if (!outfile)
 		{
 			fclose(infile);
@@ -736,22 +692,9 @@ bool Util::MoveFile(const char* szSrcFilename, const char* szDstFilename)
 
 bool Util::FileExists(const char* szFilename)
 {
-#ifdef WIN32
-	// we use a native windows call because c-lib function "stat" fails on windows if file date is invalid
-	WIN32_FIND_DATA findData;
-	HANDLE handle = FindFirstFile(szFilename, &findData);
-	if (handle != INVALID_HANDLE_VALUE)
-	{
-		bool bExists = (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0;
-		FindClose(handle);
-		return bExists;
-	}
-	return false;
-#else
 	struct stat buffer;
 	bool bExists = !stat(szFilename, &buffer) && S_ISREG(buffer.st_mode);
 	return bExists;
-#endif
 }
 
 bool Util::FileExists(const char* szPath, const char* szFilenameWithoutPath)
@@ -765,22 +708,9 @@ bool Util::FileExists(const char* szPath, const char* szFilenameWithoutPath)
 
 bool Util::DirectoryExists(const char* szDirFilename)
 {
-#ifdef WIN32
-	// we use a native windows call because c-lib function "stat" fails on windows if file date is invalid
-	WIN32_FIND_DATA findData;
-	HANDLE handle = FindFirstFile(szDirFilename, &findData);
-	if (handle != INVALID_HANDLE_VALUE)
-	{
-		bool bExists = (findData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) != 0;
-		FindClose(handle);
-		return bExists;
-	}
-	return false;
-#else
 	struct stat buffer;
 	bool bExists = !stat(szDirFilename, &buffer) && S_ISDIR(buffer.st_mode);
 	return bExists;
-#endif
 }
 
 bool Util::CreateDirectory(const char* szDirFilename)
@@ -792,18 +722,14 @@ bool Util::CreateDirectory(const char* szDirFilename)
 bool Util::RemoveDirectory(const char* szDirFilename)
 {
 #ifdef WIN32
-	return _rmdir(szDirFilename) == 0;
+	return ::RemoveDirectory(szDirFilename);
 #else
 	return remove(szDirFilename) == 0;
 #endif
 }
 
-bool Util::DeleteDirectoryWithContent(const char* szDirFilename, char* szErrBuf, int iBufSize)
+bool Util::DeleteDirectoryWithContent(const char* szDirFilename)
 {
-	*szErrBuf = '\0';
-	char szSysErrStr[256];
-
-	bool bDel = false;
 	bool bOK = true;
 
 	DirBrowser dir(szDirFilename);
@@ -817,27 +743,16 @@ bool Util::DeleteDirectoryWithContent(const char* szDirFilename, char* szErrBuf,
 		{
 			if (Util::DirectoryExists(szFullFilename))
 			{
-				bDel = DeleteDirectoryWithContent(szFullFilename, szSysErrStr, sizeof(szSysErrStr));
+				bOK &= DeleteDirectoryWithContent(szFullFilename);
 			}
 			else
 			{
-				bDel = remove(szFullFilename) == 0;
-			}
-			bOK &= bDel;
-			if (!bDel && !*szErrBuf)
-			{
-				snprintf(szErrBuf, iBufSize, "could not delete %s: %s", szFullFilename, GetLastErrorMessage(szSysErrStr, sizeof(szSysErrStr)));
+				bOK &= remove(szFullFilename) == 0;
 			}
 		}
 	}
 
-	bDel = RemoveDirectory(szDirFilename);
-	bOK &= bDel;
-	if (!bDel && !*szErrBuf)
-	{
-		GetLastErrorMessage(szErrBuf, iBufSize);
-	}
-	return bOK;
+	return bOK && RemoveDirectory(szDirFilename);
 }
 
 long long Util::FileSize(const char* szFilename)
@@ -940,7 +855,7 @@ bool Util::ExpandHomePath(const char* szFilename, char* szBuffer, int iBufSize)
 	}
 	else
 	{
-		strncpy(szBuffer, szFilename ? szFilename : "", iBufSize);
+		strncpy(szBuffer, szFilename, iBufSize);
 		szBuffer[iBufSize - 1] = '\0';
 	}
 	
@@ -1002,23 +917,6 @@ bool Util::SameFilename(const char* szFilename1, const char* szFilename2)
 #endif
 }
 
-bool Util::MatchFileExt(const char* szFilename, const char* szExtensionList, const char* szListSeparator)
-{
-	int iFilenameLen = strlen(szFilename);
-
-	Tokenizer tok(szExtensionList, szListSeparator);
-	while (const char* szExt = tok.Next())
-	{
-		int iExtLen = strlen(szExt);
-		if (iFilenameLen >= iExtLen && !strcasecmp(szExt, szFilename + iFilenameLen - iExtLen))
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
 #ifndef WIN32
 void Util::FixExecPermission(const char* szFilename)
 {
@@ -1260,241 +1158,6 @@ bool Util::RegReadStr(HKEY hKey, const char* szKeyName, const char* szValueName,
 }
 #endif
 
-/* From boost */
-
-inline int is_leap(int year)
-{
-  if(year % 400 == 0)
-  return 1;
-  if(year % 100 == 0)
-  return 0;
-  if(year % 4 == 0)
-  return 1;
-  return 0;
-}
-inline int days_from_0(int year)
-{
-  year--;
-  return 365 * year + (year / 400) - (year/100) + (year / 4);
-}
-inline int days_from_1970(int year)
-{
-  static const int days_from_0_to_1970 = days_from_0(1970);
-  return days_from_0(year) - days_from_0_to_1970;
-}
-inline int days_from_1jan(int year,int month,int day)
-{
-  static const int days[2][12] =
-  {
-    { 0,31,59,90,120,151,181,212,243,273,304,334},
-    { 0,31,60,91,121,152,182,213,244,274,305,335}
-  };
-  return days[is_leap(year)][month-1] + day - 1;
-}
-
-inline time_t internal_timegm(tm const *t)
-{
-  int year = t->tm_year + 1900;
-  int month = t->tm_mon;
-  if(month > 11)
-  {
-    year += month/12;
-    month %= 12;
-  }
-  else if(month < 0)
-  {
-    int years_diff = (-month + 11)/12;
-    year -= years_diff;
-    month+=12 * years_diff;
-  }
-  month++;
-  int day = t->tm_mday;
-  int day_of_year = days_from_1jan(year,month,day);
-  int days_since_epoch = days_from_1970(year) + day_of_year;
-
-  time_t seconds_in_day = 3600 * 24;
-  time_t result = seconds_in_day * days_since_epoch + 3600 * t->tm_hour + 60 * t->tm_min + t->tm_sec;
-
-  return result;
-}
-
-// prevent PC from going to sleep
-void Util::SetStandByMode(bool bStandBy)
-{
-#ifdef WIN32
-	SetThreadExecutionState((bStandBy ? 0 : ES_SYSTEM_REQUIRED) | ES_CONTINUOUS);
-#endif
-}
-
-time_t Util::Timegm(tm const *t)
-{
-	return internal_timegm(t);
-}
-
-static unsigned long crc32_tab[] = {
-	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-	0xe963a535, 0x9e6495a3,	0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-	0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-	0xf3b97148, 0x84be41de,	0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-	0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,	0x14015c4f, 0x63066cd9,
-	0xfa0f3d63, 0x8d080df5,	0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-	0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,	0x35b5a8fa, 0x42b2986c,
-	0xdbbbc9d6, 0xacbcf940,	0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-	0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-	0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-	0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,	0x76dc4190, 0x01db7106,
-	0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-	0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
-	0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-	0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-	0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-	0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
-	0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-	0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
-	0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-	0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-	0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-	0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
-	0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-	0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-	0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-	0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-	0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-	0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
-	0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-	0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
-	0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-	0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-	0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-	0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-	0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-	0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
-	0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-	0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-	0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-	0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
-	0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-};
-
-/* This is a modified version of chksum_crc() from
- * crc32.c (http://www.koders.com/c/fid699AFE0A656F0022C9D6B9D1743E697B69CE5815.aspx)
- * (c) 1999,2000 Krzysztof Dabrowski
- * (c) 1999,2000 ElysiuM deeZine
- *
- * chksum_crc() -- to a given block, this one calculates the
- *				crc32-checksum until the length is
- *				reached. the crc32-checksum will be
- *				the result.
- */
-unsigned long Util::Crc32m(unsigned long startCrc, unsigned char *block, unsigned long length)
-{
-	register unsigned long crc = startCrc;
-	for (unsigned long i = 0; i < length; i++)
-	{
-		crc = ((crc >> 8) & 0x00FFFFFF) ^ crc32_tab[(crc ^ *block++) & 0xFF];
-	}
-	return crc;
-}
-
-unsigned long Util::Crc32(unsigned char *block, unsigned long length)
-{
-	return Util::Crc32m(0xFFFFFFFF, block, length) ^ 0xFFFFFFFF;
-}
-
-/* From zlib/crc32.c (http://www.zlib.net/)
- * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
- */
-
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
-
-unsigned long gf2_matrix_times(unsigned long *mat, unsigned long vec)
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
-    }
-    return sum;
-}
-
-void gf2_matrix_square(unsigned long *square, unsigned long *mat)
-{
-    int n;
-
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
-}
-
-unsigned long Util::Crc32Combine(unsigned long crc1, unsigned long crc2, unsigned long len2)
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case (also disallow negative lengths) */
-    if (len2 <= 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
-
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-
-    return crc1;
-}
-
-int Util::NumberOfCpuCores()
-{
-#ifdef WIN32
-	SYSTEM_INFO sysinfo;
-	GetSystemInfo(&sysinfo);
-	return sysinfo.dwNumberOfProcessors;
-#elif HAVE_SC_NPROCESSORS_ONLN
-	return sysconf(_SC_NPROCESSORS_ONLN);
-#endif
-	return -1;
-}
-
 
 unsigned int WebUtil::DecodeBase64(char* szInputBuffer, int iInputBufferLength, char* szOutputBuffer)
 {
@@ -2120,8 +1783,9 @@ time_t WebUtil::ParseRfc822DateTime(const char* szDateTimeStr)
 	rawtime.tm_min = minutes;
 	rawtime.tm_sec = seconds;
 
-	time_t enctime = Util::Timegm(&rawtime);
-	enctime -= (zonehours * 60 + (zonehours > 0 ? zoneminutes : -zoneminutes)) * 60;
+	time_t enctime = mktime(&rawtime);
+
+	enctime = enctime - (zonehours * 60 + (zonehours > 0 ? zoneminutes : -zoneminutes)) * 60;
 
 	return enctime;
 }
@@ -2579,58 +2243,3 @@ GUnzipStream::EStatus GUnzipStream::Read(const void **pOutputBuffer, int *iOutpu
 }
 
 #endif
-
-Tokenizer::Tokenizer(const char* szDataString, const char* szSeparators)
-{
-	// an optimization to avoid memory allocation for short data string (shorten than 1024 chars)
-	int iLen = strlen(szDataString);
-	if (iLen < sizeof(m_szDefaultBuf) - 1)
-	{
-		strncpy(m_szDefaultBuf, szDataString, sizeof(m_szDefaultBuf));
-		m_szDefaultBuf[1024- 1] = '\0';
-		m_szDataString = m_szDefaultBuf;
-		m_bInplaceBuf = true;
-	}
-	else
-	{
-		m_szDataString = strdup(szDataString);
-		m_bInplaceBuf = false;
-	}
-
-	m_szSeparators = szSeparators;
-	m_szSavePtr = NULL;
-	m_bWorking = false;
-}
-
-Tokenizer::Tokenizer(char* szDataString, const char* szSeparators, bool bInplaceBuf)
-{
-	m_szDataString = bInplaceBuf ? szDataString : strdup(szDataString);
-	m_szSeparators = szSeparators;
-	m_szSavePtr = NULL;
-	m_bWorking = false;
-	m_bInplaceBuf = bInplaceBuf;
-}
-
-Tokenizer::~Tokenizer()
-{
-	if (!m_bInplaceBuf)
-	{
-		free(m_szDataString);
-	}
-}
-
-char* Tokenizer::Next()
-{
-	char* szToken = NULL;
-	while (!szToken || !*szToken)
-	{
-		szToken = strtok_r(m_bWorking ? NULL : m_szDataString, m_szSeparators, &m_szSavePtr);
-		m_bWorking = true;
-		if (!szToken)
-		{
-			return NULL;
-		}
-		szToken = Util::Trim(szToken);
-	}
-	return szToken;
-}

Util.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -26,10 +26,12 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#ifdef DIRBROWSER_SNAPSHOT
-#include <deque>
+#ifdef WIN32
+#include <stdio.h>
+#include <io.h>
+#else
+#include <dirent.h>
 #endif
-#include <time.h>
 
 #ifdef WIN32
 extern int optind, opterr;
@@ -41,27 +43,16 @@ class DirBrowser
 {
 private:
 #ifdef WIN32
-	WIN32_FIND_DATA		m_FindData;
-	HANDLE				m_hFile;
+	struct _finddata_t	m_FindData;
+	intptr_t			m_hFile;
 	bool				m_bFirst;
 #else
-	void*				m_pDir;    // DIR*, declared as void* to avoid including of <dirent>
+	DIR*				m_pDir;
 	struct dirent*		m_pFindData;
 #endif
 
-#ifdef DIRBROWSER_SNAPSHOT
-	bool				m_bSnapshot;
-	typedef std::deque<char*>	FileList;
-	FileList			m_Snapshot;
-	FileList::iterator	m_itSnapshot;
-#endif
-
 public:
-#ifdef DIRBROWSER_SNAPSHOT
-						DirBrowser(const char* szPath, bool bSnapshot = true);
-#else
 						DirBrowser(const char* szPath);
-#endif
 						~DirBrowser();
 	const char*			Next();
 };
@@ -79,14 +70,15 @@ public:
 	const char*			GetBuffer() { return m_szBuffer; }
 };
 
-class Util
+class Util 
 {
 public:
+
 	static char* BaseFileName(const char* filename);
 	static void NormalizePathSeparators(char* szPath);
 	static bool LoadFileIntoBuffer(const char* szFileName, char** pBuffer, int* pBufferLength);
 	static bool SaveBufferIntoFile(const char* szFileName, const char* szBuffer, int iBufLen);
-	static bool CreateSparseFile(const char* szFilename, long long iSize);
+	static bool CreateSparseFile(const char* szFilename, int iSize);
 	static bool TruncateFile(const char* szFilename, int iSize);
 	static void MakeValidFilename(char* szFilename, char cReplaceChar, bool bAllowSlashes);
 	static bool MakeUniqueFilename(char* szDestBufFilename, int iDestBufSize, const char* szDestDir, const char* szBasename);
@@ -96,7 +88,7 @@ public:
 	static bool DirectoryExists(const char* szDirFilename);
 	static bool CreateDirectory(const char* szDirFilename);
 	static bool RemoveDirectory(const char* szDirFilename);
-	static bool DeleteDirectoryWithContent(const char* szDirFilename, char* szErrBuf, int iBufSize);
+	static bool DeleteDirectoryWithContent(const char* szDirFilename);
 	static bool ForceDirectories(const char* szPath, char* szErrBuf, int iBufSize);
 	static bool GetCurrentDirectory(char* szBuffer, int iBufSize);
 	static bool SetCurrentDirectory(const char* szDirFilename);
@@ -111,7 +103,6 @@ public:
 	static void ExpandFileName(const char* szFilename, char* szBuffer, int iBufSize);
 	static void FormatFileSize(char* szBuffer, int iBufLen, long long lFileSize);
 	static bool SameFilename(const char* szFilename1, const char* szFilename2);
-	static bool MatchFileExt(const char* szFilename, const char* szExtensionList, const char* szListSeparator);
 	static char* GetLastErrorMessage(char* szBuffer, int iBufLen);
 
 	/*
@@ -152,29 +143,20 @@ public:
 	static bool RegReadStr(HKEY hKey, const char* szKeyName, const char* szValueName, char* szBuffer, int* iBufLen);
 #endif
 
-	static void SetStandByMode(bool bStandBy);
-
-	/* cross platform version of GNU timegm, which is similar to mktime but takes an UTC time as parameter */
-	static time_t Timegm(tm const *t);
-
 	/*
 	 * Returns program version and revision number as string formatted like "0.7.0-r295".
 	 * If revision number is not available only version is returned ("0.7.0").
 	 */
 	static const char* VersionRevision() { return VersionRevisionBuf; };
 	
-	static char VersionRevisionBuf[40];
-
-	static void InitVersionRevision();
-
-	static unsigned long Crc32(unsigned char *block, unsigned long length);
-	static unsigned long Crc32m(unsigned long startCrc, unsigned char *block, unsigned long length);
-	static unsigned long Crc32Combine(unsigned long crc1, unsigned long crc2, unsigned long len2);
-
 	/*
-	 * Returns number of available CPU cores or -1 if it could not be determined
+	 * Initialize buffer for program version and revision number.
+	 * This function must be called during program initialization before any
+	 * call to "VersionRevision()".
 	 */
-	static int NumberOfCpuCores();
+	static void InitVersionRevision();
+	
+	static char VersionRevisionBuf[40];
 };
 
 class WebUtil
@@ -363,21 +345,4 @@ public:
 };
 #endif
 
-class Tokenizer
-{
-private:
-	char				m_szDefaultBuf[2014];
-	char*				m_szDataString;
-	bool				m_bInplaceBuf;
-	const char*			m_szSeparators;
-	char*				m_szSavePtr;
-	bool				m_bWorking;
-
-public:
-						Tokenizer(const char* szDataString, const char* szSeparators);
-						Tokenizer(char* szDataString, const char* szSeparators, bool bInplaceBuf);
-						~Tokenizer();
-	char*				Next();
-};
-
 #endif

WebDownloader.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2012-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2012-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -124,19 +124,19 @@ void WebDownloader::Run()
 
 		if ((((Status == adFailed) && (iRemainedDownloadRetries > 1)) ||
 			((Status == adConnectError) && (iRemainedConnectRetries > 1)))
-			&& !IsStopped() && !(!m_bForce && g_pOptions->GetPauseDownload()))
+			&& !IsStopped() && !(!m_bForce && (g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2())))
 		{
 			detail("Waiting %i sec to retry", g_pOptions->GetRetryInterval());
 			int msec = 0;
 			while (!IsStopped() && (msec < g_pOptions->GetRetryInterval() * 1000) && 
-				!(!m_bForce && g_pOptions->GetPauseDownload()))
+				!(!m_bForce && (g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2())))
 			{
 				usleep(100 * 1000);
 				msec += 100;
 			}
 		}
 
-		if (IsStopped() || (!m_bForce && g_pOptions->GetPauseDownload()))
+		if (IsStopped() || (!m_bForce && (g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2())))
 		{
 			Status = adRetry;
 			break;
@@ -207,7 +207,6 @@ WebDownloader::EStatus WebDownloader::Download()
 		return Status;
 	}
 
-	m_pConnection->SetTimeout(g_pOptions->GetUrlTimeout());
 	m_pConnection->SetSuppressErrors(false);
 
 	// connection
@@ -299,15 +298,7 @@ void WebDownloader::SendHeaders(URL *pUrl)
 	tmp[1024-1] = '\0';
 	m_pConnection->WriteLine(tmp);
 
-	if ((!strcasecmp(pUrl->GetProtocol(), "http") && (pUrl->GetPort() == 80 || pUrl->GetPort() == 0)) ||
-		(!strcasecmp(pUrl->GetProtocol(), "https") && (pUrl->GetPort() == 443 || pUrl->GetPort() == 0)))
-	{
-		snprintf(tmp, 1024, "Host: %s\r\n", pUrl->GetHost());
-	}
-	else
-	{
-		snprintf(tmp, 1024, "Host: %s:%i\r\n", pUrl->GetHost(), pUrl->GetPort());
-	}
+	snprintf(tmp, 1024, "Host: %s\r\n", pUrl->GetHost());
 	tmp[1024-1] = '\0';
 	m_pConnection->WriteLine(tmp);
 
@@ -659,15 +650,15 @@ bool WebDownloader::PrepareFile()
 	// prepare file for writing
 
 	const char* szFilename = m_szOutputFilename;
-	m_pOutFile = fopen(szFilename, FOPEN_WB);
+	m_pOutFile = fopen(szFilename, "wb");
 	if (!m_pOutFile)
 	{
 		error("Could not %s file %s", "create", szFilename);
 		return false;
 	}
-	if (g_pOptions->GetWriteBuffer() > 0)
+	if (g_pOptions->GetWriteBufferSize() > 0)
 	{
-		setvbuf(m_pOutFile, NULL, _IOFBF, g_pOptions->GetWriteBuffer() * 1024);
+		setvbuf(m_pOutFile, (char *)NULL, _IOFBF, g_pOptions->GetWriteBufferSize());
 	}
 
 	return true;
@@ -682,7 +673,7 @@ void WebDownloader::LogDebugInfo()
 		ctime_r(&m_tLastUpdateTime, szTime);
 #endif
 
-	info("      Web-Download: status=%i, LastUpdateTime=%s, filename=%s", m_eStatus, szTime, Util::BaseFileName(m_szOutputFilename));
+	debug("      Web-Download: status=%i, LastUpdateTime=%s, filename=%s", m_eStatus, szTime, Util::BaseFileName(m_szOutputFilename));
 }
 
 void WebDownloader::Stop()

WebDownloader.h

@@ -88,7 +88,7 @@ protected:
 
 public:
 						WebDownloader();
-	virtual				~WebDownloader();
+						~WebDownloader();
 	EStatus				GetStatus() { return m_eStatus; }
 	virtual void		Run();
 	virtual void		Stop();

WebServer.cpp

@@ -189,7 +189,7 @@ void WebProcessor::Execute()
 		char* pw = strchr(szAuthInfo, ':');
 		if (pw) *pw++ = '\0';
 		if ((strlen(g_pOptions->GetControlUsername()) > 0 && strcmp(szAuthInfo, g_pOptions->GetControlUsername())) ||
-			(pw && strcmp(pw, g_pOptions->GetControlPassword())))
+			strcmp(pw, g_pOptions->GetControlPassword()))
 		{
 			warn("Request received on port %i from %s, but username or password invalid (%s:%s)",
 				g_pOptions->GetControlPort(), m_pConnection->GetRemoteAddr(), szAuthInfo, pw);
@@ -223,15 +223,20 @@ bool WebProcessor::IsAuthorizedIP(const char* szRemoteAddr)
 
 	// split option AuthorizedIP into tokens and check each token
 	bool bAuthorized = false;
-	Tokenizer tok(g_pOptions->GetAuthorizedIP(), ",;");
-	while (const char* szIP = tok.Next())
+	char* szAuthorizedIP = strdup(g_pOptions->GetAuthorizedIP());
+	char* saveptr;
+	char* szIP = strtok_r(szAuthorizedIP, ",;", &saveptr);
+	while (szIP)
 	{
-		if (!strcmp(szIP, szRemoteIP))
+		szIP = Util::Trim(szIP);
+		if (szIP[0] != '\0' && !strcmp(szIP, szRemoteIP))
 		{
 			bAuthorized = true;
 			break;
 		}
+		szIP = strtok_r(NULL, ",;", &saveptr);
 	}
+	free(szAuthorizedIP);
 	
 	return bAuthorized;
 }

XmlRpc.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -86,14 +86,12 @@ protected:
 
 	void				BuildErrorResponse(int iErrCode, const char* szErrText, ...);
 	void				BuildBoolResponse(bool bOK);
-	void				BuildIntResponse(int iValue);
 	void				AppendResponse(const char* szPart);
 	bool				IsJson();
 	bool				CheckSafeMethod();
 	bool				NextParamAsInt(int* iValue);
 	bool				NextParamAsBool(bool* bValue);
 	bool				NextParamAsStr(char** szValueBuf);
-	char*				XmlNextValue(char* szXml, const char* szTag, int* pValueLength);
 	const char*			BoolToStr(bool bValue);
 	char*				EncodeStr(const char* szStr);
 	void				DecodeStr(char* szStr);

config.h.in

@@ -3,17 +3,13 @@
 /* Define to 1 to include debug-code */
 #undef DEBUG
 
-/* Define to 1 if deleting of files during reading of directory is not
-   properly supported by OS */
-#undef DIRBROWSER_SNAPSHOT
-
 /* Define to 1 to not use curses */
 #undef DISABLE_CURSES
 
 /* Define to 1 to disable gzip-support */
 #undef DISABLE_GZIP
 
-/* Define to 1 to disable par-verification and repair */
+/* Define to 1 to disable smart par-verification and restoration */
 #undef DISABLE_PARCHECK
 
 /* Define to 1 to not use TLS/SSL */
@@ -35,16 +31,6 @@
 /* Define to 1 if you have the <curses.h> header file. */
 #undef HAVE_CURSES_H
 
-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the <endian.h> header file. */
-#undef HAVE_ENDIAN_H
-
-/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-#undef HAVE_FSEEKO
-
 /* Define to 1 if getaddrinfo is supported */
 #undef HAVE_GETADDRINFO
 
@@ -60,12 +46,6 @@
 /* Define to 1 if gethostbyname_r takes 6 arguments */
 #undef HAVE_GETHOSTBYNAME_R_6
 
-/* Define to 1 if you have the `getopt' function. */
-#undef HAVE_GETOPT
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-
 /* Define to 1 if getopt_long is supported */
 #undef HAVE_GETOPT_LONG
 
@@ -75,9 +55,6 @@
 /* Define to 1 to use GnuTLS library for TLS/SSL-support. */
 #undef HAVE_LIBGNUTLS
 
-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -87,56 +64,33 @@
 /* Define to 1 if you have the <ncurses/ncurses.h> header file. */
 #undef HAVE_NCURSES_NCURSES_H
 
-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
 /* Define to 1 to use OpenSSL library for TLS/SSL-support. */
 #undef HAVE_OPENSSL
 
+/* Define to 1 if libpar2 has recent bugfixes-patch (version 2) */
+#undef HAVE_PAR2_BUGFIXES_V2
+
+/* Define to 1 if libpar2 supports cancelling (needs a special patch) */
+#undef HAVE_PAR2_CANCEL
+
 /* Define to 1 if you have the <regex.h> header file. */
 #undef HAVE_REGEX_H
 
-/* Define to 1 if _SC_NPROCESSORS_ONLN is present in unistd.h */
-#undef HAVE_SC_NPROCESSORS_ONLN
-
 /* Define to 1 if spinlocks are supported */
 #undef HAVE_SPINLOCK
 
-/* Define to 1 if stdbool.h conforms to C99. */
-#undef HAVE_STDBOOL_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
 
-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `stricmp' function. */
-#undef HAVE_STRICMP
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H
 
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_NDIR_H
-
 /* Define to 1 if you have the <sys/prctl.h> header file. */
 #undef HAVE_SYS_PRCTL_H
 
@@ -152,9 +106,6 @@
 /* Define to 1 if variadic macros are supported */
 #undef HAVE_VARIADIC_MACROS
 
-/* Define to 1 if the system has the type `_Bool'. */
-#undef HAVE__BOOL
-
 /* Name of package */
 #undef PACKAGE
 
@@ -185,27 +136,8 @@
 /* Version number of package */
 #undef VERSION
 
-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS
 
-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t

configure.ac

@@ -1,32 +1,11 @@
-#
-#  This file is part of nzbget
-#
-# Copyright (C) 2008-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-#
-
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(nzbget, 14.2, hugbug@users.sourceforge.net)
+AC_INIT(nzbget, 12.0, hugbug@users.sourceforge.net)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(nzbget, 14.2)
-AC_CONFIG_SRCDIR([daemon/main/nzbget.cpp])
+AM_INIT_AUTOMAKE(nzbget, 12.0)
+AC_CONFIG_SRCDIR([nzbget.cpp])
 AC_CONFIG_HEADERS([config.h])
 
 
@@ -164,7 +143,7 @@ fi
 
 
 dnl
-dnl Check if spinlocks are available
+dnl cCheck if spinlocks are available
 dnl
 AC_CHECK_FUNC(pthread_spin_init,
 	[AC_DEFINE([HAVE_SPINLOCK], 1, [Define to 1 if spinlocks are supported])]
@@ -201,31 +180,6 @@ AC_TRY_COMPILE([
 AC_DEFINE_UNQUOTED(SOCKLEN_T, $SOCKLEN_T, [Determine what socket length (socklen_t) data type is])
 
 
-dnl
-dnl Dir-browser's snapshot
-dnl
-AC_MSG_CHECKING(whether dir-browser snapshot workaround is needed)
-if test "$target_vendor" == "apple"; then
-	AC_MSG_RESULT([[yes]])
-	AC_DEFINE([DIRBROWSER_SNAPSHOT], 1, [Define to 1 if deleting of files during reading of directory is not properly supported by OS])
-else
-	AC_MSG_RESULT([[no]])
-fi
-
-
-dnl
-dnl check cpu cores via sysconf
-dnl
-AC_MSG_CHECKING(for cpu cores via sysconf)
-AC_TRY_COMPILE(
-	[#include <unistd.h>],
-	[ int a = _SC_NPROCESSORS_ONLN; ],
-	FOUND="yes"
-	AC_MSG_RESULT([[yes]])
-	AC_DEFINE([HAVE_SC_NPROCESSORS_ONLN], 1, [Define to 1 if _SC_NPROCESSORS_ONLN is present in unistd.h]),
-	FOUND="no")
-
-
 dnl 
 dnl checks for libxml2 includes and libraries.
 dnl
@@ -242,8 +196,7 @@ AC_ARG_WITH(libxml2_libraries,
 if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
 	PKG_CHECK_MODULES(libxml2, libxml-2.0,
 		[LIBS="${LIBS} $libxml2_LIBS"]
-		[CPPFLAGS="${CPPFLAGS} $libxml2_CFLAGS"],
-		AC_MSG_ERROR("libxml2 library not found"))
+		[CPPFLAGS="${CPPFLAGS} $libxml2_CFLAGS"])
 fi
 AC_CHECK_HEADER(libxml/tree.h,,
 	AC_MSG_ERROR("libxml2 header files not found"))
@@ -299,37 +252,116 @@ fi
 
 
 dnl
-dnl Use par-checking. Deafult: yes.
+dnl Use libpar2 for par-checking. Deafult: no
 dnl
 AC_MSG_CHECKING(whether to include code for par-checking)
 AC_ARG_ENABLE(parcheck,
-	[AS_HELP_STRING([--disable-parcheck], [do not include par-check/-repair-support])],
+	[AS_HELP_STRING([--disable-parcheck], [do not include par-check/-repair-support (removes dependency from libpar2- and libsigc-libraries)])],
 	[ ENABLEPARCHECK=$enableval ],
 	[ ENABLEPARCHECK=yes] )
 AC_MSG_RESULT($ENABLEPARCHECK)
 if test "$ENABLEPARCHECK" = "yes"; then
-	dnl PAR2 checks. 
+
 	dnl 
-	dnl Checks for header files.
-	AC_HEADER_DIRENT
-	AC_HEADER_STDBOOL
-	AC_HEADER_STDC
-	AC_CHECK_HEADERS([stdio.h] [endian.h] [getopt.h])
-	dnl Checks for typedefs, structures, and compiler characteristics.
-	AC_TYPE_SIZE_T
-	AC_C_BIGENDIAN
-	AC_C_CONST
-	AC_C_INLINE
-	AC_FUNC_FSEEKO
-	dnl Checks for library functions.
-	AC_FUNC_MEMCMP
-	AC_CHECK_FUNCS([stricmp] [strcasecmp])
-	AC_CHECK_FUNCS([strchr] [memcpy])
-	AC_CHECK_FUNCS([getopt])
-	AM_CONDITIONAL(WITH_PAR2, true)
+	dnl checks for libsigc++ includes and libraries (required for libpar2).
+	dnl
+
+	AC_ARG_WITH(libsigc_includes,
+		[AS_HELP_STRING([--with-libsigc-includes=DIR], [libsigc++-2.0 include directory])],
+		[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+		[INCVAL="yes"],
+		[INCVAL="no"])
+	AC_ARG_WITH(libsigc_libraries,
+		[AS_HELP_STRING([--with-libsigc-libraries=DIR], [libsigc++-2.0 library directory])],
+		[LDFLAGS="${LDFLAGS} -L${withval}"]
+		[CPPFLAGS="${CPPFLAGS} -I${withval}/sigc++-2.0/include"]
+		[LIBVAL="yes"],
+		[LIBVAL="no"])
+	if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+		PKG_CHECK_MODULES(libsigc, sigc++-2.0,
+			[LIBS="${LIBS} $libsigc_LIBS"]
+			[CPPFLAGS="${CPPFLAGS} $libsigc_CFLAGS"])
+	fi
+	
+	AC_CHECK_HEADER(sigc++/type_traits.h,,
+		AC_MSG_ERROR("libsigc++-2.0 header files not found"))
+
+	dnl
+	dnl checks for libpar2 includes and libraries.
+	dnl
+	INCVAL="${LIBPREF}/include"
+	LIBVAL="${LIBPREF}/lib"
+	AC_ARG_WITH(libpar2_includes,
+		[AS_HELP_STRING([--with-libpar2-includes=DIR], [libpar2 include directory])],
+		[INCVAL="$withval"])
+
+	CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+	
+	AC_CHECK_HEADER(libpar2/libpar2.h,,
+		AC_MSG_ERROR("libpar2 header files not found"))
+
+	AC_ARG_WITH(libpar2_libraries,
+		[AS_HELP_STRING([--with-libpar2-libraries=DIR], [libpar2 library directory])],
+		[LIBVAL="$withval"])
+
+	LDFLAGS="${LDFLAGS} -L${LIBVAL}"
+
+	AC_SEARCH_LIBS([_ZN12Par2RepairerC1Ev], [par2], ,
+		AC_MSG_ERROR("libpar2 library not found"))
+
+	dnl
+	dnl check if libpar2 library is linkable
+	dnl
+	AC_MSG_CHECKING(for libpar2 linking)
+	AC_TRY_LINK(
+		[#include <libpar2/par2cmdline.h>]
+		[#include <libpar2/par2repairer.h>]
+		[ class Repairer : public Par2Repairer { }; ],
+		[ Repairer* p = new Repairer(); ],
+		AC_MSG_RESULT([[yes]]),
+		AC_MSG_RESULT([[no]])
+		AC_MSG_ERROR("libpar2 library not found"))
+
+	dnl
+	dnl check if libpar2 has support for cancelling
+	dnl
+	AC_MSG_CHECKING(whether libpar2 supports cancelling)
+	AC_TRY_COMPILE(
+		[#include <libpar2/par2cmdline.h>]
+		[#include <libpar2/par2repairer.h>]
+		[ class Repairer : public Par2Repairer { void test() { cancelled = true; } }; ],
+		[],
+		AC_MSG_RESULT([[yes]])
+		AC_DEFINE([HAVE_PAR2_CANCEL], 1, [Define to 1 if libpar2 supports cancelling (needs a special patch)]),
+		AC_MSG_RESULT([[no]]))
+
+	dnl
+	dnl check if libpar2 has recent bugfixes-patch
+	dnl
+	AC_MSG_CHECKING(whether libpar2 has recent bugfixes-patch (version 2))
+	AC_TRY_COMPILE(
+		[#include <libpar2/par2cmdline.h>]
+		[#include <libpar2/par2repairer.h>]
+		[ class Repairer : public Par2Repairer { void test() { BugfixesPatchVersion2(); } }; ],
+		[],
+		AC_MSG_RESULT([[yes]])
+		PAR2PATCHV2=yes
+		AC_DEFINE([HAVE_PAR2_BUGFIXES_V2], 1, [Define to 1 if libpar2 has recent bugfixes-patch (version 2)]),
+		AC_MSG_RESULT([[no]])
+		PAR2PATCHV2=no)
+
+	if test "$PAR2PATCHV2" = "no" ; then
+		AC_ARG_ENABLE(libpar2-bugfixes-check,
+			[AS_HELP_STRING([--disable-libpar2-bugfixes-check], [do not check if libpar2 has recent bugfixes-patch applied])],
+			[ PAR2PATCHCHECK=$enableval ],
+			[ PAR2PATCHCHECK=yes] )
+		if test "$PAR2PATCHCHECK" = "yes"; then
+			AC_ERROR([Your version of libpar2 doesn't include the recent bugfixes-patch (version 2, updated Dec 3, 2012). Please patch libpar2 with the patches supplied with NZBGet (see README for details). If you cannot patch libpar2, you can use configure parameter --disable-libpar2-bugfixes-check to suppress the check. Please note however that in this case the program may crash during par-check/repair. The patch is highly recommended!])
+		fi
+	fi
+
 else
-	AC_DEFINE([DISABLE_PARCHECK],1,[Define to 1 to disable par-verification and repair])
-	AM_CONDITIONAL(WITH_PAR2, false)
+	AC_DEFINE([DISABLE_PARCHECK],1,[Define to 1 to disable smart par-verification and restoration])
 fi
 
 
@@ -344,12 +376,47 @@ AC_ARG_ENABLE(tls,
 AC_MSG_RESULT($USETLS)
 if test "$USETLS" = "yes"; then
 	AC_ARG_WITH(tlslib,
-		[AS_HELP_STRING([--with-tlslib=(OpenSSL, GnuTLS)], [TLS/SSL library to use])],
+		[AS_HELP_STRING([--with-tlslib=(GnuTLS, OpenSSL)], [TLS/SSL library to use])],
 		[TLSLIB="$withval"])
 	if test "$TLSLIB" != "GnuTLS" -a "$TLSLIB" != "OpenSSL" -a "$TLSLIB" != ""; then
 		AC_MSG_ERROR([Invalid argument for option --with-tlslib])
 	fi
+	
+	if test "$TLSLIB" = "GnuTLS" -o "$TLSLIB" = ""; then
+		INCVAL="${LIBPREF}/include"
+		LIBVAL="${LIBPREF}/lib"
+		AC_ARG_WITH(libgnutls_includes,
+			[AS_HELP_STRING([--with-libgnutls-includes=DIR], [GnuTLS include directory])],
+			[INCVAL="$withval"])
+		CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+		AC_ARG_WITH(libgnutls_libraries,
+			[AS_HELP_STRING([--with-libgnutls-libraries=DIR], [GnuTLS library directory])],
+			[LIBVAL="$withval"])
+		LDFLAGS="${LDFLAGS} -L${LIBVAL}"
 
+		AC_CHECK_HEADER(gnutls/gnutls.h,
+			FOUND=yes
+			TLSHEADERS=yes,
+			FOUND=no)
+		if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
+			AC_MSG_ERROR([Couldn't find GnuTLS headers (gnutls.h)])
+		fi
+		if test "$FOUND" = "yes"; then
+			AC_SEARCH_LIBS([gnutls_global_init], [gnutls],
+				AC_SEARCH_LIBS([gcry_control], [gnutls gcrypt],
+					FOUND=yes,
+					FOUND=no),
+				FOUND=no)
+			if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
+				AC_MSG_ERROR([Couldn't find GnuTLS library])
+			fi
+			if test "$FOUND" = "yes"; then
+				TLSLIB="GnuTLS"
+				AC_DEFINE([HAVE_LIBGNUTLS],1,[Define to 1 to use GnuTLS library for TLS/SSL-support.])
+			fi
+		fi
+	fi
+	
 	if test "$TLSLIB" = "OpenSSL" -o "$TLSLIB" = ""; then
 		AC_ARG_WITH(openssl_includes,
 			[AS_HELP_STRING([--with-openssl-includes=DIR], [OpenSSL include directory])],
@@ -362,10 +429,9 @@ if test "$USETLS" = "yes"; then
 			[LIBVAL="yes"],
 			[LIBVAL="no"])
 		if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
-			PKG_CHECK_MODULES([openssl], [openssl],
+			PKG_CHECK_MODULES(openssl, openssl,
 				[LIBS="${LIBS} $openssl_LIBS"]
-				[CPPFLAGS="${CPPFLAGS} $openssl_CFLAGS"],
-				FOUND=no)
+				[CPPFLAGS="${CPPFLAGS} $openssl_CFLAGS"])
 		fi
 
 		AC_CHECK_HEADER(openssl/ssl.h,
@@ -390,66 +456,12 @@ if test "$USETLS" = "yes"; then
 			fi
 		fi
 	fi
-
-	if test "$TLSLIB" = "GnuTLS" -o "$TLSLIB" = ""; then
-		INCVAL="${LIBPREF}/include"
-		LIBVAL="${LIBPREF}/lib"
-		AC_ARG_WITH(libgnutls_includes,
-			[AS_HELP_STRING([--with-libgnutls-includes=DIR], [GnuTLS include directory])],
-			[INCVAL="$withval"])
-		CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
-		AC_ARG_WITH(libgnutls_libraries,
-			[AS_HELP_STRING([--with-libgnutls-libraries=DIR], [GnuTLS library directory])],
-			[LIBVAL="$withval"])
-		LDFLAGS="${LDFLAGS} -L${LIBVAL}"
-
-		AC_CHECK_HEADER(gnutls/gnutls.h,
-			FOUND=yes
-			TLSHEADERS=yes,
-			FOUND=no)
-		if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
-			AC_MSG_ERROR([Couldn't find GnuTLS headers (gnutls.h)])
-		fi
-		if test "$FOUND" = "yes"; then
-			AC_SEARCH_LIBS([gnutls_global_init], [gnutls],
-				FOUND=yes,
-				FOUND=no)
-			if test "$FOUND" = "yes"; then
-				dnl gcrypt is optional
-				AC_MSG_CHECKING([whether gcrypt is needed])
-				AC_TRY_COMPILE(
-					[#include <gnutls/gnutls.h>]
-					[#if GNUTLS_VERSION_NUMBER <= 0x020b00]
-					[compile error]
-					[#endif],
-					[int a;],
-					AC_MSG_RESULT([no])
-					GCRYPT=no,
-					AC_MSG_RESULT([yes])
-					GCRYPT=yes)
-				if test "$GCRYPT" = "yes"; then
-					AC_CHECK_HEADER([gcrypt.h],
-						AC_SEARCH_LIBS([gcry_control], [gnutls gcrypt],
-							FOUND=yes,
-							FOUND=no),
-						FOUND=yes)
-				fi
-			fi
-			if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
-				AC_MSG_ERROR([Couldn't find GnuTLS library])
-			fi
-			if test "$FOUND" = "yes"; then
-				TLSLIB="GnuTLS"
-				AC_DEFINE([HAVE_LIBGNUTLS],1,[Define to 1 to use GnuTLS library for TLS/SSL-support.])
-			fi
-		fi
-	fi
-
+	
 	if test "$TLSLIB" = ""; then
 		if test "$TLSHEADERS" = ""; then
-			AC_MSG_ERROR([Couldn't find neither OpenSSL nor GnuTLS headers (ssl.h or gnutls.h)])
+			AC_MSG_ERROR([Couldn't find neither GnuTLS nor OpenSSL headers (gnutls.h or ssl.h)])
 		else
-			AC_MSG_ERROR([Couldn't find neither OpenSSL nor GnuTLS library])
+			AC_MSG_ERROR([Couldn't find neither GnuTLS nor OpenSSL library])
 		fi
 	fi
 else

daemon/main/Scheduler.cpp

@@ -1,483 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2008-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#else
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "nzbget.h"
-#include "Scheduler.h"
-#include "Options.h"
-#include "Log.h"
-#include "NewsServer.h"
-#include "ServerPool.h"
-#include "FeedInfo.h"
-#include "FeedCoordinator.h"
-#include "QueueScript.h"
-
-extern Options* g_pOptions;
-extern ServerPool* g_pServerPool;
-extern FeedCoordinator* g_pFeedCoordinator;
-
-class SchedulerScriptController : public Thread, public NZBScriptController
-{
-private:
-	char*				m_szScript;
-	bool				m_bExternalProcess;
-	int					m_iTaskID;
-
-	void				PrepareParams(const char* szScriptName);
-	void				ExecuteExternalProcess();
-
-protected:
-	virtual void		ExecuteScript(Options::Script* pScript);
-
-public:
-	virtual				~SchedulerScriptController();
-	virtual void		Run();
-	static void			StartScript(const char* szParam, bool bExternalProcess, int iTaskID);
-};
-
-Scheduler::Task::Task(int iID, int iHours, int iMinutes, int iWeekDaysBits, ECommand eCommand, const char* szParam)
-{
-	m_iID = iID;
-	m_iHours = iHours;
-	m_iMinutes = iMinutes;
-	m_iWeekDaysBits = iWeekDaysBits;
-	m_eCommand = eCommand;
-	m_szParam = szParam ? strdup(szParam) : NULL;
-	m_tLastExecuted = 0;
-}
-
-Scheduler::Task::~Task()
-{
-	free(m_szParam);
-}
-
-
-Scheduler::Scheduler()
-{
-	debug("Creating Scheduler");
-
-	m_tLastCheck = 0;
-	m_TaskList.clear();
-}
-
-Scheduler::~Scheduler()
-{
-	debug("Destroying Scheduler");
-	
-	for (TaskList::iterator it = m_TaskList.begin(); it != m_TaskList.end(); it++)
-	{
-		delete *it;
-	}
-}
-
-void Scheduler::AddTask(Task* pTask)
-{
-	m_mutexTaskList.Lock();
-	m_TaskList.push_back(pTask);
-	m_mutexTaskList.Unlock();
-}
-
-bool Scheduler::CompareTasks(Scheduler::Task* pTask1, Scheduler::Task* pTask2)
-{
-	return (pTask1->m_iHours < pTask2->m_iHours) || 
-		((pTask1->m_iHours == pTask2->m_iHours) && (pTask1->m_iMinutes < pTask2->m_iMinutes));
-}
-
-void Scheduler::FirstCheck()
-{
-	m_mutexTaskList.Lock();
-	m_TaskList.sort(CompareTasks);
-	m_mutexTaskList.Unlock();
-
-	// check all tasks for the last week
-	CheckTasks();
-}
-
-void Scheduler::IntervalCheck()
-{
-	m_bExecuteProcess = true;
-	CheckTasks();
-	CheckScheduledResume();
-}
-
-void Scheduler::CheckTasks()
-{
-	PrepareLog();
-
-	m_mutexTaskList.Lock();
-
-	time_t tCurrent = time(NULL);
-
-	if (!m_TaskList.empty())
-	{
-		// Detect large step changes of system time 
-		time_t tDiff = tCurrent - m_tLastCheck;
-		if (tDiff > 60*90 || tDiff < 0)
-		{
-			debug("Reset scheduled tasks (detected clock change greater than 90 minutes or negative)");
-
-			// check all tasks for the last week
-			m_tLastCheck = tCurrent - 60*60*24*7;
-			m_bExecuteProcess = false;
-
-			for (TaskList::iterator it = m_TaskList.begin(); it != m_TaskList.end(); it++)
-			{
-				Task* pTask = *it;
-				pTask->m_tLastExecuted = 0;
-			}
-		}
-
-		time_t tLocalCurrent = tCurrent + g_pOptions->GetLocalTimeOffset();
-		time_t tLocalLastCheck = m_tLastCheck + g_pOptions->GetLocalTimeOffset();
-
-		tm tmCurrent;
-		gmtime_r(&tLocalCurrent, &tmCurrent);
-		tm tmLastCheck;
-		gmtime_r(&tLocalLastCheck, &tmLastCheck);
-
-		tm tmLoop;
-		memcpy(&tmLoop, &tmLastCheck, sizeof(tmLastCheck));
-		tmLoop.tm_hour = tmCurrent.tm_hour;
-		tmLoop.tm_min = tmCurrent.tm_min;
-		tmLoop.tm_sec = tmCurrent.tm_sec;
-		time_t tLoop = Util::Timegm(&tmLoop);
-
-		while (tLoop <= tLocalCurrent)
-		{
-			for (TaskList::iterator it = m_TaskList.begin(); it != m_TaskList.end(); it++)
-			{
-				Task* pTask = *it;
-				if (pTask->m_tLastExecuted != tLoop)
-				{
-					tm tmAppoint;
-					memcpy(&tmAppoint, &tmLoop, sizeof(tmLoop));
-					tmAppoint.tm_hour = pTask->m_iHours;
-					tmAppoint.tm_min = pTask->m_iMinutes;
-					tmAppoint.tm_sec = 0;
-
-					time_t tAppoint = Util::Timegm(&tmAppoint);
-
-					int iWeekDay = tmAppoint.tm_wday;
-					if (iWeekDay == 0)
-					{
-						iWeekDay = 7;
-					}
-
-					bool bWeekDayOK = pTask->m_iWeekDaysBits == 0 || (pTask->m_iWeekDaysBits & (1 << (iWeekDay - 1)));
-					bool bDoTask = bWeekDayOK && tLocalLastCheck < tAppoint && tAppoint <= tLocalCurrent;
-
-					//debug("TEMP: 1) m_tLastCheck=%i, tLocalCurrent=%i, tLoop=%i, tAppoint=%i, bWeekDayOK=%i, bDoTask=%i", m_tLastCheck, tLocalCurrent, tLoop, tAppoint, (int)bWeekDayOK, (int)bDoTask);
-
-					if (bDoTask)
-					{
-						ExecuteTask(pTask);
-						pTask->m_tLastExecuted = tLoop;
-					}
-				}
-			}
-			tLoop += 60*60*24; // inc day
-			gmtime_r(&tLoop, &tmLoop);
-		}
-	}
-
-	m_tLastCheck = tCurrent;
-
-	m_mutexTaskList.Unlock();
-
-	PrintLog();
-}
-
-void Scheduler::ExecuteTask(Task* pTask)
-{
-	const char* szCommandName[] = { "Pause", "Unpause", "Pause Post-processing", "Unpause Post-processing",
-		"Set download rate", "Execute process", "Execute script",
-		"Pause Scan", "Unpause Scan", "Enable Server", "Disable Server", "Fetch Feed" };
-	debug("Executing scheduled command: %s", szCommandName[pTask->m_eCommand]);
-
-	switch (pTask->m_eCommand)
-	{
-		case scDownloadRate:
-			if (!Util::EmptyStr(pTask->m_szParam))
-			{
-				g_pOptions->SetDownloadRate(atoi(pTask->m_szParam) * 1024);
-				m_bDownloadRateChanged = true;
-			}
-			break;
-
-		case scPauseDownload:
-		case scUnpauseDownload:
-			g_pOptions->SetPauseDownload(pTask->m_eCommand == scPauseDownload);
-			m_bPauseDownloadChanged = true;
-			break;
-
-		case scPausePostProcess:
-		case scUnpausePostProcess:
-			g_pOptions->SetPausePostProcess(pTask->m_eCommand == scPausePostProcess);
-			m_bPausePostProcessChanged = true;
-			break;
-
-		case scPauseScan:
-		case scUnpauseScan:
-			g_pOptions->SetPauseScan(pTask->m_eCommand == scPauseScan);
-			m_bPauseScanChanged = true;
-			break;
-
-		case scScript:
-		case scProcess:
-			if (m_bExecuteProcess)
-			{
-				SchedulerScriptController::StartScript(pTask->m_szParam, pTask->m_eCommand == scProcess, pTask->m_iID);
-			}
-			break;
-
-		case scActivateServer:
-		case scDeactivateServer:
-			EditServer(pTask->m_eCommand == scActivateServer, pTask->m_szParam);
-			break;
-
-		case scFetchFeed:
-			if (m_bExecuteProcess)
-			{
-				FetchFeed(pTask->m_szParam);
-				break;
-			}
-	}
-}
-
-void Scheduler::PrepareLog()
-{
-	m_bDownloadRateChanged = false;
-	m_bPauseDownloadChanged = false;
-	m_bPausePostProcessChanged = false;
-	m_bPauseScanChanged = false;
-	m_bServerChanged = false;
-}
-
-void Scheduler::PrintLog()
-{
-	if (m_bDownloadRateChanged)
-	{
-		info("Scheduler: setting download rate to %i KB/s", g_pOptions->GetDownloadRate() / 1024);
-	}
-	if (m_bPauseDownloadChanged)
-	{
-		info("Scheduler: %s download", g_pOptions->GetPauseDownload() ? "pausing" : "unpausing");
-	}
-	if (m_bPausePostProcessChanged)
-	{
-		info("Scheduler: %s post-processing", g_pOptions->GetPausePostProcess() ? "pausing" : "unpausing");
-	}
-	if (m_bPauseScanChanged)
-	{
-		info("Scheduler: %s scan", g_pOptions->GetPauseScan() ? "pausing" : "unpausing");
-	}
-	if (m_bServerChanged)
-	{
-		int index = 0;
-		for (Servers::iterator it = g_pServerPool->GetServers()->begin(); it != g_pServerPool->GetServers()->end(); it++, index++)
-		{
-			NewsServer* pServer = *it;
-			if (pServer->GetActive() != m_ServerStatusList[index])
-			{
-				info("Scheduler: %s %s", pServer->GetActive() ? "activating" : "deactivating", pServer->GetName());
-			}
-		}
-		g_pServerPool->Changed();
-	}
-}
-
-void Scheduler::EditServer(bool bActive, const char* szServerList)
-{
-	Tokenizer tok(szServerList, ",;");
-	while (const char* szServer = tok.Next())
-	{
-		int iID = atoi(szServer);
-		for (Servers::iterator it = g_pServerPool->GetServers()->begin(); it != g_pServerPool->GetServers()->end(); it++)
-		{
-			NewsServer* pServer = *it;
-			if ((iID > 0 && pServer->GetID() == iID) ||
-				!strcasecmp(pServer->GetName(), szServer))
-			{
-				if (!m_bServerChanged)
-				{
-					// store old server status for logging
-					m_ServerStatusList.clear();
-					m_ServerStatusList.reserve(g_pServerPool->GetServers()->size());
-					for (Servers::iterator it2 = g_pServerPool->GetServers()->begin(); it2 != g_pServerPool->GetServers()->end(); it2++)
-					{
-						NewsServer* pServer2 = *it2;
-						m_ServerStatusList.push_back(pServer2->GetActive());
-					}
-				}
-				m_bServerChanged = true;
-				pServer->SetActive(bActive);
-				break;
-			}
-		}
-	}
-}
-
-void Scheduler::FetchFeed(const char* szFeedList)
-{
-	Tokenizer tok(szFeedList, ",;");
-	while (const char* szFeed = tok.Next())
-	{
-		int iID = atoi(szFeed);
-		for (Feeds::iterator it = g_pFeedCoordinator->GetFeeds()->begin(); it != g_pFeedCoordinator->GetFeeds()->end(); it++)
-		{
-			FeedInfo* pFeed = *it;
-			if (pFeed->GetID() == iID ||
-				!strcasecmp(pFeed->GetName(), szFeed) ||
-				!strcasecmp("0", szFeed))
-			{
-				g_pFeedCoordinator->FetchFeed(!strcasecmp("0", szFeed) ? 0 : pFeed->GetID());
-				break;
-			}
-		}
-	}
-}
-
-void Scheduler::CheckScheduledResume()
-{
-	time_t tResumeTime = g_pOptions->GetResumeTime();
-	time_t tCurrentTime = time(NULL);
-	if (tResumeTime > 0 && tCurrentTime >= tResumeTime)
-	{
-		info("Autoresume");
-		g_pOptions->SetResumeTime(0);
-		g_pOptions->SetPauseDownload(false);
-		g_pOptions->SetPausePostProcess(false);
-		g_pOptions->SetPauseScan(false);
-	}
-}
-
-
-SchedulerScriptController::~SchedulerScriptController()
-{
-	free(m_szScript);
-}
-
-void SchedulerScriptController::StartScript(const char* szParam, bool bExternalProcess, int iTaskID)
-{
-	char** argv = NULL;
-	if (bExternalProcess && !Util::SplitCommandLine(szParam, &argv))
-	{
-		error("Could not execute scheduled process-script, failed to parse command line: %s", szParam);
-		return;
-	}
-
-	SchedulerScriptController* pScriptController = new SchedulerScriptController();
-
-	pScriptController->m_bExternalProcess = bExternalProcess;
-	pScriptController->m_szScript = strdup(szParam);
-	pScriptController->m_iTaskID = iTaskID;
-
-	if (bExternalProcess)
-	{
-		pScriptController->SetScript(argv[0]);
-		pScriptController->SetArgs((const char**)argv, true);
-	}
-
-	pScriptController->SetAutoDestroy(true);
-
-	pScriptController->Start();
-}
-
-void SchedulerScriptController::Run()
-{
-	if (m_bExternalProcess)
-	{
-		ExecuteExternalProcess();
-	}
-	else
-	{
-		ExecuteScriptList(m_szScript);
-	}
-}
-
-void SchedulerScriptController::ExecuteScript(Options::Script* pScript)
-{
-	if (!pScript->GetSchedulerScript())
-	{
-		return;
-	}
-
-	PrintMessage(Message::mkInfo, "Executing scheduler-script %s for Task%i", pScript->GetName(), m_iTaskID);
-
-	SetScript(pScript->GetLocation());
-	SetArgs(NULL, false);
-
-	char szInfoName[1024];
-	snprintf(szInfoName, 1024, "scheduler-script %s for Task%i", pScript->GetName(), m_iTaskID);
-	szInfoName[1024-1] = '\0';
-	SetInfoName(szInfoName);
-
-	SetLogPrefix(pScript->GetDisplayName());
-	PrepareParams(pScript->GetName());
-
-	Execute();
-
-	SetLogPrefix(NULL);
-}
-
-void SchedulerScriptController::PrepareParams(const char* szScriptName)
-{
-	ResetEnv();
-
-	SetIntEnvVar("NZBSP_TASKID", m_iTaskID);
-
-	PrepareEnvScript(NULL, szScriptName);
-}
-
-void SchedulerScriptController::ExecuteExternalProcess()
-{
-	info("Executing scheduled process-script %s for Task%i", Util::BaseFileName(GetScript()), m_iTaskID);
-
-	char szInfoName[1024];
-	snprintf(szInfoName, 1024, "scheduled process-script %s for Task%i", Util::BaseFileName(GetScript()), m_iTaskID);
-	szInfoName[1024-1] = '\0';
-	SetInfoName(szInfoName);
-
-	char szLogPrefix[1024];
-	strncpy(szLogPrefix, Util::BaseFileName(GetScript()), 1024);
-	szLogPrefix[1024-1] = '\0';
-	if (char* ext = strrchr(szLogPrefix, '.')) *ext = '\0'; // strip file extension
-	SetLogPrefix(szLogPrefix);
-
-	Execute();
-}

daemon/main/StackTrace.cpp

@@ -1,321 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#ifdef WIN32
-#include <dbghelp.h>
-#else
-#include <unistd.h>
-#include <sys/resource.h>
-#include <signal.h>
-#endif
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
-#ifdef HAVE_BACKTRACE
-#include <execinfo.h>
-#endif
-
-#include "nzbget.h"
-#include "Log.h"
-#include "Options.h"
-#include "StackTrace.h"
-
-extern Options* g_pOptions;
-extern void ExitProc();
-
-#ifdef WIN32
-
-#ifdef DEBUG
-
-void PrintBacktrace(PCONTEXT pContext)
-{
-	HANDLE hProcess = GetCurrentProcess();
-	HANDLE hThread = GetCurrentThread();
-
-	char szAppDir[MAX_PATH + 1];
-	GetModuleFileName(NULL, szAppDir, sizeof(szAppDir));
-	char* end = strrchr(szAppDir, PATH_SEPARATOR);
-	if (end) *end = '\0';
-
-	SymSetOptions(SymGetOptions() | SYMOPT_LOAD_LINES | SYMOPT_FAIL_CRITICAL_ERRORS);
-
-	if (!SymInitialize(hProcess, szAppDir, TRUE))
-	{
-		warn("Could not obtain detailed exception information: SymInitialize failed");
-		return;
-	}
-
-	const int MAX_NAMELEN = 1024;
-	IMAGEHLP_SYMBOL64* pSym = (IMAGEHLP_SYMBOL64 *) malloc(sizeof(IMAGEHLP_SYMBOL64) + MAX_NAMELEN);
-	memset(pSym, 0, sizeof(IMAGEHLP_SYMBOL64) + MAX_NAMELEN);
-	pSym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
-	pSym->MaxNameLength = MAX_NAMELEN;
-
-	IMAGEHLP_LINE64 ilLine;
-	memset(&ilLine, 0, sizeof(ilLine));
-	ilLine.SizeOfStruct = sizeof(ilLine);
-
-	STACKFRAME64 sfStackFrame;
-	memset(&sfStackFrame, 0, sizeof(sfStackFrame));
-	DWORD imageType;
-#ifdef _M_IX86
-	imageType = IMAGE_FILE_MACHINE_I386;
-	sfStackFrame.AddrPC.Offset = pContext->Eip;
-	sfStackFrame.AddrPC.Mode = AddrModeFlat;
-	sfStackFrame.AddrFrame.Offset = pContext->Ebp;
-	sfStackFrame.AddrFrame.Mode = AddrModeFlat;
-	sfStackFrame.AddrStack.Offset = pContext->Esp;
-	sfStackFrame.AddrStack.Mode = AddrModeFlat;
-#elif _M_X64
-	imageType = IMAGE_FILE_MACHINE_AMD64;
-	sfStackFrame.AddrPC.Offset = pContext->Rip;
-	sfStackFrame.AddrPC.Mode = AddrModeFlat;
-	sfStackFrame.AddrFrame.Offset = pContext->Rsp;
-	sfStackFrame.AddrFrame.Mode = AddrModeFlat;
-	sfStackFrame.AddrStack.Offset = pContext->Rsp;
-	sfStackFrame.AddrStack.Mode = AddrModeFlat;
-#else
-	warn("Could not obtain detailed exception information: platform not supported");
-	return;
-#endif
-
-	for (int frameNum = 0; ; frameNum++)
-	{
-		if (frameNum > 1000)
-		{
-			warn("Endless stack, abort tracing");
-			return;
-		}
-
-		if (!StackWalk64(imageType, hProcess, hThread, &sfStackFrame, pContext, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL))
-		{
-			warn("Could not obtain detailed exception information: StackWalk64 failed");
-			return;
-		}
-
-		DWORD64 dwAddr = sfStackFrame.AddrPC.Offset;
-		char szSymName[1024];
-		char szSrcFileName[1024];
-		int iLineNumber = 0;
-
-		DWORD64 dwSymbolDisplacement;
-		if (SymGetSymFromAddr64(hProcess, dwAddr, &dwSymbolDisplacement, pSym))
-		{
-			UnDecorateSymbolName(pSym->Name, szSymName, sizeof(szSymName), UNDNAME_COMPLETE);
-			szSymName[sizeof(szSymName) - 1] = '\0';
-		}
-		else
-		{
-			strncpy(szSymName, "<symbol not available>", sizeof(szSymName));
-		}
-
-		DWORD dwLineDisplacement;
-		if (SymGetLineFromAddr64(hProcess, dwAddr, &dwLineDisplacement, &ilLine))
-		{
-			iLineNumber = ilLine.LineNumber;
-			char* szUseFileName = ilLine.FileName;
-			char* szRoot = strstr(szUseFileName, "\\daemon\\");
-			if (szRoot)
-			{
-				szUseFileName = szRoot;
-			}
-			strncpy(szSrcFileName, szUseFileName, sizeof(szSrcFileName));
-			szSrcFileName[sizeof(szSrcFileName) - 1] = '\0';
-		}
-		else
-		{
-			strncpy(szSrcFileName, "<filename not available>", sizeof(szSymName));
-		}
-
-		info("%s (%i) : %s", szSrcFileName, iLineNumber, szSymName);
-
-		if (sfStackFrame.AddrReturn.Offset == 0)
-		{
-			break;
-		}
-	}
-}
-#endif
-
-LONG __stdcall ExceptionFilter(EXCEPTION_POINTERS* pExPtrs)
-{
-	error("Unhandled Exception: code: 0x%8.8X, flags: %d, address: 0x%8.8X",
-		pExPtrs->ExceptionRecord->ExceptionCode,
-		pExPtrs->ExceptionRecord->ExceptionFlags,
-		pExPtrs->ExceptionRecord->ExceptionAddress);
-
-#ifdef DEBUG
-	PrintBacktrace(pExPtrs->ContextRecord);
-#else
-	 info("Detailed exception information can be printed by debug version of NZBGet (available from download page)");
-#endif
-
-	ExitProcess(-1);
-	return EXCEPTION_CONTINUE_SEARCH;
-}
-
-void InstallErrorHandler()
-{
-	SetUnhandledExceptionFilter(ExceptionFilter);
-}
-
-#else
-
-#ifdef DEBUG
-typedef void(*sighandler)(int);
-std::vector<sighandler> SignalProcList;
-#endif
-
-#ifdef HAVE_SYS_PRCTL_H
-/**
-* activates the creation of core-files
-*/
-void EnableDumpCore()
-{
-	rlimit rlim;
-	rlim.rlim_cur= RLIM_INFINITY;
-	rlim.rlim_max= RLIM_INFINITY;
-	setrlimit(RLIMIT_CORE, &rlim);
-	prctl(PR_SET_DUMPABLE, 1);
-}
-#endif
-
-void PrintBacktrace()
-{
-#ifdef HAVE_BACKTRACE
-	printf("Segmentation fault, tracing...\n");
-	
-	void *array[100];
-	size_t size;
-	char **strings;
-	size_t i;
-
-	size = backtrace(array, 100);
-	strings = backtrace_symbols(array, size);
-
-	// first trace to screen
-	printf("Obtained %zd stack frames\n", size);
-	for (i = 0; i < size; i++)
-	{
-		printf("%s\n", strings[i]);
-	}
-
-	// then trace to log
-	error("Segmentation fault, tracing...");
-	error("Obtained %zd stack frames", size);
-	for (i = 0; i < size; i++)
-	{
-		error("%s", strings[i]);
-	}
-
-	free(strings);
-#else
-	error("Segmentation fault");
-#endif
-}
-
-/*
- * Signal handler
- */
-void SignalProc(int iSignal)
-{
-	switch (iSignal)
-	{
-		case SIGINT:
-			signal(SIGINT, SIG_DFL);   // Reset the signal handler
-			ExitProc();
-			break;
-
-		case SIGTERM:
-			signal(SIGTERM, SIG_DFL);   // Reset the signal handler
-			ExitProc();
-			break;
-
-		case SIGCHLD:
-			// ignoring
-			break;
-
-#ifdef DEBUG
-		case SIGSEGV:
-			signal(SIGSEGV, SIG_DFL);   // Reset the signal handler
-			PrintBacktrace();
-			break;
-#endif
-	}
-}
-
-void InstallErrorHandler()
-{
-#ifdef HAVE_SYS_PRCTL_H
-	if (g_pOptions->GetDumpCore())
-	{
-		EnableDumpCore();
-	}
-#endif
-
-	signal(SIGINT, SignalProc);
-	signal(SIGTERM, SignalProc);
-	signal(SIGPIPE, SIG_IGN);
-#ifdef DEBUG
-	signal(SIGSEGV, SignalProc);
-#endif
-#ifdef SIGCHLD_HANDLER
-    // it could be necessary on some systems to activate a handler for SIGCHLD
-    // however it make troubles on other systems and is deactivated by default
-	signal(SIGCHLD, SignalProc);
-#endif
-}
-
-#endif
-
-#ifdef DEBUG
-class SegFault
-{
-public:
-	void DoSegFault()
-	{
-		char* N = NULL;
-		strcpy(N, "");
-	}
-};
-
-void TestSegFault()
-{
-	SegFault s;
-	s.DoSegFault();
-}
-#endif

daemon/main/StackTrace.h

@@ -1,35 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef STACKTRACE_H
-#define STACKTRACE_H
-
-void InstallErrorHandler();
-
-#ifdef DEBUG
-void TestSegFault();
-#endif
-
-#endif

daemon/nntp/ArticleDownloader.cpp

@@ -1,723 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifdef WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-#include <sys/stat.h>
-#include <errno.h>
-
-#include "nzbget.h"
-#include "ArticleDownloader.h"
-#include "ArticleWriter.h"
-#include "Decoder.h"
-#include "Log.h"
-#include "Options.h"
-#include "ServerPool.h"
-#include "StatMeter.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-extern ServerPool* g_pServerPool;
-extern StatMeter* g_pStatMeter;
-
-ArticleDownloader::ArticleDownloader()
-{
-	debug("Creating ArticleDownloader");
-
-	m_szInfoName = NULL;
-	m_szConnectionName[0] = '\0';
-	m_pConnection = NULL;
-	m_eStatus = adUndefined;
-	m_eFormat = Decoder::efUnknown;
-	m_szArticleFilename = NULL;
-	m_iDownloadedSize = 0;
-	m_ArticleWriter.SetOwner(this);
-	SetLastUpdateTimeNow();
-}
-
-ArticleDownloader::~ArticleDownloader()
-{
-	debug("Destroying ArticleDownloader");
-
-	free(m_szInfoName);
-	free(m_szArticleFilename);
-}
-
-void ArticleDownloader::SetInfoName(const char* szInfoName)
-{
-	m_szInfoName = strdup(szInfoName);
-	m_ArticleWriter.SetInfoName(m_szInfoName);
-}
-
-/*
- * How server management (for one particular article) works:
-	- there is a list of failed servers which is initially empty;
-	- level is initially 0;
-
-	<loop>
-		- request a connection from server pool for current level;
-		  Exception: this step is skipped for the very first download attempt, because a
-		  level-0 connection is initially passed from queue manager;
-		- try to download from server;
-		- if connection to server cannot be established or download fails due to interrupted connection,
-		  try again (as many times as needed without limit) the same server until connection is OK;
-		- if download fails with error "Not-Found" (article or group not found) or with CRC error,
-		  add the server to failed server list;
-		- if download fails with general failure error (article incomplete, other unknown error
-		  codes), try the same server again as many times as defined by option <Retries>; if all attempts
-		  fail, add the server to failed server list;
-		- if all servers from current level were tried, increase level;
-		- if all servers from all levels were tried, break the loop with failure status.
-	<end-loop>
-*/
-void ArticleDownloader::Run()
-{
-	debug("Entering ArticleDownloader-loop");
-
-	SetStatus(adRunning);
-
-	m_ArticleWriter.SetFileInfo(m_pFileInfo);
-	m_ArticleWriter.SetArticleInfo(m_pArticleInfo);
-	m_ArticleWriter.Prepare();
-
-	EStatus Status = adFailed;
-	int iRetries = g_pOptions->GetRetries() > 0 ? g_pOptions->GetRetries() : 1;
-	int iRemainedRetries = iRetries;
-	Servers failedServers;
-	failedServers.reserve(g_pServerPool->GetServers()->size());
-	NewsServer* pWantServer = NULL;
-	NewsServer* pLastServer = NULL;
-	int iLevel = 0;
-	int iServerConfigGeneration = g_pServerPool->GetGeneration();
-	bool bForce = m_pFileInfo->GetNZBInfo()->GetForcePriority();
-
-	while (!IsStopped())
-	{
-		Status = adFailed;
-
-		SetStatus(adWaiting);
-		while (!m_pConnection && !(IsStopped() || iServerConfigGeneration != g_pServerPool->GetGeneration()))
-		{
-			m_pConnection = g_pServerPool->GetConnection(iLevel, pWantServer, &failedServers);
-			usleep(5 * 1000);
-		}
-		SetLastUpdateTimeNow();
-		SetStatus(adRunning);
-
-		if (IsStopped() || (g_pOptions->GetPauseDownload() && !bForce) ||
-			(g_pOptions->GetTempPauseDownload() && !m_pFileInfo->GetExtraPriority()) ||
-			iServerConfigGeneration != g_pServerPool->GetGeneration())
-		{
-			Status = adRetry;
-			break;
-		}
-
-		pLastServer = m_pConnection->GetNewsServer();
-
-		m_pConnection->SetSuppressErrors(false);
-
-		snprintf(m_szConnectionName, sizeof(m_szConnectionName), "%s (%s)",
-			m_pConnection->GetNewsServer()->GetName(), m_pConnection->GetHost());
-		m_szConnectionName[sizeof(m_szConnectionName) - 1] = '\0';
-
-		// test connection
-		bool bConnected = m_pConnection && m_pConnection->Connect();
-		if (bConnected && !IsStopped())
-		{
-			NewsServer* pNewsServer = m_pConnection->GetNewsServer();
-			detail("Downloading %s @ %s", m_szInfoName, m_szConnectionName);
-
-			Status = Download();
-
-			if (Status == adFinished || Status == adFailed || Status == adNotFound || Status == adCrcError)
-			{
-				m_ServerStats.StatOp(pNewsServer->GetID(), Status == adFinished ? 1 : 0, Status == adFinished ? 0 : 1, ServerStatList::soSet);
-			}
-		}
-
-		if (bConnected)
-		{
-			if (Status == adConnectError)
-			{
-				m_pConnection->Disconnect();
-				bConnected = false;
-				Status = adFailed;
-			}
-			else
-			{
-				// freeing connection allows other threads to start.
-				// we doing this only if the problem was with article or group.
-				// if the problem occurs by connecting or authorization we do not
-				// free the connection, to prevent starting of thousands of threads 
-				// (cause each of them will also free it's connection after the 
-				// same connect-error).
-				FreeConnection(Status == adFinished || Status == adNotFound);
-			}
-		}
-
-		if (m_pConnection)
-		{
-			AddServerData();
-		}
-
-		if (Status == adFinished || Status == adFatalError)
-		{
-			break;
-		}
-
-		pWantServer = NULL;
-
-		if (bConnected && Status == adFailed)
-		{
-			iRemainedRetries--;
-		}
-
-		if (!bConnected || (Status == adFailed && iRemainedRetries > 0))
-		{
-			pWantServer = pLastServer;
-		}
-
-		if (pWantServer && 
-			!(IsStopped() || (g_pOptions->GetPauseDownload() && !bForce) ||
-			  (g_pOptions->GetTempPauseDownload() && !m_pFileInfo->GetExtraPriority()) ||
-			  iServerConfigGeneration != g_pServerPool->GetGeneration()))
-		{
-			detail("Waiting %i sec to retry", g_pOptions->GetRetryInterval());
-			SetStatus(adWaiting);
-			int msec = 0;
-			while (!(IsStopped() || (g_pOptions->GetPauseDownload() && !bForce) ||
-					 (g_pOptions->GetTempPauseDownload() && !m_pFileInfo->GetExtraPriority()) ||
-					 iServerConfigGeneration != g_pServerPool->GetGeneration()) &&
-				  msec < g_pOptions->GetRetryInterval() * 1000)
-			{
-				usleep(100 * 1000);
-				msec += 100;
-			}
-			SetLastUpdateTimeNow();
-			SetStatus(adRunning);
-		}
-
-		if (IsStopped() || (g_pOptions->GetPauseDownload() && !bForce) ||
-			(g_pOptions->GetTempPauseDownload() && !m_pFileInfo->GetExtraPriority()) ||
-			iServerConfigGeneration != g_pServerPool->GetGeneration())
-		{
-			Status = adRetry;
-			break;
-		}
-
-		if (!pWantServer)
-		{
-			failedServers.push_back(pLastServer);
-
-			// if all servers from current level were tried, increase level
-			// if all servers from all levels were tried, break the loop with failure status
-
-			bool bAllServersOnLevelFailed = true;
-			for (Servers::iterator it = g_pServerPool->GetServers()->begin(); it != g_pServerPool->GetServers()->end(); it++)
-			{
-				NewsServer* pCandidateServer = *it;
-				if (pCandidateServer->GetNormLevel() == iLevel)
-				{
-					bool bServerFailed = !pCandidateServer->GetActive() || pCandidateServer->GetMaxConnections() == 0;
-					if (!bServerFailed)
-					{
-						for (Servers::iterator it = failedServers.begin(); it != failedServers.end(); it++)
-						{
-							NewsServer* pIgnoreServer = *it;
-							if (pIgnoreServer == pCandidateServer ||
-								(pIgnoreServer->GetGroup() > 0 && pIgnoreServer->GetGroup() == pCandidateServer->GetGroup() &&
-								 pIgnoreServer->GetNormLevel() == pCandidateServer->GetNormLevel()))
-							{
-								bServerFailed = true;
-								break;
-							}					
-						}
-					}
-					if (!bServerFailed)
-					{
-						bAllServersOnLevelFailed = false;
-						break;
-					}
-				}
-			}
-
-			if (bAllServersOnLevelFailed)
-			{
-				if (iLevel < g_pServerPool->GetMaxNormLevel())
-				{
-					detail("Article %s @ all level %i servers failed, increasing level", m_szInfoName, iLevel);
-					iLevel++;
-				}
-				else
-				{
-					detail("Article %s @ all servers failed", m_szInfoName);
-					Status = adFailed;
-					break;
-				}
-			}
-			
-			iRemainedRetries = iRetries;
-		}
-	}
-
-	FreeConnection(Status == adFinished);
-
-	if (m_ArticleWriter.GetDuplicate())
-	{
-		Status = adFinished;
-	}
-
-	if (Status != adFinished && Status != adRetry)
-	{
-		Status = adFailed;
-	}
-
-	if (IsStopped())
-	{
-		detail("Download %s cancelled", m_szInfoName);
-		Status = adRetry;
-	}
-
-	if (Status == adFailed)
-	{
-		detail("Download %s failed", m_szInfoName);
-	}
-
-	SetStatus(Status);
-	Notify(NULL);
-
-	debug("Exiting ArticleDownloader-loop");
-}
-
-ArticleDownloader::EStatus ArticleDownloader::Download()
-{
-	const char* szResponse = NULL;
-	EStatus Status = adRunning;
-	m_bWritingStarted = false;
-	m_pArticleInfo->SetCrc(0);
-
-	if (m_pConnection->GetNewsServer()->GetJoinGroup())
-	{
-		// change group
-		for (FileInfo::Groups::iterator it = m_pFileInfo->GetGroups()->begin(); it != m_pFileInfo->GetGroups()->end(); it++)
-		{
-			szResponse = m_pConnection->JoinGroup(*it);
-			if (szResponse && !strncmp(szResponse, "2", 1))
-			{
-				break; 
-			}
-		}
-
-		Status = CheckResponse(szResponse, "could not join group");
-		if (Status != adFinished)
-		{
-			return Status;
-		}
-	}
-
-	// retrieve article
-	char tmp[1024];
-	snprintf(tmp, 1024, "ARTICLE %s\r\n", m_pArticleInfo->GetMessageID());
-	tmp[1024-1] = '\0';
-
-	for (int retry = 3; retry > 0; retry--)
-	{
-		szResponse = m_pConnection->Request(tmp);
-		if ((szResponse && !strncmp(szResponse, "2", 1)) || m_pConnection->GetAuthError())
-		{
-			break;
-		}
-	}
-
-	Status = CheckResponse(szResponse, "could not fetch article");
-	if (Status != adFinished)
-	{
-		return Status;
-	}
-
-	if (g_pOptions->GetDecode())
-	{
-		m_YDecoder.Clear();
-		m_YDecoder.SetCrcCheck(g_pOptions->GetCrcCheck());
-		m_UDecoder.Clear();
-	}
-
-	bool bBody = false;
-	bool bEnd = false;
-	const int LineBufSize = 1024*10;
-	char* szLineBuf = (char*)malloc(LineBufSize);
-	Status = adRunning;
-
-	while (!IsStopped())
-	{
-		time_t tOldTime = m_tLastUpdateTime;
-		SetLastUpdateTimeNow();
-		if (tOldTime != m_tLastUpdateTime)
-		{
-			AddServerData();
-		}
-
-		// Throttle the bandwidth
-		while (!IsStopped() && (g_pOptions->GetDownloadRate() > 0.0f) &&
-		        (g_pStatMeter->CalcCurrentDownloadSpeed() > g_pOptions->GetDownloadRate()))
-		{
-			SetLastUpdateTimeNow();
-			usleep(10 * 1000);
-		}
-
-		int iLen = 0;
-		char* line = m_pConnection->ReadLine(szLineBuf, LineBufSize, &iLen);
-
-		g_pStatMeter->AddSpeedReading(iLen);
-		if (g_pOptions->GetAccurateRate())
-		{
-			AddServerData();
-		}
-
-		// Have we encountered a timeout?
-		if (!line)
-		{
-			if (!IsStopped())
-			{
-				detail("Article %s @ %s failed: Unexpected end of article", m_szInfoName, m_szConnectionName);
-			}
-			Status = adFailed;
-			break;
-		}
-
-		//detect end of article
-		if (!strcmp(line, ".\r\n") || !strcmp(line, ".\n"))
-		{
-			bEnd = true;
-			break;
-		}
-
-		//detect lines starting with "." (marked as "..")
-		if (!strncmp(line, "..", 2))
-		{
-			line++;
-			iLen--;
-		}
-
-		if (!bBody)
-		{
-			// detect body of article
-			if (*line == '\r' || *line == '\n')
-			{
-				bBody = true;
-			}
-			// check id of returned article
-			else if (!strncmp(line, "Message-ID: ", 12))
-			{
-				char* p = line + 12;
-				if (strncmp(p, m_pArticleInfo->GetMessageID(), strlen(m_pArticleInfo->GetMessageID())))
-				{
-					if (char* e = strrchr(p, '\r')) *e = '\0'; // remove trailing CR-character
-					detail("Article %s @ %s failed: Wrong message-id, expected %s, returned %s", m_szInfoName,
-						m_szConnectionName, m_pArticleInfo->GetMessageID(), p);
-					Status = adFailed;
-					break;
-				}
-			}
-		}
-		else if (m_eFormat == Decoder::efUnknown && g_pOptions->GetDecode())
-		{
-			m_eFormat = Decoder::DetectFormat(line, iLen);
-		}
-
-		// write to output file
-		if (((bBody && m_eFormat != Decoder::efUnknown) || !g_pOptions->GetDecode()) && !Write(line, iLen))
-		{
-			Status = adFatalError;
-			break;
-		}
-	}
-
-	free(szLineBuf);
-
-	if (!bEnd && Status == adRunning && !IsStopped())
-	{
-		detail("Article %s @ %s failed: article incomplete", m_szInfoName, m_szConnectionName);
-		Status = adFailed;
-	}
-
-	if (IsStopped())
-	{
-		Status = adFailed;
-	}
-
-	if (Status == adRunning)
-	{
-		FreeConnection(true);
-		Status = DecodeCheck();
-	}
-
-	if (m_bWritingStarted)
-	{
-		m_ArticleWriter.Finish(Status == adFinished);
-	}
-
-	if (Status == adFinished)
-	{
-		detail("Successfully downloaded %s", m_szInfoName);
-	}
-
-	return Status;
-}
-
-ArticleDownloader::EStatus ArticleDownloader::CheckResponse(const char* szResponse, const char* szComment)
-{
-	if (!szResponse)
-	{
-		if (!IsStopped())
-		{
-			detail("Article %s @ %s failed, %s: Connection closed by remote host",
-				m_szInfoName, m_szConnectionName, szComment);
-		}
-		return adConnectError;
-	}
-	else if (m_pConnection->GetAuthError() || !strncmp(szResponse, "400", 3) || !strncmp(szResponse, "499", 3))
-	{
-		detail("Article %s @ %s failed, %s: %s", m_szInfoName, m_szConnectionName, szComment, szResponse);
-		return adConnectError;
-	}
-	else if (!strncmp(szResponse, "41", 2) || !strncmp(szResponse, "42", 2) || !strncmp(szResponse, "43", 2))
-	{
-		detail("Article %s @ %s failed, %s: %s", m_szInfoName, m_szConnectionName, szComment, szResponse);
-		return adNotFound;
-	}
-	else if (!strncmp(szResponse, "2", 1))
-	{
-		// OK
-		return adFinished;
-	}
-	else 
-	{
-		// unknown error, no special handling
-		detail("Article %s @ %s failed, %s: %s", m_szInfoName, m_szConnectionName, szComment, szResponse);
-		return adFailed;
-	}
-}
-
-bool ArticleDownloader::Write(char* szLine, int iLen)
-{
-	const char* szArticleFilename = NULL;
-	long long iArticleFileSize = 0;
-	long long iArticleOffset = 0;
-	int iArticleSize = 0;
-
-	if (g_pOptions->GetDecode())
-	{
-		if (m_eFormat == Decoder::efYenc)
-		{
-			iLen = m_YDecoder.DecodeBuffer(szLine, iLen);
-			szArticleFilename = m_YDecoder.GetArticleFilename();
-			iArticleFileSize = m_YDecoder.GetSize();
-		}
-		else if (m_eFormat == Decoder::efUx)
-		{
-			iLen = m_UDecoder.DecodeBuffer(szLine, iLen);
-			szArticleFilename = m_UDecoder.GetArticleFilename();
-		}
-		else
-		{
-			detail("Decoding %s failed: unsupported encoding", m_szInfoName);
-			return false;
-		}
-
-		if (iLen > 0 && m_eFormat == Decoder::efYenc)
-		{
-			if (m_YDecoder.GetBegin() == 0 || m_YDecoder.GetEnd() == 0)
-			{
-				return false;
-			}
-			iArticleOffset = m_YDecoder.GetBegin() - 1;
-			iArticleSize = (int)(m_YDecoder.GetEnd() - m_YDecoder.GetBegin() + 1);
-		}
-	}
-
-	if (!m_bWritingStarted && iLen > 0)
-	{
-		if (!m_ArticleWriter.Start(m_eFormat, szArticleFilename, iArticleFileSize, iArticleOffset, iArticleSize))
-		{
-			return false;
-		}
-		m_bWritingStarted = true;
-	}
-
-	bool bOK = iLen == 0 || m_ArticleWriter.Write(szLine, iLen);
-
-	return bOK;
-}
-
-ArticleDownloader::EStatus ArticleDownloader::DecodeCheck()
-{
-	if (g_pOptions->GetDecode())
-	{
-		Decoder* pDecoder = NULL;
-		if (m_eFormat == Decoder::efYenc)
-		{
-			pDecoder = &m_YDecoder;
-		}
-		else if (m_eFormat == Decoder::efUx)
-		{
-			pDecoder = &m_UDecoder;
-		}
-		else
-		{
-			detail("Decoding %s failed: no binary data or unsupported encoding format", m_szInfoName);
-			return adFailed;
-		}
-
-		Decoder::EStatus eStatus = pDecoder->Check();
-
-		if (eStatus == Decoder::eFinished)
-		{
-			if (pDecoder->GetArticleFilename())
-			{
-				free(m_szArticleFilename);
-				m_szArticleFilename = strdup(pDecoder->GetArticleFilename());
-			}
-
-			if (m_eFormat == Decoder::efYenc)
-			{
-				m_pArticleInfo->SetCrc(g_pOptions->GetCrcCheck() ?
-					m_YDecoder.GetCalculatedCrc() : m_YDecoder.GetExpectedCrc());
-			}
-
-			return adFinished;
-		}
-		else if (eStatus == Decoder::eCrcError)
-		{
-			detail("Decoding %s failed: CRC-Error", m_szInfoName);
-			return adCrcError;
-		}
-		else if (eStatus == Decoder::eArticleIncomplete)
-		{
-			detail("Decoding %s failed: article incomplete", m_szInfoName);
-			return adFailed;
-		}
-		else if (eStatus == Decoder::eInvalidSize)
-		{
-			detail("Decoding %s failed: size mismatch", m_szInfoName);
-			return adFailed;
-		}
-		else if (eStatus == Decoder::eNoBinaryData)
-		{
-			detail("Decoding %s failed: no binary data found", m_szInfoName);
-			return adFailed;
-		}
-		else
-		{
-			detail("Decoding %s failed", m_szInfoName);
-			return adFailed;
-		}
-	}
-	else 
-	{
-		return adFinished;
-	}
-}
-
-void ArticleDownloader::LogDebugInfo()
-{
-	char szTime[50];
-#ifdef HAVE_CTIME_R_3
-		ctime_r(&m_tLastUpdateTime, szTime, 50);
-#else
-		ctime_r(&m_tLastUpdateTime, szTime);
-#endif
-	info("      Download: Status=%i, LastUpdateTime=%s, InfoName=%s", m_eStatus, szTime, m_szInfoName);
-}
-
-void ArticleDownloader::Stop()
-{
-	debug("Trying to stop ArticleDownloader");
-	Thread::Stop();
-	m_mutexConnection.Lock();
-	if (m_pConnection)
-	{
-		m_pConnection->SetSuppressErrors(true);
-		m_pConnection->Cancel();
-	}
-	m_mutexConnection.Unlock();
-	debug("ArticleDownloader stopped successfully");
-}
-
-bool ArticleDownloader::Terminate()
-{
-	NNTPConnection* pConnection = m_pConnection;
-	bool terminated = Kill();
-	if (terminated && pConnection)
-	{
-		debug("Terminating connection");
-		pConnection->SetSuppressErrors(true);
-		pConnection->Cancel();
-		pConnection->Disconnect();
-		g_pStatMeter->AddServerData(pConnection->FetchTotalBytesRead(), pConnection->GetNewsServer()->GetID());
-		g_pServerPool->FreeConnection(pConnection, true);
-	}
-	return terminated;
-}
-
-void ArticleDownloader::FreeConnection(bool bKeepConnected)
-{
-	if (m_pConnection)							
-	{
-		debug("Releasing connection");
-		m_mutexConnection.Lock();
-		if (!bKeepConnected || m_pConnection->GetStatus() == Connection::csCancelled)
-		{
-			m_pConnection->Disconnect();
-		}
-		AddServerData();
-		g_pServerPool->FreeConnection(m_pConnection, true);
-		m_pConnection = NULL;
-		m_mutexConnection.Unlock();
-	}
-}
-
-void ArticleDownloader::AddServerData()
-{
-	int iBytesRead = m_pConnection->FetchTotalBytesRead();
-	g_pStatMeter->AddServerData(iBytesRead, m_pConnection->GetNewsServer()->GetID());
-	m_iDownloadedSize += iBytesRead;
-}

daemon/nntp/ArticleWriter.cpp

@@ -1,999 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifdef WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-#include <sys/stat.h>
-#include <errno.h>
-#include <algorithm>
-
-#include "nzbget.h"
-#include "ArticleWriter.h"
-#include "DiskState.h"
-#include "Options.h"
-#include "Log.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-extern DiskState* g_pDiskState;
-extern ArticleCache* g_pArticleCache;
-
-
-ArticleWriter::ArticleWriter()
-{
-	debug("Creating ArticleWriter");
-
-	m_szTempFilename = NULL;
-	m_szOutputFilename = NULL;
-	m_szResultFilename = NULL;
-	m_szInfoName = NULL;
-	m_eFormat = Decoder::efUnknown;
-	m_pArticleData = NULL;
-	m_bDuplicate = false;
-	m_bFlushing = false;
-}
-
-ArticleWriter::~ArticleWriter()
-{
-	debug("Destroying ArticleWriter");
-
-	free(m_szOutputFilename);
-	free(m_szTempFilename);
-	free(m_szInfoName);
-
-	if (m_pArticleData)
-	{
-		free(m_pArticleData);
-		g_pArticleCache->Free(m_iArticleSize);
-	}
-
-	if (m_bFlushing)
-	{
-		g_pArticleCache->UnlockFlush();
-	}
-}
-
-void ArticleWriter::SetInfoName(const char* szInfoName)
-{
-	m_szInfoName = strdup(szInfoName);
-}
-
-void ArticleWriter::SetWriteBuffer(FILE* pOutFile, int iRecSize)
-{
-	if (g_pOptions->GetWriteBuffer() > 0)
-	{
-		setvbuf(pOutFile, NULL, _IOFBF,
-			iRecSize > 0 && iRecSize < g_pOptions->GetWriteBuffer() * 1024 ?
-			iRecSize : g_pOptions->GetWriteBuffer() * 1024);
-	}
-}
-
-void ArticleWriter::Prepare()
-{
-	BuildOutputFilename();
-	m_szResultFilename = m_pArticleInfo->GetResultFilename();
-}
-
-bool ArticleWriter::Start(Decoder::EFormat eFormat, const char* szFilename, long long iFileSize,
-	long long iArticleOffset, int iArticleSize)
-{
-	char szErrBuf[256];
-	m_pOutFile = NULL;
-	m_eFormat = eFormat;
-	m_iArticleOffset = iArticleOffset;
-	m_iArticleSize = iArticleSize ? iArticleSize : m_pArticleInfo->GetSize();
-	m_iArticlePtr = 0;
-
-	// prepare file for writing
-	if (m_eFormat == Decoder::efYenc)
-	{
-		if (g_pOptions->GetDupeCheck() &&
-			m_pFileInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
-			!m_pFileInfo->GetNZBInfo()->GetManyDupeFiles())
-		{
-			m_pFileInfo->LockOutputFile();
-			bool bOutputInitialized = m_pFileInfo->GetOutputInitialized();
-			if (!g_pOptions->GetDirectWrite())
-			{
-				m_pFileInfo->SetOutputInitialized(true);
-			}
-			m_pFileInfo->UnlockOutputFile();
-			if (!bOutputInitialized && szFilename &&
-				Util::FileExists(m_pFileInfo->GetNZBInfo()->GetDestDir(), szFilename))
-			{
-				m_bDuplicate = true;
-				return false;
-			}
-		}
-
-		if (g_pOptions->GetDirectWrite())
-		{
-			m_pFileInfo->LockOutputFile();
-			if (!m_pFileInfo->GetOutputInitialized())
-			{
-				if (!CreateOutputFile(iFileSize))
-				{
-					m_pFileInfo->UnlockOutputFile();
-					return false;
-				}
-				m_pFileInfo->SetOutputInitialized(true);
-			}
-			m_pFileInfo->UnlockOutputFile();
-		}
-	}
-
-	// allocate cache buffer
-	if (g_pOptions->GetArticleCache() > 0 && g_pOptions->GetDecode() &&
-		(!g_pOptions->GetDirectWrite() || m_eFormat == Decoder::efYenc))
-	{
-		if (m_pArticleData)
-		{
-			free(m_pArticleData);
-			g_pArticleCache->Free(m_iArticleSize);
-		}
-
-		m_pArticleData = (char*)g_pArticleCache->Alloc(m_iArticleSize);
-
-		while (!m_pArticleData && g_pArticleCache->GetFlushing())
-		{
-			usleep(5 * 1000);
-			m_pArticleData = (char*)g_pArticleCache->Alloc(m_iArticleSize);
-		}
-
-		if (!m_pArticleData)
-		{
-			detail("Article cache is full, using disk for %s", m_szInfoName);
-		}
-	}
-
-	if (!m_pArticleData)
-	{
-		bool bDirectWrite = g_pOptions->GetDirectWrite() && m_eFormat == Decoder::efYenc;
-		const char* szFilename = bDirectWrite ? m_szOutputFilename : m_szTempFilename;
-		m_pOutFile = fopen(szFilename, bDirectWrite ? FOPEN_RBP : FOPEN_WB);
-		if (!m_pOutFile)
-		{
-			error("Could not %s file %s: %s", bDirectWrite ? "open" : "create", szFilename, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-			return false;
-		}
-		SetWriteBuffer(m_pOutFile, m_pArticleInfo->GetSize());
-
-		if (g_pOptions->GetDirectWrite() && m_eFormat == Decoder::efYenc)
-		{
-			fseek(m_pOutFile, m_iArticleOffset, SEEK_SET);
-		}
-	}
-
-	return true;
-}
-
-bool ArticleWriter::Write(char* szBufffer, int iLen)
-{
-	if (g_pOptions->GetDecode())
-	{
-		m_iArticlePtr += iLen;
-	}
-
-	if (g_pOptions->GetDecode() && m_pArticleData)
-	{
-		if (m_iArticlePtr > m_iArticleSize)
-		{
-			detail("Decoding %s failed: article size mismatch", m_szInfoName);
-			return false;
-		}
-		memcpy(m_pArticleData + m_iArticlePtr - iLen, szBufffer, iLen);
-		return true;
-	}
-
-	return fwrite(szBufffer, 1, iLen, m_pOutFile) > 0;
-}
-
-void ArticleWriter::Finish(bool bSuccess)
-{
-	char szErrBuf[256];
-
-	if (m_pOutFile)
-	{
-		fclose(m_pOutFile);
-		m_pOutFile = NULL;
-	}
-
-	if (!bSuccess)
-	{
-		remove(m_szTempFilename);
-		remove(m_szResultFilename);
-		return;
-	}
-
-	bool bDirectWrite = g_pOptions->GetDirectWrite() && m_eFormat == Decoder::efYenc;
-
-	if (g_pOptions->GetDecode())
-	{
-		if (!bDirectWrite && !m_pArticleData)
-		{
-			if (!Util::MoveFile(m_szTempFilename, m_szResultFilename))
-			{
-				error("Could not rename file %s to %s: %s", m_szTempFilename, m_szResultFilename, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-			}
-		}
-
-		remove(m_szTempFilename);
-
-		if (m_pArticleData)
-		{
-			if (m_iArticleSize != m_iArticlePtr)
-			{
-				m_pArticleData = (char*)g_pArticleCache->Realloc(m_pArticleData, m_iArticleSize, m_iArticlePtr);
-			}
-			g_pArticleCache->LockContent();
-			m_pArticleInfo->AttachSegment(m_pArticleData, m_iArticleOffset, m_iArticlePtr);
-			m_pFileInfo->SetCachedArticles(m_pFileInfo->GetCachedArticles() + 1);
-			g_pArticleCache->UnlockContent();
-			m_pArticleData = NULL;
-		}
-		else
-		{
-			m_pArticleInfo->SetSegmentOffset(m_iArticleOffset);
-			m_pArticleInfo->SetSegmentSize(m_iArticlePtr);
-		}
-	}
-	else 
-	{
-		// rawmode
-		if (!Util::MoveFile(m_szTempFilename, m_szResultFilename))
-		{
-			error("Could not move file %s to %s: %s", m_szTempFilename, m_szResultFilename, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-		}
-	}
-}
-
-/* creates output file and subdirectores */
-bool ArticleWriter::CreateOutputFile(long long iSize)
-{
-	if (g_pOptions->GetDirectWrite() && Util::FileExists(m_szOutputFilename) &&
-		Util::FileSize(m_szOutputFilename) == iSize)
-	{
-		// keep existing old file from previous program session
-		return true;
-	}
-		
-	// delete eventually existing old file from previous program session
-	remove(m_szOutputFilename);
-
-	// ensure the directory exist
-	char szDestDir[1024];
-	int iMaxlen = Util::BaseFileName(m_szOutputFilename) - m_szOutputFilename;
-	if (iMaxlen > 1024-1) iMaxlen = 1024-1;
-	strncpy(szDestDir, m_szOutputFilename, iMaxlen);
-	szDestDir[iMaxlen] = '\0';
-	char szErrBuf[1024];
-
-	if (!Util::ForceDirectories(szDestDir, szErrBuf, sizeof(szErrBuf)))
-	{
-		error("Could not create directory %s: %s", szDestDir, szErrBuf);
-		return false;
-	}
-
-	if (!Util::CreateSparseFile(m_szOutputFilename, iSize))
-	{
-		error("Could not create file %s", m_szOutputFilename);
-		return false;
-	}
-
-	return true;
-}
-
-void ArticleWriter::BuildOutputFilename()
-{
-	char szFilename[1024];
-
-	snprintf(szFilename, 1024, "%s%i.%03i", g_pOptions->GetTempDir(), m_pFileInfo->GetID(), m_pArticleInfo->GetPartNumber());
-	szFilename[1024-1] = '\0';
-	m_pArticleInfo->SetResultFilename(szFilename);
-
-	char tmpname[1024];
-	snprintf(tmpname, 1024, "%s.tmp", szFilename);
-	tmpname[1024-1] = '\0';
-	m_szTempFilename = strdup(tmpname);
-
-	if (g_pOptions->GetDirectWrite())
-	{
-		m_pFileInfo->LockOutputFile();
-
-		if (m_pFileInfo->GetOutputFilename())
-		{
-			strncpy(szFilename, m_pFileInfo->GetOutputFilename(), 1024);
-			szFilename[1024-1] = '\0';
-		}
-		else
-		{
-			snprintf(szFilename, 1024, "%s%c%i.out.tmp", m_pFileInfo->GetNZBInfo()->GetDestDir(), (int)PATH_SEPARATOR, m_pFileInfo->GetID());
-			szFilename[1024-1] = '\0';
-			m_pFileInfo->SetOutputFilename(szFilename);
-		}
-
-		m_pFileInfo->UnlockOutputFile();
-
-		m_szOutputFilename = strdup(szFilename);
-	}
-}
-
-void ArticleWriter::CompleteFileParts()
-{
-	debug("Completing file parts");
-	debug("ArticleFilename: %s", m_pFileInfo->GetFilename());
-
-	bool bDirectWrite = g_pOptions->GetDirectWrite() && m_pFileInfo->GetOutputInitialized();
-	char szErrBuf[256];
-
-	char szNZBName[1024];
-	char szNZBDestDir[1024];
-	// the locking is needed for accessing the members of NZBInfo
-	DownloadQueue::Lock();
-	strncpy(szNZBName, m_pFileInfo->GetNZBInfo()->GetName(), 1024);
-	strncpy(szNZBDestDir, m_pFileInfo->GetNZBInfo()->GetDestDir(), 1024);
-	DownloadQueue::Unlock();
-	szNZBName[1024-1] = '\0';
-	szNZBDestDir[1024-1] = '\0';
-	
-	char szInfoFilename[1024];
-	snprintf(szInfoFilename, 1024, "%s%c%s", szNZBName, (int)PATH_SEPARATOR, m_pFileInfo->GetFilename());
-	szInfoFilename[1024-1] = '\0';
-
-	bool bCached = m_pFileInfo->GetCachedArticles() > 0;
-
-	if (!g_pOptions->GetDecode())
-	{
-		detail("Moving articles for %s", szInfoFilename);
-	}
-	else if (bDirectWrite && bCached)
-	{
-		detail("Writing articles for %s", szInfoFilename);
-	}
-	else if (bDirectWrite)
-	{
-		detail("Checking articles for %s", szInfoFilename);
-	}
-	else
-	{
-		detail("Joining articles for %s", szInfoFilename);
-	}
-
-	// Ensure the DstDir is created
-	if (!Util::ForceDirectories(szNZBDestDir, szErrBuf, sizeof(szErrBuf)))
-	{
-		error("Could not create directory %s: %s", szNZBDestDir, szErrBuf);
-		return;
-	}
-
-	char ofn[1024];
-	Util::MakeUniqueFilename(ofn, 1024, szNZBDestDir, m_pFileInfo->GetFilename());
-
-	FILE* outfile = NULL;
-	char tmpdestfile[1024];
-	snprintf(tmpdestfile, 1024, "%s.tmp", ofn);
-	tmpdestfile[1024-1] = '\0';
-
-	if (g_pOptions->GetDecode() && !bDirectWrite)
-	{
-		remove(tmpdestfile);
-		outfile = fopen(tmpdestfile, FOPEN_WBP);
-		if (!outfile)
-		{
-			error("Could not create file %s: %s", tmpdestfile, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-			return;
-		}
-	}
-	else if (bDirectWrite && bCached)
-	{
-		outfile = fopen(m_szOutputFilename, FOPEN_RBP);
-		if (!outfile)
-		{
-			error("Could not open file %s: %s", m_szOutputFilename, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-			return;
-		}
-		strncpy(tmpdestfile, m_szOutputFilename, 1024);
-		tmpdestfile[1024-1] = '\0';
-	}
-	else if (!g_pOptions->GetDecode())
-	{
-		remove(tmpdestfile);
-		if (!Util::CreateDirectory(ofn))
-		{
-			error("Could not create directory %s: %s", ofn, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-			return;
-		}
-	}
-
-	if (outfile)
-	{
-		SetWriteBuffer(outfile, 0);
-	}
-
-	if (bCached)
-	{
-		g_pArticleCache->LockFlush();
-		m_bFlushing = true;
-	}
-
-	static const int BUFFER_SIZE = 1024 * 64;
-	char* buffer = NULL;
-	bool bFirstArticle = true;
-	unsigned long lCrc = 0;
-
-	if (g_pOptions->GetDecode() && !bDirectWrite)
-	{
-		buffer = (char*)malloc(BUFFER_SIZE);
-	}
-
-	for (FileInfo::Articles::iterator it = m_pFileInfo->GetArticles()->begin(); it != m_pFileInfo->GetArticles()->end(); it++)
-	{
-		ArticleInfo* pa = *it;
-		if (pa->GetStatus() != ArticleInfo::aiFinished)
-		{
-			continue;
-		}
-
-		if (g_pOptions->GetDecode() && !bDirectWrite && pa->GetSegmentOffset() > -1 &&
-			pa->GetSegmentOffset() > ftell(outfile) && ftell(outfile) > -1)
-		{
-			memset(buffer, 0, BUFFER_SIZE);
-			while (pa->GetSegmentOffset() > ftell(outfile) && ftell(outfile) > -1 &&
-				fwrite(buffer, 1, (std::min)((int)(pa->GetSegmentOffset() - ftell(outfile)), BUFFER_SIZE), outfile)) ;
-		}
-
-		if (pa->GetSegmentContent())
-		{
-			fseek(outfile, pa->GetSegmentOffset(), SEEK_SET);
-			fwrite(pa->GetSegmentContent(), 1, pa->GetSegmentSize(), outfile);
-			pa->DiscardSegment();
-			SetLastUpdateTimeNow();
-		}
-		else if (g_pOptions->GetDecode() && !bDirectWrite)
-		{
-			FILE* infile = pa->GetResultFilename() ? fopen(pa->GetResultFilename(), FOPEN_RB) : NULL;
-			if (infile)
-			{
-				int cnt = BUFFER_SIZE;
-				while (cnt == BUFFER_SIZE)
-				{
-					cnt = (int)fread(buffer, 1, BUFFER_SIZE, infile);
-					fwrite(buffer, 1, cnt, outfile);
-					SetLastUpdateTimeNow();
-				}
-				fclose(infile);
-			}
-			else
-			{
-				m_pFileInfo->SetFailedArticles(m_pFileInfo->GetFailedArticles() + 1);
-				m_pFileInfo->SetSuccessArticles(m_pFileInfo->GetSuccessArticles() - 1);
-				error("Could not find file %s for %s%c%s [%i/%i]",
-					pa->GetResultFilename(), szNZBName, (int)PATH_SEPARATOR, m_pFileInfo->GetFilename(),
-					pa->GetPartNumber(), (int)m_pFileInfo->GetArticles()->size());
-			}
-		}
-		else if (!g_pOptions->GetDecode())
-		{
-			char dstFileName[1024];
-			snprintf(dstFileName, 1024, "%s%c%03i", ofn, (int)PATH_SEPARATOR, pa->GetPartNumber());
-			dstFileName[1024-1] = '\0';
-			if (!Util::MoveFile(pa->GetResultFilename(), dstFileName))
-			{
-				error("Could not move file %s to %s: %s", pa->GetResultFilename(), dstFileName, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-			}
-		}
-
-		if (m_eFormat == Decoder::efYenc)
-		{
-			lCrc = bFirstArticle ? pa->GetCrc() : Util::Crc32Combine(lCrc, pa->GetCrc(), pa->GetSegmentSize());
-			bFirstArticle = false;
-		}
-	}
-
-	free(buffer);
-
-	if (bCached)
-	{
-		g_pArticleCache->UnlockFlush();
-		m_bFlushing = false;
-	}
-
-	if (outfile)
-	{
-		fclose(outfile);
-		if (!bDirectWrite && !Util::MoveFile(tmpdestfile, ofn))
-		{
-			error("Could not move file %s to %s: %s", tmpdestfile, ofn, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-		}
-	}
-
-	if (bDirectWrite)
-	{
-		if (!Util::MoveFile(m_szOutputFilename, ofn))
-		{
-			error("Could not move file %s to %s: %s", m_szOutputFilename, ofn, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-		}
-
-		// if destination directory was changed delete the old directory (if empty)
-		int iLen = strlen(szNZBDestDir);
-		if (!(!strncmp(szNZBDestDir, m_szOutputFilename, iLen) && 
-			(m_szOutputFilename[iLen] == PATH_SEPARATOR || m_szOutputFilename[iLen] == ALT_PATH_SEPARATOR)))
-		{
-			debug("Checking old dir for: %s", m_szOutputFilename);
-			char szOldDestDir[1024];
-			int iMaxlen = Util::BaseFileName(m_szOutputFilename) - m_szOutputFilename;
-			if (iMaxlen > 1024-1) iMaxlen = 1024-1;
-			strncpy(szOldDestDir, m_szOutputFilename, iMaxlen);
-			szOldDestDir[iMaxlen] = '\0';
-			if (Util::DirEmpty(szOldDestDir))
-			{
-				debug("Deleting old dir: %s", szOldDestDir);
-				rmdir(szOldDestDir);
-			}
-		}
-	}
-
-	if (!bDirectWrite)
-	{
-		for (FileInfo::Articles::iterator it = m_pFileInfo->GetArticles()->begin(); it != m_pFileInfo->GetArticles()->end(); it++)
-		{
-			ArticleInfo* pa = *it;
-			remove(pa->GetResultFilename());
-		}
-	}
-
-	if (m_pFileInfo->GetMissedArticles() == 0 && m_pFileInfo->GetFailedArticles() == 0)
-	{
-		info("Successfully downloaded %s", szInfoFilename);
-	}
-	else
-	{
-		warn("%i of %i article downloads failed for \"%s\"", m_pFileInfo->GetMissedArticles() + m_pFileInfo->GetFailedArticles(),
-			m_pFileInfo->GetTotalArticles(), szInfoFilename);
-
-		if (g_pOptions->GetCreateBrokenLog())
-		{
-			char szBrokenLogName[1024];
-			snprintf(szBrokenLogName, 1024, "%s%c_brokenlog.txt", szNZBDestDir, (int)PATH_SEPARATOR);
-			szBrokenLogName[1024-1] = '\0';
-			FILE* file = fopen(szBrokenLogName, FOPEN_AB);
-			fprintf(file, "%s (%i/%i)%s", m_pFileInfo->GetFilename(), m_pFileInfo->GetSuccessArticles(),
-				m_pFileInfo->GetTotalArticles(), LINE_ENDING);
-			fclose(file);
-		}
-
-		lCrc = 0;
-
-		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-		{
-			g_pDiskState->DiscardFile(m_pFileInfo, false, true, false);
-			g_pDiskState->SaveFileState(m_pFileInfo, true);
-		}
-	}
-
-	CompletedFile::EStatus eFileStatus = m_pFileInfo->GetMissedArticles() == 0 &&
-		m_pFileInfo->GetFailedArticles() == 0 ? CompletedFile::cfSuccess :
-		m_pFileInfo->GetSuccessArticles() > 0 ? CompletedFile::cfPartial :
-		CompletedFile::cfFailure;
-
-	// the locking is needed for accessing the members of NZBInfo
-	DownloadQueue::Lock();
-	m_pFileInfo->GetNZBInfo()->GetCompletedFiles()->push_back(new CompletedFile(
-		m_pFileInfo->GetID(), Util::BaseFileName(ofn), eFileStatus, lCrc));
-	if (strcmp(m_pFileInfo->GetNZBInfo()->GetDestDir(), szNZBDestDir))
-	{
-		// destination directory was changed during completion, need to move the file
-		MoveCompletedFiles(m_pFileInfo->GetNZBInfo(), szNZBDestDir);
-	}
-	DownloadQueue::Unlock();
-}
-
-void ArticleWriter::FlushCache()
-{
-	detail("Flushing cache for %s", m_szInfoName);
-
-	bool bDirectWrite = g_pOptions->GetDirectWrite() && m_pFileInfo->GetOutputInitialized();
-	FILE* outfile = NULL;
-	bool bNeedBufFile = false;
-	char szDestFile[1024];
-	char szErrBuf[256];
-	int iFlushedArticles = 0;
-	long long iFlushedSize = 0;
-
-	g_pArticleCache->LockFlush();
-
-	FileInfo::Articles cachedArticles;
-	cachedArticles.reserve(m_pFileInfo->GetArticles()->size());
-
-	g_pArticleCache->LockContent();
-	for (FileInfo::Articles::iterator it = m_pFileInfo->GetArticles()->begin(); it != m_pFileInfo->GetArticles()->end(); it++)
-	{
-		ArticleInfo* pa = *it;
-		if (pa->GetSegmentContent())
-		{
-			cachedArticles.push_back(pa);
-		}
-	}
-	g_pArticleCache->UnlockContent();
-
-	for (FileInfo::Articles::iterator it = cachedArticles.begin(); it != cachedArticles.end(); it++)
-	{
-		if (m_pFileInfo->GetDeleted())
-		{
-			// the file was deleted during flushing: stop flushing immediately
-			break;
-		}
-
-		ArticleInfo* pa = *it;
-
-		if (bDirectWrite && !outfile)
-		{
-			outfile = fopen(m_pFileInfo->GetOutputFilename(), FOPEN_RBP);
-			if (!outfile)
-			{
-				error("Could not open file %s: %s", m_pFileInfo->GetOutputFilename(), Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-				break;
-			}
-			bNeedBufFile = true;
-		}
-
-		if (!bDirectWrite)
-		{
-			snprintf(szDestFile, 1024, "%s.tmp", pa->GetResultFilename());
-			szDestFile[1024-1] = '\0';
-
-			outfile = fopen(szDestFile, FOPEN_WB);
-			if (!outfile)
-			{
-				error("Could not create file %s: %s", "create", szDestFile, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-				break;
-			}
-			bNeedBufFile = true;
-		}
-
-		if (outfile && bNeedBufFile)
-		{
-			SetWriteBuffer(outfile, 0);
-			bNeedBufFile = false;
-		}
-
-		if (bDirectWrite)
-		{
-			fseek(outfile, pa->GetSegmentOffset(), SEEK_SET);
-		}
-
-		fwrite(pa->GetSegmentContent(), 1, pa->GetSegmentSize(), outfile);
-
-		iFlushedSize += pa->GetSegmentSize();
-		iFlushedArticles++;
-
-		pa->DiscardSegment();
-
-		if (!bDirectWrite)
-		{
-			fclose(outfile);
-			outfile = NULL;
-
-			if (!Util::MoveFile(szDestFile, pa->GetResultFilename()))
-			{
-				error("Could not rename file %s to %s: %s", szDestFile, pa->GetResultFilename(), Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-			}
-		}
-	}
-
-	if (outfile)
-	{
-		fclose(outfile);
-	}
-
-	g_pArticleCache->LockContent();
-	m_pFileInfo->SetCachedArticles(m_pFileInfo->GetCachedArticles() - iFlushedArticles);
-	g_pArticleCache->UnlockContent();
-
-	g_pArticleCache->UnlockFlush();
-
-	detail("Saved %i articles (%.2f MB) from cache into disk for %s", iFlushedArticles, (float)(iFlushedSize / 1024.0 / 1024.0), m_szInfoName);
-}
-
-bool ArticleWriter::MoveCompletedFiles(NZBInfo* pNZBInfo, const char* szOldDestDir)
-{
-	if (pNZBInfo->GetCompletedFiles()->empty())
-	{
-		return true;
-	}
-
-	// Ensure the DstDir is created
-	char szErrBuf[1024];
-	if (!Util::ForceDirectories(pNZBInfo->GetDestDir(), szErrBuf, sizeof(szErrBuf)))
-	{
-		error("Could not create directory %s: %s", pNZBInfo->GetDestDir(), szErrBuf);
-		return false;
-	}
-
-	// move already downloaded files to new destination
-	for (CompletedFiles::iterator it = pNZBInfo->GetCompletedFiles()->begin(); it != pNZBInfo->GetCompletedFiles()->end(); it++)
-    {
-		CompletedFile* pCompletedFile = *it;
-
-		char szOldFileName[1024];
-		snprintf(szOldFileName, 1024, "%s%c%s", szOldDestDir, (int)PATH_SEPARATOR, pCompletedFile->GetFileName());
-		szOldFileName[1024-1] = '\0';
-
-		char szNewFileName[1024];
-		snprintf(szNewFileName, 1024, "%s%c%s", pNZBInfo->GetDestDir(), (int)PATH_SEPARATOR, pCompletedFile->GetFileName());
-		szNewFileName[1024-1] = '\0';
-
-		// check if file was not moved already
-		if (strcmp(szOldFileName, szNewFileName))
-		{
-			// prevent overwriting of existing files
-			Util::MakeUniqueFilename(szNewFileName, 1024, pNZBInfo->GetDestDir(), pCompletedFile->GetFileName());
-
-			detail("Moving file %s to %s", szOldFileName, szNewFileName);
-			if (!Util::MoveFile(szOldFileName, szNewFileName))
-			{
-				char szErrBuf[256];
-				error("Could not move file %s to %s: %s", szOldFileName, szNewFileName, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-			}
-		}
-    }
-
-	// move brokenlog.txt
-	if (g_pOptions->GetCreateBrokenLog())
-	{
-		char szOldBrokenLogName[1024];
-		snprintf(szOldBrokenLogName, 1024, "%s%c_brokenlog.txt", szOldDestDir, (int)PATH_SEPARATOR);
-		szOldBrokenLogName[1024-1] = '\0';
-		if (Util::FileExists(szOldBrokenLogName))
-		{
-			char szBrokenLogName[1024];
-			snprintf(szBrokenLogName, 1024, "%s%c_brokenlog.txt", pNZBInfo->GetDestDir(), (int)PATH_SEPARATOR);
-			szBrokenLogName[1024-1] = '\0';
-
-			detail("Moving file %s to %s", szOldBrokenLogName, szBrokenLogName);
-			if (Util::FileExists(szBrokenLogName))
-			{
-				// copy content to existing new file, then delete old file
-				FILE* outfile;
-				outfile = fopen(szBrokenLogName, FOPEN_AB);
-				if (outfile)
-				{
-					FILE* infile;
-					infile = fopen(szOldBrokenLogName, FOPEN_RB);
-					if (infile)
-					{
-						static const int BUFFER_SIZE = 1024 * 50;
-						int cnt = BUFFER_SIZE;
-						char* buffer = (char*)malloc(BUFFER_SIZE);
-						while (cnt == BUFFER_SIZE)
-						{
-							cnt = (int)fread(buffer, 1, BUFFER_SIZE, infile);
-							fwrite(buffer, 1, cnt, outfile);
-						}
-						fclose(infile);
-						free(buffer);
-						remove(szOldBrokenLogName);
-					}
-					else
-					{
-						error("Could not open file %s", szOldBrokenLogName);
-					}
-					fclose(outfile);
-				}
-				else
-				{
-					error("Could not open file %s", szBrokenLogName);
-				}
-			}
-			else 
-			{
-				// move to new destination
-				if (!Util::MoveFile(szOldBrokenLogName, szBrokenLogName))
-				{
-					char szErrBuf[256];
-					error("Could not move file %s to %s: %s", szOldBrokenLogName, szBrokenLogName, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-				}
-			}
-		}
-	}
-
-	// delete old directory (if empty)
-	if (Util::DirEmpty(szOldDestDir))
-	{
-		// check if there are pending writes into directory
-		bool bPendingWrites = false;
-		for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end() && !bPendingWrites; it++)
-		{
-			FileInfo* pFileInfo = *it;
-			if (pFileInfo->GetActiveDownloads() > 0)
-			{
-				pFileInfo->LockOutputFile();
-				bPendingWrites = pFileInfo->GetOutputInitialized() && !Util::EmptyStr(pFileInfo->GetOutputFilename());
-				pFileInfo->UnlockOutputFile();
-			}
-			else
-			{
-				bPendingWrites = pFileInfo->GetOutputInitialized() && !Util::EmptyStr(pFileInfo->GetOutputFilename());
-			}
-		}
-
-		if (!bPendingWrites)
-		{
-			rmdir(szOldDestDir);
-		}
-	}
-
-	return true;
-}
-
-
-ArticleCache::ArticleCache()
-{
-	m_iAllocated = 0;
-	m_bFlushing = false;
-	m_pFileInfo = NULL;
-}
-
-void* ArticleCache::Alloc(int iSize)
-{
-	m_mutexAlloc.Lock();
-
-	void* p = NULL;
-	if (m_iAllocated + iSize <= (size_t)g_pOptions->GetArticleCache() * 1024 * 1024)
-	{
-		p = malloc(iSize);
-		if (p)
-		{
-			if (!m_iAllocated && g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode() && g_pOptions->GetContinuePartial())
-			{
-				g_pDiskState->WriteCacheFlag();
-			}
-			m_iAllocated += iSize;
-		}
-	}
-	m_mutexAlloc.Unlock();
-
-	return p;
-}
-
-void* ArticleCache::Realloc(void* buf, int iOldSize, int iNewSize)
-{
-	m_mutexAlloc.Lock();
-
-	void* p = realloc(buf, iNewSize);
-	if (p)
-	{
-		m_iAllocated += iNewSize - iOldSize;
-	}
-	else
-	{
-		p = buf;
-	}
-	m_mutexAlloc.Unlock();
-
-	return p;
-}
-
-void ArticleCache::Free(int iSize)
-{
-	m_mutexAlloc.Lock();
-	m_iAllocated -= iSize;
-	if (!m_iAllocated && g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode() && g_pOptions->GetContinuePartial())
-	{
-		g_pDiskState->DeleteCacheFlag();
-	}
-	m_mutexAlloc.Unlock();
-}
-
-void ArticleCache::LockFlush()
-{
-	m_mutexFlush.Lock();
-	m_bFlushing = true;
-}
-
-void ArticleCache::UnlockFlush()
-{
-	m_mutexFlush.Unlock();
-	m_bFlushing = false;
-}
-
-void ArticleCache::Run()
-{
-	// automatically flush the cache if it is filled to 90% (only in DirectWrite mode)
-	size_t iFillThreshold = (size_t)g_pOptions->GetArticleCache() * 1024 * 1024 / 100 * 90;
-
-	int iResetCounter = 0;
-	bool bJustFlushed = false;
-	while (!IsStopped() || m_iAllocated > 0)
-	{
-		if ((bJustFlushed || iResetCounter >= 1000  || IsStopped() ||
-			 (g_pOptions->GetDirectWrite() && m_iAllocated >= iFillThreshold)) &&
-			m_iAllocated > 0)
-		{
-			bJustFlushed = CheckFlush(m_iAllocated >= iFillThreshold);
-			iResetCounter = 0;
-		}
-		else
-		{
-			usleep(5 * 1000);
-			iResetCounter += 5;
-		}
-	}
-}
-
-bool ArticleCache::CheckFlush(bool bFlushEverything)
-{
-	debug("Checking cache, Allocated: %i, FlushEverything: %i", m_iAllocated, (int)bFlushEverything);
-
-	char szInfoName[1024];
-
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end() && !m_pFileInfo; it++)
-	{
-		NZBInfo* pNZBInfo = *it;
-		for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++)
-		{
-			FileInfo* pFileInfo = *it2;
-			if (pFileInfo->GetCachedArticles() > 0 && (pFileInfo->GetActiveDownloads() == 0 || bFlushEverything))
-			{
-				m_pFileInfo = pFileInfo;
-				snprintf(szInfoName, 1024, "%s%c%s", m_pFileInfo->GetNZBInfo()->GetName(), (int)PATH_SEPARATOR, m_pFileInfo->GetFilename());
-				szInfoName[1024-1] = '\0';
-				break;
-			}
-		}
-	}
-	DownloadQueue::Unlock();
-
-	if (m_pFileInfo)
-	{
-		ArticleWriter* pArticleWriter = new ArticleWriter();
-		pArticleWriter->SetFileInfo(m_pFileInfo);
-		pArticleWriter->SetInfoName(szInfoName);
-		pArticleWriter->FlushCache();
-		delete pArticleWriter;
-		m_pFileInfo = NULL;
-		return true;
-	}
-
-	debug("Checking cache... nothing to flush");
-
-	return false;
-}