version 0.5.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-2013 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
@@ -34,7 +34,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+#include <cstdio>
 #ifdef WIN32
 #include <direct.h>
 #else
@@ -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;
 
@@ -110,35 +110,17 @@ void ArticleDownloader::SetInfoName(const char * v)
 	m_szInfoName = strdup(v);
 }
 
-/*
- * How server management (for one particular article) works:
-	- there is a list of failed servers which is initially empty;
-	- level is initially 0;
+void ArticleDownloader::SetStatus(EStatus eStatus)
+{
+	m_eStatus = eStatus;
+	Notify(NULL);
+}
 
-	<loop>
-		- request a connection from server pool for current level;
-		  Exception: this step is skipped for the very first download attempt, because a
-		  level-0 connection is initially passed from queue manager;
-		- try to download from server;
-		- if connection to server cannot be established or download fails due to interrupted connection,
-		  try again (as many times as needed without limit) the same server until connection is OK;
-		- if download fails with error "Not-Found" (article or group not found) or with CRC error,
-		  add the server to failed server list;
-		- if download fails with general failure error (article incomplete, other unknown error
-		  codes), try the same server again as many times as defined by option <Retries>; if all attempts
-		  fail, add the server to failed server list;
-		- if all servers from current level were tried, increase level;
-		- if all servers from all levels were tried, break the loop with failure status.
-	<end-loop>
-*/
 void ArticleDownloader::Run()
 {
 	debug("Entering ArticleDownloader-loop");
 
 	SetStatus(adRunning);
-
-	BuildOutputFilename();
-
 	m_szResultFilename = m_pArticleInfo->GetResultFilename();
 
 	if (g_pOptions->GetContinuePartial())
@@ -147,44 +129,45 @@ void ArticleDownloader::Run()
 		{
 			// file exists from previous program's start
 			detail("Article %s already downloaded, skipping", m_szInfoName);
-			FreeConnection(true);
 			SetStatus(adFinished);
-			Notify(NULL);
+			FreeConnection(true);
 			return;
 		}
 	}
 
+	int retry = g_pOptions->GetRetries();
+
 	EStatus Status = adFailed;
-
-	int iRetries = g_pOptions->GetRetries() > 0 ? g_pOptions->GetRetries() : 1;
-	int iRemainedRetries = iRetries;
-	ServerPool::Servers failedServers;
-	failedServers.reserve(g_pServerPool->GetServers()->size());
-	NewsServer* pWantServer = NULL;
-	NewsServer* pLastServer = NULL;
-	int iLevel = 0;
-
-	while (!IsStopped())
+	int iMaxLevel = g_pServerPool->GetMaxLevel();
+	int* LevelStatus = (int*)malloc((iMaxLevel + 1) * sizeof(int));
+	for (int i = 0; i <= iMaxLevel; i++)
 	{
+		LevelStatus[i] = 0;
+	}
+	int level = 0;
+
+	while (!IsStopped() && (retry > 0))
+	{
+		SetLastUpdateTimeNow();
+
 		Status = adFailed;
 
-		SetStatus(adWaiting);
-		while (!IsStopped() && !m_pConnection)
+		if (!m_pConnection)
 		{
-			m_pConnection = g_pServerPool->GetConnection(iLevel, pWantServer, &failedServers);
-			usleep(5 * 1000);
+			m_pConnection = g_pServerPool->GetConnection(level, true);
 		}
-		SetLastUpdateTimeNow();
-		SetStatus(adRunning);
 
-		if (IsStopped() || g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2())
+		if (IsStopped())
 		{
-			Status = adRetry;
+			Status = adFailed;
 			break;
 		}
 
-		pLastServer = m_pConnection->GetNewsServer();
-
+		if (!m_pConnection)
+		{
+			error("Serious error: Connection is NULL");
+		}
+		
 		m_pConnection->SetSuppressErrors(false);
 
 		// test connection
@@ -192,8 +175,7 @@ void ArticleDownloader::Run()
 		if (bConnected && !IsStopped())
 		{
 			// Okay, we got a Connection. Now start downloading.
-			detail("Downloading %s @ server%i (%s)", m_szInfoName,
-				m_pConnection->GetNewsServer()->GetID(), m_pConnection->GetHost());
+			detail("Downloading %s @ %s", m_szInfoName, m_pConnection->GetServer()->GetHost());
 			Status = Download();
 		}
 
@@ -213,126 +195,93 @@ void ArticleDownloader::Run()
 				// free the connection, to prevent starting of thousands of threads 
 				// (cause each of them will also free it's connection after the 
 				// same connect-error).
-				FreeConnection(Status == adFinished || Status == adNotFound);
+				FreeConnection(Status == adFinished);
 			}
 		}
 
-		if (Status == adFinished || Status == adFatalError)
-		{
-			break;
-		}
-
-		pWantServer = NULL;
-
-		if (bConnected && Status == adFailed)
-		{
-			iRemainedRetries--;
-		}
-
-		if (!bConnected || (Status == adFailed && iRemainedRetries > 0))
-		{
-			pWantServer = pLastServer;
-		}
-
-		if (pWantServer && !IsStopped() &&
-			!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
+		if (((Status == adFailed) || (Status == adCrcError && g_pOptions->GetRetryOnCrcError())) && 
+			(retry > 1 || !bConnected) && !IsStopped())
 		{
 			detail("Waiting %i sec to retry", g_pOptions->GetRetryInterval());
-			SetStatus(adWaiting);
 			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;
 			}
-			SetLastUpdateTimeNow();
-			SetStatus(adRunning);
 		}
 
-		if (IsStopped() || g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2())
+		if (IsStopped())
+		{
+			Status = adFailed;
+			break;
+		}
+	 
+		if ((Status == adFinished) || (Status == adFatalError) ||
+			(Status == adCrcError && !g_pOptions->GetRetryOnCrcError()))
 		{
-			Status = adRetry;
 			break;
 		}
 
-		if (!pWantServer)
+		LevelStatus[level] = Status;
+
+		bool bAllLevelNotFound = true;
+		for (int lev = 0; lev <= iMaxLevel; lev++)
 		{
-			failedServers.push_back(pLastServer);
-
-			// if all servers from current level were tried, increase level
-			// if all servers from all levels were tried, break the loop with failure status
-
-			bool bAllServersOnLevelFailed = true;
-			for (ServerPool::Servers::iterator it = g_pServerPool->GetServers()->begin(); it != g_pServerPool->GetServers()->end(); it++)
+			if (LevelStatus[lev] != adNotFound)
 			{
-				NewsServer* pCandidateServer = *it;
-				if (pCandidateServer->GetLevel() == iLevel)
-				{
-					bool bServerFailed = false;
-					for (ServerPool::Servers::iterator it = failedServers.begin(); it != failedServers.end(); it++)
-					{
-						NewsServer* pIgnoreServer = *it;
-						if (pIgnoreServer == pCandidateServer ||
-							(pIgnoreServer->GetGroup() > 0 && pIgnoreServer->GetGroup() == pCandidateServer->GetGroup() &&
-							 pIgnoreServer->GetLevel() == pCandidateServer->GetLevel()))
-						{
-							bServerFailed = true;
-							break;
-						}					
-					}
-					if (!bServerFailed)
-					{
-						bAllServersOnLevelFailed = false;
-						break;
-					}
-				}
+				bAllLevelNotFound = false;
+				break;
 			}
-
-			if (bAllServersOnLevelFailed)
+		}
+		if (bAllLevelNotFound)
+		{
+			if (iMaxLevel > 0)
 			{
-				if (iLevel < g_pServerPool->GetMaxLevel())
-				{
-					detail("Article %s @ all level %i servers failed, increasing level", m_szInfoName, iLevel);
-					iLevel++;
-				}
-				else
-				{
-					warn("Article %s @ all servers failed", m_szInfoName);
-					Status = adFailed;
-					break;
-				}
+				warn("Article %s @ all servers failed: Article not found", m_szInfoName);
 			}
-			
-			iRemainedRetries = iRetries;
+			break;
+		}
+
+		// do not count connect-errors, only article- and group-errors
+		if (bConnected)
+		{
+			level++;
+			if (level > iMaxLevel)
+			{
+				level = 0;
+			}
+			retry--;
 		}
 	}
 
 	FreeConnection(Status == adFinished);
 
+	free(LevelStatus);
+
 	if (m_bDuplicate)
 	{
 		Status = adFinished;
 	}
 
-	if (Status != adFinished && Status != adRetry)
+	if (Status != adFinished)
 	{
 		Status = adFailed;
 	}
 
-	if (IsStopped())
-	{
-		detail("Download %s cancelled", m_szInfoName);
-		Status = adRetry;
-	}
-
 	if (Status == adFailed)
 	{
-		warn("Download %s failed", m_szInfoName);
+		if (IsStopped())
+		{
+			detail("Download %s cancelled", m_szInfoName);
+		}
+		else
+		{
+			warn("Download %s failed", m_szInfoName);
+		}
 	}
 
 	SetStatus(Status);
-	Notify(NULL);
 
 	debug("Exiting ArticleDownloader-loop");
 }
@@ -369,7 +318,7 @@ ArticleDownloader::EStatus ArticleDownloader::Download()
 	for (int retry = 3; retry > 0; retry--)
 	{
 		szResponse = m_pConnection->Request(tmp);
-		if ((szResponse && !strncmp(szResponse, "2", 1)) || m_pConnection->GetAuthError())
+		if (szResponse && !strncmp(szResponse, "2", 1))
 		{
 			break;
 		}
@@ -408,7 +357,7 @@ ArticleDownloader::EStatus ArticleDownloader::Download()
 		        (g_pDownloadSpeedMeter->CalcCurrentDownloadSpeed() > g_pOptions->GetDownloadRate()))
 		{
 			SetLastUpdateTimeNow();
-			usleep(10 * 1000);
+			usleep(200 * 1000);
 		}
 
 		int iLen = 0;
@@ -420,8 +369,7 @@ ArticleDownloader::EStatus ArticleDownloader::Download()
 		{
 			if (!IsStopped())
 			{
-				warn("Article %s @ server%i (%s) failed: Unexpected end of article", m_szInfoName,
-					m_pConnection->GetNewsServer()->GetID(), m_pConnection->GetHost());
+				warn("Article %s @ %s failed: Unexpected end of article", m_szInfoName, m_pConnection->GetServer()->GetHost());
 			}
 			Status = adFailed;
 			break;
@@ -438,7 +386,6 @@ ArticleDownloader::EStatus ArticleDownloader::Download()
 		if (!strncmp(line, "..", 2))
 		{
 			line++;
-			iLen--;
 		}
 
 		if (!bBody)
@@ -455,8 +402,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 @ server%i (%s) failed: Wrong message-id, expected %s, returned %s", m_szInfoName,
-						m_pConnection->GetNewsServer()->GetID(), 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;
 				}
@@ -484,8 +430,7 @@ ArticleDownloader::EStatus ArticleDownloader::Download()
 
 	if (!bEnd && Status == adRunning && !IsStopped())
 	{
-		warn("Article %s @ server%i (%s) failed: article incomplete", m_szInfoName,
-			m_pConnection->GetNewsServer()->GetID(), m_pConnection->GetHost());
+		warn("Article %s @ %s failed: article incomplete", m_szInfoName, m_pConnection->GetServer()->GetHost());
 		Status = adFailed;
 	}
 
@@ -512,21 +457,18 @@ ArticleDownloader::EStatus ArticleDownloader::CheckResponse(const char* szRespon
 	{
 		if (!IsStopped())
 		{
-			warn("Article %s @ server%i (%s) failed, %s: Connection closed by remote host", m_szInfoName, 
-				m_pConnection->GetNewsServer()->GetID(), 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 @ server%i (%s) failed, %s: %s", m_szInfoName,
-			 m_pConnection->GetNewsServer()->GetID(), 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))
+	else if (!strncmp(szResponse, "41", 2) || !strncmp(szResponse, "42", 2))
 	{
-		warn("Article %s @ server%i (%s) failed, %s: %s", m_szInfoName,
-			 m_pConnection->GetNewsServer()->GetID(), 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))
@@ -537,8 +479,7 @@ ArticleDownloader::EStatus ArticleDownloader::CheckResponse(const char* szRespon
 	else 
 	{
 		// unknown error, no special handling
-		warn("Article %s @ server%i (%s) failed, %s: %s", m_szInfoName,
-			 m_pConnection->GetNewsServer()->GetID(), m_pConnection->GetHost(), szComment, szResponse);
+		warn("Article %s @ %s failed, %s: %s", m_szInfoName, m_pConnection->GetServer()->GetHost(), szComment, szResponse);
 		return adFailed;
 	}
 }
@@ -552,26 +493,18 @@ bool ArticleDownloader::Write(char* szLine, int iLen)
 
 	if (g_pOptions->GetDecode())
 	{
-		bool bOK = false;
 		if (m_eFormat == Decoder::efYenc)
 		{
-			bOK = m_YDecoder.Write(szLine, iLen, m_pOutFile);
+			return m_YDecoder.Write(szLine, iLen, m_pOutFile);
 		}
 		else if (m_eFormat == Decoder::efUx)
 		{
-			bOK = m_UDecoder.Write(szLine, iLen, m_pOutFile);
+			return m_UDecoder.Write(szLine, iLen, m_pOutFile);
 		}
 		else
 		{
-			warn("Decoding %s failed: unsupported encoding", m_szInfoName);
 			return false;
 		}
-		if (!bOK)
-		{
-			debug("Failed line: %s", szLine);
-			warn("Decoding %s failed", m_szInfoName);
-		}
-		return bOK;
 	}
 	else
 	{
@@ -591,8 +524,7 @@ bool ArticleDownloader::PrepareFile(char* szLine)
 			if (g_pOptions->GetDupeCheck())
 			{
 				m_pFileInfo->LockOutputFile();
-				bool bOutputInitialized = m_pFileInfo->GetOutputInitialized();
-				if (!bOutputInitialized)
+				if (!m_pFileInfo->GetOutputInitialized())
 				{
 					char* pb = strstr(szLine, " name=");
 					if (pb)
@@ -606,6 +538,11 @@ bool ArticleDownloader::PrepareFile(char* szLine)
 							strncpy(m_szArticleFilename, pb, pe - pb);
 							m_szArticleFilename[pe - pb] = '\0';
 						}
+						if (m_pFileInfo->IsDupe(m_szArticleFilename))
+						{
+							m_bDuplicate = true;
+							return false;
+						}
 					}
 				}
 				if (!g_pOptions->GetDirectWrite())
@@ -613,11 +550,6 @@ bool ArticleDownloader::PrepareFile(char* szLine)
 					m_pFileInfo->SetOutputInitialized(true);
 				}
 				m_pFileInfo->UnlockOutputFile();
-				if (!bOutputInitialized && m_szArticleFilename && m_pFileInfo->IsDupe(m_szArticleFilename))
-				{
-					m_bDuplicate = true;
-					return false;
-				}
 			}
 
 			if (g_pOptions->GetDirectWrite())
@@ -630,9 +562,9 @@ bool ArticleDownloader::PrepareFile(char* szLine)
 					{
 						pb += 6; //=strlen(" size=")
 						long iArticleFilesize = atol(pb);
-						if (!CreateOutputFile(iArticleFilesize))
+						if (!Util::SetFileSize(m_szOutputFilename, iArticleFilesize))
 						{
-							m_pFileInfo->UnlockOutputFile();
+							error("Could not create file %s!", m_szOutputFilename);
 							return false;
 						}
 						m_pFileInfo->SetOutputInitialized(true);
@@ -656,7 +588,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);
@@ -675,77 +607,6 @@ bool ArticleDownloader::PrepareFile(char* szLine)
 	return true;
 }
 
-/* creates output file and subdirectores */
-bool ArticleDownloader::CreateOutputFile(int iSize)
-{
-	if (g_pOptions->GetDirectWrite() && Util::FileExists(m_szOutputFilename) &&
-		Util::FileSize(m_szOutputFilename) == iSize)
-	{
-		// keep existing old file from previous program session
-		return true;
-	}
-		
-	// delete eventually existing old file from previous program session
-	remove(m_szOutputFilename);
-
-	// ensure the directory exist
-	char szDestDir[1024];
-	int iMaxlen = Util::BaseFileName(m_szOutputFilename) - m_szOutputFilename;
-	if (iMaxlen > 1024-1) iMaxlen = 1024-1;
-	strncpy(szDestDir, m_szOutputFilename, iMaxlen);
-	szDestDir[iMaxlen] = '\0';
-	char szErrBuf[1024];
-
-	if (!Util::ForceDirectories(szDestDir, szErrBuf, sizeof(szErrBuf)))
-	{
-		error("Could not create directory %s: %s", szDestDir, szErrBuf);
-		return false;
-	}
-
-	if (!Util::CreateSparseFile(m_szOutputFilename, iSize))
-	{
-		error("Could not create file %s", m_szOutputFilename);
-		return false;
-	}
-
-	return true;
-}
-
-void ArticleDownloader::BuildOutputFilename()
-{
-	char szFilename[1024];
-
-	snprintf(szFilename, 1024, "%s%i.%03i", g_pOptions->GetTempDir(), m_pFileInfo->GetID(), m_pArticleInfo->GetPartNumber());
-	szFilename[1024-1] = '\0';
-	m_pArticleInfo->SetResultFilename(szFilename);
-
-	char tmpname[1024];
-	snprintf(tmpname, 1024, "%s.tmp", szFilename);
-	tmpname[1024-1] = '\0';
-	SetTempFilename(tmpname);
-
-	if (g_pOptions->GetDirectWrite())
-	{
-		m_pFileInfo->LockOutputFile();
-
-		if (m_pFileInfo->GetOutputFilename())
-		{
-			strncpy(szFilename, m_pFileInfo->GetOutputFilename(), 1024);
-			szFilename[1024-1] = '\0';
-		}
-		else
-		{
-			snprintf(szFilename, 1024, "%s%c%i.out.tmp", m_pFileInfo->GetNZBInfo()->GetDestDir(), (int)PATH_SEPARATOR, m_pFileInfo->GetID());
-			szFilename[1024-1] = '\0';
-			m_pFileInfo->SetOutputFilename(szFilename);
-		}
-
-		m_pFileInfo->UnlockOutputFile();
-
-		SetOutputFilename(szFilename);
-	}
-}
-
 ArticleDownloader::EStatus ArticleDownloader::DecodeCheck()
 {
 	bool bDirectWrite = g_pOptions->GetDirectWrite() && m_eFormat == Decoder::efYenc;
@@ -767,7 +628,7 @@ ArticleDownloader::EStatus ArticleDownloader::DecodeCheck()
 		else
 		{
 			warn("Decoding %s failed: no binary data or unsupported encoding format", m_szInfoName);
-			return adFailed;
+			return adFatalError;
 		}
 
 		Decoder::EStatus eStatus = pDecoder->Check();
@@ -795,7 +656,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);
@@ -917,18 +778,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())
@@ -944,11 +798,16 @@ 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
-	char szErrBuf[1024];
-	if (!Util::ForceDirectories(szNZBDestDir, szErrBuf, sizeof(szErrBuf)))
+	if (!Util::ForceDirectories(szNZBDestDir))
 	{
-		error("Could not create directory %s: %s", szNZBDestDir, szErrBuf);
+		error("Could not create directory %s! Errcode: %i", szNZBDestDir, errno);
 		SetStatus(adJoined);
 		return;
 	}
@@ -974,7 +833,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);
@@ -1024,7 +883,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;
@@ -1078,24 +937,6 @@ void ArticleDownloader::CompleteFileParts()
 		{
 			error("Could not move file %s to %s! Errcode: %i", m_szOutputFilename, ofn, errno);
 		}
-
-		// if destination directory was changed delete the old directory (if empty)
-		int iLen = strlen(szNZBDestDir);
-		if (!(!strncmp(szNZBDestDir, m_szOutputFilename, iLen) && 
-			(m_szOutputFilename[iLen] == PATH_SEPARATOR || m_szOutputFilename[iLen] == ALT_PATH_SEPARATOR)))
-		{
-			debug("Checking old dir for: %s", m_szOutputFilename);
-			char szOldDestDir[1024];
-			int iMaxlen = Util::BaseFileName(m_szOutputFilename) - m_szOutputFilename;
-			if (iMaxlen > 1024-1) iMaxlen = 1024-1;
-			strncpy(szOldDestDir, m_szOutputFilename, iMaxlen);
-			szOldDestDir[iMaxlen] = '\0';
-			if (Util::DirEmpty(szOldDestDir))
-			{
-				debug("Deleting old dir: %s", szOldDestDir);
-				rmdir(szOldDestDir);
-			}
-		}
 	}
 
 	if (!bDirectWrite || g_pOptions->GetContinuePartial())
@@ -1115,26 +956,46 @@ void ArticleDownloader::CompleteFileParts()
 	{
 		warn("%i of %i article downloads failed for \"%s\"", iBrokenCount, m_pFileInfo->GetArticles()->size(), InfoFilename);
 
+		if (g_pOptions->GetRenameBroken())
+		{
+			char brokenfn[1024];
+			snprintf(brokenfn, 1024, "%s_broken", ofn);
+			brokenfn[1024-1] = '\0';
+			if (Util::MoveFile(ofn, brokenfn))
+			{
+				detail("Renaming broken file from %s to %s", ofn, brokenfn);
+			}
+			else
+			{
+				warn("Renaming broken file from %s to %s failed", ofn, brokenfn);
+			}
+			strncpy(ofn, brokenfn, 1024);
+			ofn[1024-1] = '\0';
+		}
+		else
+		{
+			detail("Not renaming broken file %s", ofn);
+		}
+
 		if (g_pOptions->GetCreateBrokenLog())
 		{
 			char szBrokenLogName[1024];
 			snprintf(szBrokenLogName, 1024, "%s%c_brokenlog.txt", szNZBDestDir, (int)PATH_SEPARATOR);
 			szBrokenLogName[1024-1] = '\0';
-			FILE* file = fopen(szBrokenLogName, "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);
 }
@@ -1147,10 +1008,9 @@ bool ArticleDownloader::MoveCompletedFiles(NZBInfo* pNZBInfo, const char* szOldD
 	}
 
 	// Ensure the DstDir is created
-	char szErrBuf[1024];
-	if (!Util::ForceDirectories(pNZBInfo->GetDestDir(), szErrBuf, sizeof(szErrBuf)))
+	if (!Util::ForceDirectories(pNZBInfo->GetDestDir()))
 	{
-		error("Could not create directory %s: %s", pNZBInfo->GetDestDir(), szErrBuf);
+		error("Could not create directory %s! Errcode: %i", pNZBInfo->GetDestDir(), errno);
 		return false;
 	}
 
@@ -1204,11 +1064,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

@@ -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$
@@ -28,6 +28,9 @@
 #define ARTICLEDOWNLOADER_H
 
 #include <time.h>
+#ifdef WIN32
+#include <sys/timeb.h>
+#endif
 
 #include "Observer.h"
 #include "DownloadInfo.h"
@@ -42,10 +45,9 @@ public:
 	{
 		adUndefined,
 		adRunning,
-		adWaiting,
 		adFinished,
 		adFailed,
-		adRetry,
+		adDecodeError,
 		adCrcError,
 		adDecoding,
 		adJoining,
@@ -76,15 +78,9 @@ private:
 	EStatus				Download();
 	bool				Write(char* szLine, int iLen);
 	bool				PrepareFile(char* szLine);
-	bool				CreateOutputFile(int iSize);
-	void				BuildOutputFilename();
 	EStatus				DecodeCheck();
 	void				FreeConnection(bool bKeepConnected);
 	EStatus				CheckResponse(const char* szResponse, const char* szComment);
-	void				SetStatus(EStatus eStatus) { m_eStatus = eStatus; }
-	const char* 		GetTempFilename() { return m_szTempFilename; }
-	void 				SetTempFilename(const char* v);
-	void 				SetOutputFilename(const char* v);
 
 public:
 						ArticleDownloader();
@@ -93,12 +89,16 @@ public:
 	FileInfo*			GetFileInfo() { return m_pFileInfo; }
 	void				SetArticleInfo(ArticleInfo* pArticleInfo) { m_pArticleInfo = pArticleInfo; }
 	ArticleInfo*		GetArticleInfo() { return m_pArticleInfo; }
+	void				SetStatus(EStatus eStatus);
 	EStatus				GetStatus() { return m_eStatus; }
 	virtual void		Run();
 	virtual void		Stop();
 	bool				Terminate();
 	time_t				GetLastUpdateTime() { return m_tLastUpdateTime; }
 	void				SetLastUpdateTimeNow() { m_tLastUpdateTime = ::time(NULL); }
+	const char* 		GetTempFilename() { return m_szTempFilename; }
+	void 				SetTempFilename(const char* v);
+	void 				SetOutputFilename(const char* v);
 	const char* 		GetArticleFilename() { return m_szArticleFilename; }
 	void				SetInfoName(const char* v);
 	const char*			GetInfoName() { return m_szInfoName; }
@@ -113,8 +113,16 @@ class DownloadSpeedMeter
 {
 public:
 	virtual				~DownloadSpeedMeter() {};
-	virtual int			CalcCurrentDownloadSpeed() = 0;
+	virtual float		CalcCurrentDownloadSpeed() = 0;
 	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.h

@@ -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$
@@ -33,21 +33,23 @@
 class BinRpcProcessor
 {
 private:
+	SOCKET				m_iSocket;
 	SNZBRequestBase		m_MessageBase;
-	Connection*			m_pConnection;
+	const char*			m_szClientIP;
 
 	void				Dispatch();
 
 public:
-						BinRpcProcessor();
 	void				Execute();
-	void				SetConnection(Connection* pConnection) { m_pConnection = pConnection; }
+	void				SetSocket(SOCKET iSocket) { m_iSocket = iSocket; }
+	void				SetSignature(int iSignature) { m_MessageBase.m_iSignature = iSignature; }
+	void				SetClientIP(const char* szClientIP) { m_szClientIP = szClientIP; }
 };
 
 class BinCommand
 {
 protected:
-	Connection*			m_pConnection;
+	SOCKET				m_iSocket;
 	SNZBRequestBase*	m_pMessageBase;
 
 	bool				ReceiveRequest(void* pBuffer, int iSize);
@@ -56,7 +58,7 @@ protected:
 public:
 	virtual				~BinCommand() {}
 	virtual void		Execute() = 0;
-	void				SetConnection(Connection* pConnection) { m_pConnection = pConnection; }
+	void				SetSocket(SOCKET iSocket) { m_iSocket = iSocket; }
 	void				SetMessageBase(SNZBRequestBase*	pMessageBase) { m_pMessageBase = pMessageBase; }
 };
 
@@ -108,12 +110,6 @@ public:
 	virtual void		Execute();
 };
 
-class ReloadBinCommand: public BinCommand
-{
-public:
-	virtual void		Execute();
-};
-
 class VersionBinCommand: public BinCommand
 {
 public:
@@ -132,28 +128,4 @@ public:
 	virtual void		Execute();
 };
 
-class ScanBinCommand: public BinCommand
-{
-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$
@@ -74,11 +74,11 @@ void ColoredFrontend::PrintStatus()
 	char tmp[1024];
 	char timeString[100];
 	timeString[0] = '\0';
-	int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
+	float fCurrentDownloadSpeed = m_bStandBy ? 0 : m_fCurrentDownloadSpeed;
 
-	if (iCurrentDownloadSpeed > 0 && !(m_bPauseDownload || m_bPauseDownload2))
+	if (fCurrentDownloadSpeed > 0.0 && !m_bPause)
 	{
-		long long remain_sec = (long long)(m_lRemainingSize / iCurrentDownloadSpeed);
+		long long remain_sec = m_lRemainingSize / ((long long)(fCurrentDownloadSpeed * 1024));
 		int h = (int)(remain_sec / 3600);
 		int m = (int)((remain_sec % 3600) / 60);
 		int s = (int)(remain_sec % 60);
@@ -86,9 +86,9 @@ void ColoredFrontend::PrintStatus()
 	}
 
 	char szDownloadLimit[128];
-	if (m_iDownloadLimit > 0)
+	if (m_fDownloadLimit > 0.0f)
 	{
-		sprintf(szDownloadLimit, ", Limit %.0f KB/s", (float)m_iDownloadLimit / 1024.0);
+		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, (iCurrentDownloadSpeed >= 10*1024 ? 0 : 1), (float)iCurrentDownloadSpeed / 1024.0, 
-		(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.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-2013 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,14 +27,7 @@
 #ifndef CONNECTION_H
 #define CONNECTION_H
 
-#ifndef HAVE_GETADDRINFO
-#ifndef HAVE_GETHOSTBYNAME_R
-#include "Thread.h"
-#endif
-#endif
-#ifndef DISABLE_TLS
-#include "TLS.h"
-#endif
+#include "NetAddress.h"
 
 class Connection
 {
@@ -46,71 +39,61 @@ public:
 		csListening,
 		csCancelled
 	};
-
+	
 protected:
-	char*				m_szHost;
-	int					m_iPort;
+	NetAddress* 		m_pNetAddress;
 	SOCKET				m_iSocket;
-	bool				m_bTLS;
-	char*				m_szCipher;
 	char*				m_szReadBuf;
 	int					m_iBufAvail;
 	char*				m_szBufPtr;
 	EStatus				m_eStatus;
 	int					m_iTimeout;
 	bool				m_bSuppressErrors;
-	char				m_szRemoteAddr[20];
+	bool				m_bAutoClose;
 #ifndef DISABLE_TLS
-	TLSSocket*			m_pTLSSocket;
+	void*				m_pTLS;
+	static bool			bTLSLibInitialized;
 	bool				m_bTLSError;
-#endif
-#ifndef HAVE_GETADDRINFO
-#ifndef HAVE_GETHOSTBYNAME_R
-	static Mutex*		m_pMutexGetHostByName;
-#endif
 #endif
 
-						Connection(SOCKET iSocket, bool bTLS);
-	void				ReportError(const char* szMsgPrefix, const char* szMsgArg, bool PrintErrCode, int herrno);
-	bool				DoConnect();
-	bool				DoDisconnect();
-#ifndef HAVE_GETADDRINFO
-	unsigned int		ResolveHostAddr(const char* szHost);
-#endif
+	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 DISABLE_TLS
+	bool				CheckTLSResult(int iResultCode, char* szErrStr, const char* szErrMsgPrefix);
 	int					recv(SOCKET s, char* buf, int len, int flags);
 	int					send(SOCKET s, const char* buf, int len, int flags);
 	void				CloseTLS();
 #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();
-	virtual bool 		Connect();
-	virtual bool		Disconnect();
-	bool				Bind();
-	bool				Send(const char* pBuffer, int iSize);
-	bool				Recv(char* pBuffer, int iSize);
-	int					TryRecv(char* pBuffer, int iSize);
+	bool 				Connect();
+	bool				Disconnect();
+	int					Bind();
+	int					Send(const char* pBuffer, int iSize);
+	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);
-	Connection*			Accept();
+	SOCKET				Accept();
 	void				Cancel();
-	const char*			GetHost() { return m_szHost; }
-	int					GetPort() { return m_iPort; }
-	bool				GetTLS() { return m_bTLS; }
-	const char*			GetCipher() { return m_szCipher; }
-	void				SetCipher(const char* szCipher);
+	NetAddress*			GetServer() { return m_pNetAddress; }
+	SOCKET				GetSocket() { return m_iSocket; }
 	void				SetTimeout(int iTimeout) { m_iTimeout = iTimeout; }
 	EStatus				GetStatus() { return m_eStatus; }
-	void				SetSuppressErrors(bool bSuppressErrors);
+	void				SetSuppressErrors(bool bSuppressErrors) { m_bSuppressErrors = bSuppressErrors; }
 	bool				GetSuppressErrors() { return m_bSuppressErrors; }
-	const char*			GetRemoteAddr();
 #ifndef DISABLE_TLS
-	bool				StartTLS(bool bIsClient, const char* szCertFile, const char* szKeyFile);
+	bool				StartTLS();
 #endif
 };
 

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
@@ -141,7 +141,7 @@ void YDecoder::Clear()
 	m_lExpectedCRC = 0;
 	m_lCalculatedCRC = 0xFFFFFFFF;
 	m_iBegin = 0;
-	m_iEnd = 0xFFFFFFFF;
+	m_iEnd = 0;
 	m_iSize = 0;
 	m_iEndSize = 0;
 	m_bAutoSeek = false;
@@ -319,7 +319,7 @@ bool YDecoder::Write(char* buffer, int len, FILE* outfile)
 	{
 		if (m_bNeedSetPos)
 		{
-			if (m_iBegin == 0 || m_iEnd == 0xFFFFFFFF || !outfile)
+			if (m_iBegin == 0 || m_iEnd == 0 || !outfile)
 			{
 				return false;
 			}

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-2013 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$
@@ -27,28 +27,15 @@
 #define DISKSTATE_H
 
 #include "DownloadInfo.h"
+#include "PostInfo.h"
 
 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, int iFormatVersion);
-	bool				LoadOldPostQueue(DownloadQueue* pDownloadQueue);
-	void				SaveUrlQueue(DownloadQueue* pDownloadQueue, FILE* outfile);
-	bool				LoadUrlQueue(DownloadQueue* pDownloadQueue, FILE* infile, int iFormatVersion);
-	void				SaveUrlInfo(UrlInfo* pUrlInfo, FILE* outfile);
-	bool				LoadUrlInfo(UrlInfo* pUrlInfo, FILE* infile, int iFormatVersion);
-	void				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,8 +43,11 @@ public:
 	bool				LoadDownloadQueue(DownloadQueue* pDownloadQueue);
 	bool				SaveFile(FileInfo* pFileInfo);
 	bool				LoadArticles(FileInfo* pFileInfo);
-	void				DiscardDownloadQueue();
-	bool				DiscardFile(FileInfo* pFileInfo);
+	bool				SavePostQueue(PostQueue* pPostQueue, bool bCompleted);
+	bool				LoadPostQueue(PostQueue* pPostQueue, bool bCompleted);
+	bool				DiscardDownloadQueue();
+	bool				DiscardPostQueue();
+	bool				DiscardFile(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo);
 	void				CleanupTempDir(DownloadQueue* pDownloadQueue);
 };
 

DownloadInfo.cpp

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  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
@@ -34,10 +34,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <ctype.h>
+#include <cctype>
+#include <cstdio>
 #include <sys/stat.h>
-#include <map>
 
 #include "nzbget.h"
 #include "DownloadInfo.h"
@@ -48,127 +47,6 @@
 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)
-{
-	m_szName = strdup(szName);
-	m_szValue = NULL;
-}
-
-NZBParameter::~NZBParameter()
-{
-	if (m_szName)
-	{
-		free(m_szName);
-	}
-	if (m_szValue)
-	{
-		free(m_szValue);
-	}
-}
-
-void NZBParameter::SetValue(const char* szValue)
-{
-	if (m_szValue)
-	{
-		free(m_szValue);
-	}
-	m_szValue = strdup(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);
-}
-
-
-ScriptStatus::ScriptStatus(const char* szName, EStatus eStatus)
-{
-	m_szName = strdup(szName);
-	m_eStatus = eStatus;
-}
-
-ScriptStatus::~ScriptStatus()
-{
-	if (m_szName)
-	{
-		free(m_szName);
-	}
-}
-
-
-ScriptStatusList::~ScriptStatusList()
-{
-	Clear();
-}
-
-void ScriptStatusList::Clear()
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		delete *it;
-	}
-	clear();
-}
-
-void ScriptStatusList::Add(const char* szScriptName, ScriptStatus::EStatus eStatus)
-{
-	push_back(new ScriptStatus(szScriptName, eStatus));
-}
-
-ScriptStatus::EStatus ScriptStatusList::CalcTotalStatus()
-{
-	ScriptStatus::EStatus eStatus = ScriptStatus::srNone;
-
-	for (iterator it = begin(); it != end(); it++)
-	{
-		ScriptStatus* pScriptStatus = *it;
-		// Failure-Status overrides Success-Status
-		if ((pScriptStatus->GetStatus() == ScriptStatus::srSuccess && eStatus == ScriptStatus::srNone) ||
-			(pScriptStatus->GetStatus() == ScriptStatus::srFailure))
-		{
-			eStatus = pScriptStatus->GetStatus();
-		}
-	}
-	
-	return eStatus;
-}
-
 
 NZBInfo::NZBInfo()
 {
@@ -177,27 +55,11 @@ 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_eRenameStatus = rsNone;
-	m_eParStatus = psNone;
-	m_eUnpackStatus = usNone;
-	m_eCleanupStatus = csNone;
-	m_eMoveStatus = msNone;
-	m_bDeleted = false;
-	m_bParCleanup = false;
-	m_bCleanupDisk = false;
-	m_bUnpackCleanedUpDisk = false;
 	m_szQueuedFilename = strdup("");
-	m_Owner = NULL;
-	m_Messages.clear();
-	m_iIDMessageGen = 0;
-	m_iIDGen++;
-	m_iID = m_iIDGen;
 }
 
 NZBInfo::~NZBInfo()
@@ -216,33 +78,16 @@ NZBInfo::~NZBInfo()
 	{
 		free(m_szCategory);
 	}
-	if (m_szName)
-	{
-		free(m_szName);
-	}
 	if (m_szQueuedFilename)
 	{
 		free(m_szQueuedFilename);
 	}
 
-	ClearCompletedFiles();
-
-	for (NZBParameterList::iterator it = m_ppParameters.begin(); it != m_ppParameters.end(); it++)
+	for (Files::iterator it = m_completedFiles.begin(); it != m_completedFiles.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);
+		free(*it);
 	}
+	m_completedFiles.clear();
 }
 
 void NZBInfo::AddReference()
@@ -259,24 +104,6 @@ void NZBInfo::Release()
 	}
 }
 
-void NZBInfo::SetID(int iID)
-{
-	m_iID = iID;
-	if (m_iIDGen < m_iID)
-	{
-		m_iIDGen = m_iID;
-	}
-}
-
-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)
@@ -288,28 +115,7 @@ void NZBInfo::SetDestDir(const char* szDestDir)
 
 void NZBInfo::SetFilename(const char * szFilename)
 {
-	if (m_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)
@@ -330,146 +136,96 @@ 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';
 }
 
 void NZBInfo::BuildDestDirName()
-{
-	char szDestDir[1024];
-
-	if (strlen(g_pOptions->GetInterDir()) == 0)
-	{
-		BuildFinalDirName(szDestDir, 1024);
-	}
-	else
-	{
-		snprintf(szDestDir, 1024, "%s%s", g_pOptions->GetInterDir(), GetName());
-		szDestDir[1024-1] = '\0';
-	}
-
-	SetDestDir(szDestDir);
-}
-
-void NZBInfo::BuildFinalDirName(char* szFinalDirBuf, int iBufSize)
 {
 	char szBuffer[1024];
-	bool bUseCategory = m_szCategory && m_szCategory[0] != '\0';
-
-	snprintf(szFinalDirBuf, iBufSize, "%s", g_pOptions->GetDestDir());
-	szFinalDirBuf[iBufSize-1] = '\0';
-
-	if (bUseCategory)
+	char szCategory[1024];
+	bool bHasCategory = m_szCategory && m_szCategory[0] != '\0';
+	if (g_pOptions->GetAppendCategoryDir() && bHasCategory)
 	{
-		Options::Category *pCategory = g_pOptions->FindCategory(m_szCategory);
-		if (pCategory && pCategory->GetDestDir() && pCategory->GetDestDir()[0] != '\0')
+		strncpy(szCategory, m_szCategory, 1024);
+		szCategory[1024 - 1] = '\0';
+		Util::MakeValidFilename(szCategory, '_', true);
+	}
+
+	if (g_pOptions->GetAppendNZBDir())
+	{
+		char szNiceNZBName[1024];
+		GetNiceNZBName(szNiceNZBName, 1024);
+		if (g_pOptions->GetAppendCategoryDir() && bHasCategory)
 		{
-			snprintf(szFinalDirBuf, iBufSize, "%s", pCategory->GetDestDir());
-			szFinalDirBuf[iBufSize-1] = '\0';
-			bUseCategory = false;
-		}
-	}
-
-	if (g_pOptions->GetAppendCategoryDir() && bUseCategory)
-	{
-		char szCategoryDir[1024];
-		strncpy(szCategoryDir, m_szCategory, 1024);
-		szCategoryDir[1024 - 1] = '\0';
-		Util::MakeValidFilename(szCategoryDir, '_', true);
-
-		snprintf(szBuffer, 1024, "%s%s%c", szFinalDirBuf, szCategoryDir, PATH_SEPARATOR);
-		szBuffer[1024-1] = '\0';
-		strncpy(szFinalDirBuf, szBuffer, iBufSize);
-	}
-
-	snprintf(szBuffer, 1024, "%s%s", szFinalDirBuf, GetName());
-	szBuffer[1024-1] = '\0';
-	strncpy(szFinalDirBuf, szBuffer, iBufSize);
-}
-
-void NZBInfo::SetParameter(const char* szName, const char* szValue)
-{
-	m_ppParameters.SetParameter(szName, 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)
-	{
-		tTime = time(NULL);
-	}
-
-	m_mutexLog.Lock();
-	Message* pMessage = new Message(++m_iIDMessageGen, eKind, tTime, szText);
-	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)
-		{
-			erase(it);
-			break;
-		}
-	}
-}
-
-void NZBInfoList::ReleaseAll()
-{
-	int i = 0;
-	for (iterator it = begin(); it != end(); )
-	{
-		NZBInfo* pNZBInfo = *it;
-		bool bObjDeleted = pNZBInfo->m_iRefCount == 1;
-		pNZBInfo->Release();
-		if (bObjDeleted)
-		{
-			it = begin() + i;
+			snprintf(szBuffer, 1024, "%s%s%c%s", g_pOptions->GetDestDir(), szCategory, PATH_SEPARATOR, szNiceNZBName);
 		}
 		else
 		{
-			it++;
-			i++;
+			snprintf(szBuffer, 1024, "%s%s", g_pOptions->GetDestDir(), szNiceNZBName);
 		}
+		szBuffer[1024-1] = '\0';
 	}
+	else
+	{
+		if (g_pOptions->GetAppendCategoryDir() && bHasCategory)
+		{
+			snprintf(szBuffer, 1024, "%s%s", g_pOptions->GetDestDir(), szCategory);
+		}
+		else
+		{
+			strncpy(szBuffer, g_pOptions->GetDestDir(), 1024);
+		}
+		szBuffer[1024-1] = '\0'; // trim the last slash, always returned by GetDestDir()
+	}
+
+	SetDestDir(szBuffer);
 }
 
 ArticleInfo::ArticleInfo()
@@ -502,10 +258,6 @@ void ArticleInfo::SetMessageID(const char * szMessageID)
 
 void ArticleInfo::SetResultFilename(const char * v)
 {
-	if (m_szResultFilename)
-	{
-		free(m_szResultFilename);
-	}
 	m_szResultFilename = strdup(v);
 }
 
@@ -518,21 +270,14 @@ FileInfo::FileInfo()
 	m_Groups.clear();
 	m_szSubject = NULL;
 	m_szFilename = NULL;
-	m_szOutputFilename = NULL;
-	m_pMutexOutputFile = NULL;
 	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_bExtraPriority = false;
-	m_iActiveDownloads = 0;
-	m_bAutoDeleted = false;
 	m_iIDGen++;
 	m_iID = m_iIDGen;
 }
@@ -549,14 +294,6 @@ FileInfo::~ FileInfo()
 	{
 		free(m_szFilename);
 	}
-	if (m_szOutputFilename)
-	{
-		free(m_szOutputFilename);
-	}
-	if (m_pMutexOutputFile)
-	{
-		delete m_pMutexOutputFile;
-	}
 
 	for (Groups::iterator it = m_Groups.begin(); it != m_Groups.end() ;it++)
 	{
@@ -581,9 +318,9 @@ void FileInfo::ClearArticles()
 	m_Articles.clear();
 }
 
-void FileInfo::SetID(int iID)
+void FileInfo::SetID(int s)
 {
-	m_iID = iID;
+	m_iID = s;
 	if (m_iIDGen < m_iID)
 	{
 		m_iIDGen = m_iID;
@@ -592,10 +329,6 @@ void FileInfo::SetID(int iID)
 
 void FileInfo::SetNZBInfo(NZBInfo* pNZBInfo)
 {
-	if (m_pNZBInfo)
-	{
-		m_pNZBInfo->Release();
-	}
 	m_pNZBInfo = pNZBInfo;
 	m_pNZBInfo->AddReference();
 }
@@ -621,36 +354,12 @@ void FileInfo::MakeValidFilename()
 
 void FileInfo::LockOutputFile()
 {
-	m_pMutexOutputFile->Lock();
+	m_mutexOutputFile.Lock();
 }
 
 void FileInfo::UnlockOutputFile()
 {
-	m_pMutexOutputFile->Unlock();
-}
-
-void FileInfo::SetOutputFilename(const char* szOutputFilename)
-{
-	if (m_szOutputFilename)
-	{
-		free(m_szOutputFilename);
-	}
-	m_szOutputFilename = strdup(szOutputFilename);
-}
-
-void FileInfo::SetActiveDownloads(int iActiveDownloads)
-{
-	m_iActiveDownloads = iActiveDownloads;
-
-	if (m_iActiveDownloads > 0 && !m_pMutexOutputFile)
-	{
-		m_pMutexOutputFile = new Mutex();
-	}
-	else if (m_iActiveDownloads == 0 && m_pMutexOutputFile)
-	{
-		delete m_pMutexOutputFile;
-		m_pMutexOutputFile = NULL;
-	}
+	m_mutexOutputFile.Unlock();
 }
 
 bool FileInfo::IsDupe(const char* szFilename)
@@ -677,15 +386,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()
@@ -696,112 +399,21 @@ GroupInfo::~GroupInfo()
 	}
 }
 
-PostInfo::PostInfo()
+void GroupInfo::BuildGroups(DownloadQueue* pDownloadQueue, GroupQueue* pGroupQueue)
 {
-	debug("Creating PostInfo");
-
-	m_pNZBInfo = NULL;
-	m_szInfoName = NULL;
-	m_bWorking = false;
-	m_bDeleted = false;
-	m_bRequestParCheck = false;
-	m_bRequestParRename = false;
-	m_szProgressLabel = strdup("");
-	m_iFileProgress = 0;
-	m_iStageProgress = 0;
-	m_tStartTime = 0;
-	m_tStageTime = 0;
-	m_eStage = ptQueued;
-	m_pPostThread = NULL;
-	m_Messages.clear();
-	m_iIDMessageGen = 0;
-	m_iIDGen++;
-	m_iID = m_iIDGen;
-}
-
-PostInfo::~ PostInfo()
-{
-	debug("Destroying PostInfo");
-
-	if (m_szInfoName)
-	{
-		free(m_szInfoName);
-	}
-	if (m_szProgressLabel)
-	{
-		free(m_szProgressLabel);
-	}
-
-	for (Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
-	{
-		delete *it;
-	}
-	m_Messages.clear();
-
-	if (m_pNZBInfo)
-	{
-		m_pNZBInfo->Release();
-	}
-}
-
-void PostInfo::SetNZBInfo(NZBInfo* pNZBInfo)
-{
-	if (m_pNZBInfo)
-	{
-		m_pNZBInfo->Release();
-	}
-	m_pNZBInfo = pNZBInfo;
-	m_pNZBInfo->AddReference();
-}
-
-void PostInfo::SetInfoName(const char* szInfoName)
-{
-	m_szInfoName = strdup(szInfoName);
-}
-
-void PostInfo::SetProgressLabel(const char* szProgressLabel)
-{
-	if (m_szProgressLabel)
-	{
-		free(m_szProgressLabel);
-	}
-	m_szProgressLabel = strdup(szProgressLabel);
-}
-
-PostInfo::Messages* PostInfo::LockMessages()
-{
-	m_mutexLog.Lock();
-	return &m_Messages;
-}
-
-void PostInfo::UnlockMessages()
-{
-	m_mutexLog.Unlock();
-}
-
-void PostInfo::AppendMessage(Message::EKind eKind, const char * szText)
-{
-	m_mutexLog.Lock();
-	Message* pMessage = new Message(++m_iIDMessageGen, eKind, time(NULL), szText);
-	m_Messages.push_back(pMessage);
-
-	while (m_Messages.size() > (unsigned int)g_pOptions->GetLogBufferSize())
-	{
-		Message* pMessage = m_Messages.front();
-		delete pMessage;
-		m_Messages.pop_front();
-	}
-	m_mutexLog.Unlock();
-}
-
-void DownloadQueue::BuildGroups(GroupQueue* pGroupQueue)
-{
-	std::map<int, GroupInfo*> groupMap;
-
-	for (FileQueue::iterator it = GetFileQueue()->begin(); it != GetFileQueue()->end(); it++)
+    for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
     {
         FileInfo* pFileInfo = *it;
-		GroupInfo *&pGroupInfo = groupMap[pFileInfo->GetNZBInfo()->GetID()];
+		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();
@@ -809,10 +421,6 @@ void DownloadQueue::BuildGroups(GroupQueue* pGroupQueue)
 			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())
@@ -823,33 +431,11 @@ void DownloadQueue::BuildGroups(GroupQueue* pGroupQueue)
 		{
 			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];
@@ -862,151 +448,3 @@ void DownloadQueue::BuildGroups(GroupQueue* pGroupQueue)
 		}
 	}
 }
-
-
-UrlInfo::UrlInfo()
-{
-	//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)
-	{
-		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 iID)
-{
-	m_iID = iID;
-	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 iID)
-{
-	m_iID = iID;
-	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);
-	}
-}

DownloadInfo.h

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  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$
@@ -29,13 +29,49 @@
 
 #include <vector>
 #include <deque>
-#include <time.h>
 
-#include "Log.h"
 #include "Thread.h"
 
-class NZBInfo;
-class DownloadQueue;
+class NZBInfo
+{
+public:
+	typedef std::vector<char*>			Files;
+
+private:
+	int					m_iRefCount;
+	char* 				m_szFilename;
+	char* 				m_szDestDir;
+	char* 				m_szCategory;
+	int		 			m_iFileCount;
+	long long 			m_lSize;
+	Files				m_completedFiles;
+	bool				m_bPostProcess;
+	char*				m_szQueuedFilename;
+
+public:
+						NZBInfo();
+						~NZBInfo();
+	void				AddReference();
+	void				Release();
+	const char*			GetFilename() { return m_szFilename; }
+	void				SetFilename(const char* szFilename);
+	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)
+	long long 			GetSize() { return m_lSize; }
+	void 				SetSize(long long s) { m_lSize = s; }
+	int					GetFileCount() { return m_iFileCount; }
+	void 				SetFileCount(int s) { m_iFileCount = s; }
+	void				BuildDestDirName();
+	Files*				GetCompletedFiles() { return &m_completedFiles; }
+	bool				GetPostProcess() { return m_bPostProcess; }
+	void				SetPostProcess(bool b) { m_bPostProcess = b; }
+	const char*			GetQueuedFilename() { return m_szQueuedFilename; }
+	void				SetQueuedFilename(const char* szQueuedFilename);
+};
 
 class ArticleInfo
 {
@@ -85,18 +121,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;
-	char*				m_szOutputFilename;
-	Mutex*				m_pMutexOutputFile;
-	int					m_iPriority;
-	bool				m_bExtraPriority;
-	int					m_iActiveDownloads;
-	bool				m_bAutoDeleted;
+	Mutex				m_mutexOutputFile;
 
 	static int			m_iIDGen;
 
@@ -104,7 +134,7 @@ public:
 						FileInfo();
 						~FileInfo();
 	int					GetID() { return m_iID; }
-	void				SetID(int iID);
+	void				SetID(int s);
 	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
 	void				SetNZBInfo(NZBInfo* pNZBInfo);
 	Articles* 			GetArticles() { return &m_Articles; }
@@ -120,8 +150,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,22 +159,15 @@ public:
 	void				ClearArticles();
 	void				LockOutputFile();
 	void				UnlockOutputFile();
-	const char*			GetOutputFilename() { return m_szOutputFilename; }
-	void 				SetOutputFilename(const char* szOutputFilename);
 	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; }
-	bool				GetExtraPriority() { return m_bExtraPriority; }
-	void				SetExtraPriority(bool bExtraPriority) { m_bExtraPriority = bExtraPriority; };
-	int					GetActiveDownloads() { return m_iActiveDownloads; }
-	void				SetActiveDownloads(int iActiveDownloads);
-	bool				GetAutoDeleted() { return m_bAutoDeleted; }
-	void				SetAutoDeleted(bool bAutoDeleted) { m_bAutoDeleted = bAutoDeleted; }
 };
                               
-typedef std::deque<FileInfo*> FileQueue;
+typedef std::deque<FileInfo*> DownloadQueue;
+
+class GroupInfo;
+typedef std::deque<GroupInfo*> GroupQueue;
 
 class GroupInfo
 {
@@ -155,17 +176,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();
@@ -176,416 +189,9 @@ 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; }
-};
 
-typedef std::deque<GroupInfo*> GroupQueue;
-
-class NZBParameter
-{
-private:
-	char* 				m_szName;
-	char* 				m_szValue;
-
-	void				SetValue(const char* szValue);
-
-	friend class NZBParameterList;
-
-public:
-						NZBParameter(const char* szName);
-						~NZBParameter();
-	const char*			GetName() { return m_szName; }
-	const char*			GetValue() { return m_szValue; }
-};
-
-typedef std::deque<NZBParameter*> NZBParameterListBase;
-
-class NZBParameterList : public NZBParameterListBase
-{
-public:
-	void				SetParameter(const char* szName, const char* szValue);
-};
-
-class ScriptStatus
-{
-public:
-	enum EStatus
-	{
-		srNone,
-		srFailure,
-		srSuccess
-	};
-
-private:
-	char* 				m_szName;
-	EStatus				m_eStatus;
-	
-	friend class ScriptStatusList;
-	
-public:
-						ScriptStatus(const char* szName, EStatus eStatus);
-						~ScriptStatus();
-	const char*			GetName() { return m_szName; }
-	EStatus				GetStatus() { return m_eStatus; }
-};
-
-typedef std::deque<ScriptStatus*> ScriptStatusListBase;
-
-class ScriptStatusList : public ScriptStatusListBase
-{
-public:
-						~ScriptStatusList();
-	void				Add(const char* szScriptName, ScriptStatus::EStatus eStatus);
-	void				Clear();
-	ScriptStatus::EStatus	CalcTotalStatus();
-};
-
-class NZBInfoList;
-
-class NZBInfo
-{
-public:
-	enum ERenameStatus
-	{
-		rsNone,
-		rsSkipped,
-		rsFailure,
-		rsSuccess
-	};
-
-	enum EParStatus
-	{
-		psNone,
-		psSkipped,
-		psFailure,
-		psSuccess,
-		psRepairPossible,
-		psManual
-	};
-
-	enum EUnpackStatus
-	{
-		usNone,
-		usSkipped,
-		usFailure,
-		usSuccess
-	};
-
-	enum ECleanupStatus
-	{
-		csNone,
-		csFailure,
-		csSuccess
-	};
-
-	enum EMoveStatus
-	{
-		msNone,
-		msFailure,
-		msSuccess
-	};
-
-	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;
-	ERenameStatus		m_eRenameStatus;
-	EParStatus			m_eParStatus;
-	EUnpackStatus		m_eUnpackStatus;
-	ECleanupStatus		m_eCleanupStatus;
-	EMoveStatus			m_eMoveStatus;
-	char*				m_szQueuedFilename;
-	bool				m_bDeleted;
-	bool				m_bParCleanup;
-	bool				m_bParManual;
-	bool				m_bCleanupDisk;
-	bool				m_bUnpackCleanedUpDisk;
-	NZBInfoList*		m_Owner;
-	NZBParameterList	m_ppParameters;
-	ScriptStatusList	m_scriptStatuses;
-	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; }
-	void				SetID(int iID);
-	const char*			GetFilename() { return m_szFilename; }
-	void				SetFilename(const char* szFilename);
-	static void			MakeNiceNZBName(const char* szNZBFilename, char* szBuffer, int iSize, bool bRemoveExt);
-	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();
-	void				BuildFinalDirName(char* szFinalDirBuf, int iBufSize);
-	Files*				GetCompletedFiles() { return &m_completedFiles; }		// needs locking (for shared objects)
-	void				ClearCompletedFiles();
-	bool				GetPostProcess() { return m_bPostProcess; }
-	void				SetPostProcess(bool bPostProcess) { m_bPostProcess = bPostProcess; }
-	ERenameStatus		GetRenameStatus() { return m_eRenameStatus; }
-	void				SetRenameStatus(ERenameStatus eRenameStatus) { m_eRenameStatus = eRenameStatus; }
-	EParStatus			GetParStatus() { return m_eParStatus; }
-	void				SetParStatus(EParStatus eParStatus) { m_eParStatus = eParStatus; }
-	EUnpackStatus		GetUnpackStatus() { return m_eUnpackStatus; }
-	void				SetUnpackStatus(EUnpackStatus eUnpackStatus) { m_eUnpackStatus = eUnpackStatus; }
-	ECleanupStatus		GetCleanupStatus() { return m_eCleanupStatus; }
-	void				SetCleanupStatus(ECleanupStatus eCleanupStatus) { m_eCleanupStatus = eCleanupStatus; }
-	EMoveStatus			GetMoveStatus() { return m_eMoveStatus; }
-	void				SetMoveStatus(EMoveStatus eMoveStatus) { m_eMoveStatus = eMoveStatus; }
-	const char*			GetQueuedFilename() { return m_szQueuedFilename; }
-	void				SetQueuedFilename(const char* szQueuedFilename);
-	bool				GetDeleted() { return m_bDeleted; }
-	void				SetDeleted(bool bDeleted) { m_bDeleted = bDeleted; }
-	bool				GetParCleanup() { return m_bParCleanup; }
-	void				SetParCleanup(bool bParCleanup) { m_bParCleanup = bParCleanup; }
-	bool				GetCleanupDisk() { return m_bCleanupDisk; }
-	void				SetCleanupDisk(bool bCleanupDisk) { m_bCleanupDisk = bCleanupDisk; }
-	bool				GetUnpackCleanedUpDisk() { return m_bUnpackCleanedUpDisk; }
-	void				SetUnpackCleanedUpDisk(bool bUnpackCleanedUpDisk) { m_bUnpackCleanedUpDisk = bUnpackCleanedUpDisk; }
-	NZBParameterList*	GetParameters() { return &m_ppParameters; }				// needs locking (for shared objects)
-	void				SetParameter(const char* szName, const char* szValue);	// needs locking (for shared objects)
-	ScriptStatusList*	GetScriptStatuses() { return &m_scriptStatuses; }        // 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();
-};
-
-class PostInfo
-{
-public:
-	enum EStage
-	{
-		ptQueued,
-		ptLoadingPars,
-		ptVerifyingSources,
-		ptRepairing,
-		ptVerifyingRepaired,
-		ptRenaming,
-		ptUnpacking,
-		ptMoving,
-		ptExecutingScript,
-		ptFinished
-	};
-
-	typedef std::deque<Message*>	Messages;
-
-private:
-	int					m_iID;
-	NZBInfo*			m_pNZBInfo;
-	char*				m_szInfoName;
-	bool				m_bWorking;
-	bool				m_bDeleted;
-	bool				m_bRequestParCheck;
-	bool				m_bRequestParRename;
-	EStage				m_eStage;
-	char*				m_szProgressLabel;
-	int					m_iFileProgress;
-	int					m_iStageProgress;
-	time_t				m_tStartTime;
-	time_t				m_tStageTime;
-	Thread*				m_pPostThread;
-	
-	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*			GetInfoName() { return m_szInfoName; }
-	void				SetInfoName(const char* szInfoName);
-	EStage				GetStage() { return m_eStage; }
-	void				SetStage(EStage eStage) { m_eStage = eStage; }
-	void				SetProgressLabel(const char* szProgressLabel);
-	const char*			GetProgressLabel() { return m_szProgressLabel; }
-	int					GetFileProgress() { return m_iFileProgress; }
-	void				SetFileProgress(int iFileProgress) { m_iFileProgress = iFileProgress; }
-	int					GetStageProgress() { return m_iStageProgress; }
-	void				SetStageProgress(int iStageProgress) { m_iStageProgress = iStageProgress; }
-	time_t				GetStartTime() { return m_tStartTime; }
-	void				SetStartTime(time_t tStartTime) { m_tStartTime = tStartTime; }
-	time_t				GetStageTime() { return m_tStageTime; }
-	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				GetRequestParCheck() { return m_bRequestParCheck; }
-	void				SetRequestParCheck(bool bRequestParCheck) { m_bRequestParCheck = bRequestParCheck; }
-	bool				GetRequestParRename() { return m_bRequestParRename; }
-	void				SetRequestParRename(bool bRequestParRename) { m_bRequestParRename = bRequestParRename; }
-	void				AppendMessage(Message::EKind eKind, const char* szText);
-	Thread*				GetPostThread() { return m_pPostThread; }
-	void				SetPostThread(Thread* pPostThread) { m_pPostThread = pPostThread; }
-	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 iID);
-	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 iID);
-	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;
+	static void			BuildGroups(DownloadQueue* pDownloadQueue, GroupQueue* pGroupQueue);
 };
 
 #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-2013 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$
@@ -34,7 +34,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+#include <cstdio>
+#include <fstream>
 #ifndef WIN32
 #include <unistd.h>
 #include <arpa/inet.h>
@@ -48,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()
@@ -62,17 +65,18 @@ Frontend::Frontend()
 	m_iNeededLogEntries = 0;
 	m_bSummary = false;
 	m_bFileList = false;
-	m_iCurrentDownloadSpeed = 0;
+	m_fCurrentDownloadSpeed = 0;
 	m_lRemainingSize = 0;
-	m_bPauseDownload = false;
-	m_bPauseDownload2 = false;
-	m_iDownloadLimit = 0;
+	m_bPause = false;
+	m_fDownloadLimit = 0;
 	m_iThreadCount = 0;
 	m_iPostJobCount = 0;
 	m_iUpTimeSec = 0;
 	m_iDnTimeSec = 0;
 	m_iAllBytes = 0;
 	m_bStandBy = 0;
+	m_RemoteMessages.clear();
+	m_RemoteQueue.clear();
 	m_iUpdateInterval = g_pOptions->GetUpdateInterval();
 }
 
@@ -86,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;
 		}
@@ -95,15 +99,14 @@ bool Frontend::PrepareData()
 	{
 		if (m_bSummary)
 		{
-			m_iCurrentDownloadSpeed = g_pQueueCoordinator->CalcCurrentDownloadSpeed();
+			m_fCurrentDownloadSpeed = g_pQueueCoordinator->CalcCurrentDownloadSpeed();
 			m_lRemainingSize = g_pQueueCoordinator->CalcRemainingSize();
-			m_bPauseDownload = g_pOptions->GetPauseDownload();
-			m_bPauseDownload2 = g_pOptions->GetPauseDownload2();
-			m_iDownloadLimit = g_pOptions->GetDownloadRate();
+			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);
 		}
 	}
@@ -120,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();
 	}
 }
 
@@ -148,7 +151,7 @@ void Frontend::UnlockMessages()
 	}
 }
 
-DownloadQueue* Frontend::LockQueue()
+DownloadQueue * Frontend::LockQueue()
 {
 	if (IsRemoteMode())
 	{
@@ -173,35 +176,27 @@ 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
 	{
-		g_pOptions->SetResumeTime(0);
-		if (bSecondRegister)
-		{
-			g_pOptions->SetPauseDownload2(bPause);
-		}
-		else
-		{
-			g_pOptions->SetPauseDownload(bPause);
-		}
+		g_pOptions->SetPause(bPause);
 	}
 }
 
-void Frontend::ServerSetDownloadRate(int iRate)
+void Frontend::ServerSetDownloadRate(float fRate)
 {
 	if (IsRemoteMode())
 	{
-		RequestSetDownloadRate(iRate);
+		RequestSetDownloadRate(fRate);
 	}
 	else
 	{
-		g_pOptions->SetDownloadRate(iRate);
+		g_pOptions->SetDownloadRate(fRate);
 	}
 }
 
@@ -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,17 +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_szUsername, g_pOptions->GetControlUsername(), NZBREQUESTPASSWORDSIZE - 1);
-	pMessageBase->m_szUsername[NZBREQUESTPASSWORDSIZE - 1] = '\0';
-
-	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)
@@ -265,15 +257,15 @@ bool Frontend::RequestMessages()
 		LogRequest.m_iIDFrom = 0;
 	}
 
-	if (!connection.Send((char*)(&LogRequest), sizeof(LogRequest)))
+	if (connection.Send((char*)(&LogRequest), sizeof(LogRequest)) < 0)
 	{
 		return false;
 	}
 
 	// Now listen for the returned log
 	SNZBLogResponse LogResponse;
-	bool bRead = connection.Recv((char*) &LogResponse, sizeof(LogResponse));
-	if (!bRead || 
+	int iResponseLen = connection.Recv((char*) &LogResponse, sizeof(LogResponse));
+	if (iResponseLen != sizeof(LogResponse) || 
 		(int)ntohl(LogResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
 		ntohl(LogResponse.m_MessageBase.m_iStructSize) != sizeof(LogResponse))
 	{
@@ -284,7 +276,7 @@ bool Frontend::RequestMessages()
 	if (ntohl(LogResponse.m_iTrailingDataLength) > 0)
 	{
 		pBuf = (char*)malloc(ntohl(LogResponse.m_iTrailingDataLength));
-		if (!connection.Recv(pBuf, ntohl(LogResponse.m_iTrailingDataLength)))
+		if (!connection.RecvAll(pBuf, ntohl(LogResponse.m_iTrailingDataLength)))
 		{
 			free(pBuf);
 			return false;
@@ -316,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)
@@ -329,15 +322,15 @@ bool Frontend::RequestFileList()
 	ListRequest.m_bFileList = htonl(m_bFileList);
 	ListRequest.m_bServerState = htonl(m_bSummary);
 
-	if (!connection.Send((char*)(&ListRequest), sizeof(ListRequest)))
+	if (connection.Send((char*)(&ListRequest), sizeof(ListRequest)) < 0)
 	{
 		return false;
 	}
 
 	// Now listen for the returned list
 	SNZBListResponse ListResponse;
-	bool bRead = connection.Recv((char*) &ListResponse, sizeof(ListResponse));
-	if (!bRead || 
+	int iResponseLen = connection.Recv((char*) &ListResponse, sizeof(ListResponse));
+	if (iResponseLen != sizeof(ListResponse) || 
 		(int)ntohl(ListResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
 		ntohl(ListResponse.m_MessageBase.m_iStructSize) != sizeof(ListResponse))
 	{
@@ -348,7 +341,7 @@ bool Frontend::RequestFileList()
 	if (ntohl(ListResponse.m_iTrailingDataLength) > 0)
 	{
 		pBuf = (char*)malloc(ntohl(ListResponse.m_iTrailingDataLength));
-		if (!connection.Recv(pBuf, ntohl(ListResponse.m_iTrailingDataLength)))
+		if (!connection.RecvAll(pBuf, ntohl(ListResponse.m_iTrailingDataLength)))
 		{
 			free(pBuf);
 			return false;
@@ -359,26 +352,72 @@ 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_iCurrentDownloadSpeed = ntohl(ListResponse.m_iDownloadRate);
-		m_iDownloadLimit = ntohl(ListResponse.m_iDownloadLimit);
+		m_fCurrentDownloadSpeed = ntohl(ListResponse.m_iDownloadRate) / 1024.0f;
+		m_fDownloadLimit = ntohl(ListResponse.m_iDownloadLimit) / 1024.0f;
 		m_iThreadCount = ntohl(ListResponse.m_iThreadCount);
 		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));
 	}
 
 	if (m_bFileList && ntohl(ListResponse.m_iTrailingDataLength) > 0)
 	{
-		RemoteClient client;
-		client.SetVerbose(false);
-		client.BuildFileList(&ListResponse, pBuf, &m_RemoteQueue);
-	}
+		typedef std::deque<NZBInfo*> NZBList;
+		NZBList cNZBList;
 
+		char* pBufPtr = (char*)pBuf;
+		for (unsigned int i = 0; i < ntohl(ListResponse.m_iNrTrailingEntries); i++)
+		{
+			SNZBListResponseEntry* pListAnswer = (SNZBListResponseEntry*) pBufPtr;
+
+			char* szNZBFilename = pBufPtr + sizeof(SNZBListResponseEntry);
+			char* szSubject = pBufPtr + sizeof(SNZBListResponseEntry) + ntohl(pListAnswer->m_iNZBFilenameLen);
+			char* szFileName = pBufPtr + sizeof(SNZBListResponseEntry) + ntohl(pListAnswer->m_iNZBFilenameLen) + ntohl(pListAnswer->m_iSubjectLen);
+			char* szDestDir = pBufPtr + sizeof(SNZBListResponseEntry) + ntohl(pListAnswer->m_iNZBFilenameLen) + ntohl(pListAnswer->m_iSubjectLen) + ntohl(pListAnswer->m_iFilenameLen);
+			char* szCategory = pBufPtr + sizeof(SNZBListResponseEntry) + ntohl(pListAnswer->m_iNZBFilenameLen) + ntohl(pListAnswer->m_iSubjectLen) + ntohl(pListAnswer->m_iFilenameLen) + ntohl(pListAnswer->m_iDestDirLen);
+			
+			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)));
+			pFileInfo->SetPaused(ntohl(pListAnswer->m_bPaused));
+			pFileInfo->SetSubject(szSubject);
+			pFileInfo->SetFilename(szFileName);
+			pFileInfo->SetFilenameConfirmed(ntohl(pListAnswer->m_bFilenameConfirmed));
+
+			// find nzb-info or create new
+			NZBInfo* pNZBInfo = NULL;
+			for (NZBList::iterator it = cNZBList.begin(); it != cNZBList.end(); it++)
+			{
+				NZBInfo* pNZBInfo2 = *it;
+				if (!strcmp(pNZBInfo2->GetFilename(), szNZBFilename))
+				{
+					pNZBInfo = pNZBInfo2;
+					break;
+				}
+			}
+			if (!pNZBInfo)
+			{
+				pNZBInfo = new NZBInfo();
+				pNZBInfo->SetFilename(szNZBFilename);
+				pNZBInfo->SetDestDir(szDestDir);
+				pNZBInfo->SetCategory(szCategory);
+				cNZBList.push_back(pNZBInfo);
+			}
+
+			pFileInfo->SetNZBInfo(pNZBInfo);
+
+			m_RemoteQueue.push_back(pFileInfo);
+
+			pBufPtr += sizeof(SNZBListResponseEntry) + ntohl(pListAnswer->m_iNZBFilenameLen) +
+				ntohl(pListAnswer->m_iSubjectLen) + ntohl(pListAnswer->m_iFilenameLen) + 
+				ntohl(pListAnswer->m_iDestDirLen) + ntohl(pListAnswer->m_iCategoryLen);
+		}
+	}
 	if (pBuf)
 	{
 		free(pBuf);
@@ -387,18 +426,18 @@ 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(int iRate)
+bool Frontend::RequestSetDownloadRate(float fRate)
 {
 	RemoteClient client;
 	client.SetVerbose(false);
-	return client.RequestServerSetDownloadRate(iRate);
+	return client.RequestServerSetDownloadRate(fRate);
 }
 
 bool Frontend::RequestDumpDebug()
@@ -408,9 +447,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$
@@ -50,11 +50,10 @@ protected:
 	int					m_iUpdateInterval;
 
 	// summary
-	int					m_iCurrentDownloadSpeed;
+	float				m_fCurrentDownloadSpeed;
 	long long 			m_lRemainingSize;
-	bool				m_bPauseDownload;
-	bool				m_bPauseDownload2;
-	int					m_iDownloadLimit;
+	bool				m_bPause;
+	float				m_fDownloadLimit;
 	int					m_iThreadCount;
 	int					m_iPostJobCount;
 	int					m_iUpTimeSec;
@@ -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				ServerSetDownloadRate(int iRate);
-	bool				RequestSetDownloadRate(int iRate);
+	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-2013 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,15 +30,13 @@
 
 #ifdef WIN32
 #include "win32.h"
-#else
-#include <pthread.h>
 #endif
 
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <stdarg.h>
-#include <stdio.h>
+#include <cstdio>
 
 #include "nzbget.h"
 #include "Options.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,166 +1,20 @@
-#
-#  This file if part of nzbget
-#
-# Copyright (C) 2008-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-#
-
 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 \
-	Observer.h Options.cpp Options.h ParChecker.cpp ParChecker.h ParRenamer.cpp ParRenamer.h \
-	ParCoordinator.cpp ParCoordinator.h PrePostProcessor.cpp PrePostProcessor.h QueueCoordinator.cpp \
+	NZBFile.h NetAddress.cpp NetAddress.h NewsServer.cpp NewsServer.h Observer.cpp \
+	Observer.h Options.cpp Options.h ParChecker.cpp ParChecker.h PostInfo.cpp \
+	PostInfo.h PrePostProcessor.cpp PrePostProcessor.h QueueCoordinator.cpp \
 	QueueCoordinator.h QueueEditor.cpp QueueEditor.h RemoteClient.cpp RemoteClient.h \
-	RemoteServer.cpp RemoteServer.h Scanner.cpp Scanner.h Scheduler.cpp Scheduler.h ScriptController.cpp \
-	ScriptController.h ServerPool.cpp ServerPool.h svn_version.cpp TLS.cpp TLS.h Thread.cpp Thread.h \
-	Util.cpp Util.h XmlRpc.cpp XmlRpc.h WebDownloader.cpp WebDownloader.h WebServer.cpp WebServer.h \
-	UrlCoordinator.cpp UrlCoordinator.h Unpack.cpp Unpack.h nzbget.cpp nzbget.h
+	RemoteServer.cpp RemoteServer.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 \
-	$(patches_FILES) $(windows_FILES)
-
-patches_FILES = \
-	libpar2-0.2-bugfixes.patch libpar2-0.2-cancel.patch \
-	libpar2-0.2-MSVC8.patch libsigc++-2.0.18-MSVC8.patch
-
-windows_FILES = \
-	win32.h NTService.cpp NTService.h nzbget.sln nzbget.vcproj nzbget-shell.bat
-
-doc_FILES = \
-	README ChangeLog COPYING
-
-exampleconf_FILES = \
-	nzbget.conf
-
-webui_FILES = \
-	webui/index.html webui/index.js webui/downloads.js webui/edit.js webui/fasttable.js \
-	webui/history.js webui/messages.js webui/status.js webui/style.css webui/upload.js \
-	webui/util.js webui/config.js \
-	webui/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
-
-ppscripts_FILES = \
-	ppscripts/EMail.py ppscripts/Logger.py
-
-# Install
-sbin_SCRIPTS = nzbgetd
-dist_doc_DATA = $(doc_FILES)
-exampleconfdir = $(datadir)/nzbget
-dist_exampleconf_DATA = $(exampleconf_FILES)
-webuidir = $(datadir)/nzbget
-nobase_dist_webui_DATA = $(webui_FILES)
-ppscriptsdir = $(datadir)/nzbget
-nobase_dist_ppscripts_SCRIPTS = $(ppscripts_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 file
-install-data-hook:
-	rm -f "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	cp "$(DESTDIR)$(exampleconfdir)/nzbget.conf" "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:^ConfigTemplate=:ConfigTemplate=$(exampleconfdir)/nzbget.conf:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
-	sed 's:configuration file (typically installed:configuration file (installed:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:/usr/local/share/nzbget/nzbget.conf):$(exampleconfdir)/nzbget.conf):' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
-	sed 's:^WebDir=:WebDir=$(webuidir)/webui:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:typically installed to /usr/local/share/nzbget/ppscripts:installed to $(ppscriptsdir)/ppscripts:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
-	rm "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-
-# Install configuration files into /etc
-# (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" ; \
-	fi
-
-uninstall-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 '{}' ';'
+EXTRA_DIST = nzbget.conf.example postprocess-example.sh \
+	win32.h NTService.cpp NTService.h \
+	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-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-#
-
-
-
-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,27 +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) $(nobase_dist_ppscripts_SCRIPTS) \
-	$(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)$(ppscriptsdir)" \
-	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(docdir)" \
-	"$(DESTDIR)$(exampleconfdir)" "$(DESTDIR)$(webuidir)"
+am__installdirs = "$(DESTDIR)$(bindir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
 am_nzbget_OBJECTS = ArticleDownloader.$(OBJEXT) BinRpc.$(OBJEXT) \
@@ -87,29 +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) ParRenamer.$(OBJEXT) \
-	ParCoordinator.$(OBJEXT) PrePostProcessor.$(OBJEXT) \
+	NZBFile.$(OBJEXT) NetAddress.$(OBJEXT) NewsServer.$(OBJEXT) \
+	Observer.$(OBJEXT) Options.$(OBJEXT) ParChecker.$(OBJEXT) \
+	PostInfo.$(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) Unpack.$(OBJEXT) \
+	ScriptController.$(OBJEXT) ServerPool.$(OBJEXT) TLS.$(OBJEXT) \
+	Thread.$(OBJEXT) Util.$(OBJEXT) XmlRpc.$(OBJEXT) \
 	nzbget.$(OBJEXT)
 nzbget_OBJECTS = $(am_nzbget_OBJECTS)
 nzbget_LDADD = $(LDADD)
-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|^.*/||'`;
-nobase_dist_ppscriptsSCRIPT_INSTALL = $(install_sh_SCRIPT)
-sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
-SCRIPTS = $(nobase_dist_ppscripts_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) \
@@ -123,11 +79,6 @@ CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(nzbget_SOURCES)
 DIST_SOURCES = $(nzbget_SOURCES)
-dist_docDATA_INSTALL = $(INSTALL_DATA)
-dist_exampleconfDATA_INSTALL = $(INSTALL_DATA)
-nobase_dist_webuiDATA_INSTALL = $(install_sh_DATA)
-DATA = $(dist_doc_DATA) $(dist_exampleconf_DATA) \
-	$(nobase_dist_webui_DATA)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -140,14 +91,20 @@ 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@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+ADDSRCS = @ADDSRCS@
 AMTAR = @AMTAR@
+AR = @AR@
 AUTOCONF = @AUTOCONF@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CP = @CP@
+CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -161,7 +118,9 @@ ECHO_N = @ECHO_N@
 ECHO_T = @ECHO_T@
 EGREP = @EGREP@
 EXEEXT = @EXEEXT@
+FALSE = @FALSE@
 GREP = @GREP@
+INSTALL = @INSTALL@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -169,9 +128,15 @@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 LDFLAGS = @LDFLAGS@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
+LIBSIGC_CFLAGS = @LIBSIGC_CFLAGS@
+LIBSIGC_LIBS = @LIBSIGC_LIBS@
+LN = @LN@
 LTLIBOBJS = @LTLIBOBJS@
 MAKE = @MAKE@
 MAKEINFO = @MAKEINFO@
+MKDIR = @MKDIR@
+MKDIR_P = @MKDIR_P@
+MV = @MV@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
 PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
@@ -181,14 +146,20 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+RM = @RM@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
+TRUE = @TRUE@
 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@
@@ -200,6 +171,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@
@@ -216,90 +188,39 @@ infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
-libsigc_CFLAGS = @libsigc_CFLAGS@
-libsigc_LIBS = @libsigc_LIBS@
-libxml2_CFLAGS = @libxml2_CFLAGS@
-libxml2_LIBS = @libxml2_LIBS@
 localedir = @localedir@
 localstatedir = @localstatedir@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 oldincludedir = @oldincludedir@
-openssl_CFLAGS = @openssl_CFLAGS@
-openssl_LIBS = @openssl_LIBS@
 pdfdir = @pdfdir@
 prefix = @prefix@
 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 \
-	Observer.h Options.cpp Options.h ParChecker.cpp ParChecker.h ParRenamer.cpp ParRenamer.h \
-	ParCoordinator.cpp ParCoordinator.h PrePostProcessor.cpp PrePostProcessor.h QueueCoordinator.cpp \
+	NZBFile.h NetAddress.cpp NetAddress.h NewsServer.cpp NewsServer.h Observer.cpp \
+	Observer.h Options.cpp Options.h ParChecker.cpp ParChecker.h PostInfo.cpp \
+	PostInfo.h PrePostProcessor.cpp PrePostProcessor.h QueueCoordinator.cpp \
 	QueueCoordinator.h QueueEditor.cpp QueueEditor.h RemoteClient.cpp RemoteClient.h \
-	RemoteServer.cpp RemoteServer.h Scanner.cpp Scanner.h Scheduler.cpp Scheduler.h ScriptController.cpp \
-	ScriptController.h ServerPool.cpp ServerPool.h svn_version.cpp TLS.cpp TLS.h Thread.cpp Thread.h \
-	Util.cpp Util.h XmlRpc.cpp XmlRpc.h WebDownloader.cpp WebDownloader.h WebServer.cpp WebServer.h \
-	UrlCoordinator.cpp UrlCoordinator.h Unpack.cpp Unpack.h nzbget.cpp nzbget.h
+	RemoteServer.cpp RemoteServer.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 \
-	$(patches_FILES) $(windows_FILES)
-
-patches_FILES = \
-	libpar2-0.2-bugfixes.patch libpar2-0.2-cancel.patch \
-	libpar2-0.2-MSVC8.patch libsigc++-2.0.18-MSVC8.patch
-
-windows_FILES = \
-	win32.h NTService.cpp NTService.h nzbget.sln nzbget.vcproj nzbget-shell.bat
-
-doc_FILES = \
-	README ChangeLog COPYING
-
-exampleconf_FILES = \
-	nzbget.conf
-
-webui_FILES = \
-	webui/index.html webui/index.js webui/downloads.js webui/edit.js webui/fasttable.js \
-	webui/history.js webui/messages.js webui/status.js webui/style.css webui/upload.js \
-	webui/util.js webui/config.js \
-	webui/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
-
-ppscripts_FILES = \
-	ppscripts/EMail.py ppscripts/Logger.py
-
-
-# Install
-sbin_SCRIPTS = nzbgetd
-dist_doc_DATA = $(doc_FILES)
-exampleconfdir = $(datadir)/nzbget
-dist_exampleconf_DATA = $(exampleconf_FILES)
-webuidir = $(datadir)/nzbget
-nobase_dist_webui_DATA = $(webui_FILES)
-ppscriptsdir = $(datadir)/nzbget
-nobase_dist_ppscripts_SCRIPTS = $(ppscripts_FILES)
-
-# Ignore "svn_version.cpp" in distcleancheck
-distcleancheck_listfiles = \
-	find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
-	sh '{}' ';'
+EXTRA_DIST = nzbget.conf.example postprocess-example.sh \
+	win32.h NTService.cpp NTService.h \
+	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
@@ -343,7 +264,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
@@ -358,7 +279,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 \
@@ -381,51 +302,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-nobase_dist_ppscriptsSCRIPTS: $(nobase_dist_ppscripts_SCRIPTS)
-	@$(NORMAL_INSTALL)
-	test -z "$(ppscriptsdir)" || $(mkdir_p) "$(DESTDIR)$(ppscriptsdir)"
-	@$(am__vpath_adj_setup) \
-	list='$(nobase_dist_ppscripts_SCRIPTS)'; for p in $$list; do \
-	  $(am__vpath_adj) p=$$f; \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  if test -f $$d$$p; then \
-	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	    f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
-	    echo " $(nobase_dist_ppscriptsSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(ppscriptsdir)/$$f'"; \
-	    $(nobase_dist_ppscriptsSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(ppscriptsdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-nobase_dist_ppscriptsSCRIPTS:
-	@$(NORMAL_UNINSTALL)
-	@$(am__vpath_adj_setup) \
-	list='$(nobase_dist_ppscripts_SCRIPTS)'; for p in $$list; do \
-	  $(am__vpath_adj) p=$$f; \
-	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
-	  f=`echo "$$p" | sed 's|[^/]*$$||'`"$$f"; \
-	  echo " rm -f '$(DESTDIR)$(ppscriptsdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(ppscriptsdir)/$$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)
@@ -446,99 +323,38 @@ 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@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParChecker.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParCoordinator.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ParRenamer.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PostInfo.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/PrePostProcessor.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/QueueCoordinator.Po@am__quote@
 @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)/Unpack.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-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)'; \
@@ -590,24 +406,22 @@ distclean-tags:
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/ppscripts $(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; \
@@ -618,13 +432,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
@@ -699,7 +510,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 \
@@ -720,10 +531,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)$(ppscriptsdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(exampleconfdir)" "$(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
@@ -770,20 +581,22 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_docDATA install-dist_exampleconfDATA \
-	install-nobase_dist_ppscriptsSCRIPTS \
-	install-nobase_dist_webuiDATA
-	@$(NORMAL_INSTALL)
-	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-data-am:
 
-install-exec-am: install-binPROGRAMS 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
@@ -805,113 +618,27 @@ ps: ps-am
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
-	uninstall-dist_exampleconfDATA uninstall-info-am \
-	uninstall-nobase_dist_ppscriptsSCRIPTS \
-	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-data install-data-am \
-	install-data-hook install-dist_docDATA \
-	install-dist_exampleconfDATA install-exec install-exec-am \
-	install-exec-hook install-info install-info-am install-man \
-	install-nobase_dist_ppscriptsSCRIPTS \
-	install-nobase_dist_webuiDATA install-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 \
-	uninstall-dist_docDATA uninstall-dist_exampleconfDATA \
-	uninstall-info-am uninstall-nobase_dist_ppscriptsSCRIPTS \
-	uninstall-nobase_dist_webuiDATA uninstall-sbinSCRIPTS
+	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 file
-install-data-hook:
-	rm -f "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	cp "$(DESTDIR)$(exampleconfdir)/nzbget.conf" "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:^ConfigTemplate=:ConfigTemplate=$(exampleconfdir)/nzbget.conf:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
-	sed 's:configuration file (typically installed:configuration file (installed:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:/usr/local/share/nzbget/nzbget.conf):$(exampleconfdir)/nzbget.conf):' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
-	sed 's:^WebDir=:WebDir=$(webuidir)/webui:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:typically installed to /usr/local/share/nzbget/ppscripts:installed to $(ppscriptsdir)/ppscripts:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
-	rm "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-
-# Install configuration files into /etc
-# (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" ; \
-	fi
-
-uninstall-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

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2005  Bo Cordes Petersen <placebodk@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,7 +27,7 @@
 #ifndef MESSAGEBASE_H
 #define MESSAGEBASE_H
 
-static const int32_t NZBMESSAGE_SIGNATURE = 0x6E7A6217; // = "nzb-XX" (protocol version)
+static const int32_t NZBMESSAGE_SIGNATURE = 0x6E7A6203; // = "nzb3" (nzb version 3)
 static const int NZBREQUESTFILENAMESIZE = 512;
 static const int NZBREQUESTPASSWORDSIZE = 32;
 
@@ -35,14 +35,8 @@ static const int NZBREQUESTPASSWORDSIZE = 32;
  * NZBGet communication protocol uses only two basic data types: integer and char.
  * Integer values are passed using network byte order (Big-Endian).
  * Use function "htonl" and "ntohl" to convert integers to/from machine 
- * (host) byte order.
+ ' (host) byte order.
  * All char-strings ends with NULL-char.
- *
- * NOTE: 
- * NZBGet communication protocol is intended for usage only by NZBGet itself.
- * The communication works only if server and client has the same version.
- * The compatibility with previous program versions is not provided.
- * Third-party programs should use JSON-RPC or XML-RPC to communicate with NZBGet.
  */
 
 // Possible values for field "m_iType" of struct "SNZBRequestBase":
@@ -56,14 +50,9 @@ enum eRemoteRequest
 	eRemoteRequestEditQueue,
 	eRemoteRequestLog,
 	eRemoteRequestShutdown,
-	eRemoteRequestReload,
 	eRemoteRequestVersion,
 	eRemoteRequestPostQueue,
-	eRemoteRequestWriteLog,
-	eRemoteRequestScan,
-	eRemoteRequestHistory,
-	eRemoteRequestDownloadUrl,
-	eRemoteRequestUrlQueue
+	eRemoteRequestWriteLog
 };
 
 // Possible values for field "m_iAction" of struct "SNZBEditQueueRequest":
@@ -71,55 +60,23 @@ 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)
-	eRemoteEditActionFileSplit,				// split - create new group from selected files
-	eRemoteEditActionGroupMoveOffset,		// move group to m_iOffset relative to the current position in download-queue
-	eRemoteEditActionGroupMoveTop,			// move group to the top of download-queue
-	eRemoteEditActionGroupMoveBottom,		// move group to the bottom of download-queue
-	eRemoteEditActionGroupPause,			// pause group
-	eRemoteEditActionGroupResume,			// resume (unpause) group
-	eRemoteEditActionGroupDelete,			// delete group
-	eRemoteEditActionGroupPauseAllPars,		// pause only (all) pars (does not affect other files) in group
-	eRemoteEditActionGroupPauseExtraPars,	// pause only (almost all) pars in group, except main par-file (does not affect other files)
-	eRemoteEditActionGroupSetPriority,		// set priority for groups
-	eRemoteEditActionGroupSetCategory,		// set or change category for a group
-	eRemoteEditActionGroupMerge,			// merge group
-	eRemoteEditActionGroupSetParameter,		// set post-process parameter for group
-	eRemoteEditActionGroupSetName,			// set group name (rename group)
-	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
-	eRemoteEditActionHistorySetParameter	// set post-process parameter for history-item
-};
-
-// 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
+	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
 };
 
 // The basic SNZBRequestBase struct, used in all requests
@@ -128,8 +85,7 @@ struct SNZBRequestBase
 	int32_t					m_iSignature;			// Signature must be NZBMESSAGE_SIGNATURE in integer-value
 	int32_t					m_iStructSize;			// Size of the entire struct
 	int32_t					m_iType;				// Message type, see enum in NZBMessageRequest-namespace
-	char					m_szUsername[NZBREQUESTPASSWORDSIZE];	// User name
-	char					m_szPassword[NZBREQUESTPASSWORDSIZE];	// Password
+	char					m_szPassword[NZBREQUESTPASSWORDSIZE];	// Password needs to be in every request
 };
 
 // The basic SNZBResposneBase struct, used in all responses
@@ -144,10 +100,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
 };
@@ -167,9 +121,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
@@ -181,73 +132,39 @@ 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_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
-	// SNZBListResponseEntry m_NZBEntries[m_iNrTrailingNZBEntries]			// variable sized
-	// SNZBListResponseEntry m_PPPEntries[m_iNrTrailingPPPEntries]			// variable sized
-	// SNZBListResponseEntry m_FileEntries[m_iNrTrailingFileEntries]		// variable sized
+	int32_t					m_bServerStandBy;		// 0 - there are currently downloads running, 1 - no downloads in progress (server paused or all jobs completed)
+	int32_t					m_iNrTrailingEntries;	// Number of List-entries, following to this structure
+	int32_t					m_iTrailingDataLength;	// Length of all List-entries, following to this structure
+	// SNZBListResponseEntry m_Entries[m_iNrTrailingEntries]		// variable sized
 };
 
-// A list response nzb entry
-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
-};
-
-// A list response pp-parameter entry
-struct SNZBListResponsePPPEntry
-{
-	int32_t					m_iNZBIndex;			// Index of NZB-Entry in m_NZBEntries-list
-	int32_t					m_iNameLen;				// Length of Name-string (m_szName), following to this record
-	int32_t					m_iValueLen;			// Length of Value-string (m_szValue), following to this record
-	//char					m_szName[m_iNameLen];	// variable sized
-	//char					m_szValue[m_iValueLen];	// variable sized
-};
-
-// A list response file entry
-struct SNZBListResponseFileEntry
+// A list response entry
+struct SNZBListResponseEntry
 {
 	int32_t					m_iID;					// Entry-ID
-	int32_t					m_iNZBIndex;			// Index of NZB-Entry in m_NZBEntries-list
 	int32_t					m_iFileSizeLo;			// Filesize in bytes, Low 32-bits of 64-bit value
 	int32_t					m_iFileSizeHi;			// Filesize in bytes, High 32-bits of 64-bit value
 	int32_t					m_iRemainingSizeLo;		// Remaining size in bytes, Low 32-bits of 64-bit value
 	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_iNZBFilenameLen;		// Length of NZBFileName-string (m_szNZBFilename), following to this record
 	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
+	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
+	//char					m_szNZBFilename[m_iNZBFilenameLen];	// variable sized, may contain full path (local path on client) or only filename
 	//char					m_szSubject[m_iSubjectLen];			// variable sized
 	//char					m_szFilename[m_iFilenameLen];		// variable sized
+	//char					m_szDestDir[m_iDestDirLen];			// variable sized
+	//char					m_szCategory[m_iCategoryLen];		// variable sized
 };
 
 // A log request
@@ -283,7 +200,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
@@ -311,23 +227,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
@@ -369,21 +281,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
 {
@@ -425,10 +322,12 @@ struct SNZBPostQueueResponseEntry
 	int32_t					m_iTotalTimeSec;		// Number of seconds this post-job is beeing processed (after it first changed the state from QUEUED).
 	int32_t					m_iStageTimeSec;		// Number of seconds the current stage is beeing processed.
 	int32_t					m_iNZBFilenameLen;		// Length of NZBFileName-string (m_szNZBFilename), following to this record
+	int32_t					m_iParFilename;			// Length of ParFilename-string (m_szParFilename), following to this record
 	int32_t					m_iInfoNameLen;			// Length of Filename-string (m_szFilename), following to this record
 	int32_t					m_iDestDirLen;			// Length of DestDir-string (m_szDestDir), following to this record
 	int32_t					m_iProgressLabelLen;	// Length of ProgressLabel-string (m_szProgressLabel), following to this record
 	//char					m_szNZBFilename[m_iNZBFilenameLen];		// variable sized, may contain full path (local path on client) or only filename
+	//char					m_szParFilename[m_iParFilename];		// variable sized
 	//char					m_szInfoName[m_iInfoNameLen];			// variable sized
 	//char					m_szDestDir[m_iDestDirLen];				// variable sized
 	//char					m_szProgressLabel[m_iProgressLabelLen];	// variable sized
@@ -443,7 +342,7 @@ struct SNZBWriteLogRequest
 	//char					m_szText[m_iTrailingDataLength];	// variable sized
 };
 
-// Write log response
+// Write log  response
 struct SNZBWriteLogResponse
 {
 	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
@@ -452,102 +351,4 @@ struct SNZBWriteLogResponse
 	//char					m_szText[m_iTrailingDataLength];	// variable sized
 };
 
-// Scan nzb directory request
-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
-struct SNZBScanResponse
-{
-	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
-};
-
-// 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;
 	}
@@ -613,10 +603,10 @@ void NCursesFrontend::PrintStatus()
     char timeString[100];
     timeString[0] = '\0';
 
-	int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
-    if (iCurrentDownloadSpeed > 0 && !(m_bPauseDownload || m_bPauseDownload2))
+	float fCurrentDownloadSpeed = m_bStandBy ? 0 : m_fCurrentDownloadSpeed;
+    if (fCurrentDownloadSpeed > 0.0 && !m_bPause)
     {
-        long long remain_sec = (long long)(m_lRemainingSize / iCurrentDownloadSpeed);
+        long long remain_sec = (long long)(m_lRemainingSize / (fCurrentDownloadSpeed * 1024));
 		int h = (int)(remain_sec / 3600);
 		int m = (int)((remain_sec % 3600) / 60);
 		int s = (int)(remain_sec % 60);
@@ -624,9 +614,9 @@ void NCursesFrontend::PrintStatus()
     }
 
     char szDownloadLimit[128];
-    if (m_iDownloadLimit > 0)
+    if (m_fDownloadLimit > 0.0f)
     {
-        sprintf(szDownloadLimit, ", Limit %.0f KB/s", (float)m_iDownloadLimit / 1024.0);
+        sprintf(szDownloadLimit, ", Limit %.0f KB/s", m_fDownloadLimit);
     }
     else
     {
@@ -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, (iCurrentDownloadSpeed >= 10*1024 ? 0 : 1), (float)iCurrentDownloadSpeed / 1024.0, 
-		(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;
 
@@ -785,15 +771,14 @@ void NCursesFrontend::PrintFileQueue()
         }
 		
 		char szRemaining[20];
-		Util::FormatFileSize(szRemaining, sizeof(szRemaining), lRemaining);
+		FormatFileSize(szRemaining, sizeof(szRemaining), lRemaining);
 
 		char szUnpaused[20];
-		Util::FormatFileSize(szUnpaused, sizeof(szUnpaused), lRemaining - lPaused);
+		FormatFileSize(szUnpaused, sizeof(szUnpaused), lRemaining - lPaused);
 		
 		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,15 +825,35 @@ 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';
 
 	PlotLine(szBuffer, iRow, 0, color);
 }
 
+void NCursesFrontend::FormatFileSize(char * szBuffer, int iBufLen, long long lFileSize)
+{
+	if (lFileSize > 1024 * 1024 * 1024)
+	{
+		snprintf(szBuffer, iBufLen, "%.2f GB", (float)(Util::Int64ToFloat(lFileSize) / 1024 / 1024 / 1024));
+	}
+	else if (lFileSize > 1024 * 1024)
+	{
+		snprintf(szBuffer, iBufLen, "%.2f MB", (float)(Util::Int64ToFloat(lFileSize) / 1024 / 1024));
+	}
+	else if (lFileSize > 1024)
+	{
+		snprintf(szBuffer, iBufLen, "%.2f KB", (float)(Util::Int64ToFloat(lFileSize) / 1024));
+	}
+	else 
+	{
+		snprintf(szBuffer, iBufLen, "%i", (int)lFileSize);
+	}
+	szBuffer[iBufLen - 1] = '\0';
+}
+
 void NCursesFrontend::PrintTopHeader(char* szHeader, int iLineNr, bool bUpTime)
 {
     char szBuffer[MAX_SCREEN_WIDTH];
@@ -926,7 +918,6 @@ void NCursesFrontend::PrintGroupQueue()
 {
 	int iLineNr = m_iQueueWinTop;
 
-    LockQueue();
 	GroupQueue* pGroupQueue = &m_groupQueue;
 	if (pGroupQueue->empty())
     {
@@ -939,9 +930,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 +939,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();
@@ -970,10 +947,10 @@ void NCursesFrontend::PrintGroupQueue()
         }
 		
 		char szRemaining[20];
-		Util::FormatFileSize(szRemaining, sizeof(szRemaining), lRemaining);
+		FormatFileSize(szRemaining, sizeof(szRemaining), lRemaining);
 
 		char szUnpaused[20];
-		Util::FormatFileSize(szUnpaused, sizeof(szUnpaused), lRemaining - lPaused);
+		FormatFileSize(szUnpaused, sizeof(szUnpaused), lRemaining - lPaused);
 		
 		char szBuffer[MAX_SCREEN_WIDTH];
 		snprintf(szBuffer, sizeof(szBuffer), " %sNZBs for downloading - %i NZBs in queue - %s / %s", 
@@ -981,140 +958,50 @@ 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();
 
 	char szRemaining[20];
-	Util::FormatFileSize(szRemaining, sizeof(szRemaining), lUnpausedRemainingSize);
+	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];
+		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';
-		int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
-		if (pGroupInfo->GetPausedSize() > 0 && lUnpausedRemainingSize == 0)
-		{
-			snprintf(szTime, 100, "[paused]");
-			Util::FormatFileSize(szRemaining, sizeof(szRemaining), pGroupInfo->GetRemainingSize());
-		}
-		else if (iCurrentDownloadSpeed > 0 && !(m_bPauseDownload || m_bPauseDownload2))
-		{
-			long long remain_sec = (long long)(lUnpausedRemainingSize / iCurrentDownloadSpeed);
-			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 +1009,7 @@ void NCursesFrontend::PrepareGroupQueue()
 	m_groupQueue.clear();
 
     DownloadQueue* pDownloadQueue = LockQueue();
-	pDownloadQueue->BuildGroups(&m_groupQueue);
+	GroupInfo::BuildGroups(pDownloadQueue, &m_groupQueue);
 	UnlockQueue();
 }
 
@@ -1181,9 +1068,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 +1193,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();
@@ -1448,7 +1335,7 @@ void NCursesFrontend::UpdateInput(int initialKey)
 			// Enter
 			else if (iKey == 10 || iKey == 13)
 			{
-				ServerSetDownloadRate(m_iInputValue * 1024);
+				ServerSetDownloadRate((float)m_iInputValue);
 				m_eInputMode = eNormal;
 				return;
 			}

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();
@@ -110,6 +105,7 @@ private:
 	void			Update(int iKey);
 	void			SetCurrentQueueEntry(int iEntry);
 	void			CalcWindowSizes();
+	void			FormatFileSize(char* szBuffer, int iBufLen, long long lFileSize);
 	void			RefreshScreen();
 	int				ReadConsoleKey();
 	int				CalcQueueSize();

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
@@ -34,7 +34,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+#include <cstdio>
 
 #include "nzbget.h"
 #include "Log.h"
@@ -44,13 +44,11 @@
 
 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;
-	SetCipher(pNewsServer->GetCipher());
 }
 
 NNTPConnection::~NNTPConnection()
@@ -83,16 +81,19 @@ 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())
 		{
+			m_bAuthError = true;
 			return NULL;
 		}
 
 		//try again
 		WriteLine(req);
 		answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
+		return answer;
 	}
 
 	return answer;
@@ -100,16 +101,13 @@ const char* NNTPConnection::Request(const char* req)
 
 bool NNTPConnection::Authenticate()
 {
-	if (!m_pNewsServer->GetUser() || strlen(m_pNewsServer->GetUser()) == 0 || 
-		!m_pNewsServer->GetPassword() || strlen(m_pNewsServer->GetPassword()) == 0)
+	if (!((NewsServer*)m_pNetAddress)->GetUser() ||
+		!((NewsServer*)m_pNetAddress)->GetPassword())
 	{
-		error("Server%i (%s) requested authorization but username/password are not set in settings", m_pNewsServer->GetID(), m_pNewsServer->GetHost());
-		m_bAuthError = true;
-		return false;
+		return true;
 	}
 
-	m_bAuthError = !AuthInfoUser(0);
-	return !m_bAuthError;
+	return AuthInfoUser();
 }
 
 bool NNTPConnection::AuthInfoUser(int iRecur)
@@ -120,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);
@@ -128,13 +126,13 @@ bool NNTPConnection::AuthInfoUser(int iRecur)
 	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 	if (!answer)
 	{
-		ReportErrorAnswer("Authorization for server%i (%s) failed: Connection closed by remote host", NULL);
+		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))
@@ -150,7 +148,7 @@ bool NNTPConnection::AuthInfoUser(int iRecur)
 
 	if (GetStatus() != csCancelled)
 	{
-		ReportErrorAnswer("Authorization for server%i (%s) failed (Answer: %s)", answer);
+		ReportErrorAnswer("Authorization for %s failed (Answer: %s)", answer);
 	}
 	return false;
 }
@@ -163,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);
@@ -171,12 +169,12 @@ bool NNTPConnection::AuthInfoPass(int iRecur)
 	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 	if (!answer)
 	{
-		ReportErrorAnswer("Authorization for server%i (%s) failed: Connection closed by remote host", NULL);
+		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))
@@ -188,7 +186,7 @@ bool NNTPConnection::AuthInfoPass(int iRecur)
 
 	if (GetStatus() != csCancelled)
 	{
-		ReportErrorAnswer("Authorization for server%i (%s) failed (Answer: %s)", answer);
+		ReportErrorAnswer("Authorization for %s failed (Answer: %s)", answer);
 	}
 	return false;
 }
@@ -207,10 +205,14 @@ const char* NNTPConnection::JoinGroup(const char* grp)
 	tmp[1024-1] = '\0';
 
 	const char* answer = Request(tmp);
+	if (m_bAuthError)
+	{
+		return answer;
+	}
 
 	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)
 		{
@@ -220,55 +222,52 @@ 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;
 }
 
-bool NNTPConnection::Connect()
+bool NNTPConnection::DoConnect()
 {
-	debug("Opening connection to %s", GetHost());
-
-	if (m_eStatus == csConnected)
+	debug("Opening connection to %s", GetServer()->GetHost());
+	bool res = Connection::DoConnect();
+	if (!res)
 	{
-		return true;
+		return res;
 	}
 
-	if (!Connection::Connect())
+#ifndef DISABLE_TLS
+	if (GetNewsServer()->GetTLS())
 	{
-		return false;
+		if (!StartTLS())
+		{
+			return false;
+		}
 	}
+#endif
 
-	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
+	char* answer = DoReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 
 	if (!answer)
 	{
-		ReportErrorAnswer("Connection to server%i (%s) failed: Connection closed by remote host", NULL);
-		Disconnect();
+		ReportError("Connection to %s failed: Connection closed by remote host.", m_pNetAddress->GetHost(), true, 0);
 		return false;
 	}
 
 	if (strncmp(answer, "2", 1))
 	{
-		ReportErrorAnswer("Connection to server%i (%s) failed (Answer: %s)", answer);
-		Disconnect();
+		ReportErrorAnswer("Connection to %s failed (Answer: %s)", answer);
 		return false;
 	}
 
-	if ((m_pNewsServer->GetUser() && strlen(m_pNewsServer->GetUser()) > 0 &&
-		 m_pNewsServer->GetPassword() && strlen(m_pNewsServer->GetPassword()) > 0) &&
-		!Authenticate())
-	{
-		return false;
-	}
-
-	debug("Connection to %s established", GetHost());
+	debug("Connection to %s established", GetServer()->GetHost());
 
 	return true;
 }
 
-bool NNTPConnection::Disconnect()
+bool NNTPConnection::DoDisconnect()
 {
 	if (m_eStatus == csConnected)
 	{
@@ -279,13 +278,13 @@ bool NNTPConnection::Disconnect()
 			m_szActiveGroup = NULL;
 		}
 	}
-	return Connection::Disconnect();
+	return Connection::DoDisconnect();
 }
 
 void NNTPConnection::ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer)
 {
 	char szErrStr[1024];
-	snprintf(szErrStr, 1024, szMsgPrefix, m_pNewsServer->GetID(), m_pNewsServer->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,27 +33,27 @@
 class NNTPConnection : public Connection
 {
 private:
-	NewsServer*			m_pNewsServer;
-	char* 				m_szActiveGroup;
-	char*				m_szLineBuf;
-	bool				m_bAuthError;
+	char* 					m_szActiveGroup;
+	char*					m_szLineBuf;
+	bool					m_bAuthError;
 
-	void				Clear();
-	void				ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer);
-	bool 				Authenticate();
-	bool 				AuthInfoUser(int iRecur);
-	bool 				AuthInfoPass(int iRecur);
+	virtual bool 			DoConnect();
+	virtual bool 			DoDisconnect();
+	void					Clear();
+	void					ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer);
 
 public:
-						NNTPConnection(NewsServer* pNewsServer);
-	virtual				~NNTPConnection();
-	virtual bool 		Connect();
-	virtual bool		Disconnect();
-	NewsServer*			GetNewsServer() { return m_pNewsServer; }
-	const char* 		Request(const char* req);
-	const char*			JoinGroup(const char* grp);
-	bool				GetAuthError() { return m_bAuthError; }
+							NNTPConnection(NewsServer* server);
+	virtual					~NNTPConnection();
+	NewsServer*				GetNewsServer() { return(NewsServer*)m_pNetAddress; }
+	const char* 			Request(const char* req);
+	bool 					Authenticate();
+	bool 					AuthInfoUser(int iRecur = 0);
+	bool 					AuthInfoPass(int iRecur = 0);
+	const char*				JoinGroup(const char* grp);
+	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-2013 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()
@@ -121,6 +100,16 @@ void NZBFile::DetachFileInfos()
     m_FileInfos.clear();
 }
 
+NZBFile* NZBFile::CreateFromBuffer(const char* szFileName, const char* szCategory, const char* szBuffer, int iSize)
+{
+	return Create(szFileName, szCategory, szBuffer, iSize, true);
+}
+
+NZBFile* NZBFile::CreateFromFile(const char* szFileName, const char* szCategory)
+{
+	return Create(szFileName, szCategory, NULL, 0, false);
+}
+
 void NZBFile::AddArticle(FileInfo* pFileInfo, ArticleInfo* pArticleInfo)
 {
 	// make Article-List big enough
@@ -151,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
 	{
@@ -162,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
@@ -272,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;
@@ -298,56 +273,25 @@ 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
-NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory)
+NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory, const char* szBuffer, int iSize, bool bFromBuffer)
 {
     CoInitialize(NULL);
 
@@ -364,15 +308,21 @@ NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory)
 	doc->put_resolveExternals(VARIANT_FALSE);
 	doc->put_validateOnParse(VARIANT_FALSE);
 	doc->put_async(VARIANT_FALSE);
-
-	// filename needs to be properly encoded
-	char* szURL = (char*)malloc(strlen(szFileName)*3 + 1);
-	EncodeURL(szFileName, szURL);
-	debug("url=\"%s\"", szURL);
-	_variant_t v(szURL);
-	free(szURL);
-
-	VARIANT_BOOL success = doc->load(v);
+	VARIANT_BOOL success;
+	if (bFromBuffer)
+	{
+		success = doc->loadXML(szBuffer);
+	}
+	else
+	{
+		// filename needs to be properly encoded
+		char* szURL = (char*)malloc(strlen(szFileName)*3 + 1);
+		EncodeURL(szFileName, szURL);
+		debug("url=\"%s\"", szURL);
+		_variant_t v(szURL);
+		free(szURL);
+		success = doc->load(v);
+	} 
 	if (success == VARIANT_FALSE)
 	{
 		_bstr_t r(doc->GetparseError()->reason);
@@ -384,7 +334,7 @@ NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory)
     NZBFile* pFile = new NZBFile(szFileName, szCategory);
     if (pFile->ParseNZB(doc))
 	{
-		pFile->ProcessFilenames();
+		pFile->CheckFilenames();
 	}
 	else
 	{
@@ -432,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++)
 		{
@@ -466,14 +409,11 @@ bool NZBFile::ParseNZB(IUnknown* nzb)
 			int partNumber = atoi(number);
 			int lsize = atoi(bytes);
 
-			if (partNumber > 0)
-			{
-				ArticleInfo* pArticle = new ArticleInfo();
-				pArticle->SetPartNumber(partNumber);
-				pArticle->SetMessageID(szId);
-				pArticle->SetSize(lsize);
-				AddArticle(pFileInfo, pArticle);
-			}
+			ArticleInfo* pArticle = new ArticleInfo();
+			pArticle->SetPartNumber(partNumber);
+			pArticle->SetMessageID(szId);
+			pArticle->SetSize(lsize);
+			AddArticle(pFileInfo, pArticle);
 
             if (lsize > 0)
             {
@@ -488,229 +428,146 @@ bool NZBFile::ParseNZB(IUnknown* nzb)
 
 #else
 
-NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory)
+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);
-
-	pFile->m_bIgnoreNextError = false;
-
-	int ret = xmlSAXUserParseFile(&SAX_handler, pFile, szFileName);
-    
-    if (ret == 0)
+    xmlTextReaderPtr doc;
+	if (bFromBuffer)
 	{
-		pFile->ProcessFilenames();
+		doc = xmlReaderForMemory(szBuffer, iSize-1, "", NULL, 0);
+	}
+	else
+	{
+		doc = xmlReaderForFile(szFileName, NULL, 0);
+	}
+    if (!doc)
+    {
+        return NULL;
+    }
+
+    NZBFile* pFile = new NZBFile(szFileName, szCategory);
+    if (pFile->ParseNZB(doc))
+	{
+		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-2013 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,35 +44,22 @@ 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);
 
 public:
 	virtual 			~NZBFile();
-	static NZBFile*		Create(const char* szFileName, const char* szCategory);
+	static NZBFile*		CreateFromBuffer(const char* szFileName, const char* szCategory, const char* szBuffer, int iSize);
+	static NZBFile*		CreateFromFile(const char* szFileName, const char* szCategory);
 	const char* 		GetFileName() const { return m_szFileName; }
 	FileInfos*			GetFileInfos() { return &m_FileInfos; }
-	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
 	void				DetachFileInfos();
 
 	void				LogDebugInfo();

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,32 +37,29 @@
 
 #include "nzbget.h"
 #include "NewsServer.h"
+#include "Log.h"
 
-NewsServer::NewsServer(int iID, const char* szHost, int iPort, const char* szUser, const char* szPass, bool bJoinGroup,
-	bool bTLS, const char* szCipher, int iMaxConnections, int iLevel, int iGroup)
+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_iID = iID;
-	m_szHost = NULL;
-	m_iPort = iPort;
 	m_szUser = NULL;
 	m_szPassword = NULL;
 	m_iLevel = iLevel;
-	m_iGroup = iGroup;
 	m_iMaxConnections = iMaxConnections;
 	m_bJoinGroup = bJoinGroup;
 	m_bTLS = bTLS;
-	m_szHost = szHost ? strdup(szHost) : NULL;
-	m_szUser = szUser ? strdup(szUser) : NULL;
-	m_szPassword = szPass ? strdup(szPass) : NULL;
-	m_szCipher = szCipher ? strdup(szCipher) : NULL;
+
+	if (szUser)
+	{
+		m_szUser = strdup(szUser);
+	}
+	if (szPass)
+	{
+		m_szPassword = strdup(szPass);
+	}
 }
 
 NewsServer::~NewsServer()
 {
-	if (m_szHost)
-	{
-		free(m_szHost);
-	}
 	if (m_szUser)
 	{
 		free(m_szUser);
@@ -71,8 +68,4 @@ NewsServer::~NewsServer()
 	{
 		free(m_szPassword);
 	}
-	if (m_szCipher)
-	{
-		free(m_szCipher);
-	}
 }

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,37 +27,27 @@
 #ifndef NEWSSERVER_H
 #define NEWSSERVER_H
 
-class NewsServer
+#include "NetAddress.h"
+
+class NewsServer : public NetAddress
 {
 private:
-	int				m_iID;
-	int				m_iGroup;
-	char*			m_szHost;
-	int				m_iPort;
 	char*			m_szUser;
 	char*			m_szPassword;
 	int				m_iMaxConnections;
 	int				m_iLevel;
 	bool			m_bJoinGroup;
 	bool			m_bTLS;
-	char*			m_szCipher;
 
 public:
-					NewsServer(int iID, const char* szHost, int iPort, const char* szUser, const char* szPass, bool bJoinGroup,
-						bool bTLS, const char* szCipher, int iMaxConnections, int iLevel, int iGroup);
-					~NewsServer();
-	int				GetID() { return m_iID; }
-	int				GetGroup() { return m_iGroup; }
-	const char*		GetHost() { return m_szHost; }
-	int				GetPort() { return m_iPort; }
+					NewsServer(const char* szHost, int iPort, const char* szUser, const char* szPass, bool bJoinGroup, bool bTLS, int iMaxConnections, int iLevel);
+	virtual			~NewsServer();
 	const char*		GetUser() { return m_szUser; }
 	const char*		GetPassword() { return m_szPassword; }
 	int				GetMaxConnections() { return m_iMaxConnections; }
 	int				GetLevel() { return m_iLevel; }
-	void			SetLevel(int iLevel) { m_iLevel = iLevel; }
 	int				GetJoinGroup() { return m_bJoinGroup; }
 	bool			GetTLS() { return m_bTLS; }
-	const char*		GetCipher() { return m_szCipher; }
 };
 
 #endif

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-2013 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,11 +28,6 @@
 #define OPTIONS_H
 
 #include <vector>
-#include <list>
-#include <time.h>
-
-#include "Thread.h"
-#include "Util.h"
 
 class Options
 {
@@ -41,31 +36,17 @@ public:
 	{
 		opClientNoOperation,
 		opClientRequestDownload,
-		opClientRequestListFiles,
-		opClientRequestListGroups,
-		opClientRequestListStatus,
+		opClientRequestList,
+		opClientRequestPause,
+		opClientRequestUnpause,
 		opClientRequestSetRate,
 		opClientRequestDumpDebug,
 		opClientRequestEditQueue,
 		opClientRequestLog,
 		opClientRequestShutdown,
-		opClientRequestReload,
 		opClientRequestVersion,
 		opClientRequestPostQueue,
-		opClientRequestWriteLog,
-		opClientRequestScanSync,
-		opClientRequestScanAsync,
-		opClientRequestDownloadPause,
-		opClientRequestDownloadUnpause,
-		opClientRequestDownload2Pause,
-		opClientRequestDownload2Unpause,
-		opClientRequestPostPause,
-		opClientRequestPostUnpause,
-		opClientRequestScanPause,
-		opClientRequestScanUnpause,
-		opClientRequestHistory,
-		opClientRequestDownloadUrl,
-		opClientRequestUrlQueue
+		opClientRequestWriteLog
 	};
 	enum EMessageTarget
 	{
@@ -80,162 +61,39 @@ public:
 		omColored,
 		omNCurses
 	};
-	enum EParCheck
+	enum ELoadPars
 	{
-		pcAuto,
-		pcForce,
-		pcManual
+		lpNone,
+		lpOne,
+		lpAll
 	};
-	enum EParScan
+	enum EPostLogKind
 	{
-		psLimited,
-		psFull,
-		psAuto
-	};
-	enum EScriptLogKind
-	{
-		slNone,
-		slDetail,
-		slInfo,
-		slWarning,
-		slError,
-		slDebug
-	};
-
-	enum EMatchMode
-	{
-		mmID = 1,
-		mmName,
-		mmRegEx
-	};
-
-	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);
-	};
-
-	class ConfigTemplate
-	{
-	private:
-		char*			m_szName;
-		char*			m_szDisplayName;
-		char*			m_szTemplate;
-
-		friend class Options;
-
-	public:
-						ConfigTemplate(const char* szName, const char* szDisplayName, const char* szTemplate);
-						~ConfigTemplate();
-		const char*		GetName() { return m_szName; }
-		const char*		GetDisplayName() { return m_szDisplayName; }
-		const char*		GetTemplate() { return m_szTemplate; }
-	};
-	
-	typedef std::vector<ConfigTemplate*>  ConfigTemplatesBase;
-
-	class ConfigTemplates: public ConfigTemplatesBase
-	{
-	public:
-						~ConfigTemplates();
-	};
-
-	typedef std::vector<char*>  NameList;
-
-	class Category
-	{
-	private:
-		char*			m_szName;
-		char*			m_szDestDir;
-		char*			m_szDefScript;
-
-	public:
-						Category(const char* szName, const char* szDestDir, const char* szDefScript);
-						~Category();
-		const char*		GetName() { return m_szName; }
-		const char*		GetDestDir() { return m_szDestDir; }
-		const char*		GetDefScript() { return m_szDefScript; }
-	};
-	
-	typedef std::vector<Category*>  CategoriesBase;
-
-	class Categories: public CategoriesBase
-	{
-	public:
-						~Categories();
-		Category*		FindCategory(const char* szName);
-	};
-
-	class Script
-	{
-	private:
-		char*			m_szName;
-		char*			m_szLocation;
-		char*			m_szDisplayName;
-
-	public:
-						Script(const char* szName, const char* szLocation);
-						~Script();
-		const char*		GetName() { return m_szName; }
-		const char*		GetLocation() { return m_szLocation; }
-		void			SetDisplayName(const char* szDisplayName);
-		const char*		GetDisplayName() { return m_szDisplayName; }
-	};
-
-	typedef std::list<Script*>  ScriptListBase;
-
-	class ScriptList: public ScriptListBase
-	{
-	public:
-						~ScriptList();
-		Script*			Find(const char* szName);	
+		plNone,
+		plDetail,
+		plInfo,
+		plWarning,
+		plError,
+		plDebug
 	};
 
 private:
-	OptEntries			m_OptEntries;
+	struct OptEntry
+	{
+		char* name;
+		char* value;
+	};
+	
+	std::vector< struct OptEntry >	optEntries;
+
 	bool				m_bConfigInitialized;
-	Mutex				m_mutexOptEntries;
-	Categories			m_Categories;
 
 	// Options
-	bool				m_bConfigErrors;
-	int					m_iConfigLine;
 	char*				m_szConfigFilename;
 	char*				m_szDestDir;
-	char*				m_szInterDir;
 	char*				m_szTempDir;
 	char*				m_szQueueDir;
 	char*				m_szNzbDir;
-	char*				m_szWebDir;
-	char*				m_szConfigTemplate;
-	char*				m_szScriptDir;
 	EMessageTarget		m_eInfoTarget;
 	EMessageTarget		m_eWarningTarget;
 	EMessageTarget		m_eErrorTarget;
@@ -246,37 +104,29 @@ private:
 	bool				m_bResetLog;
 	int					m_iConnectionTimeout;
 	int					m_iTerminateTimeout;
+	bool				m_bAppendNZBDir;
 	bool				m_bAppendCategoryDir;
 	bool				m_bContinuePartial;
+	bool				m_bRenameBroken;
 	int					m_iRetries;
 	int					m_iRetryInterval;
 	bool				m_bSaveQueue;
 	bool				m_bDupeCheck;
-	char*				m_szControlIP;
-	char*				m_szControlUsername;
-	char*				m_szControlPassword;
-	int					m_iControlPort;
-	bool				m_bSecureControl;
-	int					m_iSecurePort;
-	char*				m_szSecureCert;
-	char*				m_szSecureKey;
+	char*				m_szServerIP;
+	char*				m_szServerPassword;
+	int					m_szServerPort;
 	char*				m_szLockFile;
-	char*				m_szDaemonUsername;
+	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;
-	EParCheck			m_eParCheck;
+	ELoadPars			m_eLoadPars;
+	bool				m_bParCheck;
 	bool				m_bParRepair;
-	EParScan			m_eParScan;
-	char*				m_szDefScript;
-	char*				m_szScriptOrder;
-	char*				m_szNZBProcess;
-	char*				m_szNZBAddedProcess;
+	char*				m_szPostProcess;
 	bool				m_bStrictParName;
 	bool				m_bNoConfig;
 	int					m_iUMask;
@@ -285,28 +135,21 @@ private:
 	bool				m_bCursesTime;
 	bool				m_bCursesGroup;
 	bool				m_bCrcCheck;
+	bool				m_bRetryOnCrcError;
+	int					m_iThreadLimit;
 	bool				m_bDirectWrite;
 	int					m_iWriteBufferSize;
 	int					m_iNzbDirInterval;
 	int					m_iNzbDirFileAge;
 	bool				m_bParCleanupQueue;
 	int					m_iDiskSpace;
+	EPostLogKind		m_ePostLogKind;
+	bool				m_bAllowReProcess;
 	bool				m_bTLS;
 	bool				m_bDumpCore;
 	bool				m_bParPauseQueue;
-	bool				m_bScriptPauseQueue;
+	bool				m_bPostPauseQueue;
 	bool				m_bNzbCleanupDisk;
-	bool				m_bDeleteCleanupDisk;
-	bool				m_bMergeNzb;
-	int					m_iParTimeLimit;
-	int					m_iKeepHistory;
-	bool				m_bAccurateRate;
-	bool				m_bUnpack;
-	bool				m_bUnpackCleanupDisk;
-	char*				m_szUnrarCmd;
-	char*				m_szSevenZipCmd;
-	bool				m_bUnpackPauseQueue;
-	char*				m_szExtCleanupDisk;
 
 	// Parsed command-line parameters
 	bool				m_bServerMode;
@@ -316,30 +159,21 @@ 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;
-	int					m_iSetRate;
+	float				m_fSetRate;
 	int					m_iLogLines;
 	int					m_iWriteLogKind;
 	bool				m_bTestBacktrace;
 
 	// Current state
-	bool				m_bPauseDownload;
-	bool				m_bPauseDownload2;
-	bool				m_bPausePostProcess;
-	bool				m_bPauseScan;
-	int					m_iDownloadRate;
+	bool				m_bPause;
+	float				m_fDownloadRate;
 	EClientOperation	m_eClientOperation;
-	time_t				m_tResumeTime;
 
 	void				InitDefault();
 	void				InitOptFile();
@@ -347,54 +181,28 @@ private:
 	void				InitOptions();
 	void				InitFileArg(int argc, char* argv[]);
 	void				InitServers();
-	void				InitCategories();
-	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);
-	OptEntry*			FindOption(const char* optname);
+	int					ParseOptionValue(const char* OptName, const char* OptValue, int argc, const char* argn[], const int argv[]);
 	const char*			GetOption(const char* optname);
+	void				DelOption(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);
 	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				ParseWeekDays(const char* szWeekDays, int* pWeekDaysBits);
-	void				ConfigError(const char* msg, ...);
-	void				ConfigWarn(const char* msg, ...);
-	void				LocateOptionSrcPos(const char *szOptionName);
-	void				ConvertOldOption(char *szOption, int iOptionBufLen, char *szValue, int iValueBufLen);
-	static bool			CompareScripts(Script* pScript1, Script* pScript2);
-	void				LoadScriptDir(ScriptList* pScriptList, const char* szDirectory, bool bIsSubDir);
-	void				BuildScriptDisplayNames(ScriptList* pScriptList);
 
 public:
 						Options(int argc, char* argv[]);
 						~Options();
 
-	bool				LoadConfig(OptEntries* pOptEntries);
-	bool				SaveConfig(OptEntries* pOptEntries);
-	bool				LoadConfigTemplates(ConfigTemplates* pConfigTemplates);
-	void				LoadScriptList(ScriptList* pScriptList);
-
 	// Options
-	OptEntries*			LockOptEntries();
-	void				UnlockOptEntries();
-	const char*			GetConfigFilename() { return m_szConfigFilename; }
 	const char*			GetDestDir() { return m_szDestDir; }
-	const char*			GetInterDir() { return m_szInterDir; }
 	const char*			GetTempDir() { return m_szTempDir; }
 	const char*			GetQueueDir() { return m_szQueueDir; }
 	const char*			GetNzbDir() { return m_szNzbDir; }
-	const char*			GetWebDir() { return m_szWebDir; }
-	const char*			GetConfigTemplate() { return m_szConfigTemplate; }
-	const char*			GetScriptDir() { return m_szScriptDir; }
 	bool				GetCreateBrokenLog() const { return m_bCreateBrokenLog; }
 	bool				GetResetLog() const { return m_bResetLog; }
 	EMessageTarget		GetInfoTarget() const { return m_eInfoTarget; }
@@ -405,37 +213,29 @@ public:
 	int					GetConnectionTimeout() { return m_iConnectionTimeout; }
 	int					GetTerminateTimeout() { return m_iTerminateTimeout; }
 	bool				GetDecode() { return m_bDecode; };
+	bool				GetAppendNZBDir() { return m_bAppendNZBDir; }
 	bool				GetAppendCategoryDir() { return m_bAppendCategoryDir; }
 	bool				GetContinuePartial() { return m_bContinuePartial; }
+	bool				GetRenameBroken() { return m_bRenameBroken; }
 	int					GetRetries() { return m_iRetries; }
 	int					GetRetryInterval() { return m_iRetryInterval; }
 	bool				GetSaveQueue() { return m_bSaveQueue; }
 	bool				GetDupeCheck() { return m_bDupeCheck; }
-	const char*			GetControlIP() { return m_szControlIP; }
-	const char*			GetControlUsername() { return m_szControlUsername; }
-	const char*			GetControlPassword() { return m_szControlPassword; }
-	int					GetControlPort() { return m_iControlPort; }
-	bool				GetSecureControl() { return m_bSecureControl; }
-	int					GetSecurePort() { return m_iSecurePort; }
-	const char*			GetSecureCert() { return m_szSecureCert; }
-	const char*			GetSecureKey() { return m_szSecureKey; }
-	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; }
-	EParCheck			GetParCheck() { return m_eParCheck; }
+	char*				GetLogFile() { return m_szLogFile; }
+	ELoadPars			GetLoadPars() { return m_eLoadPars; }
+	bool				GetParCheck() { return m_bParCheck; }
 	bool				GetParRepair() { return m_bParRepair; }
-	EParScan			GetParScan() { return m_eParScan; }
-	const char*			GetScriptOrder() { return m_szScriptOrder; }
-	const char*			GetDefScript() { return m_szDefScript; }
-	const char*			GetNZBProcess() { return m_szNZBProcess; }
-	const char*			GetNZBAddedProcess() { return m_szNZBAddedProcess; }
+	const char*			GetPostProcess() { return m_szPostProcess; }
 	bool				GetStrictParName() { return m_bStrictParName; }
 	int					GetUMask() { return m_iUMask; }
 	int					GetUpdateInterval() {return m_iUpdateInterval; }
@@ -443,30 +243,21 @@ public:
 	bool				GetCursesTime() { return m_bCursesTime; }
 	bool				GetCursesGroup() { return m_bCursesGroup; }
 	bool				GetCrcCheck() { return m_bCrcCheck; }
+	bool				GetRetryOnCrcError() { return m_bRetryOnCrcError; }
+	int					GetThreadLimit() { return m_iThreadLimit; }
 	bool				GetDirectWrite() { return m_bDirectWrite; }
 	int					GetWriteBufferSize() { return m_iWriteBufferSize; }
 	int					GetNzbDirInterval() { return m_iNzbDirInterval; }
 	int					GetNzbDirFileAge() { return m_iNzbDirFileAge; }
 	bool				GetParCleanupQueue() { return m_bParCleanupQueue; }
 	int					GetDiskSpace() { return m_iDiskSpace; }
+	EPostLogKind		GetPostLogKind() { return m_ePostLogKind; }
+	bool				GetAllowReProcess() { return m_bAllowReProcess; }
 	bool				GetTLS() { return m_bTLS; }
 	bool				GetDumpCore() { return m_bDumpCore; }
 	bool				GetParPauseQueue() { return m_bParPauseQueue; }
-	bool				GetScriptPauseQueue() { return m_bScriptPauseQueue; }
+	bool				GetPostPauseQueue() { return m_bPostPauseQueue; }
 	bool				GetNzbCleanupDisk() { return m_bNzbCleanupDisk; }
-	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; }
-	bool				GetUnpack() { return m_bUnpack; }
-	bool				GetUnpackCleanupDisk() { return m_bUnpackCleanupDisk; }
-	const char*			GetUnrarCmd() { return m_szUnrarCmd; }
-	const char*			GetSevenZipCmd() { return m_szSevenZipCmd; }
-	bool				GetUnpackPauseQueue() { return m_bUnpackPauseQueue; }
-	const char*			GetExtCleanupDisk() { return m_szExtCleanupDisk; }
-
-	Category*			FindCategory(const char* szName) { return m_Categories.FindCategory(szName); }
 
 	// Parsed command-line parameters
 	bool				GetServerMode() { return m_bServerMode; }
@@ -477,34 +268,21 @@ 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; }
-	int					GetSetRate() { return m_iSetRate; }
+	float				GetSetRate() { return m_fSetRate; }
 	int					GetLogLines() { return m_iLogLines; }
 	int					GetWriteLogKind() { return m_iWriteLogKind; }
 	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				SetDownloadRate(int iRate) { m_iDownloadRate = iRate; }
-	int					GetDownloadRate() const { return m_iDownloadRate; }
-	void				SetResumeTime(time_t tResumeTime) { m_tResumeTime = tResumeTime; }
-	time_t				GetResumeTime() const { return m_tResumeTime; }
+	void				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; }
 };
 
 #endif

ParChecker.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2013 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
@@ -35,21 +35,18 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #include <ctype.h>
+#include <fstream>
 #ifdef WIN32
 #include <par2cmdline.h>
 #include <par2repairer.h>
 #else
-#include <unistd.h>
 #include <libpar2/par2cmdline.h>
 #include <libpar2/par2repairer.h>
 #endif
-#include <algorithm>
 
 #include "nzbget.h"
 #include "ParChecker.h"
-#include "ParCoordinator.h"
 #include "Log.h"
 #include "Options.h"
 #include "Util.h"
@@ -69,97 +66,17 @@ const char* Par2CmdLineErrStr[] = { "OK",
 
 class Repairer : public Par2Repairer
 {
-private:
-    CommandLine	commandLine;
-
-public:
-	Result		PreProcess(const char *szParFilename);
-	Result		Process(bool dorepair);
-
 	friend class ParChecker;
 };
 
-Result Repairer::PreProcess(const char *szParFilename)
-{
-#ifdef HAVE_PAR2_BUGFIXES_V2
-	// Ensure linking against the patched version of libpar2
-	BugfixesPatchVersion2();
-#endif
-
-	if (g_pOptions->GetParScan() == Options::psFull)
-	{
-		char szWildcardParam[1024];
-		strncpy(szWildcardParam, szParFilename, 1024);
-		szWildcardParam[1024-1] = '\0';
-		char* szBasename = Util::BaseFileName(szWildcardParam);
-		if (szBasename != szWildcardParam && strlen(szBasename) > 0)
-		{
-			szBasename[0] = '*';
-			szBasename[1] = '\0';
-		}
-
-		const char* argv[] = { "par2", "r", "-v", "-v", szParFilename, szWildcardParam };
-		if (!commandLine.Parse(6, (char**)argv))
-		{
-			return eInvalidCommandLineArguments;
-		}
-	}
-	else
-	{
-		const char* argv[] = { "par2", "r", "-v", "-v", szParFilename };
-		if (!commandLine.Parse(5, (char**)argv))
-		{
-			return eInvalidCommandLineArguments;
-		}
-	}
-
-	return Par2Repairer::PreProcess(commandLine);
-}
-
-Result Repairer::Process(bool dorepair)
-{
-	return Par2Repairer::Process(commandLine, dorepair);
-}
-
-
-class MissingFilesComparator
-{
-private:
-	const char* m_szBaseParFilename;
-public:
-	MissingFilesComparator(const char* szBaseParFilename) : m_szBaseParFilename(szBaseParFilename) {}
-	bool operator()(CommandLine::ExtraFile* pFirst, CommandLine::ExtraFile* pSecond) const;
-};
-
-
-/*
- * Files with the same name as in par-file (and a differnt extension) are
- * placed at the top of the list to be scanned first.
- */
-bool MissingFilesComparator::operator()(CommandLine::ExtraFile* pFile1, CommandLine::ExtraFile* pFile2) const
-{
-	char name1[1024];
-	strncpy(name1, Util::BaseFileName(pFile1->FileName().c_str()), 1024);
-	name1[1024-1] = '\0';
-	if (char* ext = strrchr(name1, '.')) *ext = '\0'; // trim extension
-
-	char name2[1024];
-	strncpy(name2, Util::BaseFileName(pFile2->FileName().c_str()), 1024);
-	name2[1024-1] = '\0';
-	if (char* ext = strrchr(name2, '.')) *ext = '\0'; // trim extension
-
-	return strcmp(name1, m_szBaseParFilename) == 0 && strcmp(name1, name2) != 0;
-}
-
 
 ParChecker::ParChecker()
 {
     debug("Creating ParChecker");
 
-	m_eStatus = psFailed;
-	m_szDestDir = NULL;
-	m_szNZBName = NULL;
+	m_eStatus = psUndefined;
 	m_szParFilename = NULL;
+	m_szNZBFilename = NULL;
 	m_szInfoName = NULL;
 	m_szErrMsg = NULL;
 	m_szProgressLabel = (char*)malloc(1024);
@@ -167,21 +84,21 @@ ParChecker::ParChecker()
 	m_iStageProgress = 0;
 	m_iExtraFiles = 0;
 	m_bVerifyingExtraFiles = false;
-	m_bCancelled = false;
 	m_eStage = ptLoadingPars;
+	m_QueuedParFiles.clear();
 }
 
 ParChecker::~ParChecker()
 {
     debug("Destroying ParChecker");
 
-	if (m_szDestDir)
+	if (m_szParFilename)
 	{
-		free(m_szDestDir);
+		free(m_szParFilename);
 	}
-	if (m_szNZBName)
+	if (m_szNZBFilename)
 	{
-		free(m_szNZBName);
+		free(m_szNZBFilename);
 	}
 	if (m_szInfoName)
 	{
@@ -193,42 +110,20 @@ ParChecker::~ParChecker()
 	}
 	free(m_szProgressLabel);
 
-	Cleanup();
-}
-
-void ParChecker::Cleanup()
-{
-	for (FileList::iterator it = m_QueuedParFiles.begin(); it != m_QueuedParFiles.end() ;it++)
+	for (QueuedParFiles::iterator it = m_QueuedParFiles.begin(); it != m_QueuedParFiles.end() ;it++)
 	{
 		free(*it);
 	}
 	m_QueuedParFiles.clear();
-
-	for (FileList::iterator it = m_ProcessedFiles.begin(); it != m_ProcessedFiles.end() ;it++)
-	{
-		free(*it);
-	}
-	m_ProcessedFiles.clear();
-
-	m_sourceFiles.clear();
 }
 
-void ParChecker::SetDestDir(const char * szDestDir)
+void ParChecker::SetParFilename(const char * szParFilename)
 {
-	if (m_szDestDir)
+	if (m_szParFilename)
 	{
-		free(m_szDestDir);
+		free(m_szParFilename);
 	}
-	m_szDestDir = strdup(szDestDir);
-}
-
-void ParChecker::SetNZBName(const char * szNZBName)
-{
-	if (m_szNZBName)
-	{
-		free(m_szNZBName);
-	}
-	m_szNZBName = strdup(szNZBName);
+	m_szParFilename = strdup(szParFilename);
 }
 
 void ParChecker::SetInfoName(const char * szInfoName)
@@ -240,121 +135,48 @@ 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;
+	Notify(NULL);
+}
+
 void ParChecker::Run()
 {
-	ParCoordinator::FileList fileList;
-	if (!ParCoordinator::FindMainPars(m_szDestDir, &fileList))
-	{
-		PrintMessage(Message::mkError, "Could not start par-check for %s. Could not find any par-files", m_szNZBName);
-		m_eStatus = psFailed;
-		Completed();
-		return;
-	}
-
-	m_eStatus = psRepairNotNeeded;
-	m_bCancelled = false;
-
-	for (ParCoordinator::FileList::iterator it = fileList.begin(); it != fileList.end(); it++)
-	{
-		char* szParFilename = *it;
-		debug("Found par: %s", szParFilename);
-
-		if (!IsStopped() && !m_bCancelled)
-		{
-			char szFullParFilename[1024];
-			snprintf(szFullParFilename, 1024, "%s%c%s", m_szDestDir, (int)PATH_SEPARATOR, szParFilename);
-			szFullParFilename[1024-1] = '\0';
-
-			char szInfoName[1024];
-			int iBaseLen = 0;
-			ParCoordinator::ParseParFilename(szParFilename, &iBaseLen, NULL);
-			int maxlen = iBaseLen < 1024 ? iBaseLen : 1024 - 1;
-			strncpy(szInfoName, szParFilename, maxlen);
-			szInfoName[maxlen] = '\0';
-			
-			char szParInfoName[1024];
-			snprintf(szParInfoName, 1024, "%s%c%s", m_szNZBName, (int)PATH_SEPARATOR, szInfoName);
-			szParInfoName[1024-1] = '\0';
-
-			SetInfoName(szParInfoName);
-
-			EStatus eStatus = RunParCheck(szFullParFilename);
-
-			// accumulate total status, the worst status has priority
-			if (m_eStatus > eStatus)
-			{
-				m_eStatus = eStatus;
-			}
-
-			if (g_pOptions->GetCreateBrokenLog())
-			{
-				WriteBrokenLog(eStatus);
-			}
-		}
-
-		free(szParFilename);
-	}
-
-	Completed();
-}
-
-void ParChecker::WriteBrokenLog(EStatus eStatus)
-{
-	char szBrokenLogName[1024];
-	snprintf(szBrokenLogName, 1024, "%s%c_brokenlog.txt", m_szDestDir, (int)PATH_SEPARATOR);
-	szBrokenLogName[1024-1] = '\0';
-	
-	if (eStatus != psRepairNotNeeded || Util::FileExists(szBrokenLogName))
-	{
-		FILE* file = fopen(szBrokenLogName, "ab");
-		if (file)
-		{
-			if (eStatus == psFailed)
-			{
-				if (m_bCancelled)
-				{
-					fprintf(file, "Repair cancelled for %s\n", m_szInfoName);
-				}
-				else
-				{
-					fprintf(file, "Repair failed for %s: %s\n", m_szInfoName, m_szErrMsg ? m_szErrMsg : "");
-				}
-			}
-			else if (eStatus == psRepairPossible)
-			{
-				fprintf(file, "Repair possible for %s\n", m_szInfoName);
-			}
-			else if (eStatus == psRepaired)
-			{
-				fprintf(file, "Successfully repaired %s\n", m_szInfoName);
-			}
-			else if (eStatus == psRepairNotNeeded)
-			{
-				fprintf(file, "Repair not needed for %s\n", m_szInfoName);
-			}
-			fclose(file);
-		}
-		else
-		{
-			PrintMessage(Message::mkError, "Could not open file %s", szBrokenLogName);
-		}
-	}
-}
-
-ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
-{
-	Cleanup();
-	m_szParFilename = szParFilename;
+	m_bRepairNotNeeded = false;
 	m_eStage = ptLoadingPars;
 	m_iProcessedFiles = 0;
 	m_iExtraFiles = 0;
 	m_bVerifyingExtraFiles = false;
-	EStatus eStatus = psFailed;
 
-	PrintMessage(Message::mkInfo, "Verifying %s", m_szInfoName);
+	info("Verifying %s", m_szInfoName);
+	SetStatus(psWorking);
+
+	snprintf(m_szProgressLabel, 1024, "Verifying %s", m_szInfoName);
+	m_szProgressLabel[1024-1] = '\0';
+	m_iFileProgress = 0;
+	m_iStageProgress = 0;
+	UpdateProgress();
 
     debug("par: %s", m_szParFilename);
-	
+    CommandLine commandLine;
+    const char* argv[] = { "par2", "r", "-v", "-v", m_szParFilename };
+    if (!commandLine.Parse(5, (char**)argv))
+    {
+        error("Could not start par-check for %s. Par-file: %s", m_szInfoName, m_szParFilename);
+		SetStatus(psFailed);
+        return;
+    }
+
     Result res;
 
 	Repairer* pRepairer = new Repairer();
@@ -363,31 +185,17 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 	pRepairer->sig_filename.connect(sigc::mem_fun(*this, &ParChecker::signal_filename));
 	pRepairer->sig_progress.connect(sigc::mem_fun(*this, &ParChecker::signal_progress));
 	pRepairer->sig_done.connect(sigc::mem_fun(*this, &ParChecker::signal_done));
-
-	snprintf(m_szProgressLabel, 1024, "Verifying %s", m_szInfoName);
-	m_szProgressLabel[1024-1] = '\0';
-	m_iFileProgress = 0;
-	m_iStageProgress = 0;
-	UpdateProgress();
-
-    res = pRepairer->PreProcess(m_szParFilename);
+	
+    res = pRepairer->PreProcess(commandLine);
     debug("ParChecker: PreProcess-result=%i", res);
 
 	if (res != eSuccess || IsStopped())
 	{
-		if (res == eInvalidCommandLineArguments)
-		{
-			PrintMessage(Message::mkError, "Could not start par-check for %s. Par-file: %s", m_szInfoName, m_szParFilename);
-			m_szErrMsg = strdup("Command line could not be parsed");
-		}
-		else
-		{
-			PrintMessage(Message::mkError, "Could not verify %s: %s", m_szInfoName, IsStopped() ? "due stopping" : "par2-file could not be processed");
-			m_szErrMsg = strdup("par2-file could not be processed");
-		}
+       	error("Could not verify %s: %s", m_szInfoName, IsStopped() ? "due stopping" : "par2-file could not be processed");
+		m_szErrMsg = strdup("par2-file could not be processed");
+		SetStatus(psFailed);
 		delete pRepairer;
-		Cleanup();
-		return psFailed;
+		return;
 	}
 
 	char BufReason[1024];
@@ -399,19 +207,13 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 	m_szErrMsg = NULL;
 	
 	m_eStage = ptVerifyingSources;
-    res = pRepairer->Process(false);
+    res = pRepairer->Process(commandLine, false);
     debug("ParChecker: Process-result=%i", res);
 
-	if (!IsStopped() && pRepairer->missingfilecount > 0 && g_pOptions->GetParScan() == Options::psAuto && AddMissingFiles())
-	{
-		res = pRepairer->Process(false);
-		debug("ParChecker: Process-result=%i", res);
-	}
-
 	if (!IsStopped() && res == eRepairNotPossible && CheckSplittedFragments())
 	{
 		pRepairer->UpdateVerificationResults();
-		res = pRepairer->Process(false);
+		res = pRepairer->Process(commandLine, false);
 		debug("ParChecker: Process-result=%i", res);
 	}
 
@@ -421,7 +223,7 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 		int missingblockcount = pRepairer->missingblockcount - pRepairer->recoverypacketmap.size();
 		if (bMoreFilesLoaded)
 		{
-			PrintMessage(Message::mkInfo, "Need more %i par-block(s) for %s", missingblockcount, m_szInfoName);
+			info("Need more %i par-block(s) for %s", missingblockcount, m_szInfoName);
 		}
 		
 		m_mutexQueuedParFiles.Lock();
@@ -442,7 +244,6 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 			
 			m_mutexQueuedParFiles.Lock();
 			hasMorePars = !m_QueuedParFiles.empty();
-			m_bQueuedParFilesChanged = false;
 			m_mutexQueuedParFiles.Unlock();
 			
 			if (!requested && !hasMorePars)
@@ -455,15 +256,7 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 			
 			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();
 			}
 		}
 
@@ -476,33 +269,29 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 		if (bMoreFilesLoaded)
 		{
 			pRepairer->UpdateVerificationResults();
-			res = pRepairer->Process(false);
+			res = pRepairer->Process(commandLine, false);
 			debug("ParChecker: Process-result=%i", res);
 		}
 	}
 
 	if (IsStopped())
 	{
+		SetStatus(psFailed);
 		delete pRepairer;
-		Cleanup();
-		return psFailed;
+		return;
 	}
 	
-	eStatus = psFailed;
-	
 	if (res == eSuccess)
 	{
-    	PrintMessage(Message::mkInfo, "Repair not needed for %s", m_szInfoName);
-		eStatus = psRepairNotNeeded;
+    	info("Repair not needed for %s", m_szInfoName);
+		m_bRepairNotNeeded = true;
 	}
 	else if (res == eRepairPossible)
 	{
-		eStatus = psRepairPossible;
 		if (g_pOptions->GetParRepair())
 		{
-			PrintMessage(Message::mkInfo, "Repairing %s", m_szInfoName);
+    		info("Repairing %s", m_szInfoName);
 
-			SaveSourceList();
 			snprintf(m_szProgressLabel, 1024, "Repairing %s", m_szInfoName);
 			m_szProgressLabel[1024-1] = '\0';
 			m_iFileProgress = 0;
@@ -512,69 +301,56 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 			m_iFilesToRepair = pRepairer->damagedfilecount + pRepairer->missingfilecount;
 			UpdateProgress();
 
-			res = pRepairer->Process(true);
+			res = pRepairer->Process(commandLine, true);
     		debug("ParChecker: Process-result=%i", res);
 			if (res == eSuccess)
 			{
-    			PrintMessage(Message::mkInfo, "Successfully repaired %s", m_szInfoName);
-				eStatus = psRepaired;
-				DeleteLeftovers();
+    			info("Successfully repaired %s", m_szInfoName);
 			}
 		}
 		else
 		{
-    		PrintMessage(Message::mkInfo, "Repair possible for %s", m_szInfoName);
+    		info("Repair possible for %s", m_szInfoName);
+			res = eSuccess;
 		}
 	}
 	
-	if (m_bCancelled)
+	if (res == eSuccess)
 	{
-		if (m_eStage >= ptRepairing)
-		{
-			PrintMessage(Message::mkWarning, "Repair cancelled for %s", m_szInfoName);
-			m_szErrMsg = strdup("repair cancelled");
-			eStatus = psRepairPossible;
-		}
-		else
-		{
-			PrintMessage(Message::mkWarning, "Par-check cancelled for %s", m_szInfoName);
-			m_szErrMsg = strdup("par-check cancelled");
-			eStatus = psFailed;
-		}
+		SetStatus(psFinished);
 	}
-	else if (eStatus == psFailed)
+	else
 	{
 		if (!m_szErrMsg && (int)res >= 0 && (int)res <= 8)
 		{
 			m_szErrMsg = strdup(Par2CmdLineErrStr[res]);
 		}
-		PrintMessage(Message::mkError, "Repair failed for %s: %s", m_szInfoName, m_szErrMsg ? m_szErrMsg : "");
+		error("Repair failed for %s: %s", m_szInfoName, m_szErrMsg ? m_szErrMsg : "");
+		SetStatus(psFailed);
 	}
 	
 	delete pRepairer;
-	Cleanup();
-	return eStatus;
 }
 
 bool ParChecker::LoadMorePars()
 {
 	m_mutexQueuedParFiles.Lock();
-	FileList moreFiles;
+	QueuedParFiles moreFiles;
 	moreFiles.assign(m_QueuedParFiles.begin(), m_QueuedParFiles.end());
 	m_QueuedParFiles.clear();
 	m_mutexQueuedParFiles.Unlock();
 	
-	for (FileList::iterator it = moreFiles.begin(); it != moreFiles.end() ;it++)
+	for (QueuedParFiles::iterator it = moreFiles.begin(); it != moreFiles.end() ;it++)
 	{
 		char* szParFilename = *it;
 		bool loadedOK = ((Repairer*)m_pRepairer)->LoadPacketsFromFile(szParFilename);
 		if (loadedOK)
 		{
-			PrintMessage(Message::mkInfo, "File %s successfully loaded for par-check", Util::BaseFileName(szParFilename), m_szInfoName);
+			info("File %s successfully loaded for par-check", Util::BaseFileName(szParFilename), m_szInfoName);
 		}
 		else
 		{
-			PrintMessage(Message::mkInfo, "Could not load file %s for par-check", Util::BaseFileName(szParFilename), m_szInfoName);
+			info("Could not load file %s for par-check", Util::BaseFileName(szParFilename), m_szInfoName);
 		}
 		free(szParFilename);
 	}
@@ -586,14 +362,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();
 }
 
@@ -601,11 +377,11 @@ bool ParChecker::CheckSplittedFragments()
 {
 	bool bFragmentsAdded = false;
 
-	for (std::vector<Par2RepairerSourceFile*>::iterator it = ((Repairer*)m_pRepairer)->sourcefiles.begin();
+	for (vector<Par2RepairerSourceFile*>::iterator it = ((Repairer*)m_pRepairer)->sourcefiles.begin();
 		it != ((Repairer*)m_pRepairer)->sourcefiles.end(); it++)
 	{
 		Par2RepairerSourceFile *sourcefile = *it;
-		if (AddSplittedFragments(sourcefile->TargetFileName().c_str()))
+		if (!sourcefile->GetTargetExists() && AddSplittedFragments(sourcefile->TargetFileName().c_str()))
 		{
 			bFragmentsAdded = true;
 		}
@@ -628,7 +404,7 @@ bool ParChecker::AddSplittedFragments(const char* szFilename)
 	szBasename[-1] = '\0';
 	int iBaseLen = strlen(szBasename);
 
-	std::list<CommandLine::ExtraFile> extrafiles;
+	list<CommandLine::ExtraFile> extrafiles;
 
 	DirBrowser dir(szDirectory);
 	while (const char* filename = dir.Next())
@@ -658,7 +434,7 @@ bool ParChecker::AddSplittedFragments(const char* szFilename)
 
 	if (!extrafiles.empty())
 	{
-		m_iExtraFiles += extrafiles.size();
+		m_iExtraFiles = extrafiles.size();
 		m_bVerifyingExtraFiles = true;
 		bFragmentsAdded = ((Repairer*)m_pRepairer)->VerifyExtraFiles(extrafiles);
 		m_bVerifyingExtraFiles = false;
@@ -667,93 +443,6 @@ bool ParChecker::AddSplittedFragments(const char* szFilename)
 	return bFragmentsAdded;
 }
 
-bool ParChecker::AddMissingFiles()
-{
-    PrintMessage(Message::mkInfo, "Performing extra par-scan for %s", m_szInfoName);
-
-	char szDirectory[1024];
-	strncpy(szDirectory, m_szParFilename, 1024);
-	szDirectory[1024-1] = '\0';
-
-	char* szBasename = Util::BaseFileName(szDirectory);
-	if (szBasename == szDirectory)
-	{
-		return false;
-	}
-	szBasename[-1] = '\0';
-
-	std::list<CommandLine::ExtraFile*> extrafiles;
-
-	DirBrowser dir(szDirectory);
-	while (const char* filename = dir.Next())
-	{
-		if (strcmp(filename, ".") && strcmp(filename, "..") && strcmp(filename, "_brokenlog.txt"))
-		{
-			bool bAlreadyScanned = false;
-			for (FileList::iterator it = m_ProcessedFiles.begin(); it != m_ProcessedFiles.end(); it++)
-			{
-				const char* szProcessedFilename = *it;
-				if (!strcasecmp(Util::BaseFileName(szProcessedFilename), filename))
-				{
-					bAlreadyScanned = true;
-					break;
-				}
-			}
-
-			if (!bAlreadyScanned)
-			{
-				char fullfilename[1024];
-				snprintf(fullfilename, 1024, "%s%c%s", szDirectory, PATH_SEPARATOR, filename);
-				fullfilename[1024-1] = '\0';
-
-				extrafiles.push_back(new CommandLine::ExtraFile(fullfilename, Util::FileSize(fullfilename)));
-			}
-		}
-	}
-
-	// Sort the list
-	char* szBaseParFilename = strdup(Util::BaseFileName(m_szParFilename));
-	if (char* ext = strrchr(szBaseParFilename, '.')) *ext = '\0'; // trim extension
-	extrafiles.sort(MissingFilesComparator(szBaseParFilename));
-	free(szBaseParFilename);
-
-	// Scan files
-	bool bFilesAdded = false;
-	if (!extrafiles.empty())
-	{
-		m_iExtraFiles += extrafiles.size();
-		m_bVerifyingExtraFiles = true;
-
-		std::list<CommandLine::ExtraFile> extrafiles1;
-
-		// adding files one by one until all missing files are found
-
-		while (!IsStopped() && !m_bCancelled && extrafiles.size() > 0 && ((Repairer*)m_pRepairer)->missingfilecount > 0)
-		{
-			CommandLine::ExtraFile* pExtraFile = extrafiles.front();
-			extrafiles.pop_front();
-
-			extrafiles1.clear();
-			extrafiles1.push_back(*pExtraFile);
-
-			bFilesAdded = ((Repairer*)m_pRepairer)->VerifyExtraFiles(extrafiles1) || bFilesAdded;
-			((Repairer*)m_pRepairer)->UpdateVerificationResults();
-
-			delete pExtraFile;
-		}
-
-		m_bVerifyingExtraFiles = false;
-
-		// free any remaining objects
-		for (std::list<CommandLine::ExtraFile*>::iterator it = extrafiles.begin(); it != extrafiles.end() ;it++)
-		{
-			delete *it;
-		}
-	}
-
-	return bFilesAdded;
-}
-
 void ParChecker::signal_filename(std::string str)
 {
     const char* szStageMessage[] = { "Loading file", "Verifying file", "Repairing file", "Verifying repaired file" };
@@ -763,12 +452,7 @@ void ParChecker::signal_filename(std::string str)
 		m_eStage = ptVerifyingRepaired;
 	}
 
-	PrintMessage(Message::mkInfo, "%s %s", szStageMessage[m_eStage], str.c_str());
-
-	if (m_eStage == ptLoadingPars || m_eStage == ptVerifyingSources)
-	{
-		m_ProcessedFiles.push_back(strdup(str.c_str()));
-	}
+	info("%s %s", szStageMessage[m_eStage], str.c_str());
 
 	snprintf(m_szProgressLabel, 1024, "%s %s", szStageMessage[m_eStage], str.c_str());
 	m_szProgressLabel[1024-1] = '\0';
@@ -833,7 +517,7 @@ void ParChecker::signal_done(std::string str, int available, int total)
 		{
 			bool bFileExists = true;
 
-			for (std::vector<Par2RepairerSourceFile*>::iterator it = ((Repairer*)m_pRepairer)->sourcefiles.begin();
+			for (vector<Par2RepairerSourceFile*>::iterator it = ((Repairer*)m_pRepairer)->sourcefiles.begin();
 				it != ((Repairer*)m_pRepairer)->sourcefiles.end(); it++)
 			{
 				Par2RepairerSourceFile *sourcefile = *it;
@@ -847,76 +531,14 @@ void ParChecker::signal_done(std::string str, int available, int total)
 
 			if (bFileExists)
 			{
-				PrintMessage(Message::mkWarning, "File %s has %i bad block(s) of total %i block(s)", str.c_str(), total - available, total);
+				warn("File %s has %i bad block(s) of total %i block(s)", str.c_str(), total - available, total);
 			}
 			else
 			{
-				PrintMessage(Message::mkWarning, "File %s with %i block(s) is missing", str.c_str(), total);
+				warn("File %s with %i block(s) is missing", str.c_str(), total);
 			}
 		}
 	}
 }
 
-void ParChecker::Cancel()
-{
-#ifdef HAVE_PAR2_CANCEL
-	((Repairer*)m_pRepairer)->cancelled = true;
-	m_bCancelled = true;
-#else
-	PrintMessage(Message::mkError, "Could not cancel par-repair. The program was compiled using version of libpar2 which doesn't support cancelling of par-repair. Please apply libpar2-patches supplied with NZBGet and recompile libpar2 and NZBGet (see README for details).");
-#endif
-}
-
-void ParChecker::SaveSourceList()
-{
-	// Buliding a list of DiskFile-objects, marked as source-files
-	
-	for (std::vector<Par2RepairerSourceFile*>::iterator it = ((Repairer*)m_pRepairer)->sourcefiles.begin();
-		it != ((Repairer*)m_pRepairer)->sourcefiles.end(); it++)
-	{
-		Par2RepairerSourceFile* sourcefile = (Par2RepairerSourceFile*)*it;
-		vector<DataBlock>::iterator it2 = sourcefile->SourceBlocks();
-		for (int i = 0; i < (int)sourcefile->BlockCount(); i++, it2++)
-		{
-			DataBlock block = *it2;
-			DiskFile* pSourceFile = block.GetDiskFile();
-			if (pSourceFile &&
-				std::find(m_sourceFiles.begin(), m_sourceFiles.end(), pSourceFile) == m_sourceFiles.end())
-			{
-				m_sourceFiles.push_back(pSourceFile);
-			}
-		}
-	}
-}
-
-void ParChecker::DeleteLeftovers()
-{
-	// After repairing check if all DiskFile-objects saved by "SaveSourceList()" have
-	// corresponding target-files. If not - the source file was replaced. In this case
-	// the DiskFile-object points to the renamed bak-file, which we can delete.
-	
-	for (SourceList::iterator it = m_sourceFiles.begin(); it != m_sourceFiles.end(); it++)
-	{
-		DiskFile* pSourceFile = (DiskFile*)*it;
-
-		bool bFound = false;
-		for (std::vector<Par2RepairerSourceFile*>::iterator it2 = ((Repairer*)m_pRepairer)->sourcefiles.begin();
-			it2 != ((Repairer*)m_pRepairer)->sourcefiles.end(); it2++)
-		{
-			Par2RepairerSourceFile* sourcefile = *it2;
-			if (sourcefile->GetTargetFile() == pSourceFile)
-			{
-				bFound = true;
-				break;
-			}
-		}
-
-		if (!bFound)
-		{
-			PrintMessage(Message::mkInfo, "Deleting file %s", Util::BaseFileName(pSourceFile->FileName().c_str()));
-			remove(pSourceFile->FileName().c_str());
-		}
-	}
-}
-
 #endif

ParChecker.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2013 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,20 +29,20 @@
 #ifndef DISABLE_PARCHECK
 
 #include <deque>
-#include <string>
 
 #include "Thread.h"
-#include "Log.h"
+#include "Observer.h"
+#include "DownloadInfo.h"
 
-class ParChecker : public Thread
+class ParChecker : public Thread, public Subject
 {
 public:
 	enum EStatus
 	{
+        psUndefined,
+		psWorking,
 		psFailed,
-		psRepairPossible,
-		psRepaired,
-		psRepairNotNeeded
+		psFinished
 	};
 
 	enum EStage
@@ -53,22 +53,20 @@ public:
 		ptVerifyingRepaired,
 	};
 
-	typedef std::deque<char*>		FileList;
-	typedef std::deque<void*>		SourceList;
+	typedef std::deque<char*>		QueuedParFiles;
 	
 private:
 	char*				m_szInfoName;
-	char*				m_szDestDir;
-	char*				m_szNZBName;
-	const char*			m_szParFilename;
+	char*				m_szNZBFilename;
+	char*				m_szParFilename;
 	EStatus				m_eStatus;
 	EStage				m_eStage;
 	void*				m_pRepairer;	// declared as void* to prevent the including of libpar2-headers into this header-file
 	char*				m_szErrMsg;
-	FileList			m_QueuedParFiles;
+	bool				m_bRepairNotNeeded;
+	QueuedParFiles		m_QueuedParFiles;
 	Mutex			 	m_mutexQueuedParFiles;
-	bool				m_bQueuedParFilesChanged;
-	FileList			m_ProcessedFiles;
+	Semaphore			m_semNeedMoreFiles;
 	int					m_iProcessedFiles;
 	int					m_iFilesToRepair;
 	int					m_iExtraFiles;
@@ -76,18 +74,10 @@ private:
 	char*				m_szProgressLabel;
 	int					m_iFileProgress;
 	int					m_iStageProgress;
-	bool				m_bCancelled;
-	SourceList			m_sourceFiles;
 
-	EStatus				RunParCheck(const char* szParFilename);
-	void				WriteBrokenLog(EStatus eStatus);
-	void				Cleanup();
 	bool				LoadMorePars();
 	bool				CheckSplittedFragments();
 	bool				AddSplittedFragments(const char* szFilename);
-	bool				AddMissingFiles();
-	void				SaveSourceList();
-	void				DeleteLeftovers();
 	void				signal_filename(std::string str);
 	void				signal_progress(double progress);
 	void				signal_done(std::string str, int available, int total);
@@ -100,8 +90,6 @@ protected:
 	*/
 	virtual bool		RequestMorePars(int iBlockNeeded, int* pBlockFound) = 0;
 	virtual void		UpdateProgress() {}
-	virtual void		Completed() {}
-	virtual void		PrintMessage(Message::EKind eKind, const char* szFormat, ...) {}
 	EStage				GetStage() { return m_eStage; }
 	const char*			GetProgressLabel() { return m_szProgressLabel; }
 	int					GetFileProgress() { return m_iFileProgress; }
@@ -111,16 +99,18 @@ public:
 						ParChecker();
 	virtual				~ParChecker();
 	virtual void		Run();
-	void				SetDestDir(const char* szDestDir);
 	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				SetNZBName(const char* szNZBName);
+	void				SetStatus(EStatus eStatus);
 	EStatus				GetStatus() { return m_eStatus; }
+	const char*			GetErrMsg() { return m_szErrMsg; }
+	bool				GetRepairNotNeeded() { return m_bRepairNotNeeded; }
 	void				AddParFile(const char* szParFilename);
 	void				QueueChanged();
-	void				Cancel();
-	bool				GetCancelled() { return m_bCancelled; }
 };
 
 #endif

ParCoordinator.cpp

@@ -1,726 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdarg.h>
-#ifdef WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-
-#include "nzbget.h"
-#include "ParCoordinator.h"
-#include "Options.h"
-#include "Log.h"
-#include "Util.h"
-#include "QueueCoordinator.h"
-#include "DiskState.h"
-
-extern QueueCoordinator* g_pQueueCoordinator;
-extern Options* g_pOptions;
-extern DiskState* g_pDiskState;
-
-#ifndef DISABLE_PARCHECK
-bool ParCoordinator::PostParChecker::RequestMorePars(int iBlockNeeded, int* pBlockFound)
-{
-	return m_pOwner->RequestMorePars(m_pPostInfo->GetNZBInfo(), GetParFilename(), iBlockNeeded, pBlockFound);
-}
-
-void ParCoordinator::PostParChecker::UpdateProgress()
-{
-	m_pOwner->UpdateParCheckProgress();
-}
-
-void ParCoordinator::PostParChecker::PrintMessage(Message::EKind eKind, const char* szFormat, ...)
-{
-	char szText[1024];
-	va_list args;
-	va_start(args, szFormat);
-	vsnprintf(szText, 1024, szFormat, args);
-	va_end(args);
-	szText[1024-1] = '\0';
-
-	m_pOwner->PrintMessage(m_pPostInfo, eKind, "%s", szText);
-}
-
-void ParCoordinator::PostParRenamer::UpdateProgress()
-{
-	m_pOwner->UpdateParRenameProgress();
-}
-
-void ParCoordinator::PostParRenamer::PrintMessage(Message::EKind eKind, const char* szFormat, ...)
-{
-	char szText[1024];
-	va_list args;
-	va_start(args, szFormat);
-	vsnprintf(szText, 1024, szFormat, args);
-	va_end(args);
-	szText[1024-1] = '\0';
-	
-	m_pOwner->PrintMessage(m_pPostInfo, eKind, "%s", szText);
-}
-#endif
-
-ParCoordinator::ParCoordinator()
-{
-	debug("Creating ParCoordinator");
-
-#ifndef DISABLE_PARCHECK
-	m_bStopped = false;
-	m_ParChecker.m_pOwner = this;
-	m_ParRenamer.m_pOwner = this;
-#endif
-}
-
-ParCoordinator::~ParCoordinator()
-{
-	debug("Destroying ParCoordinator");
-}
-
-#ifndef DISABLE_PARCHECK
-void ParCoordinator::Stop()
-{
-	debug("Stopping ParCoordinator");
-
-	m_bStopped = true;
-
-	if (m_ParChecker.IsRunning())
-	{
-		m_ParChecker.Stop();
-		int iMSecWait = 5000;
-		while (m_ParChecker.IsRunning() && iMSecWait > 0)
-		{
-			usleep(50 * 1000);
-			iMSecWait -= 50;
-		}
-		if (m_ParChecker.IsRunning())
-		{
-			warn("Terminating par-check for %s", m_ParChecker.GetInfoName());
-			m_ParChecker.Kill();
-		}
-	}
-}
-#endif
-
-void ParCoordinator::PausePars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
-{
-	debug("ParCoordinator: Pausing pars");
-	
-	for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-		if (pFileInfo->GetNZBInfo() == pNZBInfo)
-		{
-			g_pQueueCoordinator->GetQueueEditor()->LockedEditEntry(pDownloadQueue, pFileInfo->GetID(), false, 
-				QueueEditor::eaGroupPauseExtraPars, 0, NULL);
-			break;
-		}
-	}
-}
-
-bool ParCoordinator::FindMainPars(const char* szPath, FileList* pFileList)
-{
-	if (pFileList)
-	{
-		pFileList->clear();
-	}
-
-	DirBrowser dir(szPath);
-	while (const char* filename = dir.Next())
-	{
-		int iBaseLen = 0;
-		if (ParseParFilename(filename, &iBaseLen, NULL))
-		{
-			if (!pFileList)
-			{
-				return true;
-			}
-
-			// check if the base file already added to list
-			bool exists = false;
-			for (FileList::iterator it = pFileList->begin(); it != pFileList->end(); it++)
-			{
-				const char* filename2 = *it;
-				exists = SameParCollection(filename, filename2);
-				if (exists)
-				{
-					break;
-				}
-			}
-			if (!exists)
-			{
-				pFileList->push_back(strdup(filename));
-			}
-		}
-	}
-	return pFileList && !pFileList->empty();
-}
-
-bool ParCoordinator::SameParCollection(const char* szFilename1, const char* szFilename2)
-{
-	int iBaseLen1 = 0, iBaseLen2 = 0;
-	return ParseParFilename(szFilename1, &iBaseLen1, NULL) &&
-		ParseParFilename(szFilename2, &iBaseLen2, NULL) &&
-		iBaseLen1 == iBaseLen2 &&
-		!strncasecmp(szFilename1, szFilename2, iBaseLen1);
-}
-
-bool ParCoordinator::ParseParFilename(const char* szParFilename, int* iBaseNameLen, int* iBlocks)
-{
-	char szFilename[1024];
-	strncpy(szFilename, szParFilename, 1024);
-	szFilename[1024-1] = '\0';
-	for (char* p = szFilename; *p; p++) *p = tolower(*p); // convert string to lowercase
-
-	int iLen = strlen(szFilename);
-	if (iLen < 6)
-	{
-		return false;
-	}
-
-	// find last occurence of ".par2" and trim filename after it
-	char* szEnd = szFilename;
-	while (char* p = strstr(szEnd, ".par2")) szEnd = p + 5;
-	*szEnd = '\0';
-	iLen = strlen(szFilename);
-	
-	if (strcasecmp(szFilename + iLen - 5, ".par2"))
-	{
-		return false;
-	}
-	*(szFilename + iLen - 5) = '\0';
-
-	int blockcnt = 0;
-	char* p = strrchr(szFilename, '.');
-	if (p && !strncasecmp(p, ".vol", 4))
-	{
-		char* b = strchr(p, '+');
-		if (!b)
-		{
-			b = strchr(p, '-');
-		}
-		if (b)
-		{
-			blockcnt = atoi(b+1);
-			*p = '\0';
-		}
-	}
-
-	if (iBaseNameLen)
-	{
-		*iBaseNameLen = strlen(szFilename);
-	}
-	if (iBlocks)
-	{
-		*iBlocks = blockcnt;
-	}
-	
-	return true;
-}
-
-#ifndef DISABLE_PARCHECK
-
-/**
- * DownloadQueue must be locked prior to call of this function.
- */
-void ParCoordinator::StartParCheckJob(PostInfo* pPostInfo)
-{
-	m_eCurrentJob = jkParCheck;
-	m_ParChecker.SetPostInfo(pPostInfo);
-	m_ParChecker.SetDestDir(pPostInfo->GetNZBInfo()->GetDestDir());
-	m_ParChecker.SetNZBName(pPostInfo->GetNZBInfo()->GetName());
-	m_ParChecker.PrintMessage(Message::mkInfo, "Checking pars for %s", pPostInfo->GetInfoName());
-	pPostInfo->SetWorking(true);
-	m_ParChecker.Start();
-}
-
-/**
- * DownloadQueue must be locked prior to call of this function.
- */
-void ParCoordinator::StartParRenameJob(PostInfo* pPostInfo)
-{
-	m_eCurrentJob = jkParRename;
-	m_ParRenamer.SetPostInfo(pPostInfo);
-	m_ParRenamer.SetDestDir(pPostInfo->GetNZBInfo()->GetDestDir());
-	m_ParRenamer.SetInfoName(pPostInfo->GetNZBInfo()->GetName());
-	m_ParRenamer.PrintMessage(Message::mkInfo, "Checking renamed files for %s", pPostInfo->GetNZBInfo()->GetName());
-	pPostInfo->SetWorking(true);
-	m_ParRenamer.Start();
-}
-
-bool ParCoordinator::Cancel()
-{
-	if (m_eCurrentJob == jkParCheck)
-	{
-#ifdef HAVE_PAR2_CANCEL
-		if (!m_ParChecker.GetCancelled())
-		{
-			debug("Cancelling par-repair for %s", m_ParChecker.GetInfoName());
-			m_ParChecker.Cancel();
-			return true;
-		}
-#else
-		warn("Cannot cancel par-repair for %s, used version of libpar2 does not support cancelling", m_ParChecker.GetInfoName());
-#endif
-	}
-	else if (m_eCurrentJob == jkParRename)
-	{
-		if (!m_ParRenamer.GetCancelled())
-		{
-			debug("Cancelling par-rename for %s", m_ParRenamer.GetInfoName());
-			m_ParRenamer.Cancel();
-			return true;
-		}
-	}
-	return false;
-}
-
-/**
- * DownloadQueue must be locked prior to call of this function.
- */
-bool ParCoordinator::AddPar(FileInfo* pFileInfo, bool bDeleted)
-{
-	bool bSameCollection = m_ParChecker.IsRunning() &&
-		pFileInfo->GetNZBInfo() == m_ParChecker.GetPostInfo()->GetNZBInfo() &&
-		SameParCollection(pFileInfo->GetFilename(), Util::BaseFileName(m_ParChecker.GetParFilename()));
-	if (bSameCollection && !bDeleted)
-	{
-		char szFullFilename[1024];
-		snprintf(szFullFilename, 1024, "%s%c%s", pFileInfo->GetNZBInfo()->GetDestDir(), (int)PATH_SEPARATOR, pFileInfo->GetFilename());
-		szFullFilename[1024-1] = '\0';
-		m_ParChecker.AddParFile(szFullFilename);
-
-		if (g_pOptions->GetParPauseQueue())
-		{
-			PauseDownload();
-		}
-	}
-	else
-	{
-		m_ParChecker.QueueChanged();
-	}
-	return bSameCollection;
-}
-
-void ParCoordinator::ParCheckCompleted()
-{
-	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
-
-	PostInfo* pPostInfo = m_ParChecker.GetPostInfo();
-
-	// Update ParStatus (accumulate result)
-	if ((m_ParChecker.GetStatus() == ParChecker::psRepaired ||
-		m_ParChecker.GetStatus() == ParChecker::psRepairNotNeeded) &&
-		pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped)
-	{
-		pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psSuccess);
-	}
-	else if (m_ParChecker.GetStatus() == ParChecker::psRepairPossible &&
-		pPostInfo->GetNZBInfo()->GetParStatus() != NZBInfo::psFailure)
-	{
-		pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psRepairPossible);
-	}
-	else
-	{
-		pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psFailure);
-	}
-
-	pPostInfo->SetWorking(false);
-	pPostInfo->SetStage(PostInfo::ptQueued);
-
-	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-	{
-		g_pDiskState->SaveDownloadQueue(pDownloadQueue);
-	}
-
-	g_pQueueCoordinator->UnlockQueue();
-}
-
-/**
-* Unpause par2-files
-* returns true, if the files with required number of blocks were unpaused,
-* or false if there are no more files in queue for this collection or not enough blocks
-*/
-bool ParCoordinator::RequestMorePars(NZBInfo* pNZBInfo, const char* szParFilename, int iBlockNeeded, int* pBlockFound)
-{
-	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
-	
-	Blocks blocks;
-	blocks.clear();
-	int iBlockFound = 0;
-    int iCurBlockFound = 0;
-
-	FindPars(pDownloadQueue, pNZBInfo, szParFilename, &blocks, true, true, &iCurBlockFound);
-    iBlockFound += iCurBlockFound;
-	if (iBlockFound < iBlockNeeded)
-	{
-		FindPars(pDownloadQueue, pNZBInfo, szParFilename, &blocks, true, false, &iCurBlockFound);
-        iBlockFound += iCurBlockFound;
-	}
-	if (iBlockFound < iBlockNeeded && !g_pOptions->GetStrictParName())
-	{
-		FindPars(pDownloadQueue, pNZBInfo, szParFilename, &blocks, false, false, &iCurBlockFound);
-        iBlockFound += iCurBlockFound;
-	}
-
-	if (iBlockFound >= iBlockNeeded)
-	{
-		// 1. first unpause all files with par-blocks less or equal iBlockNeeded
-		// starting from the file with max block count.
-		// if par-collection was built exponentially and all par-files present,
-		// this step selects par-files with exact number of blocks we need.
-		while (iBlockNeeded > 0)
-		{               
-			BlockInfo* pBestBlockInfo = NULL;
-			for (Blocks::iterator it = blocks.begin(); it != blocks.end(); it++)
-			{
-				BlockInfo* pBlockInfo = *it;
-				if (pBlockInfo->m_iBlockCount <= iBlockNeeded &&
-				   (!pBestBlockInfo || pBestBlockInfo->m_iBlockCount < pBlockInfo->m_iBlockCount))
-				{
-					pBestBlockInfo = pBlockInfo;
-				}
-			}
-			if (pBestBlockInfo)
-			{
-				if (pBestBlockInfo->m_pFileInfo->GetPaused())
-				{
-					m_ParChecker.PrintMessage(Message::mkInfo, "Unpausing %s%c%s for par-recovery", pNZBInfo->GetName(), (int)PATH_SEPARATOR, pBestBlockInfo->m_pFileInfo->GetFilename());
-					pBestBlockInfo->m_pFileInfo->SetPaused(false);
-					pBestBlockInfo->m_pFileInfo->SetExtraPriority(true);
-				}
-				iBlockNeeded -= pBestBlockInfo->m_iBlockCount;
-				blocks.remove(pBestBlockInfo);
-				delete pBestBlockInfo;
-			}
-			else
-			{
-				break;
-			}
-		}
-			
-		// 2. then unpause other files
-		// this step only needed if the par-collection was built not exponentially 
-		// or not all par-files present (or some of them were corrupted)
-		// this step is not optimal, but we hope, that the first step will work good 
-		// in most cases and we will not need the second step often
-		while (iBlockNeeded > 0)
-		{
-			BlockInfo* pBlockInfo = blocks.front();
-			if (pBlockInfo->m_pFileInfo->GetPaused())
-			{
-				m_ParChecker.PrintMessage(Message::mkInfo, "Unpausing %s%c%s for par-recovery", pNZBInfo->GetName(), (int)PATH_SEPARATOR, pBlockInfo->m_pFileInfo->GetFilename());
-				pBlockInfo->m_pFileInfo->SetPaused(false);
-				pBlockInfo->m_pFileInfo->SetExtraPriority(true);
-			}
-			iBlockNeeded -= pBlockInfo->m_iBlockCount;
-		}
-	}
-
-	g_pQueueCoordinator->UnlockQueue();
-
-	if (pBlockFound)
-	{
-		*pBlockFound = iBlockFound;
-	}
-
-	for (Blocks::iterator it = blocks.begin(); it != blocks.end(); it++)
-	{
-		delete *it;
-	}
-	blocks.clear();
-
-	bool bOK = iBlockNeeded <= 0;
-
-	if (bOK && g_pOptions->GetParPauseQueue())
-	{
-		UnpauseDownload();
-	}
-
-	return bOK;
-}
-
-void ParCoordinator::FindPars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, const char* szParFilename,
-	Blocks* pBlocks, bool bStrictParName, bool bExactParName, int* pBlockFound)
-{
-    *pBlockFound = 0;
-	
-	// extract base name from m_szParFilename (trim .par2-extension and possible .vol-part)
-	char* szBaseParFilename = Util::BaseFileName(szParFilename);
-	char szMainBaseFilename[1024];
-	int iMainBaseLen = 0;
-	if (!ParseParFilename(szBaseParFilename, &iMainBaseLen, NULL))
-	{
-		// should not happen
-        error("Internal error: could not parse filename %s", szBaseParFilename);
-		return;
-	}
-	int maxlen = iMainBaseLen < 1024 ? iMainBaseLen : 1024 - 1;
-	strncpy(szMainBaseFilename, szBaseParFilename, maxlen);
-	szMainBaseFilename[maxlen] = '\0';
-	for (char* p = szMainBaseFilename; *p; p++) *p = tolower(*p); // convert string to lowercase
-
-	for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-		int iBlocks = 0;
-		if (pFileInfo->GetNZBInfo() == pNZBInfo &&
-			ParseParFilename(pFileInfo->GetFilename(), NULL, &iBlocks) &&
-			iBlocks > 0)
-		{
-			bool bUseFile = true;
-
-			if (bExactParName)
-			{
-				bUseFile = SameParCollection(pFileInfo->GetFilename(), Util::BaseFileName(szParFilename));
-			}
-			else if (bStrictParName)
-			{
-				// the pFileInfo->GetFilename() may be not confirmed and may contain
-				// additional texts if Subject could not be parsed correctly
-
-				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
-				
-				char szCandidateFileName[1024];
-				snprintf(szCandidateFileName, 1024, "%s.par2", szMainBaseFilename);
-				szCandidateFileName[1024-1] = '\0';
-				if (!strstr(szLoFileName, szCandidateFileName))
-				{
-					snprintf(szCandidateFileName, 1024, "%s.vol", szMainBaseFilename);
-					szCandidateFileName[1024-1] = '\0';
-					bUseFile = strstr(szLoFileName, szCandidateFileName);
-				}
-			}
-
-            bool bAlreadyAdded = false;
-            // check if file is not in the list already
-			if (bUseFile)
-			{
-				for (Blocks::iterator it = pBlocks->begin(); it != pBlocks->end(); it++)
-				{
-					BlockInfo* pBlockInfo = *it;
-					if (pBlockInfo->m_pFileInfo == pFileInfo)
-					{
-						bAlreadyAdded = true;
-						break;
-                	}
-        		}
-			}
-                
-			// if it is a par2-file with blocks and it was from the same NZB-request
-			// and it belongs to the same file collection (same base name),
-			// then OK, we can use it
-            if (bUseFile && !bAlreadyAdded)
-            {
-				BlockInfo* pBlockInfo = new BlockInfo();
-				pBlockInfo->m_pFileInfo = pFileInfo;
-				pBlockInfo->m_iBlockCount = iBlocks;
-				pBlocks->push_back(pBlockInfo);
-				*pBlockFound += iBlocks;
-			}
-		}
-	}
-}
-
-void ParCoordinator::UpdateParCheckProgress()
-{
-	g_pQueueCoordinator->LockQueue();
-
-	PostInfo* pPostInfo = m_ParChecker.GetPostInfo();
-	if (m_ParChecker.GetFileProgress() == 0)
-	{
-		pPostInfo->SetProgressLabel(m_ParChecker.GetProgressLabel());
-	}
-	pPostInfo->SetFileProgress(m_ParChecker.GetFileProgress());
-	pPostInfo->SetStageProgress(m_ParChecker.GetStageProgress());
-    PostInfo::EStage StageKind[] = { PostInfo::ptLoadingPars, PostInfo::ptVerifyingSources, PostInfo::ptRepairing, PostInfo::ptVerifyingRepaired };
-	PostInfo::EStage eStage = StageKind[m_ParChecker.GetStage()];
-	time_t tCurrent = time(NULL);
-
-	if (!pPostInfo->GetStartTime())
-	{
-		pPostInfo->SetStartTime(tCurrent);
-	}
-
-	if (pPostInfo->GetStage() != eStage)
-	{
-		pPostInfo->SetStage(eStage);
-		pPostInfo->SetStageTime(tCurrent);
-	}
-
-	bool bParCancel = false;
-#ifdef HAVE_PAR2_CANCEL
-	if (!m_ParChecker.GetCancelled())
-	{
-		if ((g_pOptions->GetParTimeLimit() > 0) &&
-			m_ParChecker.GetStage() == ParChecker::ptRepairing &&
-			((g_pOptions->GetParTimeLimit() > 5 && tCurrent - pPostInfo->GetStageTime() > 5 * 60) ||
-			(g_pOptions->GetParTimeLimit() <= 5 && tCurrent - pPostInfo->GetStageTime() > 1 * 60)))
-		{
-			// first five (or one) minutes elapsed, now can check the estimated time
-			int iEstimatedRepairTime = (int)((tCurrent - pPostInfo->GetStartTime()) * 1000 / 
-				(pPostInfo->GetStageProgress() > 0 ? pPostInfo->GetStageProgress() : 1));
-			if (iEstimatedRepairTime > g_pOptions->GetParTimeLimit() * 60)
-			{
-				debug("Estimated repair time %i seconds", iEstimatedRepairTime);
-				m_ParChecker.PrintMessage(Message::mkWarning, "Cancelling par-repair for %s, estimated repair time (%i minutes) exceeds allowed repair time", m_ParChecker.GetInfoName(), iEstimatedRepairTime / 60);
-				bParCancel = true;
-			}
-		}
-	}
-#endif
-
-	if (bParCancel)
-	{
-		m_ParChecker.Cancel();
-	}
-
-	g_pQueueCoordinator->UnlockQueue();
-	
-	CheckPauseState(pPostInfo);
-}
-
-void ParCoordinator::CheckPauseState(PostInfo* pPostInfo)
-{
-	if (g_pOptions->GetPausePostProcess())
-	{
-		time_t tStageTime = pPostInfo->GetStageTime();
-		time_t tStartTime = pPostInfo->GetStartTime();
-		time_t tWaitTime = time(NULL);
-		
-		// wait until Post-processor is unpaused
-		while (g_pOptions->GetPausePostProcess() && !m_bStopped)
-		{
-			usleep(100 * 1000);
-			
-			// update time stamps
-			
-			time_t tDelta = time(NULL) - tWaitTime;
-			
-			if (tStageTime > 0)
-			{
-				pPostInfo->SetStageTime(tStageTime + tDelta);
-			}
-			
-			if (tStartTime > 0)
-			{
-				pPostInfo->SetStartTime(tStartTime + tDelta);
-			}
-		}
-	}
-}
-
-void ParCoordinator::ParRenameCompleted()
-{
-	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
-	
-	PostInfo* pPostInfo = m_ParRenamer.GetPostInfo();
-	pPostInfo->GetNZBInfo()->SetRenameStatus(m_ParRenamer.GetStatus() == ParRenamer::psSuccess ? NZBInfo::rsSuccess : NZBInfo::rsFailure);
-	pPostInfo->SetWorking(false);
-	pPostInfo->SetStage(PostInfo::ptQueued);
-	
-	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-	{
-		g_pDiskState->SaveDownloadQueue(pDownloadQueue);
-	}
-	
-	g_pQueueCoordinator->UnlockQueue();
-}
-
-void ParCoordinator::UpdateParRenameProgress()
-{
-	g_pQueueCoordinator->LockQueue();
-	
-	PostInfo* pPostInfo = m_ParRenamer.GetPostInfo();
-	pPostInfo->SetProgressLabel(m_ParRenamer.GetProgressLabel());
-	pPostInfo->SetStageProgress(m_ParRenamer.GetStageProgress());
-	time_t tCurrent = time(NULL);
-	
-	if (!pPostInfo->GetStartTime())
-	{
-		pPostInfo->SetStartTime(tCurrent);
-	}
-	
-	if (pPostInfo->GetStage() != PostInfo::ptRenaming)
-	{
-		pPostInfo->SetStage(PostInfo::ptRenaming);
-		pPostInfo->SetStageTime(tCurrent);
-	}
-	
-	g_pQueueCoordinator->UnlockQueue();
-	
-	CheckPauseState(pPostInfo);
-}
-
-void ParCoordinator::PrintMessage(PostInfo* pPostInfo, Message::EKind eKind, const char* szFormat, ...)
-{
-	char szText[1024];
-	va_list args;
-	va_start(args, szFormat);
-	vsnprintf(szText, 1024, szFormat, args);
-	va_end(args);
-	szText[1024-1] = '\0';
-
-	pPostInfo->AppendMessage(eKind, szText);
-
-	switch (eKind)
-	{
-		case Message::mkDetail:
-			detail("%s", szText);
-			break;
-
-		case Message::mkInfo:
-			info("%s", szText);
-			break;
-
-		case Message::mkWarning:
-			warn("%s", szText);
-			break;
-
-		case Message::mkError:
-			error("%s", szText);
-			break;
-
-		case Message::mkDebug:
-			debug("%s", szText);
-			break;
-	}
-}
-
-#endif

ParCoordinator.h

@@ -1,130 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef PARCOORDINATOR_H
-#define PARCOORDINATOR_H
-
-#include <list>
-#include <deque>
-
-#include "DownloadInfo.h"
-
-#ifndef DISABLE_PARCHECK
-#include "ParChecker.h"
-#include "ParRenamer.h"
-#endif
-
-class ParCoordinator 
-{
-private:
-#ifndef DISABLE_PARCHECK
-	class PostParChecker: public ParChecker
-	{
-	private:
-		ParCoordinator*	m_pOwner;
-		PostInfo*		m_pPostInfo;
-	protected:
-		virtual bool	RequestMorePars(int iBlockNeeded, int* pBlockFound);
-		virtual void	UpdateProgress();
-		virtual void	Completed() { m_pOwner->ParCheckCompleted(); }
-		virtual void	PrintMessage(Message::EKind eKind, const char* szFormat, ...);
-	public:
-		PostInfo*		GetPostInfo() { return m_pPostInfo; }
-		void			SetPostInfo(PostInfo* pPostInfo) { m_pPostInfo = pPostInfo; }
-
-		friend class ParCoordinator;
-	};
-
-	class PostParRenamer: public ParRenamer
-	{
-	private:
-		ParCoordinator*	m_pOwner;
-		PostInfo*		m_pPostInfo;
-	protected:
-		virtual void	UpdateProgress();
-		virtual void	Completed() { m_pOwner->ParRenameCompleted(); }
-		virtual void	PrintMessage(Message::EKind eKind, const char* szFormat, ...);
-	public:
-		PostInfo*		GetPostInfo() { return m_pPostInfo; }
-		void			SetPostInfo(PostInfo* pPostInfo) { m_pPostInfo = pPostInfo; }
-		
-		friend class ParCoordinator;
-	};
-	
-	struct BlockInfo
-	{
-		FileInfo*		m_pFileInfo;
-		int				m_iBlockCount;
-	};
-
-	typedef std::list<BlockInfo*> 	Blocks;
-	
-	enum EJobKind
-	{
-		jkParCheck,
-		jkParRename
-	};
-
-private:
-	PostParChecker		m_ParChecker;
-	bool				m_bStopped;
-	PostParRenamer		m_ParRenamer;
-	EJobKind			m_eCurrentJob;
-
-protected:
-	virtual bool		PauseDownload() = 0;
-	virtual bool		UnpauseDownload() = 0;
-	void				UpdateParCheckProgress();
-	void				UpdateParRenameProgress();
-	void				ParCheckCompleted();
-	void				ParRenameCompleted();
-	void				CheckPauseState(PostInfo* pPostInfo);
-	bool				RequestMorePars(NZBInfo* pNZBInfo, const char* szParFilename, int iBlockNeeded, int* pBlockFound);
-	void				PrintMessage(PostInfo* pPostInfo, Message::EKind eKind, const char* szFormat, ...);
-#endif
-
-public:
-	typedef std::deque<char*>		FileList;
-
-public:
-						ParCoordinator();
-	virtual				~ParCoordinator();
-	static bool			FindMainPars(const char* szPath, FileList* pFileList);
-	static bool			ParseParFilename(const char* szParFilename, int* iBaseNameLen, int* iBlocks);
-	static bool			SameParCollection(const char* szFilename1, const char* szFilename2);
-	void				PausePars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
-
-#ifndef DISABLE_PARCHECK
-	bool				AddPar(FileInfo* pFileInfo, bool bDeleted);
-	void				FindPars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, const char* szParFilename, 
-							Blocks* pBlocks, bool bStrictParName, bool bExactParName, int* pBlockFound);
-	void				StartParCheckJob(PostInfo* pPostInfo);
-	void				StartParRenameJob(PostInfo* pPostInfo);
-	void				Stop();
-	bool				Cancel();
-#endif
-};
-
-#endif

ParRenamer.cpp

@@ -1,315 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#ifndef DISABLE_PARCHECK
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-#ifdef WIN32
-#include <par2cmdline.h>
-#include <par2repairer.h>
-#include <md5.h>
-#else
-#include <unistd.h>
-#include <libpar2/par2cmdline.h>
-#include <libpar2/par2repairer.h>
-#include <libpar2/md5.h>
-#endif
-
-#include "nzbget.h"
-#include "ParRenamer.h"
-#include "ParCoordinator.h"
-#include "Log.h"
-#include "Options.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-
-class ParRenamerRepairer : public Par2Repairer
-{
-public:
-	friend class ParRenamer;
-};
-
-ParRenamer::FileHash::FileHash(const char* szFilename, const char* szHash)
-{
-	m_szFilename = strdup(szFilename);
-	m_szHash = strdup(szHash);
-}
-
-ParRenamer::FileHash::~FileHash()
-{
-	free(m_szFilename);
-	free(m_szHash);
-}
-
-ParRenamer::ParRenamer()
-{
-    debug("Creating ParRenamer");
-
-	m_eStatus = psFailed;
-	m_szDestDir = NULL;
-	m_szInfoName = NULL;
-	m_szProgressLabel = (char*)malloc(1024);
-	m_iStageProgress = 0;
-	m_bCancelled = false;
-}
-
-ParRenamer::~ParRenamer()
-{
-    debug("Destroying ParRenamer");
-
-	if (m_szDestDir)
-	{
-		free(m_szDestDir);
-	}
-	if (m_szInfoName)
-	{
-		free(m_szInfoName);
-	}
-	free(m_szProgressLabel);
-
-	Cleanup();
-}
-
-void ParRenamer::Cleanup()
-{
-	for (FileHashList::iterator it = m_fileHashList.begin(); it != m_fileHashList.end(); it++)
-	{
-		delete *it;
-	}
-	m_fileHashList.clear();
-}
-
-void ParRenamer::SetDestDir(const char * szDestDir)
-{
-	if (m_szDestDir)
-	{
-		free(m_szDestDir);
-	}
-	m_szDestDir = strdup(szDestDir);
-}
-
-void ParRenamer::SetInfoName(const char * szInfoName)
-{
-	if (m_szInfoName)
-	{
-		free(m_szInfoName);
-	}
-	m_szInfoName = strdup(szInfoName);
-}
-
-void ParRenamer::Cancel()
-{
-	m_bCancelled = true;
-}
-
-void ParRenamer::Run()
-{
-	Cleanup();
-	m_bCancelled = false;
-	m_iRenamedCount = 0;
-	m_eStatus = psFailed;
-
-	snprintf(m_szProgressLabel, 1024, "Checking renamed files for %s", m_szInfoName);
-	m_szProgressLabel[1024-1] = '\0';
-	m_iStageProgress = 0;
-	UpdateProgress();
-
-	LoadParFiles();
-	CheckFiles();
-	
-	if (m_bCancelled)
-	{
-		PrintMessage(Message::mkWarning, "Renaming cancelled for %s", m_szInfoName);
-	}
-	else if (m_iRenamedCount > 0)
-	{
-		PrintMessage(Message::mkInfo, "Successfully renamed %i file(s) for %s", m_iRenamedCount, m_szInfoName);
-		m_eStatus = psSuccess;
-	}
-	else
-	{
-		PrintMessage(Message::mkInfo, "No renamed files found for %s", m_szInfoName);
-	}
-
-	Cleanup();
-	Completed();
-}
-
-void ParRenamer::LoadParFiles()
-{
-	ParCoordinator::FileList parFileList;
-	ParCoordinator::FindMainPars(m_szDestDir, &parFileList);
-	
-	for (ParCoordinator::FileList::iterator it = parFileList.begin(); it != parFileList.end(); it++)
-	{
-		char* szParFilename = *it;
-		
-		char szFullParFilename[1024];
-		snprintf(szFullParFilename, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, szParFilename);
-		szFullParFilename[1024-1] = '\0';
-		
-		LoadParFile(szFullParFilename);
-		
-		free(*it);
-	}
-}
-
-void ParRenamer::LoadParFile(const char* szParFilename)
-{
-	ParRenamerRepairer* pRepairer = new ParRenamerRepairer();
-
-	if (!pRepairer->LoadPacketsFromFile(szParFilename))
-	{
-		PrintMessage(Message::mkWarning, "Could not load par2-file %s", szParFilename);
-		delete pRepairer;
-		return;
-	}
-
-	for (map<MD5Hash, Par2RepairerSourceFile*>::iterator it = pRepairer->sourcefilemap.begin(); it != pRepairer->sourcefilemap.end(); it++)
-	{
-		if (m_bCancelled)
-		{
-			break;
-		}
-		
-		Par2RepairerSourceFile* sourceFile = (*it).second;
-		m_fileHashList.push_back(new FileHash(sourceFile->GetDescriptionPacket()->FileName().c_str(),
-			sourceFile->GetDescriptionPacket()->Hash16k().print().c_str()));
-	}
-
-	delete pRepairer;
-}
-
-void ParRenamer::CheckFiles()
-{
-	int iFileCount = 0;
-	DirBrowser dir2(m_szDestDir);
-	while (const char* filename = dir2.Next())
-	{
-		if (strcmp(filename, ".") && strcmp(filename, "..") && !m_bCancelled)
-		{
-			iFileCount++;
-		}
-	}
-
-	int iCurFile = 0;
-	DirBrowser dir(m_szDestDir);
-	while (const char* filename = dir.Next())
-	{
-		if (strcmp(filename, ".") && strcmp(filename, "..") && !m_bCancelled)
-		{
-			char szFullFilename[1024];
-			snprintf(szFullFilename, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, filename);
-			szFullFilename[1024-1] = '\0';
-
-			snprintf(m_szProgressLabel, 1024, "Checking file %s", filename);
-			m_szProgressLabel[1024-1] = '\0';
-			m_iStageProgress = iCurFile * 1000 / iFileCount;
-			UpdateProgress();
-			iCurFile++;
-			
-			CheckFile(szFullFilename);
-		}
-	}
-}
-
-void ParRenamer::CheckFile(const char* szFilename)
-{
-	debug("Computing hash for %s", szFilename);
-
-	const int iBlockSize = 16*1024;
-	
-    FILE* pFile = fopen(szFilename, "rb");
-    if (!pFile)
-    {
-		PrintMessage(Message::mkError, "Could not open file %s", szFilename);
-        return;
-    }
-
-	// load first 16K of the file into buffer
-	
-	void* pBuffer = malloc(iBlockSize);
-	
-    int iReadBytes = fread(pBuffer, 1, iBlockSize, pFile);
-	int iError = ferror(pFile);
-	if (iReadBytes != iBlockSize && iError)
-	{
-		PrintMessage(Message::mkError, "Could not read file %s", szFilename);
-		return;
-	}
-	
-    fclose(pFile);
-	
-	MD5Hash hash16k;
-	MD5Context context;
-	context.Update(pBuffer, iReadBytes);
-	context.Final(hash16k);
-	
-	free(pBuffer);
-	
-	debug("file: %s; hash16k: %s", Util::BaseFileName(szFilename), hash16k.print().c_str());
-	
-	for (FileHashList::iterator it = m_fileHashList.begin(); it != m_fileHashList.end(); it++)
-	{
-		FileHash* pFileHash = *it;
-		if (!strcmp(pFileHash->GetHash(), hash16k.print().c_str()))
-		{
-			debug("Found correct filename: %s", pFileHash->GetFilename());
-			
-			char szDstFilename[1024];
-			snprintf(szDstFilename, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, pFileHash->GetFilename());
-			szDstFilename[1024-1] = '\0';
-			
-			if (!Util::FileExists(szDstFilename))
-			{
-				PrintMessage(Message::mkInfo, "Renaming %s to %s", Util::BaseFileName(szFilename), pFileHash->GetFilename());
-				if (Util::MoveFile(szFilename, szDstFilename))
-				{
-					m_iRenamedCount++;
-				}
-				else
-				{
-					PrintMessage(Message::mkError, "Could not rename %s to %s", szFilename, szDstFilename);
-				}
-			}
-			
-			break;
-		}
-	}
-}
-
-#endif

ParRenamer.h

@@ -1,98 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  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 PARRENAMER_H
-#define PARRENAMER_H
-
-#ifndef DISABLE_PARCHECK
-
-#include <deque>
-
-#include "Thread.h"
-#include "Log.h"
-
-class ParRenamer : public Thread
-{
-public:
-	enum EStatus
-	{
-		psFailed,
-		psSuccess
-	};
-	
-	class FileHash
-	{
-	private:
-		char*			m_szFilename;
-		char*			m_szHash;
-
-	public:
-						FileHash(const char* szFilename, const char* szHash);
-						~FileHash();
-		const char*		GetFilename() { return m_szFilename; }
-		const char*		GetHash() { return m_szHash; }
-	};
-
-	typedef std::deque<FileHash*>		FileHashList;
-	
-private:
-	char*				m_szInfoName;
-	char*				m_szDestDir;
-	EStatus				m_eStatus;
-	char*				m_szProgressLabel;
-	int					m_iStageProgress;
-	bool				m_bCancelled;
-	FileHashList		m_fileHashList;
-	int					m_iRenamedCount;
-
-	void				Cleanup();
-	void				LoadParFiles();
-	void				LoadParFile(const char* szParFilename);
-	void				CheckFiles();
-	void				CheckFile(const char* szFilename);
-
-protected:
-	virtual void		UpdateProgress() {}
-	virtual void		Completed() {}
-	virtual void		PrintMessage(Message::EKind eKind, const char* szFormat, ...) {}
-	const char*			GetProgressLabel() { return m_szProgressLabel; }
-	int					GetStageProgress() { return m_iStageProgress; }
-
-public:
-						ParRenamer();
-	virtual				~ParRenamer();
-	virtual void		Run();
-	void				SetDestDir(const char* szDestDir);
-	const char*			GetInfoName() { return m_szInfoName; }
-	void				SetInfoName(const char* szInfoName);
-	void				SetStatus(EStatus eStatus);
-	EStatus				GetStatus() { return m_eStatus; }
-	void				Cancel();
-	bool				GetCancelled() { return m_bCancelled; }
-};
-
-#endif
-
-#endif

PostInfo.cpp

@@ -0,0 +1,174 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  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 "PostInfo.h"
+#include "Options.h"
+
+extern Options* g_pOptions;
+
+int PostInfo::m_iIDGen = 0;
+
+PostInfo::PostInfo()
+{
+	debug("Creating PostInfo");
+
+	m_szNZBFilename = NULL;
+	m_szDestDir = NULL;
+	m_szParFilename = NULL;
+	m_szInfoName = NULL;
+	m_szCategory = NULL;
+	m_szQueuedFilename = NULL;
+	m_bWorking = false;
+	m_bParCheck = false;
+	m_iParStatus = 0;
+	m_bParFailed = false;
+	m_szProgressLabel = strdup("");
+	m_iFileProgress = 0;
+	m_iStageProgress = 0;
+	m_tStartTime = 0;
+	m_tStageTime = 0;
+	m_eStage = ptQueued;
+	m_pScriptThread = NULL;
+	m_Messages.clear();
+	m_iIDGen++;
+	m_iID = m_iIDGen;
+}
+
+PostInfo::~ PostInfo()
+{
+	debug("Destroying PostInfo");
+
+	if (m_szNZBFilename)
+	{
+		free(m_szNZBFilename);
+	}
+	if (m_szDestDir)
+	{
+		free(m_szDestDir);
+	}
+	if (m_szParFilename)
+	{
+		free(m_szParFilename);
+	}
+	if (m_szInfoName)
+	{
+		free(m_szInfoName);
+	}
+	if (m_szCategory)
+	{
+		free(m_szCategory);
+	}
+	if (m_szQueuedFilename)
+	{
+		free(m_szQueuedFilename);
+	}
+	if (m_szProgressLabel)
+	{
+		free(m_szProgressLabel);
+	}
+	for (Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
+	{
+		delete *it;
+	}
+	m_Messages.clear();
+}
+
+void PostInfo::SetNZBFilename(const char* szNZBFilename)
+{
+	m_szNZBFilename = strdup(szNZBFilename);
+}
+
+void PostInfo::SetDestDir(const char* szDestDir)
+{
+	m_szDestDir = strdup(szDestDir);
+}
+
+void PostInfo::SetParFilename(const char* szParFilename)
+{
+	m_szParFilename = strdup(szParFilename);
+}
+
+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)
+	{
+		free(m_szProgressLabel);
+	}
+	m_szProgressLabel = strdup(szProgressLabel);
+}
+
+PostInfo::Messages* PostInfo::LockMessages()
+{
+	m_mutexLog.Lock();
+	return &m_Messages;
+}
+
+void PostInfo::UnlockMessages()
+{
+	m_mutexLog.Unlock();
+}
+
+void PostInfo::AppendMessage(Message::EKind eKind, const char * szText)
+{
+	Message* pMessage = new Message(++m_iIDGen, eKind, time(NULL), szText);
+
+	m_mutexLog.Lock();
+	m_Messages.push_back(pMessage);
+
+	while (m_Messages.size() > (unsigned int)g_pOptions->GetLogBufferSize())
+	{
+		Message* pMessage = m_Messages.front();
+		delete pMessage;
+		m_Messages.pop_front();
+	}
+	m_mutexLog.Unlock();
+}

PostInfo.h

@@ -0,0 +1,119 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  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 POSTINFO_H
+#define POSTINFO_H
+
+#include <deque>
+
+#include "Log.h"
+#include "Thread.h"
+
+class PostInfo
+{
+public:
+	enum EStage
+	{
+		ptQueued,
+		ptLoadingPars,
+		ptVerifyingSources,
+		ptRepairing,
+		ptVerifyingRepaired,
+		ptExecutingScript,
+		ptFinished
+	};
+
+	typedef std::deque<Message*>	Messages;
+
+private:
+	int				m_iID;
+	char*			m_szNZBFilename;
+	char*			m_szDestDir;
+	char*			m_szParFilename;
+	char*			m_szInfoName;
+	char*			m_szCategory;
+	char*			m_szQueuedFilename;
+	bool			m_bWorking;
+	bool			m_bParCheck;
+	int				m_iParStatus;
+	bool			m_bParFailed;
+	EStage			m_eStage;
+	char*			m_szProgressLabel;
+	int				m_iFileProgress;
+	int				m_iStageProgress;
+	time_t			m_tStartTime;
+	time_t			m_tStageTime;
+	Thread*			m_pScriptThread;
+	
+	Mutex			m_mutexLog;
+	Messages		m_Messages;
+	static int		m_iIDGen;
+
+public:
+					PostInfo();
+					~PostInfo();
+	int				GetID() { return m_iID; }
+	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);
+	const char*		GetProgressLabel() { return m_szProgressLabel; }
+	int				GetFileProgress() { return m_iFileProgress; }
+	void			SetFileProgress(int iFileProgress) { m_iFileProgress = iFileProgress; }
+	int				GetStageProgress() { return m_iStageProgress; }
+	void			SetStageProgress(int iStageProgress) { m_iStageProgress = iStageProgress; }
+	time_t			GetStartTime() { return m_tStartTime; }
+	void			SetStartTime(time_t tStartTime) { m_tStartTime = tStartTime; }
+	time_t			GetStageTime() { return m_tStageTime; }
+	void			SetStageTime(time_t tStageTime) { m_tStageTime = tStageTime; }
+	bool			GetWorking() { return m_bWorking; }
+	void			SetWorking(bool bWorking) { m_bWorking = bWorking; }
+	bool			GetParCheck() { return m_bParCheck; }
+	void			SetParCheck(bool bParCheck) { m_bParCheck = bParCheck; }
+	int				GetParStatus() { return m_iParStatus; }
+	void			SetParStatus(int iParStatus) { m_iParStatus = iParStatus; }
+	bool			GetParFailed() { return m_bParFailed; }
+	void			SetParFailed(bool bParFailed) { m_bParFailed = bParFailed; }
+	void			AppendMessage(Message::EKind eKind, const char* szText);
+	Thread*			GetScriptThread() { return m_pScriptThread; }
+	void			SetScriptThread(Thread* pScriptThread) { m_pScriptThread = pScriptThread; }
+	Messages*		LockMessages();
+	void			UnlockMessages();
+};
+
+typedef std::deque<PostInfo*> PostQueue;
+
+#endif

PrePostProcessor.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2013 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,81 +31,97 @@
 #include "Thread.h"
 #include "Observer.h"
 #include "DownloadInfo.h"
-#include "ParCoordinator.h"
+#include "PostInfo.h"
+
+#ifndef DISABLE_PARCHECK
+#include "ParChecker.h"
+#endif
 
 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,
-		eaHistorySetParameter
-	};
-
 private:
+	typedef std::deque<char*>		FileList;
+
 	class QueueCoordinatorObserver: public Observer
 	{
 	public:
-		PrePostProcessor* m_pOwner;
-		virtual void	Update(Subject* Caller, void* Aspect) { m_pOwner->QueueCoordinatorUpdate(Caller, Aspect); }
+		PrePostProcessor* owner;
+		virtual void	Update(Subject* Caller, void* Aspect) { owner->QueueCoordinatorUpdate(Caller, Aspect); }
 	};
 
-	class PostParCoordinator: public ParCoordinator
+#ifndef DISABLE_PARCHECK
+	class ParCheckerObserver: public Observer
+	{
+	public:
+		PrePostProcessor* owner;
+		virtual void	Update(Subject* Caller, void* Aspect) { owner->ParCheckerUpdate(Caller, Aspect); }
+	};
+
+	class PostParChecker: public ParChecker
 	{
 	private:
-		PrePostProcessor*	m_pOwner;
+		PrePostProcessor* m_Owner;
 	protected:
-		virtual bool		PauseDownload() { return m_pOwner->PauseDownload(); }
-		virtual bool		UnpauseDownload() { return m_pOwner->UnpauseDownload(); }
+		virtual bool	RequestMorePars(int iBlockNeeded, int* pBlockFound);
+		virtual void	UpdateProgress();
 
 		friend class PrePostProcessor;
 	};
+
+	struct BlockInfo
+	{
+		FileInfo*		m_pFileInfo;
+		int				m_iBlockCount;
+	};
+
+	typedef std::deque<BlockInfo*> 	Blocks;
+#endif
 	
 private:
-	PostParCoordinator	m_ParCoordinator;
 	QueueCoordinatorObserver	m_QueueCoordinatorObserver;
 	bool				m_bHasMoreJobs;
-	bool				m_bSchedulerPauseChanged;
-	bool				m_bSchedulerPause;
-	bool				m_bPostPause;
-	const char*			m_szPauseReason;
+	bool				m_bPostScript;
 
-	bool				IsNZBFileCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, 
-							bool bIgnorePausedPars, bool bAllowOnlyOneDeleted);
+	void				PausePars(DownloadQueue* pDownloadQueue, const char* szNZBFilename);
+	void				CheckIncomingNZBs(const char* szDirectory, const char* szCategory);
+	bool				IsNZBFileCompleted(DownloadQueue* pDownloadQueue, const char* szNZBFilename, 
+							bool bIgnoreFirstInPostQueue, bool bIgnorePaused, bool bCheckPostQueue);
+	bool				CheckScript(FileInfo* pFileInfo);
+	bool				JobExists(PostQueue* pPostQueue, const char* szNZBFilename);
+	bool				ClearCompletedJobs(const char* szNZBFilename);
 	void				CheckPostQueue();
 	void				JobCompleted(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
-	void				StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
-	void				SaveQueue(DownloadQueue* pDownloadQueue);
-	void				SanitisePostQueue(PostQueue* pPostQueue);
+	void				StartScriptJob(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
+	void				SavePostQueue();
+	void				SanitisePostQueue();
 	void				CheckDiskSpace();
-	void				ApplySchedulerState();
-	void				CheckScheduledResume();
-	void				UpdatePauseState(bool bNeedPause, const char* szReason);
-	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				DeleteQueuedFile(const char* szQueuedFile);
-	NZBInfo*			MergeGroups(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
-	bool				PostQueueMove(IDList* pIDList, EEditAction eAction, int iOffset);
-	bool				PostQueueDelete(IDList* pIDList);
-	bool				HistoryEdit(IDList* pIDList, EEditAction eAction, int iOffset, const char* szText);
-	void				HistoryDelete(DownloadQueue* pDownloadQueue, HistoryList::iterator itHistory, HistoryInfo* pHistoryInfo);
-	void				HistoryReturn(DownloadQueue* pDownloadQueue, HistoryList::iterator itHistory, HistoryInfo* pHistoryInfo, bool bReprocess);
-	void				HistorySetParameter(HistoryInfo* pHistoryInfo, const char* szText);
-	void				Cleanup();
-	FileInfo*			GetQueueGroup(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
-	void				CheckHistory();
-	void				DeletePostThread(PostInfo* pPostInfo);
+	bool				PostProcessEnabled();
+	void				AddFileToQueue(const char* szFilename, const char* szCategory);
 
+	Mutex			 	m_mutexQueue;
+	PostQueue			m_PostQueue;
+	PostQueue			m_CompletedJobs;
+
+#ifndef DISABLE_PARCHECK
+	PostParChecker		m_ParChecker;
+	ParCheckerObserver	m_ParCheckerObserver;
+
+	void				ParCheckerUpdate(Subject* Caller, void* Aspect);
+	bool				CheckPars(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo);
+	bool				AddPar(FileInfo* pFileInfo, bool bDeleted);
+	bool				SameParCollection(const char* szFilename1, const char* szFilename2);
+	bool				FindMainPars(const char* szPath, FileList* pFileList);
+	int					GetParCleanupQueueGroup(DownloadQueue* pDownloadQueue, const char* szNZBFilename);
+	bool				HasFailedParJobs(const char* szNZBFilename);
+	bool				ParJobExists(PostQueue* pPostQueue, const char* szParFilename);
+	bool				ParseParFilename(const char* szParFilename, int* iBaseNameLen, int* iBlocks);
+	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);
+#endif
+	
 public:
 						PrePostProcessor();
 	virtual				~PrePostProcessor();
@@ -113,7 +129,8 @@ public:
 	virtual void		Stop();
 	void				QueueCoordinatorUpdate(Subject* Caller, void* Aspect);
 	bool				HasMoreJobs() { return m_bHasMoreJobs; }
-	bool				QueueEditList(IDList* pIDList, EEditAction eAction, int iOffset, const char* szText);
+	PostQueue*			LockPostQueue();
+	void				UnlockPostQueue();
 };
 
 #endif

QueueCoordinator.cpp

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2005  Bo Cordes Petersen <placebodk@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
@@ -34,7 +34,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+#include <cstdio>
 #include <sys/stat.h>
 #ifndef WIN32
 #include <unistd.h>
@@ -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++)
@@ -117,17 +119,6 @@ void QueueCoordinator::Run()
 
 	m_mutexDownloadQueue.Unlock();
 
-	// compute maximum number of allowed download threads
-	m_iDownloadsLimit = 2; // two extra threads for completing files (when connections are not needed)
-	for (ServerPool::Servers::iterator it = g_pServerPool->GetServers()->begin(); it != g_pServerPool->GetServers()->end(); it++)
-	{
-		NewsServer* pNewsServer = *it;
-		if (pNewsServer->GetLevel() == 0)
-		{
-			m_iDownloadsLimit += pNewsServer->GetMaxConnections();
-		}
-	}
-
 	m_tStartServer = time(NULL);
 	m_tLastCheck = m_tStartServer;
 	bool bWasStandBy = true;
@@ -136,35 +127,29 @@ void QueueCoordinator::Run()
 
 	while (!IsStopped())
 	{
-		if (!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
+		if (!g_pOptions->GetPause())
 		{
-			NNTPConnection* pConnection = g_pServerPool->GetConnection(0, NULL, NULL);
+			NNTPConnection* pConnection = g_pServerPool->GetConnection(0, false);
 			if (pConnection)
 			{
 				// start download for next article
 				FileInfo* pFileInfo;
 				ArticleInfo* pArticleInfo;
-				bool bFreeConnection = false;
-				
+
 				m_mutexDownloadQueue.Lock();
 				bool bHasMoreArticles = GetNextArticle(pFileInfo, pArticleInfo);
 				bArticeDownloadsRunning = !m_ActiveDownloads.empty();
 				m_bHasMoreJobs = bHasMoreArticles || bArticeDownloadsRunning;
-				if (bHasMoreArticles && !IsStopped() && (int)m_ActiveDownloads.size() < m_iDownloadsLimit)
+				if (bHasMoreArticles && !IsStopped() && Thread::GetThreadCount() < g_pOptions->GetThreadLimit())
 				{
 					StartArticleDownload(pFileInfo, pArticleInfo, pConnection);
 					bArticeDownloadsRunning = true;
 				}
 				else
-				{
-					bFreeConnection = true;
-				}
-				m_mutexDownloadQueue.Unlock();
-				
-				if (bFreeConnection)
 				{
 					g_pServerPool->FreeConnection(pConnection, false);
 				}
+				m_mutexDownloadQueue.Unlock();
 			}
 		}
 		else
@@ -185,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
@@ -223,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;
@@ -266,41 +248,39 @@ 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())
 		{
-			g_pDiskState->DiscardFile(pFileInfo);
+			g_pDiskState->DiscardFile(NULL, pFileInfo);
 		}
 		delete pFileInfo;
 	}
 
-	m_DownloadQueue.GetNZBInfoList()->Add(pNZBFile->GetNZBInfo());
-
 	pNZBFile->DetachFileInfos();
 
-	Aspect aspect = { eaNZBFileAdded, &m_DownloadQueue, pNZBFile->GetNZBInfo(), NULL };
+	Aspect aspect = { eaNZBFileAdded, NULL, &m_DownloadQueue, pNZBFile->GetFileName() };
 	Notify(&aspect);
 	
 	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
@@ -311,102 +291,92 @@ 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"
  */
-int QueueCoordinator::CalcCurrentDownloadSpeed()
+float QueueCoordinator::CalcCurrentDownloadSpeed()
 {
-	if (m_bStandBy)
-	{
-		return 0;
-	}
-
-	int iTimeDiff = (int)time(NULL) - m_iSpeedStartTime * SPEEDMETER_SLOTSIZE;
-	if (iTimeDiff == 0)
-	{
-		return 0;
-	}
-
-	return m_iSpeedTotalBytes / iTimeDiff;
+    int iTimeDiff = (int)time(NULL) - m_iSpeedStartTime * SPEEDMETER_SLOTSIZE;
+    if (iTimeDiff == 0)
+    {
+    	return 0;
+    }
+	float fSpeed = m_iSpeedTotalBytes / 1024.0f / iTimeDiff;
+	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)
 {
-	time_t tCurTime = time(NULL);
-	int iNowSlot = (int)tCurTime / SPEEDMETER_SLOTSIZE;
+    int iNowSlot = (int)time(NULL) / SPEEDMETER_SLOTSIZE;
 
-	if (g_pOptions->GetAccurateRate())
-	{
-#ifdef HAVE_SPINLOCK
-		m_spinlockSpeed.Lock();
-#else
-		m_mutexSpeed.Lock();
-#endif
-	}
+    if (iNowSlot > m_iSpeedTime[m_iSpeedBytesIndex])
+    {
+        //record bytes in next slot
+        m_iSpeedBytesIndex++;
+        if (m_iSpeedBytesIndex >= SPEEDMETER_SLOTS)
+        {
+            m_iSpeedBytesIndex = 0;
+        }
+        //Adjust counters with outging information.
+        m_iSpeedTotalBytes -= m_iSpeedBytes[m_iSpeedBytesIndex];
 
-	while (iNowSlot > m_iSpeedTime[m_iSpeedBytesIndex])
-	{
-		//record bytes in next slot
-		m_iSpeedBytesIndex++;
-		if (m_iSpeedBytesIndex >= SPEEDMETER_SLOTS)
-		{
-			m_iSpeedBytesIndex = 0;
-		}
-		//Adjust counters with outgoing information.
-		m_iSpeedTotalBytes -= m_iSpeedBytes[m_iSpeedBytesIndex];
+        //Note we should really use the start time of the next slot
+        //but its easier to just use the outgoing slot time. This 
+        //will result in a small error.
+        m_iSpeedStartTime = m_iSpeedTime[m_iSpeedBytesIndex];
 
-		//Note we should really use the start time of the next slot
-		//but its easier to just use the outgoing slot time. This
-		//will result in a small error.
-		m_iSpeedStartTime = m_iSpeedTime[m_iSpeedBytesIndex];
+        //Now reset.
+        m_iSpeedBytes[m_iSpeedBytesIndex] = 0;
+        m_iSpeedTime[m_iSpeedBytesIndex] = iNowSlot;
+    } 
 
-		//Now reset.
-		m_iSpeedBytes[m_iSpeedBytesIndex] = 0;
-		m_iSpeedTime[m_iSpeedBytesIndex] = iNowSlot;
-	}
-
-	// Once per second recalculate summary field "m_iSpeedTotalBytes" to recover from possible synchronisation errors
-	if (tCurTime > m_tSpeedCorrection)
-	{
-		int iSpeedTotalBytes = 0;
-		for (int i = 0; i < SPEEDMETER_SLOTS; i++)
-		{
-			iSpeedTotalBytes += m_iSpeedBytes[i];
-		}
-		m_iSpeedTotalBytes = iSpeedTotalBytes;
-		m_tSpeedCorrection = tCurTime;
-	}
-
-	if (m_iSpeedTotalBytes == 0)
-	{
-		m_iSpeedStartTime = iNowSlot;
-	}
-	m_iSpeedBytes[m_iSpeedBytesIndex] += iBytes;
-	m_iSpeedTotalBytes += iBytes;
+    if (m_iSpeedTotalBytes == 0)
+    {
+        m_iSpeedStartTime = iNowSlot;
+    }
+    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()
 {
-	time_t tCurTime = time(NULL);
-	m_iSpeedStartTime = (int)tCurTime / SPEEDMETER_SLOTSIZE;
+    m_iSpeedStartTime = (int)time(NULL) / SPEEDMETER_SLOTSIZE;
 	for (int i = 0; i < SPEEDMETER_SLOTS; i++)
 	{
 		m_iSpeedBytes[i] = 0;
-		m_iSpeedTime[i] = m_iSpeedStartTime;
+        m_iSpeedTime[i] = m_iSpeedStartTime;
 	}
 	m_iSpeedBytesIndex = 0;
-	m_iSpeedTotalBytes = 0;
-	m_tSpeedCorrection = tCurTime;
+    m_iSpeedTotalBytes = 0;
 }
 
 long long QueueCoordinator::CalcRemainingSize()
@@ -414,7 +384,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())
@@ -447,7 +417,7 @@ bool QueueCoordinator::DeleteQueueEntry(FileInfo* pFileInfo)
 	}
 	if (!hasDownloads)
 	{
-		Aspect aspect = { eaFileDeleted, &m_DownloadQueue, pFileInfo->GetNZBInfo(), pFileInfo };
+		Aspect aspect = { eaFileDeleted, pFileInfo, &m_DownloadQueue, NULL };
 		Notify(&aspect);
 
 		DeleteFileInfo(pFileInfo, false);
@@ -469,90 +439,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.
-
-	// special case: if the file has ExtraPriority-flag set, it has the highest priority and the
-	// Paused-flag is ignored.
-
 	//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->GetExtraPriority() == pFileInfo->GetExtraPriority() &&
-				  pFileInfo1->GetPriority() > pFileInfo->GetPriority()) ||
-				 (pFileInfo1->GetExtraPriority() > pFileInfo->GetExtraPriority())))
+			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)
@@ -565,19 +476,42 @@ void QueueCoordinator::StartArticleDownload(FileInfo* pFileInfo, ArticleInfo* pA
 	pArticleDownloader->SetFileInfo(pFileInfo);
 	pArticleDownloader->SetArticleInfo(pArticleInfo);
 	pArticleDownloader->SetConnection(pConnection);
-
-	char szInfoName[1024];
-	snprintf(szInfoName, 1024, "%s%c%s [%i/%i]", pFileInfo->GetNZBInfo()->GetName(), (int)PATH_SEPARATOR, pFileInfo->GetFilename(), pArticleInfo->GetPartNumber(), pFileInfo->GetArticles()->size());
-	szInfoName[1024-1] = '\0';
-	pArticleDownloader->SetInfoName(szInfoName);
+	BuildArticleFilename(pArticleDownloader, pFileInfo, pArticleInfo);
 
 	pArticleInfo->SetStatus(ArticleInfo::aiRunning);
-	pFileInfo->SetActiveDownloads(pFileInfo->GetActiveDownloads() + 1);
 
 	m_ActiveDownloads.push_back(pArticleDownloader);
 	pArticleDownloader->Start();
 }
 
+void QueueCoordinator::BuildArticleFilename(ArticleDownloader* pArticleDownloader, FileInfo* pFileInfo, ArticleInfo* pArticleInfo)
+{
+	char name[1024];
+	
+	snprintf(name, 1024, "%s%i.%03i", g_pOptions->GetTempDir(), pFileInfo->GetID(), pArticleInfo->GetPartNumber());
+	name[1024-1] = '\0';
+	pArticleInfo->SetResultFilename(name);
+
+	char tmpname[1024];
+	snprintf(tmpname, 1024, "%s.tmp", name);
+	tmpname[1024-1] = '\0';
+	pArticleDownloader->SetTempFilename(tmpname);
+
+	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);
+
+	if (g_pOptions->GetDirectWrite())
+	{
+		snprintf(name, 1024, "%s%i.out", g_pOptions->GetTempDir(), pFileInfo->GetID());
+		name[1024-1] = '\0';
+		pArticleDownloader->SetOutputFilename(name);
+	}
+}
+
 DownloadQueue* QueueCoordinator::LockQueue()
 {
 	m_mutexDownloadQueue.Lock();
@@ -595,8 +529,7 @@ void QueueCoordinator::Update(Subject* Caller, void* Aspect)
 
 	ArticleDownloader* pArticleDownloader = (ArticleDownloader*) Caller;
 	if ((pArticleDownloader->GetStatus() == ArticleDownloader::adFinished) ||
-		(pArticleDownloader->GetStatus() == ArticleDownloader::adFailed) ||
-		(pArticleDownloader->GetStatus() == ArticleDownloader::adRetry))
+	        (pArticleDownloader->GetStatus() == ArticleDownloader::adFailed))
 	{
 		ArticleCompleted(pArticleDownloader);
 	}
@@ -608,8 +541,6 @@ void QueueCoordinator::ArticleCompleted(ArticleDownloader* pArticleDownloader)
 
 	FileInfo* pFileInfo = pArticleDownloader->GetFileInfo();
 	ArticleInfo* pArticleInfo = pArticleDownloader->GetArticleInfo();
-	bool bPaused = false;
-	bool fileCompleted = false;
 
 	m_mutexDownloadQueue.Lock();
 
@@ -621,18 +552,10 @@ void QueueCoordinator::ArticleCompleted(ArticleDownloader* pArticleDownloader)
 	{
 		pArticleInfo->SetStatus(ArticleInfo::aiFailed);
 	}
-	else if (pArticleDownloader->GetStatus() == ArticleDownloader::adRetry)
-	{
-		pArticleInfo->SetStatus(ArticleInfo::aiUndefined);
-		bPaused = true;
-	}
 
-	if (!bPaused)
-	{
-		pFileInfo->SetRemainingSize(pFileInfo->GetRemainingSize() - pArticleInfo->GetSize());
-		pFileInfo->SetCompleted(pFileInfo->GetCompleted() + 1);
-		fileCompleted = (int)pFileInfo->GetArticles()->size() == pFileInfo->GetCompleted();
-	}
+	pFileInfo->SetRemainingSize(pFileInfo->GetRemainingSize() - pArticleInfo->GetSize());
+	pFileInfo->SetCompleted(pFileInfo->GetCompleted() + 1);
+	bool fileCompleted = (int)pFileInfo->GetArticles()->size() == pFileInfo->GetCompleted();
 
 	if (!pFileInfo->GetFilenameConfirmed() &&
 		pArticleDownloader->GetStatus() == ArticleDownloader::adFinished &&
@@ -644,7 +567,6 @@ void QueueCoordinator::ArticleCompleted(ArticleDownloader* pArticleDownloader)
 		{
 			warn("File \"%s\" seems to be duplicate, cancelling download and deleting file from queue", pFileInfo->GetFilename());
 			fileCompleted = false;
-			pFileInfo->SetAutoDeleted(true);
 			DeleteQueueEntry(pFileInfo);
 		}
 	}
@@ -687,23 +609,16 @@ void QueueCoordinator::ArticleCompleted(ArticleDownloader* pArticleDownloader)
 			break;
 		}
 	}
-
-	pFileInfo->SetActiveDownloads(pFileInfo->GetActiveDownloads() - 1);
-
 	if (deleteFileObj)
 	{
 		bool fileDeleted = pFileInfo->GetDeleted();
 		// delete File from Queue
 		pFileInfo->SetDeleted(true);
 
-		Aspect aspect = { fileCompleted && !fileDeleted ? eaFileCompleted : eaFileDeleted, &m_DownloadQueue, pFileInfo->GetNZBInfo(), pFileInfo };
+		Aspect aspect = { fileCompleted && !fileDeleted ? eaFileCompleted : eaFileDeleted, pFileInfo, &m_DownloadQueue, NULL };
 		Notify(&aspect);
 		
 		DeleteFileInfo(pFileInfo, fileCompleted);
-		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-		{
-			g_pDiskState->SaveDownloadQueue(&m_DownloadQueue);
-		}
 	}
 
 	m_mutexDownloadQueue.Unlock();
@@ -711,49 +626,47 @@ 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;
 		}
 	}
 
 	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
 	{
-		g_pDiskState->DiscardFile(pFileInfo);
+		g_pDiskState->DiscardFile(&m_DownloadQueue, pFileInfo);
 	}
 
 	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() && pFileInfo->GetOutputFilename())
-	{
-		remove(pFileInfo->GetOutputFilename());
-	}
+	delete pFileInfo;
 }
 
 bool QueueCoordinator::IsDupe(FileInfo* pFileInfo)
@@ -767,7 +680,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()) &&
@@ -784,25 +697,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 = (float)(CalcCurrentDownloadSpeed() / 1024.0);
-	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("   ----------------");
 
@@ -822,7 +719,8 @@ void QueueCoordinator::LogDebugInfo()
 
 void QueueCoordinator::ResetHangingDownloads()
 {
-	if (g_pOptions->GetTerminateTimeout() == 0 && g_pOptions->GetConnectionTimeout() == 0)
+	const int TimeOut = g_pOptions->GetTerminateTimeout();
+	if (TimeOut == 0)
 	{
 		return;
 	}
@@ -833,15 +731,7 @@ void QueueCoordinator::ResetHangingDownloads()
 	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end();)
 	{
 		ArticleDownloader* pArticleDownloader = *it;
-
-		if (tm - pArticleDownloader->GetLastUpdateTime() > g_pOptions->GetConnectionTimeout() + 1 &&
-		   pArticleDownloader->GetStatus() == ArticleDownloader::adRunning)
-		{
-			error("Cancelling hanging download %s", pArticleDownloader->GetInfoName());
-			pArticleDownloader->Stop();
-		}
-		
-		if (tm - pArticleDownloader->GetLastUpdateTime() > g_pOptions->GetTerminateTimeout() &&
+		if (tm - pArticleDownloader->GetLastUpdateTime() > TimeOut &&
 		   pArticleDownloader->GetStatus() == ArticleDownloader::adRunning)
 		{
 			ArticleInfo* pArticleInfo = pArticleDownloader->GetArticleInfo();
@@ -856,7 +746,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();
@@ -926,7 +815,7 @@ void QueueCoordinator::AdjustStartTime()
 	if (tDiff > 60 || tDiff < 0)
 	{
 		m_tStartServer += tDiff + 1; // "1" because the method is called once per second
-		if (m_tStartDownload != 0 && !m_bStandBy)
+		if (m_tStartDownload != 0)
 		{
 			m_tStartDownload += tDiff + 1;
 		}
@@ -938,7 +827,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;
 	}
 
@@ -954,153 +845,3 @@ 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
- */
-bool QueueCoordinator::MergeQueueEntries(NZBInfo* pDestNZBInfo, NZBInfo* pSrcNZBInfo)
-{
-	if (pDestNZBInfo->GetPostProcess() || pSrcNZBInfo->GetPostProcess())
-	{
-		error("Could not merge %s and %s. File in post-process-stage", pDestNZBInfo->GetName(), pSrcNZBInfo->GetName());
-		return false;
-	}
-
-	// set new dest directory, new category and move downloaded files to new dest directory
-	pSrcNZBInfo->SetFilename(pSrcNZBInfo->GetFilename());
-	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++)
-	{
-		FileInfo* pFileInfo = *it;
-		if (pFileInfo->GetNZBInfo() == pSrcNZBInfo)
-		{
-			pFileInfo->SetNZBInfo(pDestNZBInfo);
-		}
-	}
-
-	pDestNZBInfo->SetFileCount(pDestNZBInfo->GetFileCount() + pSrcNZBInfo->GetFileCount());
-	pDestNZBInfo->SetSize(pDestNZBInfo->GetSize() + pSrcNZBInfo->GetSize());
-
-	// reattach completed file items to new NZBInfo-object
-	for (NZBInfo::Files::iterator it = pSrcNZBInfo->GetCompletedFiles()->begin(); it != pSrcNZBInfo->GetCompletedFiles()->end(); it++)
-    {
-		char* szFileName = *it;
-		pDestNZBInfo->GetCompletedFiles()->push_back(szFileName);
-	}
-	pSrcNZBInfo->GetCompletedFiles()->clear();
-
-	// concatenate QueuedFilenames using character '|' as separator
-	int iLen = strlen(pDestNZBInfo->GetQueuedFilename()) + strlen(pSrcNZBInfo->GetQueuedFilename()) + 1;
-	char* szQueuedFilename = (char*)malloc(iLen);
-	snprintf(szQueuedFilename, iLen, "%s|%s", pDestNZBInfo->GetQueuedFilename(), pSrcNZBInfo->GetQueuedFilename());
-	szQueuedFilename[iLen - 1] = '\0';
-	pDestNZBInfo->SetQueuedFilename(szQueuedFilename);
-	free(szQueuedFilename);
-
-	return true;
-}
-
-/*
- * Creates new nzb-item out of existing files from other nzb-items.
- * If any of file-items is being downloaded the command fail.
- * For each file-item an event "eaFileDeleted" is fired.
- *
- * NOTE: DownloadQueue must be locked prior to call of this function
- */
-bool QueueCoordinator::SplitQueueEntries(FileQueue* pFileList, const char* szName, NZBInfo** pNewNZBInfo)
-{
-	if (pFileList->empty())
-	{
-		return false;
-	}
-
-	NZBInfo* pSrcNZBInfo = NULL;
-
-	for (FileQueue::iterator it = pFileList->begin(); it != pFileList->end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-		if (pFileInfo->GetActiveDownloads() > 0 || pFileInfo->GetCompleted() > 0)
-		{
-			error("Could not split %s. File is already (partially) downloaded", pFileInfo->GetFilename());
-			return false;
-		}
-		if (pFileInfo->GetNZBInfo()->GetPostProcess())
-		{
-			error("Could not split %s. File in post-process-stage", pFileInfo->GetFilename());
-			return false;
-		}
-		if (!pSrcNZBInfo)
-		{
-			pSrcNZBInfo = pFileInfo->GetNZBInfo();
-		}
-	}
-
-	NZBInfo* pNZBInfo = new NZBInfo();
-	pNZBInfo->AddReference();
-	m_DownloadQueue.GetNZBInfoList()->Add(pNZBInfo);
-
-	pNZBInfo->SetFilename(pSrcNZBInfo->GetFilename());
-	pNZBInfo->SetName(szName);
-	pNZBInfo->SetCategory(pSrcNZBInfo->GetCategory());
-	pNZBInfo->BuildDestDirName();
-	pNZBInfo->SetQueuedFilename(pSrcNZBInfo->GetQueuedFilename());
-
-	for (NZBParameterList::iterator it = pSrcNZBInfo->GetParameters()->begin(); it != pSrcNZBInfo->GetParameters()->end(); it++)
-	{
-		NZBParameter* pNZBParameter = *it;
-		pNZBInfo->SetParameter(pNZBParameter->GetName(), pNZBParameter->GetValue());
-	}
-
-	for (FileQueue::iterator it = pFileList->begin(); it != pFileList->end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-
-		Aspect aspect = { eaFileDeleted, &m_DownloadQueue, pFileInfo->GetNZBInfo(), pFileInfo };
-		Notify(&aspect);
-
-		pFileInfo->SetNZBInfo(pNZBInfo);
-
-		pSrcNZBInfo->SetFileCount(pSrcNZBInfo->GetFileCount() - 1);
-		pSrcNZBInfo->SetSize(pSrcNZBInfo->GetSize() - pFileInfo->GetSize());
-
-		pNZBInfo->SetFileCount(pNZBInfo->GetFileCount() + 1);
-		pNZBInfo->SetSize(pNZBInfo->GetSize() + pFileInfo->GetSize());
-	}
-
-	pNZBInfo->Release();
-
-	*pNewNZBInfo = pNZBInfo;
-	return true;
-}

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;
@@ -52,9 +55,9 @@ public:
 	struct Aspect
 	{
 		EAspectAction eAction;
-		DownloadQueue* pDownloadQueue;
-		NZBInfo* pNZBInfo;
 		FileInfo* pFileInfo;
+		DownloadQueue* pDownloadQueue;
+		const char* szNZBFilename;
 	};
 
 private:
@@ -63,7 +66,6 @@ private:
 	QueueEditor				m_QueueEditor;
 	Mutex			 		m_mutexDownloadQueue;
 	bool					m_bHasMoreJobs;
-	int						m_iDownloadsLimit;
 
 	// statistics
 	static const int		SPEEDMETER_SLOTS = 30;    
@@ -72,12 +74,6 @@ private:
     int                     m_iSpeedTotalBytes;
     int 					m_iSpeedTime[SPEEDMETER_SLOTS];
     int                     m_iSpeedStartTime; 
-	time_t					m_tSpeedCorrection;
-#ifdef HAVE_SPINLOCK
-	SpinLock				m_spinlockSpeed;
-#else
-	Mutex					m_mutexSpeed;
-#endif
 
     int						m_iSpeedBytesIndex;
 	long long				m_iAllBytes;
@@ -90,6 +86,7 @@ private:
 
 	bool					GetNextArticle(FileInfo* &pFileInfo, ArticleInfo* &pArticleInfo);
 	void					StartArticleDownload(FileInfo* pFileInfo, ArticleInfo* pArticleInfo, NNTPConnection* pConnection);
+	void					BuildArticleFilename(ArticleDownloader* pArticleDownloader, FileInfo* pFileInfo, ArticleInfo* pArticleInfo);
 	bool					IsDupe(FileInfo* pFileInfo);
 	void					ArticleCompleted(ArticleDownloader* pArticleDownloader);
 	void					DeleteFileInfo(FileInfo* pFileInfo, bool bCompleted);
@@ -107,24 +104,24 @@ public:
 
 	// statistics
 	long long 				CalcRemainingSize();
-	virtual int				CalcCurrentDownloadSpeed();
+	virtual float			CalcCurrentDownloadSpeed();
 	virtual void			AddSpeedReading(int iBytes);
 	void					CalcStat(int* iUpTimeSec, int* iDnTimeSec, long long* iAllBytes, bool* bStandBy);
 
 	// Editing the queue
 	DownloadQueue*			LockQueue();
 	void					UnlockQueue() ;
-	void					AddNZBFileToQueue(NZBFile* pNZBFile, bool bAddFirst);
+	void					AddNZBFileToQueue(NZBFile* pNZBQueue, 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);
-	bool					SplitQueueEntries(FileQueue* pFileList, const char* szName, NZBInfo** pNewNZBInfo);
-	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-2013 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
@@ -33,10 +33,9 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <ctype.h>
+#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,19 +177,9 @@ bool QueueEditor::EditList(IDList* pIDList, NameList* pNameList, EMatchMode eMat
 
 	g_pQueueCoordinator->UnlockQueue();
 
-	if (pNameList)
-	{
-		delete pIDList;
-	}
-
 	return bOK;
 }
 
-bool QueueEditor::LockedEditList(DownloadQueue* pDownloadQueue, IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText)
-{
-	return InternEditList(pDownloadQueue, pIDList, bSmartOrder, eAction, iOffset, szText);
-}
-
 bool QueueEditor::InternEditList(DownloadQueue* pDownloadQueue, IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText)
 {
 	if (eAction == eaGroupMoveOffset)
@@ -225,18 +194,6 @@ bool QueueEditor::InternEditList(DownloadQueue* pDownloadQueue, IDList* pIDList,
 	{
 		PauseParsInGroups(&cItemList, eAction == eaFilePauseExtraPars);
 	}
-	else if (eAction == eaGroupMerge)
-	{
-		return MergeGroups(pDownloadQueue, &cItemList);
-	}
-	else if (eAction == eaFileSplit)
-	{
-		return SplitGroup(pDownloadQueue, &cItemList, szText);
-	}
-	else if (eAction == eaFileReorder)
-	{
-		ReorderFiles(pDownloadQueue, &cItemList);
-	}
 	else
 	{
 		for (ItemList::iterator it = cItemList.begin(); it != cItemList.end(); it++)
@@ -262,22 +219,15 @@ bool QueueEditor::InternEditList(DownloadQueue* pDownloadQueue, IDList* pIDList,
 					DeleteEntry(pItem->m_pFileInfo);
 					break;
 
-				case eaFileSetPriority:
-					SetPriorityEntry(pItem->m_pFileInfo, szText);
+				case eaFilePauseAllPars:
+				case eaFilePauseExtraPars:
+					// remove compiler warning "enumeration not handled in switch"
 					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;
-
 				case eaGroupPause:
 				case eaGroupResume:
 				case eaGroupDelete:
@@ -286,16 +236,7 @@ bool QueueEditor::InternEditList(DownloadQueue* pDownloadQueue, IDList* pIDList,
 				case eaGroupMoveOffset:
 				case eaGroupPauseAllPars:
 				case eaGroupPauseExtraPars:
-				case eaGroupSetPriority:
-					EditGroup(pDownloadQueue, pItem->m_pFileInfo, eAction, iOffset, szText);
-					break;
-
-				case eaFilePauseAllPars:
-				case eaFilePauseExtraPars:
-				case eaGroupMerge:
-				case eaFileReorder:
-				case eaFileSplit:
-					// remove compiler warning "enumeration not handled in switch"
+					EditGroup(pDownloadQueue, pItem->m_pFileInfo, eAction, iOffset);
 					break;
 			}
 			delete pItem;
@@ -327,18 +268,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++)
 			{
@@ -352,9 +293,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
@@ -380,7 +321,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();
@@ -410,85 +351,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())
@@ -542,25 +411,17 @@ bool QueueEditor::EditGroup(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo,
 		}
 		iOffset = iFileOffset;
 	}
-	else if (eAction == eaGroupDelete)
-	{
-		pFileInfo->GetNZBInfo()->SetDeleted(true);
-		pFileInfo->GetNZBInfo()->SetCleanupDisk(CanCleanupDisk(pDownloadQueue, pFileInfo->GetNZBInfo()));
-	}
 
-	EEditAction GroupToFileMap[] = { (EEditAction)0, eaFileMoveOffset, eaFileMoveTop, eaFileMoveBottom, eaFilePause,
-		eaFileResume, eaFileDelete, eaFilePauseAllPars, eaFilePauseExtraPars, eaFileSetPriority, eaFileReorder, eaFileSplit,
-		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 };
 
-	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;
@@ -653,24 +514,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
@@ -806,159 +667,3 @@ 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 
-* (belonging to this nzb-file) are PARS.
-*/
-bool QueueEditor::CanCleanupDisk(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
-{
-    for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
-    {
-        FileInfo* pFileInfo = *it;
-		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"))
-		{
-			// non-par file found
-			return true;
-		}
-	}
-
-	return false;
-}
-
-bool QueueEditor::MergeGroups(DownloadQueue* pDownloadQueue, ItemList* pItemList)
-{
-	if (pItemList->size() == 0)
-	{
-		return false;
-	}
-
-	bool bOK = true;
-
-	EditItem* pDestItem = pItemList->front();
-
-	for (ItemList::iterator it = pItemList->begin() + 1; it != pItemList->end(); it++)
-	{
-		EditItem* pItem = *it;
-		if (pItem->m_pFileInfo->GetNZBInfo() != pDestItem->m_pFileInfo->GetNZBInfo())
-		{
-			debug("merge %s to %s", pItem->m_pFileInfo->GetNZBInfo()->GetFilename(), pDestItem->m_pFileInfo->GetNZBInfo()->GetFilename());
-			if (g_pQueueCoordinator->MergeQueueEntries(pDestItem->m_pFileInfo->GetNZBInfo(), pItem->m_pFileInfo->GetNZBInfo()))
-			{
-				bOK = false;
-			}
-		}
-		delete pItem;
-	}
-
-	AlignGroup(pDownloadQueue, pDestItem->m_pFileInfo->GetNZBInfo());
-
-	delete pDestItem;
-	return bOK;
-}
-
-bool QueueEditor::SplitGroup(DownloadQueue* pDownloadQueue, ItemList* pItemList, const char* szName)
-{
-	if (pItemList->size() == 0)
-	{
-		return false;
-	}
-
-	FileQueue* pFileList = new FileQueue();
-
-	for (ItemList::iterator it = pItemList->begin(); it != pItemList->end(); it++)
-	{
-		EditItem* pItem = *it;
-		pFileList->push_back(pItem->m_pFileInfo);
-		delete pItem;
-	}
-
-	NZBInfo* pNewNZBInfo = NULL;
-	bool bOK = g_pQueueCoordinator->SplitQueueEntries(pFileList, szName, &pNewNZBInfo);
-	if (bOK)
-	{
-		AlignGroup(pDownloadQueue, pNewNZBInfo);
-	}
-
-	delete pFileList;
-	return bOK;
-}
-
-void QueueEditor::ReorderFiles(DownloadQueue* pDownloadQueue, ItemList* pItemList)
-{
-	if (pItemList->size() == 0)
-	{
-		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)
-		{
-			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;
-	}
-}
-
-void QueueEditor::SetNZBParameter(NZBInfo* pNZBInfo, const char* szParamString)
-{
-	debug("QueueEditor: setting nzb parameter '%s' for '%s'", szParamString, Util::BaseFileName(pNZBInfo->GetFilename()));
-
-	char* szStr = strdup(szParamString);
-
-	char* szValue = strchr(szStr, '=');
-	if (szValue)
-	{
-		*szValue = '\0';
-		szValue++;
-		pNZBInfo->SetParameter(szStr, szValue);
-	}
-	else
-	{
-		error("Could not set nzb parameter for %s: invalid argument: %s", pNZBInfo->GetName(), szParamString);
-	}
-
-	free(szStr);
-}

QueueEditor.h

@@ -1,7 +1,7 @@
 /*
  *  This file if part of nzbget
  *
- *  Copyright (C) 2007-2013 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$
@@ -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,9 +45,6 @@ public:
 		eaFileDelete,
 		eaFilePauseAllPars,
 		eaFilePauseExtraPars,
-		eaFileSetPriority,
-		eaFileReorder,
-		eaFileSplit,
 		eaGroupMoveOffset,				// move to m_iOffset relative to the current position in queue
 		eaGroupMoveTop,
 		eaGroupMoveBottom,
@@ -54,18 +53,7 @@ public:
 		eaGroupDelete,
 		eaGroupPauseAllPars,
 		eaGroupPauseExtraPars,
-		eaGroupSetPriority,
-		eaGroupSetCategory,
-		eaGroupMerge,
-		eaGroupSetParameter,
-		eaGroupSetName
-	};
-
-	enum EMatchMode
-	{
-		mmID = 1,
-		mmName,
-		mmRegEx
+		eaGroupSetCategory
 	};
 
 private:
@@ -86,36 +74,27 @@ 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);
-	bool					MergeGroups(DownloadQueue* pDownloadQueue, ItemList* pItemList);
-	bool					SplitGroup(DownloadQueue* pDownloadQueue, ItemList* pItemList, const char* szName);
-	void					ReorderFiles(DownloadQueue* pDownloadQueue, ItemList* pItemList);
-	void					SetNZBParameter(NZBInfo* pNZBInfo, const char* szParamString);
 
 	void					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);
 };
 
 #endif

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,16 @@ 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.4.1) should run at least on:
+  - Linux Debian 4.0 on x86;
+  - Linux BusyBox with uClibc on MIPSEL;
+  - PC-BSD 1.4 (based on FreeBSD 6.2) on x86;
+  - Windows XP SP2 on x86.
+
+The previous version (0.3.0) was also tested on:
+  - Linux Debian 3.1 on x86;
+  - Solaris 10 on x86;
+  - Linux Debian 3.1 on SPARC (QEmu).
 
 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 +92,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 +102,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 +135,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.
@@ -182,23 +156,9 @@ Following configure-parameters may be usefull:
   
 The library libsigc++ must be installed first, since libpar2 requires it.
 
-If you use nzbget on a very slow computer like NAS-device, it may be good to
-limit the time allowed for par-repair (option "ParTimeLimit" in nzbget 
-configuration file). This feature requires a patched version of libpar2.
-To compile that version download the original source code of libpar2
-(version 0.2) and apply patches "libpar2-0.2-bugfixes.patch" and 
-"libpar2-0.2-cancel.patch", provided with nzbget:
-
-  cd libpar2-0.2
-  cp ~/nzbget/libpar2-0.2-*.patch .
-  patch < libpar2-0.2-bugfixes.patch
-  patch < libpar2-0.2-cancel.patch
-  ./configure
-  make
-  make install
-
 If you are not able to use libpar2 or libsigc++ or do not want them you can
-make nzbget without support for par-check using option "--disable-parcheck":
+make the program without support for par-check using option 
+"--disable-parcheck":
 
   ./configure --disable-parcheck
 
@@ -274,27 +234,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 +268,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 +295,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 +360,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,58 +379,26 @@ nzbget-client-commands in this terminal.
 Post processing scripts
 -----------------------
 
-After the download of nzb-file is completed nzbget can call post-processing
-scripts, defined in configuration file.
+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.
 
-Example post-processing scripts are provided in directory "ppscripts".
-
-To use the scripts copy them into your local directory and set options
-<ScriptDir>, <DefScript> and <ScriptOrder>.
-
-For information on writing your own post-processing scripts please
-visit NZBGet web site.
-
-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. 
+An example script for unraring of downloaded files is provided in file
+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).
 
 =====================================
 9. Copyright
@@ -519,9 +425,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 tracker/forums on
 
-    nzbget.sourceforge.net/forum
+    sourceforge.net/projects/nzbget
 
 or contact me at
 

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) 2005  Bo Cordes Petersen <placebodk@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,24 +30,12 @@
 #include "Options.h"
 #include "MessageBase.h"
 #include "Connection.h"
-#include "DownloadInfo.h"
 
 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,27 +45,20 @@ 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			RequestServerSetDownloadRate(int iRate);
+	bool 			RequestServerDownload(const char* szFilename, const char* szCategory, bool bAddFirst);
+	bool			RequestServerList();
+	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();
-	void			BuildFileList(SNZBListResponse* pListResponse, const char* pTrailingData, DownloadQueue* pDownloadQueue);
 };
 
 #endif

RemoteServer.cpp

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@sourceforge.net>
- *  Copyright (C) 2007-2013 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,21 +44,20 @@
 #include "nzbget.h"
 #include "RemoteServer.h"
 #include "BinRpc.h"
-#include "WebServer.h"
+#include "XmlRpc.h"
 #include "Log.h"
 #include "Options.h"
-#include "Util.h"
 
 extern Options* g_pOptions;
 
 //*****************************************************************
 // RemoteServer
 
-RemoteServer::RemoteServer(bool bTLS)
+RemoteServer::RemoteServer()
 {
 	debug("Creating RemoteServer");
 
-	m_bTLS = bTLS;
+	m_pNetAddress = new NetAddress(g_pOptions->GetServerIP(), g_pOptions->GetServerPort());
 	m_pConnection = NULL;
 }
 
@@ -70,50 +69,32 @@ RemoteServer::~RemoteServer()
 	{
 		delete m_pConnection;
 	}
+	delete m_pNetAddress;
 }
 
 void RemoteServer::Run()
 {
 	debug("Entering RemoteServer-loop");
 
-#ifndef DISABLE_TLS
-	if (m_bTLS)
-	{
-		if (strlen(g_pOptions->GetSecureCert()) == 0 || !Util::FileExists(g_pOptions->GetSecureCert()))
-		{
-			error("Could not initialize TLS, secure certificate is not configured or the cert-file was not found. Check option <SecureCert>");
-			return;
-		}
-
-		if (strlen(g_pOptions->GetSecureKey()) == 0 || !Util::FileExists(g_pOptions->GetSecureKey()))
-		{
-			error("Could not initialize TLS, secure key is not configured or the key-file was not found. Check option <SecureKey>");
-			return;
-		}
-	}
-#endif
-
 	while (!IsStopped())
 	{
 		bool bBind = true;
 
 		if (!m_pConnection)
 		{
-			m_pConnection = new Connection(g_pOptions->GetControlIP(), 
-				m_bTLS ? g_pOptions->GetSecurePort() : g_pOptions->GetControlPort(),
-				m_bTLS);
+			m_pConnection = new Connection(m_pNetAddress);
 			m_pConnection->SetTimeout(g_pOptions->GetConnectionTimeout());
 			m_pConnection->SetSuppressErrors(false);
-			bBind = m_pConnection->Bind();
+			bBind = m_pConnection->Bind() == 0;
 		}
 
-		// Accept connections and store the new Connection
-		Connection* pAcceptedConnection = NULL;
+		// Accept connections and store the "new" socket value
+		SOCKET iSocket = INVALID_SOCKET;
 		if (bBind)
 		{
-			pAcceptedConnection = m_pConnection->Accept();
+			iSocket = m_pConnection->Accept();
 		}
-		if (!bBind || pAcceptedConnection == NULL)
+		if (!bBind || iSocket == INVALID_SOCKET)
 		{
 			// Remote server could not bind or accept connection, waiting 1/2 sec and try again
 			if (IsStopped())
@@ -128,13 +109,9 @@ void RemoteServer::Run()
 
 		RequestProcessor* commandThread = new RequestProcessor();
 		commandThread->SetAutoDestroy(true);
-		commandThread->SetConnection(pAcceptedConnection);
-#ifndef DISABLE_TLS
-		commandThread->SetTLS(m_bTLS);
-#endif
+		commandThread->SetSocket(iSocket);
 		commandThread->Start();
 	}
-
 	if (m_pConnection)
 	{
 		m_pConnection->Disconnect();
@@ -159,32 +136,32 @@ void RemoteServer::Stop()
 //*****************************************************************
 // RequestProcessor
 
-RequestProcessor::~RequestProcessor()
-{
-	m_pConnection->Disconnect();
-	delete m_pConnection;
-}
-
 void RequestProcessor::Run()
 {
+	// Read the first 4 bytes to determine request type
 	bool bOK = false;
-
-	m_pConnection->SetSuppressErrors(true);
-
-#ifndef DISABLE_TLS
-	if (m_bTLS && !m_pConnection->StartTLS(false, g_pOptions->GetSecureCert(), g_pOptions->GetSecureKey()))
+	int iSignature = 0;
+	int iBytesReceived = recv(m_iSocket, (char*)&iSignature, sizeof(iSignature), 0);
+	if (iBytesReceived < 0)
 	{
-		debug("Could not establish secure connection to web-client: Start TLS failed");
 		return;
 	}
-#endif
 
-	// Read the first 4 bytes to determine request type
-	int iSignature = 0;
-	if (!m_pConnection->Recv((char*)&iSignature, 4))
+	// Info - connection received
+#ifdef WIN32
+	char* ip = NULL;
+#else
+	char ip[20];
+#endif
+	struct sockaddr_in PeerName;
+	int iPeerNameLength = sizeof(PeerName);
+	if (getpeername(m_iSocket, (struct sockaddr*)&PeerName, (socklen_t*) &iPeerNameLength) >= 0)
 	{
-		debug("Could not read request signature, request received on port %i from %s", m_bTLS ? g_pOptions->GetSecurePort() : g_pOptions->GetControlPort(), m_pConnection->GetRemoteAddr());
-		return;
+#ifdef WIN32
+		ip = inet_ntoa(PeerName.sin_addr);
+#else
+		inet_ntop(AF_INET, &PeerName.sin_addr, ip, sizeof(ip));
+#endif
 	}
 
 	if ((int)ntohl(iSignature) == (int)NZBMESSAGE_SIGNATURE)
@@ -192,47 +169,58 @@ void RequestProcessor::Run()
 		// binary request received
 		bOK = true;
 		BinRpcProcessor processor;
-		processor.SetConnection(m_pConnection);
+		processor.SetSocket(m_iSocket);
+		processor.SetSignature(iSignature);
+		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 (m_pConnection->ReadLine(szBuffer, sizeof(szBuffer), NULL))
+		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(m_pConnection);
-			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)
 	{
-		warn("Non-nzbget request received on port %i from %s", m_bTLS ? g_pOptions->GetSecurePort() : g_pOptions->GetControlPort(), m_pConnection->GetRemoteAddr());
+		warn("Non-nzbget request received on port %i from %s", g_pOptions->GetServerPort(), ip);
 	}
+
+	closesocket(m_iSocket);
 }

RemoteServer.h

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2005  Bo Cordes Petersen <placebodk@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,16 +28,17 @@
 #define REMOTESERVER_H
 
 #include "Thread.h"
+#include "NetAddress.h"
 #include "Connection.h"
 
 class RemoteServer : public Thread
 {
 private:
-	bool				m_bTLS;
+	NetAddress*			m_pNetAddress;
 	Connection*			m_pConnection;
 
 public:
-						RemoteServer(bool bTLS);
+						RemoteServer();
 						~RemoteServer();
 	virtual void		Run();
 	virtual void 		Stop();
@@ -46,14 +47,11 @@ public:
 class RequestProcessor : public Thread
 {
 private:
-	bool				m_bTLS;
-	Connection*			m_pConnection;
+	SOCKET				m_iSocket;
 
 public:
-						~RequestProcessor();
 	virtual void		Run();
-	void				SetTLS(bool bTLS) { m_bTLS = bTLS; }
-	void				SetConnection(Connection* pConnection) { m_pConnection = pConnection; }
+	void				SetSocket(SOCKET iSocket) { m_iSocket = iSocket; };
 };
 
 #endif

Scanner.cpp

@@ -1,545 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifdef WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-#include <sys/stat.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::QueueData::QueueData(const char* szFilename, const char* szNZBName, const char* szCategory, int iPriority,
-	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused)
-{
-	m_szFilename = strdup(szFilename);
-	m_szNZBName = strdup(szNZBName);
-	m_szCategory = strdup(szCategory ? szCategory : "");
-	m_iPriority = iPriority;
-	m_bAddTop = bAddTop;
-	m_bAddPaused = bAddPaused;
-
-	if (pParameters)
-	{
-		for (NZBParameterList::iterator it = pParameters->begin(); it != pParameters->end(); it++)
-		{
-			NZBParameter* pNZBParameter = *it;
-			m_Parameters.SetParameter(pNZBParameter->GetName(), pNZBParameter->GetValue());
-		}
-	}
-}
-
-Scanner::QueueData::~QueueData()
-{
-	free(m_szFilename);
-	free(m_szNZBName);
-	free(m_szCategory);
-
-	for (NZBParameterList::iterator it = m_Parameters.begin(); it != m_Parameters.end(); it++)
-	{
-		delete *it;
-	}
-	m_Parameters.clear();
-}
-
-
-Scanner::Scanner()
-{
-	debug("Creating Scanner");
-
-	m_bRequestedNZBDirScan = false;
-	m_bScanning = false;
-	m_iNZBDirInterval = g_pOptions->GetNzbDirInterval() * 1000;
-	m_iPass = 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();
-
-	ClearQueueList();
-}
-
-void Scanner::ClearQueueList()
-{
-	for (QueueList::iterator it = m_QueueList.begin(); it != m_QueueList.end(); it++)
-    {
-        delete *it;
-	}
-	m_QueueList.clear();
-}
-
-void Scanner::Check()
-{
-	m_mutexScan.Lock();
-
-	if (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 requested, 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->GetNzbDirInterval() > 0 && 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 += 200;
-
-	ClearQueueList();
-	m_mutexScan.Unlock();
-}
-
-/**
-* 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* szNZBName = strdup("");
-	char* szNZBCategory = strdup(szCategory);
-	NZBParameterList* pParameters = new NZBParameterList();
-	int iPriority = 0;
-	bool bAddTop = false;
-	bool bAddPaused = false;
-
-	for (QueueList::iterator it = m_QueueList.begin(); it != m_QueueList.end(); it++)
-    {
-        QueueData* pQueueData = *it;
-		if (Util::SameFilename(pQueueData->GetFilename(), szFullFilename))
-		{
-			free(szNZBName);
-			szNZBName = strdup(pQueueData->GetNZBName());
-			free(szNZBCategory);
-			szNZBCategory = strdup(pQueueData->GetCategory());
-			iPriority = pQueueData->GetPriority();
-			bAddTop = pQueueData->GetAddTop();
-			bAddPaused = pQueueData->GetAddPaused();
-		}
-	}
-
-	bool bExists = true;
-
-	if (m_bNZBScript && strcasecmp(szExtension, ".nzb_processed"))
-	{
-		NZBScriptController::ExecuteScript(g_pOptions->GetNZBProcess(), szFullFilename, szDirectory, 
-			&szNZBName, &szNZBCategory, &iPriority, pParameters, &bAddTop, &bAddPaused); 
-		bExists = Util::FileExists(szFullFilename);
-		if (bExists && strcasecmp(szExtension, ".nzb"))
-		{
-			char bakname2[1024];
-			bool bRenameOK = Util::RenameBak(szFullFilename, "processed", false, bakname2, 1024);
-			if (!bRenameOK)
-			{
-				char szSysErrStr[256];
-				error("Could not rename file %s to %s: %s", szFullFilename, bakname2, Util::GetLastErrorMessage(szSysErrStr, sizeof(szSysErrStr)));
-			}
-		}
-	}
-
-	if (!strcasecmp(szExtension, ".nzb_processed"))
-	{
-		char szRenamedName[1024];
-		bool bRenameOK = Util::RenameBak(szFullFilename, "nzb", true, szRenamedName, 1024);
-		if (bRenameOK)
-		{
-			AddFileToQueue(szRenamedName, szNZBName, szNZBCategory, iPriority, pParameters, bAddTop, bAddPaused);
-		}
-		else
-		{
-			char szSysErrStr[256];
-			error("Could not rename file %s to %s: %s", szFullFilename, szRenamedName, Util::GetLastErrorMessage(szSysErrStr, sizeof(szSysErrStr)));
-		}
-	}
-	else if (bExists && !strcasecmp(szExtension, ".nzb"))
-	{
-		AddFileToQueue(szFullFilename, szNZBName, szNZBCategory, iPriority, pParameters, bAddTop, bAddPaused);
-	}
-
-	for (NZBParameterList::iterator it = pParameters->begin(); it != pParameters->end(); it++)
-	{
-		delete *it;
-	}
-	pParameters->clear();
-	delete pParameters;
-
-	free(szNZBName);
-	free(szNZBCategory);
-}
-
-void Scanner::AddFileToQueue(const char* szFilename, const char* szNZBName, const char* szCategory, int iPriority,
-	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused)
-{
-	const char* szBasename = Util::BaseFileName(szFilename);
-
-	info("Collection %s found", szBasename);
-
-	NZBFile* pNZBFile = NZBFile::Create(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)
-	{
-		char szSysErrStr[256];
-		error("Could not rename file %s to %s: %s", szFilename, bakname2, Util::GetLastErrorMessage(szSysErrStr, sizeof(szSysErrStr)));
-	}
-
-	if (pNZBFile && bRenameOK)
-	{
-		pNZBFile->GetNZBInfo()->SetQueuedFilename(bakname2);
-
-		if (szNZBName && strlen(szNZBName) > 0)
-		{
-			pNZBFile->GetNZBInfo()->SetName(NULL);
-			pNZBFile->GetNZBInfo()->SetFilename(szNZBName);
-			pNZBFile->GetNZBInfo()->BuildDestDirName();
-		}
-
-		for (NZBParameterList::iterator it = pParameters->begin(); it != pParameters->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);
-			pFileInfo->SetPaused(bAddPaused);
-		}
-
-		g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, bAddTop);
-		info("Collection %s added to queue", szBasename);
-	}
-
-	if (pNZBFile)
-	{
-		delete pNZBFile;
-	}
-}
-
-void Scanner::ScanNZBDir(bool bSyncMode)
-{
-	m_mutexScan.Lock();
-	m_bScanning = true;
-	m_bRequestedNZBDirScan = true;
-	m_mutexScan.Unlock();
-
-	while (bSyncMode && (m_bScanning || m_bRequestedNZBDirScan))
-	{
-		usleep(100 * 1000);
-	}
-}
-
-bool Scanner::AddExternalFile(const char* szNZBName, const char* szCategory, int iPriority,
-	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused,
-	const char* szFileName, const char* szBuffer, int iBufSize, bool bSyncMode)
-{
-	char szTempFileName[1024];
-
-	if (szFileName)
-	{
-		strncpy(szTempFileName, szFileName, 1024);
-		szTempFileName[1024-1] = '\0';
-	}
-	else
-	{
-		int iNum = 1;
-		while (iNum == 1 || Util::FileExists(szTempFileName))
-		{
-			snprintf(szTempFileName, 1024, "%snzb-%i.tmp", g_pOptions->GetTempDir(), iNum);
-			szTempFileName[1024-1] = '\0';
-			iNum++;
-		}
-
-		if (!Util::SaveBufferIntoFile(szTempFileName, szBuffer, iBufSize))
-		{
-			error("Could not create file %s", szTempFileName);
-			return false;
-		}
-	}
-
-	// move file into NzbDir, make sure the file name is unique
-	char szValidNZBName[1024];
-	strncpy(szValidNZBName, Util::BaseFileName(szNZBName), 1024);
-	szValidNZBName[1024-1] = '\0';
-	Util::MakeValidFilename(szValidNZBName, '_', false);
-
-	char szScanFileName[1024];
-	snprintf(szScanFileName, 1024, "%s%s", g_pOptions->GetNzbDir(), szValidNZBName);
-
-	char *szExt = strrchr(szValidNZBName, '.');
-	if (szExt)
-	{
-		*szExt = '\0';
-		szExt++;
-	}
-
-	int iNum = 2;
-	while (Util::FileExists(szScanFileName))
-	{
-		if (szExt)
-		{
-			snprintf(szScanFileName, 1024, "%s%s_%i.%s", g_pOptions->GetNzbDir(), szValidNZBName, iNum, szExt);
-		}
-		else
-		{
-			snprintf(szScanFileName, 1024, "%s%s_%i", g_pOptions->GetNzbDir(), szValidNZBName, iNum);
-		}
-		szScanFileName[1024-1] = '\0';
-		iNum++;
-	}
-
-	if (!Util::MoveFile(szTempFileName, szScanFileName))
-	{
-		char szSysErrStr[256];
-		error("Could not move file %s to %s: %s", szTempFileName, szScanFileName, Util::GetLastErrorMessage(szSysErrStr, sizeof(szSysErrStr)));
-		remove(szTempFileName);
-		return false;
-	}
-
-	QueueData* pQueueData = new QueueData(szScanFileName, szNZBName, szCategory, iPriority, pParameters, bAddTop, bAddPaused);
-
-	m_mutexScan.Lock();
-	m_QueueList.push_back(pQueueData);
-	m_mutexScan.Unlock();
-
-	ScanNZBDir(bSyncMode);
-
-	return true;
-}

Scanner.h

@@ -1,109 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef SCANNER_H
-#define SCANNER_H
-
-#include <deque>
-#include <time.h>
-#include "DownloadInfo.h"
-#include "Thread.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;
-
-	class QueueData
-	{
-	private:
-		char*				m_szFilename;
-		char*				m_szNZBName;
-		char*				m_szCategory;
-		int					m_iPriority;
-		NZBParameterList	m_Parameters;
-		bool				m_bAddTop;
-		bool				m_bAddPaused;
-
-	public:
-							QueueData(const char* szFilename, const char* szNZBName, const char* szCategory, int iPriority,
-								NZBParameterList* pParameters, bool bAddTop, bool bAddPaused);
-							~QueueData();
-		const char*			GetFilename() { return m_szFilename; }
-		const char*			GetNZBName() { return m_szNZBName; }
-		const char*			GetCategory() { return m_szCategory; }
-		int					GetPriority() { return m_iPriority; }
-		NZBParameterList*	GetParameters() { return &m_Parameters; }
-		bool				GetAddTop() { return m_bAddTop; }
-		bool				GetAddPaused() { return m_bAddPaused; }
-	};
-
-	typedef std::deque<QueueData*>		QueueList;
-
-	bool				m_bRequestedNZBDirScan;
-	int					m_iNZBDirInterval;
-	bool				m_bNZBScript;
-	int					m_iPass;
-	FileList			m_FileList;
-	QueueList			m_QueueList;
-	bool				m_bScanning;
-	Mutex				m_mutexScan;
-
-	void				CheckIncomingNZBs(const char* szDirectory, const char* szCategory, bool bCheckStat);
-	void				AddFileToQueue(const char* szFilename, const char* szNZBName, const char* szCategory, int iPriority,
-							NZBParameterList* pParameters, bool bAddTop, bool bAddPaused);
-	void				ProcessIncomingFile(const char* szDirectory, const char* szBaseFilename, const char* szFullFilename, const char* szCategory);
-	bool				CanProcessFile(const char* szFullFilename, bool bCheckStat);
-	void				DropOldFiles();
-	void				ClearQueueList();
-
-public:
-						Scanner();
-						~Scanner();
-	void				ScanNZBDir(bool bSyncMode);
-	void				Check();
-	bool				AddExternalFile(const char* szNZBName, const char* szCategory, int iPriority,
-							NZBParameterList* pParameters, bool bAddPaused, bool bAddTop,
-							const char* szFileName, const char* szBuffer, int iBufSize, bool bSyncMode);
-};
-
-#endif

Scheduler.cpp

@@ -1,247 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2008-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#else
-#include <unistd.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "nzbget.h"
-#include "Scheduler.h"
-#include "ScriptController.h"
-#include "Options.h"
-#include "Log.h"
-
-extern Options* g_pOptions;
-
-Scheduler::Task::Task(int iHours, int iMinutes, int iWeekDaysBits, ECommand eCommand, 
-	int iDownloadRate, const char* szProcess)
-{
-	m_iHours = iHours;
-	m_iMinutes = iMinutes;
-	m_iWeekDaysBits = iWeekDaysBits;
-	m_eCommand = eCommand;
-	m_iDownloadRate = iDownloadRate;
-	m_szProcess = NULL;
-	if (szProcess)
-	{
-		m_szProcess = strdup(szProcess);
-	}
-	m_tLastExecuted = 0;
-}
-
-Scheduler::Task::~Task()
-{
-	if (m_szProcess)
-	{
-		free(m_szProcess);
-	}
-}
-
-
-Scheduler::Scheduler()
-{
-	debug("Creating Scheduler");
-
-	m_tLastCheck = 0;
-	m_TaskList.clear();
-}
-
-Scheduler::~Scheduler()
-{
-	debug("Destroying Scheduler");
-	
-	for (TaskList::iterator it = m_TaskList.begin(); it != m_TaskList.end(); it++)
-	{
-		delete *it;
-	}
-}
-
-void Scheduler::AddTask(Task* pTask)
-{
-	m_mutexTaskList.Lock();
-	m_TaskList.push_back(pTask);
-	m_mutexTaskList.Unlock();
-}
-
-bool Scheduler::CompareTasks(Scheduler::Task* pTask1, Scheduler::Task* pTask2)
-{
-	return (pTask1->m_iHours < pTask2->m_iHours) || 
-		((pTask1->m_iHours == pTask2->m_iHours) && (pTask1->m_iMinutes < pTask2->m_iMinutes));
-}
-
-void Scheduler::FirstCheck()
-{
-	m_mutexTaskList.Lock();
-	m_TaskList.sort(CompareTasks);
-	m_mutexTaskList.Unlock();
-
-	// check all tasks for the last week
-	time_t tCurrent = time(NULL);
-	m_tLastCheck = tCurrent - 60*60*24*7;
-	m_bDetectClockChanges = false;
-	m_bExecuteProcess = false;
-	m_bDownloadRateChanged = false;
-	m_bPauseDownloadChanged = false;
-	m_bPauseScanChanged = false;
-	CheckTasks();
-}
-
-void Scheduler::IntervalCheck()
-{
-	m_bDetectClockChanges = true;
-	m_bExecuteProcess = true;
-	m_bDownloadRateChanged = false;
-	m_bPauseDownloadChanged = false;
-	m_bPauseScanChanged = false;
-	CheckTasks();
-}
-
-void Scheduler::CheckTasks()
-{
-	m_mutexTaskList.Lock();
-
-	time_t tCurrent = time(NULL);
-	struct tm tmCurrent;
-	localtime_r(&tCurrent, &tmCurrent);
-
-	struct tm tmLastCheck;
-
-	if (m_bDetectClockChanges)
-	{
-		// Detect large step changes of system time 
-		time_t tDiff = tCurrent - m_tLastCheck;
-		if (tDiff > 60*90 || tDiff < -60*90)
-		{
-			debug("Reset scheduled tasks (detected clock adjustment greater than 90 minutes)");
-			m_bExecuteProcess = false;
-			m_tLastCheck = tCurrent;
-
-			for (TaskList::iterator it = m_TaskList.begin(); it != m_TaskList.end(); it++)
-			{
-				Task* pTask = *it;
-				pTask->m_tLastExecuted = 0;
-			}
-		}
-	}
-
-	localtime_r(&m_tLastCheck, &tmLastCheck);
-
-	struct tm tmLoop;
-	memcpy(&tmLoop, &tmLastCheck, sizeof(tmLastCheck));
-	tmLoop.tm_hour = tmCurrent.tm_hour;
-	tmLoop.tm_min = tmCurrent.tm_min;
-	tmLoop.tm_sec = tmCurrent.tm_sec;
-	time_t tLoop = mktime(&tmLoop);
-
-	while (tLoop <= tCurrent)
-	{
-		for (TaskList::iterator it = m_TaskList.begin(); it != m_TaskList.end(); it++)
-		{
-			Task* pTask = *it;
-			if (pTask->m_tLastExecuted != tLoop)
-			{
-				struct tm tmAppoint;
-				memcpy(&tmAppoint, &tmLoop, sizeof(tmLoop));
-				tmAppoint.tm_hour = pTask->m_iHours;
-				tmAppoint.tm_min = pTask->m_iMinutes;
-				tmAppoint.tm_sec = 0;
-
-				time_t tAppoint = mktime(&tmAppoint);
-				int iWeekDay = tmAppoint.tm_wday;
-				if (iWeekDay == 0)
-				{
-					iWeekDay = 7;
-				}
-
-				bool bWeekDayOK = pTask->m_iWeekDaysBits == 0 || (pTask->m_iWeekDaysBits & (1 << (iWeekDay - 1)));
-				bool bDoTask = bWeekDayOK && m_tLastCheck < tAppoint && tAppoint <= tCurrent;
-
-				//debug("TEMP: 1) m_tLastCheck=%i, tCurrent=%i, tLoop=%i, tAppoint=%i, bWeekDayOK=%i, bDoTask=%i", m_tLastCheck, tCurrent, tLoop, tAppoint, (int)bWeekDayOK, (int)bDoTask);
-
-				if (bDoTask)
-				{
-					ExecuteTask(pTask);
-					pTask->m_tLastExecuted = tLoop;
-				}
-			}
-		}
-		tLoop += 60*60*24; // inc day
-		localtime_r(&tLoop, &tmLoop);
-	}
-
-	m_tLastCheck = tCurrent;
-
-	m_mutexTaskList.Unlock();
-}
-
-void Scheduler::ExecuteTask(Task* pTask)
-{
-	if (pTask->m_eCommand == scDownloadRate)
-	{
-		debug("Executing scheduled command: Set download rate to %i", pTask->m_iDownloadRate);
-	}
-	else
-	{
-		const char* szCommandName[] = { "Pause", "Unpause", "Set download rate", "Execute program", "Pause Scan", "Unpause Scan" };
-		debug("Executing scheduled command: %s", szCommandName[pTask->m_eCommand]);
-	}
-
-	switch (pTask->m_eCommand)
-	{
-		case scDownloadRate:
-			m_iDownloadRate = pTask->m_iDownloadRate;
-			m_bDownloadRateChanged = true;
-			break;
-
-		case scPauseDownload:
-		case scUnpauseDownload:
-			m_bPauseDownload = pTask->m_eCommand == scPauseDownload;
-			m_bPauseDownloadChanged = true;
-			break;
-
-		case scProcess:
-			if (m_bExecuteProcess)
-			{
-				SchedulerScriptController::StartScript(pTask->m_szProcess);
-			}
-			break;
-
-		case scPauseScan:
-		case scUnpauseScan:
-			m_bPauseScan = pTask->m_eCommand == scPauseScan;
-			m_bPauseScanChanged = true;
-			break;
-	}
-}

Scheduler.h

@@ -1,98 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2008-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  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 SCHEDULER_H
-#define SCHEDULER_H
-
-#include <list>
-#include <time.h>
-
-#include "Thread.h"
-
-class Scheduler
-{
-public:
-	enum ECommand
-	{
-		scPauseDownload,
-		scUnpauseDownload,
-		scDownloadRate,
-		scProcess,
-		scPauseScan,
-		scUnpauseScan
-	};
-
-	class Task
-	{
-	private:
-		int				m_iHours;
-		int				m_iMinutes;
-		int				m_iWeekDaysBits;
-		ECommand		m_eCommand;
-		int				m_iDownloadRate;
-		char*			m_szProcess;
-		time_t			m_tLastExecuted;
-
-	public:
-						Task(int iHours, int iMinutes, int iWeekDaysBits, ECommand eCommand, 
-							int iDownloadRate, const char* szProcess);
-						~Task();
-		friend class	Scheduler;
-	};
-
-private:
-
-	typedef std::list<Task*>		TaskList;
-
-	TaskList			m_TaskList;
-	Mutex				m_mutexTaskList;
-	time_t				m_tLastCheck;
-	bool				m_bDetectClockChanges;
-	bool				m_bDownloadRateChanged;
-	bool				m_bExecuteProcess;
-	int					m_iDownloadRate;
-	bool				m_bPauseDownloadChanged;
-	bool				m_bPauseDownload;
-	bool				m_bPauseScanChanged;
-	bool				m_bPauseScan;
-	void				ExecuteTask(Task* pTask);
-	void				CheckTasks();
-	static bool			CompareTasks(Scheduler::Task* pTask1, Scheduler::Task* pTask2);
-
-public:
-						Scheduler();
-						~Scheduler();
-	void				AddTask(Task* pTask);
-	void				FirstCheck();
-	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; }
-};
-
-#endif

ScriptController.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2013 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$
@@ -26,137 +26,30 @@
 #ifndef SCRIPTCONTROLLER_H
 #define SCRIPTCONTROLLER_H
 
-#include <list>
-
-#include "Log.h"
 #include "Thread.h"
-#include "DownloadInfo.h"
-#include "Options.h"
+#include "PostInfo.h"
 
-class EnvironmentStrings
-{
-private:
-	typedef std::vector<char*>		Strings;
-	
-	Strings				m_strings;
-
-public:
-						EnvironmentStrings();
-						~EnvironmentStrings();
-	void				Clear();
-	void				InitFromCurrentProcess();
-	void				Append(char* szString);
-#ifdef WIN32
-	char*				GetStrings();
-#else	
-	char**				GetStrings();
-#endif
-};
-
-class ScriptController
+class ScriptController : public Thread
 {
 private:
+	PostInfo*			m_pPostInfo;
 	const char*			m_szScript;
-	const char*			m_szWorkingDir;
-	const char**		m_szArgs;
-	bool				m_bFreeArgs;
-	const char*			m_szStdArgs[2];
-	const char*			m_szInfoName;
-	const char*			m_szLogPrefix;
-	EnvironmentStrings	m_environmentStrings;
-	bool				m_bTerminated;
+	bool				m_bNZBFileCompleted;
+	bool				m_bHasFailedParJobs;
 #ifdef WIN32
 	HANDLE				m_hProcess;
-	char				m_szCmdLine[2048];
 #else
 	pid_t				m_hProcess;
 #endif
 
-protected:
-	void				ProcessOutput(char* szText);
-	virtual bool		ReadLine(char* szBuf, int iBufSize, FILE* pStream);
-	void				PrintMessage(Message::EKind eKind, const char* szFormat, ...);
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-	bool				GetTerminated() { return m_bTerminated; }
-	void				ResetEnv();
-	void				PrepareEnvOptions(const char* szStripPrefix);
-	void				PrepareEnvParameters(NZBInfo* pNZBInfo, const char* szStripPrefix);
-	void				PrepareArgs();
-
-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				SetInfoName(const char* szInfoName) { m_szInfoName = szInfoName; }
-	const char*			GetInfoName() { return m_szInfoName; }
-	void				SetLogPrefix(const char* szLogPrefix) { m_szLogPrefix = szLogPrefix; }
-	void				SetEnvVar(const char* szName, const char* szValue);
-	void				SetEnvVarSpecial(const char* szPrefix, const char* szName, const char* szValue);
-};
-
-class PostScriptController : public Thread, public ScriptController
-{
-private:
-	PostInfo*			m_pPostInfo;
-	char				m_szNZBName[1024];
- 
-	void				ExecuteScript(const char* szScriptName, const char* szDisplayName, const char* szLocation);
-	void				PrepareParams(const char* szScriptName);
-	ScriptStatus::EStatus	AnalyseExitCode(int iExitCode);
-
-	typedef std::deque<char*>		FileList;
-
-protected:
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
+	void				AddMessage(char* szText);
+	void				Finished();
 
 public:
 	virtual void		Run();
 	virtual void		Stop();
-	static void			StartJob(PostInfo* pPostInfo);
-	static void			InitParamsForNewNZB(NZBInfo* pNZBInfo);
-};
-
-class NZBScriptController : public ScriptController
-{
-private:
-	char**				m_pNZBName;
-	char**				m_pCategory;
-	int*				m_iPriority;
-	NZBParameterList*	m_pParameters;
-	bool*				m_bAddTop;
-	bool*				m_bAddPaused;
-	int					m_iPrefixLen;
-
-protected:
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-
-public:
-	static void			ExecuteScript(const char* szScript, const char* szNZBFilename, const char* szDirectory,
-							char** pNZBName, char** pCategory, int* iPriority, NZBParameterList* pParameters,
-							bool* bAddTop, bool* bAddPaused);
-};
-
-class NZBAddedScriptController : public Thread, public ScriptController
-{
-private:
-	char*				m_szNZBName;
-
-public:
-	virtual void		Run();
-	static void			StartScript(DownloadQueue* pDownloadQueue, NZBInfo *pNZBInfo, const char* szScript);
-};
-
-class SchedulerScriptController : public Thread, public ScriptController
-{
-public:
-	virtual void		Run();
-	static void			StartScript(const char* szCommandLine);
+	static void			StartScriptJob(PostInfo* pPostInfo, const char* szScript, 
+							bool bNZBFileCompleted, bool bHasFailedParJobs);
 };
 
 #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
@@ -38,7 +46,6 @@
 #include <unistd.h>
 #include <errno.h>
 #endif
-#include <algorithm>
 
 #include "nzbget.h"
 #include "ServerPool.h"
@@ -58,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++)
 	{
@@ -83,124 +97,87 @@ void ServerPool::AddServer(NewsServer* pNewsServer)
 {
 	debug("Adding server to ServerPool");
 
-	if (pNewsServer->GetMaxConnections() > 0)
-	{
-		m_Servers.push_back(pNewsServer);
-	}
-	else
-	{
-		delete pNewsServer;
-	}
-}
-
-void ServerPool::NormalizeLevels()
-{
-	if (m_Servers.empty())
-	{
-		return;
-	}
-
-	std::sort(m_Servers.begin(), m_Servers.end(), CompareServers);
-
-	NewsServer* pNewsServer = m_Servers.front();
-
-	m_iMaxLevel = 0;
-	int iCurLevel = pNewsServer->GetLevel();
-	for (Servers::iterator it = m_Servers.begin(); it != m_Servers.end(); it++)
-	{
-		NewsServer* pNewsServer = *it;
-		if (pNewsServer->GetLevel() != iCurLevel)
-		{
-			m_iMaxLevel++;
-		}
-
-		pNewsServer->SetLevel(m_iMaxLevel);
-	}
-}
-
-bool ServerPool::CompareServers(NewsServer* pServer1, NewsServer* pServer2)
-{
-	return pServer1->GetLevel() < pServer2->GetLevel();
+	m_Servers.push_back(pNewsServer);
 }
 
 void ServerPool::InitConnections()
 {
 	debug("Initializing connections in ServerPool");
 
-	NormalizeLevels();
-
+	m_iMaxLevel = 0;
 	for (Servers::iterator it = m_Servers.begin(); it != m_Servers.end(); it++)
 	{
 		NewsServer* pNewsServer = *it;
+		if (m_iMaxLevel < pNewsServer->GetLevel())
+		{
+			m_iMaxLevel = pNewsServer->GetLevel();
+		}
 		for (int i = 0; i < pNewsServer->GetMaxConnections(); i++)
 		{
 			PooledConnection* pConnection = new PooledConnection(pNewsServer);
 			pConnection->SetTimeout(m_iTimeout);
 			m_Connections.push_back(pConnection);
 		}
-		if ((int)m_Levels.size() <= pNewsServer->GetLevel())
-		{
-			m_Levels.push_back(0);
-		}
-		m_Levels[pNewsServer->GetLevel()] += pNewsServer->GetMaxConnections();
 	}
 
-	if (m_Levels.empty())
+	for (int iLevel = 0; iLevel <= m_iMaxLevel; iLevel++)
 	{
-		warn("No news servers defined, download is not possible");
-	}
-}
-
-NNTPConnection* ServerPool::GetConnection(int iLevel, NewsServer* pWantServer, Servers* pIgnoreServers)
-{
-	PooledConnection* pConnection = NULL;
-
-	m_mutexConnections.Lock();
-
-	if (iLevel < (int)m_Levels.size() && m_Levels[iLevel] > 0)
-	{
-		for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
+		int iMaxConnectionsForLevel = 0;
+		for (Servers::iterator it = m_Servers.begin(); it != m_Servers.end(); it++)
 		{
-			PooledConnection* pCandidateConnection = *it;
-			NewsServer* pCandidateServer = pCandidateConnection->GetNewsServer();
-			if (!pCandidateConnection->GetInUse() && pCandidateServer->GetLevel() == iLevel && 
-				(!pWantServer || pCandidateServer == pWantServer ||
-				 (pWantServer->GetGroup() > 0 && pWantServer->GetGroup() == pCandidateServer->GetGroup())))
+			NewsServer* pNewsServer = *it;
+			if (iLevel == pNewsServer->GetLevel())
 			{
-				// free connection found, check if it's not from the server which should be ignored
-				bool bUseConnection = true;
-				if (pIgnoreServers && !pWantServer)
-				{
-					for (Servers::iterator it = pIgnoreServers->begin(); it != pIgnoreServers->end(); it++)
-					{
-						NewsServer* pIgnoreServer = *it;
-						if (pIgnoreServer == pCandidateServer ||
-							(pIgnoreServer->GetGroup() > 0 && pIgnoreServer->GetGroup() == pCandidateServer->GetGroup() &&
-							 pIgnoreServer->GetLevel() == pCandidateServer->GetLevel()))
-						{
-							bUseConnection = false;
-							break;
-						}
-					}
-				}
-
-				if (bUseConnection)
-				{
-					pConnection = pCandidateConnection;
-					pConnection->SetInUse(true);
-					break;
-				}
+				iMaxConnectionsForLevel += pNewsServer->GetMaxConnections();
 			}
 		}
 
-		if (pConnection)
+		Semaphore* sem = new Semaphore(iMaxConnectionsForLevel);
+		m_Semaphores.push_back(sem);
+	}
+}
+
+NNTPConnection* ServerPool::GetConnection(int iLevel, bool bWait)
+{
+	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();
+
+	PooledConnection* pConnection = NULL;
+	for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
+	{
+		PooledConnection* pConnection1 = *it;
+		if (!pConnection1->GetInUse() && pConnection1->GetNewsServer()->GetLevel() == iLevel)
 		{
-			m_Levels[iLevel]--;
+			// 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;
 }
 
@@ -218,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();
 }
@@ -237,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();
 			}
 		}
@@ -258,8 +235,17 @@ void ServerPool::LogDebugInfo()
 	debug("    Connections: %i", m_Connections.size());
 	for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
 	{
-		debug("      %s: Level=%i, InUse:%i", (*it)->GetNewsServer()->GetHost(), (*it)->GetNewsServer()->GetLevel(), (int)(*it)->GetInUse());
+		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$
@@ -36,9 +37,6 @@
 
 class ServerPool
 {
-public:
-	typedef std::vector<NewsServer*>		Servers;
-
 private:
 	class PooledConnection : public NNTPConnection
 	{
@@ -53,28 +51,25 @@ private:
 		void			SetFreeTimeNow() { m_tFreeTime = ::time(NULL); }
 	};
 
-	typedef std::vector<int>				Levels;
+	typedef std::vector<NewsServer*>		Servers;
+	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;
 
-	void				NormalizeLevels();
-	static bool			CompareServers(NewsServer* pServer1, NewsServer* pServer2);
-
 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; }
-	Servers*			GetServers() { return &m_Servers; } // Only for read access (no lockings)
-	NNTPConnection*		GetConnection(int iLevel, NewsServer* pWantServer, Servers* pIgnoreServers);
+	NNTPConnection*		GetConnection(int iLevel, bool bWait);
 	void 				FreeConnection(NNTPConnection* pConnection, bool bUsed);
 	void				CloseUnusedConnections();
 

TLS.h

@@ -1,7 +1,13 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2008-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Based on "tls.h" from project "mpop" by Martin Lambers
+ *  Original source code available on http://sourceforge.net/projects/mpop/
+ *
+ *  Copyright (C) 2000, 2003, 2004, 2005, 2006, 2007
+ *  Martin Lambers <marlam@marlam.de>
+ *
+ *  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 +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$
@@ -27,36 +33,179 @@
 
 #ifndef DISABLE_TLS
 
-class TLSSocket
+#ifdef HAVE_LIBGNUTLS
+# include <gnutls/gnutls.h>
+#endif /* HAVE_LIBGNUTLS */
+#ifdef HAVE_OPENSSL
+# include <openssl/ssl.h>
+#endif /* HAVE_OPENSSL */
+
+
+/*
+ * If a function with an 'errstr' argument returns a value != TLS_EOK,
+ * '*errstr' either points to an allocates string containing an error 
+ * description or is NULL.
+ * If such a function returns TLS_EOK, 'errstr' will not be changed.
+ */
+#define TLS_EOK		0	/* no error */
+#define TLS_ELIBFAILED	1	/* The underlying library failed */
+#define TLS_ESEED	2	/* Cannot seed pseudo random number generator */
+#define TLS_ECERT	3	/* Certificate check or verification failed */
+#define TLS_EIO		4	/* Input/output error */
+#define TLS_EFILE	5	/* A file does not exist/cannot be read */
+#define TLS_EHANDSHAKE	6	/* TLS handshake failed */
+
+
+/*
+ * Always use tls_clear() before using a tls_t!
+ * Never call a tls_*() function with tls_t NULL!
+ */
+
+typedef struct
 {
-private:
-	bool				m_bIsClient;
-	char*				m_szCertFile;
-	char*				m_szKeyFile;
-	char*				m_szCipher;
-	SOCKET				m_iSocket;
-	bool				m_bSuppressErrors;
-	int					m_iRetCode;
-	bool				m_bInitialized;
-	bool				m_bConnected;
+    int have_trust_file;
+    int is_active;
+#ifdef HAVE_LIBGNUTLS
+    gnutls_session_t session;
+    gnutls_certificate_credentials_t cred;
+#endif /* HAVE_LIBGNUTLS */
+#ifdef HAVE_OPENSSL
+    SSL_CTX *ssl_ctx;
+    SSL *ssl;
+#endif /* HAVE_OPENSSL */
+} tls_t;
 
-	// using "void*" to prevent the including of GnuTLS/OpenSSL header files into TLS.h
-	void*				m_pContext;
-	void*				m_pSession;
+/*
+ * Information about a X509 certificate.
+ * The 6 owner_info and issuer_info fields are:
+ *   Common Name
+ *   Organization
+ *   Organizational unit
+ *   Locality
+ *   State/Province
+ *   Country
+ * Each of these entries may be NULL if it was not provided.
+ */
+typedef struct
+{
+    unsigned char sha1_fingerprint[20];
+    unsigned char md5_fingerprint[16];
+    time_t activation_time;
+    time_t expiration_time;
+    char *owner_info[6];		
+    char *issuer_info[6];
+} tls_cert_info_t;
 
-	void				ReportError(const char* szErrMsg);
+/*
+ * tls_lib_init()
+ *
+ * Initialize underlying TLS library. If this function returns TLS_ELIBFAILED,
+ * *errstr will always point to an error string.
+ * Used error codes: TLS_ELIBFAILED
+ */
+int tls_lib_init(char **errstr);
 
-public:
-						TLSSocket(SOCKET iSocket, bool bIsClient, const char* szCertFile, const char* szKeyFile, const char* szCipher);
-						~TLSSocket();
-	static void			Init();
-	static void			Final();
-	bool				Start();
-	void				Close();
-	int					Send(const char* pBuffer, int iSize);
-	int					Recv(char* pBuffer, int iSize);
-	void				SetSuppressErrors(bool bSuppressErrors) { m_bSuppressErrors = bSuppressErrors; }
-};
+/*
+ * tls_clear()
+ *
+ * Clears a tls_t type (marks it inactive).
+ */
+void tls_clear(tls_t *tls);
+
+/*
+ * tls_init()
+ *
+ * Initializes a tls_t. If both 'key_file' and 'ca_file' are not NULL, they are
+ * set to be used when the peer request a certificate. If 'trust_file' is not
+ * NULL, it will be used to verify the peer certificate.
+ * All files must be in PEM format.
+ * If 'force_sslv3' is set, then only the SSLv3 protocol will be accepted. This
+ * option might be needed to talk to some obsolete broken servers. Only use this
+ * if you have to.
+ * Used error codes: TLS_ELIBFAILED, TLS_EFILE
+ */
+int tls_init(tls_t *tls, 
+	const char *key_file, const char *ca_file, const char *trust_file, 
+	int force_sslv3, char **errstr);
+
+/*
+ * tls_start()
+ *
+ * Starts TLS encryption on a socket.
+ * 'tls' must be initialized using tls_init().
+ * If 'no_certcheck' is true, then no checks will be performed on the peer
+ * certificate. If it is false and no trust file was set with tls_init(), 
+ * only sanity checks are performed on the peer certificate. If it is false 
+ * and a trust file was set, real verification of the peer certificate is 
+ * performed.
+ * 'hostname' is the host to start TLS with. It is needed for sanity checks/
+ * verification.
+ * 'tci' must be allocated with tls_cert_info_new(). Information about the 
+ * peer's certificata will be stored in it. It can later be freed with
+ * tls_cert_info_free(). 'tci' is allowed to be NULL; no certificate 
+ * information will be passed in this case.
+ * Used error codes: TLS_ELIBFAILED, TLS_ECERT, TLS_EHANDSHAKE
+ */
+int tls_start(tls_t *tls, int fd, const char *hostname, int no_certcheck,
+	tls_cert_info_t *tci, char **errstr);
+
+/*
+ * tls_is_active()
+ *
+ * Returns whether 'tls' is an active TLS connection.
+ */
+int tls_is_active(tls_t *tls);
+
+/*
+ * tls_cert_info_new()
+ * Returns a new tls_cert_info_t
+ */
+tls_cert_info_t *tls_cert_info_new(void);
+
+/*
+ * tls_cert_info_free()
+ * Frees a tls_cert_info_t
+ */
+void tls_cert_info_free(tls_cert_info_t *tci);
+
+/*
+ * tls_cert_info_get()
+ *
+ * Extracts certificate information from the TLS connection 'tls' and stores
+ * it in 'tci'. See the description of tls_cert_info_t above.
+ * Used error codes: TLS_ECERT
+ */
+int tls_cert_info_get(tls_t *tls, tls_cert_info_t *tci, char **errstr);
+
+/*
+ * tls_getbuf()
+ *
+ * Reads a buffer using TLS and stores it in 's'.
+ * Used error codes: TLS_EIO
+ */
+int tls_getbuf(tls_t *tls, char* s, size_t len, size_t* readlen, char **errstr);
+
+/*
+ * tls_putbuf()
+ *
+ * Writes 'len' characters from the string 's' using TLS.
+ * Used error codes: TLS_EIO
+ */
+int tls_putbuf(tls_t *tls, const char *s, size_t len, char **errstr);
+
+/*
+ * tls_close()
+ *
+ * Close a TLS connection and mark it inactive
+ */
+void tls_close(tls_t *tls);
+
+/*
+ * tls_lib_deinit()
+ *
+ * Deinit underlying TLS library.
+ */
+void tls_lib_deinit(void);
 
 #endif
 #endif

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$
@@ -34,136 +34,160 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <errno.h>
 
 #ifdef WIN32
 #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;
 
 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);
+	sem_init(&m_semObj, 0, 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);
-#endif
-	free((void*)m_pSpinLockObj);
-}
-
-void SpinLock::Lock()
-{
-#ifdef WIN32
-	EnterCriticalSection((CRITICAL_SECTION *)m_pSpinLockObj);
-#else
-	pthread_spin_lock((pthread_spinlock_t *)m_pSpinLockObj);
+	sem_init(&m_semObj, 0, iValue);
 #endif
 }
 
-void SpinLock::Unlock()
+Semaphore::~ Semaphore()
 {
 #ifdef WIN32
-	LeaveCriticalSection((CRITICAL_SECTION *)m_pSpinLockObj);
+	CloseHandle(m_semObj);
 #else
-	pthread_spin_unlock((pthread_spinlock_t *)m_pSpinLockObj);
+	sem_destroy(&m_semObj);
 #endif
 }
+
+void Semaphore::Post()
+{
+#ifdef WIN32
+	ReleaseSemaphore(m_semObj, 1, NULL);
+#else
+	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
+}
+
+bool Semaphore::TryWait()
+{
+#ifdef WIN32
+	return WaitForSingleObject(m_semObj, 0) == WAIT_OBJECT_0;
+#else
+	return sem_trywait(&m_semObj) == 0;
+#endif
+}
+
+bool Semaphore::TimedWait(int iMSec)
+{
+#ifdef WIN32
+	return WaitForSingleObject(m_semObj, iMSec) == WAIT_OBJECT_0;
+#else
+	struct timespec alarm;
+	alarm.tv_sec = ::time(NULL) + iMSec / 1000;
+	alarm.tv_nsec = (iMSec % 1000) * 1000;
+	return sem_timedwait(&m_semObj, &alarm) == 0;
+#endif
+}
+
+bool Semaphore::IsLocked()
+{
+#ifdef WIN32
+	bool bCanLock = WaitForSingleObject(m_semObj, 0) == WAIT_OBJECT_0;
+	if (bCanLock)
+	{
+		ReleaseSemaphore(m_semObj, 1, NULL);
+	}
+	return !bCanLock;
+#else
+	int iSemValue;
+	sem_getvalue(&m_semObj, &iSemValue);
+	return iSemValue <= 0;
+#endif
+}
 
 
 void Thread::Init()
 {
 	debug("Initializing global thread data");
-
-	m_pMutexThread = new Mutex();
 }
 
 void Thread::Final()
 {
 	debug("Finalizing global thread data");
-
-	delete m_pMutexThread;
 }
 
 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 +196,6 @@ Thread::Thread()
 Thread::~Thread()
 {
 	debug("Destroying Thread");
-#ifndef WIN32
-	free(m_pThreadObj);
-#endif
 }
 
 void Thread::Start()
@@ -183,29 +204,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 +241,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 +263,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 +283,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 +294,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,38 @@ 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;
 #endif
 	
 public:
-							SpinLock();
-							~SpinLock();
-	void					Lock();
-	void					Unlock();
+							Semaphore();
+							Semaphore(int iValue);
+							~Semaphore();
+	void					Post();
+	bool					Wait();
+	bool					TryWait();
+	bool					TimedWait(int iMSec);
+	bool					IsLocked();
 };
-#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 +91,8 @@ private:
 #endif
 
 public:
-							Thread();
+	Thread();
 	virtual 				~Thread();
-	static void				Init();
-	static void				Final();
 
 	virtual void 			Start();
 	virtual void 			Stop();
@@ -90,6 +105,9 @@ public:
 	void					SetAutoDestroy(bool bAutoDestroy) { m_bAutoDestroy = bAutoDestroy; }
 	static int				GetThreadCount();
 
+	static void				Init();
+	static void				Final();
+
 protected:
 	virtual void 			Run() {}; // Virtual function - override in derivatives
 };

Unpack.cpp

@@ -1,888 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-#ifndef WIN32
-#include <unistd.h>
-#endif
-#include <errno.h>
-
-#include "nzbget.h"
-#include "Unpack.h"
-#include "Log.h"
-#include "Util.h"
-#include "ParCoordinator.h"
-
-extern Options* g_pOptions;
-extern DownloadQueueHolder* g_pDownloadQueueHolder;
-
-void UnpackController::FileList::Clear()
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		free(*it);
-	}
-	clear();
-}
-
-bool UnpackController::FileList::Exists(const char* szFilename)
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		char* szFilename1 = *it;
-		if (!strcmp(szFilename1, szFilename))
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
-UnpackController::~UnpackController()
-{
-	m_archiveFiles.Clear();
-}
-
-void UnpackController::StartJob(PostInfo* pPostInfo)
-{
-	UnpackController* pUnpackController = new UnpackController();
-	pUnpackController->m_pPostInfo = pPostInfo;
-	pUnpackController->SetAutoDestroy(false);
-
-	pPostInfo->SetPostThread(pUnpackController);
-
-	pUnpackController->Start();
-}
-
-void UnpackController::Run()
-{
-	// the locking is needed for accessing the members of NZBInfo
-	g_pDownloadQueueHolder->LockQueue();
-
-	strncpy(m_szDestDir, m_pPostInfo->GetNZBInfo()->GetDestDir(), 1024);
-	m_szDestDir[1024-1] = '\0';
-
-	strncpy(m_szName, m_pPostInfo->GetNZBInfo()->GetName(), 1024);
-	m_szName[1024-1] = '\0';
-
-	m_bCleanedUpDisk = false;
-	bool bUnpack = true;
-	m_szPassword[0] = '\0';
-	m_szFinalDir[0] = '\0';
-	
-	for (NZBParameterList::iterator it = m_pPostInfo->GetNZBInfo()->GetParameters()->begin(); it != m_pPostInfo->GetNZBInfo()->GetParameters()->end(); it++)
-	{
-		NZBParameter* pParameter = *it;
-		if (!strcasecmp(pParameter->GetName(), "*Unpack:") && !strcasecmp(pParameter->GetValue(), "no"))
-		{
-			bUnpack = false;
-		}
-		if (!strcasecmp(pParameter->GetName(), "*Unpack:Password"))
-		{
-			strncpy(m_szPassword, pParameter->GetValue(), 1024-1);
-			m_szPassword[1024-1] = '\0';
-		}
-	}
-	
-	g_pDownloadQueueHolder->UnlockQueue();
-
-	snprintf(m_szInfoName, 1024, "unpack for %s", m_szName);
-	m_szInfoName[1024-1] = '\0';
-
-	snprintf(m_szInfoNameUp, 1024, "Unpack for %s", m_szName); // first letter in upper case
-	m_szInfoNameUp[1024-1] = '\0';
-
-	CheckStateFiles();
-
-#ifndef DISABLE_PARCHECK
-	if (bUnpack && m_bHasBrokenFiles && m_pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped && m_bHasParFiles)
-	{
-		PrintMessage(Message::mkInfo, "%s has broken files", m_szName);
-		RequestParCheck(false);
-		m_pPostInfo->SetWorking(false);
-		return;
-	}
-#endif
-
-	if (bUnpack)
-	{
-		bool bScanNonStdFiles = m_pPostInfo->GetNZBInfo()->GetRenameStatus() > NZBInfo::rsSkipped ||
-			m_pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psSuccess ||
-			!m_bHasParFiles;
-		CheckArchiveFiles(bScanNonStdFiles);
-	}
-
-	if (bUnpack && (m_bHasRarFiles || m_bHasNonStdRarFiles || m_bHasSevenZipFiles || m_bHasSevenZipMultiFiles))
-	{
-		SetInfoName(m_szInfoName);
-		SetWorkingDir(m_szDestDir);
-
-		PrintMessage(Message::mkInfo, "Unpacking %s", m_szName);
-
-		CreateUnpackDir();
-
-		m_bUnpackOK = true;
-		m_bUnpackStartError = false;
-
-		if (m_bHasRarFiles || m_bHasNonStdRarFiles)
-		{
-			ExecuteUnrar();
-		}
-
-		if (m_bHasSevenZipFiles && m_bUnpackOK)
-		{
-			ExecuteSevenZip(false);
-		}
-
-		if (m_bHasSevenZipMultiFiles && m_bUnpackOK)
-		{
-			ExecuteSevenZip(true);
-		}
-
-		Completed();
-	}
-	else
-	{
-		PrintMessage(Message::mkInfo, (bUnpack ? "Nothing to unpack for %s" : "Unpack for %s skipped"), m_szName);
-
-#ifndef DISABLE_PARCHECK
-		if (bUnpack && m_pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped && m_bHasParFiles)
-		{
-			RequestParCheck(m_pPostInfo->GetNZBInfo()->GetRenameStatus() <= NZBInfo::rsSkipped);
-		}
-		else
-#endif
-		{
-			m_pPostInfo->GetNZBInfo()->SetUnpackStatus(NZBInfo::usSkipped);
-			m_pPostInfo->SetStage(PostInfo::ptQueued);
-		}
-	}
-
-	m_pPostInfo->SetWorking(false);
-}
-
-void UnpackController::ExecuteUnrar()
-{
-	// Format: 
-	//   unrar x -y -p- -o+ *.rar ./_unpack
-
-	char szPasswordParam[1024];
-	const char* szArgs[8];
-	szArgs[0] = g_pOptions->GetUnrarCmd();
-	szArgs[1] = "x";
-	szArgs[2] = "-y";
-	szArgs[3] = "-p-";
-	if (strlen(m_szPassword) > 0)
-	{
-		snprintf(szPasswordParam, 1024, "-p%s", m_szPassword);
-		szArgs[3] = szPasswordParam;
-	}
-	szArgs[4] = "-o+";
-	szArgs[5] = m_bHasNonStdRarFiles ? "*.*" : "*.rar";
-	szArgs[6] = m_szUnpackDir;
-	szArgs[7] = NULL;
-	SetArgs(szArgs, false);
-
-	SetScript(g_pOptions->GetUnrarCmd());
-	SetLogPrefix("Unrar");
-
-	m_bAllOKMessageReceived = false;
-	m_eUnpacker = upUnrar;
-	
-	SetProgressLabel("");
-	int iExitCode = Execute();
-	SetLogPrefix(NULL);
-	SetProgressLabel("");
-
-	m_bUnpackOK = iExitCode == 0 && m_bAllOKMessageReceived && !GetTerminated();
-	m_bUnpackStartError = iExitCode == -1;
-
-	if (!m_bUnpackOK && iExitCode > 0)
-	{
-		PrintMessage(Message::mkError, "Unrar error code: %i", iExitCode);
-	}
-}
-
-void UnpackController::ExecuteSevenZip(bool bMultiVolumes)
-{
-	// Format: 
-	//   7z x -y -p- -o./_unpack *.7z
-	// OR
-	//   7z x -y -p- -o./_unpack *.7z.001
-
-	char szPasswordParam[1024];
-	const char* szArgs[7];
-	szArgs[0] = g_pOptions->GetSevenZipCmd();
-	szArgs[1] = "x";
-	szArgs[2] = "-y";
-
-	szArgs[3] = "-p-";
-	if (strlen(m_szPassword) > 0)
-	{
-		snprintf(szPasswordParam, 1024, "-p%s", m_szPassword);
-		szArgs[3] = szPasswordParam;
-	}
-
-	char szUnpackDirParam[1024];
-	snprintf(szUnpackDirParam, 1024, "-o%s", m_szUnpackDir);
-	szArgs[4] = szUnpackDirParam;
-
-	szArgs[5] = bMultiVolumes ? "*.7z.001" : "*.7z";
-	szArgs[6] = NULL;
-	SetArgs(szArgs, false);
-
-	SetScript(g_pOptions->GetSevenZipCmd());
-
-	m_bAllOKMessageReceived = false;
-	m_eUnpacker = upSevenZip;
-
-	PrintMessage(Message::mkInfo, "Executing 7-Zip");
-	SetLogPrefix("7-Zip");
-	SetProgressLabel("");
-	int iExitCode = Execute();
-	SetLogPrefix(NULL);
-	SetProgressLabel("");
-
-	m_bUnpackOK = iExitCode == 0 && m_bAllOKMessageReceived && !GetTerminated();
-	m_bUnpackStartError = iExitCode == -1;
-
-	if (!m_bUnpackOK && iExitCode > 0)
-	{
-		PrintMessage(Message::mkError, "7-Zip error code: %i", iExitCode);
-	}
-}
-
-void UnpackController::Completed()
-{
-	bool bCleanupSuccess = Cleanup();
-
-	if (m_bUnpackOK && bCleanupSuccess)
-	{
-		PrintMessage(Message::mkInfo, "%s %s", m_szInfoNameUp, "successful");
-		m_pPostInfo->GetNZBInfo()->SetUnpackStatus(NZBInfo::usSuccess);
-		m_pPostInfo->GetNZBInfo()->SetUnpackCleanedUpDisk(m_bCleanedUpDisk);
-		m_pPostInfo->SetStage(PostInfo::ptQueued);
-	}
-	else
-	{
-#ifndef DISABLE_PARCHECK
-		if (!m_bUnpackOK && m_pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped && !m_bUnpackStartError && !GetTerminated() && m_bHasParFiles)
-		{
-			RequestParCheck(false);
-		}
-		else
-#endif
-		{
-			PrintMessage(Message::mkError, "%s failed", m_szInfoNameUp);
-			m_pPostInfo->GetNZBInfo()->SetUnpackStatus(NZBInfo::usFailure);
-			m_pPostInfo->SetStage(PostInfo::ptQueued);
-		}
-	}
-}
-
-#ifndef DISABLE_PARCHECK
-void UnpackController::RequestParCheck(bool bRename)
-{
-	PrintMessage(Message::mkInfo, "%s requested %s", m_szInfoNameUp, bRename ? "par-rename": "par-check/repair");
-	if (bRename)
-	{
-		m_pPostInfo->SetRequestParRename(true);
-	}
-	else
-	{
-		m_pPostInfo->SetRequestParCheck(true);
-	}
-	m_pPostInfo->SetStage(PostInfo::ptFinished);
-}
-#endif
-
-void UnpackController::CheckStateFiles()
-{
-	char szBrokenLog[1024];
-	snprintf(szBrokenLog, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, "_brokenlog.txt");
-	szBrokenLog[1024-1] = '\0';
-	m_bHasBrokenFiles = Util::FileExists(szBrokenLog);
-
-	m_bHasParFiles = ParCoordinator::FindMainPars(m_szDestDir, NULL);
-}
-
-void UnpackController::CreateUnpackDir()
-{
-	m_bInterDir = strlen(g_pOptions->GetInterDir()) > 0 &&
-		!strncmp(m_szDestDir, g_pOptions->GetInterDir(), strlen(g_pOptions->GetInterDir()));
-	if (m_bInterDir)
-	{
-		m_pPostInfo->GetNZBInfo()->BuildFinalDirName(m_szFinalDir, 1024);
-		m_szFinalDir[1024-1] = '\0';
-		snprintf(m_szUnpackDir, 1024, "%s%c%s", m_szFinalDir, PATH_SEPARATOR, "_unpack");
-	}
-	else
-	{
-		snprintf(m_szUnpackDir, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, "_unpack");
-	}
-	m_szUnpackDir[1024-1] = '\0';
-
-	char szErrBuf[1024];
-	if (!Util::ForceDirectories(m_szUnpackDir, szErrBuf, sizeof(szErrBuf)))
-	{
-		error("Could not create directory %s: %s", m_szUnpackDir, szErrBuf);
-	}
-}
-
-
-void UnpackController::CheckArchiveFiles(bool bScanNonStdFiles)
-{
-	m_bHasRarFiles = false;
-	m_bHasNonStdRarFiles = false;
-	m_bHasSevenZipFiles = false;
-	m_bHasSevenZipMultiFiles = false;
-
-	RegEx regExRar(".*\\.rar$");
-	RegEx regExRarMultiSeq(".*\\.(r|s)[0-9][0-9]$");
-	RegEx regExSevenZip(".*\\.7z$");
-	RegEx regExSevenZipMulti(".*\\.7z\\.[0-9]*$");
-
-	DirBrowser dir(m_szDestDir);
-	while (const char* filename = dir.Next())
-	{
-		char szFullFilename[1024];
-		snprintf(szFullFilename, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, filename);
-		szFullFilename[1024-1] = '\0';
-
-		if (strcmp(filename, ".") && strcmp(filename, "..") && !Util::DirectoryExists(szFullFilename))
-		{
-			if (regExRar.Match(filename))
-			{
-				m_bHasRarFiles = true;
-			}
-			else if (regExSevenZip.Match(filename))
-			{
-				m_bHasSevenZipFiles = true;
-			}
-			else if (regExSevenZipMulti.Match(filename))
-			{
-				m_bHasSevenZipMultiFiles = true;
-			}
-			else if (bScanNonStdFiles && !m_bHasNonStdRarFiles && !regExRarMultiSeq.Match(filename))
-			{
-				// Check if file has RAR signature
-				char rarSignature[] = {0x52, 0x61, 0x72, 0x21, 0x1A, 0x07, 0x00};
-				char fileSignature[7];
-
-				FILE* infile;
-				infile = fopen(szFullFilename, "rb");
-				if (infile)
-				{
-					int cnt = (int)fread(fileSignature, 1, sizeof(fileSignature), infile);
-					fclose(infile);
-					if (cnt == sizeof(fileSignature) && !strcmp(rarSignature, fileSignature))
-					{
-						m_bHasNonStdRarFiles = true;
-					}
-				}
-			}
-		}
-	}
-}
-
-bool UnpackController::Cleanup()
-{
-	// By success:
-	//   - move unpacked files to destination dir;
-	//   - remove _unpack-dir;
-	//   - delete archive-files.
-	// By failure:
-	//   - remove _unpack-dir.
-
-	bool bOK = true;
-
-	FileList extractedFiles;
-
-	if (m_bUnpackOK)
-	{
-		// moving files back
-		DirBrowser dir(m_szUnpackDir);
-		while (const char* filename = dir.Next())
-		{
-			if (strcmp(filename, ".") && strcmp(filename, ".."))
-			{
-				char szSrcFile[1024];
-				snprintf(szSrcFile, 1024, "%s%c%s", m_szUnpackDir, PATH_SEPARATOR, filename);
-				szSrcFile[1024-1] = '\0';
-
-				char szDstFile[1024];
-				snprintf(szDstFile, 1024, "%s%c%s", m_szFinalDir[0] != '\0' ? m_szFinalDir : m_szDestDir, PATH_SEPARATOR, filename);
-				szDstFile[1024-1] = '\0';
-
-				// silently overwrite existing files
-				remove(szDstFile);
-
-				if (!Util::MoveFile(szSrcFile, szDstFile))
-				{
-					PrintMessage(Message::mkError, "Could not move file %s to %s", szSrcFile, szDstFile);
-					bOK = false;
-				}
-
-				extractedFiles.push_back(strdup(filename));
-			}
-		}
-	}
-
-	if (bOK && !Util::DeleteDirectoryWithContent(m_szUnpackDir))
-	{
-		PrintMessage(Message::mkError, "Could not remove temporary directory %s", m_szUnpackDir);
-	}
-
-	if (m_bUnpackOK && bOK && g_pOptions->GetUnpackCleanupDisk())
-	{
-		PrintMessage(Message::mkInfo, "Deleting archive files");
-
-		// Delete rar-files (only files which were used by unrar)
-		for (FileList::iterator it = m_archiveFiles.begin(); it != m_archiveFiles.end(); it++)
-		{
-			char* szFilename = *it;
-
-			if (m_bInterDir || !extractedFiles.Exists(szFilename))
-			{
-				char szFullFilename[1024];
-				snprintf(szFullFilename, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, szFilename);
-				szFullFilename[1024-1] = '\0';
-
-				PrintMessage(Message::mkInfo, "Deleting file %s", szFilename);
-
-				if (remove(szFullFilename) != 0)
-				{
-					PrintMessage(Message::mkError, "Could not delete file %s", szFullFilename);
-				}
-			}
-		}
-
-		// Unfortunately 7-Zip doesn't print the processed archive-files to the output.
-		// Therefore we don't know for sure which files were extracted.
-		// We just delete all 7z-files in the directory.
-
-		RegEx regExSevenZip(".*\\.7z$|.*\\.7z\\.[0-9]*$");
-
-		DirBrowser dir(m_szDestDir);
-		while (const char* filename = dir.Next())
-		{
-			char szFullFilename[1024];
-			snprintf(szFullFilename, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, filename);
-			szFullFilename[1024-1] = '\0';
-
-			if (strcmp(filename, ".") && strcmp(filename, "..") && !Util::DirectoryExists(szFullFilename) 
-				&& regExSevenZip.Match(filename) && (m_bInterDir || !extractedFiles.Exists(filename)))
-			{
-				PrintMessage(Message::mkInfo, "Deleting file %s", filename);
-
-				if (remove(szFullFilename) != 0)
-				{
-					PrintMessage(Message::mkError, "Could not delete file %s", szFullFilename);
-				}
-			}
-		}
-
-		m_bCleanedUpDisk = true;
-	}
-
-	extractedFiles.Clear();
-
-	return bOK;
-}
-
-/**
- * Unrar prints progress information into the same line using backspace control character.
- * In order to print progress continuously we analyze the output after every char
- * and update post-job progress information.
- */
-bool UnpackController::ReadLine(char* szBuf, int iBufSize, FILE* pStream)
-{
-	bool bPrinted = false;
-
-	int i = 0;
-
-	for (; i < iBufSize - 1; i++)
-	{
-		int ch = fgetc(pStream);
-		szBuf[i] = ch;
-		szBuf[i+1] = '\0';
-		if (ch == EOF)
-		{
-			break;
-		}
-		if (ch == '\n')
-		{
-			i++;
-			break;
-		}
-
-		char* szBackspace = strrchr(szBuf, '\b');
-		if (szBackspace)
-		{
-			if (!bPrinted)
-			{
-				char tmp[1024];
-				strncpy(tmp, szBuf, 1024);
-				tmp[1024-1] = '\0';
-				char* szTmpPercent = strrchr(tmp, '\b');
-				if (szTmpPercent)
-				{
-					*szTmpPercent = '\0';
-				}
-				if (strncmp(szBuf, "...", 3))
-				{
-					ProcessOutput(tmp);
-				}
-				bPrinted = true;
-			}
-			if (strchr(szBackspace, '%'))
-			{
-				int iPercent = atoi(szBackspace + 1);
-				m_pPostInfo->SetStageProgress(iPercent * 10);
-			}
-		}
-	}
-
-	szBuf[i] = '\0';
-
-	if (bPrinted)
-	{
-		szBuf[0] = '\0';
-	}
-
-	return i > 0;
-}
-
-void UnpackController::AddMessage(Message::EKind eKind, const char* szText)
-{
-	char szMsgText[1024];
-	strncpy(szMsgText, szText, 1024);
-	szMsgText[1024-1] = '\0';
-	
-	// Modify unrar messages for better readability:
-	// remove the destination path part from message "Extracting file.xxx"
-	if (m_eUnpacker == upUnrar && !strncmp(szText, "Unrar: Extracting  ", 19) &&
-		!strncmp(szText + 19, m_szUnpackDir, strlen(m_szUnpackDir)))
-	{
-		snprintf(szMsgText, 1024, "Unrar: Extracting %s", szText + 19 + strlen(m_szUnpackDir) + 1);
-		szMsgText[1024-1] = '\0';
-	}
-
-	ScriptController::AddMessage(eKind, szMsgText);
-	m_pPostInfo->AppendMessage(eKind, szMsgText);
-
-	if (m_eUnpacker == upUnrar && !strncmp(szMsgText, "Unrar: UNRAR ", 6) &&
-		strstr(szMsgText, " Copyright ") && strstr(szMsgText, " Alexander Roshal"))
-	{
-		// reset start time for a case if user uses unpack-script to do some things
-		// (like sending Wake-On-Lan message) before executing unrar
-		m_pPostInfo->SetStageTime(time(NULL));
-	}
-
-	if (m_eUnpacker == upUnrar && !strncmp(szMsgText, "Unrar: Extracting ", 18))
-	{
-		SetProgressLabel(szMsgText + 7);
-	}
-
-	if (m_eUnpacker == upUnrar && !strncmp(szText, "Unrar: Extracting from ", 23))
-	{
-		const char *szFilename = szText + 23;
-		debug("Filename: %s", szFilename);
-		m_archiveFiles.push_back(strdup(szFilename));
-		SetProgressLabel(szText + 7);
-	}
-
-	if ((m_eUnpacker == upUnrar && !strncmp(szText, "Unrar: All OK", 13)) ||
-		(m_eUnpacker == upSevenZip && !strncmp(szText, "7-Zip: Everything is Ok", 23)))
-	{
-		m_bAllOKMessageReceived = true;
-	}
-}
-
-void UnpackController::Stop()
-{
-	debug("Stopping unpack");
-	Thread::Stop();
-	Terminate();
-}
-
-void UnpackController::SetProgressLabel(const char* szProgressLabel)
-{
-	g_pDownloadQueueHolder->LockQueue();
-	m_pPostInfo->SetProgressLabel(szProgressLabel);
-	g_pDownloadQueueHolder->UnlockQueue();
-}
-
-
-void MoveController::StartJob(PostInfo* pPostInfo)
-{
-	MoveController* pMoveController = new MoveController();
-	pMoveController->m_pPostInfo = pPostInfo;
-	pMoveController->SetAutoDestroy(false);
-
-	pPostInfo->SetPostThread(pMoveController);
-
-	pMoveController->Start();
-}
-
-void MoveController::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 szInfoName[1024];
-	snprintf(szInfoName, 1024, "move for %s", m_pPostInfo->GetNZBInfo()->GetName());
-	szInfoName[1024-1] = '\0';
-	SetInfoName(szInfoName);
-
-	strncpy(m_szInterDir, m_pPostInfo->GetNZBInfo()->GetDestDir(), 1024);
-	m_szInterDir[1024-1] = '\0';
-
-	m_pPostInfo->GetNZBInfo()->BuildFinalDirName(m_szDestDir, 1024);
-	m_szDestDir[1024-1] = '\0';
-
-	g_pDownloadQueueHolder->UnlockQueue();
-
-	info("Moving completed files for %s", szNZBName);
-
-	bool bOK = MoveFiles();
-
-	szInfoName[0] = 'M'; // uppercase
-
-	if (bOK)
-	{
-		info("%s successful", szInfoName);
-		// save new dest dir
-		g_pDownloadQueueHolder->LockQueue();
-		m_pPostInfo->GetNZBInfo()->SetDestDir(m_szDestDir);
-		m_pPostInfo->GetNZBInfo()->SetMoveStatus(NZBInfo::msSuccess);
-		g_pDownloadQueueHolder->UnlockQueue();
-	}
-	else
-	{
-		error("%s failed", szInfoName);
-		m_pPostInfo->GetNZBInfo()->SetMoveStatus(NZBInfo::msFailure);
-	}
-
-	m_pPostInfo->SetStage(PostInfo::ptQueued);
-	m_pPostInfo->SetWorking(false);
-}
-
-bool MoveController::MoveFiles()
-{
-	char szErrBuf[1024];
-	if (!Util::ForceDirectories(m_szDestDir, szErrBuf, sizeof(szErrBuf)))
-	{
-		error("Could not create directory %s: %s", m_szDestDir, szErrBuf);
-		return false;
-	}
-
-	bool bOK = true;
-	DirBrowser dir(m_szInterDir);
-	while (const char* filename = dir.Next())
-	{
-		if (strcmp(filename, ".") && strcmp(filename, ".."))
-		{
-			char szSrcFile[1024];
-			snprintf(szSrcFile, 1024, "%s%c%s", m_szInterDir, PATH_SEPARATOR, filename);
-			szSrcFile[1024-1] = '\0';
-
-			char szDstFile[1024];
-			snprintf(szDstFile, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, filename);
-			szDstFile[1024-1] = '\0';
-
-			// prevent overwriting of existing files
-			int dupcount = 0;
-			while (Util::FileExists(szDstFile))
-			{
-				dupcount++;
-				snprintf(szDstFile, 1024, "%s%c%s_duplicate%d", m_szDestDir, PATH_SEPARATOR, filename, dupcount);
-				szDstFile[1024-1] = '\0';
-			}
-
-			PrintMessage(Message::mkInfo, "Moving file %s to %s", Util::BaseFileName(szSrcFile), m_szDestDir);
-			if (!Util::MoveFile(szSrcFile, szDstFile))
-			{
-				PrintMessage(Message::mkError, "Could not move file %s to %s! Errcode: %i", szSrcFile, szDstFile, errno);
-				bOK = false;
-			}
-		}
-	}
-
-	Util::RemoveDirectory(m_szInterDir);
-
-	return bOK;
-}
-
-
-void CleanupController::StartJob(PostInfo* pPostInfo)
-{
-	CleanupController* pCleanupController = new CleanupController();
-	pCleanupController->m_pPostInfo = pPostInfo;
-	pCleanupController->SetAutoDestroy(false);
-
-	pPostInfo->SetPostThread(pCleanupController);
-
-	pCleanupController->Start();
-}
-
-void CleanupController::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 szInfoName[1024];
-	snprintf(szInfoName, 1024, "cleanup for %s", m_pPostInfo->GetNZBInfo()->GetName());
-	szInfoName[1024-1] = '\0';
-	SetInfoName(szInfoName);
-
-	strncpy(m_szDestDir, m_pPostInfo->GetNZBInfo()->GetDestDir(), 1024);
-	m_szDestDir[1024-1] = '\0';
-
-	bool bInterDir = strlen(g_pOptions->GetInterDir()) > 0 &&
-		!strncmp(m_szDestDir, g_pOptions->GetInterDir(), strlen(g_pOptions->GetInterDir()));
-	if (bInterDir)
-	{
-		m_pPostInfo->GetNZBInfo()->BuildFinalDirName(m_szFinalDir, 1024);
-		m_szFinalDir[1024-1] = '\0';
-	}
-	else
-	{
-		m_szFinalDir[0] = '\0';
-	}
-
-	g_pDownloadQueueHolder->UnlockQueue();
-
-	info("Cleaning up %s", szNZBName);
-
-	bool bDeleted = false;
-	bool bOK = Cleanup(m_szDestDir, &bDeleted);
-
-	if (bOK && m_szFinalDir[0] != '\0')
-	{
-		bool bDeleted2 = false;
-		bOK = Cleanup(m_szFinalDir, &bDeleted2);
-		bDeleted = bDeleted || bDeleted2;
-	}
-
-	szInfoName[0] = 'C'; // uppercase
-
-	if (bOK && bDeleted)
-	{
-		info("%s successful", szInfoName);
-		m_pPostInfo->GetNZBInfo()->SetCleanupStatus(NZBInfo::csSuccess);
-	}
-	else if (bOK)
-	{
-		info("Nothing to cleanup for %s", szNZBName);
-		m_pPostInfo->GetNZBInfo()->SetCleanupStatus(NZBInfo::csSuccess);
-	}
-	else
-	{
-		error("%s failed", szInfoName);
-		m_pPostInfo->GetNZBInfo()->SetCleanupStatus(NZBInfo::csFailure);
-	}
-
-	m_pPostInfo->SetStage(PostInfo::ptQueued);
-	m_pPostInfo->SetWorking(false);
-}
-
-bool CleanupController::Cleanup(const char* szDestDir, bool *bDeleted)
-{
-	*bDeleted = false;
-	bool bOK = true;
-
-	ExtList extList;
-	
-	// split ExtCleanupDisk into tokens and create a list
-	char* szExtCleanupDisk = strdup(g_pOptions->GetExtCleanupDisk());
-	
-	char* saveptr;
-	char* szExt = strtok_r(szExtCleanupDisk, ",; ", &saveptr);
-	while (szExt)
-	{
-		extList.push_back(szExt);
-		szExt = strtok_r(NULL, ",; ", &saveptr);
-	}
-	
-	DirBrowser dir(szDestDir);
-	while (const char* filename = dir.Next())
-	{
-		// check file extension
-		
-		int iFilenameLen = strlen(filename);
-		bool bDeleteIt = false;
-		for (ExtList::iterator it = extList.begin(); it != extList.end(); it++)
-		{
-			const char* szExt = *it;
-			int iExtLen = strlen(szExt);
-			if (iFilenameLen >= iExtLen && !strcasecmp(szExt, filename + iFilenameLen - iExtLen))
-			{
-				bDeleteIt = true;
-				break;
-			}
-		}
-
-		if (bDeleteIt)
-		{
-			char szFullFilename[1024];
-			snprintf(szFullFilename, 1024, "%s%c%s", szDestDir, PATH_SEPARATOR, filename);
-			szFullFilename[1024-1] = '\0';
-
-			PrintMessage(Message::mkInfo, "Deleting file %s", filename);
-			if (remove(szFullFilename) != 0)
-			{
-				PrintMessage(Message::mkError, "Could not delete file %s! Errcode: %i", szFullFilename, errno);
-				bOK = false;
-			}
-
-			*bDeleted = true;
-		}
-	}
-
-	free(szExtCleanupDisk);
-
-	return bOK;
-}

Unpack.h

@@ -1,129 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  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 UNPACK_H
-#define UNPACK_H
-
-#include <deque>
-
-#include "Log.h"
-#include "Thread.h"
-#include "DownloadInfo.h"
-#include "ScriptController.h"
-
-class UnpackController : public Thread, public ScriptController
-{
-private:
-	enum EUnpacker
-	{
-		upUnrar,
-		upSevenZip
-	};
-
-	typedef std::deque<char*>		FileListBase;
-	class FileList : public FileListBase
-	{
-	public:
-		void			Clear();
-		bool			Exists(const char* szFilename);
-	};
-
-private:
-	PostInfo*			m_pPostInfo;
-	char				m_szName[1024];
-	char				m_szInfoName[1024];
-	char				m_szInfoNameUp[1024];
-	char				m_szDestDir[1024];
-	char				m_szFinalDir[1024];
-	char				m_szUnpackDir[1024];
-	char				m_szPassword[1024];
-	bool				m_bInterDir;
-	bool				m_bAllOKMessageReceived;
-	bool				m_bNoFilesMessageReceived;
-	bool				m_bHasParFiles;
-	bool				m_bHasBrokenFiles;
-	bool				m_bHasRarFiles;
-	bool				m_bHasNonStdRarFiles;
-	bool				m_bHasSevenZipFiles;
-	bool				m_bHasSevenZipMultiFiles;
-	bool				m_bUnpackOK;
-	bool				m_bUnpackStartError;
-	bool				m_bCleanedUpDisk;
-	EUnpacker			m_eUnpacker;
-	FileList			m_archiveFiles;
-
-protected:
-	virtual bool		ReadLine(char* szBuf, int iBufSize, FILE* pStream);
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-	void				ExecuteUnrar();
-	void				ExecuteSevenZip(bool bMultiVolumes);
-	void				Completed();
-	void				CreateUnpackDir();
-	bool				Cleanup();
-	void				CheckStateFiles();
-	void				CheckArchiveFiles(bool bScanNonStdFiles);
-	void				SetProgressLabel(const char* szProgressLabel);
-#ifndef DISABLE_PARCHECK
-	void				RequestParCheck(bool bRename);
-#endif
-
-public:
-	virtual				~UnpackController();
-	virtual void		Run();
-	virtual void		Stop();
-	static void			StartJob(PostInfo* pPostInfo);
-};
-
-class MoveController : public Thread, public ScriptController
-{
-private:
-	PostInfo*			m_pPostInfo;
-	char				m_szInterDir[1024];
-	char				m_szDestDir[1024];
-
-	bool				MoveFiles();
-
-public:
-	virtual void		Run();
-	static void			StartJob(PostInfo* pPostInfo);
-};
-
-class CleanupController : public Thread, public ScriptController
-{
-private:
-	PostInfo*			m_pPostInfo;
-	char				m_szDestDir[1024];
-	char				m_szFinalDir[1024];
-
-	bool				Cleanup(const char* szDestDir, bool *bDeleted);
-
-	typedef std::deque<char*>	ExtList;
-
-public:
-	virtual void		Run();
-	static void			StartJob(PostInfo* pPostInfo);
-};
-
-#endif

UrlCoordinator.cpp

@@ -1,428 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#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"
-#include "Scanner.h"
-
-extern Options* g_pOptions;
-extern DiskState* g_pDiskState;
-extern QueueCoordinator* g_pQueueCoordinator;
-extern Scanner* g_pScanner;
-
-
-UrlDownloader::UrlDownloader() : WebDownloader()
-{
-	m_szCategory = NULL;
-}
-
-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())
-				{
-					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)
-{
-	g_pScanner->AddExternalFile(
-		pUrlInfo->GetNZBFilename() && strlen(pUrlInfo->GetNZBFilename()) > 0 ? pUrlInfo->GetNZBFilename() : szOriginalFilename,
-		strlen(pUrlInfo->GetCategory()) > 0 ? pUrlInfo->GetCategory() : szOriginalCategory,
-		pUrlInfo->GetPriority(), NULL, pUrlInfo->GetAddTop(), pUrlInfo->GetAddPaused(), szTempFilename, NULL, 0, false);
-}

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-2013 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
@@ -57,19 +58,6 @@ public:
 	const char*			Next();
 };
 
-class StringBuilder
-{
-private:
-	char*				m_szBuffer;
-	int					m_iBufferSize;
-	int					m_iUsedSize;
-public:
-						StringBuilder();
-						~StringBuilder();
-	void				Append(const char* szStr);
-	const char*			GetBuffer() { return m_szBuffer; }
-};
-
 class Util 
 {
 public:
@@ -77,44 +65,16 @@ public:
 	static char* BaseFileName(const char* filename);
 	static void NormalizePathSeparators(char* szPath);
 	static bool LoadFileIntoBuffer(const char* szFileName, char** pBuffer, int* pBufferLength);
-	static bool SaveBufferIntoFile(const char* szFileName, const char* szBuffer, int iBufLen);
-	static bool CreateSparseFile(const char* szFilename, 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 RemoveDirectory(const char* szDirFilename);
-	static bool DeleteDirectoryWithContent(const char* szDirFilename);
-	static bool ForceDirectories(const char* szPath, char* szErrBuf, int iBufSize);
-	static bool GetCurrentDirectory(char* szBuffer, int iBufSize);
-	static bool SetCurrentDirectory(const char* szDirFilename);
+	static bool ForceDirectories(const char* szPath);
 	static long long FileSize(const char* szFilename);
 	static long long FreeDiskSize(const char* szPath);
 	static bool DirEmpty(const char* szDirFilename);
-	static bool RenameBak(const char* szFilename, const char* szBakPart, bool bRemoveOldExtension, char* szNewNameBuf, int iNewNameBufSize);
-#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);
-	static bool SameFilename(const char* szFilename1, const char* szFilename2);
-	static char* GetLastErrorMessage(char* szBuffer, int iBufLen);
-
-	/*
-	 * 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);
@@ -126,33 +86,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);
 
-	static char* Trim(char* szStr);
-
-#ifdef WIN32
-	static bool RegReadStr(HKEY hKey, const char* szKeyName, const char* szValueName, char* szBuffer, int* iBufLen);
-#endif
-
-	/*
-	 * 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);
 
 	/*
@@ -201,100 +138,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-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifdef WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-#include <sys/stat.h>
-#include <errno.h>
-
-#include "nzbget.h"
-#include "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->TryRecv(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-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#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_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];
-	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')
-		{
-			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(g_pOptions->GetControlPassword()) > 0)
-	{
-		if (strlen(szAuthInfo) == 0)
-		{
-			SendAuthResponse();
-			return;
-		}
-
-		// Authorization
-		char* pw = strchr(szAuthInfo, ':');
-		if (pw) *pw++ = '\0';
-		if ((strlen(g_pOptions->GetControlUsername()) > 0 && strcmp(szAuthInfo, g_pOptions->GetControlUsername())) ||
-			strcmp(pw, g_pOptions->GetControlPassword()))
-		{
-			warn("Request received on port %i from %s, but username or password invalid (%s:%s)",
-				g_pOptions->GetControlPort(), m_pConnection->GetRemoteAddr(), szAuthInfo, pw);
-			SendAuthResponse();
-			return;
-		}
-	}
-
-	if (m_eHttpMethod == hmPost)
-	{
-		// reading http body (request content)
-		m_szRequest = (char*)malloc(iContentLen + 1);
-		m_szRequest[iContentLen] = '\0';
-		
-		if (!m_pConnection->Recv(m_szRequest, iContentLen))
-		{
-			error("Invalid-request: could not read data");
-			return;
-		}
-		debug("Request=%s", m_szRequest);
-	}
-	
-	debug("request received from %s", m_pConnection->GetRemoteAddr());
-
-	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.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,67 +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;
-	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; }
-};
-
-#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$
@@ -27,7 +27,19 @@
 #define XMLRPC_H
 
 #include "Connection.h"
-#include "Util.h"
+
+class StringBuilder
+{
+private:
+	char*				m_szBuffer;
+	int					m_iBufferSize;
+	int					m_iUsedSize;
+public:
+						StringBuilder();
+						~StringBuilder();
+	void				Append(const char* szStr);
+	const char*			GetBuffer() { return m_szBuffer; }
+};
 
 class XmlCommand;
 
@@ -38,8 +50,7 @@ public:
 	{
 		rpUndefined,
 		rpXmlRpc,
-		rpJsonRpc,
-		rpJsonPRpc
+		rpJsonRpc
 	};
 
 	enum EHttpMethod
@@ -49,28 +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				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);
+	void				SetClientIP(const char* szClientIP) { m_szClientIP = szClientIP; }
 };
 
 class XmlCommand
@@ -78,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();
@@ -105,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; }
 };
 
@@ -120,27 +126,13 @@ 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;
-
-public:
-						PauseUnpauseXmlCommand(bool bPause, EPauseAction eEPauseAction);
 	virtual void		Execute();
 };
 
-class ScheduleResumeXmlCommand: public XmlCommand
+class UnPauseXmlCommand: public XmlCommand
 {
 public:
 	virtual void		Execute();
@@ -152,12 +144,6 @@ public:
 	virtual void		Execute();
 };
 
-class ReloadXmlCommand: public XmlCommand
-{
-public:
-	virtual void		Execute();
-};
-
 class VersionXmlCommand: public XmlCommand
 {
 public:
@@ -224,58 +210,4 @@ 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();
-};
-
-class ConfigTemplatesXmlCommand: public XmlCommand
-{
-public:
-	virtual void		Execute();
-};
-
 #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
 
@@ -67,17 +49,8 @@
 /* Define to 1 to use OpenSSL library for TLS/SSL-support. */
 #undef HAVE_OPENSSL
 
-/* Define to 1 if libpar2 has recent bugfixes-patch (version 2) */
-#undef HAVE_PAR2_BUGFIXES_V2
-
-/* Define to 1 if libpar2 supports cancelling (needs a special patch) */
-#undef HAVE_PAR2_CANCEL
-
-/* Define to 1 if you have the <regex.h> header file. */
-#undef HAVE_REGEX_H
-
-/* Define to 1 if spinlocks are supported */
-#undef HAVE_SPINLOCK
+/* Define to 1 if stat64 is supported */
+#undef HAVE_STAT64
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
@@ -91,9 +64,6 @@
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the <sys/prctl.h> header file. */
-#undef HAVE_SYS_PRCTL_H
-
 /* Define to 1 if you have the <sys/stat.h> header file. */
 #undef HAVE_SYS_STAT_H
 
@@ -124,20 +94,8 @@
 /* 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
 
 /* Version number of package */
 #undef VERSION
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-#undef _FILE_OFFSET_BITS
-
-/* Define for large files, on AIX-style hosts. */
-#undef _LARGE_FILES

configure.ac

@@ -2,18 +2,32 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(nzbget, 11.0, hugbug@users.sourceforge.net)
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(nzbget, 11.0)
+AC_INIT(nzbget, 0.5.0, hugbug@users.sourceforge.net)
+AM_INIT_AUTOMAKE(nzbget, 0.5.0)
 AC_CONFIG_SRCDIR([nzbget.cpp])
 AC_CONFIG_HEADERS([config.h])
 
 
-dnl
-dnl Set default library path, if not specified in environment variable "LIBPREF".
-dnl
+dnl Architecture check
+AC_CANONICAL_HOST
+case "$host" in
+  *86-*-linux*)
+    LIBPREF1="/usr"
+    ;;
+  *-linux*)
+    LIBPREF1="/usr"
+    ;;
+  *-freebsd*)
+    LIBPREF1="/usr/local"
+    ;;
+  *-solaris*)
+    LIBPREF1="/usr"
+    ;;
+esac
+
+
 if test "$LIBPREF" = ""; then
-	LIBPREF="/usr"
+	LIBPREF="$LIBPREF1"
 fi
 
 
@@ -21,23 +35,30 @@ dnl
 dnl Check for programs.
 dnl
 AC_PROG_CXX
+AC_PROG_CC
+AC_PROG_GCC_TRADITIONAL
+AC_PROG_RANLIB
+AC_PROG_MAKE_SET
+AC_PATH_PROG(FALSE, false, /usr/bin/false)
+AC_PATH_PROG(TRUE, true, /usr/bin/true)
+AC_PATH_PROG(RM, rm, $FALSE)
+AC_PATH_PROG(LN, ln, $FALSE)
 AC_PATH_PROG(TAR, tar, $FALSE)
+AC_PATH_PROG(AR, ar, $FALSE)
 AC_PATH_PROG(MAKE, make, $FALSE)
+AC_PATH_PROG(CXXCPP, cpp, $FALSE)
+AC_PATH_PROG(MV, mv, $FALSE)
+AC_PATH_PROG(MKDIR, mkdir, $FALSE)
+AC_PATH_PROG(CP, cp, $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 AC_CHECK_HEADERS(stdarg.h time.h stdlib.h stdio.h unistd.h errno.h string.h sys/stat.h sys/time.h)
+dnl AC_CHECK_HEADERS(libgen.h pwd.h getopt.h dirent.h fcntl.h pthread.h semaphore.h)
+dnl AC_CHECK_HEADERS(sys/socket.h sys/types.h netinet/in.h arpa/inet.h netdb.h)
 
 dnl
 dnl Check for libs
@@ -52,13 +73,16 @@ 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 use 64-Bits for file sizes
+dnl stat64
 dnl
-AC_SYS_LARGEFILE
+AC_CHECK_FUNC(stat64,
+	[AC_DEFINE([HAVE_STAT64], 1, [Define to 1 if stat64 is supported])],
+	[AC_LIBOBJ(stat64)])
 
 
 dnl
@@ -69,7 +93,6 @@ AC_TRY_COMPILE(
 	[#include <time.h>],
 	[ time_t clock; char buf[26];	ctime_r(&clock, buf, 26); ],
 	AC_MSG_RESULT([[yes, and it takes 3 arguments]])
-	FOUND="yes"
 	AC_DEFINE([HAVE_CTIME_R_3], 1, [Define to 1 if ctime_r takes 3 arguments]),
 	FOUND="no")
 if test "$FOUND" = "no"; then
@@ -83,125 +106,54 @@ AC_TRY_COMPILE(
 fi
 if test "$FOUND" = "no"; then
 	AC_MSG_RESULT([no])
-	AC_MSG_ERROR("function ctime_r not found")
+	AC_MSG_ERROR("function ctime_r not found.")
 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
-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])
 
 
 dnl 
 dnl checks for libxml2 includes and libraries.
-dnl
+dnl 
+INCVAL="${LIBPREF}/include/libxml2"
+LIBVAL="${LIBPREF}/lib"
 AC_ARG_WITH(libxml2_includes,
-	[AS_HELP_STRING([--with-libxml2-includes=DIR], [libxml2 include directory])],
-	[CPPFLAGS="${CPPFLAGS} -I${withval}"]
-	[INCVAL="yes"],
-	[INCVAL="no"])
+      [AS_HELP_STRING([--with-libxml2-includes=DIR], [libxml2 include directory])],
+      [INCVAL="$withval"])
+CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+CFLAGS="${CFLAGS} -I${INCVAL}"
+AC_CHECK_HEADER(libxml/tree.h,,
+	AC_MSG_ERROR("libxml2 header files were not found."))
 AC_ARG_WITH(libxml2_libraries,
 	[AS_HELP_STRING([--with-libxml2-libraries=DIR], [libxml2 library directory])],
-	[LDFLAGS="${LDFLAGS} -L${withval}"]
-	[LIBVAL="yes"],
-	[LIBVAL="no"])
-if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
-	PKG_CHECK_MODULES(libxml2, libxml-2.0,
-		[LIBS="${LIBS} $libxml2_LIBS"]
-		[CPPFLAGS="${CPPFLAGS} $libxml2_CFLAGS"])
-fi
-AC_CHECK_HEADER(libxml/tree.h,,
-	AC_MSG_ERROR("libxml2 header files not found"))
+	[LIBVAL="$withval"])
+LDFLAGS="${LDFLAGS} -L${LIBVAL}"
 AC_SEARCH_LIBS([xmlNewNode], [xml2], ,
-	AC_MSG_ERROR("libxml2 library not found"))
+	AC_MSG_ERROR("libxml2 library not found in $LIBVAL."))
 
 
 dnl
@@ -210,8 +162,8 @@ dnl
 AC_MSG_CHECKING(whether to use curses)
 AC_ARG_ENABLE(curses,
 	[AS_HELP_STRING([--disable-curses], [do not use curses (removes dependency from curses-library)])],
-	[USECURSES=$enableval],
-	[USECURSES=yes] )
+	[ USECURSES=$enableval ],
+	[ USECURSES=yes] )
 AC_MSG_RESULT($USECURSES)
 if test "$USECURSES" = "yes"; then
 	INCVAL="${LIBPREF}/include"
@@ -220,6 +172,7 @@ if test "$USECURSES" = "yes"; then
 		[AS_HELP_STRING([--with-libcurses-includes=DIR], [libcurses include directory])],
 		[INCVAL="$withval"])
 	CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+	CFLAGS="${CFLAGS} -I${INCVAL}"
 	AC_ARG_WITH(libcurses_libraries,
 		[AS_HELP_STRING([--with-libcurses-libraries=DIR], [libcurses library directory])],
 		[LIBVAL="$withval"])
@@ -242,7 +195,7 @@ if test "$USECURSES" = "yes"; then
 			FOUND=no)
 	fi
 	if test "$FOUND" = "no"; then
-		AC_MSG_ERROR([Couldn't find curses headers (ncurses.h or curses.h)])
+		AC_MSG_ERROR([Couldn't find curses headers (ncurses.h or curses.h).])
 	fi
 	AC_SEARCH_LIBS([refresh], [ncurses curses],, 
 		AC_ERROR([Couldn't find curses library]))
@@ -252,7 +205,7 @@ fi
 
 
 dnl
-dnl Use libpar2 for par-checking. Deafult: no
+dnl Use lib2par for par-checking. Deafult: no
 dnl
 AC_MSG_CHECKING(whether to include code for par-checking)
 AC_ARG_ENABLE(parcheck,
@@ -271,20 +224,24 @@ if test "$ENABLEPARCHECK" = "yes"; then
 		[CPPFLAGS="${CPPFLAGS} -I${withval}"]
 		[INCVAL="yes"],
 		[INCVAL="no"])
+	
 	AC_ARG_WITH(libsigc_libraries,
 		[AS_HELP_STRING([--with-libsigc-libraries=DIR], [libsigc++-2.0 library directory])],
 		[LDFLAGS="${LDFLAGS} -L${withval}"]
 		[CPPFLAGS="${CPPFLAGS} -I${withval}/sigc++-2.0/include"]
 		[LIBVAL="yes"],
 		[LIBVAL="no"])
-	if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
-		PKG_CHECK_MODULES(libsigc, sigc++-2.0,
-			[LIBS="${LIBS} $libsigc_LIBS"]
-			[CPPFLAGS="${CPPFLAGS} $libsigc_CFLAGS"])
-	fi
 	
+	if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+		PKG_CHECK_MODULES(LIBSIGC, sigc++-2.0,
+			[LDFLAGS="${LDFLAGS} $LIBSIGC_LIBS"]
+			[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.
@@ -297,8 +254,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])],
@@ -306,59 +265,12 @@ 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
-	dnl check if libpar2 has support for cancelling
-	dnl
-	AC_MSG_CHECKING(whether libpar2 supports cancelling)
-	AC_TRY_COMPILE(
-		[#include <libpar2/par2cmdline.h>]
-		[#include <libpar2/par2repairer.h>]
-		[ class Repairer : public Par2Repairer { void test() { cancelled = true; } }; ],
-		[],
-		AC_MSG_RESULT([[yes]])
-		AC_DEFINE([HAVE_PAR2_CANCEL], 1, [Define to 1 if libpar2 supports cancelling (needs a special patch)]),
-		AC_MSG_RESULT([[no]]))
-
-	dnl
-	dnl check if libpar2 has recent bugfixes-patch
-	dnl
-	AC_MSG_CHECKING(whether libpar2 has recent bugfixes-patch (version 2))
-	AC_TRY_COMPILE(
-		[#include <libpar2/par2cmdline.h>]
-		[#include <libpar2/par2repairer.h>]
-		[ class Repairer : public Par2Repairer { void test() { BugfixesPatchVersion2(); } }; ],
-		[],
-		AC_MSG_RESULT([[yes]])
-		PAR2PATCHV2=yes
-		AC_DEFINE([HAVE_PAR2_BUGFIXES_V2], 1, [Define to 1 if libpar2 has recent bugfixes-patch (version 2)]),
-		AC_MSG_RESULT([[no]])
-		PAR2PATCHV2=no)
-
-	if test "$PAR2PATCHV2" = "no" ; then
-		AC_ARG_ENABLE(libpar2-bugfixes-check,
-			[AS_HELP_STRING([--disable-libpar2-bugfixes-check], [do not check if libpar2 has recent bugfixes-patch applied])],
-			[ PAR2PATCHCHECK=$enableval ],
-			[ PAR2PATCHCHECK=yes] )
-		if test "$PAR2PATCHCHECK" = "yes"; then
-			AC_ERROR([Your version of libpar2 doesn't include the recent bugfixes-patch (version 2, updated Dec 3, 2012). Please patch libpar2 with the patches supplied with NZBGet (see README for details). If you cannot patch libpar2, you can use configure parameter --disable-libpar2-bugfixes-check to suppress the check. Please note however that in this case the program may crash during par-check/repair. The patch is highly recommended!])
-		fi
-	fi
+	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
 
 else
 	AC_DEFINE([DISABLE_PARCHECK],1,[Define to 1 to disable smart par-verification and restoration])
@@ -379,7 +291,7 @@ if test "$USETLS" = "yes"; then
 		[AS_HELP_STRING([--with-tlslib=(GnuTLS, OpenSSL)], [TLS/SSL library to use])],
 		[TLSLIB="$withval"])
 	if test "$TLSLIB" != "GnuTLS" -a "$TLSLIB" != "OpenSSL" -a "$TLSLIB" != ""; then
-		AC_MSG_ERROR([Invalid argument for option --with-tlslib])
+		AC_MSG_ERROR([Invalid argument for option --with-tlslib.])
 	fi
 	
 	if test "$TLSLIB" = "GnuTLS" -o "$TLSLIB" = ""; then
@@ -389,26 +301,25 @@ if test "$USETLS" = "yes"; then
 			[AS_HELP_STRING([--with-libgnutls-includes=DIR], [GnuTLS include directory])],
 			[INCVAL="$withval"])
 		CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+		CFLAGS="${CFLAGS} -I${INCVAL}"
 		AC_ARG_WITH(libgnutls_libraries,
 			[AS_HELP_STRING([--with-libgnutls-libraries=DIR], [GnuTLS library directory])],
 			[LIBVAL="$withval"])
 		LDFLAGS="${LDFLAGS} -L${LIBVAL}"
-
+	
 		AC_CHECK_HEADER(gnutls/gnutls.h,
 			FOUND=yes
 			TLSHEADERS=yes,
 			FOUND=no)
 		if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
-			AC_MSG_ERROR([Couldn't find GnuTLS headers (gnutls.h)])
+			AC_MSG_ERROR([Couldn't find GnuTLS headers (gnutls.h).])
 		fi
 		if test "$FOUND" = "yes"; then
 			AC_SEARCH_LIBS([gnutls_global_init], [gnutls],
-				AC_SEARCH_LIBS([gcry_control], [gnutls gcrypt],
-					FOUND=yes,
-					FOUND=no),
+				FOUND=yes,
 				FOUND=no)
 			if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
-				AC_MSG_ERROR([Couldn't find GnuTLS library])
+				AC_MSG_ERROR([Couldn't find GnuTLS library.])
 			fi
 			if test "$FOUND" = "yes"; then
 				TLSLIB="GnuTLS"
@@ -418,37 +329,31 @@ if test "$USETLS" = "yes"; then
 	fi
 	
 	if test "$TLSLIB" = "OpenSSL" -o "$TLSLIB" = ""; then
+		INCVAL="${LIBPREF}/include"
+		LIBVAL="${LIBPREF}/lib"
 		AC_ARG_WITH(openssl_includes,
 			[AS_HELP_STRING([--with-openssl-includes=DIR], [OpenSSL include directory])],
-			[CPPFLAGS="${CPPFLAGS} -I${withval}"]
-			[INCVAL="yes"],
-			[INCVAL="no"])
+			[INCVAL="$withval"])
+		CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+		CFLAGS="${CFLAGS} -I${INCVAL}"
 		AC_ARG_WITH(openssl_libraries,
 			[AS_HELP_STRING([--with-openssl-libraries=DIR], [OpenSSL library directory])],
-			[LDFLAGS="${LDFLAGS} -L${withval}"]
-			[LIBVAL="yes"],
-			[LIBVAL="no"])
-		if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
-			PKG_CHECK_MODULES(openssl, openssl,
-				[LIBS="${LIBS} $openssl_LIBS"]
-				[CPPFLAGS="${CPPFLAGS} $openssl_CFLAGS"])
-		fi
-
+			[LIBVAL="$withval"])
+		LDFLAGS="${LDFLAGS} -L${LIBVAL}"
+	
 		AC_CHECK_HEADER(openssl/ssl.h,
 			FOUND=yes
 			TLSHEADERS=yes,
 			FOUND=no)
 		if test "$FOUND" = "no" -a "$TLSLIB" = "OpenSSL"; then
-			AC_MSG_ERROR([Couldn't find OpenSSL headers (ssl.h)])
+			AC_MSG_ERROR([Couldn't find OpenSSL headers (ssl.h).])
 		fi
 		if test "$FOUND" = "yes"; then
-			AC_SEARCH_LIBS([CRYPTO_set_locking_callback], [crypto],
-				AC_SEARCH_LIBS([SSL_library_init], [ssl],
-					FOUND=yes,
-					FOUND=no),
+			AC_SEARCH_LIBS([SSL_library_init], [ssl],
+				FOUND=yes,
 				FOUND=no)
 			if test "$FOUND" = "no" -a "$TLSLIB" = "OpenSSL"; then
-				AC_MSG_ERROR([Couldn't find OpenSSL library])
+				AC_MSG_ERROR([Couldn't find OpenSSL library.])
 			fi
 			if test "$FOUND" = "yes"; then
 				TLSLIB="OpenSSL"
@@ -459,9 +364,9 @@ if test "$USETLS" = "yes"; then
 	
 	if test "$TLSLIB" = ""; then
 		if test "$TLSHEADERS" = ""; then
-			AC_MSG_ERROR([Couldn't find neither GnuTLS nor OpenSSL headers (gnutls.h or ssl.h)])
+			AC_MSG_ERROR([Couldn't find neither GnuTLS nor OpenSSL headers (gnutls.h or ssl.h).])
 		else
-			AC_MSG_ERROR([Couldn't find neither GnuTLS nor OpenSSL library])
+			AC_MSG_ERROR([Couldn't find neither GnuTLS nor OpenSSL library.])
 		fi
 	fi
 else
@@ -469,53 +374,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}"
-	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 32-Bit BSD systems however may not function properly if the handler is installed.
-dnl The default behavior is to install the handler.
-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 may be neccessary on 32-Bit BSD)])],
-	[SIGCHLDHANDLER=$enableval],
-	[SIGCHLDHANDLER=yes])
-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 
@@ -524,42 +382,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
 
 
@@ -577,39 +434,14 @@ 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)
+AC_SUBST(LDFLAGS)
+AC_SUBST(CXXFLAGS)
+AC_SUBST(TAR)
+AC_SUBST(AR)
+AC_SUBST(ADDSRCS)
 
 
 AC_CONFIG_FILES([Makefile])

libpar2-0.2-bugfixes.patch

@@ -1,60 +0,0 @@
-diff -aud -U 5 ../libpar2-0.2-original/par2repairer.cpp ../libpar2-0.2/par2repairer.cpp
---- ../libpar2-0.2-original/par2repairer.cpp	2006-01-20 18:25:20.000000000 +0100
-+++ ../libpar2-0.2/par2repairer.cpp	2012-11-30 14:23:31.000000000 +0100
-@@ -76,10 +76,11 @@
-     ++sf;
-   }
- 
-   delete mainpacket;
-   delete creatorpacket;
-+  delete headers;
- }
- 
- 
- Result Par2Repairer::PreProcess(const CommandLine &commandline)
- {
-@@ -1259,11 +1260,11 @@
-         string path;
-         string name;
-         DiskFile::SplitFilename(filename, path, name);
- 
-         cout << "Target: \"" << name << "\" - missing." << endl;
--	sig_done.emit(name, 0, sourcefile->GetVerificationPacket()->BlockCount());
-+	sig_done.emit(name, 0, sourcefile->GetVerificationPacket() ? sourcefile->GetVerificationPacket()->BlockCount() : 0);
-       }
-     }
- 
-     ++sf;
-   }
-@@ -1802,11 +1803,11 @@
-              << "\" - no data found." 
-              << endl;
-       }
-     }
-   }
--  sig_done.emit(name,count,sourcefile->GetVerificationPacket()->BlockCount()); 
-+  sig_done.emit(name,count, count>0 && sourcefile->GetVerificationPacket() ? sourcefile->GetVerificationPacket()->BlockCount() : 0); 
-   sig_progress.emit(1000.0);
-   return true;
- }
- 
- // Find out how much data we have found
-diff -aud -U 5 ../libpar2-0.2-original/par2repairer.h ../libpar2-0.2/par2repairer.h
---- ../libpar2-0.2-original/par2repairer.h	2006-01-20 00:38:27.000000000 +0100
-+++ ../libpar2-0.2/par2repairer.h	2012-11-30 14:24:46.000000000 +0100
-@@ -34,10 +34,15 @@
-   sigc::signal<void, std::string> sig_filename;
-   sigc::signal<void, double> sig_progress;
-   sigc::signal<void, ParHeaders*> sig_headers;
-   sigc::signal<void, std::string, int, int> sig_done;
- 
-+  // This method allows to determine whether libpar2 includes the patches
-+  // ("libpar2-0.2-bugfixes.patch") submitted to libpar2 project.
-+  // Use the method in configure scripts for detection.
-+  void BugfixesPatchVersion2() { }
-+
- protected:
-   // Steps in verifying and repairing files:
- 
-   // Load packets from the specified file
-   bool LoadPacketsFromFile(string filename);

libpar2-0.2-cancel.patch

@@ -1,236 +0,0 @@
-diff -aud -U 5 ../libpar2-0.2-original/par2repairer.cpp ../libpar2-0.2/par2repairer.cpp
---- ../libpar2-0.2-original/par2repairer.cpp	2012-12-03 10:47:04.000000000 +0100
-+++ ../libpar2-0.2/par2repairer.cpp	2012-12-03 10:48:13.000000000 +0100
-@@ -50,10 +50,12 @@
-   outputbuffer = 0;
- 
-   noiselevel = CommandLine::nlNormal;
-   headers = new ParHeaders;
-   alreadyloaded = false;
-+
-+  cancelled = false;
- }
- 
- Par2Repairer::~Par2Repairer(void)
- {
-   delete [] (u8*)inputbuffer;
-@@ -404,10 +406,14 @@
-         {
-           cout << "Loading: " << newfraction/10 << '.' << newfraction%10 << "%\r" << flush;
-           progress = offset;
- 	sig_progress.emit(newfraction);
- 
-+          if (cancelled)
-+          {
-+            break;
-+          }
-         }
-       }
- 
-       // Attempt to read the next packet header
-       PACKET_HEADER header;
-@@ -582,10 +588,15 @@
-     if (noiselevel > CommandLine::nlQuiet)
-       cout << "No new packets found" << endl;
-     delete diskfile;
-   }
-   
-+  if (cancelled)
-+  {
-+    return false;
-+  }
-+
-   return true;
- }
- 
- // Finish loading a recovery packet
- bool Par2Repairer::LoadRecoveryPacket(DiskFile *diskfile, u64 offset, PACKET_HEADER &header)
-@@ -831,26 +842,42 @@
- 
-     // Load packets from each file that was found
-     for (list<string>::const_iterator s=files->begin(); s!=files->end(); ++s)
-     {
-       LoadPacketsFromFile(*s);
-+      if (cancelled)
-+      {
-+        break;
-+      }
-     }
- 
-     delete files;
-+    if (cancelled)
-+    {
-+      return false;
-+    }
-   }
- 
-   {
-     string wildcard = name.empty() ? "*.PAR2" : name + ".*.PAR2";
-     list<string> *files = DiskFile::FindFiles(path, wildcard);
- 
-     // Load packets from each file that was found
-     for (list<string>::const_iterator s=files->begin(); s!=files->end(); ++s)
-     {
-       LoadPacketsFromFile(*s);
-+      if (cancelled)
-+      {
-+        break;
-+      }
-     }
- 
-     delete files;
-+    if (cancelled)
-+    {
-+      return false;
-+    }
-   }
- 
-   return true;
- }
- 
-@@ -864,13 +891,22 @@
-     // If the filename contains ".par2" anywhere
-     if (string::npos != filename.find(".par2") ||
-         string::npos != filename.find(".PAR2"))
-     {
-       LoadPacketsFromFile(filename);
-+      if (cancelled)
-+      {
-+        break;
-+      }
-     }
-   }
- 
-+  if (cancelled)
-+  {
-+    return false;
-+  }
-+
-   return true;
- }
- 
- // Check that the packets are consistent and discard any that are not
- bool Par2Repairer::CheckPacketConsistency(void)
-@@ -1208,10 +1244,15 @@
- 
-   // Start verifying the files
-   sf = sortedfiles.begin();
-   while (sf != sortedfiles.end())
-   {
-+    if (cancelled)
-+    {
-+      return false;
-+    }
-+
-     // Do we have a source file
-     Par2RepairerSourceFile *sourcefile = *sf;
- 
-     // What filename does the file use
-     string filename = sourcefile->TargetFileName();
-@@ -1560,10 +1601,14 @@
-       if (oldfraction != newfraction)
-       {
-         cout << "Scanning: \"" << shortname << "\": " << newfraction/10 << '.' << newfraction%10 << "%\r" << flush;
- 	sig_progress.emit(newfraction);
- 
-+        if (cancelled)
-+        {
-+          break;
-+        }
-       }
-     }
- 
-     // If we fail to find a match, it might be because it was a duplicate of a block
-     // that we have already found.
-@@ -1649,10 +1694,15 @@
-           return false;
-       }
-     }
-   }
- 
-+  if (cancelled)
-+  {
-+    return false;
-+  }
-+
-   // Get the Full and 16k hash values of the file
-   filechecksummer.GetFileHashes(hashfull, hash16k);
- 
-   // Did we make any matches at all
-   if (count > 0)
-@@ -2289,14 +2339,23 @@
-           if (oldfraction != newfraction)
-           {
-             cout << "Repairing: " << newfraction/10 << '.' << newfraction%10 << "%\r" << flush;
- 	    sig_progress.emit(newfraction);
- 
-+            if (cancelled)
-+            {
-+              break;
-+            }
-           }
-         }
-       }
- 
-+      if (cancelled)
-+      {
-+        break;
-+      }
-+
-       ++inputblock;
-       ++inputindex;
-     }
-   }
-   else
-@@ -2346,13 +2405,22 @@
-         if (oldfraction != newfraction)
-         {
-           cout << "Processing: " << newfraction/10 << '.' << newfraction%10 << "%\r" << flush;
- 	sig_progress.emit(newfraction);
- 
-+          if (cancelled)
-+          {
-+            break;
-+          }
-         }
-       }
- 
-+      if (cancelled)
-+      {
-+        break;
-+      }
-+
-       ++copyblock;
-       ++inputblock;
-     }
-   }
- 
-@@ -2360,10 +2428,15 @@
-   if (lastopenfile != NULL)
-   {
-     lastopenfile->Close();
-   }
- 
-+  if (cancelled)
-+  {
-+    return false;
-+  }
-+
-   if (noiselevel > CommandLine::nlQuiet)
-     cout << "Writing recovered data\r";
- 
-   // For each output block that has been recomputed
-   vector<DataBlock*>::iterator outputblock = outputblocks.begin();
-diff -aud -U 5 ../libpar2-0.2-with-bugfixes-patch/par2repairer.h ../libpar2-0.2/par2repairer.h
---- ../libpar2-0.2-original/par2repairer.h	2012-12-03 10:47:04.000000000 +0100
-+++ ../libpar2-0.2/par2repairer.h	2012-12-03 10:48:13.000000000 +0100
-@@ -186,8 +186,9 @@
- 
-   u64                       progress;                // How much data has been processed.
-   u64                       totaldata;               // Total amount of data to be processed.
-   u64                       totalsize;               // Total data size
- 
-+  bool                      cancelled;               // repair cancelled
- };
- 
- #endif // __PAR2REPAIRER_H__

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.conf.example

@@ -0,0 +1,543 @@
+# Sample configuration file for nzbget
+#
+# On POSIX put this file to one of the following locations:
+# ~/.nzbget
+# /etc/nzbget.conf
+# /usr/etc/nzbget.conf
+# /usr/local/etc/nzbget.conf
+# /opt/etc/nzbget.conf
+#
+# On Windows put this file in program's directory.
+#
+# You can also put the file into any location, if you specify the path to it
+# using switch "-c", e.g:
+#   nzbget -c /home/user/myconig.txt
+
+# For quick start change the option MAINDIR and configure one news-server
+
+
+##############################################################################
+### PATHS                                                                  ###
+
+# Root directory for all related tasks
+# MAINDIR is a variable and therefore starts with "$"
+# The value "~/download" is example for POSIX. On Windows use 
+# absolute paths, like "C:\Download".
+$MAINDIR=~/download
+
+# Destination-directory to store the downloaded files
+DestDir=${MAINDIR}/dst
+
+# Directory to monitor for incoming nzb-jobs.
+# Can have subdirectories (only one level of nesting). 
+# A nzb-file queued from a subdirectory will be automatically assigned to 
+# category with the directory-name.
+NzbDir=${MAINDIR}/nzb
+
+# Directory to store download queue
+QueueDir=${MAINDIR}/queue
+
+# Directory to store temporary files
+TempDir=${MAINDIR}/tmp
+
+# Lock-file for daemon-mode, contains process-id (PID) (POSIX only)
+LockFile=/tmp/nzbget.lock
+
+# Where to store log file, if it needs to be created (see "CreateLog")
+LogFile=${destdir}/nzbget.log
+
+
+##############################################################################
+### NEWS-SERVERS                                                           ###
+
+# This section defines which servers nzbget should connect to.
+# The servers will be ordered by their level, i.e. nzbget will at
+# first try to download an article from the level-0-server.
+# If that server fails, nzbget proceeds with the level-1-server, etc.
+# A good idea is surely to put your major download-server at level 0
+# and your fill-servers at levels 1,2,...
+# NOTE: Do not leave out a level in your server-list and start with level 0!
+# NOTE: Several servers with the same level may be used, they will have 
+# the same priority.
+
+# First server, on level 0
+# Level of newsserver
+Server1.Level=0
+# Host-name of newsserver
+Server1.Host=my1.newsserver.com
+# Port to connect to (default 119 if not specified)
+Server1.Port=119
+# Username to use for authentication
+Server1.Username=user
+# Password to use for authentication
+Server1.Password=pass
+# Server requires "Join Group"-command (yes, no) (default yes if not specified)
+Server1.JoinGroup=yes
+# Encrypted server connection (TLS/SSL) (yes, no)
+Server1.Encryption=no
+# Maximal number of simultaneous connections to this server
+Server1.Connections=4
+
+# Second server, on level 0
+#Server2.Level=0
+#Server2.Host=my2.newsserver.com
+#Server2.Port=119
+#Server2.Username=me
+#Server2.Password=mypass
+#Server2.JoinGroup=yes
+#Server2.Connections=4
+
+# Third server, on level 1
+#Server3.Level=1
+#Server3.Host=fills.newsserver.com
+#Server3.Port=119
+#Server3.Username=me2
+#Server3.Password=mypass2
+#Server3.JoinGroup=yes
+#Server3.Connections=1
+
+
+##############################################################################
+### PERMISSIONS (POSIX ONLY)                                               ###
+
+# User name for daemon-mode (POSIX in daemon-mode only).
+# Set the user that the daemon normally runs at.
+# Set $MAINDIR with an absolute path to be sure where it will write.
+# This allows nzbget daemon to be launched in rc.local (at boot), and
+# download items as a specific user id.
+# NOTE: This option has effect only if the program was started from 
+# root-account, otherwise it is ignored and the daemon runs under 
+# current user id
+DaemonUserName=root
+
+# Specify default umask (affects file permissions) for newly created 
+# files (POSIX only).
+# The value should be written in octal form (the same as for "umask" shell 
+# command). If umask not specified (or a value greater than 0777 used, useful 
+# to disable current config-setting via command-line parameter) the umask-mode 
+# will not be set and current umask-mode (set via shell) will be used
+# NOTE: do not forget to uncomment the next line
+#UMask=022
+
+
+##############################################################################
+### DOWNLOAD QUEUE                                                         ###
+
+# Save download queue to disk. This allows to reload it on next start (yes, no)
+SaveQueue=yes
+
+# Reload download queue on start, if it exists (yes, no)
+ReloadQueue=yes
+
+# Reuse articles saved in temp-directory from previous program start (yes, no)
+# This allows to continue download of file, if program was exited before 
+# the file was completed.
+ContinuePartial=yes
+
+# Create subdirectory with category-name in destination-directory (yes, no)
+AppendCategoryDir=yes
+
+# Create subdirectory with nzb-filename in destination-directory (yes, no)
+AppendNzbDir=yes
+
+# How often incoming-directory (option "NzbDir") must be checked for new 
+# nzb-files, in seconds.
+# Value "0" disables the check.
+NzbDirInterval=5
+
+# How old nzb-file should at least be for it to be loaded to queue, in seconds.
+# Nzbget checks if nzb-file was not modified in last few seconds, defined by
+# this option. That safety interval prevents the loading of files, which 
+# were not yet completely saved to disk, for example if they are still being
+# downloaded in web-browser.
+NzbDirFileAge=60
+
+# Check for duplicate files (yes, no)
+# If this option is enabled the program checks by adding of a new nzb-file:
+# 1) if nzb-file contains duplicate entries. This check aims on detecting
+#    of reposted files (if first file was not fully uploaded);    
+#    If the program find two files with identical names, only the 
+#    biggest of these files will be added to queue;
+# 2) if download queue already contains file with the same name;
+# 3) if destination file on disk already exists.
+# In last two cases: if the file exists it will not be added to queue;
+# If this option is disabled, all files are downloaded and duplicate files 
+# are renamed to "filename_duplicate1".
+# Existing files are never deleted or overwritten.
+DupeCheck=no
+
+# Visibly rename broken files on download appending "_broken" (yes, no)
+# Do not activate this option if par-check is enabled.
+RenameBroken=no
+
+# Decode articles (yes, no)
+# yes - decode articles using internal decoder (supports yEnc and UU formats).
+# no - the articles will not be decoded and joined. External programs 
+#      (like "uudeview") can be used to decode and join downloaded articles.
+#      Also useful for debugging to look at article's source text.
+Decode=yes
+
+# Write decoded articles directly into destination output file (yes, no)
+# With this option enabled the program at first creates the output 
+# destination file with required size (total size of all articles), 
+# then writes on the fly decoded articles directly to the file 
+# without creating of any temporary files, even for decoded articles.
+# This may results in major performance improvement, but this higly 
+# depends on OS and filesystem used.
+# Can improve performance on a very fast internet connections, 
+# but you need to test if it works in your case.
+# INFO: Tests showed, that on Linux with EXT3-partition activating of 
+# this option results in up to 20% better performance, but on Windows with NTFS 
+# or Linux with FAT32-partitions the performance were decreased. 
+# The possible reason is that on EXT3-partition Linux can create large files
+# very fast (if the content of file does not need to be initialized), 
+# but Windows on NTFS-partition and also Linux on FAT32-partition need to
+# initialize created large file with nulls, resulting in a big performace 
+# degradation.
+# NOTE: for testing try to download few big files (with total size 500-1000MB)
+# and measure required time. Do not rely on the program's speed indicator.
+# NOTE: if both options "DirectWrite" and "ContinuePartial" are enabled,
+# the program will create empty articles-files in temp-directrory. They
+# are used to continue download of file on a next program start. To minimize
+# disk-io it is recommended to disable option "ContinuePartial", if 
+# "DirectWrite" is enabled. Especially on a fast connections (where you
+# would want to activate "DirectWrite") it should not be a problem to 
+# redownload the interrupted file.
+DirectWrite=no
+
+# Check CRC of downloaded and decoded articles (yes, no)
+# Normally this option should be enabled for better detecting of download 
+# errors. However checking of CRC needs about the same CPU time as 
+# decoding of articles. On a fast connections with slow CPUs disabling of
+# CPU-check may slightly improve performance (if CPU is a limiting factor).
+CrcCheck=yes
+
+# How much retries should be attempted if a download error occurs
+Retries=4
+
+# Set the interval between retries, in seconds
+RetryInterval=10
+
+# Redownload article if CRC-check fails (yes, no)
+# Helps to minimize number of broken files, but may be effective 
+# only if you have multiple download servers (even from the same provider
+# but from different locations (e.g. europe, usa)).
+# In any case the option increases your traffic.
+# For slow connections loading of extra par-blocks may be more effective
+# The option "CrcCheck" must be enabled for option "RetryOnCrcError" to work.
+RetryOnCrcError=no
+
+# Set connection timeout, in seconds
+ConnectionTimeout=60
+
+# Timeout until a download-thread is killed, in seconds
+# This can help on hanging downloads, but is dangerous. 
+# Do not use small values!
+TerminateTimeout=600
+
+# Set the (approximate) maximum number of allowed threads.
+# Sometimes under certain circumstances the program may create way to many 
+# download threads. Most of them are in wait-state. That is not bad,
+# but threads are usually a limited resource. If a program creates to many
+# of them, operating system may kill it. The option <ThreadLimit> prevents that.
+# NOTE 1: the number of threads is not the same as the number of connections
+# opened to NNTP-servers. Do not use the option <ThreadLimit> to limit the
+# number of connections. Use the appropriate options <ServerX.Connections>
+# instead.
+# NOTE 2: the actual number of created threads can be slightly larger as
+# defined by the option. Important threads may be created even if the
+# number of threads is exceeded. The option prevents only the creation of
+# additional download threads.
+# NOTE 3: in most cases you should leave the default value "100" unchanged.
+# However you may increase that value if you need more than 90 connections 
+# (that's very unlikely) or decrease the value if the OS does not allow so 
+# many threads. But the most OSes should not have problems with 100 threads.
+ThreadLimit=100
+
+# Set the maximum download rate in KB/s, "0" means no speed control
+DownloadRate=0
+
+# Set the size of memory buffer used by writing the articles, in Bytes.
+# Bigger values decrease disk-io, but increase memory usage.
+# Value "0" causes the OS-dependend default value to be used.
+# With value "-1" (which means "max/auto") the program sets the size of 
+# buffer according to the size of current article (typically less than 500K).
+# NOTE: the value must be written in bytes, do not use postfixes "K" or "M".
+# NOTE: to calculate the memory usage multiply WriteBufferSize by max number
+# of connections, configured in section "NEWS-SERVERS".
+# NOTE: typical article's size not exceed 500000 bytes, so using bigger values
+# (like several megabytes) will just waste memory.
+# NOTE: for desktop computers with large amount of memory value "-1" (max/auto)
+# is recommended, but for computers with very low memory (routers, NAS)
+# value "0" (default OS-dependend size) could be better alternative.
+# NOTE: write-buffer is managed by OS (system libraries) and therefore 
+# the effect of the option is highly OS-dependend.
+WriteBufferSize=0
+
+# Pause if disk space gets below this value, in MegaBytes.
+# Value "0" disables the check.
+# Only the disk space on the drive with "DestDir" is checked.
+# The drive with "TempDir" is not checked.
+DiskSpace=250
+
+
+##############################################################################
+### LOGGING                                                                ###
+
+# Create log file (yes, no)
+CreateLog=yes
+
+# Delete log file upon server start (only in server-mode) (yes, no)
+ResetLog=no
+
+# How various messages must be printed (screen, log, both, none)
+# Debug-messages can be printed only if the programm was compiled in 
+# debug-mode: "./configure --enable-debug"
+ErrorTarget=both
+WarningTarget=both
+InfoTarget=both
+DetailTarget=both
+DebugTarget=both
+
+# Number of messages stored in buffer and available for remote clients
+LogBufferSize=1000
+
+# Create a log of all broken files (yes ,no)
+# It is a text file placed near downloaded files, which contains
+# the names of broken files
+CreateBrokenLog=yes
+
+# Create memory dump (core-file) on abnormal termination (POSIX only) (yes, no)
+# Core-files are very helpful for debugging.
+# NOTE: core-files may contain sensible data, like your login/password to
+# newsserver etc.
+DumpCore=no
+
+# See also option "logfile" in secion "PATHS"
+
+
+##############################################################################
+### DISPLAY                                                                ###
+
+# Set screen-outputmode (loggable, colored, curses)
+# loggable - only messages will be printed to standard output;
+# colored  - prints messages (with simple coloring for messages categories)
+#            and download progress info; uses escape-sequenses to move cursor;
+# curses   - advanced interactive iterface with the ability to edit 
+#            download queue and variaous output options;
+OutputMode=curses
+
+# Shows NZB-Filename in file list in curses-outputmode (yes, no)
+# This option controls the initial state of curses-frontend,
+# it can be switched on/off in run-time with Z-key
+CursesNzbName=yes
+
+# Show files in groups (NZB-files) in queue list in curses-outputmode (yes, no)
+# This option controls the initial state of curses-frontend,
+# it can be switched on/off in run-time with G-key
+CursesGroup=no
+
+# Show timestamps in message list in curses-outputmode (yes, no)
+# This option controls the initial state of curses-frontend,
+# it can be switched on/off in run-time with T-key
+CursesTime=no
+
+# Update interval for Frontend-output in MSec (min value 25)
+# Bigger values reduce CPU usage (especially in curses-outputmode)
+# and network traffic in remote-client mode
+UpdateInterval=200
+
+
+##############################################################################
+### CLIENT/SERVER COMMUNICATION                                            ###
+
+# Set the IP on which the server listen and which client uses to contact 
+# the server. It could be dns-hostname or ip-address (more effective since
+# does not require dns-lookup).
+# If you want the server to listen to all interfaces, use "0.0.0.0"
+ServerIp=127.0.0.1
+
+# Set the port which the server & client use
+ServerPort=6789
+
+# Set the password needed to succesfully queue a request
+ServerPassword=tegbzn6789
+
+# See also option "logbuffersize" in section "LOGGING"
+
+
+##############################################################################
+### PAR CHECK/REPAIR AND POSTPROCESSING                                    ###
+
+# Reload Post-processor-queue on start, if it exists (yes, no)
+# For this option to work the options "SaveQueue" and "ReloadQueue" must
+# be also enabled.
+ReloadPostQueue=yes
+
+# How many par2-files to load (none, all, one)
+# none - all par2-files must be automatically paused
+# all - all par2-files must be downloaded
+# one - only one main par2-file must be dowloaded and other must be paused
+# Paused files remain in queue and can be unpaused by parchecker when needed
+LoadPars=one
+
+# Automatic par-verification (yes, no)
+# To download only needed par2-files (smart par-files loading) set also 
+# the option "loadpars" to "one". If option "loadpars" is set to "all",
+# all par2-files will be downloaded before verification and repair starts.
+# The option "renamebroken" must be set to "no", otherwise the par-checker
+# may not find renamed files and fail
+ParCheck=no
+
+# Automatic par-repair (yes, no)
+# If option "parcheck" is enabled and "parrepair" is not, the program
+# only verifies downloaded files and downloads needed par2-files, but does
+# not start repair-process. This is useful if the server does not have
+# enough CPU power, since repairing of large files may take too much
+# resources and time on a slow computers.
+# This option has effect only if the option "parcheck" is enabled
+ParRepair=yes
+
+# Use only par2-files with matching names (yes, no)
+# If par-check needs extra par-blocks it searches for par2-files
+# in download queue, which can be unpaused and used for restore. 
+# These par2-files should have the same base name as the main par2-file, 
+# currently loaded in par-checker. Sometimes extra par files (especially if 
+# they were uploaded by a different poster) have not matching names. 
+# Normally par-checker does not use these files, but you can allow it 
+# to use these files by setting "strictparname" to "no".
+# This has however a side effect: if NZB-file contains more than one collection
+# of files (with different par-sets), par-checker may download par-files from
+# a wrong collection. This increases you traffic (but not harm par-check).
+# NOTE: par-checker always uses only par-files added from the same NZB-file
+# and the option "strictparname" does not change this behavior
+StrictParName=yes
+
+# Pause download queue during check/repair (yes, no)
+# Enable the option to give CPU more time for par-check/repair. That helps
+# to speed up check/repair on slow CPUs with fast connection (e.g. NAS-devices).
+# NOTE: if parchecker needs additional par-files it temporary unpauses queue
+# NOTE: See also option <PostPauseQueue>.
+ParPauseQueue=no
+
+# Cleanup download queue after successful check/repair (yes, no)
+# Enable this option for automatic deletion of unneeded (paused) par-files 
+# from download queue after successful check/repair.
+# NOTE: before cleaning up the program checks if all paused files are par-files.
+# If there are paused non-par-files (this means that you have paused them
+# manually), the cleanup will be skipped for this collection.
+ParCleanupQueue=yes
+
+# Delete source nzb-file after successful check/repair (yes, no)
+# Enable this option for automatic deletion of nzb-file from incoming directory 
+# after successful check/repair.
+NzbCleanupDisk=no
+
+# Set path to program, that must be executed after the download of nzb-file 
+# or one collection in nzb-file (if par-check enabled and nzb-file contains 
+# multiple collections; see note below for the definition of "collection") 
+# is completed and possibly par-checked/repaired.
+# Arguments passed to that program:
+#  1 - path to destination dir, where downloaded files are located;
+#  2 - name of nzb-file processed;
+#  3 - name of par-file processed (if par-checked) or empty string (if not);
+#  4 - 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 sucessfully repaired;
+#      3 - checked and can be repaired but repair is disabled;
+#  5 - state of nzb-job:
+#      0 - there are more collections in this nzb-file queued;
+#      1 - this was the last collection in nzb-file;
+#  6 - 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;
+#  7 - category assigned to nzb-file (can be empty string).
+#
+# NOTE: The parameter "state of nzb-job" is very important and MUST be checked 
+# even in the simplest scripts.
+# If par-check is enabled and nzb-file contains more than one collection
+# of files the postprocess-program is called after each collection is completed
+# and par-checked. If you want to unpack files or clean up the directory 
+# (delete par-files, etc.) there are two possibilities, when you can do this:
+#  1) you parse the "name of par-file processed" to find out the base name
+#     of collection and clean up only files from this collection (not reliable,
+#     because par-files sometimes have different names than rar-files);
+#  2) or you just check the parameters "state of nzb-job" and "indication of 
+#     failed par-jobs" and do the processing, only if they are set to "1" 
+#     (which means, that this was the last collection in nzb-file and all files 
+#      are now completed) and to "0" (no failed par-jobs) respectively;
+# NOTE 2: if the option "ParCheck" is disabled nzbget calls PostProcess
+# only once, not after every collection, because the detection of collection
+# is disabled in this case;
+# NOTE 3: the term "collection" in the above description actually means 
+# "par-set". To determine what "collections" are present in nzb-file nzbget 
+# looks for par-sets. If any collection of files within nzb-file does 
+# not have any par-files, this collection will not be detected.
+# For example, for nzb-file containing three collections but only two par-sets, 
+# the postprocess will be called two times - after processing of each par-set.
+# NOTE 4: an example script for unrarring is provided within distribution 
+# in file <postprocess-example.sh>
+# NOTE 5: do not forget to uncomment the next line
+#PostProcess=~/myscript.sh
+
+# Allow multiple post-processing for the same nzb-file (yes,no)
+# After the post-processing (par-check and call of a postprocess-script) is
+# completed, nzbget adds the nzb-file to a list of completed-jobs. The nzb-file
+# stays in the list until the last file from that nzb-file is deleted from 
+# the download queue (it occurs straight away if the par-check was successful 
+# and the option "ParCleanupQueue" is enabled).
+# That means, if a paused file from a nzb-collection becomes unpaused 
+# (manually or from a post-process-script) after the collection was allready 
+# postprocessed nzbget will not post-process nzb-file again.
+# This prevents the unwanted multiple post-processings of the same nzb-file.
+# But it might be needed if the par-check/-repair are performed not directly 
+# by nzbget but from a post-process-script.
+# NOTE 1: enable this option only if you were advised to do that by the author
+# of the post-process-script
+# NOTE 2: by enabling "AllowReProcess" you should disable the option "ParCheck"
+# to prevent multiple par-checking
+AllowReProcess=no
+
+# Set the default message-kind for output received from postprocess-script 
+# (None, Detail, Info, Warning, Error, Debug).
+# NZBGet checks if the line written by the script to stdout or stderr starts
+# with special character-sequence, determining the message-kind, e.g.:
+# [INFO] bla-bla
+# [DETAIL] bla-bla
+# [WARNING] bla-bla
+# [ERROR] bla-bla
+# [DEBUG] bla-bla
+# If the message-kind was detected the text is added to log with detected type.
+# Otherwise the message becomes the default kind, specified in this option.
+PostLogKind=Detail
+
+# Pause download queue during executing of postprocess-script (yes, no)
+# Enable the option to give CPU more time for postprocess-script. That helps
+# to speed up postprocess on slow CPUs with fast connection (e.g. NAS-devices).
+# NOTE: See also option <ParPauseQueue>.
+PostPauseQueue=no
+
+##############################################################################
+### PERFORMANCE                                                            ###
+
+# On a very fast connection and slow CPU and/or drive the following 
+# settings may improve performance:
+# 1) Disable par-checking and -repairing ("ParCheck=no"). VERY important,
+#    because par-checking/repairing needs a lot of CPU-power and 
+#    significantly increases disk usage;
+# 2) Try to activate option "DirectWrite" ("DirectWrite=yes");
+# 3) Disable option "CrcCheck" ("CrcCheck=no");
+# 4) Disable option "ContinuePartial" ("ContinuePartial=no");
+# 5) Do not limit download rate ("DownloadRate=0"), because the bandwidth 
+#    throttling eats CPU time;
+# 6) Disable logging for info- and debug-messages ("InfoTarget=none", 
+#    "DebugTarget=none");
+# 7) Run the program in daemon (Posix) or service (Windows) mode and use
+#    remote client for short periods of time needed for controlling of 
+#    download process on server. Daemon/Service mode eats less CPU 
+#    resources due to not updating of output on screen.
+# 8) Increase the value of option "WriteBufferSize" or better set it to 
+#    "-1" (max/auto) if you have spare 5-20 MB of memory.

nzbget.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  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
@@ -41,9 +41,7 @@
 #include <pwd.h>
 #include <grp.h>
 #include <sys/resource.h>
-#ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
-#endif
 #include <signal.h>
 #endif
 #include <sys/types.h>
@@ -66,33 +64,25 @@
 #include "ColoredFrontend.h"
 #include "NCursesFrontend.h"
 #include "QueueCoordinator.h"
-#include "UrlCoordinator.h"
 #include "RemoteServer.h"
 #include "RemoteClient.h"
 #include "MessageBase.h"
 #include "DiskState.h"
 #include "PrePostProcessor.h"
 #include "ParChecker.h"
-#include "Scheduler.h"
-#include "Scanner.h"
-#include "Util.h"
 #ifdef WIN32
 #include "NTService.h"
 #endif
 
 // Prototypes
-void RunMain();
-void Run(bool bReload);
-void Reload();
+void Run();
 void Cleanup();
 void ProcessClientRequest();
 #ifndef WIN32
 void InstallSignalHandlers();
 void Daemonize();
 void PrintBacktrace();
-#ifdef HAVE_SYS_PRCTL_H
 void EnableDumpCore();
-#endif
 #ifdef DEBUG
 void MakeSegFault();
 #endif
@@ -105,25 +95,18 @@ Thread* g_pFrontend = NULL;
 Options* g_pOptions = NULL;
 ServerPool* g_pServerPool = NULL;
 QueueCoordinator* g_pQueueCoordinator = NULL;
-UrlCoordinator* g_pUrlCoordinator = NULL;
 RemoteServer* g_pRemoteServer = NULL;
-RemoteServer* g_pRemoteSecureServer = 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;
-Scanner* g_pScanner = NULL;
-int g_iArgumentCount;
-char* (*g_szEnvironmentVariables)[] = NULL;
-char* (*g_szArguments)[] = NULL;
-bool g_bReloading = true;
+
 
 /*
  * Main loop
  */
-int main(int argc, char *argv[], char *argp[])
+int main(int argc, char *argv[])
 {
 #ifdef WIN32
 #ifdef _DEBUG
@@ -137,9 +120,8 @@ int main(int argc, char *argv[], char *argp[])
 #endif
 #endif
 
-	Util::InitVersionRevision();
-	
 #ifdef WIN32
+	_set_fmode(_O_BINARY);
 	InstallUninstallServiceCheck(argc, argv);
 #endif
 
@@ -147,67 +129,11 @@ 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);
 
 #ifndef WIN32
 	if (g_pOptions->GetUMask() < 01000)
@@ -219,55 +145,50 @@ 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())
 	{
 #ifdef WIN32
-		info("nzbget %s service-mode", Util::VersionRevision());
+		info("nzbget service-mode");
+		StartService(Run);
+		return 0;
 #else
-		if (!bReload)
-		{
-			Daemonize();
-		}
-		info("nzbget %s daemon-mode", Util::VersionRevision());
+		Daemonize();
+		info("nzbget daemon-mode");
 #endif
 	}
 	else if (g_pOptions->GetServerMode())
 	{
-		info("nzbget %s server-mode", Util::VersionRevision());
+		info("nzbget server-mode");
 	}
 	else if (g_pOptions->GetRemoteClientMode())
 	{
-		info("nzbget %s remote-mode", Util::VersionRevision());
-	}
-
-	if (!bReload)
-	{
-		Connection::Init();
-	}
-
-	if (!g_pOptions->GetRemoteClientMode())
-	{
-		g_pServerPool->InitConnections();
-#ifdef DEBUG
-		g_pServerPool->LogDebugInfo();
-#endif
+		info("nzbget remote-mode");
 	}
 
 #ifndef WIN32
-#ifdef HAVE_SYS_PRCTL_H
 	if (g_pOptions->GetDumpCore())
 	{
 		EnableDumpCore();
 	}
 #endif
+
+	Run();
+
+#ifdef WIN32
+#ifdef _DEBUG
+	_CrtDumpMemoryLeaks();
+#endif
 #endif
 
+	return 0;
+}
+
+void Run()
+{
 #ifndef WIN32
 	InstallSignalHandlers();
 #ifdef DEBUG
@@ -277,6 +198,9 @@ void Run(bool bReload)
 	}
 #endif
 #endif
+	
+	Thread::Init();
+	Connection::Init(g_pOptions->GetTLS() && g_pOptions->GetServerMode());
 
 	// client request
 	if (g_pOptions->GetClientOperation() != Options::opClientNoOperation)
@@ -291,28 +215,19 @@ 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
 	if (g_pOptions->GetServerMode())
 	{
-		g_pRemoteServer = new RemoteServer(false);
+		g_pRemoteServer = new RemoteServer();
 		g_pRemoteServer->Start();
-
-		if (g_pOptions->GetSecureControl())
-		{
-			g_pRemoteSecureServer = new RemoteServer(true);
-			g_pRemoteSecureServer->Start();
-		}
 	}
 
 	// Creating PrePostProcessor
 	if (!g_pOptions->GetRemoteClientMode())
 	{
-		g_pScanner = new Scanner();
 		g_pPrePostProcessor = new PrePostProcessor();
 	}
 
@@ -345,16 +260,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()))
 		{
-			NZBFile* pNZBFile = NZBFile::Create(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())
@@ -363,28 +272,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();
@@ -395,7 +294,6 @@ void Run(bool bReload)
 
 		// main program-loop is terminated
 		debug("QueueCoordinator stopped");
-		debug("UrlCoordinator stopped");
 		debug("PrePostProcessor stopped");
 	}
 
@@ -417,25 +315,7 @@ void Run(bool bReload)
 		}
 		debug("RemoteServer stopped");
 	}
-
-	if (g_pRemoteSecureServer)
-	{
-		debug("stopping RemoteSecureServer");
-		g_pRemoteSecureServer->Stop();
-		int iMaxWaitMSec = 1000;
-		while (g_pRemoteSecureServer->IsRunning() && iMaxWaitMSec > 0)
-		{
-			usleep(100 * 1000);
-			iMaxWaitMSec -= 100;
-		}
-		if (g_pRemoteSecureServer->IsRunning())
-		{
-			debug("Killing RemoteSecureServer");
-			g_pRemoteSecureServer->Kill();
-		}
-		debug("RemoteSecureServer stopped");
-	}
-
+	
 	// Stop Frontend
 	if (g_pFrontend)
 	{
@@ -458,116 +338,54 @@ void ProcessClientRequest()
 {
 	RemoteClient* Client = new RemoteClient();
 
-	switch (g_pOptions->GetClientOperation())
+	if (g_pOptions->GetClientOperation() == Options::opClientRequestList)
 	{
-		case Options::opClientRequestListFiles:
-			Client->RequestServerList(true, false, g_pOptions->GetMatchMode() == Options::mmRegEx ? g_pOptions->GetEditQueueText() : NULL);
-			break;
-
-		case Options::opClientRequestListGroups:
-			Client->RequestServerList(false, true, g_pOptions->GetMatchMode() == Options::mmRegEx ? g_pOptions->GetEditQueueText() : NULL);
-			break;
-
-		case Options::opClientRequestListStatus:
-			Client->RequestServerList(false, false, NULL);
-			break;
-
-		case Options::opClientRequestDownloadPause:
-			Client->RequestServerPauseUnpause(true, eRemotePauseUnpauseActionDownload);
-			break;
-
-		case Options::opClientRequestDownloadUnpause:
-			Client->RequestServerPauseUnpause(false, eRemotePauseUnpauseActionDownload);
-			break;
-
-		case Options::opClientRequestDownload2Pause:
-			Client->RequestServerPauseUnpause(true, eRemotePauseUnpauseActionDownload2);
-			break;
-
-		case Options::opClientRequestDownload2Unpause:
-			Client->RequestServerPauseUnpause(false, eRemotePauseUnpauseActionDownload2);
-			break;
-
-		case Options::opClientRequestSetRate:
-			Client->RequestServerSetDownloadRate(g_pOptions->GetSetRate());
-			break;
-
-		case Options::opClientRequestDumpDebug:
-			Client->RequestServerDumpDebug();
-			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);
-			break;
-
-		case Options::opClientRequestLog:
-			Client->RequestServerLog(g_pOptions->GetLogLines());
-			break;
-
-		case Options::opClientRequestShutdown:
-			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());
-			break;
-
-		case Options::opClientRequestVersion:
-			Client->RequestServerVersion();
-			break;
-
-		case Options::opClientRequestPostQueue:
-			Client->RequestPostQueue();
-			break;
-
-		case Options::opClientRequestWriteLog:
-			Client->RequestWriteLog(g_pOptions->GetWriteLogKind(), g_pOptions->GetLastArg());
-			break;
-
-		case Options::opClientRequestScanAsync:
-			Client->RequestScan(false);
-			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;
+		Client->RequestServerList();
+	}
+	else if (g_pOptions->GetClientOperation() == Options::opClientRequestPause)
+	{
+		Client->RequestServerPauseUnpause(true);
+	}
+	else if (g_pOptions->GetClientOperation() == Options::opClientRequestUnpause)
+	{
+		Client->RequestServerPauseUnpause(false);
+	}
+	else if (g_pOptions->GetClientOperation() == Options::opClientRequestSetRate)
+	{
+		Client->RequestServerSetDownloadRate(g_pOptions->GetSetRate());
+	}
+	else if (g_pOptions->GetClientOperation() == Options::opClientRequestDumpDebug)
+	{
+		Client->RequestServerDumpDebug();
+	}
+	else if (g_pOptions->GetClientOperation() == Options::opClientRequestEditQueue)
+	{
+		Client->RequestServerEditQueue(g_pOptions->GetEditQueueAction(), g_pOptions->GetEditQueueOffset(),
+			g_pOptions->GetEditQueueText(), g_pOptions->GetEditQueueIDList(), g_pOptions->GetEditQueueIDCount(), true);
+	}
+	else if (g_pOptions->GetClientOperation() == Options::opClientRequestLog)
+	{
+		Client->RequestServerLog(g_pOptions->GetLogLines());
+	}
+	else if (g_pOptions->GetClientOperation() == Options::opClientRequestShutdown)
+	{
+		Client->RequestServerShutdown();
+	}
+	else if (g_pOptions->GetClientOperation() == Options::opClientRequestDownload)
+	{
+		Client->RequestServerDownload(g_pOptions->GetArgFilename(), g_pOptions->GetCategory(), g_pOptions->GetAddTop());
+	}
+	else if (g_pOptions->GetClientOperation() == Options::opClientRequestVersion)
+	{
+		Client->RequestServerVersion();
+	}
+	else if (g_pOptions->GetClientOperation() == Options::opClientRequestPostQueue)
+	{
+		Client->RequestPostQueue();
+	}
+	else if (g_pOptions->GetClientOperation() == Options::opClientRequestWriteLog)
+	{
+		Client->RequestWriteLog(g_pOptions->GetWriteLogKind(), g_pOptions->GetLastArg());
 	}
 
 	delete Client;
@@ -575,10 +393,7 @@ void ProcessClientRequest()
 
 void ExitProc()
 {
-	if (!g_bReloading)
-	{
-		info("Stopping, please wait...");
-	}
+	info("Stopping, please wait...");
 	if (g_pOptions->GetRemoteClientMode())
 	{
 		if (g_pFrontend)
@@ -593,19 +408,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);
@@ -629,15 +436,27 @@ void SignalProc(int iSignal)
 			ExitProc();
 			break;
 
+#ifdef DEBUG
+		case SIGPIPE:
+			// ignoring
+			break;
+			
 		case SIGCHLD:
 			// ignoring
 			break;
-
-#ifdef DEBUG
+			
 		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
 	}
 }
@@ -648,12 +467,12 @@ void InstallSignalHandlers()
 	signal(SIGTERM, SignalProc);
 	signal(SIGPIPE, SIG_IGN);
 #ifdef DEBUG
-	signal(SIGSEGV, SignalProc);
-#endif
-#ifdef SIGCHLD_HANDLER
-    // it could be necessary on some systems to activate a handler for SIGCHLD
-    // however it make troubles on other systems and is deactivated by default
-	signal(SIGCHLD, SignalProc);
+	SignalProcList.clear();
+	for (int i = 1; i <= 32; i++)
+	{
+		SignalProcList.push_back((sighandler)signal(i, SignalProc));
+	}
+	signal(SIGWINCH, SIG_DFL);
 #endif
 }
 
@@ -699,7 +518,6 @@ void MakeSegFault()
 }
 #endif
 
-#ifdef HAVE_SYS_PRCTL_H
 /**
 * activates the creation of core-files
 */
@@ -712,19 +530,18 @@ void EnableDumpCore()
 	prctl(PR_SET_DUMPABLE, 1);
 }
 #endif
-#endif
 
 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)
@@ -734,25 +551,12 @@ void Cleanup()
 	}
 	debug("RemoteServer deleted");
 
-	debug("Deleting RemoteSecureServer");
-	if (g_pRemoteSecureServer)
-	{
-		delete g_pRemoteSecureServer;
-		g_pRemoteSecureServer = NULL;
-	}
-	debug("RemoteSecureServer deleted");
-
 	debug("Deleting PrePostProcessor");
 	if (g_pPrePostProcessor)
 	{
 		delete g_pPrePostProcessor;
 		g_pPrePostProcessor = NULL;
 	}
-	if (g_pScanner)
-	{
-		delete g_pScanner;
-		g_pScanner = NULL;
-	}
 	debug("PrePostProcessor deleted");
 
 	debug("Deleting Frontend");
@@ -763,14 +567,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)
 	{
@@ -782,9 +578,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;
@@ -800,19 +595,8 @@ void Cleanup()
 	}
 	debug("ServerPool deleted");
 
-	debug("Deleting Scheduler");
-	if (g_pScheduler)
-	{
-		delete g_pScheduler;
-		g_pScheduler = NULL;
-	}
-	debug("Scheduler deleted");
-
-	if (!g_bReloading)
-	{
-		Connection::Final();
-		Thread::Final();
-	}
+	Thread::Final();
+	Connection::Final();
 
 	debug("Global objects cleaned up");
 
@@ -844,14 +628,13 @@ void Daemonize()
 	/* Drop user if there is one, and we were run as root */
 	if ( getuid() == 0 || geteuid() == 0 )
 	{
-		struct passwd *pw = getpwnam(g_pOptions->GetDaemonUsername());
+		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. */
-			initgroups( g_pOptions->GetDaemonUsername(),pw->pw_gid); 
+			initgroups( g_pOptions->GetDaemonUserName(),pw->pw_gid); 
 			/* Finally, set uid. */
 			setuid(pw->pw_uid);
 		}

nzbget.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2013 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$
@@ -36,9 +36,6 @@
 #endif
 #define fdopen _fdopen
 #define ctime_r(timep, buf, bufsize) ctime_s(buf, bufsize, timep)
-#define localtime_r(time, tm) localtime_s(tm, time)
-#define strtok_r(str, delim, saveptr) strtok_s(str, delim, saveptr)
-#define strerror_r(errnum, buffer, size) strerror_s(buffer, size, errnum)
 #define int32_t __int32
 #define mkdir(dir, flags) _mkdir(dir)
 #define rmdir _rmdir
@@ -51,16 +48,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_WR 0x01
 #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
@@ -69,6 +63,7 @@
 
 // POSIX
 
+#define _timeval timeval
 #define closesocket(sock) close(sock)
 #define SOCKET int
 #define INVALID_SOCKET (-1)
@@ -80,8 +75,4 @@
 
 #endif
 
-#ifndef SHUT_RDWR
-#define SHUT_RDWR 2
-#endif
-
 #endif

nzbget.kdevelop

@@ -0,0 +1,274 @@
+<?xml version = '1.0'?>
+<kdevelop>
+  <general>
+    <author>gnu</author>
+    <email/>
+    <version>0.3.0</version>
+    <projectmanagement>KDevAutoProject</projectmanagement>
+    <primarylanguage>C++</primarylanguage>
+    <keywords>
+      <keyword>C++</keyword>
+      <keyword>Code</keyword>
+    </keywords>
+    <ignoreparts>
+      <part>kdevabbrev</part>
+      <part>kdevbookmarks</part>
+      <part>kdevsnippet</part>
+      <part>kdevctags2</part>
+      <part>kdevdoxygen</part>
+      <part>kdevkonsoleview</part>
+      <part>kdevfilegroups</part>
+      <part>kdevfilelist</part>
+      <part>kdevfileview</part>
+      <part>kdevdistpart</part>
+      <part>kdevopenwith</part>
+      <part>kdevregexptest</part>
+      <part>kdevscripting</part>
+      <part>kdevfilter</part>
+      <part>kdevtexttools</part>
+    </ignoreparts>
+    <projectdirectory>.</projectdirectory>
+    <absoluteprojectpath>false</absoluteprojectpath>
+    <description/>
+    <projectname>nzbget</projectname>
+    <defaultencoding/>
+    <versioncontrol>kdevsubversion</versioncontrol>
+  </general>
+  <kdevautoproject>
+    <general>
+      <activetarget>src/nzbget</activetarget>
+      <useconfiguration>default</useconfiguration>
+    </general>
+    <run>
+      <mainprogram>/home/user/nzbget/nzbget</mainprogram>
+      <terminal>false</terminal>
+      <directoryradio>executable</directoryradio>
+      <customdirectory>/</customdirectory>
+      <programargs/>
+      <autocompile>true</autocompile>
+      <envvars/>
+      <globaldebugarguments></globaldebugarguments>
+      <globalcwd>/home/user/nzbget</globalcwd>
+      <useglobalprogram>true</useglobalprogram>
+      <autoinstall>false</autoinstall>
+      <autokdesu>false</autokdesu>
+    </run>
+    <configurations>
+      <default>
+        <envvars/>
+        <configargs>--enable-debug</configargs>
+        <builddir/>
+        <topsourcedir/>
+        <cppflags/>
+        <ldflags/>
+        <ccompiler>kdevgccoptions</ccompiler>
+        <cxxcompiler>kdevgppoptions</cxxcompiler>
+        <f77compiler>kdevpgf77options</f77compiler>
+        <ccompilerbinary/>
+        <cxxcompilerbinary/>
+        <f77compilerbinary/>
+        <cflags/>
+        <cxxflags/>
+        <f77flags/>
+      </default>
+    </configurations>
+    <make>
+      <envvars>
+        <envvar value="1" name="WANT_AUTOCONF_2_5" />
+        <envvar value="1" name="WANT_AUTOMAKE_1_6" />
+      </envvars>
+      <abortonerror>true</abortonerror>
+      <runmultiplejobs>false</runmultiplejobs>
+      <numberofjobs>1</numberofjobs>
+      <dontact>false</dontact>
+      <makebin/>
+      <prio>0</prio>
+    </make>
+  </kdevautoproject>
+  <kdevdoctreeview>
+    <ignoretocs>
+      <toc>ada</toc>
+      <toc>ada_bugs_gcc</toc>
+      <toc>bash</toc>
+      <toc>bash_bugs</toc>
+      <toc>clanlib</toc>
+      <toc>w3c-dom-level2-html</toc>
+      <toc>fortran_bugs_gcc</toc>
+      <toc>gnome1</toc>
+      <toc>gnustep</toc>
+      <toc>gtk</toc>
+      <toc>gtk_bugs</toc>
+      <toc>haskell</toc>
+      <toc>haskell_bugs_ghc</toc>
+      <toc>java_bugs_gcc</toc>
+      <toc>java_bugs_sun</toc>
+      <toc>kde2book</toc>
+      <toc>opengl</toc>
+      <toc>pascal_bugs_fp</toc>
+      <toc>php</toc>
+      <toc>php_bugs</toc>
+      <toc>perl</toc>
+      <toc>perl_bugs</toc>
+      <toc>python</toc>
+      <toc>python_bugs</toc>
+      <toc>qt-kdev3</toc>
+      <toc>ruby</toc>
+      <toc>ruby_bugs</toc>
+      <toc>sdl</toc>
+      <toc>w3c-svg</toc>
+      <toc>sw</toc>
+      <toc>w3c-uaag10</toc>
+      <toc>wxwidgets_bugs</toc>
+    </ignoretocs>
+    <ignoreqt_xml>
+      <toc>Guide to the Qt Translation Tools</toc>
+      <toc>Qt Assistant Manual</toc>
+      <toc>Qt Designer Manual</toc>
+      <toc>Qt Reference Documentation</toc>
+      <toc>qmake User Guide</toc>
+    </ignoreqt_xml>
+    <ignoredoxygen>
+      <toc>KDE Libraries (Doxygen)</toc>
+    </ignoredoxygen>
+  </kdevdoctreeview>
+  <kdevfilecreate>
+    <filetypes/>
+    <useglobaltypes>
+      <type ext="cpp" />
+      <type ext="h" />
+    </useglobaltypes>
+  </kdevfilecreate>
+  <kdevfileview>
+    <groups>
+      <group pattern="*.h" name="Header files" />
+      <group pattern="*.cpp" name="Source files" />
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+      <hidenonlocation>false</hidenonlocation>
+    </groups>
+    <tree>
+      <hidepatterns>*.o,*.lo,CVS</hidepatterns>
+      <hidenonprojectfiles>false</hidenonprojectfiles>
+    </tree>
+  </kdevfileview>
+  <kdevdocumentation>
+    <projectdoc>
+      <docsystem>Doxygen Documentation Collection</docsystem>
+      <docurl>nzbget.tag</docurl>
+      <usermanualurl/>
+    </projectdoc>
+  </kdevdocumentation>
+  <substmap>
+    <APPNAME>nzbget</APPNAME>
+    <APPNAMELC>nzbget</APPNAMELC>
+    <APPNAMESC>Nzbget</APPNAMESC>
+    <APPNAMEUC>NZBGET</APPNAMEUC>
+    <AUTHOR>gnu</AUTHOR>
+    <EMAIL/>
+    <LICENSE>GPL</LICENSE>
+    <LICENSEFILE>COPYING</LICENSEFILE>
+    <VERSION>0.3.0</VERSION>
+    <YEAR>2007</YEAR>
+    <dest>/home/user/nzbget-0.3.0/nzbget</dest>
+  </substmap>
+  <cppsupportpart>
+    <filetemplates>
+      <interfacesuffix>.h</interfacesuffix>
+      <implementationsuffix>.cpp</implementationsuffix>
+    </filetemplates>
+  </cppsupportpart>
+  <kdevcppsupport>
+    <qt>
+      <used>false</used>
+      <version>3</version>
+      <root></root>
+      <includestyle>3</includestyle>
+      <designerintegration>EmbeddedKDevDesigner</designerintegration>
+      <qmake></qmake>
+      <designer></designer>
+      <designerpluginpaths/>
+    </qt>
+    <codecompletion>
+      <includeGlobalFunctions>true</includeGlobalFunctions>
+      <includeTypes>true</includeTypes>
+      <includeEnums>true</includeEnums>
+      <includeTypedefs>false</includeTypedefs>
+      <automaticCodeCompletion>false</automaticCodeCompletion>
+      <automaticArgumentsHint>false</automaticArgumentsHint>
+      <automaticHeaderCompletion>true</automaticHeaderCompletion>
+      <codeCompletionDelay>250</codeCompletionDelay>
+      <argumentsHintDelay>400</argumentsHintDelay>
+      <headerCompletionDelay>250</headerCompletionDelay>
+      <showOnlyAccessibleItems>false</showOnlyAccessibleItems>
+      <completionBoxItemOrder>0</completionBoxItemOrder>
+      <howEvaluationContextMenu>true</howEvaluationContextMenu>
+      <showCommentWithArgumentHint>false</showCommentWithArgumentHint>
+      <statusBarTypeEvaluation>false</statusBarTypeEvaluation>
+      <namespaceAliases>std=_GLIBCXX_STD;__gnu_cxx=std</namespaceAliases>
+      <processPrimaryTypes>true</processPrimaryTypes>
+      <processFunctionArguments>false</processFunctionArguments>
+      <preProcessAllHeaders>false</preProcessAllHeaders>
+      <parseMissingHeaders>false</parseMissingHeaders>
+      <resolveIncludePaths>true</resolveIncludePaths>
+      <alwaysParseInBackground>true</alwaysParseInBackground>
+      <usePermanentCaching>true</usePermanentCaching>
+      <alwaysIncludeNamespaces>false</alwaysIncludeNamespaces>
+      <includePaths>.;</includePaths>
+    </codecompletion>
+    <creategettersetter>
+      <prefixGet/>
+      <prefixSet>set</prefixSet>
+      <prefixVariable>m_,_</prefixVariable>
+      <parameterName>theValue</parameterName>
+      <inlineGet>true</inlineGet>
+      <inlineSet>true</inlineSet>
+    </creategettersetter>
+    <references/>
+    <splitheadersource>
+      <enabled>false</enabled>
+      <synchronize>true</synchronize>
+      <orientation>Vertical</orientation>
+    </splitheadersource>
+  </kdevcppsupport>
+  <kdevdebugger>
+    <general>
+      <programargs>--standalone /home/user/.nzbget/nzb/t1.nzb</programargs>
+      <gdbpath/>
+      <dbgshell/>
+      <configGdbScript/>
+      <runShellScript/>
+      <runGdbScript/>
+      <breakonloadinglibs>true</breakonloadinglibs>
+      <separatetty>true</separatetty>
+      <floatingtoolbar>false</floatingtoolbar>
+    </general>
+    <display>
+      <staticmembers>false</staticmembers>
+      <demanglenames>true</demanglenames>
+      <outputradix>10</outputradix>
+    </display>
+  </kdevdebugger>
+  <dist>
+    <custom>false</custom>
+    <bzip>false</bzip>
+    <archname/>
+    <appname>nzbget</appname>
+    <version>0.2.4</version>
+    <release/>
+    <vendor/>
+    <licence/>
+    <summary/>
+    <group/>
+    <packager/>
+    <description/>
+    <changelog/>
+    <devpackage>false</devpackage>
+    <docspackage>false</docspackage>
+    <appicon>false</appicon>
+    <arch>0</arch>
+    <genHTML>false</genHTML>
+    <useRPM>false</useRPM>
+    <ftpkde>false</ftpkde>
+    <appskde>false</appskde>
+    <url/>
+  </dist>
+</kdevelop>

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"
 			>
@@ -391,14 +399,6 @@
 			RelativePath=".\Options.h"
 			>
 		</File>
-		<File
-			RelativePath=".\ParCoordinator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\ParCoordinator.h"
-			>
-		</File>
 		<File
 			RelativePath=".\ParChecker.cpp"
 			>
@@ -408,11 +408,11 @@
 			>
 		</File>
 		<File
-			RelativePath=".\ParRenamer.cpp"
+			RelativePath=".\PostInfo.cpp"
 			>
 		</File>
 		<File
-			RelativePath=".\ParRenamer.h"
+			RelativePath=".\PostInfo.h"
 			>
 		</File>
 		<File
@@ -455,22 +455,6 @@
 			RelativePath=".\RemoteServer.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Scanner.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Scanner.h"
-			>
-		</File>
-		<File
-			RelativePath=".\Scheduler.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Scheduler.h"
-			>
-		</File>
 		<File
 			RelativePath=".\ScriptController.cpp"
 			>
@@ -503,22 +487,6 @@
 			RelativePath=".\TLS.h"
 			>
 		</File>
-		<File
-			RelativePath=".\Unpack.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\Unpack.h"
-			>
-		</File>
-		<File
-			RelativePath=".\UrlCoordinator.cpp"
-			>
-		</File>
-		<File
-			RelativePath=".\UrlCoordinator.h"
-			>
-		</File>
 		<File
 			RelativePath=".\Util.cpp"
 			>
@@ -527,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,177 @@
+#!/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 #######################
+
+
+# Parameters passed to script by nzbget:
+#  1 - path to destination dir, where downloaded files are located; 
+#  2 - name of nzb-file processed; 
+#  3 - name of par-file processed (if par-checked) or empty string (if not); 
+#  4 - 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 sucessfully repaired; 
+#      3 - checked and can be repaired but repair is disabled; 
+#  5 - state of nzb-job: 
+#      0 - there are more collections in this nzb-file queued; 
+#      1 - this was the last collection in nzb-file; 
+#  6 - 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; 
+
+DownloadDir="$1"   
+NzbFile="$2" 
+ParCheck=$4 
+NzbState=$5  
+ParFail=$6 
+
+# Check if all is downloaded and repaired
+if [ "$#" -lt 6 ] 
+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 [ ! "$NzbState" -eq 1 ] 
+then
+	echo "[INFO] Unpack: Not the last collection in nzb-file, exiting"
+	exit
+fi 
+if [ ! "$ParCheck" -eq 2 ] 
+then
+	echo "[WARNING] Unpack: Par-check failed or disabled, exiting"
+	exit
+fi 
+if [ ! "$ParFail" -eq 0 ] 
+then
+	echo "[WARNING] Unpack: Previous par-check failed, exiting"
+	exit
+fi 
+
+# All OK, processing the files
+cd "$DownloadDir" 
+
+# 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

ppscripts/EMail.py

@@ -1,218 +0,0 @@
-#!/usr/bin/env python
-#
-# E-Mail post-processing script for NZBGet
-#
-# Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# 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$
-#
-
-
-##############################################################################
-### NZBGET POST-PROCESSING SCRIPT                                          ###
-
-# Send E-Mail notification.
-#
-# This script sends E-Mail notification when the job is done.
-#
-# NOTE: This script requires Python to be installed on your system.
-
-##############################################################################
-### OPTIONS                                                       ###
-
-# Email address you want this email to be sent from. 
-#From="NZBGet" <myaccount@gmail.com>
-
-# Email address you want this email to be sent to. 
-#To=myaccount@gmail.com
-
-# SMTP server host.
-#Server=smtp.gmail.com
-
-# SMTP server port (1-65535).
-#Port=25
-
-# Secure communication using TLS/SSL (yes, no).
-#Encryption=yes
-
-# SMTP server user name, if required.
-#Username=myaccount
-
-# SMTP server password, if required.
-#Password=mypass
-
-# Append list of files to the message (yes, no).
-#
-# Add the list of downloaded files (the content of destination directory).
-#FileList=yes
-
-# Append broken-log to the message (yes, no).
-#
-# Add the content of file _brokenlog.txt. This file contains the list of damaged
-# files and the result of par-check/repair. For successful downloads the broken-log
-# is usually deleted by cleanup-script and therefore is not sent.
-#BrokenLog=yes
-
-# Append post-processing log to the message (Always, Never, OnFailure).
-#
-# Add the post-processing log of active job.
-#PostProcessLog=OnFailure
-
-### NZBGET POST-PROCESSING SCRIPT                                          ###
-##############################################################################
-
-
-import os
-import sys
-import datetime
-import smtplib
-from email.mime.text import MIMEText
-try:
-	from xmlrpclib import ServerProxy # python 2
-except ImportError:
-	from xmlrpc.client import ServerProxy # python 3
-
-# Exit codes used by NZBGet
-POSTPROCESS_SUCCESS=93
-POSTPROCESS_ERROR=94
-
-# Check if the script is called from nzbget 11.0 or later
-if not 'NZBOP_SCRIPTDIR' in os.environ:
-	print('*** NZBGet post-processing script ***')
-	print('This script is supposed to be called from nzbget (11.0 or later).')
-	sys.exit(POSTPROCESS_ERROR)
-
-print('[DETAIL] Script successfully started')
-sys.stdout.flush()
-
-required_options = ('NZBPO_FROM', 'NZBPO_TO', 'NZBPO_SERVER', 'NZBPO_PORT', 'NZBPO_ENCRYPTION',
-	'NZBPO_USERNAME', 'NZBPO_PASSWORD', 'NZBPO_FILELIST', 'NZBPO_BROKENLOG', 'NZBPO_POSTPROCESSLOG')
-for	optname in required_options:
-	if (not optname in os.environ):
-		print('[ERROR] Option %s is missing in configuration file. Please check script settings' % optname[6:])
-		sys.exit(POSTPROCESS_ERROR)
-		
-# Check par and unpack status for errors.
-success=False
-if os.environ['NZBPP_PARSTATUS'] == '1' or os.environ['NZBPP_UNPACKSTATUS'] == '1':
-	subject = 'Failure for "%s"' % (os.environ['NZBPP_NZBNAME'])
-	text = 'Download of "%s" has failed.' % (os.environ['NZBPP_NZBNAME'])
-elif os.environ['NZBPP_PARSTATUS'] == '4':
-	subject = 'Damaged for "%s"' % (os.environ['NZBPP_NZBNAME'])
-	text = 'Download of "%s" requires par-repair.' % (os.environ['NZBPP_NZBNAME'])
-else:
-	subject = 'Success for "%s"' % (os.environ['NZBPP_NZBNAME'])
-	text = 'Download of "%s" has successfully completed.' % (os.environ['NZBPP_NZBNAME'])
-	success=True
-
-#  NZBPP_PARSTATUS    - result of par-check:
-#                       0 = not checked: par-check is 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.
-#                       4 = par-check needed but skipped (option ParCheck=manual);
-parStatus = { '0': 'skipped', '1': 'failed', '2': 'repaired', '3': 'repairable', '4': 'manual' }
-text += '\nPar-Status: %s' % parStatus[os.environ['NZBPP_PARSTATUS']]
-
-#  NZBPP_UNPACKSTATUS - result of unpack:
-#                       0 = unpack is disabled or was skipped due to nzb-file
-#                           properties or due to errors during par-check;
-#                       1 = unpack failed;
-#                       2 = unpack successful.
-unpackStatus = { '0': 'skipped', '1': 'failed', '2': 'success' }
-text += '\nUnpack-Status: %s' % unpackStatus[os.environ['NZBPP_UNPACKSTATUS']]
-
-# add list of downloaded files
-if os.environ['NZBPO_FILELIST'] == 'yes':
-	text += '\n\nFiles:'
-	for dirname, dirnames, filenames in os.walk(os.environ['NZBPP_DIRECTORY']):
-		for filename in filenames:
-			text += '\n' + os.path.join(dirname, filename)[len(os.environ['NZBPP_DIRECTORY']) + 1:]
-
-# add _brokenlog.txt (if exists)
-if os.environ['NZBPO_BROKENLOG'] == 'yes':
-	brokenlog = '%s/_brokenlog.txt' % os.environ['NZBPP_DIRECTORY']
-	if os.path.exists(brokenlog):
-		text += '\n\nBrokenlog:\n' + open(brokenlog, 'r').read().strip()
-
-# add post-processing log
-if os.environ['NZBPO_POSTPROCESSLOG'] == 'Always' or \
-	(os.environ['NZBPO_POSTPROCESSLOG'] == 'OnFailure' and not success):
-	# To get the post-processing log we connect to NZBGet via XML-RPC
-	# and call method "postqueue", which returns the list of post-processing job.
-	# The first item in the list is current job. This item has a field 'Log',
-	# containing an array of log-entries.
-	# For more info visit http://nzbget.sourceforge.net/RPC_API_reference
-	
-	# First we need to know connection info: host, port and password of NZBGet server.
-	# NZBGet passes all configuration options to post-processing script as
-	# environment variables.
-	host = os.environ['NZBOP_CONTROLIP'];
-	port = os.environ['NZBOP_CONTROLPORT'];
-	username = os.environ['NZBOP_CONTROLUSERNAME'];
-	password = os.environ['NZBOP_CONTROLPASSWORD'];
-	
-	if host == '0.0.0.0': host = '127.0.0.1'
-	
-	# Build an URL for XML-RPC requests
-	rpcUrl = 'http://%s:%s@%s:%s/xmlrpc' % (username, password, host, port);
-	
-	# Create remote server object
-	server = ServerProxy(rpcUrl)
-	
-	# Call remote method 'postqueue'. The only parameter tells how many log-entries to return as maximum.
-	postqueue = server.postqueue(10000)
-	
-	# Get field 'Log' from the first post-processing job
-	log = postqueue[0]['Log']
-	
-	# Now iterate through entries and save them to message text
-	if len(log) > 0:
-		text += '\n\nPost-processing log:';
-		for entry in log:
-			text += '\n%s\t%s\t%s' % (entry['Kind'], datetime.datetime.fromtimestamp(int(entry['Time'])), entry['Text'])
-
-# Create message
-msg = MIMEText(text)
-msg['Subject'] = subject
-msg['From'] = os.environ['NZBPO_FROM']
-msg['To'] = os.environ['NZBPO_TO']
-
-# Send message
-print('[DETAIL] Sending E-Mail')
-sys.stdout.flush()
-try:
-	smtp = smtplib.SMTP(os.environ['NZBPO_SERVER'], os.environ['NZBPO_PORT'])
-
-	if os.environ['NZBPO_ENCRYPTION'] == 'yes':
-		smtp.starttls()
-	
-	if os.environ['NZBPO_USERNAME'] != '' and os.environ['NZBPO_PASSWORD'] != '':
-		smtp.login(os.environ['NZBPO_USERNAME'], os.environ['NZBPO_PASSWORD'])
-	
-	smtp.sendmail(os.environ['NZBPO_FROM'], os.environ['NZBPO_TO'], msg.as_string())
-	
-	smtp.quit()
-except Exception as err:
-	print('[ERROR] %s' % err)
-	sys.exit(POSTPROCESS_ERROR)
-
-# All OK, returning exit status 'POSTPROCESS_SUCCESS' (int <93>) to let NZBGet know
-# that our script has successfully completed.
-sys.exit(POSTPROCESS_SUCCESS)