version 13.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)
-	Andrei Prygounkov <hugbug@users.sourceforge.net>		(versions 0.3.0 - 0.3.*)
+	Andrey Prygunkov <hugbug@users.sourceforge.net>		    (versions 0.3.0 and later)

ArticleDownloader.cpp

@@ -1,977 +0,0 @@
-/*
- *  This file is 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>
-#ifdef WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-#include <sys/stat.h>
-#include <errno.h>
-
-#include "nzbget.h"
-#include "ArticleDownloader.h"
-#include "Decoder.h"
-#include "Log.h"
-#include "Options.h"
-#include "ServerPool.h"
-#include "Util.h"
-
-extern DownloadSpeedMeter* g_pDownloadSpeedMeter;
-extern Options* g_pOptions;
-extern ServerPool* g_pServerPool;
-
-ArticleDownloader::ArticleDownloader()
-{
-	debug("Creating ArticleDownloader");
-
-	m_szResultFilename	= NULL;
-	m_szTempFilename	= NULL;
-	m_szArticleFilename	= NULL;
-	m_szInfoName		= NULL;
-	m_szOutputFilename	= NULL;
-	m_pConnection		= NULL;
-	m_eStatus			= adUndefined;
-	m_bDuplicate		= false;
-	m_eFormat			= Decoder::efUnknown;
-	SetLastUpdateTimeNow();
-}
-
-ArticleDownloader::~ArticleDownloader()
-{
-	debug("Destroying ArticleDownloader");
-
-	if (m_szTempFilename)
-	{
-		free(m_szTempFilename);
-	}
-	if (m_szArticleFilename)
-	{
-		free(m_szArticleFilename);
-	}
-	if (m_szInfoName)
-	{
-		free(m_szInfoName);
-	}
-	if (m_szOutputFilename)
-	{
-		free(m_szOutputFilename);
-	}
-}
-
-void ArticleDownloader::SetTempFilename(const char* v)
-{
-	m_szTempFilename = strdup(v);
-}
-
-void ArticleDownloader::SetOutputFilename(const char* v)
-{
-	m_szOutputFilename = strdup(v);
-}
-
-void ArticleDownloader::SetInfoName(const char * v)
-{
-	m_szInfoName = strdup(v);
-}
-
-void ArticleDownloader::SetStatus(EStatus eStatus)
-{
-	m_eStatus = eStatus;
-	Notify(NULL);
-}
-
-void ArticleDownloader::Run()
-{
-	debug("Entering ArticleDownloader-loop");
-
-	SetStatus(adRunning);
-	m_szResultFilename = m_pArticleInfo->GetResultFilename();
-
-	if (g_pOptions->GetContinuePartial())
-	{
-		if (Util::FileExists(m_szResultFilename))
-		{
-			// file exists from previous program's start
-			detail("Article %s already downloaded, skipping", m_szInfoName);
-			SetStatus(adFinished);
-			FreeConnection(true);
-			return;
-		}
-	}
-
-	detail("Downloading %s", m_szInfoName);
-
-	int retry = g_pOptions->GetRetries();
-
-	EStatus Status = adFailed;
-	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;
-
-		if (!m_pConnection)
-		{
-			m_pConnection = g_pServerPool->GetConnection(level, true);
-		}
-
-		if (IsStopped())
-		{
-			Status = adFailed;
-			break;
-		}
-
-		if (!m_pConnection)
-		{
-			debug("m_pConnection is NULL");
-			error("Serious error: Connection is NULL");
-		}
-		
-		// test connection
-		bool bConnected = m_pConnection && m_pConnection->Connect() >= 0;
-		if (bConnected && !IsStopped())
-		{
-			// Okay, we got a Connection. Now start downloading.
-			Status = Download();
-		}
-
-		if (bConnected)
-		{
-			if (Status == adConnectError)
-			{
-				m_pConnection->Disconnect();
-				bConnected = false;
-				Status = adFailed;
-			}
-			else
-			{
-				// freeing connection allows other threads to start.
-				// we doing this only if the problem was with article or group.
-				// if the problem occurs by connecting or authorization we do not
-				// free the connection, to prevent starting of thousands of threads 
-				// (cause each of them will also free it's connection after the 
-				// same connect-error).
-				FreeConnection(Status == adFinished);
-			}
-		}
-
-		if (((Status == adFailed) || (Status == adCrcError && g_pOptions->GetRetryOnCrcError())) && 
-			(retry > 1 || !bConnected) && !IsStopped())
-		{
-			detail("Waiting %i sec to retry", g_pOptions->GetRetryInterval());
-			int msec = 0;
-			while (!IsStopped() && (msec < g_pOptions->GetRetryInterval() * 1000))
-			{
-				usleep(100 * 1000);
-				msec += 100;
-			}
-		}
-
-		if (IsStopped())
-		{
-			Status = adFailed;
-			break;
-		}
-	 
-		if ((Status == adFinished) || (Status == adFatalError) ||
-			(Status == adCrcError && !g_pOptions->GetRetryOnCrcError()))
-		{
-			break;
-		}
-
-		LevelStatus[level] = Status;
-
-		bool bAllLevelNotFound = true;
-		for (int lev = 0; lev <= iMaxLevel; lev++)
-		{
-			if (LevelStatus[lev] != adNotFound)
-			{
-				bAllLevelNotFound = false;
-				break;
-			}
-		}
-		if (bAllLevelNotFound)
-		{
-			if (iMaxLevel > 0)
-			{
-				warn("Article %s @ all servers failed: Article not found", m_szInfoName);
-			}
-			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 = adFailed;
-	}
-
-	if (Status == adFailed)
-	{
-		if (IsStopped())
-		{
-			detail("Download %s cancelled", m_szInfoName);
-		}
-		else
-		{
-			warn("Download %s failed", m_szInfoName);
-		}
-	}
-
-	SetStatus(Status);
-
-	debug("Exiting ArticleDownloader-loop");
-}
-
-ArticleDownloader::EStatus ArticleDownloader::Download()
-{
-	const char* szResponse = NULL;
-	EStatus Status = adRunning;
-
-	// at first, change group
-	for (FileInfo::Groups::iterator it = m_pFileInfo->GetGroups()->begin(); it != m_pFileInfo->GetGroups()->end(); it++)
-	{
-		szResponse = m_pConnection->JoinGroup(*it);
-		if (szResponse && !strncmp(szResponse, "2", 1))
-		{
-			break; 
-		}
-	}
-
-	Status = CheckResponse(szResponse, "could not join group");
-	if (Status != adFinished)
-	{
-		return Status;
-	}
-
-	// retrieve article
-	char tmp[1024];
-	snprintf(tmp, 1024, "ARTICLE %s\r\n", m_pArticleInfo->GetMessageID());
-	tmp[1024-1] = '\0';
-
-	for (int retry = 3; retry > 0; retry--)
-	{
-		szResponse = m_pConnection->Request(tmp);
-		if (szResponse && !strncmp(szResponse, "2", 1))
-		{
-			break;
-		}
-	}
-
-	Status = CheckResponse(szResponse, "could not fetch article");
-	if (Status != adFinished)
-	{
-		return Status;
-	}
-
-	// positive answer!
-
-	if (g_pOptions->GetDecode())
-	{
-		m_YDecoder.Clear();
-		m_YDecoder.SetAutoSeek(g_pOptions->GetDirectWrite());
-		m_YDecoder.SetCrcCheck(g_pOptions->GetCrcCheck());
-
-		m_UDecoder.Clear();
-	}
-
-	m_pOutFile = NULL;
-	bool bBody = false;
-	bool bEnd = false;
-	const int LineBufSize = 1024*10;
-	char* szLineBuf = (char*)malloc(LineBufSize);
-	Status = adRunning;
-
-	while (!IsStopped())
-	{
-		SetLastUpdateTimeNow();
-
-		// Throttle the bandwidth
-		while (!IsStopped() && (g_pOptions->GetDownloadRate() > 0.0f) &&
-		        (g_pDownloadSpeedMeter->CalcCurrentDownloadSpeed() > g_pOptions->GetDownloadRate()))
-		{
-			SetLastUpdateTimeNow();
-			usleep(200 * 1000);
-		}
-
-		int iLen = 0;
-		char* line = m_pConnection->ReadLine(szLineBuf, LineBufSize, &iLen);
-		g_pDownloadSpeedMeter->AddSpeedReading(iLen);
-
-		// Have we encountered a timeout?
-		if (!line)
-		{
-			if (!IsStopped())
-			{
-				warn("Article %s @ %s failed: Unexpected end of article", m_szInfoName, m_pConnection->GetServer()->GetHost());
-			}
-			Status = adFailed;
-			break;
-		}
-
-		//detect end of article
-		if (!strcmp(line, ".\r\n") || !strcmp(line, ".\n"))
-		{
-			bEnd = true;
-			break;
-		}
-
-		//detect lines starting with "." (marked as "..")
-		if (!strncmp(line, "..", 2))
-		{
-			line++;
-		}
-
-		if (!bBody)
-		{
-			// detect body of article
-			if (*line == '\r' || *line == '\n')
-			{
-				bBody = true;
-			}
-			// check id of returned article
-			else if (!strncmp(line, "Message-ID: ", 12))
-			{
-				char* p = line + 12;
-				if (strncmp(p, m_pArticleInfo->GetMessageID(), strlen(m_pArticleInfo->GetMessageID())))
-				{
-					if (char* e = strrchr(p, '\r')) *e = '\0'; // remove trailing CR-character
-					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;
-				}
-			}
-		}
-		else if (m_eFormat == Decoder::efUnknown && g_pOptions->GetDecode())
-		{
-			m_eFormat = Decoder::DetectFormat(line, iLen);
-		}
-
-		// write to output file
-		if (((bBody && m_eFormat != Decoder::efUnknown) || !g_pOptions->GetDecode()) && !Write(line, iLen))
-		{
-			Status = adFatalError;
-			break;
-		}
-	}
-
-	free(szLineBuf);
-
-	if (m_pOutFile)
-	{
-		fclose(m_pOutFile);
-	}
-
-	if (!bEnd && Status == adRunning && !IsStopped())
-	{
-		warn("Article %s @ %s failed: article incomplete", m_szInfoName, m_pConnection->GetServer()->GetHost());
-		Status = adFailed;
-	}
-
-	if (IsStopped())
-	{
-		Status = adFailed;
-	}
-
-	if (Status == adRunning)
-	{
-		FreeConnection(true);
-		return DecodeCheck();
-	}
-	else
-	{
-		remove(m_szTempFilename);
-		return Status;
-	}
-}
-
-ArticleDownloader::EStatus ArticleDownloader::CheckResponse(const char* szResponse, const char* szComment)
-{
-	if (!szResponse)
-	{
-		if (!IsStopped())
-		{
-			warn("Article %s @ %s failed, %s: Connection closed by remote host", m_szInfoName, m_pConnection->GetServer()->GetHost(), szComment);
-		}
-		return adConnectError;
-	}
-	else if (m_pConnection->GetAuthError() || !strncmp(szResponse, "400", 3) || !strncmp(szResponse, "499", 3))
-	{
-		warn("Article %s @ %s failed, %s: %s", m_szInfoName, m_pConnection->GetServer()->GetHost(), szComment, szResponse);
-		return adConnectError;
-	}
-	else if (!strncmp(szResponse, "41", 2) || !strncmp(szResponse, "42", 2))
-	{
-		warn("Article %s @ %s failed, %s: %s", m_szInfoName, m_pConnection->GetServer()->GetHost(), szComment, szResponse);
-		return adNotFound;
-	}
-	else if (!strncmp(szResponse, "2", 1))
-	{
-		// OK
-		return adFinished;
-	}
-	else 
-	{
-		// unknown error, no special handling
-		warn("Article %s @ %s failed, %s: %s", m_szInfoName, m_pConnection->GetServer()->GetHost(), szComment, szResponse);
-		return adFailed;
-	}
-}
-
-bool ArticleDownloader::Write(char* szLine, int iLen)
-{
-	if (!m_pOutFile && !PrepareFile(szLine))
-	{
-		return false;
-	}
-
-	if (g_pOptions->GetDecode())
-	{
-		if (m_eFormat == Decoder::efYenc)
-		{
-			return m_YDecoder.Write(szLine, iLen, m_pOutFile);
-		}
-		else if (m_eFormat == Decoder::efUx)
-		{
-			return m_UDecoder.Write(szLine, iLen, m_pOutFile);
-		}
-		else
-		{
-			return false;
-		}
-	}
-	else
-	{
-		return fwrite(szLine, 1, iLen, m_pOutFile) > 0;
-	}
-}
-
-bool ArticleDownloader::PrepareFile(char* szLine)
-{
-	bool bOpen = false;
-
-	// prepare file for writing
-	if (m_eFormat == Decoder::efYenc)
-	{
-		if (!strncmp(szLine, "=ybegin ", 8))
-		{
-			if (g_pOptions->GetDupeCheck())
-			{
-				m_pFileInfo->LockOutputFile();
-				if (!m_pFileInfo->GetOutputInitialized())
-				{
-					char* pb = strstr(szLine, " name=");
-					if (pb)
-					{
-						pb += 6; //=strlen(" name=")
-						char* pe;
-						for (pe = pb; *pe != '\0' && *pe != '\n' && *pe != '\r'; pe++) ;
-						if (!m_szArticleFilename)
-						{
-							m_szArticleFilename = (char*)malloc(pe - pb + 1);
-							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())
-				{
-					m_pFileInfo->SetOutputInitialized(true);
-				}
-				m_pFileInfo->UnlockOutputFile();
-			}
-
-			if (g_pOptions->GetDirectWrite())
-			{
-				char* pb = strstr(szLine, " size=");
-				if (pb) 
-				{
-					m_pFileInfo->LockOutputFile();
-					if (!m_pFileInfo->GetOutputInitialized())
-					{
-						pb += 6; //=strlen(" size=")
-						long iArticleFilesize = atol(pb);
-						if (!Util::SetFileSize(m_szOutputFilename, iArticleFilesize))
-						{
-							error("Could not create file %s!", m_szOutputFilename);
-							return false;
-						}
-						m_pFileInfo->SetOutputInitialized(true);
-					}
-					m_pFileInfo->UnlockOutputFile();
-					bOpen = true;
-				}
-			}
-			else
-			{
-				bOpen = true;
-			}
-		}
-	}
-	else
-	{
-		bOpen = true;
-	}
-
-	if (bOpen)
-	{
-		bool bDirectWrite = g_pOptions->GetDirectWrite() && m_eFormat == Decoder::efYenc;
-		const char* szFilename = bDirectWrite ? m_szOutputFilename : m_szTempFilename;
-		m_pOutFile = fopen(szFilename, bDirectWrite ? "r+" : "w");
-		if (!m_pOutFile)
-		{
-			error("Could not %s file %s", bDirectWrite ? "open" : "create", szFilename);
-			return false;
-		}
-		if (g_pOptions->GetWriteBufferSize() == -1)
-		{
-			setvbuf(m_pOutFile, (char *)NULL, _IOFBF, m_pArticleInfo->GetSize());
-		}
-		else if (g_pOptions->GetWriteBufferSize() > 0)
-		{
-			setvbuf(m_pOutFile, (char *)NULL, _IOFBF, g_pOptions->GetWriteBufferSize());
-		}
-	}
-
-	return true;
-}
-
-ArticleDownloader::EStatus ArticleDownloader::DecodeCheck()
-{
-	bool bDirectWrite = g_pOptions->GetDirectWrite() && m_eFormat == Decoder::efYenc;
-
-	if (g_pOptions->GetDecode())
-	{
-		SetStatus(adDecoding);
-
-		Decoder* pDecoder = NULL;
-
-		if (m_eFormat == Decoder::efYenc)
-		{
-			pDecoder = &m_YDecoder;
-		}
-		else if (m_eFormat == Decoder::efUx)
-		{
-			pDecoder = &m_UDecoder;
-		}
-		else
-		{
-			warn("Decoding %s failed: no binary data or unsupported encoding format", m_szInfoName);
-			return adFatalError;
-		}
-
-		Decoder::EStatus eStatus = pDecoder->Check();
-		bool bOK = eStatus == Decoder::eFinished;
-
-		if (!bDirectWrite && bOK)
-		{
-			if (!Util::MoveFile(m_szTempFilename, m_szResultFilename))
-			{
-				error("Could not rename file %s to %s! Errcode: %i", m_szTempFilename, m_szResultFilename, errno);
-			}
-		}
-
-		if (!m_szArticleFilename && pDecoder->GetArticleFilename())
-		{
-			m_szArticleFilename = strdup(pDecoder->GetArticleFilename());
-		}
-
-		remove(m_szTempFilename);
-
-		if (bOK)
-		{
-			detail("Successfully downloaded %s", m_szInfoName);
-
-			if (bDirectWrite && g_pOptions->GetContinuePartial())
-			{
-				// create empty flag-file to indicate that the artcile was downloaded
-				FILE* flagfile = fopen(m_szResultFilename, "w");
-				if (!flagfile)
-				{
-					error("Could not create file %s", m_szResultFilename);
-					// this error can be ignored
-				}
-				fclose(flagfile);
-			}
-
-			return adFinished;
-		}
-		else
-		{
-			remove(m_szResultFilename);
-			if (eStatus == Decoder::eCrcError)
-			{
-				warn("Decoding %s failed: CRC-Error", m_szInfoName);
-				return adCrcError;
-			}
-			else if (eStatus == Decoder::eArticleIncomplete)
-			{
-				warn("Decoding %s failed: article incomplete", m_szInfoName);
-				return adFailed;
-			}
-			else if (eStatus == Decoder::eInvalidSize)
-			{
-				warn("Decoding %s failed: size mismatch", m_szInfoName);
-				return adFailed;
-			}
-			else if (eStatus == Decoder::eNoBinaryData)
-			{
-				warn("Decoding %s failed: no binary data found", m_szInfoName);
-				return adFailed;
-			}
-			else
-			{
-				warn("Decoding %s failed", m_szInfoName);
-				return adFailed;
-			}
-		}
-	}
-	else 
-	{
-		// rawmode
-		if (Util::MoveFile(m_szTempFilename, m_szResultFilename))
-		{
-			detail("Article %s successfully downloaded", m_szInfoName);
-		}
-		else
-		{
-			error("Could not move file %s to %s! Errcode: %i", m_szTempFilename, m_szResultFilename, errno);
-		}
-		return adFinished;
-	}
-}
-
-void ArticleDownloader::LogDebugInfo()
-{
-	char szTime[50];
-#ifdef HAVE_CTIME_R_3
-		ctime_r(&m_tLastUpdateTime, szTime, 50);
-#else
-		ctime_r(&m_tLastUpdateTime, szTime);
-#endif
-
-	debug("      Download: status=%i, LastUpdateTime=%s, filename=%s", m_eStatus, szTime, Util::BaseFileName(GetTempFilename()));
-}
-
-void ArticleDownloader::Stop()
-{
-	debug("Trying to stop ArticleDownloader");
-	Thread::Stop();
-	m_mutexConnection.Lock();
-	if (m_pConnection)
-	{
-		m_pConnection->Cancel();
-	}
-	m_mutexConnection.Unlock();
-	debug("ArticleDownloader stopped successfully");
-}
-
-bool ArticleDownloader::Terminate()
-{
-	NNTPConnection* pConnection = m_pConnection;
-	bool terminated = Kill();
-	if (terminated && pConnection)
-	{
-		debug("Terminating connection");
-		pConnection->Cancel();
-		pConnection->Disconnect();
-		g_pServerPool->FreeConnection(pConnection, true);
-	}
-	return terminated;
-}
-
-void ArticleDownloader::FreeConnection(bool bKeepConnected)
-{
-	if (m_pConnection)							
-	{
-		debug("Releasing connection");
-		m_mutexConnection.Lock();
-		if (!bKeepConnected || m_pConnection->GetStatus() == Connection::csCancelled)
-		{
-			m_pConnection->Disconnect();
-		}
-		g_pServerPool->FreeConnection(m_pConnection, true);
-		m_pConnection = NULL;
-		m_mutexConnection.Unlock();
-	}
-}
-
-void ArticleDownloader::CompleteFileParts()
-{
-	debug("Completing file parts");
-	debug("ArticleFilename: %s", m_pFileInfo->GetFilename());
-
-	SetStatus(adJoining);
-
-	bool bDirectWrite = g_pOptions->GetDirectWrite() && m_pFileInfo->GetOutputInitialized();
-
-	char szNZBNiceName[1024];
-	m_pFileInfo->GetNZBInfo()->GetNiceNZBName(szNZBNiceName, 1024);
-	
-	char InfoFilename[1024];
-	snprintf(InfoFilename, 1024, "%s%c%s", szNZBNiceName, (int)PATH_SEPARATOR, m_pFileInfo->GetFilename());
-	InfoFilename[1024-1] = '\0';
-
-	if (!g_pOptions->GetDecode())
-	{
-		detail("Moving articles for %s", InfoFilename);
-	}
-	else if (bDirectWrite)
-	{
-		detail("Checking articles for %s", InfoFilename);
-	}
-	else
-	{
-		detail("Joining articles for %s", InfoFilename);
-	}
-
-	char ofn[1024];
-	snprintf(ofn, 1024, "%s%c%s", m_pFileInfo->GetNZBInfo()->GetDestDir(), (int)PATH_SEPARATOR, m_pFileInfo->GetFilename());
-	ofn[1024-1] = '\0';
-
-	// Ensure the DstDir is created
-	if (!Util::CreateDirectory(m_pFileInfo->GetNZBInfo()->GetDestDir()))
-	{
-		error("Could not create directory %s! Errcode: %i", m_pFileInfo->GetNZBInfo()->GetDestDir(), errno);
-		SetStatus(adJoined);
-		return;
-	}
-
-	// prevent overwriting existing files
-	int dupcount = 0;
-	while (Util::FileExists(ofn))
-	{
-		dupcount++;
-		snprintf(ofn, 1024, "%s%c%s_duplicate%d", m_pFileInfo->GetNZBInfo()->GetDestDir(), (int)PATH_SEPARATOR, m_pFileInfo->GetFilename(), dupcount);
-		ofn[1024-1] = '\0';
-	}
-
-	FILE* outfile = NULL;
-	char tmpdestfile[1024];
-	snprintf(tmpdestfile, 1024, "%s.tmp", ofn);
-	tmpdestfile[1024-1] = '\0';
-
-	if (g_pOptions->GetDecode() && !bDirectWrite)
-	{
-		remove(tmpdestfile);
-		outfile = fopen(tmpdestfile, "w+");
-		if (!outfile)
-		{
-			error("Could not create file %s!", tmpdestfile);
-			SetStatus(adJoined);
-			return;
-		}
-		if (g_pOptions->GetWriteBufferSize() == -1 && (*m_pFileInfo->GetArticles())[0])
-		{
-			setvbuf(outfile, (char *)NULL, _IOFBF, (*m_pFileInfo->GetArticles())[0]->GetSize());
-		}
-		else if (g_pOptions->GetWriteBufferSize() > 0)
-		{
-			setvbuf(outfile, (char *)NULL, _IOFBF, g_pOptions->GetWriteBufferSize());
-		}
-	}
-	else if (!g_pOptions->GetDecode())
-	{
-		remove(tmpdestfile);
-		if (!Util::CreateDirectory(ofn))
-		{
-			error("Could not create directory %s! Errcode: %i", ofn, errno);
-			SetStatus(adJoined);
-			return;
-		}
-	}
-
-	bool complete = true;
-	int iBrokenCount = 0;
-	static const int BUFFER_SIZE = 1024 * 50;
-	char* buffer = NULL;
-
-	if (g_pOptions->GetDecode() && !bDirectWrite)
-	{
-		buffer = (char*)malloc(BUFFER_SIZE);
-	}
-
-	for (FileInfo::Articles::iterator it = m_pFileInfo->GetArticles()->begin(); it != m_pFileInfo->GetArticles()->end(); it++)
-	{
-		ArticleInfo* pa = *it;
-		if (pa->GetStatus() != ArticleInfo::aiFinished)
-		{
-			iBrokenCount++;
-			complete = false;
-		}
-		else if (g_pOptions->GetDecode() && !bDirectWrite)
-		{
-			FILE* infile;
-			const char* fn = pa->GetResultFilename();
-
-			infile = fopen(fn, "r");
-			if (infile)
-			{
-				int cnt = BUFFER_SIZE;
-
-				while (cnt == BUFFER_SIZE)
-				{
-					cnt = (int)fread(buffer, 1, BUFFER_SIZE, infile);
-					fwrite(buffer, 1, cnt, outfile);
-					SetLastUpdateTimeNow();
-				}
-
-				fclose(infile);
-			}
-			else
-			{
-				complete = false;
-				iBrokenCount++;
-				detail("Could not find file %s. Status is broken", fn);
-			}
-		}
-		else if (!g_pOptions->GetDecode())
-		{
-			const char* fn = pa->GetResultFilename();
-			char dstFileName[1024];
-			snprintf(dstFileName, 1024, "%s%c%03i", ofn, (int)PATH_SEPARATOR, pa->GetPartNumber());
-			dstFileName[1024-1] = '\0';
-			if (!Util::MoveFile(fn, dstFileName))
-			{
-				error("Could not move file %s to %s! Errcode: %i", fn, dstFileName, errno);
-			}
-		}
-	}
-
-	if (buffer)
-	{
-		free(buffer);
-	}
-
-	if (outfile)
-	{
-		fclose(outfile);
-		if (!Util::MoveFile(tmpdestfile, ofn))
-		{
-			error("Could not move file %s to %s! Errcode: %i", tmpdestfile, ofn, errno);
-		}
-	}
-
-	if (bDirectWrite)
-	{
-		if (!Util::MoveFile(m_szOutputFilename, ofn))
-		{
-			error("Could not move file %s to %s! Errcode: %i", m_szOutputFilename, ofn, errno);
-		}
-	}
-
-	if (!bDirectWrite || g_pOptions->GetContinuePartial())
-	{
-		for (FileInfo::Articles::iterator it = m_pFileInfo->GetArticles()->begin(); it != m_pFileInfo->GetArticles()->end(); it++)
-		{
-			ArticleInfo* pa = *it;
-			remove(pa->GetResultFilename());
-		}
-	}
-
-	if (complete)
-	{
-		info("Successfully downloaded %s", InfoFilename);
-	}
-	else
-	{
-		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);
-			}
-		}
-		else
-		{
-			detail("Not renaming broken file %s", ofn);
-		}
-
-		if (g_pOptions->GetCreateBrokenLog())
-		{
-			char szBrokenLogName[1024];
-			snprintf(szBrokenLogName, 1024, "%s%c_brokenlog.txt", m_pFileInfo->GetNZBInfo()->GetDestDir(), (int)PATH_SEPARATOR);
-			szBrokenLogName[1024-1] = '\0';
-			FILE* file = fopen(szBrokenLogName, "a");
-			fprintf(file, "%s (%i/%i)\n", m_pFileInfo->GetFilename(), m_pFileInfo->GetArticles()->size() - iBrokenCount, m_pFileInfo->GetArticles()->size());
-			fclose(file);
-		}
-	}
-
-	SetStatus(adJoined);
-}

BinRpc.cpp

@@ -1,772 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  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
- *  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>
-#ifndef WIN32
-#include <unistd.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#endif
-
-#include "nzbget.h"
-#include "BinRpc.h"
-#include "Log.h"
-#include "Options.h"
-#include "QueueCoordinator.h"
-#include "QueueEditor.h"
-#include "PrePostProcessor.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-extern QueueCoordinator* g_pQueueCoordinator;
-extern PrePostProcessor* g_pPrePostProcessor;
-extern void ExitProc();
-
-const char* g_szMessageRequestNames[] =
-    { "N/A", "Download", "Pause/Unpause", "List", "Set download rate", "Dump debug", 
-		"Edit queue", "Log", "Quit", "Version", "Post-queue" };
-
-const unsigned int g_iMessageRequestSizes[] =
-    { 0,
-		sizeof(SNZBDownloadRequest),
-		sizeof(SNZBPauseUnpauseRequest),
-		sizeof(SNZBListRequest),
-		sizeof(SNZBSetDownloadRateRequest),
-		sizeof(SNZBDumpDebugRequest),
-		sizeof(SNZBEditQueueRequest),
-		sizeof(SNZBLogRequest),
-		sizeof(SNZBShutdownRequest),
-		sizeof(SNZBVersionRequest),
-		sizeof(SNZBPostQueueRequest),
-    };
-
-//*****************************************************************
-// BinProcessor
-
-void BinRpcProcessor::Execute()
-{
-	// Read the first package which needs to be a request
-	int iBytesReceived = recv(m_iSocket, ((char*)&m_MessageBase) + sizeof(m_MessageBase.m_iSignature), sizeof(m_MessageBase) - sizeof(m_MessageBase.m_iSignature), 0);
-	if (iBytesReceived < 0)
-	{
-		return;
-	}
-
-	// Make sure this is a nzbget request from a client
-	if ((int)ntohl(m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE)
-	{
-		warn("Non-nzbget request received on port %i from %s", g_pOptions->GetServerPort(), m_szClientIP);
-		return;
-	}
-
-	if (strcmp(m_MessageBase.m_szPassword, g_pOptions->GetServerPassword()))
-	{
-		warn("nzbget request received on port %i from %s, but password invalid", g_pOptions->GetServerPort(), m_szClientIP);
-		return;
-	}
-
-	debug("%s request received from %s", g_szMessageRequestNames[ntohl(m_MessageBase.m_iType)], m_szClientIP);
-
-	Dispatch();
-}
-
-void BinRpcProcessor::Dispatch()
-{
-	if (ntohl(m_MessageBase.m_iType) >= (int)eRemoteRequestDownload &&
-		   ntohl(m_MessageBase.m_iType) <= (int)eRemoteRequestPostQueue &&
-		   g_iMessageRequestSizes[ntohl(m_MessageBase.m_iType)] != ntohl(m_MessageBase.m_iStructSize))
-	{
-		error("Invalid size of request: needed %i Bytes, but received %i Bytes",
-			 g_iMessageRequestSizes[ntohl(m_MessageBase.m_iType)], ntohl(m_MessageBase.m_iStructSize));
-		return;
-	}
-	
-	BinCommand* command = NULL;
-
-	switch (ntohl(m_MessageBase.m_iType))
-	{
-		case eRemoteRequestDownload:
-			{
-				command = new DownloadBinCommand();
-				break;
-			}
-
-		case eRemoteRequestList:
-			{
-				command = new ListBinCommand();
-				break;
-			}
-
-		case eRemoteRequestLog:
-			{
-				command = new LogBinCommand();
-				break;
-			}
-
-		case eRemoteRequestPauseUnpause:
-			{
-				command = new PauseUnpauseBinCommand();
-				break;
-			}
-
-		case eRemoteRequestEditQueue:
-			{
-				command = new EditQueueBinCommand();
-				break;
-			}
-
-		case eRemoteRequestSetDownloadRate:
-			{
-				command = new SetDownloadRateBinCommand();
-				break;
-			}
-
-		case eRemoteRequestDumpDebug:
-			{
-				command = new DumpDebugBinCommand();
-				break;
-			}
-
-		case eRemoteRequestShutdown:
-			{
-				command = new ShutdownBinCommand();
-				break;
-			}
-
-		case eRemoteRequestVersion:
-			{
-				command = new VersionBinCommand();
-				break;
-			}
-
-		case eRemoteRequestPostQueue:
-			{
-				command = new PostQueueBinCommand();
-				break;
-			}
-
-		case eRemoteRequestWriteLog:
-			{
-				command = new WriteLogBinCommand();
-				break;
-			}
-
-		default:
-			error("Received unsupported request %i", ntohl(m_MessageBase.m_iType));
-			break;
-	}
-
-	if (command)
-	{
-		command->SetSocket(m_iSocket);
-		command->SetMessageBase(&m_MessageBase);
-		command->Execute();
-		delete command;
-	}
-}
-
-//*****************************************************************
-// Commands
-
-void BinCommand::SendBoolResponse(bool bSuccess, const char* szText)
-{
-	// all bool-responses have the same format of structure, we use SNZBDownloadResponse here
-	SNZBDownloadResponse BoolResponse;
-	memset(&BoolResponse, 0, sizeof(BoolResponse));
-	BoolResponse.m_MessageBase.m_iSignature = htonl(NZBMESSAGE_SIGNATURE);
-	BoolResponse.m_MessageBase.m_iStructSize = htonl(sizeof(BoolResponse));
-	BoolResponse.m_bSuccess = htonl(bSuccess);
-	int iTextLen = strlen(szText) + 1;
-	BoolResponse.m_iTrailingDataLength = htonl(iTextLen);
-
-	// Send the request answer
-	send(m_iSocket, (char*) &BoolResponse, sizeof(BoolResponse), 0);
-	send(m_iSocket, (char*)szText, iTextLen, 0);
-}
-
-bool BinCommand::ReceiveRequest(void* pBuffer, int iSize)
-{
-	memcpy(pBuffer, m_pMessageBase, sizeof(SNZBRequestBase));
-	iSize -= sizeof(SNZBRequestBase);
-	if (iSize > 0)
-	{
-		int iBytesReceived = recv(m_iSocket, ((char*)pBuffer) + sizeof(SNZBRequestBase), iSize, 0);
-		if (iBytesReceived != iSize)
-		{
-			error("invalid request");
-			return false;
-		}
-	}
-	return true;
-}
-
-void PauseUnpauseBinCommand::Execute()
-{
-	SNZBPauseUnpauseRequest PauseUnpauseRequest;
-	if (!ReceiveRequest(&PauseUnpauseRequest, sizeof(PauseUnpauseRequest)))
-	{
-		return;
-	}
-
-	g_pOptions->SetPause(ntohl(PauseUnpauseRequest.m_bPause));
-	SendBoolResponse(true, "Pause-/Unpause-Command completed successfully");
-}
-
-void SetDownloadRateBinCommand::Execute()
-{
-	SNZBSetDownloadRateRequest SetDownloadRequest;
-	if (!ReceiveRequest(&SetDownloadRequest, sizeof(SetDownloadRequest)))
-	{
-		return;
-	}
-
-	g_pOptions->SetDownloadRate(ntohl(SetDownloadRequest.m_iDownloadRate) / 1024.0f);
-	SendBoolResponse(true, "Rate-Command completed successfully");
-}
-
-void DumpDebugBinCommand::Execute()
-{
-	SNZBDumpDebugRequest DumpDebugRequest;
-	if (!ReceiveRequest(&DumpDebugRequest, sizeof(DumpDebugRequest)))
-	{
-		return;
-	}
-
-	g_pQueueCoordinator->LogDebugInfo();
-	SendBoolResponse(true, "Debug-Command completed successfully");
-}
-
-void ShutdownBinCommand::Execute()
-{
-	SNZBShutdownRequest ShutdownRequest;
-	if (!ReceiveRequest(&ShutdownRequest, sizeof(ShutdownRequest)))
-	{
-		return;
-	}
-
-	SendBoolResponse(true, "Stopping server");
-	ExitProc();
-}
-
-void VersionBinCommand::Execute()
-{
-	SNZBVersionRequest VersionRequest;
-	if (!ReceiveRequest(&VersionRequest, sizeof(VersionRequest)))
-	{
-		return;
-	}
-
-	SendBoolResponse(true, VERSION);
-}
-
-void DownloadBinCommand::Execute()
-{
-	SNZBDownloadRequest DownloadRequest;
-	if (!ReceiveRequest(&DownloadRequest, sizeof(DownloadRequest)))
-	{
-		return;
-	}
-
-	char* pRecvBuffer = (char*)malloc(ntohl(DownloadRequest.m_iTrailingDataLength) + 1);
-	char* pBufPtr = pRecvBuffer;
-
-	// Read from the socket until nothing remains
-	int iResult = 0;
-	int NeedBytes = ntohl(DownloadRequest.m_iTrailingDataLength);
-	while (NeedBytes > 0)
-	{
-		iResult = recv(m_iSocket, pBufPtr, NeedBytes, 0);
-		// Did the recv succeed?
-		if (iResult <= 0)
-		{
-			error("invalid request");
-			break;
-		}
-		pBufPtr += iResult;
-		NeedBytes -= iResult;
-	}
-
-	if (NeedBytes == 0)
-	{
-		NZBFile* pNZBFile = NZBFile::CreateFromBuffer(DownloadRequest.m_szFilename, pRecvBuffer, ntohl(DownloadRequest.m_iTrailingDataLength));
-
-		if (pNZBFile)
-		{
-			info("Request: Queue collection %s", DownloadRequest.m_szFilename);
-			g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, ntohl(DownloadRequest.m_bAddFirst));
-			delete pNZBFile;
-
-			char tmp[1024];
-			snprintf(tmp, 1024, "Collection %s added to queue", Util::BaseFileName(DownloadRequest.m_szFilename));
-			tmp[1024-1] = '\0';
-			SendBoolResponse(true, tmp);
-		}
-		else
-		{
-			char tmp[1024];
-			snprintf(tmp, 1024, "Download Request failed for %s", Util::BaseFileName(DownloadRequest.m_szFilename));
-			tmp[1024-1] = '\0';
-			SendBoolResponse(false, tmp);
-		}
-	}
-
-	free(pRecvBuffer);
-}
-
-void ListBinCommand::Execute()
-{
-	SNZBListRequest ListRequest;
-	if (!ReceiveRequest(&ListRequest, sizeof(ListRequest)))
-	{
-		return;
-	}
-
-	SNZBListResponse ListResponse;
-	memset(&ListResponse, 0, sizeof(ListResponse));
-	ListResponse.m_MessageBase.m_iSignature = htonl(NZBMESSAGE_SIGNATURE);
-	ListResponse.m_MessageBase.m_iStructSize = htonl(sizeof(ListResponse));
-	ListResponse.m_iEntrySize = htonl(sizeof(SNZBListResponseEntry));
-
-	char* buf = NULL;
-	int bufsize = 0;
-
-	if (ntohl(ListRequest.m_bFileList))
-	{
-		// Make a data structure and copy all the elements of the list into it
-		DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
-
-		int NrEntries = pDownloadQueue->size();
-
-		// calculate required buffer size
-		bufsize = NrEntries * sizeof(SNZBListResponseEntry);
-		for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
-		{
-			FileInfo* pFileInfo = *it;
-			bufsize += strlen(pFileInfo->GetNZBInfo()->GetFilename()) + 1;
-			bufsize += strlen(pFileInfo->GetSubject()) + 1;
-			bufsize += strlen(pFileInfo->GetFilename()) + 1;
-			bufsize += strlen(pFileInfo->GetNZBInfo()->GetDestDir()) + 1;
-			// align struct to 4-bytes, needed by ARM-processor (and may be others)
-			bufsize += bufsize % 4 > 0 ? 4 - bufsize % 4 : 0;
-		}
-
-		buf = (char*) malloc(bufsize);
-		char* bufptr = buf;
-		for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
-		{
-			unsigned long iSizeHi, iSizeLo;
-			FileInfo* pFileInfo = *it;
-			SNZBListResponseEntry* pListAnswer = (SNZBListResponseEntry*) bufptr;
-			pListAnswer->m_iID				= htonl(pFileInfo->GetID());
-			Util::SplitInt64(pFileInfo->GetSize(), &iSizeHi, &iSizeLo);
-			pListAnswer->m_iFileSizeLo		= htonl(iSizeLo);
-			pListAnswer->m_iFileSizeHi		= htonl(iSizeHi);
-			Util::SplitInt64(pFileInfo->GetRemainingSize(), &iSizeHi, &iSizeLo);
-			pListAnswer->m_iRemainingSizeLo	= htonl(iSizeLo);
-			pListAnswer->m_iRemainingSizeHi	= htonl(iSizeHi);
-			pListAnswer->m_bFilenameConfirmed = htonl(pFileInfo->GetFilenameConfirmed());
-			pListAnswer->m_bPaused			= htonl(pFileInfo->GetPaused());
-			pListAnswer->m_iNZBFilenameLen	= htonl(strlen(pFileInfo->GetNZBInfo()->GetFilename()) + 1);
-			pListAnswer->m_iSubjectLen		= htonl(strlen(pFileInfo->GetSubject()) + 1);
-			pListAnswer->m_iFilenameLen		= htonl(strlen(pFileInfo->GetFilename()) + 1);
-			pListAnswer->m_iDestDirLen		= htonl(strlen(pFileInfo->GetNZBInfo()->GetDestDir()) + 1);
-			bufptr += sizeof(SNZBListResponseEntry);
-			strcpy(bufptr, pFileInfo->GetNZBInfo()->GetFilename());
-			bufptr += ntohl(pListAnswer->m_iNZBFilenameLen);
-			strcpy(bufptr, pFileInfo->GetSubject());
-			bufptr += ntohl(pListAnswer->m_iSubjectLen);
-			strcpy(bufptr, pFileInfo->GetFilename());
-			bufptr += ntohl(pListAnswer->m_iFilenameLen);
-			strcpy(bufptr, pFileInfo->GetNZBInfo()->GetDestDir());
-			bufptr += ntohl(pListAnswer->m_iDestDirLen);
-			// align struct to 4-bytes, needed by ARM-processor (and may be others)
-			if ((size_t)bufptr % 4 > 0)
-			{
-				pListAnswer->m_iDestDirLen = htonl(ntohl(pListAnswer->m_iDestDirLen) + 4 - (size_t)bufptr % 4);
-				bufptr += 4 - (size_t)bufptr % 4;
-			}
-		}
-
-		g_pQueueCoordinator->UnlockQueue();
-
-		ListResponse.m_iNrTrailingEntries = htonl(NrEntries);
-		ListResponse.m_iTrailingDataLength = htonl(bufsize);
-	}
-
-	if (htonl(ListRequest.m_bServerState))
-	{
-		unsigned long iSizeHi, iSizeLo;
-		ListResponse.m_iDownloadRate = htonl((int)(g_pQueueCoordinator->CalcCurrentDownloadSpeed() * 1024));
-		Util::SplitInt64(g_pQueueCoordinator->CalcRemainingSize(), &iSizeHi, &iSizeLo);
-		ListResponse.m_iRemainingSizeHi = htonl(iSizeHi);
-		ListResponse.m_iRemainingSizeLo = htonl(iSizeLo);
-		ListResponse.m_iDownloadLimit = htonl((int)(g_pOptions->GetDownloadRate() * 1024));
-		ListResponse.m_bServerPaused = htonl(g_pOptions->GetPause());
-		ListResponse.m_iThreadCount = htonl(Thread::GetThreadCount() - 1); // not counting itself
-		PostQueue* pPostQueue = g_pPrePostProcessor->LockPostQueue();
-		ListResponse.m_iPostJobCount = htonl(pPostQueue->size());
-		g_pPrePostProcessor->UnlockPostQueue();
-
-		int iUpTimeSec, iDnTimeSec;
-		long long iAllBytes;
-		bool bStandBy;
-		g_pQueueCoordinator->CalcStat(&iUpTimeSec, &iDnTimeSec, &iAllBytes, &bStandBy);
-		ListResponse.m_iUpTimeSec = htonl(iUpTimeSec);
-		ListResponse.m_iDownloadTimeSec = htonl(iDnTimeSec);
-		ListResponse.m_bServerStandBy = htonl(bStandBy);
-		Util::SplitInt64(iAllBytes, &iSizeHi, &iSizeLo);
-		ListResponse.m_iDownloadedBytesHi = htonl(iSizeHi);
-		ListResponse.m_iDownloadedBytesLo = htonl(iSizeLo);
-	}
-
-	// Send the request answer
-	send(m_iSocket, (char*) &ListResponse, sizeof(ListResponse), 0);
-
-	// Send the data
-	if (bufsize > 0)
-	{
-		send(m_iSocket, buf, bufsize, 0);
-	}
-
-	if (buf)
-	{
-		free(buf);
-	}
-}
-
-void LogBinCommand::Execute()
-{
-	SNZBLogRequest LogRequest;
-	if (!ReceiveRequest(&LogRequest, sizeof(LogRequest)))
-	{
-		return;
-	}
-
-	Log::Messages* pMessages = g_pLog->LockMessages();
-
-	int iNrEntries = ntohl(LogRequest.m_iLines);
-	unsigned int iIDFrom = ntohl(LogRequest.m_iIDFrom);
-	int iStart = pMessages->size();
-	if (iNrEntries > 0)
-	{
-		if (iNrEntries > (int)pMessages->size())
-		{
-			iNrEntries = pMessages->size();
-		}
-		iStart = pMessages->size() - iNrEntries;
-	}
-	if (iIDFrom > 0 && !pMessages->empty())
-	{
-		iStart = iIDFrom - pMessages->front()->GetID();
-		if (iStart < 0)
-		{
-			iStart = 0;
-		}
-		iNrEntries = pMessages->size() - iStart;
-		if (iNrEntries < 0)
-		{
-			iNrEntries = 0;
-		}
-	}
-
-	// calculate required buffer size
-	int bufsize = iNrEntries * sizeof(SNZBLogResponseEntry);
-	for (unsigned int i = (unsigned int)iStart; i < pMessages->size(); i++)
-	{
-		Message* pMessage = (*pMessages)[i];
-		bufsize += strlen(pMessage->GetText()) + 1;
-		// align struct to 4-bytes, needed by ARM-processor (and may be others)
-		bufsize += bufsize % 4 > 0 ? 4 - bufsize % 4 : 0;
-	}
-
-	char* buf = (char*) malloc(bufsize);
-	char* bufptr = buf;
-	for (unsigned int i = (unsigned int)iStart; i < pMessages->size(); i++)
-	{
-		Message* pMessage = (*pMessages)[i];
-		SNZBLogResponseEntry* pLogAnswer = (SNZBLogResponseEntry*) bufptr;
-		pLogAnswer->m_iID = htonl(pMessage->GetID());
-		pLogAnswer->m_iKind = htonl(pMessage->GetKind());
-		pLogAnswer->m_tTime = htonl((int)pMessage->GetTime());
-		pLogAnswer->m_iTextLen = htonl(strlen(pMessage->GetText()) + 1);
-		bufptr += sizeof(SNZBLogResponseEntry);
-		strcpy(bufptr, pMessage->GetText());
-		bufptr += ntohl(pLogAnswer->m_iTextLen);
-		// align struct to 4-bytes, needed by ARM-processor (and may be others)
-		if ((size_t)bufptr % 4 > 0)
-		{
-			pLogAnswer->m_iTextLen = htonl(ntohl(pLogAnswer->m_iTextLen) + 4 - (size_t)bufptr % 4);
-			bufptr += 4 - (size_t)bufptr % 4;
-		}
-	}
-
-	g_pLog->UnlockMessages();
-
-	SNZBLogResponse LogResponse;
-	LogResponse.m_MessageBase.m_iSignature = htonl(NZBMESSAGE_SIGNATURE);
-	LogResponse.m_MessageBase.m_iStructSize = htonl(sizeof(LogResponse));
-	LogResponse.m_iEntrySize = htonl(sizeof(SNZBLogResponseEntry));
-	LogResponse.m_iNrTrailingEntries = htonl(iNrEntries);
-	LogResponse.m_iTrailingDataLength = htonl(bufsize);
-
-	// Send the request answer
-	send(m_iSocket, (char*) &LogResponse, sizeof(LogResponse), 0);
-
-	// Send the data
-	if (bufsize > 0)
-	{
-		send(m_iSocket, buf, bufsize, 0);
-	}
-
-	free(buf);
-}
-
-void EditQueueBinCommand::Execute()
-{
-	SNZBEditQueueRequest EditQueueRequest;
-	if (!ReceiveRequest(&EditQueueRequest, sizeof(EditQueueRequest)))
-	{
-		return;
-	}
-
-	int iNrEntries = ntohl(EditQueueRequest.m_iNrTrailingEntries);
-	int iAction = ntohl(EditQueueRequest.m_iAction);
-	int iOffset = ntohl(EditQueueRequest.m_iOffset);
-	bool bSmartOrder = ntohl(EditQueueRequest.m_bSmartOrder);
-	unsigned int iBufLength = ntohl(EditQueueRequest.m_iTrailingDataLength);
-
-	if (iNrEntries * sizeof(int32_t) != iBufLength)
-	{
-		error("Invalid struct size");
-		return;
-	}
-
-	if (iNrEntries <= 0)
-	{
-		SendBoolResponse(false, "Edit-Command failed: no IDs specified");
-		return;
-	}
-
-	int32_t* pIDs = (int32_t*)malloc(iBufLength);
-
-	// Read from the socket until nothing remains
-	char* pBufPtr = (char*)pIDs;
-	int NeedBytes = iBufLength;
-	int iResult = 0;
-	while (NeedBytes > 0)
-	{
-		iResult = recv(m_iSocket, pBufPtr, NeedBytes, 0);
-		// Did the recv succeed?
-		if (iResult <= 0)
-		{
-			error("invalid request");
-			break;
-		}
-		pBufPtr += iResult;
-		NeedBytes -= iResult;
-	}
-
-	QueueEditor::IDList cIDList;
-	cIDList.reserve(iNrEntries);
-	for (int i = 0; i < iNrEntries; i++)
-	{
-		cIDList.push_back(ntohl(pIDs[i]));
-	}
-
-	free(pIDs);
-
-	bool bOK = g_pQueueCoordinator->GetQueueEditor()->EditList(&cIDList, bSmartOrder, (QueueEditor::EEditAction)iAction, iOffset);
-
-	if (bOK)
-	{
-		SendBoolResponse(true, "Edit-Command completed successfully");
-	}
-	else
-	{
-		SendBoolResponse(false, "Edit-Command failed");
-	}
-}
-
-void PostQueueBinCommand::Execute()
-{
-	SNZBPostQueueRequest PostQueueRequest;
-	if (!ReceiveRequest(&PostQueueRequest, sizeof(PostQueueRequest)))
-	{
-		return;
-	}
-
-	SNZBPostQueueResponse PostQueueResponse;
-	memset(&PostQueueResponse, 0, sizeof(PostQueueResponse));
-	PostQueueResponse.m_MessageBase.m_iSignature = htonl(NZBMESSAGE_SIGNATURE);
-	PostQueueResponse.m_MessageBase.m_iStructSize = htonl(sizeof(PostQueueResponse));
-	PostQueueResponse.m_iEntrySize = htonl(sizeof(SNZBPostQueueResponseEntry));
-
-	char* buf = NULL;
-	int bufsize = 0;
-
-	// Make a data structure and copy all the elements of the list into it
-	PostQueue* pPostQueue = g_pPrePostProcessor->LockPostQueue();
-
-	int NrEntries = pPostQueue->size();
-
-	// calculate required buffer size
-	bufsize = NrEntries * sizeof(SNZBPostQueueResponseEntry);
-	for (PostQueue::iterator it = pPostQueue->begin(); it != pPostQueue->end(); it++)
-	{
-		PostInfo* pPostInfo = *it;
-		bufsize += strlen(pPostInfo->GetNZBFilename()) + 1;
-		bufsize += strlen(pPostInfo->GetParFilename()) + 1;
-		bufsize += strlen(pPostInfo->GetInfoName()) + 1;
-		bufsize += strlen(pPostInfo->GetDestDir()) + 1;
-		bufsize += strlen(pPostInfo->GetProgressLabel()) + 1;
-		// align struct to 4-bytes, needed by ARM-processor (and may be others)
-		bufsize += bufsize % 4 > 0 ? 4 - bufsize % 4 : 0;
-	}
-
-	time_t tCurTime = time(NULL);
-	buf = (char*) malloc(bufsize);
-	char* bufptr = buf;
-
-	for (PostQueue::iterator it = pPostQueue->begin(); it != pPostQueue->end(); it++)
-	{
-		PostInfo* pPostInfo = *it;
-		SNZBPostQueueResponseEntry* pPostQueueAnswer = (SNZBPostQueueResponseEntry*) bufptr;
-		pPostQueueAnswer->m_iID				= htonl(pPostInfo->GetID());
-		pPostQueueAnswer->m_iStage			= htonl(pPostInfo->GetStage());
-		pPostQueueAnswer->m_iStageProgress	= htonl(pPostInfo->GetStageProgress());
-		pPostQueueAnswer->m_iFileProgress	= htonl(pPostInfo->GetFileProgress());
-		pPostQueueAnswer->m_iTotalTimeSec	= htonl((int)(pPostInfo->GetStartTime() ? tCurTime - pPostInfo->GetStartTime() : 0));
-		pPostQueueAnswer->m_iStageTimeSec	= htonl((int)(pPostInfo->GetStageTime() ? tCurTime - pPostInfo->GetStageTime() : 0));
-		pPostQueueAnswer->m_iNZBFilenameLen		= htonl(strlen(pPostInfo->GetNZBFilename()) + 1);
-		pPostQueueAnswer->m_iParFilename		= htonl(strlen(pPostInfo->GetParFilename()) + 1);
-		pPostQueueAnswer->m_iInfoNameLen		= htonl(strlen(pPostInfo->GetInfoName()) + 1);
-		pPostQueueAnswer->m_iDestDirLen			= htonl(strlen(pPostInfo->GetDestDir()) + 1);
-		pPostQueueAnswer->m_iProgressLabelLen	= htonl(strlen(pPostInfo->GetProgressLabel()) + 1);
-		bufptr += sizeof(SNZBPostQueueResponseEntry);
-		strcpy(bufptr, pPostInfo->GetNZBFilename());
-		bufptr += ntohl(pPostQueueAnswer->m_iNZBFilenameLen);
-		strcpy(bufptr, pPostInfo->GetParFilename());
-		bufptr += ntohl(pPostQueueAnswer->m_iParFilename);
-		strcpy(bufptr, pPostInfo->GetInfoName());
-		bufptr += ntohl(pPostQueueAnswer->m_iInfoNameLen);
-		strcpy(bufptr, pPostInfo->GetDestDir());
-		bufptr += ntohl(pPostQueueAnswer->m_iDestDirLen);
-		strcpy(bufptr, pPostInfo->GetProgressLabel());
-		bufptr += ntohl(pPostQueueAnswer->m_iProgressLabelLen);
-		// align struct to 4-bytes, needed by ARM-processor (and may be others)
-		if ((size_t)bufptr % 4 > 0)
-		{
-			pPostQueueAnswer->m_iProgressLabelLen = htonl(ntohl(pPostQueueAnswer->m_iProgressLabelLen) + 4 - (size_t)bufptr % 4);
-			bufptr += 4 - (size_t)bufptr % 4;
-		}
-	}
-
-	g_pPrePostProcessor->UnlockPostQueue();
-
-	PostQueueResponse.m_iNrTrailingEntries = htonl(NrEntries);
-	PostQueueResponse.m_iTrailingDataLength = htonl(bufsize);
-
-	// Send the request answer
-	send(m_iSocket, (char*) &PostQueueResponse, sizeof(PostQueueResponse), 0);
-
-	// Send the data
-	if (bufsize > 0)
-	{
-		send(m_iSocket, buf, bufsize, 0);
-	}
-
-	if (buf)
-	{
-		free(buf);
-	}
-}
-
-void WriteLogBinCommand::Execute()
-{
-	SNZBWriteLogRequest WriteLogRequest;
-	if (!ReceiveRequest(&WriteLogRequest, sizeof(WriteLogRequest)))
-	{
-		return;
-	}
-
-	char* pRecvBuffer = (char*)malloc(ntohl(WriteLogRequest.m_iTrailingDataLength) + 1);
-	char* pBufPtr = pRecvBuffer;
-
-	// Read from the socket until nothing remains
-	int iResult = 0;
-	int NeedBytes = ntohl(WriteLogRequest.m_iTrailingDataLength);
-	pRecvBuffer[NeedBytes] = '\0';
-	while (NeedBytes > 0)
-	{
-		iResult = recv(m_iSocket, pBufPtr, NeedBytes, 0);
-		// Did the recv succeed?
-		if (iResult <= 0)
-		{
-			error("invalid request");
-			break;
-		}
-		pBufPtr += iResult;
-		NeedBytes -= iResult;
-	}
-
-	if (NeedBytes == 0)
-	{
-		bool OK = true;
-		switch ((Message::EKind)ntohl(WriteLogRequest.m_iKind))
-		{
-			case Message::mkDetail:
-				detail(pRecvBuffer);
-				break;
-			case Message::mkInfo:
-				info(pRecvBuffer);
-				break;
-			case Message::mkWarning:
-				warn(pRecvBuffer);
-				break;
-			case Message::mkError:
-				error(pRecvBuffer);
-				break;
-			case Message::mkDebug:
-				debug(pRecvBuffer);
-				break;
-			default:
-				OK = false;
-		}
-		SendBoolResponse(OK, OK ? "Message added to log" : "Invalid message-kind");
-	}
-
-	free(pRecvBuffer);
-}

Connection.cpp

@@ -1,568 +0,0 @@
-/*
- *  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>
-#ifndef WIN32
-#include <netdb.h>
-#include <unistd.h>
-#include <errno.h>
-#include <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#endif
-
-#include "nzbget.h"
-#include "Connection.h"
-#include "Log.h"
-
-static const int CONNECTION_READBUFFER_SIZE = 1024;
-
-void Connection::Init()
-{
-	debug("Intiializing global connection data");
-
-#ifdef WIN32
-	WSADATA wsaData;
-	int err = WSAStartup(MAKEWORD(2, 0), &wsaData);
-	if (err != 0) 
-	{
-		error("Could not initialize socket library");
-		return;
-	}
-	if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE( wsaData.wVersion ) != 0) 
-	{
-		error("Could not initialize socket library");
-		WSACleanup();
-		return; 
-	}
-#endif
-}
-
-void Connection::Final()
-{
-	debug("Finalizing global connection data");
-
-#ifdef WIN32
-	WSACleanup();
-#endif
-}
-
-
-Connection::Connection(NetAddress* pNetAddress)
-{
-	debug("Creating Connection");
-
-	m_pNetAddress		= pNetAddress;
-	m_eStatus			= csDisconnected;
-	m_iSocket			= INVALID_SOCKET;
-	m_iBufAvail			= 0;
-	m_iTimeout			= 60;
-	m_bSuppressErrors	= true;
-	m_szReadBuf			= (char*)malloc(CONNECTION_READBUFFER_SIZE + 1);
-	m_bAutoClose		= true;
-}
-
-Connection::Connection(SOCKET iSocket, bool bAutoClose)
-{
-	debug("Creating Connection");
-
-	m_pNetAddress		= NULL;
-	m_eStatus			= csConnected;
-	m_iSocket			= iSocket;
-	m_iBufAvail			= 0;
-	m_iTimeout			= 60;
-	m_bSuppressErrors	= true;
-	m_szReadBuf			= (char*)malloc(CONNECTION_READBUFFER_SIZE + 1);
-	m_bAutoClose		= bAutoClose;
-}
-
-Connection::~Connection()
-{
-	debug("Destroying Connection");
-
-	if (m_eStatus == csConnected && m_bAutoClose)
-	{
-		Disconnect();
-	}
-	free(m_szReadBuf);
-}
-
-int Connection::Connect()
-{
-	debug("Connecting");
-
-	if (m_eStatus == csConnected)
-		return 0;
-
-	int iRes = DoConnect();
-
-	if (iRes >= 0)
-		m_eStatus = csConnected;
-	else
-		Connection::DoDisconnect();
-
-	return iRes;
-}
-
-int Connection::Disconnect()
-{
-	debug("Disconnecting");
-
-	if (m_eStatus == csDisconnected)
-		return 0;
-
-	int iRes = DoDisconnect();
-
-	m_eStatus = csDisconnected;
-	m_iSocket = INVALID_SOCKET;
-	m_iBufAvail = 0;
-
-	return iRes;
-}
-
-int Connection::Bind()
-{
-	debug("Binding");
-
-	if (m_eStatus == csListening)
-	{
-		return 0;
-	}
-
-	int iRes = DoBind();
-
-	if (iRes == 0)
-	{
-		m_eStatus = csListening;
-	}
-
-	return iRes;
-}
-
-int Connection::WriteLine(const char* pBuffer)
-{
-	//debug("Connection::write(char* line)");
-
-	if (m_eStatus != csConnected)
-	{
-		return -1;
-	}
-
-	int iRes = DoWriteLine(pBuffer);
-
-	return iRes;
-}
-
-int Connection::Send(const char* pBuffer, int iSize)
-{
-	debug("Sending data");
-
-	if (m_eStatus != csConnected)
-	{
-		return -1;
-	}
-
-	int iRes = send(m_iSocket, pBuffer, iSize, 0);
-
-	return iRes;
-}
-
-char* Connection::ReadLine(char* pBuffer, int iSize, int* pBytesRead)
-{
-	if (m_eStatus != csConnected)
-	{
-		return NULL;
-	}
-
-	char* res = DoReadLine(pBuffer, iSize, pBytesRead);
-
-	return res;
-}
-
-SOCKET Connection::Accept()
-{
-	debug("Accepting connection");
-
-	if (m_eStatus != csListening)
-	{
-		return INVALID_SOCKET;
-	}
-
-	SOCKET iRes = DoAccept();
-
-	return iRes;
-}
-
-int Connection::Recv(char* pBuffer, int iSize)
-{
-	debug("Receiving data");
-
-	memset(pBuffer, 0, iSize);
-
-	int iReceived = recv(m_iSocket, pBuffer, iSize, 0);
-
-	if (iReceived < 0)
-	{
-		ReportError("Could not receive data on socket", NULL, 0);
-	}
-
-	return iReceived;
-}
-
-bool Connection::RecvAll(char * pBuffer, int iSize)
-{
-	debug("Receiving data (full buffer)");
-
-	memset(pBuffer, 0, iSize);
-
-	char* pBufPtr = (char*)pBuffer;
-	int NeedBytes = iSize;
-
-	if (m_iBufAvail > 0)
-	{
-		int len = iSize > m_iBufAvail ? m_iBufAvail : iSize;
-		memcpy(pBufPtr, m_szBufPtr, len);
-		pBufPtr += len;
-		m_szBufPtr += len;
-		m_iBufAvail -= len;
-		NeedBytes -= len;
-	}
-
-	// Read from the socket until nothing remains
-	while (NeedBytes > 0)
-	{
-		int iReceived = recv(m_iSocket, pBufPtr, NeedBytes, 0);
-		// Did the recv succeed?
-		if (iReceived <= 0)
-		{
-			ReportError("Could not receive data on socket", NULL, 0);
-			return false;
-		}
-		pBufPtr += iReceived;
-		NeedBytes -= iReceived;
-	}
-	return true;
-}
-
-int Connection::DoConnect()
-{
-	debug("Do connecting");
-
-	struct sockaddr_in	sSocketAddress;
-	memset(&sSocketAddress, '\0', sizeof(sSocketAddress));
-	sSocketAddress.sin_family = AF_INET;
-	sSocketAddress.sin_port = htons(m_pNetAddress->GetPort());
-	sSocketAddress.sin_addr.s_addr = ResolveHostAddr(m_pNetAddress->GetHost());
-	if (sSocketAddress.sin_addr.s_addr == (unsigned int)-1)
-	{
-		return -1;
-	}
-
-	m_iSocket = socket(PF_INET, SOCK_STREAM, 0);
-
-	if (m_iSocket == INVALID_SOCKET)
-	{
-		ReportError("Socket creation failed for %s!", m_pNetAddress->GetHost(), 0);
-		return -1;
-	}
-
-	int res = connect(m_iSocket , (struct sockaddr *) & sSocketAddress, sizeof(sSocketAddress));
-
-	if (res < 0)
-	{
-		ReportError("Connection to %s failed!", m_pNetAddress->GetHost(), 0);
-		return -1;
-	}
-
-#ifdef WIN32
-	int MSecVal = m_iTimeout * 1000;
-	int err = setsockopt(m_iSocket, SOL_SOCKET, SO_RCVTIMEO, (char*)&MSecVal, sizeof(MSecVal));
-#else
-	struct timeval TimeVal;
-	TimeVal.tv_sec = m_iTimeout;
-	TimeVal.tv_usec = 0;
-	int err = setsockopt(m_iSocket, SOL_SOCKET, SO_RCVTIMEO, (char*)&TimeVal, sizeof(TimeVal));
-#endif
-	if (err != 0)
-	{
-		ReportError("setsockopt failed", NULL, 0);
-	}
-
-	return 0;
-}
-
-unsigned int Connection::ResolveHostAddr(const char* szHost)
-{
-	unsigned int uaddr = inet_addr(szHost);
-	if (uaddr == (unsigned int)-1)
-	{
-		struct hostent* hinfo;
-		bool err = false;
-		int h_errnop = 0;
-#ifdef WIN32
-		hinfo = gethostbyname(szHost);
-		err = hinfo == NULL;
-		h_errnop = WSAGetLastError();
-#else
-		struct hostent hinfobuf;
-		static const int strbuflen = 1024;
-		char* strbuf = (char*)malloc(strbuflen);
-#ifdef HAVE_GETHOSTBYNAME_R_6
-		err = gethostbyname_r(szHost, &hinfobuf, strbuf, strbuflen, &hinfo, &h_errnop);
-		err = err || (hinfo == NULL); // error on null hinfo (means 'no entry')
-#else
-		hinfo = gethostbyname_r(szHost, &hinfobuf, strbuf, strbuflen, &h_errnop);
-		err = hinfo == NULL;
-#endif			
-#endif
-		if (err)
-		{
-			ReportError("Could not resolve hostname %s", szHost, h_errnop);
-#ifndef WIN32
-			free(strbuf);
-#endif
-			return (unsigned int)-1;
-		}
-
-		memcpy(&uaddr, hinfo->h_addr_list[0], sizeof(uaddr));
-#ifndef WIN32
-		free(strbuf);
-#endif
-	}
-	return uaddr;
-}
-
-int Connection::DoDisconnect()
-{
-	debug("Do disconnecting");
-
-	if (m_iSocket > 0)
-	{
-		closesocket(m_iSocket);
-		m_iSocket = INVALID_SOCKET;
-	}
-
-	m_eStatus = csDisconnected;
-	return 0;
-}
-
-int Connection::DoWriteLine(const char* pBuffer)
-{
-	//debug("Connection::doWrite()");
-	return send(m_iSocket, pBuffer, strlen(pBuffer), 0);
-}
-
-char* Connection::DoReadLine(char* pBuffer, int iSize, int* pBytesRead)
-{
-	//debug( "Connection::DoReadLine()" );
-	char* pBufPtr = pBuffer;
-	iSize--; // for trailing '0'
-	int iBytesRead = 0;
-	int iBufAvail = m_iBufAvail; // local variable is faster
-	char* szBufPtr = m_szBufPtr; // local variable is faster
-	while (iSize)
-	{
-		if (!iBufAvail)
-		{
-			iBufAvail = recv(m_iSocket, m_szReadBuf, CONNECTION_READBUFFER_SIZE, 0);
-			if (iBufAvail < 0)
-			{
-				ReportError("Could not receive data on socket", NULL, 0);
-				break;
-			}
-			else if (iBufAvail == 0)
-			{
-				break;
-			}
-			szBufPtr = m_szReadBuf;
-			m_szReadBuf[iBufAvail] = '\0';
-		}
-
-		int len = 0;
-		char* p = (char*)memchr(szBufPtr, '\n', iBufAvail);
-		if (p)
-		{
-			len = (int)(p - szBufPtr + 1);
-		}
-		else
-		{
-			len = iBufAvail;
-		}
-
-		if (len > iSize)
-		{
-			len = iSize;
-		}
-		
-		memcpy(pBufPtr, szBufPtr, len);
-		pBufPtr += len;
-		szBufPtr += len;
-		iBufAvail -= len;
-		iBytesRead += len;
-		iSize -= len;
-		
-		if (p)
-		{
-			break;
-		}
-	}
-	*pBufPtr = '\0';
-
-	m_iBufAvail = iBufAvail > 0 ? iBufAvail : 0; // copy back to member
-	m_szBufPtr = szBufPtr; // copy back to member
-	
-	if (pBytesRead)
-	{
-		*pBytesRead = iBytesRead;
-	}
-	
-	if (pBufPtr == pBuffer)
-	{
-		return NULL;
-	}
-	return pBuffer;
-}
-
-int Connection::DoBind()
-{
-	debug("Do binding");
-
-	m_iSocket = socket(PF_INET, SOCK_STREAM, 0);
-	if (m_iSocket == INVALID_SOCKET)
-	{
-		ReportError("Socket creation failed for %s!", m_pNetAddress->GetHost(), 0);
-		return -1;
-	}
-
-	struct sockaddr_in	sSocketAddress;
-	memset(&sSocketAddress, '\0', sizeof(sSocketAddress));
-	sSocketAddress.sin_family = AF_INET;
-	if (!m_pNetAddress->GetHost() || strlen(m_pNetAddress->GetHost()) == 0)
-	{
-		sSocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);
-	}
-	else
-	{
-		sSocketAddress.sin_addr.s_addr = ResolveHostAddr(m_pNetAddress->GetHost());
-		if (sSocketAddress.sin_addr.s_addr == (unsigned int)-1)
-		{
-			return -1;
-		}
-	}
-	sSocketAddress.sin_port = htons(m_pNetAddress->GetPort());
-	int opt = 1;
-	setsockopt(m_iSocket, SOL_SOCKET, SO_REUSEADDR, (char*)&opt, sizeof(opt));
-
-	if (bind(m_iSocket, (struct sockaddr *) &sSocketAddress, sizeof(sSocketAddress)) < 0)
-	{
-		ReportError("Binding socket failed for %s", m_pNetAddress->GetHost(), 0);
-		return -1;
-	}
-
-	if (listen(m_iSocket, 10) < 0)
-	{
-		ReportError("Listen on socket failed for %s", m_pNetAddress->GetHost(), 0);
-		return -1;
-	}
-
-	return 0;
-}
-
-SOCKET Connection::DoAccept()
-{
-	struct sockaddr_in ClientAddress;
-	socklen_t SockLen;
-
-	SockLen = sizeof(ClientAddress);
-
-	SOCKET iSocket = accept(GetSocket(), (struct sockaddr *) & ClientAddress, &SockLen);
-
-	if (iSocket == INVALID_SOCKET && m_eStatus != csCancelled)
-	{
-		ReportError("Could not accept connection", NULL, 0);
-	}
-
-	return iSocket;
-}
-
-void Connection::Cancel()
-{
-	debug("Cancelling connection");
-	if (m_iSocket != INVALID_SOCKET)
-	{
-		m_eStatus = csCancelled;
-		int r = shutdown(m_iSocket, SHUT_RDWR);
-		if (r == -1)
-		{
-			ReportError("Could not shutdown connection", NULL, 0);
-		}
-	}
-}
-
-void Connection::ReportError(const char* szMsgPrefix, const char* szMsgArg, int ErrCode)
-{
-	if (ErrCode == 0)
-	{
-#ifdef WIN32
-		ErrCode = WSAGetLastError();
-#else
-		ErrCode = errno;
-#endif
-	}
-
-	char szErrPrefix[1024];
-	snprintf(szErrPrefix, 1024, szMsgPrefix, szMsgArg);
-	szErrPrefix[1024-1] = '\0';
-#ifdef WIN32
-	if (m_bSuppressErrors)
-	{
-		debug("%s: ErrNo %i", szErrPrefix, ErrCode);
-	}
-	else
-	{
-		error("%s: ErrNo %i", szErrPrefix, ErrCode);
-	}
-#else
-	const char* szErrMsg = hstrerror(ErrCode);
-	if (m_bSuppressErrors)
-	{
-		debug("%s: ErrNo %i, %s", szErrPrefix, ErrCode, szErrMsg);
-	}
-	else
-	{
-		error("%s: ErrNo %i, %s", szErrPrefix, ErrCode, szErrMsg);
-	}
-#endif
-}

Connection.h

@@ -1,87 +0,0 @@
-/*
- *  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 CONNECTION_H
-#define CONNECTION_H
-
-#include "NetAddress.h"
-
-class Connection
-{
-public:
-	enum EStatus
-	{
-		csConnected,
-		csDisconnected,
-		csListening,
-		csCancelled
-	};
-	
-protected:
-	NetAddress* 		m_pNetAddress;
-	SOCKET				m_iSocket;
-	char*				m_szReadBuf;
-	int					m_iBufAvail;
-	char*				m_szBufPtr;
-	EStatus				m_eStatus;
-	int					m_iTimeout;
-	bool				m_bSuppressErrors;
-	bool				m_bAutoClose;
-
-	unsigned int		ResolveHostAddr(const char* szHost);
-	void				ReportError(const char* szMsgPrefix, const char* szMsgArg, int ErrCode);
-	virtual int 		DoConnect();
-	virtual int			DoDisconnect();
-	int					DoBind();
-	int					DoWriteLine(const char* pBuffer);
-	char*				DoReadLine(char* pBuffer, int iSize, int* pBytesRead);
-	SOCKET				DoAccept();
-
-public:
-						Connection(NetAddress* pNetAddress);
-						Connection(SOCKET iSocket, bool bAutoClose);
-	virtual 			~Connection();
-	static void			Init();
-	static void			Final();
-	int 				Connect();
-	int					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);
-	int					WriteLine(const char* pBuffer);
-	SOCKET				Accept();
-	void				Cancel();
-	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) { m_bSuppressErrors = bSuppressErrors; }
-	bool				GetSuppressErrors() { return m_bSuppressErrors; }
-};
-
-#endif

DiskState.cpp

@@ -1,637 +0,0 @@
-/*
- *  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 <sys/stat.h>
-#include <stdio.h>
-
-#include "nzbget.h"
-#include "DiskState.h"
-#include "Options.h"
-#include "Log.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-
-static const char* FORMATVERSION_SIGNATURE = "nzbget diskstate file version 3\n";
-
-/* Save Download Queue to Disk.
- * The Disk State consists of file "queue", which contains the order of files
- * and of one diskstate-file for each file in download queue.
- * This function saves file "queue" and files with NZB-info. It does not
- * save file-infos.
- */
-bool DiskState::SaveDownloadQueue(DownloadQueue* pDownloadQueue)
-{
-	debug("Saving queue to disk");
-
-	// prepare list of nzb-infos
-
-	typedef std::deque<NZBInfo*> NZBList;
-	NZBList cNZBList;
-
-	for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-		bool inlist = false;
-		for (NZBList::iterator it = cNZBList.begin(); it != cNZBList.end(); it++)
-		{
-			NZBInfo* pNZBInfo = *it;
-			if (pNZBInfo == pFileInfo->GetNZBInfo())
-			{
-				inlist = true;
-				break;
-			}
-		}
-		if (!inlist)
-		{
-			cNZBList.push_back(pFileInfo->GetNZBInfo());
-		}
-	}
-
-	char fileName[1024];
-	snprintf(fileName, 1024, "%s%s", g_pOptions->GetQueueDir(), "queue");
-	fileName[1024-1] = '\0';
-
-	FILE* outfile = fopen(fileName, "w");
-
-	if (!outfile)
-	{
-		error("Could not create file %s", fileName);
-		perror(fileName);
-		return false;
-	}
-
-	fprintf(outfile, FORMATVERSION_SIGNATURE);
-
-	// save nzb-infos
-	fprintf(outfile, "%i\n", cNZBList.size());
-	for (NZBList::iterator it = cNZBList.begin(); it != cNZBList.end(); it++)
-	{
-		NZBInfo* pNZBInfo = *it;
-		fprintf(outfile, "%s\n", pNZBInfo->GetFilename());
-		fprintf(outfile, "%s\n", pNZBInfo->GetDestDir());
-		fprintf(outfile, "%i\n", pNZBInfo->GetFileCount());
-		unsigned long High, Low;
-		Util::SplitInt64(pNZBInfo->GetSize(), &High, &Low);
-		fprintf(outfile, "%lu,%lu\n", High, Low);
-	}
-
-	// save file-infos
-	fprintf(outfile, "%i\n", pDownloadQueue->size());
-	for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-		if (!pFileInfo->GetDeleted())
-		{
-			// find index of nzb-info
-			int iNZBIndex = 0;
-			for (unsigned int i = 0; i < cNZBList.size(); i++)
-			{
-				iNZBIndex++;
-				if (cNZBList[i] == pFileInfo->GetNZBInfo())
-				{
-					break;
-				}
-			}
-
-			fprintf(outfile, "%i,%i,%i\n", pFileInfo->GetID(), iNZBIndex, (int)pFileInfo->GetPaused());
-		}
-	}
-	fclose(outfile);
-
-	if (pDownloadQueue->empty())
-	{
-		remove(fileName);
-	}
-
-	return true;
-}
-
-bool DiskState::LoadDownloadQueue(DownloadQueue* pDownloadQueue)
-{
-	debug("Loading queue from disk");
-
-	typedef std::deque<NZBInfo*> NZBList;
-	NZBList cNZBList;
-
-	char fileName[1024];
-	snprintf(fileName, 1024, "%s%s", g_pOptions->GetQueueDir(), "queue");
-	fileName[1024-1] = '\0';
-
-	FILE* infile = fopen(fileName, "r");
-
-	if (!infile)
-	{
-		error("Could not open file %s", fileName);
-		return false;
-	}
-
-	char FileSignatur[128];
-	fgets(FileSignatur, sizeof(FileSignatur), infile);
-	if (strcmp(FileSignatur, FORMATVERSION_SIGNATURE))
-	{
-		error("Could not load diskstate due file version mismatch");
-		fclose(infile);
-		return false;
-	}
-
-	int size;
-	char buf[1024];
-
-	// load nzb-infos
-	if (fscanf(infile, "%i\n", &size) != 1) goto error;
-	for (int i = 0; i < size; i++)
-	{
-		NZBInfo* pNZBInfo = new NZBInfo();
-		cNZBList.push_back(pNZBInfo);
-
-		if (!fgets(buf, sizeof(buf), infile)) goto error;
-		if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
-		pNZBInfo->SetFilename(buf);
-
-		if (!fgets(buf, sizeof(buf), infile)) goto error;
-		if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
-		pNZBInfo->SetDestDir(buf);
-
-		int iFileCount;
-		if (fscanf(infile, "%i\n", &iFileCount) != 1) goto error;
-		pNZBInfo->SetFileCount(iFileCount);
-
-		unsigned long High, Low;
-		if (fscanf(infile, "%lu,%lu\n", &High, &Low) != 2) goto error;
-		pNZBInfo->SetSize(Util::JoinInt64(High, Low));
-	}
-
-	// load file-infos
-	if (fscanf(infile, "%i\n", &size) != 1) goto error;
-	for (int i = 0; i < size; i++)
-	{
-		unsigned int id, iNZBIndex, paused;
-		if (fscanf(infile, "%i,%i,%i\n", &id, &iNZBIndex, &paused) != 3) goto error;
-		if (iNZBIndex < 0 || iNZBIndex > cNZBList.size()) goto error;
-
-		char fileName[1024];
-		snprintf(fileName, 1024, "%s%i", g_pOptions->GetQueueDir(), id);
-		fileName[1024-1] = '\0';
-		FileInfo* pFileInfo = new FileInfo();
-		bool res = LoadFileInfo(pFileInfo, fileName, true, false);
-		if (res)
-		{
-			pFileInfo->SetID(id);
-			pFileInfo->SetPaused(paused);
-			pFileInfo->SetNZBInfo(cNZBList[iNZBIndex - 1]);
-			pDownloadQueue->push_back(pFileInfo);
-		}
-		else
-		{
-			warn("Could not load diskstate for file %s", fileName);
-			delete pFileInfo;
-		}
-	}
-
-	fclose(infile);
-	return true;
-
-error:
-	fclose(infile);
-	error("Error reading diskstate for file %s", fileName);
-	return false;
-}
-
-bool DiskState::SaveFile(FileInfo* pFileInfo)
-{
-	char fileName[1024];
-	snprintf(fileName, 1024, "%s%i", g_pOptions->GetQueueDir(), pFileInfo->GetID());
-	fileName[1024-1] = '\0';
-	return SaveFileInfo(pFileInfo, fileName);
-}
-
-bool DiskState::SaveFileInfo(FileInfo* pFileInfo, const char* szFilename)
-{
-	debug("Saving FileInfo to disk");
-
-	FILE* outfile = fopen(szFilename, "w");
-
-	if (!outfile)
-	{
-		error("Could not create file %s", szFilename);
-		return false;
-	}
-
-	fprintf(outfile, "%s\n", pFileInfo->GetSubject());
-	fprintf(outfile, "%s\n", pFileInfo->GetFilename());
-	fprintf(outfile, "%i\n", pFileInfo->GetFilenameConfirmed());
-	unsigned long High, Low;
-	Util::SplitInt64(pFileInfo->GetSize(), &High, &Low);
-	fprintf(outfile, "%lu,%lu\n", High, Low);
-
-	fprintf(outfile, "%i\n", pFileInfo->GetGroups()->size());
-	for (FileInfo::Groups::iterator it = pFileInfo->GetGroups()->begin(); it != pFileInfo->GetGroups()->end(); it++)
-	{
-		fprintf(outfile, "%s\n", *it);
-	}
-
-	fprintf(outfile, "%i\n", pFileInfo->GetArticles()->size());
-	for (FileInfo::Articles::iterator it = pFileInfo->GetArticles()->begin(); it != pFileInfo->GetArticles()->end(); it++)
-	{
-		ArticleInfo* pArticleInfo = *it;
-		fprintf(outfile, "%i,%i\n", pArticleInfo->GetPartNumber(), pArticleInfo->GetSize());
-		fprintf(outfile, "%s\n", pArticleInfo->GetMessageID());
-	}
-
-	fclose(outfile);
-	return true;
-}
-
-bool DiskState::LoadArticles(FileInfo* pFileInfo)
-{
-	char fileName[1024];
-	snprintf(fileName, 1024, "%s%i", g_pOptions->GetQueueDir(), pFileInfo->GetID());
-	fileName[1024-1] = '\0';
-	return LoadFileInfo(pFileInfo, fileName, false, true);
-}
-
-bool DiskState::LoadFileInfo(FileInfo* pFileInfo, const char * szFilename, bool bFileSummary, bool bArticles)
-{
-	debug("Loading FileInfo from disk");
-
-	FILE* infile = fopen(szFilename, "r");
-
-	if (!infile)
-	{
-		error("Could not open file %s", szFilename);
-		return false;
-	}
-
-	char buf[1024];
-
-	if (!fgets(buf, sizeof(buf), infile)) goto error;
-	if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
-	if (bFileSummary) pFileInfo->SetSubject(buf);
-
-	if (!fgets(buf, sizeof(buf), infile)) goto error;
-	if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
-	if (bFileSummary) pFileInfo->SetFilename(buf);
-
-	int iFilenameConfirmed;
-	if (fscanf(infile, "%i\n", &iFilenameConfirmed) != 1) goto error;
-	if (bFileSummary) pFileInfo->SetFilenameConfirmed(iFilenameConfirmed);
-	
-	unsigned long High, Low;
-	if (fscanf(infile, "%lu,%lu\n", &High, &Low) != 2) goto error;
-	if (bFileSummary) pFileInfo->SetSize(Util::JoinInt64(High, Low));
-	if (bFileSummary) pFileInfo->SetRemainingSize(pFileInfo->GetSize());
-
-	int size;
-	if (fscanf(infile, "%i\n", &size) != 1) goto error;
-	for (int i = 0; i < size; i++)
-	{
-		if (!fgets(buf, sizeof(buf), infile)) goto error;
-		if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
-		if (bFileSummary) pFileInfo->GetGroups()->push_back(strdup(buf));
-	}
-
-	if (bArticles)
-	{
-		if (fscanf(infile, "%i\n", &size) != 1) goto error;
-		for (int i = 0; i < size; i++)
-		{
-			int PartNumber, PartSize;
-			if (fscanf(infile, "%i,%i\n", &PartNumber, &PartSize) != 2) goto error;
-
-			if (!fgets(buf, sizeof(buf), infile)) goto error;
-			if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
-
-			ArticleInfo* pArticleInfo = new ArticleInfo();
-			pArticleInfo->SetPartNumber(PartNumber);
-			pArticleInfo->SetSize(PartSize);
-			pArticleInfo->SetMessageID(buf);
-			pFileInfo->GetArticles()->push_back(pArticleInfo);
-		}
-	}
-
-	fclose(infile);
-	return true;
-
-error:
-	fclose(infile);
-	error("Error reading diskstate for file %s", szFilename);
-	return false;
-}
-
-bool DiskState::SavePostQueue(PostQueue* pPostQueue, bool bCompleted)
-{
-	debug("Saving post-queue to disk");
-
-	char fileName[1024];
-	snprintf(fileName, 1024, "%s%s", g_pOptions->GetQueueDir(), bCompleted ? "postc" : "postq");
-	fileName[1024-1] = '\0';
-
-	FILE* outfile = fopen(fileName, "w");
-
-	if (!outfile)
-	{
-		error("Could not create file %s", fileName);
-		perror(fileName);
-		return false;
-	}
-
-	fprintf(outfile, FORMATVERSION_SIGNATURE);
-
-	fprintf(outfile, "%i\n", pPostQueue->size());
-	for (PostQueue::iterator it = pPostQueue->begin(); it != pPostQueue->end(); it++)
-	{
-		PostInfo* pPostInfo = *it;
-		fprintf(outfile, "%s\n", pPostInfo->GetNZBFilename());
-		fprintf(outfile, "%s\n", pPostInfo->GetDestDir());
-		fprintf(outfile, "%s\n", pPostInfo->GetParFilename());
-		fprintf(outfile, "%s\n", pPostInfo->GetInfoName());
-		fprintf(outfile, "%i\n", (int)pPostInfo->GetParCheck());
-		fprintf(outfile, "%i\n", (int)pPostInfo->GetParStatus());
-		fprintf(outfile, "%i\n", (int)pPostInfo->GetParFailed());
-		fprintf(outfile, "%i\n", (int)pPostInfo->GetStage());
-	}
-	fclose(outfile);
-
-	if (pPostQueue->empty())
-	{
-		remove(fileName);
-	}
-
-	return true;
-}
-
-bool DiskState::LoadPostQueue(PostQueue* pPostQueue, bool bCompleted)
-{
-	debug("Loading post-queue from disk");
-
-	char fileName[1024];
-	snprintf(fileName, 1024, "%s%s", g_pOptions->GetQueueDir(), bCompleted ? "postc" : "postq");
-	fileName[1024-1] = '\0';
-
-	FILE* infile = fopen(fileName, "r");
-
-	if (!infile)
-	{
-		error("Could not open file %s", fileName);
-		return false;
-	}
-
-	char FileSignatur[128];
-	fgets(FileSignatur, sizeof(FileSignatur), infile);
-	if (strcmp(FileSignatur, FORMATVERSION_SIGNATURE))
-	{
-		error("Could not load diskstate due file version mismatch");
-		fclose(infile);
-		return false;
-	}
-
-	int size;
-	char buf[1024];
-	int iIntValue;
-
-	// load file-infos
-	if (fscanf(infile, "%i\n", &size) != 1) goto error;
-	for (int i = 0; i < size; i++)
-	{
-		PostInfo* pPostInfo = new PostInfo();
-
-		if (!fgets(buf, sizeof(buf), infile)) goto error;
-		if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
-		pPostInfo->SetNZBFilename(buf);
-
-		if (!fgets(buf, sizeof(buf), infile)) goto error;
-		if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
-		pPostInfo->SetDestDir(buf);
-
-		if (!fgets(buf, sizeof(buf), infile)) goto error;
-		if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
-		pPostInfo->SetParFilename(buf);
-
-		if (!fgets(buf, sizeof(buf), infile)) goto error;
-		if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
-		pPostInfo->SetInfoName(buf);
-
-		if (fscanf(infile, "%i\n", &iIntValue) != 1) goto error;
-		pPostInfo->SetParCheck(iIntValue);
-
-		if (fscanf(infile, "%i\n", &iIntValue) != 1) goto error;
-		pPostInfo->SetParStatus(iIntValue);
-
-		if (fscanf(infile, "%i\n", &iIntValue) != 1) goto error;
-		pPostInfo->SetParFailed(iIntValue);
-
-		if (fscanf(infile, "%i\n", &iIntValue) != 1) goto error;
-		pPostInfo->SetStage((PostInfo::EStage)iIntValue);
-
-		pPostQueue->push_back(pPostInfo);
-	}
-
-	fclose(infile);
-	return true;
-
-error:
-	fclose(infile);
-	error("Error reading diskstate for file %s", fileName);
-	return false;
-}
-
-/*
- * Delete all files from Queue.
- * Returns true if successful, false if not
- */
-bool DiskState::DiscardDownloadQueue()
-{
-	debug("Discarding queue");
-
-	char fileName[1024];
-	snprintf(fileName, 1024, "%s%s", g_pOptions->GetQueueDir(), "queue");
-	fileName[1024-1] = '\0';
-
-	FILE* infile = fopen(fileName, "r");
-
-	if (!infile)
-	{
-		error("Could not open file %s", fileName);
-		return false;
-	}
-
-	bool res = false;
-	char FileSignatur[128];
-	fgets(FileSignatur, sizeof(FileSignatur), infile);
-	if (!strcmp(FileSignatur, FORMATVERSION_SIGNATURE))
-	{
-		// skip nzb-infos
-		int size = 0;
-		char buf[1024];
-		fscanf(infile, "%i\n", &size);
-		for (int i = 0; i < size; i++)
-		{
-			if (!fgets(buf, sizeof(buf), infile)) break;
-			if (!fgets(buf, sizeof(buf), infile)) break;
-			if (!fgets(buf, sizeof(buf), infile)) break;
-			if (!fgets(buf, sizeof(buf), infile)) break;
-		}
-
-		fscanf(infile, "%i\n", &size);
-		for (int i = 0; i < size; i++)
-		{
-			int id, group, paused;
-			if (fscanf(infile, "%i,%i,%i\n", &id, &group, &paused) == 3)
-			{
-				char fileName[1024];
-				snprintf(fileName, 1024, "%s%i", g_pOptions->GetQueueDir(), id);
-				fileName[1024-1] = '\0';
-				remove(fileName);
-			}
-		}
-		res = true;
-	}
-	else
-	{
-		error("Could not discard diskstate due file version mismatch");
-		res = false;
-	}
-
-	fclose(infile);
-	if (res)
-	{
-		remove(fileName);
-	}
-
-	return res;
-}
-
-/*
- * Delete all files from Queue.
- * Returns true if successful, false if not
- */
-bool DiskState::DiscardPostQueue()
-{
-	debug("Discarding post-queue");
-
-	char fileName[1024];
-
-	snprintf(fileName, 1024, "%s%s", g_pOptions->GetQueueDir(), "postq");
-	fileName[1024-1] = '\0';
-	remove(fileName);
-
-	snprintf(fileName, 1024, "%s%s", g_pOptions->GetQueueDir(), "postc");
-	fileName[1024-1] = '\0';
-	remove(fileName);
-
-	return true;
-}
-
-bool DiskState::DownloadQueueExists()
-{
-	debug("Checking if a saved queue exists on disk");
-
-	char fileName[1024];
-	snprintf(fileName, 1024, "%s%s", g_pOptions->GetQueueDir(), "queue");
-	fileName[1024-1] = '\0';
-	return Util::FileExists(fileName);
-}
-
-bool DiskState::PostQueueExists(bool bCompleted)
-{
-	debug("Checking if a saved queue exists on disk");
-
-	char fileName[1024];
-	snprintf(fileName, 1024, "%s%s", g_pOptions->GetQueueDir(), bCompleted ? "postc" : "postq");
-	fileName[1024-1] = '\0';
-	return Util::FileExists(fileName);
-}
-
-bool DiskState::DiscardFile(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo)
-{
-	// delete diskstate-file for file-info
-	char fileName[1024];
-	snprintf(fileName, 1024, "%s%i", g_pOptions->GetQueueDir(), pFileInfo->GetID());
-	fileName[1024-1] = '\0';
-	remove(fileName);
-
-	return !pDownloadQueue || SaveDownloadQueue(pDownloadQueue);
-}
-
-void DiskState::CleanupTempDir(DownloadQueue* pDownloadQueue)
-{
-	// build array of IDs of files in queue for faster access
-	int* ids = (int*)malloc(sizeof(int) * (pDownloadQueue->size() + 1));
-	int* ptr = ids;
-	for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-		*ptr++ = pFileInfo->GetID();
-	}
-	*ptr = 0;
-
-	// read directory
-	DirBrowser dir(g_pOptions->GetTempDir());
-	while (const char* filename = dir.Next())
-	{
-		int id, part;
-		bool del = strstr(filename, ".tmp") || strstr(filename, ".dec") ||
-			((sscanf(filename, "%i.out", &id) == 1) &&
-				!(g_pOptions->GetContinuePartial() && g_pOptions->GetDirectWrite()));
-		if (!del)
-		{
-			if ((sscanf(filename, "%i.%i", &id, &part) == 2) ||
-				(sscanf(filename, "%i.out", &id) == 1))
-			{
-				del = true;
-				ptr = ids;
-				while (*ptr)
-				{
-					if (*ptr == id)
-					{
-						del = false;
-						break;
-					}
-					ptr++;
-				}
-			}
-		}
-		if (del)
-		{
-			char szFullFilename[1024];
-			snprintf(szFullFilename, 1024, "%s%s", g_pOptions->GetTempDir(), filename);
-			szFullFilename[1024-1] = '\0';
-			remove(szFullFilename);
-		}
-	}
-     
-	free(ids);
-}

DiskState.h

@@ -1,53 +0,0 @@
-/*
- *  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 DISKSTATE_H
-#define DISKSTATE_H
-
-#include "DownloadInfo.h"
-#include "PostInfo.h"
-
-class DiskState
-{
-private:
-	bool				SaveFileInfo(FileInfo* pFileInfo, const char* szFilename);
-	bool				LoadFileInfo(FileInfo* pFileInfo, const char* szFilename, bool bFileSummary, bool bArticles);
-	
-public:
-	bool				DownloadQueueExists();
-	bool				PostQueueExists(bool bCompleted);
-	bool				SaveDownloadQueue(DownloadQueue* pDownloadQueue);
-	bool				LoadDownloadQueue(DownloadQueue* pDownloadQueue);
-	bool				SaveFile(FileInfo* pFileInfo);
-	bool				LoadArticles(FileInfo* pFileInfo);
-	bool				SavePostQueue(PostQueue* pPostQueue, bool bCompleted);
-	bool				LoadPostQueue(PostQueue* pPostQueue, bool bCompleted);
-	bool				DiscardDownloadQueue();
-	bool				DiscardPostQueue();
-	bool				DiscardFile(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo);
-	void				CleanupTempDir(DownloadQueue* pDownloadQueue);
-};
-
-#endif

DownloadInfo.cpp

@@ -1,363 +0,0 @@
-/*
- *  This file is 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 <sys/stat.h>
-
-#include "nzbget.h"
-#include "DownloadInfo.h"
-#include "Log.h"
-#include "Util.h"
-
-int FileInfo::m_iIDGen = 0;
-
-NZBInfo::NZBInfo()
-{
-	debug("Creating NZBInfo");
-
-	m_szFilename = NULL;
-	m_szDestDir = NULL;
-	m_iFileCount = 0;
-	m_lSize = 0;
-	m_iRefCount = 0;
-}
-
-NZBInfo::~NZBInfo()
-{
-	debug("Destroying NZBInfo");
-
-	if (m_szFilename)
-	{
-		free(m_szFilename);
-	}
-	if (m_szDestDir)
-	{
-		free(m_szDestDir);
-	}
-}
-
-void NZBInfo::AddReference()
-{
-	m_iRefCount++;
-}
-
-void NZBInfo::Release()
-{
-	m_iRefCount--;
-	if (m_iRefCount <= 0)
-	{
-		delete this;
-	}
-}
-
-void NZBInfo::SetDestDir(const char* szDestDir)
-{
-	m_szDestDir = strdup(szDestDir);
-}
-
-void NZBInfo::SetFilename(const char * szFilename)
-{
-	m_szFilename = strdup(szFilename);
-}
-
-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);
-
-	// if .nzb file has a certain structure, try to strip out certain elements
-	if (sscanf(szBaseName, "msgid_%*d_%1023s", postname) == 1)
-	{
-		// 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, '_');
-
-	// 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, '_');
-
-		// 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';
-}
-
-ArticleInfo::ArticleInfo()
-{
-	//debug("Creating ArticleInfo");
-	m_szMessageID		= NULL;
-	m_iSize 			= 0;
-	m_eStatus			= aiUndefined;
-	m_szResultFilename	= NULL;
-}
-
-ArticleInfo::~ ArticleInfo()
-{
-	//debug("Destroying ArticleInfo");
-
-	if (m_szMessageID)
-	{
-		free(m_szMessageID);
-	}
-	if (m_szResultFilename)
-	{
-		free(m_szResultFilename);
-	}
-}
-
-void ArticleInfo::SetMessageID(const char * szMessageID)
-{
-	m_szMessageID = strdup(szMessageID);
-}
-
-void ArticleInfo::SetResultFilename(const char * v)
-{
-	m_szResultFilename = strdup(v);
-}
-
-
-FileInfo::FileInfo()
-{
-	debug("Creating FileInfo");
-
-	m_Articles.clear();
-	m_Groups.clear();
-	m_szSubject = NULL;
-	m_szFilename = NULL;
-	m_bFilenameConfirmed = false;
-	m_lSize = 0;
-	m_lRemainingSize = 0;
-	m_bPaused = false;
-	m_bDeleted = false;
-	m_iCompleted = 0;
-	m_bOutputInitialized = false;
-	m_iIDGen++;
-	m_iID = m_iIDGen;
-}
-
-FileInfo::~ FileInfo()
-{
-	debug("Destroying FileInfo");
-
-	if (m_szSubject)
-	{
-		free(m_szSubject);
-	}
-	if (m_szFilename)
-	{
-		free(m_szFilename);
-	}
-
-	for (Groups::iterator it = m_Groups.begin(); it != m_Groups.end() ;it++)
-	{
-		free(*it);
-	}
-	m_Groups.clear();
-
-	ClearArticles();
-
-	if (m_pNZBInfo)
-	{
-		m_pNZBInfo->Release();
-	}
-}
-
-void FileInfo::ClearArticles()
-{
-	for (Articles::iterator it = m_Articles.begin(); it != m_Articles.end() ;it++)
-	{
-		delete *it;
-	}
-	m_Articles.clear();
-}
-
-void FileInfo::SetID(int s)
-{
-	m_iID = s;
-	if (m_iIDGen < m_iID)
-	{
-		m_iIDGen = m_iID;
-	}
-}
-
-void FileInfo::SetNZBInfo(NZBInfo* pNZBInfo)
-{
-	m_pNZBInfo = pNZBInfo;
-	m_pNZBInfo->AddReference();
-}
-
-void FileInfo::SetSubject(const char* szSubject)
-{
-	m_szSubject = strdup(szSubject);
-}
-
-void FileInfo::SetFilename(const char* szFilename)
-{
-	if (m_szFilename)
-	{
-		free(m_szFilename);
-	}
-	m_szFilename = strdup(szFilename);
-}
-
-void FileInfo::MakeValidFilename()
-{
-	Util::MakeValidFilename(m_szFilename, '_');
-}
-
-void FileInfo::LockOutputFile()
-{
-	m_mutexOutputFile.Lock();
-}
-
-void FileInfo::UnlockOutputFile()
-{
-	m_mutexOutputFile.Unlock();
-}
-
-bool FileInfo::IsDupe(const char* szFilename)
-{
-	char fileName[1024];
-	snprintf(fileName, 1024, "%s%c%s", m_pNZBInfo->GetDestDir(), (int)PATH_SEPARATOR, szFilename);
-	fileName[1024-1] = '\0';
-	if (Util::FileExists(fileName))
-	{
-		return true;
-	}
-	snprintf(fileName, 1024, "%s%c%s_broken", m_pNZBInfo->GetDestDir(), (int)PATH_SEPARATOR, szFilename);
-	fileName[1024-1] = '\0';
-	if (Util::FileExists(fileName))
-	{
-		return true;
-	}
-
-	return false;
-}
-
-GroupInfo::GroupInfo()
-{
-	m_iFirstID = 0;
-	m_iLastID = 0;
-	m_iRemainingFileCount = 0;
-	m_lRemainingSize = 0;
-	m_lPausedSize = 0;
-	m_iRemainingParCount = 0;
-}
-
-GroupInfo::~GroupInfo()
-{
-	if (m_pNZBInfo)
-	{
-		m_pNZBInfo->Release();
-	}
-}
-
-void GroupInfo::BuildGroups(DownloadQueue* pDownloadQueue, GroupQueue* pGroupQueue)
-{
-    for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
-    {
-        FileInfo* pFileInfo = *it;
-		GroupInfo* pGroupInfo = NULL;
-		for (GroupQueue::iterator itg = pGroupQueue->begin(); itg != pGroupQueue->end(); itg++)
-		{
-			GroupInfo* pGroupInfo1 = *itg;
-			if (pGroupInfo1->GetNZBInfo() == pFileInfo->GetNZBInfo())
-			{
-				pGroupInfo = pGroupInfo1;
-				break;
-			}
-		}
-		if (!pGroupInfo)
-		{
-			pGroupInfo = new GroupInfo();
-			pGroupInfo->m_pNZBInfo = pFileInfo->GetNZBInfo();
-			pGroupInfo->m_pNZBInfo->AddReference();
-			pGroupInfo->m_iFirstID = pFileInfo->GetID();
-			pGroupInfo->m_iLastID = pFileInfo->GetID();
-			pGroupQueue->push_back(pGroupInfo);
-		}
-		if (pFileInfo->GetID() < pGroupInfo->GetFirstID())
-		{
-			pGroupInfo->m_iFirstID = pFileInfo->GetID();
-		}
-		if (pFileInfo->GetID() > pGroupInfo->GetLastID())
-		{
-			pGroupInfo->m_iLastID = pFileInfo->GetID();
-		}
-		pGroupInfo->m_iRemainingFileCount++;
-		pGroupInfo->m_lRemainingSize += pFileInfo->GetRemainingSize();
-		if (pFileInfo->GetPaused())
-		{
-			pGroupInfo->m_lPausedSize += pFileInfo->GetRemainingSize();
-		}
-
-		char szLoFileName[1024];
-		strncpy(szLoFileName, pFileInfo->GetFilename(), 1024);
-		szLoFileName[1024-1] = '\0';
-		for (char* p = szLoFileName; *p; p++) *p = tolower(*p); // convert string to lowercase
-		if (strstr(szLoFileName, ".par2"))
-		{
-			pGroupInfo->m_iRemainingParCount++;
-		}
-	}
-}

DownloadInfo.h

@@ -1,182 +0,0 @@
-/*
- *  This file is 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 DOWNLOADINFO_H
-#define DOWNLOADINFO_H
-
-#include <vector>
-#include <deque>
-
-#include "Thread.h"
-
-class NZBInfo
-{
-private:
-	int					m_iRefCount;
-	char* 				m_szFilename;
-	char* 				m_szDestDir;
-	int		 			m_iFileCount;
-	long long 			m_lSize;
-
-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; }
-	void				SetDestDir(const char* szDestDir);
-	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; }
-};
-
-class ArticleInfo
-{
-public:
-	enum EStatus
-	{
-		aiUndefined,
-		aiRunning,
-		aiFinished,
-		aiFailed
-	};
-	
-private:
-	int					m_iPartNumber;
-	char*				m_szMessageID;
-	int					m_iSize;
-	EStatus				m_eStatus;
-	char*				m_szResultFilename;
-
-public:
-						ArticleInfo();
-						~ArticleInfo();
-	void 				SetPartNumber(int s) { m_iPartNumber = s; }
-	int 				GetPartNumber() { return m_iPartNumber; }
-	const char* 		GetMessageID() { return m_szMessageID; }
-	void 				SetMessageID(const char* szMessageID);
-	void 				SetSize(int s) { m_iSize = s; }
-	int 				GetSize() { return m_iSize; }
-	EStatus				GetStatus() { return m_eStatus; }
-	void				SetStatus(EStatus Status) { m_eStatus = Status; }
-	const char*			GetResultFilename() { return m_szResultFilename; }
-	void 				SetResultFilename(const char* v);
-};
-
-class FileInfo
-{
-public:
-	typedef std::vector<ArticleInfo*>	Articles;
-	typedef std::vector<char*>			Groups;
-
-private:
-	int					m_iID;
-	NZBInfo*			m_pNZBInfo;
-	Articles			m_Articles;
-	Groups				m_Groups;
-	char* 				m_szSubject;
-	char*				m_szFilename;
-	long long 			m_lSize;
-	long long 			m_lRemainingSize;
-	bool				m_bPaused;
-	bool				m_bDeleted;
-	bool				m_bFilenameConfirmed;
-	int					m_iCompleted;
-	bool				m_bOutputInitialized;
-	Mutex				m_mutexOutputFile;
-
-	static int			m_iIDGen;
-
-public:
-						FileInfo();
-						~FileInfo();
-	int					GetID() { return m_iID; }
-	void				SetID(int s);
-	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
-	void				SetNZBInfo(NZBInfo* pNZBInfo);
-	Articles* 			GetArticles() { return &m_Articles; }
-	Groups* 			GetGroups() { return &m_Groups; }
-	const char*			GetSubject() { return m_szSubject; }
-	void 				SetSubject(const char* szSubject);
-	const char*			GetFilename() { return m_szFilename; }
-	void 				SetFilename(const char* szFilename);
-	void				MakeValidFilename();
-	bool				GetFilenameConfirmed() { return m_bFilenameConfirmed; }
-	void				SetFilenameConfirmed(bool bFilenameConfirmed) { m_bFilenameConfirmed = bFilenameConfirmed; }
-	void 				SetSize(long long s) { m_lSize = s; m_lRemainingSize = s; }
-	long long 			GetSize() { return m_lSize; }
-	long long 			GetRemainingSize() { return m_lRemainingSize; }
-	void 				SetRemainingSize(long long s) { m_lRemainingSize = s; }
-	bool				GetPaused() { return m_bPaused; }
-	void				SetPaused(bool Paused) { m_bPaused = Paused; }
-	bool				GetDeleted() { return m_bDeleted; }
-	void				SetDeleted(bool Deleted) { m_bDeleted = Deleted; }
-	int					GetCompleted() { return m_iCompleted; }
-	void				SetCompleted(int s) { m_iCompleted = s; }
-	void				ClearArticles();
-	void				LockOutputFile();
-	void				UnlockOutputFile();
-	bool				GetOutputInitialized() { return m_bOutputInitialized; }
-	void				SetOutputInitialized(bool bOutputInitialized) { m_bOutputInitialized = bOutputInitialized; }
-	bool				IsDupe(const char* szFilename);
-};
-                              
-typedef std::deque<FileInfo*> DownloadQueue;
-
-class GroupInfo;
-typedef std::deque<GroupInfo*> GroupQueue;
-
-class GroupInfo
-{
-private:
-	NZBInfo*			m_pNZBInfo;
-	int					m_iFirstID;
-	int					m_iLastID;
-	int		 			m_iRemainingFileCount;
-	long long 			m_lRemainingSize;
-	long long 			m_lPausedSize;
-	int					m_iRemainingParCount;
-
-public:
-						GroupInfo();
-						~GroupInfo();
-	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
-	int					GetFirstID() { return m_iFirstID; }
-	int					GetLastID() { return m_iLastID; }
-	long long 			GetRemainingSize() { return m_lRemainingSize; }
-	long long 			GetPausedSize() { return m_lPausedSize; }
-	int					GetRemainingFileCount() { return m_iRemainingFileCount; }
-	int					GetRemainingParCount() { return m_iRemainingParCount; }
-
-	static void			BuildGroups(DownloadQueue* pDownloadQueue, GroupQueue* pGroupQueue);
-};
-
-#endif

Makefile.am

@@ -1,19 +1,320 @@
-bin_PROGRAMS = nzbget
-nzbget_SOURCES = ArticleDownloader.cpp ArticleDownloader.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 NetAddress.cpp NetAddress.h \
-	NewsServer.cpp NewsServer.h Observer.cpp Observer.h Options.cpp Options.h \
-	ParChecker.cpp ParChecker.h PrePostProcessor.cpp PrePostProcessor.h \
-	QueueCoordinator.cpp QueueCoordinator.h QueueEditor.cpp QueueEditor.h RemoteClient.cpp \
-	RemoteClient.h RemoteServer.cpp RemoteServer.h ServerPool.cpp ServerPool.h Thread.cpp \
-	Thread.h Util.cpp Util.h nzbget.cpp nzbget.h BinRpc.cpp BinRpc.h XmlRpc.cpp XmlRpc.h \
-	PostInfo.cpp PostInfo.h ScriptController.cpp ScriptController.h
+#
+#  This file if part of nzbget
+#
+# Copyright (C) 2008-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+#
 
-EXTRA_DIST = nzbget.conf.example \
-	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
+bin_PROGRAMS = nzbget
+
+nzbget_SOURCES = \
+	daemon/connect/Connection.cpp \
+	daemon/connect/Connection.h \
+	daemon/connect/TLS.cpp \
+	daemon/connect/TLS.h \
+	daemon/connect/WebDownloader.cpp \
+	daemon/connect/WebDownloader.h \
+	daemon/feed/FeedCoordinator.cpp \
+	daemon/feed/FeedCoordinator.h \
+	daemon/feed/FeedFile.cpp \
+	daemon/feed/FeedFile.h \
+	daemon/feed/FeedFilter.cpp \
+	daemon/feed/FeedFilter.h \
+	daemon/feed/FeedInfo.cpp \
+	daemon/feed/FeedInfo.h \
+	daemon/frontend/ColoredFrontend.cpp \
+	daemon/frontend/ColoredFrontend.h \
+	daemon/frontend/Frontend.cpp \
+	daemon/frontend/Frontend.h \
+	daemon/frontend/LoggableFrontend.cpp \
+	daemon/frontend/LoggableFrontend.h \
+	daemon/frontend/NCursesFrontend.cpp \
+	daemon/frontend/NCursesFrontend.h \
+	daemon/main/Maintenance.cpp \
+	daemon/main/Maintenance.h \
+	daemon/main/nzbget.cpp \
+	daemon/main/nzbget.h \
+	daemon/main/Options.cpp \
+	daemon/main/Options.h \
+	daemon/main/Scheduler.cpp \
+	daemon/main/Scheduler.h \
+	daemon/nntp/ArticleDownloader.cpp \
+	daemon/nntp/ArticleDownloader.h \
+	daemon/nntp/Decoder.cpp \
+	daemon/nntp/Decoder.h \
+	daemon/nntp/NewsServer.cpp \
+	daemon/nntp/NewsServer.h \
+	daemon/nntp/NNTPConnection.cpp \
+	daemon/nntp/NNTPConnection.h \
+	daemon/nntp/ServerPool.cpp \
+	daemon/nntp/ServerPool.h \
+	daemon/nntp/StatMeter.cpp \
+	daemon/nntp/StatMeter.h \
+	daemon/postprocess/ParChecker.cpp \
+	daemon/postprocess/ParChecker.h \
+	daemon/postprocess/ParCoordinator.cpp \
+	daemon/postprocess/ParCoordinator.h \
+	daemon/postprocess/ParRenamer.cpp \
+	daemon/postprocess/ParRenamer.h \
+	daemon/postprocess/PostScript.cpp \
+	daemon/postprocess/PostScript.h \
+	daemon/postprocess/PrePostProcessor.cpp \
+	daemon/postprocess/PrePostProcessor.h \
+	daemon/postprocess/Unpack.cpp \
+	daemon/postprocess/Unpack.h \
+	daemon/queue/DiskState.cpp \
+	daemon/queue/DiskState.h \
+	daemon/queue/DownloadInfo.cpp \
+	daemon/queue/DownloadInfo.h \
+	daemon/queue/DupeCoordinator.cpp \
+	daemon/queue/DupeCoordinator.h \
+	daemon/queue/HistoryCoordinator.cpp \
+	daemon/queue/HistoryCoordinator.h \
+	daemon/queue/NZBFile.cpp \
+	daemon/queue/NZBFile.h \
+	daemon/queue/QueueCoordinator.cpp \
+	daemon/queue/QueueCoordinator.h \
+	daemon/queue/QueueEditor.cpp \
+	daemon/queue/QueueEditor.h \
+	daemon/queue/QueueScript.cpp \
+	daemon/queue/QueueScript.h \
+	daemon/queue/Scanner.cpp \
+	daemon/queue/Scanner.h \
+	daemon/queue/UrlCoordinator.cpp \
+	daemon/queue/UrlCoordinator.h \
+	daemon/remote/BinRpc.cpp \
+	daemon/remote/BinRpc.h \
+	daemon/remote/MessageBase.h \
+	daemon/remote/RemoteClient.cpp \
+	daemon/remote/RemoteClient.h \
+	daemon/remote/RemoteServer.cpp \
+	daemon/remote/RemoteServer.h \
+	daemon/remote/WebServer.cpp \
+	daemon/remote/WebServer.h \
+	daemon/remote/XmlRpc.cpp \
+	daemon/remote/XmlRpc.h \
+	daemon/util/Log.cpp \
+	daemon/util/Log.h \
+	daemon/util/Observer.cpp \
+	daemon/util/Observer.h \
+	daemon/util/Script.cpp \
+	daemon/util/Script.h \
+	daemon/util/Thread.cpp \
+	daemon/util/Thread.h \
+	daemon/util/Util.cpp \
+	daemon/util/Util.h \
+	svn_version.cpp
+
+AM_CPPFLAGS = \
+	-I$(srcdir)/daemon/connect \
+	-I$(srcdir)/daemon/feed \
+	-I$(srcdir)/daemon/frontend \
+	-I$(srcdir)/daemon/main \
+	-I$(srcdir)/daemon/nntp \
+	-I$(srcdir)/daemon/postprocess \
+	-I$(srcdir)/daemon/queue \
+	-I$(srcdir)/daemon/remote \
+	-I$(srcdir)/daemon/util
+
+EXTRA_DIST = \
+	Makefile.cvs \
+	nzbgetd \
+	$(windows_FILES) \
+	$(osx_FILES)
+
+windows_FILES = \
+	daemon/windows/NTService.cpp \
+	daemon/windows/NTService.h \
+	daemon/windows/win32.h \
+	nzbget.sln \
+	nzbget.vcproj \
+	nzbget-shell.bat
+
+osx_FILES = \
+	osx/App_Prefix.pch \
+	osx/NZBGet-Info.plist \
+	osx/DaemonController.h \
+	osx/DaemonController.m \
+	osx/MainApp.h \
+	osx/MainApp.m \
+	osx/MainApp.xib \
+	osx/PFMoveApplication.h \
+	osx/PFMoveApplication.m \
+	osx/PreferencesDialog.h \
+	osx/PreferencesDialog.m \
+	osx/PreferencesDialog.xib \
+	osx/RPC.h \
+	osx/RPC.m \
+	osx/WebClient.h \
+	osx/WebClient.m \
+	osx/WelcomeDialog.h \
+	osx/WelcomeDialog.m \
+	osx/WelcomeDialog.xib \
+	osx/NZBGet.xcodeproj/project.pbxproj \
+	osx/Resources/Images/mainicon.icns \
+	osx/Resources/Images/statusicon.png \
+	osx/Resources/Images/statusicon@2x.png \
+	osx/Resources/Images/statusicon-inv.png \
+	osx/Resources/Images/statusicon-inv@2x.png \
+	osx/Resources/licenses/license-bootstrap.txt \
+	osx/Resources/licenses/license-jquery-GPL.txt \
+	osx/Resources/licenses/license-jquery-MIT.txt \
+	osx/Resources/Credits.rtf \
+	osx/Resources/Localizable.strings \
+	osx/Resources/Welcome.rtf
+
+doc_FILES = \
+	README \
+	ChangeLog \
+	COPYING
+
+exampleconf_FILES = \
+	nzbget.conf
+
+webui_FILES = \
+	webui/index.html \
+	webui/index.js \
+	webui/downloads.js \
+	webui/edit.js \
+	webui/fasttable.js \
+	webui/history.js \
+	webui/messages.js \
+	webui/status.js \
+	webui/style.css \
+	webui/upload.js \
+	webui/util.js \
+	webui/config.js \
+	webui/feed.js \
+	webui/lib/bootstrap.js \
+	webui/lib/bootstrap.min.js \
+	webui/lib/bootstrap.css  \
+	webui/lib/jquery.js \
+	webui/lib/jquery.min.js \
+	webui/lib/raphael.js \
+	webui/lib/raphael.min.js \
+	webui/lib/elycharts.js \
+	webui/lib/elycharts.min.js \
+	webui/img/icons.png \
+	webui/img/icons-2x.png \
+	webui/img/transmit.gif \
+	webui/img/transmit-file.gif \
+	webui/img/favicon.ico \
+	webui/img/download-anim-green-2x.png \
+	webui/img/download-anim-orange-2x.png \
+	webui/img/transmit-reload-2x.gif
+
+scripts_FILES = \
+	scripts/EMail.py \
+	scripts/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)
+scriptsdir = $(datadir)/nzbget
+nobase_dist_scripts_SCRIPTS = $(scripts_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/scripts:installed to $(scriptsdir)/scripts:' < "$(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 '{}' ';'
 
 clean-bak: rm *~
+
+# Fix premissions
+dist-hook:
+	find $(distdir)/daemon -type f -print -exec chmod -x {} \;
+	find $(distdir)/webui -type f -print -exec chmod -x {} \;
+

NZBFile.cpp

@@ -1,592 +0,0 @@
-/*
- *  This file is 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 <string.h>
-#include <list>
-#ifdef WIN32
-#include <comutil.h>
-#import "MSXML.dll" named_guids 
-using namespace MSXML;
-#else
-#include <libxml/parser.h>
-#include <libxml/xmlreader.h>
-#endif
-
-#include "nzbget.h"
-#include "NZBFile.h"
-#include "Log.h"
-#include "DownloadInfo.h"
-#include "Options.h"
-#include "DiskState.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-extern DiskState* g_pDiskState;
-
-NZBFile::NZBFile(const char* szFileName)
-{
-    debug("Creating NZBFile");
-
-    m_szFileName = strdup(szFileName);
-	m_pNZBInfo = new NZBInfo();
-	m_pNZBInfo->AddReference();
-	m_pNZBInfo->SetFilename(szFileName);
-	BuildDestDirName();
-
-    m_FileInfos.clear();
-}
-
-NZBFile::~NZBFile()
-{
-    debug("Destroying NZBFile");
-
-    // Cleanup
-    if (m_szFileName)
-    {
-        free(m_szFileName);
-    }
-
-    for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
-    {
-        delete *it;
-    }
-    m_FileInfos.clear();
-
-	if (m_pNZBInfo)
-	{
-		m_pNZBInfo->Release();
-	}
-}
-
-void NZBFile::LogDebugInfo()
-{
-    debug(" NZBFile %s", m_szFileName);
-}
-
-void NZBFile::DetachFileInfos()
-{
-    m_FileInfos.clear();
-}
-
-NZBFile* NZBFile::CreateFromBuffer(const char* szFileName, const char* szBuffer, int iSize)
-{
-	return Create(szFileName, szBuffer, iSize, true);
-}
-
-NZBFile* NZBFile::CreateFromFile(const char* szFileName)
-{
-	return Create(szFileName, NULL, 0, false);
-}
-
-void NZBFile::AddArticle(FileInfo* pFileInfo, ArticleInfo* pArticleInfo)
-{
-	// make Article-List big enough
-	while ((int)pFileInfo->GetArticles()->size() < pArticleInfo->GetPartNumber())
-		pFileInfo->GetArticles()->push_back(NULL);
-
-	(*pFileInfo->GetArticles())[pArticleInfo->GetPartNumber() - 1] = pArticleInfo;
-}
-
-void NZBFile::AddFileInfo(FileInfo* pFileInfo)
-{
-	// deleting empty articles
-	FileInfo::Articles* pArticles = pFileInfo->GetArticles();
-	int i = 0;
-	for (FileInfo::Articles::iterator it = pArticles->begin(); it != pArticles->end();)
-	{
-		if (*it == NULL)
-		{
-			pArticles->erase(it);
-			it = pArticles->begin() + i;
-		}
-		else
-		{
-			it++;
-			i++;
-		}
-	}
-
-	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
-	{
-		delete pFileInfo; 
-	}
-}
-
-void NZBFile::ParseSubject(FileInfo* pFileInfo)
-{
-	// tokenize subject, considering spaces as separators and quotation 
-	// marks as non separatable token delimiters.
-	// then take the last token containing dot (".") as a filename
-
-	typedef std::list<char*> TokenList;
-	TokenList tokens;
-	tokens.clear();
-
-	// tokenizing
-	char* p = (char*)pFileInfo->GetSubject();
-	char* start = p;
-	bool quot = false;
-	while (true)
-	{
-		char ch = *p;
-		bool sep = (ch == '\"') || (!quot && ch == ' ') || (ch == '\0');
-		if (sep)
-		{
-			// end of token
-			int len = (int)(p - start);
-			if (len > 0)
-			{
-				char* token = (char*)malloc(len + 1);
-				strncpy(token, start, len);
-				token[len] = '\0';
-				tokens.push_back(token);
-			}
-			start = p;
-			if (ch != '\"' || quot)
-			{
-				start++;
-			}
-			quot = *start == '\"';
-			if (quot)
-			{
-				start++;
-				char* q = strchr(start, '\"');
-				if (q)
-				{
-					p = q - 1;
-				}
-				else
-				{
-					quot = false;
-				}
-			}
-		}
-		if (ch == '\0')
-		{
-			break;
-		}
-		p++;
-	}
-
-	if (!tokens.empty())
-	{
-		// finding the best candidate for being a filename
-		char* besttoken = tokens.back();
-		for (TokenList::reverse_iterator it = tokens.rbegin(); it != tokens.rend(); it++)
-		{
-			char* s = *it;
-			char* p = strchr(s, '.');
-			if (p && (p[1] != '\0'))
-			{
-				besttoken = s;
-				break;
-			}
-		}
-		pFileInfo->SetFilename(besttoken);
-
-		// free mem
-		for (TokenList::iterator it = tokens.begin(); it != tokens.end(); it++)
-		{
-			free(*it);
-		}
-	}
-	else
-	{
-		// subject is empty or contains only separators?
-		debug("Could not extract Filename from Subject: %s. Using Subject as Filename", pFileInfo->GetSubject());
-		pFileInfo->SetFilename(pFileInfo->GetSubject());
-	}
-
-	pFileInfo->MakeValidFilename();
-}
-
-void NZBFile::BuildDestDirName()
-{
-	char szBuffer[1024];
-
-	if (g_pOptions->GetAppendNZBDir())
-	{
-		char szNiceNZBName[1024];
-		m_pNZBInfo->GetNiceNZBName(szNiceNZBName, 1024);
-		snprintf(szBuffer, 1024, "%s%s", g_pOptions->GetDestDir(), szNiceNZBName);
-		szBuffer[1024-1] = '\0';
-	}
-	else
-	{
-		strncpy(szBuffer, g_pOptions->GetDestDir(), 1024);
-		szBuffer[1024-1] = '\0'; // trim the last slash, always returned by GetDestDir()
-	}
-
-	m_pNZBInfo->SetDestDir(szBuffer);
-}
-
-/**
- * Check if the parsing of subject was correct
- */
-void NZBFile::CheckFilenames()
-{
-    for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
-    {
-        FileInfo* pFileInfo1 = *it;
-		int iDupe = 0;
-		for (FileInfos::iterator it2 = it + 1; it2 != m_FileInfos.end(); it2++)
-		{
-			FileInfo* pFileInfo2 = *it2;
-			if (!strcmp(pFileInfo1->GetFilename(), pFileInfo2->GetFilename()) &&
-				strcmp(pFileInfo1->GetSubject(), pFileInfo2->GetSubject()))
-			{
-				iDupe++;
-			}
-		}
-
-		// If more than two files have the same parsed filename but different subjects,
-		// this means, that the parsing was not correct.
-		// in this case we take subjects as filenames to prevent 
-		// false "duplicate files"-alarm.
-		// It's Ok for just two files to have the same filename, this is 
-		// an often case by posting-errors to repost bad files
-		if (iDupe > 2 || (iDupe == 2 && m_FileInfos.size() == 2))
-		{
-			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();
-				}
-			}
-		}
-    }
-}
-
-#ifdef WIN32
-NZBFile* NZBFile::Create(const char* szFileName, const char* szBuffer, int iSize, bool bFromBuffer)
-{
-    CoInitialize(NULL);
-
-	HRESULT hr;
-
-	MSXML::IXMLDOMDocumentPtr doc;
-	hr = doc.CreateInstance(MSXML::CLSID_DOMDocument);
-    if (FAILED(hr))
-    {
-        return NULL;
-    }
-
-    // Load the XML document file...
-	doc->put_resolveExternals(VARIANT_FALSE);
-	doc->put_validateOnParse(VARIANT_FALSE);
-	doc->put_async(VARIANT_FALSE);
-	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);
-		const char* szErrMsg = r;
-		error("Error parsing nzb-file: %s", szErrMsg);
-		return NULL;
-	}
-
-    NZBFile* pFile = new NZBFile(szFileName);
-    if (pFile->ParseNZB(doc))
-	{
-		pFile->CheckFilenames();
-	}
-	else
-	{
-		delete pFile;
-		pFile = NULL;
-	}
-
-    return pFile;
-}
-
-void NZBFile::EncodeURL(const char* szFilename, char* szURL)
-{
-	while (char ch = *szFilename++)
-	{
-		if (('0' <= ch && ch <= '9') ||
-			('a' <= ch && ch <= 'z') ||
-			('A' <= ch && ch <= 'Z') )
-		{
-			*szURL++ = ch;
-		}
-		else
-		{
-			*szURL++ = '%';
-			int a = ch >> 4;
-			*szURL++ = a > 9 ? a - 10 + 'a' : a + '0';
-			a = ch & 0xF;
-			*szURL++ = a > 9 ? a - 10 + 'a' : a + '0';
-		}
-	}
-	*szURL = NULL;
-}
-
-bool NZBFile::ParseNZB(IUnknown* nzb)
-{
-	MSXML::IXMLDOMDocumentPtr doc = nzb;
-	MSXML::IXMLDOMNodePtr root = doc->documentElement;
-
-	MSXML::IXMLDOMNodeListPtr fileList = root->selectNodes("/nzb/file");
-	for (int i = 0; i < fileList->Getlength(); i++)
-	{
-		MSXML::IXMLDOMNodePtr node = fileList->Getitem(i);
-		MSXML::IXMLDOMNodePtr attribute = node->Getattributes()->getNamedItem("subject");
-		if (!attribute) return false;
-		_bstr_t subject(attribute->Gettext());
-        FileInfo* pFileInfo = new FileInfo();
-		pFileInfo->SetSubject(subject);
-
-		MSXML::IXMLDOMNodeListPtr groupList = node->selectNodes("groups/group");
-		for (int g = 0; g < groupList->Getlength(); g++)
-		{
-			MSXML::IXMLDOMNodePtr node = groupList->Getitem(g);
-			_bstr_t group = node->Gettext();
-			pFileInfo->GetGroups()->push_back(strdup((const char*)group));
-		}
-
-		MSXML::IXMLDOMNodeListPtr segmentList = node->selectNodes("segments/segment");
-		for (int g = 0; g < segmentList->Getlength(); g++)
-		{
-			MSXML::IXMLDOMNodePtr node = segmentList->Getitem(g);
-			_bstr_t id = node->Gettext();
-            char szId[2048];
-            snprintf(szId, 2048, "<%s>", (const char*)id);
-
-			MSXML::IXMLDOMNodePtr attribute = node->Getattributes()->getNamedItem("number");
-			if (!attribute) return false;
-			_bstr_t number(attribute->Gettext());
-
-			attribute = node->Getattributes()->getNamedItem("bytes");
-			if (!attribute) return false;
-			_bstr_t bytes(attribute->Gettext());
-
-			int partNumber = atoi(number);
-			int lsize = atoi(bytes);
-
-			ArticleInfo* pArticle = new ArticleInfo();
-			pArticle->SetPartNumber(partNumber);
-			pArticle->SetMessageID(szId);
-			pArticle->SetSize(lsize);
-			AddArticle(pFileInfo, pArticle);
-
-            if (lsize > 0)
-            {
-                pFileInfo->SetSize(pFileInfo->GetSize() + lsize);
-            }
-		}
-
-		AddFileInfo(pFileInfo);
-	}
-	return true;
-}
-
-#else
-
-NZBFile* NZBFile::Create(const char* szFileName, const char* szBuffer, int iSize, bool bFromBuffer)
-{
-    xmlTextReaderPtr doc;
-	if (bFromBuffer)
-	{
-		doc = xmlReaderForMemory(szBuffer, iSize-1, "", NULL, 0);
-	}
-	else
-	{
-		doc = xmlReaderForFile(szFileName, NULL, 0);
-	}
-    if (!doc)
-    {
-        return NULL;
-    }
-
-    NZBFile* pFile = new NZBFile(szFileName);
-    if (pFile->ParseNZB(doc))
-	{
-		pFile->CheckFilenames();
-	}
-	else
-	{
-		delete pFile;
-		pFile = NULL;
-	}
-
-    xmlFreeTextReader(doc);
-
-    return pFile;
-}
-
-bool NZBFile::ParseNZB(void* nzb)
-{
-	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;
-
-            name = xmlTextReaderName(node);
-            if (name == NULL)
-            {
-                name = xmlStrdup(BAD_CAST "--");
-            }
-            value = xmlTextReaderValue(node);
-
-            if (xmlTextReaderNodeType(node) == 1)
-            {
-                if (!strcmp("file", (char*)name))
-                {
-                    pFileInfo = new FileInfo();
-                    pFileInfo->SetFilename(m_szFileName);
-
-                    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;
-
-                    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);
-
-                    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));
-                }
-            }
-
-            if (xmlTextReaderNodeType(node) == 15)
-            {
-                /* Close the file element, add the new file to file-list */
-                if (!strcmp("file",(char*)name))
-                {
-					AddFileInfo(pFileInfo);
-                }
-            }
-
-            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,69 +0,0 @@
-/*
- *  This file is 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 NZBFILE_H
-#define NZBFILE_H
-
-#include <vector>
-
-#include "DownloadInfo.h"
-
-class NZBFile
-{
-public:
-	typedef std::vector<FileInfo*>	FileInfos;
-
-private:
-	FileInfos			m_FileInfos;
-	NZBInfo*			m_pNZBInfo;
-	char*				m_szFileName;
-
-						NZBFile(const char* szFileName);
-	void				AddArticle(FileInfo* pFileInfo, ArticleInfo* pArticleInfo);
-	void				AddFileInfo(FileInfo* pFileInfo);
-	void				ParseSubject(FileInfo* pFileInfo);
-	void				BuildDestDirName();
-	void				CheckFilenames();
-#ifdef WIN32
-    bool 				ParseNZB(IUnknown* nzb);
-	static void			EncodeURL(const char* szFilename, char* szURL);
-#else
-    bool 				ParseNZB(void* nzb);
-#endif
-	static NZBFile*		Create(const char* szFileName, const char* szBuffer, int iSize, bool bFromBuffer);
-
-public:
-	virtual 			~NZBFile();
-	static NZBFile*		CreateFromBuffer(const char* szFileName, const char* szBuffer, int iSize);
-	static NZBFile*		CreateFromFile(const char* szFileName);
-	const char* 		GetFileName() const { return m_szFileName; }
-	FileInfos*			GetFileInfos() { return &m_FileInfos; }
-	void				DetachFileInfos();
-
-	void				LogDebugInfo();
-};
-
-#endif

NewsServer.cpp

@@ -1,65 +0,0 @@
-/*
- *  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 "NewsServer.h"
-#include "Log.h"
-
-NewsServer::NewsServer(const char* host, int port, const char* user, const char* pass, int maxConnections, int level) : NetAddress(host, port)
-{
-	m_szUser = NULL;
-	m_szPassword = NULL;
-	m_iLevel = level;
-	m_iMaxConnections = maxConnections;
-
-	if (pass)
-	{
-		m_szPassword = strdup(pass);
-	}
-	if (user)
-	{
-		m_szUser = strdup(user);
-	}
-}
-
-NewsServer::~NewsServer()
-{
-	free(m_szUser);
-	m_szUser = NULL;
-	free(m_szPassword);
-	m_szPassword = NULL;
-}

NewsServer.h

@@ -1,49 +0,0 @@
-/*
- *  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 NEWSSERVER_H
-#define NEWSSERVER_H
-
-#include "NetAddress.h"
-
-class NewsServer : public NetAddress
-{
-private:
-	char*		m_szUser;
-	char*		m_szPassword;
-	int			m_iMaxConnections;
-	int			m_iLevel;
-
-public:
-	NewsServer(const char* host, int port, const char* user, const char* pass, int maxConnections, int level);
-	virtual			~NewsServer();
-	const char*		GetUser() { return m_szUser; }
-	const char*		GetPassword() { return m_szPassword; }
-	int				GetMaxConnections() { return m_iMaxConnections; }
-	int				GetLevel() { return m_iLevel; }
-};
-
-#endif

Options.h

@@ -1,269 +0,0 @@
-/*
- *  This file is 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 OPTIONS_H
-#define OPTIONS_H
-
-#include <vector>
-
-class Options
-{
-public:
-	enum EClientOperation
-	{
-		opClientNoOperation,
-		opClientRequestDownload,
-		opClientRequestList,
-		opClientRequestPause,
-		opClientRequestUnpause,
-		opClientRequestSetRate,
-		opClientRequestDumpDebug,
-		opClientRequestEditQueue,
-		opClientRequestLog,
-		opClientRequestShutdown,
-		opClientRequestVersion,
-		opClientRequestPostQueue,
-		opClientRequestWriteLog
-	};
-	enum EMessageTarget
-	{
-		mtNone,
-		mtScreen,
-		mtLog,
-		mtBoth
-	};
-	enum EOutputMode
-	{
-		omLoggable,
-		omColored,
-		omNCurses
-	};
-	enum ELoadPars
-	{
-		lpNone,
-		lpOne,
-		lpAll
-	};
-
-	enum EPostLogKind
-	{
-		plNone,
-		plDetail,
-		plInfo,
-		plWarning,
-		plError,
-		plDebug
-	};
-
-private:
-	struct OptEntry
-	{
-		char* name;
-		char* value;
-	};
-	
-	std::vector< struct OptEntry >	optEntries;
-
-	bool				m_bConfigInitialized;
-
-	// Options
-	char*				m_szConfigFilename;
-	char*				m_szDestDir;
-	char*				m_szTempDir;
-	char*				m_szQueueDir;
-	char*				m_szNzbDir;
-	EMessageTarget		m_eInfoTarget;
-	EMessageTarget		m_eWarningTarget;
-	EMessageTarget		m_eErrorTarget;
-	EMessageTarget		m_eDebugTarget;
-	EMessageTarget		m_eDetailTarget;
-	bool				m_bDecode;
-	bool				m_bCreateBrokenLog;
-	bool				m_bResetLog;
-	int					m_iConnectionTimeout;
-	int					m_iTerminateTimeout;
-	bool				m_bAppendNZBDir;
-	bool				m_bContinuePartial;
-	bool				m_bRenameBroken;
-	int					m_iRetries;
-	int					m_iRetryInterval;
-	bool				m_bSaveQueue;
-	bool				m_bDupeCheck;
-	char*				m_szServerIP;
-	char*				m_szServerPassword;
-	int					m_szServerPort;
-	char*				m_szLockFile;
-	char*				m_szDaemonUserName;
-	EOutputMode			m_eOutputMode;
-	bool				m_bReloadQueue;
-	bool				m_bReloadPostQueue;
-	int					m_iLogBufferSize;
-	bool				m_bCreateLog;
-	char*				m_szLogFile;
-	ELoadPars			m_eLoadPars;
-	bool				m_bParCheck;
-	bool				m_bParRepair;
-	char*				m_szPostProcess;
-	bool				m_bStrictParName;
-	bool				m_bNoConfig;
-	int					m_iUMask;
-	int					m_iUpdateInterval;
-	bool				m_bCursesNZBName;
-	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;
-
-	// Parsed command-line parameters
-	bool				m_bServerMode;
-	bool				m_bDaemonMode;
-	bool				m_bRemoteClientMode;
-	int					m_iEditQueueAction;
-	int					m_iEditQueueOffset;
-	int*				m_pEditQueueIDList;
-	int					m_iEditQueueIDCount;
-	char*				m_szArgFilename;
-	char*				m_szLastArg;
-	bool				m_bPrintOptions;
-	bool				m_bAddTop;
-	float				m_fSetRate;
-	int					m_iLogLines;
-	int					m_iWriteLogKind;
-
-	// Current state
-	bool				m_bPause;
-	float				m_fDownloadRate;
-	EClientOperation	m_eClientOperation;
-
-	void				InitDefault();
-	void				InitOptFile();
-	void				InitCommandLine(int argc, char* argv[]);
-	void				InitOptions();
-	void				InitFileArg(int argc, char* argv[]);
-	void				InitServers();
-	void				CheckOptions();
-	void				PrintUsage(char* com);
-	void				Dump();
-	int					ParseOptionValue(const char* OptName, 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				LoadConfig(const char* configfile);
-	void				CheckDir(char** dir, const char* szOptionName);
-	void				ParseFileIDList(int argc, char* argv[], int optind);
-
-public:
-						Options(int argc, char* argv[]);
-						~Options();
-
-	// Options
-	const char*			GetDestDir() { return m_szDestDir; }
-	const char*			GetTempDir() { return m_szTempDir; }
-	const char*			GetQueueDir() { return m_szQueueDir; }
-	const char*			GetNzbDir() { return m_szNzbDir; }
-	bool				GetCreateBrokenLog() const { return m_bCreateBrokenLog; }
-	bool				GetResetLog() const { return m_bResetLog; }
-	EMessageTarget		GetInfoTarget() const { return m_eInfoTarget; }
-	EMessageTarget		GetWarningTarget() const { return m_eWarningTarget; }
-	EMessageTarget		GetErrorTarget() const { return m_eErrorTarget; }
-	EMessageTarget		GetDebugTarget() const { return m_eDebugTarget; }
-	EMessageTarget		GetDetailTarget() const { return m_eDetailTarget; }
-	int					GetConnectionTimeout() { return m_iConnectionTimeout; }
-	int					GetTerminateTimeout() { return m_iTerminateTimeout; }
-	bool				GetDecode() { return m_bDecode; };
-	bool				GetAppendNZBDir() { return m_bAppendNZBDir; }
-	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; }
-	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				GetReloadPostQueue() { return m_bReloadPostQueue; }
-	int					GetLogBufferSize() { return m_iLogBufferSize; }
-	bool				GetCreateLog() { return m_bCreateLog; }
-	char*				GetLogFile() { return m_szLogFile; }
-	ELoadPars			GetLoadPars() { return m_eLoadPars; }
-	bool				GetParCheck() { return m_bParCheck; }
-	bool				GetParRepair() { return m_bParRepair; }
-	const char*			GetPostProcess() { return m_szPostProcess; }
-	bool				GetStrictParName() { return m_bStrictParName; }
-	int					GetUMask() { return m_iUMask; }
-	int					GetUpdateInterval() {return m_iUpdateInterval; }
-	bool				GetCursesNZBName() { return m_bCursesNZBName; }
-	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; }
-
-	// Parsed command-line parameters
-	bool				GetServerMode() { return m_bServerMode; }
-	bool				GetDaemonMode() { return m_bDaemonMode; }
-	bool				GetRemoteClientMode() { return m_bRemoteClientMode; }
-	EClientOperation	GetClientOperation() { return m_eClientOperation; }
-	int					GetEditQueueAction() { return m_iEditQueueAction; }
-	int					GetEditQueueOffset() { return m_iEditQueueOffset; }
-	int*				GetEditQueueIDList() { return m_pEditQueueIDList; }
-	int					GetEditQueueIDCount() { return m_iEditQueueIDCount; }
-	const char*			GetArgFilename() { return m_szArgFilename; }
-	const char*			GetLastArg() { return m_szLastArg; }
-	bool				GetAddTop() { return m_bAddTop; }
-	float				GetSetRate() { return m_fSetRate; }
-	int					GetLogLines() { return m_iLogLines; }
-	int					GetWriteLogKind() { return m_iWriteLogKind; }
-
-	// Current state
-	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,543 +0,0 @@
-/*
- *  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
-
-#ifndef DISABLE_PARCHECK
-
-#include <stdlib.h>
-#include <string.h>
-#include <ctype.h>
-#ifdef WIN32
-#include <par2cmdline.h>
-#include <par2repairer.h>
-#else
-#include <libpar2/par2cmdline.h>
-#include <libpar2/par2repairer.h>
-#endif
-
-#include "nzbget.h"
-#include "ParChecker.h"
-#include "Log.h"
-#include "Options.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-
-const char* Par2CmdLineErrStr[] = { "OK",
-	"data files are damaged and there is enough recovery data available to repair them",
-	"data files are damaged and there is insufficient recovery data available to be able to repair them",
-	"there was something wrong with the command line arguments",
-	"the PAR2 files did not contain sufficient information about the data files to be able to verify them",
-	"repair completed but the data files still appear to be damaged",
-	"an error occured when accessing files",
-	"internal error occurred",
-	"out of memory" };
-
-
-class Repairer : public Par2Repairer
-{
-	friend class ParChecker;
-};
-
-
-ParChecker::ParChecker()
-{
-    debug("Creating ParChecker");
-
-	m_eStatus = psUndefined;
-	m_szParFilename = NULL;
-	m_szNZBFilename = NULL;
-	m_szInfoName = NULL;
-	m_szErrMsg = NULL;
-	m_szProgressLabel = (char*)malloc(1024);
-	m_iFileProgress = 0;
-	m_iStageProgress = 0;
-	m_iExtraFiles = 0;
-	m_bVerifyingExtraFiles = false;
-	m_eStage = ptLoadingPars;
-	m_QueuedParFiles.clear();
-}
-
-ParChecker::~ParChecker()
-{
-    debug("Destroying ParChecker");
-
-	if (m_szParFilename)
-	{
-		free(m_szParFilename);
-	}
-	if (m_szNZBFilename)
-	{
-		free(m_szNZBFilename);
-	}
-	if (m_szInfoName)
-	{
-		free(m_szInfoName);
-	}
-	if (m_szErrMsg)
-	{
-		free(m_szErrMsg);
-	}
-	free(m_szProgressLabel);
-
-	for (QueuedParFiles::iterator it = m_QueuedParFiles.begin(); it != m_QueuedParFiles.end() ;it++)
-	{
-		free(*it);
-	}
-	m_QueuedParFiles.clear();
-}
-
-void ParChecker::SetParFilename(const char * szParFilename)
-{
-	if (m_szParFilename)
-	{
-		free(m_szParFilename);
-	}
-	m_szParFilename = strdup(szParFilename);
-}
-
-void ParChecker::SetInfoName(const char * szInfoName)
-{
-	if (m_szInfoName)
-	{
-		free(m_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()
-{
-	m_bRepairNotNeeded = false;
-	m_eStage = ptLoadingPars;
-	m_iProcessedFiles = 0;
-	m_iExtraFiles = 0;
-	m_bVerifyingExtraFiles = false;
-
-	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();
-	m_pRepairer = pRepairer;
-
-	pRepairer->sig_filename.connect(sigc::mem_fun(*this, &ParChecker::signal_filename));
-	pRepairer->sig_progress.connect(sigc::mem_fun(*this, &ParChecker::signal_progress));
-	pRepairer->sig_done.connect(sigc::mem_fun(*this, &ParChecker::signal_done));
-	
-    res = pRepairer->PreProcess(commandLine);
-    debug("ParChecker: PreProcess-result=%i", res);
-
-	if (res != eSuccess || IsStopped())
-	{
-       	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;
-		return;
-	}
-
-	char BufReason[1024];
-	BufReason[0] = '\0';
-	if (m_szErrMsg)
-	{
-		free(m_szErrMsg);
-	}
-	m_szErrMsg = NULL;
-	
-	m_eStage = ptVerifyingSources;
-    res = pRepairer->Process(commandLine, false);
-    debug("ParChecker: Process-result=%i", res);
-
-	if (!IsStopped() && res == eRepairNotPossible && CheckSplittedFragments())
-	{
-		pRepairer->UpdateVerificationResults();
-		res = pRepairer->Process(commandLine, false);
-		debug("ParChecker: Process-result=%i", res);
-	}
-
-	bool bMoreFilesLoaded = true;
-	while (!IsStopped() && res == eRepairNotPossible)
-	{
-		int missingblockcount = pRepairer->missingblockcount - pRepairer->recoverypacketmap.size();
-		if (bMoreFilesLoaded)
-		{
-			info("Need more %i par-block(s) for %s", missingblockcount, m_szInfoName);
-		}
-		
-		m_mutexQueuedParFiles.Lock();
-        bool hasMorePars = !m_QueuedParFiles.empty();
-		m_mutexQueuedParFiles.Unlock();
-		
-		if (!hasMorePars)
-		{
-			int iBlockFound = 0;
-			bool requested = RequestMorePars(missingblockcount, &iBlockFound);
-			if (requested)
-			{
-				strncpy(m_szProgressLabel, "Awaiting additional par-files", 1024);
-				m_szProgressLabel[1024-1] = '\0';
-				m_iFileProgress = 0;
-				UpdateProgress();
-			}
-			
-			m_mutexQueuedParFiles.Lock();
-			hasMorePars = !m_QueuedParFiles.empty();
-			m_mutexQueuedParFiles.Unlock();
-			
-			if (!requested && !hasMorePars)
-			{
-				snprintf(BufReason, 1024, "not enough par-blocks, %i block(s) needed, but %i block(s) available", missingblockcount, iBlockFound);
-                BufReason[1024-1] = '\0';
-				m_szErrMsg = strdup(BufReason);
-				break;
-			}
-			
-			if (!hasMorePars)
-			{
-				m_semNeedMoreFiles.Wait();
-			}
-		}
-
-		if (IsStopped())
-		{
-			break;
-		}
-
-		bMoreFilesLoaded = LoadMorePars();
-		if (bMoreFilesLoaded)
-		{
-			pRepairer->UpdateVerificationResults();
-			res = pRepairer->Process(commandLine, false);
-			debug("ParChecker: Process-result=%i", res);
-		}
-	}
-
-	if (IsStopped())
-	{
-		SetStatus(psFailed);
-		delete pRepairer;
-		return;
-	}
-	
-	if (res == eSuccess)
-	{
-    	info("Repair not needed for %s", m_szInfoName);
-		m_bRepairNotNeeded = true;
-	}
-	else if (res == eRepairPossible)
-	{
-		if (g_pOptions->GetParRepair())
-		{
-    		info("Repairing %s", m_szInfoName);
-
-			snprintf(m_szProgressLabel, 1024, "Repairing %s", m_szInfoName);
-			m_szProgressLabel[1024-1] = '\0';
-			m_iFileProgress = 0;
-			m_iStageProgress = 0;
-			m_iProcessedFiles = 0;
-			m_eStage = ptRepairing;
-			m_iFilesToRepair = pRepairer->damagedfilecount + pRepairer->missingfilecount;
-			UpdateProgress();
-
-			res = pRepairer->Process(commandLine, true);
-    		debug("ParChecker: Process-result=%i", res);
-			if (res == eSuccess)
-			{
-    			info("Successfully repaired %s", m_szInfoName);
-			}
-		}
-		else
-		{
-    		info("Repair possible for %s", m_szInfoName);
-			res = eSuccess;
-		}
-	}
-	
-	if (res == eSuccess)
-	{
-		SetStatus(psFinished);
-	}
-	else
-	{
-		if (!m_szErrMsg && (int)res >= 0 && (int)res <= 8)
-		{
-			m_szErrMsg = strdup(Par2CmdLineErrStr[res]);
-		}
-		error("Repair failed for %s: %s", m_szInfoName, m_szErrMsg ? m_szErrMsg : "");
-		SetStatus(psFailed);
-	}
-	
-	delete pRepairer;
-}
-
-bool ParChecker::LoadMorePars()
-{
-	m_mutexQueuedParFiles.Lock();
-	QueuedParFiles moreFiles;
-	moreFiles.assign(m_QueuedParFiles.begin(), m_QueuedParFiles.end());
-	m_QueuedParFiles.clear();
-	m_mutexQueuedParFiles.Unlock();
-	
-	for (QueuedParFiles::iterator it = moreFiles.begin(); it != moreFiles.end() ;it++)
-	{
-		char* szParFilename = *it;
-		bool loadedOK = ((Repairer*)m_pRepairer)->LoadPacketsFromFile(szParFilename);
-		if (loadedOK)
-		{
-			info("File %s successfully loaded for par-check", Util::BaseFileName(szParFilename), m_szInfoName);
-		}
-		else
-		{
-			info("Could not load file %s for par-check", Util::BaseFileName(szParFilename), m_szInfoName);
-		}
-		free(szParFilename);
-	}
-
-	return !moreFiles.empty();
-}
-
-void ParChecker::AddParFile(const char * szParFilename)
-{
-	m_mutexQueuedParFiles.Lock();
-	m_QueuedParFiles.push_back(strdup(szParFilename));
-	m_semNeedMoreFiles.Post();
-	m_mutexQueuedParFiles.Unlock();
-}
-
-void ParChecker::QueueChanged()
-{
-	m_mutexQueuedParFiles.Lock();
-	m_semNeedMoreFiles.Post();
-	m_mutexQueuedParFiles.Unlock();
-}
-
-bool ParChecker::CheckSplittedFragments()
-{
-	bool bFragmentsAdded = false;
-
-	for (vector<Par2RepairerSourceFile*>::iterator it = ((Repairer*)m_pRepairer)->sourcefiles.begin();
-		it != ((Repairer*)m_pRepairer)->sourcefiles.end(); it++)
-	{
-		Par2RepairerSourceFile *sourcefile = *it;
-		if (!sourcefile->GetTargetExists() && AddSplittedFragments(sourcefile->TargetFileName().c_str()))
-		{
-			bFragmentsAdded = true;
-		}
-	}
-
-	return bFragmentsAdded;
-}
-
-bool ParChecker::AddSplittedFragments(const char* szFilename)
-{
-	char szDirectory[1024];
-	strncpy(szDirectory, szFilename, 1024);
-	szDirectory[1024-1] = '\0';
-
-	char* szBasename = Util::BaseFileName(szDirectory);
-	if (szBasename == szDirectory)
-	{
-		return false;
-	}
-	szBasename[-1] = '\0';
-	int iBaseLen = strlen(szBasename);
-
-	list<CommandLine::ExtraFile> extrafiles;
-
-	DirBrowser dir(szDirectory);
-	while (const char* filename = dir.Next())
-	{
-		if (!strncasecmp(filename, szBasename, iBaseLen))
-		{
-			const char* p = filename + iBaseLen;
-			if (*p == '.')
-			{
-				for (p++; *p && strchr("0123456789", *p); p++) ;
-				if (!*p)
-				{
-					debug("Found splitted fragment %s", filename);
-
-					char fullfilename[1024];
-					snprintf(fullfilename, 1024, "%s%c%s", szDirectory, PATH_SEPARATOR, filename);
-					fullfilename[1024-1] = '\0';
-
-					CommandLine::ExtraFile extrafile(fullfilename, Util::FileSize(fullfilename));
-					extrafiles.push_back(extrafile);
-				}
-			}
-		}
-	}
-
-	bool bFragmentsAdded = false;
-
-	if (!extrafiles.empty())
-	{
-		m_iExtraFiles = extrafiles.size();
-		m_bVerifyingExtraFiles = true;
-		bFragmentsAdded = ((Repairer*)m_pRepairer)->VerifyExtraFiles(extrafiles);
-		m_bVerifyingExtraFiles = false;
-	}
-
-	return bFragmentsAdded;
-}
-
-void ParChecker::signal_filename(std::string str)
-{
-    char* szStageMessage[] = { "Loading file", "Verifying file", "Repairing file", "Verifying repaired file" };
-
-	if (m_eStage == ptRepairing)
-	{
-		m_eStage = ptVerifyingRepaired;
-	}
-
-	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';
-	m_iFileProgress = 0;
-	UpdateProgress();
-}
-
-void ParChecker::signal_progress(double progress)
-{
-	m_iFileProgress = (int)progress;
-
-	if (m_eStage == ptRepairing)
-	{
-		// calculating repair-data for all files
-		m_iStageProgress = m_iFileProgress;
-	}
-	else
-	{
-		// processing individual files
-
-		int iTotalFiles = 0;
-		if (m_eStage == ptVerifyingRepaired)
-		{
-			// repairing individual files
-			iTotalFiles = m_iFilesToRepair;
-		}
-		else
-		{
-			// verifying individual files
-			iTotalFiles = ((Repairer*)m_pRepairer)->sourcefiles.size() + m_iExtraFiles;
-		}
-
-		if (iTotalFiles > 0)
-		{
-			if (m_iFileProgress < 1000)
-			{
-				m_iStageProgress = (m_iProcessedFiles * 1000 + m_iFileProgress) / iTotalFiles;
-			}
-			else
-			{
-				m_iStageProgress = m_iProcessedFiles * 1000 / iTotalFiles;
-			}
-		}
-		else
-		{
-			m_iStageProgress = 0;
-		}
-	}
-
-	debug("Current-progres: %i, Total-progress: %i", m_iFileProgress, m_iStageProgress);
-
-	UpdateProgress();
-}
-
-void ParChecker::signal_done(std::string str, int available, int total)
-{
-	m_iProcessedFiles++;
-
-	if (m_eStage == ptVerifyingSources)
-	{
-		if (available < total && !m_bVerifyingExtraFiles)
-		{
-			bool bFileExists = true;
-
-			for (vector<Par2RepairerSourceFile*>::iterator it = ((Repairer*)m_pRepairer)->sourcefiles.begin();
-				it != ((Repairer*)m_pRepairer)->sourcefiles.end(); it++)
-			{
-				Par2RepairerSourceFile *sourcefile = *it;
-				if (sourcefile && !strcmp(str.c_str(), Util::BaseFileName(sourcefile->TargetFileName().c_str())) &&
-					!sourcefile->GetTargetExists())
-				{
-					bFileExists = false;
-					break;
-				}
-			}
-
-			if (bFileExists)
-			{
-				warn("File %s has %i bad block(s) of total %i block(s)", str.c_str(), total - available, total);
-			}
-			else
-			{
-				warn("File %s with %i block(s) is missing", str.c_str(), total);
-			}
-		}
-	}
-}
-
-#endif

PostInfo.cpp

@@ -1,154 +0,0 @@
-/*
- *  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_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_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::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

@@ -1,113 +0,0 @@
-/*
- *  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;
-	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);
-	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,134 +0,0 @@
-/*
- *  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 PREPOSTPROCESSOR_H
-#define PREPOSTPROCESSOR_H
-
-#include <deque>
-
-#include "Thread.h"
-#include "Observer.h"
-#include "DownloadInfo.h"
-#include "PostInfo.h"
-
-#ifndef DISABLE_PARCHECK
-#include "ParChecker.h"
-#endif
-
-class PrePostProcessor : public Thread
-{
-private:
-	typedef std::deque<char*>		FileList;
-
-	class QueueCoordinatorObserver: public Observer
-	{
-	public:
-		PrePostProcessor* owner;
-		virtual void	Update(Subject* Caller, void* Aspect) { owner->QueueCoordinatorUpdate(Caller, Aspect); }
-	};
-
-#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_Owner;
-	protected:
-		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:
-	QueueCoordinatorObserver	m_QueueCoordinatorObserver;
-	bool				m_bHasMoreJobs;
-	bool				m_bPostScript;
-
-	void				PausePars(DownloadQueue* pDownloadQueue, const char* szNZBFilename);
-	void				CheckIncomingNZBs();
-	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				StartScriptJob(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
-	void				SavePostQueue();
-	void				SanitisePostQueue();
-	void				CheckDiskSpace();
-
-	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();
-	virtual void		Run();
-	virtual void		Stop();
-	void				QueueCoordinatorUpdate(Subject* Caller, void* Aspect);
-	bool				HasMoreJobs() { return m_bHasMoreJobs; }
-	PostQueue*			LockPostQueue();
-	void				UnlockPostQueue();
-};
-
-#endif

QueueCoordinator.cpp

@@ -1,791 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  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
- *  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 <sys/stat.h>
-#ifndef WIN32
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-
-#include "nzbget.h"
-#include "QueueCoordinator.h"
-#include "Options.h"
-#include "ServerPool.h"
-#include "ArticleDownloader.h"
-#include "DiskState.h"
-#include "Log.h"
-#include "Util.h"
-#include "Decoder.h"
-
-extern Options* g_pOptions;
-extern ServerPool* g_pServerPool;
-extern DiskState* g_pDiskState;
-
-QueueCoordinator::QueueCoordinator()
-{
-	debug("Creating QueueCoordinator");
-
-	m_bHasMoreJobs = true;
-	m_DownloadQueue.clear();
-	m_ActiveDownloads.clear();
-
-	for (int i = 0; i < SPEEDMETER_SECONDS; i++)
-	{
-		m_iSpeedBytes[i] = 0;
-	}
-	m_iSpeedBytesIndex = 0;
-
-	m_iAllBytes = 0;
-	m_tStartServer = 0;
-	m_tStartDownload = 0;
-	m_tPausedFrom = 0;
-	m_bStandBy = true;
-
-	YDecoder::Init();
-}
-
-QueueCoordinator::~QueueCoordinator()
-{
-	debug("Destroying QueueCoordinator");
-	// Cleanup
-
-	debug("Deleting DownloadQueue");
-	for (DownloadQueue::iterator it = m_DownloadQueue.begin(); it != m_DownloadQueue.end(); it++)
-	{
-		delete *it;
-	}
-	m_DownloadQueue.clear();
-
-	debug("Deleting ArticleDownloaders");
-	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
-	{
-		delete *it;
-	}
-	m_ActiveDownloads.clear();
-
-	YDecoder::Final();
-
-	debug("QueueCoordinator destroyed");
-}
-
-void QueueCoordinator::Run()
-{
-	debug("Entering QueueCoordinator-loop");
-
-	m_mutexDownloadQueue.Lock();
-
-	if (g_pOptions->GetServerMode() && g_pOptions->GetSaveQueue() && g_pDiskState->DownloadQueueExists())
-	{
-		if (g_pOptions->GetReloadQueue())
-		{
-			g_pDiskState->LoadDownloadQueue(&m_DownloadQueue);
-		}
-		else
-		{
-			g_pDiskState->DiscardDownloadQueue();
-		}
-	}
-
-	g_pDiskState->CleanupTempDir(&m_DownloadQueue);
-
-	m_mutexDownloadQueue.Unlock();
-
-	m_tStartServer = time(NULL);
-	bool bWasStandBy = true;
-	bool bArticeDownloadsRunning = false;
-	int iResetCounter = 0;
-
-	while (!IsStopped())
-	{
-		if (!g_pOptions->GetPause())
-		{
-			NNTPConnection* pConnection = g_pServerPool->GetConnection(0, false);
-			if (pConnection)
-			{
-				// start download for next article
-				FileInfo* pFileInfo;
-				ArticleInfo* pArticleInfo;
-
-				m_mutexDownloadQueue.Lock();
-				bool bHasMoreArticles = GetNextArticle(pFileInfo, pArticleInfo);
-				bArticeDownloadsRunning = !m_ActiveDownloads.empty();
-				m_bHasMoreJobs = bHasMoreArticles || bArticeDownloadsRunning;
-				if (bHasMoreArticles && !IsStopped() && Thread::GetThreadCount() < g_pOptions->GetThreadLimit())
-				{
-					StartArticleDownload(pFileInfo, pArticleInfo, pConnection);
-					bArticeDownloadsRunning = true;
-				}
-				else
-				{
-					g_pServerPool->FreeConnection(pConnection, false);
-				}
-				m_mutexDownloadQueue.Unlock();
-			}
-		}
-		else
-		{
-			m_mutexDownloadQueue.Lock();
-			bArticeDownloadsRunning = !m_ActiveDownloads.empty();
-			m_mutexDownloadQueue.Unlock();
-		}
-
-		bool bStandBy = !bArticeDownloadsRunning;
-		if (bStandBy ^ bWasStandBy)
-		{
-			EnterLeaveStandBy(bStandBy);
-			bWasStandBy = bStandBy;
-		}
-
-		// sleep longer in StandBy
-		int iSleepInterval = bStandBy ? 100 : 5;
-		usleep(iSleepInterval * 1000);
-
-		AddSpeedReading(0);
-
-		iResetCounter+= iSleepInterval;
-		if (iResetCounter >= 1000)
-		{
-			// this code should not be called too often, once per second is OK
-			g_pServerPool->CloseUnusedConnections();
-			ResetHangingDownloads();
-			iResetCounter = 0;
-		}
-	}
-
-	// waiting for downloads
-	debug("QueueCoordinator: waiting for Downloads to complete");
-	bool completed = false;
-	while (!completed)
-	{
-		m_mutexDownloadQueue.Lock();
-		completed = m_ActiveDownloads.size() == 0;
-		m_mutexDownloadQueue.Unlock();
-		usleep(100 * 1000);
-		ResetHangingDownloads();
-	}
-	debug("QueueCoordinator: Downloads are completed");
-
-	debug("Exiting QueueCoordinator-loop");
-}
-
-void QueueCoordinator::AddNZBFileToQueue(NZBFile* pNZBFile, bool bAddFirst)
-{
-	debug("Adding NZBFile to queue");
-
-	m_mutexDownloadQueue.Lock();
-
-	DownloadQueue tmpDownloadQueue;
-	tmpDownloadQueue.clear();
-	DownloadQueue DupeList;
-	DupeList.clear();
-
-	int index1 = 0;
-	for (NZBFile::FileInfos::iterator it = pNZBFile->GetFileInfos()->begin(); it != pNZBFile->GetFileInfos()->end(); it++)
-	{
-		index1++;
-		FileInfo* pFileInfo = *it;
-
-		if (g_pOptions->GetDupeCheck())
-		{
-			bool dupe = false;
-			if (IsDupe(pFileInfo))
-			{
-				warn("File \"%s\" seems to be duplicate, skipping", pFileInfo->GetFilename());
-				dupe = true;
-			}
-			int index2 = 0;
-			for (NZBFile::FileInfos::iterator it2 = pNZBFile->GetFileInfos()->begin(); it2 != pNZBFile->GetFileInfos()->end(); it2++)
-			{
-				index2++;
-				FileInfo* pFileInfo2 = *it2;
-				if (pFileInfo != pFileInfo2 &&
-					!strcmp(pFileInfo->GetFilename(), pFileInfo2->GetFilename()) &&
-					(pFileInfo->GetSize() < pFileInfo2->GetSize() || 
-					 (pFileInfo->GetSize() == pFileInfo2->GetSize() && index2 < index1)))
-				{
-					warn("File \"%s\" appears twice in nzb-request, adding only the biggest file", pFileInfo->GetFilename());
-					dupe = true;
-					break;
-				}
-			}
-			if (dupe)
-			{
-				DupeList.push_back(pFileInfo);
-				continue;
-			}
-		}
-
-		if (bAddFirst)
-		{
-			tmpDownloadQueue.push_front(pFileInfo);
-		}
-		else
-		{
-			tmpDownloadQueue.push_back(pFileInfo);
-		}
-	}
-
-	for (DownloadQueue::iterator it = tmpDownloadQueue.begin(); it != tmpDownloadQueue.end(); it++)
-	{
-		if (bAddFirst)
-		{
-			m_DownloadQueue.push_front(*it);
-		}
-		else
-		{
-			m_DownloadQueue.push_back(*it);
-		}
-	}
-
-	for (DownloadQueue::iterator it = DupeList.begin(); it != DupeList.end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-		{
-			g_pDiskState->DiscardFile(NULL, pFileInfo);
-		}
-		delete pFileInfo;
-	}
-
-	pNZBFile->DetachFileInfos();
-
-	Aspect aspect = { eaNZBFileAdded, NULL, &m_DownloadQueue, pNZBFile->GetFileName() };
-	Notify(&aspect);
-	
-	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-	{
-		g_pDiskState->SaveDownloadQueue(&m_DownloadQueue);
-	}
-
-	m_mutexDownloadQueue.Unlock();
-}
-
-bool QueueCoordinator::AddFileToQueue(const char* szFileName)
-{
-	// Parse the buffer and make it into a NZBFile
-	NZBFile* pNZBFile = NZBFile::CreateFromFile(szFileName);
-
-	// Did file parse correctly?
-	if (!pNZBFile)
-	{
-		return false;
-	}
-
-	// Add NZBFile to Queue
-	AddNZBFileToQueue(pNZBFile, false);
-
-	delete pNZBFile;
-
-	return true;
-}
-
-/*
- * NOTE: see note to "AddSpeedReading"
- */
-float QueueCoordinator::CalcCurrentDownloadSpeed()
-{
-	int iTotal = 0;
-
-	for (int i = 0; i < SPEEDMETER_SECONDS; i++)
-	{
-		iTotal += m_iSpeedBytes[i];
-	}
-
-	float fSpeed = iTotal / 1024.0f / SPEEDMETER_SECONDS;
-
-	return fSpeed;
-}
-
-/*
- * NOTE: we should use mutex by access to m_iSpeedBytes and m_iSpeedBytesIndex,
- * but this would results in a big performance loss (the function 
- * "AddSpeedReading" is called extremly often), so we better agree with calculation 
- * errors possible because of simultaneuos access from several threads.
- * The used algorithm is able to recover after few seconds.
- * In any case the calculation errors can not result in fatal system 
- * errors (segmentation faults).
- */
-void QueueCoordinator::AddSpeedReading(int iBytes)
-{
-	int iIndex = (int)time(NULL);
-
-	if (iIndex - m_iSpeedBytesIndex > SPEEDMETER_SECONDS)
-	{
-		m_iSpeedBytesIndex = iIndex - SPEEDMETER_SECONDS - 1;
-	}
-
-	for (int i = m_iSpeedBytesIndex + 1; i < iIndex; i++)
-	{
-		m_iSpeedBytes[i % SPEEDMETER_SECONDS] = 0;
-	}
-
-	if (iIndex > m_iSpeedBytesIndex)
-	{
-		m_iSpeedBytesIndex = iIndex;
-		m_iSpeedBytes[iIndex % SPEEDMETER_SECONDS] = iBytes;
-	}
-	else
-	{
-		m_iSpeedBytes[m_iSpeedBytesIndex % SPEEDMETER_SECONDS] += iBytes;
-	}
-
-	m_iAllBytes += iBytes;
-}
-
-long long QueueCoordinator::CalcRemainingSize()
-{
-	long long lRemainingSize = 0;
-
-	m_mutexDownloadQueue.Lock();
-	for (DownloadQueue::iterator it = m_DownloadQueue.begin(); it != m_DownloadQueue.end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-		if (!pFileInfo->GetPaused() && !pFileInfo->GetDeleted())
-		{
-			lRemainingSize += pFileInfo->GetRemainingSize();
-		}
-	}
-	m_mutexDownloadQueue.Unlock();
-
-	return lRemainingSize;
-}
-
-/*
- * NOTE: DownloadQueue must be locked prior to call of this function
- * Returns True if Entry was deleted from Queue or False if it was scheduled for Deletion.
- * NOTE: "False" does not mean unsuccess; the entry is (or will be) deleted in any case.
- */
-bool QueueCoordinator::DeleteQueueEntry(FileInfo* pFileInfo)
-{
-	pFileInfo->SetDeleted(true);
-	bool hasDownloads = false;
-	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
-	{
-		ArticleDownloader* pArticleDownloader = *it;
-		if (pArticleDownloader->GetFileInfo() == pFileInfo)
-		{
-			hasDownloads = true;
-			pArticleDownloader->Stop();
-		}
-	}
-	if (!hasDownloads)
-	{
-		Aspect aspect = { eaFileDeleted, pFileInfo, &m_DownloadQueue, NULL };
-		Notify(&aspect);
-
-		DeleteFileInfo(pFileInfo, false);
-	}
-	return hasDownloads;
-}
-
-void QueueCoordinator::Stop()
-{
-	Thread::Stop();
-
-	debug("Stopping ArticleDownloads");
-	m_mutexDownloadQueue.Lock();
-	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
-	{
-		(*it)->Stop();
-	}
-	m_mutexDownloadQueue.Unlock();
-	debug("ArticleDownloads are notified");
-}
-
-bool QueueCoordinator::GetNextArticle(FileInfo* &pFileInfo, ArticleInfo* &pArticleInfo)
-{
-	//debug("QueueCoordinator::GetNextArticle()");
-
-	for (DownloadQueue::iterator it = m_DownloadQueue.begin(); it != m_DownloadQueue.end(); it++)
-	{
-		pFileInfo = *it;
-		if (!pFileInfo->GetPaused() && !pFileInfo->GetDeleted())
-		{
-			if (pFileInfo->GetArticles()->empty() && g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-			{
-				g_pDiskState->LoadArticles(pFileInfo);
-			}
-			for (FileInfo::Articles::iterator at = pFileInfo->GetArticles()->begin(); at != pFileInfo->GetArticles()->end(); at++)
-			{
-				pArticleInfo = *at;
-				if (pArticleInfo->GetStatus() == 0)
-				{
-					return true;
-				}
-			}
-		}
-	}
-
-	return false;
-}
-
-void QueueCoordinator::StartArticleDownload(FileInfo* pFileInfo, ArticleInfo* pArticleInfo, NNTPConnection* pConnection)
-{
-	debug("Starting new ArticleDownloader");
-
-	ArticleDownloader* pArticleDownloader = new ArticleDownloader();
-	pArticleDownloader->SetAutoDestroy(true);
-	pArticleDownloader->Attach(this);
-	pArticleDownloader->SetFileInfo(pFileInfo);
-	pArticleDownloader->SetArticleInfo(pArticleInfo);
-	pArticleDownloader->SetConnection(pConnection);
-	BuildArticleFilename(pArticleDownloader, pFileInfo, pArticleInfo);
-
-	pArticleInfo->SetStatus(ArticleInfo::aiRunning);
-
-	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();
-	return &m_DownloadQueue;
-}
-
-void QueueCoordinator::UnlockQueue()
-{
-	m_mutexDownloadQueue.Unlock();
-}
-
-void QueueCoordinator::Update(Subject* Caller, void* Aspect)
-{
-	debug("Notification from ArticleDownloader received");
-
-	ArticleDownloader* pArticleDownloader = (ArticleDownloader*) Caller;
-	if ((pArticleDownloader->GetStatus() == ArticleDownloader::adFinished) ||
-	        (pArticleDownloader->GetStatus() == ArticleDownloader::adFailed))
-	{
-		ArticleCompleted(pArticleDownloader);
-	}
-}
-
-void QueueCoordinator::ArticleCompleted(ArticleDownloader* pArticleDownloader)
-{
-	debug("Article downloaded");
-
-	FileInfo* pFileInfo = pArticleDownloader->GetFileInfo();
-	ArticleInfo* pArticleInfo = pArticleDownloader->GetArticleInfo();
-
-	m_mutexDownloadQueue.Lock();
-
-	if (pArticleDownloader->GetStatus() == ArticleDownloader::adFinished)
-	{
-		pArticleInfo->SetStatus(ArticleInfo::aiFinished);
-	}
-	else if (pArticleDownloader->GetStatus() == ArticleDownloader::adFailed)
-	{
-		pArticleInfo->SetStatus(ArticleInfo::aiFailed);
-	}
-
-	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 &&
-		pArticleDownloader->GetArticleFilename())
-	{
-		pFileInfo->SetFilename(pArticleDownloader->GetArticleFilename());
-		pFileInfo->SetFilenameConfirmed(true);
-		if (g_pOptions->GetDupeCheck() && pFileInfo->IsDupe(pFileInfo->GetFilename()))
-		{
-			warn("File \"%s\" seems to be duplicate, cancelling download and deleting file from queue", pFileInfo->GetFilename());
-			fileCompleted = false;
-			DeleteQueueEntry(pFileInfo);
-		}
-	}
-
-	bool deleteFileObj = false;
-
-	if (pFileInfo->GetDeleted())
-	{
-		int cnt = 0;
-		for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
-		{
-			if ((*it)->GetFileInfo() == pFileInfo)
-			{
-				cnt++;
-			}
-		}
-		if (cnt == 1)
-		{
-			// this was the last Download for a file deleted from queue
-			deleteFileObj = true;
-		}
-	}
-
-	if (fileCompleted && !IsStopped() && !pFileInfo->GetDeleted())
-	{
-		// all jobs done
-		m_mutexDownloadQueue.Unlock();
-		pArticleDownloader->CompleteFileParts();
-		m_mutexDownloadQueue.Lock();
-		deleteFileObj = true;
-	}
-
-	// delete Download from Queue
-	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
-	{
-		ArticleDownloader* pa = *it;
-		if (pa == pArticleDownloader)
-		{
-			m_ActiveDownloads.erase(it);
-			break;
-		}
-	}
-	if (deleteFileObj)
-	{
-		bool fileDeleted = pFileInfo->GetDeleted();
-		// delete File from Queue
-		pFileInfo->SetDeleted(true);
-
-		Aspect aspect = { fileCompleted && !fileDeleted ? eaFileCompleted : eaFileDeleted, pFileInfo, &m_DownloadQueue, NULL };
-		Notify(&aspect);
-		
-		DeleteFileInfo(pFileInfo, fileCompleted);
-	}
-
-	m_mutexDownloadQueue.Unlock();
-}
-
-void QueueCoordinator::DeleteFileInfo(FileInfo* pFileInfo, bool bCompleted)
-{
-	for (DownloadQueue::iterator it = m_DownloadQueue.begin(); it != m_DownloadQueue.end(); it++)
-	{
-		FileInfo* pa = *it;
-		if (pa == pFileInfo)
-		{
-			m_DownloadQueue.erase(it);
-			break;
-		}
-	}
-
-	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-	{
-		g_pDiskState->DiscardFile(&m_DownloadQueue, pFileInfo);
-	}
-
-	if (!bCompleted)
-	{
-		// deleting temporary files
-
-		if (!g_pOptions->GetDirectWrite() || g_pOptions->GetContinuePartial())
-		{
-			for (FileInfo::Articles::iterator it = pFileInfo->GetArticles()->begin(); it != pFileInfo->GetArticles()->end(); it++)
-			{
-				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);
-		}
-	}
-
-	delete pFileInfo;
-}
-
-bool QueueCoordinator::IsDupe(FileInfo* pFileInfo)
-{
-	debug("Checking if the file is already queued");
-
-	// checking on disk
-	if (pFileInfo->IsDupe(pFileInfo->GetFilename()))
-	{
-		return true;
-	}
-
-	// checking in queue
-	for (DownloadQueue::iterator it = m_DownloadQueue.begin(); it != m_DownloadQueue.end(); it++)
-	{
-		FileInfo* pQueueEntry = *it;
-		if (!strcmp(pFileInfo->GetNZBInfo()->GetDestDir(), pQueueEntry->GetNZBInfo()->GetDestDir()) &&
-			!strcmp(pFileInfo->GetFilename(), pQueueEntry->GetFilename()) &&
-			pFileInfo != pQueueEntry)
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
-void QueueCoordinator::LogDebugInfo()
-{
-	debug("--------------------------------------------");
-	debug("Dumping debug info to log");
-	debug("--------------------------------------------");
-
-	debug("   QueueCoordinator");
-	debug("   ----------------");
-
-	m_mutexDownloadQueue.Lock();
-	debug("    Active Downloads: %i", m_ActiveDownloads.size());
-	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
-	{
-		ArticleDownloader* pArticleDownloader = *it;
-		pArticleDownloader->LogDebugInfo();
-	}
-	m_mutexDownloadQueue.Unlock();
-
-	debug("");
-
-	g_pServerPool->LogDebugInfo();
-}
-
-void QueueCoordinator::ResetHangingDownloads()
-{
-	const int TimeOut = g_pOptions->GetTerminateTimeout();
-	if (TimeOut == 0)
-	{
-		return;
-	}
-
-	m_mutexDownloadQueue.Lock();
-	time_t tm = ::time(NULL);
-
-	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end();)
-	{
-		ArticleDownloader* pArticleDownloader = *it;
-		if (tm - pArticleDownloader->GetLastUpdateTime() > TimeOut &&
-		   pArticleDownloader->GetStatus() == ArticleDownloader::adRunning)
-		{
-			ArticleInfo* pArticleInfo = pArticleDownloader->GetArticleInfo();
-			debug("Terminating hanging download %s", pArticleDownloader->GetInfoName());
-			if (pArticleDownloader->Terminate())
-			{
-				error("Terminated hanging download %s", pArticleDownloader->GetInfoName());
-				pArticleInfo->SetStatus(ArticleInfo::aiUndefined);
-			}
-			else
-			{
-				error("Could not terminate hanging download %s", Util::BaseFileName(pArticleInfo->GetResultFilename()));
-			}
-			m_ActiveDownloads.erase(it);
-			// it's not safe to destroy pArticleDownloader, because the state of object is unknown
-			delete pArticleDownloader;
-			it = m_ActiveDownloads.begin();
-			continue;
-		}
-		it++;
-	}                                              
-
-	m_mutexDownloadQueue.Unlock();
-}
-
-void QueueCoordinator::EnterLeaveStandBy(bool bEnter)
-{
-	m_mutexStat.Lock();
-	m_bStandBy = bEnter;
-	if (bEnter)
-	{
-		m_tPausedFrom = time(NULL);
-	}
-	else
-	{
-		if (m_tStartDownload == 0)
-		{
-			m_tStartDownload = time(NULL);
-		}
-		else
-		{
-			m_tStartDownload += time(NULL) - m_tPausedFrom;
-		}
-		m_tPausedFrom = 0;
-	}
-	m_mutexStat.Unlock();
-}
-
-void QueueCoordinator::CalcStat(int* iUpTimeSec, int* iDnTimeSec, long long* iAllBytes, bool* bStandBy)
-{
-	m_mutexStat.Lock();
-	if (m_tStartServer > 0)
-	{
-		*iUpTimeSec = (int)(time(NULL) - m_tStartServer);
-	}
-	else
-	{
-		*iUpTimeSec = 0;
-	}
-	*bStandBy = m_bStandBy;
-	if (m_bStandBy)
-	{
-		*iDnTimeSec = (int)(m_tPausedFrom - m_tStartDownload);
-	}
-	else
-	{
-		*iDnTimeSec = (int)(time(NULL) - m_tStartDownload);
-	}
-	*iAllBytes = m_iAllBytes;
-	m_mutexStat.Unlock();
-}

QueueCoordinator.h

@@ -1,116 +0,0 @@
-/*
- *  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 QUEUECOORDINATOR_H
-#define QUEUECOORDINATOR_H
-
-#include <deque>
-#include <list>
-#include <time.h>
-#ifdef WIN32
-#include <sys/timeb.h>
-#endif
-
-#include "Thread.h"
-#include "NZBFile.h"
-#include "ArticleDownloader.h"
-#include "DownloadInfo.h"
-#include "Observer.h"
-#include "QueueEditor.h"
-#include "NNTPConnection.h"
-                                            
-class QueueCoordinator : public Thread, public Observer, public Subject, public DownloadSpeedMeter
-{
-public:
-	typedef std::list<ArticleDownloader*>	ActiveDownloads;
-	typedef enum EAspectAction
-	{
-		eaNZBFileAdded,
-		eaFileCompleted,
-		eaFileDeleted
-	};
-	typedef struct Aspect
-	{
-		EAspectAction eAction;
-		FileInfo* pFileInfo;
-		DownloadQueue* pDownloadQueue;
-		const char* szNZBFilename;
-	};
-
-private:
-	DownloadQueue			m_DownloadQueue;
-	ActiveDownloads			m_ActiveDownloads;
-	QueueEditor				m_QueueEditor;
-	Mutex			 		m_mutexDownloadQueue;
-	bool					m_bHasMoreJobs;
-
-	// statistics
-	static const int		SPEEDMETER_SECONDS = 5;
-    int						m_iSpeedBytes[SPEEDMETER_SECONDS];
-    int						m_iSpeedBytesIndex;
-	long long				m_iAllBytes;
-	time_t					m_tStartServer;
-	time_t					m_tStartDownload;
-	time_t					m_tPausedFrom;
-	void					EnterLeaveStandBy(bool bEnter);
-	bool					m_bStandBy;
-	Mutex					m_mutexStat;
-
-	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);
-	void					ResetHangingDownloads();
-
-public:
-							QueueCoordinator();                
-	virtual					~QueueCoordinator();
-	virtual void			Run();
-	virtual void 			Stop();
-	void					Update(Subject* Caller, void* Aspect);
-
-	// statistics
-	long long 				CalcRemainingSize();
-	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* pNZBQueue, bool bAddFirst);
-	bool					AddFileToQueue(const char* szFileName);
-	bool					HasMoreJobs() { return m_bHasMoreJobs; }
-	bool					GetStandBy() { return m_bStandBy; }
-	bool					DeleteQueueEntry(FileInfo* pFileInfo);
-	QueueEditor*			GetQueueEditor() { return &m_QueueEditor; }
-	
-	void					LogDebugInfo();
-};
-
-#endif

QueueEditor.cpp

@@ -1,655 +0,0 @@
-/*
- *  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>
-#ifndef WIN32
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-
-#include "nzbget.h"
-#include "DownloadInfo.h"
-#include "QueueEditor.h"
-#include "QueueCoordinator.h"
-#include "DiskState.h"
-#include "Options.h"
-#include "Log.h"
-#include "Util.h"
-
-extern QueueCoordinator* g_pQueueCoordinator;
-extern Options* g_pOptions;
-extern DiskState* g_pDiskState;
-
-const int MAX_ID = 100000000;
-
-QueueEditor::EditItem::EditItem(FileInfo* pFileInfo, int iOffset)
-{
-	m_pFileInfo = pFileInfo;
-	m_iOffset = iOffset;
-}
-
-QueueEditor::QueueEditor()
-{
-	debug("Creating QueueEditor");
-}
-
-QueueEditor::~QueueEditor()
-{
-	debug("Destroying QueueEditor");
-}
-
-FileInfo* QueueEditor::FindFileInfo(DownloadQueue* pDownloadQueue, int iID)
-{
-	for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-		if (pFileInfo->GetID() == iID)
-		{
-			return pFileInfo;
-		}
-	}
-	return NULL;
-}
-
-int QueueEditor::FindFileInfoEntry(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo)
-{
-	int iEntry = 0;
-	for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
-	{
-		FileInfo* pFileInfo2 = *it;
-		if (pFileInfo2 == pFileInfo)
-		{
-			return iEntry;
-		}
-		iEntry ++;
-	}
-	return -1;
-}
-
-/*
- * Set the pause flag of the specific entry in the queue
- * returns true if successful, false if operation is not possible
- */
-void QueueEditor::PauseUnpauseEntry(FileInfo* pFileInfo, bool bPause)
-{
-	pFileInfo->SetPaused(bPause);
-}
-
-/*
- * Removes entry with index iEntry
- * returns true if successful, false if operation is not possible
- */
-void QueueEditor::DeleteEntry(FileInfo* pFileInfo)
-{
-	info("Deleting file %s from download queue", pFileInfo->GetFilename());
-	g_pQueueCoordinator->DeleteQueueEntry(pFileInfo);
-}
-
-/*
- * 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)
-{
-	int iEntry = FindFileInfoEntry(pDownloadQueue, pFileInfo);
-	if (iEntry > -1)
-	{
-		int iNewEntry = iEntry + iOffset;
-
-		if (iNewEntry < 0)
-		{
-			iNewEntry = 0;
-		}
-		if ((unsigned int)iNewEntry > pDownloadQueue->size() - 1)
-		{
-			iNewEntry = (int)pDownloadQueue->size() - 1;
-		}
-
-		if (iNewEntry >= 0 && (unsigned int)iNewEntry <= pDownloadQueue->size() - 1)
-		{
-			FileInfo* fi = (*pDownloadQueue)[iEntry];
-			pDownloadQueue->erase(pDownloadQueue->begin() + iEntry);
-			pDownloadQueue->insert(pDownloadQueue->begin() + iNewEntry, fi);
-		}
-	}
-}
-
-bool QueueEditor::EditEntry(int ID, bool bSmartOrder, EEditAction eAction, int iOffset)
-{
-	IDList cIDList;
-	cIDList.clear();
-	cIDList.push_back(ID);
-	return EditList(&cIDList, bSmartOrder, eAction, iOffset);
-}
-
-bool QueueEditor::LockedEditEntry(DownloadQueue* pDownloadQueue, int ID, bool bSmartOrder, EEditAction eAction, int iOffset)
-{
-	IDList cIDList;
-	cIDList.clear();
-	cIDList.push_back(ID);
-	return InternEditList(pDownloadQueue, &cIDList, bSmartOrder, eAction, iOffset);
-}
-
-bool QueueEditor::EditList(IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset)
-{
-	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
-
-	bool bOK = InternEditList(pDownloadQueue, pIDList, bSmartOrder, eAction, iOffset);
-
-	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-	{
-		g_pDiskState->SaveDownloadQueue(pDownloadQueue);
-	}
-
-	g_pQueueCoordinator->UnlockQueue();
-
-	return bOK;
-}
-
-bool QueueEditor::InternEditList(DownloadQueue* pDownloadQueue, IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset)
-{
-	if (eAction == eaGroupMoveOffset)
-	{
-		AlignAffectedGroups(pDownloadQueue, pIDList, bSmartOrder, iOffset);
-	}
-
-	ItemList cItemList;
-	PrepareList(pDownloadQueue, &cItemList, pIDList, bSmartOrder, eAction, iOffset);
-
-	if (eAction == eaFilePauseAllPars || eAction == eaFilePauseExtraPars)
-	{
-		PauseParsInGroups(&cItemList, eAction == eaFilePauseExtraPars);
-	}
-	else
-	{
-		for (ItemList::iterator it = cItemList.begin(); it != cItemList.end(); it++)
-		{
-			EditItem* pItem = *it;
-			switch (eAction)
-			{
-				case eaFilePause:
-					PauseUnpauseEntry(pItem->m_pFileInfo, true);
-					break;
-
-				case eaFileResume:
-					PauseUnpauseEntry(pItem->m_pFileInfo, false);
-					break;
-
-				case eaFileMoveOffset:
-				case eaFileMoveTop:
-				case eaFileMoveBottom:
-					MoveEntry(pDownloadQueue, pItem->m_pFileInfo, pItem->m_iOffset);
-					break;
-
-				case eaFileDelete:
-					DeleteEntry(pItem->m_pFileInfo);
-					break;
-
-				case eaFilePauseAllPars:
-				case eaFilePauseExtraPars:
-					// remove compiler warning "enumeration not handled in switch"
-					break;
-
-				case eaGroupPause:
-				case eaGroupResume:
-				case eaGroupDelete:
-				case eaGroupMoveTop:
-				case eaGroupMoveBottom:
-				case eaGroupMoveOffset:
-				case eaGroupPauseAllPars:
-				case eaGroupPauseExtraPars:
-					EditGroup(pDownloadQueue, pItem->m_pFileInfo, eAction, iOffset);
-					break;
-			}
-			delete pItem;
-		}
-	}
-
-	return cItemList.size() > 0;
-}
-
-void QueueEditor::PrepareList(DownloadQueue* pDownloadQueue, ItemList* pItemList, IDList* pIDList, bool bSmartOrder, 
-	EEditAction EEditAction, int iOffset)
-{
-	if (EEditAction == eaFileMoveTop)
-	{
-		iOffset = -MAX_ID;
-	}
-	else if (EEditAction == eaFileMoveBottom)
-	{
-		iOffset = MAX_ID;
-	}
-
-	pItemList->reserve(pIDList->size());
-	if (bSmartOrder && iOffset != 0 && 
-		(EEditAction == eaFileMoveOffset || EEditAction == eaFileMoveTop || EEditAction == eaFileMoveBottom))
-	{
-		//add IDs to list in order they currently have in download queue
-		int iLastDestPos = -1;
-		int iStart, iEnd, iStep;
-		if (iOffset < 0)
-		{
-			iStart = 0;
-			iEnd = pDownloadQueue->size();
-			iStep = 1;
-		}
-		else
-		{
-			iStart = pDownloadQueue->size() - 1;
-			iEnd = -1;
-			iStep = -1;
-		}
-		for (int iIndex = iStart; iIndex != iEnd; iIndex += iStep)
-		{
-			FileInfo* pFileInfo = (*pDownloadQueue)[iIndex];
-			int iID = pFileInfo->GetID();
-			for (IDList::iterator it = pIDList->begin(); it != pIDList->end(); it++)
-			{
-				if (iID == *it)
-				{
-					int iWorkOffset = iOffset;
-					int iDestPos = iIndex + iWorkOffset;
-					if (iLastDestPos == -1)
-					{
-						if (iDestPos < 0)
-						{
-							iWorkOffset = -iIndex;
-						}
-						else if (iDestPos > int(pDownloadQueue->size()) - 1)
-						{
-							iWorkOffset = int(pDownloadQueue->size()) - 1 - iIndex;
-						}
-					}
-					else
-					{
-						if (iWorkOffset < 0 && iDestPos <= iLastDestPos)
-						{
-							iWorkOffset = iLastDestPos - iIndex + 1;
-						}
-						else if (iWorkOffset > 0 && iDestPos >= iLastDestPos)
-						{
-							iWorkOffset = iLastDestPos - iIndex - 1;
-						}
-					}
-					iLastDestPos = iIndex + iWorkOffset;
-					pItemList->push_back(new EditItem(pFileInfo, iWorkOffset));
-					break;
-				}
-			}
-		}
-	}
-	else
-	{
-		// check ID range
-		int iMaxID = 0;
-		int iMinID = MAX_ID;
-		for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
-		{
-			FileInfo* pFileInfo = *it;
-			int ID = pFileInfo->GetID();
-			if (ID > iMaxID)
-			{
-				iMaxID = ID;
-			}
-			if (ID < iMinID)
-			{
-				iMinID = ID;
-			}
-		}
-
-		//add IDs to list in order they were transmitted in command
-		for (IDList::iterator it = pIDList->begin(); it != pIDList->end(); it++)
-		{
-			int iID = *it;
-			if (iMinID <= iID && iID <= iMaxID)
-			{
-				FileInfo* pFileInfo = FindFileInfo(pDownloadQueue, iID);
-				if (pFileInfo)
-				{
-					pItemList->push_back(new EditItem(pFileInfo, iOffset));
-				}
-			}
-		}
-	}
-}
-
-bool QueueEditor::EditGroup(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo, EEditAction eAction, int iOffset)
-{
-	IDList cIDList;
-	cIDList.clear();
-
-	// collecting files belonging to group
-	for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
-	{
-		FileInfo* pFileInfo2 = *it;
-		if (pFileInfo2->GetNZBInfo() == pFileInfo->GetNZBInfo())
-		{
-			cIDList.push_back(pFileInfo2->GetID());
-		}
-	}
-
-	if (eAction == eaGroupMoveOffset)
-	{
-		// calculating offset in terms of files
-		FileList cGroupList;
-		BuildGroupList(pDownloadQueue, &cGroupList);
-		unsigned int iNum = 0;
-		for (FileList::iterator it = cGroupList.begin(); it != cGroupList.end(); it++, iNum++)
-		{
-			FileInfo* pGroupInfo = *it;
-			if (pGroupInfo->GetNZBInfo() == pFileInfo->GetNZBInfo())
-			{
-				break;
-			}
-		}
-		int iFileOffset = 0;
-		if (iOffset > 0)
-		{
-			if (iNum + iOffset >= cGroupList.size() - 1)
-			{
-				eAction = eaGroupMoveBottom;
-			}
-			else
-			{
-				for (unsigned int i = iNum + 2; i < cGroupList.size() && iOffset > 0; i++, iOffset--)
-				{
-					iFileOffset += FindFileInfoEntry(pDownloadQueue, cGroupList[i]) - FindFileInfoEntry(pDownloadQueue, cGroupList[i-1]);
-				}
-			}
-		}
-		else
-		{
-			if (iNum + iOffset <= 0)
-			{
-				eAction = eaGroupMoveTop;
-			}
-			else
-			{
-				for (unsigned int i = iNum; i > 0 && iOffset < 0; i--, iOffset++)
-				{
-					iFileOffset -= FindFileInfoEntry(pDownloadQueue, cGroupList[i]) - FindFileInfoEntry(pDownloadQueue, cGroupList[i-1]);
-				}
-			}
-		}
-		iOffset = iFileOffset;
-	}
-
-	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);
-}
-
-void QueueEditor::BuildGroupList(DownloadQueue* pDownloadQueue, FileList* pGroupList)
-{
-	pGroupList->clear();
-    for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++)
-    {
-        FileInfo* pFileInfo = *it;
-		FileInfo* pGroupInfo = NULL;
-		for (FileList::iterator itg = pGroupList->begin(); itg != pGroupList->end(); itg++)
-		{
-			FileInfo* pGroupInfo1 = *itg;
-			if (pGroupInfo1->GetNZBInfo() == pFileInfo->GetNZBInfo())
-			{
-				pGroupInfo = pGroupInfo1;
-				break;
-			}
-		}
-		if (!pGroupInfo)
-		{
-			pGroupList->push_back(pFileInfo);
-		}
-	}
-}
-
-bool QueueEditor::ItemExists(FileList* pFileList, FileInfo* pFileInfo)
-{
-	for (FileList::iterator it = pFileList->begin(); it != pFileList->end(); it++)
-	{
-		if (*it == pFileInfo)
-		{
-			return true;
-		}
-	}
-	return false;
-}
-
-void QueueEditor::AlignAffectedGroups(DownloadQueue* pDownloadQueue, IDList* pIDList, bool bSmartOrder, int iOffset)
-{
-	// Build list of all groups; List contains first file of each group
-	FileList cGroupList;
-	BuildGroupList(pDownloadQueue, &cGroupList);
-
-	// Find affected groups. It includes groups being moved and groups directly
-	// above or under of these groups (those order is also changed)
-	FileList cAffectedGroupList;
-	cAffectedGroupList.clear();
-	ItemList cItemList;
-	PrepareList(pDownloadQueue, &cItemList, pIDList, bSmartOrder, eaFileMoveOffset, iOffset);
-	for (ItemList::iterator it = cItemList.begin(); it != cItemList.end(); it++)
-	{
-		EditItem* pItem = *it;
-		unsigned int iNum = 0;
-		for (FileList::iterator it = cGroupList.begin(); it != cGroupList.end(); it++, iNum++)
-		{
-			FileInfo* pFileInfo = *it;
-			if (pItem->m_pFileInfo->GetNZBInfo() == pFileInfo->GetNZBInfo())
-			{
-				if (!ItemExists(&cAffectedGroupList, pFileInfo))
-				{
-					cAffectedGroupList.push_back(pFileInfo);
-				}
-				if (iOffset < 0)
-				{
-					for (int i = iNum - 1; i >= -iOffset-1; i--)
-					{
-						if (!ItemExists(&cAffectedGroupList, cGroupList[i]))
-						{
-							cAffectedGroupList.push_back(cGroupList[i]);
-						}
-					}
-				}
-				if (iOffset > 0)
-				{
-					for (unsigned int i = iNum + 1; i <= cGroupList.size() - iOffset; i++)
-					{
-						if (!ItemExists(&cAffectedGroupList, cGroupList[i]))
-						{
-							cAffectedGroupList.push_back(cGroupList[i]);
-						}
-					}
-
-					if (iNum + 1 < cGroupList.size())
-					{
-						cAffectedGroupList.push_back(cGroupList[iNum + 1]);
-					}
-				}
-				break;
-			}
-		}
-		delete pItem;
-	}
-	cGroupList.clear();
-
-	// Aligning groups
-	for (FileList::iterator it = cAffectedGroupList.begin(); it != cAffectedGroupList.end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-		AlignGroup(pDownloadQueue, pFileInfo);
-	}
-}
-
-void QueueEditor::AlignGroup(DownloadQueue* pDownloadQueue, FileInfo* pFirstFileInfo)
-{
-	FileInfo* pLastFileInfo = NULL;
-	unsigned int iLastNum = 0;
-	unsigned int iNum = 0;
-	while (iNum < pDownloadQueue->size())
-	{
-		FileInfo* pFileInfo = (*pDownloadQueue)[iNum];
-		if (pFirstFileInfo->GetNZBInfo() == pFileInfo->GetNZBInfo())
-		{
-			if (pLastFileInfo && iNum - iLastNum > 1)
-			{
-				pDownloadQueue->erase(pDownloadQueue->begin() + iNum);
-				pDownloadQueue->insert(pDownloadQueue->begin() + iLastNum + 1, pFileInfo);
-				iLastNum++;
-			}
-			else
-			{
-				iLastNum = iNum;
-			}
-			pLastFileInfo = pFileInfo;
-		}
-		iNum++;
-	}
-}
-
-void QueueEditor::PauseParsInGroups(ItemList* pItemList, bool bExtraParsOnly)
-{
-	while (true)
-	{
-		FileList GroupFileList;
-		GroupFileList.clear();
-		FileInfo* pFirstFileInfo = NULL;
-
-		for (ItemList::iterator it = pItemList->begin(); it != pItemList->end(); )
-		{
-			EditItem* pItem = *it;
-			if (!pFirstFileInfo || 
-				(pFirstFileInfo->GetNZBInfo() == pItem->m_pFileInfo->GetNZBInfo()))
-			{
-				GroupFileList.push_back(pItem->m_pFileInfo);
-				if (!pFirstFileInfo)
-				{
-					pFirstFileInfo = pItem->m_pFileInfo;
-				}
-				delete pItem;
-				pItemList->erase(it);
-				it = pItemList->begin();
-				continue;
-			}
-			it++;
-		}
-
-		if (!GroupFileList.empty())
-		{
-			PausePars(&GroupFileList, bExtraParsOnly);
-		}
-		else
-		{
-			break;
-		}
-	}
-}
-
-/**
-* If the parameter "bExtraParsOnly" is set to "false", then we pause all par2-files.
-* If the parameter "bExtraParsOnly" is set to "true", we use the following strategy:
-* At first we find all par-files, which do not have "vol" in their names, then we pause
-* all vols and do not affect all just-pars.
-* In a case, if there are no just-pars, but only vols, we find the smallest vol-file
-* and do not affect it, but pause all other pars.
-*/
-void QueueEditor::PausePars(FileList* pFileList, bool bExtraParsOnly)
-{
-	debug("QueueEditor: Pausing pars");
-	
-	FileList Pars, Vols;
-	Pars.clear();
-	Vols.clear();
-			
-	for (FileList::iterator it = pFileList->begin(); it != pFileList->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"))
-		{
-			if (!bExtraParsOnly)
-			{
-				pFileInfo->SetPaused(true);
-			}
-			else
-			{
-				if (strstr(szLoFileName, ".vol"))
-				{
-					Vols.push_back(pFileInfo);
-				}
-				else
-				{
-					Pars.push_back(pFileInfo);
-				}
-			}
-		}
-	}
-	
-	if (bExtraParsOnly)
-	{
-		if (!Pars.empty())
-		{
-			for (FileList::iterator it = Vols.begin(); it != Vols.end(); it++)
-			{
-				FileInfo* pFileInfo = *it;
-				pFileInfo->SetPaused(true);
-			}
-		}
-		else
-		{
-			// pausing all Vol-files except the smallest one
-			FileInfo* pSmallest = NULL;
-			for (FileList::iterator it = Vols.begin(); it != Vols.end(); it++)
-			{
-				FileInfo* pFileInfo = *it;
-				if (!pSmallest)
-				{
-					pSmallest = pFileInfo;
-				}
-				else if (pSmallest->GetSize() > pFileInfo->GetSize())
-				{
-					pSmallest->SetPaused(true);
-					pSmallest = pFileInfo;
-				}
-				else 
-				{
-					pFileInfo->SetPaused(true);
-				}
-			}
-		}
-	}
-}

QueueEditor.h

@@ -1,98 +0,0 @@
-/*
- *  This file if 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 QUEUEEDITOR_H
-#define QUEUEEDITOR_H
-
-#include <vector>
-
-#include "DownloadInfo.h"
-
-class QueueEditor
-{
-public:
-	typedef std::vector<int> IDList;
-
-	enum EEditAction
-	{
-		eaFileMoveOffset = 1,			// move to m_iOffset relative to the current position in queue
-		eaFileMoveTop,
-		eaFileMoveBottom,
-		eaFilePause,
-		eaFileResume,
-		eaFileDelete,
-		eaFilePauseAllPars,
-		eaFilePauseExtraPars,
-		eaGroupMoveOffset,				// move to m_iOffset relative to the current position in queue
-		eaGroupMoveTop,
-		eaGroupMoveBottom,
-		eaGroupPause,
-		eaGroupResume,
-		eaGroupDelete,
-		eaGroupPauseAllPars,
-		eaGroupPauseExtraPars
-	};
-
-private:
-	class EditItem
-	{
-	public:
-		int			m_iOffset;
-		FileInfo*	m_pFileInfo;
-
-		EditItem(FileInfo* pFileInfo, int iOffset);
-	};
-
-	typedef std::vector<EditItem*> ItemList;
-	typedef std::vector<FileInfo*> FileList;
-
-private:
-	FileInfo*				FindFileInfo(DownloadQueue* pDownloadQueue, int iID);
-	int						FindFileInfoEntry(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo);
-	bool					InternEditList(DownloadQueue* pDownloadQueue, IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset);
-	void					PrepareList(DownloadQueue* pDownloadQueue, ItemList* pItemList, IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset);
-	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, FileInfo* pFirstFileInfo);
-	void					PauseParsInGroups(ItemList* pItemList, bool bExtraParsOnly);
-	void					PausePars(FileList* pFileList, bool bExtraParsOnly);
-
-	void					PauseUnpauseEntry(FileInfo* pFileInfo, bool bPause);
-	void					DeleteEntry(FileInfo* pFileInfo);
-	void					MoveEntry(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo, int iOffset);
-
-public:
-							QueueEditor();                
-							~QueueEditor();
-
-	bool					EditEntry(int ID, bool bSmartOrder, EEditAction eAction, int iOffset);
-	bool					EditList(IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset);
-
-	bool					LockedEditEntry(DownloadQueue* pDownloadQueue, int ID, bool bSmartOrder, EEditAction eAction, int iOffset);
-};
-
-#endif

README

@@ -2,6 +2,10 @@
            NZBGet ReadMe
 =====================================
 
+This is a short documentation. For more information please
+visit NZBGet home page at 
+  http://nzbget.net
+
 Contents          
 --------
 1. About NZBGet
@@ -29,6 +33,9 @@ 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.
@@ -41,16 +48,12 @@ 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.
 
-The current version (0.4.0) 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).
+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.
 
 Clients and servers running on different OS'es may communicate with
 each other. For example, you can use NZBGet as client on Windows to 
@@ -84,8 +87,17 @@ And the following libraries are optional:
    - libncurses  (http://invisible-island.net/ncurses)
    
  - for par-check and -repair (enabled by default):
-   - libpar2     (http://parchive.sourceforge.net)
+   - libpar2     (http://launchpad.net/libpar2,
+                  http://parchive.sourceforge.net)
    - libsigc++   (http://libsigc.sourceforge.net)
+ 
+ - for encrypted connections (TLS/SSL):
+   - OpenSSL     (http://www.openssl.org)
+     or
+   - GnuTLS      (http://www.gnu.org/software/gnutls)
+
+ - 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 
@@ -93,29 +105,45 @@ need the developer packages for these libraries too, they package names
 have often suffix "dev" or "devel". On other systems you may need to 
 download the libraries at the given URLs and compile them (see hints below).
 
-
 =====================================
 4. Installation on POSIX
 =====================================
 
-Well, the usual stuff:
+Installation from the source distribution archive (nzbget-VERSION.tar.gz):
 
  - 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.)
+       ./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
+
  - compile it via
      make
- - become root via
+
+ - to install system wide 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:
@@ -125,6 +153,15 @@ You may run configure with additional arguments:
     
   --disable-parcheck - to make without parcheck-support. Use this option
     if you can not use libpar2 or libsigc++.
+
+  --with-tlslib=(OpenSSL, GnuTLS) - to select which TLS/SSL library
+    should be used for encrypted server connections.
+      
+  --disable-tls - to make without TLS/SSL support. Use this option if
+    you can not neither OpenSSL nor GnuTLS.
+
+  --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.
@@ -136,8 +173,6 @@ it uses library par2 (libpar2), which needs sigc++ on its part.
 
 The libpar2 and libsigc++ (version 2 or later) must be installed on your
 system. On most linux distributions these libraries are available as packages.
-So you only need to install theme and run configure with parameter
-"--enable-parcheck".
 If you do not have these packages you can compile them yourself. 
 Following configure-parameters may be usefull:
 
@@ -148,12 +183,23 @@ Following configure-parameters may be usefull:
   
 The library libsigc++ must be installed first, since libpar2 requires it.
 
+Official project libpar2 (http://parchive.sourceforge.net) has not been
+updated for many years. The last official version of libpar 0.2 contains
+known bugs which may crash the program during par-check. These bugs
+have been fixed in the semi-official fork maintained by Debian/Ubuntu
+team (http://launchpad.net/libpar2). It is highly recommended to use this
+version of libpar2 (version 0.4 or newer) instead of the last official
+version 0.2. Recent releases of Debian/Ubuntu include this libpar2 version.
+
+NZBGets configure script checks the installed version of libpar2 and prints
+an error if it is older than 0.4. The check can be suppressed if the update
+of libpar2 is not possible.
+
 If you are not able to use libpar2 or libsigc++ or do not want them you can
-make the program without support for par-check using option 
-"--disable-parcheck":
+make nzbget without support for par-check using option "--disable-parcheck":
 
   ./configure --disable-parcheck
-  
+
 Optional package: curses
 -------------------------
 For curses-outputmode you need ncurses or curses on your system.
@@ -168,6 +214,29 @@ make the program without support for curses using option "--disable-curses":
 
   ./configure --disable-curses
 
+Optional package: TLS
+-------------------------
+To enable encrypted server connections (TLS/SSL) you need to build the program
+with TLS/SSL support. NZBGet can use two libraries: OpenSSL or GnuTLS.
+Configure-script checks which library is installed and use it. If both are
+available it gives the precedence to OpenSSL. You may override that with
+the option --with-tlslib=(OpenSSL, GnuTLS). For example to build with GnuTLS:
+
+  ./configure --with-tlslib= GnuTLS
+  
+Following configure-parameters may be useful:
+
+  --with-libtls-includes
+  --with-libtls-libraries
+
+  --with-openssl-includes
+  --with-openssl-libraries
+
+If none of these libraries is available you can make the program without 
+TLS/SSL support using option "--disable-tls":
+
+  ./configure --disable-tls
+  
 =====================================
 5. Compiling on Windows
 =====================================
@@ -180,32 +249,45 @@ To compile the program with par-check-support you also need the following
 libraries:
 
    - libsigc++   (http://libsigc.sourceforge.net)
-   - libpar2     (http://parchive.sourceforge.net)
-   
+   - libpar2     (http://launchpad.net/libpar2,
+                  http://parchive.sourceforge.net)
+
 Download these libaries, then use patch-files provided with NZBGet to create
 preconfigured project files and solutions for each library. 
 Look at http://gnuwin32.sourceforge.net/packages/patch.htm for info on how
 to use patch-files, if you do not familiar with this technique.
 
-After libsigc++ and libpar2 are compiled in static libraries (.lib) 
-and include- and libraries-paths are configured in MS Visual C++ 2005 you
-should be able to compile NZBGet.   
+To compile the program with TLS/SSL support you also need the library:
+
+   - OpenSSL  (http://www.openssl.org)
+   or
+   - GnuTLS   (http://www.gnu.org/software/gnutls)
 
 =====================================
 6. Configuration
 =====================================
 
-NZBGet needs a configuration-file to work properly. 
+NZBGet needs a configuration file. 
 
-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.
+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.
 
 The program looks for configuration file in following standard 
 locations (in this order):
 
 On POSIX systems:
-
   ~/.nzbget
   /etc/nzbget.conf
   /usr/etc/nzbget.conf
@@ -229,6 +311,12 @@ 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:
 ----------------
 
@@ -256,10 +344,16 @@ To stop server use:
 
   nzbget -Q  
 
-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).
+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.
 
 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
@@ -286,9 +380,18 @@ It prints something like:
 
   [1] nzbname\filename1.rar (50.00 MB)
   [2] nzbname\filename1.r01 (50.00 MB)
+  [3] another-nzb\filename3.r01 (100.00 MB)
+  [4] another-nzb\filename3.r02 (100.00 MB)
 
-The numbers in square braces are ID's of files in queue. They can be used
-in edit-command. For example to move file with ID 2 to the top of queue:
+This is the list of individual files listed within nzb-file. To print
+the list of nzb-files (without content) add G-modifier to the list command:
+
+  [1] nzbname (4.56 GB)
+  [2] another-nzb (4.20 GB)
+
+The numbers in square braces are ID's of files or groups in queue.
+They can be used in edit-command. For example to move file with
+ID 2 to the top of queue:
 
   nzbget -E T 2
   
@@ -301,8 +404,8 @@ or to delete files from queue:
   nzbget -E D 3 10-15 20-21 16
 
 The edit-command has also a group-mode which affects all files from the
-same nzb-request. You need to pass one ID of any file in the group. For
-example to delete all files from the first nzb-request:
+same nzb-file. You need to pass an ID of the group. For example to delete
+the whole group 1:
 
   nzbget -E G D 1
 
@@ -321,7 +424,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 "serverip" option in the nzbget.conf file to point to the
+Do this by setting the "ControlIP" 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)
 
@@ -337,36 +440,83 @@ If you need to control server from WAN it is better to connect to server's
 terminal via SSH (POSIX) or remote desktop (Windows) and then run
 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.
+
+Example post-processing scripts are provided in directory "scripts".
+
+To use the scripts copy them into your local directory and set options
+<ScriptDir>, <PostScript> 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 and the password defined by
+options "ControlUsername" (default "nzbget") and "ControlPassword"
+(default "tegbzn6789").
+
+In a case your browser forget credentials, to prevent typing them each
+time, there is a workaround - use URL in the form:
+
+  http://localhost:6789/username:password/
+
+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. 
+
 =====================================
 8. Authors
 =====================================
 
-NZBGet was initialiy written by Sven Henkel (sidddy@users.sourceforge.net).
-Up to version 0.2.3 it was been 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).
+NZBGet is developed and maintained by Andrey Prygunkov
+(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.
 
 =====================================
 9. Copyright
 =====================================
 
-NZBGet is distributed under GNU General Pubic License Version 2.
+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.
+
 The complete content of license is provided in file COPYING.
 
-Binary distribution for Windows contains code from the following libraries:
-
-   - libpar2     (http://parchive.sourceforge.net)
-   - libsigc++   (http://libsigc.sourceforge.net)
-
-libpar2 is distributed under GPL and libsigc++ under LGPL.
+Additional exemption: compiling, linking, and/or using OpenSSL is allowed.
 
 =====================================
 10. Contact
 =====================================
 
-If you encounter any problem, feel free to use tracker/forums on
+If you encounter any problem, feel free to use the forum
 
-    sourceforge.net/projects/nzbget
+    nzbget.net/forum
 
 or contact me at
 

RemoteClient.cpp

@@ -1,729 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  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
- *  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>
-#ifdef WIN32
-#include <windows.h>
-#else
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#endif
-#include <stdarg.h>
-
-#include "nzbget.h"
-#include "RemoteClient.h"
-#include "DownloadInfo.h"
-#include "Options.h"
-#include "Log.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-
-RemoteClient::RemoteClient()
-{
-	m_pConnection	= NULL;
-	m_pNetAddress	= NULL;
-	m_bVerbose		= true;
-
-	/*
-	printf("sizeof(SNZBRequestBase)=%i\n", sizeof(SNZBRequestBase));
-	printf("sizeof(SNZBDownloadRequest)=%i\n", sizeof(SNZBDownloadRequest));
-	printf("sizeof(SNZBListRequest)=%i\n", sizeof(SNZBListRequest));
-	printf("sizeof(SNZBListResponse)=%i\n", sizeof(SNZBListResponse));
-	printf("sizeof(SNZBListResponseEntry)=%i\n", sizeof(SNZBListResponseEntry));
-	printf("sizeof(SNZBLogRequest)=%i\n", sizeof(SNZBLogRequest));
-	printf("sizeof(SNZBLogResponse)=%i\n", sizeof(SNZBLogResponse));
-	printf("sizeof(SNZBLogResponseEntry)=%i\n", sizeof(SNZBLogResponseEntry));
-	printf("sizeof(SNZBPauseUnpauseRequest)=%i\n", sizeof(SNZBPauseUnpauseRequest));
-	printf("sizeof(SNZBSetDownloadRateRequest)=%i\n", sizeof(SNZBSetDownloadRateRequest));
-	printf("sizeof(SNZBEditQueueRequest)=%i\n", sizeof(SNZBEditQueueRequest));
-	printf("sizeof(SNZBDumpDebugRequest)=%i\n", sizeof(SNZBDumpDebugRequest));
-	*/
-}
-
-RemoteClient::~RemoteClient()
-{
-	if (m_pConnection)
-	{
-		delete m_pConnection;
-	}
-
-	if (m_pNetAddress)
-	{
-		delete m_pNetAddress;
-	}
-}
-
-void RemoteClient::printf(char * msg,...)
-{
-	if (m_bVerbose)
-	{
-		va_list ap;
-		va_start(ap, msg);
-		::vprintf(msg, ap);
-		va_end(ap);
-	}
-}
-
-void RemoteClient::perror(char * msg)
-{
-	if (m_bVerbose)
-	{
-		::perror(msg);
-	}
-}
-
-bool RemoteClient::InitConnection()
-{
-	// Create a connection to the server
-	m_pNetAddress	= new NetAddress(g_pOptions->GetServerIP(), g_pOptions->GetServerPort());
-	m_pConnection	= new Connection(m_pNetAddress);
-
-	bool OK = m_pConnection->Connect() >= 0;
-	if (!OK)
-	{
-		printf("Unable to send request to nzbserver at %s (port %i)\n", g_pOptions->GetServerIP(), g_pOptions->GetServerPort());
-	}
-	return OK;
-}
-
-void RemoteClient::InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int iSize)
-{
-	pMessageBase->m_iSignature	= htonl(NZBMESSAGE_SIGNATURE);
-	pMessageBase->m_iType = htonl(iRequest);
-	pMessageBase->m_iStructSize = htonl(iSize);
-	strncpy(pMessageBase->m_szPassword, g_pOptions->GetServerPassword(), NZBREQUESTPASSWORDSIZE - 1);
-	pMessageBase->m_szPassword[NZBREQUESTPASSWORDSIZE - 1] = '\0';
-}
-
-bool RemoteClient::ReceiveBoolResponse()
-{
-	printf("Request sent\n");
-
-	// all bool-responses have the same format of structure, we use SNZBDownloadResponse here
-	SNZBDownloadResponse BoolResponse;
-	memset(&BoolResponse, 0, sizeof(BoolResponse));
-
-	int iResponseLen = m_pConnection->Recv((char*)&BoolResponse, sizeof(BoolResponse));
-	if (iResponseLen != sizeof(BoolResponse) || 
-		(int)ntohl(BoolResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
-		ntohl(BoolResponse.m_MessageBase.m_iStructSize) != sizeof(BoolResponse))
-	{
-		if (iResponseLen < 0)
-		{
-			printf("No response received (timeout)\n");
-		}
-		else
-		{
-			printf("Invalid response received: either not nzbget-server or wrong server version\n");
-		}
-		return false;
-	}
-
-	int iTextLen = ntohl(BoolResponse.m_iTrailingDataLength);
-	char* buf = (char*)malloc(iTextLen);
-	iResponseLen = m_pConnection->Recv(buf, iTextLen);
-	if (iResponseLen != iTextLen)
-	{
-		if (iResponseLen < 0)
-		{
-			printf("No response received (timeout)\n");
-		}
-		else
-		{
-			printf("Invalid response received: either not nzbget-server or wrong server version\n");
-		}
-		return false;
-	}
-
-	printf("server returned: %s\n", buf);
-	free(buf);
-	return ntohl(BoolResponse.m_bSuccess);
-}
-
-/*
- * Sends a message to the running nzbget process.
- */
-bool RemoteClient::RequestServerDownload(const char* szName, bool bAddFirst)
-{
-	// Read the file into the buffer
-	char* szBuffer	= NULL;
-	int iLength		= 0;
-	if (!Util::LoadFileIntoBuffer(szName, &szBuffer, &iLength))
-	{
-		printf("Could not load file %s\n", szName);
-		return false;
-	}
-
-	bool OK = InitConnection();
-	if (OK)
-	{
-		SNZBDownloadRequest DownloadRequest;
-		InitMessageBase(&DownloadRequest.m_MessageBase, eRemoteRequestDownload, sizeof(DownloadRequest));
-		DownloadRequest.m_bAddFirst = htonl(bAddFirst);
-		DownloadRequest.m_iTrailingDataLength = htonl(iLength);
-
-		strncpy(DownloadRequest.m_szFilename, szName, NZBREQUESTFILENAMESIZE - 1);
-		DownloadRequest.m_szFilename[NZBREQUESTFILENAMESIZE-1] = '\0';
-
-		if (m_pConnection->Send((char*)(&DownloadRequest), sizeof(DownloadRequest)) < 0)
-		{
-			perror("m_pConnection->Send");
-			OK = false;
-		}
-		else
-		{
-			m_pConnection->Send(szBuffer, iLength);
-			OK = ReceiveBoolResponse();
-			m_pConnection->Disconnect();
-		}
-	}
-
-	// Cleanup
-	if (szBuffer)
-	{
-		free(szBuffer);
-	}
-
-	return OK;
-}
-
-bool RemoteClient::RequestServerList()
-{
-	if (!InitConnection()) return false;
-
-	SNZBListRequest ListRequest;
-	InitMessageBase(&ListRequest.m_MessageBase, eRemoteRequestList, sizeof(ListRequest));
-	ListRequest.m_bFileList = htonl(true);
-	ListRequest.m_bServerState = htonl(true);
-
-	if (m_pConnection->Send((char*)(&ListRequest), sizeof(ListRequest)) < 0)
-	{
-		perror("m_pConnection->Send");
-		return false;
-	}
-
-	printf("Request sent\n");
-
-	// Now listen for the returned list
-	SNZBListResponse ListResponse;
-	int iResponseLen = m_pConnection->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))
-	{
-		if (iResponseLen < 0)
-		{
-			printf("No response received (timeout)\n");
-		}
-		else
-		{
-			printf("Invalid response received: either not nzbget-server or wrong server version\n");
-		}
-		return false;
-	}
-
-	char* pBuf = NULL;
-	if (ntohl(ListResponse.m_iTrailingDataLength) > 0)
-	{
-		pBuf = (char*)malloc(ntohl(ListResponse.m_iTrailingDataLength));
-		if (!m_pConnection->RecvAll(pBuf, ntohl(ListResponse.m_iTrailingDataLength)))
-		{
-			free(pBuf);
-			return false;
-		}
-	}
-
-	m_pConnection->Disconnect();
-
-	if (ntohl(ListResponse.m_iTrailingDataLength) == 0)
-	{
-		printf("Server has no files queued for download\n");
-	}
-	else
-	{
-		printf("Queue List\n");
-		printf("-----------------------------------\n");
-
-		long long lRemaining = 0;
-		long long lPaused = 0;
-		char* pBufPtr = (char*)pBuf;
-		for (unsigned int i = 0; i < ntohl(ListResponse.m_iNrTrailingEntries); i++)
-		{
-			SNZBListResponseEntry* pListAnswer = (SNZBListResponseEntry*) pBufPtr;
-
-			long long lFileSize = Util::JoinInt64(ntohl(pListAnswer->m_iFileSizeHi), ntohl(pListAnswer->m_iFileSizeLo));
-			long long lRemainingSize = Util::JoinInt64(ntohl(pListAnswer->m_iRemainingSizeHi), ntohl(pListAnswer->m_iRemainingSizeLo));
-
-			char szCompleted[100];
-			szCompleted[0] = '\0';
-			if (lRemainingSize < lFileSize)
-			{
-				sprintf(szCompleted, ", %i%s", (int)(100 - Util::Int64ToFloat(lRemainingSize) * 100.0 / Util::Int64ToFloat(lFileSize)), "%");
-			}
-			char szStatus[100];
-			if (ntohl(pListAnswer->m_bPaused))
-			{
-				sprintf(szStatus, " (paused)");
-				lPaused += lRemainingSize;
-			}
-			else
-			{
-				szStatus[0] = '\0';
-				lRemaining += lRemainingSize;
-			}
-			char* szNZBFilename = pBufPtr + sizeof(SNZBListResponseEntry);
-			char* szFilename = pBufPtr + sizeof(SNZBListResponseEntry) + ntohl(pListAnswer->m_iNZBFilenameLen) + ntohl(pListAnswer->m_iSubjectLen);
-			
-			char szNZBNiceName[1024];
-			NZBInfo::MakeNiceNZBName(szNZBFilename, szNZBNiceName, 1024);
-			
-			printf("[%i] %s%c%s (%.2f MB%s)%s\n", ntohl(pListAnswer->m_iID), szNZBNiceName, (int)PATH_SEPARATOR, szFilename,
-				(float)(Util::Int64ToFloat(lFileSize) / 1024.0 / 1024.0), szCompleted, szStatus);
-
-			pBufPtr += sizeof(SNZBListResponseEntry) + ntohl(pListAnswer->m_iNZBFilenameLen) +
-				ntohl(pListAnswer->m_iSubjectLen) + ntohl(pListAnswer->m_iFilenameLen) + ntohl(pListAnswer->m_iDestDirLen);
-		}
-
-		printf("-----------------------------------\n");
-		printf("Files: %i\n", ntohl(ListResponse.m_iNrTrailingEntries));
-		if (lPaused > 0)
-		{
-			printf("Remaining size: %.2f MB (+%.2f MB paused)\n", (float)(Util::Int64ToFloat(lRemaining) / 1024.0 / 1024.0), 
-				(float)(Util::Int64ToFloat(lPaused) / 1024.0 / 1024.0));
-		}
-		else
-		{
-			printf("Remaining size: %.2f MB\n", (float)(Util::Int64ToFloat(lRemaining) / 1024.0 / 1024.0));
-		}
-		printf("Current download rate: %.1f KB/s\n", (float)(ntohl(ListResponse.m_iDownloadRate) / 1024.0));
-
-		free(pBuf);
-	}
-
-	long long iAllBytes = Util::JoinInt64(ntohl(ListResponse.m_iDownloadedBytesHi), ntohl(ListResponse.m_iDownloadedBytesLo));
-	float fAverageSpeed = Util::Int64ToFloat(ntohl(ListResponse.m_iDownloadTimeSec) > 0 ? iAllBytes / ntohl(ListResponse.m_iDownloadTimeSec) : 0);
-	printf("Session download rate: %.1f KB/s\n", (float)(fAverageSpeed / 1024.0));
-
-	if (ntohl(ListResponse.m_iDownloadLimit) > 0)
-	{
-		printf("Speed limit: %.1f KB/s\n", (float)(ntohl(ListResponse.m_iDownloadLimit) / 1024.0));
-	}
-
-	int sec = ntohl(ListResponse.m_iUpTimeSec);
-	int h = sec / 3600;
-	int m = (sec % 3600) / 60;
-	int s = sec % 60;
-	printf("Up time: %.2d:%.2d:%.2d\n", h, m, s);
-
-	sec = ntohl(ListResponse.m_iDownloadTimeSec);
-	h = sec / 3600;
-	m = (sec % 3600) / 60;
-	s = sec % 60;
-	printf("Download time: %.2d:%.2d:%.2d\n", h, m, s);
-
-	printf("Downloaded: %.2f MB\n", (float)(Util::Int64ToFloat(iAllBytes) / 1024.0 / 1024.0));
-
-	printf("Threads running: %i\n", ntohl(ListResponse.m_iThreadCount));
-
-	if (ntohl(ListResponse.m_iPostJobCount) > 0)
-	{
-		printf("Post-jobs: %i\n", (int)ntohl(ListResponse.m_iPostJobCount));
-	}
-
-	if (ntohl(ListResponse.m_bServerStandBy))
-	{
-		printf("Server state: Stand-By\n");
-	}
-	else
-	{
-		printf("Server state: %s\n", ntohl(ListResponse.m_bServerPaused) ? "Paused" : "Downloading");
-	}
-
-	return true;
-}
-
-bool RemoteClient::RequestServerLog(int iLines)
-{
-	if (!InitConnection()) return false;
-
-	SNZBLogRequest LogRequest;
-	InitMessageBase(&LogRequest.m_MessageBase, eRemoteRequestLog, sizeof(LogRequest));
-	LogRequest.m_iLines = htonl(iLines);
-	LogRequest.m_iIDFrom = 0;
-
-	if (m_pConnection->Send((char*)(&LogRequest), sizeof(LogRequest)) < 0)
-	{
-		perror("m_pConnection->Send");
-		return false;
-	}
-
-	printf("Request sent\n");
-
-	// Now listen for the returned log
-	SNZBLogResponse LogResponse;
-	int iResponseLen = m_pConnection->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))
-	{
-		if (iResponseLen < 0)
-		{
-			printf("No response received (timeout)\n");
-		}
-		else
-		{
-			printf("Invalid response received: either not nzbget-server or wrong server version\n");
-		}
-		return false;
-	}
-
-	char* pBuf = NULL;
-	if (ntohl(LogResponse.m_iTrailingDataLength) > 0)
-	{
-		pBuf = (char*)malloc(ntohl(LogResponse.m_iTrailingDataLength));
-		if (!m_pConnection->RecvAll(pBuf, ntohl(LogResponse.m_iTrailingDataLength)))
-		{
-			free(pBuf);
-			return false;
-		}
-	}
-
-	m_pConnection->Disconnect();
-
-	if (LogResponse.m_iTrailingDataLength == 0)
-	{
-		printf("Log is empty\n");
-	}
-	else
-	{
-		printf("Log (last %i entries)\n", ntohl(LogResponse.m_iNrTrailingEntries));
-		printf("-----------------------------------\n");
-
-		char* pBufPtr = (char*)pBuf;
-		for (unsigned int i = 0; i < ntohl(LogResponse.m_iNrTrailingEntries); i++)
-		{
-			SNZBLogResponseEntry* pLogAnswer = (SNZBLogResponseEntry*) pBufPtr;
-
-			char* szText = pBufPtr + sizeof(SNZBLogResponseEntry);
-			switch (ntohl(pLogAnswer->m_iKind))
-			{
-				case Message::mkDebug:
-					printf("[DEBUG] %s\n", szText);
-					break;
-				case Message::mkError:
-					printf("[ERROR] %s\n", szText);
-					break;
-				case Message::mkWarning:
-					printf("[WARNING] %s\n", szText);
-					break;
-				case Message::mkInfo:
-					printf("[INFO] %s\n", szText);
-					break;
-				case Message::mkDetail:
-					printf("[DETAIL] %s\n", szText);
-					break;
-			}
-
-			pBufPtr += sizeof(SNZBLogResponseEntry) + ntohl(pLogAnswer->m_iTextLen);
-		}
-
-		printf("-----------------------------------\n");
-
-		free(pBuf);
-	}
-
-	return true;
-}
-
-bool RemoteClient::RequestServerPauseUnpause(bool bPause)
-{
-	if (!InitConnection()) return false;
-
-	SNZBPauseUnpauseRequest PauseUnpauseRequest;
-	InitMessageBase(&PauseUnpauseRequest.m_MessageBase, eRemoteRequestPauseUnpause, sizeof(PauseUnpauseRequest));
-	PauseUnpauseRequest.m_bPause = htonl(bPause);
-
-	if (m_pConnection->Send((char*)(&PauseUnpauseRequest), sizeof(PauseUnpauseRequest)) < 0)
-	{
-		perror("m_pConnection->Send");
-		m_pConnection->Disconnect();
-		return false;
-	}
-
-	bool OK = ReceiveBoolResponse();
-	m_pConnection->Disconnect();
-
-	return OK;
-}
-
-bool RemoteClient::RequestServerSetDownloadRate(float fRate)
-{
-	if (!InitConnection()) return false;
-
-	SNZBSetDownloadRateRequest SetDownloadRateRequest;
-	InitMessageBase(&SetDownloadRateRequest.m_MessageBase, eRemoteRequestSetDownloadRate, sizeof(SetDownloadRateRequest));
-	SetDownloadRateRequest.m_iDownloadRate = htonl((unsigned int)(fRate * 1024));
-
-	if (m_pConnection->Send((char*)(&SetDownloadRateRequest), sizeof(SetDownloadRateRequest)) < 0)
-	{
-		perror("m_pConnection->Send");
-		m_pConnection->Disconnect();
-		return false;
-	}
-
-	bool OK = ReceiveBoolResponse();
-	m_pConnection->Disconnect();
-
-	return OK;
-}
-
-bool RemoteClient::RequestServerDumpDebug()
-{
-	if (!InitConnection()) return false;
-
-	SNZBDumpDebugRequest DumpDebugInfo;
-	InitMessageBase(&DumpDebugInfo.m_MessageBase, eRemoteRequestDumpDebug, sizeof(DumpDebugInfo));
-
-	if (m_pConnection->Send((char*)(&DumpDebugInfo), sizeof(DumpDebugInfo)) < 0)
-	{
-		perror("m_pConnection->Send");
-		m_pConnection->Disconnect();
-		return false;
-	}
-
-	bool OK = ReceiveBoolResponse();
-	m_pConnection->Disconnect();
-
-	return OK;
-}
-
-bool RemoteClient::RequestServerEditQueue(int iAction, int iOffset, int* pIDList, int iIDCount, bool bSmartOrder)
-{
-	if (iIDCount <= 0 || pIDList == NULL)
-	{
-		printf("File(s) not specified\n");
-		return false;
-	}
-
-	if (!InitConnection()) return false;
-
-	int iLength = sizeof(int32_t) * iIDCount;
-
-	SNZBEditQueueRequest EditQueueRequest;
-	InitMessageBase(&EditQueueRequest.m_MessageBase, eRemoteRequestEditQueue, sizeof(EditQueueRequest));
-	EditQueueRequest.m_iAction = htonl(iAction);
-	EditQueueRequest.m_iOffset = htonl((int)iOffset);
-	EditQueueRequest.m_bSmartOrder = htonl(bSmartOrder);
-	EditQueueRequest.m_iNrTrailingEntries = htonl(iIDCount);
-	EditQueueRequest.m_iTrailingDataLength = htonl(iLength);
-
-	int32_t* pIDs = (int32_t*)malloc(iLength);
-	
-	for (int i = 0; i < iIDCount; i++)
-	{
-		pIDs[i] = htonl(pIDList[i]);
-	}
-			
-	bool OK = false;
-	if (m_pConnection->Send((char*)(&EditQueueRequest), sizeof(EditQueueRequest)) < 0)
-	{
-		perror("m_pConnection->Send");
-	}
-	else
-	{
-		m_pConnection->Send((char*)pIDs, iLength);
-		OK = ReceiveBoolResponse();
-		m_pConnection->Disconnect();
-	}
-
-	free(pIDs);
-
-	m_pConnection->Disconnect();
-	return OK;
-}
-
-bool RemoteClient::RequestServerShutdown()
-{
-	if (!InitConnection()) return false;
-
-	SNZBShutdownRequest ShutdownRequest;
-	InitMessageBase(&ShutdownRequest.m_MessageBase, eRemoteRequestShutdown, sizeof(ShutdownRequest));
-
-	bool OK = m_pConnection->Send((char*)(&ShutdownRequest), sizeof(ShutdownRequest)) >= 0;
-	if (OK)
-	{
-		OK = ReceiveBoolResponse();
-	}
-	else
-	{
-		perror("m_pConnection->Send");
-	}
-
-	m_pConnection->Disconnect();
-	return OK;
-}
-
-bool RemoteClient::RequestServerVersion()
-{
-	if (!InitConnection()) return false;
-
-	SNZBVersionRequest VersionRequest;
-	InitMessageBase(&VersionRequest.m_MessageBase, eRemoteRequestVersion, sizeof(VersionRequest));
-
-	bool OK = m_pConnection->Send((char*)(&VersionRequest), sizeof(VersionRequest)) >= 0;
-	if (OK)
-	{
-		OK = ReceiveBoolResponse();
-	}
-	else
-	{
-		perror("m_pConnection->Send");
-	}
-
-	m_pConnection->Disconnect();
-	return OK;
-}
-
-bool RemoteClient::RequestPostQueue()
-{
-	if (!InitConnection()) return false;
-
-	SNZBPostQueueRequest PostQueueRequest;
-	InitMessageBase(&PostQueueRequest.m_MessageBase, eRemoteRequestPostQueue, sizeof(PostQueueRequest));
-
-	if (m_pConnection->Send((char*)(&PostQueueRequest), sizeof(PostQueueRequest)) < 0)
-	{
-		perror("m_pConnection->Send");
-		return false;
-	}
-
-	printf("Request sent\n");
-
-	// Now listen for the returned list
-	SNZBPostQueueResponse PostQueueResponse;
-	int iResponseLen = m_pConnection->Recv((char*) &PostQueueResponse, sizeof(PostQueueResponse));
-	if (iResponseLen != sizeof(PostQueueResponse) || 
-		(int)ntohl(PostQueueResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
-		ntohl(PostQueueResponse.m_MessageBase.m_iStructSize) != sizeof(PostQueueResponse))
-	{
-		if (iResponseLen < 0)
-		{
-			printf("No response received (timeout)\n");
-		}
-		else
-		{
-			printf("Invalid response received: either not nzbget-server or wrong server version\n");
-		}
-		return false;
-	}
-
-	char* pBuf = NULL;
-	if (ntohl(PostQueueResponse.m_iTrailingDataLength) > 0)
-	{
-		pBuf = (char*)malloc(ntohl(PostQueueResponse.m_iTrailingDataLength));
-		if (!m_pConnection->RecvAll(pBuf, ntohl(PostQueueResponse.m_iTrailingDataLength)))
-		{
-			free(pBuf);
-			return false;
-		}
-	}
-
-	m_pConnection->Disconnect();
-
-	if (ntohl(PostQueueResponse.m_iTrailingDataLength) == 0)
-	{
-		printf("Server has no files queued for post-processing\n");
-	}
-	else
-	{
-		printf("Post-Processing List\n");
-		printf("-----------------------------------\n");
-
-		char* pBufPtr = (char*)pBuf;
-		for (unsigned int i = 0; i < ntohl(PostQueueResponse.m_iNrTrailingEntries); i++)
-		{
-			SNZBPostQueueResponseEntry* pPostQueueAnswer = (SNZBPostQueueResponseEntry*) pBufPtr;
-
-			int iStageProgress = ntohl(pPostQueueAnswer->m_iStageProgress);
-
-			static const int EXECUTING_SCRIPT = 5;
-			char szCompleted[100];
-			szCompleted[0] = '\0';
-			if (iStageProgress > 0 && (int)ntohl(pPostQueueAnswer->m_iStage) != EXECUTING_SCRIPT)
-			{
-				sprintf(szCompleted, ", %i%s", (int)(iStageProgress / 10), "%");
-			}
-
-			char* szPostStageName[] = { "", ", Loading Pars", ", Verifying source files", ", Repairing", ", Verifying repaired files", ", Executing postprocess-script", "" };
-			char* szInfoName = pBufPtr + sizeof(SNZBPostQueueResponseEntry) + ntohl(pPostQueueAnswer->m_iNZBFilenameLen) + ntohl(pPostQueueAnswer->m_iParFilename);
-			
-			printf("[%i] %s%s%s\n", ntohl(pPostQueueAnswer->m_iID), szInfoName, szPostStageName[ntohl(pPostQueueAnswer->m_iStage)], szCompleted);
-
-			pBufPtr += sizeof(SNZBPostQueueResponseEntry) + ntohl(pPostQueueAnswer->m_iNZBFilenameLen) + 
-				ntohl(pPostQueueAnswer->m_iParFilename) + ntohl(pPostQueueAnswer->m_iInfoNameLen) +
-				ntohl(pPostQueueAnswer->m_iDestDirLen) + ntohl(pPostQueueAnswer->m_iProgressLabelLen);
-		}
-
-		free(pBuf);
-
-		printf("-----------------------------------\n");
-	}
-
-	return true;
-}
-
-bool RemoteClient::RequestWriteLog(int iKind, const char* szText)
-{
-	if (!InitConnection()) return false;
-
-	SNZBWriteLogRequest WriteLogRequest;
-	InitMessageBase(&WriteLogRequest.m_MessageBase, eRemoteRequestWriteLog, sizeof(WriteLogRequest));
-	WriteLogRequest.m_iKind = htonl(iKind);
-	int iLength = strlen(szText) + 1;
-	WriteLogRequest.m_iTrailingDataLength = htonl(iLength);
-
-	if (m_pConnection->Send((char*)(&WriteLogRequest), sizeof(WriteLogRequest)) < 0)
-	{
-		perror("m_pConnection->Send");
-		return false;
-	}
-
-	m_pConnection->Send(szText, iLength);
-	bool OK = ReceiveBoolResponse();
-	m_pConnection->Disconnect();
-	return OK;
-}

RemoteClient.h

@@ -1,64 +0,0 @@
-/*
- *  This file if part of nzbget
- *
- *  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
- *  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 REMOTECLIENT_H
-#define REMOTECLIENT_H
-
-#include "Options.h"
-#include "MessageBase.h"
-#include "Connection.h"
-
-class RemoteClient
-{
-private:
-	Connection* 	m_pConnection;
-	NetAddress*		m_pNetAddress;
-	bool			m_bVerbose;
-
-	bool			InitConnection();
-	void			InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int iSize);
-	bool			ReceiveBoolResponse();
-	void			printf(char* msg, ...);
-	void			perror(char* msg);
-
-public:
-	RemoteClient();
-	~RemoteClient();
-	void			SetVerbose(bool bVerbose) { m_bVerbose = bVerbose; };
-	bool 			RequestServerDownload(const char* szName, bool bAddFirst);
-	bool			RequestServerList();
-	bool			RequestServerPauseUnpause(bool bPause);
-	bool			RequestServerSetDownloadRate(float fRate);
-	bool			RequestServerDumpDebug();
-	bool 			RequestServerEditQueue(int iAction, int iOffset, int* pIDList, int iIDCount, bool bSmartOrder);
-	bool			RequestServerLog(int iLines);
-	bool			RequestServerShutdown();
-	bool			RequestServerVersion();
-	bool			RequestPostQueue();
-	bool 			RequestWriteLog(int iKind, const char* szText);
-};
-
-#endif

ScriptController.cpp

@@ -1,390 +0,0 @@
-/*
- *  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 <ctype.h>
-#ifndef WIN32
-#include <unistd.h>
-#include <sys/wait.h>
-#include <signal.h>
-#endif
-#include <sys/stat.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <stdio.h>
-
-#include "nzbget.h"
-#include "ScriptController.h"
-#include "Log.h"
-#include "Util.h"
-#include "Options.h"
-
-extern Options* g_pOptions;
-
-void ScriptController::StartScriptJob(PostInfo* pPostInfo, const char* szScript, bool bNZBFileCompleted, bool bHasFailedParJobs)
-{
-	if (!Util::FileExists(szScript))
-	{
-		error("Could not start post-process-script: could not find file %s", szScript);
-		pPostInfo->SetStage(PostInfo::ptFinished);
-		pPostInfo->SetWorking(false);
-		return;
-	}
-
-	info("Executing post-process-script for %s", pPostInfo->GetInfoName());
-
-	ScriptController* pScriptController = new ScriptController();
-	pScriptController->m_pPostInfo = pPostInfo;
-	pScriptController->m_szScript = szScript;
-	pScriptController->m_bNZBFileCompleted = bNZBFileCompleted;
-	pScriptController->m_bHasFailedParJobs = bHasFailedParJobs;
-	pScriptController->SetAutoDestroy(false);
-
-	pPostInfo->SetScriptThread(pScriptController);
-
-	pScriptController->Start();
-}
-
-void ScriptController::Run()
-{
-	char szParStatus[10];
-	snprintf(szParStatus, 10, "%i", m_pPostInfo->GetParStatus());
-	szParStatus[10-1] = '\0';
-
-	char szCollectionCompleted[10];
-	snprintf(szCollectionCompleted, 10, "%i", (int)m_bNZBFileCompleted);
-	szCollectionCompleted[10-1] = '\0';
-
-	char szHasFailedParJobs[10];
-	snprintf(szHasFailedParJobs, 10, "%i", (int)m_bHasFailedParJobs);
-	szHasFailedParJobs[10-1] = '\0';
-
-	int pipein;
-
-#ifdef WIN32
-	char szCmdLine[2048];
-	snprintf(szCmdLine, 2048, "\"%s\" \"%s\" \"%s\" \"%s\" %s %s %s", m_szScript, m_pPostInfo->GetDestDir(), 
-		m_pPostInfo->GetNZBFilename(), m_pPostInfo->GetParFilename(), szParStatus, szCollectionCompleted, szHasFailedParJobs);
-	szCmdLine[2048-1] = '\0';
-	
-	// create pipes to write and read data
-	HANDLE hReadPipe, hWritePipe;
-	SECURITY_ATTRIBUTES SecurityAttributes;
-	memset(&SecurityAttributes, 0, sizeof(SecurityAttributes));
-	SecurityAttributes.nLength = sizeof(SecurityAttributes);
-	SecurityAttributes.bInheritHandle = TRUE;
-
-	CreatePipe(&hReadPipe, &hWritePipe, &SecurityAttributes, 0);
-
-	STARTUPINFO StartupInfo;
-	memset(&StartupInfo, 0, sizeof(StartupInfo));
-	StartupInfo.cb = sizeof(StartupInfo);
-	StartupInfo.dwFlags = STARTF_USESTDHANDLES;
-	StartupInfo.hStdInput = 0;
-	StartupInfo.hStdOutput = hWritePipe;
-	StartupInfo.hStdError = hWritePipe;
-
-	PROCESS_INFORMATION ProcessInfo;
-	memset(&ProcessInfo, 0, sizeof(ProcessInfo));
-
-	BOOL bOK = CreateProcess(NULL, szCmdLine, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS | CREATE_NO_WINDOW, NULL, m_pPostInfo->GetDestDir(), &StartupInfo, &ProcessInfo);
-	if (!bOK)
-	{
-		DWORD dwErrCode = GetLastError();
-		char szErrMsg[255];
-		szErrMsg[255-1] = '\0';
-		if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM || FORMAT_MESSAGE_IGNORE_INSERTS || FORMAT_MESSAGE_ARGUMENT_ARRAY, 
-			NULL, dwErrCode, 0, szErrMsg, 255, NULL))
-		{
-			error("Could not start post-process-script: %s", szErrMsg);
-		}
-		else
-		{
-			error("Could not start post-process-script: error %i", dwErrCode);
-		}
-		m_pPostInfo->SetStage(PostInfo::ptFinished);
-		m_pPostInfo->SetWorking(false);
-		return;
-	}
-
-	debug("Child Process-ID: %i", (int)ProcessInfo.dwProcessId);
-
-	m_hProcess = ProcessInfo.hProcess;
-
-	// close unused "write" end
-	CloseHandle(hWritePipe);
-
-	pipein = _open_osfhandle((intptr_t)hReadPipe, _O_RDONLY);
-
-#else
-
-	char szDestDir[1024];
-	strncpy(szDestDir, m_pPostInfo->GetDestDir(), 1024);
-	szDestDir[1024-1] = '\0';
-	
-	char szNZBFilename[1024];
-	strncpy(szNZBFilename, m_pPostInfo->GetNZBFilename(), 1024);
-	szNZBFilename[1024-1] = '\0';
-	
-	char szParFilename[1024];
-	strncpy(szParFilename, m_pPostInfo->GetParFilename(), 1024);
-	szParFilename[1024-1] = '\0';
-
-	int p[2];
-	int pipeout;
-
-	// create the pipe
-	if (pipe(p))
-	{
-		error("Could not open pipe: errno %i", errno);
-		m_pPostInfo->SetStage(PostInfo::ptFinished);
-		m_pPostInfo->SetWorking(false);
-		return;
-	}
-
-	pipein = p[0];
-	pipeout = p[1];
-
-	debug("forking");
-	pid_t pid = fork();
-
-	if (pid == -1)
-	{
-		error("Could not start post-process-script: errno %i", errno);
-		m_pPostInfo->SetStage(PostInfo::ptFinished);
-		m_pPostInfo->SetWorking(false);
-		return;
-	}
-	else if (pid == 0)
-	{
-		// here goes the second instance
-			
-		// close up the "read" end
-		close(pipein);
-      			
-		// make the pipeout to be the same as stdout and stderr
-		dup2(pipeout, 1);
-		dup2(pipeout, 2);
-		
-		close(pipeout);
-
-		execlp(m_szScript, m_szScript, szDestDir, szNZBFilename, szParFilename,
-			szParStatus, szCollectionCompleted, szHasFailedParJobs, NULL);
-		fprintf(stdout, "[ERROR] Could not start post-process-script: %s", strerror(errno));
-		fflush(stdout);
-		_exit(-1);
-	}
-
-	// continue the first instance
-	debug("forked");
-	debug("Child Process-ID: %i", (int)pid);
-
-	m_hProcess = pid;
-
-	// close unused "write" end
-	close(pipeout);
-#endif
-
-	// open the read end
-	FILE* readpipe = fdopen(pipein, "r");
-	if (!readpipe)
-	{
-		error("Could not open pipe to post-process-script");
-		m_pPostInfo->SetStage(PostInfo::ptFinished);
-		m_pPostInfo->SetWorking(false);
-		return;
-	}
-	
-	char* buf = (char*)malloc(10240);
-
-	debug("Entering pipe-loop");
-	while (!feof(readpipe) && !IsStopped())
-	{
-		if (fgets(buf, 10240, readpipe))
-		{
-			AddMessage(buf);
-		}
-	}
-	debug("Exited pipe-loop");
-	
-	free(buf);
-	fclose(readpipe);
-
-	if (IsStopped())
-	{
-		warn("Interrupted post-process-script for %s", m_pPostInfo->GetInfoName());
-	}
-
-#ifdef WIN32
-	WaitForSingleObject(m_hProcess, INFINITE);
-#else
-	waitpid(m_hProcess, NULL, 0);
-#endif
-
-	if (!IsStopped())
-	{
-		info("Completed post-process-script for %s", m_pPostInfo->GetInfoName());
-	}
-
-	m_pPostInfo->SetStage(PostInfo::ptFinished);
-	m_pPostInfo->SetWorking(false);
-}
-
-void ScriptController::AddMessage(char* szText)
-{
-	debug("Adding message received from post-process-script");
-
-	for (char* pend = szText + strlen(szText) - 1; pend >= szText && (*pend == '\n' || *pend == '\r' || *pend == ' '); pend--) *pend = '\0';
-
-	if (strlen(szText) == 0)
-	{
-		// skip empty lines
-		return;
-	}
-
-	if (!strncmp(szText, "[INFO] ", 7))
-	{
-		info(szText + 7);
-		Options::EMessageTarget eMessageTarget = g_pOptions->GetInfoTarget();
-		if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-		{
-			m_pPostInfo->AppendMessage(Message::mkInfo, szText + 7);
-		}
-	}
-	else if (!strncmp(szText, "[WARNING] ", 10))
-	{
-		warn(szText + 10);
-		Options::EMessageTarget eMessageTarget = g_pOptions->GetWarningTarget();
-		if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-		{
-			m_pPostInfo->AppendMessage(Message::mkWarning, szText + 10);
-		}
-	}
-	else if (!strncmp(szText, "[ERROR] ", 8))
-	{
-		error(szText + 8);
-		Options::EMessageTarget eMessageTarget = g_pOptions->GetErrorTarget();
-		if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-		{
-			m_pPostInfo->AppendMessage(Message::mkError, szText + 8);
-		}
-	}
-	else if (!strncmp(szText, "[DETAIL] ", 9))
-	{
-		detail(szText + 9);
-		Options::EMessageTarget eMessageTarget = g_pOptions->GetDetailTarget();
-		if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-		{
-			m_pPostInfo->AppendMessage(Message::mkDetail, szText + 9);
-		}
-	}
-	else if (!strncmp(szText, "[DEBUG] ", 8))
-	{
-		debug(szText + 8);
-		Options::EMessageTarget eMessageTarget = g_pOptions->GetDebugTarget();
-		if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-		{
-			m_pPostInfo->AppendMessage(Message::mkDebug, szText + 8);
-		}
-	}
-	else 
-	{
-		Options::EMessageTarget eMessageTarget = Options::mtNone;
-		Message::EKind eKind = Message::mkDebug;
-		switch (g_pOptions->GetPostLogKind())
-		{
-			case Options::plNone:
-				break;
-
-			case Options::plDetail:
-				detail("Post-Process: %s", szText);
-				eMessageTarget = g_pOptions->GetDetailTarget();
-				eKind = Message::mkDetail;
-				break;
-
-			case Options::plInfo:
-				info("Post-Process: %s", szText);
-				eMessageTarget = g_pOptions->GetInfoTarget();
-				eKind = Message::mkInfo;
-				break;
-
-			case Options::plWarning:
-				warn("Post-Process: %s", szText);
-				eMessageTarget = g_pOptions->GetWarningTarget();
-				eKind = Message::mkWarning;
-				break;
-
-			case Options::plError:
-				error("Post-Process: %s", szText);
-				eMessageTarget = g_pOptions->GetErrorTarget();
-				eKind = Message::mkError;
-				break;
-
-			case Options::plDebug:
-				debug("Post-Process: %s", szText);
-				eMessageTarget = g_pOptions->GetDebugTarget();
-				eKind = Message::mkDebug;
-				break;
-		}
-		if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-		{
-			m_pPostInfo->AppendMessage(eKind, szText);
-		}
-	}
-
-	debug("Adding message received from post-process-script - completed");
-}
-
-void ScriptController::Stop()
-{
-	debug("Stopping post-process-script");
-	Thread::Stop();
-
-#ifdef WIN32
-	BOOL bOK = TerminateProcess(m_hProcess, -1);
-#else
-	bool bOK = kill(m_hProcess, 9) == 0;
-#endif
-
-	if (bOK)
-	{
-		debug("Terminated post-process-script");
-	}
-	else
-	{
-		error("Could not terminate post-process-script");
-	}
-
-	debug("Post-process-script stopped");
-}

ServerPool.cpp

@@ -1,251 +0,0 @@
-/*
- *  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$
- *
- */
-
-/*
- *
- * 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>
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#ifndef WIN32
-#include <unistd.h>
-#include <errno.h>
-#endif
-
-#include "nzbget.h"
-#include "ServerPool.h"
-#include "Log.h"
-
-static const int CONNECTION_HOLD_SECODNS = 5;
-
-ServerPool::PooledConnection::PooledConnection(NewsServer* server) : NNTPConnection(server)
-{
-	m_bInUse = false;
-	m_tFreeTime = 0;
-}
-
-ServerPool::ServerPool()
-{
-	debug("Creating ServerPool");
-
-	m_iMaxLevel = 0;
-	m_iTimeout = 60;
-	m_Servers.clear();
-	m_Connections.clear();
-	m_Semaphores.clear();
-}
-
-ServerPool::~ ServerPool()
-{
-	debug("Destroying ServerPool");
-
-	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++)
-	{
-		delete *it;
-	}
-	m_Servers.clear();
-
-	for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
-	{
-		delete *it;
-	}
-	m_Connections.clear();
-}
-
-void ServerPool::AddServer(NewsServer* pNewsServer)
-{
-	debug("Adding server to ServerPool");
-
-	m_Servers.push_back(pNewsServer);
-}
-
-void ServerPool::InitConnections()
-{
-	debug("Initializing connections in ServerPool");
-
-	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);
-		}
-	}
-
-	for (int iLevel = 0; iLevel <= m_iMaxLevel; iLevel++)
-	{
-		int iMaxConnectionsForLevel = 0;
-		for (Servers::iterator it = m_Servers.begin(); it != m_Servers.end(); it++)
-		{
-			NewsServer* pNewsServer = *it;
-			if (iLevel == pNewsServer->GetLevel())
-			{
-				iMaxConnectionsForLevel += pNewsServer->GetMaxConnections();
-			}
-		}
-
-		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)
-		{
-			// 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;
-}
-
-void ServerPool::FreeConnection(NNTPConnection* pConnection, bool bUsed)
-{
-	if (bUsed)
-	{
-		debug("Freeing used connection");
-	}
-
-	m_mutexConnections.Lock();
-
-	((PooledConnection*)pConnection)->SetInUse(false);
-	if (bUsed)
-	{
-		((PooledConnection*)pConnection)->SetFreeTimeNow();
-	}
-	m_Semaphores[pConnection->GetNewsServer()->GetLevel()]->Post();
-
-	m_mutexConnections.Unlock();
-}
-
-void ServerPool::CloseUnusedConnections()
-{
-	m_mutexConnections.Lock();
-
-	time_t curtime = ::time(NULL);
-
-	for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
-	{
-		PooledConnection* pConnection = *it;
-		if (!pConnection->GetInUse() && pConnection->GetStatus() == Connection::csConnected)
-		{
-			int tdiff = (int)(curtime - pConnection->GetFreeTime());
-			if (tdiff > CONNECTION_HOLD_SECODNS)
-			{
-				debug("Closing unused connection to %s", pConnection->GetNewsServer()->GetHost());
-				pConnection->Disconnect();
-			}
-		}
-	}
-
-	m_mutexConnections.Unlock();
-}
-
-void ServerPool::LogDebugInfo()
-{
-	debug("   ServerPool");
-	debug("   ----------------");
-
-	debug("    Max-Level: %i", m_iMaxLevel);
-
-	m_mutexConnections.Lock();
-
-	debug("    Connections: %i", m_Connections.size());
-	for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
-	{
-		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();
-}

Util.h

@@ -1,142 +0,0 @@
-/*
- *  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 UTIL_H
-#define UTIL_H
-
-#ifdef WIN32
-#include <stdio.h>
-#include <io.h>
-#include <sys/timeb.h>
-#else
-#include <dirent.h>
-#endif
-
-#ifdef WIN32
-extern int optind, opterr;
-extern char *optarg;
-int getopt(int argc, char *argv[], char *optstring);
-#endif
-
-class DirBrowser
-{
-private:
-#ifdef WIN32
-	struct _finddata_t	m_FindData;
-	intptr_t			m_hFile;
-	bool				m_bFirst;
-#else
-	DIR*				m_pDir;
-	struct dirent*		m_pFindData;
-#endif
-
-public:
-						DirBrowser(const char* szPath);
-						~DirBrowser();
-	const char*			Next();
-};
-
-class Util 
-{
-public:
-
-	static char* BaseFileName(const char* filename);
-	static void NormalizePathSeparators(char* szPath);
-	static bool LoadFileIntoBuffer(const char* szFileName, char** pBuffer, int* pBufferLength);
-	static bool SetFileSize(const char* szFilename, int iSize);
-	static void MakeValidFilename(char* szFilename, char cReplaceChar);
-	static bool MoveFile(const char* szSrcFilename, const char* szDstFilename);
-	static bool FileExists(const char* szFilename);
-	static bool DirectoryExists(const char* szDirFilename);
-	static bool CreateDirectory(const char* szDirFilename);
-	static bool ForceDirectories(const char* szPath);
-	static long long FileSize(const char* szFilename);
-	static long long FreeDiskSize(const char* szPath);
-
-	static long long JoinInt64(unsigned long Hi, unsigned long Lo);
-	static void SplitInt64(long long Int64, unsigned long* Hi, unsigned long* Lo);
-
-	/**
-	 * Int64ToFloat converts Int64 to float.
-	 * Simple (float)Int64 does not work on all compilers,
-	 * for example on ARM for NSLU2 (unslung).
-	 */
-	static float Int64ToFloat(long long Int64);
-
-	static float EqualTime(_timeval* t1, _timeval* t2);
-	static bool EmptyTime(_timeval* t);
-	static float DiffTime(_timeval* t1, _timeval* t2);
-
-	static unsigned int DecodeBase64(char* szInputBuffer, int iInputBufferLength, char* szOutputBuffer);
-
-	/*
-	 * Encodes string to be used as content of xml-tag.
-	 * Returns new string allocated with malloc, it need to be freed by caller.
-	 */
-	static char* XmlEncode(const char* raw);
-
-	/*
-	 * Decodes string from xml.
-	 * The string is decoded on the place overwriting the content of raw-data.
-	 */
-	static void XmlDecode(char* raw);
-
-	/*
-	 * Returns pointer to tag-content and length of content in iValueLength
-	 * The returned pointer points to the part of source-string, no additional strings are allocated.
-	 */
-	static const char* XmlFindTag(const char* szXml, const char* szTag, int* pValueLength);
-
-	/*
-	 * Parses tag-content into szValueBuf.
-	 */
-	static bool XmlParseTagValue(const char* szXml, const char* szTag, char* szValueBuf, int iValueBufSize, const char** pTagEnd);
-
-	/*
-	 * Creates JSON-string by replace the certain characters with escape-sequences.
-	 * Returns new string allocated with malloc, it need to be freed by caller.
-	 */
-	static char* JsonEncode(const char* raw);
-
-	/*
-	 * Decodes JSON-string.
-	 * The string is decoded on the place overwriting the content of raw-data.
-	 */
-	static void JsonDecode(char* raw);
-
-	/*
-	 * Returns pointer to field-content and length of content in iValueLength
-	 * The returned pointer points to the part of source-string, no additional strings are allocated.
-	 */
-	static const char* JsonFindField(const char* szJsonText, const char* szFieldName, int* pValueLength);
-
-	/*
-	 * Returns pointer to field-content and length of content in iValueLength
-	 * The returned pointer points to the part of source-string, no additional strings are allocated.
-	 */
-	static const char* JsonNextValue(const char* szJsonText, int* pValueLength);
-};
-
-#endif

aclocal.m4

@@ -1,7 +1,7 @@
-# generated automatically by aclocal 1.10 -*- Autoconf -*-
+# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006  Free Software Foundation, Inc.
+# 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.
@@ -11,12 +11,165 @@
 # 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>.
+#
+# 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
 
-# Copyright (C) 2002, 2003, 2005, 2006  Free Software Foundation, Inc.
+# PKG_PROG_PKG_CONFIG([MIN-VERSION])
+# ----------------------------------
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+		
+fi[]dnl
+])# PKG_PROG_PKG_CONFIG
+
+# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+#
+# Check to see whether a particular set of modules exists.  Similar
+# to PKG_CHECK_MODULES(), but does not set variables or print errors.
+#
+#
+# Similar to PKG_CHECK_MODULES, make sure that the first instance of
+# this or PKG_CHECK_MODULES is called, or make sure to call
+# PKG_CHECK_EXISTS manually
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_ifval([$2], [$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+
+# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+# ---------------------------------------------
+m4_define([_PKG_CONFIG],
+[if test -n "$PKG_CONFIG"; then
+    if test -n "$$1"; then
+        pkg_cv_[]$1="$$1"
+    else
+        PKG_CHECK_EXISTS([$3],
+                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
+			 [pkg_failed=yes])
+    fi
+else
+	pkg_failed=untried
+fi[]dnl
+])# _PKG_CONFIG
+
+# _PKG_SHORT_ERRORS_SUPPORTED
+# -----------------------------
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])# _PKG_SHORT_ERRORS_SUPPORTED
+
+
+# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+# [ACTION-IF-NOT-FOUND])
+#
+#
+# Note that if there is a possibility the first call to
+# PKG_CHECK_MODULES might not happen, you should be sure to include an
+# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+#
+#
+# --------------------------------------------------------------
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
+AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
+
+pkg_failed=no
+AC_MSG_CHECKING([for $1])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+and $1[]_LIBS to avoid the need to call pkg-config.
+See the pkg-config man page for more details.])
+
+if test $pkg_failed = yes; then
+        _PKG_SHORT_ERRORS_SUPPORTED
+        if test $_pkg_short_errors_supported = yes; then
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"`
+        else 
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	ifelse([$4], , [AC_MSG_ERROR(dnl
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT
+])],
+		[AC_MSG_RESULT([no])
+                $4])
+elif test $pkg_failed = untried; then
+	ifelse([$4], , [AC_MSG_FAILURE(dnl
+[The pkg-config script could not be found or is too old.  Make sure it
+is in your PATH or set the PKG_CONFIG environment variable to the full
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
+		[$4])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	ifelse([$3], , :, [$3])
+fi[]dnl
+])# PKG_CHECK_MODULES
+
+# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -26,29 +179,14 @@ you should regenerate the build system entirely.], [63])])
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-# (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], [])
+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
-# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
+# Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.10])dnl
-_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)])
+	 [AM_AUTOMAKE_VERSION([1.9.6])])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
@@ -105,14 +243,14 @@ am_aux_dir=`cd $ac_aux_dir && pwd`
 
 # AM_CONDITIONAL                                            -*- Autoconf -*-
 
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1997, 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 8
+# serial 7
 
 # AM_CONDITIONAL(NAME, SHELL-CONDITION)
 # -------------------------------------
@@ -121,10 +259,8 @@ 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])dnl
-AC_SUBST([$1_FALSE])dnl
-_AM_SUBST_NOTMAKE([$1_TRUE])dnl
-_AM_SUBST_NOTMAKE([$1_FALSE])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
 if $2; then
   $1_TRUE=
   $1_FALSE='#'
@@ -138,14 +274,15 @@ AC_CONFIG_COMMANDS_PRE(
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+
+# Copyright (C) 1999, 2000, 2001, 2002, 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 9
+# serial 8
 
 # 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,
@@ -173,7 +310,6 @@ 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=])
 
@@ -239,7 +375,6 @@ 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
@@ -292,8 +427,7 @@ if test "x$enable_dependency_tracking" != xno; then
   AMDEPBACKSLASH='\'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])dnl
-_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([AMDEPBACKSLASH])
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -318,9 +452,8 @@ 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.
-  # 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
+  # So let's grep whole file.
+  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
     dirpart=`AS_DIRNAME("$mf")`
   else
     continue
@@ -367,8 +500,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, 2006 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 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,
@@ -391,20 +524,16 @@ 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.60])dnl
+[AC_PREREQ([2.58])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
-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
+# 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])
 fi
 
 # test whether we have cygpath
@@ -424,9 +553,6 @@ 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
 
@@ -462,10 +588,6 @@ 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
 ])
 ])
 
@@ -501,7 +623,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-"\$(SHELL) $am_aux_dir/install-sh"}
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
 AC_SUBST(install_sh)])
 
 # Copyright (C) 2003, 2005  Free Software Foundation, Inc.
@@ -579,14 +701,14 @@ rm -f confinc confmf
 
 # Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
 
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005
+# Copyright (C) 1997, 1999, 2000, 2001, 2003, 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 5
+# serial 4
 
 # AM_MISSING_PROG(NAME, PROGRAM)
 # ------------------------------
@@ -602,7 +724,6 @@ 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
@@ -613,7 +734,7 @@ else
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 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,
@@ -621,23 +742,60 @@ fi
 
 # AM_PROG_MKDIR_P
 # ---------------
-# Check for `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.)
 AC_DEFUN([AM_PROG_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
-])
+[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])])
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
@@ -749,21 +907,9 @@ 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="\$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(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,13 +6,22 @@
 /* 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
 
+/* Define to 1 to not use TLS/SSL */
+#undef DISABLE_TLS
+
 /* Define to the name of macro which returns the name of function being
    compiled */
 #undef FUNCTION_MACRO_NAME
 
+/* Define to 1 to create stacktrace on segmentation faults */
+#undef HAVE_BACKTRACE
+
 /* Define to 1 if ctime_r takes 2 arguments */
 #undef HAVE_CTIME_R_2
 
@@ -22,6 +31,15 @@
 /* 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
 
@@ -34,6 +52,9 @@
 /* Define to 1 if you have the <inttypes.h> header file. */
 #undef HAVE_INTTYPES_H
 
+/* Define to 1 to use GnuTLS library for TLS/SSL-support. */
+#undef HAVE_LIBGNUTLS
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -43,8 +64,20 @@
 /* Define to 1 if you have the <ncurses/ncurses.h> header file. */
 #undef HAVE_NCURSES_NCURSES_H
 
-/* Define to 1 if stat64 is supported */
-#undef HAVE_STAT64
+/* 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 you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
@@ -58,6 +91,9 @@
 /* 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
 
@@ -88,8 +124,20 @@
 /* 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,41 +2,18 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(nzbget, 0.4.0, hugbug@users.sourceforge.net)
-AM_INIT_AUTOMAKE(nzbget, 0.4.0)
-AC_CONFIG_SRCDIR([nzbget.cpp])
+AC_INIT(nzbget, 13.0, hugbug@users.sourceforge.net)
+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE(nzbget, 13.0)
+AC_CONFIG_SRCDIR([daemon/main/nzbget.cpp])
 AC_CONFIG_HEADERS([config.h])
 
 
-dnl Architecture check
-AC_CANONICAL_HOST
-case "$host" in
-  *86-*-linux*)
-    LIBPREF1="/usr"
-    CFLAGS1="${CFLAGS} -m486"
-    CPPFLAGS1="${CPPFLAGS} -D_GNU_SOURCE"
-    ;;
-  *-linux*)
-    LIBPREF1="/usr"
-    CPPFLAGS1="${CPPFLAGS} -D_GNU_SOURCE"
-    ;;
-  *-freebsd*)
-    LIBPREF1="/usr/local"
-    ;;
-  *-solaris*)
-    LIBPREF1="/usr"
-    ;;
-esac
-
-
+dnl
+dnl Set default library path, if not specified in environment variable "LIBPREF".
+dnl
 if test "$LIBPREF" = ""; then
-	LIBPREF="$LIBPREF1"
-fi
-if test "$CFLAGS" = ""; then
-	CFLAGS="$CFLAGS1"
-fi
-if test "$CPPFLAGS" = ""; then
-	CPPFLAGS="$CPPFLAGS1"
+	LIBPREF="/usr"
 fi
 
 
@@ -44,30 +21,23 @@ 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
-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)
+AC_CHECK_HEADERS(sys/prctl.h)
+AC_CHECK_HEADERS(regex.h)
+
 
 dnl
 dnl Check for libs
@@ -75,7 +45,6 @@ dnl
 AC_SEARCH_LIBS([pthread_create], [pthread])
 AC_SEARCH_LIBS([socket], [socket])
 AC_SEARCH_LIBS([inet_addr], [nsl])
-AC_SEARCH_LIBS([gethostbyname_r], [nsl])
 AC_SEARCH_LIBS([hstrerror], [resolv])
 
 
@@ -83,16 +52,13 @@ dnl
 dnl Getopt
 dnl
 AC_CHECK_FUNC(getopt_long,
-	[AC_DEFINE([HAVE_GETOPT_LONG], 1, [Define to 1 if getopt_long is supported])],
-	[AC_LIBOBJ(getopt) AC_LIBOBJ(getopt1)])
+	[AC_DEFINE([HAVE_GETOPT_LONG], 1, [Define to 1 if getopt_long is supported])],)
 
 
 dnl
-dnl stat64
+dnl use 64-Bits for file sizes
 dnl
-AC_CHECK_FUNC(stat64,
-	[AC_DEFINE([HAVE_STAT64], 1, [Define to 1 if stat64 is supported])],
-	[AC_LIBOBJ(stat64)])
+AC_SYS_LARGEFILE
 
 
 dnl
@@ -103,6 +69,7 @@ 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
@@ -116,82 +83,125 @@ 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 gethostbyname_r
+dnl check getaddrinfo
 dnl
-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]])
+AC_CHECK_FUNC(getaddrinfo,
 	FOUND="yes"
-	AC_DEFINE([HAVE_GETHOSTBYNAME_R_6], 1, [Define to 1 if gethostbyname_r takes 6 arguments]),
+	[AC_DEFINE([HAVE_GETADDRINFO], 1, [Define to 1 if getaddrinfo is supported])]
+	AC_SEARCH_LIBS([getaddrinfo], [nsl]),
 	FOUND="no")
-fi
+
+
+dnl
+dnl check gethostbyname_r, if getaddrinfo is not available
+dnl
 if test "$FOUND" = "no"; then
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR("function gethostbyname_r not found.")
+	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
 fi
 
 
 dnl
-dnl check for __FUNCTION__ or __func__ macro
+dnl cCheck if spinlocks are available
 dnl
-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
+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 
-INCVAL="${LIBPREF}/include/libxml2"
-LIBVAL="${LIBPREF}/lib"
+dnl
 AC_ARG_WITH(libxml2_includes,
-      [  --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."))
+	[AS_HELP_STRING([--with-libxml2-includes=DIR], [libxml2 include directory])],
+	[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+	[INCVAL="yes"],
+	[INCVAL="no"])
 AC_ARG_WITH(libxml2_libraries,
-	[  --with-libxml2-libraries=DIR	libxml2 library directory],
-	[LIBVAL="$withval"])
-LDFLAGS="${LDFLAGS} -L${LIBVAL}"
+	[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"))
 AC_SEARCH_LIBS([xmlNewNode], [xml2], ,
-	AC_MSG_ERROR("libxml2 library not found in $LIBVAL."))
+	AC_MSG_ERROR("libxml2 library not found"))
 
 
 dnl
@@ -199,20 +209,19 @@ dnl Use curses. Deafult: yes
 dnl
 AC_MSG_CHECKING(whether to use curses)
 AC_ARG_ENABLE(curses,
-	[  --disable-curses		do not use curses (removes dependency from curses-library and makes executable smaller)],
-	[ USECURSES=$enableval ],
-	[ USECURSES=yes] )
+	[AS_HELP_STRING([--disable-curses], [do not use curses (removes dependency from curses-library)])],
+	[USECURSES=$enableval],
+	[USECURSES=yes] )
 AC_MSG_RESULT($USECURSES)
 if test "$USECURSES" = "yes"; then
 	INCVAL="${LIBPREF}/include"
 	LIBVAL="${LIBPREF}/lib"
 	AC_ARG_WITH(libcurses_includes,
-		[  --with-libcurses-includes=DIR	libcurses include directory],
+		[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,
-		[  --with-libcurses-libraries=DIR	libcurses library directory],
+		[AS_HELP_STRING([--with-libcurses-libraries=DIR], [libcurses library directory])],
 		[LIBVAL="$withval"])
 	LDFLAGS="${LDFLAGS} -L${LIBVAL}"
 	
@@ -233,7 +242,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]))
@@ -243,11 +252,11 @@ fi
 
 
 dnl
-dnl Use lib2par for par-checking. Deafult: no
+dnl Use libpar2 for par-checking. Deafult: no
 dnl
 AC_MSG_CHECKING(whether to include code for par-checking)
 AC_ARG_ENABLE(parcheck,
-	[  --enable-parcheck		include code for par-checking],
+	[AS_HELP_STRING([--disable-parcheck], [do not include par-check/-repair-support (removes dependency from libpar2- and libsigc-libraries)])],
 	[ ENABLEPARCHECK=$enableval ],
 	[ ENABLEPARCHECK=yes] )
 AC_MSG_RESULT($ENABLEPARCHECK)
@@ -256,23 +265,26 @@ if test "$ENABLEPARCHECK" = "yes"; then
 	dnl 
 	dnl checks for libsigc++ includes and libraries (required for libpar2).
 	dnl
-	INCVAL="${LIBPREF}/include/sigc++-2.0"
-	LIBVAL="${LIBPREF}/lib"
+
 	AC_ARG_WITH(libsigc_includes,
-		[  --with-libsigc-includes=DIR	libsigc++-2.0 include directory],
-		[INCVAL="$withval"])
-	
+		[AS_HELP_STRING([--with-libsigc-includes=DIR], [libsigc++-2.0 include directory])],
+		[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+		[INCVAL="yes"],
+		[INCVAL="no"])
 	AC_ARG_WITH(libsigc_libraries,
-		[  --with-libsigc-libraries=DIR	libsigc++-2.0 library directory],
-		[LIBVAL="$withval"])
-
-	LDFLAGS="${LDFLAGS} -L${LIBVAL}"
-	CPPFLAGS="${CPPFLAGS} -I${INCVAL} -I${LIBVAL}/sigc++-2.0/include"
-
-	AC_LANG_PUSH(C++)
+		[AS_HELP_STRING([--with-libsigc-libraries=DIR], [libsigc++-2.0 library directory])],
+		[LDFLAGS="${LDFLAGS} -L${withval}"]
+		[CPPFLAGS="${CPPFLAGS} -I${withval}/sigc++-2.0/include"]
+		[LIBVAL="yes"],
+		[LIBVAL="no"])
+	if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+		PKG_CHECK_MODULES(libsigc, sigc++-2.0,
+			[LIBS="${LIBS} $libsigc_LIBS"]
+			[CPPFLAGS="${CPPFLAGS} $libsigc_CFLAGS"])
+	fi
+	
 	AC_CHECK_HEADER(sigc++/type_traits.h,,
-		AC_MSG_ERROR("libsigc++-2.0 header files were not found in $INCVAL."))
-	AC_LANG_POP(C++)
+		AC_MSG_ERROR("libsigc++-2.0 header files not found"))
 
 	dnl
 	dnl checks for libpar2 includes and libraries.
@@ -280,53 +292,279 @@ if test "$ENABLEPARCHECK" = "yes"; then
 	INCVAL="${LIBPREF}/include"
 	LIBVAL="${LIBPREF}/lib"
 	AC_ARG_WITH(libpar2_includes,
-		[  --with-libpar2-includes=DIR	libpar2 include directory],
+		[AS_HELP_STRING([--with-libpar2-includes=DIR], [libpar2 include directory])],
 		[INCVAL="$withval"])
 
 	CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
 	
-	AC_LANG_PUSH(C++)
 	AC_CHECK_HEADER(libpar2/libpar2.h,,
-		AC_MSG_ERROR("libpar2 header files were not found in $INCVAL."))
-	AC_LANG_POP(C++)
+		AC_MSG_ERROR("libpar2 header files not found"))
 
 	AC_ARG_WITH(libpar2_libraries,
-		[  --with-libpar2-libraries=DIR	libpar2 library directory],
+		[AS_HELP_STRING([--with-libpar2-libraries=DIR], [libpar2 library directory])],
 		[LIBVAL="$withval"])
 
 	LDFLAGS="${LDFLAGS} -L${LIBVAL}"
 
-	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
+	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)
+	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 libpar2 version])],
+			[ PAR2PATCHCHECK=$enableval ],
+			[ PAR2PATCHCHECK=yes] )
+		if test "$PAR2PATCHCHECK" = "yes"; then
+			AC_ERROR([Your version of libpar2 doesn't include the recent bugfixes. Please update libpar2 to version 0.4 or newer (http://launchpad.net/libpar2). If you cannot install a newer version of 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 update is highly recommended!])
+		fi
+	fi
 
 else
 	AC_DEFINE([DISABLE_PARCHECK],1,[Define to 1 to disable smart par-verification and restoration])
 fi
 
 
+dnl
+dnl Use TLS/SSL. Deafult: yes
+dnl
+AC_MSG_CHECKING(whether to use TLS/SSL)
+AC_ARG_ENABLE(tls,
+	[AS_HELP_STRING([--disable-tls], [do not use TLS/SSL (removes dependency from TLS/SSL-libraries)])],
+	[ USETLS=$enableval ],
+	[ USETLS=yes] )
+AC_MSG_RESULT($USETLS)
+if test "$USETLS" = "yes"; then
+	AC_ARG_WITH(tlslib,
+		[AS_HELP_STRING([--with-tlslib=(OpenSSL, GnuTLS)], [TLS/SSL library to use])],
+		[TLSLIB="$withval"])
+	if test "$TLSLIB" != "GnuTLS" -a "$TLSLIB" != "OpenSSL" -a "$TLSLIB" != ""; then
+		AC_MSG_ERROR([Invalid argument for option --with-tlslib])
+	fi
+
+	if test "$TLSLIB" = "OpenSSL" -o "$TLSLIB" = ""; then
+		AC_ARG_WITH(openssl_includes,
+			[AS_HELP_STRING([--with-openssl-includes=DIR], [OpenSSL include directory])],
+			[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+			[INCVAL="yes"],
+			[INCVAL="no"])
+		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"],
+				FOUND=yes
+				FOUND=no)
+		fi
+
+		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)])
+		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),
+				FOUND=no)
+			if test "$FOUND" = "no" -a "$TLSLIB" = "OpenSSL"; then
+				AC_MSG_ERROR([Couldn't find OpenSSL library])
+			fi
+			if test "$FOUND" = "yes"; then
+				TLSLIB="OpenSSL"
+				AC_DEFINE([HAVE_OPENSSL],1,[Define to 1 to use OpenSSL library for TLS/SSL-support.])
+			fi
+		fi
+	fi
+
+	if test "$TLSLIB" = "GnuTLS" -o "$TLSLIB" = ""; then
+		INCVAL="${LIBPREF}/include"
+		LIBVAL="${LIBPREF}/lib"
+		AC_ARG_WITH(libgnutls_includes,
+			[AS_HELP_STRING([--with-libgnutls-includes=DIR], [GnuTLS include directory])],
+			[INCVAL="$withval"])
+		CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+		AC_ARG_WITH(libgnutls_libraries,
+			[AS_HELP_STRING([--with-libgnutls-libraries=DIR], [GnuTLS library directory])],
+			[LIBVAL="$withval"])
+		LDFLAGS="${LDFLAGS} -L${LIBVAL}"
+
+		AC_CHECK_HEADER(gnutls/gnutls.h,
+			FOUND=yes
+			TLSHEADERS=yes,
+			FOUND=no)
+		if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
+			AC_MSG_ERROR([Couldn't find GnuTLS headers (gnutls.h)])
+		fi
+		if test "$FOUND" = "yes"; then
+			AC_SEARCH_LIBS([gnutls_global_init], [gnutls],
+				AC_SEARCH_LIBS([gcry_control], [gnutls gcrypt],
+					FOUND=yes,
+					FOUND=no),
+				FOUND=no)
+			if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
+				AC_MSG_ERROR([Couldn't find GnuTLS library])
+			fi
+			if test "$FOUND" = "yes"; then
+				TLSLIB="GnuTLS"
+				AC_DEFINE([HAVE_LIBGNUTLS],1,[Define to 1 to use GnuTLS library for TLS/SSL-support.])
+			fi
+		fi
+	fi
+
+	if test "$TLSLIB" = ""; then
+		if test "$TLSHEADERS" = ""; then
+			AC_MSG_ERROR([Couldn't find neither OpenSSL nor GnuTLS headers (ssl.h or gnutls.h)])
+		else
+			AC_MSG_ERROR([Couldn't find neither OpenSSL nor GnuTLS library])
+		fi
+	fi
+else
+	AC_DEFINE([DISABLE_TLS],1,[Define to 1 to not use TLS/SSL])
+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 
 AC_MSG_CHECKING(whether to include all debugging code)
 AC_ARG_ENABLE(debug,
-	[  --enable-debug		enable debugging],
+	[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)
 
 
+if test "$ENABLEDEBUG" = "yes"; then
+
+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])
+fi
+
+
 dnl 
 dnl variadic macros
 dnl 
@@ -341,14 +579,39 @@ AC_COMPILE_IFELSE([
 	AC_MSG_RESULT([no]))
 
 
-dnl Substitute flags.
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
-AC_SUBST(CXXFLAGS)
-AC_SUBST(TAR)
-AC_SUBST(AR)
-AC_SUBST(ADDSRCS)
+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
 
 
 AC_CONFIG_FILES([Makefile])

daemon/connect/Connection.cpp

@@ -0,0 +1,870 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+// SKIP_DEFAULT_WINDOWS_HEADERS prevents the including of <windows.h>, which includes "winsock.h",
+// but we need "winsock2.h" here (they conflicts with each other)
+#define SKIP_DEFAULT_WINDOWS_HEADERS
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#ifdef WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <netdb.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/socket.h>
+#include <sys/time.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#endif
+
+#include "nzbget.h"
+#include "Connection.h"
+#include "Log.h"
+
+static const int CONNECTION_READBUFFER_SIZE = 1024;
+#ifndef HAVE_GETADDRINFO
+#ifndef HAVE_GETHOSTBYNAME_R
+Mutex* Connection::m_pMutexGetHostByName = NULL;
+#endif
+#endif
+
+
+void Connection::Init()
+{
+	debug("Initializing global connection data");
+
+#ifdef WIN32
+	WSADATA wsaData;
+	int err = WSAStartup(MAKEWORD(2, 0), &wsaData);
+	if (err != 0) 
+	{
+		error("Could not initialize socket library");
+		return;
+	}
+	if (LOBYTE(wsaData.wVersion) != 2 || HIBYTE( wsaData.wVersion ) != 0) 
+	{
+		error("Could not initialize socket library");
+		WSACleanup();
+		return; 
+	}
+#endif
+
+#ifndef DISABLE_TLS
+	TLSSocket::Init();
+#endif
+
+#ifndef HAVE_GETADDRINFO
+#ifndef HAVE_GETHOSTBYNAME_R
+	m_pMutexGetHostByName = new Mutex();
+#endif
+#endif
+}
+
+void Connection::Final()
+{
+	debug("Finalizing global connection data");
+
+#ifdef WIN32
+	WSACleanup();
+#endif
+
+#ifndef DISABLE_TLS
+	TLSSocket::Final();
+#endif
+
+#ifndef HAVE_GETADDRINFO
+#ifndef HAVE_GETHOSTBYNAME_R
+	delete m_pMutexGetHostByName;
+#endif
+#endif
+}
+
+Connection::Connection(const char* szHost, int iPort, bool bTLS)
+{
+	debug("Creating Connection");
+
+	m_szHost = NULL;
+	m_iPort = iPort;
+	m_bTLS = bTLS;
+	m_szCipher = NULL;
+	m_eStatus = csDisconnected;
+	m_iSocket = INVALID_SOCKET;
+	m_iBufAvail = 0;
+	m_iTimeout = 60;
+	m_bSuppressErrors = true;
+	m_szReadBuf = (char*)malloc(CONNECTION_READBUFFER_SIZE + 1);
+	m_iTotalBytesRead = 0;
+#ifndef DISABLE_TLS
+	m_pTLSSocket = NULL;
+	m_bTLSError = false;
+#endif
+
+	if (szHost)
+	{
+		m_szHost = strdup(szHost);
+	}
+}
+
+Connection::Connection(SOCKET iSocket, bool bTLS)
+{
+	debug("Creating Connection");
+
+	m_szHost			= NULL;
+	m_iPort				= 0;
+	m_bTLS				= bTLS;
+	m_szCipher			= NULL;
+	m_eStatus			= csConnected;
+	m_iSocket			= iSocket;
+	m_iBufAvail			= 0;
+	m_iTimeout			= 60;
+	m_bSuppressErrors	= true;
+	m_szReadBuf			= (char*)malloc(CONNECTION_READBUFFER_SIZE + 1);
+#ifndef DISABLE_TLS
+	m_pTLSSocket		= NULL;
+	m_bTLSError			= false;
+#endif
+}
+
+Connection::~Connection()
+{
+	debug("Destroying Connection");
+
+	Disconnect();
+
+	free(m_szHost);
+	free(m_szCipher);
+	free(m_szReadBuf);
+#ifndef DISABLE_TLS
+	delete m_pTLSSocket;
+#endif
+}
+
+void Connection::SetSuppressErrors(bool bSuppressErrors)
+{
+	m_bSuppressErrors = bSuppressErrors;
+#ifndef DISABLE_TLS
+	if (m_pTLSSocket)
+	{
+		m_pTLSSocket->SetSuppressErrors(bSuppressErrors);
+	}
+#endif
+}
+
+void Connection::SetCipher(const char* szCipher)
+{
+	free(m_szCipher);
+	m_szCipher = szCipher ? strdup(szCipher) : NULL;
+}
+
+bool Connection::Connect()
+{
+	debug("Connecting");
+
+	if (m_eStatus == csConnected)
+	{
+		return true;
+	}
+
+	bool bRes = DoConnect();
+
+	if (bRes)
+	{
+		m_eStatus = csConnected;
+	}
+	else
+	{
+		DoDisconnect();
+	}
+
+	return bRes;
+}
+
+bool Connection::Disconnect()
+{
+	debug("Disconnecting");
+
+	if (m_eStatus == csDisconnected)
+	{
+		return true;
+	}
+
+	bool bRes = DoDisconnect();
+
+	m_eStatus = csDisconnected;
+	m_iSocket = INVALID_SOCKET;
+	m_iBufAvail = 0;
+
+	return bRes;
+}
+
+bool Connection::Bind()
+{
+	debug("Binding");
+
+	if (m_eStatus == csListening)
+	{
+		return true;
+	}
+
+#ifdef HAVE_GETADDRINFO
+	struct addrinfo addr_hints, *addr_list, *addr;
+	char iPortStr[sizeof(int) * 4 + 1]; // is enough to hold any converted int
+	
+	memset(&addr_hints, 0, sizeof(addr_hints));
+	addr_hints.ai_family = AF_UNSPEC;    // Allow IPv4 or IPv6
+	addr_hints.ai_socktype = SOCK_STREAM,
+	addr_hints.ai_flags = AI_PASSIVE;    // For wildcard IP address
+	
+	sprintf(iPortStr, "%d", m_iPort);
+	
+	int res = getaddrinfo(m_szHost, iPortStr, &addr_hints, &addr_list);
+	if (res != 0)
+	{
+		error("Could not resolve hostname %s", m_szHost);
+		return false;
+	}
+	
+	m_iSocket = INVALID_SOCKET;
+	for (addr = addr_list; addr != NULL; addr = addr->ai_next)
+	{
+		m_iSocket = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+		if (m_iSocket != INVALID_SOCKET)
+		{
+			int opt = 1;
+			setsockopt(m_iSocket, SOL_SOCKET, SO_REUSEADDR, (char*)&opt, sizeof(opt));
+			res = bind(m_iSocket, addr->ai_addr, addr->ai_addrlen);
+			if (res != -1)
+			{
+				// Connection established
+				break;
+			}
+			// Connection failed
+			closesocket(m_iSocket);
+			m_iSocket = INVALID_SOCKET;
+		}
+	}
+	
+	freeaddrinfo(addr_list);
+	
+#else
+	
+	struct sockaddr_in	sSocketAddress;
+	memset(&sSocketAddress, 0, sizeof(sSocketAddress));
+	sSocketAddress.sin_family = AF_INET;
+	if (!m_szHost || strlen(m_szHost) == 0)
+	{
+		sSocketAddress.sin_addr.s_addr = htonl(INADDR_ANY);
+	}
+	else
+	{
+		sSocketAddress.sin_addr.s_addr = ResolveHostAddr(m_szHost);
+		if (sSocketAddress.sin_addr.s_addr == (unsigned int)-1)
+		{
+			return false;
+		}
+	}
+	sSocketAddress.sin_port = htons(m_iPort);
+	
+	m_iSocket = socket(PF_INET, SOCK_STREAM, 0);
+	if (m_iSocket == INVALID_SOCKET)
+	{
+		ReportError("Socket creation failed for %s", m_szHost, true, 0);
+		return false;
+	}
+	
+	int opt = 1;
+	setsockopt(m_iSocket, SOL_SOCKET, SO_REUSEADDR, (char*)&opt, sizeof(opt));
+	
+	int res = bind(m_iSocket, (struct sockaddr *) &sSocketAddress, sizeof(sSocketAddress));
+	if (res == -1)
+	{
+		// Connection failed
+		closesocket(m_iSocket);
+		m_iSocket = INVALID_SOCKET;
+	}
+#endif
+	
+	if (m_iSocket == INVALID_SOCKET)
+	{
+		ReportError("Binding socket failed for %s", m_szHost, true, 0);
+		return false;
+	}
+	
+	if (listen(m_iSocket, 100) < 0)
+	{
+		ReportError("Listen on socket failed for %s", m_szHost, true, 0);
+		return false;
+	}
+	
+	m_eStatus = csListening;
+
+	return true;
+}
+
+int Connection::WriteLine(const char* pBuffer)
+{
+	//debug("Connection::WriteLine");
+
+	if (m_eStatus != csConnected)
+	{
+		return -1;
+	}
+
+	int iRes = send(m_iSocket, pBuffer, strlen(pBuffer), 0);
+
+	return iRes;
+}
+
+bool Connection::Send(const char* pBuffer, int iSize)
+{
+	debug("Sending data");
+
+	if (m_eStatus != csConnected)
+	{
+		return false;
+	}
+
+	int iBytesSent = 0;
+	while (iBytesSent < iSize)
+	{
+		int iRes = send(m_iSocket, pBuffer + iBytesSent, iSize-iBytesSent, 0);
+		if (iRes <= 0)
+		{
+			return false;
+		}
+		iBytesSent += iRes;
+	}
+
+	return true;
+}
+
+char* Connection::ReadLine(char* pBuffer, int iSize, int* pBytesRead)
+{
+	if (m_eStatus != csConnected)
+	{
+		return NULL;
+	}
+
+	char* pBufPtr = pBuffer;
+	iSize--; // for trailing '0'
+	int iBytesRead = 0;
+	int iBufAvail = m_iBufAvail; // local variable is faster
+	char* szBufPtr = m_szBufPtr; // local variable is faster
+	while (iSize)
+	{
+		if (!iBufAvail)
+		{
+			iBufAvail = recv(m_iSocket, m_szReadBuf, CONNECTION_READBUFFER_SIZE, 0);
+			if (iBufAvail < 0)
+			{
+				ReportError("Could not receive data on socket", NULL, true, 0);
+				break;
+			}
+			else if (iBufAvail == 0)
+			{
+				break;
+			}
+			szBufPtr = m_szReadBuf;
+			m_szReadBuf[iBufAvail] = '\0';
+		}
+		
+		int len = 0;
+		char* p = (char*)memchr(szBufPtr, '\n', iBufAvail);
+		if (p)
+		{
+			len = (int)(p - szBufPtr + 1);
+		}
+		else
+		{
+			len = iBufAvail;
+		}
+		
+		if (len > iSize)
+		{
+			len = iSize;
+		}
+		
+		memcpy(pBufPtr, szBufPtr, len);
+		pBufPtr += len;
+		szBufPtr += len;
+		iBufAvail -= len;
+		iBytesRead += len;
+		iSize -= len;
+		
+		if (p)
+		{
+			break;
+		}
+	}
+	*pBufPtr = '\0';
+	
+	m_iBufAvail = iBufAvail > 0 ? iBufAvail : 0; // copy back to member
+	m_szBufPtr = szBufPtr; // copy back to member
+	
+	if (pBytesRead)
+	{
+		*pBytesRead = iBytesRead;
+	}
+
+	m_iTotalBytesRead += iBytesRead;
+
+	if (pBufPtr == pBuffer)
+	{
+		return NULL;
+	}
+	
+	return pBuffer;
+}
+
+Connection* Connection::Accept()
+{
+	debug("Accepting connection");
+
+	if (m_eStatus != csListening)
+	{
+		return NULL;
+	}
+
+	SOCKET iSocket = accept(m_iSocket, NULL, NULL);
+	if (iSocket == INVALID_SOCKET && m_eStatus != csCancelled)
+	{
+		ReportError("Could not accept connection", NULL, true, 0);
+	}
+	if (iSocket == INVALID_SOCKET)
+	{
+		return NULL;
+	}
+	
+	Connection* pCon = new Connection(iSocket, m_bTLS);
+
+	return pCon;
+}
+
+int Connection::TryRecv(char* pBuffer, int iSize)
+{
+	debug("Receiving data");
+
+	memset(pBuffer, 0, iSize);
+
+	int iReceived = recv(m_iSocket, pBuffer, iSize, 0);
+
+	if (iReceived < 0)
+	{
+		ReportError("Could not receive data on socket", NULL, true, 0);
+	}
+
+	return iReceived;
+}
+
+bool Connection::Recv(char * pBuffer, int iSize)
+{
+	debug("Receiving data (full buffer)");
+
+	memset(pBuffer, 0, iSize);
+
+	char* pBufPtr = (char*)pBuffer;
+	int NeedBytes = iSize;
+
+	if (m_iBufAvail > 0)
+	{
+		int len = iSize > m_iBufAvail ? m_iBufAvail : iSize;
+		memcpy(pBufPtr, m_szBufPtr, len);
+		pBufPtr += len;
+		m_szBufPtr += len;
+		m_iBufAvail -= len;
+		NeedBytes -= len;
+	}
+
+	// Read from the socket until nothing remains
+	while (NeedBytes > 0)
+	{
+		int iReceived = recv(m_iSocket, pBufPtr, NeedBytes, 0);
+		// Did the recv succeed?
+		if (iReceived <= 0)
+		{
+			ReportError("Could not receive data on socket", NULL, true, 0);
+			return false;
+		}
+		pBufPtr += iReceived;
+		NeedBytes -= iReceived;
+	}
+	return true;
+}
+
+bool Connection::DoConnect()
+{
+	debug("Do connecting");
+
+	m_iSocket = INVALID_SOCKET;
+	
+#ifdef HAVE_GETADDRINFO
+	struct addrinfo addr_hints, *addr_list, *addr;
+	char iPortStr[sizeof(int) * 4 + 1]; //is enough to hold any converted int
+
+	memset(&addr_hints, 0, sizeof(addr_hints));
+	addr_hints.ai_family = AF_UNSPEC;    /* Allow IPv4 or IPv6 */
+	addr_hints.ai_socktype = SOCK_STREAM,
+
+	sprintf(iPortStr, "%d", m_iPort);
+
+	int res = getaddrinfo(m_szHost, iPortStr, &addr_hints, &addr_list);
+	if (res != 0)
+	{
+		ReportError("Could not resolve hostname %s", m_szHost, true, 0);
+		return false;
+	}
+
+	for (addr = addr_list; addr != NULL; addr = addr->ai_next)
+	{
+		bool bLastAddr = !addr->ai_next;
+		m_iSocket = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
+		if (m_iSocket != INVALID_SOCKET)
+		{
+			res = connect(m_iSocket , addr->ai_addr, addr->ai_addrlen);
+			if (res != -1) 
+			{
+				// Connection established
+				break;
+			}
+			// Connection failed
+			if (bLastAddr)
+			{
+				ReportError("Connection to %s failed", m_szHost, true, 0);
+			}
+			closesocket(m_iSocket);
+			m_iSocket = INVALID_SOCKET;
+		}
+		else if (bLastAddr)
+		{
+			ReportError("Socket creation failed for %s", m_szHost, true, 0);
+		}
+	}
+
+	freeaddrinfo(addr_list);
+
+	if (m_iSocket == INVALID_SOCKET)
+	{
+		return false;
+	} 
+
+#else
+
+	struct sockaddr_in	sSocketAddress;
+	memset(&sSocketAddress, 0, sizeof(sSocketAddress));
+	sSocketAddress.sin_family = AF_INET;
+	sSocketAddress.sin_port = htons(m_iPort);
+	sSocketAddress.sin_addr.s_addr = ResolveHostAddr(m_szHost);
+	if (sSocketAddress.sin_addr.s_addr == (unsigned int)-1)
+	{
+		return false;
+	}
+
+	m_iSocket = socket(PF_INET, SOCK_STREAM, 0);
+	if (m_iSocket == INVALID_SOCKET)
+	{
+		ReportError("Socket creation failed for %s", m_szHost, true, 0);
+		return false;
+	}
+
+	int res = connect(m_iSocket , (struct sockaddr *) & sSocketAddress, sizeof(sSocketAddress));
+	if (res == -1)
+	{
+		ReportError("Connection to %s failed", m_szHost, true, 0);
+		closesocket(m_iSocket);
+		m_iSocket = INVALID_SOCKET;
+		return false;
+	}
+#endif
+
+#ifdef WIN32
+	int MSecVal = m_iTimeout * 1000;
+	int err = setsockopt(m_iSocket, SOL_SOCKET, SO_RCVTIMEO, (char*)&MSecVal, sizeof(MSecVal));
+#else
+	struct timeval TimeVal;
+	TimeVal.tv_sec = m_iTimeout;
+	TimeVal.tv_usec = 0;
+	int err = setsockopt(m_iSocket, SOL_SOCKET, SO_RCVTIMEO, (char*)&TimeVal, sizeof(TimeVal));
+#endif
+	if (err != 0)
+	{
+		ReportError("Socket initialization failed for %s", m_szHost, true, 0);
+	}
+
+#ifndef DISABLE_TLS
+	if (m_bTLS && !StartTLS(true, NULL, NULL))
+	{
+		return false;
+	}
+#endif
+
+	return true;
+}
+
+bool Connection::DoDisconnect()
+{
+	debug("Do disconnecting");
+
+	if (m_iSocket != INVALID_SOCKET)
+	{
+#ifndef DISABLE_TLS
+		CloseTLS();
+#endif
+		closesocket(m_iSocket);
+		m_iSocket = INVALID_SOCKET;
+	}
+
+	m_eStatus = csDisconnected;
+	return true;
+}
+
+void Connection::ReadBuffer(char** pBuffer, int *iBufLen)
+{
+	*iBufLen = m_iBufAvail;
+	*pBuffer = m_szBufPtr;
+	m_iBufAvail = 0;
+};
+
+void Connection::Cancel()
+{
+	debug("Cancelling connection");
+	if (m_iSocket != INVALID_SOCKET)
+	{
+		m_eStatus = csCancelled;
+		int r = shutdown(m_iSocket, SHUT_RDWR);
+		if (r == -1)
+		{
+			ReportError("Could not shutdown connection", NULL, true, 0);
+		}
+	}
+}
+
+void Connection::ReportError(const char* szMsgPrefix, const char* szMsgArg, bool PrintErrCode, int herrno)
+{
+#ifndef DISABLE_TLS
+	if (m_bTLSError)
+	{
+		// TLS-Error was already reported
+		m_bTLSError = false;
+		return;
+	}
+#endif
+
+	char szErrPrefix[1024];
+	snprintf(szErrPrefix, 1024, szMsgPrefix, szMsgArg);
+	szErrPrefix[1024-1] = '\0';
+	
+	if (PrintErrCode)
+	{
+#ifdef WIN32
+		int ErrCode = WSAGetLastError();
+		char szErrMsg[1024];
+		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, ErrCode, 0, szErrMsg, 1024, NULL);
+		szErrMsg[1024-1] = '\0';
+#else
+		const char *szErrMsg = NULL;
+		int ErrCode = herrno;
+		if (herrno == 0)
+		{
+			ErrCode = errno;
+			szErrMsg = strerror(ErrCode);
+		}
+		else
+		{
+			szErrMsg = hstrerror(ErrCode);
+		}
+#endif
+		if (m_bSuppressErrors)
+		{
+			debug("%s: ErrNo %i, %s", szErrPrefix, ErrCode, szErrMsg);
+		}
+		else
+		{
+			error("%s: ErrNo %i, %s", szErrPrefix, ErrCode, szErrMsg);
+		}
+	}
+	else
+	{
+		if (m_bSuppressErrors)
+		{
+			debug(szErrPrefix);
+		}
+		else
+		{
+			error(szErrPrefix);
+		}
+	}
+}
+
+#ifndef DISABLE_TLS
+bool Connection::StartTLS(bool bIsClient, const char* szCertFile, const char* szKeyFile)
+{
+	debug("Starting TLS");
+
+	delete m_pTLSSocket;
+	m_pTLSSocket = new TLSSocket(m_iSocket, bIsClient, szCertFile, szKeyFile, m_szCipher);
+	m_pTLSSocket->SetSuppressErrors(m_bSuppressErrors);
+
+	return m_pTLSSocket->Start();
+}
+
+void Connection::CloseTLS()
+{
+	if (m_pTLSSocket)
+	{
+		m_pTLSSocket->Close();
+		delete m_pTLSSocket;
+		m_pTLSSocket = NULL;
+	}
+}
+
+int Connection::recv(SOCKET s, char* buf, int len, int flags)
+{
+	int iReceived = 0;
+	
+	if (m_pTLSSocket)
+	{
+		m_bTLSError = false;
+		iReceived = m_pTLSSocket->Recv(buf, len);
+		if (iReceived < 0)
+		{
+			m_bTLSError = true;
+			return -1;
+		}
+	}
+	else
+	{
+		iReceived = ::recv(s, buf, len, flags);
+	}
+	return iReceived;
+}
+
+int Connection::send(SOCKET s, const char* buf, int len, int flags)
+{
+	int iSent = 0;
+
+	if (m_pTLSSocket)
+	{
+		m_bTLSError = false;
+		iSent = m_pTLSSocket->Send(buf, len);
+		if (iSent < 0)
+		{
+			m_bTLSError = true;
+			return -1;
+		}
+		return iSent;
+	}
+	else
+	{
+		iSent = ::send(s, buf, len, flags);
+		return iSent;
+	}
+}
+#endif
+
+#ifndef HAVE_GETADDRINFO
+unsigned int Connection::ResolveHostAddr(const char* szHost)
+{
+	unsigned int uaddr = inet_addr(szHost);
+	if (uaddr == (unsigned int)-1)
+	{
+		struct hostent* hinfo;
+		bool err = false;
+		int h_errnop = 0;
+#ifdef HAVE_GETHOSTBYNAME_R
+		struct hostent hinfobuf;
+		char strbuf[1024];
+#ifdef HAVE_GETHOSTBYNAME_R_6
+		err = gethostbyname_r(szHost, &hinfobuf, strbuf, sizeof(strbuf), &hinfo, &h_errnop);
+		err = err || (hinfo == NULL); // error on null hinfo (means 'no entry')
+#endif			
+#ifdef HAVE_GETHOSTBYNAME_R_5
+		hinfo = gethostbyname_r(szHost, &hinfobuf, strbuf, sizeof(strbuf), &h_errnop);
+		err = hinfo == NULL;
+#endif			
+#ifdef HAVE_GETHOSTBYNAME_R_3
+		//NOTE: gethostbyname_r with three parameters were not tested
+		struct hostent_data hinfo_data;
+		hinfo = gethostbyname_r((char*)szHost, (struct hostent*)hinfobuf, &hinfo_data);
+		err = hinfo == NULL;
+#endif			
+#else
+		m_pMutexGetHostByName->Lock();
+		hinfo = gethostbyname(szHost);
+		err = hinfo == NULL;
+#endif
+		if (err)
+		{
+#ifndef HAVE_GETHOSTBYNAME_R
+			m_pMutexGetHostByName->Unlock();
+#endif
+			ReportError("Could not resolve hostname %s", szHost, true, h_errnop);
+			return (unsigned int)-1;
+		}
+
+		memcpy(&uaddr, hinfo->h_addr_list[0], sizeof(uaddr));
+		
+#ifndef HAVE_GETHOSTBYNAME_R
+		m_pMutexGetHostByName->Unlock();
+#endif
+	}
+	return uaddr;
+}
+#endif
+
+const char* Connection::GetRemoteAddr()
+{
+	struct sockaddr_in PeerName;
+	int iPeerNameLength = sizeof(PeerName);
+	if (getpeername(m_iSocket, (struct sockaddr*)&PeerName, (SOCKLEN_T*) &iPeerNameLength) >= 0)
+	{
+#ifdef WIN32
+		 strncpy(m_szRemoteAddr, inet_ntoa(PeerName.sin_addr), sizeof(m_szRemoteAddr));
+#else
+		inet_ntop(AF_INET, &PeerName.sin_addr, m_szRemoteAddr, sizeof(m_szRemoteAddr));
+#endif
+	}
+	m_szRemoteAddr[sizeof(m_szRemoteAddr)-1] = '\0';
+	
+	return m_szRemoteAddr;
+}
+
+int Connection::FetchTotalBytesRead()
+{
+	int iTotal = m_iTotalBytesRead;
+	m_iTotalBytesRead = 0;
+	return iTotal;
+}

daemon/connect/Connection.h

@@ -0,0 +1,119 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#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
+
+class Connection
+{
+public:
+	enum EStatus
+	{
+		csConnected,
+		csDisconnected,
+		csListening,
+		csCancelled
+	};
+
+protected:
+	char*				m_szHost;
+	int					m_iPort;
+	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];
+	int					m_iTotalBytesRead;
+#ifndef DISABLE_TLS
+	TLSSocket*			m_pTLSSocket;
+	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
+#ifndef DISABLE_TLS
+	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);
+	virtual 			~Connection();
+	static void			Init();
+	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);
+	char*				ReadLine(char* pBuffer, int iSize, int* pBytesRead);
+	void				ReadBuffer(char** pBuffer, int *iBufLen);
+	int					WriteLine(const char* pBuffer);
+	Connection*			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);
+	void				SetTimeout(int iTimeout) { m_iTimeout = iTimeout; }
+	EStatus				GetStatus() { return m_eStatus; }
+	void				SetSuppressErrors(bool bSuppressErrors);
+	bool				GetSuppressErrors() { return m_bSuppressErrors; }
+	const char*			GetRemoteAddr();
+#ifndef DISABLE_TLS
+	bool				StartTLS(bool bIsClient, const char* szCertFile, const char* szKeyFile);
+#endif
+	int					FetchTotalBytesRead();
+};
+
+#endif

daemon/connect/TLS.cpp

@@ -0,0 +1,553 @@
+/*
+ *  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
+#define SKIP_DEFAULT_WINDOWS_HEADERS
+#include "win32.h"
+#endif
+
+#ifndef DISABLE_TLS
+
+#include <stdlib.h>
+#include <string.h>
+#ifdef WIN32
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#else
+#include <strings.h>
+#endif
+#include <ctype.h>
+#include <limits.h>
+#include <time.h>
+#include <errno.h>
+#include <list>
+
+#ifdef WIN32
+#include "nzbget.h"
+#endif
+
+#ifdef HAVE_LIBGNUTLS
+#include <gnutls/gnutls.h>
+#if GNUTLS_VERSION_NUMBER <= 0x020b00
+#define NEED_GCRYPT_LOCKING
+#endif
+#ifdef NEED_GCRYPT_LOCKING
+#include <gcrypt.h>
+#endif /* NEED_GCRYPT_LOCKING */
+#endif /* HAVE_LIBGNUTLS */
+#ifdef HAVE_OPENSSL
+#include <openssl/ssl.h>
+#include <openssl/err.h>
+#endif /* HAVE_OPENSSL */
+
+#ifndef WIN32
+#include "nzbget.h"
+#endif
+
+#include "TLS.h"
+#include "Thread.h"
+#include "Log.h"
+
+
+#ifdef HAVE_LIBGNUTLS
+#ifdef NEED_GCRYPT_LOCKING
+
+/**
+ * Mutexes for gcryptlib
+ */
+
+typedef std::list<Mutex*> Mutexes;
+Mutexes* g_pGCryptLibMutexes;
+
+static int gcry_mutex_init(void **priv)
+{
+	Mutex* pMutex = new Mutex();
+	g_pGCryptLibMutexes->push_back(pMutex);
+	*priv = pMutex;
+	return 0;
+}
+
+static int gcry_mutex_destroy(void **lock)
+{
+	Mutex* pMutex = ((Mutex*)*lock);
+	g_pGCryptLibMutexes->remove(pMutex);
+	delete pMutex;
+	return 0;
+}
+
+static int gcry_mutex_lock(void **lock)
+{
+	((Mutex*)*lock)->Lock();
+	return 0;
+}
+
+static int gcry_mutex_unlock(void **lock)
+{
+	((Mutex*)*lock)->Unlock();
+	return 0;
+}
+
+static struct gcry_thread_cbs gcry_threads_Mutex =
+{	GCRY_THREAD_OPTION_USER, NULL,
+	gcry_mutex_init, gcry_mutex_destroy,
+	gcry_mutex_lock, gcry_mutex_unlock,
+	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
+};
+
+#endif /* NEED_GCRYPT_LOCKING */
+#endif /* HAVE_LIBGNUTLS */
+
+
+#ifdef HAVE_OPENSSL
+
+/**
+ * Mutexes for OpenSSL
+ */
+
+Mutex* *g_pOpenSSLMutexes;
+
+static void openssl_locking(int mode, int n, const char *file, int line)
+{
+	Mutex* mutex = g_pOpenSSLMutexes[n];
+	if (mode & CRYPTO_LOCK)
+	{
+		mutex->Lock();
+	}
+	else
+	{
+		mutex->Unlock();
+	}
+}
+
+/*
+static unsigned long openssl_thread_id(void)
+{
+#ifdef WIN32
+	return (unsigned long)GetCurrentThreadId();
+#else
+	return (unsigned long)pthread_self();
+#endif
+}
+*/
+
+static struct CRYPTO_dynlock_value* openssl_dynlock_create(const char *file, int line)
+{
+	return (CRYPTO_dynlock_value*)new Mutex();
+}
+
+static void openssl_dynlock_destroy(struct CRYPTO_dynlock_value *l, const char *file, int line)
+{
+	Mutex* mutex = (Mutex*)l;
+	delete mutex;
+}
+
+static void openssl_dynlock_lock(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line)
+{
+	Mutex* mutex = (Mutex*)l;
+	if (mode & CRYPTO_LOCK)
+	{
+		mutex->Lock();
+	}
+	else
+	{
+		mutex->Unlock();
+	}
+}
+
+#endif /* HAVE_OPENSSL */
+
+
+void TLSSocket::Init()
+{
+	debug("Initializing TLS library");
+
+#ifdef HAVE_LIBGNUTLS
+#ifdef NEED_GCRYPT_LOCKING
+	g_pGCryptLibMutexes = new Mutexes();
+#endif /* NEED_GCRYPT_LOCKING */
+
+	int error_code;
+
+#ifdef NEED_GCRYPT_LOCKING
+	error_code = gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_Mutex);
+	if (error_code != 0)
+	{
+		error("Could not initialize libcrypt");
+		return;
+	}
+#endif /* NEED_GCRYPT_LOCKING */
+
+	error_code = gnutls_global_init();
+	if (error_code != 0)
+	{
+		error("Could not initialize libgnutls");
+		return;
+	}
+
+#endif /* HAVE_LIBGNUTLS */
+
+#ifdef HAVE_OPENSSL
+	int iMaxMutexes = CRYPTO_num_locks();
+	g_pOpenSSLMutexes = (Mutex**)malloc(sizeof(Mutex*)*iMaxMutexes);
+	for (int i=0; i < iMaxMutexes; i++)
+	{
+		g_pOpenSSLMutexes[i] = new Mutex();
+	}
+	
+	SSL_load_error_strings();
+	SSL_library_init();
+	OpenSSL_add_all_algorithms();
+
+	CRYPTO_set_locking_callback(openssl_locking);
+	//CRYPTO_set_id_callback(openssl_thread_id);
+	CRYPTO_set_dynlock_create_callback(openssl_dynlock_create);
+	CRYPTO_set_dynlock_destroy_callback(openssl_dynlock_destroy);
+	CRYPTO_set_dynlock_lock_callback(openssl_dynlock_lock);
+	
+#endif /* HAVE_OPENSSL */
+}
+
+void TLSSocket::Final()
+{
+	debug("Finalizing TLS library");
+
+#ifdef HAVE_LIBGNUTLS
+	gnutls_global_deinit();
+
+#ifdef NEED_GCRYPT_LOCKING
+	// fixing memory leak in gcryptlib
+	for (Mutexes::iterator it = g_pGCryptLibMutexes->begin(); it != g_pGCryptLibMutexes->end(); it++)
+	{
+		delete *it;
+	}
+	delete g_pGCryptLibMutexes;
+#endif /* NEED_GCRYPT_LOCKING */
+#endif /* HAVE_LIBGNUTLS */
+
+#ifdef HAVE_OPENSSL
+	int iMaxMutexes = CRYPTO_num_locks();
+	for (int i=0; i < iMaxMutexes; i++)
+	{
+		delete g_pOpenSSLMutexes[i];
+	}
+	free(g_pOpenSSLMutexes);
+#endif /* HAVE_OPENSSL */
+}
+
+TLSSocket::TLSSocket(SOCKET iSocket, bool bIsClient, const char* szCertFile, const char* szKeyFile, const char* szCipher)
+{
+	m_iSocket = iSocket;
+	m_bIsClient = bIsClient;
+	m_szCertFile = szCertFile ? strdup(szCertFile) : NULL;
+	m_szKeyFile = szKeyFile ? strdup(szKeyFile) : NULL;
+	m_szCipher = szCipher && strlen(szCipher) > 0 ? strdup(szCipher) : NULL;
+	m_pContext = NULL;
+	m_pSession = NULL;
+	m_bSuppressErrors = false;
+	m_bInitialized = false;
+	m_bConnected = false;
+}
+
+TLSSocket::~TLSSocket()
+{
+	free(m_szCertFile);
+	free(m_szKeyFile);
+	free(m_szCipher);
+	Close();
+}
+
+void TLSSocket::ReportError(const char* szErrMsg)
+{
+#ifdef HAVE_LIBGNUTLS
+	const char* errstr = gnutls_strerror(m_iRetCode);
+	if (m_bSuppressErrors)
+	{
+		debug("%s: %s", szErrMsg, errstr);
+	}
+	else
+	{
+		error("%s: %s", szErrMsg, errstr);
+	}
+#endif /* HAVE_LIBGNUTLS */
+
+#ifdef HAVE_OPENSSL
+	int errcode;
+	do
+	{
+		errcode = ERR_get_error();
+
+		char errstr[1024];
+		ERR_error_string_n(errcode, errstr, sizeof(errstr));
+		errstr[1024-1] = '\0';
+		
+		if (m_bSuppressErrors)
+		{
+			debug("%s: %s", szErrMsg, errstr);
+		}
+		else if (errcode != 0)
+		{
+			error("%s: %s", szErrMsg, errstr);
+		}
+		else
+		{
+			error("%s", szErrMsg);
+		}
+	} while (errcode);
+#endif /* HAVE_OPENSSL */
+}
+
+bool TLSSocket::Start()
+{
+#ifdef HAVE_LIBGNUTLS
+	gnutls_certificate_credentials_t cred;
+	m_iRetCode = gnutls_certificate_allocate_credentials(&cred);
+	if (m_iRetCode != 0)
+	{
+		ReportError("Could not create TLS context");
+		return false;
+	}
+
+	m_pContext = cred;
+
+	if (m_szCertFile && m_szKeyFile)
+	{
+		m_iRetCode = gnutls_certificate_set_x509_key_file((gnutls_certificate_credentials_t)m_pContext,
+			m_szCertFile, m_szKeyFile, GNUTLS_X509_FMT_PEM);
+		if (m_iRetCode != 0)
+		{
+			ReportError("Could not load certificate or key file");
+			Close();
+			return false;
+		}
+	}
+
+	gnutls_session_t sess;
+	m_iRetCode = gnutls_init(&sess, m_bIsClient ? GNUTLS_CLIENT : GNUTLS_SERVER);
+	if (m_iRetCode != 0)
+	{
+		ReportError("Could not create TLS session");
+		Close();
+		return false;
+	}
+
+	m_pSession = sess;
+
+	m_bInitialized = true;
+
+	const char* szPriority = m_szCipher ? m_szCipher : "NORMAL";
+
+	m_iRetCode = gnutls_priority_set_direct((gnutls_session_t)m_pSession, szPriority, NULL);
+	if (m_iRetCode != 0)
+	{
+		ReportError("Could not select cipher for TLS session");
+		Close();
+		return false;
+	}
+
+	m_iRetCode = gnutls_credentials_set((gnutls_session_t)m_pSession, GNUTLS_CRD_CERTIFICATE, 
+		(gnutls_certificate_credentials_t*)m_pContext);
+	if (m_iRetCode != 0)
+	{
+		ReportError("Could not initialize TLS session");
+		Close();
+		return false;
+	}
+
+	gnutls_transport_set_ptr((gnutls_session_t)m_pSession, (gnutls_transport_ptr_t)(size_t)m_iSocket);
+
+	m_iRetCode = gnutls_handshake((gnutls_session_t)m_pSession);
+	if (m_iRetCode != 0)
+	{
+		ReportError("TLS handshake failed");
+		Close();
+		return false;
+	}
+
+	m_bConnected = true;
+	return true;
+#endif /* HAVE_LIBGNUTLS */
+
+#ifdef HAVE_OPENSSL
+	m_pContext = SSL_CTX_new(SSLv23_method());
+
+	if (!m_pContext)
+	{
+		ReportError("Could not create TLS context");
+		return false;
+	}
+
+	if (m_szCertFile && m_szKeyFile)
+	{
+		if (SSL_CTX_use_certificate_file((SSL_CTX*)m_pContext, m_szCertFile, SSL_FILETYPE_PEM) != 1)
+		{
+			ReportError("Could not load certificate file");
+			Close();
+			return false;
+		}
+		if (SSL_CTX_use_PrivateKey_file((SSL_CTX*)m_pContext, m_szKeyFile, SSL_FILETYPE_PEM) != 1)
+		{
+			ReportError("Could not load key file");
+			Close();
+			return false;
+		}
+	}
+	
+	m_pSession = SSL_new((SSL_CTX*)m_pContext);
+	if (!m_pSession)
+	{
+		ReportError("Could not create TLS session");
+		Close();
+		return false;
+	}
+
+	if (m_szCipher && !SSL_set_cipher_list((SSL*)m_pSession, m_szCipher))
+	{
+		ReportError("Could not select cipher for TLS");
+		Close();
+		return false;
+	}
+
+	if (!SSL_set_fd((SSL*)m_pSession, m_iSocket))
+	{
+		ReportError("Could not set the file descriptor for TLS");
+		Close();
+		return false;
+	}
+
+	int error_code = m_bIsClient ? SSL_connect((SSL*)m_pSession) : SSL_accept((SSL*)m_pSession);
+	if (error_code < 1)
+	{
+		ReportError("TLS handshake failed");
+		Close();
+		return false;
+	}
+
+	m_bConnected = true;
+	return true;
+#endif /* HAVE_OPENSSL */
+}
+
+void TLSSocket::Close()
+{
+	if (m_pSession)
+	{
+#ifdef HAVE_LIBGNUTLS
+		if (m_bConnected)
+		{
+			gnutls_bye((gnutls_session_t)m_pSession, GNUTLS_SHUT_WR);
+		}
+		if (m_bInitialized)
+		{
+			gnutls_deinit((gnutls_session_t)m_pSession);
+		}
+#endif /* HAVE_LIBGNUTLS */
+
+#ifdef HAVE_OPENSSL
+		if (m_bConnected)
+		{
+			SSL_shutdown((SSL*)m_pSession);
+		}
+		SSL_free((SSL*)m_pSession);
+#endif /* HAVE_OPENSSL */
+
+		m_pSession = NULL;
+	}
+
+	if (m_pContext)
+	{
+#ifdef HAVE_LIBGNUTLS
+		gnutls_certificate_free_credentials((gnutls_certificate_credentials_t)m_pContext);
+#endif /* HAVE_LIBGNUTLS */
+
+#ifdef HAVE_OPENSSL
+		SSL_CTX_free((SSL_CTX*)m_pContext);
+#endif /* HAVE_OPENSSL */
+
+		m_pContext = NULL;
+	}
+}
+
+int TLSSocket::Send(const char* pBuffer, int iSize)
+{
+	int ret;
+
+#ifdef HAVE_LIBGNUTLS
+	ret = gnutls_record_send((gnutls_session_t)m_pSession, pBuffer, iSize);
+#endif /* HAVE_LIBGNUTLS */
+
+#ifdef HAVE_OPENSSL
+	ret = SSL_write((SSL*)m_pSession, pBuffer, iSize);
+#endif /* HAVE_OPENSSL */
+
+	if (ret < 0)
+	{
+#ifdef HAVE_OPENSSL
+		if (ERR_peek_error() == 0)
+		{
+			ReportError("Could not write to TLS-Socket: Connection closed by remote host");
+		}
+		else
+#endif /* HAVE_OPENSSL */
+		ReportError("Could not write to TLS-Socket");
+		return -1;
+	}
+
+	return ret;
+}
+
+int TLSSocket::Recv(char* pBuffer, int iSize)
+{
+	int ret;
+
+#ifdef HAVE_LIBGNUTLS
+	ret = gnutls_record_recv((gnutls_session_t)m_pSession, pBuffer, iSize);
+#endif /* HAVE_LIBGNUTLS */
+
+#ifdef HAVE_OPENSSL
+	ret = SSL_read((SSL*)m_pSession, pBuffer, iSize);
+#endif /* HAVE_OPENSSL */
+
+	if (ret < 0)
+	{
+#ifdef HAVE_OPENSSL
+		if (ERR_peek_error() == 0)
+		{
+			ReportError("Could not read from TLS-Socket: Connection closed by remote host");
+		}
+		else
+#endif /* HAVE_OPENSSL */
+		{
+			ReportError("Could not read from TLS-Socket");
+		}
+		return -1;
+	}
+
+	return ret;
+}
+
+#endif

daemon/connect/TLS.h

@@ -0,0 +1,62 @@
+/*
+ *  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$
+ *
+ */
+
+#ifndef TLS_H
+#define TLS_H
+
+#ifndef DISABLE_TLS
+
+class TLSSocket
+{
+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;
+
+	// using "void*" to prevent the including of GnuTLS/OpenSSL header files into TLS.h
+	void*				m_pContext;
+	void*				m_pSession;
+
+	void				ReportError(const char* szErrMsg);
+
+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; }
+};
+
+#endif
+#endif

daemon/connect/WebDownloader.cpp

@@ -0,0 +1,730 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2012-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#ifdef WIN32
+#include <direct.h>
+#else
+#include <unistd.h>
+#include <sys/time.h>
+#endif
+#include <sys/stat.h>
+#include <errno.h>
+
+#include "nzbget.h"
+#include "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;
+	m_bForce = false;
+	m_bRetry = true;
+	SetLastUpdateTimeNow();
+}
+
+WebDownloader::~WebDownloader()
+{
+	debug("Destroying WebDownloader");
+
+	free(m_szURL);
+	free(m_szInfoName);
+	free(m_szOutputFilename);
+	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)
+{
+	free(m_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;
+	if (!m_bRetry)
+	{
+		iRemainedDownloadRetries = 1;
+		iRemainedConnectRetries = 1;
+	}
+
+	m_iRedirects = 0;
+	EStatus Status = adFailed;
+
+	while (!IsStopped() && iRemainedDownloadRetries > 0 && iRemainedConnectRetries > 0)
+	{
+		SetLastUpdateTimeNow();
+
+		Status = Download();
+
+		if ((((Status == adFailed) && (iRemainedDownloadRetries > 1)) ||
+			((Status == adConnectError) && (iRemainedConnectRetries > 1)))
+			&& !IsStopped() && !(!m_bForce && g_pOptions->GetPauseDownload()))
+		{
+			detail("Waiting %i sec to retry", g_pOptions->GetRetryInterval());
+			int msec = 0;
+			while (!IsStopped() && (msec < g_pOptions->GetRetryInterval() * 1000) && 
+				!(!m_bForce && g_pOptions->GetPauseDownload()))
+			{
+				usleep(100 * 1000);
+				msec += 100;
+			}
+		}
+
+		if (IsStopped() || (!m_bForce && g_pOptions->GetPauseDownload()))
+		{
+			Status = adRetry;
+			break;
+		}
+
+		if (Status == adFinished || Status == adFatalError || Status == adNotFound)
+		{
+			break;
+		}
+
+		if (Status == adRedirect)
+		{
+			m_iRedirects++;
+			if (m_iRedirects > 5)
+			{
+				warn("Too many redirects for %s", m_szInfoName);
+				Status = adFailed;
+				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);
+
+	if ((!strcasecmp(pUrl->GetProtocol(), "http") && (pUrl->GetPort() == 80 || pUrl->GetPort() == 0)) ||
+		(!strcasecmp(pUrl->GetProtocol(), "https") && (pUrl->GetPort() == 443 || pUrl->GetPort() == 0)))
+	{
+		snprintf(tmp, 1024, "Host: %s\r\n", pUrl->GetHost());
+	}
+	else
+	{
+		snprintf(tmp, 1024, "Host: %s:%i\r\n", pUrl->GetHost(), pUrl->GetPort());
+	}
+	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;
+	m_bRedirecting = false;
+	m_bRedirected = 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;
+		}
+
+		Util::TrimRight(line);
+		ProcessHeader(line);
+
+		if (m_bRedirected)
+		{
+			Status = adRedirect;
+			break;
+		}
+	}
+
+	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 && iWrittenLen > 0)
+			{
+				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
+	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, "301", 3) || !strncmp(szHTTPResponse, "302", 3))
+	{
+		m_bRedirecting = true;
+		return adRunning;
+	}
+	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 (!strncasecmp(szLine, "Content-Length: ", 16))
+	{
+		m_iContentLen = atoi(szLine + 16);
+		m_bConfirmedLength = true;
+	}
+	else if (!strncasecmp(szLine, "Content-Encoding: gzip", 22))
+	{
+		m_bGZip = true;
+	}
+	else if (!strncasecmp(szLine, "Content-Disposition: ", 21))
+	{
+		ParseFilename(szLine);
+	}
+	else if (m_bRedirecting && !strncasecmp(szLine, "Location: ", 10))
+	{
+		ParseRedirect(szLine + 10);
+		m_bRedirected = true;
+	}
+}
+
+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);
+
+	free(m_szOriginalFilename);
+	m_szOriginalFilename = strdup(Util::BaseFileName(fname));
+
+	debug("OriginalFilename: %s", m_szOriginalFilename);
+}
+
+void WebDownloader::ParseRedirect(const char* szLocation)
+{
+	const char* szNewURL = szLocation;
+	char szUrlBuf[1024];
+	URL newUrl(szNewURL);
+	if (!newUrl.IsValid())
+	{
+		// relative address
+		URL oldUrl(m_szURL);
+		if (oldUrl.GetPort() > 0)
+		{
+			snprintf(szUrlBuf, 1024, "%s://%s:%i%s", oldUrl.GetProtocol(), oldUrl.GetHost(), oldUrl.GetPort(), szNewURL);
+		}
+		else
+		{
+			snprintf(szUrlBuf, 1024, "%s://%s%s", oldUrl.GetProtocol(), oldUrl.GetHost(), szNewURL);
+		}
+		szUrlBuf[1024-1] = '\0';
+		szNewURL = szUrlBuf;
+	}
+	detail("URL %s redirected to %s", m_szURL, szNewURL);
+	SetURL(szNewURL);
+}
+
+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, FOPEN_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
+
+	info("      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();
+	}
+}

daemon/connect/WebDownloader.h

@@ -0,0 +1,112 @@
+/*
+ *  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$
+ *
+ */
+
+
+#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,
+		adRedirect,
+		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_bForce;
+	bool				m_bRedirecting;
+	bool				m_bRedirected;
+	int					m_iRedirects;
+	bool				m_bGZip;
+	bool				m_bRetry;
+#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				CreateConnection(URL *pUrl);
+	void				ParseFilename(const char* szContentDisposition);
+	void				SendHeaders(URL *pUrl);
+	EStatus				DownloadHeaders();
+	EStatus				DownloadBody();
+	void				ParseRedirect(const char* szLocation); 
+
+protected:
+	virtual void		ProcessHeader(const char* szLine);
+
+public:
+						WebDownloader();
+	virtual				~WebDownloader();
+	EStatus				GetStatus() { return m_eStatus; }
+	virtual void		Run();
+	virtual void		Stop();
+	EStatus				Download();
+	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				SetForce(bool bForce) { m_bForce = bForce; }
+	void				SetRetry(bool bRetry) { m_bRetry = bRetry; }
+
+	void				LogDebugInfo();
+};
+
+#endif

daemon/feed/FeedCoordinator.cpp

@@ -0,0 +1,758 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#ifndef WIN32
+#include <unistd.h>
+#include <sys/time.h>
+#endif
+
+#include "nzbget.h"
+#include "FeedCoordinator.h"
+#include "Options.h"
+#include "WebDownloader.h"
+#include "Util.h"
+#include "FeedFile.h"
+#include "FeedFilter.h"
+#include "DiskState.h"
+
+extern Options* g_pOptions;
+extern DiskState* g_pDiskState;
+
+FeedCoordinator::FeedCacheItem::FeedCacheItem(const char* szUrl, int iCacheTimeSec,const char* szCacheId,
+	time_t tLastUsage, FeedItemInfos* pFeedItemInfos)
+{
+	m_szUrl = strdup(szUrl);
+	m_iCacheTimeSec = iCacheTimeSec;
+	m_szCacheId = strdup(szCacheId);
+	m_tLastUsage = tLastUsage;
+	m_pFeedItemInfos = pFeedItemInfos;
+	m_pFeedItemInfos->Retain();
+}
+
+FeedCoordinator::FeedCacheItem::~FeedCacheItem()
+{
+	free(m_szUrl);
+	free(m_szCacheId);
+	m_pFeedItemInfos->Release();
+}
+
+FeedCoordinator::FeedCoordinator()
+{
+	debug("Creating FeedCoordinator");
+	m_bForce = false;
+	m_bSave = false;
+
+	g_pLog->RegisterDebuggable(this);
+
+	m_DownloadQueueObserver.m_pOwner = this;
+	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+	pDownloadQueue->Attach(&m_DownloadQueueObserver);
+	DownloadQueue::Unlock();
+}
+
+FeedCoordinator::~FeedCoordinator()
+{
+	debug("Destroying FeedCoordinator");
+	// Cleanup
+
+	g_pLog->UnregisterDebuggable(this);
+
+	debug("Deleting FeedDownloaders");
+	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
+	{
+		delete *it;
+	}
+	m_ActiveDownloads.clear();
+
+	debug("Deleting Feeds");
+	for (Feeds::iterator it = m_Feeds.begin(); it != m_Feeds.end(); it++)
+	{
+		delete *it;
+	}
+	m_Feeds.clear();
+	
+	debug("Deleting FeedCache");
+	for (FeedCache::iterator it = m_FeedCache.begin(); it != m_FeedCache.end(); it++)
+	{
+		delete *it;
+	}
+	m_FeedCache.clear();
+
+	debug("FeedCoordinator destroyed");
+}
+
+void FeedCoordinator::AddFeed(FeedInfo* pFeedInfo)
+{
+	m_Feeds.push_back(pFeedInfo);
+}
+
+void FeedCoordinator::Run()
+{
+	debug("Entering FeedCoordinator-loop");
+
+	while (!DownloadQueue::IsLoaded())
+	{
+		usleep(20 * 1000);
+	}
+
+	if (g_pOptions->GetServerMode() && g_pOptions->GetSaveQueue() && g_pOptions->GetReloadQueue())
+	{
+		m_mutexDownloads.Lock();
+		g_pDiskState->LoadFeeds(&m_Feeds, &m_FeedHistory);
+		m_mutexDownloads.Unlock();
+	}
+
+	int iSleepInterval = 100;
+	int iUpdateCounter = 0;
+	int iCleanupCounter = 60000;
+
+	while (!IsStopped())
+	{
+		usleep(iSleepInterval * 1000);
+
+		iUpdateCounter += iSleepInterval;
+		if (iUpdateCounter >= 1000)
+		{
+			// this code should not be called too often, once per second is OK
+
+			if (!g_pOptions->GetPauseDownload() || m_bForce || g_pOptions->GetUrlForce())
+			{
+				m_mutexDownloads.Lock();
+				time_t tCurrent = time(NULL);
+				if ((int)m_ActiveDownloads.size() < g_pOptions->GetUrlConnections())
+				{
+					m_bForce = false;
+					// check feed list and update feeds
+					for (Feeds::iterator it = m_Feeds.begin(); it != m_Feeds.end(); it++)
+					{
+						FeedInfo* pFeedInfo = *it;
+						if (((pFeedInfo->GetInterval() > 0 &&
+							(tCurrent - pFeedInfo->GetLastUpdate() >= pFeedInfo->GetInterval() * 60 ||
+							 tCurrent < pFeedInfo->GetLastUpdate())) ||
+							pFeedInfo->GetFetch()) &&
+							pFeedInfo->GetStatus() != FeedInfo::fsRunning)
+						{
+							StartFeedDownload(pFeedInfo, pFeedInfo->GetFetch());
+						}
+						else if (pFeedInfo->GetFetch())
+						{
+							m_bForce = true;
+						}
+					}
+				}
+				m_mutexDownloads.Unlock();
+			}
+
+			CheckSaveFeeds();
+			ResetHangingDownloads();
+			iUpdateCounter = 0;
+		}
+
+		iCleanupCounter += iSleepInterval;
+		if (iCleanupCounter >= 60000)
+		{
+			// clean up feed history once a minute
+			CleanupHistory();
+			CleanupCache();
+			CheckSaveFeeds();
+			iCleanupCounter = 0;
+		}
+	}
+
+	// waiting for downloads
+	debug("FeedCoordinator: waiting for Downloads to complete");
+	bool completed = false;
+	while (!completed)
+	{
+		m_mutexDownloads.Lock();
+		completed = m_ActiveDownloads.size() == 0;
+		m_mutexDownloads.Unlock();
+		CheckSaveFeeds();
+		usleep(100 * 1000);
+		ResetHangingDownloads();
+	}
+	debug("FeedCoordinator: Downloads are completed");
+
+	debug("Exiting FeedCoordinator-loop");
+}
+
+void FeedCoordinator::Stop()
+{
+	Thread::Stop();
+
+	debug("Stopping UrlDownloads");
+	m_mutexDownloads.Lock();
+	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
+	{
+		(*it)->Stop();
+	}
+	m_mutexDownloads.Unlock();
+	debug("UrlDownloads are notified");
+}
+
+void FeedCoordinator::ResetHangingDownloads()
+{
+	const int TimeOut = g_pOptions->GetTerminateTimeout();
+	if (TimeOut == 0)
+	{
+		return;
+	}
+
+	m_mutexDownloads.Lock();
+	time_t tm = ::time(NULL);
+
+	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end();)
+	{
+		FeedDownloader* pFeedDownloader = *it;
+		if (tm - pFeedDownloader->GetLastUpdateTime() > TimeOut &&
+		   pFeedDownloader->GetStatus() == FeedDownloader::adRunning)
+		{
+			debug("Terminating hanging download %s", pFeedDownloader->GetInfoName());
+			if (pFeedDownloader->Terminate())
+			{
+				error("Terminated hanging download %s", pFeedDownloader->GetInfoName());
+				pFeedDownloader->GetFeedInfo()->SetStatus(FeedInfo::fsUndefined);
+			}
+			else
+			{
+				error("Could not terminate hanging download %s", pFeedDownloader->GetInfoName());
+			}
+			m_ActiveDownloads.erase(it);
+			// it's not safe to destroy pFeedDownloader, because the state of object is unknown
+			delete pFeedDownloader;
+			it = m_ActiveDownloads.begin();
+			continue;
+		}
+		it++;
+	}                                              
+
+	m_mutexDownloads.Unlock();
+}
+
+void FeedCoordinator::LogDebugInfo()
+{
+	info("   ---------- FeedCoordinator");
+
+	m_mutexDownloads.Lock();
+	info("    Active Downloads: %i", m_ActiveDownloads.size());
+	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
+	{
+		FeedDownloader* pFeedDownloader = *it;
+		pFeedDownloader->LogDebugInfo();
+	}
+	m_mutexDownloads.Unlock();
+}
+
+void FeedCoordinator::StartFeedDownload(FeedInfo* pFeedInfo, bool bForce)
+{
+	debug("Starting new FeedDownloader for %s", pFeedInfo->GetName());
+
+	FeedDownloader* pFeedDownloader = new FeedDownloader();
+	pFeedDownloader->SetAutoDestroy(true);
+	pFeedDownloader->Attach(this);
+	pFeedDownloader->SetFeedInfo(pFeedInfo);
+	pFeedDownloader->SetURL(pFeedInfo->GetUrl());
+	if (strlen(pFeedInfo->GetName()) > 0)
+	{
+		pFeedDownloader->SetInfoName(pFeedInfo->GetName());
+	}
+	else
+	{
+		char szUrlName[1024];
+		NZBInfo::MakeNiceUrlName(pFeedInfo->GetUrl(), "", szUrlName, sizeof(szUrlName));
+		pFeedDownloader->SetInfoName(szUrlName);
+	}
+	pFeedDownloader->SetForce(bForce || g_pOptions->GetUrlForce());
+
+	char tmp[1024];
+
+	if (pFeedInfo->GetID() > 0)
+	{
+		snprintf(tmp, 1024, "%sfeed-%i.tmp", g_pOptions->GetTempDir(), pFeedInfo->GetID());
+	}
+	else
+	{
+		snprintf(tmp, 1024, "%sfeed-%i-%i.tmp", g_pOptions->GetTempDir(), (int)time(NULL), rand());
+	}
+
+	tmp[1024-1] = '\0';
+	pFeedDownloader->SetOutputFilename(tmp);
+
+	pFeedInfo->SetStatus(FeedInfo::fsRunning);
+	pFeedInfo->SetForce(bForce);
+	pFeedInfo->SetFetch(false);
+
+	m_ActiveDownloads.push_back(pFeedDownloader);
+	pFeedDownloader->Start();
+}
+
+void FeedCoordinator::Update(Subject* pCaller, void* pAspect)
+{
+	debug("Notification from FeedDownloader received");
+
+	FeedDownloader* pFeedDownloader = (FeedDownloader*) pCaller;
+	if ((pFeedDownloader->GetStatus() == WebDownloader::adFinished) ||
+		(pFeedDownloader->GetStatus() == WebDownloader::adFailed) ||
+		(pFeedDownloader->GetStatus() == WebDownloader::adRetry))
+	{
+		FeedCompleted(pFeedDownloader);
+	}
+}
+
+void FeedCoordinator::FeedCompleted(FeedDownloader* pFeedDownloader)
+{
+	debug("Feed downloaded");
+
+	FeedInfo* pFeedInfo = pFeedDownloader->GetFeedInfo();
+	bool bStatusOK = pFeedDownloader->GetStatus() == WebDownloader::adFinished;
+	if (bStatusOK)
+	{
+		pFeedInfo->SetOutputFilename(pFeedDownloader->GetOutputFilename());
+	}
+
+	// delete Download from Queue
+	m_mutexDownloads.Lock();
+	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
+	{
+		FeedDownloader* pa = *it;
+		if (pa == pFeedDownloader)
+		{
+			m_ActiveDownloads.erase(it);
+			break;
+		}
+	}
+	m_mutexDownloads.Unlock();
+
+	if (bStatusOK)
+	{
+		if (!pFeedInfo->GetPreview())
+		{
+			FeedFile* pFeedFile = FeedFile::Create(pFeedInfo->GetOutputFilename());
+			remove(pFeedInfo->GetOutputFilename());
+
+			NZBList addedNZBs;
+
+			m_mutexDownloads.Lock();
+			if (pFeedFile)
+			{
+				ProcessFeed(pFeedInfo, pFeedFile->GetFeedItemInfos(), &addedNZBs);
+				delete pFeedFile;
+			}
+			pFeedInfo->SetLastUpdate(time(NULL));
+			pFeedInfo->SetForce(false);
+			m_bSave = true;
+			m_mutexDownloads.Unlock();
+
+			DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+			for (NZBList::iterator it = addedNZBs.begin(); it != addedNZBs.end(); it++)
+			{
+				NZBInfo* pNZBInfo = *it;
+				pDownloadQueue->GetQueue()->Add(pNZBInfo, false);
+			}
+			pDownloadQueue->Save();
+			DownloadQueue::Unlock();
+		}
+		pFeedInfo->SetStatus(FeedInfo::fsFinished);
+	}
+	else
+	{
+		pFeedInfo->SetStatus(FeedInfo::fsFailed);
+	}
+}
+
+void FeedCoordinator::FilterFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemInfos)
+{
+	debug("Filtering feed %s", pFeedInfo->GetName());
+
+	FeedFilter* pFeedFilter = NULL;
+	if (pFeedInfo->GetFilter() && strlen(pFeedInfo->GetFilter()) > 0)
+	{
+		pFeedFilter = new FeedFilter(pFeedInfo->GetFilter());
+	}
+
+	for (FeedItemInfos::iterator it = pFeedItemInfos->begin(); it != pFeedItemInfos->end(); it++)
+    {
+        FeedItemInfo* pFeedItemInfo = *it;
+		pFeedItemInfo->SetMatchStatus(FeedItemInfo::msAccepted);
+		pFeedItemInfo->SetMatchRule(0);
+		pFeedItemInfo->SetPauseNzb(pFeedInfo->GetPauseNzb());
+		pFeedItemInfo->SetPriority(pFeedInfo->GetPriority());
+		pFeedItemInfo->SetAddCategory(pFeedInfo->GetCategory());
+		pFeedItemInfo->SetDupeScore(0);
+		pFeedItemInfo->SetDupeMode(dmScore);
+		pFeedItemInfo->BuildDupeKey(NULL, NULL);
+		if (pFeedFilter)
+		{
+			pFeedFilter->Match(pFeedItemInfo);
+		}
+    }
+
+	delete pFeedFilter;
+}
+
+void FeedCoordinator::ProcessFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemInfos, NZBList* pAddedNZBs)
+{
+	debug("Process feed %s", pFeedInfo->GetName());
+
+	FilterFeed(pFeedInfo, pFeedItemInfos);
+
+	bool bFirstFetch = pFeedInfo->GetLastUpdate() == 0;
+	int iAdded = 0;
+
+    for (FeedItemInfos::iterator it = pFeedItemInfos->begin(); it != pFeedItemInfos->end(); it++)
+    {
+        FeedItemInfo* pFeedItemInfo = *it;
+		if (pFeedItemInfo->GetMatchStatus() == FeedItemInfo::msAccepted)
+		{
+			FeedHistoryInfo* pFeedHistoryInfo = m_FeedHistory.Find(pFeedItemInfo->GetUrl());
+			FeedHistoryInfo::EStatus eStatus = FeedHistoryInfo::hsUnknown;
+			if (bFirstFetch)
+			{
+				eStatus = FeedHistoryInfo::hsBacklog;
+			}
+			else if (!pFeedHistoryInfo)
+			{
+				NZBInfo* pNZBInfo = CreateNZBInfo(pFeedInfo, pFeedItemInfo);
+				pAddedNZBs->Add(pNZBInfo, false);
+				eStatus = FeedHistoryInfo::hsFetched;
+				iAdded++;
+			}
+
+			if (pFeedHistoryInfo)
+			{
+				pFeedHistoryInfo->SetLastSeen(time(NULL));
+			}
+			else
+			{
+				m_FeedHistory.Add(pFeedItemInfo->GetUrl(), eStatus, time(NULL));
+			}
+		}
+    }
+
+	if (iAdded)
+	{
+		info("%s has %i new item(s)", pFeedInfo->GetName(), iAdded);
+	}
+	else
+	{
+		detail("%s has no new items", pFeedInfo->GetName());
+	}
+}
+
+NZBInfo* FeedCoordinator::CreateNZBInfo(FeedInfo* pFeedInfo, FeedItemInfo* pFeedItemInfo)
+{
+	debug("Download %s from %s", pFeedItemInfo->GetUrl(), pFeedInfo->GetName());
+
+	NZBInfo* pNZBInfo = new NZBInfo();
+	pNZBInfo->SetKind(NZBInfo::nkUrl);
+	pNZBInfo->SetURL(pFeedItemInfo->GetUrl());
+
+	// add .nzb-extension if not present
+	char szNZBName[1024];
+	strncpy(szNZBName, pFeedItemInfo->GetFilename(), 1024);
+	szNZBName[1024-1] = '\0';
+	char* ext = strrchr(szNZBName, '.');
+	if (ext && !strcasecmp(ext, ".nzb"))
+	{
+		*ext = '\0';
+	}
+	char szNZBName2[1024];
+	snprintf(szNZBName2, 1024, "%s.nzb", szNZBName);
+	Util::MakeValidFilename(szNZBName2, '_', false);
+	if (strlen(szNZBName) > 0)
+	{
+		pNZBInfo->SetFilename(szNZBName2);
+	}
+
+	pNZBInfo->SetCategory(pFeedItemInfo->GetAddCategory());
+	pNZBInfo->SetPriority(pFeedItemInfo->GetPriority());
+	pNZBInfo->SetAddUrlPaused(pFeedItemInfo->GetPauseNzb());
+	pNZBInfo->SetDupeKey(pFeedItemInfo->GetDupeKey());
+	pNZBInfo->SetDupeScore(pFeedItemInfo->GetDupeScore());
+	pNZBInfo->SetDupeMode(pFeedItemInfo->GetDupeMode());
+
+	return pNZBInfo;
+}
+
+bool FeedCoordinator::ViewFeed(int iID, FeedItemInfos** ppFeedItemInfos)
+{
+	if (iID < 1 || iID > (int)m_Feeds.size())
+	{
+		return false;
+	}
+
+	FeedInfo* pFeedInfo = m_Feeds.at(iID - 1);
+
+	return PreviewFeed(pFeedInfo->GetName(), pFeedInfo->GetUrl(), pFeedInfo->GetFilter(), 
+		pFeedInfo->GetPauseNzb(), pFeedInfo->GetCategory(), pFeedInfo->GetPriority(),
+		0, NULL, ppFeedItemInfos);
+}
+
+bool FeedCoordinator::PreviewFeed(const char* szName, const char* szUrl, const char* szFilter,
+	bool bPauseNzb, const char* szCategory, int iPriority,
+	int iCacheTimeSec, const char* szCacheId, FeedItemInfos** ppFeedItemInfos)
+{
+	debug("Preview feed %s", szName);
+
+	FeedInfo* pFeedInfo = new FeedInfo(0, szName, szUrl, 0, szFilter, bPauseNzb, szCategory, iPriority);
+	pFeedInfo->SetPreview(true);
+	
+	FeedItemInfos* pFeedItemInfos = NULL;
+	bool bHasCache = false;
+	if (iCacheTimeSec > 0 && *szCacheId != '\0')
+	{
+		m_mutexDownloads.Lock();
+		for (FeedCache::iterator it = m_FeedCache.begin(); it != m_FeedCache.end(); it++)
+		{
+			FeedCacheItem* pFeedCacheItem = *it;
+			if (!strcmp(pFeedCacheItem->GetCacheId(), szCacheId))
+			{
+				pFeedCacheItem->SetLastUsage(time(NULL));
+				pFeedItemInfos = pFeedCacheItem->GetFeedItemInfos();
+				pFeedItemInfos->Retain();
+				bHasCache = true;
+				break;
+			}
+		}
+		m_mutexDownloads.Unlock();
+	}
+
+	if (!bHasCache)
+	{
+		m_mutexDownloads.Lock();
+
+		bool bFirstFetch = true;
+		for (Feeds::iterator it = m_Feeds.begin(); it != m_Feeds.end(); it++)
+		{
+			FeedInfo* pFeedInfo2 = *it;
+			if (!strcmp(pFeedInfo2->GetUrl(), pFeedInfo->GetUrl()) &&
+				!strcmp(pFeedInfo2->GetFilter(), pFeedInfo->GetFilter()) &&
+				pFeedInfo2->GetLastUpdate() > 0)
+			{
+				bFirstFetch = false;
+				break;
+			}
+		}
+
+		StartFeedDownload(pFeedInfo, true);
+		m_mutexDownloads.Unlock();
+
+		// wait until the download in a separate thread completes
+		while (pFeedInfo->GetStatus() == FeedInfo::fsRunning)
+		{
+			usleep(100 * 1000);
+		}
+
+		// now can process the feed
+
+		FeedFile* pFeedFile = NULL;
+
+		if (pFeedInfo->GetStatus() == FeedInfo::fsFinished)
+		{
+			pFeedFile = FeedFile::Create(pFeedInfo->GetOutputFilename());
+		}
+
+		remove(pFeedInfo->GetOutputFilename());
+
+		if (!pFeedFile)
+		{
+			delete pFeedInfo;
+			return false;
+		}
+
+		pFeedItemInfos = pFeedFile->GetFeedItemInfos();
+		pFeedItemInfos->Retain();
+		delete pFeedFile;
+
+		for (FeedItemInfos::iterator it = pFeedItemInfos->begin(); it != pFeedItemInfos->end(); it++)
+		{
+			FeedItemInfo* pFeedItemInfo = *it;
+			pFeedItemInfo->SetStatus(bFirstFetch ? FeedItemInfo::isBacklog : FeedItemInfo::isNew);
+			FeedHistoryInfo* pFeedHistoryInfo = m_FeedHistory.Find(pFeedItemInfo->GetUrl());
+			if (pFeedHistoryInfo)
+			{
+				pFeedItemInfo->SetStatus((FeedItemInfo::EStatus)pFeedHistoryInfo->GetStatus());
+			}
+		}
+	}
+
+	FilterFeed(pFeedInfo, pFeedItemInfos);
+	delete pFeedInfo;
+
+	if (iCacheTimeSec > 0 && *szCacheId != '\0' && !bHasCache)
+	{
+		FeedCacheItem* pFeedCacheItem = new FeedCacheItem(szUrl, iCacheTimeSec, szCacheId, time(NULL), pFeedItemInfos);
+		m_mutexDownloads.Lock();
+		m_FeedCache.push_back(pFeedCacheItem);
+		m_mutexDownloads.Unlock();
+	}
+	
+	*ppFeedItemInfos = pFeedItemInfos;
+
+	return true;
+}
+
+void FeedCoordinator::FetchFeed(int iID)
+{
+	debug("FetchFeeds");
+
+	m_mutexDownloads.Lock();
+	for (Feeds::iterator it = m_Feeds.begin(); it != m_Feeds.end(); it++)
+	{
+		FeedInfo* pFeedInfo = *it;
+		if (pFeedInfo->GetID() == iID || iID == 0)
+		{
+			pFeedInfo->SetFetch(true);
+			m_bForce = true;
+		}
+	}
+	m_mutexDownloads.Unlock();
+}
+
+void FeedCoordinator::DownloadQueueUpdate(Subject* pCaller, void* pAspect)
+{
+	debug("Notification from URL-Coordinator received");
+
+	DownloadQueue::Aspect* pQueueAspect = (DownloadQueue::Aspect*)pAspect;
+	if (pQueueAspect->eAction == DownloadQueue::eaUrlCompleted)
+	{
+		m_mutexDownloads.Lock();
+		FeedHistoryInfo* pFeedHistoryInfo = m_FeedHistory.Find(pQueueAspect->pNZBInfo->GetURL());
+		if (pFeedHistoryInfo)
+		{
+			pFeedHistoryInfo->SetStatus(FeedHistoryInfo::hsFetched);
+		}
+		else
+		{
+			m_FeedHistory.Add(pQueueAspect->pNZBInfo->GetURL(), FeedHistoryInfo::hsFetched, time(NULL));
+		}
+		m_bSave = true;
+		m_mutexDownloads.Unlock();
+	}
+}
+
+bool FeedCoordinator::HasActiveDownloads()
+{
+	m_mutexDownloads.Lock();
+	bool bActive = !m_ActiveDownloads.empty();
+	m_mutexDownloads.Unlock();
+	return bActive;
+}
+
+void FeedCoordinator::CheckSaveFeeds()
+{
+	debug("CheckSaveFeeds");
+	m_mutexDownloads.Lock();
+	if (m_bSave)
+	{
+		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+		{
+			g_pDiskState->SaveFeeds(&m_Feeds, &m_FeedHistory);
+		}
+		m_bSave = false;
+	}
+	m_mutexDownloads.Unlock();
+}
+
+void FeedCoordinator::CleanupHistory()
+{
+	debug("CleanupHistory");
+
+	m_mutexDownloads.Lock();
+
+	time_t tOldestUpdate = time(NULL);
+
+	for (Feeds::iterator it = m_Feeds.begin(); it != m_Feeds.end(); it++)
+	{
+		FeedInfo* pFeedInfo = *it;
+		if (pFeedInfo->GetLastUpdate() < tOldestUpdate)
+		{
+			tOldestUpdate = pFeedInfo->GetLastUpdate();
+		}
+	}
+
+	time_t tBorderDate = tOldestUpdate - g_pOptions->GetFeedHistory() * 60*60*24;
+	int i = 0;
+	for (FeedHistory::iterator it = m_FeedHistory.begin(); it != m_FeedHistory.end(); )
+	{
+		FeedHistoryInfo* pFeedHistoryInfo = *it;
+		if (pFeedHistoryInfo->GetLastSeen() < tBorderDate)
+		{
+			detail("Deleting %s from feed history", pFeedHistoryInfo->GetUrl());
+			delete pFeedHistoryInfo;
+			m_FeedHistory.erase(it);
+			it = m_FeedHistory.begin() + i;
+			m_bSave = true;
+		}
+		else
+		{
+			it++;
+			i++;
+		}
+	}
+
+	m_mutexDownloads.Unlock();
+}
+
+void FeedCoordinator::CleanupCache()
+{
+	debug("CleanupCache");
+	
+	m_mutexDownloads.Lock();
+	
+	time_t tCurTime = time(NULL);
+	int i = 0;
+	for (FeedCache::iterator it = m_FeedCache.begin(); it != m_FeedCache.end(); )
+	{
+		FeedCacheItem* pFeedCacheItem = *it;
+		if (pFeedCacheItem->GetLastUsage() + pFeedCacheItem->GetCacheTimeSec() < tCurTime ||
+			pFeedCacheItem->GetLastUsage() > tCurTime)
+		{
+			debug("Deleting %s from feed cache", pFeedCacheItem->GetUrl());
+			delete pFeedCacheItem;
+			m_FeedCache.erase(it);
+			it = m_FeedCache.begin() + i;
+		}
+		else
+		{
+			it++;
+			i++;
+		}
+	}
+	
+	m_mutexDownloads.Unlock();
+}

daemon/feed/FeedCoordinator.h

@@ -0,0 +1,127 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef FEEDCOORDINATOR_H
+#define FEEDCOORDINATOR_H
+
+#include <deque>
+#include <list>
+#include <time.h>
+
+#include "Log.h"
+#include "Thread.h"
+#include "WebDownloader.h"
+#include "DownloadInfo.h"
+#include "FeedInfo.h"
+#include "Observer.h"
+
+
+class FeedDownloader;
+
+class FeedCoordinator : public Thread, public Observer, public Subject, public Debuggable
+{
+private:
+	class DownloadQueueObserver: public Observer
+	{
+	public:
+		FeedCoordinator*	m_pOwner;
+		virtual void		Update(Subject* pCaller, void* pAspect) { m_pOwner->DownloadQueueUpdate(pCaller, pAspect); }
+	};
+
+	class FeedCacheItem
+	{
+	private:
+		char*				m_szUrl;
+		int					m_iCacheTimeSec;
+		char*				m_szCacheId;
+		time_t				m_tLastUsage;
+		FeedItemInfos*		m_pFeedItemInfos;
+
+	public:
+							FeedCacheItem(const char* szUrl, int iCacheTimeSec,const char* szCacheId,
+								time_t tLastUsage, FeedItemInfos* pFeedItemInfos);
+							~FeedCacheItem();
+		const char*			GetUrl() { return m_szUrl; }
+		int					GetCacheTimeSec() { return m_iCacheTimeSec; }
+		const char*			GetCacheId() { return m_szCacheId; }
+		time_t				GetLastUsage() { return m_tLastUsage; }
+		void				SetLastUsage(time_t tLastUsage) { m_tLastUsage = tLastUsage; }
+		FeedItemInfos*		GetFeedItemInfos() { return m_pFeedItemInfos; }
+	};
+
+	typedef std::deque<FeedCacheItem*>	FeedCache;
+	typedef std::list<FeedDownloader*>	ActiveDownloads;
+
+private:
+	Feeds					m_Feeds;
+	ActiveDownloads			m_ActiveDownloads;
+	FeedHistory				m_FeedHistory;
+	Mutex					m_mutexDownloads;
+	DownloadQueueObserver	m_DownloadQueueObserver;
+	bool					m_bForce;
+	bool					m_bSave;
+	FeedCache				m_FeedCache;
+
+	void					StartFeedDownload(FeedInfo* pFeedInfo, bool bForce);
+	void					FeedCompleted(FeedDownloader* pFeedDownloader);
+	void					FilterFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemInfos);
+	void					ProcessFeed(FeedInfo* pFeedInfo, FeedItemInfos* pFeedItemInfos, NZBList* pAddedNZBs);
+	NZBInfo*				CreateNZBInfo(FeedInfo* pFeedInfo, FeedItemInfo* pFeedItemInfo);
+	void					ResetHangingDownloads();
+	void					DownloadQueueUpdate(Subject* pCaller, void* pAspect);
+	void					CleanupHistory();
+	void					CleanupCache();
+	void					CheckSaveFeeds();
+
+protected:
+	virtual void			LogDebugInfo();
+
+public:
+							FeedCoordinator();                
+	virtual					~FeedCoordinator();
+	virtual void			Run();
+	virtual void 			Stop();
+	void					Update(Subject* pCaller, void* pAspect);
+	void					AddFeed(FeedInfo* pFeedInfo);
+	bool					PreviewFeed(const char* szName, const char* szUrl, const char* szFilter,
+								bool bPauseNzb, const char* szCategory, int iPriority,
+								int iCacheTimeSec, const char* szCacheId, FeedItemInfos** ppFeedItemInfos);
+	bool					ViewFeed(int iID, FeedItemInfos** ppFeedItemInfos);
+	void					FetchFeed(int iID);
+	bool					HasActiveDownloads();
+	Feeds*					GetFeeds() { return &m_Feeds; }
+};
+
+class FeedDownloader : public WebDownloader
+{
+private:
+	FeedInfo*				m_pFeedInfo;
+
+public:
+	void					SetFeedInfo(FeedInfo* pFeedInfo) { m_pFeedInfo = pFeedInfo; }
+	FeedInfo*				GetFeedInfo() { return m_pFeedInfo; }
+};
+
+#endif

daemon/feed/FeedFile.cpp

@@ -0,0 +1,609 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <string.h>
+#include <list>
+#ifdef WIN32
+#include <comutil.h>
+#import <msxml.tlb> 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"
+#include "FeedFile.h"
+#include "Log.h"
+#include "DownloadInfo.h"
+#include "Options.h"
+#include "Util.h"
+
+extern Options* g_pOptions;
+
+FeedFile::FeedFile(const char* szFileName)
+{
+    debug("Creating FeedFile");
+
+    m_szFileName = strdup(szFileName);
+	m_pFeedItemInfos = new FeedItemInfos();
+	m_pFeedItemInfos->Retain();
+
+#ifndef WIN32
+	m_pFeedItemInfo = NULL;
+	m_szTagContent = NULL;
+	m_iTagContentLen = 0;
+#endif
+}
+
+FeedFile::~FeedFile()
+{
+	debug("Destroying FeedFile");
+
+	// Cleanup
+	free(m_szFileName);
+	m_pFeedItemInfos->Release();
+
+#ifndef WIN32
+	delete m_pFeedItemInfo;
+	free(m_szTagContent);
+#endif
+}
+
+void FeedFile::LogDebugInfo()
+{
+    info(" FeedFile %s", m_szFileName);
+}
+
+void FeedFile::AddItem(FeedItemInfo* pFeedItemInfo)
+{
+	m_pFeedItemInfos->Add(pFeedItemInfo);
+}
+
+void FeedFile::ParseSubject(FeedItemInfo* pFeedItemInfo)
+{
+	// if title has quatation marks we use only part within quatation marks 
+	char* p = (char*)pFeedItemInfo->GetTitle();
+	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';
+
+				char* ext = strrchr(filename, '.');
+				if (ext && !strcasecmp(ext, ".par2"))
+				{
+					*ext = '\0';
+				}
+
+				pFeedItemInfo->SetFilename(filename);
+				free(filename);
+				return;
+			}
+		}
+	}
+
+	pFeedItemInfo->SetFilename(pFeedItemInfo->GetTitle());
+}
+
+#ifdef WIN32
+FeedFile* FeedFile::Create(const char* szFileName)
+{
+    CoInitialize(NULL);
+
+	HRESULT hr;
+
+	MSXML::IXMLDOMDocumentPtr doc;
+	hr = doc.CreateInstance(MSXML::CLSID_DOMDocument);
+    if (FAILED(hr))
+    {
+        return NULL;
+    }
+
+    // Load the XML document file...
+	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);
+	if (success == VARIANT_FALSE)
+	{
+		_bstr_t r(doc->GetparseError()->reason);
+		const char* szErrMsg = r;
+		error("Error parsing rss feed: %s", szErrMsg);
+		return NULL;
+	}
+
+    FeedFile* pFile = new FeedFile(szFileName);
+    if (!pFile->ParseFeed(doc))
+	{
+		delete pFile;
+		pFile = NULL;
+	}
+
+    return pFile;
+}
+
+void FeedFile::EncodeURL(const char* szFilename, char* szURL)
+{
+	while (char ch = *szFilename++)
+	{
+		if (('0' <= ch && ch <= '9') ||
+			('a' <= ch && ch <= 'z') ||
+			('A' <= ch && ch <= 'Z') )
+		{
+			*szURL++ = ch;
+		}
+		else
+		{
+			*szURL++ = '%';
+			int a = ch >> 4;
+			*szURL++ = a > 9 ? a - 10 + 'a' : a + '0';
+			a = ch & 0xF;
+			*szURL++ = a > 9 ? a - 10 + 'a' : a + '0';
+		}
+	}
+	*szURL = NULL;
+}
+
+bool FeedFile::ParseFeed(IUnknown* nzb)
+{
+	MSXML::IXMLDOMDocumentPtr doc = nzb;
+	MSXML::IXMLDOMNodePtr root = doc->documentElement;
+
+	MSXML::IXMLDOMNodeListPtr itemList = root->selectNodes("/rss/channel/item");
+	for (int i = 0; i < itemList->Getlength(); i++)
+	{
+		MSXML::IXMLDOMNodePtr node = itemList->Getitem(i);
+
+		FeedItemInfo* pFeedItemInfo = new FeedItemInfo();
+		AddItem(pFeedItemInfo);
+
+		MSXML::IXMLDOMNodePtr tag;
+		MSXML::IXMLDOMNodePtr attr;
+		
+		// <title>Debian 6</title> 
+		tag = node->selectSingleNode("title");
+		if (!tag)
+		{
+			// bad rss feed
+			return false;
+		}
+		_bstr_t title(tag->Gettext());
+		pFeedItemInfo->SetTitle(title);
+		ParseSubject(pFeedItemInfo);
+
+		// <pubDate>Wed, 26 Jun 2013 00:02:54 -0600</pubDate>
+		tag = node->selectSingleNode("pubDate");
+		if (tag)
+		{
+			_bstr_t time(tag->Gettext());
+			time_t unixtime = WebUtil::ParseRfc822DateTime(time);
+			if (unixtime > 0)
+			{
+				pFeedItemInfo->SetTime(unixtime);
+			}
+		}
+
+		// <category>Movies &gt; HD</category>
+		tag = node->selectSingleNode("category");
+		if (tag)
+		{
+			_bstr_t category(tag->Gettext());
+			pFeedItemInfo->SetCategory(category);
+		}
+
+		// <description>long text</description>
+		tag = node->selectSingleNode("description");
+		if (tag)
+		{
+			_bstr_t description(tag->Gettext());
+			pFeedItemInfo->SetDescription(description);
+		}
+
+		//<enclosure url="http://myindexer.com/fetch/9eeb264aecce961a6e0d" length="150263340" type="application/x-nzb" />
+		tag = node->selectSingleNode("enclosure");
+		if (tag)
+		{
+			attr = tag->Getattributes()->getNamedItem("url");
+			if (attr)
+			{
+				_bstr_t url(attr->Gettext());
+				pFeedItemInfo->SetUrl(url);
+			}
+
+			attr = tag->Getattributes()->getNamedItem("length");
+			if (attr)
+			{
+				_bstr_t size(attr->Gettext());
+				long long lSize = atoll(size);
+				pFeedItemInfo->SetSize(lSize);
+			}
+		}
+
+		if (!pFeedItemInfo->GetUrl())
+		{
+			// <link>https://nzb.org/fetch/334534ce/4364564564</link>
+			tag = node->selectSingleNode("link");
+			if (!tag)
+			{
+				// bad rss feed
+				return false;
+			}
+			_bstr_t link(tag->Gettext());
+			pFeedItemInfo->SetUrl(link);
+		}
+
+
+		// newznab special
+
+		//<newznab:attr name="size" value="5423523453534" />
+		if (pFeedItemInfo->GetSize() == 0)
+		{
+			tag = node->selectSingleNode("newznab:attr[@name='size']");
+			if (tag)
+			{
+				attr = tag->Getattributes()->getNamedItem("value");
+				if (attr)
+				{
+					_bstr_t size(attr->Gettext());
+					long long lSize = atoll(size);
+					pFeedItemInfo->SetSize(lSize);
+				}
+			}
+		}
+
+		//<newznab:attr name="imdb" value="1588173"/>
+		tag = node->selectSingleNode("newznab:attr[@name='imdb']");
+		if (tag)
+		{
+			attr = tag->Getattributes()->getNamedItem("value");
+			if (attr)
+			{
+				_bstr_t val(attr->Gettext());
+				int iVal = atoi(val);
+				pFeedItemInfo->SetImdbId(iVal);
+			}
+		}
+
+		//<newznab:attr name="rageid" value="33877"/>
+		tag = node->selectSingleNode("newznab:attr[@name='rageid']");
+		if (tag)
+		{
+			attr = tag->Getattributes()->getNamedItem("value");
+			if (attr)
+			{
+				_bstr_t val(attr->Gettext());
+				int iVal = atoi(val);
+				pFeedItemInfo->SetRageId(iVal);
+			}
+		}
+
+		//<newznab:attr name="episode" value="E09"/>
+		//<newznab:attr name="episode" value="9"/>
+		tag = node->selectSingleNode("newznab:attr[@name='episode']");
+		if (tag)
+		{
+			attr = tag->Getattributes()->getNamedItem("value");
+			if (attr)
+			{
+				_bstr_t val(attr->Gettext());
+				pFeedItemInfo->SetEpisode(val);
+			}
+		}
+
+		//<newznab:attr name="season" value="S03"/>
+		//<newznab:attr name="season" value="3"/>
+		tag = node->selectSingleNode("newznab:attr[@name='season']");
+		if (tag)
+		{
+			attr = tag->Getattributes()->getNamedItem("value");
+			if (attr)
+			{
+				_bstr_t val(attr->Gettext());
+				pFeedItemInfo->SetSeason(val);
+			}
+		}
+
+		MSXML::IXMLDOMNodeListPtr itemList = node->selectNodes("newznab:attr");
+		for (int i = 0; i < itemList->Getlength(); i++)
+		{
+			MSXML::IXMLDOMNodePtr node = itemList->Getitem(i);
+			MSXML::IXMLDOMNodePtr name = node->Getattributes()->getNamedItem("name");
+			MSXML::IXMLDOMNodePtr value = node->Getattributes()->getNamedItem("value");
+			if (name && value)
+			{
+				_bstr_t name(name->Gettext());
+				_bstr_t val(value->Gettext());
+				pFeedItemInfo->GetAttributes()->Add(name, val);
+			}
+		}
+	}
+	return true;
+}
+
+#else
+
+FeedFile* FeedFile::Create(const char* szFileName)
+{
+    FeedFile* pFile = new FeedFile(szFileName);
+
+	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)
+	{
+        error("Failed to parse rss feed");
+		delete pFile;
+		pFile = NULL;
+	}
+	
+	return pFile;
+}
+
+void FeedFile::Parse_StartElement(const char *name, const char **atts)
+{
+	ResetTagContent();
+	
+	if (!strcmp("item", name))
+	{
+		delete m_pFeedItemInfo;
+		m_pFeedItemInfo = new FeedItemInfo();
+	}
+	else if (!strcmp("enclosure", name) && m_pFeedItemInfo)
+	{
+		//<enclosure url="http://myindexer.com/fetch/9eeb264aecce961a6e0d" length="150263340" type="application/x-nzb" />
+		for (; *atts; atts+=2)
+		{
+			if (!strcmp("url", atts[0]))
+			{
+				char* szUrl = strdup(atts[1]);
+				WebUtil::XmlDecode(szUrl);
+				m_pFeedItemInfo->SetUrl(szUrl);
+				free(szUrl);
+			}
+			else if (!strcmp("length", atts[0]))
+			{
+				long long lSize = atoll(atts[1]);
+				m_pFeedItemInfo->SetSize(lSize);
+			}
+		}
+	}
+	else if (m_pFeedItemInfo && !strcmp("newznab:attr", name) &&
+		atts[0] && atts[1] && atts[2] && atts[3] &&
+		!strcmp("name", atts[0]) && !strcmp("value", atts[2]))
+	{
+		m_pFeedItemInfo->GetAttributes()->Add(atts[1], atts[3]);
+
+		//<newznab:attr name="size" value="5423523453534" />
+		if (m_pFeedItemInfo->GetSize() == 0 &&
+			!strcmp("size", atts[1]))
+		{
+			long long lSize = atoll(atts[3]);
+			m_pFeedItemInfo->SetSize(lSize);
+		}
+
+		//<newznab:attr name="imdb" value="1588173"/>
+		else if (!strcmp("imdb", atts[1]))
+		{
+			m_pFeedItemInfo->SetImdbId(atoi(atts[3]));
+		}
+
+		//<newznab:attr name="rageid" value="33877"/>
+		else if (!strcmp("rageid", atts[1]))
+		{
+			m_pFeedItemInfo->SetRageId(atoi(atts[3]));
+		}
+
+		//<newznab:attr name="episode" value="E09"/>
+		//<newznab:attr name="episode" value="9"/>
+		else if (!strcmp("episode", atts[1]))
+		{
+			m_pFeedItemInfo->SetEpisode(atts[3]);
+		}
+
+		//<newznab:attr name="season" value="S03"/>
+		//<newznab:attr name="season" value="3"/>
+		else if (!strcmp("season", atts[1]))
+		{
+			m_pFeedItemInfo->SetSeason(atts[3]);
+		}
+	}
+}
+
+void FeedFile::Parse_EndElement(const char *name)
+{
+	if (!strcmp("item", name))
+	{
+		// Close the file element, add the new file to file-list
+		AddItem(m_pFeedItemInfo);
+		m_pFeedItemInfo = NULL;
+	}
+	else if (!strcmp("title", name) && m_pFeedItemInfo)
+	{
+		m_pFeedItemInfo->SetTitle(m_szTagContent);
+		ResetTagContent();
+		ParseSubject(m_pFeedItemInfo);
+	}
+	else if (!strcmp("link", name) && m_pFeedItemInfo &&
+		(!m_pFeedItemInfo->GetUrl() || strlen(m_pFeedItemInfo->GetUrl()) == 0))
+	{
+		m_pFeedItemInfo->SetUrl(m_szTagContent);
+		ResetTagContent();
+	}
+	else if (!strcmp("category", name) && m_pFeedItemInfo)
+	{
+		m_pFeedItemInfo->SetCategory(m_szTagContent);
+		ResetTagContent();
+	}
+	else if (!strcmp("description", name) && m_pFeedItemInfo)
+	{
+		m_pFeedItemInfo->SetDescription(m_szTagContent);
+		ResetTagContent();
+	}
+	else if (!strcmp("pubDate", name) && m_pFeedItemInfo)
+	{
+		time_t unixtime = WebUtil::ParseRfc822DateTime(m_szTagContent);
+		if (unixtime > 0)
+		{
+			m_pFeedItemInfo->SetTime(unixtime);
+		}
+		ResetTagContent();
+	}
+}
+
+void FeedFile::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';
+}
+
+void FeedFile::ResetTagContent()
+{
+	free(m_szTagContent);
+	m_szTagContent = NULL;
+	m_iTagContentLen = 0;
+}
+
+void FeedFile::SAX_StartElement(FeedFile* pFile, const char *name, const char **atts)
+{
+	pFile->Parse_StartElement(name, atts);
+}
+
+void FeedFile::SAX_EndElement(FeedFile* pFile, const char *name)
+{
+	pFile->Parse_EndElement(name);
+}
+
+void FeedFile::SAX_characters(FeedFile* 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* FeedFile::SAX_getEntity(FeedFile* pFile, const char * name)
+{
+	xmlEntityPtr e = xmlGetPredefinedEntity((xmlChar* )name);
+	if (!e)
+	{
+		warn("entity not found");
+		pFile->m_bIgnoreNextError = true;
+	}
+
+	return e;
+}
+
+void FeedFile::SAX_error(FeedFile* 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 rss feed: %s", szErrMsg);
+}
+#endif

daemon/feed/FeedFile.h

@@ -0,0 +1,70 @@
+/*
+ *  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 FEEDFILE_H
+#define FEEDFILE_H
+
+#include <vector>
+
+#include "FeedInfo.h"
+
+class FeedFile
+{
+private:
+	FeedItemInfos*		m_pFeedItemInfos;
+	char*				m_szFileName;
+
+						FeedFile(const char* szFileName);
+	void				AddItem(FeedItemInfo* pFeedItemInfo);
+	void				ParseSubject(FeedItemInfo* pFeedItemInfo);
+#ifdef WIN32
+    bool 				ParseFeed(IUnknown* nzb);
+	static void			EncodeURL(const char* szFilename, char* szURL);
+#else
+	FeedItemInfo*		m_pFeedItemInfo;
+	char*				m_szTagContent;
+	int					m_iTagContentLen;
+	bool				m_bIgnoreNextError;
+
+	static void			SAX_StartElement(FeedFile* pFile, const char *name, const char **atts);
+	static void			SAX_EndElement(FeedFile* pFile, const char *name);
+	static void			SAX_characters(FeedFile* pFile, const char * xmlstr, int len);
+	static void*		SAX_getEntity(FeedFile* pFile, const char * name);
+	static void			SAX_error(FeedFile* 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);
+	void				ResetTagContent();
+#endif
+
+public:
+	virtual 			~FeedFile();
+	static FeedFile*	Create(const char* szFileName);
+	FeedItemInfos*		GetFeedItemInfos() { return m_pFeedItemInfos; }
+
+	void				LogDebugInfo();
+};
+
+#endif

daemon/feed/FeedFilter.h

@@ -0,0 +1,186 @@
+/*
+ *  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 FEEDFILTER_H
+#define FEEDFILTER_H
+
+#include "DownloadInfo.h"
+#include "FeedInfo.h"
+#include "Util.h"
+
+class FeedFilter
+{
+private:
+	typedef std::deque<char*> RefValues;
+
+	enum ETermCommand
+	{
+		fcText,
+		fcRegex,
+		fcEqual,
+		fcLess,
+		fcLessEqual,
+		fcGreater,
+		fcGreaterEqual,
+		fcOpeningBrace,
+		fcClosingBrace,
+		fcOrOperator
+	};
+	
+	class Term
+	{
+	private:
+		bool			m_bPositive;
+		char*			m_szField;
+		ETermCommand	m_eCommand;
+		char*			m_szParam;
+		long long		m_iIntParam;
+		double			m_fFloatParam;
+		bool			m_bFloat;
+		RegEx*			m_pRegEx;
+		RefValues*		m_pRefValues;
+
+		bool			GetFieldData(const char* szField, FeedItemInfo* pFeedItemInfo,
+							const char** StrValue, long long* IntValue);
+		bool			ParseParam(const char* szField, const char* szParam);
+		bool			ParseSizeParam(const char* szParam);
+		bool			ParseAgeParam(const char* szParam);
+		bool			ParseNumericParam(const char* szParam);
+		bool			MatchValue(const char* szStrValue, long long iIntValue);
+		bool			MatchText(const char* szStrValue);
+		bool			MatchRegex(const char* szStrValue);
+		void			FillWildMaskRefValues(const char* szStrValue, WildMask* pMask, int iRefOffset);
+		void			FillRegExRefValues(const char* szStrValue, RegEx* pRegEx);
+
+	public:
+						Term();
+						~Term();
+		void			SetRefValues(RefValues* pRefValues) { m_pRefValues = pRefValues; }
+		bool			Compile(char* szToken);
+		bool			Match(FeedItemInfo* pFeedItemInfo);
+		ETermCommand	GetCommand() { return m_eCommand; }
+	};
+
+	typedef std::deque<Term*> TermList;
+
+	enum ERuleCommand
+	{
+		frAccept,
+		frReject,
+		frRequire,
+		frOptions,
+		frComment
+	};
+
+	class Rule
+	{
+	private:
+		bool			m_bIsValid;
+		ERuleCommand	m_eCommand;
+		char*			m_szCategory;
+		int				m_iPriority;
+		int				m_iAddPriority;
+		bool			m_bPause;
+		int				m_iDupeScore;
+		int				m_iAddDupeScore;
+		char*			m_szDupeKey;
+		char*			m_szAddDupeKey;
+		EDupeMode		m_eDupeMode;
+		char*			m_szSeries;
+		char*			m_szRageId;
+		bool			m_bHasCategory;
+		bool			m_bHasPriority;
+		bool			m_bHasAddPriority;
+		bool			m_bHasPause;
+		bool			m_bHasDupeScore;
+		bool			m_bHasAddDupeScore;
+		bool			m_bHasDupeKey;
+		bool			m_bHasAddDupeKey;
+		bool			m_bHasDupeMode;
+		bool			m_bPatCategory;
+		bool			m_bPatDupeKey;
+		bool			m_bPatAddDupeKey;
+		bool			m_bHasSeries;
+		bool			m_bHasRageId;
+		char*			m_szPatCategory;
+		char*			m_szPatDupeKey;
+		char*			m_szPatAddDupeKey;
+		TermList		m_Terms;
+		RefValues		m_RefValues;
+
+		char*			CompileCommand(char* szRule);
+		char*			CompileOptions(char* szRule);
+		bool			CompileTerm(char* szTerm);
+		bool			MatchExpression(FeedItemInfo* pFeedItemInfo);
+
+	public:
+						Rule();
+						~Rule();
+		void			Compile(char* szRule);
+		bool			IsValid() { return m_bIsValid; }
+		ERuleCommand	GetCommand() { return m_eCommand; }
+		const char*		GetCategory() { return m_szCategory; }
+		int				GetPriority() { return m_iPriority; }
+		int				GetAddPriority() { return m_iAddPriority; }
+		bool			GetPause() { return m_bPause; }
+		const char*		GetDupeKey() { return m_szDupeKey; }
+		const char*		GetAddDupeKey() { return m_szAddDupeKey; }
+		int				GetDupeScore() { return m_iDupeScore; }
+		int				GetAddDupeScore() { return m_iAddDupeScore; }
+		EDupeMode		GetDupeMode() { return m_eDupeMode; }
+		const char*		GetRageId() { return m_szRageId; }
+		const char*		GetSeries() { return m_szSeries; }
+		bool			HasCategory() { return m_bHasCategory; }
+		bool			HasPriority() { return m_bHasPriority; }
+		bool			HasAddPriority() { return m_bHasAddPriority; }
+		bool			HasPause() { return m_bHasPause; }
+		bool			HasDupeScore() { return m_bHasDupeScore; }
+		bool			HasAddDupeScore() { return m_bHasAddDupeScore; }
+		bool			HasDupeKey() { return m_bHasDupeKey; }
+		bool			HasAddDupeKey() { return m_bHasAddDupeKey; }
+		bool			HasDupeMode() { return m_bHasDupeMode; }
+		bool			HasRageId() { return m_bHasRageId; }
+		bool			HasSeries() { return m_bHasSeries; }
+		bool			Match(FeedItemInfo* pFeedItemInfo);
+		void			ExpandRefValues(FeedItemInfo* pFeedItemInfo, char** pDestStr, char* pPatStr);
+		const char*		GetRefValue(FeedItemInfo* pFeedItemInfo, const char* szVarName);
+	};
+
+	typedef std::deque<Rule*> RuleList;
+
+private:
+	RuleList			m_Rules;
+
+	void				Compile(const char* szFilter);
+	void				CompileRule(char* szRule);
+	void				ApplyOptions(Rule* pRule, FeedItemInfo* pFeedItemInfo);
+
+public:
+						FeedFilter(const char* szFilter);
+						~FeedFilter();
+	void				Match(FeedItemInfo* pFeedItemInfo);
+};
+
+#endif

daemon/feed/FeedInfo.cpp

@@ -0,0 +1,440 @@
+/*
+ *  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: 0 $
+ * $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>
+#include <sys/stat.h>
+
+#include "nzbget.h"
+#include "FeedInfo.h"
+#include "Util.h"
+
+
+FeedInfo::FeedInfo(int iID, const char* szName, const char* szUrl, int iInterval,
+	const char* szFilter, bool bPauseNzb, const char* szCategory, int iPriority)
+{
+	m_iID = iID;
+	m_szName = strdup(szName ? szName : "");
+	m_szUrl = strdup(szUrl ? szUrl : "");
+	m_szFilter = strdup(szFilter ? szFilter : "");
+	m_iFilterHash = Util::HashBJ96(szFilter, strlen(szFilter), 0);
+	m_szCategory = strdup(szCategory ? szCategory : "");
+	m_iInterval = iInterval;
+	m_bPauseNzb = bPauseNzb;
+	m_iPriority = iPriority;
+	m_tLastUpdate = 0;
+	m_bPreview = false;
+	m_eStatus = fsUndefined;
+	m_szOutputFilename = NULL;
+	m_bFetch = false;
+	m_bForce = false;
+}
+
+FeedInfo::~FeedInfo()
+{
+	free(m_szName);
+	free(m_szUrl);
+	free(m_szFilter);
+	free(m_szCategory);
+	free(m_szOutputFilename);
+}
+
+void FeedInfo::SetOutputFilename(const char* szOutputFilename)
+{
+	free(m_szOutputFilename);
+	m_szOutputFilename = strdup(szOutputFilename);
+}
+
+
+FeedItemInfo::Attr::Attr(const char* szName, const char* szValue)
+{
+	m_szName = strdup(szName ? szName : "");
+	m_szValue = strdup(szValue ? szValue : "");
+}
+
+FeedItemInfo::Attr::~Attr()
+{
+	free(m_szName);
+	free(m_szValue);
+}
+
+
+FeedItemInfo::Attributes::~Attributes()
+{
+	for (iterator it = begin(); it != end(); it++)
+	{
+		delete *it;
+	}
+}
+
+void FeedItemInfo::Attributes::Add(const char* szName, const char* szValue)
+{
+	push_back(new Attr(szName, szValue));
+}
+
+FeedItemInfo::Attr* FeedItemInfo::Attributes::Find(const char* szName)
+{
+	for (iterator it = begin(); it != end(); it++)
+	{
+		Attr* pAttr = *it;
+		if (!strcasecmp(pAttr->GetName(), szName))
+		{
+			return pAttr;
+		}
+	}
+
+	return NULL;
+}
+
+
+FeedItemInfo::FeedItemInfo()
+{
+	m_pSharedFeedData = NULL;
+	m_szTitle = NULL;
+	m_szFilename = NULL;
+	m_szUrl = NULL;
+	m_szCategory = strdup("");
+	m_lSize = 0;
+	m_tTime = 0;
+	m_iImdbId = 0;
+	m_iRageId = 0;
+	m_szDescription = strdup("");
+	m_szSeason = NULL;
+	m_szEpisode = NULL;
+	m_iSeasonNum = 0;
+	m_iEpisodeNum = 0;
+	m_bSeasonEpisodeParsed = false;
+	m_szAddCategory = strdup("");
+	m_bPauseNzb = false;
+	m_iPriority = 0;
+	m_eStatus = isUnknown;
+	m_eMatchStatus = msIgnored;
+	m_iMatchRule = 0;
+	m_szDupeKey = NULL;
+	m_iDupeScore = 0;
+	m_eDupeMode = dmScore;
+}
+
+FeedItemInfo::~FeedItemInfo()
+{
+	free(m_szTitle);
+	free(m_szFilename);
+	free(m_szUrl);
+	free(m_szCategory);
+	free(m_szDescription);
+	free(m_szSeason);
+	free(m_szEpisode);
+	free(m_szAddCategory);
+	free(m_szDupeKey);
+}
+
+void FeedItemInfo::SetTitle(const char* szTitle)
+{
+	free(m_szTitle);
+	m_szTitle = szTitle ? strdup(szTitle) : NULL;
+}
+
+void FeedItemInfo::SetFilename(const char* szFilename)
+{
+	free(m_szFilename);
+	m_szFilename = szFilename ? strdup(szFilename) : NULL;
+}
+
+void FeedItemInfo::SetUrl(const char* szUrl)
+{
+	free(m_szUrl);
+	m_szUrl = szUrl ? strdup(szUrl) : NULL;
+}
+
+void FeedItemInfo::SetCategory(const char* szCategory)
+{
+	free(m_szCategory);
+	m_szCategory = strdup(szCategory ? szCategory: "");
+}
+
+void FeedItemInfo::SetDescription(const char* szDescription)
+{
+	free(m_szDescription);
+	m_szDescription = strdup(szDescription ? szDescription: "");
+}
+
+void FeedItemInfo::SetSeason(const char* szSeason)
+{
+	free(m_szSeason);
+	m_szSeason = szSeason ? strdup(szSeason) : NULL;
+	m_iSeasonNum = szSeason ? ParsePrefixedInt(szSeason) : 0;
+}
+
+void FeedItemInfo::SetEpisode(const char* szEpisode)
+{
+	free(m_szEpisode);
+	m_szEpisode = szEpisode ? strdup(szEpisode) : NULL;
+	m_iEpisodeNum = szEpisode ? ParsePrefixedInt(szEpisode) : 0;
+}
+
+int FeedItemInfo::ParsePrefixedInt(const char *szValue)
+{
+	const char* szVal = szValue;
+	if (!strchr("0123456789", *szVal))
+	{
+		szVal++;
+	}
+	return atoi(szVal);
+}
+
+void FeedItemInfo::SetAddCategory(const char* szAddCategory)
+{
+	free(m_szAddCategory);
+	m_szAddCategory = strdup(szAddCategory ? szAddCategory : "");
+}
+
+void FeedItemInfo::SetDupeKey(const char* szDupeKey)
+{
+	free(m_szDupeKey);
+	m_szDupeKey = strdup(szDupeKey ? szDupeKey : "");
+}
+
+void FeedItemInfo::AppendDupeKey(const char* szExtraDupeKey)
+{
+	if (!m_szDupeKey || *m_szDupeKey == '\0' || !szExtraDupeKey || *szExtraDupeKey == '\0')
+	{
+		return;
+	}
+
+	int iLen = (m_szDupeKey ? strlen(m_szDupeKey) : 0) + 1 + strlen(szExtraDupeKey) + 1;
+	char* szNewKey = (char*)malloc(iLen);
+	snprintf(szNewKey, iLen, "%s-%s", m_szDupeKey, szExtraDupeKey);
+	szNewKey[iLen - 1] = '\0';
+
+	free(m_szDupeKey);
+	m_szDupeKey = szNewKey;
+}
+
+void FeedItemInfo::BuildDupeKey(const char* szRageId, const char* szSeries)
+{
+	int iRageId = szRageId && *szRageId ? atoi(szRageId) : m_iRageId;
+
+	free(m_szDupeKey);
+
+	if (m_iImdbId != 0)
+	{
+		m_szDupeKey = (char*)malloc(20);
+		snprintf(m_szDupeKey, 20, "imdb=%i", m_iImdbId);
+	}
+	else if (szSeries && *szSeries && GetSeasonNum() != 0 && GetEpisodeNum() != 0)
+	{
+		int iLen = strlen(szSeries) + 50;
+		m_szDupeKey = (char*)malloc(iLen);
+		snprintf(m_szDupeKey, iLen, "series=%s-%s-%s", szSeries, m_szSeason, m_szEpisode);
+		m_szDupeKey[iLen-1] = '\0';
+	}
+	else if (iRageId != 0 && GetSeasonNum() != 0 && GetEpisodeNum() != 0)
+	{
+		m_szDupeKey = (char*)malloc(100);
+		snprintf(m_szDupeKey, 100, "rageid=%i-%s-%s", iRageId, m_szSeason, m_szEpisode);
+		m_szDupeKey[100-1] = '\0';
+	}
+	else
+	{
+		m_szDupeKey = strdup("");
+	}
+}
+
+int FeedItemInfo::GetSeasonNum()
+{
+	if (!m_szSeason && !m_bSeasonEpisodeParsed)
+	{
+		ParseSeasonEpisode();
+	}
+
+	return m_iSeasonNum;
+}
+
+int FeedItemInfo::GetEpisodeNum()
+{
+	if (!m_szEpisode && !m_bSeasonEpisodeParsed)
+	{
+		ParseSeasonEpisode();
+	}
+
+	return m_iEpisodeNum;
+}
+
+void FeedItemInfo::ParseSeasonEpisode()
+{
+	m_bSeasonEpisodeParsed = true;
+
+	RegEx* pRegEx = m_pSharedFeedData->GetSeasonEpisodeRegEx();
+
+	if (pRegEx->Match(m_szTitle))
+	{
+		char szRegValue[100];
+		char szValue[100];
+
+		snprintf(szValue, 100, "S%02d", atoi(m_szTitle + pRegEx->GetMatchStart(1)));
+		szValue[100-1] = '\0';
+		SetSeason(szValue);
+
+		int iLen = pRegEx->GetMatchLen(2);
+		iLen = iLen < 99 ? iLen : 99;
+		strncpy(szRegValue, m_szTitle + pRegEx->GetMatchStart(2), pRegEx->GetMatchLen(2));
+		szRegValue[iLen] = '\0';
+		snprintf(szValue, 100, "E%s", szRegValue);
+		szValue[100-1] = '\0';
+		Util::ReduceStr(szValue, "-", "");
+		for (char* p = szValue; *p; p++) *p = toupper(*p); // convert string to uppercase e02 -> E02
+		SetEpisode(szValue);
+	}
+}
+
+
+FeedHistoryInfo::FeedHistoryInfo(const char* szUrl, FeedHistoryInfo::EStatus eStatus, time_t tLastSeen)
+{
+	m_szUrl = szUrl ? strdup(szUrl) : NULL;
+	m_eStatus = eStatus;
+	m_tLastSeen = tLastSeen;
+}
+
+FeedHistoryInfo::~FeedHistoryInfo()
+{
+	free(m_szUrl);
+}
+
+
+FeedHistory::~FeedHistory()
+{
+	Clear();
+}
+
+void FeedHistory::Clear()
+{
+	for (iterator it = begin(); it != end(); it++)
+	{
+		delete *it;
+	}
+	clear();
+}
+
+void FeedHistory::Add(const char* szUrl, FeedHistoryInfo::EStatus eStatus, time_t tLastSeen)
+{
+	push_back(new FeedHistoryInfo(szUrl, eStatus, tLastSeen));
+}
+
+void FeedHistory::Remove(const char* szUrl)
+{
+	for (iterator it = begin(); it != end(); it++)
+	{
+		FeedHistoryInfo* pFeedHistoryInfo = *it;
+		if (!strcmp(pFeedHistoryInfo->GetUrl(), szUrl))
+		{
+			delete pFeedHistoryInfo;
+			erase(it);
+			break;
+		}
+	}
+}
+
+FeedHistoryInfo* FeedHistory::Find(const char* szUrl)
+{
+	for (iterator it = begin(); it != end(); it++)
+	{
+		FeedHistoryInfo* pFeedHistoryInfo = *it;
+		if (!strcmp(pFeedHistoryInfo->GetUrl(), szUrl))
+		{
+			return pFeedHistoryInfo;
+		}
+	}
+
+	return NULL;
+}
+
+
+FeedItemInfos::FeedItemInfos()
+{
+	debug("Creating FeedItemInfos");
+	
+	m_iRefCount = 0;
+}
+
+FeedItemInfos::~FeedItemInfos()
+{
+	debug("Destroing FeedItemInfos");
+	
+	for (iterator it = begin(); it != end(); it++)
+    {
+        delete *it;
+    }
+}
+
+void FeedItemInfos::Retain()
+{
+	m_iRefCount++;
+}
+
+void FeedItemInfos::Release()
+{
+	m_iRefCount--;
+	if (m_iRefCount <= 0)
+	{
+		delete this;
+	}
+}
+
+void FeedItemInfos::Add(FeedItemInfo* pFeedItemInfo)
+{
+	push_back(pFeedItemInfo);
+	pFeedItemInfo->SetSharedFeedData(&m_SharedFeedData);
+}
+
+
+SharedFeedData::SharedFeedData()
+{
+	m_pSeasonEpisodeRegEx = NULL;
+}
+
+SharedFeedData::~SharedFeedData()
+{
+	delete m_pSeasonEpisodeRegEx;
+}
+
+RegEx* SharedFeedData::GetSeasonEpisodeRegEx()
+{
+	if (!m_pSeasonEpisodeRegEx)
+	{
+		m_pSeasonEpisodeRegEx = new RegEx("[^[:alnum:]]s?([0-9]+)[ex]([0-9]+(-?e[0-9]+)?)[^[:alnum:]]", 10);
+	}
+
+	return m_pSeasonEpisodeRegEx;
+}

daemon/feed/FeedInfo.h

@@ -0,0 +1,278 @@
+/*
+ *  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: 0 $
+ * $Date$
+ *
+ */
+
+
+#ifndef FEEDINFO_H
+#define FEEDINFO_H
+
+#include <deque>
+#include <time.h>
+
+#include "Util.h"
+#include "DownloadInfo.h"
+
+
+class FeedInfo
+{
+public:
+	enum EStatus
+	{
+		fsUndefined,
+		fsRunning,
+		fsFinished,
+		fsFailed
+	};
+
+private:
+	int					m_iID;
+	char*				m_szName;
+	char*				m_szUrl;
+	int					m_iInterval;
+	char*				m_szFilter;
+	unsigned int		m_iFilterHash;
+	bool				m_bPauseNzb;
+	char*				m_szCategory;
+	int					m_iPriority;
+	time_t				m_tLastUpdate;
+	bool				m_bPreview;
+	EStatus				m_eStatus;
+	char*				m_szOutputFilename;
+	bool				m_bFetch;
+	bool				m_bForce;
+
+public:
+						FeedInfo(int iID, const char* szName, const char* szUrl, int iInterval,
+							const char* szFilter, bool bPauseNzb, const char* szCategory, int iPriority);
+						~FeedInfo();
+	int					GetID() { return m_iID; }
+	const char*			GetName() { return m_szName; }
+	const char*			GetUrl() { return m_szUrl; }
+	int					GetInterval() { return m_iInterval; }
+	const char*			GetFilter() { return m_szFilter; }
+	unsigned int		GetFilterHash() { return m_iFilterHash; }
+	bool				GetPauseNzb() { return m_bPauseNzb; }
+	const char*			GetCategory() { return m_szCategory; }
+	int					GetPriority() { return m_iPriority; }
+	time_t				GetLastUpdate() { return m_tLastUpdate; }
+	void				SetLastUpdate(time_t tLastUpdate) { m_tLastUpdate = tLastUpdate; }
+	bool				GetPreview() { return m_bPreview; }
+	void				SetPreview(bool bPreview) { m_bPreview = bPreview; }
+	EStatus				GetStatus() { return m_eStatus; }
+	void				SetStatus(EStatus Status) { m_eStatus = Status; }
+	const char*			GetOutputFilename() { return m_szOutputFilename; }
+	void 				SetOutputFilename(const char* szOutputFilename);
+	bool				GetFetch() { return m_bFetch; }
+	void				SetFetch(bool bFetch) { m_bFetch = bFetch; }
+	bool				GetForce() { return m_bForce; }
+	void				SetForce(bool bForce) { m_bForce = bForce; }
+};
+
+typedef std::deque<FeedInfo*> Feeds;
+
+class SharedFeedData
+{
+private:
+	RegEx*				m_pSeasonEpisodeRegEx;
+
+public:
+						SharedFeedData();
+						~SharedFeedData();
+	RegEx*				GetSeasonEpisodeRegEx();
+};
+
+class FeedItemInfo
+{
+public:
+	enum EStatus
+	{
+		isUnknown,
+		isBacklog,
+		isFetched,
+		isNew
+	};
+
+	enum EMatchStatus
+	{
+		msIgnored,
+		msAccepted,
+		msRejected
+	};
+
+	class Attr
+	{
+	private:
+		char*			m_szName;
+		char*			m_szValue;
+	public:
+						Attr(const char* szName, const char* szValue);
+						~Attr();
+		const char*		GetName() { return m_szName; }
+		const char*		GetValue() { return m_szValue; }
+	};
+	
+	typedef std::deque<Attr*>  AttributesBase;
+
+	class Attributes: public AttributesBase
+	{
+	public:
+						~Attributes();
+		void			Add(const char* szName, const char* szValue);
+		Attr*			Find(const char* szName);
+	};
+
+private:
+	char*				m_szTitle;
+	char*				m_szFilename;
+	char*				m_szUrl;
+	time_t				m_tTime;
+	long long			m_lSize;
+	char*				m_szCategory;
+	int					m_iImdbId;
+	int					m_iRageId;
+	char*				m_szDescription;
+	char*				m_szSeason;
+	char*				m_szEpisode;
+	int					m_iSeasonNum;
+	int					m_iEpisodeNum;
+	bool				m_bSeasonEpisodeParsed;
+	char*				m_szAddCategory;
+	bool				m_bPauseNzb;
+	int					m_iPriority;
+	EStatus				m_eStatus;
+	EMatchStatus		m_eMatchStatus;
+	int					m_iMatchRule;
+	char*				m_szDupeKey;
+	int					m_iDupeScore;
+	EDupeMode			m_eDupeMode;
+	SharedFeedData*		m_pSharedFeedData;
+	Attributes			m_Attributes;
+
+	int					ParsePrefixedInt(const char *szValue);
+	void				ParseSeasonEpisode();
+
+public:
+						FeedItemInfo();
+						~FeedItemInfo();
+	void				SetSharedFeedData(SharedFeedData* pSharedFeedData) { m_pSharedFeedData = pSharedFeedData; }
+	const char*			GetTitle() { return m_szTitle; }
+	void				SetTitle(const char* szTitle);
+	const char*			GetFilename() { return m_szFilename; }
+	void				SetFilename(const char* szFilename);
+	const char*			GetUrl() { return m_szUrl; }
+	void				SetUrl(const char* szUrl);
+	long long			GetSize() { return m_lSize; }
+	void				SetSize(long long lSize) { m_lSize = lSize; }
+	const char*			GetCategory() { return m_szCategory; }
+	void				SetCategory(const char* szCategory);
+	int					GetImdbId() { return m_iImdbId; }
+	void				SetImdbId(int iImdbId) { m_iImdbId = iImdbId; }
+	int					GetRageId() { return m_iRageId; }
+	void				SetRageId(int iRageId) { m_iRageId = iRageId; }
+	const char*			GetDescription() { return m_szDescription; }
+	void				SetDescription(const char* szDescription);
+	const char*			GetSeason() { return m_szSeason; }
+	void				SetSeason(const char* szSeason);
+	const char*			GetEpisode() { return m_szEpisode; }
+	void				SetEpisode(const char* szEpisode);
+	int					GetSeasonNum();
+	int					GetEpisodeNum();
+	const char*			GetAddCategory() { return m_szAddCategory; }
+	void				SetAddCategory(const char* szAddCategory);
+	bool				GetPauseNzb() { return m_bPauseNzb; }
+	void				SetPauseNzb(bool bPauseNzb) { m_bPauseNzb = bPauseNzb; }
+	int					GetPriority() { return m_iPriority; }
+	void				SetPriority(int iPriority) { m_iPriority = iPriority; }
+	time_t				GetTime() { return m_tTime; }
+	void				SetTime(time_t tTime) { m_tTime = tTime; }
+	EStatus				GetStatus() { return m_eStatus; }
+	void				SetStatus(EStatus eStatus) { m_eStatus = eStatus; }
+	EMatchStatus		GetMatchStatus() { return m_eMatchStatus; }
+	void				SetMatchStatus(EMatchStatus eMatchStatus) { m_eMatchStatus = eMatchStatus; }
+	int					GetMatchRule() { return m_iMatchRule; }
+	void				SetMatchRule(int iMatchRule) { m_iMatchRule = iMatchRule; }
+	const char*			GetDupeKey() { return m_szDupeKey; }
+	void				SetDupeKey(const char* szDupeKey);
+	void				AppendDupeKey(const char* szExtraDupeKey);
+	void				BuildDupeKey(const char* szRageId, const char* szSeries);
+	int					GetDupeScore() { return m_iDupeScore; }
+	void				SetDupeScore(int iDupeScore) { m_iDupeScore = iDupeScore; }
+	EDupeMode			GetDupeMode() { return m_eDupeMode; }
+	void				SetDupeMode(EDupeMode eDupeMode) { m_eDupeMode = eDupeMode; }
+	Attributes*			GetAttributes() { return &m_Attributes; }
+};
+
+typedef std::deque<FeedItemInfo*>	FeedItemInfosBase;
+
+class FeedItemInfos : public FeedItemInfosBase
+{
+private:
+	int					m_iRefCount;
+	SharedFeedData		m_SharedFeedData;
+
+public:
+						FeedItemInfos();
+						~FeedItemInfos();
+	void				Retain();
+	void				Release();
+	void				Add(FeedItemInfo* pFeedItemInfo);
+};
+
+class FeedHistoryInfo
+{
+public:
+	enum EStatus
+	{
+		hsUnknown,
+		hsBacklog,
+		hsFetched
+	};
+
+private:
+	char*				m_szUrl;
+	EStatus				m_eStatus;
+	time_t				m_tLastSeen;
+
+public:
+						FeedHistoryInfo(const char* szUrl, EStatus eStatus, time_t tLastSeen);
+						~FeedHistoryInfo();
+	const char*			GetUrl() { return m_szUrl; }
+	EStatus				GetStatus() { return m_eStatus; }
+	void				SetStatus(EStatus Status) { m_eStatus = Status; }
+	time_t				GetLastSeen() { return m_tLastSeen; }
+	void				SetLastSeen(time_t tLastSeen) { m_tLastSeen = tLastSeen; }
+};
+
+typedef std::deque<FeedHistoryInfo*> FeedHistoryBase;
+
+class FeedHistory : public FeedHistoryBase
+{
+public:
+						~FeedHistory();
+	void				Clear();
+	void				Add(const char* szUrl, FeedHistoryInfo::EStatus eStatus, time_t tLastSeen);
+	void				Remove(const char* szUrl);
+	FeedHistoryInfo*	Find(const char* szUrl);
+};
+
+#endif

daemon/frontend/ColoredFrontend.cpp

@@ -1,8 +1,8 @@
 /*
  *  This file if part of nzbget
  *
- *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -74,11 +74,11 @@ void ColoredFrontend::PrintStatus()
 	char tmp[1024];
 	char timeString[100];
 	timeString[0] = '\0';
-	float fCurrentDownloadSpeed = m_bStandBy ? 0 : m_fCurrentDownloadSpeed;
+	int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
 
-	if (fCurrentDownloadSpeed > 0.0 && !m_bPause)
+	if (iCurrentDownloadSpeed > 0 && !m_bPauseDownload)
 	{
-		long long remain_sec = m_lRemainingSize / ((long long)(fCurrentDownloadSpeed * 1024));
+		long long remain_sec = (long long)(m_lRemainingSize / iCurrentDownloadSpeed);
 		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_fDownloadLimit > 0.0f)
+	if (m_iDownloadLimit > 0)
 	{
-		sprintf(szDownloadLimit, ", Limit %.0f KB/S", m_fDownloadLimit);
+		sprintf(szDownloadLimit, ", Limit %.0f KB/s", (float)m_iDownloadLimit / 1024.0);
 	}
 	else
 	{
@@ -109,12 +109,14 @@ void ColoredFrontend::PrintStatus()
 	char* szControlSeq = "";
 #else
 	printf("\033[s");
-	char* szControlSeq = "\033[K";
+	const char* szControlSeq = "\033[K";
 #endif
 
-	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);
+	snprintf(tmp, 1024, " %d threads, %.*f KB/s, %.2f MB remaining%s%s%s%s%s\n", 
+		m_iThreadCount, (iCurrentDownloadSpeed >= 10*1024 ? 0 : 1), (float)iCurrentDownloadSpeed / 1024.0, 
+		(float)(Util::Int64ToFloat(m_lRemainingSize) / 1024.0 / 1024.0), timeString, szPostStatus, 
+		m_bPauseDownload ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
+		szDownloadLimit, szControlSeq);
 	tmp[1024-1] = '\0';
 	printf("%s", tmp);
 	m_bNeedGoBack = true;

daemon/frontend/ColoredFrontend.h

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$

daemon/frontend/Frontend.cpp

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -34,6 +34,7 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
 #ifndef WIN32
 #include <unistd.h>
 #include <arpa/inet.h>
@@ -46,14 +47,12 @@
 #include "Log.h"
 #include "Connection.h"
 #include "MessageBase.h"
-#include "QueueCoordinator.h"
-#include "PrePostProcessor.h"
 #include "RemoteClient.h"
 #include "Util.h"
+#include "StatMeter.h"
 
-extern QueueCoordinator* g_pQueueCoordinator;
-extern PrePostProcessor* g_pPrePostProcessor;
 extern Options* g_pOptions;
+extern StatMeter* g_pStatMeter;
 
 Frontend::Frontend()
 {
@@ -63,18 +62,16 @@ Frontend::Frontend()
 	m_iNeededLogEntries = 0;
 	m_bSummary = false;
 	m_bFileList = false;
-	m_fCurrentDownloadSpeed = 0;
+	m_iCurrentDownloadSpeed = 0;
 	m_lRemainingSize = 0;
-	m_bPause = false;
-	m_fDownloadLimit = 0;
+	m_bPauseDownload = false;
+	m_iDownloadLimit = 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();
 }
 
@@ -88,7 +85,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->GetServerIP(), g_pOptions->GetServerPort());
+			printf("\nUnable to send request to nzbget-server at %s (port %i)    \n", g_pOptions->GetControlIP(), g_pOptions->GetControlPort());
 			Stop();
 			return false;
 		}
@@ -97,15 +94,22 @@ bool Frontend::PrepareData()
 	{
 		if (m_bSummary)
 		{
-			m_fCurrentDownloadSpeed = g_pQueueCoordinator->CalcCurrentDownloadSpeed();
-			m_lRemainingSize = g_pQueueCoordinator->CalcRemainingSize();
-			m_bPause = g_pOptions->GetPause();
-			m_fDownloadLimit = g_pOptions->GetDownloadRate();
+			m_iCurrentDownloadSpeed = g_pStatMeter->CalcCurrentDownloadSpeed();
+			m_bPauseDownload = g_pOptions->GetPauseDownload();
+			m_iDownloadLimit = g_pOptions->GetDownloadRate();
 			m_iThreadCount = Thread::GetThreadCount();
-			PostQueue* pPostQueue = g_pPrePostProcessor->LockPostQueue();
-			m_iPostJobCount = pPostQueue->size();
-			g_pPrePostProcessor->UnlockPostQueue();
-			g_pQueueCoordinator->CalcStat(&m_iUpTimeSec, &m_iDnTimeSec, &m_iAllBytes, &m_bStandBy);
+			g_pStatMeter->CalcTotalStat(&m_iUpTimeSec, &m_iDnTimeSec, &m_iAllBytes, &m_bStandBy);
+
+			DownloadQueue *pDownloadQueue = DownloadQueue::Lock();
+			m_iPostJobCount = 0;
+			for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+			{
+				NZBInfo* pNZBInfo = *it;
+				m_iPostJobCount += pNZBInfo->GetPostInfo() ? 1 : 0;
+			}
+			pDownloadQueue->CalcRemainingSize(&m_lRemainingSize, NULL);
+			DownloadQueue::Unlock();
+
 		}
 	}
 	return true;
@@ -121,15 +125,13 @@ void Frontend::FreeData()
 		}
 		m_RemoteMessages.clear();
 
-		for (DownloadQueue::iterator it = m_RemoteQueue.begin(); it != m_RemoteQueue.end(); it++)
-		{
-			delete *it;
-		}
-		m_RemoteQueue.clear();
+		DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+		pDownloadQueue->GetQueue()->Clear();
+		DownloadQueue::Unlock();
 	}
 }
 
-Log::Messages * Frontend::LockMessages()
+Log::Messages* Frontend::LockMessages()
 {
 	if (IsRemoteMode())
 	{
@@ -149,24 +151,14 @@ void Frontend::UnlockMessages()
 	}
 }
 
-DownloadQueue * Frontend::LockQueue()
+DownloadQueue* Frontend::LockQueue()
 {
-	if (IsRemoteMode())
-	{
-		return &m_RemoteQueue;
-	}
-	else
-	{
-		return g_pQueueCoordinator->LockQueue();
-	}
+	return DownloadQueue::Lock();
 }
 
 void Frontend::UnlockQueue()
 {
-	if (!IsRemoteMode())
-	{
-		g_pQueueCoordinator->UnlockQueue();
-	}
+	DownloadQueue::Unlock();
 }
 
 bool Frontend::IsRemoteMode()
@@ -182,35 +174,24 @@ void Frontend::ServerPauseUnpause(bool bPause)
 	}
 	else
 	{
-		g_pOptions->SetPause(bPause);
+		g_pOptions->SetResumeTime(0);
+		g_pOptions->SetPauseDownload(bPause);
 	}
 }
 
-void Frontend::ServerSetDownloadRate(float fRate)
+void Frontend::ServerSetDownloadRate(int iRate)
 {
 	if (IsRemoteMode())
 	{
-		RequestSetDownloadRate(fRate);
+		RequestSetDownloadRate(iRate);
 	}
 	else
 	{
-		g_pOptions->SetDownloadRate(fRate);
+		g_pOptions->SetDownloadRate(iRate);
 	}
 }
 
-void Frontend::ServerDumpDebug()
-{
-	if (IsRemoteMode())
-	{
-		RequestDumpDebug();
-	}
-	else
-	{
-		g_pQueueCoordinator->LogDebugInfo();
-	}
-}
-
-bool Frontend::ServerEditQueue(QueueEditor::EEditAction eAction, int iOffset, int iID)
+bool Frontend::ServerEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iID)
 {
 	if (IsRemoteMode())
 	{
@@ -218,7 +199,10 @@ bool Frontend::ServerEditQueue(QueueEditor::EEditAction eAction, int iOffset, in
 	}
 	else
 	{
-		return g_pQueueCoordinator->GetQueueEditor()->EditEntry(iID, true, eAction, iOffset);
+		DownloadQueue* pDownloadQueue = LockQueue();
+		bool bOK = pDownloadQueue->EditEntry(iID, eAction, iOffset, NULL);
+		UnlockQueue();
+		return bOK;
 	}
 	return false;
 }
@@ -228,16 +212,19 @@ void Frontend::InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int
 	pMessageBase->m_iSignature	= htonl(NZBMESSAGE_SIGNATURE);
 	pMessageBase->m_iType = htonl(iRequest);
 	pMessageBase->m_iStructSize = htonl(iSize);
-	strncpy(pMessageBase->m_szPassword, g_pOptions->GetServerPassword(), NZBREQUESTPASSWORDSIZE);
+
+	strncpy(pMessageBase->m_szUsername, g_pOptions->GetControlUsername(), NZBREQUESTPASSWORDSIZE - 1);
+	pMessageBase->m_szUsername[NZBREQUESTPASSWORDSIZE - 1] = '\0';
+
+	strncpy(pMessageBase->m_szPassword, g_pOptions->GetControlPassword(), NZBREQUESTPASSWORDSIZE);
 	pMessageBase->m_szPassword[NZBREQUESTPASSWORDSIZE - 1] = '\0';
 }
 
 bool Frontend::RequestMessages()
 {
-	NetAddress netAddress(g_pOptions->GetServerIP(), g_pOptions->GetServerPort());
-	Connection connection(&netAddress);
+	Connection connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
 
-	bool OK = connection.Connect() >= 0;
+	bool OK = connection.Connect();
 	if (!OK)
 	{
 		return false;
@@ -255,15 +242,15 @@ bool Frontend::RequestMessages()
 		LogRequest.m_iIDFrom = 0;
 	}
 
-	if (connection.Send((char*)(&LogRequest), sizeof(LogRequest)) < 0)
+	if (!connection.Send((char*)(&LogRequest), sizeof(LogRequest)))
 	{
 		return false;
 	}
 
 	// Now listen for the returned log
 	SNZBLogResponse LogResponse;
-	int iResponseLen = connection.Recv((char*) &LogResponse, sizeof(LogResponse));
-	if (iResponseLen != sizeof(LogResponse) || 
+	bool bRead = connection.Recv((char*) &LogResponse, sizeof(LogResponse));
+	if (!bRead || 
 		(int)ntohl(LogResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
 		ntohl(LogResponse.m_MessageBase.m_iStructSize) != sizeof(LogResponse))
 	{
@@ -274,7 +261,7 @@ bool Frontend::RequestMessages()
 	if (ntohl(LogResponse.m_iTrailingDataLength) > 0)
 	{
 		pBuf = (char*)malloc(ntohl(LogResponse.m_iTrailingDataLength));
-		if (!connection.RecvAll(pBuf, ntohl(LogResponse.m_iTrailingDataLength)))
+		if (!connection.Recv(pBuf, ntohl(LogResponse.m_iTrailingDataLength)))
 		{
 			free(pBuf);
 			return false;
@@ -306,10 +293,9 @@ bool Frontend::RequestMessages()
 
 bool Frontend::RequestFileList()
 {
-	NetAddress netAddress(g_pOptions->GetServerIP(), g_pOptions->GetServerPort());
-	Connection connection(&netAddress);
+	Connection connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
 
-	bool OK = connection.Connect() >= 0;
+	bool OK = connection.Connect();
 	if (!OK)
 	{
 		return false;
@@ -320,15 +306,15 @@ bool Frontend::RequestFileList()
 	ListRequest.m_bFileList = htonl(m_bFileList);
 	ListRequest.m_bServerState = htonl(m_bSummary);
 
-	if (connection.Send((char*)(&ListRequest), sizeof(ListRequest)) < 0)
+	if (!connection.Send((char*)(&ListRequest), sizeof(ListRequest)))
 	{
 		return false;
 	}
 
 	// Now listen for the returned list
 	SNZBListResponse ListResponse;
-	int iResponseLen = connection.Recv((char*) &ListResponse, sizeof(ListResponse));
-	if (iResponseLen != sizeof(ListResponse) || 
+	bool bRead = connection.Recv((char*) &ListResponse, sizeof(ListResponse));
+	if (!bRead || 
 		(int)ntohl(ListResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
 		ntohl(ListResponse.m_MessageBase.m_iStructSize) != sizeof(ListResponse))
 	{
@@ -339,7 +325,7 @@ bool Frontend::RequestFileList()
 	if (ntohl(ListResponse.m_iTrailingDataLength) > 0)
 	{
 		pBuf = (char*)malloc(ntohl(ListResponse.m_iTrailingDataLength));
-		if (!connection.RecvAll(pBuf, ntohl(ListResponse.m_iTrailingDataLength)))
+		if (!connection.Recv(pBuf, ntohl(ListResponse.m_iTrailingDataLength)))
 		{
 			free(pBuf);
 			return false;
@@ -350,69 +336,28 @@ bool Frontend::RequestFileList()
 
 	if (m_bSummary)
 	{
-		m_bPause = ntohl(ListResponse.m_bServerPaused);
+		m_bPauseDownload = ntohl(ListResponse.m_bDownloadPaused);
 		m_lRemainingSize = Util::JoinInt64(ntohl(ListResponse.m_iRemainingSizeHi), ntohl(ListResponse.m_iRemainingSizeLo));
-		m_fCurrentDownloadSpeed = ntohl(ListResponse.m_iDownloadRate) / 1024.0f;
-		m_fDownloadLimit = ntohl(ListResponse.m_iDownloadLimit) / 1024.0f;
+		m_iCurrentDownloadSpeed = ntohl(ListResponse.m_iDownloadRate);
+		m_iDownloadLimit = ntohl(ListResponse.m_iDownloadLimit);
 		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_bServerStandBy);
+		m_bStandBy = ntohl(ListResponse.m_bDownloadStandBy);
 		m_iAllBytes = Util::JoinInt64(ntohl(ListResponse.m_iDownloadedBytesHi), ntohl(ListResponse.m_iDownloadedBytesLo));
 	}
 
 	if (m_bFileList && ntohl(ListResponse.m_iTrailingDataLength) > 0)
 	{
-		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);
-			
-			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);
-				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);
-		}
+		RemoteClient client;
+		client.SetVerbose(false);
+		
+		DownloadQueue* pDownloadQueue = LockQueue();
+		client.BuildFileList(&ListResponse, pBuf, pDownloadQueue);
+		UnlockQueue();
 	}
+
 	if (pBuf)
 	{
 		free(pBuf);
@@ -425,26 +370,19 @@ bool Frontend::RequestPauseUnpause(bool bPause)
 {
 	RemoteClient client;
 	client.SetVerbose(false);
-	return client.RequestServerPauseUnpause(bPause);
+	return client.RequestServerPauseUnpause(bPause, eRemotePauseUnpauseActionDownload);
 }
 
-bool Frontend::RequestSetDownloadRate(float fRate)
+bool Frontend::RequestSetDownloadRate(int iRate)
 {
 	RemoteClient client;
 	client.SetVerbose(false);
-	return client.RequestServerSetDownloadRate(fRate);
+	return client.RequestServerSetDownloadRate(iRate);
 }
 
-bool Frontend::RequestDumpDebug()
+bool Frontend::RequestEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iID)
 {
 	RemoteClient client;
 	client.SetVerbose(false);
-	return client.RequestServerDumpDebug();
-}
-
-bool Frontend::RequestEditQueue(int iAction, int iOffset, int iID)
-{
-	RemoteClient client;
-	client.SetVerbose(false);
-	return client.RequestServerEditQueue(iAction, iOffset, &iID, 1, false);
+	return client.RequestServerEditQueue(eAction, iOffset, NULL, &iID, 1, NULL, eRemoteMatchModeID);
 }

daemon/frontend/Frontend.h

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -37,7 +37,6 @@ class Frontend : public Thread
 {
 private:
 	Log::Messages		m_RemoteMessages;
-	DownloadQueue		m_RemoteQueue;
 
 	bool				RequestMessages();
 	bool				RequestFileList();
@@ -50,10 +49,10 @@ protected:
 	int					m_iUpdateInterval;
 
 	// summary
-	float				m_fCurrentDownloadSpeed;
+	int					m_iCurrentDownloadSpeed;
 	long long 			m_lRemainingSize;
-	bool				m_bPause;
-	float				m_fDownloadLimit;
+	bool				m_bPauseDownload;
+	int					m_iDownloadLimit;
 	int					m_iThreadCount;
 	int					m_iPostJobCount;
 	int					m_iUpTimeSec;
@@ -71,12 +70,10 @@ protected:
 	void				InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int iSize);
 	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(int iAction, int iOffset, int iID);
+	void				ServerSetDownloadRate(int iRate);
+	bool				RequestSetDownloadRate(int iRate);
+	bool 				ServerEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iEntry);
+	bool 				RequestEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iID);
 
 public:
 						Frontend();

daemon/frontend/LoggableFrontend.cpp

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$

daemon/frontend/LoggableFrontend.h

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$

daemon/frontend/NCursesFrontend.cpp

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #ifdef WIN32
@@ -60,6 +60,18 @@
 #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();
 
@@ -74,6 +86,7 @@ static const int NCURSES_COLORPAIR_KEYBAR		= 8;
 static const int NCURSES_COLORPAIR_INFOLINE		= 9;
 static const int NCURSES_COLORPAIR_TEXTHIGHL	= 10;
 static const int NCURSES_COLORPAIR_CURSOR		= 11;
+static const int NCURSES_COLORPAIR_HINT			= 12;
 
 static const int MAX_SCREEN_WIDTH				= 512;
 
@@ -125,10 +138,10 @@ NCursesFrontend::NCursesFrontend()
 	m_bGroupFiles = g_pOptions->GetCursesGroup();
 	m_QueueWindowPercentage = 0.5f;
 	m_iDataUpdatePos = 0;
+    m_bUpdateNextTime = false;
 	m_iLastEditEntry = -1;
 	m_bLastPausePars = false;
-
-	m_groupQueue.clear();
+	m_szHint = NULL;
 
     // Setup curses
 #ifdef WIN32
@@ -182,20 +195,16 @@ NCursesFrontend::NCursesFrontend()
         init_pair(NCURSES_COLORPAIR_INFOLINE,	COLOR_WHITE,	COLOR_BLUE);
         init_pair(NCURSES_COLORPAIR_TEXTHIGHL,	COLOR_BLACK,	COLOR_CYAN);
         init_pair(NCURSES_COLORPAIR_CURSOR,		COLOR_BLACK,	COLOR_YELLOW);
+        init_pair(NCURSES_COLORPAIR_HINT,		COLOR_WHITE,	COLOR_RED);
     }
 }
 
 NCursesFrontend::~NCursesFrontend()
 {
 #ifdef WIN32
-	if (m_pScreenBuffer)
-	{
-		free(m_pScreenBuffer);
-	}
-	if (m_pOldScreenBuffer)
-	{
-		free(m_pOldScreenBuffer);
-	}
+	free(m_pScreenBuffer);
+	free(m_pOldScreenBuffer);
+
 	m_ColorAttr.clear();
 
 	HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -210,37 +219,56 @@ NCursesFrontend::~NCursesFrontend()
     endwin();
 #endif
     printf("\n");
+	SetHint(NULL);
 }
 
 void NCursesFrontend::Run()
 {
     debug("Entering NCursesFrontend-loop");
 
-	int iScreenUpdateInterval = 25;
-	int iScreenUpdatePos = 0;
 	m_iDataUpdatePos = 0;
 
     while (!IsStopped())
     {
         // The data (queue and log) is updated each m_iUpdateInterval msec,
         // but the window is updated more often for better reaction on user's input
-		if (iScreenUpdatePos <= 0 || m_iDataUpdatePos <= 0)
+
+		bool updateNow = false;
+		int iKey = ReadConsoleKey();
+
+		if (iKey != READKEY_EMPTY)
 		{
-			iScreenUpdatePos = iScreenUpdateInterval;
-			Update();
-			if (m_iDataUpdatePos <= 0)
-			{
-				m_iDataUpdatePos = m_iUpdateInterval;
-			}
+			// Update now and next if a key is pressed.
+			updateNow = true;
+			m_bUpdateNextTime = true;
+		} 
+		else if (m_bUpdateNextTime)
+		{
+			// Update due to key being pressed during previous call.
+			updateNow = true;
+			m_bUpdateNextTime = false;
+		} 
+		else if (m_iDataUpdatePos <= 0) 
+		{
+			updateNow = true;
+			m_bUpdateNextTime = false;
+		}
+
+		if (updateNow) 
+		{
+			Update(iKey);
+		}
+
+		if (m_iDataUpdatePos <= 0)
+		{
+			m_iDataUpdatePos = m_iUpdateInterval;
 		}
 
 		usleep(10 * 1000);
-		iScreenUpdatePos -= 10;
 		m_iDataUpdatePos -= 10;
     }
 
     FreeData();
-	ClearGroupQueue();
 	
     debug("Exiting NCursesFrontend-loop");
 }
@@ -248,9 +276,10 @@ void NCursesFrontend::Run()
 void NCursesFrontend::NeedUpdateData()
 {
 	m_iDataUpdatePos = 10;
+	m_bUpdateNextTime = true;
 }
 
-void NCursesFrontend::Update()
+void NCursesFrontend::Update(int iKey)
 {
     // Figure out how big the screen is
 	CalcWindowSizes();
@@ -258,13 +287,14 @@ void NCursesFrontend::Update()
     if (m_iDataUpdatePos <= 0)
     {
         FreeData();
-		ClearGroupQueue();
 		m_iNeededLogEntries = m_iMessagesWinClientHeight;
         if (!PrepareData())
         {
             return;
         }
-		PrepareGroupQueue();
+
+		// recalculate frame sizes
+		CalcWindowSizes();
     }
 
 	if (m_eInputMode == eEditQueue)
@@ -278,7 +308,7 @@ void NCursesFrontend::Update()
 	}
 
     //------------------------------------------
-    // Print Current NZBQueue
+    // Print Current NZBInfoList
     //------------------------------------------
 	if (m_iQueueWinHeight > 0)
 	{
@@ -297,8 +327,7 @@ void NCursesFrontend::Update()
 
 	PrintKeyInputBar();
 
-    // Update the input
-    UpdateInput();
+    UpdateInput(iKey);
 
 	RefreshScreen();
 }
@@ -324,7 +353,7 @@ void NCursesFrontend::CalcWindowSizes()
 		m_pOldScreenBuffer = (CHAR_INFO*)realloc(m_pOldScreenBuffer, m_iScreenBufferSize);
 		memset(m_pOldScreenBuffer, 0, m_iScreenBufferSize);
 #else
-        clear();
+        curses_clear();
 #endif
         m_iScreenHeight = iNrRows;
         m_iScreenWidth = iNrColumns;
@@ -355,17 +384,22 @@ void NCursesFrontend::CalcWindowSizes()
 
 int NCursesFrontend::CalcQueueSize()
 {
+	int iQueueSize = 0;
+	DownloadQueue* pDownloadQueue = LockQueue();
 	if (m_bGroupFiles)
 	{
-		return m_groupQueue.size();
+		iQueueSize = pDownloadQueue->GetQueue()->size();
 	}
 	else
 	{
-		DownloadQueue* pDownloadQueue = LockQueue();
-		int iQueueSize = pDownloadQueue->size();
-		UnlockQueue();
-		return iQueueSize;
+		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+		{
+			NZBInfo* pNZBInfo = *it;
+			iQueueSize += pNZBInfo->GetFileList()->size();
+		}
 	}
+	UnlockQueue();
+	return iQueueSize;
 }
 
 void NCursesFrontend::PlotLine(const char * szString, int iRow, int iPos, int iColorPair)
@@ -501,7 +535,7 @@ void NCursesFrontend::PrintMessages()
 
 int NCursesFrontend::PrintMessage(Message* Msg, int iRow, int iMaxLines)
 {
-    char* szMessageType[] = { "INFO    ", "WARNING ", "ERROR   ", "DEBUG   ", "DETAIL  "};
+    const char* szMessageType[] = { "INFO    ", "WARNING ", "ERROR   ", "DEBUG   ", "DETAIL  "};
     const int iMessageTypeColor[] = { NCURSES_COLORPAIR_INFO, NCURSES_COLORPAIR_WARNING,
     	NCURSES_COLORPAIR_ERROR, NCURSES_COLORPAIR_DEBUG, NCURSES_COLORPAIR_DETAIL };
 
@@ -513,6 +547,8 @@ int NCursesFrontend::PrintMessage(Message* Msg, int iRow, int iMaxLines)
 		szText = (char*)malloc(iLen);
 
 		time_t rawtime = Msg->GetTime();
+		rawtime += g_pOptions->GetTimeCorrection();
+
 		char szTime[50];
 #ifdef HAVE_CTIME_R_3
 		ctime_r(&rawtime, szTime, 50);
@@ -576,10 +612,10 @@ void NCursesFrontend::PrintStatus()
     char timeString[100];
     timeString[0] = '\0';
 
-	float fCurrentDownloadSpeed = m_bStandBy ? 0 : m_fCurrentDownloadSpeed;
-    if (fCurrentDownloadSpeed > 0.0 && !m_bPause)
+	int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
+    if (iCurrentDownloadSpeed > 0 && !m_bPauseDownload)
     {
-        long long remain_sec = (long long)(m_lRemainingSize / (fCurrentDownloadSpeed * 1024));
+        long long remain_sec = (long long)(m_lRemainingSize / iCurrentDownloadSpeed);
 		int h = (int)(remain_sec / 3600);
 		int m = (int)((remain_sec % 3600) / 60);
 		int s = (int)(remain_sec % 60);
@@ -587,9 +623,9 @@ void NCursesFrontend::PrintStatus()
     }
 
     char szDownloadLimit[128];
-    if (m_fDownloadLimit > 0.0f)
+    if (m_iDownloadLimit > 0)
     {
-        sprintf(szDownloadLimit, ", Limit %.0f KB/s", m_fDownloadLimit);
+        sprintf(szDownloadLimit, ", Limit %.0f KB/s", (float)m_iDownloadLimit / 1024.0);
     }
     else
     {
@@ -606,11 +642,13 @@ void NCursesFrontend::PrintStatus()
         szPostStatus[0] = 0;
     }
 
-	float fAverageSpeed = Util::Int64ToFloat(m_iDnTimeSec > 0 ? m_iAllBytes / m_iDnTimeSec / 1024 : 0);
+	float fAverageSpeed = (float)(Util::Int64ToFloat(m_iDnTimeSec > 0 ? m_iAllBytes / m_iDnTimeSec : 0) / 1024.0);
 
-	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);
+	snprintf(tmp, MAX_SCREEN_WIDTH, " %d threads, %.*f KB/s, %.2f MB remaining%s%s%s%s, Avg. %.*f KB/s", 
+		m_iThreadCount, (iCurrentDownloadSpeed >= 10*1024 ? 0 : 1), (float)iCurrentDownloadSpeed / 1024.0, 
+		(float)(Util::Int64ToFloat(m_lRemainingSize) / 1024.0 / 1024.0), timeString, szPostStatus, 
+		m_bPauseDownload ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
+		szDownloadLimit, (fAverageSpeed >= 10 ? 0 : 1), fAverageSpeed);
 	tmp[MAX_SCREEN_WIDTH - 1] = '\0';
     PlotLine(tmp, iStatusRow, 0, NCURSES_COLORPAIR_STATUS);
 }
@@ -620,6 +658,20 @@ void NCursesFrontend::PrintKeyInputBar()
     int iQueueSize = CalcQueueSize();
 	int iInputBarRow = m_iScreenHeight - 1;
 	
+	if (m_szHint)
+	{
+		time_t tTime = time(NULL);
+		if (tTime - m_tStartHint < 5)
+		{
+			PlotLine(m_szHint, iInputBarRow, 0, NCURSES_COLORPAIR_HINT);
+			return;
+		}
+		else
+		{
+			SetHint(NULL);
+		}
+	}
+
     switch (m_eInputMode)
     {
     case eNormal:
@@ -634,7 +686,7 @@ void NCursesFrontend::PrintKeyInputBar()
         break;
     case eEditQueue:
     {
-		char* szStatus = NULL;
+		const char* szStatus = NULL;
 		if (m_iSelectedQueueEntry > 0 && iQueueSize > 1 && m_iSelectedQueueEntry == iQueueSize - 1)
 		{
 			szStatus = "(Q)uit | (E)xit | (P)ause | (D)elete | (U)p/(T)op";
@@ -666,6 +718,17 @@ void NCursesFrontend::PrintKeyInputBar()
     }
 }
 
+void NCursesFrontend::SetHint(const char* szHint)
+{
+	free(m_szHint);
+	m_szHint = NULL;
+	if (szHint)
+	{
+		m_szHint = strdup(szHint);
+		m_tStartHint = time(NULL);
+	}
+}
+
 void NCursesFrontend::PrintQueue()
 {
 	if (m_bGroupFiles)
@@ -680,31 +743,24 @@ void NCursesFrontend::PrintQueue()
 
 void NCursesFrontend::PrintFileQueue()
 {
-	int iLineNr = m_iQueueWinTop;
-			
     DownloadQueue* pDownloadQueue = LockQueue();
-	if (pDownloadQueue->empty())
-    {
-		char szBuffer[MAX_SCREEN_WIDTH];
-		snprintf(szBuffer, sizeof(szBuffer), "%s Files for downloading", m_bUseColor ? "" : "*** ");
-		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
-		PrintTopHeader(szBuffer, iLineNr++, true);
-        PlotLine("Ready to receive nzb-job", iLineNr++, 0, NCURSES_COLORPAIR_TEXT);
-    }
-    else
-    {
-		iLineNr++;
-		long long lRemaining = 0;
-		long long lPaused = 0;
-		int iPausedFiles = 0;
-		int i = 0;
-        for (DownloadQueue::iterator it = pDownloadQueue->begin(); it != pDownloadQueue->end(); it++, i++)
-        {
-            FileInfo* pFileInfo = *it;
 
-			if (i >= m_iQueueScrollOffset && i < m_iQueueScrollOffset + m_iQueueWinHeight -1)
+	int iLineNr = m_iQueueWinTop + 1;
+	long long lRemaining = 0;
+	long long lPaused = 0;
+	int iPausedFiles = 0;
+	int iFileNum = 0;
+
+	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+	{
+		NZBInfo* pNZBInfo = *it;
+		for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++, iFileNum++)
+		{
+			FileInfo* pFileInfo = *it2;
+
+			if (iFileNum >= m_iQueueScrollOffset && iFileNum < m_iQueueScrollOffset + m_iQueueWinHeight -1)
 			{
-				PrintFilename(pFileInfo, iLineNr++, i == m_iSelectedQueueEntry);
+				PrintFilename(pFileInfo, iLineNr++, iFileNum == m_iSelectedQueueEntry);
 			}
 
 			if (pFileInfo->GetPaused())
@@ -713,20 +769,34 @@ void NCursesFrontend::PrintFileQueue()
 				lPaused += pFileInfo->GetRemainingSize();
 			}
 			lRemaining += pFileInfo->GetRemainingSize();
-        }
-		
+		}
+	}
+
+	if (iFileNum > 0)
+	{
 		char szRemaining[20];
-		FormatFileSize(szRemaining, sizeof(szRemaining), lRemaining);
+		Util::FormatFileSize(szRemaining, sizeof(szRemaining), lRemaining);
 
 		char szUnpaused[20];
-		FormatFileSize(szUnpaused, sizeof(szUnpaused), lRemaining - lPaused);
+		Util::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->size(), pDownloadQueue->size() - iPausedFiles, szRemaining, szUnpaused);
+			m_bUseColor ? "" : "*** ", iFileNum,
+			iFileNum - iPausedFiles, szRemaining, szUnpaused);
 		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
 		PrintTopHeader(szBuffer, m_iQueueWinTop, true);
     }
+	else
+	{
+		iLineNr--;
+		char szBuffer[MAX_SCREEN_WIDTH];
+		snprintf(szBuffer, sizeof(szBuffer), "%s Files for downloading", m_bUseColor ? "" : "*** ");
+		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
+		PrintTopHeader(szBuffer, iLineNr++, true);
+        PlotLine("Ready to receive nzb-job", iLineNr++, 0, NCURSES_COLORPAIR_TEXT);
+	}
+
     UnlockQueue();
 }
 
@@ -749,6 +819,19 @@ 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->GetNZBInfo()->GetPriority() != 0)
+	{
+		sprintf(szPriority, " [%+i]", pFileInfo->GetNZBInfo()->GetPriority());
+	}
+
 	char szCompleted[20];
 	szCompleted[0] = '\0';
 	if (pFileInfo->GetRemainingSize() < pFileInfo->GetSize())
@@ -759,7 +842,7 @@ void NCursesFrontend::PrintFilename(FileInfo * pFileInfo, int iRow, bool bSelect
 	char szNZBNiceName[1024];
 	if (m_bShowNZBname)
 	{
-		pFileInfo->GetNZBInfo()->GetNiceNZBName(szNZBNiceName, 1023);
+		strncpy(szNZBNiceName, pFileInfo->GetNZBInfo()->GetName(), 1023);
 		int len = strlen(szNZBNiceName);
 		szNZBNiceName[len] = PATH_SEPARATOR;
 		szNZBNiceName[len + 1] = '\0';
@@ -770,35 +853,15 @@ void NCursesFrontend::PrintFilename(FileInfo * pFileInfo, int iRow, bool bSelect
 	}
 
 	char szBuffer[MAX_SCREEN_WIDTH];
-	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),
+	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),
 		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];
@@ -863,8 +926,8 @@ void NCursesFrontend::PrintGroupQueue()
 {
 	int iLineNr = m_iQueueWinTop;
 
-	GroupQueue* pGroupQueue = &m_groupQueue;
-	if (pGroupQueue->empty())
+    DownloadQueue* pDownloadQueue = LockQueue();
+	if (pDownloadQueue->GetQueue()->empty())
     {
 		char szBuffer[MAX_SCREEN_WIDTH];
 		snprintf(szBuffer, sizeof(szBuffer), "%s NZBs for downloading", m_bUseColor ? "" : "*** ");
@@ -875,153 +938,241 @@ void NCursesFrontend::PrintGroupQueue()
     else
     {
 		iLineNr++;
-		long long lRemaining = 0;
-		long long lPaused = 0;
-		int i = 0;
-        for (GroupQueue::iterator it = pGroupQueue->begin(); it != pGroupQueue->end(); it++, i++)
-        {
-            GroupInfo* pGroupInfo = *it;
 
+		ResetColWidths();
+		int iCalcLineNr = iLineNr;
+		int i = 0;
+        for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++, i++)
+        {
+            NZBInfo* pNZBInfo = *it;
 			if (i >= m_iQueueScrollOffset && i < m_iQueueScrollOffset + m_iQueueWinHeight -1)
 			{
-				PrintGroupname(pGroupInfo, iLineNr++, i == m_iSelectedQueueEntry);
+				PrintGroupname(pNZBInfo, iCalcLineNr++, false, true);
 			}
+        }
 
-			lRemaining += pGroupInfo->GetRemainingSize();
-			lPaused += pGroupInfo->GetPausedSize();
+		long long lRemaining = 0;
+		long long lPaused = 0;
+		i = 0;
+        for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++, i++)
+        {
+            NZBInfo* pNZBInfo = *it;
+			if (i >= m_iQueueScrollOffset && i < m_iQueueScrollOffset + m_iQueueWinHeight -1)
+			{
+				PrintGroupname(pNZBInfo, iLineNr++, i == m_iSelectedQueueEntry, false);
+			}
+			lRemaining += pNZBInfo->GetRemainingSize();
+			lPaused += pNZBInfo->GetPausedSize();
         }
 		
 		char szRemaining[20];
-		FormatFileSize(szRemaining, sizeof(szRemaining), lRemaining);
+		Util::FormatFileSize(szRemaining, sizeof(szRemaining), lRemaining);
 
 		char szUnpaused[20];
-		FormatFileSize(szUnpaused, sizeof(szUnpaused), lRemaining - lPaused);
+		Util::FormatFileSize(szUnpaused, sizeof(szUnpaused), lRemaining - lPaused);
 		
 		char szBuffer[MAX_SCREEN_WIDTH];
 		snprintf(szBuffer, sizeof(szBuffer), " %sNZBs for downloading - %i NZBs in queue - %s / %s", 
-			m_bUseColor ? "" : "*** ", pGroupQueue->size(), szRemaining, szUnpaused);
+			m_bUseColor ? "" : "*** ", (int)pDownloadQueue->GetQueue()->size(), szRemaining, szUnpaused);
 		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
 		PrintTopHeader(szBuffer, m_iQueueWinTop, false);
     }
+    UnlockQueue();
 }
 
-void NCursesFrontend::PrintGroupname(GroupInfo * pGroupInfo, int iRow, bool bSelected)
+void NCursesFrontend::ResetColWidths()
 {
-	int color = 0;
-	const char* Brace1 = "[";
-	const char* Brace2 = "]";
+	m_iColWidthFiles = 0;
+	m_iColWidthTotal = 0;
+	m_iColWidthLeft = 0;
+}
+
+void NCursesFrontend::PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected, bool bCalcColWidth)
+{
+	int color = NCURSES_COLORPAIR_TEXT;
+	char chBrace1 = '[';
+	char chBrace2 = ']';
 	if (m_eInputMode == eEditQueue && bSelected)
 	{
 		color = NCURSES_COLORPAIR_TEXTHIGHL;
 		if (!m_bUseColor)
 		{
-			Brace1 = "<";
-			Brace2 = ">";
+			chBrace1 = '<';
+			chBrace2 = '>';
+		}
+	}
+
+	const char* szDownloading = "";
+	if (pNZBInfo->GetActiveDownloads() > 0)
+	{
+		szDownloading = " *";
+	}
+
+	long long lUnpausedRemainingSize = pNZBInfo->GetRemainingSize() - pNZBInfo->GetPausedSize();
+
+	char szRemaining[20];
+	Util::FormatFileSize(szRemaining, sizeof(szRemaining), lUnpausedRemainingSize);
+
+	char szPriority[100];
+	szPriority[0] = '\0';
+	if (pNZBInfo->GetPriority() != 0)
+	{
+		sprintf(szPriority, " [%+i]", pNZBInfo->GetPriority());
+	}
+
+	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", (int)pNZBInfo->GetFileList()->size(), pNZBInfo->GetPausedFileCount());
+		szFiles[20-1] = '\0';
+		
+		char szTotal[20];
+		Util::FormatFileSize(szTotal, sizeof(szTotal), pNZBInfo->GetSize());
+
+		char szNameWithIds[1024];
+		snprintf(szNameWithIds, 1024, "%c%i%c%s%s %s", chBrace1, pNZBInfo->GetID(), chBrace2, 
+			szPriority, szDownloading, pNZBInfo->GetName());
+		szNameWithIds[iNameLen] = '\0';
+
+		char szTime[100];
+		szTime[0] = '\0';
+		int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
+		if (pNZBInfo->GetPausedSize() > 0 && lUnpausedRemainingSize == 0)
+		{
+			snprintf(szTime, 100, "[paused]");
+			Util::FormatFileSize(szRemaining, sizeof(szRemaining), pNZBInfo->GetRemainingSize());
+		}
+		else if (iCurrentDownloadSpeed > 0 && !m_bPauseDownload)
+		{
+			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
 	{
-		color = NCURSES_COLORPAIR_TEXT;
+		snprintf(szBuffer, MAX_SCREEN_WIDTH, "%c%i%c%s %s", chBrace1, pNZBInfo->GetID(), 
+			chBrace2, szDownloading, pNZBInfo->GetName());
 	}
 
-	long long lUnpausedRemainingSize = pGroupInfo->GetRemainingSize() - pGroupInfo->GetPausedSize();
-
-	char szRemaining[20];
-	FormatFileSize(szRemaining, sizeof(szRemaining), lUnpausedRemainingSize);
-
-	char szPaused[20];
-	szPaused[0] = '\0';
-	if (pGroupInfo->GetPausedSize() > 0)
-	{
-		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];
-	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';
 
-	PlotLine(szBuffer, iRow, 0, color);
-}
-
-void NCursesFrontend::PrepareGroupQueue()
-{
-	m_groupQueue.clear();
-
-    DownloadQueue* pDownloadQueue = LockQueue();
-	GroupInfo::BuildGroups(pDownloadQueue, &m_groupQueue);
-	UnlockQueue();
-}
-
-void NCursesFrontend::ClearGroupQueue()
-{
-	for (GroupQueue::iterator it = m_groupQueue.begin(); it != m_groupQueue.end(); it++)
+	if (!bCalcColWidth)
 	{
-		delete *it;
+		PlotLine(szBuffer, iRow, 0, color);
 	}
-	m_groupQueue.clear();
 }
 
-bool NCursesFrontend::EditQueue(QueueEditor::EEditAction eAction, int iOffset)
+bool NCursesFrontend::EditQueue(DownloadQueue::EEditAction eAction, int iOffset)
 {
 	int ID = 0;
 
 	if (m_bGroupFiles)
 	{
-		if (m_iSelectedQueueEntry >= 0 && m_iSelectedQueueEntry < (int)m_groupQueue.size())
+		DownloadQueue* pDownloadQueue = LockQueue();
+		if (m_iSelectedQueueEntry >= 0 && m_iSelectedQueueEntry < (int)pDownloadQueue->GetQueue()->size())
 		{
-			GroupInfo* pGroupInfo = m_groupQueue[m_iSelectedQueueEntry];
-			ID = pGroupInfo->GetLastID();
-			if (eAction == QueueEditor::eaFilePause)
+			NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->at(m_iSelectedQueueEntry);
+			ID = pNZBInfo->GetID();
+			if (eAction == DownloadQueue::eaFilePause)
 			{
-				if (pGroupInfo->GetRemainingSize() == pGroupInfo->GetPausedSize())
+				if (pNZBInfo->GetRemainingSize() == pNZBInfo->GetPausedSize())
 				{
-					eAction = QueueEditor::eaFileResume;
+					eAction = DownloadQueue::eaFileResume;
 				}
-				else if (pGroupInfo->GetPausedSize() == 0 && (pGroupInfo->GetRemainingParCount() > 0) &&
+				else if (pNZBInfo->GetPausedSize() == 0 && (pNZBInfo->GetRemainingParCount() > 0) &&
 					!(m_bLastPausePars && m_iLastEditEntry == m_iSelectedQueueEntry))
 				{
-					eAction = QueueEditor::eaFilePauseExtraPars;
+					eAction = DownloadQueue::eaFilePauseExtraPars;
 					m_bLastPausePars = true;
 				}
 				else
 				{
-					eAction = QueueEditor::eaFilePause;
+					eAction = DownloadQueue::eaFilePause;
 					m_bLastPausePars = false;
 				}
 			}
 		}
+		UnlockQueue();
 
 		// map file-edit-actions to group-edit-actions
-		QueueEditor::EEditAction FileToGroupMap[] = {
-			(QueueEditor::EEditAction)0,
-			QueueEditor::eaGroupMoveOffset, 
-			QueueEditor::eaGroupMoveTop, 
-			QueueEditor::eaGroupMoveBottom, 
-			QueueEditor::eaGroupPause, 
-			QueueEditor::eaGroupResume, 
-			QueueEditor::eaGroupDelete,
-			QueueEditor::eaGroupPauseAllPars,
-			QueueEditor::eaGroupPauseExtraPars };
+		 DownloadQueue::EEditAction FileToGroupMap[] = {
+			(DownloadQueue::EEditAction)0,
+			DownloadQueue::eaGroupMoveOffset, 
+			DownloadQueue::eaGroupMoveTop, 
+			DownloadQueue::eaGroupMoveBottom, 
+			DownloadQueue::eaGroupPause, 
+			DownloadQueue::eaGroupResume, 
+			DownloadQueue::eaGroupDelete,
+			DownloadQueue::eaGroupPauseAllPars,
+			DownloadQueue::eaGroupPauseExtraPars };
 		eAction = FileToGroupMap[eAction];
 	}
 	else
 	{
 		DownloadQueue* pDownloadQueue = LockQueue();
-		if (m_iSelectedQueueEntry >= 0 && m_iSelectedQueueEntry < (int)pDownloadQueue->size())
+
+		int iFileNum = 0;
+		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
 		{
-			FileInfo* pFileInfo = (*pDownloadQueue)[m_iSelectedQueueEntry];
-			ID = pFileInfo->GetID();
-			if (eAction == QueueEditor::eaFilePause)
+			NZBInfo* pNZBInfo = *it;
+			for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++, iFileNum++)
 			{
-				eAction = !pFileInfo->GetPaused() ? QueueEditor::eaFilePause : QueueEditor::eaFileResume;
+				if (m_iSelectedQueueEntry == iFileNum)
+				{
+					FileInfo* pFileInfo = *it2;
+					ID = pFileInfo->GetID();
+					if (eAction == DownloadQueue::eaFilePause)
+					{
+						eAction = !pFileInfo->GetPaused() ? DownloadQueue::eaFilePause : DownloadQueue::eaFileResume;
+					}
+				}
 			}
 		}
+
 		UnlockQueue();
 	}
 
@@ -1078,10 +1229,15 @@ void NCursesFrontend::SetCurrentQueueEntry(int iEntry)
 	m_iSelectedQueueEntry = iEntry;
 }
 
-void NCursesFrontend::UpdateInput()
+
+/*
+ * Process keystrokes starting with the initialKey, which must not be
+ * READKEY_EMPTY but has alread been set via ReadConsoleKey.
+ */
+void NCursesFrontend::UpdateInput(int initialKey)
 {
-    int iKey;
-    while ((iKey = ReadConsoleKey()) != READKEY_EMPTY)
+	int iKey = initialKey;
+	while (iKey != READKEY_EMPTY)
     {
 		int iQueueSize = CalcQueueSize();
 
@@ -1133,12 +1289,9 @@ void NCursesFrontend::UpdateInput()
 				// Key 'p' for pause
 				if (!IsRemoteMode())
 				{
-					info(m_bPause ? "Unpausing download" : "Pausing download");
+					info(m_bPauseDownload ? "Unpausing download" : "Pausing download");
 				}
-				ServerPauseUnpause(!m_bPause);
-				break;
-			case '\'':
-				ServerDumpDebug();
+				ServerPauseUnpause(!m_bPauseDownload);
 				break;
 			case 'e':
 			case 10: // return
@@ -1224,35 +1377,38 @@ void NCursesFrontend::UpdateInput()
 				break;
 			case 'p':
 				// Key 'p' for pause
-				EditQueue(QueueEditor::eaFilePause, 0);
+				EditQueue(DownloadQueue::eaFilePause, 0);
 				break;
 			case 'd':
+				SetHint(" Use Uppercase \"D\" for delete");
+				break;
+			case 'D':
 				// Delete entry
-				if (EditQueue(QueueEditor::eaFileDelete, 0))
+				if (EditQueue(DownloadQueue::eaFileDelete, 0))
 				{
 					SetCurrentQueueEntry(m_iSelectedQueueEntry);
 				}
 				break;
 			case 'u':
-				if (EditQueue(QueueEditor::eaFileMoveOffset, -1))
+				if (EditQueue(DownloadQueue::eaFileMoveOffset, -1))
 				{
 					SetCurrentQueueEntry(m_iSelectedQueueEntry - 1);
 				}
 				break;
 			case 'n':
-				if (EditQueue(QueueEditor::eaFileMoveOffset, +1))
+				if (EditQueue(DownloadQueue::eaFileMoveOffset, +1))
 				{
 					SetCurrentQueueEntry(m_iSelectedQueueEntry + 1);
 				}
 				break;
 			case 't':
-				if (EditQueue(QueueEditor::eaFileMoveTop, 0))
+				if (EditQueue(DownloadQueue::eaFileMoveTop, 0))
 				{
 					SetCurrentQueueEntry(0);
 				}
 				break;
 			case 'b':
-				if (EditQueue(QueueEditor::eaFileMoveBottom, 0))
+				if (EditQueue(DownloadQueue::eaFileMoveBottom, 0))
 				{
 					SetCurrentQueueEntry(iQueueSize > 0 ? iQueueSize - 1 : 0);
 				}
@@ -1272,7 +1428,7 @@ void NCursesFrontend::UpdateInput()
 			// Enter
 			else if (iKey == 10 || iKey == 13)
 			{
-				ServerSetDownloadRate((float)m_iInputValue);
+				ServerSetDownloadRate(m_iInputValue * 1024);
 				m_eInputMode = eNormal;
 				return;
 			}
@@ -1291,6 +1447,8 @@ void NCursesFrontend::UpdateInput()
 				m_iInputNumberIndex--;
 			}
 		}
+
+		iKey = ReadConsoleKey();
 	}
 }
 
@@ -1311,7 +1469,13 @@ int NCursesFrontend::ReadConsoleKey()
 				InputRecord.EventType == KEY_EVENT &&
 				InputRecord.Event.KeyEvent.bKeyDown)
 			{
-				return tolower(InputRecord.Event.KeyEvent.wVirtualKeyCode);
+				char c = tolower(InputRecord.Event.KeyEvent.wVirtualKeyCode);
+				if (bool(InputRecord.Event.KeyEvent.dwControlKeyState & CAPSLOCK_ON) ^
+					bool(InputRecord.Event.KeyEvent.dwControlKeyState & SHIFT_PRESSED))
+				{
+					c = toupper(c);
+				}
+				return c;
 			}
 		}
 	}

daemon/frontend/NCursesFrontend.h

@@ -1,8 +1,8 @@
 /*
- *  This file if part of nzbget
+ *  This file is part of nzbget
  *
- *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -30,6 +30,7 @@
 #ifndef DISABLE_CURSES
 
 #include <vector>
+#include <time.h>
 
 #include "Frontend.h"
 #include "Log.h"
@@ -48,6 +49,7 @@ private:
 
 	bool				m_bUseColor;
 	int					m_iDataUpdatePos;
+    bool				m_bUpdateNextTime;
 	int					m_iScreenHeight;
 	int					m_iScreenWidth;
 	int					m_iQueueWinTop;
@@ -60,9 +62,13 @@ private:
 	int					m_iLastEditEntry;
 	bool				m_bLastPausePars;
 	int					m_iQueueScrollOffset;
-	GroupQueue			m_groupQueue;
+	char*				m_szHint;
+	time_t				m_tStartHint;
+	int					m_iColWidthFiles;
+	int					m_iColWidthTotal;
+	int					m_iColWidthLeft;
 
-	// Inputting numbres
+	// Inputting numbers
 	int					m_iInputNumberIndex;
 	int					m_iInputValue;
 
@@ -91,23 +97,22 @@ private:
 	void			PrintFileQueue();
 	void			PrintFilename(FileInfo* pFileInfo, int iRow, bool bSelected);
 	void			PrintGroupQueue();
-	void			PrintGroupname(GroupInfo * pGroupInfo, int iRow, bool bSelected);
-	void			PrepareGroupQueue();
+	void			ResetColWidths();
+	void			PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected, bool bCalcColWidth);
 	void			PrintTopHeader(char* szHeader, int iLineNr, bool bUpTime);
-	void			ClearGroupQueue();
 	int				PrintMessage(Message* Msg, int iRow, int iMaxLines);
 	void			PrintKeyInputBar();
 	void 			PrintStatus();
-	void			UpdateInput();
-	void			Update();
+	void			UpdateInput(int initialKey);
+	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();
 	void			NeedUpdateData();
-	bool			EditQueue(QueueEditor::EEditAction eAction, int iOffset);
+	bool			EditQueue(DownloadQueue::EEditAction eAction, int iOffset);
+	void			SetHint(const char* szHint);
 
 protected:
 	virtual void 	Run();

daemon/main/Maintenance.cpp

@@ -0,0 +1,325 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <ctype.h>
+#ifndef WIN32
+#include <unistd.h>
+#endif
+#include <errno.h>
+
+#include "nzbget.h"
+#include "Log.h"
+#include "Util.h"
+#include "Maintenance.h"
+#include "Options.h"
+
+extern Options* g_pOptions;
+extern Maintenance* g_pMaintenance;
+
+Maintenance::Maintenance()
+{
+	m_iIDMessageGen = 0;
+	m_UpdateScriptController = NULL;
+	m_szUpdateScript = NULL;
+}
+
+Maintenance::~Maintenance()
+{
+	m_mutexController.Lock();
+	if (m_UpdateScriptController)
+	{
+		m_UpdateScriptController->Detach();
+		m_mutexController.Unlock();
+		while (m_UpdateScriptController)
+		{
+			usleep(20*1000);
+		}
+	}
+
+	ClearMessages();
+
+	free(m_szUpdateScript);
+}
+
+void Maintenance::ResetUpdateController()
+{
+	m_mutexController.Lock();
+	m_UpdateScriptController = NULL;
+	m_mutexController.Unlock();
+}
+
+void Maintenance::ClearMessages()
+{
+	for (Log::Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
+	{
+		delete *it;
+	}
+	m_Messages.clear();
+}
+
+Log::Messages* Maintenance::LockMessages()
+{
+	m_mutexLog.Lock();
+	return &m_Messages;
+}
+
+void Maintenance::UnlockMessages()
+{
+	m_mutexLog.Unlock();
+}
+
+void Maintenance::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();
+}
+
+bool Maintenance::StartUpdate(EBranch eBranch)
+{
+	m_mutexController.Lock();
+	bool bAlreadyUpdating = m_UpdateScriptController != NULL;
+	m_mutexController.Unlock();
+
+	if (bAlreadyUpdating)
+	{
+		error("Could not start update-script: update-script is already running");
+		return false;
+	}
+
+	if (m_szUpdateScript)
+	{
+		free(m_szUpdateScript);
+		m_szUpdateScript = NULL;
+	}
+
+	if (!ReadPackageInfoStr("install-script", &m_szUpdateScript))
+	{
+		return false;
+	}
+
+	ClearMessages();
+
+	m_UpdateScriptController = new UpdateScriptController();
+	m_UpdateScriptController->SetScript(m_szUpdateScript);
+	m_UpdateScriptController->SetBranch(eBranch);
+	m_UpdateScriptController->SetAutoDestroy(true);
+
+	m_UpdateScriptController->Start();
+
+	return true;
+}
+
+bool Maintenance::CheckUpdates(char** pUpdateInfo)
+{
+	char* szUpdateInfoScript;
+	if (!ReadPackageInfoStr("update-info-script", &szUpdateInfoScript))
+	{
+		return false;
+	}
+
+	*pUpdateInfo = NULL;
+	UpdateInfoScriptController::ExecuteScript(szUpdateInfoScript, pUpdateInfo);
+
+	free(szUpdateInfoScript);
+
+	return *pUpdateInfo;
+}
+
+bool Maintenance::ReadPackageInfoStr(const char* szKey, char** pValue)
+{
+	char szFileName[1024];
+	snprintf(szFileName, 1024, "%s%cpackage-info.json", g_pOptions->GetWebDir(), PATH_SEPARATOR);
+	szFileName[1024-1] = '\0';
+
+	char* szPackageInfo;
+	int iPackageInfoLen;
+	if (!Util::LoadFileIntoBuffer(szFileName, &szPackageInfo, &iPackageInfoLen))
+	{
+		error("Could not load file %s", szFileName);
+		return false;
+	}
+
+	char szKeyStr[100];
+	snprintf(szKeyStr, 100, "\"%s\"", szKey);
+	szKeyStr[100-1] = '\0';
+
+	char* p = strstr(szPackageInfo, szKeyStr);
+	if (!p)
+	{
+		error("Could not parse file %s", szFileName);
+		free(szPackageInfo);
+		return false;
+	}
+
+	p = strchr(p + strlen(szKeyStr), '"');
+	if (!p)
+	{
+		error("Could not parse file %s", szFileName);
+		free(szPackageInfo);
+		return false;
+	}
+
+	p++;
+	char* pend = strchr(p, '"');
+	if (!pend)
+	{
+		error("Could not parse file %s", szFileName);
+		free(szPackageInfo);
+		return false;
+	}
+
+	int iLen = pend - p;
+	if (iLen >= sizeof(szFileName))
+	{
+		error("Could not parse file %s", szFileName);
+		free(szPackageInfo);
+		return false;
+	}
+
+	*pValue = (char*)malloc(iLen+1);
+	strncpy(*pValue, p, iLen);
+	(*pValue)[iLen] = '\0';
+
+	WebUtil::JsonDecode(*pValue);
+
+	free(szPackageInfo);
+
+	return true;
+}
+
+void UpdateScriptController::Run()
+{
+	m_iPrefixLen = 0;
+	PrintMessage(Message::mkInfo, "Executing update-script %s", GetScript());
+
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "update-script %s", Util::BaseFileName(GetScript()));
+	szInfoName[1024-1] = '\0';
+	SetInfoName(szInfoName);
+
+    const char* szBranchName[] = { "STABLE", "TESTING", "DEVEL" };
+	SetEnvVar("NZBUP_BRANCH", szBranchName[m_eBranch]);
+
+	char szProcessID[20];
+#ifdef WIN32
+	int pid = (int)GetCurrentProcessId();
+#else
+	int pid = (int)getppid();
+#endif
+	snprintf(szProcessID, 20, "%i", pid);
+	szProcessID[20-1] = '\0';
+	SetEnvVar("NZBUP_PROCESSID", szProcessID);
+
+	char szLogPrefix[100];
+	strncpy(szLogPrefix, Util::BaseFileName(GetScript()), 100);
+	szLogPrefix[100-1] = '\0';
+	if (char* ext = strrchr(szLogPrefix, '.')) *ext = '\0'; // strip file extension
+	SetLogPrefix(szLogPrefix);
+	m_iPrefixLen = strlen(szLogPrefix) + 2; // 2 = strlen(": ");
+
+	Execute();
+
+	g_pMaintenance->ResetUpdateController();
+}
+
+void UpdateScriptController::AddMessage(Message::EKind eKind, const char* szText)
+{
+	szText = szText + m_iPrefixLen;
+
+	g_pMaintenance->AppendMessage(eKind, time(NULL), szText);
+	ScriptController::AddMessage(eKind, szText);
+}
+
+void UpdateInfoScriptController::ExecuteScript(const char* szScript, char** pUpdateInfo)
+{
+	detail("Executing update-info-script %s", Util::BaseFileName(szScript));
+
+	UpdateInfoScriptController* pScriptController = new UpdateInfoScriptController();
+	pScriptController->SetScript(szScript);
+
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "update-info-script %s", Util::BaseFileName(szScript));
+	szInfoName[1024-1] = '\0';
+	pScriptController->SetInfoName(szInfoName);
+
+	char szLogPrefix[1024];
+	strncpy(szLogPrefix, Util::BaseFileName(szScript), 1024);
+	szLogPrefix[1024-1] = '\0';
+	if (char* ext = strrchr(szLogPrefix, '.')) *ext = '\0'; // strip file extension
+	pScriptController->SetLogPrefix(szLogPrefix);
+	pScriptController->m_iPrefixLen = strlen(szLogPrefix) + 2; // 2 = strlen(": ");
+
+	pScriptController->Execute();
+
+	if (pScriptController->m_UpdateInfo.GetBuffer())
+	{
+		int iLen = strlen(pScriptController->m_UpdateInfo.GetBuffer());
+		*pUpdateInfo = (char*)malloc(iLen + 1);
+		strncpy(*pUpdateInfo, pScriptController->m_UpdateInfo.GetBuffer(), iLen);
+		(*pUpdateInfo)[iLen] = '\0';
+	}
+
+	delete pScriptController;
+}
+
+void UpdateInfoScriptController::AddMessage(Message::EKind eKind, const char* szText)
+{
+	szText = szText + m_iPrefixLen;
+
+	if (!strncmp(szText, "[NZB] ", 6))
+	{
+		debug("Command %s detected", szText + 6);
+		if (!strncmp(szText + 6, "[UPDATEINFO]", 12))
+		{
+			m_UpdateInfo.Append(szText + 6 + 12);
+		}
+		else
+		{
+			error("Invalid command \"%s\" received from %s", szText, GetInfoName());
+		}
+	}
+	else
+	{
+		ScriptController::AddMessage(eKind, szText);
+	}
+}

daemon/main/Maintenance.h

@@ -0,0 +1,93 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+#ifndef MAINTENANCE_H
+#define MAINTENANCE_H
+
+#include "Thread.h"
+#include "Script.h"
+#include "Log.h"
+#include "Util.h"
+
+class UpdateScriptController;
+
+class Maintenance
+{
+private:
+	Log::Messages		m_Messages;
+	Mutex				m_mutexLog;
+	Mutex				m_mutexController;
+	int					m_iIDMessageGen;
+	UpdateScriptController*	m_UpdateScriptController;
+	char*				m_szUpdateScript;
+
+	bool				ReadPackageInfoStr(const char* szKey, char** pValue);
+
+public:
+	enum EBranch
+	{
+		brStable,
+		brTesting,
+		brDevel
+	};
+
+						Maintenance();
+						~Maintenance();
+	void				ClearMessages();
+	void				AppendMessage(Message::EKind eKind, time_t tTime, const char* szText);
+	Log::Messages*		LockMessages();
+	void				UnlockMessages();
+	bool				StartUpdate(EBranch eBranch);
+	void				ResetUpdateController();
+	bool				CheckUpdates(char** pUpdateInfo);
+};
+
+class UpdateScriptController : public Thread, public ScriptController
+{
+private:
+	Maintenance::EBranch	m_eBranch;
+	int						m_iPrefixLen;
+
+protected:
+	virtual void		AddMessage(Message::EKind eKind, const char* szText);
+
+public:
+	virtual void		Run();
+	void				SetBranch(Maintenance::EBranch eBranch) { m_eBranch = eBranch; }
+};
+
+class UpdateInfoScriptController : public ScriptController
+{
+private:
+	int					m_iPrefixLen;
+	StringBuilder		m_UpdateInfo;
+
+protected:
+	virtual void		AddMessage(Message::EKind eKind, const char* szText);
+
+public:
+	static void			ExecuteScript(const char* szScript, char** pUpdateInfo);
+};
+
+#endif

daemon/main/Options.h

@@ -0,0 +1,531 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef OPTIONS_H
+#define OPTIONS_H
+
+#include <vector>
+#include <list>
+#include <time.h>
+
+#include "Thread.h"
+#include "Util.h"
+
+class Options
+{
+public:
+	enum EClientOperation
+	{
+		opClientNoOperation,
+		opClientRequestDownload,
+		opClientRequestListFiles,
+		opClientRequestListGroups,
+		opClientRequestListStatus,
+		opClientRequestSetRate,
+		opClientRequestDumpDebug,
+		opClientRequestEditQueue,
+		opClientRequestLog,
+		opClientRequestShutdown,
+		opClientRequestReload,
+		opClientRequestVersion,
+		opClientRequestPostQueue,
+		opClientRequestWriteLog,
+		opClientRequestScanSync,
+		opClientRequestScanAsync,
+		opClientRequestDownloadPause,
+		opClientRequestDownloadUnpause,
+		opClientRequestPostPause,
+		opClientRequestPostUnpause,
+		opClientRequestScanPause,
+		opClientRequestScanUnpause,
+		opClientRequestHistory,
+		opClientRequestDownloadUrl
+	};
+	enum EMessageTarget
+	{
+		mtNone,
+		mtScreen,
+		mtLog,
+		mtBoth
+	};
+	enum EOutputMode
+	{
+		omLoggable,
+		omColored,
+		omNCurses
+	};
+	enum EParCheck
+	{
+		pcAuto,
+		pcAlways,
+		pcForce,
+		pcManual
+	};
+	enum EParScan
+	{
+		psLimited,
+		psFull,
+		psAuto
+	};
+	enum EHealthCheck
+	{
+		hcPause,
+		hcDelete,
+		hcNone
+	};
+	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);
+	};
+
+	typedef std::vector<char*>  NameList;
+
+	class Category
+	{
+	private:
+		char*			m_szName;
+		char*			m_szDestDir;
+		bool			m_bUnpack;
+		char*			m_szPostScript;
+		NameList		m_Aliases;
+
+	public:
+						Category(const char* szName, const char* szDestDir, bool bUnpack, const char* szPostScript);
+						~Category();
+		const char*		GetName() { return m_szName; }
+		const char*		GetDestDir() { return m_szDestDir; }
+		bool			GetUnpack() { return m_bUnpack; }
+		const char*		GetPostScript() { return m_szPostScript; }
+		NameList*		GetAliases() { return &m_Aliases; }
+	};
+	
+	typedef std::vector<Category*>  CategoriesBase;
+
+	class Categories: public CategoriesBase
+	{
+	public:
+						~Categories();
+		Category*		FindCategory(const char* szName, bool bSearchAliases);
+	};
+
+	class Script
+	{
+	private:
+		char*			m_szName;
+		char*			m_szLocation;
+		char*			m_szDisplayName;
+		bool			m_bPostScript;
+		bool			m_bScanScript;
+		bool			m_bQueueScript;
+		bool			m_bSchedulerScript;
+
+	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; }
+		bool			GetPostScript() { return m_bPostScript; }
+		void			SetPostScript(bool bPostScript) { m_bPostScript = bPostScript; }
+		bool			GetScanScript() { return m_bScanScript; }
+		void			SetScanScript(bool bScanScript) { m_bScanScript = bScanScript; }
+		bool			GetQueueScript() { return m_bQueueScript; }
+		void			SetQueueScript(bool bQueueScript) { m_bQueueScript = bQueueScript; }
+		bool			GetSchedulerScript() { return m_bSchedulerScript; }
+		void			SetSchedulerScript(bool bSchedulerScript) { m_bSchedulerScript = bSchedulerScript; }
+	};
+
+	typedef std::list<Script*>  ScriptListBase;
+
+	class ScriptList: public ScriptListBase
+	{
+	public:
+						~ScriptList();
+		Script*			Find(const char* szName);	
+	};
+
+	class ConfigTemplate
+	{
+	private:
+		Script*			m_pScript;
+		char*			m_szTemplate;
+
+		friend class Options;
+
+	public:
+						ConfigTemplate(Script* pScript, const char* szTemplate);
+						~ConfigTemplate();
+		Script*			GetScript() { return m_pScript; }
+		const char*		GetTemplate() { return m_szTemplate; }
+	};
+	
+	typedef std::vector<ConfigTemplate*>  ConfigTemplatesBase;
+
+	class ConfigTemplates: public ConfigTemplatesBase
+	{
+	public:
+						~ConfigTemplates();
+	};
+
+private:
+	OptEntries			m_OptEntries;
+	bool				m_bConfigInitialized;
+	Mutex				m_mutexOptEntries;
+	Categories			m_Categories;
+
+	// 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;
+	EMessageTarget		m_eDebugTarget;
+	EMessageTarget		m_eDetailTarget;
+	bool				m_bDecode;
+	bool				m_bCreateBrokenLog;
+	bool				m_bResetLog;
+	int					m_iConnectionTimeout;
+	int					m_iTerminateTimeout;
+	bool				m_bAppendCategoryDir;
+	bool				m_bContinuePartial;
+	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_szAuthorizedIP;
+	char*				m_szLockFile;
+	char*				m_szDaemonUsername;
+	EOutputMode			m_eOutputMode;
+	bool				m_bReloadQueue;
+	int					m_iUrlConnections;
+	int					m_iLogBufferSize;
+	bool				m_bCreateLog;
+	char*				m_szLogFile;
+	EParCheck			m_eParCheck;
+	bool				m_bParRepair;
+	EParScan			m_eParScan;
+	bool				m_bParRename;
+	EHealthCheck		m_eHealthCheck;
+	char*				m_szPostScript;
+	char*				m_szScriptOrder;
+	char*				m_szScanScript;
+	char*				m_szQueueScript;
+	bool				m_bNoConfig;
+	int					m_iUMask;
+	int					m_iUpdateInterval;
+	bool				m_bCursesNZBName;
+	bool				m_bCursesTime;
+	bool				m_bCursesGroup;
+	bool				m_bCrcCheck;
+	bool				m_bDirectWrite;
+	int					m_iWriteBufferSize;
+	int					m_iNzbDirInterval;
+	int					m_iNzbDirFileAge;
+	bool				m_bParCleanupQueue;
+	int					m_iDiskSpace;
+	bool				m_bTLS;
+	bool				m_bDumpCore;
+	bool				m_bParPauseQueue;
+	bool				m_bScriptPauseQueue;
+	bool				m_bNzbCleanupDisk;
+	bool				m_bDeleteCleanupDisk;
+	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;
+	char*				m_szParIgnoreExt;
+	int					m_iFeedHistory;
+	bool				m_bUrlForce;
+	int					m_iTimeCorrection;
+	int					m_iPropagationDelay;
+
+	// Parsed command-line parameters
+	bool				m_bServerMode;
+	bool				m_bDaemonMode;
+	bool				m_bRemoteClientMode;
+	int					m_iEditQueueAction;
+	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_szLastArg;
+	bool				m_bPrintOptions;
+	bool				m_bAddTop;
+	int					m_iSetRate;
+	int					m_iLogLines;
+	int					m_iWriteLogKind;
+	bool				m_bTestBacktrace;
+
+	// Current state
+	bool				m_bPauseDownload;
+	bool				m_bPausePostProcess;
+	bool				m_bPauseScan;
+	bool				m_bTempPauseDownload;
+	int					m_iDownloadRate;
+	EClientOperation	m_eClientOperation;
+	time_t				m_tResumeTime;
+	int					m_iLocalTimeOffset;
+
+	void				InitDefault();
+	void				InitOptFile();
+	void				InitCommandLine(int argc, char* argv[]);
+	void				InitOptions();
+	void				InitFileArg(int argc, char* argv[]);
+	void				InitServers();
+	void				InitCategories();
+	void				InitScheduler();
+	void				InitFeeds();
+	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);
+	const char*			GetOption(const char* optname);
+	void				SetOption(const char* optname, const char* value);
+	bool				SetOptionString(const char* option);
+	bool				SplitOptionString(const char* option, char** pOptName, char** pOptValue);
+	bool				ValidateOptionName(const char* optname, const char* optvalue);
+	void				LoadConfigFile();
+	void				CheckDir(char** dir, const char* szOptionName, bool bAllowEmpty, bool bCreate);
+	void				ParseFileIDList(int argc, char* argv[], int optind);
+	void				ParseFileNameList(int argc, char* argv[], int optind);
+	bool				ParseTime(const char** 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; }
+	EMessageTarget		GetWarningTarget() const { return m_eWarningTarget; }
+	EMessageTarget		GetErrorTarget() const { return m_eErrorTarget; }
+	EMessageTarget		GetDebugTarget() const { return m_eDebugTarget; }
+	EMessageTarget		GetDetailTarget() const { return m_eDetailTarget; }
+	int					GetConnectionTimeout() { return m_iConnectionTimeout; }
+	int					GetTerminateTimeout() { return m_iTerminateTimeout; }
+	bool				GetDecode() { return m_bDecode; };
+	bool				GetAppendCategoryDir() { return m_bAppendCategoryDir; }
+	bool				GetContinuePartial() { return m_bContinuePartial; }
+	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*			GetAuthorizedIP() { return m_szAuthorizedIP; }
+	const char*			GetLockFile() { return m_szLockFile; }
+	const char*			GetDaemonUsername() { return m_szDaemonUsername; }
+	EOutputMode			GetOutputMode() { return m_eOutputMode; }
+	bool				GetReloadQueue() { return m_bReloadQueue; }
+	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; }
+	bool				GetParRepair() { return m_bParRepair; }
+	EParScan			GetParScan() { return m_eParScan; }
+	bool				GetParRename() { return m_bParRename; }
+	EHealthCheck		GetHealthCheck() { return m_eHealthCheck; }
+	const char*			GetScriptOrder() { return m_szScriptOrder; }
+	const char*			GetPostScript() { return m_szPostScript; }
+	const char*			GetScanScript() { return m_szScanScript; }
+	const char*			GetQueueScript() { return m_szQueueScript; }
+	int					GetUMask() { return m_iUMask; }
+	int					GetUpdateInterval() {return m_iUpdateInterval; }
+	bool				GetCursesNZBName() { return m_bCursesNZBName; }
+	bool				GetCursesTime() { return m_bCursesTime; }
+	bool				GetCursesGroup() { return m_bCursesGroup; }
+	bool				GetCrcCheck() { return m_bCrcCheck; }
+	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; }
+	bool				GetTLS() { return m_bTLS; }
+	bool				GetDumpCore() { return m_bDumpCore; }
+	bool				GetParPauseQueue() { return m_bParPauseQueue; }
+	bool				GetScriptPauseQueue() { return m_bScriptPauseQueue; }
+	bool				GetNzbCleanupDisk() { return m_bNzbCleanupDisk; }
+	bool				GetDeleteCleanupDisk() { return m_bDeleteCleanupDisk; }
+	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; }
+	const char*			GetParIgnoreExt() { return m_szParIgnoreExt; }
+	int					GetFeedHistory() { return m_iFeedHistory; }
+	bool				GetUrlForce() { return m_bUrlForce; }
+	int					GetTimeCorrection() { return m_iTimeCorrection; }
+	int					GetPropagationDelay() { return m_iPropagationDelay; }
+
+	Category*			FindCategory(const char* szName, bool bSearchAliases) { return m_Categories.FindCategory(szName, bSearchAliases); }
+
+	// Parsed command-line parameters
+	bool				GetServerMode() { return m_bServerMode; }
+	bool				GetDaemonMode() { return m_bDaemonMode; }
+	bool				GetRemoteClientMode() { return m_bRemoteClientMode; }
+	EClientOperation	GetClientOperation() { return m_eClientOperation; }
+	int					GetEditQueueAction() { return m_iEditQueueAction; }
+	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*			GetLastArg() { return m_szLastArg; }
+	int					GetAddPriority() { return m_iAddPriority; }
+	char*				GetAddNZBFilename() { return m_szAddNZBFilename; }
+	bool				GetAddTop() { return m_bAddTop; }
+	int					GetSetRate() { return m_iSetRate; }
+	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				SetPausePostProcess(bool bPausePostProcess) { m_bPausePostProcess = bPausePostProcess; }
+	bool				GetPausePostProcess() const { return m_bPausePostProcess; }
+	void				SetPauseScan(bool bPauseScan) { m_bPauseScan = bPauseScan; }
+	bool				GetPauseScan() const { return m_bPauseScan; }
+	void				SetTempPauseDownload(bool bTempPauseDownload) { m_bTempPauseDownload = bTempPauseDownload; }
+	bool				GetTempPauseDownload() const { return m_bTempPauseDownload; }
+	void				SetDownloadRate(int iRate) { m_iDownloadRate = iRate; }
+	int					GetDownloadRate() const { return m_iDownloadRate; }
+	void				SetResumeTime(time_t tResumeTime) { m_tResumeTime = tResumeTime; }
+	time_t				GetResumeTime() const { return m_tResumeTime; }
+	void				SetLocalTimeOffset(int iLocalTimeOffset) { m_iLocalTimeOffset = iLocalTimeOffset; }
+	int					GetLocalTimeOffset() { return m_iLocalTimeOffset; }
+};
+
+#endif

daemon/main/Scheduler.cpp

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

daemon/main/Scheduler.h

@@ -0,0 +1,102 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2008-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef SCHEDULER_H
+#define SCHEDULER_H
+
+#include <list>
+#include <vector>
+#include <time.h>
+
+#include "Thread.h"
+
+class Scheduler
+{
+public:
+	enum ECommand
+	{
+		scPauseDownload,
+		scUnpauseDownload,
+		scDownloadRate,
+		scScript,
+		scProcess,
+		scPauseScan,
+		scUnpauseScan,
+		scActivateServer,
+		scDeactivateServer,
+		scFetchFeed
+	};
+
+	class Task
+	{
+	private:
+		int				m_iID;
+		int				m_iHours;
+		int				m_iMinutes;
+		int				m_iWeekDaysBits;
+		ECommand		m_eCommand;
+		char*			m_szParam;
+		time_t			m_tLastExecuted;
+
+	public:
+						Task(int iID, int iHours, int iMinutes, int iWeekDaysBits, ECommand eCommand, 
+							const char* szParam);
+						~Task();
+		friend class	Scheduler;
+	};
+
+private:
+
+	typedef std::list<Task*>		TaskList;
+	typedef std::vector<bool>		ServerStatusList;
+
+	TaskList			m_TaskList;
+	Mutex				m_mutexTaskList;
+	time_t				m_tLastCheck;
+	bool				m_bDetectClockChanges;
+	bool				m_bDownloadRateChanged;
+	bool				m_bExecuteProcess;
+	bool				m_bPauseDownloadChanged;
+	bool				m_bPauseScanChanged;
+	bool				m_bServerChanged;
+	ServerStatusList	m_ServerStatusList;
+	void				ExecuteTask(Task* pTask);
+	void				CheckTasks();
+	static bool			CompareTasks(Scheduler::Task* pTask1, Scheduler::Task* pTask2);
+	void				PrepareLog();
+	void				PrintLog();
+	void				EditServer(bool bActive, const char* szServerList);
+	void				FetchFeed(const char* szFeedList);
+	void				CheckScheduledResume();
+
+public:
+						Scheduler();
+						~Scheduler();
+	void				AddTask(Task* pTask);
+	void				FirstCheck();
+	void				IntervalCheck();
+};
+
+#endif

daemon/main/nzbget.cpp

@@ -0,0 +1,876 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#ifdef WIN32
+#include <winsvc.h>
+#else
+#include <unistd.h>
+#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>
+#include <sys/stat.h>
+#include <stdio.h>
+#include <fcntl.h>
+#ifndef DISABLE_PARCHECK
+#include <iostream>
+#endif
+#ifdef HAVE_BACKTRACE
+#include <execinfo.h>
+#endif
+
+#include "nzbget.h"
+#include "ServerPool.h"
+#include "Log.h"
+#include "NZBFile.h"
+#include "Options.h"
+#include "Thread.h"
+#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 "HistoryCoordinator.h"
+#include "DupeCoordinator.h"
+#include "ParChecker.h"
+#include "Scheduler.h"
+#include "Scanner.h"
+#include "FeedCoordinator.h"
+#include "Maintenance.h"
+#include "StatMeter.h"
+#include "Util.h"
+#ifdef WIN32
+#include "NTService.h"
+#endif
+
+// Prototypes
+void RunMain();
+void Run(bool bReload);
+void Reload();
+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
+#endif
+#ifndef DISABLE_PARCHECK
+void DisableCout();
+#endif
+
+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;
+StatMeter* g_pStatMeter = NULL;
+Log* g_pLog = NULL;
+PrePostProcessor* g_pPrePostProcessor = NULL;
+HistoryCoordinator* g_pHistoryCoordinator = NULL;
+DupeCoordinator* g_pDupeCoordinator = NULL;
+DiskState* g_pDiskState = NULL;
+Scheduler* g_pScheduler = NULL;
+Scanner* g_pScanner = NULL;
+FeedCoordinator* g_pFeedCoordinator = NULL;
+Maintenance* g_pMaintenance = 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[])
+{
+#ifdef WIN32
+#ifdef _DEBUG
+	_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
+	_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
+	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF
+#ifdef DEBUG_CRTMEMLEAKS
+		| _CRTDBG_CHECK_CRT_DF | _CRTDBG_CHECK_ALWAYS_DF
+#endif
+		);
+#endif
+#endif
+
+	Util::InitVersionRevision();
+	
+#ifdef WIN32
+	InstallUninstallServiceCheck(argc, argv);
+#endif
+
+#ifndef DISABLE_PARCHECK
+	DisableCout();
+#endif
+
+	srand (time(NULL));
+
+	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)
+{
+	g_pLog = new Log();
+
+	debug("nzbget %s", Util::VersionRevision());
+
+	if (!bReload)
+	{
+		Thread::Init();
+	}
+
+	g_pServerPool = new ServerPool();
+	g_pScheduler = new Scheduler();
+	g_pQueueCoordinator = new QueueCoordinator();
+	g_pStatMeter = new StatMeter();
+	g_pScanner = new Scanner();
+	g_pPrePostProcessor = new PrePostProcessor();
+	g_pHistoryCoordinator = new HistoryCoordinator();
+	g_pDupeCoordinator = new DupeCoordinator();
+	g_pUrlCoordinator = new UrlCoordinator();
+	g_pFeedCoordinator = new FeedCoordinator();
+	g_pMaintenance = new Maintenance();
+
+	debug("Reading options");
+	g_pOptions = new Options(g_iArgumentCount, *g_szArguments);
+
+#ifndef WIN32
+	if (g_pOptions->GetUMask() < 01000)
+	{
+		/* set newly created file permissions */
+		umask(g_pOptions->GetUMask());
+	}
+#endif
+	
+	if (g_pOptions->GetServerMode() && g_pOptions->GetCreateLog() && g_pOptions->GetResetLog())
+	{
+		debug("Deleting old log-file");
+		g_pLog->ResetLog();
+	}
+
+	g_pLog->InitOptions();
+	g_pScanner->InitOptions();
+
+	if (g_pOptions->GetDaemonMode())
+	{
+#ifdef WIN32
+		info("nzbget %s service-mode", Util::VersionRevision());
+#else
+		if (!bReload)
+		{
+			Daemonize();
+		}
+		info("nzbget %s daemon-mode", Util::VersionRevision());
+#endif
+	}
+	else if (g_pOptions->GetServerMode())
+	{
+		info("nzbget %s server-mode", Util::VersionRevision());
+	}
+	else if (g_pOptions->GetRemoteClientMode())
+	{
+		info("nzbget %s remote-mode", Util::VersionRevision());
+	}
+
+	if (!bReload)
+	{
+		Connection::Init();
+	}
+
+	if (!g_pOptions->GetRemoteClientMode())
+	{
+		g_pServerPool->InitConnections();
+		g_pStatMeter->Init();
+	}
+
+#ifndef WIN32
+#ifdef HAVE_SYS_PRCTL_H
+	if (g_pOptions->GetDumpCore())
+	{
+		EnableDumpCore();
+	}
+#endif
+#endif
+
+#ifndef WIN32
+	InstallSignalHandlers();
+#ifdef DEBUG
+	if (g_pOptions->GetTestBacktrace())
+	{
+		MakeSegFault();
+	}
+#endif
+#endif
+
+	// client request
+	if (g_pOptions->GetClientOperation() != Options::opClientNoOperation)
+	{
+		ProcessClientRequest();
+		Cleanup();
+		return;
+	}
+
+	// Setup the network-server
+	if (g_pOptions->GetServerMode())
+	{
+		g_pRemoteServer = new RemoteServer(false);
+		g_pRemoteServer->Start();
+
+		if (g_pOptions->GetSecureControl())
+		{
+			g_pRemoteSecureServer = new RemoteServer(true);
+			g_pRemoteSecureServer->Start();
+		}
+	}
+
+	// Create the frontend
+	if (!g_pOptions->GetDaemonMode())
+	{
+		switch (g_pOptions->GetOutputMode())
+		{
+			case Options::omNCurses:
+#ifndef DISABLE_CURSES
+				g_pFrontend = new NCursesFrontend();
+				break;
+#endif
+			case Options::omColored:
+				g_pFrontend = new ColoredFrontend();
+				break;
+			case Options::omLoggable:
+				g_pFrontend = new LoggableFrontend();
+				break;
+		}
+	}
+
+	// Starting a thread with the frontend
+	if (g_pFrontend)
+	{
+		g_pFrontend->Start();
+	}
+
+	// Starting QueueCoordinator and PrePostProcessor
+	if (!g_pOptions->GetRemoteClientMode())
+	{
+		// Standalone-mode
+		if (!g_pOptions->GetServerMode())
+		{
+			const char* szCategory = g_pOptions->GetAddCategory() ? g_pOptions->GetAddCategory() : "";
+			NZBFile* pNZBFile = NZBFile::Create(g_pOptions->GetArgFilename(), szCategory);
+			if (!pNZBFile)
+			{
+				abort("FATAL ERROR: Parsing NZB-document %s failed\n\n", g_pOptions->GetArgFilename() ? g_pOptions->GetArgFilename() : "N/A");
+				return;
+			}
+			g_pScanner->InitPPParameters(szCategory, pNZBFile->GetNZBInfo()->GetParameters());
+			g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, NULL, false);
+			delete pNZBFile;
+		}
+
+		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+		{
+			g_pDiskState = new DiskState();
+		}
+
+		g_pQueueCoordinator->Start();
+		g_pUrlCoordinator->Start();
+		g_pPrePostProcessor->Start();
+		g_pFeedCoordinator->Start();
+
+		// enter main program-loop
+		while (g_pQueueCoordinator->IsRunning() || 
+			g_pUrlCoordinator->IsRunning() || 
+			g_pPrePostProcessor->IsRunning() ||
+			g_pFeedCoordinator->IsRunning())
+		{
+			if (!g_pOptions->GetServerMode() && 
+				!g_pQueueCoordinator->HasMoreJobs() && 
+				!g_pUrlCoordinator->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();
+				}
+				if (!g_pFeedCoordinator->IsStopped())
+				{
+					g_pFeedCoordinator->Stop();
+				}
+			}
+			usleep(100 * 1000);
+		}
+
+		// main program-loop is terminated
+		debug("QueueCoordinator stopped");
+		debug("UrlCoordinator stopped");
+		debug("PrePostProcessor stopped");
+		debug("FeedCoordinator stopped");
+	}
+
+	// Stop network-server
+	if (g_pRemoteServer)
+	{
+		debug("stopping RemoteServer");
+		g_pRemoteServer->Stop();
+		int iMaxWaitMSec = 1000;
+		while (g_pRemoteServer->IsRunning() && iMaxWaitMSec > 0)
+		{
+			usleep(100 * 1000);
+			iMaxWaitMSec -= 100;
+		}
+		if (g_pRemoteServer->IsRunning())
+		{
+			debug("Killing RemoteServer");
+			g_pRemoteServer->Kill();
+		}
+		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)
+	{
+		if (!g_pOptions->GetRemoteClientMode())
+		{
+			debug("Stopping Frontend");
+			g_pFrontend->Stop();
+		}
+		while (g_pFrontend->IsRunning())
+		{
+			usleep(50 * 1000);
+		}
+		debug("Frontend stopped");
+	}
+
+	Cleanup();
+}
+
+void ProcessClientRequest()
+{
+	RemoteClient* Client = new RemoteClient();
+
+	switch (g_pOptions->GetClientOperation())
+	{
+		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::opClientRequestSetRate:
+			Client->RequestServerSetDownloadRate(g_pOptions->GetSetRate());
+			break;
+
+		case Options::opClientRequestDumpDebug:
+			Client->RequestServerDumpDebug();
+			break;
+
+		case Options::opClientRequestEditQueue:
+			Client->RequestServerEditQueue((DownloadQueue::EEditAction)g_pOptions->GetEditQueueAction(),
+				g_pOptions->GetEditQueueOffset(), g_pOptions->GetEditQueueText(),
+				g_pOptions->GetEditQueueIDList(), g_pOptions->GetEditQueueIDCount(),
+				g_pOptions->GetEditQueueNameList(), (eRemoteMatchMode)g_pOptions->GetMatchMode());
+			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::opClientNoOperation:
+			break;
+	}
+
+	delete Client;
+}
+
+void ExitProc()
+{
+	if (!g_bReloading)
+	{
+		info("Stopping, please wait...");
+	}
+	if (g_pOptions->GetRemoteClientMode())
+	{
+		if (g_pFrontend)
+		{
+			debug("Stopping Frontend");
+			g_pFrontend->Stop();
+		}
+	}
+	else
+	{
+		if (g_pQueueCoordinator)
+		{
+			debug("Stopping QueueCoordinator");
+			g_pQueueCoordinator->Stop();
+			g_pUrlCoordinator->Stop();
+			g_pPrePostProcessor->Stop();
+			g_pFeedCoordinator->Stop();
+		}
+	}
+}
+
+void Reload()
+{
+	g_bReloading = true;
+	info("Reloading...");
+	ExitProc();
+}
+
+#ifndef WIN32
+#ifdef DEBUG
+typedef void(*sighandler)(int);
+std::vector<sighandler> SignalProcList;
+#endif
+
+/*
+ * Signal handler
+ */
+void SignalProc(int iSignal)
+{
+	switch (iSignal)
+	{
+		case SIGINT:
+			signal(SIGINT, SIG_DFL);   // Reset the signal handler
+			ExitProc();
+			break;
+
+		case SIGTERM:
+			signal(SIGTERM, SIG_DFL);   // Reset the signal handler
+			ExitProc();
+			break;
+
+		case SIGCHLD:
+			// ignoring
+			break;
+
+#ifdef DEBUG
+		case SIGSEGV:
+			signal(SIGSEGV, SIG_DFL);   // Reset the signal handler
+			PrintBacktrace();
+			break;
+#endif
+	}
+}
+
+void InstallSignalHandlers()
+{
+	signal(SIGINT, SignalProc);
+	signal(SIGTERM, SignalProc);
+	signal(SIGPIPE, SIG_IGN);
+#ifdef DEBUG
+	signal(SIGSEGV, SignalProc);
+#endif
+#ifdef SIGCHLD_HANDLER
+    // it could be necessary on some systems to activate a handler for SIGCHLD
+    // however it make troubles on other systems and is deactivated by default
+	signal(SIGCHLD, SignalProc);
+#endif
+}
+
+void PrintBacktrace()
+{
+#ifdef HAVE_BACKTRACE
+	printf("Segmentation fault, tracing...\n");
+	
+	void *array[100];
+	size_t size;
+	char **strings;
+	size_t i;
+
+	size = backtrace(array, 100);
+	strings = backtrace_symbols(array, size);
+
+	// first trace to screen
+	printf("Obtained %zd stack frames\n", size);
+	for (i = 0; i < size; i++)
+	{
+		printf("%s\n", strings[i]);
+	}
+
+	// then trace to log
+	error("Segmentation fault, tracing...");
+	error("Obtained %zd stack frames", size);
+	for (i = 0; i < size; i++)
+	{
+		error("%s", strings[i]);
+	}
+
+	free(strings);
+#else
+	error("Segmentation fault");
+#endif
+}
+
+#ifdef DEBUG
+void MakeSegFault()
+{
+	char* N = NULL;
+	strcpy(N, "");
+}
+#endif
+
+#ifdef HAVE_SYS_PRCTL_H
+/**
+* activates the creation of core-files
+*/
+void EnableDumpCore()
+{
+	rlimit rlim;
+	rlim.rlim_cur= RLIM_INFINITY;
+	rlim.rlim_max= RLIM_INFINITY;
+	setrlimit(RLIMIT_CORE, &rlim);
+	prctl(PR_SET_DUMPABLE, 1);
+}
+#endif
+#endif
+
+void Cleanup()
+{
+	debug("Cleaning up global objects");
+
+	debug("Deleting UrlCoordinator");
+	delete g_pUrlCoordinator;
+	g_pUrlCoordinator = NULL;
+	debug("UrlCoordinator deleted");
+
+	debug("Deleting RemoteServer");
+	delete g_pRemoteServer;
+	g_pRemoteServer = NULL;
+	debug("RemoteServer deleted");
+
+	debug("Deleting RemoteSecureServer");
+	delete g_pRemoteSecureServer;
+	g_pRemoteSecureServer = NULL;
+	debug("RemoteSecureServer deleted");
+
+	debug("Deleting PrePostProcessor");
+	delete g_pPrePostProcessor;
+	g_pPrePostProcessor = NULL;
+	delete g_pScanner;
+	g_pScanner = NULL;
+	debug("PrePostProcessor deleted");
+
+	debug("Deleting HistoryCoordinator");
+	delete g_pHistoryCoordinator;
+	g_pHistoryCoordinator = NULL;
+	debug("HistoryCoordinator deleted");
+
+	debug("Deleting DupeCoordinator");
+	delete g_pDupeCoordinator;
+	g_pDupeCoordinator = NULL;
+	debug("DupeCoordinator deleted");
+
+	debug("Deleting Frontend");
+	delete g_pFrontend;
+	g_pFrontend = NULL;
+	debug("Frontend deleted");
+
+	debug("Deleting QueueCoordinator");
+	delete g_pQueueCoordinator;
+	g_pQueueCoordinator = NULL;
+	debug("QueueCoordinator deleted");
+
+	debug("Deleting DiskState");
+	delete g_pDiskState;
+	g_pDiskState = NULL;
+	debug("DiskState deleted");
+
+	debug("Deleting Options");
+	if (g_pOptions)
+	{
+		if (g_pOptions->GetDaemonMode() && !g_bReloading)
+		{
+			info("Deleting lock file");
+			remove(g_pOptions->GetLockFile());
+		}
+		delete g_pOptions;
+		g_pOptions = NULL;
+	}
+	debug("Options deleted");
+
+	debug("Deleting ServerPool");
+	delete g_pServerPool;
+	g_pServerPool = NULL;
+	debug("ServerPool deleted");
+
+	debug("Deleting Scheduler");
+	delete g_pScheduler;
+	g_pScheduler = NULL;
+	debug("Scheduler deleted");
+
+	debug("Deleting FeedCoordinator");
+	delete g_pFeedCoordinator;
+	g_pFeedCoordinator = NULL;
+	debug("FeedCoordinator deleted");
+
+	debug("Deleting Maintenance");
+	delete g_pMaintenance;
+	g_pMaintenance = NULL;
+	debug("Maintenance deleted");
+
+	debug("Deleting StatMeter");
+	delete g_pStatMeter;
+	g_pStatMeter = NULL;
+	debug("StatMeter deleted");
+
+	if (!g_bReloading)
+	{
+		Connection::Final();
+		Thread::Final();
+	}
+
+	debug("Global objects cleaned up");
+
+	delete g_pLog;
+	g_pLog = NULL;
+}
+
+#ifndef WIN32
+void Daemonize()
+{
+	int i, lfp;
+	char str[10];
+	if (getppid() == 1) return; /* already a daemon */
+	i = fork();
+	if (i < 0) exit(1); /* fork error */
+	if (i > 0) exit(0); /* parent exits */
+	/* child (daemon) continues */
+	setsid(); /* obtain a new process group */
+	for (i = getdtablesize();i >= 0;--i) close(i); /* close all descriptors */
+	i = open("/dev/null", O_RDWR); dup(i); dup(i); /* handle standart I/O */
+	chdir(g_pOptions->GetDestDir()); /* change running directory */
+	lfp = open(g_pOptions->GetLockFile(), O_RDWR | O_CREAT, 0640);
+	if (lfp < 0) exit(1); /* can not open */
+	if (lockf(lfp, F_TLOCK, 0) < 0) exit(0); /* can not lock */
+
+	/* Drop user if there is one, and we were run as root */
+	if ( getuid() == 0 || geteuid() == 0 )
+	{
+		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); 
+			/* Finally, set uid. */
+			setuid(pw->pw_uid);
+		}
+	}
+
+	/* first instance continues */
+	sprintf(str, "%d\n", getpid());
+	write(lfp, str, strlen(str)); /* record pid to lockfile */
+	signal(SIGCHLD, SIG_IGN); /* ignore child */
+	signal(SIGTSTP, SIG_IGN); /* ignore tty signals */
+	signal(SIGTTOU, SIG_IGN);
+	signal(SIGTTIN, SIG_IGN);
+}
+#endif
+
+#ifndef DISABLE_PARCHECK
+class NullStreamBuf : public std::streambuf
+{
+public:
+	int sputc ( char c ) { return (int) c; }
+} NullStreamBufInstance;
+
+void DisableCout()
+{
+	// libpar2 prints messages to c++ standard output stream (std::cout).
+	// However we do not want these messages to be printed.
+	// Since we do not use std::cout in nzbget we just disable it.
+	std::cout.rdbuf(&NullStreamBufInstance);
+}
+#endif

daemon/main/nzbget.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -36,40 +36,65 @@
 #endif
 #define fdopen _fdopen
 #define ctime_r(timep, buf, bufsize) ctime_s(buf, bufsize, timep)
+#define gmtime_r(time, tm) gmtime_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
 #define strcasecmp(a, b) _stricmp(a, b)
 #define strncasecmp(a, b, c) _strnicmp(a, b, c)
-
-#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
-
+#define ssize_t SSIZE_T
 #define	__S_ISTYPE(mode, mask)	(((mode) & _S_IFMT) == (mask))
 #define	S_ISDIR(mode)	 __S_ISTYPE((mode), _S_IFDIR)
 #define	S_ISREG(mode)	 __S_ISTYPE((mode), _S_IFREG)
 #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
+#define atoll _atoi64
+#ifndef FSCTL_SET_SPARSE
+#define FSCTL_SET_SPARSE 590020
+#endif
+#define FOPEN_RB "rbN"
+#define FOPEN_RBP "rb+N"
+#define FOPEN_WB "wbN"
+#define FOPEN_WBP "wb+N"
+#define FOPEN_AB "abN"
+#define FOPEN_ABP "ab+N"
+
+#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
 
 #else
 
 // POSIX
 
-#define _timeval timeval
 #define closesocket(sock) close(sock)
 #define SOCKET int
 #define INVALID_SOCKET (-1)
 #define PATH_SEPARATOR '/'
 #define ALT_PATH_SEPARATOR '\\'
 #define MAX_PATH 1024
-#define	S_DIRMODE (S_IRUSR | S_IWUSR | S_IXUSR | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH)
+#define S_DIRMODE (S_IRWXU | S_IRWXG | S_IRWXO)
+#define LINE_ENDING "\n"
+#define FOPEN_RB "rb"
+#define FOPEN_RBP "rb+"
+#define FOPEN_WB "wb"
+#define FOPEN_WBP "wb+"
+#define FOPEN_AB "ab"
+#define FOPEN_ABP "ab+"
 
 #endif
 
+#ifndef SHUT_RDWR
+#define SHUT_RDWR 2
+#endif
+
 #endif

daemon/nntp/ArticleDownloader.h

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -28,9 +28,6 @@
 #define ARTICLEDOWNLOADER_H
 
 #include <time.h>
-#ifdef WIN32
-#include <sys/timeb.h>
-#endif
 
 #include "Observer.h"
 #include "DownloadInfo.h"
@@ -45,9 +42,10 @@ public:
 	{
 		adUndefined,
 		adRunning,
+		adWaiting,
 		adFinished,
 		adFailed,
-		adDecodeError,
+		adRetry,
 		adCrcError,
 		adDecoding,
 		adJoining,
@@ -74,46 +72,43 @@ private:
 	UDecoder			m_UDecoder;
 	FILE*				m_pOutFile;
 	bool				m_bDuplicate;
+	ServerStatList		m_ServerStats;
 
 	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();
-						~ArticleDownloader();
+	virtual				~ArticleDownloader();
 	void				SetFileInfo(FileInfo* pFileInfo) { m_pFileInfo = pFileInfo; }
 	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; }
+	ServerStatList*		GetServerStats() { return &m_ServerStats; }
 	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; }
 	void				CompleteFileParts();
+	static bool			MoveCompletedFiles(NZBInfo* pNZBInfo, const char* szOldDestDir);
 	void				SetConnection(NNTPConnection* pConnection) { m_pConnection = pConnection; }
 
 	void				LogDebugInfo();
 };
 
-class DownloadSpeedMeter
-{
-public:
-	virtual				~DownloadSpeedMeter() {};
-	virtual float		CalcCurrentDownloadSpeed() = 0;
-	virtual void		AddSpeedReading(int iBytes) = 0;
-};
-                      
 #endif

daemon/nntp/Decoder.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #ifdef WIN32
@@ -60,18 +60,12 @@ Decoder::~ Decoder()
 {
 	debug("Destroying Decoder");
 
-	if (m_szArticleFilename)
-	{
-		free(m_szArticleFilename);
-	}
+	free(m_szArticleFilename);
 }
 
 void Decoder::Clear()
 {
-	if (m_szArticleFilename)
-	{
-		free(m_szArticleFilename);
-	}
+	free(m_szArticleFilename);
 	m_szArticleFilename = NULL;
 }
 
@@ -141,7 +135,7 @@ void YDecoder::Clear()
 	m_lExpectedCRC = 0;
 	m_lCalculatedCRC = 0xFFFFFFFF;
 	m_iBegin = 0;
-	m_iEnd = 0;
+	m_iEnd = 0xFFFFFFFF;
 	m_iSize = 0;
 	m_iEndSize = 0;
 	m_bAutoSeek = false;
@@ -268,10 +262,7 @@ BreakLoop:
 				pb += 6; //=strlen(" name=")
 				char* pe;
 				for (pe = pb; *pe != '\0' && *pe != '\n' && *pe != '\r'; pe++) ;
-				if (m_szArticleFilename)
-				{
-					free(m_szArticleFilename);
-				}
+				free(m_szArticleFilename);
 				m_szArticleFilename = (char*)malloc(pe - pb + 1);
 				strncpy(m_szArticleFilename, pb, pe - pb);
 				m_szArticleFilename[pe - pb] = '\0';
@@ -319,7 +310,7 @@ bool YDecoder::Write(char* buffer, int len, FILE* outfile)
 	{
 		if (m_bNeedSetPos)
 		{
-			if (m_iBegin == 0 || m_iEnd == 0 || !outfile)
+			if (m_iBegin == 0 || m_iEnd == 0xFFFFFFFF || !outfile)
 			{
 				return false;
 			}
@@ -404,10 +395,7 @@ unsigned int UDecoder::DecodeBuffer(char* buffer, int len)
 			// extracting filename
 			char* pe;
 			for (pe = pb; *pe != '\0' && *pe != '\n' && *pe != '\r'; pe++) ;
-			if (m_szArticleFilename)
-			{
-				free(m_szArticleFilename);
-			}
+			free(m_szArticleFilename);
 			m_szArticleFilename = (char*)malloc(pe - pb + 1);
 			strncpy(m_szArticleFilename, pb, pe - pb);
 			m_szArticleFilename[pe - pb] = '\0';

daemon/nntp/Decoder.h

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -27,8 +27,6 @@
 #ifndef DECODER_H
 #define DECODER_H
 
-#include "Thread.h"
-
 class Decoder
 {
 public:

daemon/nntp/NNTPConnection.cpp

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -25,7 +25,7 @@
 
 
 #ifdef HAVE_CONFIG_H
-#include <config.h>
+#include "config.h"
 #endif
 
 #ifdef WIN32
@@ -34,6 +34,8 @@
 
 #include <stdlib.h>
 #include <string.h>
+#include <stdio.h>
+#include <ctype.h>
 
 #include "nzbget.h"
 #include "Log.h"
@@ -43,24 +45,22 @@
 
 static const int CONNECTION_LINEBUFFER_SIZE = 1024*10;
 
-NNTPConnection::NNTPConnection(NewsServer* server) : Connection(server)
+NNTPConnection::NNTPConnection(NewsServer* pNewsServer) : Connection(pNewsServer->GetHost(), pNewsServer->GetPort(), pNewsServer->GetTLS())
 {
+	m_pNewsServer = pNewsServer;
 	m_szActiveGroup = NULL;
 	m_szLineBuf = (char*)malloc(CONNECTION_LINEBUFFER_SIZE);
 	m_bAuthError = false;
+	SetCipher(pNewsServer->GetCipher());
 }
 
 NNTPConnection::~NNTPConnection()
 {
-	if (m_szActiveGroup)
-	{
-		free(m_szActiveGroup);
-		m_szActiveGroup = NULL;
-	}
+	free(m_szActiveGroup);
 	free(m_szLineBuf);
 }
 
-const char* NNTPConnection::Request(char* req)
+const char* NNTPConnection::Request(const char* req)
 {
 	if (!req)
 	{
@@ -80,19 +80,16 @@ const char* NNTPConnection::Request(char* req)
 
 	if (!strncmp(answer, "480", 3))
 	{
-		debug("%s requested authorization", m_pNetAddress->GetHost());
+		debug("%s requested authorization", 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,13 +97,16 @@ const char* NNTPConnection::Request(char* req)
 
 bool NNTPConnection::Authenticate()
 {
-	if (!((NewsServer*)m_pNetAddress)->GetUser() ||
-		!((NewsServer*)m_pNetAddress)->GetPassword())
+	if (strlen(m_pNewsServer->GetUser()) == 0 || strlen(m_pNewsServer->GetPassword()) == 0)
 	{
+		error("%c%s (%s) requested authorization but username/password are not set in settings", 
+			toupper(m_pNewsServer->GetName()[0]), m_pNewsServer->GetName() + 1, m_pNewsServer->GetHost());
+		m_bAuthError = true;
 		return false;
 	}
 
-	return AuthInfoUser();
+	m_bAuthError = !AuthInfoUser(0);
+	return !m_bAuthError;
 }
 
 bool NNTPConnection::AuthInfoUser(int iRecur)
@@ -117,7 +117,7 @@ bool NNTPConnection::AuthInfoUser(int iRecur)
 	}
 
 	char tmp[1024];
-	snprintf(tmp, 1024, "AUTHINFO USER %s\r\n", ((NewsServer*)m_pNetAddress)->GetUser());
+	snprintf(tmp, 1024, "AUTHINFO USER %s\r\n", m_pNewsServer->GetUser());
 	tmp[1024-1] = '\0';
 
 	WriteLine(tmp);
@@ -125,13 +125,13 @@ bool NNTPConnection::AuthInfoUser(int iRecur)
 	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 	if (!answer)
 	{
-		ReportError("authorization for %s failed: Connection closed by remote host.", m_pNetAddress->GetHost(), 0);
+		ReportErrorAnswer("Authorization for server%i (%s) failed: Connection closed by remote host", NULL);
 		return false;
 	}
 
 	if (!strncmp(answer, "281", 3))
 	{
-		debug("authorization for %s successful", m_pNetAddress->GetHost());
+		debug("Authorization for %s successful", GetHost());
 		return true;
 	}
 	else if (!strncmp(answer, "381", 3))
@@ -147,7 +147,7 @@ bool NNTPConnection::AuthInfoUser(int iRecur)
 
 	if (GetStatus() != csCancelled)
 	{
-		error("authorization for %s failed (Answer: %s)", m_pNetAddress->GetHost(), answer);
+		ReportErrorAnswer("Authorization for server%i (%s) failed (Answer: %s)", answer);
 	}
 	return false;
 }
@@ -160,7 +160,7 @@ bool NNTPConnection::AuthInfoPass(int iRecur)
 	}
 
 	char tmp[1024];
-	snprintf(tmp, 1024, "AUTHINFO PASS %s\r\n", ((NewsServer*)m_pNetAddress)->GetPassword());
+	snprintf(tmp, 1024, "AUTHINFO PASS %s\r\n", m_pNewsServer->GetPassword());
 	tmp[1024-1] = '\0';
 
 	WriteLine(tmp);
@@ -168,12 +168,12 @@ bool NNTPConnection::AuthInfoPass(int iRecur)
 	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 	if (!answer)
 	{
-		ReportError("authorization for %s failed: Connection closed by remote host.", m_pNetAddress->GetHost(), 0);
+		ReportErrorAnswer("Authorization for server%i (%s) failed: Connection closed by remote host", NULL);
 		return false;
 	}
 	else if (!strncmp(answer, "2", 1))
 	{
-		debug("authorization for %s successful", m_pNetAddress->GetHost());
+		debug("Authorization for %s successful", GetHost());
 		return true;
 	}
 	else if (!strncmp(answer, "381", 3))
@@ -185,7 +185,7 @@ bool NNTPConnection::AuthInfoPass(int iRecur)
 
 	if (GetStatus() != csCancelled)
 	{
-		error("authorization for %s failed (Answer: %s)", m_pNetAddress->GetHost(), answer);
+		ReportErrorAnswer("Authorization for server%i (%s) failed (Answer: %s)", answer);
 	}
 	return false;
 }
@@ -204,67 +204,78 @@ 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, GetServer()->GetHost());
-
-		if (m_szActiveGroup)
-		{
-			free(m_szActiveGroup);
-		}
+		debug("Changed group to %s on %s", grp, GetHost());
+		free(m_szActiveGroup);
 		m_szActiveGroup = strdup(grp);
 	}
 	else
 	{
-		debug("Error changing group on %s to %s: %s.",
-			 GetServer()->GetHost(), grp, answer);
+		debug("Error changing group on %s to %s: %s.", GetHost(), grp, answer);
 	}
 
 	return answer;
 }
 
-int NNTPConnection::DoConnect()
+bool NNTPConnection::Connect()
 {
-	debug("Opening connection to %s", GetServer()->GetHost());
-	int res = Connection::DoConnect();
-	if (res < 0)
+	debug("Opening connection to %s", GetHost());
+
+	if (m_eStatus == csConnected)
 	{
-		return res;
+		return true;
 	}
 
-	char* answer = DoReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
+	if (!Connection::Connect())
+	{
+		return false;
+	}
+
+	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 
 	if (!answer)
 	{
-		ReportError("Connection to %s failed: Connection closed by remote host.", m_pNetAddress->GetHost(), 0);
-		return -1;
+		ReportErrorAnswer("Connection to server%i (%s) failed: Connection closed by remote host", NULL);
+		Disconnect();
+		return false;
 	}
 
 	if (strncmp(answer, "2", 1))
 	{
-		error("Connection to %s failed. Answer: ", m_pNetAddress->GetHost(), answer);
-		return -1;
+		ReportErrorAnswer("Connection to server%i (%s) failed (Answer: %s)", answer);
+		Disconnect();
+		return false;
 	}
 
-	debug("Connection to %s established", GetServer()->GetHost());
-	return 0;
+	if ((strlen(m_pNewsServer->GetUser()) > 0 && strlen(m_pNewsServer->GetPassword()) > 0) &&
+		!Authenticate())
+	{
+		return false;
+	}
+
+	debug("Connection to %s established", GetHost());
+
+	return true;
 }
 
-int NNTPConnection::DoDisconnect()
+bool NNTPConnection::Disconnect()
 {
 	if (m_eStatus == csConnected)
 	{
 		Request("quit\r\n");
-		if (m_szActiveGroup)
-		{
-			free(m_szActiveGroup);
-			m_szActiveGroup = NULL;
-		}
+		free(m_szActiveGroup);
+		m_szActiveGroup = NULL;
 	}
-	return Connection::DoDisconnect();
+	return Connection::Disconnect();
+}
+
+void NNTPConnection::ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer)
+{
+	char szErrStr[1024];
+	snprintf(szErrStr, 1024, szMsgPrefix, m_pNewsServer->GetID(), m_pNewsServer->GetHost(), szAnswer);
+	szErrStr[1024-1] = '\0';
+	
+	ReportError(szErrStr, NULL, false, 0);
 }

daemon/nntp/NNTPConnection.h

@@ -1,8 +1,8 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -33,26 +33,27 @@
 class NNTPConnection : public Connection
 {
 private:
-	char* 					m_szActiveGroup;
-	char*					m_szLineBuf;
-	bool					m_bAuthError;
+	NewsServer*			m_pNewsServer;
+	char* 				m_szActiveGroup;
+	char*				m_szLineBuf;
+	bool				m_bAuthError;
 
-	virtual int 			DoConnect();
-	virtual int 			DoDisconnect();
-	void					Clear();
+	void				Clear();
+	void				ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer);
+	bool 				Authenticate();
+	bool 				AuthInfoUser(int iRecur);
+	bool 				AuthInfoPass(int iRecur);
 
 public:
-							NNTPConnection(NewsServer* server);
-							~NNTPConnection();
-	NewsServer*				GetNewsServer() { return(NewsServer*)m_pNetAddress; }
-	const char* 			Request(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; }
+						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; }
 };
 
-
 #endif
 

daemon/nntp/NewsServer.cpp

@@ -0,0 +1,80 @@
+/*
+ *  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>
+ *
+ *  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 "nzbget.h"
+#include "NewsServer.h"
+
+NewsServer::NewsServer(int iID, bool bActive, const char* szName, const char* szHost, int iPort,
+	const char* szUser, const char* szPass, bool bJoinGroup, bool bTLS,
+	const char* szCipher, int iMaxConnections, int iLevel, int iGroup)
+{
+	m_iID = iID;
+	m_iStateID = 0;
+	m_bActive = bActive;
+	m_iPort = iPort;
+	m_iLevel = iLevel;
+	m_iNormLevel = iLevel;
+	m_iGroup = iGroup;
+	m_iMaxConnections = iMaxConnections;
+	m_bJoinGroup = bJoinGroup;
+	m_bTLS = bTLS;
+	m_szHost = strdup(szHost ? szHost : "");
+	m_szUser = strdup(szUser ? szUser : "");
+	m_szPassword = strdup(szPass ? szPass : "");
+	m_szCipher = strdup(szCipher ? szCipher : "");
+
+	if (szName && strlen(szName) > 0)
+	{
+		m_szName = strdup(szName);
+	}
+	else
+	{
+		m_szName = (char*)malloc(20);
+		snprintf(m_szName, 20, "server%i", iID);
+		m_szName[20-1] = '\0';
+	}
+}
+
+NewsServer::~NewsServer()
+{
+	free(m_szName);
+	free(m_szHost);
+	free(m_szUser);
+	free(m_szPassword);
+	free(m_szCipher);
+}

daemon/nntp/NewsServer.h

@@ -0,0 +1,78 @@
+/*
+ *  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>
+ *
+ *  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 NEWSSERVER_H
+#define NEWSSERVER_H
+
+#include <vector>
+
+class NewsServer
+{
+private:
+	int				m_iID;
+	int				m_iStateID;
+	bool			m_bActive;
+	char*			m_szName;
+	int				m_iGroup;
+	char*			m_szHost;
+	int				m_iPort;
+	char*			m_szUser;
+	char*			m_szPassword;
+	int				m_iMaxConnections;
+	int				m_iLevel;
+	int				m_iNormLevel;
+	bool			m_bJoinGroup;
+	bool			m_bTLS;
+	char*			m_szCipher;
+
+public:
+					NewsServer(int iID, bool bActive, const char* szName, 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				GetStateID() { return m_iStateID; }
+	void			SetStateID(int iStateID) { m_iStateID = iStateID; }
+	bool			GetActive() { return m_bActive; }
+	void			SetActive(bool bActive) { m_bActive = bActive; }
+	const char*		GetName() { return m_szName; }
+	int				GetGroup() { return m_iGroup; }
+	const char*		GetHost() { return m_szHost; }
+	int				GetPort() { return m_iPort; }
+	const char*		GetUser() { return m_szUser; }
+	const char*		GetPassword() { return m_szPassword; }
+	int				GetMaxConnections() { return m_iMaxConnections; }
+	int				GetLevel() { return m_iLevel; }
+	int				GetNormLevel() { return m_iNormLevel; }
+	void			SetNormLevel(int iLevel) { m_iNormLevel = iLevel; }
+	int				GetJoinGroup() { return m_bJoinGroup; }
+	bool			GetTLS() { return m_bTLS; }
+	const char*		GetCipher() { return m_szCipher; }
+};
+
+typedef std::vector<NewsServer*>		Servers;
+
+#endif

daemon/nntp/ServerPool.cpp

@@ -0,0 +1,366 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#ifndef WIN32
+#include <unistd.h>
+#include <errno.h>
+#endif
+#include <algorithm>
+
+#include "nzbget.h"
+#include "ServerPool.h"
+
+static const int CONNECTION_HOLD_SECODNS = 5;
+
+ServerPool::PooledConnection::PooledConnection(NewsServer* server) : NNTPConnection(server)
+{
+	m_bInUse = false;
+	m_tFreeTime = 0;
+}
+
+ServerPool::ServerPool()
+{
+	debug("Creating ServerPool");
+
+	m_iMaxNormLevel = 0;
+	m_iTimeout = 60;
+	m_iGeneration = 0;
+
+	g_pLog->RegisterDebuggable(this);
+}
+
+ServerPool::~ ServerPool()
+{
+	debug("Destroying ServerPool");
+
+	g_pLog->UnregisterDebuggable(this);
+
+	m_Levels.clear();
+
+	for (Servers::iterator it = m_Servers.begin(); it != m_Servers.end(); it++)
+	{
+		delete *it;
+	}
+	m_Servers.clear();
+	m_SortedServers.clear();
+
+	for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
+	{
+		delete *it;
+	}
+	m_Connections.clear();
+}
+
+void ServerPool::AddServer(NewsServer* pNewsServer)
+{
+	debug("Adding server to ServerPool");
+
+	m_Servers.push_back(pNewsServer);
+	m_SortedServers.push_back(pNewsServer);
+}
+
+/*
+ * Calculate normalized levels for all servers.
+ * Normalized Level means: starting from 0 with step 1.
+ * The servers of minimum Level must be always used even if they are not active;
+ * this is to prevent backup servers to act as main servers.
+**/
+void ServerPool::NormalizeLevels()
+{
+	if (m_Servers.empty())
+	{
+		return;
+	}
+
+	std::sort(m_SortedServers.begin(), m_SortedServers.end(), CompareServers);
+
+	// find minimum level
+	int iMinLevel = m_SortedServers.front()->GetLevel();
+	for (Servers::iterator it = m_SortedServers.begin(); it != m_SortedServers.end(); it++)
+	{
+		NewsServer* pNewsServer = *it;
+		if (pNewsServer->GetLevel() < iMinLevel)
+		{
+			iMinLevel = pNewsServer->GetLevel();
+		}
+	}
+
+	m_iMaxNormLevel = 0;
+	int iLastLevel = iMinLevel;
+	for (Servers::iterator it = m_SortedServers.begin(); it != m_SortedServers.end(); it++)
+	{
+		NewsServer* pNewsServer = *it;
+		if ((pNewsServer->GetActive() && pNewsServer->GetMaxConnections() > 0) ||
+			(pNewsServer->GetLevel() == iMinLevel))
+		{
+			if (pNewsServer->GetLevel() != iLastLevel)
+			{
+				m_iMaxNormLevel++;
+			}
+			pNewsServer->SetNormLevel(m_iMaxNormLevel);
+			iLastLevel = pNewsServer->GetLevel();
+		}
+		else
+		{
+			pNewsServer->SetNormLevel(-1);
+		}
+	}
+}
+
+bool ServerPool::CompareServers(NewsServer* pServer1, NewsServer* pServer2)
+{
+	return pServer1->GetLevel() < pServer2->GetLevel();
+}
+
+void ServerPool::InitConnections()
+{
+	debug("Initializing connections in ServerPool");
+
+	m_mutexConnections.Lock();
+
+	NormalizeLevels();
+	m_Levels.clear();
+
+	for (Servers::iterator it = m_SortedServers.begin(); it != m_SortedServers.end(); it++)
+	{
+		NewsServer* pNewsServer = *it;
+		int iNormLevel = pNewsServer->GetNormLevel();
+		if (pNewsServer->GetNormLevel() > -1)
+		{
+			if ((int)m_Levels.size() <= iNormLevel)
+			{
+				m_Levels.push_back(0);
+			}
+
+			if (pNewsServer->GetActive())
+			{
+				int iConnections = 0;
+				
+				for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
+				{
+					PooledConnection* pConnection = *it;
+					if (pConnection->GetNewsServer() == pNewsServer)
+					{
+						iConnections++;
+					}
+				}
+				
+				for (int i = iConnections; i < pNewsServer->GetMaxConnections(); i++)
+				{
+					PooledConnection* pConnection = new PooledConnection(pNewsServer);
+					pConnection->SetTimeout(m_iTimeout);
+					m_Connections.push_back(pConnection);
+					iConnections++;
+				}
+
+				m_Levels[iNormLevel] += iConnections;
+			}
+		}
+	}
+
+	m_iGeneration++;
+
+	m_mutexConnections.Unlock();
+}
+
+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++)
+		{
+			PooledConnection* pCandidateConnection = *it;
+			NewsServer* pCandidateServer = pCandidateConnection->GetNewsServer();
+			if (!pCandidateConnection->GetInUse() && pCandidateServer->GetActive() &&
+				pCandidateServer->GetNormLevel() == iLevel && 
+				(!pWantServer || pCandidateServer == pWantServer ||
+				 (pWantServer->GetGroup() > 0 && pWantServer->GetGroup() == pCandidateServer->GetGroup())))
+			{
+				// 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->GetNormLevel() == pCandidateServer->GetNormLevel()))
+						{
+							bUseConnection = false;
+							break;
+						}
+					}
+				}
+
+				if (bUseConnection)
+				{
+					pConnection = pCandidateConnection;
+					pConnection->SetInUse(true);
+					break;
+				}
+			}
+		}
+
+		if (pConnection)
+		{
+			m_Levels[iLevel]--;
+		}
+	}
+
+	m_mutexConnections.Unlock();
+
+	return pConnection;
+}
+
+void ServerPool::FreeConnection(NNTPConnection* pConnection, bool bUsed)
+{
+	if (bUsed)
+	{
+		debug("Freeing used connection");
+	}
+
+	m_mutexConnections.Lock();
+
+	((PooledConnection*)pConnection)->SetInUse(false);
+	if (bUsed)
+	{
+		((PooledConnection*)pConnection)->SetFreeTimeNow();
+	}
+
+	if (pConnection->GetNewsServer()->GetNormLevel() > -1 && pConnection->GetNewsServer()->GetActive())
+	{
+		m_Levels[pConnection->GetNewsServer()->GetNormLevel()]++;
+	}
+
+	m_mutexConnections.Unlock();
+}
+
+void ServerPool::CloseUnusedConnections()
+{
+	m_mutexConnections.Lock();
+
+	time_t curtime = ::time(NULL);
+
+	int i = 0;
+	for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); )
+	{
+		PooledConnection* pConnection = *it;
+		bool bDeleted = false;
+
+		if (!pConnection->GetInUse() &&
+			(pConnection->GetNewsServer()->GetNormLevel() == -1 ||
+			 !pConnection->GetNewsServer()->GetActive()))
+		{
+			debug("Closing (and deleting) unused connection to server%i", pConnection->GetNewsServer()->GetID());
+			if (pConnection->GetStatus() == Connection::csConnected)
+			{
+				pConnection->Disconnect();
+			}
+			delete pConnection;
+			m_Connections.erase(it);
+			it = m_Connections.begin() + i;
+			bDeleted = true;
+		}
+
+		if (!bDeleted && !pConnection->GetInUse() && pConnection->GetStatus() == Connection::csConnected)
+		{
+			int tdiff = (int)(curtime - pConnection->GetFreeTime());
+			if (tdiff > CONNECTION_HOLD_SECODNS)
+			{
+				debug("Closing (and keeping) unused connection to server%i", pConnection->GetNewsServer()->GetID());
+				pConnection->Disconnect();
+			}
+		}
+
+		if (!bDeleted)
+		{
+			it++;
+			i++;
+		}
+	}
+
+	m_mutexConnections.Unlock();
+}
+
+void ServerPool::Changed()
+{
+	debug("Server config has been changed");
+
+	InitConnections();
+	CloseUnusedConnections();
+}
+
+void ServerPool::LogDebugInfo()
+{
+	info("   ---------- ServerPool");
+
+	info("    Max-Level: %i", m_iMaxNormLevel);
+
+	m_mutexConnections.Lock();
+
+	info("    Servers: %i", m_Servers.size());
+	for (Servers::iterator it = m_Servers.begin(); it != m_Servers.end(); it++)
+	{
+		NewsServer*  pNewsServer = *it;
+		info("      %i) %s (%s): Level=%i, NormLevel=%i", pNewsServer->GetID(), pNewsServer->GetName(),
+			pNewsServer->GetHost(), pNewsServer->GetLevel(), pNewsServer->GetNormLevel());
+	}
+
+	info("    Levels: %i", m_Levels.size());
+	int index = 0;
+	for (Levels::iterator it = m_Levels.begin(); it != m_Levels.end(); it++, index++)
+	{
+		int  iSize = *it;
+		info("      %i: Free connections=%i", index, iSize);
+	}
+
+	info("    Connections: %i", m_Connections.size());
+	for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
+	{
+		PooledConnection*  pConnection = *it;
+		info("      %i) %s (%s): Level=%i, NormLevel=%i, InUse:%i", pConnection->GetNewsServer()->GetID(),
+			pConnection->GetNewsServer()->GetName(), pConnection->GetNewsServer()->GetHost(),
+			pConnection->GetNewsServer()->GetLevel(), pConnection->GetNewsServer()->GetNormLevel(),
+			(int)pConnection->GetInUse());
+	}
+
+	m_mutexConnections.Unlock();
+}

daemon/nntp/ServerPool.h

@@ -1,9 +1,8 @@
 /*
- *  This file if part of nzbget
+ *  This file is part of nzbget
  *
- *  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>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -17,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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -31,11 +30,12 @@
 #include <vector>
 #include <time.h>
 
+#include "Log.h"
 #include "Thread.h"
 #include "NewsServer.h"
 #include "NNTPConnection.h"
 
-class ServerPool
+class ServerPool : public Debuggable
 {
 private:
 	class PooledConnection : public NNTPConnection
@@ -51,29 +51,37 @@ private:
 		void			SetFreeTimeNow() { m_tFreeTime = ::time(NULL); }
 	};
 
-	typedef std::vector<NewsServer*>		Servers;
-	typedef std::vector<Semaphore*>			Semaphores;
+	typedef std::vector<int>				Levels;
 	typedef std::vector<PooledConnection*>	Connections;
 
 	Servers				m_Servers;
+	Servers				m_SortedServers;
 	Connections			m_Connections;
-	Semaphores			m_Semaphores;
-	int					m_iMaxLevel;
+	Levels				m_Levels;
+	int					m_iMaxNormLevel;
 	Mutex			 	m_mutexConnections;
 	int					m_iTimeout;
+	int					m_iGeneration;
+
+	void				NormalizeLevels();
+	static bool			CompareServers(NewsServer* pServer1, NewsServer* pServer2);
+
+protected:
+	virtual void			LogDebugInfo();
 
 public:
-	ServerPool();
-	~ServerPool();
+						ServerPool();
+						~ServerPool();
 	void				SetTimeout(int iTimeout) { m_iTimeout = iTimeout; }
-	void 				AddServer(NewsServer *s);
+	void 				AddServer(NewsServer* pNewsServer);
 	void				InitConnections();
-	int					GetMaxLevel() { return m_iMaxLevel; }
-	NNTPConnection*		GetConnection(int iLevel, bool bWait);
+	int					GetMaxNormLevel() { return m_iMaxNormLevel; }
+	Servers*			GetServers() { return &m_Servers; } // Only for read access (no lockings)
+	NNTPConnection*		GetConnection(int iLevel, NewsServer* pWantServer, Servers* pIgnoreServers);
 	void 				FreeConnection(NNTPConnection* pConnection, bool bUsed);
 	void				CloseUnusedConnections();
-
-	void				LogDebugInfo();
+	void				Changed();
+	int					GetGeneration() { return m_iGeneration; }
 };
 
 #endif

daemon/nntp/StatMeter.cpp

@@ -0,0 +1,546 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+
+#include "nzbget.h"
+#include "StatMeter.h"
+#include "Options.h"
+#include "ServerPool.h"
+#include "DiskState.h"
+
+extern ServerPool* g_pServerPool;
+extern Options* g_pOptions;
+extern DiskState* g_pDiskState;
+
+static const int DAYS_UP_TO_2013_JAN_1 = 15706;
+static const int DAYS_IN_TWENTY_YEARS = 366*20;
+
+ServerVolume::ServerVolume()
+{
+	m_BytesPerSeconds.resize(60);
+	m_BytesPerMinutes.resize(60);
+	m_BytesPerHours.resize(24);
+	m_BytesPerDays.resize(0);
+	m_iFirstDay = 0;
+	m_tDataTime = 0;
+	m_lTotalBytes = 0;
+	m_lCustomBytes = 0;
+	m_tCustomTime = time(NULL);
+	m_iSecSlot = 0;
+	m_iMinSlot = 0;
+	m_iHourSlot = 0;
+	m_iDaySlot = 0;
+}
+
+void ServerVolume::CalcSlots(time_t tLocCurTime)
+{
+	m_iSecSlot = (int)tLocCurTime % 60;
+	m_iMinSlot = ((int)tLocCurTime / 60) % 60;
+	m_iHourSlot = ((int)tLocCurTime % 86400) / 3600;
+	int iDaysSince1970 = (int)tLocCurTime / 86400;
+	m_iDaySlot = iDaysSince1970 - DAYS_UP_TO_2013_JAN_1 + 1;
+	if (0 <= m_iDaySlot && m_iDaySlot < DAYS_IN_TWENTY_YEARS)
+	{
+		int iCurDay = iDaysSince1970;
+		if (m_iFirstDay == 0 || m_iFirstDay > iCurDay)
+		{
+			m_iFirstDay = iCurDay;
+		}
+		m_iDaySlot = iCurDay - m_iFirstDay;
+		if (m_iDaySlot + 1 > (int)m_BytesPerDays.size())
+		{
+			m_BytesPerDays.resize(m_iDaySlot + 1);
+		}
+	}
+	else
+	{
+		m_iDaySlot = -1;
+	}
+}
+
+void ServerVolume::AddData(int iBytes)
+{
+	time_t tCurTime = time(NULL);
+	time_t tLocCurTime = tCurTime + g_pOptions->GetLocalTimeOffset();
+	time_t tLocDataTime = m_tDataTime + g_pOptions->GetLocalTimeOffset();
+
+	int iLastMinSlot = m_iMinSlot;
+	int iLastHourSlot = m_iHourSlot;
+
+	CalcSlots(tLocCurTime);
+
+	if (tLocCurTime != tLocDataTime)
+	{
+		// clear seconds/minutes/hours slots if necessary
+		// also handle the backwards changes of system clock
+
+		int iTotalDelta = (int)(tLocCurTime - tLocDataTime);
+		int iDeltaSign = iTotalDelta >= 0 ? 1 : -1;
+		iTotalDelta = abs(iTotalDelta);
+
+		int iSecDelta = iTotalDelta;
+		if (iDeltaSign < 0) iSecDelta++;
+		if (iSecDelta >= 60) iSecDelta = 60;
+		for (int i = 0; i < iSecDelta; i++)
+		{
+			int iNulSlot = m_iSecSlot - i * iDeltaSign;
+			if (iNulSlot < 0) iNulSlot += 60;
+			if (iNulSlot >= 60) iNulSlot -= 60;
+			m_BytesPerSeconds[iNulSlot] = 0;
+		}
+
+		int iMinDelta = iTotalDelta / 60;
+		if (iDeltaSign < 0) iMinDelta++;
+		if (abs(iMinDelta) >= 60) iMinDelta = 60;
+		if (iMinDelta == 0 && m_iMinSlot != iLastMinSlot) iMinDelta = 1;
+		for (int i = 0; i < iMinDelta; i++)
+		{
+			int iNulSlot = m_iMinSlot - i * iDeltaSign;
+			if (iNulSlot < 0) iNulSlot += 60;
+			if (iNulSlot >= 60) iNulSlot -= 60;
+			m_BytesPerMinutes[iNulSlot] = 0;
+		}
+
+		int iHourDelta = iTotalDelta / (60 * 60);
+		if (iDeltaSign < 0) iHourDelta++;
+		if (iHourDelta >= 24) iHourDelta = 24;
+		if (iHourDelta == 0 && m_iHourSlot != iLastHourSlot) iHourDelta = 1;
+		for (int i = 0; i < iHourDelta; i++)
+		{
+			int iNulSlot = m_iHourSlot - i * iDeltaSign;
+			if (iNulSlot < 0) iNulSlot += 24;
+			if (iNulSlot >= 24) iNulSlot -= 24;
+			m_BytesPerHours[iNulSlot] = 0;
+		}
+	}
+
+	// add bytes to every slot
+	m_BytesPerSeconds[m_iSecSlot] += iBytes;
+	m_BytesPerMinutes[m_iMinSlot] += iBytes;
+	m_BytesPerHours[m_iHourSlot] += iBytes;
+	if (m_iDaySlot >= 0)
+	{
+		m_BytesPerDays[m_iDaySlot] += iBytes;
+	}
+	m_lTotalBytes += iBytes;
+	m_lCustomBytes += iBytes;
+
+	m_tDataTime = tCurTime;
+}
+
+void ServerVolume::ResetCustom()
+{
+	m_lCustomBytes = 0;
+	m_tCustomTime = time(NULL);
+}
+
+void ServerVolume::LogDebugInfo()
+{
+	info("   ---------- ServerVolume");
+
+	char szSec[4000];
+
+	szSec[0] = '\0';
+	for (int i = 0; i < 60; i++)
+	{
+		char szNum[20];
+		snprintf(szNum, 20, "[%i]=%lli ", i, m_BytesPerSeconds[i]);
+		strncat(szSec, szNum, 4000);
+	}
+	info("Secs: %s", szSec);
+
+	szSec[0] = '\0';
+	for (int i = 0; i < 60; i++)
+	{
+		char szNum[20];
+		snprintf(szNum, 20, "[%i]=%lli ", i, m_BytesPerMinutes[i]);
+		strncat(szSec, szNum, 4000);
+	}
+	info("Mins: %s", szSec);
+
+	szSec[0] = '\0';
+	for (int i = 0; i < 24; i++)
+	{
+		char szNum[20];
+		snprintf(szNum, 20, "[%i]=%lli ", i, m_BytesPerHours[i]);
+		strncat(szSec, szNum, 4000);
+	}
+	info("Hours: %s", szSec);
+
+	szSec[0] = '\0';
+	for (int i = 0; i < (int)m_BytesPerDays.size(); i++)
+	{
+		char szNum[20];
+		snprintf(szNum, 20, "[%i]=%lli ", m_iFirstDay + i, m_BytesPerDays[i]);
+		strncat(szSec, szNum, 4000);
+	}
+	info("Days: %s", szSec);
+}
+
+StatMeter::StatMeter()
+{
+	debug("Creating StatMeter");
+
+	ResetSpeedStat();
+
+	m_iAllBytes = 0;
+	m_tStartDownload = 0;
+	m_tPausedFrom = 0;
+	m_bStandBy = true;
+	m_tStartServer = 0;
+	m_tLastCheck = 0;
+	m_tLastTimeOffset = 0;
+	m_bStatChanged = false;
+
+	g_pLog->RegisterDebuggable(this);
+}
+
+StatMeter::~StatMeter()
+{
+	debug("Destroying StatMeter");
+	// Cleanup
+
+	g_pLog->UnregisterDebuggable(this);
+
+	for (ServerVolumes::iterator it = m_ServerVolumes.begin(); it != m_ServerVolumes.end(); it++)
+	{
+		delete *it;
+	}
+
+	debug("StatMeter destroyed");
+}
+
+void StatMeter::Init()
+{
+	m_tStartServer = time(NULL);
+	m_tLastCheck = m_tStartServer;
+	AdjustTimeOffset();
+
+	m_ServerVolumes.resize(1 + g_pServerPool->GetServers()->size());
+	m_ServerVolumes[0] = new ServerVolume();
+	for (Servers::iterator it = g_pServerPool->GetServers()->begin(); it != g_pServerPool->GetServers()->end(); it++)
+	{
+		NewsServer* pServer = *it;
+		m_ServerVolumes[pServer->GetID()] = new ServerVolume();
+	}
+}
+
+void StatMeter::AdjustTimeOffset()
+{
+	time_t tUtcTime = time(NULL);
+	tm tmSplittedTime;
+	gmtime_r(&tUtcTime, &tmSplittedTime);
+	tmSplittedTime.tm_isdst = -1;
+	time_t tLocTime = mktime(&tmSplittedTime);
+	time_t tLocalTimeDelta = tUtcTime - tLocTime;
+	g_pOptions->SetLocalTimeOffset((int)tLocalTimeDelta + g_pOptions->GetTimeCorrection());
+	m_tLastTimeOffset = tUtcTime;
+
+	debug("UTC delta: %i (%i+%i)", g_pOptions->GetLocalTimeOffset(), (int)tLocalTimeDelta, g_pOptions->GetTimeCorrection());
+}
+
+/*
+ * Called once per second.
+ *  - detect large step changes of system time and adjust statistics;
+ *  - save volume stats (if changed).
+ */
+void StatMeter::IntervalCheck()
+{
+	time_t m_tCurTime = time(NULL);
+	time_t tDiff = m_tCurTime - m_tLastCheck;
+	if (tDiff > 60 || tDiff < 0)
+	{
+		m_tStartServer += tDiff + 1; // "1" because the method is called once per second
+		if (m_tStartDownload != 0 && !m_bStandBy)
+		{
+			m_tStartDownload += tDiff + 1;
+		}
+		AdjustTimeOffset();
+	}
+	else if (m_tLastTimeOffset > m_tCurTime ||
+		m_tCurTime - m_tLastTimeOffset > 60 * 60 * 3 ||
+		(m_tCurTime - m_tLastTimeOffset > 60 && !m_bStandBy))
+	{
+		// checking time zone settings may prevent the device from entering sleep/hibernate mode
+		// check every minute if not in standby
+		// check at least every 3 hours even in standby
+		AdjustTimeOffset();
+	}
+
+	m_tLastCheck = m_tCurTime;
+
+	if (m_bStatChanged)
+	{
+		Save();
+	}
+}
+
+void StatMeter::EnterLeaveStandBy(bool bEnter)
+{
+	m_mutexStat.Lock();
+	m_bStandBy = bEnter;
+	if (bEnter)
+	{
+		m_tPausedFrom = time(NULL);
+	}
+	else
+	{
+		if (m_tStartDownload == 0)
+		{
+			m_tStartDownload = time(NULL);
+		}
+		else
+		{
+			m_tStartDownload += time(NULL) - m_tPausedFrom;
+		}
+		m_tPausedFrom = 0;
+		ResetSpeedStat();
+	}
+	m_mutexStat.Unlock();
+}
+
+void StatMeter::CalcTotalStat(int* iUpTimeSec, int* iDnTimeSec, long long* iAllBytes, bool* bStandBy)
+{
+	m_mutexStat.Lock();
+	if (m_tStartServer > 0)
+	{
+		*iUpTimeSec = (int)(time(NULL) - m_tStartServer);
+	}
+	else
+	{
+		*iUpTimeSec = 0;
+	}
+	*bStandBy = m_bStandBy;
+	if (m_bStandBy)
+	{
+		*iDnTimeSec = (int)(m_tPausedFrom - m_tStartDownload);
+	}
+	else
+	{
+		*iDnTimeSec = (int)(time(NULL) - m_tStartDownload);
+	}
+	*iAllBytes = m_iAllBytes;
+	m_mutexStat.Unlock();
+}
+
+/*
+ * NOTE: see note to "AddSpeedReading"
+ */
+int StatMeter::CalcCurrentDownloadSpeed()
+{
+	if (m_bStandBy)
+	{
+		return 0;
+	}
+
+	int iTimeDiff = (int)time(NULL) - m_iSpeedStartTime * SPEEDMETER_SLOTSIZE;
+	if (iTimeDiff == 0)
+	{
+		return 0;
+	}
+
+	return (int)(m_iSpeedTotalBytes / iTimeDiff);
+}
+
+void StatMeter::AddSpeedReading(int iBytes)
+{
+	time_t tCurTime = time(NULL);
+	int iNowSlot = (int)tCurTime / SPEEDMETER_SLOTSIZE;
+
+	if (g_pOptions->GetAccurateRate())
+	{
+#ifdef HAVE_SPINLOCK
+		m_spinlockSpeed.Lock();
+#else
+		m_mutexSpeed.Lock();
+#endif
+	}
+
+	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_iSpeedTotalBytes - (long long)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];
+
+		//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)
+	{
+		long long 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;
+	m_iAllBytes += iBytes;
+
+	if (g_pOptions->GetAccurateRate())
+	{
+#ifdef HAVE_SPINLOCK
+		m_spinlockSpeed.Unlock();
+#else
+		m_mutexSpeed.Unlock();
+#endif
+	}
+}
+
+void StatMeter::ResetSpeedStat()
+{
+	time_t tCurTime = time(NULL);
+	m_iSpeedStartTime = (int)tCurTime / SPEEDMETER_SLOTSIZE;
+	for (int i = 0; i < SPEEDMETER_SLOTS; i++)
+	{
+		m_iSpeedBytes[i] = 0;
+		m_iSpeedTime[i] = m_iSpeedStartTime;
+	}
+	m_iSpeedBytesIndex = 0;
+	m_iSpeedTotalBytes = 0;
+	m_tSpeedCorrection = tCurTime;
+}
+
+void StatMeter::LogDebugInfo()
+{
+	info("   ---------- SpeedMeter");
+	float fSpeed = (float)(CalcCurrentDownloadSpeed() / 1024.0);
+	int iTimeDiff = (int)time(NULL) - m_iSpeedStartTime * SPEEDMETER_SLOTSIZE;
+	info("      Speed: %f", fSpeed);
+	info("      SpeedStartTime: %i", m_iSpeedStartTime);
+	info("      SpeedTotalBytes: %i", m_iSpeedTotalBytes);
+	info("      SpeedBytesIndex: %i", m_iSpeedBytesIndex);
+	info("      AllBytes: %i", m_iAllBytes);
+	info("      Time: %i", (int)time(NULL));
+	info("      TimeDiff: %i", iTimeDiff);
+	for (int i=0; i < SPEEDMETER_SLOTS; i++)
+	{
+		info("      Bytes[%i]: %i, Time[%i]: %i", i, m_iSpeedBytes[i], i, m_iSpeedTime[i]);
+	}
+
+	m_mutexVolume.Lock();
+	int index = 0;
+	for (ServerVolumes::iterator it = m_ServerVolumes.begin(); it != m_ServerVolumes.end(); it++, index++)
+	{
+		ServerVolume* pServerVolume = *it;
+		info("      ServerVolume %i", index);
+		pServerVolume->LogDebugInfo();
+	}
+	m_mutexVolume.Unlock();
+}
+
+void StatMeter::AddServerData(int iBytes, int iServerID)
+{
+	if (iBytes == 0)
+	{
+		return;
+	}
+
+	m_mutexVolume.Lock();
+	m_ServerVolumes[0]->AddData(iBytes);
+	m_ServerVolumes[iServerID]->AddData(iBytes);
+	m_bStatChanged = true;
+	m_mutexVolume.Unlock();
+}
+
+ServerVolumes* StatMeter::LockServerVolumes()
+{
+	m_mutexVolume.Lock();
+
+	// update slots
+	for (ServerVolumes::iterator it = m_ServerVolumes.begin(); it != m_ServerVolumes.end(); it++)
+	{
+		ServerVolume* pServerVolume = *it;
+		pServerVolume->AddData(0);
+	}
+
+	return &m_ServerVolumes;
+}
+
+void StatMeter::UnlockServerVolumes()
+{
+	m_mutexVolume.Unlock();
+}
+
+void StatMeter::Save()
+{
+	if (!g_pOptions->GetServerMode())
+	{
+		return;
+	}
+
+	m_mutexVolume.Lock();
+	g_pDiskState->SaveStats(g_pServerPool->GetServers(), &m_ServerVolumes);
+	m_bStatChanged = false;
+	m_mutexVolume.Unlock();
+}
+
+bool StatMeter::Load(bool* pPerfectServerMatch)
+{
+	m_mutexVolume.Lock();
+
+	bool bOK = g_pDiskState->LoadStats(g_pServerPool->GetServers(), &m_ServerVolumes, pPerfectServerMatch);
+
+	for (ServerVolumes::iterator it = m_ServerVolumes.begin(); it != m_ServerVolumes.end(); it++)
+	{
+		ServerVolume* pServerVolume = *it;
+		pServerVolume->CalcSlots(pServerVolume->GetDataTime() + g_pOptions->GetLocalTimeOffset());
+	}
+
+	m_mutexVolume.Unlock();
+
+	return bOK;
+}

daemon/nntp/StatMeter.h

@@ -0,0 +1,140 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef STATMETER_H
+#define STATMETER_H
+
+#include <vector>
+#include <time.h>
+
+#include "Log.h"
+#include "Thread.h"
+
+class ServerVolume
+{
+public:
+	typedef std::vector<long long>	VolumeArray;
+
+private:
+	VolumeArray			m_BytesPerSeconds;
+	VolumeArray			m_BytesPerMinutes;
+	VolumeArray			m_BytesPerHours;
+	VolumeArray			m_BytesPerDays;
+	int					m_iFirstDay;
+	long long			m_lTotalBytes;
+	long long			m_lCustomBytes;
+	time_t				m_tDataTime;
+	time_t				m_tCustomTime;
+	int					m_iSecSlot;
+	int					m_iMinSlot;
+	int					m_iHourSlot;
+	int					m_iDaySlot;
+
+public:
+						ServerVolume();
+	VolumeArray*		BytesPerSeconds() { return &m_BytesPerSeconds; }
+	VolumeArray*		BytesPerMinutes() { return &m_BytesPerMinutes; }
+	VolumeArray*		BytesPerHours() { return &m_BytesPerHours; }
+	VolumeArray*		BytesPerDays() { return &m_BytesPerDays; }
+	void				SetFirstDay(int iFirstDay) { m_iFirstDay = iFirstDay; }
+	int					GetFirstDay() { return m_iFirstDay; }
+	void				SetTotalBytes(long long lTotalBytes) { m_lTotalBytes = lTotalBytes; }
+	long long			GetTotalBytes() { return m_lTotalBytes; }
+	void				SetCustomBytes(long long lCustomBytes) { m_lCustomBytes = lCustomBytes; }
+	long long			GetCustomBytes() { return m_lCustomBytes; }
+	int					GetSecSlot() { return m_iSecSlot; }
+	int					GetMinSlot() { return m_iMinSlot; }
+	int					GetHourSlot() { return m_iHourSlot; }
+	int					GetDaySlot() { return m_iDaySlot; }
+	time_t				GetDataTime() { return m_tDataTime; }
+	void				SetDataTime(time_t tDataTime) { m_tDataTime = tDataTime; }
+	time_t				GetCustomTime() { return m_tCustomTime; }
+	void				SetCustomTime(time_t tCustomTime) { m_tCustomTime = tCustomTime; }
+
+	void				AddData(int iBytes);
+	void				CalcSlots(time_t tLocCurTime);
+	void				ResetCustom();
+	void				LogDebugInfo();
+};
+
+typedef std::vector<ServerVolume*>	ServerVolumes;
+
+class StatMeter : public Debuggable
+{
+private:
+	// speed meter
+	static const int	SPEEDMETER_SLOTS = 30;	  
+	static const int	SPEEDMETER_SLOTSIZE = 1;  //Split elapsed time into this number of secs.
+	int					m_iSpeedBytes[SPEEDMETER_SLOTS];
+	long long			m_iSpeedTotalBytes;
+	int					m_iSpeedTime[SPEEDMETER_SLOTS];
+	int					m_iSpeedStartTime; 
+	time_t				m_tSpeedCorrection;
+	int					m_iSpeedBytesIndex;
+#ifdef HAVE_SPINLOCK
+	SpinLock			m_spinlockSpeed;
+#else
+	Mutex				m_mutexSpeed;
+#endif
+
+	// time
+	long long			m_iAllBytes;
+	time_t				m_tStartServer;
+	time_t				m_tLastCheck;
+	time_t				m_tLastTimeOffset;
+	time_t				m_tStartDownload;
+	time_t				m_tPausedFrom;
+	bool				m_bStandBy;
+	Mutex				m_mutexStat;
+
+	// data volume
+	bool				m_bStatChanged;
+	ServerVolumes		m_ServerVolumes;
+	Mutex				m_mutexVolume;
+
+	void				ResetSpeedStat();
+	void				AdjustTimeOffset();
+
+protected:
+	virtual void		LogDebugInfo();
+
+public:
+						StatMeter();
+						~StatMeter();
+	void				Init();
+	int					CalcCurrentDownloadSpeed();
+	void				AddSpeedReading(int iBytes);
+	void				AddServerData(int iBytes, int iServerID);
+	void				CalcTotalStat(int* iUpTimeSec, int* iDnTimeSec, long long* iAllBytes, bool* bStandBy);
+	bool				GetStandBy() { return m_bStandBy; }
+	void				IntervalCheck();
+	void				EnterLeaveStandBy(bool bEnter);
+	ServerVolumes*		LockServerVolumes();
+	void				UnlockServerVolumes();
+	void				Save();
+	bool				Load(bool* pPerfectServerMatch);
+};
+
+#endif

daemon/postprocess/ParChecker.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -29,20 +29,20 @@
 #ifndef DISABLE_PARCHECK
 
 #include <deque>
+#include <string>
 
 #include "Thread.h"
-#include "Observer.h"
-#include "DownloadInfo.h"
+#include "Log.h"
 
-class ParChecker : public Thread, public Subject
+class ParChecker : public Thread
 {
 public:
 	enum EStatus
 	{
-        psUndefined,
-		psWorking,
 		psFailed,
-		psFinished
+		psRepairPossible,
+		psRepaired,
+		psRepairNotNeeded
 	};
 
 	enum EStage
@@ -53,20 +53,22 @@ public:
 		ptVerifyingRepaired,
 	};
 
-	typedef std::deque<char*>		QueuedParFiles;
+	typedef std::deque<char*>		FileList;
+	typedef std::deque<void*>		SourceList;
 	
 private:
 	char*				m_szInfoName;
-	char*				m_szNZBFilename;
-	char*				m_szParFilename;
+	char*				m_szDestDir;
+	char*				m_szNZBName;
+	const 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;
-	bool				m_bRepairNotNeeded;
-	QueuedParFiles		m_QueuedParFiles;
+	FileList			m_QueuedParFiles;
 	Mutex			 	m_mutexQueuedParFiles;
-	Semaphore			m_semNeedMoreFiles;
+	bool				m_bQueuedParFilesChanged;
+	FileList			m_ProcessedFiles;
 	int					m_iProcessedFiles;
 	int					m_iFilesToRepair;
 	int					m_iExtraFiles;
@@ -74,10 +76,21 @@ private:
 	char*				m_szProgressLabel;
 	int					m_iFileProgress;
 	int					m_iStageProgress;
+	bool				m_bCancelled;
+	SourceList			m_sourceFiles;
 
+	void				Cleanup();
+	EStatus				RunParCheck(const char* szParFilename);
+	int					PreProcessPar();
+	bool				LoadMainParBak();
+	int					ProcessMorePars();
 	bool				LoadMorePars();
-	bool				CheckSplittedFragments();
-	bool				AddSplittedFragments(const char* szFilename);
+	bool				AddSplittedFragments();
+	bool				AddMissingFiles();
+	bool				IsProcessedFile(const char* szFilename);
+	void				WriteBrokenLog(EStatus eStatus);
+	void				SaveSourceList();
+	void				DeleteLeftovers();
 	void				signal_filename(std::string str);
 	void				signal_progress(double progress);
 	void				signal_done(std::string str, int available, int total);
@@ -90,6 +103,10 @@ protected:
 	*/
 	virtual bool		RequestMorePars(int iBlockNeeded, int* pBlockFound) = 0;
 	virtual void		UpdateProgress() {}
+	virtual void		Completed() {}
+	virtual void		PrintMessage(Message::EKind eKind, const char* szFormat, ...) {}
+	virtual void		RegisterParredFile(const char* szFilename) {}
+	virtual bool		IsParredFile(const char* szFilename) { return false; }
 	EStage				GetStage() { return m_eStage; }
 	const char*			GetProgressLabel() { return m_szProgressLabel; }
 	int					GetFileProgress() { return m_iFileProgress; }
@@ -99,18 +116,16 @@ 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				SetStatus(EStatus eStatus);
+	void				SetNZBName(const char* szNZBName);
 	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

daemon/postprocess/ParCoordinator.cpp

@@ -0,0 +1,749 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <ctype.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"
+
+extern Options* g_pOptions;
+
+#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::PostParChecker::RegisterParredFile(const char* szFilename)
+{
+	m_pPostInfo->GetParredFiles()->push_back(strdup(szFilename));
+}
+
+bool ParCoordinator::PostParChecker::IsParredFile(const char* szFilename)
+{
+	for (PostInfo::ParredFiles::iterator it = m_pPostInfo->GetParredFiles()->begin(); it != m_pPostInfo->GetParredFiles()->end(); it++)
+	{
+		const char* szParredFile = *it;
+		if (!strcasecmp(szParredFile, szFilename))
+		{
+			return true;
+		}
+	}
+	return false;
+}
+
+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);
+}
+
+void ParCoordinator::PostParRenamer::RegisterParredFile(const char* szFilename)
+{
+	m_pPostInfo->GetParredFiles()->push_back(strdup(szFilename));
+}
+
+#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");
+
+	pDownloadQueue->EditEntry(pNZBInfo->GetID(), 
+		DownloadQueue::eaGroupPauseExtraPars, 0, NULL);
+}
+
+bool ParCoordinator::FindMainPars(const char* szPath, ParFileList* 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 (ParFileList::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 (iLen < 6)
+	{
+		return false;
+	}
+
+	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->GetNZBInfo()->GetName());
+	pPostInfo->SetWorking(true);
+	m_ParChecker.Start();
+}
+
+/**
+ * DownloadQueue must be locked prior to call of this function.
+ */
+void ParCoordinator::StartParRenameJob(PostInfo* pPostInfo)
+{
+	const char* szDestDir = pPostInfo->GetNZBInfo()->GetDestDir();
+
+	char szFinalDir[1024];
+	if (pPostInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usSuccess)
+	{
+		pPostInfo->GetNZBInfo()->BuildFinalDirName(szFinalDir, 1024);
+		szFinalDir[1024-1] = '\0';
+		szDestDir = szFinalDir;
+	}
+
+	m_eCurrentJob = jkParRename;
+	m_ParRenamer.SetPostInfo(pPostInfo);
+	m_ParRenamer.SetDestDir(szDestDir);
+	m_ParRenamer.SetInfoName(pPostInfo->GetNZBInfo()->GetName());
+	m_ParRenamer.SetDetectMissing(pPostInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usNone);
+	m_ParRenamer.PrintMessage(Message::mkInfo, "Checking renamed files for %s", pPostInfo->GetNZBInfo()->GetName());
+	pPostInfo->SetWorking(true);
+	m_ParRenamer.Start();
+}
+
+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();
+	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);
+	}
+	else
+	{
+		m_ParChecker.QueueChanged();
+	}
+	return bSameCollection;
+}
+
+void ParCoordinator::ParCheckCompleted()
+{
+	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+
+	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);
+
+	pDownloadQueue->Save();
+
+	DownloadQueue::Unlock();
+}
+
+/**
+* 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 = DownloadQueue::Lock();
+	
+	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)
+	{
+		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;
+		}
+	}
+
+	DownloadQueue::Unlock();
+
+	if (pBlockFound)
+	{
+		*pBlockFound = iBlockFound;
+	}
+
+	for (Blocks::iterator it = blocks.begin(); it != blocks.end(); it++)
+	{
+		delete *it;
+	}
+	blocks.clear();
+
+	bool bOK = iBlockNeeded <= 0;
+
+	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 (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
+	{
+		FileInfo* pFileInfo = *it;
+		int iBlocks = 0;
+		if (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()
+{
+	DownloadQueue::Lock();
+
+	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();
+	}
+
+	DownloadQueue::Unlock();
+	
+	CheckPauseState(pPostInfo);
+}
+
+void ParCoordinator::CheckPauseState(PostInfo* pPostInfo)
+{
+	if (g_pOptions->GetPausePostProcess() && !pPostInfo->GetNZBInfo()->GetForcePriority())
+	{
+		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() && !pPostInfo->GetNZBInfo()->GetForcePriority() && !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 = DownloadQueue::Lock();
+	
+	PostInfo* pPostInfo = m_ParRenamer.GetPostInfo();
+	pPostInfo->GetNZBInfo()->SetRenameStatus(m_ParRenamer.GetStatus() == ParRenamer::psSuccess ? NZBInfo::rsSuccess : NZBInfo::rsFailure);
+
+	if (m_ParRenamer.HasMissedFiles() && pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped)
+	{
+		PrintMessage(pPostInfo, Message::mkInfo, "Requesting par-check/repair for %s to restore missing files ", m_ParRenamer.GetInfoName());
+		pPostInfo->SetRequestParCheck(true);
+	}
+	else if (m_ParRenamer.HasSplittedFragments() && pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped)
+	{
+		PrintMessage(pPostInfo, Message::mkInfo, "Requesting par-check/repair for %s to join splitted fragments", m_ParRenamer.GetInfoName());
+		pPostInfo->SetRequestParCheck(true);
+	}
+
+	pPostInfo->SetWorking(false);
+	pPostInfo->SetStage(PostInfo::ptQueued);
+	
+	pDownloadQueue->Save();
+
+	DownloadQueue::Unlock();
+}
+
+void ParCoordinator::UpdateParRenameProgress()
+{
+	DownloadQueue::Lock();
+	
+	PostInfo* pPostInfo = m_ParRenamer.GetPostInfo();
+	pPostInfo->SetProgressLabel(m_ParRenamer.GetProgressLabel());
+	pPostInfo->SetStageProgress(m_ParRenamer.GetStageProgress());
+	time_t tCurrent = time(NULL);
+	
+	if (!pPostInfo->GetStartTime())
+	{
+		pPostInfo->SetStartTime(tCurrent);
+	}
+	
+	if (pPostInfo->GetStage() != PostInfo::ptRenaming)
+	{
+		pPostInfo->SetStage(PostInfo::ptRenaming);
+		pPostInfo->SetStageTime(tCurrent);
+	}
+	
+	DownloadQueue::Unlock();
+	
+	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

daemon/postprocess/ParCoordinator.h

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

daemon/postprocess/ParRenamer.cpp

@@ -0,0 +1,499 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#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);
+	m_bFileExists = false;
+}
+
+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;
+	m_bHasSplittedFragments = false;
+	m_bHasMissedFiles = false;
+	m_bDetectMissing = false;
+}
+
+ParRenamer::~ParRenamer()
+{
+	debug("Destroying ParRenamer");
+
+	free(m_szDestDir);
+	free(m_szInfoName);
+	free(m_szProgressLabel);
+
+	Cleanup();
+}
+
+void ParRenamer::Cleanup()
+{
+	ClearHashList();
+	
+	for (DirList::iterator it = m_DirList.begin(); it != m_DirList.end(); it++)
+	{
+		free(*it);
+	}
+	m_DirList.clear();
+}
+
+void ParRenamer::ClearHashList()
+{
+	for (FileHashList::iterator it = m_FileHashList.begin(); it != m_FileHashList.end(); it++)
+	{
+		delete *it;
+	}
+	m_FileHashList.clear();
+}
+
+void ParRenamer::SetDestDir(const char * szDestDir)
+{
+	free(m_szDestDir);
+	m_szDestDir = strdup(szDestDir);
+}
+
+void ParRenamer::SetInfoName(const char * szInfoName)
+{
+	free(m_szInfoName);
+	m_szInfoName = strdup(szInfoName);
+}
+
+void ParRenamer::Cancel()
+{
+	m_bCancelled = true;
+}
+
+void ParRenamer::Run()
+{
+	Cleanup();
+	m_bCancelled = false;
+	m_iFileCount = 0;
+	m_iCurFile = 0;
+	m_iRenamedCount = 0;
+	m_bHasSplittedFragments = false;
+	m_bHasMissedFiles = false;
+	m_eStatus = psFailed;
+
+	snprintf(m_szProgressLabel, 1024, "Checking renamed files for %s", m_szInfoName);
+	m_szProgressLabel[1024-1] = '\0';
+	m_iStageProgress = 0;
+	UpdateProgress();
+
+	BuildDirList(m_szDestDir);
+
+	for (DirList::iterator it = m_DirList.begin(); it != m_DirList.end(); it++)
+	{
+		char* szDestDir = *it;
+		debug("Checking %s", szDestDir);
+		ClearHashList();
+		LoadParFiles(szDestDir);
+
+		if (m_FileHashList.empty())
+		{
+			int iSavedCurFile = m_iCurFile;
+			CheckFiles(szDestDir, true);
+			m_iCurFile = iSavedCurFile; // restore progress indicator
+			LoadParFiles(szDestDir);
+		}
+
+		CheckFiles(szDestDir, false);
+
+		if (m_bDetectMissing)
+		{
+			CheckMissing();
+		}
+	}
+
+	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::BuildDirList(const char* szDestDir)
+{
+	m_DirList.push_back(strdup(szDestDir));
+
+	char* szFullFilename = (char*)malloc(1024);
+	DirBrowser* pDirBrowser = new DirBrowser(szDestDir);
+	
+	while (const char* filename = pDirBrowser->Next())
+	{
+		if (strcmp(filename, ".") && strcmp(filename, "..") && !m_bCancelled)
+		{
+			snprintf(szFullFilename, 1024, "%s%c%s", szDestDir, PATH_SEPARATOR, filename);
+			szFullFilename[1024-1] = '\0';
+			
+			if (Util::DirectoryExists(szFullFilename))
+			{
+				BuildDirList(szFullFilename);
+			}
+			else
+			{
+				m_iFileCount++;
+			}
+		}
+	}
+	
+	free(szFullFilename);
+	delete pDirBrowser;
+}
+
+void ParRenamer::LoadParFiles(const char* szDestDir)
+{
+	ParCoordinator::ParFileList parFileList;
+	ParCoordinator::FindMainPars(szDestDir, &parFileList);
+
+	for (ParCoordinator::ParFileList::iterator it = parFileList.begin(); it != parFileList.end(); it++)
+	{
+		char* szParFilename = *it;
+		
+		char szFullParFilename[1024];
+		snprintf(szFullParFilename, 1024, "%s%c%s", 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;
+		if (!sourceFile || !sourceFile->GetDescriptionPacket())
+		{
+			warn("Damaged par2-file detected: %s", szParFilename);
+			continue;
+		}
+		m_FileHashList.push_back(new FileHash(sourceFile->GetDescriptionPacket()->FileName().c_str(),
+			sourceFile->GetDescriptionPacket()->Hash16k().print().c_str()));
+		RegisterParredFile(sourceFile->GetDescriptionPacket()->FileName().c_str());
+	}
+
+	delete pRepairer;
+}
+
+void ParRenamer::CheckFiles(const char* szDestDir, bool bRenamePars)
+{
+	DirBrowser dir(szDestDir);
+	while (const char* filename = dir.Next())
+	{
+		if (strcmp(filename, ".") && strcmp(filename, "..") && !m_bCancelled)
+		{
+			char szFullFilename[1024];
+			snprintf(szFullFilename, 1024, "%s%c%s", szDestDir, PATH_SEPARATOR, filename);
+			szFullFilename[1024-1] = '\0';
+
+			if (!Util::DirectoryExists(szFullFilename))
+			{
+				snprintf(m_szProgressLabel, 1024, "Checking file %s", filename);
+				m_szProgressLabel[1024-1] = '\0';
+				m_iStageProgress = m_iCurFile * 1000 / m_iFileCount;
+				UpdateProgress();
+				m_iCurFile++;
+				
+				if (bRenamePars)
+				{
+					CheckParFile(szDestDir, szFullFilename);
+				}
+				else
+				{
+					CheckRegularFile(szDestDir, szFullFilename);
+				}
+			}
+		}
+	}
+}
+
+void ParRenamer::CheckMissing()
+{
+	for (FileHashList::iterator it = m_FileHashList.begin(); it != m_FileHashList.end(); it++)
+	{
+		FileHash* pFileHash = *it;
+		if (!pFileHash->GetFileExists())
+		{
+			if (Util::MatchFileExt(pFileHash->GetFilename(), g_pOptions->GetParIgnoreExt(), ",;") ||
+				Util::MatchFileExt(pFileHash->GetFilename(), g_pOptions->GetExtCleanupDisk(), ",;"))
+			{
+				info("File %s is missing, ignoring", pFileHash->GetFilename());
+			}
+			else
+			{
+				info("File %s is missing", pFileHash->GetFilename());
+				m_bHasMissedFiles = true;
+			}
+		}
+	}
+}
+
+bool ParRenamer::IsSplittedFragment(const char* szFilename, const char* szCorrectName)
+{
+	bool bSplittedFragement = false;
+	const char* szDiskBasename = Util::BaseFileName(szFilename);
+	const char* szExtension = strrchr(szDiskBasename, '.');
+	int iBaseLen = strlen(szCorrectName);
+	if (szExtension && !strncasecmp(szDiskBasename, szCorrectName, iBaseLen))
+	{
+		const char* p = szDiskBasename + iBaseLen;
+		if (*p == '.')
+		{
+			for (p++; *p && strchr("0123456789", *p); p++) ;
+			bSplittedFragement = !*p;
+			bSplittedFragement = bSplittedFragement && atoi(szDiskBasename + iBaseLen + 1) == 1;
+		}
+	}
+
+	m_bHasSplittedFragments = m_bHasSplittedFragments || bSplittedFragement;
+
+	return bSplittedFragement;
+}
+
+void ParRenamer::CheckRegularFile(const char* szDestDir, const char* szFilename)
+{
+	debug("Computing hash for %s", szFilename);
+
+	const int iBlockSize = 16*1024;
+	
+	FILE* pFile = fopen(szFilename, FOPEN_RB);
+	if (!pFile)
+	{
+		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());
+			pFileHash->SetFileExists(true);
+
+			char szDstFilename[1024];
+			snprintf(szDstFilename, 1024, "%s%c%s", szDestDir, PATH_SEPARATOR, pFileHash->GetFilename());
+			szDstFilename[1024-1] = '\0';
+
+			if (!Util::FileExists(szDstFilename) && !IsSplittedFragment(szFilename, pFileHash->GetFilename()))
+			{
+				PrintMessage(Message::mkInfo, "Renaming %s to %s", Util::BaseFileName(szFilename), pFileHash->GetFilename());
+				if (Util::MoveFile(szFilename, szDstFilename))
+				{
+					m_iRenamedCount++;
+				}
+				else
+				{
+					char szErrBuf[256];
+					PrintMessage(Message::mkError, "Could not rename %s to %s: %s", szFilename, szDstFilename,
+						Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+				}
+			}
+			
+			break;
+		}
+	}
+}
+
+/*
+* For files not having par2-extensions: checks if the file is a par2-file and renames
+* it according to its set-id.
+*/
+void ParRenamer::CheckParFile(const char* szDestDir, const char* szFilename)
+{
+	debug("Checking par2-header for %s", szFilename);
+
+	const char* szBasename = Util::BaseFileName(szFilename);
+	const char* szExtension = strrchr(szBasename, '.');
+	if (szExtension && !strcasecmp(szExtension, ".par2"))
+	{
+		// do not process files already having par2-extension
+		return;
+	}
+
+	FILE* pFile = fopen(szFilename, FOPEN_RB);
+	if (!pFile)
+	{
+		PrintMessage(Message::mkError, "Could not open file %s", szFilename);
+		return;
+	}
+
+	// load par2-header
+	PACKET_HEADER header;
+
+	int iReadBytes = fread(&header, 1, sizeof(header), pFile);
+	int iError = ferror(pFile);
+	if (iReadBytes != sizeof(header) && iError)
+	{
+		PrintMessage(Message::mkError, "Could not read file %s", szFilename);
+		return;
+	}
+
+	fclose(pFile);
+
+	// Check the packet header
+	if (packet_magic != header.magic ||          // not par2-file
+		sizeof(PACKET_HEADER) > header.length || // packet length is too small
+		0 != (header.length & 3) ||              // packet length is not a multiple of 4
+		Util::FileSize(szFilename) < (int)header.length)       // packet would extend beyond the end of the file
+	{
+		// not par2-file or damaged header, ignoring the file
+		return;
+	}
+
+	char szSetId[33];
+	strncpy(szSetId, header.setid.print().c_str(), sizeof(szSetId));
+	szSetId[33-1] = '\0';
+	for (char* p = szSetId; *p; p++) *p = tolower(*p); // convert string to lowercase
+
+	debug("Renaming: %s; setid: %s", Util::BaseFileName(szFilename), szSetId);
+
+	char szDestFileName[1024];
+	int iNum = 1;
+	while (iNum == 1 || Util::FileExists(szDestFileName))
+	{
+		snprintf(szDestFileName, 1024, "%s%c%s.vol%03i+01.PAR2", szDestDir, PATH_SEPARATOR, szSetId, iNum);
+		szDestFileName[1024-1] = '\0';
+		iNum++;
+	}
+
+	PrintMessage(Message::mkInfo, "Renaming %s to %s", Util::BaseFileName(szFilename), Util::BaseFileName(szDestFileName));
+	if (Util::MoveFile(szFilename, szDestFileName))
+	{
+		m_iRenamedCount++;
+	}
+	else
+	{
+		char szErrBuf[256];
+		PrintMessage(Message::mkError, "Could not rename %s to %s: %s", szFilename, szDestFileName,
+			Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+	}
+}
+
+#endif

daemon/postprocess/ParRenamer.h

@@ -0,0 +1,119 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef 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;
+		bool			m_bFileExists;
+
+	public:
+						FileHash(const char* szFilename, const char* szHash);
+						~FileHash();
+		const char*		GetFilename() { return m_szFilename; }
+		const char*		GetHash() { return m_szHash; }
+		bool			GetFileExists() { return m_bFileExists; }
+		void			SetFileExists(bool bFileExists) { m_bFileExists = bFileExists; }
+	};
+
+	typedef std::deque<FileHash*>		FileHashList;
+
+	typedef std::deque<char*>			DirList;
+	
+private:
+	char*				m_szInfoName;
+	char*				m_szDestDir;
+	EStatus				m_eStatus;
+	char*				m_szProgressLabel;
+	int					m_iStageProgress;
+	bool				m_bCancelled;
+	DirList				m_DirList;
+	FileHashList		m_FileHashList;
+	int					m_iFileCount;
+	int					m_iCurFile;
+	int					m_iRenamedCount;
+	bool				m_bHasSplittedFragments;
+	bool				m_bHasMissedFiles;
+	bool				m_bDetectMissing;
+
+	void				Cleanup();
+	void				ClearHashList();
+	void				BuildDirList(const char* szDestDir);
+	void				CheckDir(const char* szDestDir);
+	void				LoadParFiles(const char* szDestDir);
+	void				LoadParFile(const char* szParFilename);
+	void				CheckFiles(const char* szDestDir, bool bRenamePars);
+	void				CheckRegularFile(const char* szDestDir, const char* szFilename);
+	void				CheckParFile(const char* szDestDir, const char* szFilename);
+	bool				IsSplittedFragment(const char* szFilename, const char* szCorrectName);
+	void				CheckMissing();
+
+protected:
+	virtual void		UpdateProgress() {}
+	virtual void		Completed() {}
+	virtual void		PrintMessage(Message::EKind eKind, const char* szFormat, ...) {}
+	virtual void		RegisterParredFile(const char* szFilename) {}
+	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; }
+	bool				HasSplittedFragments() { return m_bHasSplittedFragments; }
+	bool				HasMissedFiles() { return m_bHasMissedFiles; }
+	void				SetDetectMissing(bool bDetectMissing) { m_bDetectMissing = bDetectMissing; }
+};
+
+#endif
+
+#endif

daemon/postprocess/PostScript.cpp

@@ -0,0 +1,322 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#ifndef WIN32
+#include <unistd.h>
+#endif
+#include <stdio.h>
+
+#include "nzbget.h"
+#include "PostScript.h"
+#include "Log.h"
+#include "Util.h"
+#include "Options.h"
+
+extern Options* g_pOptions;
+
+static const int POSTPROCESS_PARCHECK = 92;
+static const int POSTPROCESS_SUCCESS = 93;
+static const int POSTPROCESS_ERROR = 94;
+static const int POSTPROCESS_NONE = 95;
+
+void PostScriptController::StartJob(PostInfo* pPostInfo)
+{
+	PostScriptController* pScriptController = new PostScriptController();
+	pScriptController->m_pPostInfo = pPostInfo;
+	pScriptController->SetWorkingDir(g_pOptions->GetDestDir());
+	pScriptController->SetAutoDestroy(false);
+	pScriptController->m_iPrefixLen = 0;
+
+	pPostInfo->SetPostThread(pScriptController);
+
+	pScriptController->Start();
+}
+
+void PostScriptController::Run()
+{
+	StringBuilder scriptCommaList;
+
+	// the locking is needed for accessing the members of NZBInfo
+	DownloadQueue::Lock();
+	for (NZBParameterList::iterator it = m_pPostInfo->GetNZBInfo()->GetParameters()->begin(); it != m_pPostInfo->GetNZBInfo()->GetParameters()->end(); it++)
+	{
+		NZBParameter* pParameter = *it;
+		const char* szVarname = pParameter->GetName();
+		if (strlen(szVarname) > 0 && szVarname[0] != '*' && szVarname[strlen(szVarname)-1] == ':' &&
+			(!strcasecmp(pParameter->GetValue(), "yes") || !strcasecmp(pParameter->GetValue(), "on") || !strcasecmp(pParameter->GetValue(), "1")))
+		{
+			char* szScriptName = strdup(szVarname);
+			szScriptName[strlen(szScriptName)-1] = '\0'; // remove trailing ':'
+			scriptCommaList.Append(szScriptName);
+			scriptCommaList.Append(",");
+			free(szScriptName);
+		}
+	}
+	m_pPostInfo->GetNZBInfo()->GetScriptStatuses()->Clear();
+	DownloadQueue::Unlock();
+
+	ExecuteScriptList(scriptCommaList.GetBuffer());
+
+	m_pPostInfo->SetStage(PostInfo::ptFinished);
+	m_pPostInfo->SetWorking(false);
+}
+
+void PostScriptController::ExecuteScript(Options::Script* pScript)
+{
+	// if any script has requested par-check, do not execute other scripts
+	if (!pScript->GetPostScript() || m_pPostInfo->GetRequestParCheck())
+	{
+		return;
+	}
+
+	PrintMessage(Message::mkInfo, "Executing post-process-script %s for %s", pScript->GetName(), m_pPostInfo->GetNZBInfo()->GetName());
+
+	SetScript(pScript->GetLocation());
+	SetArgs(NULL, false);
+
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "post-process-script %s for %s", pScript->GetName(), m_pPostInfo->GetNZBInfo()->GetName());
+	szInfoName[1024-1] = '\0';
+	SetInfoName(szInfoName);
+
+	SetLogPrefix(pScript->GetDisplayName());
+	m_iPrefixLen = strlen(pScript->GetDisplayName()) + 2; // 2 = strlen(": ");
+	PrepareParams(pScript->GetName());
+
+	int iExitCode = Execute();
+
+	szInfoName[0] = 'P'; // uppercase
+
+	SetLogPrefix(NULL);
+	ScriptStatus::EStatus eStatus = AnalyseExitCode(iExitCode);
+	
+	// the locking is needed for accessing the members of NZBInfo
+	DownloadQueue::Lock();
+	m_pPostInfo->GetNZBInfo()->GetScriptStatuses()->Add(pScript->GetName(), eStatus);
+	DownloadQueue::Unlock();
+}
+
+void PostScriptController::PrepareParams(const char* szScriptName)
+{
+	// the locking is needed for accessing the members of NZBInfo
+	DownloadQueue::Lock();
+
+	ResetEnv();
+
+	SetIntEnvVar("NZBPP_NZBID", m_pPostInfo->GetNZBInfo()->GetID());
+	SetEnvVar("NZBPP_NZBNAME", m_pPostInfo->GetNZBInfo()->GetName());
+	SetEnvVar("NZBPP_DIRECTORY", m_pPostInfo->GetNZBInfo()->GetDestDir());
+	SetEnvVar("NZBPP_NZBFILENAME", m_pPostInfo->GetNZBInfo()->GetFilename());
+	SetEnvVar("NZBPP_URL", m_pPostInfo->GetNZBInfo()->GetURL());
+	SetEnvVar("NZBPP_FINALDIR", m_pPostInfo->GetNZBInfo()->GetFinalDir());
+	SetEnvVar("NZBPP_CATEGORY", m_pPostInfo->GetNZBInfo()->GetCategory());
+	SetIntEnvVar("NZBPP_HEALTH", m_pPostInfo->GetNZBInfo()->CalcHealth());
+	SetIntEnvVar("NZBPP_CRITICALHEALTH", m_pPostInfo->GetNZBInfo()->CalcCriticalHealth(false));
+
+	char szStatus[256];
+	strncpy(szStatus, m_pPostInfo->GetNZBInfo()->MakeTextStatus(true), sizeof(szStatus));
+	szStatus[256-1] = '\0';
+	SetEnvVar("NZBPP_STATUS", szStatus);
+
+	char* szDetail = strchr(szStatus, '/');
+	if (szDetail) *szDetail = '\0';
+	SetEnvVar("NZBPP_TOTALSTATUS", szStatus);
+
+    const char* szScriptStatusName[] = { "NONE", "FAILURE", "SUCCESS" };
+	SetEnvVar("NZBPP_SCRIPTSTATUS", szScriptStatusName[m_pPostInfo->GetNZBInfo()->GetScriptStatuses()->CalcTotalStatus()]);
+
+	// deprecated
+	int iParStatus[] = { 0, 0, 1, 2, 3, 4 };
+	SetIntEnvVar("NZBPP_PARSTATUS", iParStatus[m_pPostInfo->GetNZBInfo()->GetParStatus()]);
+
+	// deprecated
+	int iUnpackStatus[] = { 0, 0, 1, 2, 3, 4 };
+	SetIntEnvVar("NZBPP_UNPACKSTATUS", iUnpackStatus[m_pPostInfo->GetNZBInfo()->GetUnpackStatus()]);
+
+	// deprecated
+	SetIntEnvVar("NZBPP_HEALTHDELETED", (int)m_pPostInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsHealth);
+
+	SetIntEnvVar("NZBPP_TOTALARTICLES", (int)m_pPostInfo->GetNZBInfo()->GetTotalArticles());
+	SetIntEnvVar("NZBPP_SUCCESSARTICLES", (int)m_pPostInfo->GetNZBInfo()->GetSuccessArticles());
+	SetIntEnvVar("NZBPP_FAILEDARTICLES", (int)m_pPostInfo->GetNZBInfo()->GetFailedArticles());
+
+	for (ServerStatList::iterator it = m_pPostInfo->GetNZBInfo()->GetServerStats()->begin(); it != m_pPostInfo->GetNZBInfo()->GetServerStats()->end(); it++)
+	{
+		ServerStat* pServerStat = *it;
+
+		char szName[50];
+
+		snprintf(szName, 50, "NZBPP_SERVER%i_SUCCESSARTICLES", pServerStat->GetServerID());
+		szName[50-1] = '\0';
+		SetIntEnvVar(szName, pServerStat->GetSuccessArticles());
+
+		snprintf(szName, 50, "NZBPP_SERVER%i_FAILEDARTICLES", pServerStat->GetServerID());
+		szName[50-1] = '\0';
+		SetIntEnvVar(szName, pServerStat->GetFailedArticles());
+	}
+
+	PrepareEnvScript(m_pPostInfo->GetNZBInfo()->GetParameters(), szScriptName);
+	
+	DownloadQueue::Unlock();
+}
+
+ScriptStatus::EStatus PostScriptController::AnalyseExitCode(int iExitCode)
+{
+	// The ScriptStatus is accumulated for all scripts:
+	// If any script has failed the status is "failure", etc.
+
+	switch (iExitCode)
+	{
+		case POSTPROCESS_SUCCESS:
+			PrintMessage(Message::mkInfo, "%s successful", GetInfoName());
+			return ScriptStatus::srSuccess;
+
+		case POSTPROCESS_ERROR:
+		case -1: // Execute() returns -1 if the process could not be started (file not found or other problem)
+			PrintMessage(Message::mkError, "%s failed", GetInfoName());
+			return ScriptStatus::srFailure;
+
+		case POSTPROCESS_NONE:
+			PrintMessage(Message::mkInfo, "%s skipped", GetInfoName());
+			return ScriptStatus::srNone;
+
+#ifndef DISABLE_PARCHECK
+		case POSTPROCESS_PARCHECK:
+			if (m_pPostInfo->GetNZBInfo()->GetParStatus() > NZBInfo::psSkipped)
+			{
+				PrintMessage(Message::mkError, "%s requested par-check/repair, but the collection was already checked", GetInfoName());
+				return ScriptStatus::srFailure;
+			}
+			else
+			{
+				PrintMessage(Message::mkInfo, "%s requested par-check/repair", GetInfoName());
+				m_pPostInfo->SetRequestParCheck(true);
+				return ScriptStatus::srSuccess;
+			}
+			break;
+#endif
+
+		default:
+			PrintMessage(Message::mkError, "%s failed (terminated with unknown status)", GetInfoName());
+			return ScriptStatus::srFailure;
+	}
+}
+
+void PostScriptController::AddMessage(Message::EKind eKind, const char* szText)
+{
+	const char* szMsgText = szText + m_iPrefixLen;
+
+	if (!strncmp(szMsgText, "[NZB] ", 6))
+	{
+		debug("Command %s detected", szMsgText + 6);
+		if (!strncmp(szMsgText + 6, "FINALDIR=", 9))
+		{
+			DownloadQueue::Lock();
+			m_pPostInfo->GetNZBInfo()->SetFinalDir(szMsgText + 6 + 9);
+			DownloadQueue::Unlock();
+		}
+		else if (!strncmp(szMsgText + 6, "DIRECTORY=", 10))
+		{
+			DownloadQueue::Lock();
+			m_pPostInfo->GetNZBInfo()->SetDestDir(szMsgText + 6 + 10);
+			DownloadQueue::Unlock();
+		}
+		else if (!strncmp(szMsgText + 6, "NZBPR_", 6))
+		{
+			char* szParam = strdup(szMsgText + 6 + 6);
+			char* szValue = strchr(szParam, '=');
+			if (szValue)
+			{
+				*szValue = '\0';
+				DownloadQueue::Lock();
+				m_pPostInfo->GetNZBInfo()->GetParameters()->SetParameter(szParam, szValue + 1);
+				DownloadQueue::Unlock();
+			}
+			else
+			{
+				error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
+			}
+			free(szParam);
+		}
+		else
+		{
+			error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
+		}
+	}
+	else if (!strncmp(szMsgText, "[HISTORY] ", 10))
+	{
+		m_pPostInfo->GetNZBInfo()->AppendMessage(eKind, 0, szMsgText);
+	}
+	else
+	{
+		ScriptController::AddMessage(eKind, szText);
+		m_pPostInfo->AppendMessage(eKind, szText);
+	}
+
+	if (g_pOptions->GetPausePostProcess() && !m_pPostInfo->GetNZBInfo()->GetForcePriority())
+	{
+		time_t tStageTime = m_pPostInfo->GetStageTime();
+		time_t tStartTime = m_pPostInfo->GetStartTime();
+		time_t tWaitTime = time(NULL);
+
+		// wait until Post-processor is unpaused
+		while (g_pOptions->GetPausePostProcess() && !m_pPostInfo->GetNZBInfo()->GetForcePriority() && !IsStopped())
+		{
+			usleep(100 * 1000);
+
+			// update time stamps
+
+			time_t tDelta = time(NULL) - tWaitTime;
+
+			if (tStageTime > 0)
+			{
+				m_pPostInfo->SetStageTime(tStageTime + tDelta);
+			}
+
+			if (tStartTime > 0)
+			{
+				m_pPostInfo->SetStartTime(tStartTime + tDelta);
+			}
+		}
+	}
+}
+
+void PostScriptController::Stop()
+{
+	debug("Stopping post-process-script");
+	Thread::Stop();
+	Terminate();
+}

daemon/postprocess/PostScript.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007  Andrei Prygounkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -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., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
  * $Revision$
  * $Date$
@@ -23,32 +23,33 @@
  */
 
 
-#ifndef SCRIPTCONTROLLER_H
-#define SCRIPTCONTROLLER_H
+#ifndef POSTSCRIPT_H
+#define POSTSCRIPT_H
 
 #include "Thread.h"
-#include "PostInfo.h"
+#include "Log.h"
+#include "QueueScript.h"
+#include "DownloadInfo.h"
+#include "Options.h"
 
-class ScriptController : public Thread
+class PostScriptController : public Thread, public NZBScriptController
 {
 private:
 	PostInfo*			m_pPostInfo;
-	const char*			m_szScript;
-	bool				m_bNZBFileCompleted;
-	bool				m_bHasFailedParJobs;
-#ifdef WIN32
-	HANDLE				m_hProcess;
-#else
-	pid_t				m_hProcess;
-#endif
+	char				m_szNZBName[1024];
+ 	int					m_iPrefixLen;
 
-	void				AddMessage(char* szText);
+	void				PrepareParams(const char* szScriptName);
+	ScriptStatus::EStatus	AnalyseExitCode(int iExitCode);
+
+protected:
+	virtual void		ExecuteScript(Options::Script* pScript);
+	virtual void		AddMessage(Message::EKind eKind, const char* szText);
 
 public:
 	virtual void		Run();
 	virtual void		Stop();
-	static void			StartScriptJob(PostInfo* pPostInfo, const char* szScript, 
-							bool bNZBFileCompleted, bool bHasFailedParJobs);
+	static void			StartJob(PostInfo* pPostInfo);
 };
 
 #endif

daemon/postprocess/PrePostProcessor.cpp

@@ -0,0 +1,800 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#ifdef WIN32
+#include <direct.h>
+#else
+#include <unistd.h>
+#endif
+#include <set>
+#include <algorithm>
+
+#include "nzbget.h"
+#include "PrePostProcessor.h"
+#include "Options.h"
+#include "Log.h"
+#include "HistoryCoordinator.h"
+#include "DupeCoordinator.h"
+#include "PostScript.h"
+#include "Util.h"
+#include "Scheduler.h"
+#include "Scanner.h"
+#include "Unpack.h"
+#include "NZBFile.h"
+#include "StatMeter.h"
+
+extern HistoryCoordinator* g_pHistoryCoordinator;
+extern DupeCoordinator* g_pDupeCoordinator;
+extern Options* g_pOptions;
+extern Scheduler* g_pScheduler;
+extern Scanner* g_pScanner;
+extern StatMeter* g_pStatMeter;
+
+PrePostProcessor::PrePostProcessor()
+{
+	debug("Creating PrePostProcessor");
+
+	m_iJobCount = 0;
+	m_pCurJob = NULL;
+	m_szPauseReason = NULL;
+
+	m_DownloadQueueObserver.m_pOwner = this;
+	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+	pDownloadQueue->Attach(&m_DownloadQueueObserver);
+	DownloadQueue::Unlock();
+}
+
+PrePostProcessor::~PrePostProcessor()
+{
+	debug("Destroying PrePostProcessor");
+}
+
+void PrePostProcessor::Run()
+{
+	debug("Entering PrePostProcessor-loop");
+
+	while (!DownloadQueue::IsLoaded())
+	{
+		usleep(20 * 1000);
+	}
+
+	if (g_pOptions->GetServerMode() && g_pOptions->GetSaveQueue() && g_pOptions->GetReloadQueue())
+	{
+		DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+		SanitisePostQueue(pDownloadQueue);
+		DownloadQueue::Unlock();
+	}
+
+	g_pScheduler->FirstCheck();
+
+	int iDiskSpaceInterval = 1000;
+	int iSchedulerInterval = 1000;
+	int iHistoryInterval = 600000;
+	const int iStepMSec = 200;
+
+	while (!IsStopped())
+	{
+		// check incoming nzb directory
+		g_pScanner->Check();
+
+		if (!g_pOptions->GetPauseDownload() && 
+			g_pOptions->GetDiskSpace() > 0 && !g_pStatMeter->GetStandBy() && 
+			iDiskSpaceInterval >= 1000)
+		{
+			// check free disk space every 1 second
+			CheckDiskSpace();
+			iDiskSpaceInterval = 0;
+		}
+		iDiskSpaceInterval += iStepMSec;
+
+		// check post-queue every 200 msec
+		CheckPostQueue();
+
+		if (iSchedulerInterval >= 1000)
+		{
+			// check scheduler tasks every 1 second
+			g_pScheduler->IntervalCheck();
+			iSchedulerInterval = 0;
+		}
+		iSchedulerInterval += iStepMSec;
+
+		if (iHistoryInterval >= 600000)
+		{
+			// check history (remove old entries) every 10 minutes
+			g_pHistoryCoordinator->IntervalCheck();
+			iHistoryInterval = 0;
+		}
+		iHistoryInterval += iStepMSec;
+
+		Util::SetStandByMode(!m_pCurJob);
+
+		usleep(iStepMSec * 1000);
+	}
+
+	g_pHistoryCoordinator->Cleanup();
+
+	debug("Exiting PrePostProcessor-loop");
+}
+
+void PrePostProcessor::Stop()
+{
+	Thread::Stop();
+	DownloadQueue::Lock();
+
+#ifndef DISABLE_PARCHECK
+	m_ParCoordinator.Stop();
+#endif
+
+	if (m_pCurJob && m_pCurJob->GetPostInfo() &&
+		(m_pCurJob->GetPostInfo()->GetStage() == PostInfo::ptUnpacking ||
+		 m_pCurJob->GetPostInfo()->GetStage() == PostInfo::ptExecutingScript) && 
+		m_pCurJob->GetPostInfo()->GetPostThread())
+	{
+		Thread* pPostThread = m_pCurJob->GetPostInfo()->GetPostThread();
+		m_pCurJob->GetPostInfo()->SetPostThread(NULL);
+		pPostThread->SetAutoDestroy(true);
+		pPostThread->Stop();
+	}
+
+	DownloadQueue::Unlock();
+}
+
+void PrePostProcessor::DownloadQueueUpdate(Subject* Caller, void* Aspect)
+{
+	if (IsStopped())
+	{
+		return;
+	}
+
+	DownloadQueue::Aspect* pQueueAspect = (DownloadQueue::Aspect*)Aspect;
+	if (pQueueAspect->eAction == DownloadQueue::eaNzbFound)
+	{
+		NZBFound(pQueueAspect->pDownloadQueue, pQueueAspect->pNZBInfo);
+	}
+	else if (pQueueAspect->eAction == DownloadQueue::eaNzbAdded)
+	{
+		NZBAdded(pQueueAspect->pDownloadQueue, pQueueAspect->pNZBInfo);
+	}
+	else if ((pQueueAspect->eAction == DownloadQueue::eaFileCompleted ||
+		pQueueAspect->eAction == DownloadQueue::eaFileDeleted))
+	{
+		if (
+#ifndef DISABLE_PARCHECK
+			!m_ParCoordinator.AddPar(pQueueAspect->pFileInfo, pQueueAspect->eAction == DownloadQueue::eaFileDeleted) &&
+#endif
+			IsNZBFileCompleted(pQueueAspect->pNZBInfo, true, false) &&
+			!pQueueAspect->pNZBInfo->GetPostInfo() &&
+			(!pQueueAspect->pFileInfo->GetPaused() || IsNZBFileCompleted(pQueueAspect->pNZBInfo, false, false)))
+		{
+			if ((pQueueAspect->eAction == DownloadQueue::eaFileCompleted ||
+				(pQueueAspect->pFileInfo->GetAutoDeleted() &&
+				 IsNZBFileCompleted(pQueueAspect->pNZBInfo, false, true))) &&
+				 pQueueAspect->pFileInfo->GetNZBInfo()->GetDeleteStatus() != NZBInfo::dsHealth)
+			{
+				info("Collection %s completely downloaded", pQueueAspect->pNZBInfo->GetName());
+				NZBDownloaded(pQueueAspect->pDownloadQueue, pQueueAspect->pNZBInfo);
+			}
+			else if ((pQueueAspect->eAction == DownloadQueue::eaFileDeleted ||
+				(pQueueAspect->eAction == DownloadQueue::eaFileCompleted &&
+				 pQueueAspect->pFileInfo->GetNZBInfo()->GetDeleteStatus() > NZBInfo::dsNone)) &&
+				!pQueueAspect->pNZBInfo->GetParCleanup() &&
+				IsNZBFileCompleted(pQueueAspect->pNZBInfo, false, true))
+			{
+				info("Collection %s deleted from queue", pQueueAspect->pNZBInfo->GetName());
+				NZBDeleted(pQueueAspect->pDownloadQueue, pQueueAspect->pNZBInfo);
+			}
+		}
+	}
+}
+
+void PrePostProcessor::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
+{
+	if (g_pOptions->GetDupeCheck() && pNZBInfo->GetDupeMode() != dmForce)
+	{
+		g_pDupeCoordinator->NZBFound(pDownloadQueue, pNZBInfo);
+	}
+}
+
+void PrePostProcessor::NZBAdded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
+{
+	if (g_pOptions->GetParCheck() != Options::pcForce)
+	{
+		m_ParCoordinator.PausePars(pDownloadQueue, pNZBInfo);
+	}
+
+	if (g_pOptions->GetDupeCheck() && pNZBInfo->GetDupeMode() != dmForce &&
+		pNZBInfo->GetDeleteStatus() == NZBInfo::dsDupe)
+	{
+		NZBCompleted(pDownloadQueue, pNZBInfo, false);
+	}
+	else if (!Util::EmptyStr(g_pOptions->GetQueueScript()))
+	{
+		QueueScriptController::StartScripts(pDownloadQueue, pNZBInfo);
+	}
+}
+
+void PrePostProcessor::NZBDownloaded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
+{
+	if (!pNZBInfo->GetPostInfo() && g_pOptions->GetDecode())
+	{
+		info("Queueing %s for post-processing", pNZBInfo->GetName());
+
+		pNZBInfo->EnterPostProcess();
+		m_iJobCount++;
+
+		if (pNZBInfo->GetParStatus() == NZBInfo::psNone &&
+			g_pOptions->GetParCheck() != Options::pcAlways &&
+			g_pOptions->GetParCheck() != Options::pcForce)
+		{
+			pNZBInfo->SetParStatus(NZBInfo::psSkipped);
+		}
+
+		if (pNZBInfo->GetRenameStatus() == NZBInfo::rsNone && !g_pOptions->GetParRename())
+		{
+			pNZBInfo->SetRenameStatus(NZBInfo::rsSkipped);
+		}
+
+		if (pNZBInfo->GetDeleteStatus() != NZBInfo::dsNone)
+		{
+			pNZBInfo->SetParStatus(NZBInfo::psFailure);
+			pNZBInfo->SetUnpackStatus(NZBInfo::usFailure);
+			pNZBInfo->SetRenameStatus(NZBInfo::rsFailure);
+			pNZBInfo->SetMoveStatus(NZBInfo::msFailure);
+		}
+
+		pDownloadQueue->Save();
+	}
+	else
+	{
+		NZBCompleted(pDownloadQueue, pNZBInfo, true);
+	}
+}
+
+void PrePostProcessor::NZBDeleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
+{
+	if (pNZBInfo->GetDeleteStatus() == NZBInfo::dsNone)
+	{
+		pNZBInfo->SetDeleteStatus(NZBInfo::dsManual);
+	}
+	pNZBInfo->SetDeleting(false);
+
+	if ((g_pOptions->GetDeleteCleanupDisk() && pNZBInfo->GetCleanupDisk()) ||
+		pNZBInfo->GetDeleteStatus() == NZBInfo::dsDupe)
+	{
+		// download was cancelled, deleting already downloaded files from disk
+		for (NZBInfo::Files::reverse_iterator it = pNZBInfo->GetCompletedFiles()->rbegin(); it != pNZBInfo->GetCompletedFiles()->rend(); it++)
+		{
+			char* szFilename = *it;
+			if (Util::FileExists(szFilename))
+			{
+				detail("Deleting file %s", Util::BaseFileName(szFilename));
+				remove(szFilename);
+			}
+		}
+
+		// delete .out.tmp-files and _brokenlog.txt
+		DirBrowser dir(pNZBInfo->GetDestDir());
+		while (const char* szFilename = dir.Next())
+		{
+			int iLen = strlen(szFilename);
+			if ((iLen > 8 && !strcmp(szFilename + iLen - 8, ".out.tmp")) || !strcmp(szFilename, "_brokenlog.txt"))
+			{
+				char szFullFilename[1024];
+				snprintf(szFullFilename, 1024, "%s%c%s", pNZBInfo->GetDestDir(), PATH_SEPARATOR, szFilename);
+				szFullFilename[1024-1] = '\0';
+
+				detail("Deleting file %s", szFilename);
+				remove(szFullFilename);
+			}
+		}
+	
+		// delete old directory (if empty)
+		if (Util::DirEmpty(pNZBInfo->GetDestDir()))
+		{
+			rmdir(pNZBInfo->GetDestDir());
+		}
+	}
+
+	if (pNZBInfo->GetDeleteStatus() == NZBInfo::dsHealth)
+	{
+		NZBDownloaded(pDownloadQueue, pNZBInfo);
+	}
+	else
+	{
+		NZBCompleted(pDownloadQueue, pNZBInfo, true);
+	}
+}
+
+void PrePostProcessor::NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bSaveQueue)
+{
+	bool bAddToHistory = g_pOptions->GetKeepHistory() > 0 && !pNZBInfo->GetAvoidHistory();
+	if (bAddToHistory)
+	{
+		g_pHistoryCoordinator->AddToHistory(pDownloadQueue, pNZBInfo);
+	}
+	pNZBInfo->SetAvoidHistory(false);
+
+	bool bNeedSave = bAddToHistory;
+
+	if (g_pOptions->GetDupeCheck() && pNZBInfo->GetDupeMode() != dmForce &&
+		(pNZBInfo->GetDeleteStatus() == NZBInfo::dsNone ||
+		 pNZBInfo->GetDeleteStatus() == NZBInfo::dsHealth))
+	{
+		g_pDupeCoordinator->NZBCompleted(pDownloadQueue, pNZBInfo);
+		bNeedSave = true;
+	}
+
+	if (!bAddToHistory)
+	{
+		g_pHistoryCoordinator->DeleteQueuedFile(pNZBInfo->GetQueuedFilename());
+		pDownloadQueue->GetQueue()->Remove(pNZBInfo);
+		delete pNZBInfo;
+	}
+
+	if (bSaveQueue && bNeedSave)
+	{
+		pDownloadQueue->Save();
+	}
+}
+
+void PrePostProcessor::CheckDiskSpace()
+{
+	long long lFreeSpace = Util::FreeDiskSize(g_pOptions->GetDestDir());
+	if (lFreeSpace > -1 && lFreeSpace / 1024 / 1024 < g_pOptions->GetDiskSpace())
+	{
+		warn("Low disk space on %s. Pausing download", g_pOptions->GetDestDir());
+		g_pOptions->SetPauseDownload(true);
+	}
+
+	if (!Util::EmptyStr(g_pOptions->GetInterDir()))
+	{
+		lFreeSpace = Util::FreeDiskSize(g_pOptions->GetInterDir());
+		if (lFreeSpace > -1 && lFreeSpace / 1024 / 1024 < g_pOptions->GetDiskSpace())
+		{
+			warn("Low disk space on %s. Pausing download", g_pOptions->GetInterDir());
+			g_pOptions->SetPauseDownload(true);
+		}
+	}
+}
+
+void PrePostProcessor::CheckPostQueue()
+{
+	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+
+	if (!m_pCurJob && m_iJobCount > 0)
+	{
+		m_pCurJob = GetNextJob(pDownloadQueue);
+		if (!m_pCurJob && !g_pOptions->GetPausePostProcess())
+		{
+			error("Internal error: no jobs found in queue");
+			m_iJobCount = 0;
+		}
+	}
+
+	if (m_pCurJob)
+	{
+		PostInfo* pPostInfo = m_pCurJob->GetPostInfo();
+		if (!pPostInfo->GetWorking() && !IsNZBFileDownloading(m_pCurJob))
+		{
+#ifndef DISABLE_PARCHECK
+			if (pPostInfo->GetRequestParCheck() && pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped &&
+				g_pOptions->GetParCheck() != Options::pcManual)
+			{
+				pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psNone);
+				pPostInfo->SetRequestParCheck(false);
+				pPostInfo->SetStage(PostInfo::ptQueued);
+				pPostInfo->GetNZBInfo()->GetScriptStatuses()->Clear();
+				DeletePostThread(pPostInfo);
+			}
+			else if (pPostInfo->GetRequestParCheck() && pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped &&
+				g_pOptions->GetParCheck() == Options::pcManual)
+			{
+				pPostInfo->SetRequestParCheck(false);
+				pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psManual);
+				DeletePostThread(pPostInfo);
+
+				if (!pPostInfo->GetNZBInfo()->GetFileList()->empty())
+				{
+					info("Downloading all remaining files for manual par-check for %s", pPostInfo->GetNZBInfo()->GetName());
+					pDownloadQueue->EditEntry(pPostInfo->GetNZBInfo()->GetID(), DownloadQueue::eaGroupResume, 0, NULL);
+					pPostInfo->SetStage(PostInfo::ptFinished);
+				}
+				else
+				{
+					info("There are no par-files remain for download for %s", pPostInfo->GetNZBInfo()->GetName());
+					pPostInfo->SetStage(PostInfo::ptQueued);
+				}
+			}
+			
+#endif
+			if (pPostInfo->GetDeleted())
+			{
+				pPostInfo->SetStage(PostInfo::ptFinished);
+			}
+
+			if (pPostInfo->GetStage() == PostInfo::ptQueued &&
+				(!g_pOptions->GetPausePostProcess() || pPostInfo->GetNZBInfo()->GetForcePriority()))
+			{
+				DeletePostThread(pPostInfo);
+				StartJob(pDownloadQueue, pPostInfo);
+			}
+			else if (pPostInfo->GetStage() == PostInfo::ptFinished)
+			{
+				UpdatePauseState(false, NULL);
+				JobCompleted(pDownloadQueue, pPostInfo);
+			}
+			else if (!g_pOptions->GetPausePostProcess())
+			{
+				error("Internal error: invalid state in post-processor");
+				// TODO: cancel (delete) current job
+			}
+		}
+	}
+	
+	DownloadQueue::Unlock();
+}
+
+NZBInfo* PrePostProcessor::GetNextJob(DownloadQueue* pDownloadQueue)
+{
+	NZBInfo* pNZBInfo = NULL;
+
+	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+	{
+		NZBInfo* pNZBInfo1 = *it;
+		if (pNZBInfo1->GetPostInfo() && (!pNZBInfo || pNZBInfo1->GetPriority() > pNZBInfo->GetPriority()) &&
+			(!g_pOptions->GetPausePostProcess() || pNZBInfo1->GetForcePriority()))
+		{
+			pNZBInfo = pNZBInfo1;
+		}
+	}
+
+	return pNZBInfo;
+}
+
+/**
+ * Reset the state of items after reloading from disk and
+ * delete items which could not be resumed.
+ * Also count the number of post-jobs.
+ */
+void PrePostProcessor::SanitisePostQueue(DownloadQueue* pDownloadQueue)
+{
+	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+	{
+		NZBInfo* pNZBInfo = *it;
+		PostInfo* pPostInfo = pNZBInfo->GetPostInfo();
+		if (pPostInfo)
+		{
+			m_iJobCount++;
+			if (pPostInfo->GetStage() == PostInfo::ptExecutingScript ||
+				!Util::DirectoryExists(pNZBInfo->GetDestDir()))
+			{
+				pPostInfo->SetStage(PostInfo::ptFinished);
+			}
+			else
+			{
+				pPostInfo->SetStage(PostInfo::ptQueued);
+			}
+		}
+	}
+}
+
+void PrePostProcessor::DeletePostThread(PostInfo* pPostInfo)
+{
+	delete pPostInfo->GetPostThread();
+	pPostInfo->SetPostThread(NULL);
+}
+
+void PrePostProcessor::StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo)
+{
+#ifndef DISABLE_PARCHECK
+	if (pPostInfo->GetNZBInfo()->GetRenameStatus() == NZBInfo::rsNone)
+	{
+		UpdatePauseState(g_pOptions->GetParPauseQueue(), "par-rename");
+		m_ParCoordinator.StartParRenameJob(pPostInfo);
+		return;
+	}
+	else if (pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psNone)
+	{
+		if (m_ParCoordinator.FindMainPars(pPostInfo->GetNZBInfo()->GetDestDir(), NULL))
+		{
+			UpdatePauseState(g_pOptions->GetParPauseQueue(), "par-check");
+			m_ParCoordinator.StartParCheckJob(pPostInfo);
+		}
+		else
+		{
+			info("Nothing to par-check for %s", pPostInfo->GetNZBInfo()->GetName());
+			pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psSkipped);
+			pPostInfo->SetWorking(false);
+			pPostInfo->SetStage(PostInfo::ptQueued);
+		}
+		return;
+	}
+	else if (pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psSkipped &&
+		pPostInfo->GetNZBInfo()->CalcHealth() < pPostInfo->GetNZBInfo()->CalcCriticalHealth(false) &&
+		pPostInfo->GetNZBInfo()->CalcCriticalHealth(false) < 1000 &&
+		m_ParCoordinator.FindMainPars(pPostInfo->GetNZBInfo()->GetDestDir(), NULL))
+	{
+		warn("Skipping par-check for %s due to health %.1f%% below critical %.1f%%", pPostInfo->GetNZBInfo()->GetName(),
+			pPostInfo->GetNZBInfo()->CalcHealth() / 10.0, pPostInfo->GetNZBInfo()->CalcCriticalHealth(false) / 10.0);
+		pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psFailure);
+		return;
+	}
+	else if (pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psSkipped &&
+		pPostInfo->GetNZBInfo()->GetFailedSize() - pPostInfo->GetNZBInfo()->GetParFailedSize() > 0 &&
+		m_ParCoordinator.FindMainPars(pPostInfo->GetNZBInfo()->GetDestDir(), NULL))
+	{
+		info("Collection %s with health %.1f%% needs par-check",
+			pPostInfo->GetNZBInfo()->GetName(), pPostInfo->GetNZBInfo()->CalcHealth() / 10.0);
+		pPostInfo->SetRequestParCheck(true);
+		return;
+	}
+#endif
+
+	NZBParameter* pUnpackParameter = pPostInfo->GetNZBInfo()->GetParameters()->Find("*Unpack:", false);
+	bool bUnpackParam = !(pUnpackParameter && !strcasecmp(pUnpackParameter->GetValue(), "no"));
+	bool bUnpack = bUnpackParam && (pPostInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usNone);
+
+	bool bParFailed = pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psFailure ||
+		pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psRepairPossible ||
+		pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psManual;
+
+	bool bCleanup = !bUnpack &&
+		pPostInfo->GetNZBInfo()->GetCleanupStatus() == NZBInfo::csNone &&
+		(pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psSuccess ||
+		 (pPostInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usSuccess &&
+		  pPostInfo->GetNZBInfo()->GetParStatus() != NZBInfo::psFailure)) &&
+		strlen(g_pOptions->GetExtCleanupDisk()) > 0;
+
+	bool bMoveInter = !bUnpack &&
+		pPostInfo->GetNZBInfo()->GetMoveStatus() == NZBInfo::msNone &&
+		pPostInfo->GetNZBInfo()->GetUnpackStatus() != NZBInfo::usFailure &&
+		pPostInfo->GetNZBInfo()->GetUnpackStatus() != NZBInfo::usSpace &&
+		pPostInfo->GetNZBInfo()->GetUnpackStatus() != NZBInfo::usPassword &&
+		pPostInfo->GetNZBInfo()->GetParStatus() != NZBInfo::psFailure &&
+		pPostInfo->GetNZBInfo()->GetParStatus() != NZBInfo::psManual &&
+		strlen(g_pOptions->GetInterDir()) > 0 &&
+		!strncmp(pPostInfo->GetNZBInfo()->GetDestDir(), g_pOptions->GetInterDir(), strlen(g_pOptions->GetInterDir()));
+
+	bool bPostScript = true;
+
+	if (bUnpack && bParFailed)
+	{
+		warn("Skipping unpack for %s due to %s", pPostInfo->GetNZBInfo()->GetName(),
+			pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psManual ? "required par-repair" : "par-failure");
+		pPostInfo->GetNZBInfo()->SetUnpackStatus(NZBInfo::usSkipped);
+		bUnpack = false;
+	}
+
+	if (!bUnpack && !bMoveInter && !bPostScript)
+	{
+		pPostInfo->SetStage(PostInfo::ptFinished);
+		return;
+	}
+
+	pPostInfo->SetProgressLabel(bUnpack ? "Unpacking" : bMoveInter ? "Moving" : "Executing post-process-script");
+	pPostInfo->SetWorking(true);
+	pPostInfo->SetStage(bUnpack ? PostInfo::ptUnpacking : bMoveInter ? PostInfo::ptMoving : PostInfo::ptExecutingScript);
+	pPostInfo->SetFileProgress(0);
+	pPostInfo->SetStageProgress(0);
+
+	pDownloadQueue->Save();
+
+	if (!pPostInfo->GetStartTime())
+	{
+		pPostInfo->SetStartTime(time(NULL));
+	}
+	pPostInfo->SetStageTime(time(NULL));
+
+	if (bUnpack)
+	{
+		UpdatePauseState(g_pOptions->GetUnpackPauseQueue(), "unpack");
+		UnpackController::StartJob(pPostInfo);
+	}
+	else if (bCleanup)
+	{
+		UpdatePauseState(g_pOptions->GetUnpackPauseQueue() || g_pOptions->GetScriptPauseQueue(), "cleanup");
+		CleanupController::StartJob(pPostInfo);
+	}
+	else if (bMoveInter)
+	{
+		UpdatePauseState(g_pOptions->GetUnpackPauseQueue() || g_pOptions->GetScriptPauseQueue(), "move");
+		MoveController::StartJob(pPostInfo);
+	}
+	else
+	{
+		UpdatePauseState(g_pOptions->GetScriptPauseQueue(), "post-process-script");
+		PostScriptController::StartJob(pPostInfo);
+	}
+}
+
+void PrePostProcessor::JobCompleted(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo)
+{
+	NZBInfo* pNZBInfo = pPostInfo->GetNZBInfo();
+	DeletePostThread(pPostInfo);
+	pNZBInfo->LeavePostProcess();
+
+	if (IsNZBFileCompleted(pNZBInfo, true, false))
+	{
+		// Cleaning up queue if par-check was successful or unpack was successful or
+		// script was successful (if unpack was not performed)
+		bool bCanCleanupQueue = pNZBInfo->GetParStatus() == NZBInfo::psSuccess ||
+			 pNZBInfo->GetParStatus() == NZBInfo::psRepairPossible ||
+			 pNZBInfo->GetUnpackStatus() == NZBInfo::usSuccess ||
+			 (pNZBInfo->GetUnpackStatus() == NZBInfo::usNone &&
+			  pNZBInfo->GetScriptStatuses()->CalcTotalStatus() == ScriptStatus::srSuccess);
+		if (g_pOptions->GetParCleanupQueue() && bCanCleanupQueue)
+		{
+			if (!pNZBInfo->GetFileList()->empty())
+			{
+				info("Cleaning up download queue for %s", pNZBInfo->GetName());
+				pNZBInfo->ClearCompletedFiles();
+				pNZBInfo->SetParCleanup(true);
+				pDownloadQueue->EditEntry(pNZBInfo->GetID(), DownloadQueue::eaGroupDelete, 0, NULL);
+			}
+		}
+
+		NZBCompleted(pDownloadQueue, pNZBInfo, false);
+	}
+
+	if (pNZBInfo == m_pCurJob)
+	{
+		m_pCurJob = NULL;
+	}
+	m_iJobCount--;
+
+	pDownloadQueue->Save();
+}
+
+bool PrePostProcessor::IsNZBFileCompleted(NZBInfo* pNZBInfo, bool bIgnorePausedPars, bool bAllowOnlyOneDeleted)
+{
+	int iDeleted = 0;
+
+	for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
+	{
+		FileInfo* pFileInfo = *it;
+		if (pFileInfo->GetDeleted())
+		{
+			iDeleted++;
+		}
+		if (((!pFileInfo->GetPaused() || !bIgnorePausedPars || !pFileInfo->GetParFile()) &&
+			!pFileInfo->GetDeleted()) ||
+			(bAllowOnlyOneDeleted && iDeleted > 1))
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool PrePostProcessor::IsNZBFileDownloading(NZBInfo* pNZBInfo)
+{
+	if (pNZBInfo->GetActiveDownloads())
+	{
+		return true;
+	}
+
+	for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
+	{
+		FileInfo* pFileInfo = *it;
+		if (!pFileInfo->GetPaused())
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void PrePostProcessor::UpdatePauseState(bool bNeedPause, const char* szReason)
+{
+	if (bNeedPause && !g_pOptions->GetTempPauseDownload())
+	{
+		info("Pausing download before %s", szReason);
+	}
+	else if (!bNeedPause && g_pOptions->GetTempPauseDownload())
+	{
+		info("Unpausing download after %s", m_szPauseReason);
+	}
+	g_pOptions->SetTempPauseDownload(bNeedPause);
+	m_szPauseReason = szReason;
+}
+
+bool PrePostProcessor::EditList(DownloadQueue* pDownloadQueue, IDList* pIDList, DownloadQueue::EEditAction eAction, int iOffset, const char* szText)
+{
+	debug("Edit-command for post-processor received");
+	switch (eAction)
+	{
+		case DownloadQueue::eaPostDelete:
+			return PostQueueDelete(pDownloadQueue, pIDList);
+
+		default:
+			return false;
+	}
+}
+
+bool PrePostProcessor::PostQueueDelete(DownloadQueue* pDownloadQueue, IDList* pIDList)
+{
+	bool bOK = false;
+
+	for (IDList::iterator itID = pIDList->begin(); itID != pIDList->end(); itID++)
+	{
+		int iID = *itID;
+
+		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+		{
+			NZBInfo* pNZBInfo = *it;
+			PostInfo* pPostInfo = pNZBInfo->GetPostInfo();
+			if (pPostInfo && pNZBInfo->GetID() == iID)
+			{
+				if (pPostInfo->GetWorking())
+				{
+					info("Deleting active post-job %s", pPostInfo->GetNZBInfo()->GetName());
+					pPostInfo->SetDeleted(true);
+#ifndef DISABLE_PARCHECK
+					if (PostInfo::ptLoadingPars <= pPostInfo->GetStage() && pPostInfo->GetStage() <= PostInfo::ptRenaming)
+					{
+						if (m_ParCoordinator.Cancel())
+						{
+							bOK = true;
+						}
+					}
+					else
+#endif
+					if (pPostInfo->GetPostThread())
+					{
+						debug("Terminating %s for %s", (pPostInfo->GetStage() == PostInfo::ptUnpacking ? "unpack" : "post-process-script"), pPostInfo->GetNZBInfo()->GetName());
+						pPostInfo->GetPostThread()->Stop();
+						bOK = true;
+					}
+					else
+					{
+						error("Internal error in PrePostProcessor::QueueDelete");
+					}
+				}
+				else
+				{
+					info("Deleting queued post-job %s", pPostInfo->GetNZBInfo()->GetName());
+					JobCompleted(pDownloadQueue, pPostInfo);
+					bOK = true;
+				}
+				break;
+			}
+		}
+	}
+
+	return bOK;
+}

daemon/postprocess/PrePostProcessor.h

@@ -0,0 +1,82 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef PREPOSTPROCESSOR_H
+#define PREPOSTPROCESSOR_H
+
+#include <deque>
+
+#include "Thread.h"
+#include "Observer.h"
+#include "DownloadInfo.h"
+#include "ParCoordinator.h"
+
+class PrePostProcessor : public Thread
+{
+private:
+	class DownloadQueueObserver: public Observer
+	{
+	public:
+		PrePostProcessor* m_pOwner;
+		virtual void	Update(Subject* Caller, void* Aspect) { m_pOwner->DownloadQueueUpdate(Caller, Aspect); }
+	};
+
+private:
+	ParCoordinator		m_ParCoordinator;
+	DownloadQueueObserver	m_DownloadQueueObserver;
+	int					m_iJobCount;
+	NZBInfo*			m_pCurJob;
+	const char*			m_szPauseReason;
+
+	bool				IsNZBFileCompleted(NZBInfo* pNZBInfo, bool bIgnorePausedPars, bool bAllowOnlyOneDeleted);
+	bool				IsNZBFileDownloading(NZBInfo* pNZBInfo);
+	void				CheckPostQueue();
+	void				JobCompleted(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
+	void				StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
+	void				SaveQueue(DownloadQueue* pDownloadQueue);
+	void				SanitisePostQueue(DownloadQueue* pDownloadQueue);
+	void				CheckDiskSpace();
+	void				UpdatePauseState(bool bNeedPause, const char* szReason);
+	void				NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBAdded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBDeleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bSaveQueue);
+	bool				PostQueueDelete(DownloadQueue* pDownloadQueue, IDList* pIDList);
+	void				DeletePostThread(PostInfo* pPostInfo);
+	NZBInfo*			GetNextJob(DownloadQueue* pDownloadQueue);
+	void				DownloadQueueUpdate(Subject* Caller, void* Aspect);
+
+public:
+						PrePostProcessor();
+	virtual				~PrePostProcessor();
+	virtual void		Run();
+	virtual void		Stop();
+	bool				HasMoreJobs() { return m_iJobCount > 0; }
+	int					GetJobCount() { return m_iJobCount; }
+	bool				EditList(DownloadQueue* pDownloadQueue, IDList* pIDList, DownloadQueue::EEditAction eAction, int iOffset, const char* szText);
+	void				NZBDownloaded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+};
+
+#endif

daemon/postprocess/Unpack.cpp

@@ -0,0 +1,837 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#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"
+#include "Options.h"
+
+extern Options* g_pOptions;
+
+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;
+}
+
+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
+	DownloadQueue::Lock();
+
+	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;
+	m_szPassword[0] = '\0';
+	m_szFinalDir[0] = '\0';
+	m_bFinalDirCreated = false;
+	
+	NZBParameter* pParameter = m_pPostInfo->GetNZBInfo()->GetParameters()->Find("*Unpack:", false);
+	bool bUnpack = !(pParameter && !strcasecmp(pParameter->GetValue(), "no"));
+
+	pParameter = m_pPostInfo->GetNZBInfo()->GetParameters()->Find("*Unpack:Password", false);
+	if (pParameter)
+	{
+		strncpy(m_szPassword, pParameter->GetValue(), 1024-1);
+		m_szPassword[1024-1] = '\0';
+	}
+	
+	DownloadQueue::Unlock();
+
+	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';
+
+	m_bHasParFiles = ParCoordinator::FindMainPars(m_szDestDir, NULL);
+
+	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;
+		m_bUnpackSpaceError = false;
+		m_bUnpackPasswordError = 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_pPostInfo->GetNZBInfo()->GetRenameStatus() <= NZBInfo::rsSkipped && m_bHasParFiles)
+		{
+			RequestParCheck();
+		}
+		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;
+	m_bUnpackSpaceError = iExitCode == 5;
+	m_bUnpackPasswordError = iExitCode == 11; // only for rar5-archives
+
+	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);
+		if (g_pOptions->GetParRename())
+		{
+			//request par-rename check for extracted files
+			m_pPostInfo->GetNZBInfo()->SetRenameStatus(NZBInfo::rsNone);
+		}
+		m_pPostInfo->SetStage(PostInfo::ptQueued);
+	}
+	else
+	{
+#ifndef DISABLE_PARCHECK
+		if (!m_bUnpackOK && m_pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped &&
+			!m_bUnpackStartError && !m_bUnpackSpaceError && !m_bUnpackPasswordError &&
+			!GetTerminated() && m_bHasParFiles)
+		{
+			RequestParCheck();
+		}
+		else
+#endif
+		{
+			PrintMessage(Message::mkError, "%s failed", m_szInfoNameUp);
+			m_pPostInfo->GetNZBInfo()->SetUnpackStatus(
+				m_bUnpackSpaceError ? NZBInfo::usSpace :
+				m_bUnpackPasswordError ? NZBInfo::usPassword :
+				NZBInfo::usFailure);
+			m_pPostInfo->SetStage(PostInfo::ptQueued);
+		}
+	}
+}
+
+#ifndef DISABLE_PARCHECK
+void UnpackController::RequestParCheck()
+{
+	PrintMessage(Message::mkInfo, "%s requested par-check/repair", m_szInfoNameUp);
+	m_pPostInfo->SetRequestParCheck(true);
+	m_pPostInfo->SetStage(PostInfo::ptFinished);
+}
+#endif
+
+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");
+		m_bFinalDirCreated = !Util::DirectoryExists(m_szFinalDir);
+	}
+	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]+$");
+	RegEx regExNumExt(".*\\.[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) && regExNumExt.Match(filename) &&
+				FileHasRarSignature(szFullFilename))
+			{
+				m_bHasNonStdRarFiles = true;
+			}
+		}
+	}
+}
+
+bool UnpackController::FileHasRarSignature(const char* szFilename)
+{
+	char rar4Signature[] = { 0x52, 0x61, 0x72, 0x21, 0x1A, 0x07, 0x00 };
+	char rar5Signature[] = { 0x52, 0x61, 0x72, 0x21, 0x1A, 0x07, 0x01, 0x00 };
+
+	char fileSignature[8];
+
+	int cnt = 0;
+	FILE* infile;
+	infile = fopen(szFilename, FOPEN_RB);
+	if (infile)
+	{
+		cnt = (int)fread(fileSignature, 1, sizeof(fileSignature), infile);
+		fclose(infile);
+	}
+
+	bool bRar = cnt == sizeof(fileSignature) && 
+		(!strcmp(rar4Signature, fileSignature) || !strcmp(rar5Signature, fileSignature));
+	return bRar;
+}
+
+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, "..") &&
+				strcmp(filename, ".AppleDouble") && strcmp(filename, ".DS_Store"))
+			{
+				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))
+				{
+					char szErrBuf[256];
+					PrintMessage(Message::mkError, "Could not move file %s to %s: %s", szSrcFile, szDstFile, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+					bOK = false;
+				}
+
+				extractedFiles.push_back(strdup(filename));
+			}
+		}
+	}
+
+	char szErrBuf[256];
+	if (bOK && !Util::DeleteDirectoryWithContent(m_szUnpackDir, szErrBuf, sizeof(szErrBuf)))
+	{
+		PrintMessage(Message::mkError, "Could not delete temporary directory %s: %s", m_szUnpackDir, szErrBuf);
+	}
+
+	if (!m_bUnpackOK && m_bFinalDirCreated)
+	{
+		Util::RemoveDirectory(m_szFinalDir);
+	}		
+
+	if (m_bUnpackOK && bOK && g_pOptions->GetUnpackCleanupDisk())
+	{
+		PrintMessage(Message::mkInfo, "Deleting archive files");
+
+		RegEx regExRar(".*\\.rar$");
+		RegEx regExRarMultiSeq(".*\\.[r-z][0-9][0-9]$");
+		RegEx regExSevenZip(".*\\.7z$|.*\\.7z\\.[0-9]+$");
+		RegEx regExNumExt(".*\\.[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) &&
+				(m_bInterDir || !extractedFiles.Exists(filename)) &&
+				(regExRar.Match(filename) || regExSevenZip.Match(filename) ||
+				(regExRarMultiSeq.Match(filename) && FileHasRarSignature(szFullFilename)) ||
+				(m_bHasNonStdRarFiles && regExNumExt.Match(filename) && FileHasRarSignature(szFullFilename))))
+			{
+				PrintMessage(Message::mkInfo, "Deleting file %s", filename);
+
+				if (remove(szFullFilename) != 0)
+				{
+					char szErrBuf[256];
+					PrintMessage(Message::mkError, "Could not delete file %s: %s", szFullFilename, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+				}
+			}
+		}
+
+		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);
+		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)
+{
+	DownloadQueue::Lock();
+	m_pPostInfo->SetProgressLabel(szProgressLabel);
+	DownloadQueue::Unlock();
+}
+
+
+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
+	DownloadQueue::Lock();
+
+	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';
+
+	DownloadQueue::Unlock();
+
+	info("Moving completed files for %s", szNZBName);
+
+	bool bOK = MoveFiles();
+
+	szInfoName[0] = 'M'; // uppercase
+
+	if (bOK)
+	{
+		info("%s successful", szInfoName);
+		// save new dest dir
+		DownloadQueue::Lock();
+		m_pPostInfo->GetNZBInfo()->SetDestDir(m_szDestDir);
+		m_pPostInfo->GetNZBInfo()->SetMoveStatus(NZBInfo::msSuccess);
+		DownloadQueue::Unlock();
+	}
+	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, "..") &&
+			strcmp(filename, ".AppleDouble") && strcmp(filename, ".DS_Store"))
+		{
+			char szSrcFile[1024];
+			snprintf(szSrcFile, 1024, "%s%c%s", m_szInterDir, PATH_SEPARATOR, filename);
+			szSrcFile[1024-1] = '\0';
+
+			char szDstFile[1024];
+			Util::MakeUniqueFilename(szDstFile, 1024, m_szDestDir, filename);
+
+			PrintMessage(Message::mkInfo, "Moving file %s to %s", Util::BaseFileName(szSrcFile), m_szDestDir);
+			if (!Util::MoveFile(szSrcFile, szDstFile))
+			{
+				PrintMessage(Message::mkError, "Could not move file %s to %s: %s", szSrcFile, szDstFile, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+				bOK = false;
+			}
+		}
+	}
+
+	if (bOK && !Util::DeleteDirectoryWithContent(m_szInterDir, szErrBuf, sizeof(szErrBuf)))
+	{
+		PrintMessage(Message::mkError, "Could not delete intermediate directory %s: %s", m_szInterDir, szErrBuf);
+	}
+
+	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
+	DownloadQueue::Lock();
+
+	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';
+	}
+
+	DownloadQueue::Unlock();
+
+	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;
+
+	DirBrowser dir(szDestDir);
+	while (const char* filename = dir.Next())
+	{
+		// check file extension
+		bool bDeleteIt = Util::MatchFileExt(filename, g_pOptions->GetExtCleanupDisk(), ",;");
+
+		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)
+			{
+				char szErrBuf[256];
+				PrintMessage(Message::mkError, "Could not delete file %s: %s", szFullFilename, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+				bOK = false;
+			}
+
+			*bDeleted = true;
+		}
+	}
+
+	return bOK;
+}

daemon/postprocess/Unpack.h

@@ -0,0 +1,127 @@
+/*
+ *  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 "Script.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_bHasRarFiles;
+	bool				m_bHasNonStdRarFiles;
+	bool				m_bHasSevenZipFiles;
+	bool				m_bHasSevenZipMultiFiles;
+	bool				m_bUnpackOK;
+	bool				m_bUnpackStartError;
+	bool				m_bUnpackSpaceError;
+	bool				m_bUnpackPasswordError;
+	bool				m_bCleanedUpDisk;
+	EUnpacker			m_eUnpacker;
+	bool				m_bFinalDirCreated;
+
+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				CheckArchiveFiles(bool bScanNonStdFiles);
+	void				SetProgressLabel(const char* szProgressLabel);
+#ifndef DISABLE_PARCHECK
+	void				RequestParCheck();
+#endif
+	bool				FileHasRarSignature(const char* szFilename);
+
+public:
+	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);
+
+public:
+	virtual void		Run();
+	static void			StartJob(PostInfo* pPostInfo);
+};
+
+#endif

daemon/queue/DiskState.h

@@ -0,0 +1,94 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *                                                          
+ */
+
+
+#ifndef DISKSTATE_H
+#define DISKSTATE_H
+
+#include "DownloadInfo.h"
+#include "FeedInfo.h"
+#include "NewsServer.h"
+#include "StatMeter.h"
+
+class DiskState
+{
+private:
+	int					fscanf(FILE* infile, const char* Format, ...);
+	int					ParseFormatVersion(const char* szFormatSignature);
+	bool				SaveFileInfo(FileInfo* pFileInfo, const char* szFilename);
+	bool				LoadFileInfo(FileInfo* pFileInfo, const char* szFilename, bool bFileSummary, bool bArticles);
+	void				SaveNZBQueue(DownloadQueue* pDownloadQueue, FILE* outfile);
+	bool				LoadNZBList(NZBList* pNZBList, Servers* pServers, FILE* infile, int iFormatVersion);
+	void				SaveNZBInfo(NZBInfo* pNZBInfo, FILE* outfile);
+	bool				LoadNZBInfo(NZBInfo* pNZBInfo, Servers* pServers, FILE* infile, int iFormatVersion);
+	void				SavePostQueue(DownloadQueue* pDownloadQueue, FILE* outfile);
+	void				SaveDupInfo(DupInfo* pDupInfo, FILE* outfile);
+	bool				LoadDupInfo(DupInfo* pDupInfo, FILE* infile, int iFormatVersion);
+	void				SaveHistory(DownloadQueue* pDownloadQueue, FILE* outfile);
+	bool				LoadHistory(DownloadQueue* pDownloadQueue, NZBList* pNZBList, Servers* pServers, FILE* infile, int iFormatVersion);
+	NZBInfo*			FindNZBInfo(DownloadQueue* pDownloadQueue, int iID);
+	bool				SaveFeedStatus(Feeds* pFeeds, FILE* outfile);
+	bool				LoadFeedStatus(Feeds* pFeeds, FILE* infile, int iFormatVersion);
+	bool				SaveFeedHistory(FeedHistory* pFeedHistory, FILE* outfile);
+	bool				LoadFeedHistory(FeedHistory* pFeedHistory, FILE* infile, int iFormatVersion);
+	bool				SaveServerInfo(Servers* pServers, FILE* outfile);
+	bool				LoadServerInfo(Servers* pServers, FILE* infile, int iFormatVersion, bool* pPerfectMatch);
+	bool				SaveVolumeStat(ServerVolumes* pServerVolumes, FILE* outfile);
+	bool				LoadVolumeStat(Servers* pServers, ServerVolumes* pServerVolumes, FILE* infile, int iFormatVersion);
+	void				CalcFileStats(DownloadQueue* pDownloadQueue, int iFormatVersion);
+	void				CalcNZBFileStats(NZBInfo* pNZBInfo, int iFormatVersion);
+	bool				LoadFileState(FileInfo* pFileInfo, Servers* pServers);
+	bool				LoadAllFileStates(DownloadQueue* pDownloadQueue, Servers* pServers);
+	void				SaveServerStats(ServerStatList* pServerStatList, FILE* outfile);
+	bool				LoadServerStats(ServerStatList* pServerStatList, Servers* pServers, FILE* infile);
+
+	// backward compatibility functions (conversions from older formats)
+	bool				LoadPostQueue12(DownloadQueue* pDownloadQueue, NZBList* pNZBList, FILE* infile, int iFormatVersion);
+	bool				LoadPostQueue5(DownloadQueue* pDownloadQueue, NZBList* pNZBList);
+	bool				LoadUrlQueue12(DownloadQueue* pDownloadQueue, FILE* infile, int iFormatVersion);
+	bool				LoadUrlInfo12(NZBInfo* pNZBInfo, FILE* infile, int iFormatVersion);
+	int					FindNZBInfoIndex(NZBList* pNZBList, NZBInfo* pNZBInfo);
+	void				ConvertDupeKey(char* buf, int bufsize);
+	bool				LoadFileQueue12(NZBList* pNZBList, NZBList* pSortList, FILE* infile, int iFormatVersion);
+	void				CompleteNZBList12(DownloadQueue* pDownloadQueue, NZBList* pNZBList, int iFormatVersion);
+	void				CompleteDupList12(DownloadQueue* pDownloadQueue, int iFormatVersion);
+	void				CalcCriticalHealth(NZBList* pNZBList);
+
+public:
+	bool				DownloadQueueExists();
+	bool				SaveDownloadQueue(DownloadQueue* pDownloadQueue);
+	bool				LoadDownloadQueue(DownloadQueue* pDownloadQueue, Servers* pServers);
+	bool				SaveFile(FileInfo* pFileInfo);
+	bool				SaveFileState(FileInfo* pFileInfo);
+	bool				LoadArticles(FileInfo* pFileInfo);
+	void				DiscardDownloadQueue();
+	bool				DiscardFile(FileInfo* pFileInfo);
+	bool				SaveFeeds(Feeds* pFeeds, FeedHistory* pFeedHistory);
+	bool				LoadFeeds(Feeds* pFeeds, FeedHistory* pFeedHistory);
+	bool				SaveStats(Servers* pServers, ServerVolumes* pServerVolumes);
+	bool				LoadStats(Servers* pServers, ServerVolumes* pServerVolumes, bool* pPerfectMatch);
+	void				CleanupTempDir(DownloadQueue* pDownloadQueue);
+};
+
+#endif

daemon/queue/DownloadInfo.h

@@ -0,0 +1,861 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef DOWNLOADINFO_H
+#define DOWNLOADINFO_H
+
+#include <vector>
+#include <deque>
+#include <time.h>
+
+#include "Observer.h"
+#include "Log.h"
+#include "Thread.h"
+
+class NZBInfo;
+class DownloadQueue;
+class PostInfo;
+
+class ServerStat
+{
+private:
+	int					m_iServerID;
+	int					m_iSuccessArticles;
+	int					m_iFailedArticles;
+
+public:
+						ServerStat(int iServerID);
+	int					GetServerID() { return m_iServerID; }
+	int					GetSuccessArticles() { return m_iSuccessArticles; }
+	void				SetSuccessArticles(int iSuccessArticles) { m_iSuccessArticles = iSuccessArticles; }
+	int					GetFailedArticles() { return m_iFailedArticles; }
+	void				SetFailedArticles(int iFailedArticles) { m_iFailedArticles = iFailedArticles; }
+};
+
+typedef std::vector<ServerStat*>	ServerStatListBase;
+
+class ServerStatList : public ServerStatListBase
+{
+public:
+	enum EStatOperation
+	{
+		soSet,
+		soAdd,
+		soSubtract
+	};
+	
+public:
+						~ServerStatList();
+	void				StatOp(int iServerID, int iSuccessArticles, int iFailedArticles, EStatOperation eStatOperation);
+	void				ListOp(ServerStatList* pServerStats, EStatOperation eStatOperation);
+	void				Clear();
+};
+
+class ArticleInfo
+{
+public:
+	enum EStatus
+	{
+		aiUndefined,
+		aiRunning,
+		aiFinished,
+		aiFailed
+	};
+	
+private:
+	int					m_iPartNumber;
+	char*				m_szMessageID;
+	int					m_iSize;
+	EStatus				m_eStatus;
+	char*				m_szResultFilename;
+
+public:
+						ArticleInfo();
+						~ArticleInfo();
+	void 				SetPartNumber(int s) { m_iPartNumber = s; }
+	int 				GetPartNumber() { return m_iPartNumber; }
+	const char* 		GetMessageID() { return m_szMessageID; }
+	void 				SetMessageID(const char* szMessageID);
+	void 				SetSize(int s) { m_iSize = s; }
+	int 				GetSize() { return m_iSize; }
+	EStatus				GetStatus() { return m_eStatus; }
+	void				SetStatus(EStatus Status) { m_eStatus = Status; }
+	const char*			GetResultFilename() { return m_szResultFilename; }
+	void 				SetResultFilename(const char* v);
+};
+
+class FileInfo
+{
+public:
+	typedef std::vector<ArticleInfo*>	Articles;
+	typedef std::vector<char*>			Groups;
+
+private:
+	int					m_iID;
+	NZBInfo*			m_pNZBInfo;
+	Articles			m_Articles;
+	Groups				m_Groups;
+	ServerStatList		m_ServerStats;
+	char* 				m_szSubject;
+	char*				m_szFilename;
+	long long 			m_lSize;
+	long long 			m_lRemainingSize;
+	long long			m_lSuccessSize;
+	long long			m_lFailedSize;
+	long long			m_lMissedSize;
+	int					m_iTotalArticles;
+	int					m_iMissedArticles;
+	int					m_iFailedArticles;
+	int					m_iSuccessArticles;
+	time_t				m_tTime;
+	bool				m_bPaused;
+	bool				m_bDeleted;
+	bool				m_bFilenameConfirmed;
+	bool				m_bParFile;
+	int					m_iCompletedArticles;
+	bool				m_bOutputInitialized;
+	char*				m_szOutputFilename;
+	Mutex*				m_pMutexOutputFile;
+	bool				m_bExtraPriority;
+	int					m_iActiveDownloads;
+	bool				m_bAutoDeleted;
+
+	static int			m_iIDGen;
+	static int			m_iIDMax;
+
+public:
+						FileInfo();
+						~FileInfo();
+	int					GetID() { return m_iID; }
+	void				SetID(int iID);
+	static void			ResetGenID(bool bMax);
+	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
+	void				SetNZBInfo(NZBInfo* pNZBInfo) { m_pNZBInfo = pNZBInfo; }
+	Articles* 			GetArticles() { return &m_Articles; }
+	Groups* 			GetGroups() { return &m_Groups; }
+	const char*			GetSubject() { return m_szSubject; }
+	void 				SetSubject(const char* szSubject);
+	const char*			GetFilename() { return m_szFilename; }
+	void 				SetFilename(const char* szFilename);
+	void				MakeValidFilename();
+	bool				GetFilenameConfirmed() { return m_bFilenameConfirmed; }
+	void				SetFilenameConfirmed(bool bFilenameConfirmed) { m_bFilenameConfirmed = bFilenameConfirmed; }
+	void 				SetSize(long long lSize) { m_lSize = lSize; m_lRemainingSize = lSize; }
+	long long 			GetSize() { return m_lSize; }
+	long long 			GetRemainingSize() { return m_lRemainingSize; }
+	void 				SetRemainingSize(long long lRemainingSize) { m_lRemainingSize = lRemainingSize; }
+	long long			GetMissedSize() { return m_lMissedSize; }
+	void 				SetMissedSize(long long lMissedSize) { m_lMissedSize = lMissedSize; }
+	long long			GetSuccessSize() { return m_lSuccessSize; }
+	void 				SetSuccessSize(long long lSuccessSize) { m_lSuccessSize = lSuccessSize; }
+	long long			GetFailedSize() { return m_lFailedSize; }
+	void 				SetFailedSize(long long lFailedSize) { m_lFailedSize = lFailedSize; }
+	int					GetTotalArticles() { return m_iTotalArticles; }
+	void 				SetTotalArticles(int iTotalArticles) { m_iTotalArticles = iTotalArticles; }
+	int					GetMissedArticles() { return m_iMissedArticles; }
+	void 				SetMissedArticles(int iMissedArticles) { m_iMissedArticles = iMissedArticles; }
+	int					GetFailedArticles() { return m_iFailedArticles; }
+	void 				SetFailedArticles(int iFailedArticles) { m_iFailedArticles = iFailedArticles; }
+	int					GetSuccessArticles() { return m_iSuccessArticles; }
+	void 				SetSuccessArticles(int iSuccessArticles) { m_iSuccessArticles = iSuccessArticles; }
+	time_t				GetTime() { return m_tTime; }
+	void				SetTime(time_t tTime) { m_tTime = tTime; }
+	bool				GetPaused() { return m_bPaused; }
+	void				SetPaused(bool bPaused);
+	bool				GetDeleted() { return m_bDeleted; }
+	void				SetDeleted(bool Deleted) { m_bDeleted = Deleted; }
+	int					GetCompletedArticles() { return m_iCompletedArticles; }
+	void				SetCompletedArticles(int iCompletedArticles) { m_iCompletedArticles = iCompletedArticles; }
+	bool				GetParFile() { return m_bParFile; }
+	void				SetParFile(bool bParFile) { m_bParFile = bParFile; }
+	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				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; }
+	ServerStatList*		GetServerStats() { return &m_ServerStats; }
+};
+                              
+typedef std::deque<FileInfo*> FileListBase;
+
+class FileList : public FileListBase
+{
+private:
+	bool				m_bOwnObjects;
+public:
+						FileList(bool bOwnObjects = false) { m_bOwnObjects = bOwnObjects; }
+						~FileList();
+	void				Clear();
+	void				Remove(FileInfo* pFileInfo);
+};
+
+
+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:
+						~NZBParameterList();
+	void				SetParameter(const char* szName, const char* szValue);
+	NZBParameter*		Find(const char* szName, bool bCaseSensitive);
+	void				Clear();
+	void				CopyFrom(NZBParameterList* pSourceParameters);
+};
+
+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();
+};
+
+enum EDupeMode
+{
+	dmScore,
+	dmAll,
+	dmForce
+};
+
+class NZBInfo
+{
+public:
+	enum ERenameStatus
+	{
+		rsNone,
+		rsSkipped,
+		rsFailure,
+		rsSuccess
+	};
+
+	enum EParStatus
+	{
+		psNone,
+		psSkipped,
+		psFailure,
+		psSuccess,
+		psRepairPossible,
+		psManual
+	};
+
+	enum EUnpackStatus
+	{
+		usNone,
+		usSkipped,
+		usFailure,
+		usSuccess,
+		usSpace,
+		usPassword
+	};
+
+	enum ECleanupStatus
+	{
+		csNone,
+		csFailure,
+		csSuccess
+	};
+
+	enum EMoveStatus
+	{
+		msNone,
+		msFailure,
+		msSuccess
+	};
+
+	enum EDeleteStatus
+	{
+		dsNone,
+		dsManual,
+		dsHealth,
+		dsDupe
+	};
+
+	enum EMarkStatus
+	{
+		ksNone,
+		ksBad,
+		ksGood
+	};
+
+	enum EUrlStatus
+	{
+		lsNone,
+		lsRunning,
+		lsFinished,
+		lsFailed,
+		lsRetry,
+		lsScanSkipped,
+		lsScanFailed
+	};
+
+	enum EKind
+	{
+		nkNzb,
+		nkUrl
+	};
+
+	typedef std::vector<char*>			Files;
+	typedef std::deque<Message*>		Messages;
+
+	static const int FORCE_PRIORITY = 900;
+
+	friend class DupInfo;
+
+private:
+	int					m_iID;
+	EKind				m_eKind;
+	char*				m_szURL;
+	char* 				m_szFilename;
+	char*				m_szName;
+	char* 				m_szDestDir;
+	char* 				m_szFinalDir;
+	char* 				m_szCategory;
+	int		 			m_iFileCount;
+	int		 			m_iParkedFileCount;
+	long long 			m_lSize;
+	long long 			m_lRemainingSize;
+	int					m_iPausedFileCount;
+	long long 			m_lPausedSize;
+	int					m_iRemainingParCount;
+	int					m_iActiveDownloads;
+	long long			m_lSuccessSize;
+	long long			m_lFailedSize;
+	long long			m_lCurrentSuccessSize;
+	long long			m_lCurrentFailedSize;
+	long long			m_lParSize;
+	long long			m_lParSuccessSize;
+	long long			m_lParFailedSize;
+	long long			m_lParCurrentSuccessSize;
+	long long			m_lParCurrentFailedSize;
+	int					m_iTotalArticles;
+	int					m_iSuccessArticles;
+	int					m_iFailedArticles;
+	int					m_iCurrentSuccessArticles;
+	int					m_iCurrentFailedArticles;
+	time_t				m_tMinTime;
+	time_t				m_tMaxTime;
+	int					m_iPriority;
+	Files				m_completedFiles;
+	ERenameStatus		m_eRenameStatus;
+	EParStatus			m_eParStatus;
+	EUnpackStatus		m_eUnpackStatus;
+	ECleanupStatus		m_eCleanupStatus;
+	EMoveStatus			m_eMoveStatus;
+	EDeleteStatus		m_eDeleteStatus;
+	EMarkStatus			m_eMarkStatus;
+	EUrlStatus			m_eUrlStatus;
+	bool				m_bAddUrlPaused;
+	bool				m_bDeletePaused;
+	bool				m_bManyDupeFiles;
+	char*				m_szQueuedFilename;
+	bool				m_bDeleting;
+	bool				m_bAvoidHistory;
+	bool				m_bHealthPaused;
+	bool				m_bParCleanup;
+	bool				m_bParManual;
+	bool				m_bCleanupDisk;
+	bool				m_bUnpackCleanedUpDisk;
+	char*				m_szDupeKey;
+	int					m_iDupeScore;
+	EDupeMode			m_eDupeMode;
+	unsigned int		m_iFullContentHash;
+	unsigned int		m_iFilteredContentHash;
+	FileList			m_FileList;
+	NZBParameterList	m_ppParameters;
+	ScriptStatusList	m_scriptStatuses;
+	ServerStatList		m_ServerStats;
+	ServerStatList		m_CurrentServerStats;
+	Mutex				m_mutexLog;
+	Messages			m_Messages;
+	int					m_iIDMessageGen;
+	PostInfo*			m_pPostInfo;
+
+	static int			m_iIDGen;
+	static int			m_iIDMax;
+
+public:
+						NZBInfo();
+						~NZBInfo();
+	int					GetID() { return m_iID; }
+	void				SetID(int iID);
+	static void			ResetGenID(bool bMax);
+	static int			GenerateID();
+	EKind				GetKind() { return m_eKind; }
+	void				SetKind(EKind eKind) { m_eKind = eKind; }
+	const char*			GetURL() { return m_szURL; }			// needs locking (for shared objects)
+	void				SetURL(const char* szURL);				// needs locking (for shared objects)
+	const char*			GetFilename() { return m_szFilename; }
+	void				SetFilename(const char* szFilename);
+	static void			MakeNiceNZBName(const char* szNZBFilename, char* szBuffer, int iSize, bool bRemoveExt);
+	static void			MakeNiceUrlName(const char* szURL, const char* szNZBFilename, char* szBuffer, int iSize);
+	const char*			GetDestDir() { return m_szDestDir; }   // needs locking (for shared objects)
+	void				SetDestDir(const char* szDestDir);     // needs locking (for shared objects)
+	const char*			GetFinalDir() { return m_szFinalDir; }   // needs locking (for shared objects)
+	void				SetFinalDir(const char* szFinalDir);     // 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)
+	int					GetFileCount() { return m_iFileCount; }
+	void 				SetFileCount(int iFileCount) { m_iFileCount = iFileCount; }
+	int					GetParkedFileCount() { return m_iParkedFileCount; }
+	void 				SetParkedFileCount(int iParkedFileCount) { m_iParkedFileCount = iParkedFileCount; }
+	long long 			GetSize() { return m_lSize; }
+	void 				SetSize(long long lSize) { m_lSize = lSize; }
+	long long 			GetRemainingSize() { return m_lRemainingSize; }
+	void	 			SetRemainingSize(long long lRemainingSize) { m_lRemainingSize = lRemainingSize; }
+	long long 			GetPausedSize() { return m_lPausedSize; }
+	void	 			SetPausedSize(long long lPausedSize) { m_lPausedSize = lPausedSize; }
+	int					GetPausedFileCount() { return m_iPausedFileCount; }
+	void 				SetPausedFileCount(int iPausedFileCount) { m_iPausedFileCount = iPausedFileCount; }
+	int					GetRemainingParCount() { return m_iRemainingParCount; }
+	void 				SetRemainingParCount(int iRemainingParCount) { m_iRemainingParCount = iRemainingParCount; }
+	int					GetActiveDownloads() { return m_iActiveDownloads; }
+	void				SetActiveDownloads(int iActiveDownloads) { m_iActiveDownloads = iActiveDownloads; }
+	long long			GetSuccessSize() { return m_lSuccessSize; }
+	void 				SetSuccessSize(long long lSuccessSize) { m_lSuccessSize = lSuccessSize; }
+	long long			GetFailedSize() { return m_lFailedSize; }
+	void 				SetFailedSize(long long lFailedSize) { m_lFailedSize = lFailedSize; }
+	long long			GetCurrentSuccessSize() { return m_lCurrentSuccessSize; }
+	void 				SetCurrentSuccessSize(long long lCurrentSuccessSize) { m_lCurrentSuccessSize = lCurrentSuccessSize; }
+	long long			GetCurrentFailedSize() { return m_lCurrentFailedSize; }
+	void 				SetCurrentFailedSize(long long lCurrentFailedSize) { m_lCurrentFailedSize = lCurrentFailedSize; }
+	long long			GetParSize() { return m_lParSize; }
+	void 				SetParSize(long long lParSize) { m_lParSize = lParSize; }
+	long long			GetParSuccessSize() { return m_lParSuccessSize; }
+	void 				SetParSuccessSize(long long lParSuccessSize) { m_lParSuccessSize = lParSuccessSize; }
+	long long			GetParFailedSize() { return m_lParFailedSize; }
+	void 				SetParFailedSize(long long lParFailedSize) { m_lParFailedSize = lParFailedSize; }
+	long long			GetParCurrentSuccessSize() { return m_lParCurrentSuccessSize; }
+	void 				SetParCurrentSuccessSize(long long lParCurrentSuccessSize) { m_lParCurrentSuccessSize = lParCurrentSuccessSize; }
+	long long			GetParCurrentFailedSize() { return m_lParCurrentFailedSize; }
+	void 				SetParCurrentFailedSize(long long lParCurrentFailedSize) { m_lParCurrentFailedSize = lParCurrentFailedSize; }
+	int					GetTotalArticles() { return m_iTotalArticles; }
+	void 				SetTotalArticles(int iTotalArticles) { m_iTotalArticles = iTotalArticles; }
+	int					GetSuccessArticles() { return m_iSuccessArticles; }
+	void 				SetSuccessArticles(int iSuccessArticles) { m_iSuccessArticles = iSuccessArticles; }
+	int					GetFailedArticles() { return m_iFailedArticles; }
+	void 				SetFailedArticles(int iFailedArticles) { m_iFailedArticles = iFailedArticles; }
+	int					GetCurrentSuccessArticles() { return m_iCurrentSuccessArticles; }
+	void 				SetCurrentSuccessArticles(int iCurrentSuccessArticles) { m_iCurrentSuccessArticles = iCurrentSuccessArticles; }
+	int					GetCurrentFailedArticles() { return m_iCurrentFailedArticles; }
+	void 				SetCurrentFailedArticles(int iCurrentFailedArticles) { m_iCurrentFailedArticles = iCurrentFailedArticles; }
+	int					GetPriority() { return m_iPriority; }
+	void				SetPriority(int iPriority) { m_iPriority = iPriority; }
+	bool				GetForcePriority() { return m_iPriority >= FORCE_PRIORITY; }
+	time_t				GetMinTime() { return m_tMinTime; }
+	void				SetMinTime(time_t tMinTime) { m_tMinTime = tMinTime; }
+	time_t				GetMaxTime() { return m_tMaxTime; }
+	void				SetMaxTime(time_t tMaxTime) { m_tMaxTime = tMaxTime; }
+	void				BuildDestDirName();
+	void				BuildFinalDirName(char* szFinalDirBuf, int iBufSize);
+	Files*				GetCompletedFiles() { return &m_completedFiles; }		// needs locking (for shared objects)
+	void				ClearCompletedFiles();
+	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; }
+	EDeleteStatus		GetDeleteStatus() { return m_eDeleteStatus; }
+	void				SetDeleteStatus(EDeleteStatus eDeleteStatus) { m_eDeleteStatus = eDeleteStatus; }
+	EMarkStatus			GetMarkStatus() { return m_eMarkStatus; }
+	void				SetMarkStatus(EMarkStatus eMarkStatus) { m_eMarkStatus = eMarkStatus; }
+	EUrlStatus			GetUrlStatus() { return m_eUrlStatus; }
+	void				SetUrlStatus(EUrlStatus eUrlStatus) { m_eUrlStatus = eUrlStatus; }
+	const char*			GetQueuedFilename() { return m_szQueuedFilename; }
+	void				SetQueuedFilename(const char* szQueuedFilename);
+	bool				GetDeleting() { return m_bDeleting; }
+	void				SetDeleting(bool bDeleting) { m_bDeleting = bDeleting; }
+	bool				GetDeletePaused() { return m_bDeletePaused; }
+	void				SetDeletePaused(bool bDeletePaused) { m_bDeletePaused = bDeletePaused; }
+	bool				GetManyDupeFiles() { return m_bManyDupeFiles; }
+	void				SetManyDupeFiles(bool bManyDupeFiles) { m_bManyDupeFiles = bManyDupeFiles; }
+	bool				GetAvoidHistory() { return m_bAvoidHistory; }
+	void				SetAvoidHistory(bool bAvoidHistory) { m_bAvoidHistory = bAvoidHistory; }
+	bool				GetHealthPaused() { return m_bHealthPaused; }
+	void				SetHealthPaused(bool bHealthPaused) { m_bHealthPaused = bHealthPaused; }
+	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; }
+	bool				GetAddUrlPaused() { return m_bAddUrlPaused; }
+	void				SetAddUrlPaused(bool bAddUrlPaused) { m_bAddUrlPaused = bAddUrlPaused; }
+	FileList*			GetFileList() { return &m_FileList; }					// needs locking (for shared objects)
+	NZBParameterList*	GetParameters() { return &m_ppParameters; }				// needs locking (for shared objects)
+	ScriptStatusList*	GetScriptStatuses() { return &m_scriptStatuses; }        // needs locking (for shared objects)
+	ServerStatList*		GetServerStats() { return &m_ServerStats; }
+	ServerStatList*		GetCurrentServerStats() { return &m_CurrentServerStats; }
+	int					CalcHealth();
+	int					CalcCriticalHealth(bool bAllowEstimation);
+	const char*			GetDupeKey() { return m_szDupeKey; }					// needs locking (for shared objects)
+	void				SetDupeKey(const char* szDupeKey);						// needs locking (for shared objects)
+	int					GetDupeScore() { return m_iDupeScore; }
+	void				SetDupeScore(int iDupeScore) { m_iDupeScore = iDupeScore; }
+	EDupeMode			GetDupeMode() { return m_eDupeMode; }
+	void				SetDupeMode(EDupeMode eDupeMode) { m_eDupeMode = eDupeMode; }
+	unsigned int		GetFullContentHash() { return m_iFullContentHash; }
+	void				SetFullContentHash(unsigned int iFullContentHash) { m_iFullContentHash = iFullContentHash; }
+	unsigned int		GetFilteredContentHash() { return m_iFilteredContentHash; }
+	void				SetFilteredContentHash(unsigned int iFilteredContentHash) { m_iFilteredContentHash = iFilteredContentHash; }
+	void				CopyFileList(NZBInfo* pSrcNZBInfo);
+	void				UpdateMinMaxTime();
+	PostInfo*			GetPostInfo() { return m_pPostInfo; }
+	void				EnterPostProcess();
+	void				LeavePostProcess();
+	bool				IsDupeSuccess();
+	const char*			MakeTextStatus(bool bIgnoreScriptStatus);
+
+	void				AppendMessage(Message::EKind eKind, time_t tTime, const char* szText);
+	Messages*			LockMessages();
+	void				UnlockMessages();
+};
+
+typedef std::deque<NZBInfo*> NZBQueueBase;
+
+class NZBList : public NZBQueueBase
+{
+private:
+	bool				m_bOwnObjects;
+public:
+						NZBList(bool bOwnObjects = false) { m_bOwnObjects = bOwnObjects; }
+						~NZBList();
+	void				Clear();
+	void				Add(NZBInfo* pNZBInfo, bool bAddTop);
+	void				Remove(NZBInfo* pNZBInfo);
+};
+
+class PostInfo
+{
+public:
+	enum EStage
+	{
+		ptQueued,
+		ptLoadingPars,
+		ptVerifyingSources,
+		ptRepairing,
+		ptVerifyingRepaired,
+		ptRenaming,
+		ptUnpacking,
+		ptMoving,
+		ptExecutingScript,
+		ptFinished
+	};
+
+	typedef std::deque<Message*>	Messages;
+	typedef std::vector<char*>		ParredFiles;
+
+private:
+	NZBInfo*			m_pNZBInfo;
+	bool				m_bWorking;
+	bool				m_bDeleted;
+	bool				m_bRequestParCheck;
+	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;
+	ParredFiles			m_ParredFiles;
+
+public:
+						PostInfo();
+						~PostInfo();
+	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
+	void				SetNZBInfo(NZBInfo* pNZBInfo) { m_pNZBInfo = pNZBInfo; }
+	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; }
+	Thread*				GetPostThread() { return m_pPostThread; }
+	void				SetPostThread(Thread* pPostThread) { m_pPostThread = pPostThread; }
+	void				AppendMessage(Message::EKind eKind, const char* szText);
+	Messages*			LockMessages();
+	void				UnlockMessages();
+	ParredFiles*		GetParredFiles() { return &m_ParredFiles; }
+};
+
+typedef std::vector<int> IDList;
+
+typedef std::vector<char*> NameList;
+
+class DupInfo
+{
+public:
+	enum EStatus
+	{
+		dsUndefined,
+		dsSuccess,
+		dsFailed,
+		dsDeleted,
+		dsDupe,
+		dsBad,
+		dsGood
+	};
+
+private:
+	int					m_iID;
+	char*				m_szName;
+	char*				m_szDupeKey;
+	int					m_iDupeScore;
+	EDupeMode			m_eDupeMode;
+	long long 			m_lSize;
+	unsigned int		m_iFullContentHash;
+	unsigned int		m_iFilteredContentHash;
+	EStatus				m_eStatus;
+
+public:
+						DupInfo();
+						~DupInfo();
+	int					GetID() { return m_iID; }
+	void				SetID(int iID);
+	const char*			GetName() { return m_szName; }			// needs locking (for shared objects)
+	void				SetName(const char* szName);			// needs locking (for shared objects)
+	const char*			GetDupeKey() { return m_szDupeKey; }	// needs locking (for shared objects)
+	void				SetDupeKey(const char* szDupeKey);		// needs locking (for shared objects)
+	int					GetDupeScore() { return m_iDupeScore; }
+	void				SetDupeScore(int iDupeScore) { m_iDupeScore = iDupeScore; }
+	EDupeMode			GetDupeMode() { return m_eDupeMode; }
+	void				SetDupeMode(EDupeMode eDupeMode) { m_eDupeMode = eDupeMode; }
+	long long			GetSize() { return m_lSize; }
+	void 				SetSize(long long lSize) { m_lSize = lSize; }
+	unsigned int		GetFullContentHash() { return m_iFullContentHash; }
+	void				SetFullContentHash(unsigned int iFullContentHash) { m_iFullContentHash = iFullContentHash; }
+	unsigned int		GetFilteredContentHash() { return m_iFilteredContentHash; }
+	void				SetFilteredContentHash(unsigned int iFilteredContentHash) { m_iFilteredContentHash = iFilteredContentHash; }
+	EStatus				GetStatus() { return m_eStatus; }
+	void				SetStatus(EStatus Status) { m_eStatus = Status; }
+};
+
+class HistoryInfo
+{
+public:
+	enum EKind
+	{
+		hkUnknown,
+		hkNzb,
+		hkUrl,
+		hkDup
+	};
+
+private:
+	EKind				m_eKind;
+	void*				m_pInfo;
+	time_t				m_tTime;
+
+public:
+						HistoryInfo(NZBInfo* pNZBInfo);
+						HistoryInfo(DupInfo* pDupInfo);
+						~HistoryInfo();
+	EKind				GetKind() { return m_eKind; }
+	int					GetID();
+	NZBInfo*			GetNZBInfo() { return (NZBInfo*)m_pInfo; }
+	DupInfo*			GetDupInfo() { return (DupInfo*)m_pInfo; }
+	void				DiscardNZBInfo() { 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 : public Subject
+{
+public:
+	enum EAspectAction
+	{
+		eaNzbFound,
+		eaNzbAdded,
+		eaFileCompleted,
+		eaFileDeleted,
+		eaUrlCompleted
+	};
+
+	struct Aspect
+	{
+		EAspectAction eAction;
+		DownloadQueue* pDownloadQueue;
+		NZBInfo* pNZBInfo;
+		FileInfo* pFileInfo;
+	};
+
+	enum EEditAction
+	{
+		eaFileMoveOffset = 1,	// move files to m_iOffset relative to the current position in download-queue
+		eaFileMoveTop,			// move files to the top of download-queue
+		eaFileMoveBottom,		// move files to the bottom of download-queue
+		eaFilePause,			// pause files
+		eaFileResume,			// resume (unpause) files
+		eaFileDelete,			// delete files
+		eaFilePauseAllPars,		// pause only (all) pars (does not affect other files)
+		eaFilePauseExtraPars,	// pause only (almost all) pars, except main par-file (does not affect other files)
+		eaFileReorder,			// set file order
+		eaFileSplit,			// split - create new group from selected files
+		eaGroupMoveOffset,		// move group to m_iOffset relative to the current position in download-queue
+		eaGroupMoveTop,			// move group to the top of download-queue
+		eaGroupMoveBottom,		// move group to the bottom of download-queue
+		eaGroupPause,			// pause group
+		eaGroupResume,			// resume (unpause) group
+		eaGroupDelete,			// delete group and put to history
+		eaGroupDupeDelete,		// delete group, put to history and mark as duplicate
+		eaGroupFinalDelete,		// delete group without adding to history
+		eaGroupPauseAllPars,	// pause only (all) pars (does not affect other files) in group
+		eaGroupPauseExtraPars,	// pause only (almost all) pars in group, except main par-file (does not affect other files)
+		eaGroupSetPriority,		// set priority for groups
+		eaGroupSetCategory,		// set or change category for a group
+		eaGroupApplyCategory,	// set or change category for a group and reassign pp-params according to category settings
+		eaGroupMerge,			// merge groups
+		eaGroupSetParameter,	// set post-process parameter for group
+		eaGroupSetName,			// set group name (rename group)
+		eaGroupSetDupeKey,		// set duplicate key
+		eaGroupSetDupeScore,	// set duplicate score
+		eaGroupSetDupeMode,		// set duplicate mode
+		eaPostDelete,			// cancel post-processing
+		eaHistoryDelete,		// hide history-item
+		eaHistoryFinalDelete,	// delete history-item
+		eaHistoryReturn,		// move history-item back to download queue
+		eaHistoryProcess,		// move history-item back to download queue and start postprocessing
+		eaHistoryRedownload,	// move history-item back to download queue for redownload
+		eaHistorySetParameter,	// set post-process parameter for history-item
+		eaHistorySetDupeKey,	// set duplicate key
+		eaHistorySetDupeScore,	// set duplicate score
+		eaHistorySetDupeMode,	// set duplicate mode
+		eaHistorySetDupeBackup,	// set duplicate backup flag
+		eaHistoryMarkBad,		// mark history-item as bad (and download other duplicate)
+		eaHistoryMarkGood		// mark history-item as good (and push it into dup-history)
+	};
+
+	enum EMatchMode
+	{
+		mmID = 1,
+		mmName,
+		mmRegEx
+	};
+
+private:
+	NZBList					m_Queue;
+	HistoryList				m_History;
+	Mutex	 				m_LockMutex;
+
+	static DownloadQueue*	g_pDownloadQueue;
+	static bool				g_bLoaded;
+
+protected:
+							DownloadQueue() : m_Queue(true) {}
+	static void				Init(DownloadQueue* pGlobalInstance) { g_pDownloadQueue = pGlobalInstance; }
+	static void				Final() { g_pDownloadQueue = NULL; }
+	static void				Loaded() { g_bLoaded = true; }
+
+public:
+	virtual					~DownloadQueue() {};
+	static bool				IsLoaded() { return g_bLoaded; }
+	static DownloadQueue*	Lock();
+	static void				Unlock();
+	NZBList*				GetQueue() { return &m_Queue; }
+	HistoryList*			GetHistory() { return &m_History; }
+	virtual bool			EditEntry(int ID, EEditAction eAction, int iOffset, const char* szText) = 0;
+	virtual bool			EditList(IDList* pIDList, NameList* pNameList, EMatchMode eMatchMode, EEditAction eAction, int iOffset, const char* szText) = 0;
+	virtual void			Save() = 0;
+	void					CalcRemainingSize(long long* pRemaining, long long* pRemainingForced);
+};
+
+#endif

daemon/queue/DupeCoordinator.cpp

@@ -0,0 +1,453 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <stdio.h>
+#ifdef WIN32
+#include <direct.h>
+#else
+#include <unistd.h>
+#endif
+#include <set>
+#include <algorithm>
+
+#include "nzbget.h"
+#include "Options.h"
+#include "Log.h"
+#include "Util.h"
+#include "NZBFile.h"
+#include "HistoryCoordinator.h"
+#include "DupeCoordinator.h"
+
+extern HistoryCoordinator* g_pHistoryCoordinator;
+extern Options* g_pOptions;
+
+bool DupeCoordinator::SameNameOrKey(const char* szName1, const char* szDupeKey1,
+	const char* szName2, const char* szDupeKey2)
+{
+	bool bHasDupeKeys = !Util::EmptyStr(szDupeKey1) && !Util::EmptyStr(szDupeKey2);
+	return (bHasDupeKeys && !strcmp(szDupeKey1, szDupeKey2)) ||
+		(!bHasDupeKeys && !strcmp(szName1, szName2));
+}
+
+/**
+  Check if the title was already downloaded or is already queued:
+  - if there is a duplicate with exactly same content (via hash-check) 
+    in queue or in history - the new item is skipped;
+  - if there is a duplicate marked as good in history - the new item is skipped;
+  - if there is a duplicate with success-status in dup-history but
+    there are no duplicates in recent history - the new item is skipped;
+  - if queue has a duplicate with the same or higher score - the new item
+    is moved to history as dupe-backup;
+  - if queue has a duplicate with lower score - the existing item is moved
+    to history as dupe-backup (unless it is in post-processing stage) and
+	the new item is added to queue;
+  - if queue doesn't have duplicates - the new item is added to queue.
+*/
+void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
+{
+	debug("Checking duplicates for %s", pNZBInfo->GetName());
+
+	// find duplicates in download queue with exactly same content
+	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+	{
+		NZBInfo* pQueuedNZBInfo = *it;
+		bool bSameContent = (pNZBInfo->GetFullContentHash() > 0 &&
+			pNZBInfo->GetFullContentHash() == pQueuedNZBInfo->GetFullContentHash()) ||
+			(pNZBInfo->GetFilteredContentHash() > 0 &&
+			 pNZBInfo->GetFilteredContentHash() == pQueuedNZBInfo->GetFilteredContentHash());
+
+		// if there is a duplicate with exactly same content (via hash-check) 
+		// in queue - the new item is skipped
+		if (pQueuedNZBInfo != pNZBInfo && bSameContent && pNZBInfo->GetKind() == NZBInfo::nkNzb)
+		{
+			if (!strcmp(pNZBInfo->GetName(), pQueuedNZBInfo->GetName()))
+			{
+				warn("Skipping duplicate %s, already queued", pNZBInfo->GetName());
+			}
+			else
+			{
+				warn("Skipping duplicate %s, already queued as %s",
+					pNZBInfo->GetName(), pQueuedNZBInfo->GetName());
+			}
+			// Flag saying QueueCoordinator to skip nzb-file
+			pNZBInfo->SetDeleteStatus(NZBInfo::dsManual);
+			g_pHistoryCoordinator->DeleteQueuedFile(pNZBInfo->GetQueuedFilename());
+			return;
+		}
+	}
+
+	// find duplicates in history
+
+	bool bSkip = false;
+	bool bGood = false;
+	bool bSameContent = false;
+	const char* szDupeName = NULL;
+
+	// find duplicates in queue having exactly same content
+	// also: nzb-files having duplicates marked as good are skipped
+	// also (only in score mode): nzb-files having success-duplicates in dup-history but don't having duplicates in recent history are skipped
+	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+	{
+		HistoryInfo* pHistoryInfo = *it;
+
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+			((pNZBInfo->GetFullContentHash() > 0 &&
+			pNZBInfo->GetFullContentHash() == pHistoryInfo->GetNZBInfo()->GetFullContentHash()) ||
+			(pNZBInfo->GetFilteredContentHash() > 0 &&
+			 pNZBInfo->GetFilteredContentHash() == pHistoryInfo->GetNZBInfo()->GetFilteredContentHash())))
+		{
+			bSkip = true;
+			bSameContent = true;
+			szDupeName = pHistoryInfo->GetNZBInfo()->GetName();
+			break;
+		}
+
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
+			((pNZBInfo->GetFullContentHash() > 0 &&
+			  pNZBInfo->GetFullContentHash() == pHistoryInfo->GetDupInfo()->GetFullContentHash()) ||
+			 (pNZBInfo->GetFilteredContentHash() > 0 &&
+			  pNZBInfo->GetFilteredContentHash() == pHistoryInfo->GetDupInfo()->GetFilteredContentHash())))
+		{
+			bSkip = true;
+			bSameContent = true;
+			szDupeName = pHistoryInfo->GetDupInfo()->GetName();
+			break;
+		}
+
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+			pHistoryInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
+			pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksGood &&
+			SameNameOrKey(pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey(),
+				pNZBInfo->GetName(), pNZBInfo->GetDupeKey()))
+		{
+			bSkip = true;
+			bGood = true;
+			szDupeName = pHistoryInfo->GetNZBInfo()->GetName();
+			break;
+		}
+
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
+			pHistoryInfo->GetDupInfo()->GetDupeMode() != dmForce &&
+			(pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsGood ||
+			 (pNZBInfo->GetDupeMode() == dmScore &&
+			  pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsSuccess &&
+			  pNZBInfo->GetDupeScore() <= pHistoryInfo->GetDupInfo()->GetDupeScore())) &&
+			SameNameOrKey(pHistoryInfo->GetDupInfo()->GetName(), pHistoryInfo->GetDupInfo()->GetDupeKey(),
+				pNZBInfo->GetName(), pNZBInfo->GetDupeKey()))
+		{
+			bSkip = true;
+			bGood = pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsGood;
+			szDupeName = pHistoryInfo->GetDupInfo()->GetName();
+			break;
+		}
+	}
+
+	if (!bSameContent && !bGood && pNZBInfo->GetDupeMode() == dmScore)
+	{
+		// nzb-files having success-duplicates in recent history (with different content) are added to history for backup
+		for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+		{
+			HistoryInfo* pHistoryInfo = *it;
+			if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+				pHistoryInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
+				SameNameOrKey(pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey(),
+					pNZBInfo->GetName(), pNZBInfo->GetDupeKey()) &&
+				pNZBInfo->GetDupeScore() <= pHistoryInfo->GetNZBInfo()->GetDupeScore() &&
+				pHistoryInfo->GetNZBInfo()->IsDupeSuccess())
+			{
+				// Flag saying QueueCoordinator to skip nzb-file
+				pNZBInfo->SetDeleteStatus(NZBInfo::dsDupe);
+				info("Collection %s is duplicate to %s", pNZBInfo->GetName(), pHistoryInfo->GetNZBInfo()->GetName());
+				return;
+			}
+		}
+	}
+
+	if (bSkip)
+	{
+		if (!strcmp(pNZBInfo->GetName(), szDupeName))
+		{
+			warn("Skipping duplicate %s, found in history with %s", pNZBInfo->GetName(),
+				bSameContent ? "exactly same content" : bGood ? "good status" : "success status");
+		}
+		else
+		{
+			warn("Skipping duplicate %s, found in history %s with %s",
+				pNZBInfo->GetName(), szDupeName,
+				bSameContent ? "exactly same content" : bGood ? "good status" : "success status");
+		}
+
+		// Flag saying QueueCoordinator to skip nzb-file
+		pNZBInfo->SetDeleteStatus(NZBInfo::dsManual);
+		g_pHistoryCoordinator->DeleteQueuedFile(pNZBInfo->GetQueuedFilename());
+		return;
+	}
+
+	// find duplicates in download queue and post-queue and handle both items according to their scores:
+	// only one item remains in queue and another one is moved to history as dupe-backup
+	if (pNZBInfo->GetDupeMode() == dmScore)
+	{
+		// find duplicates in download queue
+		int index = 0;
+		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); index++)
+		{
+			NZBInfo* pQueuedNZBInfo = *it++;
+			if (pQueuedNZBInfo != pNZBInfo &&
+				pQueuedNZBInfo->GetKind() == NZBInfo::nkNzb &&
+				pQueuedNZBInfo->GetDupeMode() != dmForce &&
+				SameNameOrKey(pQueuedNZBInfo->GetName(), pQueuedNZBInfo->GetDupeKey(),
+					pNZBInfo->GetName(), pNZBInfo->GetDupeKey()))
+			{
+				// if queue has a duplicate with the same or higher score - the new item
+				// is moved to history as dupe-backup
+				if (pNZBInfo->GetDupeScore() <= pQueuedNZBInfo->GetDupeScore())
+				{
+					// Flag saying QueueCoordinator to skip nzb-file
+					pNZBInfo->SetDeleteStatus(NZBInfo::dsDupe);
+					info("Collection %s is duplicate to %s", pNZBInfo->GetName(), pQueuedNZBInfo->GetName());
+					return;
+				}
+
+				// if queue has a duplicate with lower score - the existing item is moved
+				// to history as dupe-backup (unless it is in post-processing stage) and
+				// the new item is added to queue (unless it is in post-processing stage)
+				if (!pQueuedNZBInfo->GetPostInfo())
+				{
+					// the existing queue item is moved to history as dupe-backup
+					info("Moving collection %s with lower duplicate score to history", pQueuedNZBInfo->GetName());
+					pQueuedNZBInfo->SetDeleteStatus(NZBInfo::dsDupe);
+					pDownloadQueue->EditEntry(pQueuedNZBInfo->GetID(),
+						DownloadQueue::eaGroupDelete, 0, NULL);
+					it = pDownloadQueue->GetQueue()->begin() + index;
+				}
+			}
+		}
+	}
+}
+
+/**
+  - if download of an item fails and there are duplicates in history -
+    return the best duplicate from history to queue for download;
+  - if download of an item completes successfully - nothing extra needs to be done;
+*/
+void DupeCoordinator::NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
+{
+	debug("Processing duplicates for %s", pNZBInfo->GetName());
+
+	if (pNZBInfo->GetDupeMode() == dmScore && !pNZBInfo->IsDupeSuccess())
+	{
+		ReturnBestDupe(pDownloadQueue, pNZBInfo, pNZBInfo->GetName(), pNZBInfo->GetDupeKey());
+	}
+}
+
+/**
+ Returns the best duplicate from history to download queue.
+*/
+void DupeCoordinator::ReturnBestDupe(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, const char* szNZBName, const char* szDupeKey)
+{
+	// check if history (recent or dup) has other success-duplicates or good-duplicates
+	bool bHistoryDupe = false;
+	int iHistoryScore = 0;
+	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+	{
+		HistoryInfo* pHistoryInfo = *it;
+		bool bGoodDupe = false;
+
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+			pHistoryInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
+			(pHistoryInfo->GetNZBInfo()->IsDupeSuccess() ||
+			 pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksGood) &&
+			SameNameOrKey(pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey(), szNZBName, szDupeKey))
+		{
+			if (!bHistoryDupe || pHistoryInfo->GetNZBInfo()->GetDupeScore() > iHistoryScore)
+			{
+				iHistoryScore = pHistoryInfo->GetNZBInfo()->GetDupeScore();
+			}
+			bHistoryDupe = true;
+			bGoodDupe = pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksGood;
+		}
+
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
+			pHistoryInfo->GetDupInfo()->GetDupeMode() != dmForce &&
+			(pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsSuccess ||
+			 pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsGood) &&
+			SameNameOrKey(pHistoryInfo->GetDupInfo()->GetName(), pHistoryInfo->GetDupInfo()->GetDupeKey(), szNZBName, szDupeKey))
+		{
+			if (!bHistoryDupe || pHistoryInfo->GetDupInfo()->GetDupeScore() > iHistoryScore)
+			{
+				iHistoryScore = pHistoryInfo->GetDupInfo()->GetDupeScore();
+			}
+			bHistoryDupe = true;
+			bGoodDupe = pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsGood;
+		}
+
+		if (bGoodDupe)
+		{
+			// another duplicate with good-status exists - exit without moving other dupes to queue
+			return;
+		}
+	}
+
+	// check if duplicates exist in download queue
+	bool bQueueDupe = false;
+	int iQueueScore = 0;
+	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+	{
+		NZBInfo* pQueuedNZBInfo = *it;
+		if (pQueuedNZBInfo != pNZBInfo &&
+			pQueuedNZBInfo->GetKind() == NZBInfo::nkNzb &&
+			pQueuedNZBInfo->GetDupeMode() != dmForce &&
+			SameNameOrKey(pQueuedNZBInfo->GetName(), pQueuedNZBInfo->GetDupeKey(), szNZBName, szDupeKey) &&
+			(!bQueueDupe || pQueuedNZBInfo->GetDupeScore() > iQueueScore))
+		{
+			iQueueScore = pQueuedNZBInfo->GetDupeScore();
+			bQueueDupe = true;
+		}
+	}
+
+	// find dupe-backup with highest score, whose score is also higher than other
+	// success-duplicates and higher than already queued items
+	HistoryInfo* pHistoryDupe = NULL;
+	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+	{
+		HistoryInfo* pHistoryInfo = *it;
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+			pHistoryInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
+			pHistoryInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsDupe &&
+			pHistoryInfo->GetNZBInfo()->CalcHealth() >= pHistoryInfo->GetNZBInfo()->CalcCriticalHealth(true) &&
+			pHistoryInfo->GetNZBInfo()->GetMarkStatus() != NZBInfo::ksBad &&
+			(!bHistoryDupe || pHistoryInfo->GetNZBInfo()->GetDupeScore() > iHistoryScore) &&
+			(!bQueueDupe || pHistoryInfo->GetNZBInfo()->GetDupeScore() > iQueueScore) &&
+			(!pHistoryDupe || pHistoryInfo->GetNZBInfo()->GetDupeScore() > pHistoryDupe->GetNZBInfo()->GetDupeScore()) &&
+			SameNameOrKey(pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey(), szNZBName, szDupeKey))
+		{
+			pHistoryDupe = pHistoryInfo;
+		}
+	}
+
+	// move that dupe-backup from history to download queue
+	if (pHistoryDupe)
+	{
+		info("Found duplicate %s for %s", pHistoryDupe->GetNZBInfo()->GetName(), szNZBName);
+		g_pHistoryCoordinator->Redownload(pDownloadQueue, pHistoryDupe);
+	}
+}
+
+void DupeCoordinator::HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, bool bGood)
+{
+	char szNZBName[1024];
+	pHistoryInfo->GetName(szNZBName, 1024);
+
+	info("Marking %s as %s", szNZBName, (bGood ? "good" : "bad"));
+
+	if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
+	{
+		pHistoryInfo->GetNZBInfo()->SetMarkStatus(bGood ? NZBInfo::ksGood : NZBInfo::ksBad);
+	}
+	else if (pHistoryInfo->GetKind() == HistoryInfo::hkDup)
+	{
+		pHistoryInfo->GetDupInfo()->SetStatus(bGood ? DupInfo::dsGood : DupInfo::dsBad);
+	}
+	else
+	{
+		error("Could not mark %s as bad: history item has wrong type", szNZBName);
+		return;
+	}
+
+	if (!g_pOptions->GetDupeCheck() ||
+		(pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+		 pHistoryInfo->GetNZBInfo()->GetDupeMode() == dmForce) ||
+		(pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
+		 pHistoryInfo->GetDupInfo()->GetDupeMode() == dmForce))
+	{
+		return;
+	}
+
+	if (bGood)
+	{
+		// mark as good
+		// moving all duplicates from history to dup-history
+		HistoryCleanup(pDownloadQueue, pHistoryInfo);
+	}
+	else
+	{
+		// mark as bad
+		const char* szDupeKey = pHistoryInfo->GetKind() == HistoryInfo::hkNzb ? pHistoryInfo->GetNZBInfo()->GetDupeKey() :
+			pHistoryInfo->GetKind() == HistoryInfo::hkDup ? pHistoryInfo->GetDupInfo()->GetDupeKey() :
+			NULL;
+		ReturnBestDupe(pDownloadQueue, NULL, szNZBName, szDupeKey);
+	}
+}
+
+void DupeCoordinator::HistoryCleanup(DownloadQueue* pDownloadQueue, HistoryInfo* pMarkHistoryInfo)
+{
+	const char* szDupeKey = pMarkHistoryInfo->GetKind() == HistoryInfo::hkNzb ? pMarkHistoryInfo->GetNZBInfo()->GetDupeKey() :
+		pMarkHistoryInfo->GetKind() == HistoryInfo::hkDup ? pMarkHistoryInfo->GetDupInfo()->GetDupeKey() :
+		NULL;
+	const char* szNZBName = pMarkHistoryInfo->GetKind() == HistoryInfo::hkNzb ? pMarkHistoryInfo->GetNZBInfo()->GetName() :
+		pMarkHistoryInfo->GetKind() == HistoryInfo::hkDup ? pMarkHistoryInfo->GetDupInfo()->GetName() :
+		NULL;
+	bool bChanged = false;
+	int index = 0;
+
+	// traversing in a reverse order to delete items in order they were added to history
+	// (just to produce the log-messages in a more logical order)
+	for (HistoryList::reverse_iterator it = pDownloadQueue->GetHistory()->rbegin(); it != pDownloadQueue->GetHistory()->rend(); )
+	{
+		HistoryInfo* pHistoryInfo = *it;
+
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+			pHistoryInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
+			pHistoryInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsDupe &&
+			pHistoryInfo != pMarkHistoryInfo &&
+			SameNameOrKey(pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey(), szNZBName, szDupeKey))
+		{
+			g_pHistoryCoordinator->HistoryHide(pDownloadQueue, pHistoryInfo, index);
+			index++;
+			it = pDownloadQueue->GetHistory()->rbegin() + index;
+			bChanged = true;
+		}
+		else
+		{
+			it++;
+			index++;
+		}
+	}
+
+	if (bChanged)
+	{
+		pDownloadQueue->Save();
+	}
+}

daemon/queue/DupeCoordinator.h

@@ -0,0 +1,44 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef DUPECOORDINATOR_H
+#define DUPECOORDINATOR_H
+
+#include "DownloadInfo.h"
+
+class DupeCoordinator
+{
+private:
+	void				ReturnBestDupe(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, const char* szNZBName, const char* szDupeKey);
+	void				HistoryCleanup(DownloadQueue* pDownloadQueue, HistoryInfo* pMarkHistoryInfo);
+	bool				SameNameOrKey(const char* szName1, const char* szDupeKey1, const char* szName2, const char* szDupeKey2);
+
+public:
+	void				NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, bool bGood);
+};
+
+#endif

daemon/queue/HistoryCoordinator.cpp

@@ -0,0 +1,666 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision: 951 $
+ * $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 <set>
+#include <algorithm>
+
+#include "nzbget.h"
+#include "HistoryCoordinator.h"
+#include "Options.h"
+#include "Log.h"
+#include "QueueCoordinator.h"
+#include "DiskState.h"
+#include "Util.h"
+#include "NZBFile.h"
+#include "DupeCoordinator.h"
+#include "ParCoordinator.h"
+#include "PrePostProcessor.h"
+#include "DupeCoordinator.h"
+
+extern QueueCoordinator* g_pQueueCoordinator;
+extern PrePostProcessor* g_pPrePostProcessor;
+extern DupeCoordinator* g_pDupeCoordinator;
+extern Options* g_pOptions;
+extern DiskState* g_pDiskState;
+
+HistoryCoordinator::HistoryCoordinator()
+{
+	debug("Creating HistoryCoordinator");
+}
+
+HistoryCoordinator::~HistoryCoordinator()
+{
+	debug("Destroying HistoryCoordinator");
+}
+
+void HistoryCoordinator::Cleanup()
+{
+	debug("Cleaning up HistoryCoordinator");
+
+	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+
+	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+	{
+		delete *it;
+	}
+	pDownloadQueue->GetHistory()->clear();
+
+	DownloadQueue::Unlock();
+}
+
+/**
+ * Removes old entries from (recent) history
+ */
+void HistoryCoordinator::IntervalCheck()
+{
+	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+
+	time_t tMinTime = time(NULL) - g_pOptions->GetKeepHistory() * 60*60*24;
+	bool bChanged = false;
+	int index = 0;
+
+	// traversing in a reverse order to delete items in order they were added to history
+	// (just to produce the log-messages in a more logical order)
+	for (HistoryList::reverse_iterator it = pDownloadQueue->GetHistory()->rbegin(); it != pDownloadQueue->GetHistory()->rend(); )
+	{
+		HistoryInfo* pHistoryInfo = *it;
+		if (pHistoryInfo->GetKind() != HistoryInfo::hkDup && pHistoryInfo->GetTime() < tMinTime)
+		{
+			if (g_pOptions->GetDupeCheck() && pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
+			{
+				// replace history element
+				HistoryHide(pDownloadQueue, pHistoryInfo, index);
+				index++;
+			}
+			else
+			{
+				char szNiceName[1024];
+				pHistoryInfo->GetName(szNiceName, 1024);
+
+				pDownloadQueue->GetHistory()->erase(pDownloadQueue->GetHistory()->end() - 1 - index);
+				
+				if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
+				{
+					DeleteQueuedFile(pHistoryInfo->GetNZBInfo()->GetQueuedFilename());
+				}
+				info("Collection %s removed from history", szNiceName);
+
+				delete pHistoryInfo;
+			}
+
+			it = pDownloadQueue->GetHistory()->rbegin() + index;
+			bChanged = true;
+		}
+		else
+		{
+			it++;
+			index++;
+		}
+	}
+
+	if (bChanged)
+	{
+		pDownloadQueue->Save();
+	}
+
+	DownloadQueue::Unlock();
+}
+
+void HistoryCoordinator::DeleteQueuedFile(const char* szQueuedFile)
+{
+	if (!g_pOptions->GetNzbCleanupDisk())
+	{
+		return;
+	}
+
+	// szQueuedFile may contain one filename or several filenames separated
+	// with "|"-character (for merged groups)
+	char* szFilename = strdup(szQueuedFile);
+	char* szEnd = szFilename - 1;
+	
+	while (szEnd)
+	{
+		char* szName1 = szEnd + 1;
+		szEnd = strchr(szName1, '|');
+		if (szEnd) *szEnd = '\0';
+
+		if (Util::FileExists(szName1))
+		{
+			info("Deleting file %s", szName1);
+			remove(szName1);
+		}
+	}
+
+	free(szFilename);
+}
+
+void HistoryCoordinator::AddToHistory(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
+{
+	//remove old item for the same NZB
+	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
+	{
+		HistoryInfo* pHistoryInfo = *it;
+		if (pHistoryInfo->GetNZBInfo() == pNZBInfo)
+		{
+			delete pHistoryInfo;
+			pDownloadQueue->GetHistory()->erase(it);
+			break;
+		}
+	}
+
+	HistoryInfo* pHistoryInfo = new HistoryInfo(pNZBInfo);
+	pHistoryInfo->SetTime(time(NULL));
+	pDownloadQueue->GetHistory()->push_front(pHistoryInfo);
+	pDownloadQueue->GetQueue()->Remove(pNZBInfo);
+
+	if (pNZBInfo->GetDeleteStatus() == NZBInfo::dsNone)
+	{
+		// park files and delete files marked for deletion
+		int iParkedFiles = 0;
+		for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); )
+		{
+			FileInfo* pFileInfo = *it;
+			if (!pFileInfo->GetDeleted())
+			{
+				detail("Parking file %s", pFileInfo->GetFilename());
+				g_pQueueCoordinator->DiscardDiskFile(pFileInfo);
+				iParkedFiles++;
+				it++;
+			}
+			else
+			{
+				// since we removed pNZBInfo from queue we need to take care of removing file infos marked for deletion
+				pNZBInfo->GetFileList()->erase(it);
+				delete pFileInfo;
+				it = pNZBInfo->GetFileList()->begin() + iParkedFiles;
+			}
+		}
+		pNZBInfo->SetParkedFileCount(iParkedFiles);
+	}
+	else
+	{
+		pNZBInfo->GetFileList()->Clear();
+	}
+
+	info("Collection %s added to history", pNZBInfo->GetName());
+}
+
+void HistoryCoordinator::HistoryHide(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, int rindex)
+{
+	char szNiceName[1024];
+	pHistoryInfo->GetName(szNiceName, 1024);
+
+	// replace history element
+	DupInfo* pDupInfo = new DupInfo();
+	pDupInfo->SetID(pHistoryInfo->GetNZBInfo()->GetID());
+	pDupInfo->SetName(pHistoryInfo->GetNZBInfo()->GetName());
+	pDupInfo->SetDupeKey(pHistoryInfo->GetNZBInfo()->GetDupeKey());
+	pDupInfo->SetDupeScore(pHistoryInfo->GetNZBInfo()->GetDupeScore());
+	pDupInfo->SetDupeMode(pHistoryInfo->GetNZBInfo()->GetDupeMode());
+	pDupInfo->SetSize(pHistoryInfo->GetNZBInfo()->GetSize());
+	pDupInfo->SetFullContentHash(pHistoryInfo->GetNZBInfo()->GetFullContentHash());
+	pDupInfo->SetFilteredContentHash(pHistoryInfo->GetNZBInfo()->GetFilteredContentHash());
+
+	pDupInfo->SetStatus(
+		pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksGood ? DupInfo::dsGood :
+		pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksBad ? DupInfo::dsBad :
+		pHistoryInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsDupe ? DupInfo::dsDupe :
+		pHistoryInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsManual ? DupInfo::dsDeleted :
+		pHistoryInfo->GetNZBInfo()->IsDupeSuccess() ? DupInfo::dsSuccess :
+		DupInfo::dsFailed);
+
+	HistoryInfo* pNewHistoryInfo = new HistoryInfo(pDupInfo);
+	pNewHistoryInfo->SetTime(pHistoryInfo->GetTime());
+	(*pDownloadQueue->GetHistory())[pDownloadQueue->GetHistory()->size() - 1 - rindex] = pNewHistoryInfo;
+
+	DeleteQueuedFile(pHistoryInfo->GetNZBInfo()->GetQueuedFilename());
+
+	delete pHistoryInfo;
+	info("Collection %s removed from history", szNiceName);
+}
+
+bool HistoryCoordinator::EditList(DownloadQueue* pDownloadQueue, IDList* pIDList, DownloadQueue::EEditAction eAction, int iOffset, const char* szText)
+{
+	bool bOK = false;
+
+	for (IDList::iterator itID = pIDList->begin(); itID != pIDList->end(); itID++)
+	{
+		int iID = *itID;
+		for (HistoryList::iterator itHistory = pDownloadQueue->GetHistory()->begin(); itHistory != pDownloadQueue->GetHistory()->end(); itHistory++)
+		{
+			HistoryInfo* pHistoryInfo = *itHistory;
+			if (pHistoryInfo->GetID() == iID)
+			{
+				switch (eAction)
+				{
+					case DownloadQueue::eaHistoryDelete:
+					case DownloadQueue::eaHistoryFinalDelete:
+						HistoryDelete(pDownloadQueue, itHistory, pHistoryInfo, eAction == DownloadQueue::eaHistoryFinalDelete);
+						break;
+
+					case DownloadQueue::eaHistoryReturn:
+					case DownloadQueue::eaHistoryProcess:
+						HistoryReturn(pDownloadQueue, itHistory, pHistoryInfo, eAction == DownloadQueue::eaHistoryProcess);
+						break;
+
+					case DownloadQueue::eaHistoryRedownload:
+						HistoryRedownload(pDownloadQueue, itHistory, pHistoryInfo, false);
+						break;
+
+ 					case DownloadQueue::eaHistorySetParameter:
+						HistorySetParameter(pHistoryInfo, szText);
+						break;
+
+					case DownloadQueue::eaHistorySetDupeKey:
+					case DownloadQueue::eaHistorySetDupeScore:
+					case DownloadQueue::eaHistorySetDupeMode:
+					case DownloadQueue::eaHistorySetDupeBackup:
+						HistorySetDupeParam(pHistoryInfo, eAction, szText);
+						break;
+
+					case DownloadQueue::eaHistoryMarkBad:
+					case DownloadQueue::eaHistoryMarkGood:
+						g_pDupeCoordinator->HistoryMark(pDownloadQueue, pHistoryInfo, eAction == DownloadQueue::eaHistoryMarkGood);
+						break;
+
+					default:
+						// nothing, just to avoid compiler warning
+						break;
+				}
+
+				bOK = true;
+				break;
+			}
+		}
+	}
+
+	if (bOK)
+	{
+		pDownloadQueue->Save();
+	}
+
+	return bOK;
+}
+
+void HistoryCoordinator::HistoryDelete(DownloadQueue* pDownloadQueue, HistoryList::iterator itHistory,
+	HistoryInfo* pHistoryInfo, bool bFinal)
+{
+	char szNiceName[1024];
+	pHistoryInfo->GetName(szNiceName, 1024);
+	info("Deleting %s from history", szNiceName);
+
+	if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
+	{
+		NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
+
+		// delete parked files
+		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+		{
+			for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
+			{
+				FileInfo* pFileInfo = *it;
+				g_pDiskState->DiscardFile(pFileInfo);
+			}
+		}
+		pNZBInfo->GetFileList()->Clear();
+
+		DeleteQueuedFile(pNZBInfo->GetQueuedFilename());
+	}
+
+	if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
+		g_pOptions->GetDeleteCleanupDisk() &&
+		(pHistoryInfo->GetNZBInfo()->GetDeleteStatus() != NZBInfo::dsNone ||
+		pHistoryInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psFailure ||
+		pHistoryInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usFailure ||
+		pHistoryInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usPassword) &&
+		Util::DirectoryExists(pHistoryInfo->GetNZBInfo()->GetDestDir()))
+	{
+		info("Deleting %s", pHistoryInfo->GetNZBInfo()->GetDestDir());
+		char szErrBuf[256];
+		if (!Util::DeleteDirectoryWithContent(pHistoryInfo->GetNZBInfo()->GetDestDir(), szErrBuf, sizeof(szErrBuf)))
+		{
+			error("Could not delete directory %s: %s", pHistoryInfo->GetNZBInfo()->GetDestDir(), szErrBuf);
+		}
+	}
+
+	if (bFinal || !g_pOptions->GetDupeCheck() || pHistoryInfo->GetKind() == HistoryInfo::hkUrl)
+	{
+		pDownloadQueue->GetHistory()->erase(itHistory);
+		delete pHistoryInfo;
+	}
+	else
+	{
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
+		{
+			// replace history element
+			int rindex = pDownloadQueue->GetHistory()->size() - 1 - (itHistory - pDownloadQueue->GetHistory()->begin());
+			HistoryHide(pDownloadQueue, pHistoryInfo, rindex);
+		}
+	}
+}
+
+void HistoryCoordinator::HistoryReturn(DownloadQueue* pDownloadQueue, HistoryList::iterator itHistory, HistoryInfo* pHistoryInfo, bool bReprocess)
+{
+	char szNiceName[1024];
+	pHistoryInfo->GetName(szNiceName, 1024);
+	debug("Returning %s from history back to download queue", szNiceName);
+	bool bUnparked = false;
+	NZBInfo* pNZBInfo = NULL;
+
+	if (bReprocess && pHistoryInfo->GetKind() != HistoryInfo::hkNzb)
+	{
+		error("Could not restart postprocessing for %s: history item has wrong type", szNiceName);
+		return;
+	}
+
+	if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
+	{
+		pNZBInfo = pHistoryInfo->GetNZBInfo();
+
+		// unpark files
+		for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
+		{
+			FileInfo* pFileInfo = *it;
+			detail("Unpark file %s", pFileInfo->GetFilename());
+			bUnparked = true;
+		}
+
+		pDownloadQueue->GetQueue()->push_front(pNZBInfo);
+		pHistoryInfo->DiscardNZBInfo();
+
+		// reset postprocessing status variables
+		pNZBInfo->SetParCleanup(false);
+		if (!pNZBInfo->GetUnpackCleanedUpDisk())
+		{
+			pNZBInfo->SetUnpackStatus(NZBInfo::usNone);
+			pNZBInfo->SetCleanupStatus(NZBInfo::csNone);
+			pNZBInfo->SetRenameStatus(NZBInfo::rsNone);
+
+			if (ParCoordinator::FindMainPars(pNZBInfo->GetDestDir(), NULL))
+			{
+				pNZBInfo->SetParStatus(NZBInfo::psNone);
+			}
+		}
+		pNZBInfo->SetDeleteStatus(NZBInfo::dsNone);
+		pNZBInfo->SetDeletePaused(false);
+		pNZBInfo->SetMarkStatus(NZBInfo::ksNone);
+		pNZBInfo->GetScriptStatuses()->Clear();
+		pNZBInfo->SetParkedFileCount(0);
+		if (pNZBInfo->GetMoveStatus() == NZBInfo::msFailure)
+		{
+			pNZBInfo->SetMoveStatus(NZBInfo::msNone);
+		}
+	}
+
+	if (pHistoryInfo->GetKind() == HistoryInfo::hkUrl)
+	{
+		NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
+		pHistoryInfo->DiscardNZBInfo();
+		pNZBInfo->SetUrlStatus(NZBInfo::lsNone);
+		pNZBInfo->SetDeleteStatus(NZBInfo::dsNone);
+		pDownloadQueue->GetQueue()->push_front(pNZBInfo);
+		bUnparked = true;
+	}
+
+	if (bUnparked || bReprocess)
+	{
+		pDownloadQueue->GetHistory()->erase(itHistory);
+		// the object "pHistoryInfo" is released few lines later, after the call to "NZBDownloaded"
+		info("%s returned from history back to download queue", szNiceName);
+	}
+	else
+	{
+		warn("Could not return %s back from history to download queue: history item does not have any files left for download", szNiceName);
+	}
+
+	if (bReprocess)
+	{
+		// start postprocessing
+		debug("Restarting postprocessing for %s", szNiceName);
+		g_pPrePostProcessor->NZBDownloaded(pDownloadQueue, pNZBInfo);
+	}
+
+	if (bUnparked || bReprocess)
+	{
+		delete pHistoryInfo;
+	}
+}
+
+void HistoryCoordinator::HistoryRedownload(DownloadQueue* pDownloadQueue, HistoryList::iterator itHistory,
+	HistoryInfo* pHistoryInfo, bool bRestorePauseState)
+{
+	NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
+	bool bPaused = bRestorePauseState && pNZBInfo->GetDeletePaused();
+
+	if (!Util::FileExists(pNZBInfo->GetQueuedFilename()))
+	{
+		error("Could not return collection %s from history back to queue: could not find source nzb-file %s",
+			pNZBInfo->GetName(), pNZBInfo->GetQueuedFilename());
+		return;
+	}
+
+	NZBFile* pNZBFile = NZBFile::Create(pNZBInfo->GetQueuedFilename(), "");
+	if (pNZBFile == NULL)
+	{
+		error("Could not return collection %s from history back to queue: could not parse nzb-file",
+			pNZBInfo->GetName());
+		return;
+	}
+
+	info("Returning collection %s from history back to queue", pNZBInfo->GetName());
+
+	for (FileList::iterator it = pNZBFile->GetNZBInfo()->GetFileList()->begin(); it != pNZBFile->GetNZBInfo()->GetFileList()->end(); it++)
+	{
+		FileInfo* pFileInfo = *it;
+		pFileInfo->SetPaused(bPaused);
+	}
+
+	if (Util::DirectoryExists(pNZBInfo->GetDestDir()))
+	{
+		detail("Deleting %s", pNZBInfo->GetDestDir());
+		char szErrBuf[256];
+		if (!Util::DeleteDirectoryWithContent(pNZBInfo->GetDestDir(), szErrBuf, sizeof(szErrBuf)))
+		{
+			error("Could not delete directory %s: %s", pNZBInfo->GetDestDir(), szErrBuf);
+		}
+	}
+
+	pNZBInfo->BuildDestDirName();
+	if (Util::DirectoryExists(pNZBInfo->GetDestDir()))
+	{
+		detail("Deleting %s", pNZBInfo->GetDestDir());
+		char szErrBuf[256];
+		if (!Util::DeleteDirectoryWithContent(pNZBInfo->GetDestDir(), szErrBuf, sizeof(szErrBuf)))
+		{
+			error("Could not delete directory %s: %s", pNZBInfo->GetDestDir(), szErrBuf);
+		}
+	}
+
+	// reset status fields (which are not reset by "HistoryReturn")
+	pNZBInfo->SetMoveStatus(NZBInfo::msNone);
+	pNZBInfo->SetUnpackCleanedUpDisk(false);
+	pNZBInfo->SetParStatus(NZBInfo::psNone);
+	pNZBInfo->SetRenameStatus(NZBInfo::rsNone);
+	pNZBInfo->ClearCompletedFiles();
+	pNZBInfo->GetServerStats()->Clear();
+	pNZBInfo->GetCurrentServerStats()->Clear();
+
+	pNZBInfo->CopyFileList(pNZBFile->GetNZBInfo());
+
+	g_pQueueCoordinator->CheckDupeFileInfos(pNZBInfo);
+	delete pNZBFile;
+
+	HistoryReturn(pDownloadQueue, itHistory, pHistoryInfo, false);
+
+	if (!bPaused && g_pOptions->GetParCheck() != Options::pcForce)
+	{
+		pDownloadQueue->EditEntry(pNZBInfo->GetID(), 
+			DownloadQueue::eaGroupPauseExtraPars, 0, NULL);
+	}
+}
+
+void HistoryCoordinator::HistorySetParameter(HistoryInfo* pHistoryInfo, const char* szText)
+{
+	char szNiceName[1024];
+	pHistoryInfo->GetName(szNiceName, 1024);
+	debug("Setting post-process-parameter '%s' for '%s'", szText, szNiceName);
+
+	if (!(pHistoryInfo->GetKind() == HistoryInfo::hkNzb || pHistoryInfo->GetKind() == HistoryInfo::hkUrl))
+	{
+		error("Could not set post-process-parameter for %s: history item has wrong type", szNiceName);
+		return;
+	}
+
+	char* szStr = strdup(szText);
+
+	char* szValue = strchr(szStr, '=');
+	if (szValue)
+	{
+		*szValue = '\0';
+		szValue++;
+		pHistoryInfo->GetNZBInfo()->GetParameters()->SetParameter(szStr, szValue);
+	}
+	else
+	{
+		error("Could not set post-process-parameter for %s: invalid argument: %s", pHistoryInfo->GetNZBInfo()->GetName(), szText);
+	}
+
+	free(szStr);
+}
+
+void HistoryCoordinator::HistorySetDupeParam(HistoryInfo* pHistoryInfo, DownloadQueue::EEditAction eAction, const char* szText)
+{
+	char szNiceName[1024];
+	pHistoryInfo->GetName(szNiceName, 1024);
+	debug("Setting dupe-parameter '%i'='%s' for '%s'", (int)eAction, szText, szNiceName);
+
+	EDupeMode eMode = dmScore;
+	if (eAction == DownloadQueue::eaHistorySetDupeMode)
+	{
+		if (!strcasecmp(szText, "SCORE"))
+		{
+			eMode = dmScore;
+		}
+		else if (!strcasecmp(szText, "ALL"))
+		{
+			eMode = dmAll;
+		}
+		else if (!strcasecmp(szText, "FORCE"))
+		{
+			eMode = dmForce;
+		}
+		else
+		{
+			error("Could not set duplicate mode for %s: incorrect mode (%s)", szNiceName, szText);
+			return;
+		}
+	}
+
+	if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb || pHistoryInfo->GetKind() == HistoryInfo::hkUrl)
+	{
+		switch (eAction) 
+		{
+			case DownloadQueue::eaHistorySetDupeKey:
+				pHistoryInfo->GetNZBInfo()->SetDupeKey(szText);
+				break;
+
+			case DownloadQueue::eaHistorySetDupeScore:
+				pHistoryInfo->GetNZBInfo()->SetDupeScore(atoi(szText));
+				break;
+
+			case DownloadQueue::eaHistorySetDupeMode:
+				pHistoryInfo->GetNZBInfo()->SetDupeMode(eMode);
+				break;
+
+			case DownloadQueue::eaHistorySetDupeBackup:
+				if (pHistoryInfo->GetKind() == HistoryInfo::hkUrl)
+				{
+					error("Could not set duplicate parameter for %s: history item has wrong type", szNiceName);
+					return;
+				}
+				else if (pHistoryInfo->GetNZBInfo()->GetDeleteStatus() != NZBInfo::dsDupe &&
+					pHistoryInfo->GetNZBInfo()->GetDeleteStatus() != NZBInfo::dsManual)
+				{
+					error("Could not set duplicate parameter for %s: history item has wrong delete status", szNiceName);
+					return;
+				}
+				pHistoryInfo->GetNZBInfo()->SetDeleteStatus(!strcasecmp(szText, "YES") ||
+					!strcasecmp(szText, "TRUE") || !strcasecmp(szText, "1") ? NZBInfo::dsDupe : NZBInfo::dsManual);
+				break;
+
+			default:
+				// suppress compiler warning
+				break;
+		}
+	}
+	else if (pHistoryInfo->GetKind() == HistoryInfo::hkDup)
+	{
+		switch (eAction) 
+		{
+			case DownloadQueue::eaHistorySetDupeKey:
+				pHistoryInfo->GetDupInfo()->SetDupeKey(szText);
+				break;
+
+			case DownloadQueue::eaHistorySetDupeScore:
+				pHistoryInfo->GetDupInfo()->SetDupeScore(atoi(szText));
+				break;
+
+			case DownloadQueue::eaHistorySetDupeMode:
+				pHistoryInfo->GetDupInfo()->SetDupeMode(eMode);
+				break;
+
+			case DownloadQueue::eaHistorySetDupeBackup:
+				error("Could not set duplicate parameter for %s: history item has wrong type", szNiceName);
+				return;
+
+			default:
+				// suppress compiler warning
+				break;
+		}
+	}
+}
+
+void HistoryCoordinator::Redownload(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo)
+{
+	HistoryList::iterator it = std::find(pDownloadQueue->GetHistory()->begin(),
+		pDownloadQueue->GetHistory()->end(), pHistoryInfo);
+	HistoryRedownload(pDownloadQueue, it, pHistoryInfo, true);
+}