version 0.6.0

AUTHORS

@@ -1,4 +1,4 @@
 nzbget:
 	Sven Henkel <sidddy@users.sourceforge.net>				(versions 0.1.0 - ?)
 	Bo Cordes Petersen <placebodk@users.sourceforge.net>	(versions ? - 0.2.3)
-	Andrey Prygunkov <hugbug@users.sourceforge.net>		    (versions 0.3.0 and later)
+	Andrei Prygounkov <hugbug@users.sourceforge.net>		(versions 0.3.0 and later)

ArticleDownloader.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -53,7 +53,7 @@
 #include "Util.h"
 
 extern DownloadSpeedMeter* g_pDownloadSpeedMeter;
-extern DownloadQueueHolder* g_pDownloadQueueHolder;
+extern NZBInfoLocker* g_pNZBInfoLocker;
 extern Options* g_pOptions;
 extern ServerPool* g_pServerPool;
 
@@ -135,7 +135,7 @@ void ArticleDownloader::Run()
 		}
 	}
 
-	int iRemainedDownloadRetries = g_pOptions->GetRetries() > 0 ? g_pOptions->GetRetries() : 1;
+	int iRemainedDownloadRetries = g_pOptions->GetRetries();
 
 #ifdef THREADCONNECT_WORKAROUND
 	// NOTE: about iRemainedConnectRetries:
@@ -164,10 +164,9 @@ void ArticleDownloader::Run()
 
 		Status = adFailed;
 
-		while (!IsStopped() && !m_pConnection)
+		if (!m_pConnection)
 		{
-			m_pConnection = g_pServerPool->GetConnection(level);
-			usleep(5 * 1000);
+			m_pConnection = g_pServerPool->GetConnection(level, true);
 		}
 
 		if (IsStopped())
@@ -176,12 +175,17 @@ void ArticleDownloader::Run()
 			break;
 		}
 
-		if (g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2())
+		if (g_pOptions->GetPause())
 		{
 			Status = adRetry;
 			break;
 		}
 
+		if (!m_pConnection)
+		{
+			error("Serious error: Connection is NULL");
+		}
+		
 		m_pConnection->SetSuppressErrors(false);
 
 		// test connection
@@ -189,7 +193,7 @@ void ArticleDownloader::Run()
 		if (bConnected && !IsStopped())
 		{
 			// Okay, we got a Connection. Now start downloading.
-			detail("Downloading %s @ %s", m_szInfoName, m_pConnection->GetHost());
+			detail("Downloading %s @ %s", m_szInfoName, m_pConnection->GetServer()->GetHost());
 			Status = Download();
 		}
 
@@ -229,26 +233,24 @@ void ArticleDownloader::Run()
 		}
 #endif
 
+		if (g_pOptions->GetPause())
+		{
+			Status = adRetry;
+			break;
+		}
+
 		if (((Status == adFailed) || (Status == adCrcError && g_pOptions->GetRetryOnCrcError())) && 
-			(iRemainedDownloadRetries > 1 || !bConnected) && !IsStopped() &&
-			!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
+			(iRemainedDownloadRetries > 1 || !bConnected) && !IsStopped())
 		{
 			detail("Waiting %i sec to retry", g_pOptions->GetRetryInterval());
 			int msec = 0;
-			while (!IsStopped() && (msec < g_pOptions->GetRetryInterval() * 1000) && 
-				!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
+			while (!IsStopped() && (msec < g_pOptions->GetRetryInterval() * 1000))
 			{
 				usleep(100 * 1000);
 				msec += 100;
 			}
 		}
 
-		if (g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2())
-		{
-			Status = adRetry;
-			break;
-		}
-
 		if (IsStopped())
 		{
 			Status = adFailed;
@@ -395,7 +397,7 @@ ArticleDownloader::EStatus ArticleDownloader::Download()
 		        (g_pDownloadSpeedMeter->CalcCurrentDownloadSpeed() > g_pOptions->GetDownloadRate()))
 		{
 			SetLastUpdateTimeNow();
-			usleep(10 * 1000);
+			usleep(200 * 1000);
 		}
 
 		int iLen = 0;
@@ -407,7 +409,7 @@ ArticleDownloader::EStatus ArticleDownloader::Download()
 		{
 			if (!IsStopped())
 			{
-				warn("Article %s @ %s failed: Unexpected end of article", m_szInfoName, m_pConnection->GetHost());
+				warn("Article %s @ %s failed: Unexpected end of article", m_szInfoName, m_pConnection->GetServer()->GetHost());
 			}
 			Status = adFailed;
 			break;
@@ -441,7 +443,7 @@ ArticleDownloader::EStatus ArticleDownloader::Download()
 				if (strncmp(p, m_pArticleInfo->GetMessageID(), strlen(m_pArticleInfo->GetMessageID())))
 				{
 					if (char* e = strrchr(p, '\r')) *e = '\0'; // remove trailing CR-character
-					warn("Article %s @ %s failed: Wrong message-id, expected %s, returned %s", m_szInfoName, m_pConnection->GetHost(), m_pArticleInfo->GetMessageID(), p);
+					warn("Article %s @ %s failed: Wrong message-id, expected %s, returned %s", m_szInfoName, m_pConnection->GetServer()->GetHost(), m_pArticleInfo->GetMessageID(), p);
 					Status = adFailed;
 					break;
 				}
@@ -469,7 +471,7 @@ ArticleDownloader::EStatus ArticleDownloader::Download()
 
 	if (!bEnd && Status == adRunning && !IsStopped())
 	{
-		warn("Article %s @ %s failed: article incomplete", m_szInfoName, m_pConnection->GetHost());
+		warn("Article %s @ %s failed: article incomplete", m_szInfoName, m_pConnection->GetServer()->GetHost());
 		Status = adFailed;
 	}
 
@@ -496,18 +498,18 @@ ArticleDownloader::EStatus ArticleDownloader::CheckResponse(const char* szRespon
 	{
 		if (!IsStopped())
 		{
-			warn("Article %s @ %s failed, %s: Connection closed by remote host", m_szInfoName, m_pConnection->GetHost(), szComment);
+			warn("Article %s @ %s failed, %s: Connection closed by remote host", m_szInfoName, m_pConnection->GetServer()->GetHost(), szComment);
 		}
 		return adConnectError;
 	}
 	else if (m_pConnection->GetAuthError() || !strncmp(szResponse, "400", 3) || !strncmp(szResponse, "499", 3))
 	{
-		warn("Article %s @ %s failed, %s: %s", m_szInfoName, m_pConnection->GetHost(), szComment, szResponse);
+		warn("Article %s @ %s failed, %s: %s", m_szInfoName, m_pConnection->GetServer()->GetHost(), szComment, szResponse);
 		return adConnectError;
 	}
 	else if (!strncmp(szResponse, "41", 2) || !strncmp(szResponse, "42", 2) || !strncmp(szResponse, "43", 2))
 	{
-		warn("Article %s @ %s failed, %s: %s", m_szInfoName, m_pConnection->GetHost(), szComment, szResponse);
+		warn("Article %s @ %s failed, %s: %s", m_szInfoName, m_pConnection->GetServer()->GetHost(), szComment, szResponse);
 		return adNotFound;
 	}
 	else if (!strncmp(szResponse, "2", 1))
@@ -518,7 +520,7 @@ ArticleDownloader::EStatus ArticleDownloader::CheckResponse(const char* szRespon
 	else 
 	{
 		// unknown error, no special handling
-		warn("Article %s @ %s failed, %s: %s", m_szInfoName, m_pConnection->GetHost(), szComment, szResponse);
+		warn("Article %s @ %s failed, %s: %s", m_szInfoName, m_pConnection->GetServer()->GetHost(), szComment, szResponse);
 		return adFailed;
 	}
 }
@@ -609,7 +611,7 @@ bool ArticleDownloader::PrepareFile(char* szLine)
 					{
 						pb += 6; //=strlen(" size=")
 						long iArticleFilesize = atol(pb);
-						if (!Util::CreateSparseFile(m_szOutputFilename, iArticleFilesize))
+						if (!Util::SetFileSize(m_szOutputFilename, iArticleFilesize))
 						{
 							error("Could not create file %s!", m_szOutputFilename);
 							return false;
@@ -635,7 +637,7 @@ bool ArticleDownloader::PrepareFile(char* szLine)
 	{
 		bool bDirectWrite = g_pOptions->GetDirectWrite() && m_eFormat == Decoder::efYenc;
 		const char* szFilename = bDirectWrite ? m_szOutputFilename : m_szTempFilename;
-		m_pOutFile = fopen(szFilename, bDirectWrite ? "rb+" : "wb");
+		m_pOutFile = fopen(szFilename, bDirectWrite ? "r+" : "w");
 		if (!m_pOutFile)
 		{
 			error("Could not %s file %s", bDirectWrite ? "open" : "create", szFilename);
@@ -703,7 +705,7 @@ ArticleDownloader::EStatus ArticleDownloader::DecodeCheck()
 			if (bDirectWrite && g_pOptions->GetContinuePartial())
 			{
 				// create empty flag-file to indicate that the artcile was downloaded
-				FILE* flagfile = fopen(m_szResultFilename, "wb");
+				FILE* flagfile = fopen(m_szResultFilename, "w");
 				if (!flagfile)
 				{
 					error("Could not create file %s", m_szResultFilename);
@@ -825,18 +827,11 @@ void ArticleDownloader::CompleteFileParts()
 
 	bool bDirectWrite = g_pOptions->GetDirectWrite() && m_pFileInfo->GetOutputInitialized();
 
-	char szNZBName[1024];
-	char szNZBDestDir[1024];
-	// the locking is needed for accessing the memebers of NZBInfo
-	g_pDownloadQueueHolder->LockQueue();
-	strncpy(szNZBName, m_pFileInfo->GetNZBInfo()->GetName(), 1024);
-	strncpy(szNZBDestDir, m_pFileInfo->GetNZBInfo()->GetDestDir(), 1024);
-	g_pDownloadQueueHolder->UnlockQueue();
-	szNZBName[1024-1] = '\0';
-	szNZBDestDir[1024-1] = '\0';
+	char szNZBNiceName[1024];
+	m_pFileInfo->GetNZBInfo()->GetNiceNZBName(szNZBNiceName, 1024);
 	
 	char InfoFilename[1024];
-	snprintf(InfoFilename, 1024, "%s%c%s", szNZBName, (int)PATH_SEPARATOR, m_pFileInfo->GetFilename());
+	snprintf(InfoFilename, 1024, "%s%c%s", szNZBNiceName, (int)PATH_SEPARATOR, m_pFileInfo->GetFilename());
 	InfoFilename[1024-1] = '\0';
 
 	if (!g_pOptions->GetDecode())
@@ -852,6 +847,12 @@ void ArticleDownloader::CompleteFileParts()
 		detail("Joining articles for %s", InfoFilename);
 	}
 
+	char szNZBDestDir[1024];
+	g_pNZBInfoLocker->LockNZBInfo(m_pFileInfo->GetNZBInfo());
+	strncpy(szNZBDestDir, m_pFileInfo->GetNZBInfo()->GetDestDir(), 1024);
+	g_pNZBInfoLocker->UnlockNZBInfo(m_pFileInfo->GetNZBInfo());
+	szNZBDestDir[1024-1] = '\0';
+
 	// Ensure the DstDir is created
 	if (!Util::ForceDirectories(szNZBDestDir))
 	{
@@ -881,7 +882,7 @@ void ArticleDownloader::CompleteFileParts()
 	if (g_pOptions->GetDecode() && !bDirectWrite)
 	{
 		remove(tmpdestfile);
-		outfile = fopen(tmpdestfile, "wb+");
+		outfile = fopen(tmpdestfile, "w+");
 		if (!outfile)
 		{
 			error("Could not create file %s!", tmpdestfile);
@@ -931,7 +932,7 @@ void ArticleDownloader::CompleteFileParts()
 			FILE* infile;
 			const char* fn = pa->GetResultFilename();
 
-			infile = fopen(fn, "rb");
+			infile = fopen(fn, "r");
 			if (infile)
 			{
 				int cnt = BUFFER_SIZE;
@@ -1030,21 +1031,20 @@ void ArticleDownloader::CompleteFileParts()
 			char szBrokenLogName[1024];
 			snprintf(szBrokenLogName, 1024, "%s%c_brokenlog.txt", szNZBDestDir, (int)PATH_SEPARATOR);
 			szBrokenLogName[1024-1] = '\0';
-			FILE* file = fopen(szBrokenLogName, "ab");
+			FILE* file = fopen(szBrokenLogName, "a");
 			fprintf(file, "%s (%i/%i)%s", m_pFileInfo->GetFilename(), m_pFileInfo->GetArticles()->size() - iBrokenCount, m_pFileInfo->GetArticles()->size(), LINE_ENDING);
 			fclose(file);
 		}
 	}
 
-	// the locking is needed for accessing the memebers of NZBInfo
-	g_pDownloadQueueHolder->LockQueue();
+	g_pNZBInfoLocker->LockNZBInfo(m_pFileInfo->GetNZBInfo());
 	m_pFileInfo->GetNZBInfo()->GetCompletedFiles()->push_back(strdup(ofn));
 	if (strcmp(m_pFileInfo->GetNZBInfo()->GetDestDir(), szNZBDestDir))
 	{
 		// destination directory was changed during completion, need to move the file
 		MoveCompletedFiles(m_pFileInfo->GetNZBInfo(), szNZBDestDir);
 	}
-	g_pDownloadQueueHolder->UnlockQueue();
+	g_pNZBInfoLocker->UnlockNZBInfo(m_pFileInfo->GetNZBInfo());
 
 	SetStatus(adJoined);
 }
@@ -1113,11 +1113,11 @@ bool ArticleDownloader::MoveCompletedFiles(NZBInfo* pNZBInfo, const char* szOldD
 			{
 				// copy content to existing new file, then delete old file
 				FILE* outfile;
-				outfile = fopen(szBrokenLogName, "ab");
+				outfile = fopen(szBrokenLogName, "a");
 				if (outfile)
 				{
 					FILE* infile;
-					infile = fopen(szOldBrokenLogName, "rb");
+					infile = fopen(szOldBrokenLogName, "r");
 					if (infile)
 					{
 						static const int BUFFER_SIZE = 1024 * 50;

ArticleDownloader.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -28,6 +28,9 @@
 #define ARTICLEDOWNLOADER_H
 
 #include <time.h>
+#ifdef WIN32
+#include <sys/timeb.h>
+#endif
 
 #include "Observer.h"
 #include "DownloadInfo.h"
@@ -115,4 +118,12 @@ public:
 	virtual void		AddSpeedReading(int iBytes) = 0;
 };
 
+class NZBInfoLocker
+{
+public:
+	virtual				~NZBInfoLocker() {};
+	virtual void		LockNZBInfo(NZBInfo* pNZBInfo) = 0;
+	virtual void		UnlockNZBInfo(NZBInfo* pNZBInfo) = 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-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -48,23 +48,18 @@
 #include "Log.h"
 #include "Options.h"
 #include "QueueCoordinator.h"
-#include "UrlCoordinator.h"
 #include "QueueEditor.h"
 #include "PrePostProcessor.h"
 #include "Util.h"
-#include "DownloadInfo.h"
 
 extern Options* g_pOptions;
 extern QueueCoordinator* g_pQueueCoordinator;
-extern UrlCoordinator* g_pUrlCoordinator;
 extern PrePostProcessor* g_pPrePostProcessor;
 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", "URL-queue" };
+		"Edit queue", "Log", "Quit", "Version", "Post-queue", "Write log", "Scan" };
 
 const unsigned int g_iMessageRequestSizes[] =
     { 0,
@@ -76,14 +71,10 @@ const unsigned int g_iMessageRequestSizes[] =
 		sizeof(SNZBEditQueueRequest),
 		sizeof(SNZBLogRequest),
 		sizeof(SNZBShutdownRequest),
-		sizeof(SNZBReloadRequest),
 		sizeof(SNZBVersionRequest),
 		sizeof(SNZBPostQueueRequest),
 		sizeof(SNZBWriteLogRequest),
-		sizeof(SNZBScanRequest),
-		sizeof(SNZBHistoryRequest),
-		sizeof(SNZBDownloadUrlRequest),
-		sizeof(SNZBUrlQueueRequest)
+		sizeof(SNZBScanRequest)
     };
 
 //*****************************************************************
@@ -101,13 +92,13 @@ void BinRpcProcessor::Execute()
 	// Make sure this is a nzbget request from a client
 	if ((int)ntohl(m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE)
 	{
-		warn("Non-nzbget request received on port %i from %s", g_pOptions->GetControlPort(), m_szClientIP);
+		warn("Non-nzbget request received on port %i from %s", g_pOptions->GetServerPort(), m_szClientIP);
 		return;
 	}
 
-	if (strcmp(m_MessageBase.m_szPassword, g_pOptions->GetControlPassword()))
+	if (strcmp(m_MessageBase.m_szPassword, g_pOptions->GetServerPassword()))
 	{
-		warn("nzbget request received on port %i from %s, but password invalid", g_pOptions->GetControlPort(), m_szClientIP);
+		warn("nzbget request received on port %i from %s, but password invalid", g_pOptions->GetServerPort(), m_szClientIP);
 		return;
 	}
 
@@ -119,10 +110,10 @@ void BinRpcProcessor::Execute()
 void BinRpcProcessor::Dispatch()
 {
 	if (ntohl(m_MessageBase.m_iType) >= (int)eRemoteRequestDownload &&
-		   ntohl(m_MessageBase.m_iType) <= (int)eRemoteRequestHistory &&
+		   ntohl(m_MessageBase.m_iType) <= (int)eRemoteRequestScan &&
 		   g_iMessageRequestSizes[ntohl(m_MessageBase.m_iType)] != ntohl(m_MessageBase.m_iStructSize))
 	{
-		error("Invalid size of request: expected %i Bytes, but received %i Bytes",
+		error("Invalid size of request: needed %i Bytes, but received %i Bytes",
 			 g_iMessageRequestSizes[ntohl(m_MessageBase.m_iType)], ntohl(m_MessageBase.m_iStructSize));
 		return;
 	}
@@ -132,68 +123,76 @@ void BinRpcProcessor::Dispatch()
 	switch (ntohl(m_MessageBase.m_iType))
 	{
 		case eRemoteRequestDownload:
-			command = new DownloadBinCommand();
-			break;
+			{
+				command = new DownloadBinCommand();
+				break;
+			}
 
 		case eRemoteRequestList:
-			command = new ListBinCommand();
-			break;
+			{
+				command = new ListBinCommand();
+				break;
+			}
 
 		case eRemoteRequestLog:
-			command = new LogBinCommand();
-			break;
+			{
+				command = new LogBinCommand();
+				break;
+			}
 
 		case eRemoteRequestPauseUnpause:
-			command = new PauseUnpauseBinCommand();
-			break;
+			{
+				command = new PauseUnpauseBinCommand();
+				break;
+			}
 
 		case eRemoteRequestEditQueue:
-			command = new EditQueueBinCommand();
-			break;
+			{
+				command = new EditQueueBinCommand();
+				break;
+			}
 
 		case eRemoteRequestSetDownloadRate:
-			command = new SetDownloadRateBinCommand();
-			break;
+			{
+				command = new SetDownloadRateBinCommand();
+				break;
+			}
 
 		case eRemoteRequestDumpDebug:
-			command = new DumpDebugBinCommand();
-			break;
+			{
+				command = new DumpDebugBinCommand();
+				break;
+			}
 
 		case eRemoteRequestShutdown:
-			command = new ShutdownBinCommand();
-			break;
-
-		case eRemoteRequestReload:
-			command = new ReloadBinCommand();
-			break;
+			{
+				command = new ShutdownBinCommand();
+				break;
+			}
 
 		case eRemoteRequestVersion:
-			command = new VersionBinCommand();
-			break;
+			{
+				command = new VersionBinCommand();
+				break;
+			}
 
 		case eRemoteRequestPostQueue:
-			command = new PostQueueBinCommand();
-			break;
+			{
+				command = new PostQueueBinCommand();
+				break;
+			}
 
 		case eRemoteRequestWriteLog:
-			command = new WriteLogBinCommand();
-			break;
+			{
+				command = new WriteLogBinCommand();
+				break;
+			}
 
 		case eRemoteRequestScan:
-			command = new ScanBinCommand();
-			break;
-
-		case eRemoteRequestHistory:
-			command = new HistoryBinCommand();
-			break;
-
-		case eRemoteRequestDownloadUrl:
-			command = new DownloadUrlBinCommand();
-			break;
-
-		case eRemoteRequestUrlQueue:
-			command = new UrlQueueBinCommand();
-			break;
+			{
+				command = new ScanBinCommand();
+				break;
+			}
 
 		default:
 			error("Received unsupported request %i", ntohl(m_MessageBase.m_iType));
@@ -252,25 +251,7 @@ void PauseUnpauseBinCommand::Execute()
 		return;
 	}
 
-	switch (ntohl(PauseUnpauseRequest.m_iAction))
-	{
-		case eRemotePauseUnpauseActionDownload:
-			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;
-
-		case eRemotePauseUnpauseActionScan:
-			g_pOptions->SetPauseScan(ntohl(PauseUnpauseRequest.m_bPause));
-			break;
-	}
-
+	g_pOptions->SetPause(ntohl(PauseUnpauseRequest.m_bPause));
 	SendBoolResponse(true, "Pause-/Unpause-Command completed successfully");
 }
 
@@ -295,7 +276,6 @@ void DumpDebugBinCommand::Execute()
 	}
 
 	g_pQueueCoordinator->LogDebugInfo();
-	g_pUrlCoordinator->LogDebugInfo();
 	SendBoolResponse(true, "Debug-Command completed successfully");
 }
 
@@ -311,18 +291,6 @@ void ShutdownBinCommand::Execute()
 	ExitProc();
 }
 
-void ReloadBinCommand::Execute()
-{
-	SNZBReloadRequest ReloadRequest;
-	if (!ReceiveRequest(&ReloadRequest, sizeof(ReloadRequest)))
-	{
-		return;
-	}
-
-	SendBoolResponse(true, "Reloading server");
-	Reload();
-}
-
 void VersionBinCommand::Execute()
 {
 	SNZBVersionRequest VersionRequest;
@@ -331,7 +299,7 @@ void VersionBinCommand::Execute()
 		return;
 	}
 
-	SendBoolResponse(true, Util::VersionRevision());
+	SendBoolResponse(true, VERSION);
 }
 
 void DownloadBinCommand::Execute()
@@ -363,22 +331,11 @@ void DownloadBinCommand::Execute()
 
 	if (NeedBytes == 0)
 	{
-		int iPriority = ntohl(DownloadRequest.m_iPriority);
-		bool bAddPaused = ntohl(DownloadRequest.m_bAddPaused);
-
 		NZBFile* pNZBFile = NZBFile::CreateFromBuffer(DownloadRequest.m_szFilename, DownloadRequest.m_szCategory, pRecvBuffer, ntohl(DownloadRequest.m_iTrailingDataLength));
 
 		if (pNZBFile)
 		{
 			info("Request: Queue collection %s", DownloadRequest.m_szFilename);
-
-			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, ntohl(DownloadRequest.m_bAddFirst));
 			delete pNZBFile;
 
@@ -412,36 +369,27 @@ void ListBinCommand::Execute()
 	ListResponse.m_MessageBase.m_iSignature = htonl(NZBMESSAGE_SIGNATURE);
 	ListResponse.m_MessageBase.m_iStructSize = htonl(sizeof(ListResponse));
 	ListResponse.m_iEntrySize = htonl(sizeof(SNZBListResponseFileEntry));
-	ListResponse.m_bRegExValid = 0;
 
 	char* buf = NULL;
 	int bufsize = 0;
 
 	if (ntohl(ListRequest.m_bFileList))
 	{
-		eRemoteMatchMode eMatchMode = (eRemoteMatchMode)ntohl(ListRequest.m_iMatchMode);
-		bool bMatchGroup = ntohl(ListRequest.m_bMatchGroup);
-		const char* szPattern = ListRequest.m_szPattern;
-
-		RegEx *pRegEx = NULL;
-		if (eMatchMode == eRemoteMatchModeRegEx)
-		{
-			pRegEx = new RegEx(szPattern);
-			ListResponse.m_bRegExValid = pRegEx->IsValid();
-		}
-
 		// Make a data structure and copy all the elements of the list into it
 		DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
 
+		// prepare list of nzb-infos
+		NZBQueue cNZBQueue;
+		NZBInfo::BuildNZBList(pDownloadQueue, &cNZBQueue);
+
 		// calculate required buffer size for nzbs
-		int iNrNZBEntries = pDownloadQueue->GetNZBInfoList()->size();
+		int iNrNZBEntries = cNZBQueue.size();
 		int iNrPPPEntries = 0;
 		bufsize += iNrNZBEntries * sizeof(SNZBListResponseNZBEntry);
-		for (NZBInfoList::iterator it = pDownloadQueue->GetNZBInfoList()->begin(); it != pDownloadQueue->GetNZBInfoList()->end(); it++)
+		for (NZBQueue::iterator it = cNZBQueue.begin(); it != cNZBQueue.end(); it++)
 		{
 			NZBInfo* pNZBInfo = *it;
 			bufsize += strlen(pNZBInfo->GetFilename()) + 1;
-			bufsize += strlen(pNZBInfo->GetName()) + 1;
 			bufsize += strlen(pNZBInfo->GetDestDir()) + 1;
 			bufsize += strlen(pNZBInfo->GetCategory()) + 1;
 			bufsize += strlen(pNZBInfo->GetQueuedFilename()) + 1;
@@ -462,9 +410,9 @@ void ListBinCommand::Execute()
 		}
 
 		// calculate required buffer size for files
-		int iNrFileEntries = pDownloadQueue->GetFileQueue()->size();
+		int iNrFileEntries = pDownloadQueue->size();
 		bufsize += iNrFileEntries * sizeof(SNZBListResponseFileEntry);
-		for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+		for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
 		{
 			FileInfo* pFileInfo = *it;
 			bufsize += strlen(pFileInfo->GetSubject()) + 1;
@@ -477,7 +425,7 @@ void ListBinCommand::Execute()
 		char* bufptr = buf;
 
 		// write nzb entries
-		for (NZBInfoList::iterator it = pDownloadQueue->GetNZBInfoList()->begin(); it != pDownloadQueue->GetNZBInfoList()->end(); it++)
+		for (NZBQueue::iterator it = cNZBQueue.begin(); it != cNZBQueue.end(); it++)
 		{
 			unsigned long iSizeHi, iSizeLo;
 			NZBInfo* pNZBInfo = *it;
@@ -485,17 +433,13 @@ void ListBinCommand::Execute()
 			Util::SplitInt64(pNZBInfo->GetSize(), &iSizeHi, &iSizeLo);
 			pListAnswer->m_iSizeLo				= htonl(iSizeLo);
 			pListAnswer->m_iSizeHi				= htonl(iSizeHi);
-			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);
 			pListAnswer->m_iDestDirLen			= htonl(strlen(pNZBInfo->GetDestDir()) + 1);
 			pListAnswer->m_iCategoryLen			= htonl(strlen(pNZBInfo->GetCategory()) + 1);
 			pListAnswer->m_iQueuedFilenameLen	= htonl(strlen(pNZBInfo->GetQueuedFilename()) + 1);
 			bufptr += sizeof(SNZBListResponseNZBEntry);
 			strcpy(bufptr, pNZBInfo->GetFilename());
 			bufptr += ntohl(pListAnswer->m_iFilenameLen);
-			strcpy(bufptr, pNZBInfo->GetName());
-			bufptr += ntohl(pListAnswer->m_iNameLen);
 			strcpy(bufptr, pNZBInfo->GetDestDir());
 			bufptr += ntohl(pListAnswer->m_iDestDirLen);
 			strcpy(bufptr, pNZBInfo->GetCategory());
@@ -513,7 +457,7 @@ void ListBinCommand::Execute()
 
 		// write ppp entries
 		int iNZBIndex = 1;
-		for (NZBInfoList::iterator it = pDownloadQueue->GetNZBInfoList()->begin(); it != pDownloadQueue->GetNZBInfoList()->end(); it++, iNZBIndex++)
+		for (NZBQueue::iterator it = cNZBQueue.begin(); it != cNZBQueue.end(); it++, iNZBIndex++)
 		{
 			NZBInfo* pNZBInfo = *it;
 			for (NZBParameterList::iterator it = pNZBInfo->GetParameters()->begin(); it != pNZBInfo->GetParameters()->end(); it++)
@@ -539,31 +483,24 @@ void ListBinCommand::Execute()
 		}
 
 		// write file entries
-		for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+		for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
 		{
 			unsigned long iSizeHi, iSizeLo;
 			FileInfo* pFileInfo = *it;
 			SNZBListResponseFileEntry* pListAnswer = (SNZBListResponseFileEntry*) bufptr;
-			pListAnswer->m_iID = htonl(pFileInfo->GetID());
+			pListAnswer->m_iID				= htonl(pFileInfo->GetID());
 
 			int iNZBIndex = 0;
-			for (unsigned int i = 0; i < pDownloadQueue->GetNZBInfoList()->size(); i++)
+			for (unsigned int i = 0; i < cNZBQueue.size(); i++)
 			{
 				iNZBIndex++;
-				if (pDownloadQueue->GetNZBInfoList()->at(i) == pFileInfo->GetNZBInfo())
+				if (cNZBQueue[i] == pFileInfo->GetNZBInfo())
 				{
 					break;
 				}
 			}
 			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));
-			}
-
 			Util::SplitInt64(pFileInfo->GetSize(), &iSizeHi, &iSizeLo);
 			pListAnswer->m_iFileSizeLo		= htonl(iSizeLo);
 			pListAnswer->m_iFileSizeHi		= htonl(iSizeHi);
@@ -572,8 +509,6 @@ void ListBinCommand::Execute()
 			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);
@@ -592,11 +527,6 @@ void ListBinCommand::Execute()
 
 		g_pQueueCoordinator->UnlockQueue();
 
-		if (pRegEx)
-		{
-			delete pRegEx;
-		}
-
 		ListResponse.m_iNrTrailingNZBEntries = htonl(iNrNZBEntries);
 		ListResponse.m_iNrTrailingPPPEntries = htonl(iNrPPPEntries);
 		ListResponse.m_iNrTrailingFileEntries = htonl(iNrFileEntries);
@@ -611,14 +541,11 @@ void ListBinCommand::Execute()
 		ListResponse.m_iRemainingSizeHi = htonl(iSizeHi);
 		ListResponse.m_iRemainingSizeLo = htonl(iSizeLo);
 		ListResponse.m_iDownloadLimit = htonl((int)(g_pOptions->GetDownloadRate() * 1024));
-		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_bServerPaused = htonl(g_pOptions->GetPause());
 		ListResponse.m_iThreadCount = htonl(Thread::GetThreadCount() - 1); // not counting itself
-		PostQueue* pPostQueue = g_pQueueCoordinator->LockQueue()->GetPostQueue();
+		PostQueue* pPostQueue = g_pPrePostProcessor->LockPostQueue();
 		ListResponse.m_iPostJobCount = htonl(pPostQueue->size());
-		g_pQueueCoordinator->UnlockQueue();
+		g_pPrePostProcessor->UnlockPostQueue();
 
 		int iUpTimeSec, iDnTimeSec;
 		long long iAllBytes;
@@ -626,7 +553,7 @@ void ListBinCommand::Execute()
 		g_pQueueCoordinator->CalcStat(&iUpTimeSec, &iDnTimeSec, &iAllBytes, &bStandBy);
 		ListResponse.m_iUpTimeSec = htonl(iUpTimeSec);
 		ListResponse.m_iDownloadTimeSec = htonl(iDnTimeSec);
-		ListResponse.m_bDownloadStandBy = htonl(bStandBy);
+		ListResponse.m_bServerStandBy = htonl(bStandBy);
 		Util::SplitInt64(iAllBytes, &iSizeHi, &iSizeLo);
 		ListResponse.m_iDownloadedBytesHi = htonl(iSizeHi);
 		ListResponse.m_iDownloadedBytesLo = htonl(iSizeLo);
@@ -743,23 +670,28 @@ void EditQueueBinCommand::Execute()
 		return;
 	}
 
-	int iNrIDEntries = ntohl(EditQueueRequest.m_iNrTrailingIDEntries);
-	int iNrNameEntries = ntohl(EditQueueRequest.m_iNrTrailingNameEntries);
-	int iNameEntriesLen = ntohl(EditQueueRequest.m_iTrailingNameEntriesLen);
+	int iNrEntries = ntohl(EditQueueRequest.m_iNrTrailingEntries);
 	int iAction = ntohl(EditQueueRequest.m_iAction);
-	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)
+	if (iNrEntries * sizeof(int32_t) + iTextLen != iBufLength)
 	{
 		error("Invalid struct size");
 		return;
 	}
 
+	if (iNrEntries <= 0)
+	{
+		SendBoolResponse(false, "Edit-Command failed: no IDs specified");
+		return;
+	}
+
 	char* pBuf = (char*)malloc(iBufLength);
+	char* szText = NULL;
+	int32_t* pIDs = NULL;
 
 	// Read from the socket until nothing remains
 	char* pBufPtr = pBuf;
@@ -779,53 +711,21 @@ void EditQueueBinCommand::Execute()
 	}
 	bool bOK = NeedBytes == 0;
 
-	if (iNrIDEntries <= 0 && iNrNameEntries <= 0)
-	{
-		SendBoolResponse(false, "Edit-Command failed: no IDs/Names specified");
-		return;
-	}
-
 	if (bOK)
 	{
-		char* szText = iTextLen > 0 ? pBuf : NULL;
-		int32_t* pIDs = (int32_t*)(pBuf + iTextLen);
-		char* pNames = (pBuf + iTextLen + iNrIDEntries * sizeof(int32_t));
-
-		IDList cIDList;
-		NameList cNameList;
-
-		if (iNrIDEntries > 0)
-		{
-			cIDList.reserve(iNrIDEntries);
-			for (int i = 0; i < iNrIDEntries; i++)
-			{
-				cIDList.push_back(ntohl(pIDs[i]));
-			}
-		}
-
-		if (iNrNameEntries > 0)
-		{
-			cNameList.reserve(iNrNameEntries);
-			for (int i = 0; i < iNrNameEntries; i++)
-			{
-				cNameList.push_back(pNames);
-				pNames += strlen(pNames) + 1;
-			}
-		}
-
-		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 = iTextLen > 0 ? pBuf : NULL;
+		pIDs = (int32_t*)(pBuf + iTextLen);
 	}
 
+	QueueEditor::IDList cIDList;
+	cIDList.reserve(iNrEntries);
+	for (int i = 0; i < iNrEntries; i++)
+	{
+		cIDList.push_back(ntohl(pIDs[i]));
+	}
+
+	bOK = g_pQueueCoordinator->GetQueueEditor()->EditList(&cIDList, bSmartOrder, (QueueEditor::EEditAction)iAction, iOffset, szText);
+
 	free(pBuf);
 
 	if (bOK)
@@ -834,13 +734,6 @@ void EditQueueBinCommand::Execute()
 	}
 	else
 	{
-#ifndef HAVE_REGEX_H
-		if ((QueueEditor::EMatchMode)iMatchMode == QueueEditor::mmRegEx)
-		{
-			SendBoolResponse(false, "Edit-Command failed: the program was compiled without RegEx-support");
-			return;
-		}
-#endif
 		SendBoolResponse(false, "Edit-Command failed");
 	}
 }
@@ -863,7 +756,7 @@ void PostQueueBinCommand::Execute()
 	int bufsize = 0;
 
 	// Make a data structure and copy all the elements of the list into it
-	PostQueue* pPostQueue = g_pQueueCoordinator->LockQueue()->GetPostQueue();
+	PostQueue* pPostQueue = g_pPrePostProcessor->LockPostQueue();
 
 	int NrEntries = pPostQueue->size();
 
@@ -872,10 +765,10 @@ void PostQueueBinCommand::Execute()
 	for (PostQueue::iterator it = pPostQueue->begin(); it != pPostQueue->end(); it++)
 	{
 		PostInfo* pPostInfo = *it;
-		bufsize += strlen(pPostInfo->GetNZBInfo()->GetFilename()) + 1;
+		bufsize += strlen(pPostInfo->GetNZBFilename()) + 1;
 		bufsize += strlen(pPostInfo->GetParFilename()) + 1;
 		bufsize += strlen(pPostInfo->GetInfoName()) + 1;
-		bufsize += strlen(pPostInfo->GetNZBInfo()->GetDestDir()) + 1;
+		bufsize += strlen(pPostInfo->GetDestDir()) + 1;
 		bufsize += strlen(pPostInfo->GetProgressLabel()) + 1;
 		// align struct to 4-bytes, needed by ARM-processor (and may be others)
 		bufsize += bufsize % 4 > 0 ? 4 - bufsize % 4 : 0;
@@ -895,19 +788,19 @@ void PostQueueBinCommand::Execute()
 		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_iNZBFilenameLen		= htonl(strlen(pPostInfo->GetNZBFilename()) + 1);
 		pPostQueueAnswer->m_iParFilename		= htonl(strlen(pPostInfo->GetParFilename()) + 1);
 		pPostQueueAnswer->m_iInfoNameLen		= htonl(strlen(pPostInfo->GetInfoName()) + 1);
-		pPostQueueAnswer->m_iDestDirLen			= htonl(strlen(pPostInfo->GetNZBInfo()->GetDestDir()) + 1);
+		pPostQueueAnswer->m_iDestDirLen			= htonl(strlen(pPostInfo->GetDestDir()) + 1);
 		pPostQueueAnswer->m_iProgressLabelLen	= htonl(strlen(pPostInfo->GetProgressLabel()) + 1);
 		bufptr += sizeof(SNZBPostQueueResponseEntry);
-		strcpy(bufptr, pPostInfo->GetNZBInfo()->GetFilename());
+		strcpy(bufptr, pPostInfo->GetNZBFilename());
 		bufptr += ntohl(pPostQueueAnswer->m_iNZBFilenameLen);
 		strcpy(bufptr, pPostInfo->GetParFilename());
 		bufptr += ntohl(pPostQueueAnswer->m_iParFilename);
 		strcpy(bufptr, pPostInfo->GetInfoName());
 		bufptr += ntohl(pPostQueueAnswer->m_iInfoNameLen);
-		strcpy(bufptr, pPostInfo->GetNZBInfo()->GetDestDir());
+		strcpy(bufptr, pPostInfo->GetDestDir());
 		bufptr += ntohl(pPostQueueAnswer->m_iDestDirLen);
 		strcpy(bufptr, pPostInfo->GetProgressLabel());
 		bufptr += ntohl(pPostQueueAnswer->m_iProgressLabelLen);
@@ -920,7 +813,7 @@ void PostQueueBinCommand::Execute()
 		}
 	}
 
-	g_pQueueCoordinator->UnlockQueue();
+	g_pPrePostProcessor->UnlockPostQueue();
 
 	PostQueueResponse.m_iNrTrailingEntries = htonl(NrEntries);
 	PostQueueResponse.m_iTrailingDataLength = htonl(bufsize);
@@ -934,7 +827,10 @@ void PostQueueBinCommand::Execute()
 		send(m_iSocket, buf, bufsize, 0);
 	}
 
-	free(buf);
+	if (buf)
+	{
+		free(buf);
+	}
 }
 
 void WriteLogBinCommand::Execute()
@@ -1002,213 +898,6 @@ void ScanBinCommand::Execute()
 		return;
 	}
 
-	bool bSyncMode = ntohl(ScanRequest.m_bSyncMode);
-
-	g_pPrePostProcessor->ScanNZBDir(bSyncMode);
-	SendBoolResponse(true, bSyncMode ? "Scan-Command completed" : "Scan-Command scheduled successfully");
-}
-
-void HistoryBinCommand::Execute()
-{
-	SNZBHistoryRequest HistoryRequest;
-	if (!ReceiveRequest(&HistoryRequest, sizeof(HistoryRequest)))
-	{
-		return;
-	}
-
-	SNZBHistoryResponse HistoryResponse;
-	memset(&HistoryResponse, 0, sizeof(HistoryResponse));
-	HistoryResponse.m_MessageBase.m_iSignature = htonl(NZBMESSAGE_SIGNATURE);
-	HistoryResponse.m_MessageBase.m_iStructSize = htonl(sizeof(HistoryResponse));
-	HistoryResponse.m_iEntrySize = htonl(sizeof(SNZBHistoryResponseEntry));
-
-	char* buf = NULL;
-	int bufsize = 0;
-
-	// Make a data structure and copy all the elements of the list into it
-	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
-
-	// calculate required buffer size for nzbs
-	int iNrEntries = pDownloadQueue->GetHistoryList()->size();
-	bufsize += iNrEntries * sizeof(SNZBHistoryResponseEntry);
-	for (HistoryList::iterator it = pDownloadQueue->GetHistoryList()->begin(); it != pDownloadQueue->GetHistoryList()->end(); it++)
-	{
-		HistoryInfo* pHistoryInfo = *it;
-		char szNicename[1024];
-		pHistoryInfo->GetName(szNicename, sizeof(szNicename));
-		bufsize += strlen(szNicename) + 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 (HistoryList::iterator it = pDownloadQueue->GetHistoryList()->begin(); it != pDownloadQueue->GetHistoryList()->end(); it++)
-	{
-		HistoryInfo* pHistoryInfo = *it;
-		SNZBHistoryResponseEntry* pListAnswer = (SNZBHistoryResponseEntry*) bufptr;
-		pListAnswer->m_iID					= htonl(pHistoryInfo->GetID());
-		pListAnswer->m_iKind				= htonl((int)pHistoryInfo->GetKind());
-		pListAnswer->m_tTime				= htonl((int)pHistoryInfo->GetTime());
-
-		char szNicename[1024];
-		pHistoryInfo->GetName(szNicename, sizeof(szNicename));
-		pListAnswer->m_iNicenameLen			= htonl(strlen(szNicename) + 1);
-
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkNZBInfo)
-		{
-			NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
-			unsigned long iSizeHi, iSizeLo;
-			Util::SplitInt64(pNZBInfo->GetSize(), &iSizeHi, &iSizeLo);
-			pListAnswer->m_iSizeLo				= htonl(iSizeLo);
-			pListAnswer->m_iSizeHi				= htonl(iSizeHi);
-			pListAnswer->m_iFileCount			= htonl(pNZBInfo->GetFileCount());
-			pListAnswer->m_iParStatus			= htonl(pNZBInfo->GetParStatus());
-			pListAnswer->m_iScriptStatus		= htonl(pNZBInfo->GetScriptStatus());
-		}
-		else if (pHistoryInfo->GetKind() == HistoryInfo::hkUrlInfo)
-		{
-			UrlInfo* pUrlInfo = pHistoryInfo->GetUrlInfo();
-			pListAnswer->m_iUrlStatus			= htonl(pUrlInfo->GetStatus());
-		}
-
-		bufptr += sizeof(SNZBHistoryResponseEntry);
-		strcpy(bufptr, szNicename);
-		bufptr += ntohl(pListAnswer->m_iNicenameLen);
-		// align struct to 4-bytes, needed by ARM-processor (and may be others)
-		if ((size_t)bufptr % 4 > 0)
-		{
-			pListAnswer->m_iNicenameLen = htonl(ntohl(pListAnswer->m_iNicenameLen) + 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();
-
-	HistoryResponse.m_iNrTrailingEntries = htonl(iNrEntries);
-	HistoryResponse.m_iTrailingDataLength = htonl(bufsize);
-
-	// Send the request answer
-	send(m_iSocket, (char*) &HistoryResponse, sizeof(HistoryResponse), 0);
-
-	// Send the data
-	if (bufsize > 0)
-	{
-		send(m_iSocket, buf, bufsize, 0);
-	}
-
-	free(buf);
-}
-
-void DownloadUrlBinCommand::Execute()
-{
-	SNZBDownloadUrlRequest DownloadUrlRequest;
-	if (!ReceiveRequest(&DownloadUrlRequest, sizeof(DownloadUrlRequest)))
-	{
-		return;
-	}
-
-	URL url(DownloadUrlRequest.m_szURL);
-	if (!url.IsValid())
-	{
-		char tmp[1024];
-		snprintf(tmp, 1024, "Url %s is not valid", DownloadUrlRequest.m_szURL);
-		tmp[1024-1] = '\0';
-		SendBoolResponse(true, tmp);
-		return;
-	}
-
-	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));
-
-	g_pUrlCoordinator->AddUrlToQueue(pUrlInfo, ntohl(DownloadUrlRequest.m_bAddFirst));
-
-	info("Request: Queue url %s", DownloadUrlRequest.m_szURL);
-
-	char tmp[1024];
-	snprintf(tmp, 1024, "Url %s added to queue", DownloadUrlRequest.m_szURL);
-	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
-	send(m_iSocket, (char*) &UrlQueueResponse, sizeof(UrlQueueResponse), 0);
-
-	// Send the data
-	if (bufsize > 0)
-	{
-		send(m_iSocket, buf, bufsize, 0);
-	}
-
-	free(buf);
+	g_pPrePostProcessor->ScanNZBDir();
+	SendBoolResponse(true, "Scan-Command scheduled successfully");
 }

BinRpc.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@sourceforge.net>
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -110,12 +110,6 @@ public:
 	virtual void		Execute();
 };
 
-class ReloadBinCommand: public BinCommand
-{
-public:
-	virtual void		Execute();
-};
-
 class VersionBinCommand: public BinCommand
 {
 public:
@@ -140,22 +134,4 @@ public:
 	virtual void		Execute();
 };
 
-class HistoryBinCommand: public BinCommand
-{
-public:
-	virtual void		Execute();
-};
-
-class DownloadUrlBinCommand: public BinCommand
-{
-public:
-	virtual void		Execute();
-};
-
-class UrlQueueBinCommand: public BinCommand
-{
-public:
-	virtual void		Execute();
-};
-
 #endif

ColoredFrontend.cpp

@@ -1,8 +1,8 @@
 /*
  *  This file if part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -76,7 +76,7 @@ void ColoredFrontend::PrintStatus()
 	timeString[0] = '\0';
 	float fCurrentDownloadSpeed = m_bStandBy ? 0 : m_fCurrentDownloadSpeed;
 
-	if (fCurrentDownloadSpeed > 0.0 && !(m_bPauseDownload || m_bPauseDownload2))
+	if (fCurrentDownloadSpeed > 0.0 && !m_bPause)
 	{
 		long long remain_sec = m_lRemainingSize / ((long long)(fCurrentDownloadSpeed * 1024));
 		int h = (int)(remain_sec / 3600);
@@ -88,7 +88,7 @@ void ColoredFrontend::PrintStatus()
 	char szDownloadLimit[128];
 	if (m_fDownloadLimit > 0.0f)
 	{
-		sprintf(szDownloadLimit, ", Limit %.0f KB/s", m_fDownloadLimit);
+		sprintf(szDownloadLimit, ", Limit %.0f KB/S", m_fDownloadLimit);
 	}
 	else
 	{
@@ -112,11 +112,9 @@ void ColoredFrontend::PrintStatus()
 	const char* szControlSeq = "\033[K";
 #endif
 
-	snprintf(tmp, 1024, " %d threads, %.*f KB/s, %.2f MB remaining%s%s%s%s%s\n", 
-		m_iThreadCount, (fCurrentDownloadSpeed >= 10 ? 0 : 1), fCurrentDownloadSpeed, 
-		(float)(Util::Int64ToFloat(m_lRemainingSize) / 1024.0 / 1024.0), timeString, szPostStatus, 
-		m_bPauseDownload || m_bPauseDownload2 ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
-		szDownloadLimit, szControlSeq);
+	snprintf(tmp, 1024, " %d threads, %.0f KB/s, %.2f MB remaining%s%s%s%s%s\n", 
+		m_iThreadCount, fCurrentDownloadSpeed, (float)(Util::Int64ToFloat(m_lRemainingSize) / 1024.0 / 1024.0), 
+		timeString, szPostStatus, m_bPause ? (m_bStandBy ? ", Paused" : ", Pausing") : "", szDownloadLimit, szControlSeq);
 	tmp[1024-1] = '\0';
 	printf("%s", tmp);
 	m_bNeedGoBack = true;

ColoredFrontend.h

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$

Connection.cpp

@@ -1,8 +1,8 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -46,7 +46,6 @@
 #include <unistd.h>
 #include <errno.h>
 #include <sys/socket.h>
-#include <sys/time.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
 #endif
@@ -60,13 +59,8 @@ static const int CONNECTION_READBUFFER_SIZE = 1024;
 #ifndef DISABLE_TLS
 bool Connection::bTLSLibInitialized = false;
 #endif
-#ifndef HAVE_GETADDRINFO
-#ifndef HAVE_GETHOSTBYNAME_R
-Mutex* Connection::m_pMutexGetHostByName = NULL;
-#endif
-#endif
 
-void Connection::Init()
+void Connection::Init(bool bTLS)
 {
 	debug("Initializing global connection data");
 
@@ -85,27 +79,23 @@ void Connection::Init()
 		return; 
 	}
 #endif
-
 #ifndef DISABLE_TLS
-	debug("Initializing TLS library");
-	char* szErrStr;
-	int iRes = tls_lib_init(&szErrStr);
-	bTLSLibInitialized = iRes == TLS_EOK;
-	if (!bTLSLibInitialized)
+	if (bTLS)
 	{
-		error("Could not initialize TLS library: %s", szErrStr ? szErrStr : "unknown error");
-		if (szErrStr)
+		debug("Initializing TLS library");
+		char* szErrStr;
+		int iRes = tls_lib_init(&szErrStr);
+		bTLSLibInitialized = iRes == TLS_EOK;
+		if (!bTLSLibInitialized)
 		{
-			free(szErrStr);
+			error("Could not initialize TLS library: %s", szErrStr ? szErrStr : "unknown error");
+			if (szErrStr)
+			{
+				free(szErrStr);
+			}
 		}
 	}
 #endif
-
-#ifndef HAVE_GETADDRINFO
-#ifndef HAVE_GETHOSTBYNAME_R
-	m_pMutexGetHostByName = new Mutex();
-#endif
-#endif
 }
 
 void Connection::Final()
@@ -123,21 +113,13 @@ void Connection::Final()
 		tls_lib_deinit();
 	}
 #endif
-
-#ifndef HAVE_GETADDRINFO
-#ifndef HAVE_GETHOSTBYNAME_R
-	delete m_pMutexGetHostByName;
-#endif
-#endif
 }
 
-Connection::Connection(const char* szHost, int iPort, bool bTLS)
+Connection::Connection(NetAddress* pNetAddress)
 {
 	debug("Creating Connection");
 
-	m_szHost			= NULL;
-	m_iPort				= iPort;
-	m_bTLS				= bTLS;
+	m_pNetAddress		= pNetAddress;
 	m_eStatus			= csDisconnected;
 	m_iSocket			= INVALID_SOCKET;
 	m_iBufAvail			= 0;
@@ -149,20 +131,13 @@ Connection::Connection(const char* szHost, int iPort, bool bTLS)
 	m_pTLS				= NULL;
 	m_bTLSError			= false;
 #endif
-
-	if (szHost)
-	{
-		m_szHost = strdup(szHost);
-	}
 }
 
 Connection::Connection(SOCKET iSocket, bool bAutoClose)
 {
 	debug("Creating Connection");
 
-	m_szHost			= NULL;
-	m_iPort				= 0;
-	m_bTLS				= false;
+	m_pNetAddress		= NULL;
 	m_eStatus			= csConnected;
 	m_iSocket			= iSocket;
 	m_iBufAvail			= 0;
@@ -179,11 +154,7 @@ Connection::~Connection()
 {
 	debug("Destroying Connection");
 
-	if (m_szHost)
-	{
-		free(m_szHost);
-	}
-	if (m_bAutoClose)
+	if (m_eStatus == csConnected && m_bAutoClose)
 	{
 		Disconnect();
 	}
@@ -201,20 +172,14 @@ bool Connection::Connect()
 	debug("Connecting");
 
 	if (m_eStatus == csConnected)
-	{
 		return true;
-	}
 
 	bool bRes = DoConnect();
 
 	if (bRes)
-	{
 		m_eStatus = csConnected;
-	}
 	else
-	{
 		Connection::DoDisconnect();
-	}
 
 	return bRes;
 }
@@ -224,9 +189,7 @@ bool Connection::Disconnect()
 	debug("Disconnecting");
 
 	if (m_eStatus == csDisconnected)
-	{
 		return true;
-	}
 
 	bool bRes = DoDisconnect();
 
@@ -365,9 +328,6 @@ bool Connection::DoConnect()
 {
 	debug("Do connecting");
 
-	m_iSocket = INVALID_SOCKET;
-	
-#ifdef HAVE_GETADDRINFO
 	struct addrinfo addr_hints, *addr_list, *addr;
 	char iPortStr[sizeof(int) * 4 + 1]; //is enough to hold any converted int
 
@@ -375,15 +335,16 @@ bool Connection::DoConnect()
 	addr_hints.ai_family = AF_UNSPEC;    /* Allow IPv4 or IPv6 */
 	addr_hints.ai_socktype = SOCK_STREAM,
 
-	sprintf(iPortStr, "%d", m_iPort);
+	sprintf(iPortStr, "%d", m_pNetAddress->GetPort());
 
-	int res = getaddrinfo(m_szHost, iPortStr, &addr_hints, &addr_list);
+	int res = getaddrinfo(m_pNetAddress->GetHost(), iPortStr, &addr_hints, &addr_list);
 	if (res != 0)
 	{
-		ReportError("Could not resolve hostname %s", m_szHost, true, 0);
+		ReportError("Could not resolve hostname %s", m_pNetAddress->GetHost(), true, 0);
 		return false;
 	}
 
+	m_iSocket = INVALID_SOCKET;
 	for (addr = addr_list; addr != NULL; addr = addr->ai_next)
 	{
 		m_iSocket = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
@@ -403,37 +364,9 @@ bool Connection::DoConnect()
 
 	freeaddrinfo(addr_list);
 
-#else
-	
-	struct sockaddr_in	sSocketAddress;
-	memset(&sSocketAddress, 0, sizeof(sSocketAddress));
-	sSocketAddress.sin_family = AF_INET;
-	sSocketAddress.sin_port = htons(m_iPort);
-	sSocketAddress.sin_addr.s_addr = ResolveHostAddr(m_szHost);
-	if (sSocketAddress.sin_addr.s_addr == (unsigned int)-1)
-	{
-		return false;
-	}
-
-	m_iSocket = socket(PF_INET, SOCK_STREAM, 0);
 	if (m_iSocket == INVALID_SOCKET)
 	{
-		ReportError("Socket creation failed for %s", m_szHost, true, 0);
-		return false;
-	}
-
-	int res = connect(m_iSocket , (struct sockaddr *) & sSocketAddress, sizeof(sSocketAddress));
-	if (res == -1)
-	{
-		// Connection failed
-		closesocket(m_iSocket);
-		m_iSocket = INVALID_SOCKET;
-	}
-#endif
-
-	if (m_iSocket == INVALID_SOCKET)
-	{
-		ReportError("Connection to %s failed", m_szHost, true, 0);
+		ReportError("Connection to %s failed!", m_pNetAddress->GetHost(), true, 0);
 		return false;
 	} 
 
@@ -451,13 +384,6 @@ bool Connection::DoConnect()
 		ReportError("setsockopt failed", NULL, true, 0);
 	}
 
-#ifndef DISABLE_TLS
-	if (m_bTLS && !StartTLS())
-	{
-		return false;
-	}
-#endif
-
 	return true;
 }
 
@@ -465,7 +391,7 @@ bool Connection::DoDisconnect()
 {
 	debug("Do disconnecting");
 
-	if (m_iSocket != INVALID_SOCKET)
+	if (m_iSocket > 0)
 	{
 		closesocket(m_iSocket);
 		m_iSocket = INVALID_SOCKET;
@@ -558,20 +484,10 @@ char* Connection::DoReadLine(char* pBuffer, int iSize, int* pBytesRead)
 	return pBuffer;
 }
 
-
-void Connection::ReadBuffer(char** pBuffer, int *iBufLen)
-{
-	*iBufLen = m_iBufAvail;
-	*pBuffer = m_szBufPtr;
-	m_iBufAvail = 0;
- };
-
-
 int Connection::DoBind()
 {
 	debug("Do binding");
 
-#ifdef HAVE_GETADDRINFO
 	struct addrinfo addr_hints, *addr_list, *addr;
 	char iPortStr[sizeof(int) * 4 + 1]; // is enough to hold any converted int
 
@@ -580,12 +496,12 @@ int Connection::DoBind()
 	addr_hints.ai_socktype = SOCK_STREAM,
 	addr_hints.ai_flags = AI_PASSIVE;    // For wildcard IP address
 
-	sprintf(iPortStr, "%d", m_iPort);
+	sprintf(iPortStr, "%d", m_pNetAddress->GetPort());
 
-	int res = getaddrinfo(m_szHost, iPortStr, &addr_hints, &addr_list);
+	int res = getaddrinfo(m_pNetAddress->GetHost(), iPortStr, &addr_hints, &addr_list);
 	if (res != 0)
 	{
-		error("Could not resolve hostname %s", m_szHost);
+		error( "Could not resolve hostname %s", m_pNetAddress->GetHost() );
 		return -1;
 	}
 
@@ -611,53 +527,15 @@ int Connection::DoBind()
 
 	freeaddrinfo(addr_list);
 
-#else
-
-	struct sockaddr_in	sSocketAddress;
-	memset(&sSocketAddress, 0, sizeof(sSocketAddress));
-	sSocketAddress.sin_family = AF_INET;
-	if (!m_szHost || strlen(m_szHost) == 0)
-	{
-		sSocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);
-	}
-	else
-	{
-		sSocketAddress.sin_addr.s_addr = ResolveHostAddr(m_szHost);
-		if (sSocketAddress.sin_addr.s_addr == (unsigned int)-1)
-		{
-			return -1;
-		}
-	}
-	sSocketAddress.sin_port = htons(m_iPort);
-
-	m_iSocket = socket(PF_INET, SOCK_STREAM, 0);
 	if (m_iSocket == INVALID_SOCKET)
 	{
-		ReportError("Socket creation failed for %s", m_szHost, true, 0);
-		return -1;
-	}
-	
-	int opt = 1;
-	setsockopt(m_iSocket, SOL_SOCKET, SO_REUSEADDR, (char*)&opt, sizeof(opt));
-
-	int res = bind(m_iSocket, (struct sockaddr *) &sSocketAddress, sizeof(sSocketAddress));
-	if (res == -1)
-	{
-		// Connection failed
-		closesocket(m_iSocket);
-		m_iSocket = INVALID_SOCKET;
-	}
-#endif
-
-	if (m_iSocket == INVALID_SOCKET)
-	{
-		ReportError("Binding socket failed for %s", m_szHost, true, 0);
+		ReportError("Binding socket failed for %s", m_pNetAddress->GetHost(), true, 0);
 		return -1;
 	}
 
 	if (listen(m_iSocket, 10) < 0)
 	{
-		ReportError("Listen on socket failed for %s", m_szHost, true, 0);
+		ReportError("Listen on socket failed for %s", m_pNetAddress->GetHost(), true, 0);
 		return -1;
 	}
 
@@ -690,7 +568,7 @@ void Connection::Cancel()
 	}
 }
 
-void Connection::ReportError(const char* szMsgPrefix, const char* szMsgArg, bool PrintErrCode, int herrno)
+void Connection::ReportError(const char* szMsgPrefix, const char* szMsgArg, bool PrintErrCode, int ErrCode)
 {
 #ifndef DISABLE_TLS
 	if (m_bTLSError)
@@ -707,8 +585,15 @@ void Connection::ReportError(const char* szMsgPrefix, const char* szMsgArg, bool
 	
 	if (PrintErrCode)
 	{
+		if (ErrCode == 0)
+		{
+#ifdef WIN32
+			ErrCode = WSAGetLastError();
+#else
+			ErrCode = errno;
+#endif
+		}
 #ifdef WIN32
-		int ErrCode = WSAGetLastError();
 		if (m_bSuppressErrors)
 		{
 			debug("%s: ErrNo %i", szErrPrefix, ErrCode);
@@ -718,18 +603,7 @@ void Connection::ReportError(const char* szMsgPrefix, const char* szMsgArg, bool
 			error("%s: ErrNo %i", szErrPrefix, ErrCode);
 		}
 #else
-		const char *szErrMsg = NULL;
-		int ErrCode = herrno;
-		if (herrno == 0)
-		{
-			ErrCode = errno;
-			szErrMsg = strerror(ErrCode);
-		}
-		else
-		{
-			szErrMsg = hstrerror(ErrCode);
-		}
-		
+		const char* szErrMsg = hstrerror(ErrCode);
 		if (m_bSuppressErrors)
 		{
 			debug("%s: ErrNo %i, %s", szErrPrefix, ErrCode, szErrMsg);
@@ -852,53 +726,3 @@ int Connection::send(SOCKET s, const char* buf, int len, int flags)
 	}
 }
 #endif
-
-#ifndef HAVE_GETADDRINFO
-unsigned int Connection::ResolveHostAddr(const char* szHost)
-{
-	unsigned int uaddr = inet_addr(szHost);
-	if (uaddr == (unsigned int)-1)
-	{
-		struct hostent* hinfo;
-		bool err = false;
-		int h_errnop = 0;
-#ifdef HAVE_GETHOSTBYNAME_R
-		struct hostent hinfobuf;
-		char strbuf[1024];
-#ifdef HAVE_GETHOSTBYNAME_R_6
-		err = gethostbyname_r(szHost, &hinfobuf, strbuf, sizeof(strbuf), &hinfo, &h_errnop);
-		err = err || (hinfo == NULL); // error on null hinfo (means 'no entry')
-#endif			
-#ifdef HAVE_GETHOSTBYNAME_R_5
-		hinfo = gethostbyname_r(szHost, &hinfobuf, strbuf, sizeof(strbuf), &h_errnop);
-		err = hinfo == NULL;
-#endif			
-#ifdef HAVE_GETHOSTBYNAME_R_3
-		//NOTE: gethostbyname_r with three parameters were not tested
-		struct hostent_data hinfo_data;
-		hinfo = gethostbyname_r((char*)szHost, (struct hostent*)hinfobuf, &hinfo_data);
-		err = hinfo == NULL;
-#endif			
-#else
-		m_pMutexGetHostByName->Lock();
-		hinfo = gethostbyname(szHost);
-		err = hinfo == NULL;
-#endif
-		if (err)
-		{
-#ifndef HAVE_GETHOSTBYNAME_R
-			m_pMutexGetHostByName->Unlock();
-#endif
-			ReportError("Could not resolve hostname %s", szHost, true, h_errnop);
-			return (unsigned int)-1;
-		}
-
-		memcpy(&uaddr, hinfo->h_addr_list[0], sizeof(uaddr));
-		
-#ifndef HAVE_GETHOSTBYNAME_R
-		m_pMutexGetHostByName->Unlock();
-#endif
-	}
-	return uaddr;
-}
-#endif

Connection.h

@@ -1,8 +1,8 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -27,11 +27,7 @@
 #ifndef CONNECTION_H
 #define CONNECTION_H
 
-#ifndef HAVE_GETADDRINFO
-#ifndef HAVE_GETHOSTBYNAME_R
-#include "Thread.h"
-#endif
-#endif
+#include "NetAddress.h"
 
 class Connection
 {
@@ -45,10 +41,8 @@ public:
 	};
 	
 protected:
-	char*				m_szHost;
-	int					m_iPort;
+	NetAddress* 		m_pNetAddress;
 	SOCKET				m_iSocket;
-	bool				m_bTLS;
 	char*				m_szReadBuf;
 	int					m_iBufAvail;
 	char*				m_szBufPtr;
@@ -60,23 +54,15 @@ protected:
 	void*				m_pTLS;
 	static bool			bTLSLibInitialized;
 	bool				m_bTLSError;
-#endif
-#ifndef HAVE_GETADDRINFO
-#ifndef HAVE_GETHOSTBYNAME_R
-	static Mutex*		m_pMutexGetHostByName;
-#endif
 #endif
 
-	void				ReportError(const char* szMsgPrefix, const char* szMsgArg, bool PrintErrCode, int herrno);
+	void				ReportError(const char* szMsgPrefix, const char* szMsgArg, bool PrintErrCode, int ErrCode);
 	virtual bool 		DoConnect();
 	virtual bool		DoDisconnect();
 	int					DoBind();
 	int					DoWriteLine(const char* pBuffer);
 	char*				DoReadLine(char* pBuffer, int iSize, int* pBytesRead);
 	SOCKET				DoAccept();
-#ifndef HAVE_GETADDRINFO
-	unsigned int		ResolveHostAddr(const char* szHost);
-#endif
 #ifndef DISABLE_TLS
 	bool				CheckTLSResult(int iResultCode, char* szErrStr, const char* szErrMsgPrefix);
 	int					recv(SOCKET s, char* buf, int len, int flags);
@@ -85,10 +71,10 @@ protected:
 #endif
 
 public:
-						Connection(const char* szHost, int iPort, bool bTLS);
+						Connection(NetAddress* pNetAddress);
 						Connection(SOCKET iSocket, bool bAutoClose);
 	virtual 			~Connection();
-	static void			Init();
+	static void			Init(bool bTLS);
 	static void			Final();
 	bool 				Connect();
 	bool				Disconnect();
@@ -97,13 +83,10 @@ public:
 	int					Recv(char* pBuffer, int iSize);
 	bool				RecvAll(char* pBuffer, int iSize);
 	char*				ReadLine(char* pBuffer, int iSize, int* pBytesRead);
-	void				ReadBuffer(char** pBuffer, int *iBufLen);
 	int					WriteLine(const char* pBuffer);
 	SOCKET				Accept();
 	void				Cancel();
-	const char*			GetHost() { return m_szHost; }
-	int					GetPort() { return m_iPort; }
-	bool				GetTLS() { return m_bTLS; }
+	NetAddress*			GetServer() { return m_pNetAddress; }
 	SOCKET				GetSocket() { return m_iSocket; }
 	void				SetTimeout(int iTimeout) { m_iTimeout = iTimeout; }
 	EStatus				GetStatus() { return m_eStatus; }

Decoder.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32

Decoder.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$

DiskState.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -31,24 +31,10 @@
 class DiskState
 {
 private:
-	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);
-	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				SaveHistory(DownloadQueue* pDownloadQueue, FILE* outfile);
-	bool				LoadHistory(DownloadQueue* pDownloadQueue, FILE* infile, int iFormatVersion);
-	int					FindNZBInfoIndex(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
-
+	int					ParseFormatVersion(const char* szFormatSignature);
+	
 public:
 	bool				DownloadQueueExists();
 	bool				PostQueueExists(bool bCompleted);
@@ -56,7 +42,10 @@ public:
 	bool				LoadDownloadQueue(DownloadQueue* pDownloadQueue);
 	bool				SaveFile(FileInfo* pFileInfo);
 	bool				LoadArticles(FileInfo* pFileInfo);
+	bool				SavePostQueue(PostQueue* pPostQueue, bool bCompleted);
+	bool				LoadPostQueue(PostQueue* pPostQueue, bool bCompleted);
 	bool				DiscardDownloadQueue();
+	bool				DiscardPostQueue();
 	bool				DiscardFile(FileInfo* pFileInfo);
 	void				CleanupTempDir(DownloadQueue* pDownloadQueue);
 };

DownloadInfo.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -36,7 +36,6 @@
 #include <string.h>
 #include <cctype>
 #include <cstdio>
-#include <map>
 #include <sys/stat.h>
 
 #include "nzbget.h"
@@ -48,10 +47,7 @@
 extern Options* g_pOptions;
 
 int FileInfo::m_iIDGen = 0;
-int NZBInfo::m_iIDGen = 0;
 int PostInfo::m_iIDGen = 0;
-int UrlInfo::m_iIDGen = 0;
-int HistoryInfo::m_iIDGen = 0;
 
 NZBParameter::NZBParameter(const char* szName)
 {
@@ -81,42 +77,6 @@ void NZBParameter::SetValue(const char* szValue)
 }
 
 
-void NZBParameterList::SetParameter(const char* szName, const char* szValue)
-{
-	NZBParameter* pParameter = NULL;
-	bool bDelete = !szValue || !*szValue;
-
-	for (iterator it = begin(); it != end(); it++)
-	{
-		NZBParameter* pLookupParameter = *it;
-		if (!strcmp(pLookupParameter->GetName(), szName))
-		{
-			if (bDelete)
-			{
-				delete pLookupParameter;
-				erase(it);
-				return;
-			}
-			pParameter = pLookupParameter;
-			break;
-		}
-	}
-
-	if (bDelete)
-	{
-		return;
-	}
-
-	if (!pParameter)
-	{
-		pParameter = new NZBParameter(szName);
-		push_back(pParameter);
-	}
-
-	pParameter->SetValue(szValue);
-}
-
-
 NZBInfo::NZBInfo()
 {
 	debug("Creating NZBInfo");
@@ -124,23 +84,14 @@ NZBInfo::NZBInfo()
 	m_szFilename = NULL;
 	m_szDestDir = NULL;
 	m_szCategory = strdup("");
-	m_szName = NULL;
 	m_iFileCount = 0;
-	m_iParkedFileCount = 0;
 	m_lSize = 0;
 	m_iRefCount = 0;
 	m_bPostProcess = false;
-	m_eParStatus = prNone;
-	m_eScriptStatus = srNone;
 	m_bDeleted = false;
 	m_bParCleanup = false;
 	m_bCleanupDisk = false;
 	m_szQueuedFilename = strdup("");
-	m_Owner = NULL;
-	m_Messages.clear();
-	m_iIDMessageGen = 0;
-	m_iIDGen++;
-	m_iID = m_iIDGen;
 }
 
 NZBInfo::~NZBInfo()
@@ -159,33 +110,22 @@ NZBInfo::~NZBInfo()
 	{
 		free(m_szCategory);
 	}
-	if (m_szName)
-	{
-		free(m_szName);
-	}
 	if (m_szQueuedFilename)
 	{
 		free(m_szQueuedFilename);
 	}
 
-	ClearCompletedFiles();
+	for (Files::iterator it = m_completedFiles.begin(); it != m_completedFiles.end(); it++)
+	{
+		free(*it);
+	}
+	m_completedFiles.clear();
 
 	for (NZBParameterList::iterator it = m_ppParameters.begin(); it != m_ppParameters.end(); it++)
 	{
 		delete *it;
 	}
 	m_ppParameters.clear();
-
-	for (Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
-	{
-		delete *it;
-	}
-	m_Messages.clear();
-
-	if (m_Owner)
-	{
-		m_Owner->Remove(this);
-	}
 }
 
 void NZBInfo::AddReference()
@@ -202,15 +142,6 @@ void NZBInfo::Release()
 	}
 }
 
-void NZBInfo::ClearCompletedFiles()
-{
-	for (Files::iterator it = m_completedFiles.begin(); it != m_completedFiles.end(); it++)
-	{
-		free(*it);
-	}
-	m_completedFiles.clear();
-}
-
 void NZBInfo::SetDestDir(const char* szDestDir)
 {
 	if (m_szDestDir)
@@ -227,23 +158,6 @@ void NZBInfo::SetFilename(const char * szFilename)
 		free(m_szFilename);
 	}
 	m_szFilename = strdup(szFilename);
-
-	if (!m_szName)
-	{
-		char szNZBNicename[1024];
-		MakeNiceNZBName(m_szFilename, szNZBNicename, sizeof(szNZBNicename), true);
-		szNZBNicename[1024-1] = '\0';
-		SetName(szNZBNicename);
-	}
-}
-
-void NZBInfo::SetName(const char* szName)
-{
-	if (m_szName)
-	{
-		free(m_szName);
-	}
-	m_szName = szName ? strdup(szName) : NULL;
 }
 
 void NZBInfo::SetCategory(const char* szCategory)
@@ -264,23 +178,52 @@ void NZBInfo::SetQueuedFilename(const char * szQueuedFilename)
 	m_szQueuedFilename = strdup(szQueuedFilename);
 }
 
-void NZBInfo::MakeNiceNZBName(const char * szNZBFilename, char * szBuffer, int iSize, bool bRemoveExt)
+void NZBInfo::GetNiceNZBName(char* szBuffer, int iSize)
+{
+	MakeNiceNZBName(m_szFilename, szBuffer, iSize);
+}
+
+void NZBInfo::MakeNiceNZBName(const char * szNZBFilename, char * szBuffer, int iSize)
 {
 	char postname[1024];
 	const char* szBaseName = Util::BaseFileName(szNZBFilename);
 
-	strncpy(postname, szBaseName, 1024);
-	postname[1024-1] = '\0';
-
-	if (bRemoveExt)
+	// if .nzb file has a certain structure, try to strip out certain elements
+	if (sscanf(szBaseName, "msgid_%*d_%1023s", postname) == 1)
 	{
-		// wipe out ".nzb"
-		char* p = strrchr(postname, '.');
-		if (p && !strcasecmp(p, ".nzb")) *p = '\0';
+		// OK, using stripped name
+	}
+	else
+	{
+		// using complete filename
+		strncpy(postname, szBaseName, 1024);
+		postname[1024-1] = '\0';
 	}
 
+	// wipe out ".nzb"
+	if (char* p = strrchr(postname, '.')) *p = '\0';
+
 	Util::MakeValidFilename(postname, '_', false);
 
+	// if the resulting name is empty, use basename without cleaning up "msgid_"
+	if (strlen(postname) == 0)
+	{
+		// using complete filename
+		strncpy(postname, szBaseName, 1024);
+		postname[1024-1] = '\0';
+
+		// wipe out ".nzb"
+		if (char* p = strrchr(postname, '.')) *p = '\0';
+
+		Util::MakeValidFilename(postname, '_', false);
+
+		// if the resulting name is STILL empty, use "noname"
+		if (strlen(postname) == 0)
+		{
+			strncpy(postname, "noname", 1024);
+		}
+	}
+
 	strncpy(szBuffer, postname, iSize);
 	szBuffer[iSize-1] = '\0';
 }
@@ -299,13 +242,15 @@ void NZBInfo::BuildDestDirName()
 
 	if (g_pOptions->GetAppendNZBDir())
 	{
+		char szNiceNZBName[1024];
+		GetNiceNZBName(szNiceNZBName, 1024);
 		if (g_pOptions->GetAppendCategoryDir() && bHasCategory)
 		{
-			snprintf(szBuffer, 1024, "%s%s%c%s", g_pOptions->GetDestDir(), szCategory, PATH_SEPARATOR, GetName());
+			snprintf(szBuffer, 1024, "%s%s%c%s", g_pOptions->GetDestDir(), szCategory, PATH_SEPARATOR, szNiceNZBName);
 		}
 		else
 		{
-			snprintf(szBuffer, 1024, "%s%s", g_pOptions->GetDestDir(), GetName());
+			snprintf(szBuffer, 1024, "%s%s", g_pOptions->GetDestDir(), szNiceNZBName);
 		}
 		szBuffer[1024-1] = '\0';
 	}
@@ -327,69 +272,57 @@ void NZBInfo::BuildDestDirName()
 
 void NZBInfo::SetParameter(const char* szName, const char* szValue)
 {
-	m_ppParameters.SetParameter(szName, szValue);
-}
+	NZBParameter* pParameter = NULL;
+	bool bDelete = !szValue || !*szValue;
 
-NZBInfo::Messages* NZBInfo::LockMessages()
-{
-	m_mutexLog.Lock();
-	return &m_Messages;
-}
-
-void NZBInfo::UnlockMessages()
-{
-	m_mutexLog.Unlock();
-}
-
-void NZBInfo::AppendMessage(Message::EKind eKind, time_t tTime, const char * szText)
-{
-	if (tTime == 0)
+	for (NZBParameterList::iterator it = m_ppParameters.begin(); it != m_ppParameters.end(); it++)
 	{
-		tTime = time(NULL);
-	}
-
-	Message* pMessage = new Message(++m_iIDMessageGen, eKind, tTime, szText);
-
-	m_mutexLog.Lock();
-	m_Messages.push_back(pMessage);
-	m_mutexLog.Unlock();
-}
-
-void NZBInfoList::Add(NZBInfo* pNZBInfo)
-{
-	pNZBInfo->m_Owner = this;
-	push_back(pNZBInfo);
-}
-
-void NZBInfoList::Remove(NZBInfo* pNZBInfo)
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		NZBInfo* pNZBInfo2 = *it;
-		if (pNZBInfo2 == pNZBInfo)
+		NZBParameter* pLookupParameter = *it;
+		if (!strcmp(pLookupParameter->GetName(), szName))
 		{
-			erase(it);
+			if (bDelete)
+			{
+				delete pLookupParameter;
+				m_ppParameters.erase(it);
+				return;
+			}
+			pParameter = pLookupParameter;
 			break;
 		}
 	}
+
+	if (bDelete)
+	{
+		return;
+	}
+
+	if (!pParameter)
+	{
+		pParameter = new NZBParameter(szName);
+		m_ppParameters.push_back(pParameter);
+	}
+
+	pParameter->SetValue(szValue);
 }
 
-void NZBInfoList::ReleaseAll()
+void NZBInfo::BuildNZBList(DownloadQueue* pDownloadQueue, NZBQueue* pNZBQueue)
 {
-	int i = 0;
-	for (iterator it = begin(); it != end(); )
+	for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
 	{
-		NZBInfo* pNZBInfo = *it;
-		bool bObjDeleted = pNZBInfo->m_iRefCount == 1;
-		pNZBInfo->Release();
-		if (bObjDeleted)
+		FileInfo* pFileInfo = *it;
+		bool inlist = false;
+		for (NZBQueue::iterator it = pNZBQueue->begin(); it != pNZBQueue->end(); it++)
 		{
-			it = begin() + i;
+			NZBInfo* pNZBInfo = *it;
+			if (pNZBInfo == pFileInfo->GetNZBInfo())
+			{
+				inlist = true;
+				break;
+			}
 		}
-		else
+		if (!inlist)
 		{
-			it++;
-			i++;
+			pNZBQueue->push_back(pFileInfo->GetNZBInfo());
 		}
 	}
 }
@@ -443,14 +376,11 @@ FileInfo::FileInfo()
 	m_bFilenameConfirmed = false;
 	m_lSize = 0;
 	m_lRemainingSize = 0;
-	m_tTime = 0;
 	m_bPaused = false;
 	m_bDeleted = false;
 	m_iCompleted = 0;
 	m_bOutputInitialized = false;
 	m_pNZBInfo = NULL;
-	m_iPriority = 0;
-	m_iActiveDownloads = 0;
 	m_iIDGen++;
 	m_iID = m_iIDGen;
 }
@@ -563,15 +493,9 @@ GroupInfo::GroupInfo()
 	m_iFirstID = 0;
 	m_iLastID = 0;
 	m_iRemainingFileCount = 0;
-	m_iPausedFileCount = 0;
 	m_lRemainingSize = 0;
 	m_lPausedSize = 0;
 	m_iRemainingParCount = 0;
-	m_tMinTime = 0;
-	m_tMaxTime = 0;
-	m_iMinPriority = 0;
-	m_iMaxPriority = 0;
-	m_iActiveDownloads = 0;
 }
 
 GroupInfo::~GroupInfo()
@@ -582,19 +506,70 @@ GroupInfo::~GroupInfo()
 	}
 }
 
+void GroupInfo::BuildGroups(DownloadQueue* pDownloadQueue, GroupQueue* pGroupQueue)
+{
+    for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
+    {
+        FileInfo* pFileInfo = *it;
+		GroupInfo* pGroupInfo = NULL;
+		for (GroupQueue::iterator itg = pGroupQueue->begin(); itg != pGroupQueue->end(); itg++)
+		{
+			GroupInfo* pGroupInfo1 = *itg;
+			if (pGroupInfo1->GetNZBInfo() == pFileInfo->GetNZBInfo())
+			{
+				pGroupInfo = pGroupInfo1;
+				break;
+			}
+		}
+		if (!pGroupInfo)
+		{
+			pGroupInfo = new GroupInfo();
+			pGroupInfo->m_pNZBInfo = pFileInfo->GetNZBInfo();
+			pGroupInfo->m_pNZBInfo->AddReference();
+			pGroupInfo->m_iFirstID = pFileInfo->GetID();
+			pGroupInfo->m_iLastID = pFileInfo->GetID();
+			pGroupQueue->push_back(pGroupInfo);
+		}
+		if (pFileInfo->GetID() < pGroupInfo->GetFirstID())
+		{
+			pGroupInfo->m_iFirstID = pFileInfo->GetID();
+		}
+		if (pFileInfo->GetID() > pGroupInfo->GetLastID())
+		{
+			pGroupInfo->m_iLastID = pFileInfo->GetID();
+		}
+		pGroupInfo->m_iRemainingFileCount++;
+		pGroupInfo->m_lRemainingSize += pFileInfo->GetRemainingSize();
+		if (pFileInfo->GetPaused())
+		{
+			pGroupInfo->m_lPausedSize += pFileInfo->GetRemainingSize();
+		}
+
+		char szLoFileName[1024];
+		strncpy(szLoFileName, pFileInfo->GetFilename(), 1024);
+		szLoFileName[1024-1] = '\0';
+		for (char* p = szLoFileName; *p; p++) *p = tolower(*p); // convert string to lowercase
+		if (strstr(szLoFileName, ".par2"))
+		{
+			pGroupInfo->m_iRemainingParCount++;
+		}
+	}
+}
+
 PostInfo::PostInfo()
 {
 	debug("Creating PostInfo");
 
-	m_pNZBInfo = NULL;
+	m_szNZBFilename = NULL;
+	m_szDestDir = NULL;
 	m_szParFilename = NULL;
 	m_szInfoName = NULL;
+	m_szCategory = NULL;
+	m_szQueuedFilename = NULL;
 	m_bWorking = false;
-	m_bDeleted = false;
 	m_bParCheck = false;
-	m_eParStatus = psNone;
+	m_iParStatus = 0;
 	m_eRequestParCheck = rpNone;
-	m_eScriptStatus = srNone;
 	m_szProgressLabel = strdup("");
 	m_iFileProgress = 0;
 	m_iStageProgress = 0;
@@ -603,7 +578,6 @@ PostInfo::PostInfo()
 	m_eStage = ptQueued;
 	m_pScriptThread = NULL;
 	m_Messages.clear();
-	m_iIDMessageGen = 0;
 	m_iIDGen++;
 	m_iID = m_iIDGen;
 }
@@ -612,6 +586,14 @@ PostInfo::~ PostInfo()
 {
 	debug("Destroying PostInfo");
 
+	if (m_szNZBFilename)
+	{
+		free(m_szNZBFilename);
+	}
+	if (m_szDestDir)
+	{
+		free(m_szDestDir);
+	}
 	if (m_szParFilename)
 	{
 		free(m_szParFilename);
@@ -620,6 +602,14 @@ PostInfo::~ PostInfo()
 	{
 		free(m_szInfoName);
 	}
+	if (m_szCategory)
+	{
+		free(m_szCategory);
+	}
+	if (m_szQueuedFilename)
+	{
+		free(m_szQueuedFilename);
+	}
 	if (m_szProgressLabel)
 	{
 		free(m_szProgressLabel);
@@ -631,20 +621,21 @@ PostInfo::~ PostInfo()
 	}
 	m_Messages.clear();
 
-	if (m_pNZBInfo)
+	for (NZBParameterList::iterator it = m_ppParameters.begin(); it != m_ppParameters.end(); it++)
 	{
-		m_pNZBInfo->Release();
+		delete *it;
 	}
+	m_ppParameters.clear();
 }
 
-void PostInfo::SetNZBInfo(NZBInfo* pNZBInfo)
+void PostInfo::SetNZBFilename(const char* szNZBFilename)
 {
-	if (m_pNZBInfo)
-	{
-		m_pNZBInfo->Release();
-	}
-	m_pNZBInfo = pNZBInfo;
-	m_pNZBInfo->AddReference();
+	m_szNZBFilename = strdup(szNZBFilename);
+}
+
+void PostInfo::SetDestDir(const char* szDestDir)
+{
+	m_szDestDir = strdup(szDestDir);
 }
 
 void PostInfo::SetParFilename(const char* szParFilename)
@@ -657,6 +648,16 @@ void PostInfo::SetInfoName(const char* szInfoName)
 	m_szInfoName = strdup(szInfoName);
 }
 
+void PostInfo::SetCategory(const char* szCategory)
+{
+	m_szCategory = strdup(szCategory);
+}
+
+void PostInfo::SetQueuedFilename(const char * szQueuedFilename)
+{
+	m_szQueuedFilename = strdup(szQueuedFilename);
+}
+
 void PostInfo::SetProgressLabel(const char* szProgressLabel)
 {
 	if (m_szProgressLabel)
@@ -679,7 +680,7 @@ void PostInfo::UnlockMessages()
 
 void PostInfo::AppendMessage(Message::EKind eKind, const char * szText)
 {
-	Message* pMessage = new Message(++m_iIDMessageGen, eKind, time(NULL), szText);
+	Message* pMessage = new Message(++m_iIDGen, eKind, time(NULL), szText);
 
 	m_mutexLog.Lock();
 	m_Messages.push_back(pMessage);
@@ -693,219 +694,18 @@ void PostInfo::AppendMessage(Message::EKind eKind, const char * szText)
 	m_mutexLog.Unlock();
 }
 
-void DownloadQueue::BuildGroups(GroupQueue* pGroupQueue)
+void PostInfo::AddParameter(const char* szName, const char* szValue)
 {
-	std::map<int, GroupInfo*> groupMap;
-
-	for (FileQueue::iterator it = GetFileQueue()->begin(); it != GetFileQueue()->end(); it++)
-    {
-        FileInfo* pFileInfo = *it;
-		GroupInfo *&pGroupInfo = groupMap[pFileInfo->GetNZBInfo()->GetID()];
-		if (!pGroupInfo)
-		{
-			pGroupInfo = new GroupInfo();
-			pGroupInfo->m_pNZBInfo = pFileInfo->GetNZBInfo();
-			pGroupInfo->m_pNZBInfo->AddReference();
-			pGroupInfo->m_iFirstID = pFileInfo->GetID();
-			pGroupInfo->m_iLastID = pFileInfo->GetID();
-			pGroupInfo->m_tMinTime = pFileInfo->GetTime();
-			pGroupInfo->m_tMaxTime = pFileInfo->GetTime();
-			pGroupInfo->m_iMinPriority = pFileInfo->GetPriority();
-			pGroupInfo->m_iMaxPriority = pFileInfo->GetPriority();
-			pGroupQueue->push_back(pGroupInfo);
-		}
-		if (pFileInfo->GetID() < pGroupInfo->GetFirstID())
-		{
-			pGroupInfo->m_iFirstID = pFileInfo->GetID();
-		}
-		if (pFileInfo->GetID() > pGroupInfo->GetLastID())
-		{
-			pGroupInfo->m_iLastID = pFileInfo->GetID();
-		}
-		if (pFileInfo->GetTime() > 0)
-		{
-			if (pFileInfo->GetTime() < pGroupInfo->GetMinTime())
-			{
-				pGroupInfo->m_tMinTime = pFileInfo->GetTime();
-			}
-			if (pFileInfo->GetTime() > pGroupInfo->GetMaxTime())
-			{
-				pGroupInfo->m_tMaxTime = pFileInfo->GetTime();
-			}
-		}
-		if (pFileInfo->GetPriority() < pGroupInfo->GetMinPriority())
-		{
-			pGroupInfo->m_iMinPriority = pFileInfo->GetPriority();
-		}
-		if (pFileInfo->GetPriority() > pGroupInfo->GetMaxPriority())
-		{
-			pGroupInfo->m_iMaxPriority = pFileInfo->GetPriority();
-		}
-
-		pGroupInfo->m_iActiveDownloads += pFileInfo->GetActiveDownloads();
-		pGroupInfo->m_iRemainingFileCount++;
-		pGroupInfo->m_lRemainingSize += pFileInfo->GetRemainingSize();
-		if (pFileInfo->GetPaused())
-		{
-			pGroupInfo->m_lPausedSize += pFileInfo->GetRemainingSize();
-			pGroupInfo->m_iPausedFileCount++;
-		}
-
-		char szLoFileName[1024];
-		strncpy(szLoFileName, pFileInfo->GetFilename(), 1024);
-		szLoFileName[1024-1] = '\0';
-		for (char* p = szLoFileName; *p; p++) *p = tolower(*p); // convert string to lowercase
-		if (strstr(szLoFileName, ".par2"))
-		{
-			pGroupInfo->m_iRemainingParCount++;
-		}
-	}
+	NZBParameter* pParameter = new NZBParameter(szName);
+	pParameter->SetValue(szValue);
+	m_ppParameters.push_back(pParameter);
 }
 
-
-UrlInfo::UrlInfo()
+void PostInfo::AssignParameter(NZBParameterList* pSrcParameters)
 {
-	//debug("Creating ArticleInfo");
-	m_szURL = NULL;
-	m_szNZBFilename = strdup("");
-	m_szCategory = strdup("");
-	m_iPriority = 0;
-	m_bAddTop = false;
-	m_bAddPaused = false;
-	m_eStatus = aiUndefined;
-	m_iIDGen++;
-	m_iID = m_iIDGen;
-}
-
-UrlInfo::~ UrlInfo()
-{
-	if (m_szURL)
+	for (NZBParameterList::iterator it = pSrcParameters->begin(); it != pSrcParameters->end(); it++)
 	{
-		free(m_szURL);
-	}
-	if (m_szNZBFilename)
-	{
-		free(m_szNZBFilename);
-	}
-	if (m_szCategory)
-	{
-		free(m_szCategory);
-	}
-}
-
-void UrlInfo::SetURL(const char* szURL)
-{
-	if (m_szURL)
-	{
-		free(m_szURL);
-	}
-	m_szURL = strdup(szURL);
-}
-
-void UrlInfo::SetID(int s)
-{
-	m_iID = s;
-	if (m_iIDGen < m_iID)
-	{
-		m_iIDGen = m_iID;
-	}
-}
-
-void UrlInfo::SetNZBFilename(const char* szNZBFilename)
-{
-	if (m_szNZBFilename)
-	{
-		free(m_szNZBFilename);
-	}
-	m_szNZBFilename = strdup(szNZBFilename);
-}
-
-void UrlInfo::SetCategory(const char* szCategory)
-{
-	if (m_szCategory)
-	{
-		free(m_szCategory);
-	}
-	m_szCategory = strdup(szCategory);
-}
-
-void UrlInfo::GetName(char* szBuffer, int iSize)
-{
-	MakeNiceName(m_szURL, m_szNZBFilename, szBuffer, iSize);
-}
-
-void UrlInfo::MakeNiceName(const char* szURL, const char* szNZBFilename, char* szBuffer, int iSize)
-{
-	URL url(szURL);
-
-	if (strlen(szNZBFilename) > 0)
-	{
-		char szNZBNicename[1024];
-		NZBInfo::MakeNiceNZBName(szNZBFilename, szNZBNicename, sizeof(szNZBNicename), true);
-		snprintf(szBuffer, iSize, "%s @ %s", szNZBNicename, url.GetHost());
-	}
-	else
-	{
-		snprintf(szBuffer, iSize, "%s%s", url.GetHost(), url.GetResource());
-	}
-
-	szBuffer[iSize-1] = '\0';
-}
-
-
-HistoryInfo::HistoryInfo(NZBInfo* pNZBInfo)
-{
-	m_eKind = hkNZBInfo;
-	m_pInfo = pNZBInfo;
-	pNZBInfo->AddReference();
-	m_tTime = 0;
-	m_iIDGen++;
-	m_iID = m_iIDGen;
-}
-
-HistoryInfo::HistoryInfo(UrlInfo* pUrlInfo)
-{
-	m_eKind = hkUrlInfo;
-	m_pInfo = pUrlInfo;
-	m_tTime = 0;
-	m_iIDGen++;
-	m_iID = m_iIDGen;
-}
-
-HistoryInfo::~HistoryInfo()
-{
-	if (m_eKind == hkNZBInfo && m_pInfo)
-	{
-		((NZBInfo*)m_pInfo)->Release();
-	}
-	else if (m_eKind == hkUrlInfo && m_pInfo)
-	{
-		delete (UrlInfo*)m_pInfo;
-	}
-}
-
-void HistoryInfo::SetID(int s)
-{
-	m_iID = s;
-	if (m_iIDGen < m_iID)
-	{
-		m_iIDGen = m_iID;
-	}
-}
-
-void HistoryInfo::GetName(char* szBuffer, int iSize)
-{
-	if (m_eKind == hkNZBInfo)
-	{
-		strncpy(szBuffer, GetNZBInfo()->GetName(), iSize);
-		szBuffer[iSize-1] = '\0';
-	}
-	else if (m_eKind == hkUrlInfo)
-	{
-		GetUrlInfo()->GetName(szBuffer, iSize);
-	}
-	else
-	{
-		strncpy(szBuffer, "<unknown>", iSize);
+		NZBParameter* pParameter = *it;
+		AddParameter(pParameter->GetName(), pParameter->GetValue());
 	}
 }

DownloadInfo.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -29,13 +29,11 @@
 
 #include <vector>
 #include <deque>
-#include <time.h>
 
 #include "Log.h"
 #include "Thread.h"
 
 class NZBInfo;
-class DownloadQueue;
 
 class ArticleInfo
 {
@@ -85,15 +83,12 @@ private:
 	char*				m_szFilename;
 	long long 			m_lSize;
 	long long 			m_lRemainingSize;
-	time_t				m_tTime;
 	bool				m_bPaused;
 	bool				m_bDeleted;
 	bool				m_bFilenameConfirmed;
 	int					m_iCompleted;
 	bool				m_bOutputInitialized;
 	Mutex				m_mutexOutputFile;
-	int					m_iPriority;
-	int					m_iActiveDownloads;
 
 	static int			m_iIDGen;
 
@@ -117,8 +112,6 @@ public:
 	long long 			GetSize() { return m_lSize; }
 	long long 			GetRemainingSize() { return m_lRemainingSize; }
 	void 				SetRemainingSize(long long s) { m_lRemainingSize = s; }
-	time_t				GetTime() { return m_tTime; }
-	void				SetTime(time_t tTime) { m_tTime = tTime; }
 	bool				GetPaused() { return m_bPaused; }
 	void				SetPaused(bool Paused) { m_bPaused = Paused; }
 	bool				GetDeleted() { return m_bDeleted; }
@@ -131,13 +124,12 @@ public:
 	bool				GetOutputInitialized() { return m_bOutputInitialized; }
 	void				SetOutputInitialized(bool bOutputInitialized) { m_bOutputInitialized = bOutputInitialized; }
 	bool				IsDupe(const char* szFilename);
-	int					GetPriority() { return m_iPriority; }
-	void				SetPriority(int iPriority) { m_iPriority = iPriority; }
-	int					GetActiveDownloads() { return m_iActiveDownloads; }
-	void				SetActiveDownloads(int iActiveDownloads) { m_iActiveDownloads = iActiveDownloads; }
 };
                               
-typedef std::deque<FileInfo*> FileQueue;
+typedef std::deque<FileInfo*> DownloadQueue;
+
+class GroupInfo;
+typedef std::deque<GroupInfo*> GroupQueue;
 
 class GroupInfo
 {
@@ -146,17 +138,9 @@ private:
 	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:
 						GroupInfo();
@@ -167,16 +151,11 @@ public:
 	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; }
+
+	static void			BuildGroups(DownloadQueue* pDownloadQueue, GroupQueue* pGroupQueue);
 };
 
-typedef std::deque<GroupInfo*> GroupQueue;
 
 class NZBParameter
 {
@@ -186,7 +165,8 @@ private:
 
 	void				SetValue(const char* szValue);
 
-	friend class NZBParameterList;
+	friend class NZBInfo;
+	friend class PostInfo;
 
 public:
 						NZBParameter(const char* szName);
@@ -195,96 +175,51 @@ public:
 	const char*			GetValue() { return m_szValue; }
 };
 
-typedef std::deque<NZBParameter*> NZBParameterListBase;
+typedef std::deque<NZBParameter*> NZBParameterList;
 
-class NZBParameterList : public NZBParameterListBase
-{
-public:
-	void				SetParameter(const char* szName, const char* szValue);
-};
-
-class NZBInfoList;
+typedef std::deque<NZBInfo*> NZBQueue;
 
 class NZBInfo
 {
 public:
-	enum EParStatus
-	{
-		prNone,
-		prFailure,
-		prRepairPossible,
-		prSuccess
-	};
-
-	enum EScriptStatus
-	{
-		srNone,
-		srUnknown,
-		srFailure,
-		srSuccess
-	};
-
 	typedef std::vector<char*>			Files;
-	typedef std::deque<Message*>		Messages;
 
 private:
-	int					m_iID;
 	int					m_iRefCount;
 	char* 				m_szFilename;
-	char*				m_szName;
 	char* 				m_szDestDir;
 	char* 				m_szCategory;
 	int		 			m_iFileCount;
-	int		 			m_iParkedFileCount;
 	long long 			m_lSize;
 	Files				m_completedFiles;
 	bool				m_bPostProcess;
-	EParStatus			m_eParStatus;
-	EScriptStatus		m_eScriptStatus;
 	char*				m_szQueuedFilename;
 	bool				m_bDeleted;
 	bool				m_bParCleanup;
 	bool				m_bCleanupDisk;
-	NZBInfoList*		m_Owner;
 	NZBParameterList	m_ppParameters;
-	Mutex				m_mutexLog;
-	Messages			m_Messages;
-	int					m_iIDMessageGen;
-
-	static int			m_iIDGen;
-
-	friend class NZBInfoList;
 
 public:
 						NZBInfo();
 						~NZBInfo();
 	void				AddReference();
 	void				Release();
-	int					GetID() { return m_iID; }
 	const char*			GetFilename() { return m_szFilename; }
 	void				SetFilename(const char* szFilename);
-	static void			MakeNiceNZBName(const char* szNZBFilename, char* szBuffer, int iSize, bool bRemoveExt);
+	void				GetNiceNZBName(char* szBuffer, int iSize);
+	static void			MakeNiceNZBName(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*			GetCategory() { return m_szCategory; } // needs locking (for shared objects)
 	void				SetCategory(const char* szCategory);   // needs locking (for shared objects)
-	const char*			GetName() { return m_szName; } 	   // needs locking (for shared objects)
-	void				SetName(const char* szName);	   // needs locking (for shared objects)
 	long long 			GetSize() { return m_lSize; }
 	void 				SetSize(long long lSize) { m_lSize = lSize; }
 	int					GetFileCount() { return m_iFileCount; }
 	void 				SetFileCount(int iFileCount) { m_iFileCount = iFileCount; }
-	int					GetParkedFileCount() { return m_iParkedFileCount; }
-	void 				SetParkedFileCount(int iParkedFileCount) { m_iParkedFileCount = iParkedFileCount; }
 	void				BuildDestDirName();
 	Files*				GetCompletedFiles() { return &m_completedFiles; }		// needs locking (for shared objects)
-	void				ClearCompletedFiles();
 	bool				GetPostProcess() { return m_bPostProcess; }
 	void				SetPostProcess(bool bPostProcess) { m_bPostProcess = bPostProcess; }
-	EParStatus			GetParStatus() { return m_eParStatus; }
-	void				SetParStatus(EParStatus eParStatus) { m_eParStatus = eParStatus; }
-	EScriptStatus		GetScriptStatus() { return m_eScriptStatus; }
-	void				SetScriptStatus(EScriptStatus eScriptStatus) { m_eScriptStatus = eScriptStatus; }
 	const char*			GetQueuedFilename() { return m_szQueuedFilename; }
 	void				SetQueuedFilename(const char* szQueuedFilename);
 	bool				GetDeleted() { return m_bDeleted; }
@@ -295,19 +230,8 @@ public:
 	void				SetCleanupDisk(bool bCleanupDisk) { m_bCleanupDisk = bCleanupDisk; }
 	NZBParameterList*	GetParameters() { return &m_ppParameters; }				// needs locking (for shared objects)
 	void				SetParameter(const char* szName, const char* szValue);	// needs locking (for shared objects)
-	void				AppendMessage(Message::EKind eKind, time_t tTime, const char* szText);
-	Messages*			LockMessages();
-	void				UnlockMessages();
-};
 
-typedef std::deque<NZBInfo*> NZBInfoListBase;
-
-class NZBInfoList : public NZBInfoListBase
-{
-public:
-	void				Add(NZBInfo* pNZBInfo);
-	void				Remove(NZBInfo* pNZBInfo);
-	void				ReleaseAll();
+	static void			BuildNZBList(DownloadQueue* pDownloadQueue, NZBQueue* pNZBQueue);
 };
 
 class PostInfo
@@ -324,14 +248,6 @@ public:
 		ptFinished
 	};
 
-	enum EParStatus
-	{
-		psNone,
-		psFailure,
-		psSuccess,
-		psRepairPossible
-	};
-
 	enum ERequestParCheck
 	{
 		rpNone,
@@ -339,26 +255,19 @@ public:
 		rpAll
 	};
 
-	enum EScriptStatus
-	{
-		srNone,
-		srUnknown,
-		srFailure,
-		srSuccess
-	};
-
 	typedef std::deque<Message*>	Messages;
 
 private:
 	int					m_iID;
-	NZBInfo*			m_pNZBInfo;
+	char*				m_szNZBFilename;
+	char*				m_szDestDir;
 	char*				m_szParFilename;
 	char*				m_szInfoName;
+	char*				m_szCategory;
+	char*				m_szQueuedFilename;
 	bool				m_bWorking;
-	bool				m_bDeleted;
 	bool				m_bParCheck;
-	EParStatus			m_eParStatus;
-	EScriptStatus		m_eScriptStatus;
+	int					m_iParStatus;
 	ERequestParCheck	m_eRequestParCheck;
 	EStage				m_eStage;
 	char*				m_szProgressLabel;
@@ -367,23 +276,28 @@ private:
 	time_t				m_tStartTime;
 	time_t				m_tStageTime;
 	Thread*				m_pScriptThread;
+	NZBParameterList	m_ppParameters;
 	
 	Mutex				m_mutexLog;
 	Messages			m_Messages;
-	int					m_iIDMessageGen;
-
 	static int			m_iIDGen;
 
 public:
 						PostInfo();
 						~PostInfo();
 	int					GetID() { return m_iID; }
-	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
-	void				SetNZBInfo(NZBInfo* pNZBInfo);
+	const char*			GetNZBFilename() { return m_szNZBFilename; }
+	void				SetNZBFilename(const char* szNZBFilename);
+	const char*			GetDestDir() { return m_szDestDir; }
+	void				SetDestDir(const char* szDestDir);
 	const char*			GetParFilename() { return m_szParFilename; }
 	void				SetParFilename(const char* szParFilename);
 	const char*			GetInfoName() { return m_szInfoName; }
 	void				SetInfoName(const char* szInfoName);
+	const char*			GetCategory() { return m_szCategory; }
+	void				SetCategory(const char* szCategory);
+	const char*			GetQueuedFilename() { return m_szQueuedFilename; }
+	void				SetQueuedFilename(const char* szQueuedFilename);
 	EStage				GetStage() { return m_eStage; }
 	void				SetStage(EStage eStage) { m_eStage = eStage; }
 	void				SetProgressLabel(const char* szProgressLabel);
@@ -398,139 +312,22 @@ public:
 	void				SetStageTime(time_t tStageTime) { m_tStageTime = tStageTime; }
 	bool				GetWorking() { return m_bWorking; }
 	void				SetWorking(bool bWorking) { m_bWorking = bWorking; }
-	bool				GetDeleted() { return m_bDeleted; }
-	void				SetDeleted(bool bDeleted) { m_bDeleted = bDeleted; }
 	bool				GetParCheck() { return m_bParCheck; }
 	void				SetParCheck(bool bParCheck) { m_bParCheck = bParCheck; }
-	EParStatus			GetParStatus() { return m_eParStatus; }
-	void				SetParStatus(EParStatus eParStatus) { m_eParStatus = eParStatus; }
+	int					GetParStatus() { return m_iParStatus; }
+	void				SetParStatus(int iParStatus) { m_iParStatus = iParStatus; }
 	ERequestParCheck	GetRequestParCheck() { return m_eRequestParCheck; }
 	void				SetRequestParCheck(ERequestParCheck eRequestParCheck) { m_eRequestParCheck = eRequestParCheck; }
-	EScriptStatus		GetScriptStatus() { return m_eScriptStatus; }
-	void				SetScriptStatus(EScriptStatus eScriptStatus) { m_eScriptStatus = eScriptStatus; }
 	void				AppendMessage(Message::EKind eKind, const char* szText);
 	Thread*				GetScriptThread() { return m_pScriptThread; }
 	void				SetScriptThread(Thread* pScriptThread) { m_pScriptThread = pScriptThread; }
+	NZBParameterList*	GetParameters() { return &m_ppParameters; }
+	void				AddParameter(const char* szName, const char* szValue);
+	void				AssignParameter(NZBParameterList* pSrcParameters);
 	Messages*			LockMessages();
 	void				UnlockMessages();
 };
 
 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
-	};
-
-private:
-	int					m_iID;
-	char*				m_szURL;
-	char*				m_szNZBFilename;
-	char* 				m_szCategory;
-	int					m_iPriority;
-	bool				m_bAddTop;
-	bool				m_bAddPaused;
-	EStatus				m_eStatus;
-
-	static int			m_iIDGen;
-
-public:
-						UrlInfo();
-						~UrlInfo();
-	int					GetID() { return m_iID; }
-	void				SetID(int s);
-	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; }
-	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);
-	EStatus				GetStatus() { return m_eStatus; }
-	void				SetStatus(EStatus Status) { m_eStatus = Status; }
-};
-
-typedef std::deque<UrlInfo*> UrlQueue;
-
-class HistoryInfo
-{
-public:
-	enum EKind
-	{
-		hkUnknown,
-		hkNZBInfo,
-		hkUrlInfo
-	};
-
-private:
-	int					m_iID;
-	EKind				m_eKind;
-	void*				m_pInfo;
-	time_t				m_tTime;
-
-	static int			m_iIDGen;
-
-public:
-						HistoryInfo(NZBInfo* pNZBInfo);
-						HistoryInfo(UrlInfo* pUrlInfo);
-						~HistoryInfo();
-	int					GetID() { return m_iID; }
-	void				SetID(int s);
-	EKind				GetKind() { return m_eKind; }
-	NZBInfo*			GetNZBInfo() { return (NZBInfo*)m_pInfo; }
-	UrlInfo*			GetUrlInfo() { return (UrlInfo*)m_pInfo; }
-	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)
-};
-
-typedef std::deque<HistoryInfo*> HistoryList;
-
-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:
-	virtual					~DownloadQueueHolder() {};
-	virtual DownloadQueue*	LockQueue() = 0;
-	virtual void			UnlockQueue() = 0;
-};
-
 #endif

Frontend.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -49,10 +49,12 @@
 #include "Connection.h"
 #include "MessageBase.h"
 #include "QueueCoordinator.h"
+#include "PrePostProcessor.h"
 #include "RemoteClient.h"
 #include "Util.h"
 
 extern QueueCoordinator* g_pQueueCoordinator;
+extern PrePostProcessor* g_pPrePostProcessor;
 extern Options* g_pOptions;
 
 Frontend::Frontend()
@@ -65,8 +67,7 @@ Frontend::Frontend()
 	m_bFileList = false;
 	m_fCurrentDownloadSpeed = 0;
 	m_lRemainingSize = 0;
-	m_bPauseDownload = false;
-	m_bPauseDownload2 = false;
+	m_bPause = false;
 	m_fDownloadLimit = 0;
 	m_iThreadCount = 0;
 	m_iPostJobCount = 0;
@@ -74,6 +75,8 @@ Frontend::Frontend()
 	m_iDnTimeSec = 0;
 	m_iAllBytes = 0;
 	m_bStandBy = 0;
+	m_RemoteMessages.clear();
+	m_RemoteQueue.clear();
 	m_iUpdateInterval = g_pOptions->GetUpdateInterval();
 }
 
@@ -87,7 +90,7 @@ bool Frontend::PrepareData()
 		}
 		if (!RequestMessages() || ((m_bSummary || m_bFileList) && !RequestFileList()))
 		{
-			printf("\nUnable to send request to nzbget-server at %s (port %i)    \n", g_pOptions->GetControlIP(), g_pOptions->GetControlPort());
+			printf("\nUnable to send request to nzbget-server at %s (port %i)    \n", g_pOptions->GetServerIP(), g_pOptions->GetServerPort());
 			Stop();
 			return false;
 		}
@@ -98,13 +101,12 @@ bool Frontend::PrepareData()
 		{
 			m_fCurrentDownloadSpeed = g_pQueueCoordinator->CalcCurrentDownloadSpeed();
 			m_lRemainingSize = g_pQueueCoordinator->CalcRemainingSize();
-			m_bPauseDownload = g_pOptions->GetPauseDownload();
-			m_bPauseDownload2 = g_pOptions->GetPauseDownload2();
+			m_bPause = g_pOptions->GetPause();
 			m_fDownloadLimit = g_pOptions->GetDownloadRate();
 			m_iThreadCount = Thread::GetThreadCount();
-			PostQueue* pPostQueue = g_pQueueCoordinator->LockQueue()->GetPostQueue();
+			PostQueue* pPostQueue = g_pPrePostProcessor->LockPostQueue();
 			m_iPostJobCount = pPostQueue->size();
-			g_pQueueCoordinator->UnlockQueue();
+			g_pPrePostProcessor->UnlockPostQueue();
 			g_pQueueCoordinator->CalcStat(&m_iUpTimeSec, &m_iDnTimeSec, &m_iAllBytes, &m_bStandBy);
 		}
 	}
@@ -121,11 +123,11 @@ void Frontend::FreeData()
 		}
 		m_RemoteMessages.clear();
 
-		for (FileQueue::iterator it = m_RemoteQueue.GetFileQueue()->begin(); it != m_RemoteQueue.GetFileQueue()->end(); it++)
+		for (DownloadQueue::iterator it = m_RemoteQueue.begin(); it != m_RemoteQueue.end(); it++)
 		{
 			delete *it;
 		}
-		m_RemoteQueue.GetFileQueue()->clear();
+		m_RemoteQueue.clear();
 	}
 }
 
@@ -149,7 +151,7 @@ void Frontend::UnlockMessages()
 	}
 }
 
-DownloadQueue* Frontend::LockQueue()
+DownloadQueue * Frontend::LockQueue()
 {
 	if (IsRemoteMode())
 	{
@@ -174,22 +176,15 @@ bool Frontend::IsRemoteMode()
 	return g_pOptions->GetRemoteClientMode();
 }
 
-void Frontend::ServerPauseUnpause(bool bPause, bool bSecondRegister)
+void Frontend::ServerPauseUnpause(bool bPause)
 {
 	if (IsRemoteMode())
 	{
-		RequestPauseUnpause(bPause, bSecondRegister);
+		RequestPauseUnpause(bPause);
 	}
 	else
 	{
-		if (bSecondRegister)
-		{
-			g_pOptions->SetPauseDownload2(bPause);
-		}
-		else
-		{
-			g_pOptions->SetPauseDownload(bPause);
-		}
+		g_pOptions->SetPause(bPause);
 	}
 }
 
@@ -221,7 +216,7 @@ bool Frontend::ServerEditQueue(QueueEditor::EEditAction eAction, int iOffset, in
 {
 	if (IsRemoteMode())
 	{
-		return RequestEditQueue((eRemoteEditAction)eAction, iOffset, iID);
+		return RequestEditQueue(eAction, iOffset, iID);
 	}
 	else
 	{
@@ -235,13 +230,14 @@ void Frontend::InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int
 	pMessageBase->m_iSignature	= htonl(NZBMESSAGE_SIGNATURE);
 	pMessageBase->m_iType = htonl(iRequest);
 	pMessageBase->m_iStructSize = htonl(iSize);
-	strncpy(pMessageBase->m_szPassword, g_pOptions->GetControlPassword(), NZBREQUESTPASSWORDSIZE);
+	strncpy(pMessageBase->m_szPassword, g_pOptions->GetServerPassword(), NZBREQUESTPASSWORDSIZE);
 	pMessageBase->m_szPassword[NZBREQUESTPASSWORDSIZE - 1] = '\0';
 }
 
 bool Frontend::RequestMessages()
 {
-	Connection connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
+	NetAddress netAddress(g_pOptions->GetServerIP(), g_pOptions->GetServerPort());
+	Connection connection(&netAddress);
 
 	bool OK = connection.Connect();
 	if (!OK)
@@ -312,7 +308,8 @@ bool Frontend::RequestMessages()
 
 bool Frontend::RequestFileList()
 {
-	Connection connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
+	NetAddress netAddress(g_pOptions->GetServerIP(), g_pOptions->GetServerPort());
+	Connection connection(&netAddress);
 
 	bool OK = connection.Connect();
 	if (!OK)
@@ -355,8 +352,7 @@ bool Frontend::RequestFileList()
 
 	if (m_bSummary)
 	{
-		m_bPauseDownload = ntohl(ListResponse.m_bDownloadPaused);
-		m_bPauseDownload2 = ntohl(ListResponse.m_bDownload2Paused);
+		m_bPause = ntohl(ListResponse.m_bServerPaused);
 		m_lRemainingSize = Util::JoinInt64(ntohl(ListResponse.m_iRemainingSizeHi), ntohl(ListResponse.m_iRemainingSizeLo));
 		m_fCurrentDownloadSpeed = ntohl(ListResponse.m_iDownloadRate) / 1024.0f;
 		m_fDownloadLimit = ntohl(ListResponse.m_iDownloadLimit) / 1024.0f;
@@ -364,7 +360,7 @@ bool Frontend::RequestFileList()
 		m_iPostJobCount = ntohl(ListResponse.m_iPostJobCount);
 		m_iUpTimeSec = ntohl(ListResponse.m_iUpTimeSec);
 		m_iDnTimeSec = ntohl(ListResponse.m_iDownloadTimeSec);
-		m_bStandBy = ntohl(ListResponse.m_bDownloadStandBy);
+		m_bStandBy = ntohl(ListResponse.m_bServerStandBy);
 		m_iAllBytes = Util::JoinInt64(ntohl(ListResponse.m_iDownloadedBytesHi), ntohl(ListResponse.m_iDownloadedBytesLo));
 	}
 
@@ -383,11 +379,11 @@ bool Frontend::RequestFileList()
 	return true;
 }
 
-bool Frontend::RequestPauseUnpause(bool bPause, bool bSecondRegister)
+bool Frontend::RequestPauseUnpause(bool bPause)
 {
 	RemoteClient client;
 	client.SetVerbose(false);
-	return client.RequestServerPauseUnpause(bPause, bSecondRegister ? eRemotePauseUnpauseActionDownload2 : eRemotePauseUnpauseActionDownload);
+	return client.RequestServerPauseUnpause(bPause);
 }
 
 bool Frontend::RequestSetDownloadRate(float fRate)
@@ -404,9 +400,9 @@ bool Frontend::RequestDumpDebug()
 	return client.RequestServerDumpDebug();
 }
 
-bool Frontend::RequestEditQueue(eRemoteEditAction iAction, int iOffset, int iID)
+bool Frontend::RequestEditQueue(int iAction, int iOffset, int iID)
 {
 	RemoteClient client;
 	client.SetVerbose(false);
-	return client.RequestServerEditQueue(iAction, iOffset, NULL, &iID, 1, NULL, eRemoteMatchModeID, false);
+	return client.RequestServerEditQueue(iAction, iOffset, NULL, &iID, 1, false);
 }

Frontend.h

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -52,8 +52,7 @@ protected:
 	// summary
 	float				m_fCurrentDownloadSpeed;
 	long long 			m_lRemainingSize;
-	bool				m_bPauseDownload;
-	bool				m_bPauseDownload2;
+	bool				m_bPause;
 	float				m_fDownloadLimit;
 	int					m_iThreadCount;
 	int					m_iPostJobCount;
@@ -70,14 +69,14 @@ protected:
 	void				UnlockQueue();
 	bool				IsRemoteMode();
 	void				InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int iSize);
-	void				ServerPauseUnpause(bool bPause, bool bSecondRegister);
-	bool				RequestPauseUnpause(bool bPause, bool bSecondRegister);
+	void				ServerPauseUnpause(bool bPause);
+	bool				RequestPauseUnpause(bool bPause);
 	void				ServerSetDownloadRate(float fRate);
 	bool				RequestSetDownloadRate(float fRate);
 	void				ServerDumpDebug();
 	bool				RequestDumpDebug();
 	bool 				ServerEditQueue(QueueEditor::EEditAction eAction, int iOffset, int iEntry);
-	bool 				RequestEditQueue(eRemoteEditAction iAction, int iOffset, int iID);
+	bool 				RequestEditQueue(int iAction, int iOffset, int iID);
 
 public:
 						Frontend();

Log.cpp

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -30,8 +30,6 @@
 
 #ifdef WIN32
 #include "win32.h"
-#else
-#include <pthread.h>
 #endif
 
 #include <stdlib.h>
@@ -59,7 +57,11 @@ Log::Log()
 
 Log::~Log()
 {
-	Clear();
+	for (Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
+	{
+		delete *it;
+	}
+	m_Messages.clear();
 	if (m_szLogFilename)
 	{
 		free(m_szLogFilename);
@@ -68,8 +70,18 @@ Log::~Log()
 
 void Log::Filelog(const char* msg, ...)
 {
-	if (m_szLogFilename)
+	if (
+		(g_pOptions && g_pOptions->GetCreateLog() && g_pOptions->GetLogFile())
+#ifdef DEBUG
+		|| (m_szLogFilename && m_bExtraDebug)
+#endif
+		)
 	{
+		if (!m_szLogFilename)
+		{
+			m_szLogFilename = strdup(g_pOptions->GetLogFile());
+		}
+
 		char tmp2[1024];
 
 		va_list ap;
@@ -90,7 +102,7 @@ void Log::Filelog(const char* msg, ...)
 		szTime[50-1] = '\0';
 		szTime[strlen(szTime) - 1] = '\0'; // trim LF
 
-		FILE* file = fopen(m_szLogFilename, "ab+");
+		FILE* file = fopen(m_szLogFilename, "a+");
 		if (file)
 		{
 #ifdef WIN32
@@ -112,7 +124,6 @@ void Log::Filelog(const char* msg, ...)
 	}
 }
 
-#ifdef DEBUG
 #undef debug
 #ifdef HAVE_VARIADIC_MACROS
 void debug(const char* szFilename, const char* szFuncname, int iLineNr, const char* msg, ...)
@@ -120,6 +131,7 @@ void debug(const char* szFilename, const char* szFuncname, int iLineNr, const ch
 void debug(const char* msg, ...)
 #endif
 {
+#ifdef DEBUG
 	char tmp1[1024];
 
 	va_list ap;
@@ -145,12 +157,18 @@ void debug(const char* msg, ...)
 
 	g_pLog->m_mutexLog.Lock();
 
-	if (!g_pOptions && g_pLog->m_bExtraDebug)
+	if (!g_pOptions)
 	{
-		printf("%s\n", tmp2);
+		if (g_pLog->m_bExtraDebug)
+		{
+			printf("%s\n", tmp2);
+			g_pLog->Filelog("DEBUG\t%s", tmp2);
+		}
+		g_pLog->m_mutexLog.Unlock();
+		return;
 	}
 
-	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetDebugTarget() : Options::mtScreen;
+	Options::EMessageTarget eMessageTarget = g_pOptions->GetDebugTarget();
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("DEBUG\t%s", tmp2);
@@ -161,8 +179,8 @@ void debug(const char* msg, ...)
 	}
 
 	g_pLog->m_mutexLog.Unlock();
-}
 #endif
+}
 
 void error(const char* msg, ...)
 {
@@ -176,7 +194,7 @@ void error(const char* msg, ...)
 
 	g_pLog->m_mutexLog.Lock();
 
-	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetErrorTarget() : Options::mtBoth;
+	Options::EMessageTarget eMessageTarget = g_pOptions->GetErrorTarget();
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("ERROR\t%s", tmp2);
@@ -201,7 +219,7 @@ void warn(const char* msg, ...)
 
 	g_pLog->m_mutexLog.Lock();
 
-	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetWarningTarget() : Options::mtScreen;
+	Options::EMessageTarget eMessageTarget = g_pOptions->GetWarningTarget();
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("WARNING\t%s", tmp2);
@@ -226,7 +244,7 @@ void info(const char* msg, ...)
 
 	g_pLog->m_mutexLog.Lock();
 
-	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetInfoTarget() : Options::mtScreen;
+	Options::EMessageTarget eMessageTarget = g_pOptions->GetInfoTarget();
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("INFO\t%s", tmp2);
@@ -251,7 +269,7 @@ void detail(const char* msg, ...)
 
 	g_pLog->m_mutexLog.Lock();
 
-	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetDetailTarget() : Options::mtScreen;
+	Options::EMessageTarget eMessageTarget = g_pOptions->GetDetailTarget();
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("DETAIL\t%s", tmp2);
@@ -311,30 +329,16 @@ Message::~ Message()
 	}
 }
 
-void Log::Clear()
-{
-	m_mutexLog.Lock();
-	for (Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
-	{
-		delete *it;
-	}
-	m_Messages.clear();
-	m_mutexLog.Unlock();
-}
-
 void Log::AppendMessage(Message::EKind eKind, const char * szText)
 {
 	Message* pMessage = new Message(++m_iIDGen, eKind, time(NULL), szText);
 	m_Messages.push_back(pMessage);
 
-	if (g_pOptions)
+	while (m_Messages.size() > (unsigned int)g_pOptions->GetLogBufferSize())
 	{
-		while (m_Messages.size() > (unsigned int)g_pOptions->GetLogBufferSize())
-		{
-			Message* pMessage = m_Messages.front();
-			delete pMessage;
-			m_Messages.pop_front();
-		}
+		Message* pMessage = m_Messages.front();
+		delete pMessage;
+		m_Messages.pop_front();
 	}
 }
 
@@ -353,64 +357,3 @@ void Log::ResetLog()
 {
 	remove(g_pOptions->GetLogFile());
 }
-
-/*
-* During intializing stage (when options were not read yet) all messages
-* are saved in screen log, even if they shouldn't (according to options).
-* Method "InitOptions()" check all messages added to screen log during
-* intializing stage and does three things:
-* 1) save the messages to log-file (if they should according to options);
-* 2) delete messages from screen log (if they should not be saved in screen log).
-* 3) renumerate IDs
-*/
-void Log::InitOptions()
-{
-	const char* szMessageType[] = { "INFO", "WARNING", "ERROR", "DEBUG", "DETAIL"};
-
-	if (g_pOptions->GetCreateLog() && g_pOptions->GetLogFile())
-	{
-		m_szLogFilename = strdup(g_pOptions->GetLogFile());
-	}
-
-	m_iIDGen = 0;
-
-	for (unsigned int i = 0; i < m_Messages.size(); )
-	{
-		Message* pMessage = m_Messages.at(i);
-		Options::EMessageTarget eTarget = Options::mtNone;
-		switch (pMessage->GetKind())
-		{
-			case Message::mkDebug:
-				eTarget = g_pOptions->GetDebugTarget();
-				break;
-			case Message::mkDetail:
-				eTarget = g_pOptions->GetDetailTarget();
-				break;
-			case Message::mkInfo:
-				eTarget = g_pOptions->GetInfoTarget();
-				break;
-			case Message::mkWarning:
-				eTarget = g_pOptions->GetWarningTarget();
-				break;
-			case Message::mkError:
-				eTarget = g_pOptions->GetErrorTarget();
-				break;
-		}
-
-		if (eTarget == Options::mtLog || eTarget == Options::mtBoth)
-		{
-			Filelog("%s\t%s", szMessageType[pMessage->GetKind()], pMessage->GetText());
-		}
-
-		if (eTarget == Options::mtLog || eTarget == Options::mtNone)
-		{
-			delete pMessage;
-			m_Messages.erase(m_Messages.begin() + i);
-		}
-		else
-		{
-			pMessage->m_iID = ++m_iIDGen;
-			i++;
-		}
-	}
-}

Log.h

@@ -1,8 +1,8 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -38,13 +38,12 @@ void info(const char* msg, ...);
 void detail(const char* msg, ...);
 void abort(const char* msg, ...);
 
-#ifdef DEBUG
 #ifdef HAVE_VARIADIC_MACROS
 	void debug(const char* szFilename, const char* szFuncname, int iLineNr, const char* msg, ...);
 #else
 	void debug(const char* msg, ...);
 #endif
-#endif
+
 
 class Message
 {
@@ -64,11 +63,9 @@ private:
 	time_t				m_tTime;
 	char*				m_szText;
 
-	friend class Log;
-
 public:
-						Message(unsigned int iID, EKind eKind, time_t tTime, const char* szText);
-						~Message();
+	Message(unsigned int iID, EKind eKind, time_t tTime, const char* szText);
+	~Message();
 	unsigned int		GetID() { return m_iID; }
 	EKind				GetKind() { return m_eKind; }
 	time_t				GetTime() { return m_tTime; }
@@ -97,30 +94,26 @@ private:
 	friend void info(const char* msg, ...);
 	friend void abort(const char* msg, ...);
 	friend void detail(const char* msg, ...);
-#ifdef DEBUG
 #ifdef HAVE_VARIADIC_MACROS
 	friend void debug(const char* szFilename, const char* szFuncname, int iLineNr, const char* msg, ...);
 #else	
 	friend void debug(const char* msg, ...);
 #endif
-#endif
 	
 public:
-						Log();
-						~Log();
+	Log();
+	~Log();
 	Messages*			LockMessages();
 	void				UnlockMessages();
-	void				Clear();
 	void				ResetLog();
-	void				InitOptions();
 };
 
-#ifdef DEBUG
 #ifdef HAVE_VARIADIC_MACROS
-#define debug(...)   debug(__FILE__, FUNCTION_MACRO_NAME, __LINE__, __VA_ARGS__)
-#endif
-#else
-#define debug(...)   do { } while(0)
+	#ifdef DEBUG
+		#define debug(...)   debug(__FILE__, FUNCTION_MACRO_NAME, __LINE__, __VA_ARGS__)
+	#else
+		#define debug(...)   do { } while(0)
+	#endif
 #endif
 
 extern Log* g_pLog;

LoggableFrontend.cpp

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$

LoggableFrontend.h

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$

Makefile.am

@@ -1,170 +1,21 @@
-#
-#  This file if part of nzbget
-#
-# Copyright (C) 2008-2012 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.
-#
-#
-
 bin_PROGRAMS = nzbget
-
-nzbget_SOURCES = \
-	ArticleDownloader.cpp ArticleDownloader.h BinRpc.cpp BinRpc.h \
+nzbget_SOURCES = 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 Frontend.cpp Frontend.h \
 	Log.cpp Log.h LoggableFrontend.cpp LoggableFrontend.h MessageBase.h \
 	NCursesFrontend.cpp NCursesFrontend.h NNTPConnection.cpp NNTPConnection.h NZBFile.cpp \
-	NZBFile.h NewsServer.cpp NewsServer.h Observer.cpp \
+	NZBFile.h NetAddress.cpp NetAddress.h NewsServer.cpp NewsServer.h Observer.cpp \
 	Observer.h Options.cpp Options.h ParChecker.cpp ParChecker.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 nzbget.cpp nzbget.h
+	RemoteServer.cpp RemoteServer.h Scheduler.cpp Scheduler.h ScriptController.cpp \
+	ScriptController.h ServerPool.cpp ServerPool.h TLS.cpp TLS.h Thread.cpp Thread.h Util.cpp \
+	Util.h XmlRpc.cpp XmlRpc.h nzbget.cpp nzbget.h
 
-EXTRA_DIST = \
-	Makefile.cvs nzbgetd nzbget-postprocess.sh \
-	$(patches_FILES) $(windows_FILES)
-
-patches_FILES = \
+EXTRA_DIST = nzbget.conf.example postprocess-example.sh \
+	win32.h NTService.cpp NTService.h \
 	libpar2-0.2-bugfixes.patch libpar2-0.2-cancel.patch \
-	libpar2-0.2-MSVC8.patch libsigc++-2.0.18-MSVC8.patch
-
-windows_FILES = \
-	win32.h NTService.cpp NTService.h nzbget.sln nzbget.vcproj nzbget-shell.bat
-
-doc_FILES = \
-	README ChangeLog COPYING
-
-exampleconf_FILES = \
-	nzbget.conf nzbget-postprocess.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/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
-
-# Install
-sbin_SCRIPTS = nzbgetd
-bin_SCRIPTS = nzbget-postprocess.sh
-dist_doc_DATA = $(doc_FILES)
-exampleconfdir = $(datadir)/nzbget
-dist_exampleconf_DATA = $(exampleconf_FILES)
-webuiconfdir = $(datadir)/nzbget/webui
-dist_webuiconf_DATA = $(exampleconf_FILES)
-webuidir = $(datadir)/nzbget
-nobase_dist_webui_DATA = $(webui_FILES)
-
-# Note about "sed": 
-# We need to make some changes in installed files.
-# On Linux "sed" has option "-i" for in-place-edit. Unfortunateley the BSD version of "sed"
-# has incompatible syntax. To solve the problem we perform in-place-edit in three steps:
-# 1) copy the original file to original.temp (delete existing original.temp, if any);
-# 2) sed < original.temp > original
-# 3) delete original.temp
-# These steps ensure that the output file has the same permissions as the original file.
-
-# Configure installed script
-install-exec-hook:
-	rm -f "$(DESTDIR)$(sbindir)/nzbgetd.temp"
-	cp "$(DESTDIR)$(sbindir)/nzbgetd" "$(DESTDIR)$(sbindir)/nzbgetd.temp"
-	sed 's?/usr/local/bin?$(bindir)?' < "$(DESTDIR)$(sbindir)/nzbgetd.temp" > "$(DESTDIR)$(sbindir)/nzbgetd"
-	rm "$(DESTDIR)$(sbindir)/nzbgetd.temp"
-
-# Prepare example configuration files
-install-data-hook:
-	rm -f "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	cp "$(DESTDIR)$(exampleconfdir)/nzbget.conf" "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:"nzbget-postprocess.sh":"nzbget-postprocess.sh" (installed into $(bindir)):' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:^WebDir=:WebDir=$(webuidir)/webui:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
-	rm "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-
-# Install configuration files into /etc
-# (only if they do not exist there to prevent override by update)
-install-conf:
-	if test ! -f "$(DESTDIR)$(sysconfdir)/nzbget.conf" ; then \
-		$(mkinstalldirs) "$(DESTDIR)$(sysconfdir)" ; \
-		cp "$(DESTDIR)$(exampleconfdir)/nzbget.conf" "$(DESTDIR)$(sysconfdir)/nzbget.conf" ; \
-		rm -f "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" ; \
-		cp "$(DESTDIR)$(sysconfdir)/nzbget.conf" "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" ; \
-		sed 's:^PostProcess=:PostProcess=$(bindir)/nzbget-postprocess.sh:' < "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(sysconfdir)/nzbget.conf" ; \
-		rm "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" ; \
-	fi
-	if test ! -f "$(DESTDIR)$(sysconfdir)/nzbget-postprocess.conf" ; then \
-		$(mkinstalldirs) "$(DESTDIR)$(sysconfdir)" ; \
-		cp "$(DESTDIR)$(exampleconfdir)/nzbget-postprocess.conf" "$(DESTDIR)$(sysconfdir)/nzbget-postprocess.conf" ; \
-	fi
-
-uninstall-conf:
-	rm -f "$(DESTDIR)$(sysconfdir)/nzbget-postprocess.conf"
-	rm -f "$(DESTDIR)$(sysconfdir)/nzbget.conf"
-
-# Determining subversion revision:
-# 1) If directory ".svn" exists we take revision from it using program svnversion (part of subversion package)
-#    File is recreated only if revision number was changed.
-# 2) If directory ".svn" doesn't exists we keep and reuse file "svn_version.cpp",
-#    which was possibly created early.
-# 3) If neither directory ".svn" nor file "svn_version.cpp" are available
-#    we create new file "svn_version.c" with empty revision number.
-svn_version.cpp: FORCE
-	@ if test -d ./.svn ; then \
-		V="$(shell svnversion -n .)"; \
-		H="$(shell test -f ./svn_version.cpp && head -n 1 svn_version.cpp)"; \
-		if test "/* $$V */" != "$$H" ; then \
-			( \
-			echo "/* $$V */" ;\
-			echo "/* This file is automatically regenerated on each build. Do not edit it. */" ;\
-			echo "const char* svn_version(void)" ;\
-			echo "{" ;\
-			echo "	const char* SVN_Version = \"$$V\";" ;\
-			echo "	return SVN_Version;" ;\
-			echo "}" ;\
-			) > svn_version.cpp ; \
-		fi \
-	elif test -f ./svn_version.cpp ; then \
-		test "ok, reuse existing file"; \
-	else \
-		( \
-		echo "/*  */" ;\
-		echo "/* This file is automatically regenerated on each build. Do not edit it. */" ;\
-		echo "const char* svn_version(void)" ;\
-		echo "{" ;\
-		echo "	const char* SVN_Version = \"\";" ;\
-		echo "	return SVN_Version;" ;\
-		echo "}" ;\
-		) > svn_version.cpp ; \
-	fi
-FORCE:
-
-# Ignore "svn_version.cpp" in distcleancheck
-distcleancheck_listfiles = \
-	find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
-	sh '{}' ';'
+	libpar2-0.2-MSVC8.patch libsigc++-2.0.18-MSVC8.patch \
+	Makefile.cvs nzbget.kdevelop nzbget.sln nzbget.vcproj
 
 clean-bak: rm *~
-
-# Fix premissions
-dist-hook:
-	chmod -x $(distdir)/*.cpp $(distdir)/*.h
-	find $(distdir)/webui -type f -print -exec chmod -x {} \;
-

Makefile.in

@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -14,38 +14,11 @@
 
 @SET_MAKE@
 
-#
-#  This file if part of nzbget
-#
-# Copyright (C) 2008-2012 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.
-#
-#
-
-
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
 VPATH = @srcdir@
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
@@ -59,28 +32,22 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-target_triplet = @target@
 bin_PROGRAMS = nzbget$(EXEEXT)
-DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
-	$(dist_exampleconf_DATA) $(dist_webuiconf_DATA) \
-	$(nobase_dist_webui_DATA) $(srcdir)/Makefile.am \
+subdir = .
+DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
 	config.guess config.sub depcomp install-sh missing
-subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
-	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(docdir)" \
-	"$(DESTDIR)$(exampleconfdir)" "$(DESTDIR)$(webuiconfdir)" \
-	"$(DESTDIR)$(webuidir)"
+am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_nzbget_OBJECTS = ArticleDownloader.$(OBJEXT) BinRpc.$(OBJEXT) \
@@ -88,21 +55,17 @@ am_nzbget_OBJECTS = ArticleDownloader.$(OBJEXT) BinRpc.$(OBJEXT) \
 	Decoder.$(OBJEXT) DiskState.$(OBJEXT) DownloadInfo.$(OBJEXT) \
 	Frontend.$(OBJEXT) Log.$(OBJEXT) LoggableFrontend.$(OBJEXT) \
 	NCursesFrontend.$(OBJEXT) NNTPConnection.$(OBJEXT) \
-	NZBFile.$(OBJEXT) NewsServer.$(OBJEXT) Observer.$(OBJEXT) \
-	Options.$(OBJEXT) ParChecker.$(OBJEXT) \
+	NZBFile.$(OBJEXT) NetAddress.$(OBJEXT) NewsServer.$(OBJEXT) \
+	Observer.$(OBJEXT) Options.$(OBJEXT) ParChecker.$(OBJEXT) \
 	PrePostProcessor.$(OBJEXT) QueueCoordinator.$(OBJEXT) \
 	QueueEditor.$(OBJEXT) RemoteClient.$(OBJEXT) \
-	RemoteServer.$(OBJEXT) Scanner.$(OBJEXT) Scheduler.$(OBJEXT) \
-	ScriptController.$(OBJEXT) ServerPool.$(OBJEXT) \
-	svn_version.$(OBJEXT) TLS.$(OBJEXT) Thread.$(OBJEXT) \
-	Util.$(OBJEXT) XmlRpc.$(OBJEXT) WebDownloader.$(OBJEXT) \
-	WebServer.$(OBJEXT) UrlCoordinator.$(OBJEXT) nzbget.$(OBJEXT)
+	RemoteServer.$(OBJEXT) Scheduler.$(OBJEXT) \
+	ScriptController.$(OBJEXT) ServerPool.$(OBJEXT) TLS.$(OBJEXT) \
+	Thread.$(OBJEXT) Util.$(OBJEXT) XmlRpc.$(OBJEXT) \
+	nzbget.$(OBJEXT)
 nzbget_OBJECTS = $(am_nzbget_OBJECTS)
 nzbget_LDADD = $(LDADD)
-binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(bin_SCRIPTS) $(sbin_SCRIPTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
+DEFAULT_INCLUDES = -I.@am__isrc@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
@@ -116,18 +79,6 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(nzbget_SOURCES)
 DIST_SOURCES = $(nzbget_SOURCES)
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-dist_docDATA_INSTALL = $(INSTALL_DATA)
-dist_exampleconfDATA_INSTALL = $(INSTALL_DATA)
-dist_webuiconfDATA_INSTALL = $(INSTALL_DATA)
-nobase_dist_webuiDATA_INSTALL = $(install_sh_DATA)
-DATA = $(dist_doc_DATA) $(dist_exampleconf_DATA) \
-	$(dist_webuiconf_DATA) $(nobase_dist_webui_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -140,17 +91,19 @@ am__remove_distdir = \
 DIST_ARCHIVES = $(distdir).tar.gz
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 ADDSRCS = @ADDSRCS@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
 AMTAR = @AMTAR@
 AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -165,6 +118,7 @@ ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -175,6 +129,7 @@ LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -189,9 +144,12 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
 VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
 am__include = @am__include@
 am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
@@ -203,6 +161,7 @@ build_alias = @build_alias@
 build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+builddir = @builddir@
 datadir = @datadir@
 datarootdir = @datarootdir@
 docdir = @docdir@
@@ -234,71 +193,29 @@ program_transform_name = @program_transform_name@
 psdir = @psdir@
 sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
 sysconfdir = @sysconfdir@
-target = @target@
 target_alias = @target_alias@
-target_cpu = @target_cpu@
-target_os = @target_os@
-target_vendor = @target_vendor@
-nzbget_SOURCES = \
-	ArticleDownloader.cpp ArticleDownloader.h BinRpc.cpp BinRpc.h \
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+nzbget_SOURCES = 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 Frontend.cpp Frontend.h \
 	Log.cpp Log.h LoggableFrontend.cpp LoggableFrontend.h MessageBase.h \
 	NCursesFrontend.cpp NCursesFrontend.h NNTPConnection.cpp NNTPConnection.h NZBFile.cpp \
-	NZBFile.h NewsServer.cpp NewsServer.h Observer.cpp \
+	NZBFile.h NetAddress.cpp NetAddress.h NewsServer.cpp NewsServer.h Observer.cpp \
 	Observer.h Options.cpp Options.h ParChecker.cpp ParChecker.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 nzbget.cpp nzbget.h
+	RemoteServer.cpp RemoteServer.h Scheduler.cpp Scheduler.h ScriptController.cpp \
+	ScriptController.h ServerPool.cpp ServerPool.h TLS.cpp TLS.h Thread.cpp Thread.h Util.cpp \
+	Util.h XmlRpc.cpp XmlRpc.h nzbget.cpp nzbget.h
 
-EXTRA_DIST = \
-	Makefile.cvs nzbgetd nzbget-postprocess.sh \
-	$(patches_FILES) $(windows_FILES)
-
-patches_FILES = \
+EXTRA_DIST = nzbget.conf.example postprocess-example.sh \
+	win32.h NTService.cpp NTService.h \
 	libpar2-0.2-bugfixes.patch libpar2-0.2-cancel.patch \
-	libpar2-0.2-MSVC8.patch libsigc++-2.0.18-MSVC8.patch
-
-windows_FILES = \
-	win32.h NTService.cpp NTService.h nzbget.sln nzbget.vcproj nzbget-shell.bat
-
-doc_FILES = \
-	README ChangeLog COPYING
-
-exampleconf_FILES = \
-	nzbget.conf nzbget-postprocess.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/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
-
-
-# Install
-sbin_SCRIPTS = nzbgetd
-bin_SCRIPTS = nzbget-postprocess.sh
-dist_doc_DATA = $(doc_FILES)
-exampleconfdir = $(datadir)/nzbget
-dist_exampleconf_DATA = $(exampleconf_FILES)
-webuiconfdir = $(datadir)/nzbget/webui
-dist_webuiconf_DATA = $(exampleconf_FILES)
-webuidir = $(datadir)/nzbget
-nobase_dist_webui_DATA = $(webui_FILES)
-
-# Ignore "svn_version.cpp" in distcleancheck
-distcleancheck_listfiles = \
-	find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
-	sh '{}' ';'
+	libpar2-0.2-MSVC8.patch libsigc++-2.0.18-MSVC8.patch \
+	Makefile.cvs nzbget.kdevelop nzbget.sln nzbget.vcproj
 
 all: config.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
@@ -342,7 +259,7 @@ $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 config.h: stamp-h1
 	@if test ! -f $@; then \
 	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
+	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
 	else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
@@ -357,7 +274,7 @@ distclean-hdr:
 	-rm -f config.h stamp-h1
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
+	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
 	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
 	  if test -f $$p \
@@ -380,45 +297,7 @@ clean-binPROGRAMS:
 	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
 nzbget$(EXEEXT): $(nzbget_OBJECTS) $(nzbget_DEPENDENCIES) 
 	@rm -f nzbget$(EXEEXT)
-	$(CXXLINK) $(nzbget_LDFLAGS) $(nzbget_OBJECTS) $(nzbget_LDADD) $(LIBS)
-install-binSCRIPTS: $(bin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(binSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(bindir)/$$f'"; \
-	    $(binSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(bindir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-binSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(bin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f '$(DESTDIR)$(bindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(bindir)/$$f"; \
-	done
-install-sbinSCRIPTS: $(sbin_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
-	@list='$(sbin_SCRIPTS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    echo " $(sbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
-	    $(sbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(sbindir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-sbinSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(sbin_SCRIPTS)'; for p in $$list; do \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
-	done
+	$(CXXLINK) $(nzbget_OBJECTS) $(nzbget_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -439,6 +318,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NCursesFrontend.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NNTPConnection.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NZBFile.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NetAddress.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/NewsServer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Observer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Options.Po@am__quote@
@@ -448,104 +328,28 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QueueEditor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RemoteClient.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/RemoteServer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Scanner.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Scheduler.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ScriptController.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerPool.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TLS.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Thread.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/UrlCoordinator.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Util.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WebDownloader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WebServer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlRpc.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nzbget.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svn_version.Po@am__quote@
 
 .cpp.o:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<
 
 .cpp.obj:
-@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
+@am__fastdepCXX_TRUE@	mv -f $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
-uninstall-info-am:
-install-dist_docDATA: $(dist_doc_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
-	@list='$(dist_doc_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
-	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
-	done
-
-uninstall-dist_docDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_doc_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(docdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(docdir)/$$f"; \
-	done
-install-dist_exampleconfDATA: $(dist_exampleconf_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(exampleconfdir)" || $(mkdir_p) "$(DESTDIR)$(exampleconfdir)"
-	@list='$(dist_exampleconf_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_exampleconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(exampleconfdir)/$$f'"; \
-	  $(dist_exampleconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(exampleconfdir)/$$f"; \
-	done
-
-uninstall-dist_exampleconfDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_exampleconf_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(exampleconfdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(exampleconfdir)/$$f"; \
-	done
-install-dist_webuiconfDATA: $(dist_webuiconf_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(webuiconfdir)" || $(mkdir_p) "$(DESTDIR)$(webuiconfdir)"
-	@list='$(dist_webuiconf_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(dist_webuiconfDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(webuiconfdir)/$$f'"; \
-	  $(dist_webuiconfDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(webuiconfdir)/$$f"; \
-	done
-
-uninstall-dist_webuiconfDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(dist_webuiconf_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(webuiconfdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(webuiconfdir)/$$f"; \
-	done
-install-nobase_dist_webuiDATA: $(nobase_dist_webui_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(webuidir)" || $(mkdir_p) "$(DESTDIR)$(webuidir)"
-	@$(am__vpath_adj_setup) \
-	list='$(nobase_dist_webui_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  $(am__vpath_adj) \
-	  echo " $(nobase_dist_webuiDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(webuidir)/$$f'"; \
-	  $(nobase_dist_webuiDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(webuidir)/$$f"; \
-	done
-
-uninstall-nobase_dist_webuiDATA:
-	@$(NORMAL_UNINSTALL)
-	@$(am__vpath_adj_setup) \
-	list='$(nobase_dist_webui_DATA)'; for p in $$list; do \
-	  $(am__vpath_adj) \
-	  echo " rm -f '$(DESTDIR)$(webuidir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(webuidir)/$$f"; \
-	done
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
@@ -597,24 +401,22 @@ distclean-tags:
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/webui $(distdir)/webui/img $(distdir)/webui/lib
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	test -d $(distdir) || mkdir $(distdir)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
 	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
 	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
 	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
 	    fi; \
@@ -625,13 +427,10 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
 	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
 	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
 	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	  ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
 	|| chmod -R a+r $(distdir)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -706,7 +505,7 @@ distcheck: dist
 	$(am__remove_distdir)
 	@(echo "$(distdir) archives ready for distribution: "; \
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
 	@cd $(distuninstallcheck_dir) \
 	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -727,10 +526,10 @@ distcleancheck: distclean
 	       exit 1; } >&2
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h
+all-am: Makefile $(PROGRAMS) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(exampleconfdir)" "$(DESTDIR)$(webuiconfdir)" "$(DESTDIR)$(webuidir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
+	for dir in "$(DESTDIR)$(bindir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
 install-exec: install-exec-am
@@ -777,20 +576,22 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_docDATA install-dist_exampleconfDATA \
-	install-dist_webuiconfDATA install-nobase_dist_webuiDATA
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-data-am:
 
-install-exec-am: install-binPROGRAMS install-binSCRIPTS \
-	install-sbinSCRIPTS
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-dvi: install-dvi-am
+
+install-exec-am: install-binPROGRAMS
+
+install-html: install-html-am
 
 install-info: install-info-am
 
 install-man:
 
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
@@ -812,119 +613,27 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
-	uninstall-dist_docDATA uninstall-dist_exampleconfDATA \
-	uninstall-dist_webuiconfDATA uninstall-info-am \
-	uninstall-nobase_dist_webuiDATA uninstall-sbinSCRIPTS
+uninstall-am: uninstall-binPROGRAMS
+
+.MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
-	dist-gzip dist-hook dist-shar dist-tarZ dist-zip distcheck \
-	distclean distclean-compile distclean-generic distclean-hdr \
+	dist-gzip dist-shar dist-tarZ dist-zip distcheck distclean \
+	distclean-compile distclean-generic distclean-hdr \
 	distclean-tags distcleancheck distdir distuninstallcheck dvi \
 	dvi-am html html-am info info-am install install-am \
-	install-binPROGRAMS install-binSCRIPTS install-data \
-	install-data-am install-data-hook install-dist_docDATA \
-	install-dist_exampleconfDATA install-dist_webuiconfDATA \
-	install-exec install-exec-am install-exec-hook install-info \
-	install-info-am install-man install-nobase_dist_webuiDATA \
-	install-sbinSCRIPTS install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic pdf pdf-am \
-	ps ps-am tags uninstall uninstall-am uninstall-binPROGRAMS \
-	uninstall-binSCRIPTS uninstall-dist_docDATA \
-	uninstall-dist_exampleconfDATA uninstall-dist_webuiconfDATA \
-	uninstall-info-am uninstall-nobase_dist_webuiDATA \
-	uninstall-sbinSCRIPTS
+	install-binPROGRAMS install-data install-data-am install-dvi \
+	install-dvi-am install-exec install-exec-am install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS
 
 
-# Note about "sed": 
-# We need to make some changes in installed files.
-# On Linux "sed" has option "-i" for in-place-edit. Unfortunateley the BSD version of "sed"
-# has incompatible syntax. To solve the problem we perform in-place-edit in three steps:
-# 1) copy the original file to original.temp (delete existing original.temp, if any);
-# 2) sed < original.temp > original
-# 3) delete original.temp
-# These steps ensure that the output file has the same permissions as the original file.
-
-# Configure installed script
-install-exec-hook:
-	rm -f "$(DESTDIR)$(sbindir)/nzbgetd.temp"
-	cp "$(DESTDIR)$(sbindir)/nzbgetd" "$(DESTDIR)$(sbindir)/nzbgetd.temp"
-	sed 's?/usr/local/bin?$(bindir)?' < "$(DESTDIR)$(sbindir)/nzbgetd.temp" > "$(DESTDIR)$(sbindir)/nzbgetd"
-	rm "$(DESTDIR)$(sbindir)/nzbgetd.temp"
-
-# Prepare example configuration files
-install-data-hook:
-	rm -f "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	cp "$(DESTDIR)$(exampleconfdir)/nzbget.conf" "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:"nzbget-postprocess.sh":"nzbget-postprocess.sh" (installed into $(bindir)):' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:^WebDir=:WebDir=$(webuidir)/webui:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
-	rm "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-
-# Install configuration files into /etc
-# (only if they do not exist there to prevent override by update)
-install-conf:
-	if test ! -f "$(DESTDIR)$(sysconfdir)/nzbget.conf" ; then \
-		$(mkinstalldirs) "$(DESTDIR)$(sysconfdir)" ; \
-		cp "$(DESTDIR)$(exampleconfdir)/nzbget.conf" "$(DESTDIR)$(sysconfdir)/nzbget.conf" ; \
-		rm -f "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" ; \
-		cp "$(DESTDIR)$(sysconfdir)/nzbget.conf" "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" ; \
-		sed 's:^PostProcess=:PostProcess=$(bindir)/nzbget-postprocess.sh:' < "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(sysconfdir)/nzbget.conf" ; \
-		rm "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" ; \
-	fi
-	if test ! -f "$(DESTDIR)$(sysconfdir)/nzbget-postprocess.conf" ; then \
-		$(mkinstalldirs) "$(DESTDIR)$(sysconfdir)" ; \
-		cp "$(DESTDIR)$(exampleconfdir)/nzbget-postprocess.conf" "$(DESTDIR)$(sysconfdir)/nzbget-postprocess.conf" ; \
-	fi
-
-uninstall-conf:
-	rm -f "$(DESTDIR)$(sysconfdir)/nzbget-postprocess.conf"
-	rm -f "$(DESTDIR)$(sysconfdir)/nzbget.conf"
-
-# Determining subversion revision:
-# 1) If directory ".svn" exists we take revision from it using program svnversion (part of subversion package)
-#    File is recreated only if revision number was changed.
-# 2) If directory ".svn" doesn't exists we keep and reuse file "svn_version.cpp",
-#    which was possibly created early.
-# 3) If neither directory ".svn" nor file "svn_version.cpp" are available
-#    we create new file "svn_version.c" with empty revision number.
-svn_version.cpp: FORCE
-	@ if test -d ./.svn ; then \
-		V="$(shell svnversion -n .)"; \
-		H="$(shell test -f ./svn_version.cpp && head -n 1 svn_version.cpp)"; \
-		if test "/* $$V */" != "$$H" ; then \
-			( \
-			echo "/* $$V */" ;\
-			echo "/* This file is automatically regenerated on each build. Do not edit it. */" ;\
-			echo "const char* svn_version(void)" ;\
-			echo "{" ;\
-			echo "	const char* SVN_Version = \"$$V\";" ;\
-			echo "	return SVN_Version;" ;\
-			echo "}" ;\
-			) > svn_version.cpp ; \
-		fi \
-	elif test -f ./svn_version.cpp ; then \
-		test "ok, reuse existing file"; \
-	else \
-		( \
-		echo "/*  */" ;\
-		echo "/* This file is automatically regenerated on each build. Do not edit it. */" ;\
-		echo "const char* svn_version(void)" ;\
-		echo "{" ;\
-		echo "	const char* SVN_Version = \"\";" ;\
-		echo "	return SVN_Version;" ;\
-		echo "}" ;\
-		) > svn_version.cpp ; \
-	fi
-FORCE:
-
 clean-bak: rm *~
-
-# Fix premissions
-dist-hook:
-	chmod -x $(distdir)/*.cpp $(distdir)/*.h
-	find $(distdir)/webui -type f -print -exec chmod -x {} \;
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

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-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -27,7 +27,7 @@
 #ifndef MESSAGEBASE_H
 #define MESSAGEBASE_H
 
-static const int32_t NZBMESSAGE_SIGNATURE = 0x6E7A6212; // = "nzb-XX" (protocol version)
+static const int32_t NZBMESSAGE_SIGNATURE = 0x6E7A6204; // = "nzb4" (nzb version 4)
 static const int NZBREQUESTFILENAMESIZE = 512;
 static const int NZBREQUESTPASSWORDSIZE = 32;
 
@@ -56,14 +56,10 @@ enum eRemoteRequest
 	eRemoteRequestEditQueue,
 	eRemoteRequestLog,
 	eRemoteRequestShutdown,
-	eRemoteRequestReload,
 	eRemoteRequestVersion,
 	eRemoteRequestPostQueue,
 	eRemoteRequestWriteLog,
-	eRemoteRequestScan,
-	eRemoteRequestHistory,
-	eRemoteRequestDownloadUrl,
-	eRemoteRequestUrlQueue
+	eRemoteRequestScan
 };
 
 // Possible values for field "m_iAction" of struct "SNZBEditQueueRequest":
@@ -71,53 +67,25 @@ enum eRemoteRequest
 // 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
+	eRemoteEditActionFileMoveOffset = 1,	// move to m_iOffset relative to the current position in queue
+	eRemoteEditActionFileMoveTop,			// move to top of queue
+	eRemoteEditActionFileMoveBottom,		// move to bottom of queue
+	eRemoteEditActionFilePause,				// pause
+	eRemoteEditActionFileResume,			// resume (unpause)
+	eRemoteEditActionFileDelete,			// delete
 	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)
-	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
-	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
+	eRemoteEditActionGroupMoveOffset,		// move to m_iOffset relative to the current position in queue
+	eRemoteEditActionGroupMoveTop,			// move to top of queue
+	eRemoteEditActionGroupMoveBottom,		// move to bottom of queue
+	eRemoteEditActionGroupPause,			// pause
+	eRemoteEditActionGroupResume,			// resume (unpause)
+	eRemoteEditActionGroupDelete,			// delete
+	eRemoteEditActionGroupPauseAllPars,		// pause only (all) pars (does not affect other files)
+	eRemoteEditActionGroupPauseExtraPars,	// pause only (almost all) pars, except main par-file (does not affect other files)
 	eRemoteEditActionGroupSetCategory,		// set or change category for a group
 	eRemoteEditActionGroupMerge,			// merge group
-	eRemoteEditActionGroupSetParameter,		// set post-process parameter for group
-	eRemoteEditActionGroupSetName,			// set group name (rename group)
-	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,			// delete history-item
-	eRemoteEditActionHistoryReturn,			// move history-item back to download queue
-	eRemoteEditActionHistoryProcess			// move history-item back to download queue and start postprocessing
-};
-
-// 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
-};
-
-// Possible values for field "m_iMatchMode" of struct "SNZBEditQueueRequest":
-enum eRemoteMatchMode
-{
-	eRemoteMatchModeID = 1,				// ID
-	eRemoteMatchModeName,				// Name
-	eRemoteMatchModeRegEx,				// RegEx
+	eRemoteEditActionGroupSetParameter		// set post-process parameter
 };
 
 // The basic SNZBRequestBase struct, used in all requests
@@ -141,10 +109,8 @@ struct SNZBDownloadRequest
 {
 	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
 	char					m_szFilename[NZBREQUESTFILENAMESIZE];	// Name of nzb-file, may contain full path (local path on client) or only filename
-	char					m_szCategory[NZBREQUESTFILENAMESIZE];	// Category, can be empty
+	char					m_szCategory[NZBREQUESTFILENAMESIZE];	// Category, be empty
 	int32_t					m_bAddFirst;			// 1 - add file to the top of download queue
-	int32_t					m_bAddPaused;			// 1 - pause added files
-	int32_t					m_iPriority;			// Priority for files (0 - default)
 	int32_t					m_iTrailingDataLength;	// Length of nzb-file in bytes
 	//char					m_szContent[m_iTrailingDataLength];	// variable sized
 };
@@ -164,9 +130,6 @@ struct SNZBListRequest
 	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
 	int32_t					m_bFileList;			// 1 - return file list
 	int32_t					m_bServerState;			// 1 - return server state
-	int32_t					m_iMatchMode;			// File/Group match mode, see enum eRemoteMatchMode (only values eRemoteMatchModeID (no filter) and eRemoteMatchModeRegEx are allowed)
-	int32_t					m_bMatchGroup;			// 0 - match files; 1 - match nzbs (when m_iMatchMode == eRemoteMatchModeRegEx)
-	char					m_szPattern[NZBREQUESTFILENAMESIZE];	// RegEx Pattern (when m_iMatchMode == eRemoteMatchModeRegEx)
 };
 
 // A list response
@@ -178,22 +141,18 @@ struct SNZBListResponse
 	int32_t 				m_iRemainingSizeHi;		// Remaining size in bytes, High 32-bits of 64-bit value
 	int32_t					m_iDownloadRate;		// Current download speed, in Bytes pro Second
 	int32_t					m_iDownloadLimit;		// Current download limit, in Bytes pro Second
-	int32_t					m_bDownloadPaused;		// 1 - download queue is currently in paused-state
-	int32_t					m_bDownload2Paused;		// 1 - download queue is currently in paused-state (second pause-register)
-	int32_t					m_bDownloadStandBy;		// 0 - there are currently downloads running, 1 - no downloads in progress (download queue paused or all download jobs completed)
-	int32_t					m_bPostPaused;			// 1 - post-processor queue is currently in paused-state
-	int32_t					m_bScanPaused;			// 1 - scaning of incoming directory is currently in paused-state
+	int32_t					m_bServerPaused;		// 1 - server is currently in paused-state
 	int32_t					m_iThreadCount;			// Number of threads running
 	int32_t					m_iPostJobCount;		// Number of jobs in post-processor queue (including current job)
 	int32_t					m_iUpTimeSec;			// Server up time in seconds
 	int32_t					m_iDownloadTimeSec;		// Server download time in seconds (up_time - standby_time)
 	int32_t					m_iDownloadedBytesLo;	// Amount of data downloaded since server start, Low 32-bits of 64-bit value
 	int32_t					m_iDownloadedBytesHi;	// Amount of data downloaded since server start, High 32-bits of 64-bit value
-	int32_t					m_bRegExValid;			// 0 - error in RegEx-pattern, 1 - RegEx-pattern is valid (only when Request has eRemoteMatchModeRegEx)
+	int32_t					m_bServerStandBy;		// 0 - there are currently downloads running, 1 - no downloads in progress (server paused or all jobs completed)
 	int32_t					m_iNrTrailingNZBEntries;	// Number of List-NZB-entries, following to this structure
 	int32_t					m_iNrTrailingPPPEntries;	// Number of List-PPP-entries, following to this structure
 	int32_t					m_iNrTrailingFileEntries;	// Number of List-File-entries, following to this structure
-	int32_t					m_iTrailingDataLength;		// Length of all List-entries, following to this structure
+	int32_t					m_iTrailingDataLength;	// Length of all List-entries, following to this structure
 	// SNZBListResponseEntry m_NZBEntries[m_iNrTrailingNZBEntries]			// variable sized
 	// SNZBListResponseEntry m_PPPEntries[m_iNrTrailingPPPEntries]			// variable sized
 	// SNZBListResponseEntry m_FileEntries[m_iNrTrailingFileEntries]		// variable sized
@@ -204,14 +163,11 @@ struct SNZBListResponseNZBEntry
 {
 	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_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
 	int32_t					m_iDestDirLen;			// Length of DestDir-string (m_szDestDir), following to this record
 	int32_t					m_iCategoryLen;			// Length of Category-string (m_szCategory), following to this record
 	int32_t					m_iQueuedFilenameLen;	// Length of queued file name (m_szQueuedFilename), following to this record
 	//char					m_szFilename[m_iFilenameLen];				// variable sized
-	//char					m_szName[m_iNameLen];						// variable sized
 	//char					m_szDestDir[m_iDestDirLen];					// variable sized
 	//char					m_szCategory[m_iCategoryLen];				// variable sized
 	//char					m_szQueuedFilename[m_iQueuedFilenameLen];	// variable sized
@@ -238,9 +194,6 @@ 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
 	int32_t					m_iFilenameLen;			// Length of Filename-string (m_szFilename), following to this record
 	//char					m_szSubject[m_iSubjectLen];			// variable sized
@@ -280,7 +233,6 @@ struct SNZBPauseUnpauseRequest
 {
 	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
 	int32_t					m_bPause;				// 1 - server must be paused, 0 - server must be unpaused
-	int32_t					m_iAction;				// Action to be executed, see enum eRemotePauseUnpauseAction
 };
 
 // A Pause/Unpause response
@@ -308,23 +260,19 @@ struct SNZBSetDownloadRateResponse
 	//char					m_szText[m_iTrailingDataLength];	// variable sized
 };
 
-// edit queue request
+// An edit queue request
 struct SNZBEditQueueRequest
 {
 	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iAction;				// Action to be executed, see enum eRemoteEditAction
+	int32_t					m_iAction;				// Action to be executed, see enum in NZBMessageRequest-namespace
 	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
-	int32_t					m_iTrailingNameEntriesLen;	// Length of all Name-entries, following to this structure
-	int32_t					m_iTextLen;					// Length of Text-string (m_szText), following to this record
-	int32_t					m_iTrailingDataLength;		// Length of Text-string and all ID-entries, following to this structure
-	//char					m_szText[m_iTextLen];		// variable sized
-	//int32_t				m_iIDs[m_iNrTrailingIDEntries];			// variable sized array of IDs. For File-Actions - ID of file, for Group-Actions - ID of any file belonging to group
-	//char*					m_szNames[m_iNrTrailingNameEntries];	// variable sized array of strings. For File-Actions - name of file incl. nzb-name as path, for Group-Actions - name of group
+	int32_t					m_iNrTrailingEntries;	// Number of ID-entries, following to this structure
+	int32_t					m_iTextLen;				// Length of Text-string (m_szText), following to this record
+	int32_t					m_iTrailingDataLength;	// Length of Text-string and all ID-entries, following to this structure
+	//char					m_szText[m_iTextLen];	// variable sized
+	//int32_t				m_iIDs[m_iNrTrailingEntries];	// variable sized array of IDs. For File-Actions - ID of file, for Group-Actions - ID of any file belonging to group
 };
 
 // An edit queue response
@@ -366,21 +314,6 @@ struct SNZBShutdownResponse
 	//char					m_szText[m_iTrailingDataLength];	// variable sized
 };
 
-// Reload server request
-struct SNZBReloadRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-};
-
-// Reload server response
-struct SNZBReloadResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bSuccess;				// 0 - command failed, 1 - command executed successfully
-	int32_t					m_iTrailingDataLength;	// Length of Text-string (m_szText), following to this record
-	//char					m_szText[m_iTrailingDataLength];	// variable sized
-};
-
 // Server version request
 struct SNZBVersionRequest
 {
@@ -455,7 +388,6 @@ struct SNZBWriteLogResponse
 struct SNZBScanRequest
 {
 	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bSyncMode;			// 0 - asynchronous Scan (the command returns immediately), 1 - synchronous Scan (the command returns when the scan is completed)
 };
 
 // Scan nzb directory response
@@ -467,86 +399,4 @@ struct SNZBScanResponse
 	//char					m_szText[m_iTrailingDataLength];	// variable sized
 };
 
-// A history request
-struct SNZBHistoryRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-};
-
-// history response
-struct SNZBHistoryResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iEntrySize;			// Size of the SNZBHistoryResponseEntry-struct
-	int32_t					m_iNrTrailingEntries;	// Number of History-entries, following to this structure
-	int32_t					m_iTrailingDataLength;	// Length of all History-entries, following to this structure
-	// SNZBHistoryResponseEntry m_Entries[m_iNrTrailingEntries]			// variable sized
-};
-
-// history entry
-struct SNZBHistoryResponseEntry
-{
-	int32_t					m_iID;					// History-ID
-	int32_t					m_iKind;				// Kind of Item: 1 - Collection (NZB), 2 - URL
-	int32_t					m_tTime;				// When the item was added to history. time since the Epoch (00:00:00 UTC, January 1, 1970), measured in seconds.
-	int32_t					m_iNicenameLen;			// Length of Nicename-string (m_szNicename), following to this record
-	// for Collection items (m_iKind = 1)
-	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_iFileCount;			// Initial number of files included in NZB-file
-	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 UrlInfo::EStatus
-	// trailing data
-	//char					m_szNicename[m_iNicenameLen];				// variable sized
-};
-
-// download url request
-struct SNZBDownloadUrlRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	char					m_szURL[NZBREQUESTFILENAMESIZE];		// url to nzb-file
-	char					m_szNZBFilename[NZBREQUESTFILENAMESIZE];// Name of nzb-file. Can be empty, then the filename is read from URL download response
-	char					m_szCategory[NZBREQUESTFILENAMESIZE];	// Category, can be empty
-	int32_t					m_bAddFirst;							// 1 - add url to the top of download queue
-	int32_t					m_bAddPaused;							// 1 - pause added files
-	int32_t					m_iPriority;							// Priority for files (0 - default)
-};
-
-// download url response
-struct SNZBDownloadUrlResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bSuccess;				// 0 - command failed, 1 - command executed successfully
-	int32_t					m_iTrailingDataLength;	// Length of Text-string (m_szText), following to this record
-	//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

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -60,18 +60,6 @@
 #undef erase
 #endif
 
-#ifndef WIN32
-// curses.h on Solaris declares "clear()" via DEFINE. That causes problems, because
-// it also affects calls to deque's method "clear()", producing compiler errors.
-// We use function "curses_clear()" to call macro "clear" of curses, then
-// undefine macro "clear".
-void curses_clear()
-{
-    clear();
-}
-#undef clear
-#endif
-
 extern Options* g_pOptions;
 extern void ExitProc();
 
@@ -143,6 +131,8 @@ NCursesFrontend::NCursesFrontend()
 	m_bLastPausePars = false;
 	m_szHint = NULL;
 
+	m_groupQueue.clear();
+
     // Setup curses
 #ifdef WIN32
 	HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -316,7 +306,7 @@ void NCursesFrontend::Update(int iKey)
 	}
 
     //------------------------------------------
-    // Print Current NZBInfoList
+    // Print Current NZBQueue
     //------------------------------------------
 	if (m_iQueueWinHeight > 0)
 	{
@@ -361,7 +351,7 @@ void NCursesFrontend::CalcWindowSizes()
 		m_pOldScreenBuffer = (CHAR_INFO*)realloc(m_pOldScreenBuffer, m_iScreenBufferSize);
 		memset(m_pOldScreenBuffer, 0, m_iScreenBufferSize);
 #else
-        curses_clear();
+        clear();
 #endif
         m_iScreenHeight = iNrRows;
         m_iScreenWidth = iNrColumns;
@@ -399,7 +389,7 @@ int NCursesFrontend::CalcQueueSize()
 	else
 	{
 		DownloadQueue* pDownloadQueue = LockQueue();
-		int iQueueSize = pDownloadQueue->GetFileQueue()->size();
+		int iQueueSize = pDownloadQueue->size();
 		UnlockQueue();
 		return iQueueSize;
 	}
@@ -614,7 +604,7 @@ void NCursesFrontend::PrintStatus()
     timeString[0] = '\0';
 
 	float fCurrentDownloadSpeed = m_bStandBy ? 0 : m_fCurrentDownloadSpeed;
-    if (fCurrentDownloadSpeed > 0.0 && !(m_bPauseDownload || m_bPauseDownload2))
+    if (fCurrentDownloadSpeed > 0.0 && !m_bPause)
     {
         long long remain_sec = (long long)(m_lRemainingSize / (fCurrentDownloadSpeed * 1024));
 		int h = (int)(remain_sec / 3600);
@@ -643,15 +633,11 @@ void NCursesFrontend::PrintStatus()
         szPostStatus[0] = 0;
     }
 
-	float fAverageSpeed = (float)(Util::Int64ToFloat(m_iDnTimeSec > 0 ? m_iAllBytes / m_iDnTimeSec : 0) / 1024.0);
+	float fAverageSpeed = Util::Int64ToFloat(m_iDnTimeSec > 0 ? m_iAllBytes / m_iDnTimeSec / 1024 : 0);
 
-	snprintf(tmp, MAX_SCREEN_WIDTH, " %d threads, %.*f KB/s, %.2f MB remaining%s%s%s%s%s, Avg. %.*f KB/s", 
-		m_iThreadCount, (fCurrentDownloadSpeed >= 10 ? 0 : 1), fCurrentDownloadSpeed, 
-		(float)(Util::Int64ToFloat(m_lRemainingSize) / 1024.0 / 1024.0), timeString, szPostStatus, 
-		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);
+	snprintf(tmp, MAX_SCREEN_WIDTH, " %d threads, %.0f KB/s, %.2f MB remaining%s%s%s%s, Avg. %.0f KB/s", 
+		m_iThreadCount, fCurrentDownloadSpeed, (float)(Util::Int64ToFloat(m_lRemainingSize) / 1024.0 / 1024.0), timeString, 
+		szPostStatus, m_bPause ? (m_bStandBy ? ", Paused" : ", Pausing") : "", szDownloadLimit, fAverageSpeed);
 	tmp[MAX_SCREEN_WIDTH - 1] = '\0';
     PlotLine(tmp, iStatusRow, 0, NCURSES_COLORPAIR_STATUS);
 }
@@ -752,7 +738,7 @@ void NCursesFrontend::PrintFileQueue()
 	int iLineNr = m_iQueueWinTop;
 			
     DownloadQueue* pDownloadQueue = LockQueue();
-	if (pDownloadQueue->GetFileQueue()->empty())
+	if (pDownloadQueue->empty())
     {
 		char szBuffer[MAX_SCREEN_WIDTH];
 		snprintf(szBuffer, sizeof(szBuffer), "%s Files for downloading", m_bUseColor ? "" : "*** ");
@@ -767,7 +753,7 @@ void NCursesFrontend::PrintFileQueue()
 		long long lPaused = 0;
 		int iPausedFiles = 0;
 		int i = 0;
-        for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++, i++)
+        for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++, i++)
         {
             FileInfo* pFileInfo = *it;
 
@@ -792,8 +778,7 @@ void NCursesFrontend::PrintFileQueue()
 		
 		char szBuffer[MAX_SCREEN_WIDTH];
 		snprintf(szBuffer, sizeof(szBuffer), " %sFiles for downloading - %i / %i files in queue - %s / %s", 
-			m_bUseColor ? "" : "*** ", pDownloadQueue->GetFileQueue()->size(), 
-			pDownloadQueue->GetFileQueue()->size() - iPausedFiles, szRemaining, szUnpaused);
+			m_bUseColor ? "" : "*** ", pDownloadQueue->size(), pDownloadQueue->size() - iPausedFiles, szRemaining, szUnpaused);
 		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
 		PrintTopHeader(szBuffer, m_iQueueWinTop, true);
     }
@@ -819,19 +804,6 @@ void NCursesFrontend::PrintFilename(FileInfo * pFileInfo, int iRow, bool bSelect
 		color = NCURSES_COLORPAIR_TEXT;
 	}
 
-	const char* szDownloading = "";
-	if (pFileInfo->GetActiveDownloads() > 0)
-	{
-		szDownloading = " *";
-	}
-
-	char szPriority[100];
-	szPriority[0] = '\0';
-	if (pFileInfo->GetPriority() != 0)
-	{
-		sprintf(szPriority, " [%+i]", pFileInfo->GetPriority());
-	}
-
 	char szCompleted[20];
 	szCompleted[0] = '\0';
 	if (pFileInfo->GetRemainingSize() < pFileInfo->GetSize())
@@ -842,7 +814,7 @@ void NCursesFrontend::PrintFilename(FileInfo * pFileInfo, int iRow, bool bSelect
 	char szNZBNiceName[1024];
 	if (m_bShowNZBname)
 	{
-		strncpy(szNZBNiceName, pFileInfo->GetNZBInfo()->GetName(), 1023);
+		pFileInfo->GetNZBInfo()->GetNiceNZBName(szNZBNiceName, 1023);
 		int len = strlen(szNZBNiceName);
 		szNZBNiceName[len] = PATH_SEPARATOR;
 		szNZBNiceName[len + 1] = '\0';
@@ -853,9 +825,8 @@ void NCursesFrontend::PrintFilename(FileInfo * pFileInfo, int iRow, bool bSelect
 	}
 
 	char szBuffer[MAX_SCREEN_WIDTH];
-	snprintf(szBuffer, MAX_SCREEN_WIDTH, "%s%i%s%s%s %s%s (%.2f MB%s)%s", Brace1, pFileInfo->GetID(),
-		Brace2, szPriority, szDownloading, szNZBNiceName, pFileInfo->GetFilename(), 
-		(float)(Util::Int64ToFloat(pFileInfo->GetSize()) / 1024.0 / 1024.0),
+	snprintf(szBuffer, MAX_SCREEN_WIDTH, "%s%i%s %s%s (%.2f MB%s)%s", Brace1, pFileInfo->GetID(),
+		Brace2, szNZBNiceName, pFileInfo->GetFilename(), (float)(Util::Int64ToFloat(pFileInfo->GetSize()) / 1024.0 / 1024.0),
 		szCompleted, pFileInfo->GetPaused() ? " (paused)" : "");
 	szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
 
@@ -926,7 +897,6 @@ void NCursesFrontend::PrintGroupQueue()
 {
 	int iLineNr = m_iQueueWinTop;
 
-    LockQueue();
 	GroupQueue* pGroupQueue = &m_groupQueue;
 	if (pGroupQueue->empty())
     {
@@ -939,9 +909,8 @@ void NCursesFrontend::PrintGroupQueue()
     else
     {
 		iLineNr++;
-
-		ResetColWidths();
-		int iCalcLineNr = iLineNr;
+		long long lRemaining = 0;
+		long long lPaused = 0;
 		int i = 0;
         for (GroupQueue::iterator it = pGroupQueue->begin(); it != pGroupQueue->end(); it++, i++)
         {
@@ -949,20 +918,7 @@ void NCursesFrontend::PrintGroupQueue()
 
 			if (i >= m_iQueueScrollOffset && i < m_iQueueScrollOffset + m_iQueueWinHeight -1)
 			{
-				PrintGroupname(pGroupInfo, iCalcLineNr++, false, true);
-			}
-        }
-
-		long long lRemaining = 0;
-		long long lPaused = 0;
-		i = 0;
-        for (GroupQueue::iterator it = pGroupQueue->begin(); it != pGroupQueue->end(); it++, i++)
-        {
-            GroupInfo* pGroupInfo = *it;
-
-			if (i >= m_iQueueScrollOffset && i < m_iQueueScrollOffset + m_iQueueWinHeight -1)
-			{
-				PrintGroupname(pGroupInfo, iLineNr++, i == m_iSelectedQueueEntry, false);
+				PrintGroupname(pGroupInfo, iLineNr++, i == m_iSelectedQueueEntry);
 			}
 
 			lRemaining += pGroupInfo->GetRemainingSize();
@@ -981,35 +937,25 @@ void NCursesFrontend::PrintGroupQueue()
 		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
 		PrintTopHeader(szBuffer, m_iQueueWinTop, false);
     }
-    UnlockQueue();
 }
 
-void NCursesFrontend::ResetColWidths()
+void NCursesFrontend::PrintGroupname(GroupInfo * pGroupInfo, int iRow, bool bSelected)
 {
-	m_iColWidthFiles = 0;
-	m_iColWidthTotal = 0;
-	m_iColWidthLeft = 0;
-}
-
-void NCursesFrontend::PrintGroupname(GroupInfo * pGroupInfo, int iRow, bool bSelected, bool bCalcColWidth)
-{
-	int color = NCURSES_COLORPAIR_TEXT;
-	char chBrace1 = '[';
-	char chBrace2 = ']';
+	int color = 0;
+	const char* Brace1 = "[";
+	const char* Brace2 = "]";
 	if (m_eInputMode == eEditQueue && bSelected)
 	{
 		color = NCURSES_COLORPAIR_TEXTHIGHL;
 		if (!m_bUseColor)
 		{
-			chBrace1 = '<';
-			chBrace2 = '>';
+			Brace1 = "<";
+			Brace2 = ">";
 		}
 	}
-
-	const char* szDownloading = "";
-	if (pGroupInfo->GetActiveDownloads() > 0)
+	else
 	{
-		szDownloading = " *";
+		color = NCURSES_COLORPAIR_TEXT;
 	}
 
 	long long lUnpausedRemainingSize = pGroupInfo->GetRemainingSize() - pGroupInfo->GetPausedSize();
@@ -1017,104 +963,24 @@ void NCursesFrontend::PrintGroupname(GroupInfo * pGroupInfo, int iRow, bool bSel
 	char szRemaining[20];
 	Util::FormatFileSize(szRemaining, sizeof(szRemaining), lUnpausedRemainingSize);
 
-	char szPriority[100];
-	szPriority[0] = '\0';
-	if (pGroupInfo->GetMinPriority() != 0 || pGroupInfo->GetMaxPriority() != 0)
+	char szPaused[20];
+	szPaused[0] = '\0';
+	if (pGroupInfo->GetPausedSize() > 0)
 	{
-		if (pGroupInfo->GetMinPriority() == pGroupInfo->GetMaxPriority())
-		{
-			sprintf(szPriority, " [%+i]", pGroupInfo->GetMinPriority());
-		}
-		else
-		{
-			sprintf(szPriority, " [%+i..%+i]", pGroupInfo->GetMinPriority(), pGroupInfo->GetMaxPriority());
-		}
+		char szPausedSize[20];
+		Util::FormatFileSize(szPausedSize, sizeof(szPausedSize), pGroupInfo->GetPausedSize());
+		sprintf(szPaused, " + %s paused", szPausedSize);
 	}
 
+	char szNZBNiceName[1024];
+	pGroupInfo->GetNZBInfo()->GetNiceNZBName(szNZBNiceName, 1023);
+
 	char szBuffer[MAX_SCREEN_WIDTH];
-
-	// Format:
-	// [id - id] Name   Left-Files/Paused     Total      Left     Time
-	// [1-2] Nzb-name             999/999 999.99 MB 999.99 MB 00:00:00
-
-	int iNameLen = 0;
-	if (bCalcColWidth)
-	{
-		iNameLen = m_iScreenWidth - 1 - 9 - 11 - 11 - 9;
-	}
-	else
-	{
-		iNameLen = m_iScreenWidth - 1 - m_iColWidthFiles - 2 - m_iColWidthTotal - 2 - m_iColWidthLeft - 2 - 9;
-	}
-
-	bool bPrintFormatted = iNameLen > 20;
-
-	if (bPrintFormatted)
-	{
-		char szFiles[20];
-		snprintf(szFiles, 20, "%i/%i", pGroupInfo->GetRemainingFileCount(), pGroupInfo->GetPausedFileCount());
-		szFiles[20-1] = '\0';
-		
-		char szTotal[20];
-		Util::FormatFileSize(szTotal, sizeof(szTotal), pGroupInfo->GetNZBInfo()->GetSize());
-
-		char szNameWithIds[1024];
-		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';
-		float fCurrentDownloadSpeed = m_bStandBy ? 0 : m_fCurrentDownloadSpeed;
-		if (pGroupInfo->GetPausedSize() > 0 && lUnpausedRemainingSize == 0)
-		{
-			snprintf(szTime, 100, "[paused]");
-			Util::FormatFileSize(szRemaining, sizeof(szRemaining), pGroupInfo->GetRemainingSize());
-		}
-		else if (fCurrentDownloadSpeed > 0.0 && !(m_bPauseDownload || m_bPauseDownload2))
-		{
-			long long remain_sec = (long long)(lUnpausedRemainingSize / (fCurrentDownloadSpeed * 1024));
-			int h = (int)(remain_sec / 3600);
-			int m = (int)((remain_sec % 3600) / 60);
-			int s = (int)(remain_sec % 60);
-			if (h < 100)
-			{
-				snprintf(szTime, 100, "%.2d:%.2d:%.2d", h, m, s);
-			}
-			else
-			{
-				snprintf(szTime, 100, "99:99:99");
-			}
-		}
-
-		if (bCalcColWidth)
-		{
-			int iColWidthFiles = strlen(szFiles);
-			m_iColWidthFiles = iColWidthFiles > m_iColWidthFiles ? iColWidthFiles : m_iColWidthFiles;
-
-			int iColWidthTotal = strlen(szTotal);
-			m_iColWidthTotal = iColWidthTotal > m_iColWidthTotal ? iColWidthTotal : m_iColWidthTotal;
-
-			int iColWidthLeft = strlen(szRemaining);
-			m_iColWidthLeft = iColWidthLeft > m_iColWidthLeft ? iColWidthLeft : m_iColWidthLeft;
-		}
-		else
-		{
-			snprintf(szBuffer, MAX_SCREEN_WIDTH, "%-*s  %*s  %*s  %*s  %8s", iNameLen, szNameWithIds, m_iColWidthFiles, szFiles, m_iColWidthTotal, szTotal, m_iColWidthLeft, szRemaining, szTime);
-		}
-	}
-	else
-	{
-		snprintf(szBuffer, MAX_SCREEN_WIDTH, "%c%i-%i%c%s %s", chBrace1, pGroupInfo->GetFirstID(), 
-			pGroupInfo->GetLastID(), chBrace2, szDownloading, pGroupInfo->GetNZBInfo()->GetName());
-	}
-
+	snprintf(szBuffer, MAX_SCREEN_WIDTH, "%s%i-%i%s %s (%i file%s, %s%s)", Brace1, pGroupInfo->GetFirstID(), pGroupInfo->GetLastID(), Brace2, szNZBNiceName, 
+		pGroupInfo->GetRemainingFileCount(), pGroupInfo->GetRemainingFileCount() > 1 ? "s" : "", szRemaining, szPaused);
 	szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
 
-	if (!bCalcColWidth)
-	{
-		PlotLine(szBuffer, iRow, 0, color);
-	}
+	PlotLine(szBuffer, iRow, 0, color);
 }
 
 void NCursesFrontend::PrepareGroupQueue()
@@ -1122,7 +988,7 @@ void NCursesFrontend::PrepareGroupQueue()
 	m_groupQueue.clear();
 
     DownloadQueue* pDownloadQueue = LockQueue();
-	pDownloadQueue->BuildGroups(&m_groupQueue);
+	GroupInfo::BuildGroups(pDownloadQueue, &m_groupQueue);
 	UnlockQueue();
 }
 
@@ -1181,9 +1047,9 @@ bool NCursesFrontend::EditQueue(QueueEditor::EEditAction eAction, int iOffset)
 	else
 	{
 		DownloadQueue* pDownloadQueue = LockQueue();
-		if (m_iSelectedQueueEntry >= 0 && m_iSelectedQueueEntry < (int)pDownloadQueue->GetFileQueue()->size())
+		if (m_iSelectedQueueEntry >= 0 && m_iSelectedQueueEntry < (int)pDownloadQueue->size())
 		{
-			FileInfo* pFileInfo = pDownloadQueue->GetFileQueue()->at(m_iSelectedQueueEntry);
+			FileInfo* pFileInfo = (*pDownloadQueue)[m_iSelectedQueueEntry];
 			ID = pFileInfo->GetID();
 			if (eAction == QueueEditor::eaFilePause)
 			{
@@ -1306,9 +1172,9 @@ void NCursesFrontend::UpdateInput(int initialKey)
 				// Key 'p' for pause
 				if (!IsRemoteMode())
 				{
-					info(m_bPauseDownload || m_bPauseDownload2 ? "Unpausing download" : "Pausing download");
+					info(m_bPause ? "Unpausing download" : "Pausing download");
 				}
-				ServerPauseUnpause(!(m_bPauseDownload || m_bPauseDownload2), m_bPauseDownload2 && !m_bPauseDownload);
+				ServerPauseUnpause(!m_bPause);
 				break;
 			case '\'':
 				ServerDumpDebug();

NCursesFrontend.h

@@ -1,8 +1,8 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -30,7 +30,6 @@
 #ifndef DISABLE_CURSES
 
 #include <vector>
-#include <time.h>
 
 #include "Frontend.h"
 #include "Log.h"
@@ -65,9 +64,6 @@ private:
 	GroupQueue			m_groupQueue;
 	char*				m_szHint;
 	time_t				m_tStartHint;
-	int					m_iColWidthFiles;
-	int					m_iColWidthTotal;
-	int					m_iColWidthLeft;
 
 	// Inputting numbers
 	int					m_iInputNumberIndex;
@@ -98,8 +94,7 @@ private:
 	void			PrintFileQueue();
 	void			PrintFilename(FileInfo* pFileInfo, int iRow, bool bSelected);
 	void			PrintGroupQueue();
-	void			ResetColWidths();
-	void			PrintGroupname(GroupInfo * pGroupInfo, int iRow, bool bSelected, bool bCalcColWidth);
+	void			PrintGroupname(GroupInfo * pGroupInfo, int iRow, bool bSelected);
 	void			PrepareGroupQueue();
 	void			PrintTopHeader(char* szHeader, int iLineNr, bool bUpTime);
 	void			ClearGroupQueue();

NNTPConnection.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -44,9 +44,8 @@
 
 static const int CONNECTION_LINEBUFFER_SIZE = 1024*10;
 
-NNTPConnection::NNTPConnection(NewsServer* pNewsServer) : Connection(pNewsServer->GetHost(), pNewsServer->GetPort(), pNewsServer->GetTLS())
+NNTPConnection::NNTPConnection(NewsServer* server) : Connection(server)
 {
-	m_pNewsServer = pNewsServer;
 	m_szActiveGroup = NULL;
 	m_szLineBuf = (char*)malloc(CONNECTION_LINEBUFFER_SIZE);
 	m_bAuthError = false;
@@ -82,7 +81,7 @@ const char* NNTPConnection::Request(const char* req)
 
 	if (!strncmp(answer, "480", 3))
 	{
-		debug("%s requested authorization", GetHost());
+		debug("%s requested authorization", m_pNetAddress->GetHost());
 
 		//authentication required!
 		if (!Authenticate())
@@ -102,8 +101,8 @@ const char* NNTPConnection::Request(const char* req)
 
 bool NNTPConnection::Authenticate()
 {
-	if (!(m_pNewsServer)->GetUser() ||
-		!(m_pNewsServer)->GetPassword())
+	if (!((NewsServer*)m_pNetAddress)->GetUser() ||
+		!((NewsServer*)m_pNetAddress)->GetPassword())
 	{
 		return true;
 	}
@@ -119,7 +118,7 @@ bool NNTPConnection::AuthInfoUser(int iRecur)
 	}
 
 	char tmp[1024];
-	snprintf(tmp, 1024, "AUTHINFO USER %s\r\n", m_pNewsServer->GetUser());
+	snprintf(tmp, 1024, "AUTHINFO USER %s\r\n", ((NewsServer*)m_pNetAddress)->GetUser());
 	tmp[1024-1] = '\0';
 
 	WriteLine(tmp);
@@ -127,13 +126,13 @@ bool NNTPConnection::AuthInfoUser(int iRecur)
 	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 	if (!answer)
 	{
-		ReportError("Authorization for %s failed: Connection closed by remote host.", GetHost(), true, 0);
+		ReportError("Authorization for %s failed: Connection closed by remote host.", m_pNetAddress->GetHost(), true, 0);
 		return false;
 	}
 
 	if (!strncmp(answer, "281", 3))
 	{
-		debug("Authorization for %s successful", GetHost());
+		debug("Authorization for %s successful", m_pNetAddress->GetHost());
 		return true;
 	}
 	else if (!strncmp(answer, "381", 3))
@@ -162,7 +161,7 @@ bool NNTPConnection::AuthInfoPass(int iRecur)
 	}
 
 	char tmp[1024];
-	snprintf(tmp, 1024, "AUTHINFO PASS %s\r\n", m_pNewsServer->GetPassword());
+	snprintf(tmp, 1024, "AUTHINFO PASS %s\r\n", ((NewsServer*)m_pNetAddress)->GetPassword());
 	tmp[1024-1] = '\0';
 
 	WriteLine(tmp);
@@ -170,12 +169,12 @@ bool NNTPConnection::AuthInfoPass(int iRecur)
 	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 	if (!answer)
 	{
-		ReportError("Authorization for %s failed: Connection closed by remote host.", GetHost(), true, 0);
+		ReportError("Authorization for %s failed: Connection closed by remote host.", m_pNetAddress->GetHost(), true, 0);
 		return false;
 	}
 	else if (!strncmp(answer, "2", 1))
 	{
-		debug("Authorization for %s successful", GetHost());
+		debug("Authorization for %s successful", m_pNetAddress->GetHost());
 		return true;
 	}
 	else if (!strncmp(answer, "381", 3))
@@ -213,7 +212,7 @@ const char* NNTPConnection::JoinGroup(const char* grp)
 
 	if (answer && !strncmp(answer, "2", 1))
 	{
-		debug("Changed group to %s on %s", grp, GetHost());
+		debug("Changed group to %s on %s", grp, GetServer()->GetHost());
 
 		if (m_szActiveGroup)
 		{
@@ -223,7 +222,8 @@ const char* NNTPConnection::JoinGroup(const char* grp)
 	}
 	else
 	{
-		debug("Error changing group on %s to %s: %s.", GetHost(), grp, answer);
+		debug("Error changing group on %s to %s: %s.",
+			 GetServer()->GetHost(), grp, answer);
 	}
 
 	return answer;
@@ -231,18 +231,28 @@ const char* NNTPConnection::JoinGroup(const char* grp)
 
 bool NNTPConnection::DoConnect()
 {
-	debug("Opening connection to %s", GetHost());
+	debug("Opening connection to %s", GetServer()->GetHost());
 	bool res = Connection::DoConnect();
 	if (!res)
 	{
 		return res;
 	}
 
+#ifndef DISABLE_TLS
+	if (GetNewsServer()->GetTLS())
+	{
+		if (!StartTLS())
+		{
+			return false;
+		}
+	}
+#endif
+
 	char* answer = DoReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 
 	if (!answer)
 	{
-		ReportError("Connection to %s failed: Connection closed by remote host.", GetHost(), true, 0);
+		ReportError("Connection to %s failed: Connection closed by remote host.", m_pNetAddress->GetHost(), true, 0);
 		return false;
 	}
 
@@ -252,7 +262,7 @@ bool NNTPConnection::DoConnect()
 		return false;
 	}
 
-	debug("Connection to %s established", GetHost());
+	debug("Connection to %s established", GetServer()->GetHost());
 
 	return true;
 }
@@ -274,7 +284,7 @@ bool NNTPConnection::DoDisconnect()
 void NNTPConnection::ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer)
 {
 	char szErrStr[1024];
-	snprintf(szErrStr, 1024, szMsgPrefix, GetHost(), szAnswer);
+	snprintf(szErrStr, 1024, szMsgPrefix, m_pNetAddress->GetHost(), szAnswer);
 	szErrStr[1024-1] = '\0';
 	
 	ReportError(szErrStr, NULL, false, 0);

NNTPConnection.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -33,7 +33,6 @@
 class NNTPConnection : public Connection
 {
 private:
-	NewsServer*				m_pNewsServer;
 	char* 					m_szActiveGroup;
 	char*					m_szLineBuf;
 	bool					m_bAuthError;
@@ -44,9 +43,9 @@ private:
 	void					ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer);
 
 public:
-							NNTPConnection(NewsServer* pNewsServer);
+							NNTPConnection(NewsServer* server);
 	virtual					~NNTPConnection();
-	NewsServer*				GetNewsServer() { return m_pNewsServer; }
+	NewsServer*				GetNewsServer() { return(NewsServer*)m_pNetAddress; }
 	const char* 			Request(const char* req);
 	bool 					Authenticate();
 	bool 					AuthInfoUser(int iRecur = 0);
@@ -55,5 +54,6 @@ public:
 	bool					GetAuthError() { return m_bAuthError; }
 };
 
+
 #endif
 

NTService.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$

NTService.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$

NZBFile.cpp

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -36,13 +36,11 @@
 #include <list>
 #ifdef WIN32
 #include <comutil.h>
-#import <msxml.tlb> named_guids 
+#import "MSXML.dll" named_guids 
 using namespace MSXML;
 #else
 #include <libxml/parser.h>
 #include <libxml/xmlreader.h>
-#include <libxml/xmlerror.h>
-#include <libxml/entities.h>
 #endif
 
 #include "nzbget.h"
@@ -67,13 +65,6 @@ NZBFile::NZBFile(const char* szFileName, const char* szCategory)
 	m_pNZBInfo->SetCategory(szCategory);
 	m_pNZBInfo->BuildDestDirName();
 
-#ifndef WIN32
-	m_pFileInfo = NULL;
-	m_pArticle = NULL;
-	m_szTagContent = NULL;
-	m_iTagContentLen = 0;
-#endif
-
     m_FileInfos.clear();
 }
 
@@ -97,18 +88,6 @@ NZBFile::~NZBFile()
 	{
 		m_pNZBInfo->Release();
 	}
-
-#ifndef WIN32
-	if (m_pFileInfo)
-	{
-		delete m_pFileInfo;
-	}
-	
-	if (m_szTagContent)
-	{
-		free(m_szTagContent);
-	}
-#endif
 }
 
 void NZBFile::LogDebugInfo()
@@ -161,10 +140,17 @@ void NZBFile::AddFileInfo(FileInfo* pFileInfo)
 
 	if (!pArticles->empty())
 	{
+		ParseSubject(pFileInfo);
 		m_FileInfos.push_back(pFileInfo);
 		pFileInfo->SetNZBInfo(m_pNZBInfo);
 		m_pNZBInfo->SetSize(m_pNZBInfo->GetSize() + pFileInfo->GetSize());
 		m_pNZBInfo->SetFileCount(m_pNZBInfo->GetFileCount() + 1);
+
+		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+		{
+			g_pDiskState->SaveFile(pFileInfo);
+			pFileInfo->ClearArticles();
+		}
 	}
 	else
 	{
@@ -172,34 +158,8 @@ void NZBFile::AddFileInfo(FileInfo* pFileInfo)
 	}
 }
 
-void NZBFile::ParseSubject(FileInfo* pFileInfo, bool TryQuotes)
+void NZBFile::ParseSubject(FileInfo* pFileInfo)
 {
-	if (TryQuotes)
-	{
-		// try to use the filename in quatation marks 
-		char* p = (char*)pFileInfo->GetSubject();
-		char* start = strchr(p, '\"');
-		if (start)
-		{
-			start++;
-			char* end = strchr(start + 1, '\"');
-			if (end)
-			{
-				int len = (int)(end - start);
-				char* point = strchr(start + 1, '.');
-				if (point && point < end)
-				{
-					char* filename = (char*)malloc(len + 1);
-					strncpy(filename, start, len);
-					filename[len] = '\0';
-					pFileInfo->SetFilename(filename);
-					free(filename);
-					return;
-				}
-			}
-		}
-	}
-
 	// tokenize subject, considering spaces as separators and quotation 
 	// marks as non separatable token delimiters.
 	// then take the last token containing dot (".") as a filename
@@ -282,14 +242,19 @@ void NZBFile::ParseSubject(FileInfo* pFileInfo, bool TryQuotes)
 		debug("Could not extract Filename from Subject: %s. Using Subject as Filename", pFileInfo->GetSubject());
 		pFileInfo->SetFilename(pFileInfo->GetSubject());
 	}
+
+	pFileInfo->MakeValidFilename();
 }
 
-bool NZBFile::HasDuplicateFilenames()
+/**
+ * Check if the parsing of subject was correct
+ */
+void NZBFile::CheckFilenames()
 {
-	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
+    for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
     {
         FileInfo* pFileInfo1 = *it;
-		int iDupe = 1;
+		int iDupe = 0;
 		for (FileInfos::iterator it2 = it + 1; it2 != m_FileInfos.end(); it2++)
 		{
 			FileInfo* pFileInfo2 = *it2;
@@ -308,52 +273,21 @@ bool NZBFile::HasDuplicateFilenames()
 		// an often case by posting-errors to repost bad files
 		if (iDupe > 2 || (iDupe == 2 && m_FileInfos.size() == 2))
 		{
-			return true;
+			for (FileInfos::iterator it2 = it; it2 != m_FileInfos.end(); it2++)
+			{
+				FileInfo* pFileInfo2 = *it2;
+				pFileInfo2->SetFilename(pFileInfo2->GetSubject());
+				pFileInfo2->MakeValidFilename();
+
+				if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+				{
+					g_pDiskState->LoadArticles(pFileInfo2);
+					g_pDiskState->SaveFile(pFileInfo2);
+					pFileInfo2->ClearArticles();
+				}
+			}
 		}
     }
-
-	return false;
-}
-
-/**
- * Generate filenames from subjects and check if the parsing of subject was correct
- */
-void NZBFile::ProcessFilenames()
-{
-	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
-    {
-        FileInfo* pFileInfo = *it;
-		ParseSubject(pFileInfo, true);
-	}
-
-	if (HasDuplicateFilenames())
-    {
-		for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
-		{
-			FileInfo* pFileInfo = *it;
-			ParseSubject(pFileInfo, false);
-		}
-	}
-
-	if (HasDuplicateFilenames())
-    {
-		for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
-		{
-			FileInfo* pFileInfo = *it;
-			pFileInfo->SetFilename(pFileInfo->GetSubject());
-		}
-    }
-
-	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
-    {
-        FileInfo* pFileInfo = *it;
-		pFileInfo->MakeValidFilename();
-		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-		{
-			g_pDiskState->SaveFile(pFileInfo);
-			pFileInfo->ClearArticles();
-		}
-	}
 }
 
 #ifdef WIN32
@@ -400,7 +334,7 @@ NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory, const c
     NZBFile* pFile = new NZBFile(szFileName, szCategory);
     if (pFile->ParseNZB(doc))
 	{
-		pFile->ProcessFilenames();
+		pFile->CheckFilenames();
 	}
 	else
 	{
@@ -448,13 +382,6 @@ bool NZBFile::ParseNZB(IUnknown* nzb)
         FileInfo* pFileInfo = new FileInfo();
 		pFileInfo->SetSubject(subject);
 
-		attribute = node->Getattributes()->getNamedItem("date");
-		if (attribute)
-		{
-			_bstr_t date(attribute->Gettext());
-			pFileInfo->SetTime(atoi(date));
-		}
-
 		MSXML::IXMLDOMNodeListPtr groupList = node->selectNodes("groups/group");
 		for (int g = 0; g < groupList->Getlength(); g++)
 		{
@@ -503,235 +430,144 @@ bool NZBFile::ParseNZB(IUnknown* nzb)
 
 NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory, const char* szBuffer, int iSize, bool bFromBuffer)
 {
-    NZBFile* pFile = new NZBFile(szFileName, szCategory);
-
-	xmlSAXHandler SAX_handler = {0};
-	SAX_handler.startElement = reinterpret_cast<startElementSAXFunc>(SAX_StartElement);
-	SAX_handler.endElement = reinterpret_cast<endElementSAXFunc>(SAX_EndElement);
-	SAX_handler.characters = reinterpret_cast<charactersSAXFunc>(SAX_characters);
-	SAX_handler.error = reinterpret_cast<errorSAXFunc>(SAX_error);
-	SAX_handler.getEntity = reinterpret_cast<getEntitySAXFunc>(SAX_getEntity);
-
-	int ret = 0;
-	pFile->m_bIgnoreNextError = false;
-
+    xmlTextReaderPtr doc;
 	if (bFromBuffer)
 	{
-		ret = xmlSAXUserParseMemory(&SAX_handler, pFile, szBuffer, iSize);
+		doc = xmlReaderForMemory(szBuffer, iSize-1, "", NULL, 0);
 	}
 	else
 	{
-		ret = xmlSAXUserParseFile(&SAX_handler, pFile, szFileName);
+		doc = xmlReaderForFile(szFileName, NULL, 0);
 	}
-        
-    if (ret == 0)
+    if (!doc)
+    {
+        return NULL;
+    }
+
+    NZBFile* pFile = new NZBFile(szFileName, szCategory);
+    if (pFile->ParseNZB(doc))
 	{
-		pFile->ProcessFilenames();
+		pFile->CheckFilenames();
 	}
 	else
 	{
-        error("Failed to parse nzb-file");
 		delete pFile;
 		pFile = NULL;
 	}
-	
-	return pFile;
+
+    xmlFreeTextReader(doc);
+
+    return pFile;
 }
 
-void NZBFile::Parse_StartElement(const char *name, const char **atts)
+bool NZBFile::ParseNZB(void* nzb)
 {
-	if (m_szTagContent)
-	{
-		free(m_szTagContent);
-		m_szTagContent = NULL;
-		m_iTagContentLen = 0;
-	}
-	
-	if (!strcmp("file", name))
-	{
-		m_pFileInfo = new FileInfo();
-		m_pFileInfo->SetFilename(m_szFileName);
+	FileInfo* pFileInfo = NULL;
+	xmlTextReaderPtr node = (xmlTextReaderPtr)nzb;
+    // walk through whole doc and search for segments-tags
+    int ret = xmlTextReaderRead(node);
+    while (ret == 1)
+    {
+        if (node)
+        {
+            xmlChar *name, *value;
 
-    	for (int i = 0; atts[i]; i += 2)
-    	{
-    		const char* attrname = atts[i];
-    		const char* attrvalue = atts[i + 1];
-			if (!strcmp("subject", attrname))
-			{
-				m_pFileInfo->SetSubject(attrvalue);
-			}
-			if (!strcmp("date", attrname))
-			{
-				m_pFileInfo->SetTime(atoi(attrvalue));
-			}
-		}
-	}
-	else if (!strcmp("segment", name))
-	{
-		if (!m_pFileInfo)
-		{
-			// error: bad nzb-file
-			return;
-		}
-	
-		long long lsize = -1;
-		int partNumber = -1;
+            name = xmlTextReaderName(node);
+            if (name == NULL)
+            {
+                name = xmlStrdup(BAD_CAST "--");
+            }
+            value = xmlTextReaderValue(node);
 
-    	for (int i = 0; atts[i]; i += 2)
-    	{
-    		const char* attrname = atts[i];
-    		const char* attrvalue = atts[i + 1];
-			if (!strcmp("bytes", attrname))
-			{
-				lsize = atol(attrvalue);
-			}
-			if (!strcmp("number", attrname))
-			{
-				partNumber = atol(attrvalue);
-			}
-		}
-		if (lsize > 0)
-		{
-			m_pFileInfo->SetSize(m_pFileInfo->GetSize() + lsize);
-		}
+            if (xmlTextReaderNodeType(node) == 1)
+            {
+                if (!strcmp("file", (char*)name))
+                {
+                    pFileInfo = new FileInfo();
+                    pFileInfo->SetFilename(m_szFileName);
 
-		if (partNumber > 0)
-		{
-			// new segment, add it!
-			m_pArticle = new ArticleInfo();
-			m_pArticle->SetPartNumber(partNumber);
-			m_pArticle->SetSize(lsize);
-			AddArticle(m_pFileInfo, m_pArticle);
-		}
-	}
-}
+                    while (xmlTextReaderMoveToNextAttribute(node))
+                    {
+						xmlFree(name);
+            			name = xmlTextReaderName(node);
+                        if (!strcmp("subject",(char*)name))
+                        {
+							xmlFree(value);
+							value = xmlTextReaderValue(node);
+                            pFileInfo->SetSubject((char*)value);
+                        }
+                    }
+                }
+                else if (!strcmp("segment",(char*)name))
+                {
+                    long long lsize = -1;
+                    int partNumber = -1;
 
-void NZBFile::Parse_EndElement(const char *name)
-{
-	if (!strcmp("file", name))
-	{
-		// Close the file element, add the new file to file-list
-		AddFileInfo(m_pFileInfo);
-		m_pFileInfo = NULL;
-		m_pArticle = NULL;
-	}
-	else if (!strcmp("group", name))
-	{
-		if (!m_pFileInfo)
-		{
-			// error: bad nzb-file
-			return;
-		}
-		
-		m_pFileInfo->GetGroups()->push_back(m_szTagContent);
-		m_szTagContent = NULL;
-		m_iTagContentLen = 0;
-	}
-	else if (!strcmp("segment", name))
-	{
-		if (!m_pFileInfo || !m_pArticle)
-		{
-			// error: bad nzb-file
-			return;
-		}
+                    while (xmlTextReaderMoveToNextAttribute(node))
+                    {
+						xmlFree(name);
+						name = xmlTextReaderName(node);
+						xmlFree(value);
+						value = xmlTextReaderValue(node);
+                        if (!strcmp("bytes",(char*)name))
+                        {
+                            lsize = atol((char*)value);
+                        }
+                        if (!strcmp("number",(char*)name))
+                        {
+                            partNumber = atol((char*)value);
+                        }
+                    }
+                    if (lsize > 0)
+                    {
+                        pFileInfo->SetSize(pFileInfo->GetSize() + lsize);
+                    }
+                    
+					/* Get the #text part */
+                    ret = xmlTextReaderRead(node);
 
-		// Get the #text part
-		char ID[2048];
-		snprintf(ID, 2048, "<%s>", m_szTagContent);
-		m_pArticle->SetMessageID(ID);
-		m_pArticle = NULL;
-	}
-}
+                    if (partNumber > 0)
+                    {
+                        // new segment, add it!
+						xmlFree(value);
+						value = xmlTextReaderValue(node);
+                        char tmp[2048];
+                        snprintf(tmp, 2048, "<%s>", (char*)value);
+                        ArticleInfo* pArticle = new ArticleInfo();
+                        pArticle->SetPartNumber(partNumber);
+                        pArticle->SetMessageID(tmp);
+                        pArticle->SetSize(lsize);
+						AddArticle(pFileInfo, pArticle);
+                    }
+                }
+                else if (!strcmp("group",(char*)name))
+                {
+                    ret = xmlTextReaderRead(node);
+					xmlFree(value);
+					value = xmlTextReaderValue(node);
+                    pFileInfo->GetGroups()->push_back(strdup((char*)value));
+                }
+            }
 
-void NZBFile::Parse_Content(const char *buf, int len)
-{
-	m_szTagContent = (char*)realloc(m_szTagContent, m_iTagContentLen + len + 1);
-	strncpy(m_szTagContent + m_iTagContentLen, buf, len);
-	m_iTagContentLen += len;
-	m_szTagContent[m_iTagContentLen] = '\0';
-}
+            if (xmlTextReaderNodeType(node) == 15)
+            {
+                /* Close the file element, add the new file to file-list */
+                if (!strcmp("file",(char*)name))
+                {
+					AddFileInfo(pFileInfo);
+                }
+            }
 
-void NZBFile::SAX_StartElement(NZBFile* pFile, const char *name, const char **atts)
-{
-	pFile->Parse_StartElement(name, atts);
-}
-
-void NZBFile::SAX_EndElement(NZBFile* pFile, const char *name)
-{
-	pFile->Parse_EndElement(name);
-}
-
-void NZBFile::SAX_characters(NZBFile* pFile, const char * xmlstr, int len)
-{
-	char* str = (char*)xmlstr;
-	
-	// trim starting blanks
-	int off = 0;
-	for (int i = 0; i < len; i++)
-	{
-		char ch = str[i];
-		if (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
-		{
-			off++;
-		}
-		else
-		{
-			break;
-		}
-	}
-	
-	int newlen = len - off;
-	
-	// trim ending blanks
-	for (int i = len - 1; i >= off; i--)
-	{
-		char ch = str[i];
-		if (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
-		{
-			newlen--;
-		}
-		else
-		{
-			break;
-		}
-	}
-	
-	if (newlen > 0)
-	{
-		// interpret tag content
-		pFile->Parse_Content(str + off, newlen);
-	}
-}
-
-void* NZBFile::SAX_getEntity(NZBFile* pFile, const char * name)
-{
-	xmlEntityPtr e = xmlGetPredefinedEntity((xmlChar* )name);
-	if (!e)
-	{
-		warn("entity not found");
-		pFile->m_bIgnoreNextError = true;
-	}
-
-	return e;
-}
-
-void NZBFile::SAX_error(NZBFile* pFile, const char *msg, ...)
-{
-	if (pFile->m_bIgnoreNextError)
-	{
-		pFile->m_bIgnoreNextError = false;
-		return;
-	}
-	
-    va_list argp;
-    va_start(argp, msg);
-    char szErrMsg[1024];
-    vsnprintf(szErrMsg, sizeof(szErrMsg), msg, argp);
-    szErrMsg[1024-1] = '\0';
-    va_end(argp);
-
-	// remove trailing CRLF
-	for (char* pend = szErrMsg + strlen(szErrMsg) - 1; pend >= szErrMsg && (*pend == '\n' || *pend == '\r' || *pend == ' '); pend--) *pend = '\0';
-    error("Error parsing nzb-file: %s", szErrMsg);
+            xmlFree(name);
+            xmlFree(value);
+        }
+        ret = xmlTextReaderRead(node);
+    }
+    if (ret != 0)
+    {
+        error("Failed to parse nzb-file\n");
+		return false;
+    }
+	return true;
 }
 #endif

NZBFile.h

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -44,27 +44,13 @@ private:
 						NZBFile(const char* szFileName, const char* szCategory);
 	void				AddArticle(FileInfo* pFileInfo, ArticleInfo* pArticleInfo);
 	void				AddFileInfo(FileInfo* pFileInfo);
-	void				ParseSubject(FileInfo* pFileInfo, bool TryQuotes);
-	void				ProcessFilenames();
-	bool				HasDuplicateFilenames();
+	void				ParseSubject(FileInfo* pFileInfo);
+	void				CheckFilenames();
 #ifdef WIN32
     bool 				ParseNZB(IUnknown* nzb);
 	static void			EncodeURL(const char* szFilename, char* szURL);
 #else
-	FileInfo*			m_pFileInfo;
-	ArticleInfo*		m_pArticle;
-	char*				m_szTagContent;
-	int					m_iTagContentLen;
-	bool				m_bIgnoreNextError;
-
-	static void			SAX_StartElement(NZBFile* pFile, const char *name, const char **atts);
-	static void			SAX_EndElement(NZBFile* pFile, const char *name);
-	static void			SAX_characters(NZBFile* pFile, const char * xmlstr, int len);
-	static void*		SAX_getEntity(NZBFile* pFile, const char * name);
-	static void			SAX_error(NZBFile* pFile, const char *msg, ...);
-	void				Parse_StartElement(const char *name, const char **atts);
-	void				Parse_EndElement(const char *name);
-	void				Parse_Content(const char *buf, int len);
+    bool 				ParseNZB(void* nzb);
 #endif
 	static NZBFile*		Create(const char* szFileName, const char* szCategory, const char* szBuffer, int iSize, bool bFromBuffer);
 

NetAddress.cpp

@@ -0,0 +1,54 @@
+/*
+ *  This file if part of nzbget
+ *
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "nzbget.h"
+#include "NetAddress.h"
+
+NetAddress::NetAddress(const char* szHost, int iPort)
+{
+	m_szHost = NULL;
+	m_iPort = iPort;
+	if (szHost)
+		m_szHost = strdup(szHost);
+}
+
+NetAddress::~NetAddress()
+{
+	if (m_szHost)
+		free(m_szHost);
+	m_szHost = NULL;
+}

NetAddress.h

@@ -0,0 +1,44 @@
+/*
+ *  This file if part of nzbget
+ *
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef NETADDRESS_H
+#define NETADDRESS_H
+
+class NetAddress
+{
+private:
+	char*			m_szHost;
+	int				m_iPort;
+
+public:
+	NetAddress(const char* szHost, int iPort);
+	virtual 		~NetAddress();
+	const char*		GetHost() { return m_szHost; }
+	int				GetPort() { return m_iPort; }
+};
+
+
+#endif

NewsServer.cpp

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -37,11 +37,10 @@
 
 #include "nzbget.h"
 #include "NewsServer.h"
+#include "Log.h"
 
-NewsServer::NewsServer(const char* szHost, int iPort, const char* szUser, const char* szPass, bool bJoinGroup, bool bTLS, int iMaxConnections, int iLevel)
+NewsServer::NewsServer(const char* szHost, int iPort, const char* szUser, const char* szPass, bool bJoinGroup, bool bTLS, int iMaxConnections, int iLevel) : NetAddress(szHost, iPort)
 {
-	m_szHost = NULL;
-	m_iPort = iPort;
 	m_szUser = NULL;
 	m_szPassword = NULL;
 	m_iLevel = iLevel;
@@ -49,10 +48,6 @@ NewsServer::NewsServer(const char* szHost, int iPort, const char* szUser, const
 	m_bJoinGroup = bJoinGroup;
 	m_bTLS = bTLS;
 
-	if (szHost)
-	{
-		m_szHost = strdup(szHost);
-	}
 	if (szUser)
 	{
 		m_szUser = strdup(szUser);
@@ -65,10 +60,6 @@ NewsServer::NewsServer(const char* szHost, int iPort, const char* szUser, const
 
 NewsServer::~NewsServer()
 {
-	if (m_szHost)
-	{
-		free(m_szHost);
-	}
 	if (m_szUser)
 	{
 		free(m_szUser);

NewsServer.h

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -27,11 +27,11 @@
 #ifndef NEWSSERVER_H
 #define NEWSSERVER_H
 
-class NewsServer
+#include "NetAddress.h"
+
+class NewsServer : public NetAddress
 {
 private:
-	char*			m_szHost;
-	int				m_iPort;
 	char*			m_szUser;
 	char*			m_szPassword;
 	int				m_iMaxConnections;
@@ -41,9 +41,7 @@ private:
 
 public:
 					NewsServer(const char* szHost, int iPort, const char* szUser, const char* szPass, bool bJoinGroup, bool bTLS, int iMaxConnections, int iLevel);
-					~NewsServer();
-	const char*		GetHost() { return m_szHost; }
-	int				GetPort() { return m_iPort; }
+	virtual			~NewsServer();
 	const char*		GetUser() { return m_szUser; }
 	const char*		GetPassword() { return m_szPassword; }
 	int				GetMaxConnections() { return m_iMaxConnections; }

Observer.cpp

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32

Observer.h

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$

Options.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -40,28 +40,17 @@ public:
 		opClientRequestListFiles,
 		opClientRequestListGroups,
 		opClientRequestListStatus,
+		opClientRequestPause,
+		opClientRequestUnpause,
 		opClientRequestSetRate,
 		opClientRequestDumpDebug,
 		opClientRequestEditQueue,
 		opClientRequestLog,
 		opClientRequestShutdown,
-		opClientRequestReload,
 		opClientRequestVersion,
 		opClientRequestPostQueue,
 		opClientRequestWriteLog,
-		opClientRequestScanSync,
-		opClientRequestScanAsync,
-		opClientRequestDownloadPause,
-		opClientRequestDownloadUnpause,
-		opClientRequestDownload2Pause,
-		opClientRequestDownload2Unpause,
-		opClientRequestPostPause,
-		opClientRequestPostUnpause,
-		opClientRequestScanPause,
-		opClientRequestScanUnpause,
-		opClientRequestHistory,
-		opClientRequestDownloadUrl,
-		opClientRequestUrlQueue
+		opClientRequestScan
 	};
 	enum EMessageTarget
 	{
@@ -92,53 +81,25 @@ public:
 		slDebug
 	};
 
-	enum EMatchMode
-	{
-		mmID = 1,
-		mmName,
-		mmRegEx
-	};
-
-	enum EDomain
-	{
-		dmServer = 1,
-		dmPostProcess
-	};
-
 	class OptEntry
 	{
 	private:
 		char*			m_szName;
 		char*			m_szValue;
-		char*			m_szDefValue;
-		int				m_iLineNo;
 
 		void			SetName(const char* szName);
 		void			SetValue(const char* szValue);
-		void			SetLineNo(int iLineNo) { m_iLineNo = iLineNo; }
 
 		friend class Options;
 
 	public:
 						OptEntry();
-						OptEntry(const char* szName, const char* szValue);
 						~OptEntry();
 		const char*		GetName() { return m_szName; }
 		const char*		GetValue() { return m_szValue; }
-		const char*		GetDefValue() { return m_szDefValue; }
-		int				GetLineNo() { return m_iLineNo; }
 	};
 	
-	typedef std::vector<OptEntry*>  OptEntriesBase;
-
-	class OptEntries: public OptEntriesBase
-	{
-	public:
-						~OptEntries();
-		OptEntry*		FindOption(const char* szName);
-	};
-
-	typedef std::vector<char*>  NameList;
+	typedef std::vector<OptEntry*>  OptEntries;
 
 private:
 	OptEntries			m_OptEntries;
@@ -146,14 +107,11 @@ private:
 	Mutex				m_mutexOptEntries;
 
 	// Options
-	bool				m_bConfigErrors;
-	int					m_iConfigLine;
 	char*				m_szConfigFilename;
 	char*				m_szDestDir;
 	char*				m_szTempDir;
 	char*				m_szQueueDir;
 	char*				m_szNzbDir;
-	char*				m_szWebDir;
 	EMessageTarget		m_eInfoTarget;
 	EMessageTarget		m_eWarningTarget;
 	EMessageTarget		m_eErrorTarget;
@@ -172,16 +130,14 @@ private:
 	int					m_iRetryInterval;
 	bool				m_bSaveQueue;
 	bool				m_bDupeCheck;
-	char*				m_szControlIP;
-	char*				m_szControlPassword;
-	int					m_szControlPort;
+	char*				m_szServerIP;
+	char*				m_szServerPassword;
+	int					m_szServerPort;
 	char*				m_szLockFile;
 	char*				m_szDaemonUserName;
 	EOutputMode			m_eOutputMode;
 	bool				m_bReloadQueue;
-	bool				m_bReloadUrlQueue;
 	bool				m_bReloadPostQueue;
-	int					m_iUrlConnections;
 	int					m_iLogBufferSize;
 	bool				m_bCreateLog;
 	char*				m_szLogFile;
@@ -189,9 +145,7 @@ private:
 	bool				m_bParCheck;
 	bool				m_bParRepair;
 	char*				m_szPostProcess;
-	char*				m_szPostConfigFilename;
 	char*				m_szNZBProcess;
-	char*				m_szNZBAddedProcess;
 	bool				m_bStrictParName;
 	bool				m_bNoConfig;
 	int					m_iUMask;
@@ -218,8 +172,6 @@ private:
 	bool				m_bDeleteCleanupDisk;
 	bool				m_bMergeNzb;
 	int					m_iParTimeLimit;
-	int					m_iKeepHistory;
-	bool				m_bAccurateRate;
 
 	// Parsed command-line parameters
 	bool				m_bServerMode;
@@ -229,14 +181,9 @@ private:
 	int					m_iEditQueueOffset;
 	int*				m_pEditQueueIDList;
 	int					m_iEditQueueIDCount;
-	NameList			m_EditQueueNameList;
-	EMatchMode			m_EMatchMode;
 	char*				m_szEditQueueText;
 	char*				m_szArgFilename;
-	char*				m_szAddCategory;
-	int					m_iAddPriority;
-	bool				m_bAddPaused;
-	char*				m_szAddNZBFilename;
+	char*				m_szCategory;
 	char*				m_szLastArg;
 	bool				m_bPrintOptions;
 	bool				m_bAddTop;
@@ -246,10 +193,7 @@ private:
 	bool				m_bTestBacktrace;
 
 	// Current state
-	bool				m_bPauseDownload;
-	bool				m_bPauseDownload2;
-	bool				m_bPausePostProcess;
-	bool				m_bPauseScan;
+	bool				m_bPause;
 	float				m_fDownloadRate;
 	EClientOperation	m_eClientOperation;
 
@@ -257,46 +201,35 @@ private:
 	void				InitOptFile();
 	void				InitCommandLine(int argc, char* argv[]);
 	void				InitOptions();
-	void				InitPostConfig();
 	void				InitFileArg(int argc, char* argv[]);
 	void				InitServers();
 	void				InitScheduler();
 	void				CheckOptions();
 	void				PrintUsage(char* com);
 	void				Dump();
-	int					ParseEnumValue(const char* OptName, int argc, const char* argn[], const int argv[]);
-	int					ParseIntValue(const char* OptName, int iBase);
-	float				ParseFloatValue(const char* OptName);
+	int					ParseOptionValue(const char* OptName, int argc, const char* argn[], const int argv[]);
 	OptEntry*			FindOption(const char* optname);
 	const char*			GetOption(const char* optname);
 	void				SetOption(const char* optname, const char* value);
 	bool				SetOptionString(const char* option);
 	bool				ValidateOptionName(const char* optname);
-	void				LoadConfigFile();
-	void				CheckDir(char** dir, const char* szOptionName, bool bAllowEmpty, bool bCreate);
+	void				LoadConfig(const char* configfile);
+	void				CheckDir(char** dir, const char* szOptionName, bool bAllowEmpty);
 	void				ParseFileIDList(int argc, char* argv[], int optind);
-	void				ParseFileNameList(int argc, char* argv[], int optind);
-	bool				ParseTime(const char** pTime, int* pHours, int* pMinutes);
+	bool				ParseTime(const char* szTime, int* pHours, int* pMinutes);
 	bool				ParseWeekDays(const char* szWeekDays, int* pWeekDaysBits);
-	void				ConfigError(const char* msg, ...);
-	void				ConvertOldOptionName(char *szOption, int iBufLen);
 
 public:
 						Options(int argc, char* argv[]);
 						~Options();
 
-	bool				LoadConfig(EDomain eDomain, OptEntries* pOptEntries);
-	bool				SaveConfig(EDomain eDomain, OptEntries* pOptEntries);
-
 	// Options
 	OptEntries*			LockOptEntries();
 	void				UnlockOptEntries();
-	const char*			GetConfigFilename() { return m_szConfigFilename; }
 	const char*			GetDestDir() { return m_szDestDir; }
 	const char*			GetTempDir() { return m_szTempDir; }
 	const char*			GetQueueDir() { return m_szQueueDir; }
 	const char*			GetNzbDir() { return m_szNzbDir; }
-	const char*			GetWebDir() { return m_szWebDir; }
 	bool				GetCreateBrokenLog() const { return m_bCreateBrokenLog; }
 	bool				GetResetLog() const { return m_bResetLog; }
 	EMessageTarget		GetInfoTarget() const { return m_eInfoTarget; }
@@ -315,26 +248,22 @@ public:
 	int					GetRetryInterval() { return m_iRetryInterval; }
 	bool				GetSaveQueue() { return m_bSaveQueue; }
 	bool				GetDupeCheck() { return m_bDupeCheck; }
-	const char*			GetControlIP() { return m_szControlIP; }
-	const char*			GetControlPassword() { return m_szControlPassword; }
-	int					GetControlPort() { return m_szControlPort; }
-	const char*			GetLockFile() { return m_szLockFile; }
-	const char*			GetDaemonUserName() { return m_szDaemonUserName; }
+	char*				GetServerIP() { return m_szServerIP; }
+	char*				GetServerPassword() { return m_szServerPassword; }
+	int					GetServerPort() { return m_szServerPort; }
+	char*				GetLockFile() { return m_szLockFile; }
+	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; }
 	bool				GetCreateLog() { return m_bCreateLog; }
-	const char*			GetLogFile() { return m_szLogFile; }
+	char*				GetLogFile() { return m_szLogFile; }
 	ELoadPars			GetLoadPars() { return m_eLoadPars; }
 	bool				GetParCheck() { return m_bParCheck; }
 	bool				GetParRepair() { return m_bParRepair; }
 	const char*			GetPostProcess() { return m_szPostProcess; }
-	const char*			GetPostConfigFilename() { return m_szPostConfigFilename; }
 	const char*			GetNZBProcess() { return m_szNZBProcess; }
-	const char*			GetNZBAddedProcess() { return m_szNZBAddedProcess; }
 	bool				GetStrictParName() { return m_bStrictParName; }
 	int					GetUMask() { return m_iUMask; }
 	int					GetUpdateInterval() {return m_iUpdateInterval; }
@@ -360,8 +289,6 @@ public:
 	bool				GetDeleteCleanupDisk() { return m_bDeleteCleanupDisk; }
 	bool				GetMergeNzb() { return m_bMergeNzb; }
 	int					GetParTimeLimit() { return m_iParTimeLimit; }
-	int					GetKeepHistory() { return m_iKeepHistory; }
-	bool				GetAccurateRate() { return m_bAccurateRate; }
 
 	// Parsed command-line parameters
 	bool				GetServerMode() { return m_bServerMode; }
@@ -372,15 +299,10 @@ public:
 	int					GetEditQueueOffset() { return m_iEditQueueOffset; }
 	int*				GetEditQueueIDList() { return m_pEditQueueIDList; }
 	int					GetEditQueueIDCount() { return m_iEditQueueIDCount; }
-	NameList*			GetEditQueueNameList() { return &m_EditQueueNameList; }
-	EMatchMode			GetMatchMode() { return m_EMatchMode; }
 	const char*			GetEditQueueText() { return m_szEditQueueText; }
 	const char*			GetArgFilename() { return m_szArgFilename; }
-	const char*			GetAddCategory() { return m_szAddCategory; }
-	bool				GetAddPaused() { return m_bAddPaused; }
+	const char*			GetCategory() { return m_szCategory; }
 	const char*			GetLastArg() { return m_szLastArg; }
-	int					GetAddPriority() { return m_iAddPriority; }
-	char*				GetAddNZBFilename() { return m_szAddNZBFilename; }
 	bool				GetAddTop() { return m_bAddTop; }
 	float				GetSetRate() { return m_fSetRate; }
 	int					GetLogLines() { return m_iLogLines; }
@@ -388,14 +310,8 @@ public:
 	bool				GetTestBacktrace() { return m_bTestBacktrace; }
 
 	// 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				SetPause(bool bOnOff) { m_bPause = bOnOff; }
+	bool				GetPause() const { return m_bPause; }
 	void				SetDownloadRate(float fRate) { m_fDownloadRate = fRate; }
 	float				GetDownloadRate() const { return m_fDownloadRate; }
 };

ParChecker.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -24,7 +24,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -41,7 +41,6 @@
 #include <par2cmdline.h>
 #include <par2repairer.h>
 #else
-#include <unistd.h>
 #include <libpar2/par2cmdline.h>
 #include <libpar2/par2repairer.h>
 #endif
@@ -77,6 +76,7 @@ ParChecker::ParChecker()
 
 	m_eStatus = psUndefined;
 	m_szParFilename = NULL;
+	m_szNZBFilename = NULL;
 	m_szInfoName = NULL;
 	m_szErrMsg = NULL;
 	m_szProgressLabel = (char*)malloc(1024);
@@ -97,6 +97,10 @@ ParChecker::~ParChecker()
 	{
 		free(m_szParFilename);
 	}
+	if (m_szNZBFilename)
+	{
+		free(m_szNZBFilename);
+	}
 	if (m_szInfoName)
 	{
 		free(m_szInfoName);
@@ -132,6 +136,15 @@ void ParChecker::SetInfoName(const char * szInfoName)
 	m_szInfoName = strdup(szInfoName);
 }
 
+void ParChecker::SetNZBFilename(const char * szNZBFilename)
+{
+	if (m_szNZBFilename)
+	{
+		free(m_szNZBFilename);
+	}
+	m_szNZBFilename = strdup(szNZBFilename);
+}
+
 void ParChecker::SetStatus(EStatus eStatus)
 {
 	m_eStatus = eStatus;
@@ -233,7 +246,6 @@ void ParChecker::Run()
 			
 			m_mutexQueuedParFiles.Lock();
 			hasMorePars = !m_QueuedParFiles.empty();
-			m_bQueuedParFilesChanged = false;
 			m_mutexQueuedParFiles.Unlock();
 			
 			if (!requested && !hasMorePars)
@@ -246,15 +258,7 @@ void ParChecker::Run()
 			
 			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);
-				}
+				m_semNeedMoreFiles.Wait();
 			}
 		}
 
@@ -315,7 +319,7 @@ void ParChecker::Run()
 	
 	if (m_bCancelled)
 	{
-		warn("Repair cancelled for %s", m_szInfoName);
+		error("Repair cancelled for %s", m_szInfoName);
 		m_szErrMsg = strdup("repair cancelled");
 		SetStatus(psFailed);
 	}
@@ -366,14 +370,14 @@ void ParChecker::AddParFile(const char * szParFilename)
 {
 	m_mutexQueuedParFiles.Lock();
 	m_QueuedParFiles.push_back(strdup(szParFilename));
-	m_bQueuedParFilesChanged = true;
+	m_semNeedMoreFiles.Post();
 	m_mutexQueuedParFiles.Unlock();
 }
 
 void ParChecker::QueueChanged()
 {
 	m_mutexQueuedParFiles.Lock();
-	m_bQueuedParFilesChanged = true;
+	m_semNeedMoreFiles.Post();
 	m_mutexQueuedParFiles.Unlock();
 }
 

ParChecker.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -32,6 +32,7 @@
 
 #include "Thread.h"
 #include "Observer.h"
+#include "DownloadInfo.h"
 
 class ParChecker : public Thread, public Subject
 {
@@ -56,6 +57,7 @@ public:
 	
 private:
 	char*				m_szInfoName;
+	char*				m_szNZBFilename;
 	char*				m_szParFilename;
 	EStatus				m_eStatus;
 	EStage				m_eStage;
@@ -64,7 +66,7 @@ private:
 	bool				m_bRepairNotNeeded;
 	QueuedParFiles		m_QueuedParFiles;
 	Mutex			 	m_mutexQueuedParFiles;
-	bool				m_bQueuedParFilesChanged;
+	Semaphore			m_semNeedMoreFiles;
 	int					m_iProcessedFiles;
 	int					m_iFilesToRepair;
 	int					m_iExtraFiles;
@@ -100,6 +102,8 @@ public:
 	virtual void		Run();
 	const char*			GetParFilename() { return m_szParFilename; }
 	void				SetParFilename(const char* szParFilename);
+	const char*			GetNZBFilename() { return m_szNZBFilename; }
+	void				SetNZBFilename(const char* szNZBFilename);
 	const char*			GetInfoName() { return m_szInfoName; }
 	void				SetInfoName(const char* szInfoName);
 	void				SetStatus(EStatus eStatus);

PrePostProcessor.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -31,7 +31,6 @@
 #include "Thread.h"
 #include "Observer.h"
 #include "DownloadInfo.h"
-#include "Scanner.h"
 
 #ifndef DISABLE_PARCHECK
 #include "ParChecker.h"
@@ -39,18 +38,6 @@
 
 class PrePostProcessor : public Thread
 {
-public:
-	enum EEditAction
-	{
-		eaPostMoveOffset = 51,			// move post to m_iOffset relative to the current position in post-queue
-		eaPostMoveTop,
-		eaPostMoveBottom,
-		eaPostDelete,
-		eaHistoryDelete,
-		eaHistoryReturn,
-		eaHistoryProcess
-	};
-
 private:
 	typedef std::deque<char*>		FileList;
 
@@ -72,14 +59,10 @@ private:
 	class PostParChecker: public ParChecker
 	{
 	private:
-		PrePostProcessor*	m_Owner;
-		PostInfo*			m_pPostInfo;
+		PrePostProcessor* m_Owner;
 	protected:
 		virtual bool	RequestMorePars(int iBlockNeeded, int* pBlockFound);
 		virtual void	UpdateProgress();
-	public:
-		PostInfo*		GetPostInfo() { return m_pPostInfo; }
-		void			SetPostInfo(PostInfo* pPostInfo) { m_pPostInfo = pPostInfo; }
 
 		friend class PrePostProcessor;
 	};
@@ -97,40 +80,44 @@ private:
 	QueueCoordinatorObserver	m_QueueCoordinatorObserver;
 	bool				m_bHasMoreJobs;
 	bool				m_bPostScript;
+	bool				m_bNZBScript;
 	bool				m_bSchedulerPauseChanged;
 	bool				m_bSchedulerPause;
 	bool				m_bPostPause;
-	Scanner				m_Scanner;
+	bool				m_bRequestedNZBDirScan;
 
-	bool				IsNZBFileCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, 
-							bool bIgnorePausedPars, bool bCheckPostQueue, bool bAllowOnlyOneDeleted);
+	void				CheckIncomingNZBs(const char* szDirectory, const char* szCategory, bool bCheckTimestamp);
+	bool				IsNZBFileCompleted(DownloadQueue* pDownloadQueue, const char* szNZBFilename, 
+							bool bIgnoreFirstInPostQueue, bool bIgnorePaused, bool bCheckPostQueue, bool bAllowOnlyOneDeleted);
+	bool				JobExists(PostQueue* pPostQueue, const char* szNZBFilename, const char* szParFilename, bool bParCheck);
+	bool				ClearCompletedJobs(const char* szNZBFilename);
 	void				CheckPostQueue();
 	void				JobCompleted(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
 	void				StartScriptJob(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
-	void				SaveQueue(DownloadQueue* pDownloadQueue);
-	void				SanitisePostQueue(PostQueue* pPostQueue);
+	void				SavePostQueue();
+	void				SanitisePostQueue();
 	void				CheckDiskSpace();
+	void				AddFileToQueue(const char* szFilename, const char* szCategory);
+	void				ProcessIncomingFile(const char* szDirectory, const char* szBaseFilename, const char* szFullFilename, const char* szCategory);
 	void				ApplySchedulerState();
 	bool				PauseDownload();
 	bool				UnpauseDownload();
 	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				NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, FileInfo* pFileInfo);
+	void				NZBDeleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, FileInfo* pFileInfo);
 	bool				FindMainPars(const char* szPath, FileList* pFileList);
 	bool				ParseParFilename(const char* szParFilename, int* iBaseNameLen, int* iBlocks);
 	bool				SameParCollection(const char* szFilename1, const char* szFilename2);
-	bool				CreatePostJobs(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bParCheck, bool bPostScript, bool bAddTop);
+	bool				CreatePostJobs(DownloadQueue* pDownloadQueue, const char* szDestDir, const char* szNZBFilename,
+							const char* szCategory, NZBParameterList* pParameters, const char* szQueuedFilename,
+							bool bParCheck, bool bLockQueue, bool bAddTop);
 	void				DeleteQueuedFile(const char* szQueuedFile);
 	void				PausePars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
 	NZBInfo*			MergeGroups(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
-	bool				PostQueueMove(IDList* pIDList, EEditAction eAction, int iOffset);
-	bool				PostQueueDelete(IDList* pIDList);
-	bool				HistoryDelete(IDList* pIDList);
-	bool				HistoryReturn(IDList* pIDList, bool bReprocess);
-	void				Cleanup();
-	FileInfo*			GetQueueGroup(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
-	void				CheckHistory();
+
+	Mutex			 	m_mutexQueue;
+	PostQueue			m_PostQueue;
+	PostQueue			m_CompletedJobs;
 
 #ifndef DISABLE_PARCHECK
 	PostParChecker		m_ParChecker;
@@ -138,8 +125,10 @@ private:
 
 	void				ParCheckerUpdate(Subject* Caller, void* Aspect);
 	bool				AddPar(FileInfo* pFileInfo, bool bDeleted);
-	bool				RequestMorePars(NZBInfo* pNZBInfo, const char* szParFilename, int iBlockNeeded, int* pBlockFound);
-	void				FindPars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, const char* szParFilename, 
+	FileInfo*			GetParCleanupQueueGroup(DownloadQueue* pDownloadQueue, const char* szNZBFilename);
+	bool				HasFailedParJobs(const char* szNZBFilename, bool bIgnoreRepairPossible);
+	bool				RequestMorePars(const char* szNZBFilename, const char* szParFilename, int iBlockNeeded, int* pBlockFound);
+	void				FindPars(DownloadQueue* pDownloadQueue, const char* szNZBFilename, const char* szParFilename, 
 							Blocks* pBlocks, bool bStrictParName, bool bExactParName, int* pBlockFound);
 	void				UpdateParProgress();
 	void				StartParJob(PostInfo* pPostInfo);
@@ -152,8 +141,9 @@ public:
 	virtual void		Stop();
 	void				QueueCoordinatorUpdate(Subject* Caller, void* Aspect);
 	bool				HasMoreJobs() { return m_bHasMoreJobs; }
-	void				ScanNZBDir(bool bSyncMode);
-	bool				QueueEditList(IDList* pIDList, EEditAction eAction, int iOffset);
+	PostQueue*			LockPostQueue();
+	void				UnlockPostQueue();
+	void				ScanNZBDir();
 };
 
 #endif

QueueCoordinator.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -60,6 +60,8 @@ QueueCoordinator::QueueCoordinator()
 	debug("Creating QueueCoordinator");
 
 	m_bHasMoreJobs = true;
+	m_DownloadQueue.clear();
+	m_ActiveDownloads.clear();
 	ResetSpeedStat();
 
 	m_iAllBytes = 0;
@@ -77,11 +79,11 @@ QueueCoordinator::~QueueCoordinator()
 	// Cleanup
 
 	debug("Deleting DownloadQueue");
-	for (FileQueue::iterator it = m_DownloadQueue.GetFileQueue()->begin(); it != m_DownloadQueue.GetFileQueue()->end(); it++)
+	for (DownloadQueue::iterator it = m_DownloadQueue.begin(); it != m_DownloadQueue.end(); it++)
 	{
 		delete *it;
 	}
-	m_DownloadQueue.GetFileQueue()->clear();
+	m_DownloadQueue.clear();
 
 	debug("Deleting ArticleDownloaders");
 	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
@@ -125,9 +127,9 @@ void QueueCoordinator::Run()
 
 	while (!IsStopped())
 	{
-		if (!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
+		if (!g_pOptions->GetPause())
 		{
-			NNTPConnection* pConnection = g_pServerPool->GetConnection(0);
+			NNTPConnection* pConnection = g_pServerPool->GetConnection(0, false);
 			if (pConnection)
 			{
 				// start download for next article
@@ -168,12 +170,9 @@ void QueueCoordinator::Run()
 		int iSleepInterval = bStandBy ? 100 : 5;
 		usleep(iSleepInterval * 1000);
 
-		if (!bStandBy)
-		{
-			AddSpeedReading(0);
-		}
+		AddSpeedReading(0);
 
-		iResetCounter += iSleepInterval;
+		iResetCounter+= iSleepInterval;
 		if (iResetCounter >= 1000)
 		{
 			// this code should not be called too often, once per second is OK
@@ -206,9 +205,9 @@ void QueueCoordinator::AddNZBFileToQueue(NZBFile* pNZBFile, bool bAddFirst)
 
 	m_mutexDownloadQueue.Lock();
 
-	FileQueue tmpFileQueue;
-	tmpFileQueue.clear();
-	FileQueue DupeList;
+	DownloadQueue tmpDownloadQueue;
+	tmpDownloadQueue.clear();
+	DownloadQueue DupeList;
 	DupeList.clear();
 
 	int index1 = 0;
@@ -249,27 +248,27 @@ void QueueCoordinator::AddNZBFileToQueue(NZBFile* pNZBFile, bool bAddFirst)
 
 		if (bAddFirst)
 		{
-			tmpFileQueue.push_front(pFileInfo);
+			tmpDownloadQueue.push_front(pFileInfo);
 		}
 		else
 		{
-			tmpFileQueue.push_back(pFileInfo);
+			tmpDownloadQueue.push_back(pFileInfo);
 		}
 	}
 
-	for (FileQueue::iterator it = tmpFileQueue.begin(); it != tmpFileQueue.end(); it++)
+	for (DownloadQueue::iterator it = tmpDownloadQueue.begin(); it != tmpDownloadQueue.end(); it++)
 	{
 		if (bAddFirst)
 		{
-			m_DownloadQueue.GetFileQueue()->push_front(*it);
+			m_DownloadQueue.push_front(*it);
 		}
 		else
 		{
-			m_DownloadQueue.GetFileQueue()->push_back(*it);
+			m_DownloadQueue.push_back(*it);
 		}
 	}
 
-	for (FileQueue::iterator it = DupeList.begin(); it != DupeList.end(); it++)
+	for (DownloadQueue::iterator it = DupeList.begin(); it != DupeList.end(); it++)
 	{
 		FileInfo* pFileInfo = *it;
 		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
@@ -279,8 +278,6 @@ void QueueCoordinator::AddNZBFileToQueue(NZBFile* pNZBFile, bool bAddFirst)
 		delete pFileInfo;
 	}
 
-	m_DownloadQueue.GetNZBInfoList()->Add(pNZBFile->GetNZBInfo());
-
 	pNZBFile->DetachFileInfos();
 
 	Aspect aspect = { eaNZBFileAdded, &m_DownloadQueue, pNZBFile->GetNZBInfo(), NULL };
@@ -294,6 +291,25 @@ void QueueCoordinator::AddNZBFileToQueue(NZBFile* pNZBFile, bool bAddFirst)
 	m_mutexDownloadQueue.Unlock();
 }
 
+bool QueueCoordinator::AddFileToQueue(const char* szFileName, const char* szCategory)
+{
+	// Parse the buffer and make it into a NZBFile
+	NZBFile* pNZBFile = NZBFile::CreateFromFile(szFileName, szCategory);
+
+	// Did file parse correctly?
+	if (!pNZBFile)
+	{
+		return false;
+	}
+
+	// Add NZBFile to Queue
+	AddNZBFileToQueue(pNZBFile, false);
+
+	delete pNZBFile;
+
+	return true;
+}
+
 /*
  * NOTE: see note to "AddSpeedReading"
  */
@@ -313,20 +329,20 @@ float QueueCoordinator::CalcCurrentDownloadSpeed()
 	return fSpeed;
 }
 
+/*
+ * NOTE: we should use mutex by access to m_iSpeedBytes and m_iSpeedBytesIndex,
+ * but this would results in a big performance loss (the function 
+ * "AddSpeedReading" is called extremly often), so we better agree with calculation 
+ * errors possible because of simultaneuos access from several threads.
+ * The used algorithm is able to recover after few seconds.
+ * In any case the calculation errors can not result in fatal system 
+ * errors (segmentation faults).
+ */
 void QueueCoordinator::AddSpeedReading(int iBytes)
 {
     int iNowSlot = (int)time(NULL) / SPEEDMETER_SLOTSIZE;
 
-	if (g_pOptions->GetAccurateRate())
-	{
-#ifdef HAVE_SPINLOCK
-		m_spinlockSpeed.Lock();
-#else
-		m_mutexSpeed.Lock();
-#endif
-	}
-
-    while (iNowSlot > m_iSpeedTime[m_iSpeedBytesIndex])
+    if (iNowSlot > m_iSpeedTime[m_iSpeedBytesIndex])
     {
         //record bytes in next slot
         m_iSpeedBytesIndex++;
@@ -354,15 +370,6 @@ void QueueCoordinator::AddSpeedReading(int iBytes)
     m_iSpeedBytes[m_iSpeedBytesIndex] += iBytes;
     m_iSpeedTotalBytes += iBytes;
 	m_iAllBytes += iBytes;
-
-	if (g_pOptions->GetAccurateRate())
-	{
-#ifdef HAVE_SPINLOCK
-		m_spinlockSpeed.Unlock();
-#else
-		m_mutexSpeed.Unlock();
-#endif
-	}
 }
 
 void QueueCoordinator::ResetSpeedStat()
@@ -382,7 +389,7 @@ long long QueueCoordinator::CalcRemainingSize()
 	long long lRemainingSize = 0;
 
 	m_mutexDownloadQueue.Lock();
-	for (FileQueue::iterator it = m_DownloadQueue.GetFileQueue()->begin(); it != m_DownloadQueue.GetFileQueue()->end(); it++)
+	for (DownloadQueue::iterator it = m_DownloadQueue.begin(); it != m_DownloadQueue.end(); it++)
 	{
 		FileInfo* pFileInfo = *it;
 		if (!pFileInfo->GetPaused() && !pFileInfo->GetDeleted())
@@ -437,84 +444,31 @@ void QueueCoordinator::Stop()
 	debug("ArticleDownloads are notified");
 }
 
-/*
- * Returns next article for download.
- */
 bool QueueCoordinator::GetNextArticle(FileInfo* &pFileInfo, ArticleInfo* &pArticleInfo)
 {
-	// find an unpaused file with the highest priority, then take the next article from the file.
-	// if the file doesn't have any articles left for download, we store that fact and search again,
-	// ignoring all files which were previously marked as not having any articles.
-
 	//debug("QueueCoordinator::GetNextArticle()");
 
-	bool bOK = false;
-
-	// pCheckedFiles stores
-	bool* pCheckedFiles = NULL;
-
-	while (!bOK) 
+	for (DownloadQueue::iterator it = m_DownloadQueue.begin(); it != m_DownloadQueue.end(); it++)
 	{
-		//debug("QueueCoordinator::GetNextArticle() - in loop");
-
-		pFileInfo = NULL;
-		int iNum = 0;
-		int iFileNum = 0;
-
-		for (FileQueue::iterator it = m_DownloadQueue.GetFileQueue()->begin(); it != m_DownloadQueue.GetFileQueue()->end(); it++)
+		pFileInfo = *it;
+		if (!pFileInfo->GetPaused() && !pFileInfo->GetDeleted())
 		{
-			FileInfo* pFileInfo1 = *it;
-			if ((!pCheckedFiles || !pCheckedFiles[iNum]) && 
-				!pFileInfo1->GetPaused() && !pFileInfo1->GetDeleted() &&
-				(!pFileInfo || (pFileInfo1->GetPriority() > pFileInfo->GetPriority())))
+			if (pFileInfo->GetArticles()->empty() && g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
 			{
-				pFileInfo = pFileInfo1;
-				iFileNum = iNum;
+				g_pDiskState->LoadArticles(pFileInfo);
 			}
-			iNum++;
-		}
-
-		if (!pFileInfo)
-		{
-			// there are no more files for download
-			break;
-		}
-
-		if (pFileInfo->GetArticles()->empty() && g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-		{
-			g_pDiskState->LoadArticles(pFileInfo);
-		}
-
-		// check if the file has any articles left for download
-		for (FileInfo::Articles::iterator at = pFileInfo->GetArticles()->begin(); at != pFileInfo->GetArticles()->end(); at++)
-		{
-			pArticleInfo = *at;
-			if (pArticleInfo->GetStatus() == 0)
+			for (FileInfo::Articles::iterator at = pFileInfo->GetArticles()->begin(); at != pFileInfo->GetArticles()->end(); at++)
 			{
-				bOK = true;
-				break;
+				pArticleInfo = *at;
+				if (pArticleInfo->GetStatus() == 0)
+				{
+					return true;
+				}
 			}
 		}
-
-		if (!bOK)
-		{
-			// the file doesn't have any articles left for download, we mark the file as such
-			if (!pCheckedFiles)
-			{
-				int iArrSize = sizeof(bool) * m_DownloadQueue.GetFileQueue()->size();
-				pCheckedFiles = (bool*)malloc(iArrSize);
-				memset(pCheckedFiles, false, iArrSize);
-			}
-			pCheckedFiles[iFileNum] = true;
-		}
 	}
 
-	if (pCheckedFiles)
-	{
-		free(pCheckedFiles);
-	}
-
-	return bOK;
+	return false;
 }
 
 void QueueCoordinator::StartArticleDownload(FileInfo* pFileInfo, ArticleInfo* pArticleInfo, NNTPConnection* pConnection)
@@ -530,7 +484,6 @@ void QueueCoordinator::StartArticleDownload(FileInfo* pFileInfo, ArticleInfo* pA
 	BuildArticleFilename(pArticleDownloader, pFileInfo, pArticleInfo);
 
 	pArticleInfo->SetStatus(ArticleInfo::aiRunning);
-	pFileInfo->SetActiveDownloads(pFileInfo->GetActiveDownloads() + 1);
 
 	m_ActiveDownloads.push_back(pArticleDownloader);
 	pArticleDownloader->Start();
@@ -549,7 +502,10 @@ void QueueCoordinator::BuildArticleFilename(ArticleDownloader* pArticleDownloade
 	tmpname[1024-1] = '\0';
 	pArticleDownloader->SetTempFilename(tmpname);
 
-	snprintf(name, 1024, "%s%c%s [%i/%i]", pFileInfo->GetNZBInfo()->GetName(), (int)PATH_SEPARATOR, pFileInfo->GetFilename(), pArticleInfo->GetPartNumber(), pFileInfo->GetArticles()->size());
+	char szNZBNiceName[1024];
+	pFileInfo->GetNZBInfo()->GetNiceNZBName(szNZBNiceName, 1024);
+	
+	snprintf(name, 1024, "%s%c%s [%i/%i]", szNZBNiceName, (int)PATH_SEPARATOR, pFileInfo->GetFilename(), pArticleInfo->GetPartNumber(), pFileInfo->GetArticles()->size());
 	name[1024-1] = '\0';
 	pArticleDownloader->SetInfoName(name);
 
@@ -670,8 +626,6 @@ void QueueCoordinator::ArticleCompleted(ArticleDownloader* pArticleDownloader)
 		}
 	}
 
-	pFileInfo->SetActiveDownloads(pFileInfo->GetActiveDownloads() - 1);
-
 	if (deleteFileObj)
 	{
 		bool fileDeleted = pFileInfo->GetDeleted();
@@ -693,12 +647,12 @@ void QueueCoordinator::ArticleCompleted(ArticleDownloader* pArticleDownloader)
 
 void QueueCoordinator::DeleteFileInfo(FileInfo* pFileInfo, bool bCompleted)
 {
-	for (FileQueue::iterator it = m_DownloadQueue.GetFileQueue()->begin(); it != m_DownloadQueue.GetFileQueue()->end(); it++)
+	for (DownloadQueue::iterator it = m_DownloadQueue.begin(); it != m_DownloadQueue.end(); it++)
 	{
 		FileInfo* pa = *it;
 		if (pa == pFileInfo)
 		{
-			m_DownloadQueue.GetFileQueue()->erase(it);
+			m_DownloadQueue.erase(it);
 			break;
 		}
 	}
@@ -710,35 +664,30 @@ void QueueCoordinator::DeleteFileInfo(FileInfo* pFileInfo, bool bCompleted)
 
 	if (!bCompleted)
 	{
-		DiscardDiskFile(pFileInfo);
-	}
+		// deleting temporary files
 
-	delete pFileInfo;
-}
-
-void QueueCoordinator::DiscardDiskFile(FileInfo* pFileInfo)
-{
-	// deleting temporary files
-
-	if (!g_pOptions->GetDirectWrite() || g_pOptions->GetContinuePartial())
-	{
-		for (FileInfo::Articles::iterator it = pFileInfo->GetArticles()->begin(); it != pFileInfo->GetArticles()->end(); it++)
+		if (!g_pOptions->GetDirectWrite() || g_pOptions->GetContinuePartial())
 		{
-			ArticleInfo* pa = *it;
-			if (pa->GetResultFilename())
+			for (FileInfo::Articles::iterator it = pFileInfo->GetArticles()->begin(); it != pFileInfo->GetArticles()->end(); it++)
 			{
-				remove(pa->GetResultFilename());
+				ArticleInfo* pa = *it;
+				if (pa->GetResultFilename())
+				{
+					remove(pa->GetResultFilename());
+				}
 			}
 		}
+
+		if (g_pOptions->GetDirectWrite())
+		{
+			char name[1024];
+			snprintf(name, 1024, "%s%i.out", g_pOptions->GetTempDir(), pFileInfo->GetID());
+			name[1024-1] = '\0';
+			remove(name);
+		}
 	}
 
-	if (g_pOptions->GetDirectWrite())
-	{
-		char name[1024];
-		snprintf(name, 1024, "%s%i.out", g_pOptions->GetTempDir(), pFileInfo->GetID());
-		name[1024-1] = '\0';
-		remove(name);
-	}
+	delete pFileInfo;
 }
 
 bool QueueCoordinator::IsDupe(FileInfo* pFileInfo)
@@ -752,7 +701,7 @@ bool QueueCoordinator::IsDupe(FileInfo* pFileInfo)
 	}
 
 	// checking in queue
-	for (FileQueue::iterator it = m_DownloadQueue.GetFileQueue()->begin(); it != m_DownloadQueue.GetFileQueue()->end(); it++)
+	for (DownloadQueue::iterator it = m_DownloadQueue.begin(); it != m_DownloadQueue.end(); it++)
 	{
 		FileInfo* pQueueEntry = *it;
 		if (!strcmp(pFileInfo->GetNZBInfo()->GetDestDir(), pQueueEntry->GetNZBInfo()->GetDestDir()) &&
@@ -769,25 +718,9 @@ bool QueueCoordinator::IsDupe(FileInfo* pFileInfo)
 void QueueCoordinator::LogDebugInfo()
 {
 	debug("--------------------------------------------");
-	debug("Dumping debug debug to log");
+	debug("Dumping debug info to log");
 	debug("--------------------------------------------");
 
-	debug("   SpeedMeter");
-	debug("   ----------");
-	float fSpeed = CalcCurrentDownloadSpeed();
-	int iTimeDiff = (int)time(NULL) - m_iSpeedStartTime * SPEEDMETER_SLOTSIZE;
-	debug("      Speed: %f", fSpeed);
-	debug("      SpeedStartTime: %i", m_iSpeedStartTime);
-	debug("      SpeedTotalBytes: %i", m_iSpeedTotalBytes);
-	debug("      SpeedBytesIndex: %i", m_iSpeedBytesIndex);
-	debug("      AllBytes: %i", m_iAllBytes);
-	debug("      Time: %i", (int)time(NULL));
-	debug("      TimeDiff: %i", iTimeDiff);
-	for (int i=0; i < SPEEDMETER_SLOTS; i++)
-	{
-		debug("      Bytes[%i]: %i, Time[%i]: %i", i, m_iSpeedBytes[i], i, m_iSpeedTime[i]);
-	}
-
 	debug("   QueueCoordinator");
 	debug("   ----------------");
 
@@ -834,7 +767,6 @@ void QueueCoordinator::ResetHangingDownloads()
 				error("Could not terminate hanging download %s", Util::BaseFileName(pArticleInfo->GetResultFilename()));
 			}
 			m_ActiveDownloads.erase(it);
-			pArticleDownloader->GetFileInfo()->SetActiveDownloads(pArticleDownloader->GetFileInfo()->GetActiveDownloads() - 1);
 			// it's not safe to destroy pArticleDownloader, because the state of object is unknown
 			delete pArticleDownloader;
 			it = m_ActiveDownloads.begin();
@@ -916,7 +848,9 @@ bool QueueCoordinator::SetQueueEntryNZBCategory(NZBInfo* pNZBInfo, const char* s
 {
 	if (pNZBInfo->GetPostProcess())
 	{
-		error("Could not change category for %s. File in post-process-stage", pNZBInfo->GetName());
+		char szNZBNiceName[1024];
+		pNZBInfo->GetNiceNZBName(szNZBNiceName, 1024);
+		error("Could not change category for %s. File in post-process-stage", szNZBNiceName);
 		return false;
 	}
 
@@ -933,36 +867,6 @@ bool QueueCoordinator::SetQueueEntryNZBCategory(NZBInfo* pNZBInfo, const char* s
 	return bOK;
 }
 
-bool QueueCoordinator::SetQueueEntryNZBName(NZBInfo* pNZBInfo, const char* szName)
-{
-	if (pNZBInfo->GetPostProcess())
-	{
-		error("Could not rename %s. File in post-process-stage", pNZBInfo->GetName());
-		return false;
-	}
-
-	if (strlen(szName) == 0)
-	{
-		error("Could not rename %s. The new name cannot be empty", pNZBInfo->GetName());
-		return false;
-	}
-
-	char szOldDestDir[1024];
-	strncpy(szOldDestDir, pNZBInfo->GetDestDir(), 1024);
-	szOldDestDir[1024-1] = '\0';
-
-	char szNZBNicename[1024];
-	NZBInfo::MakeNiceNZBName(szName, szNZBNicename, sizeof(szNZBNicename), false);
-	pNZBInfo->SetName(szNZBNicename);
-
-	pNZBInfo->BuildDestDirName();
-
-	bool bDirUnchanged = !strcmp(pNZBInfo->GetDestDir(), szOldDestDir);
-	bool bOK = bDirUnchanged || ArticleDownloader::MoveCompletedFiles(pNZBInfo, szOldDestDir);
-
-	return bOK;
-}
-
 /*
  * NOTE: DownloadQueue must be locked prior to call of this function
  */
@@ -970,7 +874,11 @@ bool QueueCoordinator::MergeQueueEntries(NZBInfo* pDestNZBInfo, NZBInfo* pSrcNZB
 {
 	if (pDestNZBInfo->GetPostProcess() || pSrcNZBInfo->GetPostProcess())
 	{
-		error("Could not merge %s and %s. File in post-process-stage", pDestNZBInfo->GetName(), pSrcNZBInfo->GetName());
+		char szDestNZBNiceName[1024];
+		pDestNZBInfo->GetNiceNZBName(szDestNZBNiceName, 1024);
+		char szSrcNZBNiceName[1024];
+		pSrcNZBInfo->GetNiceNZBName(szSrcNZBNiceName, 1024);
+		error("Could not merge %s and %s. File in post-process-stage", szDestNZBNiceName, szSrcNZBNiceName);
 		return false;
 	}
 
@@ -979,7 +887,7 @@ bool QueueCoordinator::MergeQueueEntries(NZBInfo* pDestNZBInfo, NZBInfo* pSrcNZB
 	SetQueueEntryNZBCategory(pSrcNZBInfo, pDestNZBInfo->GetCategory());
 
 	// reattach file items to new NZBInfo-object
-	for (FileQueue::iterator it = m_DownloadQueue.GetFileQueue()->begin(); it != m_DownloadQueue.GetFileQueue()->end(); it++)
+	for (DownloadQueue::iterator it = m_DownloadQueue.begin(); it != m_DownloadQueue.end(); it++)
 	{
 		FileInfo* pFileInfo = *it;
 		if (pFileInfo->GetNZBInfo() == pSrcNZBInfo)

QueueCoordinator.h

@@ -1,8 +1,8 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -30,6 +30,9 @@
 #include <deque>
 #include <list>
 #include <time.h>
+#ifdef WIN32
+#include <sys/timeb.h>
+#endif
 
 #include "Thread.h"
 #include "NZBFile.h"
@@ -39,7 +42,7 @@
 #include "QueueEditor.h"
 #include "NNTPConnection.h"
                                             
-class QueueCoordinator : public Thread, public Observer, public Subject, public DownloadSpeedMeter, public DownloadQueueHolder
+class QueueCoordinator : public Thread, public Observer, public Subject, public DownloadSpeedMeter, public NZBInfoLocker
 {
 public:
 	typedef std::list<ArticleDownloader*>	ActiveDownloads;
@@ -71,11 +74,6 @@ private:
     int                     m_iSpeedTotalBytes;
     int 					m_iSpeedTime[SPEEDMETER_SLOTS];
     int                     m_iSpeedStartTime; 
-#ifdef HAVE_SPINLOCK
-	SpinLock				m_spinlockSpeed;
-#else
-	Mutex					m_mutexSpeed;
-#endif
 
     int						m_iSpeedBytesIndex;
 	long long				m_iAllBytes;
@@ -114,15 +112,17 @@ public:
 	DownloadQueue*			LockQueue();
 	void					UnlockQueue() ;
 	void					AddNZBFileToQueue(NZBFile* pNZBFile, bool bAddFirst);
+	bool					AddFileToQueue(const char* szFileName, const char* szCategory);
 	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);
-	void					DiscardDiskFile(FileInfo* pFileInfo);
 	QueueEditor*			GetQueueEditor() { return &m_QueueEditor; }
 
+	virtual void			LockNZBInfo(NZBInfo* pNZBInfo) { LockQueue(); }
+	virtual void			UnlockNZBInfo(NZBInfo* pNZBInfo) { UnlockQueue(); }
+
 	void					LogDebugInfo();
 };
 

QueueEditor.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -24,7 +24,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -36,7 +36,6 @@
 #include <cctype>
 #include <cstdio>
 #include <sys/stat.h>
-#include <set>
 #ifndef WIN32
 #include <unistd.h>
 #include <sys/time.h>
@@ -75,7 +74,7 @@ QueueEditor::~QueueEditor()
 
 FileInfo* QueueEditor::FindFileInfo(DownloadQueue* pDownloadQueue, int iID)
 {
-	for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+	for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
 	{
 		FileInfo* pFileInfo = *it;
 		if (pFileInfo->GetID() == iID)
@@ -89,7 +88,7 @@ FileInfo* QueueEditor::FindFileInfo(DownloadQueue* pDownloadQueue, int iID)
 int QueueEditor::FindFileInfoEntry(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo)
 {
 	int iEntry = 0;
-	for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+	for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
 	{
 		FileInfo* pFileInfo2 = *it;
 		if (pFileInfo2 == pFileInfo)
@@ -111,7 +110,7 @@ void QueueEditor::PauseUnpauseEntry(FileInfo* pFileInfo, bool bPause)
 }
 
 /*
- * Removes entry
+ * Removes entry with index iEntry
  * returns true if successful, false if operation is not possible
  */
 void QueueEditor::DeleteEntry(FileInfo* pFileInfo)
@@ -121,7 +120,7 @@ void QueueEditor::DeleteEntry(FileInfo* pFileInfo)
 }
 
 /*
- * Moves entry in the queue
+ * Moves entry identified with iID in the queue
  * returns true if successful, false if operation is not possible
  */
 void QueueEditor::MoveEntry(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo, int iOffset)
@@ -135,37 +134,26 @@ void QueueEditor::MoveEntry(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo,
 		{
 			iNewEntry = 0;
 		}
-		if ((unsigned int)iNewEntry > pDownloadQueue->GetFileQueue()->size() - 1)
+		if ((unsigned int)iNewEntry > pDownloadQueue->size() - 1)
 		{
-			iNewEntry = (int)pDownloadQueue->GetFileQueue()->size() - 1;
+			iNewEntry = (int)pDownloadQueue->size() - 1;
 		}
 
-		if (iNewEntry >= 0 && (unsigned int)iNewEntry <= pDownloadQueue->GetFileQueue()->size() - 1)
+		if (iNewEntry >= 0 && (unsigned int)iNewEntry <= pDownloadQueue->size() - 1)
 		{
-			FileInfo* fi = pDownloadQueue->GetFileQueue()->at(iEntry);
-			pDownloadQueue->GetFileQueue()->erase(pDownloadQueue->GetFileQueue()->begin() + iEntry);
-			pDownloadQueue->GetFileQueue()->insert(pDownloadQueue->GetFileQueue()->begin() + iNewEntry, fi);
+			FileInfo* fi = (*pDownloadQueue)[iEntry];
+			pDownloadQueue->erase(pDownloadQueue->begin() + iEntry);
+			pDownloadQueue->insert(pDownloadQueue->begin() + iNewEntry, fi);
 		}
 	}
 }
 
-/*
- * Set priority for entry
- * returns true if successful, false if operation is not possible
- */
-void QueueEditor::SetPriorityEntry(FileInfo* pFileInfo, const char* szPriority)
-{
-	debug("Setting priority %s for file %s", szPriority, pFileInfo->GetFilename());
-	int iPriority = atoi(szPriority);
-	pFileInfo->SetPriority(iPriority);
-}
-
 bool QueueEditor::EditEntry(int ID, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText)
 {
 	IDList cIDList;
 	cIDList.clear();
 	cIDList.push_back(ID);
-	return EditList(&cIDList, NULL, mmID, bSmartOrder, eAction, iOffset, szText);
+	return EditList(&cIDList, bSmartOrder, eAction, iOffset, szText);
 }
 
 bool QueueEditor::LockedEditEntry(DownloadQueue* pDownloadQueue, int ID, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText)
@@ -176,20 +164,11 @@ bool QueueEditor::LockedEditEntry(DownloadQueue* pDownloadQueue, int ID, bool bS
 	return InternEditList(pDownloadQueue, &cIDList, bSmartOrder, eAction, iOffset, szText);
 }
 
-bool QueueEditor::EditList(IDList* pIDList, NameList* pNameList, EMatchMode eMatchMode, bool bSmartOrder, 
-	EEditAction eAction, int iOffset, const char* szText)
+bool QueueEditor::EditList(IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText)
 {
 	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
 
-	bool bOK = true;
-
-	if (pNameList)
-	{
-		pIDList = new IDList();
-		bOK = BuildIDListFromNameList(pDownloadQueue, pIDList, pNameList, eMatchMode, eAction);
-	}
-
-	bOK = bOK && (InternEditList(pDownloadQueue, pIDList, bSmartOrder, eAction, iOffset, szText) || eMatchMode == mmRegEx);
+	bool bOK = InternEditList(pDownloadQueue, pIDList, bSmartOrder, eAction, iOffset, szText);
 
 	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
 	{
@@ -198,11 +177,6 @@ bool QueueEditor::EditList(IDList* pIDList, NameList* pNameList, EMatchMode eMat
 
 	g_pQueueCoordinator->UnlockQueue();
 
-	if (pNameList)
-	{
-		delete pIDList;
-	}
-
 	return bOK;
 }
 
@@ -229,10 +203,6 @@ bool QueueEditor::InternEditList(DownloadQueue* pDownloadQueue, IDList* pIDList,
 	{
 		MergeGroups(pDownloadQueue, &cItemList);
 	}
-	else if (eAction == eaFileReorder)
-	{
-		ReorderFiles(pDownloadQueue, &cItemList);
-	}
 	else
 	{
 		for (ItemList::iterator it = cItemList.begin(); it != cItemList.end(); it++)
@@ -258,18 +228,10 @@ bool QueueEditor::InternEditList(DownloadQueue* pDownloadQueue, IDList* pIDList,
 					DeleteEntry(pItem->m_pFileInfo);
 					break;
 
-				case eaFileSetPriority:
-					SetPriorityEntry(pItem->m_pFileInfo, szText);
-					break;
-
 				case eaGroupSetCategory:
 					SetNZBCategory(pItem->m_pFileInfo->GetNZBInfo(), szText);
 					break;
 
-				case eaGroupSetName:
-					SetNZBName(pItem->m_pFileInfo->GetNZBInfo(), szText);
-					break;
-
 				case eaGroupSetParameter:
 					SetNZBParameter(pItem->m_pFileInfo->GetNZBInfo(), szText);
 					break;
@@ -282,14 +244,12 @@ bool QueueEditor::InternEditList(DownloadQueue* pDownloadQueue, IDList* pIDList,
 				case eaGroupMoveOffset:
 				case eaGroupPauseAllPars:
 				case eaGroupPauseExtraPars:
-				case eaGroupSetPriority:
-					EditGroup(pDownloadQueue, pItem->m_pFileInfo, eAction, iOffset, szText);
+					EditGroup(pDownloadQueue, pItem->m_pFileInfo, eAction, iOffset);
 					break;
 
 				case eaFilePauseAllPars:
 				case eaFilePauseExtraPars:
 				case eaGroupMerge:
-				case eaFileReorder:
 					// remove compiler warning "enumeration not handled in switch"
 					break;
 			}
@@ -322,18 +282,18 @@ void QueueEditor::PrepareList(DownloadQueue* pDownloadQueue, ItemList* pItemList
 		if (iOffset < 0)
 		{
 			iStart = 0;
-			iEnd = pDownloadQueue->GetFileQueue()->size();
+			iEnd = pDownloadQueue->size();
 			iStep = 1;
 		}
 		else
 		{
-			iStart = pDownloadQueue->GetFileQueue()->size() - 1;
+			iStart = pDownloadQueue->size() - 1;
 			iEnd = -1;
 			iStep = -1;
 		}
 		for (int iIndex = iStart; iIndex != iEnd; iIndex += iStep)
 		{
-			FileInfo* pFileInfo = pDownloadQueue->GetFileQueue()->at(iIndex);
+			FileInfo* pFileInfo = (*pDownloadQueue)[iIndex];
 			int iID = pFileInfo->GetID();
 			for (IDList::iterator it = pIDList->begin(); it != pIDList->end(); it++)
 			{
@@ -347,9 +307,9 @@ void QueueEditor::PrepareList(DownloadQueue* pDownloadQueue, ItemList* pItemList
 						{
 							iWorkOffset = -iIndex;
 						}
-						else if (iDestPos > int(pDownloadQueue->GetFileQueue()->size()) - 1)
+						else if (iDestPos > int(pDownloadQueue->size()) - 1)
 						{
-							iWorkOffset = int(pDownloadQueue->GetFileQueue()->size()) - 1 - iIndex;
+							iWorkOffset = int(pDownloadQueue->size()) - 1 - iIndex;
 						}
 					}
 					else
@@ -375,7 +335,7 @@ void QueueEditor::PrepareList(DownloadQueue* pDownloadQueue, ItemList* pItemList
 		// check ID range
 		int iMaxID = 0;
 		int iMinID = MAX_ID;
-		for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+		for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
 		{
 			FileInfo* pFileInfo = *it;
 			int ID = pFileInfo->GetID();
@@ -405,85 +365,13 @@ void QueueEditor::PrepareList(DownloadQueue* pDownloadQueue, ItemList* pItemList
 	}
 }
 
-bool QueueEditor::BuildIDListFromNameList(DownloadQueue* pDownloadQueue, IDList* pIDList, NameList* pNameList, EMatchMode eMatchMode, EEditAction eAction)
-{
-#ifndef HAVE_REGEX_H
-	if (eMatchMode == mmRegEx)
-	{
-		return false;
-	}
-#endif
-
-	std::set<int> uniqueIDs;
-
-	for (NameList::iterator it = pNameList->begin(); it != pNameList->end(); it++)
-	{
-		const char* szName = *it;
-
-		RegEx *pRegEx = NULL;
-		if (eMatchMode == mmRegEx)
-		{
-			pRegEx = new RegEx(szName);
-			if (!pRegEx->IsValid())
-			{
-				delete pRegEx;
-				return false;
-			}
-		}
-
-		bool bFound = false;
-
-		for (FileQueue::iterator it2 = pDownloadQueue->GetFileQueue()->begin(); it2 != pDownloadQueue->GetFileQueue()->end(); it2++)
-		{
-			FileInfo* pFileInfo = *it2;
-			if (eAction < eaGroupMoveOffset)
-			{
-				// file action
-				char szFilename[MAX_PATH];
-				snprintf(szFilename, sizeof(szFilename) - 1, "%s/%s", pFileInfo->GetNZBInfo()->GetName(), Util::BaseFileName(pFileInfo->GetFilename()));
-				if (((!pRegEx && !strcmp(szFilename, szName)) || (pRegEx && pRegEx->Match(szFilename))) &&
-					(uniqueIDs.find(pFileInfo->GetID()) == uniqueIDs.end()))
-				{
-					uniqueIDs.insert(pFileInfo->GetID());
-					pIDList->push_back(pFileInfo->GetID());
-					bFound = true;
-				}
-			}
-			else
-			{
-				// group action
-				const char *szFilename = pFileInfo->GetNZBInfo()->GetName();
-				if (((!pRegEx && !strcmp(szFilename, szName)) || (pRegEx && pRegEx->Match(szFilename))) &&
-					(uniqueIDs.find(pFileInfo->GetNZBInfo()->GetID()) == uniqueIDs.end()))
-				{
-					uniqueIDs.insert(pFileInfo->GetNZBInfo()->GetID());
-					pIDList->push_back(pFileInfo->GetID());
-					bFound = true;
-				}
-			}
-		}
-
-		if (pRegEx)
-		{
-			delete pRegEx;
-		}
-
-		if (!bFound && (eMatchMode == mmName))
-		{
-			return false;
-		}
-	}
-
-	return true;
-}
-
-bool QueueEditor::EditGroup(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo, EEditAction eAction, int iOffset, const char* szText)
+bool QueueEditor::EditGroup(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo, EEditAction eAction, int iOffset)
 {
 	IDList cIDList;
 	cIDList.clear();
 
 	// collecting files belonging to group
-	for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+	for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
 	{
 		FileInfo* pFileInfo2 = *it;
 		if (pFileInfo2->GetNZBInfo() == pFileInfo->GetNZBInfo())
@@ -543,19 +431,16 @@ bool QueueEditor::EditGroup(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo,
 		pFileInfo->GetNZBInfo()->SetCleanupDisk(CanCleanupDisk(pDownloadQueue, pFileInfo->GetNZBInfo()));
 	}
 
-	EEditAction GroupToFileMap[] = { (EEditAction)0, eaFileMoveOffset, eaFileMoveTop, eaFileMoveBottom, 
-		eaFilePause, eaFileResume, eaFileDelete, eaFilePauseAllPars, eaFilePauseExtraPars, eaFileSetPriority, eaFileReorder,
-		eaFileMoveOffset, eaFileMoveTop, eaFileMoveBottom, eaFilePause, eaFileResume, eaFileDelete, 
-		eaFilePauseAllPars, eaFilePauseExtraPars, eaFileSetPriority,
-		(EEditAction)0, (EEditAction)0, (EEditAction)0 };
+	EEditAction GroupToFileMap[] = { (EEditAction)0, eaFileMoveOffset, eaFileMoveTop, eaFileMoveBottom, eaFilePause, eaFileResume, eaFileDelete, eaFilePauseAllPars, eaFilePauseExtraPars,
+		eaFileMoveOffset, eaFileMoveTop, eaFileMoveBottom, eaFilePause, eaFileResume, eaFileDelete, eaFilePauseAllPars, eaFilePauseExtraPars, (EEditAction)0, (EEditAction)0, (EEditAction)0 };
 
-	return InternEditList(pDownloadQueue, &cIDList, true, GroupToFileMap[eAction], iOffset, szText);
+	return InternEditList(pDownloadQueue, &cIDList, true, GroupToFileMap[eAction], iOffset, NULL);
 }
 
 void QueueEditor::BuildGroupList(DownloadQueue* pDownloadQueue, FileList* pGroupList)
 {
 	pGroupList->clear();
-    for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+    for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
     {
         FileInfo* pFileInfo = *it;
 		FileInfo* pGroupInfo = NULL;
@@ -648,24 +533,24 @@ void QueueEditor::AlignAffectedGroups(DownloadQueue* pDownloadQueue, IDList* pID
 	for (FileList::iterator it = cAffectedGroupList.begin(); it != cAffectedGroupList.end(); it++)
 	{
 		FileInfo* pFileInfo = *it;
-		AlignGroup(pDownloadQueue, pFileInfo->GetNZBInfo());
+		AlignGroup(pDownloadQueue, pFileInfo);
 	}
 }
 
-void QueueEditor::AlignGroup(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
+void QueueEditor::AlignGroup(DownloadQueue* pDownloadQueue, FileInfo* pFirstFileInfo)
 {
 	FileInfo* pLastFileInfo = NULL;
 	unsigned int iLastNum = 0;
 	unsigned int iNum = 0;
-	while (iNum < pDownloadQueue->GetFileQueue()->size())
+	while (iNum < pDownloadQueue->size())
 	{
-		FileInfo* pFileInfo = pDownloadQueue->GetFileQueue()->at(iNum);
-		if (pFileInfo->GetNZBInfo() == pNZBInfo)
+		FileInfo* pFileInfo = (*pDownloadQueue)[iNum];
+		if (pFirstFileInfo->GetNZBInfo() == pFileInfo->GetNZBInfo())
 		{
 			if (pLastFileInfo && iNum - iLastNum > 1)
 			{
-				pDownloadQueue->GetFileQueue()->erase(pDownloadQueue->GetFileQueue()->begin() + iNum);
-				pDownloadQueue->GetFileQueue()->insert(pDownloadQueue->GetFileQueue()->begin() + iLastNum + 1, pFileInfo);
+				pDownloadQueue->erase(pDownloadQueue->begin() + iNum);
+				pDownloadQueue->insert(pDownloadQueue->begin() + iLastNum + 1, pFileInfo);
 				iLastNum++;
 			}
 			else
@@ -802,13 +687,6 @@ void QueueEditor::SetNZBCategory(NZBInfo* pNZBInfo, const char* szCategory)
 	g_pQueueCoordinator->SetQueueEntryNZBCategory(pNZBInfo, szCategory);
 }
 
-void QueueEditor::SetNZBName(NZBInfo* pNZBInfo, const char* szName)
-{
-	debug("QueueEditor: renaming '%s' to '%s'", Util::BaseFileName(pNZBInfo->GetFilename()), szName);
-
-	g_pQueueCoordinator->SetQueueEntryNZBName(pNZBInfo, szName);
-}
-
 /**
 * Check if deletion of already downloaded files is possible (when nzb id deleted from queue).
 * The deletion is most always possible, except the case if all remaining files in queue 
@@ -816,7 +694,7 @@ void QueueEditor::SetNZBName(NZBInfo* pNZBInfo, const char* szName)
 */
 bool QueueEditor::CanCleanupDisk(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 {
-    for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+    for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
     {
         FileInfo* pFileInfo = *it;
 		char szLoFileName[1024];
@@ -854,55 +732,18 @@ void QueueEditor::MergeGroups(DownloadQueue* pDownloadQueue, ItemList* pItemList
 		delete pItem;
 	}
 
-	// align group
-	AlignGroup(pDownloadQueue, pDestItem->m_pFileInfo->GetNZBInfo());
-
-	delete pDestItem;
-}
-
-void QueueEditor::ReorderFiles(DownloadQueue* pDownloadQueue, ItemList* pItemList)
-{
-	if (pItemList->size() == 0)
+	// align group ("AlignGroup" needs the first file item as parameter)
+	for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
 	{
-		return;
-	}
-
-	EditItem* pFirstItem = pItemList->front();
-	NZBInfo* pNZBInfo = pFirstItem->m_pFileInfo->GetNZBInfo();
-	unsigned int iInsertPos = 0;
-
-	// find first file of the group
-    for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
-    {
-        FileInfo* pFileInfo = *it;
-		if (pFileInfo->GetNZBInfo() == pNZBInfo)
+		FileInfo* pFileInfo = *it;
+		if (pFileInfo->GetNZBInfo() == pDestItem->m_pFileInfo->GetNZBInfo())
 		{
+			AlignGroup(pDownloadQueue, pFileInfo);
 			break;
 		}
-		iInsertPos++;
 	}
 
-	// now can reorder
-	for (ItemList::iterator it = pItemList->begin(); it != pItemList->end(); it++)
-	{
-		EditItem* pItem = *it;
-		FileInfo* pFileInfo = pItem->m_pFileInfo;
-
-		// move file item
-		for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
-		{
-			FileInfo* pFileInfo1 = *it;
-			if (pFileInfo1 == pFileInfo)
-			{
-				pDownloadQueue->GetFileQueue()->erase(it);
-				pDownloadQueue->GetFileQueue()->insert(pDownloadQueue->GetFileQueue()->begin() + iInsertPos, pFileInfo);
-				iInsertPos++;				
-				break;
-			}
-		}
-
-		delete pItem;
-	}
+	delete pDestItem;
 }
 
 void QueueEditor::SetNZBParameter(NZBInfo* pNZBInfo, const char* szParamString)
@@ -920,7 +761,7 @@ void QueueEditor::SetNZBParameter(NZBInfo* pNZBInfo, const char* szParamString)
 	}
 	else
 	{
-		error("Could not set nzb parameter for %s: invalid argument: %s", pNZBInfo->GetName(), szParamString);
+		error("Could not set nzb parameter for %s: invalid argument: %s", Util::BaseFileName(pNZBInfo->GetFilename()), szParamString);
 	}
 
 	free(szStr);

QueueEditor.h

@@ -1,7 +1,7 @@
 /*
  *  This file if part of nzbget
  *
- *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -33,6 +33,8 @@
 class QueueEditor
 {
 public:
+	typedef std::vector<int> IDList;
+
 	enum EEditAction
 	{
 		eaFileMoveOffset = 1,			// move to m_iOffset relative to the current position in queue
@@ -43,8 +45,6 @@ public:
 		eaFileDelete,
 		eaFilePauseAllPars,
 		eaFilePauseExtraPars,
-		eaFileSetPriority,
-		eaFileReorder,
 		eaGroupMoveOffset,				// move to m_iOffset relative to the current position in queue
 		eaGroupMoveTop,
 		eaGroupMoveBottom,
@@ -53,18 +53,9 @@ public:
 		eaGroupDelete,
 		eaGroupPauseAllPars,
 		eaGroupPauseExtraPars,
-		eaGroupSetPriority,
 		eaGroupSetCategory,
 		eaGroupMerge,
-		eaGroupSetParameter,
-		eaGroupSetName
-	};
-
-	enum EMatchMode
-	{
-		mmID = 1,
-		mmName,
-		mmRegEx
+		eaGroupSetParameter
 	};
 
 private:
@@ -85,32 +76,28 @@ private:
 	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);
+	bool					EditGroup(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo, EEditAction eAction, int iOffset);
 	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					AlignGroup(DownloadQueue* pDownloadQueue, FileInfo* pFirstFileInfo);
 	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);
 	void					MergeGroups(DownloadQueue* pDownloadQueue, ItemList* pItemList);
-	void					ReorderFiles(DownloadQueue* pDownloadQueue, ItemList* pItemList);
 	void					SetNZBParameter(NZBInfo* pNZBInfo, const char* szParamString);
 
 	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					EditList(IDList* pIDList, 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);

README

@@ -2,10 +2,6 @@
            NZBGet ReadMe
 =====================================
 
-This is a short documentation. For more information please
-visit NZBGet home page at 
-  http://nzbget.sourceforge.net
-
 Contents          
 --------
 1. About NZBGet
@@ -33,9 +29,6 @@ In server/client mode NZBGet runs as server in background.
 Then you use client to send requests to server. The sample requests
 are: download nzb-file, list files in queue, etc.
 
-There is also a built-in web-interface. The server has RPC-support
-and can be controlled from third party applications too.
-
 Standalone-tool, server and client are all contained in only one 
 executable file "nzbget". The mode in which the program works 
 depends on command-line parameters passed to the program.
@@ -48,12 +41,13 @@ NZBGet is written in C++ and was initialy developed on Linux.
 It was ported to Windows later and tested for compatibility with
 several POSIX-OS'es.
 
-It should run at least on:
-  - Linux Debian 5.0 on x86;
-  - Linux with uClibc on MIPSEL and ARM;
-  - OpenBSD 5.0 on x86;
-  - Mac OS X 10.7 Lion on x64;
-  - Windows XP SP3 on x86 and Windows 7 on x64.
+The current version (0.6.0) should run at least on:
+  - Linux Debian 4.0 on x86;
+  - Linux with uClibc and BusyBox on MIPSEL and ARM;
+  - FreeBSD 7.0 on x86;
+  - OpenSolaris 2008.11 on x86;
+  - Mac OS X;
+  - Windows XP SP2 on x86.
 
 Clients and servers running on different OS'es may communicate with
 each other. For example, you can use NZBGet as client on Windows to 
@@ -95,9 +89,6 @@ And the following libraries are optional:
      or
    - OpenSSL     (http://www.openssl.org)
 
- - for gzip support in web-server and web-client (enabled by default):
-   - zlib     (http://www.zlib.net)
-
 All these libraries are included in modern Linux distributions and
 should be available as installable packages. Please note that you also 
 need the developer packages for these libraries too, they package names 
@@ -108,41 +99,24 @@ download the libraries at the given URLs and compile them (see hints below).
 4. Installation on POSIX
 =====================================
 
-Installation from the source distribution archive (nzbget-VERSION.tar.gz):
+Well, the usual stuff:
 
  - untar the nzbget-source via
      tar -zxf nzbget-VERSION.tar.gz
-
  - change into nzbget-directory via
      cd nzbget-VERSION
-
  - configure it via
      ./configure
-
    (maybe you have to tell configure, where to find some libraries.
-       ./configure --help is your friend!
-    also see "Configure-options" later)
-
- - in a case you don't have root access or want to install the program
-   in your home directory use the configure parameter --prefix, e. g.:
-
-  ./configure --prefix ~/usr
-
+       ./configure --help is your friend!)
+    also see "Configure-options" later.)
  - compile it via
      make
-
- - to install system wide become root via:
+ - become root via
      su
-
- - install it via:
+ - install it via
      make install
 
- - install configuration files into <prefix>/etc via:
-     make install-conf
-
-   (you can skip this step if you intend to store configuration
-    files in a non-standard location)
-
 Configure-options
 -----------------
 You may run configure with additional arguments:
@@ -158,9 +132,6 @@ You may run configure with additional arguments:
       
   --disable-tls - to make without TLS/SSL support. Use this option if
     you can not neither GnuTLS nor OpenSSL.
-
-  --disable-gzip - to make without gzip support. Use this option
-    if you can not use zlib.
        
   --enable-debug - to build in debug-mode, if you want to see and log
     debug-messages.
@@ -274,27 +245,17 @@ in MS Visual C++ 2005 you should be able to compile NZBGet.
 6. Configuration
 =====================================
 
-NZBGet needs a configuration file. 
+NZBGet needs a configuration-file to work properly. 
 
-An example configuration file is provided in "nzbget.conf", which
-is installed into "<prefix>/share/nzbget" (where <prefix> depends on
-system configuration and configure options - typically "/usr/local",
-"/usr" or "/opt"). The installer adjusts the file according to your
-system paths. If you have performed the installation step 
-"make install-conf" this file is already copied to "<prefix>/etc" and
-NZBGet finds it automatically. If you install the program manually
-from a binary archive you have to copy the file from "<prefix>/share/nzbget"
-to one of the locations listed below.
-
-Open the file in a text editor and modify it accodring to your needs.
-
-You need to set at least the option "MAINDIR" and one news server in
-configuration file. The file has comments on how to use each option.
+You need to set at least the option "MAINDIR" and one newsserver in
+configuration file. Have a look at the example in nzbget.conf.example, 
+it has comments on how to use each option.
 
 The program looks for configuration file in following standard 
 locations (in this order):
 
 On POSIX systems:
+
   ~/.nzbget
   /etc/nzbget.conf
   /usr/etc/nzbget.conf
@@ -318,12 +279,6 @@ options via command-line.
 NZBGet can be used in either standalone mode which downloads a single file 
 or as a server which is able to queue up numerous download requests.
 
-TIP for Windows users: NZBGet is controlled via various command line
-parameters. For easier using there is a simple shell script included
-in "nzbget-shell.bat". Start this script from Windows Explorer and you will
-be running a command shell with PATH adjusted to find NZBGet executable.
-Then you can type all commands without full path to nzbget.exe.
-
 Standalone mode:
 ----------------
 
@@ -351,16 +306,10 @@ To stop server use:
 
   nzbget -Q  
 
-TIP for POSIX users: with included script "nzbgetd" you can use standard
-commands to control daemon:
-
-  nzbgetd start
-  nzbgetd stop
-  etc.
-
-When NZBGet is started in console server mode it displays a message that
-it is ready to receive download requests. In daemon mode it doesn't print any
-messages to console since it runs in background.
+Depending on which frontend has been selected in the nzbget.conf file
+(option "outputmode") the server should display a message that
+it is ready to receive download requests (this applies only to console
+mode, not to daemon mode).
 
 When the server is running it is possible to queue up downloads. This can be
 done either in terminal with "nzbget -A <nzb-file>" or by uploading
@@ -422,7 +371,7 @@ Running client & server on seperate machines:
 Since nzbget communicates via TCP/IP it's possible to have a server running on
 one computer and adding downloads via a client on another computer.
 
-Do this by setting the "ControlIP" option in the nzbget.conf file to point to the
+Do this by setting the "serverip" option in the nzbget.conf file to point to the
 IP of the server (default is localhost which means client and server runs on 
 same computer)
 
@@ -441,72 +390,26 @@ nzbget-client-commands in this terminal.
 Post processing scripts
 -----------------------
 
-After the download of nzb-file is completed nzbget can call post-processing
-script, defined in configuration file. See example configuration file for
-the description of parameters passed to the script (option "PostProcess").
+After the download of nzb-file is completed nzbget can call post-process-script, 
+defined in configuration file. See example configuration file for the 
+description of parameters passed to the script.
 
 An example script for unraring of downloaded files is provided in file
-"nzbget-postprocess.sh" installed into "<prefix>/bin". The script requires
-configuration file "nzbget-postprocess.conf". If you have installed the
-program with "make install" this file is copied to "<prefix>/etc",
-where the post-processing script finds it automatically. If you install
-the program manually from a binary archive you have to copy the file
-from "<prefix>/share/nzbget" to the directory where you have put the
-nzbget configuration file ("nzbget.conf").
-
-Set the option "PostProcess" in "nzbget.conf" to point to the post-
-processing script.
-
-Additional usage instructions are included in "nzbget-postprocess.sh",
-please open the file in a text editor to read them.
-
-NOTE: The post-processing script "nzbget-postprocess.sh" is for
-POSIX systems and will not work on Windows.
-
-Web-interface
--------------
-
-NZBGet has a built-in web-server providing the access to the program
-functions via web-interface.
-
-To activate web-interface set the option "WebDir" to the path with
-web-interface files. If you install using "make install-conf" as
-described above the option is set automatically. If you install using
-binary files you should check if the option is set correctly.
-
-To access web-interface from your web-browser use the server address
-and port defined in NZBGet configuration file in options "ControlIP" and
-"ControlPort". For example:
-
-  http://localhost:6789/
-
-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/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
-access to your computer. 
+postprocess-example.sh. That example is for POSIX systems (not for Windows).
 
 =====================================
 8. Authors
 =====================================
 
-NZBGet is developed and maintained by Andrey Prygunkov
+NZBGet was initialiy written by Sven Henkel (sidddy@users.sourceforge.net).
+
+Up to version 0.2.3 it was developed and maintained by Bo Cordes Petersen 
+(placebodk@users.sourceforge.net). 
+
+Beginning at version 0.3.0 the program is being developed by Andrei Prygounkov 
 (hugbug@users.sourceforge.net).
 
-The original project was initially created by Sven Henkel
-(sidddy@users.sourceforge.net) in 2004 and later developed by
-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.
-
-Module TLS (TLS.c, TLS.h) is based on work by Martin Lambers
-(marlam@marlam.de).
+Module TLS (TLS.c, TLS.h) is based on work by Martin Lambers (marlam@marlam.de).
 
 =====================================
 9. Copyright
@@ -533,9 +436,9 @@ libpar2 is distributed under GPL; libsigc++ and GnuTLS - under LGPL.
 10. Contact
 =====================================
 
-If you encounter any problem, feel free to use the forum
+If you encounter any problem, feel free to use forums on
 
-    nzbget.sourceforge.net/forum
+    sourceforge.net/projects/nzbget
 
 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-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -55,6 +55,7 @@ extern Options* g_pOptions;
 RemoteClient::RemoteClient()
 {
 	m_pConnection	= NULL;
+	m_pNetAddress	= NULL;
 	m_bVerbose		= true;
 
 	/*
@@ -79,6 +80,11 @@ RemoteClient::~RemoteClient()
 	{
 		delete m_pConnection;
 	}
+
+	if (m_pNetAddress)
+	{
+		delete m_pNetAddress;
+	}
 }
 
 void RemoteClient::printf(const char * msg,...)
@@ -103,19 +109,13 @@ void RemoteClient::perror(const char * msg)
 bool RemoteClient::InitConnection()
 {
 	// Create a connection to the server
-
-	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);
+	m_pNetAddress	= new NetAddress(g_pOptions->GetServerIP(), g_pOptions->GetServerPort());
+	m_pConnection	= new Connection(m_pNetAddress);
 
 	bool OK = m_pConnection->Connect();
 	if (!OK)
 	{
-		printf("Unable to send request to nzbserver at %s (port %i)\n", szControlIP, g_pOptions->GetControlPort());
+		printf("Unable to send request to nzbserver at %s (port %i)\n", g_pOptions->GetServerIP(), g_pOptions->GetServerPort());
 	}
 	return OK;
 }
@@ -125,7 +125,7 @@ void RemoteClient::InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest,
 	pMessageBase->m_iSignature	= htonl(NZBMESSAGE_SIGNATURE);
 	pMessageBase->m_iType = htonl(iRequest);
 	pMessageBase->m_iStructSize = htonl(iSize);
-	strncpy(pMessageBase->m_szPassword, g_pOptions->GetControlPassword(), NZBREQUESTPASSWORDSIZE - 1);
+	strncpy(pMessageBase->m_szPassword, g_pOptions->GetServerPassword(), NZBREQUESTPASSWORDSIZE - 1);
 	pMessageBase->m_szPassword[NZBREQUESTPASSWORDSIZE - 1] = '\0';
 }
 
@@ -166,7 +166,6 @@ bool RemoteClient::ReceiveBoolResponse()
 		{
 			printf("Invalid response received: either not nzbget-server or wrong server version\n");
 		}
-		free(buf);
 		return false;
 	}
 
@@ -178,7 +177,7 @@ bool RemoteClient::ReceiveBoolResponse()
 /*
  * Sends a message to the running nzbget process.
  */
-bool RemoteClient::RequestServerDownload(const char* szFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority)
+bool RemoteClient::RequestServerDownload(const char* szFilename, const char* szCategory, bool bAddFirst)
 {
 	// Read the file into the buffer
 	char* szBuffer	= NULL;
@@ -195,8 +194,6 @@ bool RemoteClient::RequestServerDownload(const char* szFilename, const char* szC
 		SNZBDownloadRequest DownloadRequest;
 		InitMessageBase(&DownloadRequest.m_MessageBase, eRemoteRequestDownload, sizeof(DownloadRequest));
 		DownloadRequest.m_bAddFirst = htonl(bAddFirst);
-		DownloadRequest.m_bAddPaused = htonl(bAddPaused);
-		DownloadRequest.m_iPriority = htonl(iPriority);
 		DownloadRequest.m_iTrailingDataLength = htonl(iLength);
 
 		strncpy(DownloadRequest.m_szFilename, szFilename, NZBREQUESTFILENAMESIZE - 1);
@@ -234,6 +231,7 @@ void RemoteClient::BuildFileList(SNZBListResponse* pListResponse, const char* pT
 {
 	if (ntohl(pListResponse->m_iTrailingDataLength) > 0)
 	{
+		NZBQueue cNZBQueue;
 		const char* pBufPtr = pTrailingData;
 
 		// read nzb entries
@@ -242,29 +240,22 @@ void RemoteClient::BuildFileList(SNZBListResponse* pListResponse, const char* pT
 			SNZBListResponseNZBEntry* pListAnswer = (SNZBListResponseNZBEntry*) pBufPtr;
 
 			const char* szFileName = pBufPtr + sizeof(SNZBListResponseNZBEntry);
-			const char* szName = pBufPtr + sizeof(SNZBListResponseNZBEntry) + ntohl(pListAnswer->m_iFilenameLen);
-			const char* szDestDir = pBufPtr + sizeof(SNZBListResponseNZBEntry) + ntohl(pListAnswer->m_iFilenameLen) + 
-				ntohl(pListAnswer->m_iNameLen);
-			const char* szCategory = pBufPtr + sizeof(SNZBListResponseNZBEntry) + ntohl(pListAnswer->m_iFilenameLen) + 
-				ntohl(pListAnswer->m_iNameLen) + ntohl(pListAnswer->m_iDestDirLen);
-			const char* m_szQueuedFilename = pBufPtr + sizeof(SNZBListResponseNZBEntry) + ntohl(pListAnswer->m_iFilenameLen) + 
-				ntohl(pListAnswer->m_iNameLen) + ntohl(pListAnswer->m_iDestDirLen) + ntohl(pListAnswer->m_iCategoryLen);
+			const char* szDestDir = pBufPtr + sizeof(SNZBListResponseNZBEntry) + ntohl(pListAnswer->m_iFilenameLen);
+			const char* szCategory = pBufPtr + sizeof(SNZBListResponseNZBEntry) + ntohl(pListAnswer->m_iFilenameLen) + ntohl(pListAnswer->m_iDestDirLen);
+			const char* m_szQueuedFilename = pBufPtr + sizeof(SNZBListResponseNZBEntry) + ntohl(pListAnswer->m_iFilenameLen) + ntohl(pListAnswer->m_iDestDirLen) + ntohl(pListAnswer->m_iCategoryLen);
 			
-			MatchedNZBInfo* pNZBInfo = new MatchedNZBInfo();
+			NZBInfo* pNZBInfo = new NZBInfo();
 			pNZBInfo->SetSize(Util::JoinInt64(ntohl(pListAnswer->m_iSizeHi), ntohl(pListAnswer->m_iSizeLo)));
 			pNZBInfo->SetFilename(szFileName);
-			pNZBInfo->SetName(szName);
 			pNZBInfo->SetDestDir(szDestDir);
 			pNZBInfo->SetCategory(szCategory);
 			pNZBInfo->SetQueuedFilename(m_szQueuedFilename);
-			pNZBInfo->m_bMatch = ntohl(pListAnswer->m_bMatch);
 
-			pNZBInfo->AddReference();
-			pDownloadQueue->GetNZBInfoList()->Add(pNZBInfo);
+			cNZBQueue.push_back(pNZBInfo);
 
 			pBufPtr += sizeof(SNZBListResponseNZBEntry) + ntohl(pListAnswer->m_iFilenameLen) +
-				ntohl(pListAnswer->m_iNameLen) + ntohl(pListAnswer->m_iDestDirLen) + 
-				ntohl(pListAnswer->m_iCategoryLen) + ntohl(pListAnswer->m_iQueuedFilenameLen);
+				ntohl(pListAnswer->m_iDestDirLen) + ntohl(pListAnswer->m_iCategoryLen) + 
+				ntohl(pListAnswer->m_iQueuedFilenameLen);
 		}
 
 		//read ppp entries
@@ -275,7 +266,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->GetNZBInfoList()->at(ntohl(pListAnswer->m_iNZBIndex) - 1);
+			NZBInfo* pNZBInfo = cNZBQueue.at(ntohl(pListAnswer->m_iNZBIndex) - 1);
 			pNZBInfo->SetParameter(szName, szValue);
 
 			pBufPtr += sizeof(SNZBListResponsePPPEntry) + ntohl(pListAnswer->m_iNameLen) +
@@ -290,7 +281,7 @@ void RemoteClient::BuildFileList(SNZBListResponse* pListResponse, const char* pT
 			const char* szSubject = pBufPtr + sizeof(SNZBListResponseFileEntry);
 			const char* szFileName = pBufPtr + sizeof(SNZBListResponseFileEntry) + ntohl(pListAnswer->m_iSubjectLen);
 			
-			MatchedFileInfo* pFileInfo = new MatchedFileInfo();
+			FileInfo* pFileInfo = new FileInfo();
 			pFileInfo->SetID(ntohl(pListAnswer->m_iID));
 			pFileInfo->SetSize(Util::JoinInt64(ntohl(pListAnswer->m_iFileSizeHi), ntohl(pListAnswer->m_iFileSizeLo)));
 			pFileInfo->SetRemainingSize(Util::JoinInt64(ntohl(pListAnswer->m_iRemainingSizeHi), ntohl(pListAnswer->m_iRemainingSizeLo)));
@@ -298,25 +289,20 @@ void RemoteClient::BuildFileList(SNZBListResponse* pListResponse, const char* pT
 			pFileInfo->SetSubject(szSubject);
 			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->GetNZBInfoList()->at(ntohl(pListAnswer->m_iNZBIndex) - 1);
+			NZBInfo* pNZBInfo = cNZBQueue.at(ntohl(pListAnswer->m_iNZBIndex) - 1);
 
 			pFileInfo->SetNZBInfo(pNZBInfo);
 
-			pDownloadQueue->GetFileQueue()->push_back(pFileInfo);
+			pDownloadQueue->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)
+bool RemoteClient::RequestServerList(bool bFiles, bool bGroups)
 {
 	if (!InitConnection()) return false;
 
@@ -324,13 +310,6 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 	InitMessageBase(&ListRequest.m_MessageBase, eRemoteRequestList, sizeof(ListRequest));
 	ListRequest.m_bFileList = htonl(true);
 	ListRequest.m_bServerState = htonl(true);
-	ListRequest.m_iMatchMode = htonl(szPattern ? eRemoteMatchModeRegEx : eRemoteMatchModeID);
-	ListRequest.m_bMatchGroup = htonl(bGroups);
-	if (szPattern)
-	{
-		strncpy(ListRequest.m_szPattern, szPattern, NZBREQUESTFILENAMESIZE - 1);
-		ListRequest.m_szPattern[NZBREQUESTFILENAMESIZE-1] = '\0';
-	}
 
 	if (m_pConnection->Send((char*)(&ListRequest), sizeof(ListRequest)) < 0)
 	{
@@ -371,13 +350,6 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 
 	m_pConnection->Disconnect();
 
-	if (szPattern && !ListResponse.m_bRegExValid)
-	{
-		printf("Error in regular expression\n");
-		free(pBuf);
-		return false;
-	}
-
 	if (bFiles)
 	{
 		if (ntohl(ListResponse.m_iTrailingDataLength) == 0)
@@ -394,33 +366,17 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 
 			long long lRemaining = 0;
 			long long lPaused = 0;
-			int iMatches = 0;
 
-			for (FileQueue::iterator it = cRemoteQueue.GetFileQueue()->begin(); it != cRemoteQueue.GetFileQueue()->end(); it++)
+			for (DownloadQueue::iterator it = cRemoteQueue.begin(); it != cRemoteQueue.end(); it++)
 			{
 				FileInfo* pFileInfo = *it;
 
-				char szPriority[100];
-				szPriority[0] = '\0';
-				if (pFileInfo->GetPriority() != 0)
-				{
-					sprintf(szPriority, "[%+i] ", pFileInfo->GetPriority());
-				}
-
 				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())
 				{
@@ -432,30 +388,18 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 					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++;
-				}
+				
+				char szNZBNiceName[1024];
+				pFileInfo->GetNZBInfo()->GetNiceNZBName(szNZBNiceName, 1024);
+				
+				printf("[%i] %s%c%s (%.2f MB%s)%s\n", pFileInfo->GetID(), szNZBNiceName, (int)PATH_SEPARATOR, pFileInfo->GetFilename(),
+					(float)(Util::Int64ToFloat(pFileInfo->GetSize()) / 1024.0 / 1024.0), szCompleted, szStatus);
 
 				delete pFileInfo;
 			}
 
-			if (iMatches == 0)
-			{
-				printf("No matches founds\n");
-			}
-
 			printf("-----------------------------------\n");
-			printf("Files: %i\n", cRemoteQueue.GetFileQueue()->size());
-			if (szPattern)
-			{
-				printf("Matches: %i\n", iMatches);
-			}
+			printf("Files: %i\n", cRemoteQueue.size());
 			if (lPaused > 0)
 			{
 				printf("Remaining size: %.2f MB (+%.2f MB paused)\n", (float)(Util::Int64ToFloat(lRemaining) / 1024.0 / 1024.0), 
@@ -483,11 +427,10 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 			BuildFileList(&ListResponse, pBuf, &cRemoteQueue);
 
 			GroupQueue cGroupQueue;
-			cRemoteQueue.BuildGroups(&cGroupQueue);
+			GroupInfo::BuildGroups(&cRemoteQueue, &cGroupQueue);
 
 			long long lRemaining = 0;
 			long long lPaused = 0;
-			int iMatches = 0;
 
 			for (GroupQueue::iterator it = cGroupQueue.begin(); it != cGroupQueue.end(); it++)
 			{
@@ -499,20 +442,6 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 				char szRemaining[20];
 				Util::FormatFileSize(szRemaining, sizeof(szRemaining), lUnpausedRemainingSize);
 
-				char szPriority[100];
-				szPriority[0] = '\0';
-				if (pGroupInfo->GetMinPriority() != 0 || pGroupInfo->GetMaxPriority() != 0)
-				{
-					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 (pGroupInfo->GetPausedSize() > 0)
@@ -523,6 +452,9 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 					lPaused += pGroupInfo->GetPausedSize();
 				}
 
+				char szNZBNiceName[1024];
+				pGroupInfo->GetNZBInfo()->GetNiceNZBName(szNZBNiceName, 1023);
+
 				char szCategory[1024];
 				szCategory[0] = '\0';
 				if (pGroupInfo->GetNZBInfo()->GetCategory() && strlen(pGroupInfo->GetNZBInfo()->GetCategory()) > 0)
@@ -530,13 +462,6 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 					sprintf(szCategory, " (%s)", pGroupInfo->GetNZBInfo()->GetCategory());
 				}
 
-				char szThreads[100];
-				szThreads[0] = '\0';
-				if (pGroupInfo->GetActiveDownloads() > 0)
-				{
-					sprintf(szThreads, ", %i thread%s", pGroupInfo->GetActiveDownloads(), (pGroupInfo->GetActiveDownloads() > 1 ? "s" : ""));
-				}
-
 				char szParameters[1024];
 				szParameters[0] = '\0';
 				for (NZBParameterList::iterator it = pGroupInfo->GetNZBInfo()->GetParameters()->begin(); it != pGroupInfo->GetNZBInfo()->GetParameters()->end(); it++)
@@ -559,35 +484,21 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 					strncat(szParameters, ")", 1024);
 				}
 
-				if (!szPattern || ((MatchedNZBInfo*)pGroupInfo->GetNZBInfo())->m_bMatch)
-				{
-					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++;
-				}
+				printf("[%i-%i] %s (%i file%s, %s%s)%s%s\n", pGroupInfo->GetFirstID(), pGroupInfo->GetLastID(), szNZBNiceName, 
+					pGroupInfo->GetRemainingFileCount(), pGroupInfo->GetRemainingFileCount() > 1 ? "s" : "", szRemaining, 
+					szPaused, szCategory, szParameters);
 
 				delete pGroupInfo;
 			}
 
-			for (FileQueue::iterator it = cRemoteQueue.GetFileQueue()->begin(); it != cRemoteQueue.GetFileQueue()->end(); it++)
+			for (DownloadQueue::iterator it = cRemoteQueue.begin(); it != cRemoteQueue.end(); it++)
 			{
 				delete *it;
 			}
 
-			if (iMatches == 0)
-			{
-				printf("No matches founds\n");
-			}
-
 			printf("-----------------------------------\n");
 			printf("Groups: %i\n", cGroupQueue.size());
-			if (szPattern)
-			{
-				printf("Matches: %i\n", iMatches);
-			}
-			printf("Files: %i\n", cRemoteQueue.GetFileQueue()->size());
+			printf("Files: %i\n", cRemoteQueue.size());
 			if (lPaused > 0)
 			{
 				printf("Remaining size: %.2f MB (+%.2f MB paused)\n", (float)(Util::Int64ToFloat(lRemaining) / 1024.0 / 1024.0), 
@@ -602,25 +513,12 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 
 	free(pBuf);
 
-	long long lRemaining = Util::JoinInt64(ntohl(ListResponse.m_iRemainingSizeHi), ntohl(ListResponse.m_iRemainingSizeLo));
-
 	if (!bFiles && !bGroups)
 	{
+		long long lRemaining = Util::JoinInt64(ntohl(ListResponse.m_iRemainingSizeHi), ntohl(ListResponse.m_iRemainingSizeLo));
 		printf("Remaining size: %.2f MB\n", (float)(Util::Int64ToFloat(lRemaining) / 1024.0 / 1024.0));
 	}
 
-    if (ntohl(ListResponse.m_iDownloadRate) > 0 && 
-		!ntohl(ListResponse.m_bDownloadPaused) && 
-		!ntohl(ListResponse.m_bDownload2Paused) && 
-		!ntohl(ListResponse.m_bDownloadStandBy))
-    {
-        long long remain_sec = (long long)(lRemaining / ntohl(ListResponse.m_iDownloadRate));
-		int h = (int)(remain_sec / 3600);
-		int m = (int)((remain_sec % 3600) / 60);
-		int s = (int)(remain_sec % 60);
-		printf("Remaining time: %.2d:%.2d:%.2d\n", h, m, s);
-    }
-
 	printf("Current download rate: %.1f KB/s\n", (float)(ntohl(ListResponse.m_iDownloadRate) / 1024.0));
 
 	long long iAllBytes = Util::JoinInt64(ntohl(ListResponse.m_iDownloadedBytesHi), ntohl(ListResponse.m_iDownloadedBytesLo));
@@ -653,41 +551,15 @@ bool RemoteClient::RequestServerList(bool bFiles, bool bGroups, const char* szPa
 		printf("Post-jobs: %i\n", (int)ntohl(ListResponse.m_iPostJobCount));
 	}
 
-	if (ntohl(ListResponse.m_bScanPaused))
+	if (ntohl(ListResponse.m_bServerStandBy))
 	{
-		printf("Scan state: Paused\n");
-	}
-
-	char szServerState[50];
-
-	if (ntohl(ListResponse.m_bDownloadPaused) || ntohl(ListResponse.m_bDownload2Paused))
-	{
-		snprintf(szServerState, sizeof(szServerState), "%s%s", 
-			ntohl(ListResponse.m_bDownloadStandBy) ? "Paused" : "Pausing",
-			ntohl(ListResponse.m_bDownloadPaused) && ntohl(ListResponse.m_bDownload2Paused) ?
-			" (+2)" : ntohl(ListResponse.m_bDownload2Paused) ? " (2)" : "");
+		printf("Server state: Stand-By\n");
 	}
 	else
 	{
-		snprintf(szServerState, sizeof(szServerState), "%s", ntohl(ListResponse.m_bDownloadStandBy) ? "" : "Downloading");
+		printf("Server state: %s\n", ntohl(ListResponse.m_bServerPaused) ? "Paused" : "Downloading");
 	}
 
-	if (ntohl(ListResponse.m_iPostJobCount) > 0 || ntohl(ListResponse.m_bPostPaused))
-	{
-		strncat(szServerState, strlen(szServerState) > 0 ? ", Post-Processing" : "Post-Processing", sizeof(szServerState));
-		if (ntohl(ListResponse.m_bPostPaused))
-		{
-			strncat(szServerState, " paused", sizeof(szServerState));
-		}
-	}
-
-	if (strlen(szServerState) == 0)
-	{
-		strncpy(szServerState, "Stand-By", sizeof(szServerState));
-	}
-
-	printf("Server state: %s\n", szServerState);
-
 	return true;
 }
 
@@ -784,14 +656,13 @@ bool RemoteClient::RequestServerLog(int iLines)
 	return true;
 }
 
-bool RemoteClient::RequestServerPauseUnpause(bool bPause, eRemotePauseUnpauseAction iAction)
+bool RemoteClient::RequestServerPauseUnpause(bool bPause)
 {
 	if (!InitConnection()) return false;
 
 	SNZBPauseUnpauseRequest PauseUnpauseRequest;
 	InitMessageBase(&PauseUnpauseRequest.m_MessageBase, eRemoteRequestPauseUnpause, sizeof(PauseUnpauseRequest));
 	PauseUnpauseRequest.m_bPause = htonl(bPause);
-	PauseUnpauseRequest.m_iAction = htonl(iAction);
 
 	if (m_pConnection->Send((char*)(&PauseUnpauseRequest), sizeof(PauseUnpauseRequest)) < 0)
 	{
@@ -847,10 +718,9 @@ bool RemoteClient::RequestServerDumpDebug()
 	return OK;
 }
 
-bool RemoteClient::RequestServerEditQueue(eRemoteEditAction iAction, int iOffset, const char* szText, 
-	int* pIDList, int iIDCount, NameList* pNameList, eRemoteMatchMode iMatchMode, bool bSmartOrder)
+bool RemoteClient::RequestServerEditQueue(int iAction, int iOffset, const char* szText, int* pIDList, int iIDCount, bool bSmartOrder)
 {
-	if ((iIDCount <= 0 || pIDList == NULL) && (pNameList == NULL || pNameList->size() == 0))
+	if (iIDCount <= 0 || pIDList == NULL)
 	{
 		printf("File(s) not specified\n");
 		return false;
@@ -858,38 +728,18 @@ bool RemoteClient::RequestServerEditQueue(eRemoteEditAction iAction, int iOffset
 
 	if (!InitConnection()) return false;
 
-	int iIDLength = sizeof(int32_t) * iIDCount;
-
-	int iNameCount = 0;
-	int iNameLength = 0;
-	if (pNameList && pNameList->size() > 0)
-	{
-		for (NameList::iterator it = pNameList->begin(); it != pNameList->end(); it++)
-		{
-			const char *szName = *it;
-			iNameLength += strlen(szName) + 1;
-			iNameCount++;
-		}
-		// align size to 4-bytes, needed by ARM-processor (and may be others)
-		iNameLength += iNameLength % 4 > 0 ? 4 - iNameLength % 4 : 0;
-	}
-
 	int iTextLen = szText ? strlen(szText) + 1 : 0;
 	// align size to 4-bytes, needed by ARM-processor (and may be others)
 	iTextLen += iTextLen % 4 > 0 ? 4 - iTextLen % 4 : 0;
-
-	int iLength = iTextLen + iIDLength + iNameLength;
+	int iLength = sizeof(int32_t) * iIDCount + iTextLen;
 
 	SNZBEditQueueRequest EditQueueRequest;
 	InitMessageBase(&EditQueueRequest.m_MessageBase, eRemoteRequestEditQueue, sizeof(EditQueueRequest));
 	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);
-	EditQueueRequest.m_iTrailingNameEntriesLen = htonl(iNameLength);
+	EditQueueRequest.m_iNrTrailingEntries = htonl(iIDCount);
 	EditQueueRequest.m_iTrailingDataLength = htonl(iLength);
 
 	char* pTrailingData = (char*)malloc(iLength);
@@ -905,19 +755,7 @@ bool RemoteClient::RequestServerEditQueue(eRemoteEditAction iAction, int iOffset
 	{
 		pIDs[i] = htonl(pIDList[i]);
 	}
-	
-	if (iNameCount > 0)
-	{
-		char *pNames = pTrailingData + iTextLen + iIDLength;
-		for (NameList::iterator it = pNameList->begin(); it != pNameList->end(); it++)
-		{
-			const char *szName = *it;
-			int iLen = strlen(szName);
-			strncpy(pNames, szName, iLen + 1);
-			pNames += iLen + 1;
-		}
-	}
-
+			
 	bool OK = false;
 	if (m_pConnection->Send((char*)(&EditQueueRequest), sizeof(EditQueueRequest)) < 0)
 	{
@@ -957,27 +795,6 @@ bool RemoteClient::RequestServerShutdown()
 	return OK;
 }
 
-bool RemoteClient::RequestServerReload()
-{
-	if (!InitConnection()) return false;
-
-	SNZBReloadRequest ReloadRequest;
-	InitMessageBase(&ReloadRequest.m_MessageBase, eRemoteRequestReload, sizeof(ReloadRequest));
-
-	bool OK = m_pConnection->Send((char*)(&ReloadRequest), sizeof(ReloadRequest)) >= 0;
-	if (OK)
-	{
-		OK = ReceiveBoolResponse();
-	}
-	else
-	{
-		perror("m_pConnection->Send");
-	}
-
-	m_pConnection->Disconnect();
-	return OK;
-}
-
 bool RemoteClient::RequestServerVersion()
 {
 	if (!InitConnection()) return false;
@@ -1047,7 +864,7 @@ bool RemoteClient::RequestPostQueue()
 
 	if (ntohl(PostQueueResponse.m_iTrailingDataLength) == 0)
 	{
-		printf("Server has no jobs queued for post-processing\n");
+		printf("Server has no files queued for post-processing\n");
 	}
 	else
 	{
@@ -1109,15 +926,13 @@ bool RemoteClient::RequestWriteLog(int iKind, const char* szText)
 	return OK;
 }
 
-bool RemoteClient::RequestScan(bool bSyncMode)
+bool RemoteClient::RequestScan()
 {
 	if (!InitConnection()) return false;
 
 	SNZBScanRequest ScanRequest;
 	InitMessageBase(&ScanRequest.m_MessageBase, eRemoteRequestScan, sizeof(ScanRequest));
 
-	ScanRequest.m_bSyncMode = htonl(bSyncMode);
-
 	bool OK = m_pConnection->Send((char*)(&ScanRequest), sizeof(ScanRequest)) >= 0;
 	if (OK)
 	{
@@ -1131,222 +946,3 @@ bool RemoteClient::RequestScan(bool bSyncMode)
 	m_pConnection->Disconnect();
 	return OK;
 }
-
-bool RemoteClient::RequestHistory()
-{
-	if (!InitConnection()) return false;
-
-	SNZBHistoryRequest HistoryRequest;
-	InitMessageBase(&HistoryRequest.m_MessageBase, eRemoteRequestHistory, sizeof(HistoryRequest));
-
-	if (m_pConnection->Send((char*)(&HistoryRequest), sizeof(HistoryRequest)) < 0)
-	{
-		perror("m_pConnection->Send");
-		return false;
-	}
-
-	printf("Request sent\n");
-
-	// Now listen for the returned list
-	SNZBHistoryResponse HistoryResponse;
-	int iResponseLen = m_pConnection->Recv((char*) &HistoryResponse, sizeof(HistoryResponse));
-	if (iResponseLen != sizeof(HistoryResponse) || 
-		(int)ntohl(HistoryResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
-		ntohl(HistoryResponse.m_MessageBase.m_iStructSize) != sizeof(HistoryResponse))
-	{
-		if (iResponseLen < 0)
-		{
-			printf("No response received (timeout)\n");
-		}
-		else
-		{
-			printf("Invalid response received: either not nzbget-server or wrong server version\n");
-		}
-		return false;
-	}
-
-	char* pBuf = NULL;
-	if (ntohl(HistoryResponse.m_iTrailingDataLength) > 0)
-	{
-		pBuf = (char*)malloc(ntohl(HistoryResponse.m_iTrailingDataLength));
-		if (!m_pConnection->RecvAll(pBuf, ntohl(HistoryResponse.m_iTrailingDataLength)))
-		{
-			free(pBuf);
-			return false;
-		}
-	}
-
-	m_pConnection->Disconnect();
-
-	if (ntohl(HistoryResponse.m_iTrailingDataLength) == 0)
-	{
-		printf("Server has no files in history\n");
-	}
-	else
-	{
-		printf("History (most recent first)\n");
-		printf("-----------------------------------\n");
-
-		char* pBufPtr = (char*)pBuf;
-		for (unsigned int i = 0; i < ntohl(HistoryResponse.m_iNrTrailingEntries); i++)
-		{
-			SNZBHistoryResponseEntry* pListAnswer = (SNZBHistoryResponseEntry*) pBufPtr;
-
-			HistoryInfo::EKind eKind = (HistoryInfo::EKind)ntohl(pListAnswer->m_iKind);
-			const char* szNicename = pBufPtr + sizeof(SNZBHistoryResponseEntry);
-
-			if (eKind == HistoryInfo::hkNZBInfo)
-			{
-				long long lSize = Util::JoinInt64(ntohl(pListAnswer->m_iSizeHi), ntohl(pListAnswer->m_iSizeLo));
-
-				char szSize[20];
-				Util::FormatFileSize(szSize, sizeof(szSize), lSize);
-
-				const char* szParStatusText[] = { "", ", Par failed", ", Par possible", ", Par successful" };
-				const char* szScriptStatusText[] = { "", ", Script status unknown", ", Script failed", ", Script successful" };
-
-				printf("[%i] %s (%i files, %s%s%s)\n", ntohl(pListAnswer->m_iID), szNicename, 
-					ntohl(pListAnswer->m_iFileCount), szSize, 
-					szParStatusText[ntohl(pListAnswer->m_iParStatus)], 
-					szScriptStatusText[ntohl(pListAnswer->m_iScriptStatus)]);
-			}
-			else if (eKind == HistoryInfo::hkUrlInfo)
-			{
-				const char* szUrlStatusText[] = { "", "", "Url download successful", "Url download failed", "" };
-
-				printf("[%i] %s (%s)\n", ntohl(pListAnswer->m_iID), szNicename, 
-					szUrlStatusText[ntohl(pListAnswer->m_iUrlStatus)]);
-			}
-
-			pBufPtr += sizeof(SNZBHistoryResponseEntry) + ntohl(pListAnswer->m_iNicenameLen);
-		}
-
-		printf("-----------------------------------\n");
-		printf("Items: %i\n", ntohl(HistoryResponse.m_iNrTrailingEntries));
-	}
-
-	free(pBuf);
-
-	return true;
-}
-
-bool RemoteClient::RequestServerDownloadUrl(const char* szURL, const char* szNZBFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority)
-{
-	if (!InitConnection()) return false;
-
-	SNZBDownloadUrlRequest DownloadUrlRequest;
-	InitMessageBase(&DownloadUrlRequest.m_MessageBase, eRemoteRequestDownloadUrl, sizeof(DownloadUrlRequest));
-	DownloadUrlRequest.m_bAddFirst = htonl(bAddFirst);
-	DownloadUrlRequest.m_bAddPaused = htonl(bAddPaused);
-	DownloadUrlRequest.m_iPriority = htonl(iPriority);
-
-	strncpy(DownloadUrlRequest.m_szURL, szURL, NZBREQUESTFILENAMESIZE - 1);
-	DownloadUrlRequest.m_szURL[NZBREQUESTFILENAMESIZE-1] = '\0';
-
-	DownloadUrlRequest.m_szCategory[0] = '\0';
-	if (szCategory)
-	{
-		strncpy(DownloadUrlRequest.m_szCategory, szCategory, NZBREQUESTFILENAMESIZE - 1);
-	}
-	DownloadUrlRequest.m_szCategory[NZBREQUESTFILENAMESIZE-1] = '\0';
-
-	DownloadUrlRequest.m_szNZBFilename[0] = '\0';
-	if (szNZBFilename)
-	{
-		strncpy(DownloadUrlRequest.m_szNZBFilename, szNZBFilename, NZBREQUESTFILENAMESIZE - 1);
-	}
-	DownloadUrlRequest.m_szNZBFilename[NZBREQUESTFILENAMESIZE-1] = '\0';
-
-	bool OK = m_pConnection->Send((char*)(&DownloadUrlRequest), sizeof(DownloadUrlRequest)) >= 0;
-	if (OK)
-	{
-		OK = ReceiveBoolResponse();
-	}
-	else
-	{
-		perror("m_pConnection->Send");
-	}
-
-	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)) < 0)
-	{
-		perror("m_pConnection->Send");
-		return false;
-	}
-
-	printf("Request sent\n");
-
-	// Now listen for the returned list
-	SNZBUrlQueueResponse UrlQueueResponse;
-	int iResponseLen = m_pConnection->Recv((char*) &UrlQueueResponse, sizeof(UrlQueueResponse));
-	if (iResponseLen != sizeof(UrlQueueResponse) || 
-		(int)ntohl(UrlQueueResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
-		ntohl(UrlQueueResponse.m_MessageBase.m_iStructSize) != sizeof(UrlQueueResponse))
-	{
-		if (iResponseLen < 0)
-		{
-			printf("No response received (timeout)\n");
-		}
-		else
-		{
-			printf("Invalid response received: either not nzbget-server or wrong server version\n");
-		}
-		return false;
-	}
-
-	char* pBuf = NULL;
-	if (ntohl(UrlQueueResponse.m_iTrailingDataLength) > 0)
-	{
-		pBuf = (char*)malloc(ntohl(UrlQueueResponse.m_iTrailingDataLength));
-		if (!m_pConnection->RecvAll(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

@@ -1,8 +1,8 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
  *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -35,19 +35,8 @@
 class RemoteClient
 {
 private:
-	class MatchedNZBInfo: public NZBInfo
-	{
-	public:
-		bool		m_bMatch;
-	};
-
-	class MatchedFileInfo: public FileInfo
-	{
-	public:
-		bool		m_bMatch;
-	};
-
 	Connection* 	m_pConnection;
+	NetAddress*		m_pNetAddress;
 	bool			m_bVerbose;
 
 	bool			InitConnection();
@@ -57,26 +46,21 @@ private:
 	void			perror(const char* msg);
 
 public:
-					RemoteClient();
-					~RemoteClient();
+	RemoteClient();
+	~RemoteClient();
 	void			SetVerbose(bool bVerbose) { m_bVerbose = bVerbose; };
-	bool 			RequestServerDownload(const char* szFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority);
-	bool			RequestServerList(bool bFiles, bool bGroups, const char* szPattern);
-	bool			RequestServerPauseUnpause(bool bPause, eRemotePauseUnpauseAction iAction);
+	bool 			RequestServerDownload(const char* szFilename, const char* szCategory, bool bAddFirst);
+	bool			RequestServerList(bool bFiles, bool bGroups);
+	bool			RequestServerPauseUnpause(bool bPause);
 	bool			RequestServerSetDownloadRate(float fRate);
 	bool			RequestServerDumpDebug();
-	bool 			RequestServerEditQueue(eRemoteEditAction iAction, int iOffset, const char* szText, 
-		int* pIDList, int iIDCount, NameList* pNameList, eRemoteMatchMode iMatchMode, bool bSmartOrder);
+	bool 			RequestServerEditQueue(int iAction, int iOffset, const char* szText, int* pIDList, int iIDCount, bool bSmartOrder);
 	bool			RequestServerLog(int iLines);
 	bool			RequestServerShutdown();
-	bool			RequestServerReload();
 	bool			RequestServerVersion();
 	bool			RequestPostQueue();
 	bool 			RequestWriteLog(int iKind, const char* szText);
-	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();
+	bool			RequestScan();
 	void			BuildFileList(SNZBListResponse* pListResponse, const char* pTrailingData, DownloadQueue* pDownloadQueue);
 };
 

RemoteServer.cpp

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@sourceforge.net>
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2005  Bo Cordes Petersen <placebodk@sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -44,7 +44,7 @@
 #include "nzbget.h"
 #include "RemoteServer.h"
 #include "BinRpc.h"
-#include "WebServer.h"
+#include "XmlRpc.h"
 #include "Log.h"
 #include "Options.h"
 
@@ -57,6 +57,7 @@ RemoteServer::RemoteServer()
 {
 	debug("Creating RemoteServer");
 
+	m_pNetAddress = new NetAddress(g_pOptions->GetServerIP(), g_pOptions->GetServerPort());
 	m_pConnection = NULL;
 }
 
@@ -68,6 +69,7 @@ RemoteServer::~RemoteServer()
 	{
 		delete m_pConnection;
 	}
+	delete m_pNetAddress;
 }
 
 void RemoteServer::Run()
@@ -80,7 +82,7 @@ void RemoteServer::Run()
 
 		if (!m_pConnection)
 		{
-			m_pConnection = new Connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
+			m_pConnection = new Connection(m_pNetAddress);
 			m_pConnection->SetTimeout(g_pOptions->GetConnectionTimeout());
 			m_pConnection->SetSuppressErrors(false);
 			bBind = m_pConnection->Bind() == 0;
@@ -153,7 +155,7 @@ void RequestProcessor::Run()
 #endif
 	struct sockaddr_in PeerName;
 	int iPeerNameLength = sizeof(PeerName);
-	if (getpeername(m_iSocket, (struct sockaddr*)&PeerName, (SOCKLEN_T*) &iPeerNameLength) >= 0)
+	if (getpeername(m_iSocket, (struct sockaddr*)&PeerName, (socklen_t*) &iPeerNameLength) >= 0)
 	{
 #ifdef WIN32
 		ip = inet_ntoa(PeerName.sin_addr);
@@ -172,52 +174,52 @@ void RequestProcessor::Run()
 		processor.SetClientIP(ip);
 		processor.Execute();
 	}
-	else if (!strncmp((char*)&iSignature, "POST", 4) || 
-		!strncmp((char*)&iSignature, "GET ", 4) ||
-		!strncmp((char*)&iSignature, "OPTI", 4))
+	else if (!strncmp((char*)&iSignature, "POST", 4) || !strncmp((char*)&iSignature, "GET ", 4))
 	{
-		// HTTP request received
+		// XML-RPC or JSON-RPC request received
 		Connection con(m_iSocket, false);
 		char szBuffer[1024];
 		if (con.ReadLine(szBuffer, sizeof(szBuffer), NULL))
 		{
-			WebProcessor::EHttpMethod eHttpMethod = WebProcessor::hmGet;
+			XmlRpcProcessor::EHttpMethod eHttpMethod = XmlRpcProcessor::hmGet;
 			char* szUrl = szBuffer;
 			if (!strncmp((char*)&iSignature, "POST", 4))
 			{
-				eHttpMethod = WebProcessor::hmPost;
+				eHttpMethod = XmlRpcProcessor::hmPost;
 				szUrl++;
 			}
-			if (!strncmp((char*)&iSignature, "OPTI", 4) && strlen(szUrl) > 4)
-			{
-				eHttpMethod = WebProcessor::hmOptions;
-				szUrl += 4;
-			}
 			if (char* p = strchr(szUrl, ' '))
 			{
 				*p = '\0';
 			}
 
-			debug("url: %s", szUrl);
+			XmlRpcProcessor::ERpcProtocol eProtocol = XmlRpcProcessor::rpUndefined;
+			if (!strcmp(szUrl, "/xmlrpc") || !strncmp(szUrl, "/xmlrpc/", 8))
+			{
+				eProtocol = XmlRpcProcessor::rpXmlRpc;
+			}
+			else if (!strcmp(szUrl, "/jsonrpc") || !strncmp(szUrl, "/jsonrpc/", 9))
+			{
+				eProtocol = XmlRpcProcessor::rpJsonRpc;
+			}
 
-			WebProcessor processor;
-			processor.SetConnection(&con);
-			processor.SetClientIP(ip);
-			processor.SetUrl(szUrl);
-			processor.SetHttpMethod(eHttpMethod);
-			processor.Execute();
-			bOK = true;
+			if (eProtocol != XmlRpcProcessor::rpUndefined)
+			{
+				XmlRpcProcessor processor;
+				processor.SetConnection(&con);
+				processor.SetClientIP(ip);
+				processor.SetProtocol(eProtocol);
+				processor.SetHttpMethod(eHttpMethod);
+				processor.SetUrl(szUrl);
+				processor.Execute();
+				bOK = true;
+			}
 		}
 	}
 
-	if (!bOK && iBytesReceived > 0)
+	if (!bOK)
 	{
-		warn("Non-nzbget request received on port %i from %s", g_pOptions->GetControlPort(), ip);
-	}
-
-	if (!bOK && iBytesReceived == 0)
-	{
-		debug("empty request received on port %i from %s", g_pOptions->GetControlPort(), ip);
+		warn("Non-nzbget request received on port %i from %s", g_pOptions->GetServerPort(), ip);
 	}
 
 	closesocket(m_iSocket);

RemoteServer.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2005  Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -28,11 +28,13 @@
 #define REMOTESERVER_H
 
 #include "Thread.h"
+#include "NetAddress.h"
 #include "Connection.h"
 
 class RemoteServer : public Thread
 {
 private:
+	NetAddress*			m_pNetAddress;
 	Connection*			m_pConnection;
 
 public:

Scanner.cpp

@@ -1,387 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  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
- *  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 <fstream>
-#ifdef WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-#include <sys/stat.h>
-#include <errno.h>
-
-#include "nzbget.h"
-#include "Scanner.h"
-#include "Options.h"
-#include "Log.h"
-#include "QueueCoordinator.h"
-#include "ScriptController.h"
-#include "DiskState.h"
-#include "Util.h"
-
-extern QueueCoordinator* g_pQueueCoordinator;
-extern Options* g_pOptions;
-extern DiskState* g_pDiskState;
-
-Scanner::FileData::FileData(const char* szFilename)
-{
-	m_szFilename = strdup(szFilename);
-	m_iSize = 0;
-	m_tLastChange = 0;
-}
-
-Scanner::FileData::~FileData()
-{
-	free(m_szFilename);
-}
-
-Scanner::Scanner()
-{
-	debug("Creating Scanner");
-
-	m_bRequestedNZBDirScan = false;
-	m_bScanning = false;
-	m_iNZBDirInterval = g_pOptions->GetNzbDirInterval() * 1000;
-	m_iPass = 0;
-	m_iStepMSec = 0;
-
-	const char* szNZBScript = g_pOptions->GetNZBProcess();
-	m_bNZBScript = szNZBScript && strlen(szNZBScript) > 0;
-}
-
-Scanner::~Scanner()
-{
-	debug("Destroying Scanner");
-
-	for (FileList::iterator it = m_FileList.begin(); it != m_FileList.end(); it++)
-    {
-        delete *it;
-	}
-	m_FileList.clear();
-}
-
-void Scanner::Check()
-{
-	if (g_pOptions->GetNzbDir() && (m_bRequestedNZBDirScan || 
-		(!g_pOptions->GetPauseScan() && g_pOptions->GetNzbDirInterval() > 0 && 
-		 m_iNZBDirInterval >= g_pOptions->GetNzbDirInterval() * 1000)))
-	{
-		// check nzbdir every g_pOptions->GetNzbDirInterval() seconds or if requested
-		bool bCheckStat = !m_bRequestedNZBDirScan;
-		m_bRequestedNZBDirScan = false;
-		m_bScanning = true;
-		CheckIncomingNZBs(g_pOptions->GetNzbDir(), "", bCheckStat);
-		if (!bCheckStat && m_bNZBScript)
-		{
-			// if immediate scan requesten, we need second scan to process files extracted by NzbProcess-script
-			CheckIncomingNZBs(g_pOptions->GetNzbDir(), "", bCheckStat);
-		}
-		m_bScanning = false;
-		m_iNZBDirInterval = 0;
-
-		// if NzbDirFileAge is less than NzbDirInterval (that can happen if NzbDirInterval
-		// is set for rare scans like once per hour) we make 4 scans:
-		//   - one additional scan is neccessary to check sizes of detected files;
-		//   - another scan is required to check files which were extracted by NzbProcess-script;
-		//   - third scan is needed to check sizes of extracted files.
-		if (g_pOptions->GetNzbDirFileAge() < g_pOptions->GetNzbDirInterval())
-		{
-			int iMaxPass = m_bNZBScript ? 3 : 1;
-			if (m_iPass < iMaxPass)
-			{
-				// scheduling another scan of incoming directory in NzbDirFileAge seconds.
-				m_iNZBDirInterval = (g_pOptions->GetNzbDirInterval() - g_pOptions->GetNzbDirFileAge()) * 1000;
-				m_iPass++;
-			}
-			else
-			{
-				m_iPass = 0;
-			}
-		}
-
-		DropOldFiles();
-	}
-	m_iNZBDirInterval += m_iStepMSec;
-}
-
-/**
-* Check if there are files in directory for incoming nzb-files
-* and add them to download queue
-*/
-void Scanner::CheckIncomingNZBs(const char* szDirectory, const char* szCategory, bool bCheckStat)
-{
-	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';
-		if (!stat(fullfilename, &buffer))
-		{
-			// check subfolders
-			if ((buffer.st_mode & S_IFDIR) != 0 && strcmp(filename, ".") && strcmp(filename, ".."))
-			{
-				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);
-			}
-		}
-	}
-}
-
-/**
- * Only files which were not changed during last g_pOptions->GetNzbDirFileAge() seconds
- * can be processed. That prevents the processing of files, which are currently being
- * copied into nzb-directory (eg. being downloaded in web-browser).
- */
-bool Scanner::CanProcessFile(const char* szFullFilename, bool bCheckStat)
-{
-	const char* szExtension = strrchr(szFullFilename, '.');
-	if (!szExtension ||
-		!strcasecmp(szExtension, ".queued") ||
-		!strcasecmp(szExtension, ".error") ||
-		!strcasecmp(szExtension, ".processed"))
-	{
-		return false;
-	}
-
-	if (!bCheckStat)
-	{
-		return true;
-	}
-
-	long long lSize = Util::FileSize(szFullFilename);
-	time_t tCurrent = time(NULL);
-	bool bCanProcess = false;
-	bool bInList = false;
-
-	for (FileList::iterator it = m_FileList.begin(); it != m_FileList.end(); it++)
-    {
-        FileData* pFileData = *it;
-		if (!strcmp(pFileData->GetFilename(), szFullFilename))
-		{
-			bInList = true;
-			if (pFileData->GetSize() == lSize &&
-				tCurrent - pFileData->GetLastChange() >= g_pOptions->GetNzbDirFileAge())
-			{
-				bCanProcess = true;
-				delete pFileData;
-				m_FileList.erase(it);
-			}
-			else
-			{
-				pFileData->SetSize(lSize);
-				if (pFileData->GetSize() != lSize)
-				{
-					pFileData->SetLastChange(tCurrent);
-				}
-			}
-			break;
-		}
-	}
-
-	if (!bInList)
-	{
-		FileData* pFileData = new FileData(szFullFilename);
-		pFileData->SetSize(lSize);
-		pFileData->SetLastChange(tCurrent);
-		m_FileList.push_back(pFileData);
-	}
-
-	return bCanProcess;
-}
-
-/**
- * Remove old files from the list of monitored files.
- * Normally these files are deleted from the list when they are processed.
- * However if a file was detected by function "CanProcessFile" once but wasn't 
- * processed later (for example if the user deleted it), it will stay in the list,
- * until we remove it here.
- */
-void Scanner::DropOldFiles()
-{
-	time_t tCurrent = time(NULL);
-
-	int i = 0;
-	for (FileList::iterator it = m_FileList.begin(); it != m_FileList.end(); )
-    {
-        FileData* pFileData = *it;
-		if ((tCurrent - pFileData->GetLastChange() >= 
-			(g_pOptions->GetNzbDirInterval() + g_pOptions->GetNzbDirFileAge()) * 2) ||
-			// can occur if the system clock was adjusted
-			tCurrent < pFileData->GetLastChange())
-		{
-			debug("Removing file %s from scan file list", pFileData->GetFilename());
-
-			delete pFileData;
-			m_FileList.erase(it);
-			it = m_FileList.begin() + i;
-		}
-		else
-		{
-			it++;
-			i++;
-		}
-	}
-}
-
-void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFilename, const char* szFullFilename, const char* szCategory)
-{
-	const char* szExtension = strrchr(szBaseFilename, '.');
-	if (!szExtension)
-	{
-		return;
-	}
-
-	char* szNZBCategory = strdup(szCategory);
-	NZBParameterList* pParameterList = new NZBParameterList;
-	int iPriority = 0;
-
-	bool bExists = true;
-
-	if (m_bNZBScript && strcasecmp(szExtension, ".nzb_processed"))
-	{
-		NZBScriptController::ExecuteScript(g_pOptions->GetNZBProcess(), szFullFilename, szDirectory, 
-			&szNZBCategory, &iPriority, pParameterList); 
-		bExists = Util::FileExists(szFullFilename);
-		if (bExists && strcasecmp(szExtension, ".nzb"))
-		{
-			char bakname2[1024];
-			bool bRenameOK = Util::RenameBak(szFullFilename, "processed", false, bakname2, 1024);
-			if (!bRenameOK)
-			{
-				error("Could not rename file %s to %s! Errcode: %i", szFullFilename, bakname2, errno);
-			}
-		}
-	}
-
-	if (!strcasecmp(szExtension, ".nzb_processed"))
-	{
-		char szRenamedName[1024];
-		bool bRenameOK = Util::RenameBak(szFullFilename, "nzb", true, szRenamedName, 1024);
-		if (bRenameOK)
-		{
-			AddFileToQueue(szRenamedName, szNZBCategory, iPriority, pParameterList);
-		}
-		else
-		{
-			error("Could not rename file %s to %s! Errcode: %i", szFullFilename, szRenamedName, errno);
-		}
-	}
-	else if (bExists && !strcasecmp(szExtension, ".nzb"))
-	{
-		AddFileToQueue(szFullFilename, szNZBCategory, iPriority, pParameterList);
-	}
-
-	for (NZBParameterList::iterator it = pParameterList->begin(); it != pParameterList->end(); it++)
-	{
-		delete *it;
-	}
-	pParameterList->clear();
-	delete pParameterList;
-
-	free(szNZBCategory);
-}
-
-void Scanner::AddFileToQueue(const char* szFilename, const char* szCategory, int iPriority, NZBParameterList* pParameterList)
-{
-	const char* szBasename = Util::BaseFileName(szFilename);
-
-	info("Collection %s found", szBasename);
-
-	NZBFile* pNZBFile = NZBFile::CreateFromFile(szFilename, szCategory);
-	if (!pNZBFile)
-	{
-		error("Could not add collection %s to queue", szBasename);
-	}
-
-	char bakname2[1024];
-	bool bRenameOK = Util::RenameBak(szFilename, pNZBFile ? "queued" : "error", false, bakname2, 1024);
-	if (!bRenameOK)
-	{
-		error("Could not rename file %s to %s! Errcode: %i", szFilename, bakname2, errno);
-	}
-
-	if (pNZBFile && bRenameOK)
-	{
-		pNZBFile->GetNZBInfo()->SetQueuedFilename(bakname2);
-
-		for (NZBParameterList::iterator it = pParameterList->begin(); it != pParameterList->end(); it++)
-		{
-			NZBParameter* pParameter = *it;
-			pNZBFile->GetNZBInfo()->SetParameter(pParameter->GetName(), pParameter->GetValue());
-		}
-
-		for (NZBFile::FileInfos::iterator it = pNZBFile->GetFileInfos()->begin(); it != pNZBFile->GetFileInfos()->end(); it++)
-		{
-			FileInfo* pFileInfo = *it;
-			pFileInfo->SetPriority(iPriority);
-		}
-
-		g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, false);
-		info("Collection %s added to queue", szBasename);
-	}
-
-	if (pNZBFile)
-	{
-		delete pNZBFile;
-	}
-}
-
-void Scanner::ScanNZBDir(bool bSyncMode)
-{
-	// ideally we should use mutex to access "m_bRequestedNZBDirScan",
-	// but it's not critical here.
-	m_bScanning = true;
-	m_bRequestedNZBDirScan = true;
-
-	while (bSyncMode && (m_bScanning || m_bRequestedNZBDirScan))
-	{
-		usleep(100 * 1000);
-	}
-}

Scanner.h

@@ -1,77 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  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
- *  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 SCANNER_H
-#define SCANNER_H
-
-#include <deque>
-#include <time.h>
-#include "DownloadInfo.h"
-
-class Scanner
-{
-private:
-	class FileData
-	{
-	private:
-		char*			m_szFilename;
-		long long		m_iSize;
-		time_t			m_tLastChange;
-
-	public:
-						FileData(const char* szFilename);
-						~FileData();
-		const char*		GetFilename() { return m_szFilename; }
-		long long		GetSize() { return m_iSize; }
-		void			SetSize(long long lSize) { m_iSize = lSize; }
-		time_t			GetLastChange() { return m_tLastChange; }
-		void			SetLastChange(time_t tLastChange) { m_tLastChange = tLastChange; }
-	};
-
-	typedef std::deque<FileData*>		FileList;
-
-	bool				m_bRequestedNZBDirScan;
-	int					m_iNZBDirInterval;
-	bool				m_bNZBScript;
-	int					m_iPass;
-	int					m_iStepMSec;
-	FileList			m_FileList;
-	bool				m_bScanning;
-
-	void				CheckIncomingNZBs(const char* szDirectory, const char* szCategory, bool bCheckStat);
-	void				AddFileToQueue(const char* szFilename, const char* szCategory, int iPriority, NZBParameterList* pParameterList);
-	void				ProcessIncomingFile(const char* szDirectory, const char* szBaseFilename, const char* szFullFilename, const char* szCategory);
-	bool				CanProcessFile(const char* szFullFilename, bool bCheckStat);
-	void				DropOldFiles();
-
-public:
-						Scanner();
-						~Scanner();
-	void				SetStepInterval(int iStepMSec) { m_iStepMSec = iStepMSec; }
-	void				ScanNZBDir(bool bSyncMode);
-	void				Check();
-};
-
-#endif

Scheduler.cpp

@@ -1,7 +1,7 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
- *  Copyright (C) 2008-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2008 Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -24,13 +24,11 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
 #include "win32.h"
-#else
-#include <unistd.h>
 #endif
 
 #include <stdlib.h>
@@ -112,8 +110,7 @@ void Scheduler::FirstCheck()
 	m_bDetectClockChanges = false;
 	m_bExecuteProcess = false;
 	m_bDownloadRateChanged = false;
-	m_bPauseDownloadChanged = false;
-	m_bPauseScanChanged = false;
+	m_bPauseChanged = false;
 	CheckTasks();
 }
 
@@ -122,8 +119,7 @@ void Scheduler::IntervalCheck()
 	m_bDetectClockChanges = true;
 	m_bExecuteProcess = true;
 	m_bDownloadRateChanged = false;
-	m_bPauseDownloadChanged = false;
-	m_bPauseScanChanged = false;
+	m_bPauseChanged = false;
 	CheckTasks();
 }
 
@@ -213,7 +209,7 @@ void Scheduler::ExecuteTask(Task* pTask)
 	}
 	else
 	{
-		const char* szCommandName[] = { "Pause", "Unpause", "Set download rate", "Execute program", "Pause Scan", "Unpause Scan" };
+		const char* szCommandName[] = { "Pause", "Unpause", "Set download rate", "Execute program" };
 		debug("Executing scheduled command: %s", szCommandName[pTask->m_eCommand]);
 	}
 
@@ -224,10 +220,10 @@ void Scheduler::ExecuteTask(Task* pTask)
 			m_bDownloadRateChanged = true;
 			break;
 
-		case scPauseDownload:
-		case scUnpauseDownload:
-			m_bPauseDownload = pTask->m_eCommand == scPauseDownload;
-			m_bPauseDownloadChanged = true;
+		case scPause:
+		case scUnpause:
+			m_bPause = pTask->m_eCommand == scPause;
+			m_bPauseChanged = true;
 			break;
 
 		case scProcess:
@@ -236,11 +232,5 @@ void Scheduler::ExecuteTask(Task* pTask)
 				SchedulerScriptController::StartScript(pTask->m_szProcess);
 			}
 			break;
-
-		case scPauseScan:
-		case scUnpauseScan:
-			m_bPauseScan = pTask->m_eCommand == scPauseScan;
-			m_bPauseScanChanged = true;
-			break;
 	}
 }

Scheduler.h

@@ -1,7 +1,7 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
- *  Copyright (C) 2008-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2008 Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -27,7 +27,6 @@
 #define SCHEDULER_H
 
 #include <list>
-#include <time.h>
 
 #include "Thread.h"
 
@@ -36,12 +35,10 @@ class Scheduler
 public:
 	enum ECommand
 	{
-		scPauseDownload,
-		scUnpauseDownload,
+		scPause,
+		scUnpause,
 		scDownloadRate,
-		scProcess,
-		scPauseScan,
-		scUnpauseScan
+		scProcess
 	};
 
 	class Task
@@ -73,10 +70,8 @@ private:
 	bool				m_bDownloadRateChanged;
 	bool				m_bExecuteProcess;
 	int					m_iDownloadRate;
-	bool				m_bPauseDownloadChanged;
-	bool				m_bPauseDownload;
-	bool				m_bPauseScanChanged;
-	bool				m_bPauseScan;
+	bool				m_bPauseChanged;
+	bool				m_bPause;
 	void				ExecuteTask(Task* pTask);
 	void				CheckTasks();
 	static bool			CompareTasks(Scheduler::Task* pTask1, Scheduler::Task* pTask2);
@@ -89,10 +84,8 @@ public:
 	void				IntervalCheck();
 	bool				GetDownloadRateChanged() { return m_bDownloadRateChanged; }
 	int					GetDownloadRate() { return m_iDownloadRate; }
-	bool				GetPauseDownloadChanged() { return m_bPauseDownloadChanged; }
-	bool				GetPauseDownload() { return m_bPauseDownload; }
-	bool				GetPauseScanChanged() { return m_bPauseScanChanged; }
-	bool				GetPauseScan() { return m_bPauseScan; }
+	bool				GetPauseChanged() { return m_bPauseChanged; }
+	bool				GetPause() { return m_bPause; }
 };
 
 #endif

ScriptController.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -24,7 +24,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -50,14 +50,10 @@
 #include "Util.h"
 
 extern Options* g_pOptions;
-extern char* (*g_szEnvironmentVariables)[];
-extern DownloadQueueHolder* g_pDownloadQueueHolder;
+extern char* (*szEnvironmentVariables)[];
 
 static const int POSTPROCESS_PARCHECK_CURRENT = 91;
 static const int POSTPROCESS_PARCHECK_ALL = 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
@@ -120,9 +116,9 @@ EnvironmentStrings::~EnvironmentStrings()
 
 void EnvironmentStrings::InitFromCurrentProcess()
 {
-	for (int i = 0; (*g_szEnvironmentVariables)[i]; i++)
+	for (int i = 0; (*szEnvironmentVariables)[i]; i++)
 	{
-		char* szVar = (*g_szEnvironmentVariables)[i];
+		char* szVar = (*szEnvironmentVariables)[i];
 		Append(strdup(szVar));
 	}
 }
@@ -154,7 +150,7 @@ char* EnvironmentStrings::GetStrings()
 		strcpy(szPtr, szVar);
 		szPtr += strlen(szVar) + 1;
 	}
-	*szPtr = '\0';
+	szPtr = '\0';
 
 	return szStrings;
 }
@@ -187,25 +183,12 @@ ScriptController::ScriptController()
 	m_szScript = NULL;
 	m_szWorkingDir = NULL;
 	m_szArgs = NULL;
-	m_bFreeArgs = false;
 	m_szInfoName = NULL;
 	m_szDefaultKindPrefix = NULL;
 	m_bTerminated = false;
 	m_environmentStrings.InitFromCurrentProcess();
 }
 
-ScriptController::~ScriptController()
-{
-	if (m_bFreeArgs)
-	{
-		for (const char** szArgPtr = m_szArgs; *szArgPtr; szArgPtr++)
-		{
-			free((char*)*szArgPtr);
-		}
-		free(m_szArgs);
-	}
-}
-
 void ScriptController::SetEnvVar(const char* szName, const char* szValue)
 {
 	int iLen = strlen(szName) + strlen(szValue) + 2;
@@ -352,9 +335,6 @@ int ScriptController::Execute()
 	else if (pid == 0)
 	{
 		// here goes the second instance
-
-		// create new process group (see Terminate() where it is used)
-		setsid();
 			
 		// close up the "read" end
 		close(pipein);
@@ -482,13 +462,7 @@ void ScriptController::Terminate()
 #ifdef WIN32
 	BOOL bOK = TerminateProcess(m_hProcess, -1);
 #else
-	pid_t hKillProcess = m_hProcess;
-	if (getpgid(hKillProcess) == hKillProcess)
-	{
-		// if the child process has its own group (setsid() was successful), kill the whole group
-		hKillProcess = -hKillProcess;
-	}
-	bool bOK = kill(hKillProcess, SIGKILL) == 0;
+	bool bOK = kill(m_hProcess, SIGKILL) == 0;
 #endif
 
 	if (bOK)
@@ -612,13 +586,6 @@ void PostScriptController::StartScriptJob(PostInfo* pPostInfo, const char* szScr
 
 void PostScriptController::Run()
 {
-	// the locking is needed for accessing the members of NZBInfo
-	g_pDownloadQueueHolder->LockQueue();
-
-	char szNZBName[1024];
-	strncpy(szNZBName, m_pPostInfo->GetNZBInfo()->GetName(), 1024);
-	szNZBName[1024-1] = '\0';
-
 	char szParStatus[10];
 	snprintf(szParStatus, 10, "%i", m_pPostInfo->GetParStatus());
 	szParStatus[10-1] = '\0';
@@ -632,21 +599,17 @@ void PostScriptController::Run()
 	szHasFailedParJobs[10-1] = '\0';
 
 	char szDestDir[1024];
-	strncpy(szDestDir, m_pPostInfo->GetNZBInfo()->GetDestDir(), 1024);
+	strncpy(szDestDir, m_pPostInfo->GetDestDir(), 1024);
 	szDestDir[1024-1] = '\0';
 	
 	char szNZBFilename[1024];
-	strncpy(szNZBFilename, m_pPostInfo->GetNZBInfo()->GetFilename(), 1024);
+	strncpy(szNZBFilename, m_pPostInfo->GetNZBFilename(), 1024);
 	szNZBFilename[1024-1] = '\0';
 	
 	char szParFilename[1024];
 	strncpy(szParFilename, m_pPostInfo->GetParFilename(), 1024);
 	szParFilename[1024-1] = '\0';
 
-	char szCategory[1024];
-	strncpy(szCategory, m_pPostInfo->GetNZBInfo()->GetCategory(), 1024);
-	szCategory[1024-1] = '\0';
-
 	char szInfoName[1024];
 	snprintf(szInfoName, 1024, "post-process-script for %s", m_pPostInfo->GetInfoName());
 	szInfoName[1024-1] = '\0';
@@ -657,26 +620,25 @@ void PostScriptController::Run()
 
 	const char* szArgs[9];
 	szArgs[0] = GetScript();
-	szArgs[1] = szDestDir;
+	szArgs[1] = m_pPostInfo->GetDestDir();
 	szArgs[2] = szNZBFilename;
 	szArgs[3] = szParFilename;
 	szArgs[4] = szParStatus;
 	szArgs[5] = szCollectionCompleted;
 	szArgs[6] = szHasFailedParJobs;
-	szArgs[7] = szCategory;
+	szArgs[7] = m_pPostInfo->GetCategory();
 	szArgs[8] = NULL;
-	SetArgs(szArgs, false);
+	SetArgs(szArgs);
 
-	SetEnvVar("NZBPP_NZBNAME", szNZBName);
-	SetEnvVar("NZBPP_DIRECTORY", szDestDir);
+	SetEnvVar("NZBPP_DIRECTORY", m_pPostInfo->GetDestDir());
 	SetEnvVar("NZBPP_NZBFILENAME", szNZBFilename);
 	SetEnvVar("NZBPP_PARFILENAME", szParFilename);
 	SetEnvVar("NZBPP_PARSTATUS", szParStatus);
 	SetEnvVar("NZBPP_NZBCOMPLETED", szCollectionCompleted);
 	SetEnvVar("NZBPP_PARFAILED", szHasFailedParJobs);
-	SetEnvVar("NZBPP_CATEGORY", szCategory);
+	SetEnvVar("NZBPP_CATEGORY", m_pPostInfo->GetCategory());
 
-	for (NZBParameterList::iterator it = m_pPostInfo->GetNZBInfo()->GetParameters()->begin(); it != m_pPostInfo->GetNZBInfo()->GetParameters()->end(); it++)
+	for (NZBParameterList::iterator it = m_pPostInfo->GetParameters()->begin(); it != m_pPostInfo->GetParameters()->end(); it++)
 	{
 		NZBParameter* pParameter = *it;
 		char szVarname[1024];
@@ -685,71 +647,43 @@ void PostScriptController::Run()
 		SetEnvVar(szVarname, pParameter->GetValue());
 	}
 
-	g_pDownloadQueueHolder->UnlockQueue();
-
-	int iResult = Execute();
-
-	switch (iResult)
-	{
-		case POSTPROCESS_SUCCESS:
-			info("%s sucessful", szInfoName);
-			m_pPostInfo->SetScriptStatus(PostInfo::srSuccess);
-			break;
-
-		case POSTPROCESS_ERROR:
-			info("%s failed", szInfoName);
-			m_pPostInfo->SetScriptStatus(PostInfo::srFailure);
-			break;
-
-		case POSTPROCESS_NONE:
-			info("%s skipped", szInfoName);
-			m_pPostInfo->SetScriptStatus(PostInfo::srNone);
-			break;
-
 #ifndef DISABLE_PARCHECK
-		case POSTPROCESS_PARCHECK_ALL:
-			if (m_pPostInfo->GetParCheck())
-			{
-				error("%s requested par-check/repair for all collections, but they were already checked", szInfoName);
-				m_pPostInfo->SetScriptStatus(PostInfo::srFailure);
-			}
-			else if (!m_bNZBFileCompleted)
-			{
-				error("%s requested par-check/repair for all collections, but it was not the call for the last collection", szInfoName);
-				m_pPostInfo->SetScriptStatus(PostInfo::srFailure);
-			}
-			else
-			{
-				info("%s requested par-check/repair for all collections", szInfoName);
-				m_pPostInfo->SetRequestParCheck(PostInfo::rpAll);
-				m_pPostInfo->SetScriptStatus(PostInfo::srSuccess);
-			}
-			break;
-
-		case POSTPROCESS_PARCHECK_CURRENT:
-			if (m_pPostInfo->GetParCheck())
-			{
-				error("%s requested par-check/repair for current collection, but it was already checked", szInfoName);
-				m_pPostInfo->SetScriptStatus(PostInfo::srFailure);
-			}
-			else if (strlen(m_pPostInfo->GetParFilename()) == 0)
-			{
-				error("%s requested par-check/repair for current collection, but it doesn't have any par-files", szInfoName);
-				m_pPostInfo->SetScriptStatus(PostInfo::srFailure);
-			}
-			else
-			{
-				info("%s requested par-check/repair for current collection", szInfoName);
-				m_pPostInfo->SetRequestParCheck(PostInfo::rpCurrent);
-				m_pPostInfo->SetScriptStatus(PostInfo::srSuccess);
-			}
-			break;
-#endif
-
-		default:
-			info("%s terminated with unknown status", szInfoName);
-			m_pPostInfo->SetScriptStatus(PostInfo::srUnknown);
+	int iResult = Execute();
+	if (iResult == POSTPROCESS_PARCHECK_ALL)
+	{
+		if (m_pPostInfo->GetParCheck())
+		{
+			error("%s requested par-check/repair for all collections, but they were already checked", szInfoName);
+		}
+		else if (!m_bNZBFileCompleted)
+		{
+			error("%s requested par-check/repair for all collections, but it was not the call for the last collection", szInfoName);
+		}
+		else
+		{
+			info("%s requested par-check/repair for all collections", szInfoName);
+			m_pPostInfo->SetRequestParCheck(PostInfo::rpAll);
+		}
 	}
+	else if (iResult == POSTPROCESS_PARCHECK_CURRENT)
+	{
+		if (m_pPostInfo->GetParCheck())
+		{
+			error("%s requested par-check/repair for current collection, but the collection was already checked", szInfoName);
+		}
+		else if (strlen(m_pPostInfo->GetParFilename()) == 0)
+		{
+			error("%s requested par-check/repair for current collection, but the collection doesn't have any par-files", szInfoName);
+		}
+		else
+		{
+			info("%s requested par-check/repair for current collection", szInfoName);
+			m_pPostInfo->SetRequestParCheck(PostInfo::rpCurrent);
+		}
+	}
+#else
+	Execute();
+#endif
 
 	m_pPostInfo->SetStage(PostInfo::ptFinished);
 	m_pPostInfo->SetWorking(false);
@@ -757,49 +691,11 @@ void PostScriptController::Run()
 
 void PostScriptController::AddMessage(Message::EKind eKind, bool bDefaultKind, Options::EMessageTarget eMessageTarget, const char* szText)
 {
-	if (!strncmp(szText, "[HISTORY] ", 10))
+	ScriptController::AddMessage(eKind, bDefaultKind, eMessageTarget, szText);
+
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
 	{
-		if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-		{
-			m_pPostInfo->GetNZBInfo()->AppendMessage(eKind, 0, szText + 10);
-		}
-	}
-	else
-	{
-		ScriptController::AddMessage(eKind, bDefaultKind, eMessageTarget, szText);
-
-		if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-		{
-			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);
-			}
-		}
+		m_pPostInfo->AppendMessage(eKind, szText);
 	}
 }
 
@@ -810,16 +706,12 @@ void PostScriptController::Stop()
 	Terminate();
 }
 
-void NZBScriptController::ExecuteScript(const char* szScript, const char* szNZBFilename, 
-	const char* szDirectory, char** pCategory, int* iPriority, NZBParameterList* pParameterList)
+void NZBScriptController::ExecuteScript(const char* szScript, const char* szNZBFilename, const char* szDirectory)
 {
 	info("Executing nzb-process-script for %s", Util::BaseFileName(szNZBFilename));
 
 	NZBScriptController* pScriptController = new NZBScriptController();
 	pScriptController->SetScript(szScript);
-	pScriptController->m_pCategory = pCategory;
-	pScriptController->m_pParameterList = pParameterList;
-	pScriptController->m_iPriority = iPriority;
 
 	char szInfoName[1024];
 	snprintf(szInfoName, 1024, "nzb-process-script for %s", Util::BaseFileName(szNZBFilename));
@@ -844,7 +736,7 @@ void NZBScriptController::ExecuteScript(const char* szScript, const char* szNZBF
 	szArgs[1] = szDir;
 	szArgs[2] = szNZBFilename;
 	szArgs[3] = NULL;
-	pScriptController->SetArgs(szArgs, false);
+	pScriptController->SetArgs(szArgs);
 
 	pScriptController->SetEnvVar("NZBNP_DIRECTORY", szDir);
 	pScriptController->SetEnvVar("NZBNP_FILENAME", szNZBFilename);
@@ -854,129 +746,12 @@ void NZBScriptController::ExecuteScript(const char* szScript, const char* szNZBF
 	delete pScriptController;
 }
 
-void NZBScriptController::AddMessage(Message::EKind eKind, bool bDefaultKind, Options::EMessageTarget eMessageTarget, const char* szText)
+void SchedulerScriptController::StartScript(const char* szScript)
 {
-	if (!strncmp(szText, "[NZB] ", 6))
-	{
-		debug("Command %s detected", szText + 6);
-		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_pParameterList->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
-		{
-			error("Invalid command \"%s\" received from %s", szText, GetInfoName());
-		}
-	}
-	else
-	{
-		ScriptController::AddMessage(eKind, bDefaultKind, eMessageTarget, 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_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();
-		}
-	}
-
-	char buf[100];
-
-	snprintf(buf, 100, "%i", iLastID);
-	pScriptController->SetEnvVar("NZBNA_LASTID", buf);
-
-	snprintf(buf, 100, "%i", iMaxPriority);
-	pScriptController->SetEnvVar("NZBNA_PRIORITY", buf);
-
-	for (NZBParameterList::iterator it = pNZBInfo->GetParameters()->begin(); it != pNZBInfo->GetParameters()->end(); it++)
-	{
-		NZBParameter* pParameter = *it;
-		char szVarname[1024];
-		snprintf(szVarname, sizeof(szVarname), "NZBPR_%s", pParameter->GetName());
-		szVarname[1024-1] = '\0';
-		pScriptController->SetEnvVar(szVarname, pParameter->GetValue());
-	}
-
-	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);
-
-	SetDefaultKindPrefix("NZB-Added Process: ");
-	SetDefaultLogKind(g_pOptions->GetProcessLogKind());
-
-	const char* szArgs[2];
-	szArgs[0] = GetScript();
-	szArgs[1] = NULL;
-	SetArgs(szArgs, false);
-
-	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]));
+	info("Executing scheduled process-script %s", Util::BaseFileName(szScript));
 
 	SchedulerScriptController* pScriptController = new SchedulerScriptController();
-	pScriptController->SetScript(argv[0]);
-	pScriptController->SetArgs((const char**)argv, true);
+	pScriptController->SetScript(szScript);
 	pScriptController->SetAutoDestroy(true);
 
 	pScriptController->Start();
@@ -989,6 +764,11 @@ void SchedulerScriptController::Run()
 	szInfoName[1024-1] = '\0';
 	SetInfoName(szInfoName);
 
+	const char* szArgs[2];
+	szArgs[0] = GetScript();
+	szArgs[1] = NULL;
+	SetArgs(szArgs);
+
 	SetDefaultKindPrefix("Scheduled Process: ");
 	SetDefaultLogKind(g_pOptions->GetProcessLogKind());
 

ScriptController.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -58,7 +58,6 @@ private:
 	const char*			m_szScript;
 	const char*			m_szWorkingDir;
 	const char**		m_szArgs;
-	bool				m_bFreeArgs;
 	const char*			m_szInfoName;
 	const char*			m_szDefaultKindPrefix;
 	EnvironmentStrings	m_environmentStrings;
@@ -78,16 +77,14 @@ protected:
 
 public:
 						ScriptController();
-	virtual				~ScriptController();
 	int					Execute();
 	void				Terminate();
 
 	void				SetScript(const char* szScript) { m_szScript = szScript; }
 	const char*			GetScript() { return m_szScript; }
 	void				SetWorkingDir(const char* szWorkingDir) { m_szWorkingDir = szWorkingDir; }
-	void				SetArgs(const char** szArgs, bool bFreeArgs) { m_szArgs = szArgs; m_bFreeArgs = bFreeArgs; }
+	void				SetArgs(const char** szArgs) { m_szArgs = szArgs; }
 	void				SetInfoName(const char* szInfoName) { m_szInfoName = szInfoName; }
-	const char*			GetInfoName() { return m_szInfoName; }
 	void				SetDefaultKindPrefix(const char* szDefaultKindPrefix) { m_szDefaultKindPrefix = szDefaultKindPrefix; }
 	void				SetDefaultLogKind(Options::EScriptLogKind eDefaultLogKind) { m_eDefaultLogKind = eDefaultLogKind; }
 	void				SetEnvVar(const char* szName, const char* szValue);
@@ -112,33 +109,15 @@ public:
 
 class NZBScriptController : public ScriptController
 {
-private:
-	char**				m_pCategory;
-	int*				m_iPriority;
-	NZBParameterList*	m_pParameterList;
-
-protected:
-	virtual void		AddMessage(Message::EKind eKind, bool bDefaultKind, Options::EMessageTarget eMessageTarget, const char* szText);
-
 public:
-	static void			ExecuteScript(const char* szScript, const char* szNZBFilename, const char* szDirectory, char** pCategory, int* iPriority, NZBParameterList* pParameterList);
-};
-
-class NZBAddedScriptController : public Thread, ScriptController
-{
-private:
-	char*				m_szNZBName;
-
-public:
-	virtual void		Run();
-	static void			StartScript(DownloadQueue* pDownloadQueue, NZBInfo *pNZBInfo, const char* szScript);
+	static void			ExecuteScript(const char* szScript, const char* szNZBFilename, const char* szDirectory);
 };
 
 class SchedulerScriptController : public Thread, ScriptController
 {
 public:
 	virtual void		Run();
-	static void			StartScript(const char* szCommandLine);
+	static void			StartScript(const char* szScript);
 };
 
 #endif

ServerPool.cpp

@@ -1,8 +1,8 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,16 +16,24 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
  *
  */
 
+/*
+ *
+ * m_Semaphore Patch by Florian Penzkofer <f.penzkofer@sent.com>
+ * The queue of mutexes that was used did not work for every
+ * implementation of POSIX threads. Now a m_Semaphore is used.
+ *
+ */
+
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -57,13 +65,20 @@ ServerPool::ServerPool()
 
 	m_iMaxLevel = 0;
 	m_iTimeout = 60;
+	m_Servers.clear();
+	m_Connections.clear();
+	m_Semaphores.clear();
 }
 
 ServerPool::~ ServerPool()
 {
 	debug("Destroying ServerPool");
 
-	m_Levels.clear();
+	for (Semaphores::iterator it = m_Semaphores.begin(); it != m_Semaphores.end(); it++)
+	{
+		delete *it;
+	}
+	m_Semaphores.clear();
 
 	for (Servers::iterator it = m_Servers.begin(); it != m_Servers.end(); it++)
 	{
@@ -117,40 +132,52 @@ void ServerPool::InitConnections()
 			}
 		}
 
-		m_Levels.push_back(iMaxConnectionsForLevel);
+		Semaphore* sem = new Semaphore(iMaxConnectionsForLevel);
+		m_Semaphores.push_back(sem);
 	}
 }
 
-NNTPConnection* ServerPool::GetConnection(int iLevel)
+NNTPConnection* ServerPool::GetConnection(int iLevel, bool bWait)
 {
-	PooledConnection* pConnection = NULL;
+	bool bWaitVal = false;
+	if (bWait)
+	{
+		debug("Getting connection (wait)");
+		bWaitVal = m_Semaphores[iLevel]->Wait();
+	}
+	else
+	{
+		bWaitVal = m_Semaphores[iLevel]->TryWait();
+	}
+
+	if (!bWaitVal)
+	{
+		// signal received or wait timeout
+		return NULL;
+	}
 
 	m_mutexConnections.Lock();
 
-	if (m_Levels[iLevel] > 0)
+	PooledConnection* pConnection = NULL;
+	for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
 	{
-		for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
+		PooledConnection* pConnection1 = *it;
+		if (!pConnection1->GetInUse() && pConnection1->GetNewsServer()->GetLevel() == iLevel)
 		{
-			PooledConnection* pConnection1 = *it;
-			if (!pConnection1->GetInUse() && pConnection1->GetNewsServer()->GetLevel() == iLevel)
-			{
-				// free connection found, take it!
-				pConnection = pConnection1;
-				pConnection->SetInUse(true);
-				break;
-			}
-		}
-
-		m_Levels[iLevel]--;
-
-		if (!pConnection)
-		{
-			error("ServerPool: internal error, no free connection found, but there should be one");
+			// free connection found, take it!
+			pConnection = pConnection1;
+			pConnection->SetInUse(true);
+			break;
 		}
 	}
 
 	m_mutexConnections.Unlock();
 
+	if (!pConnection)
+	{
+		error("ServerPool: serious error, no free connection found, but there should be one.");
+	}
+
 	return pConnection;
 }
 
@@ -168,7 +195,7 @@ void ServerPool::FreeConnection(NNTPConnection* pConnection, bool bUsed)
 	{
 		((PooledConnection*)pConnection)->SetFreeTimeNow();
 	}
-	m_Levels[pConnection->GetNewsServer()->GetLevel()]++;
+	m_Semaphores[pConnection->GetNewsServer()->GetLevel()]->Post();
 
 	m_mutexConnections.Unlock();
 }
@@ -187,7 +214,7 @@ void ServerPool::CloseUnusedConnections()
 			int tdiff = (int)(curtime - pConnection->GetFreeTime());
 			if (tdiff > CONNECTION_HOLD_SECODNS)
 			{
-				debug("Closing unused connection to %s", pConnection->GetHost());
+				debug("Closing unused connection to %s", pConnection->GetNewsServer()->GetHost());
 				pConnection->Disconnect();
 			}
 		}
@@ -210,6 +237,15 @@ void ServerPool::LogDebugInfo()
 	{
 		debug("      Connection: Level=%i, InUse:%i", (*it)->GetNewsServer()->GetLevel(), (int)(*it)->GetInUse());
 	}
-
+/*
+	debug("    Semaphores: %i", m_Semaphores.size());
+	for (int iLevel = 0; iLevel <= m_iMaxLevel; iLevel++)
+	{
+		sem_t* sem = m_Semaphores[iLevel];
+		int iSemValue;
+		sem_getvalue(sem, &iSemValue);
+		debug("      Semaphore: level=%i, value=%i", iLevel, iSemValue);
+	}
+*/
 	m_mutexConnections.Unlock();
 }

ServerPool.h

@@ -1,8 +1,9 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2005	Florian Penzkofer <f.penzkofer@sent.com>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +17,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -51,24 +52,24 @@ private:
 	};
 
 	typedef std::vector<NewsServer*>		Servers;
-	typedef std::vector<int>				Levels;
+	typedef std::vector<Semaphore*>			Semaphores;
 	typedef std::vector<PooledConnection*>	Connections;
 
 	Servers				m_Servers;
 	Connections			m_Connections;
-	Levels				m_Levels;
+	Semaphores			m_Semaphores;
 	int					m_iMaxLevel;
 	Mutex			 	m_mutexConnections;
 	int					m_iTimeout;
 
 public:
-						ServerPool();
-						~ServerPool();
+	ServerPool();
+	~ServerPool();
 	void				SetTimeout(int iTimeout) { m_iTimeout = iTimeout; }
-	void 				AddServer(NewsServer* pNewsServer);
+	void 				AddServer(NewsServer *s);
 	void				InitConnections();
 	int					GetMaxLevel() { return m_iMaxLevel; }
-	NNTPConnection*		GetConnection(int iLevel);
+	NNTPConnection*		GetConnection(int iLevel, bool bWait);
 	void 				FreeConnection(NNTPConnection* pConnection, bool bUsed);
 	void				CloseUnusedConnections();
 

TLS.cpp

@@ -7,7 +7,7 @@
  *  Copyright (C) 2000, 2003, 2004, 2005, 2006, 2007
  *  Martin Lambers <marlam@marlam.de>
  *
- *  Copyright (C) 2008-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2008 Andrei Prygounkov <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
@@ -21,7 +21,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -55,9 +55,7 @@
 #include <errno.h>
 #include <list>
 
-#ifdef WIN32
 #include "nzbget.h"
-#endif
 
 #ifdef HAVE_LIBGNUTLS
 #include <gnutls/gnutls.h>
@@ -77,10 +75,6 @@
 # include <idna.h>
 #endif
 
-#ifndef WIN32
-#include "nzbget.h"
-#endif
-
 #include "TLS.h"
 #include "Thread.h"
 
@@ -908,7 +902,7 @@ int tls_check_cert(tls_t *tls, const char *hostname, int verify, char **errstr)
     char *buf;
     int bufsize;
     /* needed to get the DNS subjectAltNames: */
-    STACK_OF(GENERAL_NAME) *subj_alt_names;
+    STACK *subj_alt_names;
     int subj_alt_names_count;
     GENERAL_NAME *subj_alt_name;
     /* did we find a name matching hostname? */
@@ -960,7 +954,7 @@ int tls_check_cert(tls_t *tls, const char *hostname, int verify, char **errstr)
     /* Try the DNS subjectAltNames. */
     match_found = 0;
     if ((subj_alt_names =
-		(STACK_OF(GENERAL_NAME) *)X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
+		(STACK*)X509_get_ext_d2i(x509cert, NID_subject_alt_name, NULL, NULL)))
     {
 	subj_alt_names_count = sk_GENERAL_NAME_num(subj_alt_names);
 	for (i = 0; i < subj_alt_names_count; i++) 
@@ -1105,11 +1099,7 @@ int tls_init(tls_t *tls, const char *key_file, const char *cert_file,
 
 #ifdef HAVE_OPENSSL
     
-    #if OPENSSL_VERSION_NUMBER >= 0x10000000L
-    const SSL_METHOD *ssl_method = NULL;
-    #else
     SSL_METHOD *ssl_method = NULL;
-    #endif
     
     ssl_method = force_sslv3 ? SSLv3_client_method() : SSLv23_client_method();
     if (!ssl_method)

TLS.h

@@ -7,7 +7,7 @@
  *  Copyright (C) 2000, 2003, 2004, 2005, 2006, 2007
  *  Martin Lambers <marlam@marlam.de>
  *
- *  Copyright (C) 2008-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2008 Andrei Prygounkov <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
@@ -21,7 +21,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -33,7 +33,6 @@
 
 #ifndef DISABLE_TLS
 
-#include <time.h>
 #ifdef HAVE_LIBGNUTLS
 # include <gnutls/gnutls.h>
 #endif /* HAVE_LIBGNUTLS */

Thread.cpp

@@ -1,8 +1,8 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -40,130 +40,157 @@
 #include <process.h>
 #else
 #include <fcntl.h>
-#include <pthread.h>
 #endif
 
 #include "Log.h"
 #include "Thread.h"
 
 int Thread::m_iThreadCount = 1; // take the main program thread into account
-Mutex* Thread::m_pMutexThread;
+Mutex Thread::m_mutexThread;
 
+#ifndef WIN32
+#ifndef HAVE_UNNAMED_SEMAPHORES	
+int Semaphore::m_iID = 1;
+Mutex Semaphore::m_mutexID;
+#endif
+#endif
 
 Mutex::Mutex()
 {
 #ifdef WIN32
-	m_pMutexObj = (CRITICAL_SECTION*)malloc(sizeof(CRITICAL_SECTION));
-	InitializeCriticalSection((CRITICAL_SECTION*)m_pMutexObj);
+	InitializeCriticalSection(&m_mutexObj);
 #else
-	m_pMutexObj = (pthread_mutex_t*)malloc(sizeof(pthread_mutex_t));
-	pthread_mutex_init((pthread_mutex_t*)m_pMutexObj, NULL);
+	pthread_mutex_init(&m_mutexObj, NULL);
 #endif
 }
 
 Mutex::~ Mutex()
 {
 #ifdef WIN32
-	DeleteCriticalSection((CRITICAL_SECTION*)m_pMutexObj);
+	DeleteCriticalSection(&m_mutexObj);
 #else
-	pthread_mutex_destroy((pthread_mutex_t*)m_pMutexObj);
+	pthread_mutex_destroy(&m_mutexObj);
 #endif
-	free(m_pMutexObj);
 }
 
 void Mutex::Lock()
 {
 #ifdef WIN32
-	EnterCriticalSection((CRITICAL_SECTION*)m_pMutexObj);
+	EnterCriticalSection(&m_mutexObj);
 #ifdef DEBUG
 	// CriticalSections on Windows can be locked many times from the same thread,
 	// but we do not want this and must treat such situations as errors and detect them.
-	if (((CRITICAL_SECTION*)m_pMutexObj)->RecursionCount > 1)
+	if (m_mutexObj.RecursionCount > 1)
 	{
 		error("Internal program error: inconsistent thread-lock detected");
 	}
 #endif
 #else
-	pthread_mutex_lock((pthread_mutex_t*)m_pMutexObj);
+	pthread_mutex_lock(&m_mutexObj);
 #endif
 }
 
 void Mutex::Unlock()
 {
 #ifdef WIN32
-	LeaveCriticalSection((CRITICAL_SECTION*)m_pMutexObj);
+	LeaveCriticalSection(&m_mutexObj);
 #else
-	pthread_mutex_unlock((pthread_mutex_t*)m_pMutexObj);
+	pthread_mutex_unlock(&m_mutexObj);
 #endif
 }
 
 
-#ifdef HAVE_SPINLOCK
-SpinLock::SpinLock()
+Semaphore::Semaphore()
 {
 #ifdef WIN32
-	m_pSpinLockObj = (CRITICAL_SECTION *)malloc(sizeof(CRITICAL_SECTION));
-	InitializeCriticalSectionAndSpinCount((CRITICAL_SECTION *)m_pSpinLockObj, 0x00FFFFFF);
+	m_semObj = CreateSemaphore(NULL, 0, 1, NULL);
 #else
-	m_pSpinLockObj = (pthread_spinlock_t *)malloc(sizeof(pthread_spinlock_t));
-	pthread_spin_init((pthread_spinlock_t *)m_pSpinLockObj, PTHREAD_PROCESS_PRIVATE);
+	CreateSemObj(0);
 #endif
 }
 
-SpinLock::~SpinLock()
+Semaphore::Semaphore(int iValue)
 {
 #ifdef WIN32
-	DeleteCriticalSection((CRITICAL_SECTION *)m_pSpinLockObj);
+	m_semObj = CreateSemaphore(NULL, iValue, iValue, NULL);
 #else
-	pthread_spin_destroy((pthread_spinlock_t *)m_pSpinLockObj);
+	CreateSemObj(iValue);
 #endif
-	free((void*)m_pSpinLockObj);
 }
 
-void SpinLock::Lock()
+#ifndef WIN32
+void Semaphore::CreateSemObj(int iValue)
+{
+#ifdef HAVE_UNNAMED_SEMAPHORES
+	m_semObj = (sem_t*)malloc(sizeof(sem_t));
+	int iRet = sem_init(m_semObj, 0, iValue);
+	if (iRet == -1)
+	{
+		error("sem_init failed: error %i", errno);
+	}
+#else
+	m_mutexID.Lock();
+	int iID = m_iID;
+	m_iID++;
+	m_mutexID.Unlock();
+	snprintf(m_szName, sizeof(m_szName), "/NZBGET-%i", iID);
+	m_semObj = sem_open(m_szName, O_CREAT, S_IRWXU, iValue);
+	if (m_semObj == SEM_FAILED)
+	{
+		error("sem_open failed: error %i", errno);
+	}
+#endif
+}
+#endif
+
+Semaphore::~ Semaphore()
 {
 #ifdef WIN32
-	EnterCriticalSection((CRITICAL_SECTION *)m_pSpinLockObj);
+	CloseHandle(m_semObj);
 #else
-	pthread_spin_lock((pthread_spinlock_t *)m_pSpinLockObj);
+#ifdef HAVE_UNNAMED_SEMAPHORES	
+	sem_destroy(m_semObj);
+	free(m_semObj);
+#else
+	sem_close(m_semObj);
+	sem_unlink(m_szName);
+#endif
 #endif
 }
 
-void SpinLock::Unlock()
+void Semaphore::Post()
 {
 #ifdef WIN32
-	LeaveCriticalSection((CRITICAL_SECTION *)m_pSpinLockObj);
+	ReleaseSemaphore(m_semObj, 1, NULL);
 #else
-	pthread_spin_unlock((pthread_spinlock_t *)m_pSpinLockObj);
+	sem_post(m_semObj);
 #endif
 }
+
+bool Semaphore::Wait()
+{
+#ifdef WIN32
+	return WaitForSingleObject(m_semObj, INFINITE) == WAIT_OBJECT_0;
+#else
+	return sem_wait(m_semObj) == 0;
 #endif
-
-
-void Thread::Init()
-{
-	debug("Initializing global thread data");
-
-	m_pMutexThread = new Mutex();
 }
 
-void Thread::Final()
+bool Semaphore::TryWait()
 {
-	debug("Finalizing global thread data");
-
-	delete m_pMutexThread;
+#ifdef WIN32
+	return WaitForSingleObject(m_semObj, 0) == WAIT_OBJECT_0;
+#else
+	return sem_trywait(m_semObj) == 0;
+#endif
 }
 
+
 Thread::Thread()
 {
 	debug("Creating Thread");
 
-#ifdef WIN32
-	m_pThreadObj = NULL;
-#else
-	m_pThreadObj = (pthread_t*)malloc(sizeof(pthread_t));
-	*((pthread_t*)m_pThreadObj) = 0;
-#endif
+	m_Thread = 0;
 	m_bRunning = false;
 	m_bStopped = false;
 	m_bAutoDestroy = false;
@@ -172,9 +199,6 @@ Thread::Thread()
 Thread::~Thread()
 {
 	debug("Destroying Thread");
-#ifndef WIN32
-	free(m_pThreadObj);
-#endif
 }
 
 void Thread::Start()
@@ -183,29 +207,30 @@ void Thread::Start()
 
 	m_bRunning = true;
 	
-	// NOTE: we must guarantee, that in a time we set m_bRunning
+	// NOTE: we must garantee, that in a time we setting m_bRunning
 	// to value returned from pthread_create, the thread-object still exists.
 	// This is not obviously!
 	// pthread_create could wait long enough before returning result
-	// back to allow the started thread to complete its job and terminate.
-	// We lock mutex m_pMutexThread on calling pthread_create; the started thread
+	// back to allow the started thread to complete it job
+	// and terminate.
+	// We lock mutex m_mutexThread on calling pthread_create; the started thread
 	// then also try to lock the mutex (see thread_handler) and therefore
 	// must wait until we unlock it
-	m_pMutexThread->Lock();
+	m_mutexThread.Lock();
 
 #ifdef WIN32
-	m_pThreadObj = (HANDLE)_beginthread(Thread::thread_handler, 0, (void *)this);
-	m_bRunning = m_pThreadObj != NULL;
+	m_Thread = (HANDLE)_beginthread(Thread::thread_handler, 0, (void *)this);
+	m_bRunning = m_Thread != NULL;
 #else
 	pthread_attr_t m_Attr;
 	pthread_attr_init(&m_Attr);
 	pthread_attr_setdetachstate(&m_Attr, PTHREAD_CREATE_DETACHED);
 	pthread_attr_setinheritsched(&m_Attr , PTHREAD_INHERIT_SCHED);
-	m_bRunning = !pthread_create((pthread_t*)m_pThreadObj, &m_Attr, Thread::thread_handler, (void *) this);
+	m_bRunning = !pthread_create(&m_Thread, &m_Attr, Thread::thread_handler, (void *) this);
 	pthread_attr_destroy(&m_Attr);
 #endif
 
-	m_pMutexThread->Unlock();
+	m_mutexThread.Unlock();
 }
 
 void Thread::Stop()
@@ -219,19 +244,19 @@ bool Thread::Kill()
 {
 	debug("Killing Thread");
 
-	m_pMutexThread->Lock();
+	m_mutexThread.Lock();
 
 #ifdef WIN32
-	bool terminated = TerminateThread((HANDLE)m_pThreadObj, 0) != 0;
+	bool terminated = TerminateThread(m_Thread, 0) != 0;
 #else
-	bool terminated = pthread_cancel(*(pthread_t*)m_pThreadObj) == 0;
+	bool terminated = pthread_cancel(m_Thread) == 0;
 #endif
 
 	if (terminated)
 	{
 		m_iThreadCount--;
 	}
-	m_pMutexThread->Unlock();
+	m_mutexThread.Unlock();
 	return terminated;
 }
 
@@ -241,9 +266,9 @@ void __cdecl Thread::thread_handler(void* pObject)
 void* Thread::thread_handler(void* pObject)
 #endif
 {
-	m_pMutexThread->Lock();
+	m_mutexThread.Lock();
 	m_iThreadCount++;
-	m_pMutexThread->Unlock();
+	m_mutexThread.Unlock();
 
 	debug("Entering Thread-func");
 
@@ -261,9 +286,9 @@ void* Thread::thread_handler(void* pObject)
 		delete pThread;
 	}
 
-	m_pMutexThread->Lock();
+	m_mutexThread.Lock();
 	m_iThreadCount--;
-	m_pMutexThread->Unlock();
+	m_mutexThread.Unlock();
 
 #ifndef WIN32
 	return NULL;
@@ -272,8 +297,8 @@ void* Thread::thread_handler(void* pObject)
 
 int Thread::GetThreadCount()
 {
-	m_pMutexThread->Lock();
+	m_mutexThread.Lock();
 	int iThreadCount = m_iThreadCount;
-	m_pMutexThread->Unlock();
+	m_mutexThread.Unlock();
 	return iThreadCount;
 }

Thread.h

@@ -1,8 +1,8 @@
 /*
- *  This file is part of nzbget
+ *  This file if part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -27,10 +27,19 @@
 #ifndef THREAD_H
 #define THREAD_H
 
+#ifndef WIN32
+#include <pthread.h>
+#include <semaphore.h>
+#endif
+
 class Mutex
 {
 private:
-	void*					m_pMutexObj;
+#ifdef WIN32
+	CRITICAL_SECTION		m_mutexObj;
+#else
+	pthread_mutex_t			m_mutexObj;
+#endif
 	
 public:
 							Mutex();
@@ -39,30 +48,43 @@ public:
 	void					Unlock();
 };
 
-#ifdef HAVE_SPINLOCK
-class SpinLock
+
+class Semaphore
 {
 private:
 #ifdef WIN32
-	void*					m_pSpinLockObj;
+	HANDLE					m_semObj;
 #else
-	volatile void*			m_pSpinLockObj;
+	sem_t*					m_semObj;
+#ifndef HAVE_UNNAMED_SEMAPHORES
+	char					m_szName[20];
+	static int				m_iID;
+	static Mutex			m_mutexID;
+#endif
+
+	void					CreateSemObj(int iValue);
 #endif
 	
 public:
-							SpinLock();
-							~SpinLock();
-	void					Lock();
-	void					Unlock();
+							Semaphore();
+							Semaphore(int iValue);
+							~Semaphore();
+	void					Post();
+	bool					Wait();
+	bool					TryWait();
 };
-#endif
+
 
 class Thread
 {
 private:
-	static Mutex*			m_pMutexThread;
+	static Mutex			m_mutexThread;
 	static int				m_iThreadCount;
-	void*	 				m_pThreadObj;
+#ifdef WIN32
+	HANDLE	 				m_Thread;
+#else
+	pthread_t 				m_Thread;
+#endif
 	bool 					m_bRunning;
 	bool					m_bStopped;
 	bool					m_bAutoDestroy;
@@ -74,10 +96,8 @@ private:
 #endif
 
 public:
-							Thread();
+	Thread();
 	virtual 				~Thread();
-	static void				Init();
-	static void				Final();
 
 	virtual void 			Start();
 	virtual void 			Stop();

UrlCoordinator.cpp

@@ -1,455 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012 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 <cstdio>
-#include <sys/stat.h>
-#ifndef WIN32
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-
-#include "nzbget.h"
-#include "UrlCoordinator.h"
-#include "Options.h"
-#include "WebDownloader.h"
-#include "DiskState.h"
-#include "Log.h"
-#include "Util.h"
-#include "NZBFile.h"
-#include "QueueCoordinator.h"
-
-extern Options* g_pOptions;
-extern DiskState* g_pDiskState;
-extern QueueCoordinator* g_pQueueCoordinator;
-
-UrlDownloader::UrlDownloader() : WebDownloader()
-{
-	m_szCategory = NULL;
-}
-
-UrlDownloader::~UrlDownloader()
-{
-	if (m_szCategory)
-	{
-		free(m_szCategory);
-	}
-}
-
-void UrlDownloader::ProcessHeader(const char* szLine)
-{
-	WebDownloader::ProcessHeader(szLine);
-
-	if (!strncmp(szLine, "X-DNZB-Category: ", 17))
-	{
-		if (m_szCategory)
-		{
-			free(m_szCategory);
-		}
-
-		const char *szCat = szLine + 17;
-
-		int iCatLen = strlen(szCat);
-
-		// trim trailing CR/LF/spaces
-		while (iCatLen > 0 && (szCat[iCatLen-1] == '\n' || szCat[iCatLen-1] == '\r' || szCat[iCatLen-1] == ' ')) iCatLen--; 
-
-		m_szCategory = (char*)malloc(iCatLen + 1);
-		strncpy(m_szCategory, szCat, iCatLen);
-		m_szCategory[iCatLen] = '\0';
-
-		debug("Category: %s", m_szCategory);
-	}
-}
-
-UrlCoordinator::UrlCoordinator()
-{
-	debug("Creating UrlCoordinator");
-
-	m_bHasMoreJobs = true;
-}
-
-UrlCoordinator::~UrlCoordinator()
-{
-	debug("Destroying UrlCoordinator");
-	// Cleanup
-
-	debug("Deleting UrlDownloaders");
-	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
-	{
-		delete *it;
-	}
-	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");
-}
-
-void UrlCoordinator::Run()
-{
-	debug("Entering UrlCoordinator-loop");
-
-	int iResetCounter = 0;
-
-	while (!IsStopped())
-	{
-		if (!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
-		{
-			// start download for next URL
-			DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
-
-			if ((int)m_ActiveDownloads.size() < g_pOptions->GetUrlConnections())
-			{
-				UrlInfo* pUrlInfo;
-				bool bHasMoreUrls = GetNextUrl(pDownloadQueue, pUrlInfo);
-				bool bUrlDownloadsRunning = !m_ActiveDownloads.empty();
-				m_bHasMoreJobs = bHasMoreUrls || bUrlDownloadsRunning;
-				if (bHasMoreUrls && !IsStopped() && Thread::GetThreadCount() < g_pOptions->GetThreadLimit())
-				{
-					StartUrlDownload(pUrlInfo);
-				}
-			}
-			g_pQueueCoordinator->UnlockQueue();
-		}
-
-		int iSleepInterval = 100;
-		usleep(iSleepInterval * 1000);
-
-		iResetCounter += iSleepInterval;
-		if (iResetCounter >= 1000)
-		{
-			// this code should not be called too often, once per second is OK
-			ResetHangingDownloads();
-			iResetCounter = 0;
-		}
-	}
-
-	// waiting for downloads
-	debug("UrlCoordinator: waiting for Downloads to complete");
-	bool completed = false;
-	while (!completed)
-	{
-		g_pQueueCoordinator->LockQueue();
-		completed = m_ActiveDownloads.size() == 0;
-		g_pQueueCoordinator->UnlockQueue();
-		usleep(100 * 1000);
-		ResetHangingDownloads();
-	}
-	debug("UrlCoordinator: Downloads are completed");
-
-	debug("Exiting UrlCoordinator-loop");
-}
-
-void UrlCoordinator::Stop()
-{
-	Thread::Stop();
-
-	debug("Stopping UrlDownloads");
-	g_pQueueCoordinator->LockQueue();
-	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
-	{
-		(*it)->Stop();
-	}
-	g_pQueueCoordinator->UnlockQueue();
-	debug("UrlDownloads are notified");
-}
-
-void UrlCoordinator::ResetHangingDownloads()
-{
-	const int TimeOut = g_pOptions->GetTerminateTimeout();
-	if (TimeOut == 0)
-	{
-		return;
-	}
-
-	g_pQueueCoordinator->LockQueue();
-	time_t tm = ::time(NULL);
-
-	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end();)
-	{
-		UrlDownloader* pUrlDownloader = *it;
-		if (tm - pUrlDownloader->GetLastUpdateTime() > TimeOut &&
-		   pUrlDownloader->GetStatus() == UrlDownloader::adRunning)
-		{
-			UrlInfo* pUrlInfo = pUrlDownloader->GetUrlInfo();
-			debug("Terminating hanging download %s", pUrlDownloader->GetInfoName());
-			if (pUrlDownloader->Terminate())
-			{
-				error("Terminated hanging download %s", pUrlDownloader->GetInfoName());
-				pUrlInfo->SetStatus(UrlInfo::aiUndefined);
-			}
-			else
-			{
-				error("Could not terminate hanging download %s", pUrlDownloader->GetInfoName());
-			}
-			m_ActiveDownloads.erase(it);
-			// it's not safe to destroy pUrlDownloader, because the state of object is unknown
-			delete pUrlDownloader;
-			it = m_ActiveDownloads.begin();
-			continue;
-		}
-		it++;
-	}                                              
-
-	g_pQueueCoordinator->UnlockQueue();
-}
-
-void UrlCoordinator::LogDebugInfo()
-{
-	debug("   UrlCoordinator");
-	debug("   ----------------");
-
-	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();
-	}
-	g_pQueueCoordinator->UnlockQueue();
-}
-
-void UrlCoordinator::AddUrlToQueue(UrlInfo* pUrlInfo, bool AddFirst)
-{
-	debug("Adding NZB-URL to queue");
-
-	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
-
-	pDownloadQueue->GetUrlQueue()->push_back(pUrlInfo);
-
-	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-	{
-		g_pDiskState->SaveDownloadQueue(pDownloadQueue);
-	}
-
-	g_pQueueCoordinator->UnlockQueue();
-}
-
-/*
- * Returns next URL for download.
- */
-bool UrlCoordinator::GetNextUrl(DownloadQueue* pDownloadQueue, UrlInfo* &pUrlInfo)
-{
-	bool bOK = false;
-
-	for (UrlQueue::iterator at = pDownloadQueue->GetUrlQueue()->begin(); at != pDownloadQueue->GetUrlQueue()->end(); at++)
-	{
-		pUrlInfo = *at;
-		if (pUrlInfo->GetStatus() == 0)
-		{
-			bOK = true;
-			break;
-		}
-	}
-
-	return bOK;
-}
-
-void UrlCoordinator::StartUrlDownload(UrlInfo* pUrlInfo)
-{
-	debug("Starting new UrlDownloader");
-
-	UrlDownloader* pUrlDownloader = new UrlDownloader();
-	pUrlDownloader->SetAutoDestroy(true);
-	pUrlDownloader->Attach(this);
-	pUrlDownloader->SetUrlInfo(pUrlInfo);
-	pUrlDownloader->SetURL(pUrlInfo->GetURL());
-
-	char tmp[1024];
-
-	pUrlInfo->GetName(tmp, 1024);
-	pUrlDownloader->SetInfoName(tmp);
-
-	snprintf(tmp, 1024, "%surl-%i.tmp", g_pOptions->GetTempDir(), pUrlInfo->GetID());
-	tmp[1024-1] = '\0';
-	pUrlDownloader->SetOutputFilename(tmp);
-
-	pUrlInfo->SetStatus(UrlInfo::aiRunning);
-
-	m_ActiveDownloads.push_back(pUrlDownloader);
-	pUrlDownloader->Start();
-}
-
-void UrlCoordinator::Update(Subject* Caller, void* Aspect)
-{
-	debug("Notification from UrlDownloader received");
-
-	UrlDownloader* pUrlDownloader = (UrlDownloader*) Caller;
-	if ((pUrlDownloader->GetStatus() == WebDownloader::adFinished) ||
-		(pUrlDownloader->GetStatus() == WebDownloader::adFailed) ||
-		(pUrlDownloader->GetStatus() == WebDownloader::adRetry))
-	{
-		UrlCompleted(pUrlDownloader);
-	}
-}
-
-void UrlCoordinator::UrlCompleted(UrlDownloader* pUrlDownloader)
-{
-	debug("URL downloaded");
-
-	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())
-	{
-		strncpy(filename, pUrlDownloader->GetOriginalFilename(), 1024);
-		filename[1024-1] = '\0';
-	}
-	else
-	{
-		strncpy(filename, Util::BaseFileName(pUrlInfo->GetURL()), 1024);
-		filename[1024-1] = '\0';
-
-		// TODO: decode URL escaping
-	}
-
-	Util::MakeValidFilename(filename, '_', false);
-
-	debug("Filename: [%s]", filename);
-
-	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
-
-	// delete Download from Queue
-	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
-	{
-		UrlDownloader* pa = *it;
-		if (pa == pUrlDownloader)
-		{
-			m_ActiveDownloads.erase(it);
-			break;
-		}
-	}
-
-	bool bDeleteObj = false;
-
-	if (pUrlInfo->GetStatus() == UrlInfo::aiFinished || pUrlInfo->GetStatus() == UrlInfo::aiFailed)
-	{
-		// delete UrlInfo from Queue
-		for (UrlQueue::iterator it = pDownloadQueue->GetUrlQueue()->begin(); it != pDownloadQueue->GetUrlQueue()->end(); it++)
-		{
-			UrlInfo* pa = *it;
-			if (pa == pUrlInfo)
-			{
-				pDownloadQueue->GetUrlQueue()->erase(it);
-				break;
-			}
-		}
-
-		bDeleteObj = true;
-
-		if (g_pOptions->GetKeepHistory() > 0 && pUrlInfo->GetStatus() == UrlInfo::aiFailed)
-		{
-			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 (pUrlInfo->GetStatus() == UrlInfo::aiFinished)
-	{
-		// add nzb-file to download queue
-		AddToNZBQueue(pUrlInfo, pUrlDownloader->GetOutputFilename(), filename, pUrlDownloader->GetCategory());
-	}
-
-	if (bDeleteObj)
-	{
-		delete pUrlInfo;
-	}
-}
-
-void UrlCoordinator::AddToNZBQueue(UrlInfo* pUrlInfo, const char* szTempFilename, const char* szOriginalFilename, const char* szOriginalCategory)
-{
-	info("Queue downloaded collection %s", szOriginalFilename);
-
-	NZBFile* pNZBFile = NZBFile::CreateFromFile(szTempFilename, pUrlInfo->GetCategory());
-	if (pNZBFile)
-	{
-		pNZBFile->GetNZBInfo()->SetName(NULL);
-		pNZBFile->GetNZBInfo()->SetFilename(pUrlInfo->GetNZBFilename() && strlen(pUrlInfo->GetNZBFilename()) > 0 ? pUrlInfo->GetNZBFilename() : szOriginalFilename);
-
-		if (strlen(pUrlInfo->GetCategory()) > 0)
-		{
-			pNZBFile->GetNZBInfo()->SetCategory(pUrlInfo->GetCategory());
-		}
-		else if (szOriginalCategory)
-		{
-			pNZBFile->GetNZBInfo()->SetCategory(szOriginalCategory);
-		}
-
-		pNZBFile->GetNZBInfo()->BuildDestDirName();
-
-		for (NZBFile::FileInfos::iterator it = pNZBFile->GetFileInfos()->begin(); it != pNZBFile->GetFileInfos()->end(); it++)
-		{
-			FileInfo* pFileInfo = *it;
-			pFileInfo->SetPriority(pUrlInfo->GetPriority());
-			pFileInfo->SetPaused(pUrlInfo->GetAddPaused());
-		}
-
-		g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, pUrlInfo->GetAddTop());
-		delete pNZBFile;
-		info("Collection %s added to queue", szOriginalFilename);
-	}
-	else
-	{
-		error("Could not add downloaded collection %s to queue", szOriginalFilename);
-	}
-}

UrlCoordinator.h

@@ -1,86 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012 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 URLCOORDINATOR_H
-#define URLCOORDINATOR_H
-
-#include <deque>
-#include <list>
-#include <time.h>
-
-#include "Thread.h"
-#include "WebDownloader.h"
-#include "DownloadInfo.h"
-#include "Observer.h"
-
-class UrlDownloader;
-
-class UrlCoordinator : public Thread, public Observer, public Subject
-{
-public:
-	typedef std::list<UrlDownloader*>	ActiveDownloads;
-
-private:
-	ActiveDownloads			m_ActiveDownloads;
-	bool					m_bHasMoreJobs;
-
-	bool					GetNextUrl(DownloadQueue* pDownloadQueue, UrlInfo* &pUrlInfo);
-	void					StartUrlDownload(UrlInfo* pUrlInfo);
-	void					UrlCompleted(UrlDownloader* pUrlDownloader);
-	void					ResetHangingDownloads();
-	void					AddToNZBQueue(UrlInfo* pUrlInfo, const char* szTempFilename, const char* szOriginalFilename, const char* szOriginalCategory);
-
-public:
-							UrlCoordinator();                
-	virtual					~UrlCoordinator();
-	virtual void			Run();
-	virtual void 			Stop();
-	void					Update(Subject* Caller, void* Aspect);
-
-	// Editing the queue
-	void					AddUrlToQueue(UrlInfo* pUrlInfo, bool AddFirst);
-	bool					HasMoreJobs() { return m_bHasMoreJobs; }
-
-	void					LogDebugInfo();
-};
-
-class UrlDownloader : public WebDownloader
-{
-private:
-	UrlInfo*				m_pUrlInfo;
-	char*					m_szCategory;
-
-protected:
-	virtual void			ProcessHeader(const char* szLine);
-
-public:
-							UrlDownloader();
-							~UrlDownloader();
-	void					SetUrlInfo(UrlInfo* pUrlInfo) { m_pUrlInfo = pUrlInfo; }
-	UrlInfo*				GetUrlInfo() { return m_pUrlInfo; }
-	const char*				GetCategory() { return m_szCategory; }
-};
-
-#endif

Util.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -29,6 +29,7 @@
 #ifdef WIN32
 #include <stdio.h>
 #include <io.h>
+#include <sys/timeb.h>
 #else
 #include <dirent.h>
 #endif
@@ -64,16 +65,13 @@ public:
 	static char* BaseFileName(const char* filename);
 	static void NormalizePathSeparators(char* szPath);
 	static bool LoadFileIntoBuffer(const char* szFileName, char** pBuffer, int* pBufferLength);
-	static bool CreateSparseFile(const char* szFilename, int iSize);
-	static bool TruncateFile(const char* szFilename, int iSize);
+	static bool SetFileSize(const char* szFilename, int iSize);
 	static void MakeValidFilename(char* szFilename, char cReplaceChar, bool bAllowSlashes);
 	static bool MoveFile(const char* szSrcFilename, const char* szDstFilename);
 	static bool FileExists(const char* szFilename);
 	static bool DirectoryExists(const char* szDirFilename);
 	static bool CreateDirectory(const char* szDirFilename);
 	static bool ForceDirectories(const char* szPath);
-	static bool GetCurrentDirectory(char* szBuffer, int iBufSize);
-	static bool SetCurrentDirectory(const char* szDirFilename);
 	static long long FileSize(const char* szFilename);
 	static long long FreeDiskSize(const char* szPath);
 	static bool DirEmpty(const char* szDirFilename);
@@ -81,23 +79,8 @@ public:
 #ifndef WIN32
 	static bool ExpandHomePath(const char* szFilename, char* szBuffer, int iBufSize);
 #endif
-	static void ExpandFileName(const char* szFilename, char* szBuffer, int iBufSize);
 	static void FormatFileSize(char* szBuffer, int iBufLen, long long lFileSize);
 
-	/*
-	 * Split command line int arguments.
-	 * Uses spaces and single quotation marks as separators.
-	 * Returns bool if sucessful or false if bad escaping was detected.
-	 * Parameter "argv" may be NULL if only a syntax check is needed.
-	 * Parsed parameters returned in Array "argv", which contains at least one element.
-	 * The last element in array is NULL.
-	 * Restrictions: the number of arguments is limited to 100 and each arguments must
-	 * be maximum 1024 chars long.
-	 * If these restrictions are exceeded, only first 100 arguments and only first 1024
-	 * for each argument are returned (the functions still returns "true").
-	 */
-	static bool SplitCommandLine(const char* szCommandLine, char*** argv);
-
 	static long long JoinInt64(unsigned long Hi, unsigned long Lo);
 	static void SplitInt64(long long Int64, unsigned long* Hi, unsigned long* Lo);
 
@@ -108,27 +91,10 @@ public:
 	 */
 	static float Int64ToFloat(long long Int64);
 
-	static void TrimRight(char* szStr);
+	static float EqualTime(_timeval* t1, _timeval* t2);
+	static bool EmptyTime(_timeval* t);
+	static float DiffTime(_timeval* t1, _timeval* t2);
 
-	/*
-	 * 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; };
-	
-	/*
-	 * Initialize buffer for program version and revision number.
-	 * This function must be called during program initialization before any
-	 * call to "VersionRevision()".
-	 */
-	static void InitVersionRevision();
-	
-	static char VersionRevisionBuf[40];
-};
-
-class WebUtil
-{
-public:
 	static unsigned int DecodeBase64(char* szInputBuffer, int iInputBufferLength, char* szOutputBuffer);
 
 	/*
@@ -177,100 +143,6 @@ public:
 	 * The returned pointer points to the part of source-string, no additional strings are allocated.
 	 */
 	static const char* JsonNextValue(const char* szJsonText, int* pValueLength);
-
-	/*
-	 * Unquote http quoted string.
-	 * The string is decoded on the place overwriting the content of raw-data.
-	 */
-	static void HttpUnquote(char* raw);
 };
 
-class URL
-{
-private:
-	char*				m_szAddress;
-	char*				m_szProtocol;
-	char*				m_szUser;
-	char*				m_szPassword;
-	char*				m_szHost;
-	char*				m_szResource;
-	int					m_iPort;
-	bool				m_bTLS;
-	bool				m_bValid;
-	void				ParseURL();
-
-public:
-	 					URL(const char* szAddress);
-						~URL();
-	bool				IsValid() { return m_bValid; }
-	const char*			GetAddress() { return m_szAddress; }
-	const char*			GetProtocol() { return m_szProtocol; }
-	const char*			GetUser() { return m_szUser; }
-	const char*			GetPassword() { return m_szPassword; }
-	const char*			GetHost() { return m_szHost; }
-	const char*			GetResource() { return m_szResource; }
-	int					GetPort() { return m_iPort; }
-	bool				GetTLS() { return m_bTLS; }
-};
-
-class RegEx
-{
-private:
-	void*				m_pContext;
-	bool				m_bValid;
-
-public:
-						RegEx(const char *szPattern);
-						~RegEx();
-	bool				IsValid() { return m_bValid; }
-	bool				Match(const char *szStr);
-};
-
-#ifndef DISABLE_GZIP
-class ZLib
-{
-public:
-	/*
-	 * calculates the size required for output buffer
-	 */
-	static unsigned int GZipLen(int iInputBufferLength);
-	
-	/*
-	 * returns the size of bytes written to szOutputBuffer or 0 if the buffer is too small or an error occured.
-	 */
-	static unsigned int GZip(const void* szInputBuffer, int iInputBufferLength, void* szOutputBuffer, int iOutputBufferLength);
-};
-
-class GUnzipStream
-{
-public:
-	enum EStatus
-	{
-		zlError,
-		zlFinished,
-		zlOK
-	};
-
-private:
-	void*				m_pZStream;
-	void*				m_pOutputBuffer;
-	int					m_iBufferSize;
-
-public:
-						GUnzipStream(int BufferSize);
-						~GUnzipStream();
-
-	/*
-	 * set next memory block for uncompression
-	 */
-	void				Write(const void *pInputBuffer, int iInputBufferLength);
-
-	/*
-	 * get next uncompressed memory block.
-	 * iOutputBufferLength - the size of uncompressed block. if it is "0" the next compressed block must be provided via "Write".
-	 */
-	EStatus				Read(const void **pOutputBuffer, int *iOutputBufferLength);
-};
-#endif
-
 #endif

WebDownloader.cpp

@@ -1,679 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012 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 <cstdio>
-#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 "WebDownloader.h"
-#include "Log.h"
-#include "Options.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-
-WebDownloader::WebDownloader()
-{
-	debug("Creating WebDownloader");
-
-	m_szURL	= NULL;
-	m_szOutputFilename	= NULL;
-	m_pConnection = NULL;
-	m_szInfoName = NULL;
-	m_bConfirmedLength = false;
-	m_eStatus = adUndefined;
-	m_szOriginalFilename = NULL;
-	SetLastUpdateTimeNow();
-}
-
-WebDownloader::~WebDownloader()
-{
-	debug("Destroying WebDownloader");
-
-	if (m_szURL)
-	{
-		free(m_szURL);
-	}
-	if (m_szInfoName)
-	{
-		free(m_szInfoName);
-	}
-	if (m_szOutputFilename)
-	{
-		free(m_szOutputFilename);
-	}
-	if (m_szOriginalFilename)
-	{
-		free(m_szOriginalFilename);
-	}
-}
-
-void WebDownloader::SetOutputFilename(const char* v)
-{
-	m_szOutputFilename = strdup(v);
-}
-
-void WebDownloader::SetInfoName(const char* v)
-{
-	m_szInfoName = strdup(v);
-}
-
-void WebDownloader::SetURL(const char * szURL)
-{
-	m_szURL = strdup(szURL);
-}
-
-void WebDownloader::SetStatus(EStatus eStatus)
-{
-	m_eStatus = eStatus;
-	Notify(NULL);
-}
-
-void WebDownloader::Run()
-{
-	debug("Entering WebDownloader-loop");
-
-	SetStatus(adRunning);
-
-	int iRemainedDownloadRetries = g_pOptions->GetRetries() > 0 ? g_pOptions->GetRetries() : 1;
-	int iRemainedConnectRetries = iRemainedDownloadRetries > 10 ? iRemainedDownloadRetries : 10;
-
-	EStatus Status = adFailed;
-
-	while (!IsStopped() && iRemainedDownloadRetries > 0 && iRemainedConnectRetries > 0)
-	{
-		SetLastUpdateTimeNow();
-
-		Status = Download();
-
-		if ((((Status == adFailed) && (iRemainedDownloadRetries > 1)) ||
-			((Status == adConnectError) && (iRemainedConnectRetries > 1)))
-			&& !IsStopped() && !(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) && 
-				!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
-			{
-				usleep(100 * 1000);
-				msec += 100;
-			}
-		}
-
-		if (IsStopped() || g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2())
-		{
-			Status = adRetry;
-			break;
-		}
-
-		if (Status == adFinished || Status == adFatalError || Status == adNotFound)
-		{
-			break;
-		}
-
-		if (Status != adConnectError)
-		{
-			iRemainedDownloadRetries--;
-		}
-		else
-		{
-			iRemainedConnectRetries--;
-		}
-	}
-
-	if (Status != adFinished && Status != adRetry)
-	{
-		Status = adFailed;
-	}
-
-	if (Status == adFailed)
-	{
-		if (IsStopped())
-		{
-			detail("Download %s cancelled", m_szInfoName);
-		}
-		else
-		{
-			error("Download %s failed", m_szInfoName);
-		}
-	}
-
-	if (Status == adFinished)
-	{
-		detail("Download %s completed", m_szInfoName);
-	}
-
-	SetStatus(Status);
-
-	debug("Exiting WebDownloader-loop");
-}
-
-WebDownloader::EStatus WebDownloader::Download()
-{
-	EStatus Status = adRunning;
-
-	URL url(m_szURL);
-
-	Status = CreateConnection(&url);
-	if (Status != adRunning)
-	{
-		return Status;
-	}
-
-	m_pConnection->SetSuppressErrors(false);
-
-	// connection
-	bool bConnected = m_pConnection->Connect();
-	if (!bConnected || IsStopped())
-	{
-		FreeConnection();
-		return adConnectError;
-	}
-
-	// Okay, we got a Connection. Now start downloading.
-	detail("Downloading %s", m_szInfoName);
-
-	SendHeaders(&url);
-
-	Status = DownloadHeaders();
-
-	if (Status == adRunning)
-	{
-		Status = DownloadBody();
-	}
-
-	if (IsStopped())
-	{
-		Status = adFailed;
-	}
-
-	FreeConnection();
-
-	if (Status != adFinished)
-	{
-		// Download failed, delete broken output file
-		remove(m_szOutputFilename);
-	}
-
-	return Status;
-}
-
-
-WebDownloader::EStatus WebDownloader::CreateConnection(URL *pUrl)
-{
-	if (!pUrl->IsValid())
-	{
-		error("URL is not valid: %s", pUrl->GetAddress());
-		return adFatalError;
-	}
-
-	int iPort = pUrl->GetPort();
-	if (iPort == 0 && !strcasecmp(pUrl->GetProtocol(), "http"))
-	{
-		iPort = 80;
-	}
-	if (iPort == 0 && !strcasecmp(pUrl->GetProtocol(), "https"))
-	{
-		iPort = 443;
-	}
-
-	if (strcasecmp(pUrl->GetProtocol(), "http") && strcasecmp(pUrl->GetProtocol(), "https"))
-	{
-		error("Unsupported protocol in URL: %s", pUrl->GetAddress());
-		return adFatalError;
-	}
-
-#ifdef DISABLE_TLS
-	if (!strcasecmp(pUrl->GetProtocol(), "https"))
-	{
-		error("Program was compiled without TLS/SSL-support. Cannot download using https protocol. URL: %s", pUrl->GetAddress());
-		return adFatalError;
-	}
-#endif
-
-	bool bTLS = !strcasecmp(pUrl->GetProtocol(), "https");
-
-	m_pConnection = new Connection(pUrl->GetHost(), iPort, bTLS);
-
-	return adRunning;
-}
-
-void WebDownloader::SendHeaders(URL *pUrl)
-{
-	char tmp[1024];
-
-	// retrieve file
-	snprintf(tmp, 1024, "GET %s HTTP/1.0\r\n", pUrl->GetResource());
-	tmp[1024-1] = '\0';
-	m_pConnection->WriteLine(tmp);
-
-	snprintf(tmp, 1024, "User-Agent: nzbget/%s\r\n", Util::VersionRevision());
-	tmp[1024-1] = '\0';
-	m_pConnection->WriteLine(tmp);
-
-	snprintf(tmp, 1024, "Host: %s\r\n", pUrl->GetHost());
-	tmp[1024-1] = '\0';
-	m_pConnection->WriteLine(tmp);
-
-	m_pConnection->WriteLine("Accept: */*\r\n");
-#ifndef DISABLE_GZIP
-	m_pConnection->WriteLine("Accept-Encoding: gzip\r\n");
-#endif
-	m_pConnection->WriteLine("Connection: close\r\n");
-	m_pConnection->WriteLine("\r\n");
-}
-
-WebDownloader::EStatus WebDownloader::DownloadHeaders()
-{
-	EStatus Status = adRunning;
-
-	m_bConfirmedLength = false;
-	const int LineBufSize = 1024*10;
-	char* szLineBuf = (char*)malloc(LineBufSize);
-	m_iContentLen = -1;
-	bool bFirstLine = true;
-	m_bGZip = false;
-
-	// Headers
-	while (!IsStopped())
-	{
-		SetLastUpdateTimeNow();
-
-		int iLen = 0;
-		char* line = m_pConnection->ReadLine(szLineBuf, LineBufSize, &iLen);
-
-		if (bFirstLine)
-		{
-			Status = CheckResponse(szLineBuf);
-			if (Status != adRunning)
-			{
-				break;
-			}
-			bFirstLine = false;
-		}
-
-		// Have we encountered a timeout?
-		if (!line)
-		{
-			if (!IsStopped())
-			{
-				warn("URL %s failed: Unexpected end of file", m_szInfoName);
-			}
-			Status = adFailed;
-			break;
-		}
-
-		debug("Header: %s", line);
-
-		// detect body of response
-		if (*line == '\r' || *line == '\n')
-		{
-			if (m_iContentLen == -1 && !m_bGZip)
-			{
-				warn("URL %s: Content-Length is not submitted by server, cannot verify whether the file is complete", m_szInfoName);
-			}
-			break;
-		}
-
-		ProcessHeader(line);
-	}
-
-	free(szLineBuf);
-
-	return Status;
-}
-
-WebDownloader::EStatus WebDownloader::DownloadBody()
-{
-	EStatus Status = adRunning;
-
-	m_pOutFile = NULL;
-	bool bEnd = false;
-	const int LineBufSize = 1024*10;
-	char* szLineBuf = (char*)malloc(LineBufSize);
-	int iWrittenLen = 0;
-
-#ifndef DISABLE_GZIP
-	m_pGUnzipStream = NULL;
-	if (m_bGZip)
-	{
-		m_pGUnzipStream = new GUnzipStream(1024*10);
-	}
-#endif
-
-	// Body
-	while (!IsStopped())
-	{
-		SetLastUpdateTimeNow();
-
-		char* szBuffer;
-		int iLen;
-		m_pConnection->ReadBuffer(&szBuffer, &iLen);
-		if (iLen == 0)
-		{
-			iLen = m_pConnection->Recv(szLineBuf, LineBufSize);
-			szBuffer = szLineBuf;
-		}
-
-		// Have we encountered a timeout?
-		if (iLen <= 0)
-		{
-			if (m_iContentLen == -1)
-			{
-				bEnd = true;
-				break;
-			}
-
-			if (!IsStopped())
-			{
-				warn("URL %s failed: Unexpected end of file", m_szInfoName);
-			}
-			Status = adFailed;
-			break;
-		}
-
-		// write to output file
-		if (!Write(szBuffer, iLen))
-		{
-			Status = adFatalError;
-			break;
-		}
-		iWrittenLen += iLen;
-
-		//detect end of file
-		if (iWrittenLen == m_iContentLen || (m_iContentLen == -1 && m_bGZip && m_bConfirmedLength))
-		{
-			bEnd = true;
-			break;
-		}
-	}
-
-	free(szLineBuf);
-
-#ifndef DISABLE_GZIP
-	if (m_pGUnzipStream)
-	{
-		delete m_pGUnzipStream;
-	}
-#endif
-
-	if (m_pOutFile)
-	{
-		fclose(m_pOutFile);
-	}
-
-	if (!bEnd && Status == adRunning && !IsStopped())
-	{
-		warn("URL %s failed: file incomplete", m_szInfoName);
-		Status = adFailed;
-	}
-
-	if (bEnd)
-	{
-		Status = adFinished;
-	}
-
-	return Status;
-}
-
-WebDownloader::EStatus WebDownloader::CheckResponse(const char* szResponse)
-{
-	if (!szResponse)
-	{
-		if (!IsStopped())
-		{
-			warn("URL %s: Connection closed by remote host", m_szInfoName);
-		}
-		return adConnectError;
-	}
-
-	const char* szHTTPResponse = strchr(szResponse, ' ');
-	if (strncmp(szResponse, "HTTP", 4) || !szHTTPResponse)
-	{
-		warn("URL %s failed: %s", m_szInfoName, szResponse);
-		return adFailed;
-	}
-
-	szHTTPResponse++;
-
-	if (!strncmp(szHTTPResponse, "400", 3) || !strncmp(szHTTPResponse, "499", 3))
-	{
-		warn("URL %s failed: %s", m_szInfoName, szHTTPResponse);
-		return adConnectError;
-	}
-	else if (!strncmp(szHTTPResponse, "404", 3))
-	{
-		warn("URL %s failed: %s", m_szInfoName, szHTTPResponse);
-		return adNotFound;
-	}
-	else if (!strncmp(szHTTPResponse, "200", 3))
-	{
-		// OK
-		return adRunning;
-	}
-	else 
-	{
-		// unknown error, no special handling
-		warn("URL %s failed: %s", m_szInfoName, szResponse);
-		return adFailed;
-	}
-}
-
-void WebDownloader::ProcessHeader(const char* szLine)
-{
-	if (!strncmp(szLine, "Content-Length: ", 16))
-	{
-		m_iContentLen = atoi(szLine + 16);
-		m_bConfirmedLength = true;
-	}
-
-	if (!strncmp(szLine, "Content-Encoding: gzip", 22))
-	{
-		m_bGZip = true;
-	}
-
-	if (!strncmp(szLine, "Content-Disposition: ", 21))
-	{
-		ParseFilename(szLine);
-	}
-}
-
-void WebDownloader::ParseFilename(const char* szContentDisposition)
-{
-	// Examples:
-	// Content-Disposition: attachment; filename="fname.ext"
-	// Content-Disposition: attachement;filename=fname.ext
-	// Content-Disposition: attachement;filename=fname.ext;
-	const char *p = strstr(szContentDisposition, "filename");
-	if (!p)
-	{
-		return;
-	}
-
-	p = strchr(p, '=');
-	if (!p)
-	{
-		return;
-	}
-
-	p++;
-
-	while (*p == ' ') p++;
-
-	char fname[1024];
-	strncpy(fname, p, 1024);
-	fname[1024-1] = '\0';
-
-	char *pe = fname + strlen(fname) - 1;
-	while ((*pe == ' ' || *pe == '\n' || *pe == '\r' || *pe == ';') && pe > fname) {
-		*pe = '\0';
-		pe--;
-	}
-
-	WebUtil::HttpUnquote(fname);
-
-	if (m_szOriginalFilename)
-	{
-		free(m_szOriginalFilename);
-	}
-	m_szOriginalFilename = strdup(Util::BaseFileName(fname));
-
-	debug("OriginalFilename: %s", m_szOriginalFilename);
-}
-
-bool WebDownloader::Write(void* pBuffer, int iLen)
-{
-	if (!m_pOutFile && !PrepareFile())
-	{
-		return false;
-	}
-
-#ifndef DISABLE_GZIP
-	if (m_bGZip)
-	{
-		m_pGUnzipStream->Write(pBuffer, iLen);
-		const void *pOutBuf;
-		int iOutLen = 1;
-		while (iOutLen > 0)
-		{
-			GUnzipStream::EStatus eGZStatus = m_pGUnzipStream->Read(&pOutBuf, &iOutLen);
-
-			if (eGZStatus == GUnzipStream::zlError)
-			{
-				error("URL %s: GUnzip failed", m_szInfoName);
-				return false;
-			}
-
-			if (iOutLen > 0 && fwrite(pOutBuf, 1, iOutLen, m_pOutFile) <= 0)
-			{
-				return false;
-			}
-
-			if (eGZStatus == GUnzipStream::zlFinished)
-			{
-				m_bConfirmedLength = true;
-				return true;
-			}
-		}
-		return true;
-	}
-	else
-#endif
-
-	return fwrite(pBuffer, 1, iLen, m_pOutFile) > 0;
-}
-
-bool WebDownloader::PrepareFile()
-{
-	// prepare file for writing
-
-	const char* szFilename = m_szOutputFilename;
-	m_pOutFile = fopen(szFilename, "wb");
-	if (!m_pOutFile)
-	{
-		error("Could not %s file %s", "create", szFilename);
-		return false;
-	}
-	if (g_pOptions->GetWriteBufferSize() > 0)
-	{
-		setvbuf(m_pOutFile, (char *)NULL, _IOFBF, g_pOptions->GetWriteBufferSize());
-	}
-
-	return true;
-}
-
-void WebDownloader::LogDebugInfo()
-{
-	char szTime[50];
-#ifdef HAVE_CTIME_R_3
-		ctime_r(&m_tLastUpdateTime, szTime, 50);
-#else
-		ctime_r(&m_tLastUpdateTime, szTime);
-#endif
-
-	debug("      Web-Download: status=%i, LastUpdateTime=%s, filename=%s", m_eStatus, szTime, Util::BaseFileName(m_szOutputFilename));
-}
-
-void WebDownloader::Stop()
-{
-	debug("Trying to stop WebDownloader");
-	Thread::Stop();
-	m_mutexConnection.Lock();
-	if (m_pConnection)
-	{
-		m_pConnection->SetSuppressErrors(true);
-		m_pConnection->Cancel();
-	}
-	m_mutexConnection.Unlock();
-	debug("WebDownloader stopped successfully");
-}
-
-bool WebDownloader::Terminate()
-{
-	Connection* pConnection = m_pConnection;
-	bool terminated = Kill();
-	if (terminated && pConnection)
-	{
-		debug("Terminating connection");
-		pConnection->SetSuppressErrors(true);
-		pConnection->Cancel();
-		pConnection->Disconnect();
-		delete pConnection;
-	}
-	return terminated;
-}
-
-void WebDownloader::FreeConnection()
-{
-	if (m_pConnection)							
-	{
-		debug("Releasing connection");
-		m_mutexConnection.Lock();
-		if (m_pConnection->GetStatus() == Connection::csCancelled)
-		{
-			m_pConnection->Disconnect();
-		}
-		delete m_pConnection;
-		m_pConnection = NULL;
-		m_mutexConnection.Unlock();
-	}
-}

WebDownloader.h

@@ -1,103 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012 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 WEBDOWNLOADER_H
-#define WEBDOWNLOADER_H
-
-#include <time.h>
-
-#include "Observer.h"
-#include "Thread.h"
-#include "Connection.h"
-#include "Util.h"
-
-class WebDownloader : public Thread, public Subject
-{
-public:
-	enum EStatus
-	{
-		adUndefined,
-		adRunning,
-		adFinished,
-		adFailed,
-		adRetry,
-		adNotFound,
-		adConnectError,
-		adFatalError
-	};
-			
-private:
-	char*				m_szURL;
-	char*				m_szOutputFilename;
-	Connection* 		m_pConnection;
-	Mutex			 	m_mutexConnection;
-	EStatus				m_eStatus;
-	time_t				m_tLastUpdateTime;
-	char*				m_szInfoName;
-	FILE*				m_pOutFile;
-	int					m_iContentLen;
-	bool				m_bConfirmedLength;
-	char*				m_szOriginalFilename;
-	bool				m_bGZip;
-#ifndef DISABLE_GZIP
-	GUnzipStream*		m_pGUnzipStream;
-#endif
-
-	void				SetStatus(EStatus eStatus);
-	bool				Write(void* pBuffer, int iLen);
-	bool				PrepareFile();
-	void				FreeConnection();
-	EStatus				CheckResponse(const char* szResponse);
-	EStatus				Download();
-	EStatus				CreateConnection(URL *pUrl);
-	void				ParseFilename(const char* szContentDisposition);
-	void				SendHeaders(URL *pUrl);
-	EStatus				DownloadHeaders();
-	EStatus				DownloadBody();
-
-protected:
-	virtual void		ProcessHeader(const char* szLine);
-
-public:
-						WebDownloader();
-						~WebDownloader();
-	EStatus				GetStatus() { return m_eStatus; }
-	virtual void		Run();
-	virtual void		Stop();
-	bool				Terminate();
-	void				SetInfoName(const char* v);
-	const char*			GetInfoName() { return m_szInfoName; }
-	void 				SetURL(const char* szURL);
-	const char*			GetOutputFilename() { return m_szOutputFilename; }
-	void 				SetOutputFilename(const char* v);
-	time_t				GetLastUpdateTime() { return m_tLastUpdateTime; }
-	void				SetLastUpdateTimeNow() { m_tLastUpdateTime = ::time(NULL); }
-	bool				GetConfirmedLength() { return m_bConfirmedLength; }
-	const char*			GetOriginalFilename() { return m_szOriginalFilename; }
-
-	void				LogDebugInfo();
-};
-
-#endif

WebServer.cpp

@@ -1,485 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012 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 <cstdio>
-#ifndef WIN32
-#include <unistd.h>
-#endif
-
-#include "nzbget.h"
-#include "WebServer.h"
-#include "XmlRpc.h"
-#include "Log.h"
-#include "Options.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-
-static const char* ERR_HTTP_BAD_REQUEST = "400 Bad Request";
-static const char* ERR_HTTP_NOT_FOUND = "404 Not Found";
-static const char* ERR_HTTP_SERVICE_UNAVAILABLE = "503 Service Unavailable";
-
-static const int MAX_UNCOMPRESSED_SIZE = 500;
-
-//*****************************************************************
-// WebProcessor
-
-WebProcessor::WebProcessor()
-{
-	m_pConnection = NULL;
-	m_szClientIP = NULL;
-	m_szRequest = NULL;
-	m_szUrl = NULL;
-	m_szOrigin = NULL;
-}
-
-WebProcessor::~WebProcessor()
-{
-	if (m_szRequest)
-	{
-		free(m_szRequest);
-	}
-	if (m_szUrl)
-	{
-		free(m_szUrl);
-	}
-	if (m_szOrigin)
-	{
-		free(m_szOrigin);
-	}
-}
-
-void WebProcessor::SetUrl(const char* szUrl)
-{
-	m_szUrl = strdup(szUrl);
-}
-
-void WebProcessor::Execute()
-{
-	m_bGZip =false;
-	char szAuthInfo[1024];
-	szAuthInfo[0] = '\0';
-
-	// reading http header
-	char szBuffer[1024];
-	bool bBody = false;
-	int iContentLen = 0;
-	while (char* p = m_pConnection->ReadLine(szBuffer, sizeof(szBuffer), NULL))
-	{
-		if (char* pe = strrchr(p, '\r')) *pe = '\0';
-		debug("header=%s", p);
-		if (!strncasecmp(p, "Content-Length: ", 16))
-		{
-			iContentLen = atoi(p + 16);
-		}
-		if (!strncasecmp(p, "Authorization: Basic ", 21))
-		{
-			char* szAuthInfo64 = p + 21;
-			if (strlen(szAuthInfo64) > sizeof(szAuthInfo))
-			{
-				error("invalid-request: auth-info too big");
-				return;
-			}
-			szAuthInfo[WebUtil::DecodeBase64(szAuthInfo64, 0, szAuthInfo)] = '\0';
-		}
-		if (!strncasecmp(p, "Accept-Encoding: ", 17))
-		{
-			m_bGZip = strstr(p, "gzip");
-		}
-		if (!strncasecmp(p, "Origin: ", 8))
-		{
-			m_szOrigin = strdup(p + 8);
-		}
-		if (*p == '\0')
-		{
-			bBody = true;
-			break;
-		}
-	}
-
-	debug("URL=%s", m_szUrl);
-	debug("Authorization=%s", szAuthInfo);
-
-	if (m_eHttpMethod == hmPost && iContentLen <= 0)
-	{
-		error("invalid-request: content length is 0");
-		return;
-	}
-
-	if (m_eHttpMethod == hmOptions)
-	{
-		SendOptionsResponse();
-		return;
-	}
-
-	// remove subfolder "nzbget" from the path (if exists)
-	// http://localhost:6789/nzbget/username:password/jsonrpc -> http://localhost:6789/username:password/jsonrpc
-	if (!strncmp(m_szUrl, "/nzbget/", 8))
-	{
-		char* sz_OldUrl = m_szUrl;
-		m_szUrl = strdup(m_szUrl + 7);
-		free(sz_OldUrl);
-	}
-	// http://localhost:6789/nzbget -> http://localhost:6789
-	if (!strcmp(m_szUrl, "/nzbget"))
-	{
-		char szRedirectURL[1024];
-		snprintf(szRedirectURL, 1024, "%s/", m_szUrl);
-		szRedirectURL[1024-1] = '\0';
-		SendRedirectResponse(szRedirectURL);
-		return;
-	}
-
-	// authorization via URL in format:
-	// http://localhost:6789/username:password/jsonrpc
-	char* pauth1 = strchr(m_szUrl + 1, ':');
-	char* pauth2 = strchr(m_szUrl + 1, '/');
-	if (pauth1 && pauth1 < pauth2)
-	{
-		char* pstart = m_szUrl + 1;
-		int iLen = 0;
-		char* pend = strchr(pstart + 1, '/');
-		if (pend) 
-		{
-			iLen = (int)(pend - pstart < (int)sizeof(szAuthInfo) - 1 ? pend - pstart : (int)sizeof(szAuthInfo) - 1);
-		}
-		else
-		{
-			iLen = strlen(pstart);
-		}
-		strncpy(szAuthInfo, pstart, iLen);
-		szAuthInfo[iLen] = '\0';
-		char* sz_OldUrl = m_szUrl;
-		m_szUrl = strdup(pend);
-		free(sz_OldUrl);
-	}
-
-	debug("Final URL=%s", m_szUrl);
-
-	if (strlen(szAuthInfo) == 0)
-	{
-		SendAuthResponse();
-		return;
-	}
-
-	// Authorization
-	char* pw = strchr(szAuthInfo, ':');
-	if (pw) *pw++ = '\0';
-	if (strcmp(szAuthInfo, "nzbget") || strcmp(pw, g_pOptions->GetControlPassword()))
-	{
-		warn("request received on port %i from %s, but password invalid", g_pOptions->GetControlPort(), m_szClientIP);
-		SendAuthResponse();
-		return;
-	}
-
-	if (m_eHttpMethod == hmPost)
-	{
-		// reading http body (request content)
-		m_szRequest = (char*)malloc(iContentLen + 1);
-		m_szRequest[iContentLen] = '\0';
-		
-		if (!m_pConnection->RecvAll(m_szRequest, iContentLen))
-		{
-			free(m_szRequest);
-			error("invalid-request: could not read data");
-			return;
-		}
-		debug("Request=%s", m_szRequest);
-	}
-	
-	debug("request received from %s", m_szClientIP);
-
-	Dispatch();
-}
-
-void WebProcessor::Dispatch()
-{
-	if (*m_szUrl != '/')
-	{
-		SendErrorResponse(ERR_HTTP_BAD_REQUEST);
-		return;
-	}
-
-	if (XmlRpcProcessor::IsRpcRequest(m_szUrl))
-	{
-		XmlRpcProcessor processor;
-		processor.SetRequest(m_szRequest);
-		processor.SetClientIP(m_szClientIP);
-		processor.SetHttpMethod(m_eHttpMethod == hmGet ? XmlRpcProcessor::hmGet : XmlRpcProcessor::hmPost);
-		processor.SetUrl(m_szUrl);
-		processor.Execute();
-		SendBodyResponse(processor.GetResponse(), strlen(processor.GetResponse()), processor.GetContentType()); 
-		return;
-	}
-
-	if (!g_pOptions->GetWebDir() || strlen(g_pOptions->GetWebDir()) == 0)
-	{
-		SendErrorResponse(ERR_HTTP_SERVICE_UNAVAILABLE);
-		return;
-	}
-	
-	if (m_eHttpMethod != hmGet)
-	{
-		SendErrorResponse(ERR_HTTP_BAD_REQUEST);
-		return;
-	}
-	
-	// for security reasons we allow only characters "0..9 A..Z a..z . - _ /" in the URLs
-	// we also don't allow ".." in the URLs
-	for (char *p = m_szUrl; *p; p++)
-	{
-		if (!((*p >= '0' && *p <= '9') || (*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z') ||
-			*p == '.' || *p == '-' || *p == '_' || *p == '/') || (*p == '.' && p[1] == '.'))
-		{
-			SendErrorResponse(ERR_HTTP_NOT_FOUND);
-			return;
-		}
-	}
-
-	const char *szDefRes = "";
-	if (m_szUrl[strlen(m_szUrl)-1] == '/')
-	{
-		// default file in directory (if not specified) is "index.html"
-		szDefRes = "index.html";
-	}
-
-	char disk_filename[1024];
-	snprintf(disk_filename, sizeof(disk_filename), "%s%s%s", g_pOptions->GetWebDir(), m_szUrl + 1, szDefRes);
-
-	disk_filename[sizeof(disk_filename)-1] = '\0';
-
-	SendFileResponse(disk_filename);
-}
-
-void WebProcessor::SendAuthResponse()
-{
-	const char* AUTH_RESPONSE_HEADER =
-		"HTTP/1.0 401 Unauthorized\r\n"
-		"WWW-Authenticate: Basic realm=\"NZBGet\"\r\n"
-		"Connection: close\r\n"
-		"Content-Type: text/plain\r\n"
-		"Server: nzbget-%s\r\n"
-		"\r\n";
-	char szResponseHeader[1024];
-	snprintf(szResponseHeader, 1024, AUTH_RESPONSE_HEADER, Util::VersionRevision());
-	 
-	// Send the response answer
-	debug("ResponseHeader=%s", szResponseHeader);
-	m_pConnection->Send(szResponseHeader, strlen(szResponseHeader));
-}
-
-void WebProcessor::SendOptionsResponse()
-{
-	const char* OPTIONS_RESPONSE_HEADER =
-		"HTTP/1.1 200 OK\r\n"
-		"Connection: close\r\n"
-		//"Content-Type: plain/text\r\n"
-		"Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n"
-		"Access-Control-Allow-Origin: %s\r\n"
-		"Access-Control-Allow-Credentials: true\r\n"
-		"Access-Control-Max-Age: 86400\r\n"
-		"Access-Control-Allow-Headers: Content-Type, Authorization\r\n"
-		"Server: nzbget-%s\r\n"
-		"\r\n";
-	char szResponseHeader[1024];
-	snprintf(szResponseHeader, 1024, OPTIONS_RESPONSE_HEADER, 
-		m_szOrigin ? m_szOrigin : "",
-		Util::VersionRevision());
-	 
-	// Send the response answer
-	debug("ResponseHeader=%s", szResponseHeader);
-	m_pConnection->Send(szResponseHeader, strlen(szResponseHeader));
-}
-
-void WebProcessor::SendErrorResponse(const char* szErrCode)
-{
-	const char* RESPONSE_HEADER = 
-		"HTTP/1.0 %s\r\n"
-		"Connection: close\r\n"
-		"Content-Length: %i\r\n"
-		"Content-Type: text/html\r\n"
-		"Server: nzbget-%s\r\n"
-		"\r\n";
-
-	warn("Web-Server: %s, Resource: %s", szErrCode, m_szUrl);
-
-	char szResponseBody[1024];
-	snprintf(szResponseBody, 1024, "<html><head><title>%s</title></head><body>Error: %s</body></html>", szErrCode, szErrCode);
-	int iPageContentLen = strlen(szResponseBody);
-
-	char szResponseHeader[1024];
-	snprintf(szResponseHeader, 1024, RESPONSE_HEADER, szErrCode, iPageContentLen, Util::VersionRevision());
-
-	// Send the response answer
-	m_pConnection->Send(szResponseHeader, strlen(szResponseHeader));
-	m_pConnection->Send(szResponseBody, iPageContentLen);
-}
-
-void WebProcessor::SendRedirectResponse(const char* szURL)
-{
-	const char* REDIRECT_RESPONSE_HEADER =
-		"HTTP/1.0 301 Moved Permanently\r\n"
-		"Location: %s\r\n"
-		"Connection: close\r\n"
-		"Server: nzbget-%s\r\n"
-		"\r\n";
-	char szResponseHeader[1024];
-	snprintf(szResponseHeader, 1024, REDIRECT_RESPONSE_HEADER, szURL, Util::VersionRevision());
-	 
-	// Send the response answer
-	debug("ResponseHeader=%s", szResponseHeader);
-	m_pConnection->Send(szResponseHeader, strlen(szResponseHeader));
-}
-
-void WebProcessor::SendBodyResponse(const char* szBody, int iBodyLen, const char* szContentType)
-{
-	const char* RESPONSE_HEADER = 
-		"HTTP/1.1 200 OK\r\n"
-		"Connection: close\r\n"
-		"Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n"
-		"Access-Control-Allow-Origin: %s\r\n"
-		"Access-Control-Allow-Credentials: true\r\n"
-		"Access-Control-Max-Age: 86400\r\n"
-		"Access-Control-Allow-Headers: Content-Type, Authorization\r\n"
-		"Content-Length: %i\r\n"
-		"%s"					// Content-Type: xxx
-		"%s"					// Content-Encoding: gzip
-		"Server: nzbget-%s\r\n"
-		"\r\n";
-	
-#ifndef DISABLE_GZIP
-	char *szGBuf = NULL;
-	bool bGZip = m_bGZip && iBodyLen > MAX_UNCOMPRESSED_SIZE;
-	if (bGZip)
-	{
-		unsigned int iOutLen = ZLib::GZipLen(iBodyLen);
-		szGBuf = (char*)malloc(iOutLen);
-		int iGZippedLen = ZLib::GZip(szBody, iBodyLen, szGBuf, iOutLen);
-		if (iGZippedLen > 0 && iGZippedLen < iBodyLen)
-		{
-			szBody = szGBuf;
-			iBodyLen = iGZippedLen;
-		}
-		else
-		{
-			free(szGBuf);
-			szGBuf = NULL;
-			bGZip = false;
-		}
-	}
-#else
-	bool bGZip = false;
-#endif
-	
-	char szContentTypeHeader[1024];
-	if (szContentType)
-	{
-		snprintf(szContentTypeHeader, 1024, "Content-Type: %s\r\n", szContentType);
-	}
-	else
-	{
-		szContentTypeHeader[0] = '\0';
-	}
-	
-	char szResponseHeader[1024];
-	snprintf(szResponseHeader, 1024, RESPONSE_HEADER, 
-		m_szOrigin ? m_szOrigin : "",
-		iBodyLen, szContentTypeHeader,
-		bGZip ? "Content-Encoding: gzip\r\n" : "",
-		Util::VersionRevision());
-	
-	// Send the request answer
-	m_pConnection->Send(szResponseHeader, strlen(szResponseHeader));
-	m_pConnection->Send(szBody, iBodyLen);
-	
-#ifndef DISABLE_GZIP
-	if (szGBuf)
-	{
-		free(szGBuf);
-	}
-#endif
-}
-
-void WebProcessor::SendFileResponse(const char* szFilename)
-{
-	debug("serving file: %s", szFilename);
-
-	char *szBody;
-	int iBodyLen;
-	if (!Util::LoadFileIntoBuffer(szFilename, &szBody, &iBodyLen))
-	{
-		SendErrorResponse(ERR_HTTP_NOT_FOUND);
-		return;
-	}
-	
-	// "LoadFileIntoBuffer" adds a trailing NULL, which we don't need here
-	iBodyLen--;
-	
-	SendBodyResponse(szBody, iBodyLen, DetectContentType(szFilename));
-
-	free(szBody);
-}
-
-const char* WebProcessor::DetectContentType(const char* szFilename)
-{
-	if (const char *szExt = strrchr(szFilename, '.'))
-	{
-		if (!strcasecmp(szExt, ".css"))
-		{
-			return "text/css";
-		}
-		else if (!strcasecmp(szExt, ".html"))
-		{
-			return "text/html";
-		}
-		else if (!strcasecmp(szExt, ".js"))
-		{
-			return "application/javascript";
-		}
-		else if (!strcasecmp(szExt, ".png"))
-		{
-			return "image/png";
-		}
-		else if (!strcasecmp(szExt, ".jpeg"))
-		{
-			return "image/jpeg";
-		}
-		else if (!strcasecmp(szExt, ".gif"))
-		{
-			return "image/gif";
-		}
-	}
-	return NULL;
-}

WebServer.h

@@ -1,69 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012 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 WEBSERVER_H
-#define WEBSERVER_H
-
-#include "Connection.h"
-
-class WebProcessor
-{
-public:
-	enum EHttpMethod
-	{
-		hmPost,
-		hmGet,
-		hmOptions
-	};
-
-private:
-	Connection*			m_pConnection;
-	const char*			m_szClientIP;
-	char*				m_szRequest;
-	char*				m_szUrl;
-	EHttpMethod			m_eHttpMethod;
-	bool				m_bGZip;
-	char*				m_szOrigin;
-
-	void				Dispatch();
-	void				SendAuthResponse();
-	void				SendOptionsResponse();
-	void				SendErrorResponse(const char* szErrCode);
-	void				SendFileResponse(const char* szFilename);
-	void				SendBodyResponse(const char* szBody, int iBodyLen, const char* szContentType);
-	void				SendRedirectResponse(const char* szURL);
-	const char*			DetectContentType(const char* szFilename);
-
-public:
-						WebProcessor();
-						~WebProcessor();
-	void				Execute();
-	void				SetConnection(Connection* pConnection) { m_pConnection = pConnection; }
-	void				SetUrl(const char* szUrl);
-	void				SetHttpMethod(EHttpMethod eHttpMethod) { m_eHttpMethod = eHttpMethod; }
-	void				SetClientIP(const char* szClientIP) { m_szClientIP = szClientIP; }
-};
-
-#endif

XmlRpc.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -50,8 +50,7 @@ public:
 	{
 		rpUndefined,
 		rpXmlRpc,
-		rpJsonRpc,
-		rpJsonPRpc
+		rpJsonRpc
 	};
 
 	enum EHttpMethod
@@ -61,30 +60,27 @@ public:
 	};
 
 private:
+	Connection*			m_pConnection;
 	const char*			m_szClientIP;
 	char*				m_szRequest;
-	const char*			m_szContentType;
 	ERpcProtocol		m_eProtocol;
 	EHttpMethod			m_eHttpMethod;
 	char*				m_szUrl;
-	StringBuilder		m_cResponse;
 
 	void				Dispatch();
+	void				SendResponse(const char* szResponse, bool bFault);
 	XmlCommand*			CreateCommand(const char* szMethodName);
 	void				MutliCall();
-	void				BuildResponse(const char* szResponse, const char* szCallbackFunc, bool bFault);
 
 public:
 						XmlRpcProcessor();
 						~XmlRpcProcessor();
 	void				Execute();
+	void				SetConnection(Connection* pConnection) { m_pConnection = pConnection; }
+	void				SetProtocol(ERpcProtocol eProtocol) { m_eProtocol = eProtocol; }
 	void				SetHttpMethod(EHttpMethod eHttpMethod) { m_eHttpMethod = eHttpMethod; }
 	void				SetUrl(const char* szUrl);
 	void				SetClientIP(const char* szClientIP) { m_szClientIP = szClientIP; }
-	void				SetRequest(char* szRequest) { m_szRequest = szRequest; }
-	const char*			GetResponse() { return m_cResponse.GetBuffer(); }
-	const char*			GetContentType() { return m_szContentType; }
-	static bool			IsRpcRequest(const char* szUrl);
 };
 
 class XmlCommand
@@ -92,23 +88,20 @@ class XmlCommand
 protected:
 	char*				m_szRequest;
 	char*				m_szRequestPtr;
-	char*				m_szCallbackFunc;
 	StringBuilder		m_StringBuilder;
 	bool				m_bFault;
 	XmlRpcProcessor::ERpcProtocol	m_eProtocol;
 	XmlRpcProcessor::EHttpMethod	m_eHttpMethod;
 
-	void				BuildErrorResponse(int iErrCode, const char* szErrText, ...);
+	void				BuildErrorResponse(int iErrCode, const char* szErrText);
 	void				BuildBoolResponse(bool bOK);
 	void				AppendResponse(const char* szPart);
-	bool				IsJson();
-	bool				CheckSafeMethod();
+	bool				IsJson() { return m_eProtocol == XmlRpcProcessor::rpJsonRpc; }
 	bool				NextParamAsInt(int* iValue);
 	bool				NextParamAsBool(bool* bValue);
 	bool				NextParamAsStr(char** szValueBuf);
 	const char*			BoolToStr(bool bValue);
 	char*				EncodeStr(const char* szStr);
-	void				DecodeStr(char* szStr);
 
 public:
 						XmlCommand();
@@ -119,7 +112,6 @@ public:
 	void				SetProtocol(XmlRpcProcessor::ERpcProtocol eProtocol) { m_eProtocol = eProtocol; }
 	void				SetHttpMethod(XmlRpcProcessor::EHttpMethod eHttpMethod) { m_eHttpMethod = eHttpMethod; }
 	const char*			GetResponse() { return m_StringBuilder.GetBuffer(); }
-	const char*			GetCallbackFunc() { return m_szCallbackFunc; }
 	bool				GetFault() { return m_bFault; }
 };
 
@@ -134,23 +126,15 @@ public:
 	virtual void		Execute();
 };
 
-class PauseUnpauseXmlCommand: public XmlCommand
+class PauseXmlCommand: public XmlCommand
 {
 public:
-	enum EPauseAction
-	{
-		paDownload,
-		paDownload2,
-		paPostProcess,
-		paScan
-	};
-
-private:
-	bool			m_bPause;
-	EPauseAction	m_eEPauseAction;
+	virtual void		Execute();
+};
 
+class UnPauseXmlCommand: public XmlCommand
+{
 public:
-						PauseUnpauseXmlCommand(bool bPause, EPauseAction eEPauseAction);
 	virtual void		Execute();
 };
 
@@ -160,12 +144,6 @@ public:
 	virtual void		Execute();
 };
 
-class ReloadXmlCommand: public XmlCommand
-{
-public:
-	virtual void		Execute();
-};
-
 class VersionXmlCommand: public XmlCommand
 {
 public:
@@ -232,53 +210,10 @@ public:
 	virtual void		Execute();
 };
 
-class ClearLogXmlCommand: public XmlCommand
-{
-public:
-	virtual void		Execute();
-};
-
 class ScanXmlCommand: public XmlCommand
 {
 public:
 	virtual void		Execute();
 };
 
-class HistoryXmlCommand: public XmlCommand
-{
-public:
-	virtual void		Execute();
-};
-
-class DownloadUrlXmlCommand: public XmlCommand
-{
-public:
-	virtual void		Execute();
-};
-
-class UrlQueueXmlCommand: public XmlCommand
-{
-public:
-	virtual void		Execute();
-};
-
-class ConfigXmlCommand: public XmlCommand
-{
-public:
-	virtual void		Execute();
-};
-
-class LoadConfigXmlCommand: public XmlCommand
-{
-public:
-	virtual void		Execute();
-};
-
-class SaveConfigXmlCommand: public XmlCommand
-{
-public:
-	virtual void		Execute();
-	void				Save(const char *szFilename);
-};
-
 #endif

aclocal.m4

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+# generated automatically by aclocal 1.10 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
+# 2005, 2006  Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -11,6 +11,11 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
+m4_if(m4_PACKAGE_VERSION, [2.61],,
+[m4_fatal([this file was generated for autoconf 2.61.
+You have another version of autoconf.  If you want to use that,
+you should regenerate the build system entirely.], [63])])
+
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
 # 
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
@@ -159,7 +164,7 @@ path to pkg-config.
 
 _PKG_TEXT
 
-To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
 		[$4])
 else
 	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -169,7 +174,7 @@ else
 fi[]dnl
 ])# PKG_CHECK_MODULES
 
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -179,14 +184,29 @@ fi[]dnl
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
+# (This private macro should not be called outside this file.)
+AC_DEFUN([AM_AUTOMAKE_VERSION],
+[am__api_version='1.10'
+dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
+dnl require some minimum version.  Point them to the right macro.
+m4_if([$1], [1.10], [],
+      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
+])
+
+# _AM_AUTOCONF_VERSION(VERSION)
+# -----------------------------
+# aclocal traces this macro to find the Autoconf version.
+# This is a private macro too.  Using m4_define simplifies
+# the logic in aclocal, which can simply ignore this definition.
+m4_define([_AM_AUTOCONF_VERSION], [])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
+# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.6])])
+[AM_AUTOMAKE_VERSION([1.10])dnl
+_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -243,14 +263,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 7
+# serial 8
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -259,8 +279,10 @@ AC_DEFUN([AM_CONDITIONAL],
 [AC_PREREQ(2.52)dnl
  ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
 	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
+AC_SUBST([$1_TRUE])dnl
+AC_SUBST([$1_FALSE])dnl
+_AM_SUBST_NOTMAKE([$1_TRUE])dnl
+_AM_SUBST_NOTMAKE([$1_FALSE])dnl
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -274,15 +296,14 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 8
+# serial 9
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -310,6 +331,7 @@ AC_REQUIRE([AM_DEP_TRACK])dnl
 ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
        [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
        [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
+       [$1], UPC,  [depcc="$UPC"  am_compiler_list=],
        [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
                    [depcc="$$1"   am_compiler_list=])
 
@@ -375,6 +397,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
          >/dev/null 2>conftest.err &&
+       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
@@ -427,7 +450,8 @@ if test "x$enable_dependency_tracking" != xno; then
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
+AC_SUBST([AMDEPBACKSLASH])dnl
+_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -452,8 +476,9 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
   # some people rename them; so instead we look at the file content.
   # Grep'ing the first line is not enough: some people post-process
   # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
+  # Grep'ing the whole file is not good either: AIX grep has a line
+  # limit of 2048, but all sed's we know have understand at least 4000.
+  if sed 10q "$mf" | grep '^#.*generated by automake' > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -500,8 +525,8 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 
 # Do all the work for Automake.                             -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+# 2005, 2006 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -524,16 +549,20 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
 # arguments mandatory, and then we can depend on a new Autoconf
 # release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
+[AC_PREREQ([2.60])dnl
 dnl Autoconf wants to disallow AM_ names.  We explicitly allow
 dnl the ones we care about.
 m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
 AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
 AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+  # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+  # is not polluted with repeated "-I."
+  AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl
+  # test to see if srcdir already configured
+  if test -f $srcdir/config.status; then
+    AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+  fi
 fi
 
 # test whether we have cygpath
@@ -553,6 +582,9 @@ m4_ifval([$2],
  AC_SUBST([PACKAGE], [$1])dnl
  AC_SUBST([VERSION], [$2])],
 [_AM_SET_OPTIONS([$1])dnl
+dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
+m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,,
+  [m4_fatal([AC_INIT should be called with package and version arguments])])dnl
  AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
  AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
 
@@ -588,6 +620,10 @@ AC_PROVIDE_IFELSE([AC_PROG_CXX],
                   [_AM_DEPENDENCIES(CXX)],
                   [define([AC_PROG_CXX],
                           defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_OBJC],
+                  [_AM_DEPENDENCIES(OBJC)],
+                  [define([AC_PROG_OBJC],
+                          defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl
 ])
 ])
 
@@ -623,7 +659,7 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # Define $install_sh.
 AC_DEFUN([AM_PROG_INSTALL_SH],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -701,14 +737,14 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -724,6 +760,7 @@ AC_SUBST($1)])
 # If it does, set am_missing_run to use it, otherwise, to nothing.
 AC_DEFUN([AM_MISSING_HAS_RUN],
 [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+AC_REQUIRE_AUX_FILE([missing])dnl
 test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
 # Use eval to expand $SHELL
 if eval "$MISSING --run true"; then
@@ -734,7 +771,7 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -742,60 +779,23 @@ fi
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
+# Check for `mkdir -p'.
 AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
+[AC_PREREQ([2.60])dnl
+AC_REQUIRE([AC_PROG_MKDIR_P])dnl
+dnl Automake 1.8 to 1.9.6 used to define mkdir_p.  We now use MKDIR_P,
+dnl while keeping a definition of mkdir_p for backward compatibility.
+dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile.
+dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of
+dnl Makefile.ins that do not define MKDIR_P, so we do our own
+dnl adjustment using top_builddir (which is defined more often than
+dnl MKDIR_P).
+AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl
+case $mkdir_p in
+  [[\\/$]]* | ?:[[\\/]]*) ;;
+  */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
@@ -907,9 +907,21 @@ dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
 if test "$cross_compiling" != no; then
   AC_CHECK_TOOL([STRIP], [strip], :)
 fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
+# Copyright (C) 2006  Free Software Foundation, Inc.
+#
+# This file is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# _AM_SUBST_NOTMAKE(VARIABLE)
+# ---------------------------
+# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in.
+# This macro is traced by Automake.
+AC_DEFUN([_AM_SUBST_NOTMAKE])
+
 # Check how to create a tarball.                            -*- Autoconf -*-
 
 # Copyright (C) 2004, 2005  Free Software Foundation, Inc.

config.h.in

@@ -6,9 +6,6 @@
 /* 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 smart par-verification and restoration */
 #undef DISABLE_PARCHECK
 
@@ -31,21 +28,6 @@
 /* Define to 1 if you have the <curses.h> header file. */
 #undef HAVE_CURSES_H
 
-/* Define to 1 if getaddrinfo is supported */
-#undef HAVE_GETADDRINFO
-
-/* Define to 1 if gethostbyname_r is supported */
-#undef HAVE_GETHOSTBYNAME_R
-
-/* Define to 1 if gethostbyname_r takes 3 arguments */
-#undef HAVE_GETHOSTBYNAME_R_3
-
-/* Define to 1 if gethostbyname_r takes 5 arguments */
-#undef HAVE_GETHOSTBYNAME_R_5
-
-/* Define to 1 if gethostbyname_r takes 6 arguments */
-#undef HAVE_GETHOSTBYNAME_R_6
-
 /* Define to 1 if getopt_long is supported */
 #undef HAVE_GETOPT_LONG
 
@@ -70,12 +52,6 @@
 /* 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 spinlocks are supported */
-#undef HAVE_SPINLOCK
-
 /* Define to 1 if stat64 is supported */
 #undef HAVE_STAT64
 
@@ -103,6 +79,9 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
+/* Define to 1 to use unnamed semaphores */
+#undef HAVE_UNNAMED_SEMAPHORES
+
 /* Define to 1 if variadic macros are supported */
 #undef HAVE_VARIADIC_MACROS
 
@@ -124,12 +103,6 @@
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
-/* Define to 1 to install an empty signal handler for SIGCHLD */
-#undef SIGCHLD_HANDLER
-
-/* Determine what socket length (socklen_t) data type is */
-#undef SOCKLEN_T
-
 /* Define to 1 if you have the ANSI C header files. */
 #undef STDC_HEADERS
 

configure.ac

@@ -2,18 +2,33 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(nzbget, 9.0, hugbug@users.sourceforge.net)
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(nzbget, 9.0)
+AC_INIT(nzbget, 0.6.0, hugbug@users.sourceforge.net)
+AM_INIT_AUTOMAKE(nzbget, 0.6.0)
 AC_CONFIG_SRCDIR([nzbget.cpp])
 AC_CONFIG_HEADERS([config.h])
 
 
+dnl
+dnl Architecture check.
+dnl
+AC_CANONICAL_HOST
+
+
 dnl
 dnl Set default library path, if not specified in environment variable "LIBPREF".
 dnl
 if test "$LIBPREF" = ""; then
-	LIBPREF="/usr"
+	case "$host" in
+		*-linux*)
+			LIBPREF="/usr"
+			;;
+		*-freebsd*)
+			LIBPREF="/usr/local"
+			;;
+		*-solaris*)
+			LIBPREF="/usr"
+			;;
+	esac
 fi
 
 
@@ -21,23 +36,16 @@ dnl
 dnl Check for programs.
 dnl
 AC_PROG_CXX
+AC_PROG_CC
 AC_PATH_PROG(TAR, tar, $FALSE)
 AC_PATH_PROG(MAKE, make, $FALSE)
 AC_PROG_INSTALL
 
 
-dnl
-dnl Do all tests with c++ compiler.
-dnl
-AC_LANG(C++)
-
-
 dnl
 dnl Checks for header files.
 dnl
 AC_CHECK_HEADERS(sys/prctl.h)
-AC_CHECK_HEADERS(regex.h)
-
 
 dnl
 dnl Check for libs
@@ -52,20 +60,23 @@ dnl
 dnl Getopt
 dnl
 AC_CHECK_FUNC(getopt_long,
-	[AC_DEFINE([HAVE_GETOPT_LONG], 1, [Define to 1 if getopt_long is supported])],)
+	[AC_DEFINE([HAVE_GETOPT_LONG], 1, [Define to 1 if getopt_long is supported])],
+	[AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)])
 
 
 dnl
 dnl stat64
 dnl
 AC_CHECK_FUNC(stat64,
-	[AC_DEFINE([HAVE_STAT64], 1, [Define to 1 if stat64 is supported])],)
+	[AC_DEFINE([HAVE_STAT64], 1, [Define to 1 if stat64 is supported])],
+	[AC_LIBOBJ(stat64)])
 
 
 dnl
 dnl check ctime_r
 dnl
 AC_MSG_CHECKING(for ctime_r)
+AC_LANG_PUSH(C++)
 AC_TRY_COMPILE(
 	[#include <time.h>],
 	[ time_t clock; char buf[26];	ctime_r(&clock, buf, 26); ],
@@ -74,14 +85,15 @@ AC_TRY_COMPILE(
 	AC_DEFINE([HAVE_CTIME_R_3], 1, [Define to 1 if ctime_r takes 3 arguments]),
 	FOUND="no")
 if test "$FOUND" = "no"; then
-AC_TRY_COMPILE(
-	[#include <time.h>],
-	[ time_t clock; char buf[26];	ctime_r(&clock, buf); ],
-	AC_MSG_RESULT([[yes, and it takes 2 arguments]])
-	FOUND="yes"
-	AC_DEFINE([HAVE_CTIME_R_2], 1, [Define to 1 if ctime_r takes 2 arguments]),
-	FOUND="no")
+	AC_TRY_COMPILE(
+		[#include <time.h>],
+		[ time_t clock; char buf[26];	ctime_r(&clock, buf); ],
+		AC_MSG_RESULT([[yes, and it takes 2 arguments]])
+		FOUND="yes"
+		AC_DEFINE([HAVE_CTIME_R_2], 1, [Define to 1 if ctime_r takes 2 arguments]),
+		FOUND="no")
 fi
+AC_LANG_POP(C++)
 if test "$FOUND" = "no"; then
 	AC_MSG_RESULT([no])
 	AC_MSG_ERROR("function ctime_r not found")
@@ -89,96 +101,44 @@ fi
 
 
 dnl
-dnl check getaddrinfo
+dnl check for __FUNCTION__ or __func__ macro
 dnl
-AC_CHECK_FUNC(getaddrinfo,
-	FOUND="yes"
-	[AC_DEFINE([HAVE_GETADDRINFO], 1, [Define to 1 if getaddrinfo is supported])]
-	AC_SEARCH_LIBS([getaddrinfo], [nsl]),
-	FOUND="no")
-
-
-dnl
-dnl check gethostbyname_r, if getaddrinfo is not available
-dnl
-if test "$FOUND" = "no"; then
-	AC_MSG_CHECKING(for gethostbyname_r)
-	
-	AC_TRY_COMPILE(
-		[#include <netdb.h>],
-		[	char* szHost; struct hostent hinfobuf; char* strbuf; int h_errnop;
-			struct hostent* hinfo = gethostbyname_r(szHost, &hinfobuf, strbuf, 1024, &h_errnop); ],
-		AC_MSG_RESULT([[yes, and it takes 5 arguments]])
-		FOUND="yes"                      
-		AC_DEFINE([HAVE_GETHOSTBYNAME_R_5], 1, [Define to 1 if gethostbyname_r takes 5 arguments]),
-		FOUND="no")
-	
-	if test "$FOUND" = "no"; then
-	AC_TRY_COMPILE(
-		[#include <netdb.h>],
-		[	char* szHost; struct hostent* hinfo; struct hostent hinfobuf; char* strbuf; int h_errnop;
-			int err = gethostbyname_r(szHost, &hinfobuf, strbuf, 1024, &hinfo, &h_errnop); ],
-		AC_MSG_RESULT([[yes, and it takes 6 arguments]])
-		FOUND="yes"
-		AC_DEFINE([HAVE_GETHOSTBYNAME_R_6], 1, [Define to 1 if gethostbyname_r takes 6 arguments]),
-		FOUND="no")
-	fi
-	
-	if test "$FOUND" = "no"; then
-	AC_TRY_COMPILE(
-		[#include <netdb.h>],
-		[	char* szHost; struct hostent hinfo; struct hostent_data hinfobuf; 
-			int err = gethostbyname_r(szHost, &hinfo, &hinfobuf); ],
-		AC_MSG_RESULT([[yes, and it takes 3 arguments]])
-		FOUND="yes"
-		AC_DEFINE([HAVE_GETHOSTBYNAME_R_3], 1, [Define to 1 if gethostbyname_r takes 3 arguments]),
-		AC_MSG_RESULT([[no]])
-		FOUND="no")
-	fi
-	
-	if test "$FOUND" = "yes"; then
-		AC_DEFINE([HAVE_GETHOSTBYNAME_R], 1, [Define to 1 if gethostbyname_r is supported])
-		AC_SEARCH_LIBS([gethostbyname_r], [nsl])
-	fi
+AC_MSG_CHECKING(for __FUNCTION__ macro)
+AC_LANG_PUSH(C++)
+AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __FUNCTION__);],
+	AC_MSG_RESULT([yes])
+	AC_DEFINE([FUNCTION_MACRO_NAME],[__FUNCTION__],[Define to the name of macro which returns the name of funtion being compiled])
+	HAVE_FUNCTION_MACRO=yes,
+	AC_MSG_RESULT([no]))
+AC_LANG_POP(C++)
+if test "$HAVE_FUNCTION_MACRO" != "yes"; then
+	AC_MSG_CHECKING(for __func__ macro)
+	AC_LANG_PUSH(C++)
+	AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __func__);],
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([FUNCTION_MACRO_NAME],[__func__],[Define to the name of macro which returns the name of function being compiled])
+		HAVE_FUNCTION_MACRO=yes,
+		AC_MSG_RESULT([no]))
+	AC_LANG_POP(C++)
+fi
+if test "$HAVE_FUNCTION_MACRO" != "yes"; then
+	AC_DEFINE([FUNCTION_MACRO_NAME],[NULL],[Define to the name of macro which returns the name of function being compiled])
 fi
 
 
 dnl
-dnl cCheck if spinlocks are available
+dnl Unnamed semaphores
 dnl
-AC_CHECK_FUNC(pthread_spin_init,
-	[AC_DEFINE([HAVE_SPINLOCK], 1, [Define to 1 if spinlocks are supported])]
-	AC_SEARCH_LIBS([pthread_spin_init], [pthread]),)
-
-
-dnl
-dnl Determine what socket length (socklen_t) data type is
-dnl
-AC_MSG_CHECKING([for type of socket length (socklen_t)])
-AC_TRY_COMPILE([
-#include <stddef.h>
-#include <sys/types.h>
-#include <sys/socket.h>],[
-(void)getsockopt (1, 1, 1, NULL, (socklen_t*)NULL)],[
-  AC_MSG_RESULT(socklen_t)
-  SOCKLEN_T=socklen_t],[
-  AC_TRY_COMPILE([
-#include <stddef.h>
-#include <sys/types.h>
-#include <sys/socket.h>],[
-(void)getsockopt (1, 1, 1, NULL, (size_t*)NULL)],[
-    AC_MSG_RESULT(size_t)
-    SOCKLEN_T=size_t],[
-    AC_TRY_COMPILE([
-#include <stddef.h>
-#include <sys/types.h>
-#include <sys/socket.h>],[
-(void)getsockopt (1, 1, 1, NULL, (int*)NULL)],[
-      AC_MSG_RESULT(int)
-      SOCKLEN_T=int],[
-      AC_MSG_WARN(could not determine)
-      SOCKLEN_T=int])])])
-AC_DEFINE_UNQUOTED(SOCKLEN_T, $SOCKLEN_T, [Determine what socket length (socklen_t) data type is])
+AC_MSG_CHECKING(whether to use unnamed semaphores)
+case "$host" in
+	*-darwin*)
+		AC_MSG_RESULT([no])
+		;;
+	*)
+		AC_MSG_RESULT([yes])
+		AC_DEFINE([HAVE_UNNAMED_SEMAPHORES],1,Define to 1 to use unnamed semaphores)
+		;;
+esac
 
 
 dnl 
@@ -202,7 +162,7 @@ if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
 		[CFLAGS="${CFLAGS} $libxml2_CFLAGS"])
 fi
 AC_CHECK_HEADER(libxml/tree.h,,
-	AC_MSG_ERROR("libxml2 header files not found"))
+	AC_MSG_ERROR("libxml2 header files were not found"))
 AC_SEARCH_LIBS([xmlNewNode], [xml2], ,
 	AC_MSG_ERROR("libxml2 library not found"))
 
@@ -287,8 +247,10 @@ if test "$ENABLEPARCHECK" = "yes"; then
 			[CPPFLAGS="${CPPFLAGS} $libsigc_CFLAGS"])
 	fi
 	
+	AC_LANG_PUSH(C++)
 	AC_CHECK_HEADER(sigc++/type_traits.h,,
-		AC_MSG_ERROR("libsigc++-2.0 header files not found"))
+		AC_MSG_ERROR("libsigc++-2.0 header files were not found"))
+	AC_LANG_POP(C++)
 
 	dnl
 	dnl checks for libpar2 includes and libraries.
@@ -301,8 +263,10 @@ if test "$ENABLEPARCHECK" = "yes"; then
 
 	CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
 	
+	AC_LANG_PUSH(C++)
 	AC_CHECK_HEADER(libpar2/libpar2.h,,
-		AC_MSG_ERROR("libpar2 header files not found"))
+		AC_MSG_ERROR("libpar2 header files were not found in $INCVAL"))
+	AC_LANG_POP(C++)
 
 	AC_ARG_WITH(libpar2_libraries,
 		[AS_HELP_STRING([--with-libpar2-libraries=DIR], [libpar2 library directory])],
@@ -310,26 +274,18 @@ if test "$ENABLEPARCHECK" = "yes"; then
 
 	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 Q: How to check for c++-class in library?
+		LIBS="${LIBS} -lpar2"
+	dnl		AC_CHECK_LIB(par2, GenerateCRC32Table, , FOUND=no)
+	dnl		if test "$FOUND" = "no"; then
+	dnl			AC_MSG_ERROR("libpar2 library not found in $LIBVAL")
+	dnl		fi
 
 	dnl
 	dnl check if libpar2 has support for cancelling
 	dnl
 	AC_MSG_CHECKING(whether libpar2 supports cancelling)
+	AC_LANG_PUSH(C++)
 	AC_TRY_COMPILE(
 		[#include <libpar2/par2cmdline.h>]
 		[#include <libpar2/par2repairer.h>]
@@ -338,6 +294,7 @@ if test "$ENABLEPARCHECK" = "yes"; then
 		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]]))
+	AC_LANG_POP(C++)
 else
 	AC_DEFINE([DISABLE_PARCHECK],1,[Define to 1 to disable smart par-verification and restoration])
 fi
@@ -382,9 +339,7 @@ if test "$USETLS" = "yes"; then
 		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=yes,
 				FOUND=no)
 			if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
 				AC_MSG_ERROR([Couldn't find GnuTLS library])
@@ -442,62 +397,6 @@ else
 fi
 
 
-dnl 
-dnl checks for zlib includes and libraries.
-dnl
-AC_MSG_CHECKING(whether to use gzip)
-AC_ARG_ENABLE(gzip,
-	[AS_HELP_STRING([--disable-gzip], [disable gzip-compression/decompression (removes dependency from zlib-library)])],
-	[USEZLIB=$enableval],
-	[USEZLIB=yes] )
-AC_MSG_RESULT($USEZLIB)
-if test "$USEZLIB" = "yes"; then
-	INCVAL="${LIBPREF}/include"
-	LIBVAL="${LIBPREF}/lib"
-	AC_ARG_WITH(zlib_includes,
-		[AS_HELP_STRING([--with-zlib-includes=DIR], [zlib include directory])],
-		[INCVAL="$withval"])
-	CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
-	CFLAGS="${CFLAGS} -I${INCVAL}"
-	AC_ARG_WITH(zlib_libraries,
-		[AS_HELP_STRING([--with-zlib-libraries=DIR], [zlib library directory])],
-		[LIBVAL="$withval"])
-	LDFLAGS="${LDFLAGS} -L${LIBVAL}"
-	
-	AC_CHECK_HEADER(zlib.h,,
-		AC_MSG_ERROR("zlib header files not found"))
-	AC_SEARCH_LIBS([deflateBound], [z], ,
-		AC_MSG_ERROR("zlib library not found"))
-else
-	AC_DEFINE([DISABLE_GZIP],1,[Define to 1 to disable gzip-support])
-fi
-
-
-dnl 
-dnl Some Linux systems require an empty signal handler for SIGCHLD
-dnl in order for exit codes to be correctly delivered to parent process.
-dnl Some BSD systems however may not function properly if the handler is installed.
-dnl The default behavior is to check the target and disable the handler on BSD but keep it enabled on other systems.
-dnl
-AC_MSG_CHECKING(whether to use an empty SIGCHLD handler)
-AC_ARG_ENABLE(sigchld-handler,
-	[AS_HELP_STRING([--disable-sigchld-handler], [do not use sigchld-handler (the disabling is recommended for BSD)])],
-	[SIGCHLDHANDLER=$enableval],
-	[SIGCHLDHANDLER=auto])
-if test "$SIGCHLDHANDLER" = "auto"; then
-	SIGCHLDHANDLER=yes
-	case "$target" in
-		*bsd*)
-			SIGCHLDHANDLER=no
-			;;
-	esac
-fi
-AC_MSG_RESULT($SIGCHLDHANDLER)
-if test "$SIGCHLDHANDLER" = "yes"; then
-	AC_DEFINE([SIGCHLD_HANDLER], 1, [Define to 1 to install an empty signal handler for SIGCHLD])
-fi
-
-
 dnl 
 dnl Debugging. Default: no
 dnl 
@@ -506,42 +405,41 @@ AC_ARG_ENABLE(debug,
 	[AS_HELP_STRING([--enable-debug], [enable debugging])],
 	[ ENABLEDEBUG=$enableval ],
 	[ ENABLEDEBUG=no] )
+if test "$ENABLEDEBUG" = "yes"; then
+	AC_DEFINE([DEBUG],1,Define to 1 to include debug-code)
+	if test "$CC" = "gcc"; then
+		CXXFLAGS="-g -Wall"
+	else
+		CXXFLAGS=""
+	fi
+fi
 AC_MSG_RESULT($ENABLEDEBUG)
 
 
+dnl
+dnl Backtracing on segmentation faults
 if test "$ENABLEDEBUG" = "yes"; then
+	AC_MSG_CHECKING(for backtrace)
+	AC_TRY_COMPILE(
+		[#include <execinfo.h>]
+		[#include <stdio.h>]
+		[#include <stdlib.h>],
+		[ void *array[100];	size_t size; char **strings; ]
+		[ size = backtrace(array, 100); ]
+		[ strings = backtrace_symbols(array, size); ],
+		FOUND=yes
+		AC_MSG_RESULT([[yes]])
+		AC_DEFINE([HAVE_BACKTRACE], 1, [Define to 1 to create stacktrace on segmentation faults]),
+		FOUND=no
+		AC_MSG_RESULT([[no]]))
 
-dnl
-dnl Begin of debugging code
-dnl
-
-AC_DEFINE([DEBUG],1,Define to 1 to include debug-code)
-
-
-dnl
-dnl Set debug flags for gcc (if gcc is used)
-dnl
-if test "$CC" = "gcc"; then
-	CXXFLAGS="-g -Wall"
-else
-	CXXFLAGS=""
-fi
-
-
-dnl
-dnl check for __FUNCTION__ or __func__ macro
-dnl
-AC_MSG_CHECKING(for macro returning current function name)
-AC_TRY_COMPILE(
-	[#include <stdio.h>], [printf("%s\n", __FUNCTION__);],
-	AC_MSG_RESULT(__FUNCTION__)
-	FUNCTION_MACRO_NAME=__FUNCTION__,
-AC_TRY_COMPILE([#include <stdio.h>], [printf("%s\n", __func__);],
-	AC_MSG_RESULT(__func__)
-	FUNCTION_MACRO_NAME=__func__,
-	AC_MSG_RESULT(none)))
-if test "$FUNCTION_MACRO_NAME" != ""; then
-	AC_DEFINE_UNQUOTED(FUNCTION_MACRO_NAME, $FUNCTION_MACRO_NAME, [Define to the name of macro which returns the name of function being compiled])
+AC_MSG_CHECKING(for rdynamic linker flag)
+	old_LDFLAGS="$LDFLAGS"
+	LDFLAGS="$LDFLAGS -rdynamic"
+	AC_TRY_LINK([], [],
+		AC_MSG_RESULT([[yes]]),
+		AC_MSG_RESULT([[no]])
+		[LDFLAGS="$old_LDFLAGS"])
 fi
 
 
@@ -559,41 +457,6 @@ AC_COMPILE_IFELSE([
 	AC_MSG_RESULT([no]))
 
 
-dnl
-dnl Backtracing on segmentation faults
-dnl
-AC_MSG_CHECKING(for backtrace)
-AC_TRY_COMPILE(
-	[#include <execinfo.h>]
-	[#include <stdio.h>]
-	[#include <stdlib.h>],
-	[ void *array[100];	size_t size; char **strings; ]
-	[ size = backtrace(array, 100); ]
-	[ strings = backtrace_symbols(array, size); ],
-	FOUND=yes
-	AC_MSG_RESULT([[yes]])
-	AC_DEFINE([HAVE_BACKTRACE], 1, [Define to 1 to create stacktrace on segmentation faults]),
-	FOUND=no
-	AC_MSG_RESULT([[no]]))
-
-
-dnl
-dnl "rdynamic" linker flag
-dnl
-AC_MSG_CHECKING(for rdynamic linker flag)
-	old_LDFLAGS="$LDFLAGS"
-	LDFLAGS="$LDFLAGS -rdynamic"
-	AC_TRY_LINK([], [],
-		AC_MSG_RESULT([[yes]]),
-		AC_MSG_RESULT([[no]])
-		[LDFLAGS="$old_LDFLAGS"])
-		
-dnl
-dnl End of debugging code
-dnl
-fi
-
-
 dnl Substitute flags.
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)

nzbget-postprocess.conf

@@ -1,66 +0,0 @@
-#
-# This file if part of nzbget
-#
-# Template configuration file for postprocessing script "nzbget-postprocess.sh".
-# Please refer to "nzbget-postprocess.sh" for usage instructions.
-#
-# Copyright (C) 2008-2012 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.
-#
-#
-
-##############################################################################
-### PATHS                                                                  ###
-
-# Set the full path to unrar if it is not in your PATH.
-UnrarCmd=unrar
-
-
-##############################################################################
-### OPTIONS                                                                ###
-
-# Delete rar-files after unpacking (yes, no).
-DeleteRarFiles=yes
-
-# Rename img-files to iso (yes, no).
-RenameIMG=yes
-
-# Joint TS-files (yes, no).
-JoinTS=no
-
-##############################################################################
-### POSTPROCESSING-PARAMETERS                                              ###
-
-# This section defines parameters, which can be set for each nzb-file
-# individually using either web-interface or command line.
-# Example command line for setting parameter "password" to value "123" for
-# nzb-file with id=2:
-#    nzbget -E G O Password=123 2
-
-# Perform postprocessing (yes, no).
-#
-# Set to "no" to skip postprocessing for this nzb-file.
-PostProcess=yes
-
-# Password for encrypted posts.
-#
-# If the post requires a password for unpacking.
-Password=
-
-# Destination directory.
-#
-# NOTE: NZBGet must have write-access-rights for that directory.
-DestDir=

nzbget-postprocess.sh

@@ -1,321 +0,0 @@
-#!/bin/sh 
-#
-# This file if part of nzbget
-#
-# Example postprocessing script for NZBGet
-#
-# Copyright (C) 2008 Peter Roubos <peterroubos@hotmail.com>
-# Copyright (C) 2008 Otmar Werner
-# Copyright (C) 2008-2012 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.
-#
-#
-
-#######################    Usage instructions     #######################
-# o  Script will unrar downloaded rar files, join ts-files and rename img-files
-#    to iso.
-#
-# o  To use this script with nzbget set the option "PostProcess" in
-#    nzbget configuration file to point to this script file. E.g.:
-#        PostProcess=/home/user/nzbget/nzbget-postprocess.sh
-#
-# o  The script needs a configuration file. An example configuration file
-#    is provided in file "nzbget-postprocess.conf". Put the configuration file 
-#    into the directory where nzbget's configuration file (nzbget.conf) is located.
-#    Then edit the configuration file in any text editor to adjust the settings.
-#
-# o  You can also edit the script's configuration via web-interface.
-#
-# o  There are few options, which can be ajdusted for each nzb-file individually.
-#
-# o  The script supports the feature called "delayed par-check".
-#    That means it can try to unpack downloaded files without par-checking
-#    them fisrt. Only if unpack fails, the script schedules par-check,
-#    then unpacks again.
-#    To use delayed par-check set following options in nzbget configuration file:
-#        ParCheck=no
-#        ParRepair=yes
-#        LoadPars=one (or) LoadPars=all
-#
-# o  If you want to par-check/repair all files before trying to unpack them,
-#    set option "ParCheck=yes".
-#
-####################### End of Usage instructions #######################
-
-
-# NZBGet passes following arguments to postprocess-programm as environment
-# variables:
-#  NZBPP_DIRECTORY    - path to destination dir for downloaded files;
-#  NZBPP_NZBFILENAME  - name of processed nzb-file;
-#  NZBPP_PARFILENAME  - name of par-file or empty string (if no collections were 
-#                       found);
-#  NZBPP_PARSTATUS    - result of par-check:
-#                       0 = not checked: par-check disabled or nzb-file does
-#                           not contain any par-files;
-#                       1 = checked and failed to repair;
-#                       2 = checked and successfully repaired;
-#                       3 = checked and can be repaired but repair is disabled;
-#  NZBPP_NZBCOMPLETED - state of nzb-job:
-#                       0 = there are more collections in this nzb-file queued;
-#                       1 = this was the last collection in nzb-file;
-#  NZBPP_PARFAILED    - indication of failed par-jobs for current nzb-file:
-#                       0 = no failed par-jobs;
-#                       1 = current par-job or any of the previous par-jobs for
-#                           the same nzb-files failed;
-#  NZBPP_CATEGORY     - category assigned to nzb-file (can be empty string).
-
-
-# Name of script's configuration file
-SCRIPT_CONFIG_FILE="nzbget-postprocess.conf"
-
-# Exit codes
-POSTPROCESS_PARCHECK_CURRENT=91
-POSTPROCESS_PARCHECK_ALL=92
-POSTPROCESS_SUCCESS=93
-POSTPROCESS_ERROR=94
-POSTPROCESS_NONE=95
-
-# Check if the script is called from nzbget
-if [ "$NZBPP_DIRECTORY" = "" -o "$NZBOP_CONFIGFILE" = "" ]; then
-	echo "*** NZBGet post-process script ***"
-	echo "This script is supposed to be called from nzbget (0.7.0 or later)."
-	exit $POSTPROCESS_ERROR
-fi 
-
-# Check if postprocessing was disabled in postprocessing parameters 
-# (for current nzb-file) via web-interface or via command line with 
-# "nzbget -E G O PostProcess=no <ID>"
-if [ "$NZBPR_PostProcess" = "no" ]; then
-	echo "[WARNING] Post-Process: Postprocessing disabled for this nzb-file, exiting"
-	exit $POSTPROCESS_NONE
-fi
-
-echo "[INFO] Post-Process: Post-process script successfully started"
-
-# Determine the location of configuration file (it must be stored in
-# the directory with nzbget.conf or in this script's directory).
-ConfigDir="${NZBOP_CONFIGFILE%/*}"
-ScriptConfigFile="$ConfigDir/$SCRIPT_CONFIG_FILE"
-if [ ! -f "$ScriptConfigFile" ]; then
-	ConfigDir="${0%/*}"
-	ScriptConfigFile="$ConfigDir/$SCRIPT_CONFIG_FILE"
-fi
-if [ ! -f "$ScriptConfigFile" ]; then
-	echo "[ERROR] Post-Process: Configuration file $ScriptConfigFile not found, exiting"
-	exit $POSTPROCESS_ERROR
-fi
-
-# Readg configuration file
-while read line; do	eval "$line"; done < $ScriptConfigFile
-
-# Check nzbget.conf options
-BadConfig=0
-
-if [ "$NZBOP_ALLOWREPROCESS" = "yes" ]; then
-	echo "[ERROR] Post-Process: Please disable option \"AllowReProcess\" in nzbget configuration file"
-	BadConfig=1
-fi 
-
-if [ "$NZBOP_LOADPARS" = "none" ]; then
-	echo "[ERROR] Post-Process: Please set option \"LoadPars\" to \"One\" or \"All\" in nzbget configuration file"
-	BadConfig=1
-fi
-
-if [ "$NZBOP_PARREPAIR" = "no" ]; then
-	echo "[ERROR] Post-Process: Please set option \"ParRepair\" to \"Yes\" in nzbget configuration file"
-	BadConfig=1
-fi
-
-if [ "$BadConfig" -eq 1 ]; then
-	echo "[ERROR] Post-Process: Exiting because of not compatible nzbget configuration"
-	exit $POSTPROCESS_ERROR
-fi 
-
-# Check if all collections in nzb-file were downloaded
-if [ ! "$NZBPP_NZBCOMPLETED" -eq 1 ]; then
-	echo "[INFO] Post-Process: Not the last collection in nzb-file, exiting"
-	exit $POSTPROCESS_SUCCESS
-fi 
-
-# Check par status
-if [ "$NZBPP_PARSTATUS" -eq 1 -o "$NZBPP_PARSTATUS" -eq 3 -o "$NZBPP_PARFAILED" -eq 1 ]; then
-	if [ "$NZBPP_PARSTATUS" -eq 3 ]; then
-		echo "[WARNING] Post-Process: Par-check successful, but Par-repair disabled, exiting"
-	else
-		echo "[WARNING] Post-Process: Par-check failed, exiting"
-	fi
-	exit $POSTPROCESS_ERROR
-fi 
-
-# Check if destination directory exists (important for reprocessing of history items)
-if [ ! -d "$NZBPP_DIRECTORY" ]; then
-	echo "[ERROR] Post-Process: Nothing to post-process: destination directory $NZBPP_DIRECTORY doesn't exist"
-	exit $POSTPROCESS_ERROR
-fi
-
-cd "$NZBPP_DIRECTORY"
-
-# If not just repaired and file "_brokenlog.txt" exists, the collection is damaged
-# exiting with returning code $POSTPROCESS_PARCHECK_ALL to request par-repair
-if [ ! "$NZBPP_PARSTATUS" -eq 2 ]; then
-	if [ -f "_brokenlog.txt" ]; then
-		if (ls *.[pP][aA][rR]2 >/dev/null 2>&1); then
-			echo "[INFO] Post-Process: Brokenlog found, requesting par-repair"
-			exit $POSTPROCESS_PARCHECK_ALL
-		fi
-	fi
-fi
-
-# All checks done, now processing the files
-
-# Flag indicates that something was unrared
-Unrared=0
-   
-# Unrar the files (if any) to the temporary directory, if there are no rar files this will do nothing
-if (ls *.rar >/dev/null 2>&1); then
-
-	# Check if unrar exists
-	$UnrarCmd >/dev/null 2>&1
-	if [ "$?" -eq 127 ]; then
-		echo "[ERROR] Post-Process: Unrar not found. Set the path to unrar in script's configuration"
-		exit $POSTPROCESS_ERROR
-	fi
-
-	# Make a temporary directory to store the unrarred files
-	ExtractedDirExists=0
-	if [ -d extracted ]; then
-		ExtractedDirExists=1
-	else
-		mkdir extracted
-	fi
-	
-	echo "[INFO] Post-Process: Unraring"
-	rarpasswordparam=""
-	if [ "$NZBPR_Password" != "" ]; then
-		rarpasswordparam="-p$NZBPR_Password"
-	fi
-
-	$UnrarCmd x -y -p- "$rarpasswordparam" -o+ "*.rar"  ./extracted/
-	if [ "$?" -ne 0 ]; then
-		echo "[ERROR] Post-Process: Unrar failed"
-		if [ "$ExtractedDirExists" -eq 0 ]; then
-			rm -R extracted
-		fi
-		# for delayed par-check/-repair at least one par-file must be already downloaded
-		if (ls *.[pP][aA][rR]2 >/dev/null 2>&1); then
-			echo "[INFO] Post-Process: Requesting par-repair"
-			exit $POSTPROCESS_PARCHECK_ALL
-		fi
-		exit $POSTPROCESS_ERROR
-	fi
-	Unrared=1
-   
-	# Remove the rar files
-	if [ "$DeleteRarFiles" = "yes" ]; then
-		echo "[INFO] Post-Process: Deleting rar-files"
-		rm *.r[0-9][0-9] >/dev/null 2>&1
-		rm *.rar >/dev/null 2>&1
-		rm *.s[0-9][0-9] >/dev/null 2>&1
-	fi
-	
-	# Go to the temp directory and try to unrar again.  
-	# If there are any rars inside the extracted rars then these will no also be unrarred
-	cd extracted
-	if (ls *.rar >/dev/null 2>&1); then
-		echo "[INFO] Post-Process: Unraring (second pass)"
-		$UnrarCmd x -y -p- -o+ "*.rar"
-
-		if [ "$?" -ne 0 ]; then
-			echo "[INFO] Post-Process: Unrar (second pass) failed"
-			exit $POSTPROCESS_ERROR
-		fi
-
-		# Delete the Rar files
-		if [ "$DeleteRarFiles" = "yes" ]; then
-			echo "[INFO] Post-Process: Deleting rar-files (second pass)"
-			rm *.r[0-9][0-9] >/dev/null 2>&1
-			rm *.rar >/dev/null 2>&1
-			rm *.s[0-9][0-9] >/dev/null 2>&1
-		fi
-	fi
-	
-	# Move everything back to the Download folder
-	mv * ..
-	cd ..
-	rmdir extracted
-fi
-
-# If download contains only nzb-files move them into nzb-directory
-# for further download
-# Check if command "wc" exists
-wc -l . >/dev/null 2>&1
-if [ "$?" -ne 127 ]; then
-	AllFilesCount=`ls -1 2>/dev/null | wc -l`
-	NZBFilesCount=`ls -1 *.nzb 2>/dev/null | wc -l`
-	if [ "$AllFilesCount" -eq "$NZBFilesCount" ]; then
-		echo "[INFO] Moving downloaded nzb-files into incoming nzb-directory for further download"
-		mv *.nzb $NZBOP_NZBDIR
-	fi
-fi
-
-# Clean up
-echo "[INFO] Post-Process: Cleaning up"
-chmod -R a+rw .
-rm *.nzb >/dev/null 2>&1
-rm *.sfv >/dev/null 2>&1
-rm *.1 >/dev/null 2>&1
-rm _brokenlog.txt >/dev/null 2>&1
-if [ "$Unrared" -eq 1 ]; then
-	# Delete par2-file only if there were files for unpacking.
-	rm *.[pP][aA][rR]2 >/dev/null 2>&1
-fi
-
-if [ "$JoinTS" = "yes" ]; then
-	# Join any split .ts files if they are named xxxx.0000.ts xxxx.0001.ts
-	# They will be joined together to a file called xxxx.0001.ts
-	if (ls *.ts >/dev/null 2>&1); then
-	    echo "[INFO] Post-Process: Joining ts-files"
-		tsname=`find . -name "*0001.ts" |awk -F/ '{print $NF}'`
-		cat *0???.ts > ./$tsname
-	fi   
-   
-	# Remove all the split .ts files
-    echo "[INFO] Post-Process: Deleting source ts-files"
-	rm *0???.ts >/dev/null 2>&1
-fi
-
-if [ "$RenameIMG" = "yes" ]; then
-	# Rename img file to iso
-	# It will be renamed to .img.iso so you can see that it has been renamed
-	if (ls *.img >/dev/null 2>&1); then
-	    echo "[INFO] Post-Process: Renaming img-files to iso"
-		imgname=`find . -name "*.img" |awk -F/ '{print $NF}'`
-		mv $imgname $imgname.iso
-	fi   
-fi
-
-# Check if destination directory was set in postprocessing parameters
-# (for current nzb-file) via web-interface or via command line with 
-# "nzbget -E G O DestDir=/new/path <ID>"
-if [ "$NZBPR_DestDir" != "" ]; then
-	mkdir $NZBPR_DestDir
-	mv * $NZBPR_DestDir >/dev/null 2>&1
-	cd ..
-	rmdir $NZBPP_DIRECTORY
-fi
-
-# All OK, requesting cleaning up of download queue
-exit $POSTPROCESS_SUCCESS

nzbget-shell.bat

@@ -1,35 +0,0 @@
-@echo off
-
-rem
-rem  Batch file to start nzbget shell
-rem
-rem  Copyright (C) 2009 orbisvicis <orbisvicis@users.sourceforge.net>
-rem  Copyright (C) 2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
-rem
-rem  This program is free software; you can redistribute it and/or modify
-rem  it under the terms of the GNU General Public License as published by
-rem  the Free Software Foundation; either version 2 of the License, or
-rem  (at your option) any later version.
-rem
-rem  This program is distributed in the hope that it will be useful,
-rem  but WITHOUT ANY WARRANTY; without even the implied warranty of
-rem  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-rem  GNU General Public License for more details.
-rem
-rem  You should have received a copy of the GNU General Public License
-rem  along with this program; if not, write to the Free Software
-rem  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-rem
-
-rem #######################    Usage instructions     #######################
-rem 
-rem  After starting the batch file you can use all nzbget commands 
-rem  (like nzbget -s, nzbget -L, etc) without typing the full
-rem  path to nzbget executable.
-rem
-rem ####################### End of Usage instructions #######################
-
-
-rem expression "%~dp0" means the location of an executing batch file
-set PATH=%PATH%;%~dp0
-cmd /U /K "cd %USERPROFILE% & nzbget"

nzbget.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2012 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -16,7 +16,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #ifdef WIN32
@@ -66,7 +66,6 @@
 #include "ColoredFrontend.h"
 #include "NCursesFrontend.h"
 #include "QueueCoordinator.h"
-#include "UrlCoordinator.h"
 #include "RemoteServer.h"
 #include "RemoteClient.h"
 #include "MessageBase.h"
@@ -74,15 +73,14 @@
 #include "PrePostProcessor.h"
 #include "ParChecker.h"
 #include "Scheduler.h"
-#include "Util.h"
 #ifdef WIN32
 #include "NTService.h"
 #endif
 
+#include "ScriptController.h" // DEBUG
+
 // Prototypes
-void RunMain();
-void Run(bool bReload);
-void Reload();
+void Run();
 void Cleanup();
 void ProcessClientRequest();
 #ifndef WIN32
@@ -104,18 +102,14 @@ Thread* g_pFrontend = NULL;
 Options* g_pOptions = NULL;
 ServerPool* g_pServerPool = NULL;
 QueueCoordinator* g_pQueueCoordinator = NULL;
-UrlCoordinator* g_pUrlCoordinator = NULL;
 RemoteServer* g_pRemoteServer = NULL;
 DownloadSpeedMeter* g_pDownloadSpeedMeter = NULL;
-DownloadQueueHolder* g_pDownloadQueueHolder = NULL;
+NZBInfoLocker* g_pNZBInfoLocker = NULL;
 Log* g_pLog = NULL;
 PrePostProcessor* g_pPrePostProcessor = NULL;
 DiskState* g_pDiskState = NULL;
 Scheduler* g_pScheduler = NULL;
-int g_iArgumentCount;
-char* (*g_szEnvironmentVariables)[] = NULL;
-char* (*g_szArguments)[] = NULL;
-bool g_bReloading = true;
+char* (*szEnvironmentVariables)[] = NULL;
 
 /*
  * Main loop
@@ -134,9 +128,8 @@ int main(int argc, char *argv[], char *argp[])
 #endif
 #endif
 
-	Util::InitVersionRevision();
-	
 #ifdef WIN32
+	_set_fmode(_O_BINARY);
 	InstallUninstallServiceCheck(argc, argv);
 #endif
 
@@ -144,67 +137,14 @@ int main(int argc, char *argv[], char *argp[])
 	DisableCout();
 #endif
 
-	g_iArgumentCount = argc;
-	g_szArguments = (char*(*)[])argv;
-	g_szEnvironmentVariables = (char*(*)[])argp;
-
-#ifdef WIN32
-	for (int i=0; i < argc; i++)
-	{
-		if (!strcmp(argv[i], "-D"))
-		{
-			StartService(RunMain);
-			return 0;
-		}
-	}
-#endif
-
-	RunMain();
-
-#ifdef WIN32
-#ifdef _DEBUG
-	_CrtDumpMemoryLeaks();
-#endif
-#endif
-
-	return 0;
-}
-
-void RunMain()
-{
-	// we need to save and later restore current directory each time
-	// the program is reloaded (RPC-Method "reload") in order for
-	// config to properly load in a case relative paths are used 
-	// in command line
-	char szCurDir[MAX_PATH + 1];
-	Util::GetCurrentDirectory(szCurDir, sizeof(szCurDir));
-	
-	bool bReload = false;
-	while (g_bReloading)
-	{
-		g_bReloading = false;
-		Util::SetCurrentDirectory(szCurDir);
-		Run(bReload);
-		bReload = true;
-	}
-}
-
-void Run(bool bReload)
-{
+	// Init options & get the name of the .nzb file
 	g_pLog = new Log();
-
-	debug("nzbget %s", Util::VersionRevision());
-
-	if (!bReload)
-	{
-		Thread::Init();
-	}
-
 	g_pServerPool = new ServerPool();
 	g_pScheduler = new Scheduler();
 
-	debug("Reading options");
-	g_pOptions = new Options(g_iArgumentCount, *g_szArguments);
+	debug("Options parsing");
+	g_pOptions = new Options(argc, argv);
+	szEnvironmentVariables = (char*(*)[])argp;
 
 #ifndef WIN32
 	if (g_pOptions->GetUMask() < 01000)
@@ -216,33 +156,28 @@ void Run(bool bReload)
 	
 	if (g_pOptions->GetServerMode() && g_pOptions->GetCreateLog() && g_pOptions->GetResetLog())
 	{
-		debug("Deleting old log-file");
+		debug("deleting old log-file");
 		g_pLog->ResetLog();
 	}
 
-	g_pLog->InitOptions();
-
-	if (g_pOptions->GetDaemonMode() && !bReload)
+	if (g_pOptions->GetDaemonMode())
 	{
 #ifdef WIN32
-		info("nzbget %s service-mode", Util::VersionRevision());
+		info("nzbget %s service-mode", VERSION);
+		StartService(Run);
+		return 0;
 #else
 		Daemonize();
-		info("nzbget %s daemon-mode", Util::VersionRevision());
+		info("nzbget %s daemon-mode", VERSION);
 #endif
 	}
-	else if (g_pOptions->GetServerMode() && !bReload)
+	else if (g_pOptions->GetServerMode())
 	{
-		info("nzbget %s server-mode", Util::VersionRevision());
+		info("nzbget %s server-mode", VERSION);
 	}
 	else if (g_pOptions->GetRemoteClientMode())
 	{
-		info("nzbget %s remote-mode", Util::VersionRevision());
-	}
-
-	if (!bReload)
-	{
-		Connection::Init();
+		info("nzbget %s remote-mode", VERSION);
 	}
 
 	if (!g_pOptions->GetRemoteClientMode())
@@ -262,6 +197,19 @@ void Run(bool bReload)
 #endif
 #endif
 
+	Run();
+
+#ifdef WIN32
+#ifdef _DEBUG
+	_CrtDumpMemoryLeaks();
+#endif
+#endif
+
+	return 0;
+}
+
+void Run()
+{
 #ifndef WIN32
 	InstallSignalHandlers();
 #ifdef DEBUG
@@ -271,6 +219,9 @@ void Run(bool bReload)
 	}
 #endif
 #endif
+	
+	Connection::Init(g_pOptions->GetTLS() && !g_pOptions->GetRemoteClientMode() &&
+		(g_pOptions->GetClientOperation() == Options::opClientNoOperation));
 
 	// client request
 	if (g_pOptions->GetClientOperation() != Options::opClientNoOperation)
@@ -285,9 +236,7 @@ void Run(bool bReload)
 	{                                    
 		g_pQueueCoordinator = new QueueCoordinator();
 		g_pDownloadSpeedMeter = g_pQueueCoordinator;
-		g_pDownloadQueueHolder = g_pQueueCoordinator;
-
-		g_pUrlCoordinator = new UrlCoordinator();
+		g_pNZBInfoLocker = g_pQueueCoordinator;
 	}
 
 	// Setup the network-server
@@ -332,16 +281,10 @@ void Run(bool bReload)
 	if (!g_pOptions->GetRemoteClientMode())
 	{
 		// Standalone-mode
-		if (!g_pOptions->GetServerMode())
+		if (!g_pOptions->GetServerMode() && !g_pQueueCoordinator->AddFileToQueue(g_pOptions->GetArgFilename(), g_pOptions->GetCategory() ? g_pOptions->GetCategory() : ""))
 		{
-			NZBFile* pNZBFile = NZBFile::CreateFromFile(g_pOptions->GetArgFilename(), g_pOptions->GetAddCategory() ? g_pOptions->GetAddCategory() : "");
-			if (!pNZBFile)
-			{
-				abort("FATAL ERROR: Parsing NZB-document %s failed\n\n", g_pOptions->GetArgFilename() ? g_pOptions->GetArgFilename() : "N/A");
-				return;
-			}
-			g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, false);
-			delete pNZBFile;
+			abort("FATAL ERROR: Parsing NZB-document %s failed!!\n\n", g_pOptions->GetArgFilename() ? g_pOptions->GetArgFilename() : "N/A");
+			return;
 		}
 
 		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
@@ -350,28 +293,18 @@ void Run(bool bReload)
 		}
 
 		g_pQueueCoordinator->Start();
-		g_pUrlCoordinator->Start();
 		g_pPrePostProcessor->Start();
 
 		// enter main program-loop
-		while (g_pQueueCoordinator->IsRunning() || 
-			g_pUrlCoordinator->IsRunning() || 
-			g_pPrePostProcessor->IsRunning())
+		while (g_pQueueCoordinator->IsRunning() || g_pPrePostProcessor->IsRunning())
 		{
-			if (!g_pOptions->GetServerMode() && 
-				!g_pQueueCoordinator->HasMoreJobs() && 
-				!g_pUrlCoordinator->HasMoreJobs() && 
-				!g_pPrePostProcessor->HasMoreJobs())
+			if (!g_pOptions->GetServerMode() && !g_pQueueCoordinator->HasMoreJobs() && !g_pPrePostProcessor->HasMoreJobs())
 			{
 				// Standalone-mode: download completed
 				if (!g_pQueueCoordinator->IsStopped())
 				{
 					g_pQueueCoordinator->Stop();
 				}
-				if (!g_pUrlCoordinator->IsStopped())
-				{
-					g_pUrlCoordinator->Stop();
-				}
 				if (!g_pPrePostProcessor->IsStopped())
 				{
 					g_pPrePostProcessor->Stop();
@@ -382,7 +315,6 @@ void Run(bool bReload)
 
 		// main program-loop is terminated
 		debug("QueueCoordinator stopped");
-		debug("UrlCoordinator stopped");
 		debug("PrePostProcessor stopped");
 	}
 
@@ -404,7 +336,7 @@ void Run(bool bReload)
 		}
 		debug("RemoteServer stopped");
 	}
-
+	
 	// Stop Frontend
 	if (g_pFrontend)
 	{
@@ -430,31 +362,23 @@ void ProcessClientRequest()
 	switch (g_pOptions->GetClientOperation())
 	{
 		case Options::opClientRequestListFiles:
-			Client->RequestServerList(true, false, g_pOptions->GetMatchMode() == Options::mmRegEx ? g_pOptions->GetEditQueueText() : NULL);
+			Client->RequestServerList(true, false);
 			break;
 
 		case Options::opClientRequestListGroups:
-			Client->RequestServerList(false, true, g_pOptions->GetMatchMode() == Options::mmRegEx ? g_pOptions->GetEditQueueText() : NULL);
+			Client->RequestServerList(false, true);
 			break;
 
 		case Options::opClientRequestListStatus:
-			Client->RequestServerList(false, false, NULL);
+			Client->RequestServerList(false, false);
 			break;
 
-		case Options::opClientRequestDownloadPause:
-			Client->RequestServerPauseUnpause(true, eRemotePauseUnpauseActionDownload);
+		case Options::opClientRequestPause:
+			Client->RequestServerPauseUnpause(true);
 			break;
 
-		case Options::opClientRequestDownloadUnpause:
-			Client->RequestServerPauseUnpause(false, eRemotePauseUnpauseActionDownload);
-			break;
-
-		case Options::opClientRequestDownload2Pause:
-			Client->RequestServerPauseUnpause(true, eRemotePauseUnpauseActionDownload2);
-			break;
-
-		case Options::opClientRequestDownload2Unpause:
-			Client->RequestServerPauseUnpause(false, eRemotePauseUnpauseActionDownload2);
+		case Options::opClientRequestUnpause:
+			Client->RequestServerPauseUnpause(false);
 			break;
 
 		case Options::opClientRequestSetRate:
@@ -466,9 +390,8 @@ void ProcessClientRequest()
 			break;
 
 		case Options::opClientRequestEditQueue:
-			Client->RequestServerEditQueue((eRemoteEditAction)g_pOptions->GetEditQueueAction(), g_pOptions->GetEditQueueOffset(),
-				g_pOptions->GetEditQueueText(), g_pOptions->GetEditQueueIDList(), g_pOptions->GetEditQueueIDCount(), 
-				g_pOptions->GetEditQueueNameList(), (eRemoteMatchMode)g_pOptions->GetMatchMode(), true);
+			Client->RequestServerEditQueue(g_pOptions->GetEditQueueAction(), g_pOptions->GetEditQueueOffset(),
+				g_pOptions->GetEditQueueText(), g_pOptions->GetEditQueueIDList(), g_pOptions->GetEditQueueIDCount(), true);
 			break;
 
 		case Options::opClientRequestLog:
@@ -479,12 +402,8 @@ void ProcessClientRequest()
 			Client->RequestServerShutdown();
 			break;
 
-		case Options::opClientRequestReload:
-			Client->RequestServerReload();
-			break;
-
 		case Options::opClientRequestDownload:
-			Client->RequestServerDownload(g_pOptions->GetArgFilename(), g_pOptions->GetAddCategory(), g_pOptions->GetAddTop(), g_pOptions->GetAddPaused(), g_pOptions->GetAddPriority());
+			Client->RequestServerDownload(g_pOptions->GetArgFilename(), g_pOptions->GetCategory(), g_pOptions->GetAddTop());
 			break;
 
 		case Options::opClientRequestVersion:
@@ -499,42 +418,10 @@ void ProcessClientRequest()
 			Client->RequestWriteLog(g_pOptions->GetWriteLogKind(), g_pOptions->GetLastArg());
 			break;
 
-		case Options::opClientRequestScanAsync:
-			Client->RequestScan(false);
+		case Options::opClientRequestScan:
+			Client->RequestScan();
 			break;
-
-		case Options::opClientRequestScanSync:
-			Client->RequestScan(true);
-			break;
-
-		case Options::opClientRequestPostPause:
-			Client->RequestServerPauseUnpause(true, eRemotePauseUnpauseActionPostProcess);
-			break;
-
-		case Options::opClientRequestPostUnpause:
-			Client->RequestServerPauseUnpause(false, eRemotePauseUnpauseActionPostProcess);
-			break;
-
-		case Options::opClientRequestScanPause:
-			Client->RequestServerPauseUnpause(true, eRemotePauseUnpauseActionScan);
-			break;
-
-		case Options::opClientRequestScanUnpause:
-			Client->RequestServerPauseUnpause(false, eRemotePauseUnpauseActionScan);
-			break;
-
-		case Options::opClientRequestHistory:	 
-			Client->RequestHistory();	 
-			break;
-
-		case Options::opClientRequestDownloadUrl:
-			Client->RequestServerDownloadUrl(g_pOptions->GetLastArg(), g_pOptions->GetAddNZBFilename(), g_pOptions->GetAddCategory(), g_pOptions->GetAddTop(), g_pOptions->GetAddPaused(), g_pOptions->GetAddPriority());
-			break;
-
-		case Options::opClientRequestUrlQueue:
-			Client->RequestUrlQueue();
-			break;
-
+		
 		case Options::opClientNoOperation:
 			break;
 	}
@@ -544,10 +431,7 @@ void ProcessClientRequest()
 
 void ExitProc()
 {
-	if (!g_bReloading)
-	{
-		info("Stopping, please wait...");
-	}
+	info("Stopping, please wait...");
 	if (g_pOptions->GetRemoteClientMode())
 	{
 		if (g_pFrontend)
@@ -562,19 +446,11 @@ void ExitProc()
 		{
 			debug("Stopping QueueCoordinator");
 			g_pQueueCoordinator->Stop();
-			g_pUrlCoordinator->Stop();
 			g_pPrePostProcessor->Stop();
 		}
 	}
 }
 
-void Reload()
-{
-	g_bReloading = true;
-	info("Reloading...");
-	ExitProc();
-}
-
 #ifndef WIN32
 #ifdef DEBUG
 typedef void(*sighandler)(int);
@@ -603,10 +479,22 @@ void SignalProc(int iSignal)
 			break;
 
 #ifdef DEBUG
+		case SIGPIPE:
+			// ignoring
+			break;
+			
 		case SIGSEGV:
 			signal(SIGSEGV, SIG_DFL);   // Reset the signal handler
 			PrintBacktrace();
 			break;
+		
+		default:
+			// printf("Signal %i received\n", iSignal);
+			if (SignalProcList[iSignal - 1])
+			{
+				SignalProcList[iSignal - 1](iSignal);
+			}
+			break;
 #endif
 	}
 }
@@ -615,14 +503,15 @@ void InstallSignalHandlers()
 {
 	signal(SIGINT, SignalProc);
 	signal(SIGTERM, SignalProc);
+	signal(SIGCHLD, 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);
+	SignalProcList.clear();
+	for (int i = 1; i <= 32; i++)
+	{
+		SignalProcList.push_back((sighandler)signal(i, SignalProc));
+	}
+	signal(SIGWINCH, SIG_DFL);
 #endif
 }
 
@@ -687,13 +576,13 @@ void Cleanup()
 {
 	debug("Cleaning up global objects");
 
-	debug("Deleting UrlCoordinator");
-	if (g_pUrlCoordinator)
+	debug("Deleting QueueCoordinator");
+	if (g_pQueueCoordinator)
 	{
-		delete g_pUrlCoordinator;
-		g_pUrlCoordinator = NULL;
+		delete g_pQueueCoordinator;
+		g_pQueueCoordinator = NULL;
 	}
-	debug("UrlCoordinator deleted");
+	debug("QueueCoordinator deleted");
 
 	debug("Deleting RemoteServer");
 	if (g_pRemoteServer)
@@ -719,14 +608,6 @@ void Cleanup()
 	}
 	debug("Frontend deleted");
 
-	debug("Deleting QueueCoordinator");
-	if (g_pQueueCoordinator)
-	{
-		delete g_pQueueCoordinator;
-		g_pQueueCoordinator = NULL;
-	}
-	debug("QueueCoordinator deleted");
-
 	debug("Deleting DiskState");
 	if (g_pDiskState)
 	{
@@ -738,9 +619,8 @@ void Cleanup()
 	debug("Deleting Options");
 	if (g_pOptions)
 	{
-		if (g_pOptions->GetDaemonMode() && !g_bReloading)
+		if (g_pOptions->GetDaemonMode())
 		{
-			info("Deleting lock file");
 			remove(g_pOptions->GetLockFile());
 		}
 		delete g_pOptions;
@@ -764,11 +644,7 @@ void Cleanup()
 	}
 	debug("Scheduler deleted");
 
-	if (!g_bReloading)
-	{
-		Connection::Final();
-		Thread::Final();
-	}
+	Connection::Final();
 
 	debug("Global objects cleaned up");
 
@@ -803,7 +679,6 @@ void Daemonize()
 		struct passwd *pw = getpwnam(g_pOptions->GetDaemonUserName());
 		if (pw)
 		{
-			fchown(lfp, pw->pw_uid, pw->pw_gid); /* change owner of lock file  */
 			setgroups( 0, (const gid_t*) 0 ); /* Set aux groups to null. */
 			setgid(pw->pw_gid); /* Set primary group. */
 			/* Try setting aux groups correctly - not critical if this fails. */

nzbget.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrei Prygounkov <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
@@ -15,7 +15,7 @@
  *
  *  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.
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
  * $Revision$
  * $Date$
@@ -49,15 +49,13 @@
 #define	S_DIRMODE NULL
 #define usleep(usec) Sleep((usec) / 1000)
 #define gettimeofday(tm, ignore) _ftime(tm)
+#define _timeval _timeb
 #define socklen_t int
 #define SHUT_RDWR 0x02
 #define PATH_SEPARATOR '\\'
 #define ALT_PATH_SEPARATOR '/'
 #define LINE_ENDING "\r\n"
 #define pid_t int
-#ifndef FSCTL_SET_SPARSE
-#define FSCTL_SET_SPARSE 590020
-#endif
 
 #pragma warning(disable:4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning)
 #pragma warning(disable:4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data
@@ -66,6 +64,7 @@
 
 // POSIX
 
+#define _timeval timeval
 #define closesocket(sock) close(sock)
 #define SOCKET int
 #define INVALID_SOCKET (-1)
@@ -77,8 +76,4 @@
 
 #endif
 
-#ifndef SHUT_RDWR
-#define SHUT_RDWR 2
-#endif
-
 #endif

nzbget.vcproj

@@ -38,7 +38,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403"
+				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;DEBUG"
 				MinimalRebuild="true"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="1"
@@ -58,7 +58,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.lib ole32.lib OleAut32.Lib comsuppwd.lib Advapi32.lib sigc-2.0d.lib par2d.lib libgnutls-26.lib libgcrypt-11.lib regex.lib zlib.lib $(NOINHERIT)"
+				AdditionalDependencies="WS2_32.lib ole32.lib OleAut32.Lib comsuppwd.lib Advapi32.lib sigc-2.0d.lib par2d.lib libgnutls-26.lib libgcrypt-11.lib $(NOINHERIT)"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -112,7 +112,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -131,7 +131,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.lib ole32.lib OleAut32.Lib comsuppwd.lib Advapi32.lib sigc-2.0.lib par2.lib libgnutls-26.lib libgcrypt-11.lib regex.lib zlib.lib $(NOINHERIT)"
+				AdditionalDependencies="WS2_32.lib ole32.lib OleAut32.Lib comsuppwd.lib Advapi32.lib sigc-2.0.lib par2.lib libgnutls-26.lib libgcrypt-11.lib $(NOINHERIT)"
 				LinkIncremental="0"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -187,7 +187,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;DISABLE_TLS"
+				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;DISABLE_TLS"
 				ExceptionHandling="1"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -206,7 +206,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="WS2_32.lib ole32.lib OleAut32.Lib comsuppwd.lib Advapi32.lib sigc-2.0.lib par2.lib regex.lib zlib.lib $(NOINHERIT)"
+				AdditionalDependencies="WS2_32.lib ole32.lib OleAut32.Lib comsuppwd.lib Advapi32.lib sigc-2.0.lib par2.lib $(NOINHERIT)"
 				LinkIncremental="0"
 				GenerateDebugInformation="true"
 				SubSystem="1"
@@ -335,6 +335,14 @@
 			RelativePath=".\NCursesFrontend.h"
 			>
 		</File>
+		<File
+			RelativePath=".\NetAddress.cpp"
+			>
+		</File>
+		<File
+			RelativePath=".\NetAddress.h"
+			>
+		</File>
 		<File
 			RelativePath=".\NewsServer.cpp"
 			>
@@ -439,14 +447,6 @@
 			RelativePath=".\RemoteServer.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Scanner.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Scanner.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Scheduler.cpp"
 			>
@@ -487,14 +487,6 @@
 			RelativePath=".\TLS.h"
 			>
 		</File>
-		<File
-			RelativePath=".\UrlCoordinator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\UrlCoordinator.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Util.cpp"
 			>
@@ -503,22 +495,6 @@
 			RelativePath=".\Util.h"
 			>
 		</File>
-		<File
-			RelativePath=".\WebDownloader.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\WebDownloader.h"
-			>
-		</File>
-		<File
-			RelativePath=".\WebServer.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\WebServer.h"
-			>
-		</File>
 		<File
 			RelativePath=".\win32.h"
 			>

nzbgetd

@@ -1,75 +0,0 @@
-#!/bin/sh 
-#
-# Script used to start and stop the nzbget usenet service
-#
-# Copyright (C) 2009 orbisvicis <orbisvicis@users.sourceforge.net>
-# Copyright (C) 2009-2012 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.
-#
-#
-
-# --- CONFIGURATION -----------------------------------------------
-# Location of the nzbget executable
-NZBGET_BINARY="/usr/local/bin/nzbget"
-
-# Additional options, e. g. config file location:
-# NZBGET_OPTS="-c /mnt/hdd/tools/nzbget/conf/nzbget.conf"
-NZBGET_OPTS=""
-# -----------------------------------------------------------------
-
-
-if [ -z "$1" ] ; then
-    case `echo "$0" | sed 's:^.*/\(.*\):\1:g'` in
-        S??*) rc="start" ;;
-        K??*) rc="stop" ;;
-        *) rc="usage" ;;
-    esac
-else
-    rc="$1"
-fi
-
-case "$rc" in
-	start)
-		"$NZBGET_BINARY" $NZBGET_OPTS -D
-		;;
-	stop)
-		"$NZBGET_BINARY" $NZBGET_OPTS -Q
-		;;
-	restart)
-		"$NZBGET_BINARY" $NZBGET_OPTS -Q
-		sleep 10 # since stop is backgrounded
-		"$NZBGET_BINARY" $NZBGET_OPTS -D
-		;;
-	status)
-		"$NZBGET_BINARY" $NZBGET_OPTS -L S
-		;;
-	pstatus) 
-		retval=$(pgrep -l -f nzbget  > /dev/null ; echo $?)
-		if [ "$retval" = "0" ] ; then 
-			echo "        ------- nzbget *is* running -------"
-			ps -Ho user,pid,cmd:32,pcpu -C nzbget
-			exit 0
-		else 
-			echo "        ------- nzbget is *not* running -------"
-			exit 0
-		fi
-		;;
-	*)
-		echo "Usage: $0 {start|stop|restart|status|pstatus|usage}"
-		exit 1
-esac
-
-exit 0

postprocess-example.sh

@@ -0,0 +1,173 @@
+#!/bin/sh 
+#
+# NZBGet post-process script
+# Script will unrar downloaded rar files, join ts-files and rename img-files to iso.
+#
+# Copyright (C) 2008 Peter Roubos <peterroubos@hotmail.com>
+# Copyright (C) 2008 Otmar Werner
+# Copyright (C) 2008 Andrei Prygounkov <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., 675 Mass Ave, Cambridge, MA 02139, USA.
+#
+#
+
+#######################    Settings section     #######################
+
+# Set the full path to unrar if it is not in your PATH
+UnrarCmd=unrar
+
+# Delete rar-files after unpacking (1, 0)
+DeleteRarFiles=0
+
+# Joint TS-files (1, 0)
+JoinTS=0
+
+# Rename img-files to iso (1, 0)
+RenameIMG=0
+
+####################### End of settings section #######################
+
+# NZBGet passes following arguments to postprocess-programm as environment
+# variables:
+#  NZBPP_DIRECTORY    - path to destination dir for downloaded files;
+#  NZBPP_NZBFILENAME  - name of processed nzb-file;
+#  NZBPP_PARFILENAME  - name of par-file or empty string (if no collections were 
+#                       found);
+#  NZBPP_PARSTATUS    - result of par-check:
+#                       0 = not checked: par-check disabled or nzb-file does
+#                           not contain any par-files;
+#                       1 = checked and failed to repair;
+#                       2 = checked and successfully repaired;
+#                       3 = checked and can be repaired but repair is disabled;
+#  NZBPP_NZBCOMPLETED - state of nzb-job:
+#                       0 = there are more collections in this nzb-file queued;
+#                       1 = this was the last collection in nzb-file;
+#  NZBPP_PARFAILED    - indication of failed par-jobs for current nzb-file:
+#                       0 = no failed par-jobs;
+#                       1 = current par-job or any of the previous par-jobs for
+#                           the same nzb-files failed;
+#  NZBPP_CATEGORY     - category assigned to nzb-file (can be empty string).
+
+
+if [ "$NZBPP_DIRECTORY" = "" ] 
+then
+	echo "*** NZBGet post-process script ***"
+	echo "This script is supposed to be called from nzbget."
+	exit
+fi 
+
+echo "[INFO] Unpack: Post-process script successfully started"
+
+# Check if all is downloaded and repaired
+if [ ! "$NZBPP_NZBCOMPLETED" -eq 1 ] 
+then
+	echo "[INFO] Unpack: Not the last collection in nzb-file, exiting"
+	exit
+fi 
+if [ ! "$NZBPP_PARSTATUS" -eq 2 ] 
+then
+	echo "[WARNING] Unpack: Par-check failed or disabled, exiting"
+	exit
+fi 
+if [ ! "$NZBPP_PARFAILED" -eq 0 ] 
+then
+	echo "[WARNING] Unpack: Previous par-check failed, exiting"
+	exit
+fi 
+
+# All OK, processing the files
+cd "$NZBPP_DIRECTORY"
+
+# Make a temporary directory to store the unrarred files
+mkdir extracted
+   
+# Remove the Par files
+echo "[INFO] Unpack: Deleting par2-files"
+rm *.[pP][aA][rR]2 
+   
+# Unrar the files (if any) to the temporary directory, if there are no rar files this will do nothing
+if (ls *.rar >/dev/null)
+then
+    echo "[INFO] Unpack: Unraring"
+	$UnrarCmd x -y -p- -o+ "*.rar"  ./extracted/ 
+fi
+
+if [ $JoinTS -eq 1 ]
+then
+	# Join any split .ts files if they are named xxxx.0000.ts xxxx.0001.ts
+	# They will be joined together to a file called xxxx.0001.ts
+	if (ls *.ts >/dev/null)
+	then
+	    echo "[INFO] Unpack: Joining ts-files"
+		tsname=`find . -name "*0001.ts" |awk -F/ '{print $NF}'`
+		cat *0???.ts > ./extracted/$tsname
+	fi   
+   
+	# Remove all the split .ts files
+    echo "[INFO] Unpack: Deleting source ts-files"
+	rm *0???.ts
+fi
+   
+# Remove the rar files
+if [ $DeleteRarFiles -eq 1 ]
+then  
+    echo "[INFO] Unpack: Deleting rar-files"
+	rm *.r[0-9][0-9]
+	rm *.rar
+	rm *.s[0-9][0-9] 
+fi
+   
+# Go to the temp directory and try to unrar again.  
+# If there are any rars inside the extracted rars then these will no also be unrarred
+cd extracted
+if (ls *.rar >/dev/null)
+then
+    echo "[INFO] Unpack: Calling unrar (second pass)"
+	$UnrarCmd x -y -p- -o+ "*.rar"
+
+	# Delete the Rar files
+	if [ $DeleteRarFiles -eq 1 ]
+	then  
+	    echo "[INFO] Unpack: Deleting rar-files (second pass)"
+		rm *.r[0-9][0-9]
+		rm *.rar
+		rm *.s[0-9][0-9] 
+	fi
+fi
+   
+# Move everything back to the Download folder
+mv * ..
+cd ..
+   
+# Clean up the temp folder
+echo "[INFO] Unpack: Cleaning up"
+rmdir extracted
+chmod -R a+rw . 
+rm *.nzb
+rm *.1
+rm .sfv
+rm _brokenlog.txt
+
+if [ $RenameIMG -eq 1 ]
+then
+# Rename img file to iso
+# It will be renamed to .img.iso so you can see that it has been renamed
+	if (ls *.img >/dev/null)
+	then
+	    echo "[INFO] Unpack: Renaming img-files to iso"
+		imgname=`find . -name "*.img" |awk -F/ '{print $NF}'`
+		mv $imgname $imgname.iso
+	fi   
+fi

webui/downloads.js

@@ -1,683 +0,0 @@
-/*
- * This file is part of nzbget
- *
- * Copyright (C) 2012 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$
- *
- */
-
-/*
- * In this module:
- *   1) Download tab;
- *   2) Functions for html generation for downloads, also used from other modules (edit and add dialogs).
- */
-
-/*** DOWNLOADS TAB ***********************************************************/
- 
-var Downloads = (new function($)
-{
-	'use strict';
-
-	// Controls
-	var $DownloadsTable;
-	var $DownloadsTabBadge;
-	var $DownloadsTabBadgeEmpty;
-	var $DownloadQueueEmpty;
-	var $DownloadsRecordsPerPage;
-
-	// State
-	var notification = null;
-	var updateTabInfo;
-	var groups;
-	var urls;
-
-	this.init = function(options)
-	{
-		updateTabInfo = options.updateTabInfo;
-
-		$DownloadsTable = $('#DownloadsTable');
-		$DownloadsTabBadge = $('#DownloadsTabBadge');
-		$DownloadsTabBadgeEmpty = $('#DownloadsTabBadgeEmpty');
-		$DownloadQueueEmpty = $('#DownloadQueueEmpty');
-		$DownloadsRecordsPerPage = $('#DownloadsRecordsPerPage');
-
-		var recordsPerPage = UISettings.read('$DownloadsRecordsPerPage', 10);
-		$DownloadsRecordsPerPage.val(recordsPerPage);
-
-		$DownloadsTable.fasttable(
-			{
-				filterInput: $('#DownloadsTable_filter'),
-				filterClearButton: $("#DownloadsTable_clearfilter"),
-				pagerContainer: $('#DownloadsTable_pager'),
-				infoContainer: $('#DownloadsTable_info'),
-				headerCheck: $('#DownloadsTable > thead > tr:first-child'),
-				filterCaseSensitive: false,
-				infoEmpty: '&nbsp;', // this is to disable default message "No records"
-				pageSize: recordsPerPage,
-				maxPages: UISettings.miniTheme ? 1 : 5,
-				pageDots: !UISettings.miniTheme,
-				fillFieldsCallback: fillFieldsCallback,
-				renderCellCallback: renderCellCallback,
-				updateInfoCallback: updateInfo
-			});
-
-		$DownloadsTable.on('click', 'a', itemClick);
-		$DownloadsTable.on('click', 'tbody div.check',
-			function(event) { $DownloadsTable.fasttable('itemCheckClick', this.parentNode.parentNode, event); });
-		$DownloadsTable.on('click', 'thead div.check',
-			function() { $DownloadsTable.fasttable('titleCheckClick') });
-		$DownloadsTable.on('mousedown', Util.disableShiftMouseDown);
-	}
-
-	this.applyTheme = function()
-	{
-		$DownloadsTable.fasttable('setPageSize', UISettings.read('$DownloadsRecordsPerPage', 10),
-			UISettings.miniTheme ? 1 : 5, !UISettings.miniTheme);
-	}
-
-	this.update = function()
-	{
-		RPC.call('listgroups', [], groups_loaded);
-	}
-
-	function groups_loaded(_groups)
-	{
-		groups = _groups;
-		RPC.call('postqueue', [100], posts_loaded);
-	}
-
-	function posts_loaded(posts)
-	{
-		mergequeues(posts);
-		prepare();
-		RPC.call('urlqueue', [], urls_loaded);
-	}
-
-	function urls_loaded(_urls)
-	{
-		urls = _urls;
-		RPC.next();
-	}
-
-	function mergequeues(posts)
-	{
-		var lastPPItemIndex = -1;
-		for (var i=0, il=posts.length; i < il; i++)
-		{
-			var post = posts[i];
-			var found = false;
-			for (var j=0, jl=groups.length; j < jl; j++)
-			{
-				var group = groups[j];
-				if (group.NZBID === post.NZBID)
-				{
-					found = true;
-					if (!group.post)
-					{
-						group.post = post;
-					}
-					lastPPItemIndex = j;
-					break;
-				}
-			}
-
-			if (!found)
-			{
-				// create a virtual group-item
-				var group = {post: post};
-				group.NZBID = post.NZBID;
-				group.NZBName = post.NZBName;
-				group.MaxPriority = 0;
-				group.Category = '';
-				group.LastID = 0;
-				group.MinPostTime = 0;
-				group.FileSizeMB = 0;
-				group.FileSizeLo = 0;
-				group.RemainingSizeMB = 0;
-				group.RemainingSizeLo = 0;
-				group.PausedSizeMB = 0;
-				group.PausedSizeLo = 0;
-				group.FileCount = 0;
-				group.RemainingFileCount = 0;
-				group.RemainingParCount = 0;
-
-				// insert it after the last pp-item
-				if (lastPPItemIndex > -1)
-				{
-					groups.splice(lastPPItemIndex + 1, 0, group);
-				}
-				else
-				{
-					groups.unshift(group);
-				}
-			}
-		}
-	}
-
-	function prepare()
-	{
-		for (var j=0, jl=groups.length; j < jl; j++)
-		{
-			detectStatus(groups[j]);
-		}
-	}
-
-	this.redraw = function()
-	{
-		redraw_table();
-
-		Util.show($DownloadsTabBadge, groups.length > 0);
-		Util.show($DownloadsTabBadgeEmpty, groups.length === 0 && UISettings.miniTheme);
-		Util.show($DownloadQueueEmpty, groups.length === 0);
-	}
-
-	/*** TABLE *************************************************************************/
-
-	function redraw_table()
-	{
-		var data = [];
-
-		for (var i=0; i < groups.length; i++)
-		{
-			var group = groups[i];
-
-			var nametext = group.NZBName;
-			var priority = DownloadsUI.buildPriorityText(group.MaxPriority);
-			var estimated = DownloadsUI.buildEstimated(group);
-			var age = Util.formatAge(group.MinPostTime + UISettings.timeZoneCorrection*60*60);
-			var size = Util.formatSizeMB(group.FileSizeMB, group.FileSizeLo);
-			var remaining = Util.formatSizeMB(group.RemainingSizeMB-group.PausedSizeMB, group.RemainingSizeLo-group.PausedSizeLo);
-
-			var item =
-			{
-				id: group.NZBID,
-				group: group,
-				data: { age: age, estimated: estimated, size: size, remaining: remaining },
-				search: group.status + ' ' + nametext + ' ' + priority + ' ' + group.Category + ' ' + age + ' ' + size + ' ' + remaining + ' ' + estimated
-			};
-
-			data.push(item);
-		}
-
-		$DownloadsTable.fasttable('update', data);
-	}
-
-	function fillFieldsCallback(item)
-	{
-		var group = item.group;
-
-		var status = DownloadsUI.buildStatus(group);
-		var priority = DownloadsUI.buildPriority(group.MaxPriority);
-		var progresslabel = DownloadsUI.buildProgressLabel(group);
-		var progress = DownloadsUI.buildProgress(group, item.data.size, item.data.remaining, item.data.estimated);
-
-		var name = '<a href="#" nzbid="' + group.NZBID + '">' + Util.textToHtml(Util.formatNZBName(group.NZBName)) + '</a>';
-		var category = Util.textToHtml(group.Category);
-
-		if (!UISettings.miniTheme)
-		{
-			var info = name + ' ' + priority + progresslabel;
-			item.fields = ['<div class="check img-check"></div>', status, info, category, item.data.age, progress, item.data.estimated];
-		}
-		else
-		{
-			var info = '<div class="check img-check"></div><span class="row-title">' + name + '</span>' +
-				' ' + (group.status === 'queued' ? '' : status) + ' ' + priority;
-			if (category)
-			{
-				info += ' <span class="label label-status">' + category + '</span>';
-			}
-
-			if (progresslabel)
-			{
-				progress = '<div class="downloads-progresslabel">' + progresslabel + '</div>' + progress;
-			}
-			item.fields = [info, progress];
-		}
-	}
-
-	function renderCellCallback(cell, index, item)
-	{
-		if (4 <= index && index <= 7)
-		{
-			cell.className = 'text-right';
-		}
-	}
-
-	function detectStatus(group)
-	{
-		group.paused = (group.PausedSizeLo != 0) && (group.RemainingSizeLo == group.PausedSizeLo);
-		group.postprocess = group.post !== undefined;
-		if (group.postprocess)
-		{
-			switch (group.post.Stage)
-			{
-				case 'QUEUED': group.status = 'pp-queued'; break;
-				case 'LOADING_PARS': group.status = 'checking'; break;
-				case 'VERIFYING_SOURCES': group.status = 'checking'; break;
-				case 'REPAIRING': group.status = 'repairing'; break;
-				case 'VERIFYING_REPAIRED': group.status = 'verifying'; break;
-				case 'EXECUTING_SCRIPT': group.status = 'unpacking'; break;
-				case 'FINISHED': group.status = 'finished'; break;
-				default: group.status = 'error: ' + group.post.Stage; break;
-			}
-		}
-		else if (group.ActiveDownloads > 0)
-		{
-			group.status = 'downloading';
-		}
-		else if (group.paused)
-		{
-			group.status = 'paused';
-		}
-		else
-		{
-			group.status = 'queued';
-		}
-	}
-
-	this.recordsPerPageChange = function()
-	{
-		var val = $DownloadsRecordsPerPage.val();
-		UISettings.write('$DownloadsRecordsPerPage', val);
-		$DownloadsTable.fasttable('setPageSize', val);
-	}
-
-	function updateInfo(stat)
-	{
-		updateTabInfo($DownloadsTabBadge, stat);
-	}
-
-	/*** EDIT ******************************************************/
-
-	function itemClick()
-	{
-		var nzbid = $(this).attr('nzbid');
-		$(this).blur();
-		DownloadsEditDialog.showModal(nzbid, groups);
-	}
-
-	function editCompleted()
-	{
-		Refresher.update();
-		if (notification)
-		{
-			Notification.show(notification);
-			notification = null;
-		}
-	}
-
-	/*** CHECKMARKS ******************************************************/
-
-	function checkBuildEditIDList(UseLastID)
-	{
-		var checkedRows = $DownloadsTable.fasttable('checkedRows');
-
-		var hasIDs = false;
-		var checkedEditIDs = [];
-		for (var i = 0; i < groups.length; i++)
-		{
-			var group = groups[i];
-			if (checkedRows.indexOf(group.NZBID) > -1)
-			{
-				if (group.postprocess)
-				{
-					Notification.show('#Notif_Downloads_CheckPostProcess');
-					return null;
-				}
-
-				checkedEditIDs.push(UseLastID ? group.LastID : group.NZBID);
-			}
-		}
-
-		if (checkedEditIDs.length === 0)
-		{
-			Notification.show('#Notif_Downloads_Select');
-			return null;
-		}
-
-		return checkedEditIDs;
-	}
-
-	/*** TOOLBAR: SELECTED ITEMS ******************************************************/
-
-	this.editClick = function()
-	{
-		var checkedEditIDs = checkBuildEditIDList(false);
-		if (!checkedEditIDs)
-		{
-			return;
-		}
-
-		if (checkedEditIDs.length == 1)
-		{
-			DownloadsEditDialog.showModal(checkedEditIDs[0], groups);
-		}
-		else
-		{
-			DownloadsMultiDialog.showModal(checkedEditIDs, groups);
-		}
-	}
-
-	this.mergeClick = function()
-	{
-		var checkedEditIDs = checkBuildEditIDList(false);
-		if (!checkedEditIDs)
-		{
-			return;
-		}
-
-		if (checkedEditIDs.length < 2)
-		{
-			Notification.show('#Notif_Downloads_SelectMulti');
-			return;
-		}
-
-		DownloadsMergeDialog.showModal(checkedEditIDs, groups);
-	}
-
-	this.pauseClick = function()
-	{
-		var checkedEditIDs = checkBuildEditIDList(true);
-		if (!checkedEditIDs)
-		{
-			return;
-		}
-		notification = '#Notif_Downloads_Paused';
-		RPC.call('editqueue', ['GroupPause', 0, '', checkedEditIDs], editCompleted);
-	}
-
-	this.resumeClick = function()
-	{
-		var checkedEditIDs = checkBuildEditIDList(true);
-		if (!checkedEditIDs)
-		{
-			return;
-		}
-		notification = '#Notif_Downloads_Resumed';
-		RPC.call('editqueue', ['GroupResume', 0, '', checkedEditIDs], function()
-		{
-			RPC.call('editqueue', ['GroupPauseExtraPars', 0, '', checkedEditIDs], editCompleted);
-		});
-	}
-
-	this.deleteClick = function()
-	{
-		var checkedRows = $DownloadsTable.fasttable('checkedRows');
-		var downloadIDs = [];
-		var postprocessIDs = [];
-		for (var i = 0; i < groups.length; i++)
-		{
-			var group = groups[i];
-			if (checkedRows.indexOf(group.NZBID) > -1)
-			{
-				if (group.postprocess)
-				{
-					postprocessIDs.push(group.post.ID);
-				}
-				if (group.LastID > 0)
-				{
-					downloadIDs.push(group.LastID);
-				}
-			}
-		}
-
-		if (downloadIDs.length === 0 && postprocessIDs.length === 0)
-		{
-			Notification.show('#Notif_Downloads_Select');
-			return;
-		}
-
-		notification = '#Notif_Downloads_Deleted';
-
-		var deletePosts = function()
-		{
-			if (postprocessIDs.length > 0)
-			{
-				RPC.call('editqueue', ['PostDelete', 0, '', postprocessIDs], editCompleted);
-			}
-			else
-			{
-				editCompleted();
-			}
-		};
-
-		var deleteGroups = function()
-		{
-			if (downloadIDs.length > 0)
-			{
-				RPC.call('editqueue', ['GroupDelete', 0, '', downloadIDs], deletePosts);
-			}
-			else
-			{
-				deletePosts();
-			}
-		};
-
-		ConfirmDialog.showModal('DownloadsDeleteConfirmDialog', deleteGroups);
-	}
-
-	this.moveClick = function(action)
-	{
-		var checkedEditIDs = checkBuildEditIDList(true);
-		if (!checkedEditIDs)
-		{
-			return;
-		}
-
-		var EditAction = '';
-		var EditOffset = 0;
-		switch (action)
-		{
-			case 'top':
-				EditAction = 'GroupMoveTop';
-				checkedEditIDs.reverse();
-				break;
-			case 'bottom':
-				EditAction = 'GroupMoveBottom';
-				break;
-			case 'up':
-				EditAction = 'GroupMoveOffset';
-				EditOffset = -1;
-				break;
-			case 'down':
-				EditAction = 'GroupMoveOffset';
-				EditOffset = 1;
-				checkedEditIDs.reverse();
-				break;
-		}
-
-		notification = '';
-		RPC.call('editqueue', [EditAction, EditOffset, '', checkedEditIDs], editCompleted);
-	}
-}(jQuery));
-
-
-/*** FUNCTIONS FOR HTML GENERATION (also used from other modules) *****************************/
-
-var DownloadsUI = (new function($)
-{
-	'use strict';
-	
-	this.fillPriorityCombo = function(combo)
-	{
-		combo.empty();
-		combo.append('<option value="-100">very low</option>');
-		combo.append('<option value="-50">low</option>');
-		combo.append('<option value="0">normal</option>');
-		combo.append('<option value="50">high</option>');
-		combo.append('<option value="100">very high</option>');
-	}
-
-	this.fillCategoryCombo = function(combo)
-	{
-		combo.empty();
-		combo.append('<option></option>');
-
-		for (var i=0; i < Options.categories.length; i++)
-		{
-			combo.append($('<option></option>').text(Options.categories[i]));
-		}
-	}
-
-	this.buildStatus = function(group)
-	{
-		if (group.postprocess && group.status !== 'pp-queued')
-		{
-			if (Status.status.PostPaused)
-			{
-				return '<span class="label label-status label-warning">' + group.status + '</span>';
-			}
-			else
-			{
-				return '<span class="label label-status label-success">' + group.status + '</span>';
-			}
-		}
-		switch (group.status)
-		{
-			case 'pp-queued': return '<span class="label label-status">pp-queued</span>';
-			case 'downloading': return '<span class="label label-status label-success">downloading</span>';
-			case 'paused': return '<span class="label label-status label-warning">paused</span>';
-			case 'queued': return '<span class="label label-status">queued</span>';
-			default: return '<span class="label label-status label-important">internal error(' + group.status + ')</span>';
-		}
-	}
-
-	this.buildProgress = function(group, totalsize, remaining, estimated)
-	{
-		if (group.status === 'downloading' || (group.postprocess && !Status.status.PostPaused))
-		{
-			var kind = 'progress-success';
-		}
-		else if (group.status === 'paused' || (group.postprocess && Status.status.PostPaused))
-		{
-			var kind = 'progress-warning';
-		}
-		else
-		{
-			var kind = 'progress-none';
-		}
-
-		var totalMB = group.FileSizeMB-group.PausedSizeMB;
-		var remainingMB = group.RemainingSizeMB-group.PausedSizeMB;
-		var percent = Math.round((totalMB - remainingMB) / totalMB * 100);
-		var progress = '';
-
-		if (group.postprocess)
-		{
-			totalsize = '';
-			remaining = '';
-			percent = Math.round(group.post.StageProgress / 10);
-		}
-
-		if (!UISettings.miniTheme)
-		{
-			progress =
-				'<div class="progress-block">'+
-				'<div class="progress progress-striped ' + kind + '">'+
-				'<div class="bar" style="width:' + percent + '%;"></div>'+
-				'</div>'+
-				'<div class="bar-text-left">' + totalsize + '</div>'+
-				'<div class="bar-text-right">' + remaining + '</div>'+
-				'</div>';
-		}
-		else
-		{
-			progress =
-				'<div class="progress-block">'+
-				'<div class="progress progress-striped ' + kind + '">'+
-				'<div class="bar" style="width:' + percent + '%;"></div>'+
-				'</div>'+
-				'<div class="bar-text-left">' + (totalsize !== '' ? 'total ' : '') + totalsize + '</div>'+
-				'<div class="bar-text-center">' + (estimated !== '' ? '[' + estimated + ']': '') + '</div>'+
-				'<div class="bar-text-right">' + remaining + (remaining !== '' ? ' left' : '') + '</div>'+
-				'</div>';
-		}
-
-		return progress;
-	}
-
-	this.buildEstimated = function(group)
-	{
-		if (group.postprocess)
-		{
-			if (group.post.StageProgress > 0)
-			{
-				return Util.formatTimeHMS(group.post.StageTimeSec / group.post.StageProgress * (1000 - group.post.StageProgress));
-			}
-		}
-		else if (!group.paused && Status.status.DownloadRate > 0)
-		{
-			return Util.formatTimeLeft((group.RemainingSizeMB-group.PausedSizeMB)*1024/(Status.status.DownloadRate/1024));
-		}
-
-		return '';
-	}
-
-	this.buildProgressLabel = function(group)
-	{
-		var text = '';
-		if (group.postprocess && !Status.status.PostPaused && group.post.Stage !== 'REPAIRING')
-		{
-			if (group.post.Log && group.post.Log.length > 0)
-			{
-				text = group.post.Log[group.post.Log.length-1].Text;
-			}
-			else if (group.post.ProgressLabel !== '')
-			{
-				text = group.post.ProgressLabel;
-			}
-		}
-
-		return text !== '' ? ' <span class="label label-success">' + text + '</span>' : '';
-	}
-
-	this.buildPriorityText = function(priority)
-	{
-		switch (priority)
-		{
-			case 0: return '';
-			case 100: return 'very high priority';
-			case 50: return 'high priority';
-			case -50: return 'low priority';
-			case -100: return 'very low priority';
-			default: return 'priority: ' + priority;
-		}
-	}
-
-	this.buildPriority = function(priority)
-	{
-		switch (priority)
-		{
-			case 0: return '';
-			case 100: return ' <span class="label label-priority label-important">very high priority</span>';
-			case 50: return ' <span class="label label-priority label-important">high priority</span>';
-			case -50: return ' <span class="label label-priority label-info">low priority</span>';
-			case -100: return ' <span class="label label-priority label-info">very low priority</span>';
-		}
-		if (priority > 0)
-		{
-			return ' <span class="label label-priority label-important">priority: ' + priority + '</span>';
-		}
-		else if (priority < 0)
-		{
-			return ' <span class="label label-priority label-info">priority: ' + priority + '</span>';
-		}
-	}
-}(jQuery));

webui/fasttable.js

@@ -1,787 +0,0 @@
-/*
- * This file is part of nzbget
- *
- * Copyright (C) 2012 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$
- *
- */
-
-/*
-* Some code was borrowed from:
-* 1. Greg Weber's uiTableFilter jQuery plugin (http://gregweber.info/projects/uitablefilter)
-* 2. Denny Ferrassoli & Charles Christolini's TypeWatch jQuery plugin (http://github.com/dennyferra/TypeWatch)
-* 3. Justin Britten's tablesorterFilter jQuery plugin (http://www.justinbritten.com/work/2008/08/tablesorter-filter-results-based-on-search-string/)
-* 4. Allan Jardine's Bootstrap Pagination jQuery plugin for DataTables (http://datatables.net/)
-*/
-
-/*
- * In this module:
- *   HTML tables with:
- *     1) very fast content updates;
- *     2) automatic pagination;
- *     3) search/filtering.
- *
- * What makes it unique and fast?
- * The tables are designed to be updated very often (up to 10 times per second). This has two challenges:
- *   1) updating of whole content is slow because the DOM updates are slow.
- *   2) if the DOM is updated during user interaction the user input is not processed correctly.
- *       For example if the table is updated after the user pressed mouse key but before he/she released
- *       the key, the click is not processed because the element, on which the click was performed,
- *       doesn't exist after the update of DOM anymore.
- *
- * How Fasttable solves these problems? The solutions is to update only rows and cells,
- * which were changed by keeping the unchanged DOM-elements.
- *
- * Important: the UI of table must be designed in a way, that the cells which are frequently changed
- * (like remaining download size) should not be clickable, whereas the cells which are rarely changed
- * (e. g. Download name) can be clickable.
- */
-
-(function($) {
-
-	'use strict';
-	
-	$.fn.fasttable = function(method)
-	{
-		if (methods[method])
-		{
-			return methods[method].apply( this, Array.prototype.slice.call( arguments, 1 ));
-		}
-		else if ( typeof method === 'object' || ! method )
-		{
-			return methods.init.apply( this, arguments );
-		}
-		else
-		{
-			$.error( 'Method ' +  method + ' does not exist on jQuery.fasttable' );
-		}
-	};
-
-	var methods =
-	{
-		init : function(options)
-		{
-			return this.each(function()
-			{
-				var $this = $(this);
-				var data = $this.data('fasttable');
-
-				// If the plugin hasn't been initialized yet
-				if (!data)
-				{
-					/*
-					Do more setup stuff here
-					*/
-
-					var config = {};
-					config = $.extend(config, defaults, options);
-					
-					config.filterInput = $(config.filterInput);
-					config.filterClearButton = $(config.filterClearButton);
-					config.pagerContainer = $(config.pagerContainer);
-					config.infoContainer = $(config.infoContainer);
-					config.headerCheck = $(config.headerCheck);
-
-					// Create a timer which gets reset upon every keyup event.
-					// Perform filter only when the timer's wait is reached (user finished typing or paused long enough to elapse the timer).
-					// Do not perform the filter is the query has not changed.
-					// Immediately perform the filter if the ENTER key is pressed.
-
-					var timer;
-
-					config.filterInput.keyup(function()
-					{
-						var timerWait = 500;
-						var overrideBool = false;
-						var inputBox = this;
-
-						// Was ENTER pushed?
-						if (inputBox.keyCode == 13)
-						{
-							timerWait = 1;
-							overrideBool = true;
-						}
-
-						var timerCallback = function()
-						{
-							var value = inputBox.value;
-							var data = $this.data('fasttable');
-
-							if ((value != data.lastFilter) || (overrideBool))
-							{
-								data.lastFilter = value;
-								if (data.content)
-								{
-									data.curPage = 1;
-									refresh(data);
-								}
-								if (data.config.filterInputCallback)
-								{
-									data.config.filterInputCallback(value);
-								}								
-							}
-						};
-
-						// Reset the timer
-						clearTimeout(timer);
-						timer = setTimeout(timerCallback, timerWait);
-
-						return false;
-					});
-
-					config.filterClearButton.click(function()
-					{
-						var data = $this.data('fasttable');
-						data.lastFilter = '';
-						data.config.filterInput.val('');
-						if (data.content)
-						{
-							refresh(data);
-						}
-						if (data.config.filterClearCallback)
-						{
-							data.config.filterClearCallback();
-						}								
-					});
-						
-					config.pagerContainer.on('click', 'li', function (e)
-					{
-						e.preventDefault();
-						var data = $this.data('fasttable');
-						var pageNum = $(this).text();
-						if (pageNum.indexOf('Prev') > -1)
-						{
-							data.curPage--;
-						}
-						else if (pageNum.indexOf('Next') > -1)
-						{
-							data.curPage++;
-						}
-						else if (isNaN(parseInt(pageNum)))
-						{
-							return;
-						}
-						else
-						{
-							data.curPage = parseInt(pageNum);
-						}
-						refresh(data);
-					});
-					
-					$this.data('fasttable', {
-							target : $this,
-							config : config,
-							pageSize : parseInt(config.pageSize),
-							maxPages : parseInt(config.maxPages),
-							pageDots : Util.parseBool(config.pageDots),
-							curPage : 1,
-							checkedRows: [],
-							lastClickedRowID: 0
-						});
-				}
-			});
-		},
-
-		destroy : function()
-		{
-			return this.each(function()
-			{
-				var $this = $(this);
-				var data = $this.data('fasttable');
-
-				// Namespacing FTW
-				$(window).unbind('.fasttable');
-				$this.removeData('fasttable');
-			});
-		},
-
-		update : updateContent,
-
-		setPageSize : setPageSize,
-
-		setCurPage : setCurPage,
-		
-		filteredContent : function()
-		{
-			return $(this).data('fasttable').filteredContent;
-		},
-
-		checkedRows : function()
-		{
-			return $(this).data('fasttable').checkedRows;
-		},
-		
-		itemCheckClick : itemCheckClick,
-		
-		titleCheckClick : titleCheckClick
-	};
-
-	function has_words(str, words, caseSensitive)
-	{
-		var text = caseSensitive ? str : str.toLowerCase();
-
-		for (var i = 0; i < words.length; i++)
-		{
-			if (text.indexOf(words[i]) === -1)
-			{
-				return false;
-			}
-		}
-
-		return true;
-	}
-
-	function updateContent(content)
-	{
-		var data = $(this).data('fasttable');
-		if (content)
-		{
-			data.content = content;
-		}
-		refresh(data);
-	}
-
-	function refresh(data)
-	{
-		refilter(data);
-		validateChecks(data);
-		updatePager(data);
-		updateInfo(data);
-		updateTable(data);
-	}
-
-	function refilter(data)
-	{
-		var filterInput = data.config.filterInput;
-		var phrase = filterInput.length > 0 ? filterInput.val() : '';
-		var caseSensitive = data.config.filterCaseSensitive;
-		var words = caseSensitive ? phrase.split(' ') : phrase.toLowerCase().split(' ');
-
-		if (words.length === 1 && words[0] === '')
-		{
-			data.filteredContent = data.content;
-		}
-		else
-		{
-			data.filteredContent = [];
-			for (var i = 0; i < data.content.length; i++)
-			{
-				var item = data.content[i];
-				if (item.search === undefined && data.config.fillSearchCallback)
-				{
-					data.config.fillSearchCallback(item);
-				}
-				
-				if (has_words(item.search, words, caseSensitive))
-				{
-					data.filteredContent.push(item);
-				}
-			}
-		}
-	}
-
-	function updateTable(data)
-	{
-		var oldTable = data.target[0];
-		var newTable = buildTBody(data);
-		updateTBody(data, oldTable, newTable);
-	}
-
-	function buildTBody(data)
-	{
-		var table = $('<table><tbody></tbody></table>')[0];
-		for (var i=0; i < data.pageContent.length; i++)
-		{
-			var item = data.pageContent[i];
-
-			var row = table.insertRow(table.rows.length);
-
-			row.fasttableID = item.id;
-			if (data.checkedRows.indexOf(item.id) > -1)
-			{
-				row.className = 'checked';
-			}
-			if (data.config.renderRowCallback)
-			{
-				data.config.renderRowCallback(row, item);
-			}
-
-			if (!item.fields)
-			{
-				if (data.config.fillFieldsCallback)
-				{
-					data.config.fillFieldsCallback(item);
-				}
-				else
-				{
-					item.fields = [];
-				}
-			}
-			
-			for (var j=0; j < item.fields.length; j++)
-			{
-				var cell = row.insertCell(row.cells.length);
-				cell.innerHTML = item.fields[j];
-				if (data.config.renderCellCallback)
-				{
-					data.config.renderCellCallback(cell, j, item);
-				}
-			}
-		}
-		
-		titleCheckRedraw(data);
-		
-		if (data.config.renderTableCallback)
-		{
-			data.config.renderTableCallback(table);
-		}		
-		
-		return table;
-	}
-
-	function updateTBody(data, oldTable, newTable)
-	{
-		var oldTRs = oldTable.rows;
-		var newTRs = newTable.rows;
-		var oldTBody = $('tbody', oldTable)[0];
-		var oldTRsLength = oldTRs.length - (data.config.hasHeader ? 1 : 0); // evlt. skip header row
-		var newTRsLength = newTRs.length;
-
-		for (var i=0; i < newTRs.length; )
-		{
-			var newTR = newTRs[i];
-
-			if (i < oldTRsLength)
-			{
-				// update existing row
-				var oldTR = oldTRs[i + (data.config.hasHeader ? 1 : 0)]; // evlt. skip header row
-				var oldTDs = oldTR.cells;
-				var newTDs = newTR.cells;
-				
-				oldTR.className = newTR.className;
-				oldTR.fasttableID = newTR.fasttableID;
-
-				for (var j=0, n = 0; j < oldTDs.length; j++, n++)
-				{
-					var oldTD = oldTDs[j];
-					var newTD = newTDs[n];
-					var oldHtml = oldTD.outerHTML;
-					var newHtml = newTD.outerHTML;
-					if (oldHtml !== newHtml)
-					{
-						oldTR.replaceChild(newTD, oldTD);
-						n--;
-					}
-				}
-				i++;
-			}
-			else
-			{
-				// add new row
-				oldTBody.appendChild(newTR);
-			}
-		}
-
-		var maxTRs = newTRsLength + (data.config.hasHeader ? 1 : 0); // evlt. skip header row;
-		while (oldTRs.length > maxTRs)
-		{
-			oldTable.deleteRow(oldTRs.length - 1);
-		}
-	}
-
-	function updatePager(data)
-	{
-		data.pageCount = Math.ceil(data.filteredContent.length / data.pageSize);
-		if (data.curPage < 1)
-		{
-			data.curPage = 1;
-		}
-		if (data.curPage > data.pageCount)
-		{
-			data.curPage = data.pageCount;
-		}
-
-		var startIndex = (data.curPage - 1) * data.pageSize;
-		data.pageContent = data.filteredContent.slice(startIndex, startIndex + data.pageSize);
-
-		var pagerObj = data.config.pagerContainer;
-		var pagerHtml = buildPagerHtml(data);
-		
-		var oldPager = pagerObj[0];
-		var newPager = $(pagerHtml)[0];
-		
-		updatePagerContent(data, oldPager, newPager);
-	}
-
-	function buildPagerHtml(data)
-	{
-		var iListLength = data.maxPages;
-		var iStart, iEnd, iHalf = Math.floor(iListLength/2);
-
-		if (data.pageCount < iListLength)
-		{
-			iStart = 1;
-			iEnd = data.pageCount;
-		}
-		else if (data.curPage -1 <= iHalf)
-		{
-			iStart = 1;
-			iEnd = iListLength;
-		}
-		else if (data.curPage - 1 >= (data.pageCount-iHalf))
-		{
-			iStart = data.pageCount - iListLength + 1;
-			iEnd = data.pageCount;
-		}
-		else
-		{
-			iStart = data.curPage - 1 - iHalf + 1;
-			iEnd = iStart + iListLength - 1;
-		}
-
-		var pager = '<ul>';
-		pager += '<li' + (data.curPage === 1 || data.curPage === 0 ? ' class="disabled"' : '') + '><a href="#">&larr; Prev</a></li>';
-
-		if (iStart > 1)
-		{
-			pager += '<li><a href="#">1</a></li>';
-			if (iStart > 2 && data.pageDots)
-			{
-				pager += '<li class="disabled"><a href="#">&#133;</a></li>';
-			}
-		}
-
-		for (var j=iStart; j<=iEnd; j++)
-		{
-			pager += '<li' + ((j===data.curPage) ? ' class="active"' : '') + '><a href="#">' + j + '</a></li>';
-		}
-
-		if (iEnd != data.pageCount)
-		{
-			if (iEnd < data.pageCount - 1 && data.pageDots)
-			{
-				pager += '<li class="disabled"><a href="#">&#133;</a></li>';
-			}
-			pager += '<li><a href="#">' + data.pageCount + '</a></li>';
-		}
-
-		pager += '<li' + (data.curPage === data.pageCount || data.pageCount === 0 ? ' class="disabled"' : '') + '><a href="#">Next &rarr;</a></li>';
-		pager += '</ul>';
-		
-		return pager;
-	}
-	
-	function updatePagerContent(data, oldPager, newPager)
-	{
-		var oldLIs = oldPager.getElementsByTagName('li');
-		var newLIs = newPager.getElementsByTagName('li');
-
-		var oldLIsLength = oldLIs.length;
-		var newLIsLength = newLIs.length;
-
-		for (var i=0, n=0; i < newLIs.length; i++, n++)
-		{
-			var newLI = newLIs[i];
-
-			if (n < oldLIsLength)
-			{
-				// update existing LI
-				var oldLI = oldLIs[n];
-
-				var oldHtml = oldLI.outerHTML;
-				var newHtml = newLI.outerHTML;
-				if (oldHtml !== newHtml)
-				{
-					oldPager.replaceChild(newLI, oldLI);
-					i--;
-				}
-			}
-			else
-			{
-				// add new LI
-				oldPager.appendChild(newLI);
-				i--;
-			}
-		}
-
-		while (oldLIs.length > newLIsLength)
-		{
-			oldPager.removeChild(oldPager.lastChild);
-		}
-	}
-	
-	function updateInfo(data)
-	{
-		if (data.content.length === 0)
-		{
-			var infoText = data.config.infoEmpty;
-		}
-		else if (data.curPage === 0)
-		{
-			var infoText = 'No matching records found (total ' + data.content.length + ')';
-		}
-		else
-		{
-			var firstRecord = (data.curPage - 1) * data.pageSize + 1;
-			var lastRecord = firstRecord + data.pageContent.length - 1;
-			var infoText = 'Showing records ' + firstRecord + '-' + lastRecord + ' from ' + data.filteredContent.length;
-			if (data.filteredContent != data.content)
-			{
-				infoText += ' filtered (total ' + data.content.length + ')';
-			}
-		}
-		data.config.infoContainer.html(infoText);
-
-		if (data.config.updateInfoCallback)
-		{
-			data.config.updateInfoCallback({
-				total: data.content.length,
-				available: data.filteredContent.length,
-				filter: data.filteredContent != data.content,
-				firstRecord: firstRecord,
-				lastRecord: lastRecord				
-			});
-		}
-	}
-
-	function setPageSize(pageSize, maxPages, pageDots)
-	{
-		var data = $(this).data('fasttable');
-		data.pageSize = parseInt(pageSize);
-		data.curPage = 1;
-		if (maxPages !== undefined)
-		{
-			data.maxPages = maxPages;
-		}
-		if (pageDots !== undefined)
-		{
-			data.pageDots = pageDots;
-		}
-		refresh(data);
-	}
-
-	function setCurPage(page)
-	{
-		var data = $(this).data('fasttable');
-		data.curPage = parseInt(page);
-		refresh(data);
-	}
-	
-	function titleCheckRedraw(data)
-	{
-		var filteredContent = data.filteredContent;
-		var checkedRows = data.checkedRows;
-
-		var hasSelectedItems = false;
-		var hasUnselectedItems = false;
-		for (var i = 0; i < filteredContent.length; i++)
-		{
-			if (checkedRows.indexOf(filteredContent[i].id) === -1)
-			{
-				hasUnselectedItems = true;
-			}
-			else
-			{
-				hasSelectedItems = true;
-			}
-		}
-		
-		if (hasSelectedItems && hasUnselectedItems)
-		{
-			data.config.headerCheck.removeClass('checked').addClass('checkremove');
-		}
-		else if (hasSelectedItems)
-		{
-			data.config.headerCheck.removeClass('checkremove').addClass('checked');
-		}
-		else
-		{
-			data.config.headerCheck.removeClass('checked').removeClass('checkremove');
-		}
-	}
-
-	function itemCheckClick(row, event)
-	{
-		var data = $(this).data('fasttable');
-		var checkedRows = data.checkedRows;
-
-		var id = row.fasttableID;
-		var doToggle = true;
-
-		if (event.shiftKey && data.lastClickedRowID > 0)
-		{
-			var checked = checkedRows.indexOf(id) > -1;
-			doToggle = !checkRange(data, id, data.lastClickedRowID, !checked);
-		}
-
-		if (doToggle)
-		{
-			toggleCheck(data, id);
-		}
-
-		data.lastClickedRowID = id;
-		
-		refresh(data);
-	}
-
-	function titleCheckClick()
-	{
-		var data = $(this).data('fasttable');
-		var filteredContent = data.filteredContent;
-		var checkedRows = data.checkedRows;
-
-		var hasSelectedItems = false;
-		for (var i = 0; i < filteredContent.length; i++)
-		{
-			if (checkedRows.indexOf(filteredContent[i].id) > -1)
-			{
-				hasSelectedItems = true;
-				break;
-			}
-		}
-
-		data.lastClickedRowID = 0;
-		checkAll(data, !hasSelectedItems);
-	}
-
-	function toggleCheck(data, id)
-	{
-		var checkedRows = data.checkedRows;
-		var index = checkedRows.indexOf(id);
-		if (index > -1)
-		{
-			checkedRows.splice(index, 1);
-		}
-		else
-		{
-			checkedRows.push(id);
-		}
-	}
-	
-	function checkAll(data, checked)
-	{
-		var filteredContent = data.filteredContent;
-
-		for (var i = 0; i < filteredContent.length; i++)
-		{
-			checkRow(data, filteredContent[i].id, checked);
-		}
-
-		refresh(data);
-	}
-	
-	function checkRange(data, from, to, checked)
-	{
-		var filteredContent = data.filteredContent;
-		var indexFrom = indexOfID(filteredContent, from);
-		var indexTo = indexOfID(filteredContent, to);
-		if (indexFrom === -1 || indexTo === -1)
-		{
-			return false;
-		}
-		
-		if (indexTo < indexFrom)
-		{
-			var tmp = indexTo; indexTo = indexFrom; indexFrom = tmp;			
-		}
-		
-		for (var i = indexFrom; i <= indexTo; i++)
-		{
-			checkRow(data, filteredContent[i].id, checked);
-		}
-
-		return true;
-	}	
-
-	function checkRow(data, id, checked)
-	{
-		if (checked)
-		{
-			if (data.checkedRows.indexOf(id) === -1)
-			{
-				data.checkedRows.push(id);
-			}
-		}
-		else
-		{
-			var index = data.checkedRows.indexOf(id);
-			if (index > -1)
-			{
-				data.checkedRows.splice(index, 1);
-			}
-		}
-	}
-	
-	function indexOfID(content, id)
-	{
-		for (var i = 0; i < content.length; i++)
-		{
-			if (id === content[i].id)
-			{
-				return i;
-			}
-		}
-		return -1;
-	}
-
-	function validateChecks(data)
-	{
-		var filteredContent = data.filteredContent;
-		var checkedRows = data.checkedRows;
-
-		var ids = [];
-		for (var i = 0; i < data.content.length; i++)
-		{
-			ids.push(data.content[i].id);
-		}
-
-		for (var i = 0; i < checkedRows.length; i++)
-		{
-			if (ids.indexOf(checkedRows[i]) === -1)
-			{
-				checkedRows.splice(i, 1);
-				i--;
-			}
-		}
-	}
-	
-	var defaults =
-	{
-		filterInput: '#table-filter',
-		filterClearButton: '#table-clear',
-		filterCaseSensitive: false,
-		pagerContainer: '#table-pager',
-		infoContainer: '#table-info',
-		pageSize: 10,
-		maxPages: 5,
-		pageDots: true,
-		hasHeader: true,
-		infoEmpty: 'No records',
-		renderRowCallback: undefined,
-		renderCellCallback: undefined,
-		renderTableCallback: undefined,
-		fillFieldsCallback: undefined,
-		updateInfoCallback: undefined,
-		filterInputCallback: undefined,
-		filterClearCallback: undefined,
-		fillSearchCallback: undefined,
-		headerCheck: '#table-header-check'
-	};
-
-})(jQuery);

webui/history.js

@@ -1,430 +0,0 @@
-/*
- * This file is part of nzbget
- *
- * Copyright (C) 2012 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$
- *
- */
-
-/*
- * In this module:
- *   1) History tab;
- *   2) History edit dialog.
- */
- 
-/*** HISTORY TAB AND EDIT HISTORY DIALOG **********************************************/
- 
-var History = (new function($)
-{
-	'use strict';
- 
-	// Controls
-	var $HistoryTable;
-	var $HistoryTabBadge;
-	var $HistoryTabBadgeEmpty;
-	var $HistoryRecordsPerPage;
-
-	// State
-	var history;
-	var notification = null;
-	var updateTabInfo;
-
-	this.init = function(options)
-	{
-		updateTabInfo = options.updateTabInfo;
-
-		$HistoryTable = $('#HistoryTable');
-		$HistoryTabBadge = $('#HistoryTabBadge');
-		$HistoryTabBadgeEmpty = $('#HistoryTabBadgeEmpty');
-		$HistoryRecordsPerPage = $('#HistoryRecordsPerPage');
-		
-		historyEditDialog.init();
-
-		var recordsPerPage = UISettings.read('HistoryRecordsPerPage', 10);
-		$HistoryRecordsPerPage.val(recordsPerPage);
-
-		$HistoryTable.fasttable(
-			{
-				filterInput: $('#HistoryTable_filter'),
-				filterClearButton: $("#HistoryTable_clearfilter"),
-				pagerContainer: $('#HistoryTable_pager'),
-				infoContainer: $('#HistoryTable_info'),
-				headerCheck: $('#HistoryTable > thead > tr:first-child'),
-				filterCaseSensitive: false,
-				pageSize: recordsPerPage,
-				maxPages: UISettings.miniTheme ? 1 : 5,
-				pageDots: !UISettings.miniTheme,
-				fillFieldsCallback: fillFieldsCallback,
-				renderCellCallback: renderCellCallback,
-				updateInfoCallback: updateInfo
-			});
-
-		$HistoryTable.on('click', 'a', editClick);
-		$HistoryTable.on('click', 'tbody div.check',
-			function(event) { $HistoryTable.fasttable('itemCheckClick', this.parentNode.parentNode, event); });
-		$HistoryTable.on('click', 'thead div.check',
-			function() { $HistoryTable.fasttable('titleCheckClick') });
-		$HistoryTable.on('mousedown', Util.disableShiftMouseDown);
-	}
-
-	this.applyTheme = function()
-	{
-		$HistoryTable.fasttable('setPageSize', UISettings.read('HistoryRecordsPerPage', 10),
-			UISettings.miniTheme ? 1 : 5, !UISettings.miniTheme);
-	}
-
-	this.update = function()
-	{
-		RPC.call('history', [], loaded);
-	}
-
-	function loaded(curHistory)
-	{
-		history = curHistory;
-		prepare();
-		RPC.next();
-	}
-
-	function prepare()
-	{
-		for (var j=0, jl=history.length; j < jl; j++)
-		{
-			detectStatus(history[j]);
-		}
-	}
-
-	function detectStatus(hist)
-	{
-		if (hist.Kind === 'NZB')
-		{
-			switch (hist.ScriptStatus)
-			{
-				case 'SUCCESS': hist.status = 'success'; break;
-				case 'FAILURE': hist.status = 'failure'; break;
-				case 'UNKNOWN': hist.status = 'unknown'; break;
-				case 'NONE':
-					switch (hist.ParStatus)
-					{
-						case 'SUCCESS': hist.status = 'success'; break;
-						case 'REPAIR_POSSIBLE': hist.status = 'repairable'; break;
-						case 'FAILURE': hist.status = 'failure'; break;
-						case 'NONE': hist.status = 'none'; break;
-					}
-			}
-		}
-		else if (hist.Kind === 'URL')
-		{
-			switch (hist.UrlStatus)
-			{
-				case 'SUCCESS': hist.status = 'success'; break;
-				case 'FAILURE': hist.status = 'failure'; break;
-				case 'UNKNOWN': hist.status = 'unknown'; break;
-			}
-		}
-	}
-
-	this.redraw = function()
-	{
-		var data = [];
-
-		for (var i=0; i < history.length; i++)
-		{
-			var hist = history[i];
-
-			var kind = hist.Kind;
-			var statustext = hist.status === 'none' ? 'unknown' : hist.status;
-			var size = kind === 'NZB' ? Util.formatSizeMB(hist.FileSizeMB) : '';
-
-			var textname = hist.Name;
-			if (kind === 'URL')
-			{
-				textname += ' URL';
-			}
-
-			var time = Util.formatDateTime(hist.HistoryTime + UISettings.timeZoneCorrection*60*60);
-
-			var item =
-			{
-				id: hist.ID,
-				hist: hist,
-				data: {time: time, size: size},
-				search: statustext + ' ' + time + ' ' + textname + ' ' + hist.Category + ' ' + size
-			};
-
-			data.push(item);
-		}
-
-		$HistoryTable.fasttable('update', data);
-
-		Util.show($HistoryTabBadge, history.length > 0);
-		Util.show($HistoryTabBadgeEmpty, history.length === 0 && UISettings.miniTheme);
-	}
-
-	function fillFieldsCallback(item)
-	{
-		var hist = item.hist;
-
-		var status = buildStatus(hist);
-
-		var name = '<a href="#" histid="' + hist.ID + '">' + Util.textToHtml(Util.formatNZBName(hist.Name)) + '</a>';
-		var category = Util.textToHtml(hist.Category);
-
-		if (hist.Kind === 'URL')
-		{
-			name += ' <span class="label label-info">URL</span>';
-		}
-
-		if (!UISettings.miniTheme)
-		{
-			item.fields = ['<div class="check img-check"></div>', status, item.data.time, name, category, item.data.size];
-		}
-		else
-		{
-			var info = '<div class="check img-check"></div><span class="row-title">' + name + '</span>' +
-				' ' + status + ' <span class="label">' + item.data.time + '</span>';
-			if (category)
-			{
-				info += ' <span class="label label-status">' + category + '</span>';
-			}
-			if (hist.Kind === 'NZB')
-			{
-				info += ' <span class="label">' + item.data.size + '</span>';
-			}
-			item.fields = [info];
-		}
-	}
-
-	function renderCellCallback(cell, index, item)
-	{
-		if (index === 2)
-		{
-			cell.className = 'text-center';
-		}
-		else if (index === 5)
-		{
-			cell.className = 'text-right';
-		}
-	}
-
-	function buildStatus(hist)
-	{
-		switch (hist.status)
-		{
-			case 'success': return '<span class="label label-status label-success">success</span>';
-			case 'failure': return '<span class="label label-status label-important">failure</span>';
-			case 'unknown': return '<span class="label label-status label-info">unknown</span>';
-			case 'repairable': return '<span class="label label-status label-success">repairable</span>';
-			case 'none': return '<span class="label label-status">unknown</span>';
-			default: return '<span class="label label-status label-important">internal error(' + hist.status + ')</span>';
-		}
-	}
-
-	this.recordsPerPageChange = function()
-	{
-		var val = $HistoryRecordsPerPage.val();
-		UISettings.write('HistoryRecordsPerPage', val);
-		$HistoryTable.fasttable('setPageSize', val);
-	}
-
-	function updateInfo(stat)
-	{
-		updateTabInfo($HistoryTabBadge, stat);
-	}
-
-	this.deleteClick = function()
-	{
-		if (history.length == 0)
-		{
-			return;
-		}
-
-		var checkedRows = $HistoryTable.fasttable('checkedRows');
-		if (checkedRows.length > 0)
-		{
-			ConfirmDialog.showModal('HistoryDeleteConfirmDialog', historyDelete);
-		}
-		else
-		{
-			ConfirmDialog.showModal('HistoryClearConfirmDialog', historyClear);
-		}
-	}
-
-	function historyDelete()
-	{
-		Refresher.pause();
-
-		var IDs = $HistoryTable.fasttable('checkedRows');
-
-		RPC.call('editqueue', ['HistoryDelete', 0, '', [IDs]], function()
-		{
-			notification = '#Notif_History_Deleted';
-			editCompleted();
-		});
-	}
-
-	function historyClear()
-	{
-		Refresher.pause();
-
-		var IDs = [];
-		for (var i=0; i<history.length; i++)
-		{
-			IDs.push(history[i].ID);
-		}
-
-		RPC.call('editqueue', ['HistoryDelete', 0, '', [IDs]], function()
-		{
-			notification = '#Notif_History_Cleared';
-			editCompleted();
-		});
-	}
-
-	function editCompleted()
-	{
-		Refresher.update();
-		if (notification)
-		{
-			Notification.show(notification);
-			notification = null;
-		}
-	}
-	
-	function editClick()
-	{
-		var histid = $(this).attr('histid');
-		$(this).blur();
-		historyEditDialog.showModal(histid);
-	}
-	
-/*** EDIT HISTORY DIALOG *************************************************************************/
-
-	var historyEditDialog = new function()
-	{
-		// Controls
-		var $HistoryEditDialog;
-
-		// State
-		var curHist;
-
-		this.init = function()
-		{
-			$HistoryEditDialog = $('#HistoryEditDialog');
-			
-			$('#HistoryEdit_Delete').click(itemDelete);
-			$('#HistoryEdit_Return').click(itemReturn);
-			$('#HistoryEdit_Reprocess').click(itemReprocess);
-
-			$HistoryEditDialog.on('hidden', function () {
-				Refresher.resume();
-			});
-		}
-
-		this.showModal = function(histid)
-		{
-			var hist = null;
-
-			// find history object
-			for (var i=0; i<history.length; i++)
-			{
-				var gr = history[i];
-				if (gr.ID == histid)
-				{
-					hist = gr;
-					break;
-				}
-			}
-			if (hist == null)
-			{
-				return;
-			}
-
-			Refresher.pause();
-
-			curHist = hist;
-
-			var status = buildStatus(hist);
-
-			$('#HistoryEdit_Title').text(Util.formatNZBName(hist.Name));
-			if (hist.Kind === 'URL')
-			{
-				$('#HistoryEdit_Title').html($('#HistoryEdit_Title').html() + '&nbsp;' + '<span class="label label-info">URL</span>');
-			}
-
-			$('#HistoryEdit_Status').html(status);
-			$('#HistoryEdit_Category').text(hist.Category !== '' ? hist.Category : '<empty>');
-			$('#HistoryEdit_Path').text(hist.DestDir);
-
-			var size = Util.formatSizeMB(hist.FileSizeMB, hist.FileSizeLo);
-
-			var table = '';
-			table += '<tr><td>Total</td><td class="text-right">' + size + '</td></tr>';
-			table += '<tr><td>Files (total/parked)</td><td class="text-right">' + hist.FileCount + '/' + hist.RemainingFileCount + '</td></tr>';
-			$('#HistoryEdit_Statistics').html(table);
-
-			Util.show($('#HistoryEdit_ReturnGroup'), hist.RemainingFileCount > 0 || hist.Kind === 'URL');
-			Util.show($('#HistoryEdit_PathGroup, #HistoryEdit_StatisticsGroup, #HistoryEdit_ReprocessGroup'), hist.Kind === 'NZB');
-
-			enableAllButtons();
-
-			$HistoryEditDialog.modal({backdrop: 'static'});
-		}
-
-		function disableAllButtons()
-		{
-			$('#HistoryEditDialog .modal-footer .btn').attr('disabled', 'disabled');
-			setTimeout(function()
-			{
-				$('#HistoryEdit_Transmit').show();
-			}, 500);
-		}
-
-		function enableAllButtons()
-		{
-			$('#HistoryEditDialog .modal-footer .btn').removeAttr('disabled');
-			$('#HistoryEdit_Transmit').hide();
-		}
-
-		function itemDelete()
-		{
-			disableAllButtons();
-			notification = '#Notif_History_Deleted';
-			RPC.call('editqueue', ['HistoryDelete', 0, '', [curHist.ID]], completed);
-		}
-
-		function itemReturn()
-		{
-			disableAllButtons();
-			notification = '#Notif_History_Returned';
-			RPC.call('editqueue', ['HistoryReturn', 0, '', [curHist.ID]], completed);
-		}
-
-		function itemReprocess()
-		{
-			disableAllButtons();
-			notification = '#Notif_History_Reproces';
-			RPC.call('editqueue', ['HistoryProcess', 0, '', [curHist.ID]], completed);
-		}
-
-		function completed()
-		{
-			$HistoryEditDialog.modal('hide');
-			editCompleted();
-		}
-	}();
-}(jQuery));