version 9.0

.gitattributes

@@ -1,25 +0,0 @@
-* text=auto
-
-# Use CRLF for certain Windows files.
-*.vcproj                        eol=crlf
-*.sln                           eol=crlf
-*.bat                           eol=crlf
-README-WINDOWS.txt              eol=crlf
-nzbget-setup.nsi                eol=crlf
-windows/package-info.json       eol=crlf
-windows/resources/resource.h    eol=crlf
-windows/resources/nzbget.rc     eol=crlf
-
-# Configure GitHub's language detector
-lib/*               linguist-vendored linguist-language=C++
-webui/lib/*         linguist-vendored
-Makefile.in         linguist-vendored
-configure           linguist-vendored
-config.sub          linguist-vendored
-aclocal.m4          linguist-vendored
-config.guess        linguist-vendored
-depcomp             linguist-vendored
-install-sh          linguist-vendored
-missing             linguist-vendored
-configure.ac        linguist-vendored=false
-Makefile.am         linguist-vendored=false

.gitignore

@@ -1,63 +0,0 @@
-# Compiled Object files
-*.slo
-*.lo
-*.o
-*.obj
-
-# Precompiled Headers
-*.gch
-*.pch
-
-# Compiled Dynamic libraries
-*.so
-*.dylib
-*.dll
-
-# Compiled Static libraries
-*.lai
-*.la
-*.a
-*.lib
-
-# Executables
-*.exe
-*.out
-
-# GNU Autotools
-.deps/
-config.h
-config.log
-config.status
-Makefile
-stamp-h1
-autom4te.cache/
-
-# Visual Studio User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-.vs/
-ipch/
-*.aps
-*.ncb
-*.opensdf
-*.sdf
-*.cachefile
-*.ilk
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.vspscc
-*.vssscc
-*.pidb
-*.svclog
-*.scc
-*.sln
-
-# NZBGet specific
-nzbget
-code_revision.cpp

AUTHORS

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

ArticleDownloader.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,7 +34,6 @@
 #include "Thread.h"
 #include "NNTPConnection.h"
 #include "Decoder.h"
-#include "ArticleWriter.h"
 
 class ArticleDownloader : public Thread, public Subject
 {
@@ -43,25 +42,18 @@ public:
 	{
 		adUndefined,
 		adRunning,
-		adWaiting,
 		adFinished,
 		adFailed,
 		adRetry,
+		adDecodeError,
 		adCrcError,
+		adDecoding,
+		adJoining,
+		adJoined,
 		adNotFound,
 		adConnectError,
 		adFatalError
 	};
-
-	class ArticleWriterImpl : public ArticleWriter
-	{
-	private:
-		 ArticleDownloader*		m_pOwner;
-	protected:
-		virtual void	SetLastUpdateTimeNow() { m_pOwner->SetLastUpdateTimeNow(); } 
-	public:
-		void			SetOwner(ArticleDownloader* pOwner) { m_pOwner = pOwner; }
-	};
 			
 private:
 	FileInfo*			m_pFileInfo;
@@ -69,49 +61,58 @@ private:
 	NNTPConnection* 	m_pConnection;
 	EStatus				m_eStatus;
 	Mutex			 	m_mutexConnection;
-	char*				m_szInfoName;
-	char				m_szConnectionName[250];
+	const char*			m_szResultFilename;
+	char*				m_szTempFilename;
 	char*				m_szArticleFilename;
+	char*				m_szInfoName;
+	char*				m_szOutputFilename;
 	time_t				m_tLastUpdateTime;
 	Decoder::EFormat	m_eFormat;
 	YDecoder			m_YDecoder;
 	UDecoder			m_UDecoder;
-	ArticleWriterImpl	m_ArticleWriter;
-	ServerStatList		m_ServerStats;
-	bool				m_bWritingStarted;
-	int					m_iDownloadedSize;
+	FILE*				m_pOutFile;
+	bool				m_bDuplicate;
 
 	EStatus				Download();
+	bool				Write(char* szLine, int iLen);
+	bool				PrepareFile(char* szLine);
 	EStatus				DecodeCheck();
 	void				FreeConnection(bool bKeepConnected);
 	EStatus				CheckResponse(const char* szResponse, const char* szComment);
-	void				SetStatus(EStatus eStatus) { m_eStatus = eStatus; }
-	bool				Write(char* szLine, int iLen);
-	void				AddServerData();
 
 public:
 						ArticleDownloader();
-	virtual				~ArticleDownloader();
+						~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* szInfoName);
+	void				SetInfoName(const char* v);
 	const char*			GetInfoName() { return m_szInfoName; }
-	const char*			GetConnectionName() { return m_szConnectionName; }
+	void				CompleteFileParts();
+	static bool			MoveCompletedFiles(NZBInfo* pNZBInfo, const char* szOldDestDir);
 	void				SetConnection(NNTPConnection* pConnection) { m_pConnection = pConnection; }
-	void				CompleteFileParts() { m_ArticleWriter.CompleteFileParts(); }
-	int					GetDownloadedSize() { return m_iDownloadedSize; }
 
 	void				LogDebugInfo();
 };
 
+class DownloadSpeedMeter
+{
+public:
+	virtual				~DownloadSpeedMeter() {};
+	virtual float		CalcCurrentDownloadSpeed() = 0;
+	virtual void		AddSpeedReading(int iBytes) = 0;
+};
+
 #endif

BinRpc.h

@@ -0,0 +1,161 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This 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 BINRPC_H
+#define BINRPC_H
+
+#include "Connection.h"
+#include "MessageBase.h"
+
+class BinRpcProcessor
+{
+private:
+	SOCKET				m_iSocket;
+	SNZBRequestBase		m_MessageBase;
+	const char*			m_szClientIP;
+
+	void				Dispatch();
+
+public:
+	void				Execute();
+	void				SetSocket(SOCKET iSocket) { m_iSocket = iSocket; }
+	void				SetSignature(int iSignature) { m_MessageBase.m_iSignature = iSignature; }
+	void				SetClientIP(const char* szClientIP) { m_szClientIP = szClientIP; }
+};
+
+class BinCommand
+{
+protected:
+	SOCKET				m_iSocket;
+	SNZBRequestBase*	m_pMessageBase;
+
+	bool				ReceiveRequest(void* pBuffer, int iSize);
+	void				SendBoolResponse(bool bSuccess, const char* szText);
+
+public:
+	virtual				~BinCommand() {}
+	virtual void		Execute() = 0;
+	void				SetSocket(SOCKET iSocket) { m_iSocket = iSocket; }
+	void				SetMessageBase(SNZBRequestBase*	pMessageBase) { m_pMessageBase = pMessageBase; }
+};
+
+class DownloadBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class ListBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class LogBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class PauseUnpauseBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class EditQueueBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class SetDownloadRateBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class DumpDebugBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class ShutdownBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class ReloadBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class VersionBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class PostQueueBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class WriteLogBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class ScanBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class HistoryBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class DownloadUrlBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class UrlQueueBinCommand: public BinCommand
+{
+public:
+	virtual void		Execute();
+};
+
+#endif

ColoredFrontend.cpp

@@ -74,11 +74,11 @@ void ColoredFrontend::PrintStatus()
 	char tmp[1024];
 	char timeString[100];
 	timeString[0] = '\0';
-	int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
+	float fCurrentDownloadSpeed = m_bStandBy ? 0 : m_fCurrentDownloadSpeed;
 
-	if (iCurrentDownloadSpeed > 0 && !m_bPauseDownload)
+	if (fCurrentDownloadSpeed > 0.0 && !(m_bPauseDownload || m_bPauseDownload2))
 	{
-		long long remain_sec = (long long)(m_lRemainingSize / iCurrentDownloadSpeed);
+		long long remain_sec = m_lRemainingSize / ((long long)(fCurrentDownloadSpeed * 1024));
 		int h = (int)(remain_sec / 3600);
 		int m = (int)((remain_sec % 3600) / 60);
 		int s = (int)(remain_sec % 60);
@@ -86,9 +86,9 @@ void ColoredFrontend::PrintStatus()
 	}
 
 	char szDownloadLimit[128];
-	if (m_iDownloadLimit > 0)
+	if (m_fDownloadLimit > 0.0f)
 	{
-		sprintf(szDownloadLimit, ", Limit %i KB/s", m_iDownloadLimit / 1024);
+		sprintf(szDownloadLimit, ", Limit %.0f KB/s", m_fDownloadLimit);
 	}
 	else
 	{
@@ -112,12 +112,10 @@ void ColoredFrontend::PrintStatus()
 	const char* szControlSeq = "\033[K";
 #endif
 
-	char szFileSize[20];
-	char szCurrendSpeed[20];
-	snprintf(tmp, 1024, " %d threads, %s, %s remaining%s%s%s%s%s\n",
-		m_iThreadCount, Util::FormatSpeed(szCurrendSpeed, sizeof(szCurrendSpeed), iCurrentDownloadSpeed),
-		Util::FormatSize(szFileSize, sizeof(szFileSize), m_lRemainingSize),
-		timeString, szPostStatus, m_bPauseDownload ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
+	snprintf(tmp, 1024, " %d threads, %.*f KB/s, %.2f MB remaining%s%s%s%s%s\n", 
+		m_iThreadCount, (fCurrentDownloadSpeed >= 10 ? 0 : 1), fCurrentDownloadSpeed, 
+		(float)(Util::Int64ToFloat(m_lRemainingSize) / 1024.0 / 1024.0), timeString, szPostStatus, 
+		m_bPauseDownload || m_bPauseDownload2 ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
 		szDownloadLimit, szControlSeq);
 	tmp[1024-1] = '\0';
 	printf("%s", tmp);

Connection.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,9 +32,6 @@
 #include "Thread.h"
 #endif
 #endif
-#ifndef DISABLE_TLS
-#include "TLS.h"
-#endif
 
 class Connection
 {
@@ -46,47 +43,22 @@ public:
 		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;
-	bool				m_bBroken;
-	bool				m_bGracefull;
-
-	struct SockAddr
-	{
-		int				ai_family;
-		int				ai_socktype;
-		int				ai_protocol;
-		bool			operator==(const SockAddr& rhs) const
-							{ return memcmp(this, &rhs, sizeof(SockAddr)) == 0; }
-	};
-
+	bool				m_bAutoClose;
 #ifndef DISABLE_TLS
-	class ConTLSSocket: public TLSSocket
-	{
-	private:
-		Connection*		m_pOwner;
-	protected:
-		virtual void	PrintError(const char* szErrMsg) { m_pOwner->PrintError(szErrMsg); }
-	public:
-						ConTLSSocket(SOCKET iSocket, bool bIsClient, const char* szCertFile,
-							const char* szKeyFile, const char* szCipher, Connection* pOwner):
-							TLSSocket(iSocket, bIsClient, szCertFile, szKeyFile, szCipher), m_pOwner(pOwner) {}
-	};
-
-	ConTLSSocket*		m_pTLSSocket;
+	void*				m_pTLS;
+	static bool			bTLSLibInitialized;
 	bool				m_bTLSError;
 #endif
 #ifndef HAVE_GETADDRINFO
@@ -95,17 +67,18 @@ protected:
 #endif
 #endif
 
-						Connection(SOCKET iSocket, bool bTLS);
 	void				ReportError(const char* szMsgPrefix, const char* szMsgArg, bool PrintErrCode, int herrno);
-	virtual void		PrintError(const char* szErrMsg);
-	bool				DoConnect();
-	bool				DoDisconnect();
-	bool				InitSocketOpts();
-	bool				ConnectWithTimeout(void* address, int address_len);
+	virtual bool 		DoConnect();
+	virtual bool		DoDisconnect();
+	int					DoBind();
+	int					DoWriteLine(const char* pBuffer);
+	char*				DoReadLine(char* pBuffer, int iSize, int* pBytesRead);
+	SOCKET				DoAccept();
 #ifndef HAVE_GETADDRINFO
 	unsigned int		ResolveHostAddr(const char* szHost);
 #endif
 #ifndef DISABLE_TLS
+	bool				CheckTLSResult(int iResultCode, char* szErrStr, const char* szErrMsgPrefix);
 	int					recv(SOCKET s, char* buf, int len, int flags);
 	int					send(SOCKET s, const char* buf, int len, int flags);
 	void				CloseTLS();
@@ -113,36 +86,32 @@ protected:
 
 public:
 						Connection(const char* szHost, int iPort, bool bTLS);
+						Connection(SOCKET iSocket, bool bAutoClose);
 	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);
+	bool 				Connect();
+	bool				Disconnect();
+	int					Bind();
+	int					Send(const char* pBuffer, int iSize);
+	int					Recv(char* pBuffer, int iSize);
+	bool				RecvAll(char* pBuffer, int iSize);
 	char*				ReadLine(char* pBuffer, int iSize, int* pBytesRead);
 	void				ReadBuffer(char** pBuffer, int *iBufLen);
 	int					WriteLine(const char* pBuffer);
-	Connection*			Accept();
+	SOCKET				Accept();
 	void				Cancel();
 	const char*			GetHost() { return m_szHost; }
 	int					GetPort() { return m_iPort; }
 	bool				GetTLS() { return m_bTLS; }
-	const char*			GetCipher() { return m_szCipher; }
-	void				SetCipher(const char* szCipher);
+	SOCKET				GetSocket() { return m_iSocket; }
 	void				SetTimeout(int iTimeout) { m_iTimeout = iTimeout; }
 	EStatus				GetStatus() { return m_eStatus; }
-	void				SetSuppressErrors(bool bSuppressErrors);
+	void				SetSuppressErrors(bool bSuppressErrors) { m_bSuppressErrors = bSuppressErrors; }
 	bool				GetSuppressErrors() { return m_bSuppressErrors; }
-	const char*			GetRemoteAddr();
-	bool				GetGracefull() { return m_bGracefull; }
-	void				SetGracefull(bool bGracefull) { m_bGracefull = bGracefull; }
 #ifndef DISABLE_TLS
-	bool				StartTLS(bool bIsClient, const char* szCertFile, const char* szKeyFile);
+	bool				StartTLS();
 #endif
-	int					FetchTotalBytesRead();
 };
 
 #endif

Decoder.cpp

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

Decoder.h

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

DiskState.h

@@ -0,0 +1,64 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  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"
+
+class DiskState
+{
+private:
+	int					ParseFormatVersion(const char* szFormatSignature);
+	bool				SaveFileInfo(FileInfo* pFileInfo, const char* szFilename);
+	bool				LoadFileInfo(FileInfo* pFileInfo, const char* szFilename, bool bFileSummary, bool bArticles);
+	void				SaveNZBList(DownloadQueue* pDownloadQueue, FILE* outfile);
+	bool				LoadNZBList(DownloadQueue* pDownloadQueue, FILE* infile, int iFormatVersion);
+	void				SaveFileQueue(DownloadQueue* pDownloadQueue, FileQueue* pFileQueue, FILE* outfile);
+	bool				LoadFileQueue(DownloadQueue* pDownloadQueue, FileQueue* pFileQueue, FILE* infile, int iFormatVersion);
+	void				SavePostQueue(DownloadQueue* pDownloadQueue, FILE* outfile);
+	bool				LoadPostQueue(DownloadQueue* pDownloadQueue, FILE* infile);
+	bool				LoadOldPostQueue(DownloadQueue* pDownloadQueue);
+	void				SaveUrlQueue(DownloadQueue* pDownloadQueue, FILE* outfile);
+	bool				LoadUrlQueue(DownloadQueue* pDownloadQueue, FILE* infile, int iFormatVersion);
+	void				SaveUrlInfo(UrlInfo* pUrlInfo, FILE* outfile);
+	bool				LoadUrlInfo(UrlInfo* pUrlInfo, FILE* infile, int iFormatVersion);
+	void				SaveHistory(DownloadQueue* pDownloadQueue, FILE* outfile);
+	bool				LoadHistory(DownloadQueue* pDownloadQueue, FILE* infile, int iFormatVersion);
+	int					FindNZBInfoIndex(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+
+public:
+	bool				DownloadQueueExists();
+	bool				PostQueueExists(bool bCompleted);
+	bool				SaveDownloadQueue(DownloadQueue* pDownloadQueue);
+	bool				LoadDownloadQueue(DownloadQueue* pDownloadQueue);
+	bool				SaveFile(FileInfo* pFileInfo);
+	bool				LoadArticles(FileInfo* pFileInfo);
+	bool				DiscardDownloadQueue();
+	bool				DiscardFile(FileInfo* pFileInfo);
+	void				CleanupTempDir(DownloadQueue* pDownloadQueue);
+};
+
+#endif

DownloadInfo.cpp

@@ -0,0 +1,911 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This 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 <cctype>
+#include <cstdio>
+#include <map>
+#include <sys/stat.h>
+
+#include "nzbget.h"
+#include "DownloadInfo.h"
+#include "Options.h"
+#include "Log.h"
+#include "Util.h"
+
+extern Options* g_pOptions;
+
+int FileInfo::m_iIDGen = 0;
+int NZBInfo::m_iIDGen = 0;
+int PostInfo::m_iIDGen = 0;
+int UrlInfo::m_iIDGen = 0;
+int HistoryInfo::m_iIDGen = 0;
+
+NZBParameter::NZBParameter(const char* szName)
+{
+	m_szName = strdup(szName);
+	m_szValue = NULL;
+}
+
+NZBParameter::~NZBParameter()
+{
+	if (m_szName)
+	{
+		free(m_szName);
+	}
+	if (m_szValue)
+	{
+		free(m_szValue);
+	}
+}
+
+void NZBParameter::SetValue(const char* szValue)
+{
+	if (m_szValue)
+	{
+		free(m_szValue);
+	}
+	m_szValue = strdup(szValue);
+}
+
+
+void NZBParameterList::SetParameter(const char* szName, const char* szValue)
+{
+	NZBParameter* pParameter = NULL;
+	bool bDelete = !szValue || !*szValue;
+
+	for (iterator it = begin(); it != end(); it++)
+	{
+		NZBParameter* pLookupParameter = *it;
+		if (!strcmp(pLookupParameter->GetName(), szName))
+		{
+			if (bDelete)
+			{
+				delete pLookupParameter;
+				erase(it);
+				return;
+			}
+			pParameter = pLookupParameter;
+			break;
+		}
+	}
+
+	if (bDelete)
+	{
+		return;
+	}
+
+	if (!pParameter)
+	{
+		pParameter = new NZBParameter(szName);
+		push_back(pParameter);
+	}
+
+	pParameter->SetValue(szValue);
+}
+
+
+NZBInfo::NZBInfo()
+{
+	debug("Creating NZBInfo");
+
+	m_szFilename = NULL;
+	m_szDestDir = NULL;
+	m_szCategory = strdup("");
+	m_szName = NULL;
+	m_iFileCount = 0;
+	m_iParkedFileCount = 0;
+	m_lSize = 0;
+	m_iRefCount = 0;
+	m_bPostProcess = false;
+	m_eParStatus = prNone;
+	m_eScriptStatus = srNone;
+	m_bDeleted = false;
+	m_bParCleanup = false;
+	m_bCleanupDisk = false;
+	m_szQueuedFilename = strdup("");
+	m_Owner = NULL;
+	m_Messages.clear();
+	m_iIDMessageGen = 0;
+	m_iIDGen++;
+	m_iID = m_iIDGen;
+}
+
+NZBInfo::~NZBInfo()
+{
+	debug("Destroying NZBInfo");
+
+	if (m_szFilename)
+	{
+		free(m_szFilename);
+	}
+	if (m_szDestDir)
+	{
+		free(m_szDestDir);
+	}
+	if (m_szCategory)
+	{
+		free(m_szCategory);
+	}
+	if (m_szName)
+	{
+		free(m_szName);
+	}
+	if (m_szQueuedFilename)
+	{
+		free(m_szQueuedFilename);
+	}
+
+	ClearCompletedFiles();
+
+	for (NZBParameterList::iterator it = m_ppParameters.begin(); it != m_ppParameters.end(); it++)
+	{
+		delete *it;
+	}
+	m_ppParameters.clear();
+
+	for (Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
+	{
+		delete *it;
+	}
+	m_Messages.clear();
+
+	if (m_Owner)
+	{
+		m_Owner->Remove(this);
+	}
+}
+
+void NZBInfo::AddReference()
+{
+	m_iRefCount++;
+}
+
+void NZBInfo::Release()
+{
+	m_iRefCount--;
+	if (m_iRefCount <= 0)
+	{
+		delete this;
+	}
+}
+
+void NZBInfo::ClearCompletedFiles()
+{
+	for (Files::iterator it = m_completedFiles.begin(); it != m_completedFiles.end(); it++)
+	{
+		free(*it);
+	}
+	m_completedFiles.clear();
+}
+
+void NZBInfo::SetDestDir(const char* szDestDir)
+{
+	if (m_szDestDir)
+	{
+		free(m_szDestDir);
+	}
+	m_szDestDir = strdup(szDestDir);
+}
+
+void NZBInfo::SetFilename(const char * szFilename)
+{
+	if (m_szFilename)
+	{
+		free(m_szFilename);
+	}
+	m_szFilename = strdup(szFilename);
+
+	if (!m_szName)
+	{
+		char szNZBNicename[1024];
+		MakeNiceNZBName(m_szFilename, szNZBNicename, sizeof(szNZBNicename), true);
+		szNZBNicename[1024-1] = '\0';
+		SetName(szNZBNicename);
+	}
+}
+
+void NZBInfo::SetName(const char* szName)
+{
+	if (m_szName)
+	{
+		free(m_szName);
+	}
+	m_szName = szName ? strdup(szName) : NULL;
+}
+
+void NZBInfo::SetCategory(const char* szCategory)
+{
+	if (m_szCategory)
+	{
+		free(m_szCategory);
+	}
+	m_szCategory = strdup(szCategory);
+}
+
+void NZBInfo::SetQueuedFilename(const char * szQueuedFilename)
+{
+	if (m_szQueuedFilename)
+	{
+		free(m_szQueuedFilename);
+	}
+	m_szQueuedFilename = strdup(szQueuedFilename);
+}
+
+void NZBInfo::MakeNiceNZBName(const char * szNZBFilename, char * szBuffer, int iSize, bool bRemoveExt)
+{
+	char postname[1024];
+	const char* szBaseName = Util::BaseFileName(szNZBFilename);
+
+	strncpy(postname, szBaseName, 1024);
+	postname[1024-1] = '\0';
+
+	if (bRemoveExt)
+	{
+		// wipe out ".nzb"
+		char* p = strrchr(postname, '.');
+		if (p && !strcasecmp(p, ".nzb")) *p = '\0';
+	}
+
+	Util::MakeValidFilename(postname, '_', false);
+
+	strncpy(szBuffer, postname, iSize);
+	szBuffer[iSize-1] = '\0';
+}
+
+void NZBInfo::BuildDestDirName()
+{
+	char szBuffer[1024];
+	char szCategory[1024];
+	bool bHasCategory = m_szCategory && m_szCategory[0] != '\0';
+	if (g_pOptions->GetAppendCategoryDir() && bHasCategory)
+	{
+		strncpy(szCategory, m_szCategory, 1024);
+		szCategory[1024 - 1] = '\0';
+		Util::MakeValidFilename(szCategory, '_', true);
+	}
+
+	if (g_pOptions->GetAppendNZBDir())
+	{
+		if (g_pOptions->GetAppendCategoryDir() && bHasCategory)
+		{
+			snprintf(szBuffer, 1024, "%s%s%c%s", g_pOptions->GetDestDir(), szCategory, PATH_SEPARATOR, GetName());
+		}
+		else
+		{
+			snprintf(szBuffer, 1024, "%s%s", g_pOptions->GetDestDir(), GetName());
+		}
+		szBuffer[1024-1] = '\0';
+	}
+	else
+	{
+		if (g_pOptions->GetAppendCategoryDir() && bHasCategory)
+		{
+			snprintf(szBuffer, 1024, "%s%s", g_pOptions->GetDestDir(), szCategory);
+		}
+		else
+		{
+			strncpy(szBuffer, g_pOptions->GetDestDir(), 1024);
+		}
+		szBuffer[1024-1] = '\0'; // trim the last slash, always returned by GetDestDir()
+	}
+
+	SetDestDir(szBuffer);
+}
+
+void NZBInfo::SetParameter(const char* szName, const char* szValue)
+{
+	m_ppParameters.SetParameter(szName, szValue);
+}
+
+NZBInfo::Messages* NZBInfo::LockMessages()
+{
+	m_mutexLog.Lock();
+	return &m_Messages;
+}
+
+void NZBInfo::UnlockMessages()
+{
+	m_mutexLog.Unlock();
+}
+
+void NZBInfo::AppendMessage(Message::EKind eKind, time_t tTime, const char * szText)
+{
+	if (tTime == 0)
+	{
+		tTime = time(NULL);
+	}
+
+	Message* pMessage = new Message(++m_iIDMessageGen, eKind, tTime, szText);
+
+	m_mutexLog.Lock();
+	m_Messages.push_back(pMessage);
+	m_mutexLog.Unlock();
+}
+
+void NZBInfoList::Add(NZBInfo* pNZBInfo)
+{
+	pNZBInfo->m_Owner = this;
+	push_back(pNZBInfo);
+}
+
+void NZBInfoList::Remove(NZBInfo* pNZBInfo)
+{
+	for (iterator it = begin(); it != end(); it++)
+	{
+		NZBInfo* pNZBInfo2 = *it;
+		if (pNZBInfo2 == pNZBInfo)
+		{
+			erase(it);
+			break;
+		}
+	}
+}
+
+void NZBInfoList::ReleaseAll()
+{
+	int i = 0;
+	for (iterator it = begin(); it != end(); )
+	{
+		NZBInfo* pNZBInfo = *it;
+		bool bObjDeleted = pNZBInfo->m_iRefCount == 1;
+		pNZBInfo->Release();
+		if (bObjDeleted)
+		{
+			it = begin() + i;
+		}
+		else
+		{
+			it++;
+			i++;
+		}
+	}
+}
+
+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)
+{
+	if (m_szResultFilename)
+	{
+		free(m_szResultFilename);
+	}
+	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_tTime = 0;
+	m_bPaused = false;
+	m_bDeleted = false;
+	m_iCompleted = 0;
+	m_bOutputInitialized = false;
+	m_pNZBInfo = NULL;
+	m_iPriority = 0;
+	m_iActiveDownloads = 0;
+	m_iIDGen++;
+	m_iID = m_iIDGen;
+}
+
+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)
+{
+	if (m_pNZBInfo)
+	{
+		m_pNZBInfo->Release();
+	}
+	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, '_', false);
+}
+
+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_iPausedFileCount = 0;
+	m_lRemainingSize = 0;
+	m_lPausedSize = 0;
+	m_iRemainingParCount = 0;
+	m_tMinTime = 0;
+	m_tMaxTime = 0;
+	m_iMinPriority = 0;
+	m_iMaxPriority = 0;
+	m_iActiveDownloads = 0;
+}
+
+GroupInfo::~GroupInfo()
+{
+	if (m_pNZBInfo)
+	{
+		m_pNZBInfo->Release();
+	}
+}
+
+PostInfo::PostInfo()
+{
+	debug("Creating PostInfo");
+
+	m_pNZBInfo = NULL;
+	m_szParFilename = NULL;
+	m_szInfoName = NULL;
+	m_bWorking = false;
+	m_bDeleted = false;
+	m_bParCheck = false;
+	m_eParStatus = psNone;
+	m_eRequestParCheck = rpNone;
+	m_eScriptStatus = srNone;
+	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_iIDMessageGen = 0;
+	m_iIDGen++;
+	m_iID = m_iIDGen;
+}
+
+PostInfo::~ PostInfo()
+{
+	debug("Destroying PostInfo");
+
+	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();
+
+	if (m_pNZBInfo)
+	{
+		m_pNZBInfo->Release();
+	}
+}
+
+void PostInfo::SetNZBInfo(NZBInfo* pNZBInfo)
+{
+	if (m_pNZBInfo)
+	{
+		m_pNZBInfo->Release();
+	}
+	m_pNZBInfo = pNZBInfo;
+	m_pNZBInfo->AddReference();
+}
+
+void PostInfo::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_iIDMessageGen, 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();
+}
+
+void DownloadQueue::BuildGroups(GroupQueue* pGroupQueue)
+{
+	std::map<int, GroupInfo*> groupMap;
+
+	for (FileQueue::iterator it = GetFileQueue()->begin(); it != GetFileQueue()->end(); it++)
+    {
+        FileInfo* pFileInfo = *it;
+		GroupInfo *&pGroupInfo = groupMap[pFileInfo->GetNZBInfo()->GetID()];
+		if (!pGroupInfo)
+		{
+			pGroupInfo = new GroupInfo();
+			pGroupInfo->m_pNZBInfo = pFileInfo->GetNZBInfo();
+			pGroupInfo->m_pNZBInfo->AddReference();
+			pGroupInfo->m_iFirstID = pFileInfo->GetID();
+			pGroupInfo->m_iLastID = pFileInfo->GetID();
+			pGroupInfo->m_tMinTime = pFileInfo->GetTime();
+			pGroupInfo->m_tMaxTime = pFileInfo->GetTime();
+			pGroupInfo->m_iMinPriority = pFileInfo->GetPriority();
+			pGroupInfo->m_iMaxPriority = pFileInfo->GetPriority();
+			pGroupQueue->push_back(pGroupInfo);
+		}
+		if (pFileInfo->GetID() < pGroupInfo->GetFirstID())
+		{
+			pGroupInfo->m_iFirstID = pFileInfo->GetID();
+		}
+		if (pFileInfo->GetID() > pGroupInfo->GetLastID())
+		{
+			pGroupInfo->m_iLastID = pFileInfo->GetID();
+		}
+		if (pFileInfo->GetTime() > 0)
+		{
+			if (pFileInfo->GetTime() < pGroupInfo->GetMinTime())
+			{
+				pGroupInfo->m_tMinTime = pFileInfo->GetTime();
+			}
+			if (pFileInfo->GetTime() > pGroupInfo->GetMaxTime())
+			{
+				pGroupInfo->m_tMaxTime = pFileInfo->GetTime();
+			}
+		}
+		if (pFileInfo->GetPriority() < pGroupInfo->GetMinPriority())
+		{
+			pGroupInfo->m_iMinPriority = pFileInfo->GetPriority();
+		}
+		if (pFileInfo->GetPriority() > pGroupInfo->GetMaxPriority())
+		{
+			pGroupInfo->m_iMaxPriority = pFileInfo->GetPriority();
+		}
+
+		pGroupInfo->m_iActiveDownloads += pFileInfo->GetActiveDownloads();
+		pGroupInfo->m_iRemainingFileCount++;
+		pGroupInfo->m_lRemainingSize += pFileInfo->GetRemainingSize();
+		if (pFileInfo->GetPaused())
+		{
+			pGroupInfo->m_lPausedSize += pFileInfo->GetRemainingSize();
+			pGroupInfo->m_iPausedFileCount++;
+		}
+
+		char szLoFileName[1024];
+		strncpy(szLoFileName, pFileInfo->GetFilename(), 1024);
+		szLoFileName[1024-1] = '\0';
+		for (char* p = szLoFileName; *p; p++) *p = tolower(*p); // convert string to lowercase
+		if (strstr(szLoFileName, ".par2"))
+		{
+			pGroupInfo->m_iRemainingParCount++;
+		}
+	}
+}
+
+
+UrlInfo::UrlInfo()
+{
+	//debug("Creating ArticleInfo");
+	m_szURL = NULL;
+	m_szNZBFilename = strdup("");
+	m_szCategory = strdup("");
+	m_iPriority = 0;
+	m_bAddTop = false;
+	m_bAddPaused = false;
+	m_eStatus = aiUndefined;
+	m_iIDGen++;
+	m_iID = m_iIDGen;
+}
+
+UrlInfo::~ UrlInfo()
+{
+	if (m_szURL)
+	{
+		free(m_szURL);
+	}
+	if (m_szNZBFilename)
+	{
+		free(m_szNZBFilename);
+	}
+	if (m_szCategory)
+	{
+		free(m_szCategory);
+	}
+}
+
+void UrlInfo::SetURL(const char* szURL)
+{
+	if (m_szURL)
+	{
+		free(m_szURL);
+	}
+	m_szURL = strdup(szURL);
+}
+
+void UrlInfo::SetID(int s)
+{
+	m_iID = s;
+	if (m_iIDGen < m_iID)
+	{
+		m_iIDGen = m_iID;
+	}
+}
+
+void UrlInfo::SetNZBFilename(const char* szNZBFilename)
+{
+	if (m_szNZBFilename)
+	{
+		free(m_szNZBFilename);
+	}
+	m_szNZBFilename = strdup(szNZBFilename);
+}
+
+void UrlInfo::SetCategory(const char* szCategory)
+{
+	if (m_szCategory)
+	{
+		free(m_szCategory);
+	}
+	m_szCategory = strdup(szCategory);
+}
+
+void UrlInfo::GetName(char* szBuffer, int iSize)
+{
+	MakeNiceName(m_szURL, m_szNZBFilename, szBuffer, iSize);
+}
+
+void UrlInfo::MakeNiceName(const char* szURL, const char* szNZBFilename, char* szBuffer, int iSize)
+{
+	URL url(szURL);
+
+	if (strlen(szNZBFilename) > 0)
+	{
+		char szNZBNicename[1024];
+		NZBInfo::MakeNiceNZBName(szNZBFilename, szNZBNicename, sizeof(szNZBNicename), true);
+		snprintf(szBuffer, iSize, "%s @ %s", szNZBNicename, url.GetHost());
+	}
+	else
+	{
+		snprintf(szBuffer, iSize, "%s%s", url.GetHost(), url.GetResource());
+	}
+
+	szBuffer[iSize-1] = '\0';
+}
+
+
+HistoryInfo::HistoryInfo(NZBInfo* pNZBInfo)
+{
+	m_eKind = hkNZBInfo;
+	m_pInfo = pNZBInfo;
+	pNZBInfo->AddReference();
+	m_tTime = 0;
+	m_iIDGen++;
+	m_iID = m_iIDGen;
+}
+
+HistoryInfo::HistoryInfo(UrlInfo* pUrlInfo)
+{
+	m_eKind = hkUrlInfo;
+	m_pInfo = pUrlInfo;
+	m_tTime = 0;
+	m_iIDGen++;
+	m_iID = m_iIDGen;
+}
+
+HistoryInfo::~HistoryInfo()
+{
+	if (m_eKind == hkNZBInfo && m_pInfo)
+	{
+		((NZBInfo*)m_pInfo)->Release();
+	}
+	else if (m_eKind == hkUrlInfo && m_pInfo)
+	{
+		delete (UrlInfo*)m_pInfo;
+	}
+}
+
+void HistoryInfo::SetID(int s)
+{
+	m_iID = s;
+	if (m_iIDGen < m_iID)
+	{
+		m_iIDGen = m_iID;
+	}
+}
+
+void HistoryInfo::GetName(char* szBuffer, int iSize)
+{
+	if (m_eKind == hkNZBInfo)
+	{
+		strncpy(szBuffer, GetNZBInfo()->GetName(), iSize);
+		szBuffer[iSize-1] = '\0';
+	}
+	else if (m_eKind == hkUrlInfo)
+	{
+		GetUrlInfo()->GetName(szBuffer, iSize);
+	}
+	else
+	{
+		strncpy(szBuffer, "<unknown>", iSize);
+	}
+}

DownloadInfo.h

@@ -0,0 +1,536 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This 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 "Log.h"
+#include "Thread.h"
+
+class NZBInfo;
+class DownloadQueue;
+
+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;
+	time_t				m_tTime;
+	bool				m_bPaused;
+	bool				m_bDeleted;
+	bool				m_bFilenameConfirmed;
+	int					m_iCompleted;
+	bool				m_bOutputInitialized;
+	Mutex				m_mutexOutputFile;
+	int					m_iPriority;
+	int					m_iActiveDownloads;
+
+	static int			m_iIDGen;
+
+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; }
+	time_t				GetTime() { return m_tTime; }
+	void				SetTime(time_t tTime) { m_tTime = tTime; }
+	bool				GetPaused() { return m_bPaused; }
+	void				SetPaused(bool Paused) { m_bPaused = Paused; }
+	bool				GetDeleted() { return m_bDeleted; }
+	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);
+	int					GetPriority() { return m_iPriority; }
+	void				SetPriority(int iPriority) { m_iPriority = iPriority; }
+	int					GetActiveDownloads() { return m_iActiveDownloads; }
+	void				SetActiveDownloads(int iActiveDownloads) { m_iActiveDownloads = iActiveDownloads; }
+};
+                              
+typedef std::deque<FileInfo*> FileQueue;
+
+class GroupInfo
+{
+private:
+	NZBInfo*			m_pNZBInfo;
+	int					m_iFirstID;
+	int					m_iLastID;
+	int		 			m_iRemainingFileCount;
+	int					m_iPausedFileCount;
+	long long 			m_lRemainingSize;
+	long long 			m_lPausedSize;
+	int					m_iRemainingParCount;
+	time_t				m_tMinTime;
+	time_t				m_tMaxTime;
+	int					m_iMinPriority;
+	int					m_iMaxPriority;
+	int					m_iActiveDownloads;
+
+	friend class DownloadQueue;
+
+public:
+						GroupInfo();
+						~GroupInfo();
+	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
+	int					GetFirstID() { return m_iFirstID; }
+	int					GetLastID() { return m_iLastID; }
+	long long 			GetRemainingSize() { return m_lRemainingSize; }
+	long long 			GetPausedSize() { return m_lPausedSize; }
+	int					GetRemainingFileCount() { return m_iRemainingFileCount; }
+	int					GetPausedFileCount() { return m_iPausedFileCount; }
+	int					GetRemainingParCount() { return m_iRemainingParCount; }
+	time_t				GetMinTime() { return m_tMinTime; }
+	time_t				GetMaxTime() { return m_tMaxTime; }
+	int					GetMinPriority() { return m_iMinPriority; }
+	int					GetMaxPriority() { return m_iMaxPriority; }
+	int					GetActiveDownloads() { return m_iActiveDownloads; }
+};
+
+typedef std::deque<GroupInfo*> GroupQueue;
+
+class NZBParameter
+{
+private:
+	char* 				m_szName;
+	char* 				m_szValue;
+
+	void				SetValue(const char* szValue);
+
+	friend class NZBParameterList;
+
+public:
+						NZBParameter(const char* szName);
+						~NZBParameter();
+	const char*			GetName() { return m_szName; }
+	const char*			GetValue() { return m_szValue; }
+};
+
+typedef std::deque<NZBParameter*> NZBParameterListBase;
+
+class NZBParameterList : public NZBParameterListBase
+{
+public:
+	void				SetParameter(const char* szName, const char* szValue);
+};
+
+class NZBInfoList;
+
+class NZBInfo
+{
+public:
+	enum EParStatus
+	{
+		prNone,
+		prFailure,
+		prRepairPossible,
+		prSuccess
+	};
+
+	enum EScriptStatus
+	{
+		srNone,
+		srUnknown,
+		srFailure,
+		srSuccess
+	};
+
+	typedef std::vector<char*>			Files;
+	typedef std::deque<Message*>		Messages;
+
+private:
+	int					m_iID;
+	int					m_iRefCount;
+	char* 				m_szFilename;
+	char*				m_szName;
+	char* 				m_szDestDir;
+	char* 				m_szCategory;
+	int		 			m_iFileCount;
+	int		 			m_iParkedFileCount;
+	long long 			m_lSize;
+	Files				m_completedFiles;
+	bool				m_bPostProcess;
+	EParStatus			m_eParStatus;
+	EScriptStatus		m_eScriptStatus;
+	char*				m_szQueuedFilename;
+	bool				m_bDeleted;
+	bool				m_bParCleanup;
+	bool				m_bCleanupDisk;
+	NZBInfoList*		m_Owner;
+	NZBParameterList	m_ppParameters;
+	Mutex				m_mutexLog;
+	Messages			m_Messages;
+	int					m_iIDMessageGen;
+
+	static int			m_iIDGen;
+
+	friend class NZBInfoList;
+
+public:
+						NZBInfo();
+						~NZBInfo();
+	void				AddReference();
+	void				Release();
+	int					GetID() { return m_iID; }
+	const char*			GetFilename() { return m_szFilename; }
+	void				SetFilename(const char* szFilename);
+	static void			MakeNiceNZBName(const char* szNZBFilename, char* szBuffer, int iSize, bool bRemoveExt);
+	const char*			GetDestDir() { return m_szDestDir; }   // needs locking (for shared objects)
+	void				SetDestDir(const char* szDestDir);     // needs locking (for shared objects)
+	const char*			GetCategory() { return m_szCategory; } // needs locking (for shared objects)
+	void				SetCategory(const char* szCategory);   // needs locking (for shared objects)
+	const char*			GetName() { return m_szName; } 	   // needs locking (for shared objects)
+	void				SetName(const char* szName);	   // needs locking (for shared objects)
+	long long 			GetSize() { return m_lSize; }
+	void 				SetSize(long long lSize) { m_lSize = lSize; }
+	int					GetFileCount() { return m_iFileCount; }
+	void 				SetFileCount(int iFileCount) { m_iFileCount = iFileCount; }
+	int					GetParkedFileCount() { return m_iParkedFileCount; }
+	void 				SetParkedFileCount(int iParkedFileCount) { m_iParkedFileCount = iParkedFileCount; }
+	void				BuildDestDirName();
+	Files*				GetCompletedFiles() { return &m_completedFiles; }		// needs locking (for shared objects)
+	void				ClearCompletedFiles();
+	bool				GetPostProcess() { return m_bPostProcess; }
+	void				SetPostProcess(bool bPostProcess) { m_bPostProcess = bPostProcess; }
+	EParStatus			GetParStatus() { return m_eParStatus; }
+	void				SetParStatus(EParStatus eParStatus) { m_eParStatus = eParStatus; }
+	EScriptStatus		GetScriptStatus() { return m_eScriptStatus; }
+	void				SetScriptStatus(EScriptStatus eScriptStatus) { m_eScriptStatus = eScriptStatus; }
+	const char*			GetQueuedFilename() { return m_szQueuedFilename; }
+	void				SetQueuedFilename(const char* szQueuedFilename);
+	bool				GetDeleted() { return m_bDeleted; }
+	void				SetDeleted(bool bDeleted) { m_bDeleted = bDeleted; }
+	bool				GetParCleanup() { return m_bParCleanup; }
+	void				SetParCleanup(bool bParCleanup) { m_bParCleanup = bParCleanup; }
+	bool				GetCleanupDisk() { return m_bCleanupDisk; }
+	void				SetCleanupDisk(bool bCleanupDisk) { m_bCleanupDisk = bCleanupDisk; }
+	NZBParameterList*	GetParameters() { return &m_ppParameters; }				// needs locking (for shared objects)
+	void				SetParameter(const char* szName, const char* szValue);	// needs locking (for shared objects)
+	void				AppendMessage(Message::EKind eKind, time_t tTime, const char* szText);
+	Messages*			LockMessages();
+	void				UnlockMessages();
+};
+
+typedef std::deque<NZBInfo*> NZBInfoListBase;
+
+class NZBInfoList : public NZBInfoListBase
+{
+public:
+	void				Add(NZBInfo* pNZBInfo);
+	void				Remove(NZBInfo* pNZBInfo);
+	void				ReleaseAll();
+};
+
+class PostInfo
+{
+public:
+	enum EStage
+	{
+		ptQueued,
+		ptLoadingPars,
+		ptVerifyingSources,
+		ptRepairing,
+		ptVerifyingRepaired,
+		ptExecutingScript,
+		ptFinished
+	};
+
+	enum EParStatus
+	{
+		psNone,
+		psFailure,
+		psSuccess,
+		psRepairPossible
+	};
+
+	enum ERequestParCheck
+	{
+		rpNone,
+		rpCurrent,
+		rpAll
+	};
+
+	enum EScriptStatus
+	{
+		srNone,
+		srUnknown,
+		srFailure,
+		srSuccess
+	};
+
+	typedef std::deque<Message*>	Messages;
+
+private:
+	int					m_iID;
+	NZBInfo*			m_pNZBInfo;
+	char*				m_szParFilename;
+	char*				m_szInfoName;
+	bool				m_bWorking;
+	bool				m_bDeleted;
+	bool				m_bParCheck;
+	EParStatus			m_eParStatus;
+	EScriptStatus		m_eScriptStatus;
+	ERequestParCheck	m_eRequestParCheck;
+	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;
+	int					m_iIDMessageGen;
+
+	static int			m_iIDGen;
+
+public:
+						PostInfo();
+						~PostInfo();
+	int					GetID() { return m_iID; }
+	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
+	void				SetNZBInfo(NZBInfo* pNZBInfo);
+	const char*			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				GetDeleted() { return m_bDeleted; }
+	void				SetDeleted(bool bDeleted) { m_bDeleted = bDeleted; }
+	bool				GetParCheck() { return m_bParCheck; }
+	void				SetParCheck(bool bParCheck) { m_bParCheck = bParCheck; }
+	EParStatus			GetParStatus() { return m_eParStatus; }
+	void				SetParStatus(EParStatus eParStatus) { m_eParStatus = eParStatus; }
+	ERequestParCheck	GetRequestParCheck() { return m_eRequestParCheck; }
+	void				SetRequestParCheck(ERequestParCheck eRequestParCheck) { m_eRequestParCheck = eRequestParCheck; }
+	EScriptStatus		GetScriptStatus() { return m_eScriptStatus; }
+	void				SetScriptStatus(EScriptStatus eScriptStatus) { m_eScriptStatus = eScriptStatus; }
+	void				AppendMessage(Message::EKind eKind, const char* szText);
+	Thread*				GetScriptThread() { return m_pScriptThread; }
+	void				SetScriptThread(Thread* pScriptThread) { m_pScriptThread = pScriptThread; }
+	Messages*			LockMessages();
+	void				UnlockMessages();
+};
+
+typedef std::deque<PostInfo*> PostQueue;
+
+typedef std::vector<int> IDList;
+
+typedef std::vector<char*> NameList;
+
+class UrlInfo
+{
+public:
+	enum EStatus
+	{
+		aiUndefined,
+		aiRunning,
+		aiFinished,
+		aiFailed,
+		aiRetry
+	};
+
+private:
+	int					m_iID;
+	char*				m_szURL;
+	char*				m_szNZBFilename;
+	char* 				m_szCategory;
+	int					m_iPriority;
+	bool				m_bAddTop;
+	bool				m_bAddPaused;
+	EStatus				m_eStatus;
+
+	static int			m_iIDGen;
+
+public:
+						UrlInfo();
+						~UrlInfo();
+	int					GetID() { return m_iID; }
+	void				SetID(int s);
+	const char*			GetURL() { return m_szURL; }			// needs locking (for shared objects)
+	void				SetURL(const char* szURL);				// needs locking (for shared objects)
+	const char*			GetNZBFilename() { return m_szNZBFilename; }		// needs locking (for shared objects)
+	void				SetNZBFilename(const char* szNZBFilename);			// needs locking (for shared objects)
+	const char*			GetCategory() { return m_szCategory; }	// needs locking (for shared objects)
+	void				SetCategory(const char* szCategory);	// needs locking (for shared objects)
+	int					GetPriority() { return m_iPriority; }
+	void				SetPriority(int iPriority) { m_iPriority = iPriority; }
+	bool				GetAddTop() { return m_bAddTop; }
+	void				SetAddTop(bool bAddTop) { m_bAddTop = bAddTop; }
+	bool				GetAddPaused() { return m_bAddPaused; }
+	void				SetAddPaused(bool bAddPaused) { m_bAddPaused = bAddPaused; }
+	void				GetName(char* szBuffer, int iSize);		// needs locking (for shared objects)
+	static void			MakeNiceName(const char* szURL, const char* szNZBFilename, char* szBuffer, int iSize);
+	EStatus				GetStatus() { return m_eStatus; }
+	void				SetStatus(EStatus Status) { m_eStatus = Status; }
+};
+
+typedef std::deque<UrlInfo*> UrlQueue;
+
+class HistoryInfo
+{
+public:
+	enum EKind
+	{
+		hkUnknown,
+		hkNZBInfo,
+		hkUrlInfo
+	};
+
+private:
+	int					m_iID;
+	EKind				m_eKind;
+	void*				m_pInfo;
+	time_t				m_tTime;
+
+	static int			m_iIDGen;
+
+public:
+						HistoryInfo(NZBInfo* pNZBInfo);
+						HistoryInfo(UrlInfo* pUrlInfo);
+						~HistoryInfo();
+	int					GetID() { return m_iID; }
+	void				SetID(int s);
+	EKind				GetKind() { return m_eKind; }
+	NZBInfo*			GetNZBInfo() { return (NZBInfo*)m_pInfo; }
+	UrlInfo*			GetUrlInfo() { return (UrlInfo*)m_pInfo; }
+	void				DiscardUrlInfo() { m_pInfo = NULL; }
+	time_t				GetTime() { return m_tTime; }
+	void				SetTime(time_t tTime) { m_tTime = tTime; }
+	void				GetName(char* szBuffer, int iSize);		// needs locking (for shared objects)
+};
+
+typedef std::deque<HistoryInfo*> HistoryList;
+
+class DownloadQueue
+{
+protected:
+	NZBInfoList			m_NZBInfoList;
+	FileQueue			m_FileQueue;
+	PostQueue			m_PostQueue;
+	HistoryList			m_HistoryList;
+	FileQueue			m_ParkedFiles;
+	UrlQueue			m_UrlQueue;
+
+public:
+	NZBInfoList*		GetNZBInfoList() { return &m_NZBInfoList; }
+	FileQueue*			GetFileQueue() { return &m_FileQueue; }
+	PostQueue*			GetPostQueue() { return &m_PostQueue; }
+	HistoryList*		GetHistoryList() { return &m_HistoryList; }
+	FileQueue*			GetParkedFiles() { return &m_ParkedFiles; }
+	UrlQueue*			GetUrlQueue() { return &m_UrlQueue; }
+	void				BuildGroups(GroupQueue* pGroupQueue);
+};
+
+class DownloadQueueHolder
+{
+public:
+	virtual					~DownloadQueueHolder() {};
+	virtual DownloadQueue*	LockQueue() = 0;
+	virtual void			UnlockQueue() = 0;
+};
+
+#endif

Frontend.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,7 +34,8 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+#include <cstdio>
+#include <fstream>
 #ifndef WIN32
 #include <unistd.h>
 #include <arpa/inet.h>
@@ -47,9 +48,12 @@
 #include "Log.h"
 #include "Connection.h"
 #include "MessageBase.h"
+#include "QueueCoordinator.h"
 #include "RemoteClient.h"
 #include "Util.h"
-#include "StatMeter.h"
+
+extern QueueCoordinator* g_pQueueCoordinator;
+extern Options* g_pOptions;
 
 Frontend::Frontend()
 {
@@ -59,10 +63,11 @@ Frontend::Frontend()
 	m_iNeededLogEntries = 0;
 	m_bSummary = false;
 	m_bFileList = false;
-	m_iCurrentDownloadSpeed = 0;
+	m_fCurrentDownloadSpeed = 0;
 	m_lRemainingSize = 0;
 	m_bPauseDownload = false;
-	m_iDownloadLimit = 0;
+	m_bPauseDownload2 = false;
+	m_fDownloadLimit = 0;
 	m_iThreadCount = 0;
 	m_iPostJobCount = 0;
 	m_iUpTimeSec = 0;
@@ -82,8 +87,7 @@ bool Frontend::PrepareData()
 		}
 		if (!RequestMessages() || ((m_bSummary || m_bFileList) && !RequestFileList()))
 		{
-			const char* szControlIP = !strcmp(g_pOptions->GetControlIP(), "0.0.0.0") ? "127.0.0.1" : g_pOptions->GetControlIP();
-			printf("\nUnable to send request to nzbget-server at %s (port %i)    \n", szControlIP, g_pOptions->GetControlPort());
+			printf("\nUnable to send request to nzbget-server at %s (port %i)    \n", g_pOptions->GetControlIP(), g_pOptions->GetControlPort());
 			Stop();
 			return false;
 		}
@@ -92,22 +96,16 @@ bool Frontend::PrepareData()
 	{
 		if (m_bSummary)
 		{
-			m_iCurrentDownloadSpeed = g_pStatMeter->CalcCurrentDownloadSpeed();
+			m_fCurrentDownloadSpeed = g_pQueueCoordinator->CalcCurrentDownloadSpeed();
+			m_lRemainingSize = g_pQueueCoordinator->CalcRemainingSize();
 			m_bPauseDownload = g_pOptions->GetPauseDownload();
-			m_iDownloadLimit = g_pOptions->GetDownloadRate();
+			m_bPauseDownload2 = g_pOptions->GetPauseDownload2();
+			m_fDownloadLimit = g_pOptions->GetDownloadRate();
 			m_iThreadCount = Thread::GetThreadCount();
-			g_pStatMeter->CalcTotalStat(&m_iUpTimeSec, &m_iDnTimeSec, &m_iAllBytes, &m_bStandBy);
-
-			DownloadQueue *pDownloadQueue = DownloadQueue::Lock();
-			m_iPostJobCount = 0;
-			for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
-			{
-				NZBInfo* pNZBInfo = *it;
-				m_iPostJobCount += pNZBInfo->GetPostInfo() ? 1 : 0;
-			}
-			pDownloadQueue->CalcRemainingSize(&m_lRemainingSize, NULL);
-			DownloadQueue::Unlock();
-
+			PostQueue* pPostQueue = g_pQueueCoordinator->LockQueue()->GetPostQueue();
+			m_iPostJobCount = pPostQueue->size();
+			g_pQueueCoordinator->UnlockQueue();
+			g_pQueueCoordinator->CalcStat(&m_iUpTimeSec, &m_iDnTimeSec, &m_iAllBytes, &m_bStandBy);
 		}
 	}
 	return true;
@@ -117,15 +115,21 @@ void Frontend::FreeData()
 {
 	if (IsRemoteMode())
 	{
-		m_RemoteMessages.Clear();
+		for (Log::Messages::iterator it = m_RemoteMessages.begin(); it != m_RemoteMessages.end(); it++)
+		{
+			delete *it;
+		}
+		m_RemoteMessages.clear();
 
-		DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-		pDownloadQueue->GetQueue()->Clear();
-		DownloadQueue::Unlock();
+		for (FileQueue::iterator it = m_RemoteQueue.GetFileQueue()->begin(); it != m_RemoteQueue.GetFileQueue()->end(); it++)
+		{
+			delete *it;
+		}
+		m_RemoteQueue.GetFileQueue()->clear();
 	}
 }
 
-MessageList* Frontend::LockMessages()
+Log::Messages * Frontend::LockMessages()
 {
 	if (IsRemoteMode())
 	{
@@ -147,12 +151,22 @@ void Frontend::UnlockMessages()
 
 DownloadQueue* Frontend::LockQueue()
 {
-	return DownloadQueue::Lock();
+	if (IsRemoteMode())
+	{
+		return &m_RemoteQueue;
+	}
+	else
+	{
+		return g_pQueueCoordinator->LockQueue();
+	}
 }
 
 void Frontend::UnlockQueue()
 {
-	DownloadQueue::Unlock();
+	if (!IsRemoteMode())
+	{
+		g_pQueueCoordinator->UnlockQueue();
+	}
 }
 
 bool Frontend::IsRemoteMode()
@@ -160,43 +174,58 @@ bool Frontend::IsRemoteMode()
 	return g_pOptions->GetRemoteClientMode();
 }
 
-void Frontend::ServerPauseUnpause(bool bPause)
+void Frontend::ServerPauseUnpause(bool bPause, bool bSecondRegister)
 {
 	if (IsRemoteMode())
 	{
-		RequestPauseUnpause(bPause);
+		RequestPauseUnpause(bPause, bSecondRegister);
 	}
 	else
 	{
-		g_pOptions->SetResumeTime(0);
-		g_pOptions->SetPauseDownload(bPause);
+		if (bSecondRegister)
+		{
+			g_pOptions->SetPauseDownload2(bPause);
+		}
+		else
+		{
+			g_pOptions->SetPauseDownload(bPause);
+		}
 	}
 }
 
-void Frontend::ServerSetDownloadRate(int iRate)
+void Frontend::ServerSetDownloadRate(float fRate)
 {
 	if (IsRemoteMode())
 	{
-		RequestSetDownloadRate(iRate);
+		RequestSetDownloadRate(fRate);
 	}
 	else
 	{
-		g_pOptions->SetDownloadRate(iRate);
+		g_pOptions->SetDownloadRate(fRate);
 	}
 }
 
-bool Frontend::ServerEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iID)
+void Frontend::ServerDumpDebug()
 {
 	if (IsRemoteMode())
 	{
-		return RequestEditQueue(eAction, iOffset, iID);
+		RequestDumpDebug();
 	}
 	else
 	{
-		DownloadQueue* pDownloadQueue = LockQueue();
-		bool bOK = pDownloadQueue->EditEntry(iID, eAction, iOffset, NULL);
-		UnlockQueue();
-		return bOK;
+		g_pQueueCoordinator->LogDebugInfo();
+	}
+}
+
+bool Frontend::ServerEditQueue(QueueEditor::EEditAction eAction, int iOffset, int iID)
+{
+	if (IsRemoteMode())
+	{
+		return RequestEditQueue((eRemoteEditAction)eAction, iOffset, iID);
+	}
+	else
+	{
+		return g_pQueueCoordinator->GetQueueEditor()->EditEntry(iID, true, eAction, iOffset, NULL);
 	}
 	return false;
 }
@@ -206,18 +235,13 @@ void Frontend::InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int
 	pMessageBase->m_iSignature	= htonl(NZBMESSAGE_SIGNATURE);
 	pMessageBase->m_iType = htonl(iRequest);
 	pMessageBase->m_iStructSize = htonl(iSize);
-
-	strncpy(pMessageBase->m_szUsername, g_pOptions->GetControlUsername(), NZBREQUESTPASSWORDSIZE - 1);
-	pMessageBase->m_szUsername[NZBREQUESTPASSWORDSIZE - 1] = '\0';
-
 	strncpy(pMessageBase->m_szPassword, g_pOptions->GetControlPassword(), NZBREQUESTPASSWORDSIZE);
 	pMessageBase->m_szPassword[NZBREQUESTPASSWORDSIZE - 1] = '\0';
 }
 
 bool Frontend::RequestMessages()
 {
-	const char* szControlIP = !strcmp(g_pOptions->GetControlIP(), "0.0.0.0") ? "127.0.0.1" : g_pOptions->GetControlIP();
-	Connection connection(szControlIP, g_pOptions->GetControlPort(), false);
+	Connection connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
 
 	bool OK = connection.Connect();
 	if (!OK)
@@ -237,15 +261,15 @@ bool Frontend::RequestMessages()
 		LogRequest.m_iIDFrom = 0;
 	}
 
-	if (!connection.Send((char*)(&LogRequest), sizeof(LogRequest)))
+	if (connection.Send((char*)(&LogRequest), sizeof(LogRequest)) < 0)
 	{
 		return false;
 	}
 
 	// Now listen for the returned log
 	SNZBLogResponse LogResponse;
-	bool bRead = connection.Recv((char*) &LogResponse, sizeof(LogResponse));
-	if (!bRead || 
+	int iResponseLen = connection.Recv((char*) &LogResponse, sizeof(LogResponse));
+	if (iResponseLen != sizeof(LogResponse) || 
 		(int)ntohl(LogResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
 		ntohl(LogResponse.m_MessageBase.m_iStructSize) != sizeof(LogResponse))
 	{
@@ -256,7 +280,7 @@ bool Frontend::RequestMessages()
 	if (ntohl(LogResponse.m_iTrailingDataLength) > 0)
 	{
 		pBuf = (char*)malloc(ntohl(LogResponse.m_iTrailingDataLength));
-		if (!connection.Recv(pBuf, ntohl(LogResponse.m_iTrailingDataLength)))
+		if (!connection.RecvAll(pBuf, ntohl(LogResponse.m_iTrailingDataLength)))
 		{
 			free(pBuf);
 			return false;
@@ -288,8 +312,7 @@ bool Frontend::RequestMessages()
 
 bool Frontend::RequestFileList()
 {
-	const char* szControlIP = !strcmp(g_pOptions->GetControlIP(), "0.0.0.0") ? "127.0.0.1" : g_pOptions->GetControlIP();
-	Connection connection(szControlIP, g_pOptions->GetControlPort(), false);
+	Connection connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
 
 	bool OK = connection.Connect();
 	if (!OK)
@@ -302,15 +325,15 @@ bool Frontend::RequestFileList()
 	ListRequest.m_bFileList = htonl(m_bFileList);
 	ListRequest.m_bServerState = htonl(m_bSummary);
 
-	if (!connection.Send((char*)(&ListRequest), sizeof(ListRequest)))
+	if (connection.Send((char*)(&ListRequest), sizeof(ListRequest)) < 0)
 	{
 		return false;
 	}
 
 	// Now listen for the returned list
 	SNZBListResponse ListResponse;
-	bool bRead = connection.Recv((char*) &ListResponse, sizeof(ListResponse));
-	if (!bRead || 
+	int iResponseLen = connection.Recv((char*) &ListResponse, sizeof(ListResponse));
+	if (iResponseLen != sizeof(ListResponse) || 
 		(int)ntohl(ListResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
 		ntohl(ListResponse.m_MessageBase.m_iStructSize) != sizeof(ListResponse))
 	{
@@ -321,7 +344,7 @@ bool Frontend::RequestFileList()
 	if (ntohl(ListResponse.m_iTrailingDataLength) > 0)
 	{
 		pBuf = (char*)malloc(ntohl(ListResponse.m_iTrailingDataLength));
-		if (!connection.Recv(pBuf, ntohl(ListResponse.m_iTrailingDataLength)))
+		if (!connection.RecvAll(pBuf, ntohl(ListResponse.m_iTrailingDataLength)))
 		{
 			free(pBuf);
 			return false;
@@ -333,9 +356,10 @@ bool Frontend::RequestFileList()
 	if (m_bSummary)
 	{
 		m_bPauseDownload = ntohl(ListResponse.m_bDownloadPaused);
+		m_bPauseDownload2 = ntohl(ListResponse.m_bDownload2Paused);
 		m_lRemainingSize = Util::JoinInt64(ntohl(ListResponse.m_iRemainingSizeHi), ntohl(ListResponse.m_iRemainingSizeLo));
-		m_iCurrentDownloadSpeed = ntohl(ListResponse.m_iDownloadRate);
-		m_iDownloadLimit = ntohl(ListResponse.m_iDownloadLimit);
+		m_fCurrentDownloadSpeed = ntohl(ListResponse.m_iDownloadRate) / 1024.0f;
+		m_fDownloadLimit = ntohl(ListResponse.m_iDownloadLimit) / 1024.0f;
 		m_iThreadCount = ntohl(ListResponse.m_iThreadCount);
 		m_iPostJobCount = ntohl(ListResponse.m_iPostJobCount);
 		m_iUpTimeSec = ntohl(ListResponse.m_iUpTimeSec);
@@ -348,10 +372,7 @@ bool Frontend::RequestFileList()
 	{
 		RemoteClient client;
 		client.SetVerbose(false);
-		
-		DownloadQueue* pDownloadQueue = LockQueue();
-		client.BuildFileList(&ListResponse, pBuf, pDownloadQueue);
-		UnlockQueue();
+		client.BuildFileList(&ListResponse, pBuf, &m_RemoteQueue);
 	}
 
 	if (pBuf)
@@ -362,23 +383,30 @@ bool Frontend::RequestFileList()
 	return true;
 }
 
-bool Frontend::RequestPauseUnpause(bool bPause)
+bool Frontend::RequestPauseUnpause(bool bPause, bool bSecondRegister)
 {
 	RemoteClient client;
 	client.SetVerbose(false);
-	return client.RequestServerPauseUnpause(bPause, eRemotePauseUnpauseActionDownload);
+	return client.RequestServerPauseUnpause(bPause, bSecondRegister ? eRemotePauseUnpauseActionDownload2 : eRemotePauseUnpauseActionDownload);
 }
 
-bool Frontend::RequestSetDownloadRate(int iRate)
+bool Frontend::RequestSetDownloadRate(float fRate)
 {
 	RemoteClient client;
 	client.SetVerbose(false);
-	return client.RequestServerSetDownloadRate(iRate);
+	return client.RequestServerSetDownloadRate(fRate);
 }
 
-bool Frontend::RequestEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iID)
+bool Frontend::RequestDumpDebug()
 {
 	RemoteClient client;
 	client.SetVerbose(false);
-	return client.RequestServerEditQueue(eAction, iOffset, NULL, &iID, 1, NULL, eRemoteMatchModeID);
+	return client.RequestServerDumpDebug();
+}
+
+bool Frontend::RequestEditQueue(eRemoteEditAction iAction, int iOffset, int iID)
+{
+	RemoteClient client;
+	client.SetVerbose(false);
+	return client.RequestServerEditQueue(iAction, iOffset, NULL, &iID, 1, NULL, eRemoteMatchModeID, false);
 }

Frontend.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -36,7 +36,8 @@
 class Frontend : public Thread
 {
 private:
-	MessageList			m_RemoteMessages;
+	Log::Messages		m_RemoteMessages;
+	DownloadQueue		m_RemoteQueue;
 
 	bool				RequestMessages();
 	bool				RequestFileList();
@@ -49,10 +50,11 @@ protected:
 	int					m_iUpdateInterval;
 
 	// summary
-	int					m_iCurrentDownloadSpeed;
+	float				m_fCurrentDownloadSpeed;
 	long long 			m_lRemainingSize;
 	bool				m_bPauseDownload;
-	int					m_iDownloadLimit;
+	bool				m_bPauseDownload2;
+	float				m_fDownloadLimit;
 	int					m_iThreadCount;
 	int					m_iPostJobCount;
 	int					m_iUpTimeSec;
@@ -62,18 +64,20 @@ protected:
 
 	bool				PrepareData();
 	void				FreeData();
-	MessageList*		LockMessages();
+	Log::Messages*		LockMessages();
 	void				UnlockMessages();
 	DownloadQueue*		LockQueue();
 	void				UnlockQueue();
 	bool				IsRemoteMode();
 	void				InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int iSize);
-	void				ServerPauseUnpause(bool bPause);
-	bool				RequestPauseUnpause(bool bPause);
-	void				ServerSetDownloadRate(int iRate);
-	bool				RequestSetDownloadRate(int iRate);
-	bool 				ServerEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iEntry);
-	bool 				RequestEditQueue(DownloadQueue::EEditAction eAction, int iOffset, int iID);
+	void				ServerPauseUnpause(bool bPause, bool bSecondRegister);
+	bool				RequestPauseUnpause(bool bPause, bool bSecondRegister);
+	void				ServerSetDownloadRate(float fRate);
+	bool				RequestSetDownloadRate(float fRate);
+	void				ServerDumpDebug();
+	bool				RequestDumpDebug();
+	bool 				ServerEditQueue(QueueEditor::EEditAction eAction, int iOffset, int iEntry);
+	bool 				RequestEditQueue(eRemoteEditAction iAction, int iOffset, int iID);
 
 public:
 						Frontend();

INSTALL

@@ -0,0 +1,167 @@
+Basic Installation
+==================
+
+   These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, a file
+`config.cache' that saves the results of its tests to speed up
+reconfiguring, and a file `config.log' containing compiler output
+(useful mainly for debugging `configure').
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If at some point `config.cache'
+contains results you don't want to keep, you may remove or edit it.
+
+   The file `configure.in' is used to create `configure' by a program
+called `autoconf'.  You only need `configure.in' if you want to change
+it or regenerate `configure' using a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes a while.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Type `make install' to install the programs and any data files and
+     documentation.
+
+  4. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  You can give `configure'
+initial values for variables by setting them in the environment.  Using
+a Bourne-compatible shell, you can do that on the command line like
+this:
+     CC=c89 CFLAGS=-O2 LIBS=-lposix ./configure
+
+Or on systems that have the `env' program, you can do it like this:
+     env CPPFLAGS=-I/usr/local/include LDFLAGS=-s ./configure
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not supports the `VPATH'
+variable, you have to compile the package for one architecture at a time
+in the source code directory.  After you have installed the package for
+one architecture, use `make distclean' before reconfiguring for another
+architecture.
+
+Installation Names
+==================
+
+   By default, `make install' will install the package's files in
+`/usr/local/bin', `/usr/local/man', etc.  You can specify an
+installation prefix other than `/usr/local' by giving `configure' the
+option `--prefix=PATH'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+give `configure' the option `--exec-prefix=PATH', the package will use
+PATH as the prefix for installing programs and libraries.
+Documentation and other data files will still use the regular prefix.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' can not figure out
+automatically, but needs to determine by the type of host the package
+will run on.  Usually `configure' can figure that out, but if it prints
+a message saying it can not guess the host type, give it the
+`--host=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name with three fields:
+     CPU-COMPANY-SYSTEM
+
+See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the host type.
+
+   If you are building compiler tools for cross-compiling, you can also
+use the `--target=TYPE' option to select the type of system they will
+produce code for and the `--build=TYPE' option to select the type of
+system on which you are compiling the package.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Operation Controls
+==================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--cache-file=FILE'
+     Use and save the results of the tests in FILE instead of
+     `./config.cache'.  Set FILE to `/dev/null' to disable caching, for
+     debugging `configure'.
+
+`--help'
+     Print a summary of the options to `configure', and exit.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--version'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`configure' also accepts some other, not widely useful, options.
+

Log.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -32,40 +32,26 @@
 #include "win32.h"
 #else
 #include <pthread.h>
-#include <unistd.h>
 #endif
 
 #include <stdlib.h>
 #include <string.h>
 #include <sys/stat.h>
 #include <stdarg.h>
-#include <stdio.h>
+#include <cstdio>
 
 #include "nzbget.h"
 #include "Options.h"
 #include "Log.h"
 #include "Util.h"
 
-Log* g_pLog = NULL;
-
-void Log::Init()
-{
-	g_pLog = new Log();
-}
-
-void Log::Final()
-{
-	delete g_pLog;
-	g_pLog = NULL;
-}
+extern Options* g_pOptions;
 
 Log::Log()
 {
 	m_Messages.clear();
 	m_iIDGen = 0;
-	m_bOptInit = false;
 	m_szLogFilename = NULL;
-	m_tLastWritten = 0;
 #ifdef DEBUG
 	m_bExtraDebug = Util::FileExists("extradebug");
 #endif
@@ -74,79 +60,55 @@ Log::Log()
 Log::~Log()
 {
 	Clear();
-	free(m_szLogFilename);
-}
-
-void Log::LogDebugInfo()
-{
-	info("--------------------------------------------");
-	info("Dumping debug info to log");
-	info("--------------------------------------------");
-	
-	m_mutexDebug.Lock();
-	for (Debuggables::iterator it = m_Debuggables.begin(); it != m_Debuggables.end(); it++)
+	if (m_szLogFilename)
 	{
-        Debuggable* pDebuggable = *it;
-		pDebuggable->LogDebugInfo();
+		free(m_szLogFilename);
 	}
-	m_mutexDebug.Unlock();
-
-	info("--------------------------------------------");
 }
 
 void Log::Filelog(const char* msg, ...)
 {
-	if (!m_szLogFilename)
+	if (m_szLogFilename)
 	{
-		return;
-	}
+		char tmp2[1024];
 
-	char tmp2[1024];
+		va_list ap;
+		va_start(ap, msg);
+		vsnprintf(tmp2, 1024, msg, ap);
+		tmp2[1024-1] = '\0';
+		va_end(ap);
 
-	va_list ap;
-	va_start(ap, msg);
-	vsnprintf(tmp2, 1024, msg, ap);
-	tmp2[1024-1] = '\0';
-	va_end(ap);
-
-	time_t rawtime = time(NULL) + g_pOptions->GetTimeCorrection();
-	
-	char szTime[50];
+		time_t rawtime;
+		time(&rawtime);
+		
+		char szTime[50];
 #ifdef HAVE_CTIME_R_3
-	ctime_r(&rawtime, szTime, 50);
+		ctime_r(&rawtime, szTime, 50);
 #else
-	ctime_r(&rawtime, szTime);
+		ctime_r(&rawtime, szTime);
 #endif
-	szTime[50-1] = '\0';
-	szTime[strlen(szTime) - 1] = '\0'; // trim LF
+		szTime[50-1] = '\0';
+		szTime[strlen(szTime) - 1] = '\0'; // trim LF
 
-	if ((int)rawtime/86400 != (int)m_tLastWritten/86400 && g_pOptions->GetWriteLog() == Options::wlRotate)
-	{
-		RotateLog();
-	}
-
-	m_tLastWritten = rawtime;
-
-	FILE* file = fopen(m_szLogFilename, FOPEN_ABP);
-	if (file)
-	{
+		FILE* file = fopen(m_szLogFilename, "ab+");
+		if (file)
+		{
 #ifdef WIN32
-		unsigned long iProcessId = GetCurrentProcessId();
-		unsigned long iThreadId = GetCurrentThreadId();
+			unsigned long iThreadId = GetCurrentThreadId();
 #else
-		unsigned long iProcessId = (unsigned long)getpid();
-		unsigned long iThreadId = (unsigned long)pthread_self();
+			unsigned long iThreadId = (unsigned long)pthread_self();
 #endif
 #ifdef DEBUG
-		fprintf(file, "%s\t%lu\t%lu\t%s%s", szTime, iProcessId, iThreadId, tmp2, LINE_ENDING);
+			fprintf(file, "%s\t%lu\t%s%s", szTime, iThreadId, tmp2, LINE_ENDING);
 #else
-		fprintf(file, "%s\t%s%s", szTime, tmp2, LINE_ENDING);
+			fprintf(file, "%s\t%s%s", szTime, tmp2, LINE_ENDING);
 #endif
-		fclose(file);
-	}
-	else
-	{
-		perror(m_szLogFilename);
+			fclose(file);
+		}
+		else
+		{
+			perror(m_szLogFilename);
+		}
 	}
 }
 
@@ -189,14 +151,14 @@ void debug(const char* msg, ...)
 	}
 
 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetDebugTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AddMessage(Message::mkDebug, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("DEBUG\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkDebug, tmp2);
+	}
 
 	g_pLog->m_mutexLog.Unlock();
 }
@@ -215,14 +177,14 @@ void error(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();
 
 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetErrorTarget() : Options::mtBoth;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AddMessage(Message::mkError, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("ERROR\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkError, tmp2);
+	}
 
 	g_pLog->m_mutexLog.Unlock();
 }
@@ -240,14 +202,14 @@ void warn(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();
 
 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetWarningTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AddMessage(Message::mkWarning, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("WARNING\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkWarning, tmp2);
+	}
 
 	g_pLog->m_mutexLog.Unlock();
 }
@@ -265,14 +227,14 @@ void info(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();
 
 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetInfoTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AddMessage(Message::mkInfo, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("INFO\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkInfo, tmp2);
+	}
 
 	g_pLog->m_mutexLog.Unlock();
 }
@@ -290,18 +252,39 @@ void detail(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();
 
 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetDetailTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AddMessage(Message::mkDetail, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("DETAIL\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkDetail, tmp2);
+	}
 
 	g_pLog->m_mutexLog.Unlock();
 }
 
+void abort(const char* msg, ...)
+{
+	char tmp2[1024];
+
+	va_list ap;
+	va_start(ap, msg);
+	vsnprintf(tmp2, 1024, msg, ap);
+	tmp2[1024-1] = '\0';
+	va_end(ap);
+
+	g_pLog->m_mutexLog.Lock();
+
+	printf("\n%s", tmp2);
+
+	g_pLog->Filelog(tmp2);
+
+	g_pLog->m_mutexLog.Unlock();
+
+	exit(-1);
+}
+
 //************************************************************
 // Message
 
@@ -322,36 +305,29 @@ Message::Message(unsigned int iID, EKind eKind, time_t tTime, const char* szText
 
 Message::~ Message()
 {
-	free(m_szText);
-}
-
-MessageList::~MessageList()
-{
-	Clear();
-}
-
-void MessageList::Clear()
-{
-	for (iterator it = begin(); it != end(); it++)
+	if (m_szText)
 	{
-		delete *it;
+		free(m_szText);
 	}
-	clear();
 }
 
 void Log::Clear()
 {
 	m_mutexLog.Lock();
-	m_Messages.Clear();
+	for (Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
+	{
+		delete *it;
+	}
+	m_Messages.clear();
 	m_mutexLog.Unlock();
 }
 
-void Log::AddMessage(Message::EKind eKind, const char * szText)
+void Log::AppendMessage(Message::EKind eKind, const char * szText)
 {
 	Message* pMessage = new Message(++m_iIDGen, eKind, time(NULL), szText);
 	m_Messages.push_back(pMessage);
 
-	if (m_bOptInit && g_pOptions)
+	if (g_pOptions)
 	{
 		while (m_Messages.size() > (unsigned int)g_pOptions->GetLogBufferSize())
 		{
@@ -362,7 +338,7 @@ void Log::AddMessage(Message::EKind eKind, const char * szText)
 	}
 }
 
-MessageList* Log::LockMessages()
+Log::Messages* Log::LockMessages()
 {
 	m_mutexLog.Lock();
 	return &m_Messages;
@@ -378,82 +354,6 @@ void Log::ResetLog()
 	remove(g_pOptions->GetLogFile());
 }
 
-void Log::RotateLog()
-{
-	char szDirectory[1024];
-	strncpy(szDirectory, g_pOptions->GetLogFile(), 1024);
-	szDirectory[1024-1] = '\0';
-
-	// split the full filename into path, basename and extension
-	char* szBaseName = Util::BaseFileName(szDirectory);
-	if (szBaseName > szDirectory)
-	{
-		szBaseName[-1] = '\0';
-	}
-
-	char szBaseExt[250];
-	char* szExt = strrchr(szBaseName, '.');
-	if (szExt && szExt > szBaseName)
-	{
-		strncpy(szBaseExt, szExt, 250);
-		szBaseExt[250-1] = '\0';
-		szExt[0] = '\0';
-	}
-	else
-	{
-		szBaseExt[0] = '\0';
-	}
-
-	char szFileMask[1024];
-	snprintf(szFileMask, 1024, "%s-####-##-##%s", szBaseName, szBaseExt);
-	szFileMask[1024-1] = '\0';
-
-	time_t tCurTime = time(NULL) + g_pOptions->GetTimeCorrection();
-	int iCurDay = (int)tCurTime / 86400;
-	char szFullFilename[1024];
-
-	WildMask mask(szFileMask, true);
-	DirBrowser dir(szDirectory);
-	while (const char* filename = dir.Next())
-	{
-		if (mask.Match(filename))
-		{
-			snprintf(szFullFilename, 1024, "%s%c%s", szDirectory, PATH_SEPARATOR, filename);
-			szFullFilename[1024-1] = '\0';
-
-			struct tm tm;
-			memset(&tm, 0, sizeof(tm));
-			tm.tm_year = atoi(filename + mask.GetMatchStart(0)) - 1900;
-			tm.tm_mon = atoi(filename + mask.GetMatchStart(1)) - 1;
-			tm.tm_mday = atoi(filename + mask.GetMatchStart(2));
-			time_t tFileTime = Util::Timegm(&tm);
-			int iFileDay = (int)tFileTime / 86400;
-
-			if (iFileDay <= iCurDay - g_pOptions->GetRotateLog())
-			{
-				char szMessage[1024];
-				snprintf(szMessage, 1024, "Deleting old log-file %s\n", filename);
-				szMessage[1024-1] = '\0';
-				g_pLog->AddMessage(Message::mkInfo, szMessage);
-
-				remove(szFullFilename);
-			}
-		}
-	}
-
-	struct tm tm;
-	gmtime_r(&tCurTime, &tm);
-	snprintf(szFullFilename, 1024, "%s%c%s-%i-%.2i-%.2i%s", szDirectory, PATH_SEPARATOR,
-		szBaseName, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, szBaseExt);
-	szFullFilename[1024-1] = '\0';
-
-	free(m_szLogFilename);
-	m_szLogFilename = strdup(szFullFilename);
-#ifdef WIN32
-	WebUtil::Utf8ToAnsi(m_szLogFilename, strlen(m_szLogFilename) + 1);
-#endif
-}
-
 /*
 * During intializing stage (when options were not read yet) all messages
 * are saved in screen log, even if they shouldn't (according to options).
@@ -467,17 +367,9 @@ void Log::InitOptions()
 {
 	const char* szMessageType[] = { "INFO", "WARNING", "ERROR", "DEBUG", "DETAIL"};
 
-	if (g_pOptions->GetWriteLog() != Options::wlNone && g_pOptions->GetLogFile())
+	if (g_pOptions->GetCreateLog() && g_pOptions->GetLogFile())
 	{
 		m_szLogFilename = strdup(g_pOptions->GetLogFile());
-#ifdef WIN32
-		WebUtil::Utf8ToAnsi(m_szLogFilename, strlen(m_szLogFilename) + 1);
-#endif
-
-		if (g_pOptions->GetServerMode() && g_pOptions->GetWriteLog() == Options::wlReset)
-		{
-			g_pLog->ResetLog();
-		}
 	}
 
 	m_iIDGen = 0;
@@ -521,20 +413,4 @@ void Log::InitOptions()
 			i++;
 		}
 	}
-
-	m_bOptInit = true;
-}
-
-void Log::RegisterDebuggable(Debuggable* pDebuggable)
-{
-	m_mutexDebug.Lock();
-	m_Debuggables.push_back(pDebuggable);
-	m_mutexDebug.Unlock();
-}
-
-void Log::UnregisterDebuggable(Debuggable* pDebuggable)
-{
-	m_mutexDebug.Lock();
-	m_Debuggables.remove(pDebuggable);
-	m_mutexDebug.Unlock();
 }

Log.h

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

LoggableFrontend.cpp

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -79,7 +79,7 @@ void LoggableFrontend::Update()
 
 	BeforePrint();
 
-	MessageList* pMessages = LockMessages();
+	Log::Messages* pMessages = LockMessages();
 	if (!pMessages->empty())
 	{
 		Message* pFirstMessage = pMessages->front();

Makefile.am

@@ -1,7 +1,7 @@
 #
-#  This file is part of nzbget
+#  This file if part of nzbget
 #
-# Copyright (C) 2008-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+# Copyright (C) 2008-2012 Andrey Prygunkov <hugbug@users.sourceforge.net>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,345 +22,58 @@
 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/extension/FeedScript.cpp \
-	daemon/extension/FeedScript.h \
-	daemon/extension/NzbScript.cpp \
-	daemon/extension/NzbScript.h \
-	daemon/extension/PostScript.cpp \
-	daemon/extension/PostScript.h \
-	daemon/extension/QueueScript.cpp \
-	daemon/extension/QueueScript.h \
-	daemon/extension/ScanScript.cpp \
-	daemon/extension/ScanScript.h \
-	daemon/extension/SchedulerScript.cpp \
-	daemon/extension/SchedulerScript.h \
-	daemon/extension/ScriptConfig.cpp \
-	daemon/extension/ScriptConfig.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/CommandLineParser.cpp \
-    daemon/main/CommandLineParser.h \
-	daemon/main/DiskService.cpp \
-	daemon/main/DiskService.h \
-	daemon/main/Maintenance.cpp \
-	daemon/main/Maintenance.h \
-	daemon/main/nzbget.cpp \
-	daemon/main/nzbget.h \
-	daemon/main/Options.cpp \
-	daemon/main/Options.h \
-	daemon/main/Scheduler.cpp \
-	daemon/main/Scheduler.h \
-	daemon/main/StackTrace.cpp \
-	daemon/main/StackTrace.h \
-	daemon/nntp/ArticleDownloader.cpp \
-	daemon/nntp/ArticleDownloader.h \
-	daemon/nntp/ArticleWriter.cpp \
-	daemon/nntp/ArticleWriter.h \
-	daemon/nntp/Decoder.cpp \
-	daemon/nntp/Decoder.h \
-	daemon/nntp/NewsServer.cpp \
-	daemon/nntp/NewsServer.h \
-	daemon/nntp/NNTPConnection.cpp \
-	daemon/nntp/NNTPConnection.h \
-	daemon/nntp/ServerPool.cpp \
-	daemon/nntp/ServerPool.h \
-	daemon/nntp/StatMeter.cpp \
-	daemon/nntp/StatMeter.h \
-	daemon/postprocess/Cleanup.cpp \
-	daemon/postprocess/Cleanup.h \
-	daemon/postprocess/DupeMatcher.cpp \
-	daemon/postprocess/DupeMatcher.h \
-	daemon/postprocess/ParChecker.cpp \
-	daemon/postprocess/ParChecker.h \
-	daemon/postprocess/ParCoordinator.cpp \
-	daemon/postprocess/ParCoordinator.h \
-	daemon/postprocess/ParParser.cpp \
-	daemon/postprocess/ParParser.h \
-	daemon/postprocess/ParRenamer.cpp \
-	daemon/postprocess/ParRenamer.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/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/Service.cpp \
-	daemon/util/Service.h \
-	daemon/util/Util.cpp \
-	daemon/util/Util.h \
-	code_revision.cpp
-
-if WITH_PAR2
-nzbget_SOURCES += \
-	lib/par2/commandline.cpp \
-	lib/par2/commandline.h \
-	lib/par2/crc.cpp \
-	lib/par2/crc.h \
-	lib/par2/creatorpacket.cpp \
-	lib/par2/creatorpacket.h \
-	lib/par2/criticalpacket.cpp \
-	lib/par2/criticalpacket.h \
-	lib/par2/datablock.cpp \
-	lib/par2/datablock.h \
-	lib/par2/descriptionpacket.cpp \
-	lib/par2/descriptionpacket.h \
-	lib/par2/diskfile.cpp \
-	lib/par2/diskfile.h \
-	lib/par2/filechecksummer.cpp \
-	lib/par2/filechecksummer.h \
-	lib/par2/galois.cpp \
-	lib/par2/galois.h \
-	lib/par2/letype.h \
-	lib/par2/mainpacket.cpp \
-	lib/par2/mainpacket.h \
-	lib/par2/md5.cpp \
-	lib/par2/md5.h \
-	lib/par2/par2cmdline.h \
-	lib/par2/par2creatorsourcefile.cpp \
-	lib/par2/par2creatorsourcefile.h \
-	lib/par2/par2fileformat.cpp \
-	lib/par2/par2fileformat.h \
-	lib/par2/par2repairer.cpp \
-	lib/par2/par2repairer.h \
-	lib/par2/par2repairersourcefile.cpp \
-	lib/par2/par2repairersourcefile.h \
-	lib/par2/parheaders.cpp \
-	lib/par2/parheaders.h \
-	lib/par2/recoverypacket.cpp \
-	lib/par2/recoverypacket.h \
-	lib/par2/reedsolomon.cpp \
-	lib/par2/reedsolomon.h \
-	lib/par2/verificationhashtable.cpp \
-	lib/par2/verificationhashtable.h \
-	lib/par2/verificationpacket.cpp \
-	lib/par2/verificationpacket.h
-endif
-
-AM_CPPFLAGS = \
-	-I$(srcdir)/daemon/connect \
-	-I$(srcdir)/daemon/extension \
-	-I$(srcdir)/daemon/feed \
-	-I$(srcdir)/daemon/frontend \
-	-I$(srcdir)/daemon/main \
-	-I$(srcdir)/daemon/nntp \
-	-I$(srcdir)/daemon/postprocess \
-	-I$(srcdir)/daemon/queue \
-	-I$(srcdir)/daemon/remote \
-	-I$(srcdir)/daemon/util \
-	-I$(srcdir)/lib/par2
-
-if WITH_TESTS
-nzbget_SOURCES += \
-	lib/catch/catch.h \
-	tests/suite/TestMain.cpp \
-	tests/suite/TestMain.h \
-	tests/suite/TestUtil.cpp \
-	tests/suite/TestUtil.h \
-	tests/main/CommandLineParserTest.cpp \
-	tests/main/OptionsTest.cpp \
-	tests/feed/FeedFilterTest.cpp \
-	tests/postprocess/ParCheckerTest.cpp \
-	tests/postprocess/ParRenamerTest.cpp \
-	tests/queue/NZBFileTest.cpp \
-	tests/util/UtilTest.cpp
-
-AM_CPPFLAGS += \
-	-I$(srcdir)/lib/catch \
-	-I$(srcdir)/tests/suite
-endif
+	ArticleDownloader.cpp ArticleDownloader.h BinRpc.cpp BinRpc.h \
+	ColoredFrontend.cpp ColoredFrontend.h Connection.cpp Connection.h Decoder.cpp Decoder.h \
+	DiskState.cpp DiskState.h DownloadInfo.cpp DownloadInfo.h Frontend.cpp Frontend.h \
+	Log.cpp Log.h LoggableFrontend.cpp LoggableFrontend.h MessageBase.h \
+	NCursesFrontend.cpp NCursesFrontend.h NNTPConnection.cpp NNTPConnection.h NZBFile.cpp \
+	NZBFile.h NewsServer.cpp NewsServer.h Observer.cpp \
+	Observer.h Options.cpp Options.h ParChecker.cpp ParChecker.h \
+	PrePostProcessor.cpp PrePostProcessor.h QueueCoordinator.cpp \
+	QueueCoordinator.h QueueEditor.cpp QueueEditor.h RemoteClient.cpp RemoteClient.h \
+	RemoteServer.cpp RemoteServer.h Scanner.cpp Scanner.h Scheduler.cpp Scheduler.h ScriptController.cpp \
+	ScriptController.h ServerPool.cpp ServerPool.h svn_version.cpp TLS.cpp TLS.h Thread.cpp Thread.h \
+	Util.cpp Util.h XmlRpc.cpp XmlRpc.h WebDownloader.cpp WebDownloader.h WebServer.cpp WebServer.h \
+	UrlCoordinator.cpp UrlCoordinator.h nzbget.cpp nzbget.h
 
 EXTRA_DIST = \
-	$(windows_FILES) \
-	$(osx_FILES) \
-	$(linux_FILES) \
-	$(testdata_FILES)
+	Makefile.cvs nzbgetd nzbget-postprocess.sh \
+	$(patches_FILES) $(windows_FILES)
+
+patches_FILES = \
+	libpar2-0.2-bugfixes.patch libpar2-0.2-cancel.patch \
+	libpar2-0.2-MSVC8.patch libsigc++-2.0.18-MSVC8.patch
 
 windows_FILES = \
-	daemon/windows/NTService.cpp \
-	daemon/windows/NTService.h \
-	daemon/windows/win32.h \
-	daemon/windows/WinConsole.cpp \
-	daemon/windows/WinConsole.h \
-	nzbget.vcproj \
-	windows/nzbget-command-shell.bat  \
-	windows/install-update.bat  \
-	windows/README-WINDOWS.txt  \
-	windows/package-info.json  \
-	windows/resources/mainicon.ico \
-	windows/resources/nzbget.rc \
-	windows/resources/resource.h \
-	windows/resources/trayicon_idle.ico \
-	windows/resources/trayicon_paused.ico \
-	windows/resources/trayicon_working.ico \
-	windows/setup/nzbget-setup.nsi \
-	windows/setup/install.bmp \
-	windows/setup/uninstall.bmp
-
-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/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
-
-linux_FILES = \
-	linux/installer.sh \
-	linux/install-update.sh \
-	linux/package-info.json \
-	linux/build-info.txt \
-	linux/build-nzbget \
-	linux/build-unpack
+	win32.h NTService.cpp NTService.h nzbget.sln nzbget.vcproj nzbget-shell.bat
 
 doc_FILES = \
-	lib/par2/AUTHORS \
-	lib/par2/README \
-	README \
-	ChangeLog \
-	COPYING
+	README ChangeLog COPYING
 
 exampleconf_FILES = \
-	nzbget.conf
+	nzbget.conf nzbget-postprocess.conf
 
 webui_FILES = \
-	webui/index.html \
-	webui/index.js \
-	webui/downloads.js \
-	webui/edit.js \
-	webui/fasttable.js \
-	webui/history.js \
-	webui/messages.js \
-	webui/status.js \
-	webui/style.css \
-	webui/upload.js \
-	webui/util.js \
-	webui/config.js \
-	webui/feed.js \
-	webui/lib/bootstrap.js \
-	webui/lib/bootstrap.min.js \
-	webui/lib/bootstrap.css  \
-	webui/lib/jquery.js \
-	webui/lib/jquery.min.js \
-	webui/lib/raphael.js \
-	webui/lib/raphael.min.js \
-	webui/lib/elycharts.js \
-	webui/lib/elycharts.min.js \
-	webui/img/icons.png \
-	webui/img/icons-2x.png \
-	webui/img/transmit.gif \
-	webui/img/transmit-file.gif \
-	webui/img/favicon.ico \
-	webui/img/download-anim-green-2x.png \
-	webui/img/download-anim-orange-2x.png \
+	webui/index.html webui/index.js webui/downloads.js webui/edit.js webui/fasttable.js \
+	webui/history.js webui/messages.js webui/status.js webui/style.css webui/upload.js \
+	webui/util.js webui/config.js \
+	webui/lib/bootstrap.js webui/lib/bootstrap.min.js webui/lib/bootstrap.css  \
+	webui/lib/jquery.js webui/lib/jquery.min.js \
+	webui/img/icons.png webui/img/icons-2x.png \
+	webui/img/transmit.gif webui/img/transmit-file.gif webui/img/favicon.ico \
+	webui/img/download-anim-green-2x.png webui/img/download-anim-orange-2x.png \
 	webui/img/transmit-reload-2x.gif
 
-scripts_FILES = \
-	scripts/EMail.py \
-	scripts/Logger.py
-
-testdata_FILES = \
-	tests/testdata/dupematcher1/testfile.part01.rar \
-	tests/testdata/dupematcher1/testfile.part24.rar \
-	tests/testdata/dupematcher2/testfile.part04.rar \
-	tests/testdata/dupematcher2/testfile.part43.rar \
-	tests/testdata/nzbfile/dotless.nzb \
-	tests/testdata/nzbfile/dotless.txt \
-	tests/testdata/nzbfile/plain.nzb \
-	tests/testdata/nzbfile/plain.txt \
-	tests/testdata/parchecker/crc.txt \
-	tests/testdata/parchecker/testfile.dat \
-	tests/testdata/parchecker/testfile.nfo \
-	tests/testdata/parchecker/testfile.par2 \
-	tests/testdata/parchecker/testfile.vol00+1.PAR2 \
-	tests/testdata/parchecker/testfile.vol01+2.PAR2 \
-	tests/testdata/parchecker/testfile.vol03+3.PAR2
-
 # Install
+sbin_SCRIPTS = nzbgetd
+bin_SCRIPTS = nzbget-postprocess.sh
 dist_doc_DATA = $(doc_FILES)
 exampleconfdir = $(datadir)/nzbget
 dist_exampleconf_DATA = $(exampleconf_FILES)
+webuiconfdir = $(datadir)/nzbget/webui
+dist_webuiconf_DATA = $(exampleconf_FILES)
 webuidir = $(datadir)/nzbget
 nobase_dist_webui_DATA = $(webui_FILES)
-scriptsdir = $(datadir)/nzbget
-nobase_dist_scripts_SCRIPTS = $(scripts_FILES)
 
 # Note about "sed": 
 # We need to make some changes in installed files.
@@ -371,15 +84,19 @@ nobase_dist_scripts_SCRIPTS = $(scripts_FILES)
 # 3) delete original.temp
 # These steps ensure that the output file has the same permissions as the original file.
 
-# Prepare example configuration file
+# Configure installed script
+install-exec-hook:
+	rm -f "$(DESTDIR)$(sbindir)/nzbgetd.temp"
+	cp "$(DESTDIR)$(sbindir)/nzbgetd" "$(DESTDIR)$(sbindir)/nzbgetd.temp"
+	sed 's?/usr/local/bin?$(bindir)?' < "$(DESTDIR)$(sbindir)/nzbgetd.temp" > "$(DESTDIR)$(sbindir)/nzbgetd"
+	rm "$(DESTDIR)$(sbindir)/nzbgetd.temp"
+
+# Prepare example configuration files
 install-data-hook:
 	rm -f "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
 	cp "$(DESTDIR)$(exampleconfdir)/nzbget.conf" "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:^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"
+	sed 's:"nzbget-postprocess.sh":"nzbget-postprocess.sh" (installed into $(bindir)):' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
+	sed 's:^WebDir=:WebDir=$(webuidir)/webui:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
 	rm "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
 
 # Install configuration files into /etc
@@ -388,62 +105,58 @@ install-conf:
 	if test ! -f "$(DESTDIR)$(sysconfdir)/nzbget.conf" ; then \
 		$(mkinstalldirs) "$(DESTDIR)$(sysconfdir)" ; \
 		cp "$(DESTDIR)$(exampleconfdir)/nzbget.conf" "$(DESTDIR)$(sysconfdir)/nzbget.conf" ; \
+		rm -f "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" ; \
+		cp "$(DESTDIR)$(sysconfdir)/nzbget.conf" "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" ; \
+		sed 's:^PostProcess=:PostProcess=$(bindir)/nzbget-postprocess.sh:' < "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(sysconfdir)/nzbget.conf" ; \
+		rm "$(DESTDIR)$(sysconfdir)/nzbget.conf.temp" ; \
+	fi
+	if test ! -f "$(DESTDIR)$(sysconfdir)/nzbget-postprocess.conf" ; then \
+		$(mkinstalldirs) "$(DESTDIR)$(sysconfdir)" ; \
+		cp "$(DESTDIR)$(exampleconfdir)/nzbget-postprocess.conf" "$(DESTDIR)$(sysconfdir)/nzbget-postprocess.conf" ; \
 	fi
 
 uninstall-conf:
+	rm -f "$(DESTDIR)$(sysconfdir)/nzbget-postprocess.conf"
 	rm -f "$(DESTDIR)$(sysconfdir)/nzbget.conf"
 
-# Determining git revision:
-# 1) If directory ".git" exists we take revision from git log.
+# 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 ".git" doesn't exists we keep and reuse file "code_revision.cpp",
+# 2) If directory ".svn" doesn't exists we keep and reuse file "svn_version.cpp",
 #    which was possibly created early.
-# 3) If neither directory ".git" nor file "code_revision.cpp" are available
-#    we create new file "code_revision.c" with empty revision number.
-code_revision.cpp: FORCE
-	@ if test -d ./.git ; then \
-		B="$(shell git branch | sed -n -e 's/^\* \(.*\)/\1/p')"; \
-		M="$(shell git status --porcelain)" ; \
-		if test "$$M" != "" ; then \
-			M="M" ; \
-		fi ; \
-		if test "$$B" = "master" ; then \
-			V="$$M" ; \
-		elif test "$$B" = "develop" ; then \
-			V="$(shell git rev-list HEAD | wc -l | xargs)" ; \
-			V="$${V}$$M" ; \
-		else \
-			V="$(shell git rev-list HEAD | wc -l | xargs)" ; \
-			V="$${V}$$M ($$B)" ; \
-		fi ; \
-		H="$(shell test -f ./code_revision.cpp && head -n 1 code_revision.cpp)"; \
+# 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* code_revision(void)" ;\
+			echo "const char* svn_version(void)" ;\
 			echo "{" ;\
-			echo "	const char* revision = \"$$V\";" ;\
-			echo "	return revision;" ;\
+			echo "	const char* SVN_Version = \"$$V\";" ;\
+			echo "	return SVN_Version;" ;\
 			echo "}" ;\
-			) > code_revision.cpp ; \
+			) > svn_version.cpp ; \
 		fi \
-	elif test -f ./code_revision.cpp ; then \
+	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* code_revision(void)" ;\
+		echo "const char* svn_version(void)" ;\
 		echo "{" ;\
-		echo "	const char* revision = \"\";" ;\
-		echo "	return revision;" ;\
+		echo "	const char* SVN_Version = \"\";" ;\
+		echo "	return SVN_Version;" ;\
 		echo "}" ;\
-		) > code_revision.cpp ; \
+		) > svn_version.cpp ; \
 	fi
 FORCE:
 
-# Ignore "code_revision.cpp" in distcleancheck
+# Ignore "svn_version.cpp" in distcleancheck
 distcleancheck_listfiles = \
 	find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
 	sh '{}' ';'
@@ -452,8 +165,6 @@ clean-bak: rm *~
 
 # Fix premissions
 dist-hook:
-	find $(distdir)/daemon -type f -print -exec chmod -x {} \;
+	chmod -x $(distdir)/*.cpp $(distdir)/*.h
 	find $(distdir)/webui -type f -print -exec chmod -x {} \;
-	find $(distdir)/lib -type f -print -exec chmod -x {} \;
-	find $(distdir)/tests -type f -print -exec chmod -x {} \;
 

Makefile.cvs

@@ -0,0 +1,8 @@
+default: all
+
+all:
+	aclocal
+	autoheader
+	automake
+	autoconf
+

MessageBase.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,11 +27,7 @@
 #ifndef MESSAGEBASE_H
 #define MESSAGEBASE_H
 
-#if (!(defined(WIN32) && _MSC_VER < 1600))
-#include <stdint.h>
-#endif
-
-static const int32_t NZBMESSAGE_SIGNATURE = 0x6E7A6228; // = "nzb-XX" (protocol version)
+static const int32_t NZBMESSAGE_SIGNATURE = 0x6E7A6212; // = "nzb-XX" (protocol version)
 static const int NZBREQUESTFILENAMESIZE = 512;
 static const int NZBREQUESTPASSWORDSIZE = 32;
 
@@ -65,13 +61,53 @@ enum eRemoteRequest
 	eRemoteRequestPostQueue,
 	eRemoteRequestWriteLog,
 	eRemoteRequestScan,
-	eRemoteRequestHistory
+	eRemoteRequestHistory,
+	eRemoteRequestDownloadUrl,
+	eRemoteRequestUrlQueue
+};
+
+// Possible values for field "m_iAction" of struct "SNZBEditQueueRequest":
+// File-Actions affect one file, Group-Actions affect all files in group.
+// Group is a list of files, added to queue from one NZB-File.
+enum eRemoteEditAction
+{
+	eRemoteEditActionFileMoveOffset = 1,	// move files to m_iOffset relative to the current position in download-queue
+	eRemoteEditActionFileMoveTop,			// move files to the top of download-queue
+	eRemoteEditActionFileMoveBottom,		// move files to the bottom of download-queue
+	eRemoteEditActionFilePause,				// pause files
+	eRemoteEditActionFileResume,			// resume (unpause) files
+	eRemoteEditActionFileDelete,			// delete files
+	eRemoteEditActionFilePauseAllPars,		// pause only (all) pars (does not affect other files)
+	eRemoteEditActionFilePauseExtraPars,	// pause only (almost all) pars, except main par-file (does not affect other files)
+	eRemoteEditActionFileSetPriority,		// set priority for files
+	eRemoteEditActionFileReorder,			// (not supported)
+	eRemoteEditActionGroupMoveOffset,		// move group to m_iOffset relative to the current position in download-queue
+	eRemoteEditActionGroupMoveTop,			// move group to the top of download-queue
+	eRemoteEditActionGroupMoveBottom,		// move group to the bottom of download-queue
+	eRemoteEditActionGroupPause,			// pause group
+	eRemoteEditActionGroupResume,			// resume (unpause) group
+	eRemoteEditActionGroupDelete,			// delete group
+	eRemoteEditActionGroupPauseAllPars,		// pause only (all) pars (does not affect other files) in group
+	eRemoteEditActionGroupPauseExtraPars,	// pause only (almost all) pars in group, except main par-file (does not affect other files)
+	eRemoteEditActionGroupSetPriority,		// set priority for groups
+	eRemoteEditActionGroupSetCategory,		// set or change category for a group
+	eRemoteEditActionGroupMerge,			// merge group
+	eRemoteEditActionGroupSetParameter,		// set post-process parameter for group
+	eRemoteEditActionGroupSetName,			// set group name (rename group)
+	eRemoteEditActionPostMoveOffset = 51,	// move post-job to m_iOffset relative to the current position in post-queue
+	eRemoteEditActionPostMoveTop,			// move post-job to the top of post-queue
+	eRemoteEditActionPostMoveBottom,		// move post-job to the bottom of post-queue
+	eRemoteEditActionPostDelete,			// delete post-job
+	eRemoteEditActionHistoryDelete,			// delete history-item
+	eRemoteEditActionHistoryReturn,			// move history-item back to download queue
+	eRemoteEditActionHistoryProcess			// move history-item back to download queue and start postprocessing
 };
 
 // Possible values for field "m_iAction" of struct "SNZBPauseUnpauseRequest":
 enum eRemotePauseUnpauseAction
 {
 	eRemotePauseUnpauseActionDownload = 1,	// pause/unpause download queue
+	eRemotePauseUnpauseActionDownload2,		// pause/unpause download queue (second pause-register)
 	eRemotePauseUnpauseActionPostProcess,	// pause/unpause post-processor queue
 	eRemotePauseUnpauseActionScan			// pause/unpause scan of incoming nzb-directory
 };
@@ -90,8 +126,7 @@ struct SNZBRequestBase
 	int32_t					m_iSignature;			// Signature must be NZBMESSAGE_SIGNATURE in integer-value
 	int32_t					m_iStructSize;			// Size of the entire struct
 	int32_t					m_iType;				// Message type, see enum in NZBMessageRequest-namespace
-	char					m_szUsername[NZBREQUESTPASSWORDSIZE];	// User name
-	char					m_szPassword[NZBREQUESTPASSWORDSIZE];	// Password
+	char					m_szPassword[NZBREQUESTPASSWORDSIZE];	// Password needs to be in every request
 };
 
 // The basic SNZBResposneBase struct, used in all responses
@@ -105,14 +140,11 @@ struct SNZBResponseBase
 struct SNZBDownloadRequest
 {
 	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	char					m_szNZBFilename[NZBREQUESTFILENAMESIZE];// Name of nzb-file. For URLs can be empty, then the filename is read from URL download response
+	char					m_szFilename[NZBREQUESTFILENAMESIZE];	// Name of nzb-file, may contain full path (local path on client) or only filename
 	char					m_szCategory[NZBREQUESTFILENAMESIZE];	// Category, can be empty
 	int32_t					m_bAddFirst;			// 1 - add file to the top of download queue
 	int32_t					m_bAddPaused;			// 1 - pause added files
 	int32_t					m_iPriority;			// Priority for files (0 - default)
-	int32_t					m_iDupeScore;			// Duplicate score
-	int32_t					m_iDupeMode;			// Duplicate mode (EDupeMode)
-	char					m_szDupeKey[NZBREQUESTFILENAMESIZE];	// Duplicate key
 	int32_t					m_iTrailingDataLength;	// Length of nzb-file in bytes
 	//char					m_szContent[m_iTrailingDataLength];	// variable sized
 };
@@ -170,17 +202,8 @@ struct SNZBListResponse
 // A list response nzb entry
 struct SNZBListResponseNZBEntry
 {
-	int32_t					m_iID;					// NZB-ID
-	int32_t					m_iKind;				// Item Kind (see NZBInfo::Kind)
 	int32_t					m_iSizeLo;				// Size of all files in bytes, Low 32-bits of 64-bit value
 	int32_t					m_iSizeHi;				// Size of all files in bytes, High 32-bits of 64-bit value
-	int32_t					m_iRemainingSizeLo;		// Size of remaining (unpaused) files in bytes, Low 32-bits of 64-bit value
-	int32_t					m_iRemainingSizeHi;		// Size of remaining (unpaused) files in bytes, High 32-bits of 64-bit value
-	int32_t					m_iPausedSizeLo;		// Size of npaused files in bytes, Low 32-bits of 64-bit value
-	int32_t					m_iPausedSizeHi;		// Size of paused files in bytes, High 32-bits of 64-bit value
-	int32_t					m_iPausedCount;			// Number of paused files
-	int32_t					m_iRemainingParCount;	// Number of remaining par-files
-	int32_t					m_iPriority;			// Download priority
 	int32_t					m_bMatch;				// 1 - group matches the pattern (only when Request has eRemoteMatchModeRegEx)
 	int32_t					m_iFilenameLen;			// Length of Filename-string (m_szFilename), following to this record
 	int32_t					m_iNameLen;				// Length of Name-string (m_szName), following to this record
@@ -215,6 +238,7 @@ struct SNZBListResponseFileEntry
 	int32_t					m_iRemainingSizeHi;		// Remaining size in bytes, High 32-bits of 64-bit value
 	int32_t					m_bPaused;				// 1 - file is paused
 	int32_t					m_bFilenameConfirmed;	// 1 - Filename confirmed (read from article body), 0 - Filename parsed from subject (can be changed after reading of article)
+	int32_t					m_iPriority;			// Download priority
 	int32_t					m_iActiveDownloads;		// Number of active downloads for this file
 	int32_t					m_bMatch;				// 1 - file matches the pattern (only when Request has eRemoteMatchModeRegEx)
 	int32_t					m_iSubjectLen;			// Length of Subject-string (m_szSubject), following to this record
@@ -288,8 +312,10 @@ struct SNZBSetDownloadRateResponse
 struct SNZBEditQueueRequest
 {
 	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iAction;				// Action to be executed, see enum DownloadQueue::EEditAction
+	int32_t					m_iAction;				// Action to be executed, see enum eRemoteEditAction
 	int32_t					m_iOffset;				// Offset to move (for m_iAction = 0)
+	int32_t					m_bSmartOrder;			// For Move-Actions: 0 - execute action for each ID in order they are placed in array;
+													// 1 - smart execute to ensure that the relative order of all affected IDs are not changed.
 	int32_t					m_iMatchMode;				// File/Group match mode, see enum eRemoteMatchMode
 	int32_t					m_iNrTrailingIDEntries;		// Number of ID-entries, following to this structure
 	int32_t					m_iNrTrailingNameEntries;	// Number of Name-entries, following to this structure
@@ -396,10 +422,12 @@ struct SNZBPostQueueResponseEntry
 	int32_t					m_iTotalTimeSec;		// Number of seconds this post-job is beeing processed (after it first changed the state from QUEUED).
 	int32_t					m_iStageTimeSec;		// Number of seconds the current stage is beeing processed.
 	int32_t					m_iNZBFilenameLen;		// Length of NZBFileName-string (m_szNZBFilename), following to this record
+	int32_t					m_iParFilename;			// Length of ParFilename-string (m_szParFilename), following to this record
 	int32_t					m_iInfoNameLen;			// Length of Filename-string (m_szFilename), following to this record
 	int32_t					m_iDestDirLen;			// Length of DestDir-string (m_szDestDir), following to this record
 	int32_t					m_iProgressLabelLen;	// Length of ProgressLabel-string (m_szProgressLabel), following to this record
 	//char					m_szNZBFilename[m_iNZBFilenameLen];		// variable sized, may contain full path (local path on client) or only filename
+	//char					m_szParFilename[m_iParFilename];		// variable sized
 	//char					m_szInfoName[m_iInfoNameLen];			// variable sized
 	//char					m_szDestDir[m_iDestDirLen];				// variable sized
 	//char					m_szProgressLabel[m_iProgressLabelLen];	// variable sized
@@ -443,7 +471,6 @@ struct SNZBScanResponse
 struct SNZBHistoryRequest
 {
 	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bHidden;				// 0 - only return visible records, 1 - also return hidden records
 };
 
 // history response
@@ -460,20 +487,66 @@ struct SNZBHistoryResponse
 struct SNZBHistoryResponseEntry
 {
 	int32_t					m_iID;					// History-ID
-	int32_t					m_iKind;				// Kind of Item: 1 - Collection (NZB), 2 - URL, 3 - DUP (hidden record)
+	int32_t					m_iKind;				// Kind of Item: 1 - Collection (NZB), 2 - URL
 	int32_t					m_tTime;				// When the item was added to history. time since the Epoch (00:00:00 UTC, January 1, 1970), measured in seconds.
 	int32_t					m_iNicenameLen;			// Length of Nicename-string (m_szNicename), following to this record
-	// for Collection and Dup items (m_iKind = 1 or 2)
+	// for Collection items (m_iKind = 1)
 	int32_t					m_iSizeLo;				// Size of all files in bytes, Low 32-bits of 64-bit value
 	int32_t					m_iSizeHi;				// Size of all files in bytes, High 32-bits of 64-bit value
-	// for Collection items (m_iKind = 1)
 	int32_t					m_iFileCount;			// Initial number of files included in NZB-file
 	int32_t					m_iParStatus;			// See NZBInfo::EParStatus
 	int32_t					m_iScriptStatus;		// See NZBInfo::EScriptStatus
 	// for URL items (m_iKind = 2)
-	int32_t					m_iUrlStatus;			// See NZBInfo::EUrlStatus
+	int32_t					m_iUrlStatus;			// See UrlInfo::EStatus
 	// trailing data
 	//char					m_szNicename[m_iNicenameLen];				// variable sized
 };
 
+// download url request
+struct SNZBDownloadUrlRequest
+{
+	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
+	char					m_szURL[NZBREQUESTFILENAMESIZE];		// url to nzb-file
+	char					m_szNZBFilename[NZBREQUESTFILENAMESIZE];// Name of nzb-file. Can be empty, then the filename is read from URL download response
+	char					m_szCategory[NZBREQUESTFILENAMESIZE];	// Category, can be empty
+	int32_t					m_bAddFirst;							// 1 - add url to the top of download queue
+	int32_t					m_bAddPaused;							// 1 - pause added files
+	int32_t					m_iPriority;							// Priority for files (0 - default)
+};
+
+// download url response
+struct SNZBDownloadUrlResponse
+{
+	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
+	int32_t					m_bSuccess;				// 0 - command failed, 1 - command executed successfully
+	int32_t					m_iTrailingDataLength;	// Length of Text-string (m_szText), following to this record
+	//char					m_szText[m_iTrailingDataLength];	// variable sized
+};
+
+// UrlQueue request
+struct SNZBUrlQueueRequest
+{
+	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
+};
+
+// UrlQueue response
+struct SNZBUrlQueueResponse
+{
+	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
+	int32_t					m_iEntrySize;			// Size of the SNZBUrlQueueResponseEntry-struct
+	int32_t					m_iNrTrailingEntries;	// Number of UrlQueue-entries, following to this structure
+	int32_t					m_iTrailingDataLength;	// Length of all UrlQueue-entries, following to this structure
+	// SNZBUrlQueueResponseEntry m_Entries[m_iNrTrailingEntries]		// variable sized
+};
+
+// UrlQueue response entry
+struct SNZBUrlQueueResponseEntry
+{
+	int32_t					m_iID;					// ID of Url-entry
+	int32_t					m_iURLLen;				// Length of URL-string (m_szURL), following to this record
+	int32_t					m_iNZBFilenameLen;		// Length of NZBFilename-string (m_szNZBFilename), following to this record
+	//char					m_szURL[m_iURLLen];					// variable sized
+	//char					m_szNZBFilename[m_iNZBFilenameLen];	// variable sized
+};
+
 #endif

NCursesFrontend.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -43,7 +43,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #ifndef WIN32
 #include <unistd.h>
 #endif
@@ -73,6 +72,7 @@ void curses_clear()
 #undef clear
 #endif
 
+extern Options* g_pOptions;
 extern void ExitProc();
 
 static const int NCURSES_COLORPAIR_TEXT			= 1;
@@ -136,7 +136,7 @@ NCursesFrontend::NCursesFrontend()
 	m_bShowNZBname = g_pOptions->GetCursesNZBName();
 	m_bShowTimestamp = g_pOptions->GetCursesTime();
 	m_bGroupFiles = g_pOptions->GetCursesGroup();
-	m_QueueWindowPercentage = 50;
+	m_QueueWindowPercentage = 0.5f;
 	m_iDataUpdatePos = 0;
     m_bUpdateNextTime = false;
 	m_iLastEditEntry = -1;
@@ -202,9 +202,14 @@ NCursesFrontend::NCursesFrontend()
 NCursesFrontend::~NCursesFrontend()
 {
 #ifdef WIN32
-	free(m_pScreenBuffer);
-	free(m_pOldScreenBuffer);
-
+	if (m_pScreenBuffer)
+	{
+		free(m_pScreenBuffer);
+	}
+	if (m_pOldScreenBuffer)
+	{
+		free(m_pOldScreenBuffer);
+	}
 	m_ColorAttr.clear();
 
 	HANDLE hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
@@ -269,6 +274,7 @@ void NCursesFrontend::Run()
     }
 
     FreeData();
+	ClearGroupQueue();
 	
     debug("Exiting NCursesFrontend-loop");
 }
@@ -287,11 +293,13 @@ void NCursesFrontend::Update(int iKey)
     if (m_iDataUpdatePos <= 0)
     {
         FreeData();
+		ClearGroupQueue();
 		m_iNeededLogEntries = m_iMessagesWinClientHeight;
         if (!PrepareData())
         {
             return;
         }
+		PrepareGroupQueue();
 
 		// recalculate frame sizes
 		CalcWindowSizes();
@@ -362,7 +370,7 @@ void NCursesFrontend::CalcWindowSizes()
     int iQueueSize = CalcQueueSize();
     
 	m_iQueueWinTop = 0;
-	m_iQueueWinHeight = (m_iScreenHeight - 2) * m_QueueWindowPercentage / 100;
+	m_iQueueWinHeight = (int)((float) (m_iScreenHeight - 2) * m_QueueWindowPercentage);
 	if (m_iQueueWinHeight - 1 > iQueueSize)
 	{
 		m_iQueueWinHeight = iQueueSize > 0 ? iQueueSize + 1 : 1 + 1;
@@ -384,22 +392,17 @@ void NCursesFrontend::CalcWindowSizes()
 
 int NCursesFrontend::CalcQueueSize()
 {
-	int iQueueSize = 0;
-	DownloadQueue* pDownloadQueue = LockQueue();
 	if (m_bGroupFiles)
 	{
-		iQueueSize = pDownloadQueue->GetQueue()->size();
+		return m_groupQueue.size();
 	}
 	else
 	{
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
-		{
-			NZBInfo* pNZBInfo = *it;
-			iQueueSize += pNZBInfo->GetFileList()->size();
-		}
+		DownloadQueue* pDownloadQueue = LockQueue();
+		int iQueueSize = pDownloadQueue->GetFileQueue()->size();
+		UnlockQueue();
+		return iQueueSize;
 	}
-	UnlockQueue();
-	return iQueueSize;
 }
 
 void NCursesFrontend::PlotLine(const char * szString, int iRow, int iPos, int iColorPair)
@@ -503,7 +506,7 @@ void NCursesFrontend::PrintMessages()
     int iLine = iLineNr + m_iMessagesWinClientHeight - 1;
 	int iLinesToPrint = m_iMessagesWinClientHeight;
 
-    MessageList* pMessages = LockMessages();
+    Log::Messages* pMessages = LockMessages();
     
 	// print messages from bottom
 	for (int i = (int)pMessages->size() - 1; i >= 0 && iLinesToPrint > 0; i--)
@@ -547,8 +550,6 @@ 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);
@@ -612,10 +613,10 @@ void NCursesFrontend::PrintStatus()
     char timeString[100];
     timeString[0] = '\0';
 
-	int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
-    if (iCurrentDownloadSpeed > 0 && !m_bPauseDownload)
+	float fCurrentDownloadSpeed = m_bStandBy ? 0 : m_fCurrentDownloadSpeed;
+    if (fCurrentDownloadSpeed > 0.0 && !(m_bPauseDownload || m_bPauseDownload2))
     {
-        long long remain_sec = (long long)(m_lRemainingSize / iCurrentDownloadSpeed);
+        long long remain_sec = (long long)(m_lRemainingSize / (fCurrentDownloadSpeed * 1024));
 		int h = (int)(remain_sec / 3600);
 		int m = (int)((remain_sec % 3600) / 60);
 		int s = (int)(remain_sec % 60);
@@ -623,9 +624,9 @@ void NCursesFrontend::PrintStatus()
     }
 
     char szDownloadLimit[128];
-    if (m_iDownloadLimit > 0)
+    if (m_fDownloadLimit > 0.0f)
     {
-        sprintf(szDownloadLimit, ", Limit %i KB/s", m_iDownloadLimit / 1024);
+        sprintf(szDownloadLimit, ", Limit %.0f KB/s", m_fDownloadLimit);
     }
     else
     {
@@ -642,16 +643,15 @@ void NCursesFrontend::PrintStatus()
         szPostStatus[0] = 0;
     }
 
-	char szCurrentSpeed[20];
-	char szAverageSpeed[20];
-	char szRemainingSize[20];
-	int iAverageSpeed = (int)(m_iDnTimeSec > 0 ? m_iAllBytes / m_iDnTimeSec : 0);
+	float fAverageSpeed = (float)(Util::Int64ToFloat(m_iDnTimeSec > 0 ? m_iAllBytes / m_iDnTimeSec : 0) / 1024.0);
 
-	snprintf(tmp, MAX_SCREEN_WIDTH, " %d threads, %s, %s remaining%s%s%s%s, Avg. %s",
-		m_iThreadCount, Util::FormatSpeed(szCurrentSpeed, sizeof(szCurrentSpeed), iCurrentDownloadSpeed),
-		Util::FormatSize(szRemainingSize, sizeof(szRemainingSize), m_lRemainingSize),
-		timeString, szPostStatus, m_bPauseDownload ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
-		szDownloadLimit, Util::FormatSpeed(szAverageSpeed, sizeof(szAverageSpeed), iAverageSpeed));
+	snprintf(tmp, MAX_SCREEN_WIDTH, " %d threads, %.*f KB/s, %.2f MB remaining%s%s%s%s%s, Avg. %.*f KB/s", 
+		m_iThreadCount, (fCurrentDownloadSpeed >= 10 ? 0 : 1), fCurrentDownloadSpeed, 
+		(float)(Util::Int64ToFloat(m_lRemainingSize) / 1024.0 / 1024.0), timeString, szPostStatus, 
+		m_bPauseDownload || m_bPauseDownload2 ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
+		m_bPauseDownload || m_bPauseDownload2 ? 
+			(m_bPauseDownload && m_bPauseDownload2 ? " (+2)" : m_bPauseDownload2 ? " (2)" : "") : "",
+		szDownloadLimit, (fAverageSpeed >= 10 ? 0 : 1), fAverageSpeed);
 	tmp[MAX_SCREEN_WIDTH - 1] = '\0';
     PlotLine(tmp, iStatusRow, 0, NCURSES_COLORPAIR_STATUS);
 }
@@ -723,8 +723,11 @@ void NCursesFrontend::PrintKeyInputBar()
 
 void NCursesFrontend::SetHint(const char* szHint)
 {
-	free(m_szHint);
-	m_szHint = NULL;
+	if (m_szHint)
+	{
+		free(m_szHint);
+		m_szHint = NULL;
+	}
 	if (szHint)
 	{
 		m_szHint = strdup(szHint);
@@ -746,24 +749,31 @@ void NCursesFrontend::PrintQueue()
 
 void NCursesFrontend::PrintFileQueue()
 {
+	int iLineNr = m_iQueueWinTop;
+			
     DownloadQueue* pDownloadQueue = LockQueue();
+	if (pDownloadQueue->GetFileQueue()->empty())
+    {
+		char szBuffer[MAX_SCREEN_WIDTH];
+		snprintf(szBuffer, sizeof(szBuffer), "%s Files for downloading", m_bUseColor ? "" : "*** ");
+		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
+		PrintTopHeader(szBuffer, iLineNr++, true);
+        PlotLine("Ready to receive nzb-job", iLineNr++, 0, NCURSES_COLORPAIR_TEXT);
+    }
+    else
+    {
+		iLineNr++;
+		long long lRemaining = 0;
+		long long lPaused = 0;
+		int iPausedFiles = 0;
+		int i = 0;
+        for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++, i++)
+        {
+            FileInfo* pFileInfo = *it;
 
-	int iLineNr = m_iQueueWinTop + 1;
-	long long lRemaining = 0;
-	long long lPaused = 0;
-	int iPausedFiles = 0;
-	int iFileNum = 0;
-
-	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
-	{
-		NZBInfo* pNZBInfo = *it;
-		for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++, iFileNum++)
-		{
-			FileInfo* pFileInfo = *it2;
-
-			if (iFileNum >= m_iQueueScrollOffset && iFileNum < m_iQueueScrollOffset + m_iQueueWinHeight -1)
+			if (i >= m_iQueueScrollOffset && i < m_iQueueScrollOffset + m_iQueueWinHeight -1)
 			{
-				PrintFilename(pFileInfo, iLineNr++, iFileNum == m_iSelectedQueueEntry);
+				PrintFilename(pFileInfo, iLineNr++, i == m_iSelectedQueueEntry);
 			}
 
 			if (pFileInfo->GetPaused())
@@ -772,32 +782,21 @@ void NCursesFrontend::PrintFileQueue()
 				lPaused += pFileInfo->GetRemainingSize();
 			}
 			lRemaining += pFileInfo->GetRemainingSize();
-		}
-	}
-
-	if (iFileNum > 0)
-	{
+        }
+		
 		char szRemaining[20];
+		Util::FormatFileSize(szRemaining, sizeof(szRemaining), lRemaining);
+
 		char szUnpaused[20];
+		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 ? "" : "*** ", iFileNum,
-			iFileNum - iPausedFiles,
-			Util::FormatSize(szRemaining, sizeof(szRemaining), lRemaining),
-			Util::FormatSize(szUnpaused, sizeof(szUnpaused), lRemaining - lPaused));
+			m_bUseColor ? "" : "*** ", pDownloadQueue->GetFileQueue()->size(), 
+			pDownloadQueue->GetFileQueue()->size() - iPausedFiles, szRemaining, szUnpaused);
 		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
 		PrintTopHeader(szBuffer, m_iQueueWinTop, true);
     }
-	else
-	{
-		iLineNr--;
-		char szBuffer[MAX_SCREEN_WIDTH];
-		snprintf(szBuffer, sizeof(szBuffer), "%s Files for downloading", m_bUseColor ? "" : "*** ");
-		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
-		PrintTopHeader(szBuffer, iLineNr++, true);
-        PlotLine("Ready to receive nzb-job", iLineNr++, 0, NCURSES_COLORPAIR_TEXT);
-	}
-
     UnlockQueue();
 }
 
@@ -828,16 +827,16 @@ void NCursesFrontend::PrintFilename(FileInfo * pFileInfo, int iRow, bool bSelect
 
 	char szPriority[100];
 	szPriority[0] = '\0';
-	if (pFileInfo->GetNZBInfo()->GetPriority() != 0)
+	if (pFileInfo->GetPriority() != 0)
 	{
-		sprintf(szPriority, " [%+i]", pFileInfo->GetNZBInfo()->GetPriority());
+		sprintf(szPriority, " [%+i]", pFileInfo->GetPriority());
 	}
 
 	char szCompleted[20];
 	szCompleted[0] = '\0';
 	if (pFileInfo->GetRemainingSize() < pFileInfo->GetSize())
 	{
-		sprintf(szCompleted, ", %i%%", (int)(100 - pFileInfo->GetRemainingSize() * 100 / pFileInfo->GetSize()));
+		sprintf(szCompleted, ", %i%%", (int)(100 - Util::Int64ToFloat(pFileInfo->GetRemainingSize()) * 100.0 / Util::Int64ToFloat(pFileInfo->GetSize())));
 	}
 
 	char szNZBNiceName[1024];
@@ -853,11 +852,10 @@ void NCursesFrontend::PrintFilename(FileInfo * pFileInfo, int iRow, bool bSelect
 		szNZBNiceName[0] = '\0';
 	}
 
-	char szSize[20];
 	char szBuffer[MAX_SCREEN_WIDTH];
-	snprintf(szBuffer, MAX_SCREEN_WIDTH, "%s%i%s%s%s %s%s (%s%s)%s", Brace1, pFileInfo->GetID(),
-		Brace2, szPriority, szDownloading, szNZBNiceName, pFileInfo->GetFilename(),
-		Util::FormatSize(szSize, sizeof(szSize), pFileInfo->GetSize()),
+	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';
 
@@ -928,8 +926,9 @@ void NCursesFrontend::PrintGroupQueue()
 {
 	int iLineNr = m_iQueueWinTop;
 
-    DownloadQueue* pDownloadQueue = LockQueue();
-	if (pDownloadQueue->GetQueue()->empty())
+    LockQueue();
+	GroupQueue* pGroupQueue = &m_groupQueue;
+	if (pGroupQueue->empty())
     {
 		char szBuffer[MAX_SCREEN_WIDTH];
 		snprintf(szBuffer, sizeof(szBuffer), "%s NZBs for downloading", m_bUseColor ? "" : "*** ");
@@ -944,38 +943,41 @@ void NCursesFrontend::PrintGroupQueue()
 		ResetColWidths();
 		int iCalcLineNr = iLineNr;
 		int i = 0;
-        for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++, i++)
+        for (GroupQueue::iterator it = pGroupQueue->begin(); it != pGroupQueue->end(); it++, i++)
         {
-            NZBInfo* pNZBInfo = *it;
+            GroupInfo* pGroupInfo = *it;
+
 			if (i >= m_iQueueScrollOffset && i < m_iQueueScrollOffset + m_iQueueWinHeight -1)
 			{
-				PrintGroupname(pNZBInfo, iCalcLineNr++, false, true);
+				PrintGroupname(pGroupInfo, iCalcLineNr++, false, true);
 			}
         }
 
 		long long lRemaining = 0;
 		long long lPaused = 0;
 		i = 0;
-        for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++, i++)
+        for (GroupQueue::iterator it = pGroupQueue->begin(); it != pGroupQueue->end(); it++, i++)
         {
-            NZBInfo* pNZBInfo = *it;
+            GroupInfo* pGroupInfo = *it;
+
 			if (i >= m_iQueueScrollOffset && i < m_iQueueScrollOffset + m_iQueueWinHeight -1)
 			{
-				PrintGroupname(pNZBInfo, iLineNr++, i == m_iSelectedQueueEntry, false);
+				PrintGroupname(pGroupInfo, iLineNr++, i == m_iSelectedQueueEntry, false);
 			}
-			lRemaining += pNZBInfo->GetRemainingSize();
-			lPaused += pNZBInfo->GetPausedSize();
+
+			lRemaining += pGroupInfo->GetRemainingSize();
+			lPaused += pGroupInfo->GetPausedSize();
         }
 		
 		char szRemaining[20];
-		Util::FormatSize(szRemaining, sizeof(szRemaining), lRemaining);
+		Util::FormatFileSize(szRemaining, sizeof(szRemaining), lRemaining);
 
 		char szUnpaused[20];
-		Util::FormatSize(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 ? "" : "*** ", (int)pDownloadQueue->GetQueue()->size(), szRemaining, szUnpaused);
+			m_bUseColor ? "" : "*** ", pGroupQueue->size(), szRemaining, szUnpaused);
 		szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
 		PrintTopHeader(szBuffer, m_iQueueWinTop, false);
     }
@@ -989,7 +991,7 @@ void NCursesFrontend::ResetColWidths()
 	m_iColWidthLeft = 0;
 }
 
-void NCursesFrontend::PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected, bool bCalcColWidth)
+void NCursesFrontend::PrintGroupname(GroupInfo * pGroupInfo, int iRow, bool bSelected, bool bCalcColWidth)
 {
 	int color = NCURSES_COLORPAIR_TEXT;
 	char chBrace1 = '[';
@@ -1005,21 +1007,28 @@ void NCursesFrontend::PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected
 	}
 
 	const char* szDownloading = "";
-	if (pNZBInfo->GetActiveDownloads() > 0)
+	if (pGroupInfo->GetActiveDownloads() > 0)
 	{
 		szDownloading = " *";
 	}
 
-	long long lUnpausedRemainingSize = pNZBInfo->GetRemainingSize() - pNZBInfo->GetPausedSize();
+	long long lUnpausedRemainingSize = pGroupInfo->GetRemainingSize() - pGroupInfo->GetPausedSize();
 
 	char szRemaining[20];
-	Util::FormatSize(szRemaining, sizeof(szRemaining), lUnpausedRemainingSize);
+	Util::FormatFileSize(szRemaining, sizeof(szRemaining), lUnpausedRemainingSize);
 
 	char szPriority[100];
 	szPriority[0] = '\0';
-	if (pNZBInfo->GetPriority() != 0)
+	if (pGroupInfo->GetMinPriority() != 0 || pGroupInfo->GetMaxPriority() != 0)
 	{
-		sprintf(szPriority, " [%+i]", pNZBInfo->GetPriority());
+		if (pGroupInfo->GetMinPriority() == pGroupInfo->GetMaxPriority())
+		{
+			sprintf(szPriority, " [%+i]", pGroupInfo->GetMinPriority());
+		}
+		else
+		{
+			sprintf(szPriority, " [%+i..%+i]", pGroupInfo->GetMinPriority(), pGroupInfo->GetMaxPriority());
+		}
 	}
 
 	char szBuffer[MAX_SCREEN_WIDTH];
@@ -1043,28 +1052,28 @@ void NCursesFrontend::PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected
 	if (bPrintFormatted)
 	{
 		char szFiles[20];
-		snprintf(szFiles, 20, "%i/%i", (int)pNZBInfo->GetFileList()->size(), pNZBInfo->GetPausedFileCount());
+		snprintf(szFiles, 20, "%i/%i", pGroupInfo->GetRemainingFileCount(), pGroupInfo->GetPausedFileCount());
 		szFiles[20-1] = '\0';
 		
 		char szTotal[20];
-		Util::FormatSize(szTotal, sizeof(szTotal), pNZBInfo->GetSize());
+		Util::FormatFileSize(szTotal, sizeof(szTotal), pGroupInfo->GetNZBInfo()->GetSize());
 
 		char szNameWithIds[1024];
-		snprintf(szNameWithIds, 1024, "%c%i%c%s%s %s", chBrace1, pNZBInfo->GetID(), chBrace2, 
-			szPriority, szDownloading, pNZBInfo->GetName());
+		snprintf(szNameWithIds, 1024, "%c%i-%i%c%s%s %s", chBrace1, pGroupInfo->GetFirstID(), pGroupInfo->GetLastID(), chBrace2, 
+			szPriority, szDownloading, pGroupInfo->GetNZBInfo()->GetName());
 		szNameWithIds[iNameLen] = '\0';
 
 		char szTime[100];
 		szTime[0] = '\0';
-		int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
-		if (pNZBInfo->GetPausedSize() > 0 && lUnpausedRemainingSize == 0)
+		float fCurrentDownloadSpeed = m_bStandBy ? 0 : m_fCurrentDownloadSpeed;
+		if (pGroupInfo->GetPausedSize() > 0 && lUnpausedRemainingSize == 0)
 		{
 			snprintf(szTime, 100, "[paused]");
-			Util::FormatSize(szRemaining, sizeof(szRemaining), pNZBInfo->GetRemainingSize());
+			Util::FormatFileSize(szRemaining, sizeof(szRemaining), pGroupInfo->GetRemainingSize());
 		}
-		else if (iCurrentDownloadSpeed > 0 && !m_bPauseDownload)
+		else if (fCurrentDownloadSpeed > 0.0 && !(m_bPauseDownload || m_bPauseDownload2))
 		{
-			long long remain_sec = (long long)(lUnpausedRemainingSize / iCurrentDownloadSpeed);
+			long long remain_sec = (long long)(lUnpausedRemainingSize / (fCurrentDownloadSpeed * 1024));
 			int h = (int)(remain_sec / 3600);
 			int m = (int)((remain_sec % 3600) / 60);
 			int s = (int)(remain_sec % 60);
@@ -1096,8 +1105,8 @@ void NCursesFrontend::PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected
 	}
 	else
 	{
-		snprintf(szBuffer, MAX_SCREEN_WIDTH, "%c%i%c%s %s", chBrace1, pNZBInfo->GetID(), 
-			chBrace2, szDownloading, pNZBInfo->GetName());
+		snprintf(szBuffer, MAX_SCREEN_WIDTH, "%c%i-%i%c%s %s", chBrace1, pGroupInfo->GetFirstID(), 
+			pGroupInfo->GetLastID(), chBrace2, szDownloading, pGroupInfo->GetNZBInfo()->GetName());
 	}
 
 	szBuffer[MAX_SCREEN_WIDTH - 1] = '\0';
@@ -1108,73 +1117,79 @@ void NCursesFrontend::PrintGroupname(NZBInfo* pNZBInfo, int iRow, bool bSelected
 	}
 }
 
-bool NCursesFrontend::EditQueue(DownloadQueue::EEditAction eAction, int iOffset)
+void NCursesFrontend::PrepareGroupQueue()
+{
+	m_groupQueue.clear();
+
+    DownloadQueue* pDownloadQueue = LockQueue();
+	pDownloadQueue->BuildGroups(&m_groupQueue);
+	UnlockQueue();
+}
+
+void NCursesFrontend::ClearGroupQueue()
+{
+	for (GroupQueue::iterator it = m_groupQueue.begin(); it != m_groupQueue.end(); it++)
+	{
+		delete *it;
+	}
+	m_groupQueue.clear();
+}
+
+bool NCursesFrontend::EditQueue(QueueEditor::EEditAction eAction, int iOffset)
 {
 	int ID = 0;
 
 	if (m_bGroupFiles)
 	{
-		DownloadQueue* pDownloadQueue = LockQueue();
-		if (m_iSelectedQueueEntry >= 0 && m_iSelectedQueueEntry < (int)pDownloadQueue->GetQueue()->size())
+		if (m_iSelectedQueueEntry >= 0 && m_iSelectedQueueEntry < (int)m_groupQueue.size())
 		{
-			NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->at(m_iSelectedQueueEntry);
-			ID = pNZBInfo->GetID();
-			if (eAction == DownloadQueue::eaFilePause)
+			GroupInfo* pGroupInfo = m_groupQueue[m_iSelectedQueueEntry];
+			ID = pGroupInfo->GetLastID();
+			if (eAction == QueueEditor::eaFilePause)
 			{
-				if (pNZBInfo->GetRemainingSize() == pNZBInfo->GetPausedSize())
+				if (pGroupInfo->GetRemainingSize() == pGroupInfo->GetPausedSize())
 				{
-					eAction = DownloadQueue::eaFileResume;
+					eAction = QueueEditor::eaFileResume;
 				}
-				else if (pNZBInfo->GetPausedSize() == 0 && (pNZBInfo->GetRemainingParCount() > 0) &&
+				else if (pGroupInfo->GetPausedSize() == 0 && (pGroupInfo->GetRemainingParCount() > 0) &&
 					!(m_bLastPausePars && m_iLastEditEntry == m_iSelectedQueueEntry))
 				{
-					eAction = DownloadQueue::eaFilePauseExtraPars;
+					eAction = QueueEditor::eaFilePauseExtraPars;
 					m_bLastPausePars = true;
 				}
 				else
 				{
-					eAction = DownloadQueue::eaFilePause;
+					eAction = QueueEditor::eaFilePause;
 					m_bLastPausePars = false;
 				}
 			}
 		}
-		UnlockQueue();
 
 		// map file-edit-actions to group-edit-actions
-		 DownloadQueue::EEditAction FileToGroupMap[] = {
-			(DownloadQueue::EEditAction)0,
-			DownloadQueue::eaGroupMoveOffset, 
-			DownloadQueue::eaGroupMoveTop, 
-			DownloadQueue::eaGroupMoveBottom, 
-			DownloadQueue::eaGroupPause, 
-			DownloadQueue::eaGroupResume, 
-			DownloadQueue::eaGroupDelete,
-			DownloadQueue::eaGroupPauseAllPars,
-			DownloadQueue::eaGroupPauseExtraPars };
+		QueueEditor::EEditAction FileToGroupMap[] = {
+			(QueueEditor::EEditAction)0,
+			QueueEditor::eaGroupMoveOffset, 
+			QueueEditor::eaGroupMoveTop, 
+			QueueEditor::eaGroupMoveBottom, 
+			QueueEditor::eaGroupPause, 
+			QueueEditor::eaGroupResume, 
+			QueueEditor::eaGroupDelete,
+			QueueEditor::eaGroupPauseAllPars,
+			QueueEditor::eaGroupPauseExtraPars };
 		eAction = FileToGroupMap[eAction];
 	}
 	else
 	{
 		DownloadQueue* pDownloadQueue = LockQueue();
-
-		int iFileNum = 0;
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
+		if (m_iSelectedQueueEntry >= 0 && m_iSelectedQueueEntry < (int)pDownloadQueue->GetFileQueue()->size())
 		{
-			NZBInfo* pNZBInfo = *it;
-			for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++, iFileNum++)
+			FileInfo* pFileInfo = pDownloadQueue->GetFileQueue()->at(m_iSelectedQueueEntry);
+			ID = pFileInfo->GetID();
+			if (eAction == QueueEditor::eaFilePause)
 			{
-				if (m_iSelectedQueueEntry == iFileNum)
-				{
-					FileInfo* pFileInfo = *it2;
-					ID = pFileInfo->GetID();
-					if (eAction == DownloadQueue::eaFilePause)
-					{
-						eAction = !pFileInfo->GetPaused() ? DownloadQueue::eaFilePause : DownloadQueue::eaFileResume;
-					}
-				}
+				eAction = !pFileInfo->GetPaused() ? QueueEditor::eaFilePause : QueueEditor::eaFileResume;
 			}
 		}
-
 		UnlockQueue();
 	}
 
@@ -1258,17 +1273,17 @@ void NCursesFrontend::UpdateInput(int initialKey)
 				break;
 			case 'w':
 				// swicth window sizes
-				if (m_QueueWindowPercentage == 50)
+				if (m_QueueWindowPercentage == 0.5)
 				{
-					m_QueueWindowPercentage = 100;
+					m_QueueWindowPercentage = 1;
 				}
-				else if (m_QueueWindowPercentage == 100 && m_eInputMode != eEditQueue)
+				else if (m_QueueWindowPercentage == 1 && m_eInputMode != eEditQueue)
 				{
 					m_QueueWindowPercentage = 0;
 				}
 				else 
 				{
-					m_QueueWindowPercentage = 50;
+					m_QueueWindowPercentage = 0.5;
 				}
 				CalcWindowSizes();
 				SetCurrentQueueEntry(m_iSelectedQueueEntry);
@@ -1291,9 +1306,12 @@ void NCursesFrontend::UpdateInput(int initialKey)
 				// Key 'p' for pause
 				if (!IsRemoteMode())
 				{
-					info(m_bPauseDownload ? "Unpausing download" : "Pausing download");
+					info(m_bPauseDownload || m_bPauseDownload2 ? "Unpausing download" : "Pausing download");
 				}
-				ServerPauseUnpause(!m_bPauseDownload);
+				ServerPauseUnpause(!(m_bPauseDownload || m_bPauseDownload2), m_bPauseDownload2 && !m_bPauseDownload);
+				break;
+			case '\'':
+				ServerDumpDebug();
 				break;
 			case 'e':
 			case 10: // return
@@ -1303,7 +1321,7 @@ void NCursesFrontend::UpdateInput(int initialKey)
 					m_eInputMode = eEditQueue;
 					if (m_QueueWindowPercentage == 0)
 					{
-						m_QueueWindowPercentage = 50;
+						m_QueueWindowPercentage = 0.5;
 					}
 					return;
 				}
@@ -1379,38 +1397,38 @@ void NCursesFrontend::UpdateInput(int initialKey)
 				break;
 			case 'p':
 				// Key 'p' for pause
-				EditQueue(DownloadQueue::eaFilePause, 0);
+				EditQueue(QueueEditor::eaFilePause, 0);
 				break;
 			case 'd':
 				SetHint(" Use Uppercase \"D\" for delete");
 				break;
 			case 'D':
 				// Delete entry
-				if (EditQueue(DownloadQueue::eaFileDelete, 0))
+				if (EditQueue(QueueEditor::eaFileDelete, 0))
 				{
 					SetCurrentQueueEntry(m_iSelectedQueueEntry);
 				}
 				break;
 			case 'u':
-				if (EditQueue(DownloadQueue::eaFileMoveOffset, -1))
+				if (EditQueue(QueueEditor::eaFileMoveOffset, -1))
 				{
 					SetCurrentQueueEntry(m_iSelectedQueueEntry - 1);
 				}
 				break;
 			case 'n':
-				if (EditQueue(DownloadQueue::eaFileMoveOffset, +1))
+				if (EditQueue(QueueEditor::eaFileMoveOffset, +1))
 				{
 					SetCurrentQueueEntry(m_iSelectedQueueEntry + 1);
 				}
 				break;
 			case 't':
-				if (EditQueue(DownloadQueue::eaFileMoveTop, 0))
+				if (EditQueue(QueueEditor::eaFileMoveTop, 0))
 				{
 					SetCurrentQueueEntry(0);
 				}
 				break;
 			case 'b':
-				if (EditQueue(DownloadQueue::eaFileMoveBottom, 0))
+				if (EditQueue(QueueEditor::eaFileMoveBottom, 0))
 				{
 					SetCurrentQueueEntry(iQueueSize > 0 ? iQueueSize - 1 : 0);
 				}
@@ -1430,7 +1448,7 @@ void NCursesFrontend::UpdateInput(int initialKey)
 			// Enter
 			else if (iKey == 10 || iKey == 13)
 			{
-				ServerSetDownloadRate(m_iInputValue * 1024);
+				ServerSetDownloadRate((float)m_iInputValue);
 				m_eInputMode = eNormal;
 				return;
 			}

NCursesFrontend.h

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

NNTPConnection.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@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
@@ -34,8 +34,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
-#include <ctype.h>
+#include <cstdio>
 
 #include "nzbget.h"
 #include "Log.h"
@@ -51,12 +50,15 @@ NNTPConnection::NNTPConnection(NewsServer* pNewsServer) : Connection(pNewsServer
 	m_szActiveGroup = NULL;
 	m_szLineBuf = (char*)malloc(CONNECTION_LINEBUFFER_SIZE);
 	m_bAuthError = false;
-	SetCipher(pNewsServer->GetCipher());
 }
 
 NNTPConnection::~NNTPConnection()
 {
-	free(m_szActiveGroup);
+	if (m_szActiveGroup)
+	{
+		free(m_szActiveGroup);
+		m_szActiveGroup = NULL;
+	}
 	free(m_szLineBuf);
 }
 
@@ -82,14 +84,17 @@ const char* NNTPConnection::Request(const char* req)
 	{
 		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;
@@ -97,16 +102,13 @@ const char* NNTPConnection::Request(const char* req)
 
 bool NNTPConnection::Authenticate()
 {
-	if (strlen(m_pNewsServer->GetUser()) == 0 || strlen(m_pNewsServer->GetPassword()) == 0)
+	if (!(m_pNewsServer)->GetUser() ||
+		!(m_pNewsServer)->GetPassword())
 	{
-		ReportError("Could not connect to %s: server requested authorization but username/password are not set in settings",
-			m_pNewsServer->GetHost(), false, 0);
-		m_bAuthError = true;
-		return false;
+		return true;
 	}
 
-	m_bAuthError = !AuthInfoUser(0);
-	return !m_bAuthError;
+	return AuthInfoUser();
 }
 
 bool NNTPConnection::AuthInfoUser(int iRecur)
@@ -125,7 +127,7 @@ bool NNTPConnection::AuthInfoUser(int iRecur)
 	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 	if (!answer)
 	{
-		ReportErrorAnswer("Authorization for %s (%s) failed: Connection closed by remote host", NULL);
+		ReportError("Authorization for %s failed: Connection closed by remote host.", GetHost(), true, 0);
 		return false;
 	}
 
@@ -147,7 +149,7 @@ bool NNTPConnection::AuthInfoUser(int iRecur)
 
 	if (GetStatus() != csCancelled)
 	{
-		ReportErrorAnswer("Authorization for %s (%s) failed: %s", answer);
+		ReportErrorAnswer("Authorization for %s failed (Answer: %s)", answer);
 	}
 	return false;
 }
@@ -168,7 +170,7 @@ bool NNTPConnection::AuthInfoPass(int iRecur)
 	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 	if (!answer)
 	{
-		ReportErrorAnswer("Authorization failed for %s (%s): Connection closed by remote host", NULL);
+		ReportError("Authorization for %s failed: Connection closed by remote host.", GetHost(), true, 0);
 		return false;
 	}
 	else if (!strncmp(answer, "2", 1))
@@ -185,7 +187,7 @@ bool NNTPConnection::AuthInfoPass(int iRecur)
 
 	if (GetStatus() != csCancelled)
 	{
-		ReportErrorAnswer("Authorization for %s (%s) failed: %s", answer);
+		ReportErrorAnswer("Authorization for %s failed (Answer: %s)", answer);
 	}
 	return false;
 }
@@ -204,11 +206,19 @@ const char* NNTPConnection::JoinGroup(const char* grp)
 	tmp[1024-1] = '\0';
 
 	const char* answer = Request(tmp);
+	if (m_bAuthError)
+	{
+		return answer;
+	}
 
 	if (answer && !strncmp(answer, "2", 1))
 	{
 		debug("Changed group to %s on %s", grp, GetHost());
-		free(m_szActiveGroup);
+
+		if (m_szActiveGroup)
+		{
+			free(m_szActiveGroup);
+		}
 		m_szActiveGroup = strdup(grp);
 	}
 	else
@@ -219,39 +229,26 @@ const char* NNTPConnection::JoinGroup(const char* grp)
 	return answer;
 }
 
-bool NNTPConnection::Connect()
+bool NNTPConnection::DoConnect()
 {
 	debug("Opening connection to %s", GetHost());
-
-	if (m_eStatus == csConnected)
+	bool res = Connection::DoConnect();
+	if (!res)
 	{
-		return true;
+		return res;
 	}
 
-	if (!Connection::Connect())
-	{
-		return false;
-	}
-
-	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
+	char* answer = DoReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 
 	if (!answer)
 	{
-		ReportErrorAnswer("Connection to %s (%s) failed: Connection closed by remote host", NULL);
-		Disconnect();
+		ReportError("Connection to %s failed: Connection closed by remote host.", GetHost(), true, 0);
 		return false;
 	}
 
 	if (strncmp(answer, "2", 1))
 	{
-		ReportErrorAnswer("Connection to %s (%s) failed: %s", answer);
-		Disconnect();
-		return false;
-	}
-
-	if ((strlen(m_pNewsServer->GetUser()) > 0 && strlen(m_pNewsServer->GetPassword()) > 0) &&
-		!Authenticate())
-	{
+		ReportErrorAnswer("Connection to %s failed (Answer: %s)", answer);
 		return false;
 	}
 
@@ -260,24 +257,24 @@ bool NNTPConnection::Connect()
 	return true;
 }
 
-bool NNTPConnection::Disconnect()
+bool NNTPConnection::DoDisconnect()
 {
 	if (m_eStatus == csConnected)
 	{
-		if (!m_bBroken)
+		Request("quit\r\n");
+		if (m_szActiveGroup)
 		{
-			Request("quit\r\n");
+			free(m_szActiveGroup);
+			m_szActiveGroup = NULL;
 		}
-		free(m_szActiveGroup);
-		m_szActiveGroup = NULL;
 	}
-	return Connection::Disconnect();
+	return Connection::DoDisconnect();
 }
 
 void NNTPConnection::ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer)
 {
 	char szErrStr[1024];
-	snprintf(szErrStr, 1024, szMsgPrefix, m_pNewsServer->GetName(), m_pNewsServer->GetHost(), szAnswer);
+	snprintf(szErrStr, 1024, szMsgPrefix, GetHost(), szAnswer);
 	szErrStr[1024-1] = '\0';
 	
 	ReportError(szErrStr, NULL, false, 0);

NNTPConnection.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@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
@@ -33,27 +33,26 @@
 class NNTPConnection : public Connection
 {
 private:
-	NewsServer*			m_pNewsServer;
-	char* 				m_szActiveGroup;
-	char*				m_szLineBuf;
-	bool				m_bAuthError;
+	NewsServer*				m_pNewsServer;
+	char* 					m_szActiveGroup;
+	char*					m_szLineBuf;
+	bool					m_bAuthError;
 
-	void				Clear();
-	void				ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer);
-	bool 				Authenticate();
-	bool 				AuthInfoUser(int iRecur);
-	bool 				AuthInfoPass(int iRecur);
+	virtual bool 			DoConnect();
+	virtual bool 			DoDisconnect();
+	void					Clear();
+	void					ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer);
 
 public:
-						NNTPConnection(NewsServer* pNewsServer);
-	virtual				~NNTPConnection();
-	virtual bool 		Connect();
-	virtual bool		Disconnect();
-	NewsServer*			GetNewsServer() { return m_pNewsServer; }
-	const char* 		Request(const char* req);
-	const char*			JoinGroup(const char* grp);
-	bool				GetAuthError() { return m_bAuthError; }
-
+							NNTPConnection(NewsServer* pNewsServer);
+	virtual					~NNTPConnection();
+	NewsServer*				GetNewsServer() { return m_pNewsServer; }
+	const char* 			Request(const char* req);
+	bool 					Authenticate();
+	bool 					AuthInfoUser(int iRecur = 0);
+	bool 					AuthInfoPass(int iRecur = 0);
+	const char*				JoinGroup(const char* grp);
+	bool					GetAuthError() { return m_bAuthError; }
 };
 
 #endif

NTService.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #include "win32.h"
 
 #include <string.h>
-#include <stdio.h>
 
 #include "nzbget.h"
 #include "Log.h"
@@ -201,24 +200,3 @@ void InstallUninstallServiceCheck(int argc, char *argv[])
 		exit(0);
 	}
 }
-
-bool IsServiceRunning()
-{
-	SC_HANDLE scm = OpenSCManager(0, 0, 0);
-	if (!scm)
-	{
-		return false;
-	}
-
-	SC_HANDLE hService = OpenService(scm, "NZBGet", SERVICE_QUERY_STATUS);
-	SERVICE_STATUS ServiceStatus;
-	bool bRunning = false;
-	if (hService && QueryServiceStatus(hService, &ServiceStatus))
-	{
-		bRunning = ServiceStatus.dwCurrentState != SERVICE_STOPPED;
-	}
-
-	CloseServiceHandle(scm);
-
-	return bRunning;
-}

NTService.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,6 +30,5 @@ typedef void (*RunProc)(void);
 
 void InstallUninstallServiceCheck(int argc, char *argv[]);
 void StartService(RunProc RunProcPtr);
-bool IsServiceRunning();
 
 #endif

NZBFile.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,7 +34,6 @@
 
 #include <string.h>
 #include <list>
-#include <ctype.h>
 #ifdef WIN32
 #include <comutil.h>
 #import <msxml.tlb> named_guids 
@@ -54,24 +53,28 @@ using namespace MSXML;
 #include "DiskState.h"
 #include "Util.h"
 
+extern Options* g_pOptions;
+extern DiskState* g_pDiskState;
+
 NZBFile::NZBFile(const char* szFileName, const char* szCategory)
 {
     debug("Creating NZBFile");
 
     m_szFileName = strdup(szFileName);
-	m_szPassword = NULL;
 	m_pNZBInfo = new NZBInfo();
+	m_pNZBInfo->AddReference();
 	m_pNZBInfo->SetFilename(szFileName);
 	m_pNZBInfo->SetCategory(szCategory);
 	m_pNZBInfo->BuildDestDirName();
 
 #ifndef WIN32
-	m_bPassword = false;
 	m_pFileInfo = NULL;
 	m_pArticle = NULL;
 	m_szTagContent = NULL;
 	m_iTagContentLen = 0;
 #endif
+
+    m_FileInfos.clear();
 }
 
 NZBFile::~NZBFile()
@@ -79,20 +82,53 @@ NZBFile::~NZBFile()
     debug("Destroying NZBFile");
 
     // Cleanup
-    free(m_szFileName);
-    free(m_szPassword);
+    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();
+	}
 
 #ifndef WIN32
-	delete m_pFileInfo;
-	free(m_szTagContent);
+	if (m_pFileInfo)
+	{
+		delete m_pFileInfo;
+	}
+	
+	if (m_szTagContent)
+	{
+		free(m_szTagContent);
+	}
 #endif
-
-	delete m_pNZBInfo;
 }
 
 void NZBFile::LogDebugInfo()
 {
-    info(" NZBFile %s", m_szFileName);
+    debug(" NZBFile %s", m_szFileName);
+}
+
+void NZBFile::DetachFileInfos()
+{
+    m_FileInfos.clear();
+}
+
+NZBFile* NZBFile::CreateFromBuffer(const char* szFileName, const char* szCategory, const char* szBuffer, int iSize)
+{
+	return Create(szFileName, szCategory, szBuffer, iSize, true);
+}
+
+NZBFile* NZBFile::CreateFromFile(const char* szFileName, const char* szCategory)
+{
+	return Create(szFileName, szCategory, NULL, 0, false);
 }
 
 void NZBFile::AddArticle(FileInfo* pFileInfo, ArticleInfo* pArticleInfo)
@@ -101,100 +137,47 @@ void NZBFile::AddArticle(FileInfo* pFileInfo, ArticleInfo* pArticleInfo)
 	while ((int)pFileInfo->GetArticles()->size() < pArticleInfo->GetPartNumber())
 		pFileInfo->GetArticles()->push_back(NULL);
 
-	int index = pArticleInfo->GetPartNumber() - 1;
-	if ((*pFileInfo->GetArticles())[index])
-	{
-		delete (*pFileInfo->GetArticles())[index];
-	}
-	(*pFileInfo->GetArticles())[index] = pArticleInfo;
+	(*pFileInfo->GetArticles())[pArticleInfo->GetPartNumber() - 1] = pArticleInfo;
 }
 
 void NZBFile::AddFileInfo(FileInfo* pFileInfo)
 {
-	// calculate file size and delete empty articles
-
-	long long lSize = 0;
-	long long lMissedSize = 0;
-	long long lOneSize = 0;
-	int iUncountedArticles = 0;
-	int iMissedArticles = 0;
+	// deleting empty articles
 	FileInfo::Articles* pArticles = pFileInfo->GetArticles();
-	int iTotalArticles = (int)pArticles->size();
 	int i = 0;
-	for (FileInfo::Articles::iterator it = pArticles->begin(); it != pArticles->end(); )
+	for (FileInfo::Articles::iterator it = pArticles->begin(); it != pArticles->end();)
 	{
-		ArticleInfo* pArticle = *it;
-		if (!pArticle)
+		if (*it == NULL)
 		{
 			pArticles->erase(it);
 			it = pArticles->begin() + i;
-			iMissedArticles++;
-			if (lOneSize > 0)
-			{
-				lMissedSize += lOneSize;
-			}
-			else
-			{
-				iUncountedArticles++;
-			}
 		}
 		else
 		{
-			lSize += pArticle->GetSize();
-			if (lOneSize == 0)
-			{
-				lOneSize = pArticle->GetSize();
-			}
 			it++;
 			i++;
 		}
 	}
 
-	if (pArticles->empty())
+	if (!pArticles->empty())
 	{
-		delete pFileInfo;
-		return;
+		m_FileInfos.push_back(pFileInfo);
+		pFileInfo->SetNZBInfo(m_pNZBInfo);
+		m_pNZBInfo->SetSize(m_pNZBInfo->GetSize() + pFileInfo->GetSize());
+		m_pNZBInfo->SetFileCount(m_pNZBInfo->GetFileCount() + 1);
+	}
+	else
+	{
+		delete pFileInfo; 
 	}
-
-	lMissedSize += iUncountedArticles * lOneSize;
-	lSize += lMissedSize;
-	m_pNZBInfo->GetFileList()->push_back(pFileInfo);
-	pFileInfo->SetNZBInfo(m_pNZBInfo);
-	pFileInfo->SetSize(lSize);
-	pFileInfo->SetRemainingSize(lSize - lMissedSize);
-	pFileInfo->SetMissedSize(lMissedSize);
-	pFileInfo->SetTotalArticles(iTotalArticles);
-	pFileInfo->SetMissedArticles(iMissedArticles);
 }
 
 void NZBFile::ParseSubject(FileInfo* pFileInfo, bool TryQuotes)
 {
-	// Example subject: some garbage "title" yEnc (10/99)
-
-	// strip the "yEnc (10/99)"-suffix
-	char szSubject[1024];
-	strncpy(szSubject, pFileInfo->GetSubject(), sizeof(szSubject));
-	szSubject[1024-1] = '\0';
-	char* end = szSubject + strlen(szSubject) - 1;
-	if (*end == ')')
-	{
-		end--;
-		while (strchr("0123456789", *end) && end > szSubject) end--;
-		if (*end == '/')
-		{
-			end--;
-			while (strchr("0123456789", *end) && end > szSubject) end--;
-			if (end - 6 > szSubject && !strncmp(end - 6, " yEnc (", 7))
-			{
-				end[-6] = '\0';
-			}
-		}
-	}
-
 	if (TryQuotes)
 	{
 		// try to use the filename in quatation marks 
-		char* p = szSubject;
+		char* p = (char*)pFileInfo->GetSubject();
 		char* start = strchr(p, '\"');
 		if (start)
 		{
@@ -226,7 +209,7 @@ void NZBFile::ParseSubject(FileInfo* pFileInfo, bool TryQuotes)
 	tokens.clear();
 
 	// tokenizing
-	char* p = szSubject;
+	char* p = (char*)pFileInfo->GetSubject();
 	char* start = p;
 	bool quot = false;
 	while (true)
@@ -303,11 +286,11 @@ void NZBFile::ParseSubject(FileInfo* pFileInfo, bool TryQuotes)
 
 bool NZBFile::HasDuplicateFilenames()
 {
-	for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
+	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
     {
         FileInfo* pFileInfo1 = *it;
 		int iDupe = 1;
-		for (FileList::iterator it2 = it + 1; it2 != m_pNZBInfo->GetFileList()->end(); it2++)
+		for (FileInfos::iterator it2 = it + 1; it2 != m_FileInfos.end(); it2++)
 		{
 			FileInfo* pFileInfo2 = *it2;
 			if (!strcmp(pFileInfo1->GetFilename(), pFileInfo2->GetFilename()) &&
@@ -323,7 +306,7 @@ bool NZBFile::HasDuplicateFilenames()
 		// false "duplicate files"-alarm.
 		// It's Ok for just two files to have the same filename, this is 
 		// an often case by posting-errors to repost bad files
-		if (iDupe > 2 || (iDupe == 2 && m_pNZBInfo->GetFileList()->size() == 2))
+		if (iDupe > 2 || (iDupe == 2 && m_FileInfos.size() == 2))
 		{
 			return true;
 		}
@@ -335,9 +318,9 @@ bool NZBFile::HasDuplicateFilenames()
 /**
  * Generate filenames from subjects and check if the parsing of subject was correct
  */
-void NZBFile::BuildFilenames()
+void NZBFile::ProcessFilenames()
 {
-	for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
+	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
     {
         FileInfo* pFileInfo = *it;
 		ParseSubject(pFileInfo, true);
@@ -345,7 +328,7 @@ void NZBFile::BuildFilenames()
 
 	if (HasDuplicateFilenames())
     {
-		for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
+		for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
 		{
 			FileInfo* pFileInfo = *it;
 			ParseSubject(pFileInfo, false);
@@ -354,168 +337,27 @@ void NZBFile::BuildFilenames()
 
 	if (HasDuplicateFilenames())
     {
-		m_pNZBInfo->SetManyDupeFiles(true);
-		for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
+		for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
 		{
 			FileInfo* pFileInfo = *it;
 			pFileInfo->SetFilename(pFileInfo->GetSubject());
 		}
     }
-}
 
-bool CompareFileInfo(FileInfo* pFirst, FileInfo* pSecond)
-{
-	return strcmp(pFirst->GetFilename(), pSecond->GetFilename()) > 0;
-}
-
-void NZBFile::CalcHashes()
-{
-	TempFileList fileList;
-
-	for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
-	{
-		fileList.push_back(*it);
-	}
-
-	fileList.sort(CompareFileInfo);
-
-	unsigned int iFullContentHash = 0;
-	unsigned int iFilteredContentHash = 0;
-	int iUseForFilteredCount = 0;
-
-	for (TempFileList::iterator it = fileList.begin(); it != fileList.end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-
-		// check file extension
-		bool bSkip = !pFileInfo->GetParFile() &&
-			Util::MatchFileExt(pFileInfo->GetFilename(), g_pOptions->GetExtCleanupDisk(), ",;");
-
-		for (FileInfo::Articles::iterator it = pFileInfo->GetArticles()->begin(); it != pFileInfo->GetArticles()->end(); it++)
-		{
-			ArticleInfo* pArticle = *it;
-			int iLen = strlen(pArticle->GetMessageID());
-			iFullContentHash = Util::HashBJ96(pArticle->GetMessageID(), iLen, iFullContentHash);
-			if (!bSkip)
-			{
-				iFilteredContentHash = Util::HashBJ96(pArticle->GetMessageID(), iLen, iFilteredContentHash);
-				iUseForFilteredCount++;
-			}
-		}
-	}
-
-	// if filtered hash is based on less than a half of files - do not use filtered hash at all
-	if (iUseForFilteredCount < (int)fileList.size() / 2)
-	{
-		iFilteredContentHash = 0;
-	}
-
-	m_pNZBInfo->SetFullContentHash(iFullContentHash);
-	m_pNZBInfo->SetFilteredContentHash(iFilteredContentHash);
-}
-
-void NZBFile::ProcessFiles()
-{
-	BuildFilenames();
-
-	for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
+	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
+    {
+        FileInfo* pFileInfo = *it;
 		pFileInfo->MakeValidFilename();
-
-		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
-		bool bParFile = strstr(szLoFileName, ".par2");
-
-		m_pNZBInfo->SetFileCount(m_pNZBInfo->GetFileCount() + 1);
-		m_pNZBInfo->SetTotalArticles(m_pNZBInfo->GetTotalArticles() + pFileInfo->GetTotalArticles());
-		m_pNZBInfo->SetSize(m_pNZBInfo->GetSize() + pFileInfo->GetSize());
-		m_pNZBInfo->SetRemainingSize(m_pNZBInfo->GetRemainingSize() + pFileInfo->GetRemainingSize());
-		m_pNZBInfo->SetFailedSize(m_pNZBInfo->GetFailedSize() + pFileInfo->GetMissedSize());
-		m_pNZBInfo->SetCurrentFailedSize(m_pNZBInfo->GetFailedSize());
-
-		pFileInfo->SetParFile(bParFile);
-		if (bParFile)
+		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
 		{
-			m_pNZBInfo->SetParSize(m_pNZBInfo->GetParSize() + pFileInfo->GetSize());
-			m_pNZBInfo->SetParFailedSize(m_pNZBInfo->GetParFailedSize() + pFileInfo->GetMissedSize());
-			m_pNZBInfo->SetParCurrentFailedSize(m_pNZBInfo->GetParFailedSize());
-			m_pNZBInfo->SetRemainingParCount(m_pNZBInfo->GetRemainingParCount() + 1);
-		}
-	}
-
-	m_pNZBInfo->UpdateMinMaxTime();
-
-	CalcHashes();
-
-	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-	{
-		for (FileList::iterator it = m_pNZBInfo->GetFileList()->begin(); it != m_pNZBInfo->GetFileList()->end(); it++)
-		{
-			FileInfo* pFileInfo = *it;
 			g_pDiskState->SaveFile(pFileInfo);
 			pFileInfo->ClearArticles();
 		}
 	}
-
-	if (m_szPassword)
-	{
-		ReadPassword();
-	}
-}
-
-/**
- * Password read using XML-parser may have special characters (such as TAB) stripped.
- * This function rereads password directly from file to keep all characters intact.
- */
-void NZBFile::ReadPassword()
-{
-    FILE* pFile = fopen(m_szFileName, FOPEN_RB);
-    if (!pFile)
-    {
-        return;
-    }
-
-    // obtain file size.
-    fseek(pFile , 0 , SEEK_END);
-    int iSize  = (int)ftell(pFile);
-    rewind(pFile);
-
-	// reading first 4KB of the file
-
-    // allocate memory to contain the whole file.
-    char* buf = (char*)malloc(4096);
-
-	iSize = iSize < 4096 ? iSize : 4096;
-
-    // copy the file into the buffer.
-    fread(buf, 1, iSize, pFile);
-
-    fclose(pFile);
-
-    buf[iSize-1] = '\0';
-
-	char* szMetaPassword = strstr(buf, "<meta type=\"password\">");
-	if (szMetaPassword)
-	{
-		szMetaPassword += 22; // length of '<meta type="password">'
-		char* szEnd = strstr(szMetaPassword, "</meta>");
-		if (szEnd)
-		{
-			*szEnd = '\0';
-			WebUtil::XmlDecode(szMetaPassword);
-			free(m_szPassword);
-			m_szPassword = strdup(szMetaPassword);
-		}
-	}
-
-	free(buf);
 }
 
 #ifdef WIN32
-bool NZBFile::Parse()
+NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory, const char* szBuffer, int iSize, bool bFromBuffer)
 {
     CoInitialize(NULL);
 
@@ -525,53 +367,48 @@ bool NZBFile::Parse()
 	hr = doc.CreateInstance(MSXML::CLSID_DOMDocument);
     if (FAILED(hr))
     {
-        return false;
+        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(m_szFileName)*3 + 1);
-	EncodeURL(m_szFileName, szURL);
-	debug("url=\"%s\"", szURL);
-	_variant_t v(szURL);
-	free(szURL);
-
-	VARIANT_BOOL success = doc->load(v);
+	VARIANT_BOOL success;
+	if (bFromBuffer)
+	{
+		success = doc->loadXML(szBuffer);
+	}
+	else
+	{
+		// filename needs to be properly encoded
+		char* szURL = (char*)malloc(strlen(szFileName)*3 + 1);
+		EncodeURL(szFileName, szURL);
+		debug("url=\"%s\"", szURL);
+		_variant_t v(szURL);
+		free(szURL);
+		success = doc->load(v);
+	} 
 	if (success == VARIANT_FALSE)
 	{
 		_bstr_t r(doc->GetparseError()->reason);
 		const char* szErrMsg = r;
-
-		char szMessageText[1024];
-		snprintf(szMessageText, 1024, "Error parsing nzb-file %s: %s", Util::BaseFileName(m_szFileName), szErrMsg);
-		szMessageText[1024-1] = '\0';
-		m_pNZBInfo->AddMessage(Message::mkError, szMessageText);
-
-		return false;
+		error("Error parsing nzb-file: %s", szErrMsg);
+		return NULL;
 	}
 
-    if (!ParseNZB(doc))
+    NZBFile* pFile = new NZBFile(szFileName, szCategory);
+    if (pFile->ParseNZB(doc))
 	{
-		return false;
+		pFile->ProcessFilenames();
 	}
-
-	if (GetNZBInfo()->GetFileList()->empty())
+	else
 	{
-		char szMessageText[1024];
-		snprintf(szMessageText, 1024, "Error parsing nzb-file %s: file has no content", Util::BaseFileName(m_szFileName));
-		szMessageText[1024-1] = '\0';
-		m_pNZBInfo->AddMessage(Message::mkError, szMessageText);
-
-		return false;
+		delete pFile;
+		pFile = NULL;
 	}
 
-	ProcessFiles();
-
-    return true;
+    return pFile;
 }
 
 void NZBFile::EncodeURL(const char* szFilename, char* szURL)
@@ -587,7 +424,7 @@ void NZBFile::EncodeURL(const char* szFilename, char* szURL)
 		else
 		{
 			*szURL++ = '%';
-			int a = (unsigned char)ch >> 4;
+			int a = ch >> 4;
 			*szURL++ = a > 9 ? a - 10 + 'a' : a + '0';
 			a = ch & 0xF;
 			*szURL++ = a > 9 ? a - 10 + 'a' : a + '0';
@@ -601,17 +438,10 @@ bool NZBFile::ParseNZB(IUnknown* nzb)
 	MSXML::IXMLDOMDocumentPtr doc = nzb;
 	MSXML::IXMLDOMNodePtr root = doc->documentElement;
 
-	MSXML::IXMLDOMNodePtr node = root->selectSingleNode("/nzb/head/meta[@type='password']");
-	if (node)
-	{
-		_bstr_t password(node->Gettext());
-		m_szPassword = strdup(password);
-	}
-
 	MSXML::IXMLDOMNodeListPtr fileList = root->selectNodes("/nzb/file");
 	for (int i = 0; i < fileList->Getlength(); i++)
 	{
-		node = fileList->Getitem(i);
+		MSXML::IXMLDOMNodePtr node = fileList->Getitem(i);
 		MSXML::IXMLDOMNodePtr attribute = node->Getattributes()->getNamedItem("subject");
 		if (!attribute) return false;
 		_bstr_t subject(attribute->Gettext());
@@ -652,14 +482,16 @@ bool NZBFile::ParseNZB(IUnknown* nzb)
 			int partNumber = atoi(number);
 			int lsize = atoi(bytes);
 
-			if (partNumber > 0)
-			{
-				ArticleInfo* pArticle = new ArticleInfo();
-				pArticle->SetPartNumber(partNumber);
-				pArticle->SetMessageID(szId);
-				pArticle->SetSize(lsize);
-				AddArticle(pFileInfo, pArticle);
-			}
+			ArticleInfo* pArticle = new ArticleInfo();
+			pArticle->SetPartNumber(partNumber);
+			pArticle->SetMessageID(szId);
+			pArticle->SetSize(lsize);
+			AddArticle(pFileInfo, pArticle);
+
+            if (lsize > 0)
+            {
+                pFileInfo->SetSize(pFileInfo->GetSize() + lsize);
+            }
 		}
 
 		AddFileInfo(pFileInfo);
@@ -669,8 +501,10 @@ bool NZBFile::ParseNZB(IUnknown* nzb)
 
 #else
 
-bool NZBFile::Parse()
+NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory, const char* szBuffer, int iSize, bool bFromBuffer)
 {
+    NZBFile* pFile = new NZBFile(szFileName, szCategory);
+
 	xmlSAXHandler SAX_handler = {0};
 	SAX_handler.startElement = reinterpret_cast<startElementSAXFunc>(SAX_StartElement);
 	SAX_handler.endElement = reinterpret_cast<endElementSAXFunc>(SAX_EndElement);
@@ -678,39 +512,34 @@ bool NZBFile::Parse()
 	SAX_handler.error = reinterpret_cast<errorSAXFunc>(SAX_error);
 	SAX_handler.getEntity = reinterpret_cast<getEntitySAXFunc>(SAX_getEntity);
 
-	m_bIgnoreNextError = false;
+	int ret = 0;
+	pFile->m_bIgnoreNextError = false;
 
-	int ret = xmlSAXUserParseFile(&SAX_handler, this, m_szFileName);
-    
-    if (ret != 0)
+	if (bFromBuffer)
 	{
-		char szMessageText[1024];
-		snprintf(szMessageText, 1024, "Error parsing nzb-file %s", Util::BaseFileName(m_szFileName));
-		szMessageText[1024-1] = '\0';
-		m_pNZBInfo->AddMessage(Message::mkError, szMessageText);
-		return false;
+		ret = xmlSAXUserParseMemory(&SAX_handler, pFile, szBuffer, iSize);
 	}
-
-	if (m_pNZBInfo->GetFileList()->empty())
+	else
 	{
-		char szMessageText[1024];
-		snprintf(szMessageText, 1024, "Error parsing nzb-file %s: file has no content", Util::BaseFileName(m_szFileName));
-		szMessageText[1024-1] = '\0';
-		m_pNZBInfo->AddMessage(Message::mkError, szMessageText);
-		return false;
+		ret = xmlSAXUserParseFile(&SAX_handler, pFile, szFileName);
 	}
-
-	ProcessFiles();
-
-	return true;
+        
+    if (ret == 0)
+	{
+		pFile->ProcessFilenames();
+	}
+	else
+	{
+        error("Failed to parse nzb-file");
+		delete pFile;
+		pFile = NULL;
+	}
+	
+	return pFile;
 }
 
 void NZBFile::Parse_StartElement(const char *name, const char **atts)
 {
-	char szTagAttrMessage[1024];
-	snprintf(szTagAttrMessage, 1024, "Malformed nzb-file, tag <%s> must have attributes", name);
-	szTagAttrMessage[1024-1] = '\0';
-
 	if (m_szTagContent)
 	{
 		free(m_szTagContent);
@@ -723,12 +552,6 @@ void NZBFile::Parse_StartElement(const char *name, const char **atts)
 		m_pFileInfo = new FileInfo();
 		m_pFileInfo->SetFilename(m_szFileName);
 
-		if (!atts)
-		{
-	        m_pNZBInfo->AddMessage(Message::mkWarning, szTagAttrMessage);
-			return;
-		}
-
     	for (int i = 0; atts[i]; i += 2)
     	{
     		const char* attrname = atts[i];
@@ -747,16 +570,10 @@ void NZBFile::Parse_StartElement(const char *name, const char **atts)
 	{
 		if (!m_pFileInfo)
 		{
-			m_pNZBInfo->AddMessage(Message::mkWarning, "Malformed nzb-file, tag <segment> without tag <file>");
+			// error: bad nzb-file
 			return;
 		}
-
-		if (!atts)
-		{
-			m_pNZBInfo->AddMessage(Message::mkWarning, szTagAttrMessage);
-			return;
-		}
-
+	
 		long long lsize = -1;
 		int partNumber = -1;
 
@@ -773,6 +590,10 @@ void NZBFile::Parse_StartElement(const char *name, const char **atts)
 				partNumber = atol(attrvalue);
 			}
 		}
+		if (lsize > 0)
+		{
+			m_pFileInfo->SetSize(m_pFileInfo->GetSize() + lsize);
+		}
 
 		if (partNumber > 0)
 		{
@@ -783,15 +604,6 @@ void NZBFile::Parse_StartElement(const char *name, const char **atts)
 			AddArticle(m_pFileInfo, m_pArticle);
 		}
 	}
-	else if (!strcmp("meta", name))
-	{
-		if (!atts)
-		{
-			m_pNZBInfo->AddMessage(Message::mkWarning, szTagAttrMessage);
-			return;
-		}
-		m_bPassword = atts[0] && atts[1] && !strcmp("type", atts[0]) && !strcmp("password", atts[1]);
-	}
 }
 
 void NZBFile::Parse_EndElement(const char *name)
@@ -829,10 +641,6 @@ void NZBFile::Parse_EndElement(const char *name)
 		m_pArticle->SetMessageID(ID);
 		m_pArticle = NULL;
 	}
-	else if (!strcmp("meta", name) && m_bPassword)
-	{
-		m_szPassword = strdup(m_szTagContent);
-	}
 }
 
 void NZBFile::Parse_Content(const char *buf, int len)
@@ -900,7 +708,7 @@ void* NZBFile::SAX_getEntity(NZBFile* pFile, const char * name)
 	xmlEntityPtr e = xmlGetPredefinedEntity((xmlChar* )name);
 	if (!e)
 	{
-		pFile->GetNZBInfo()->AddMessage(Message::mkWarning, "entity not found");
+		warn("entity not found");
 		pFile->m_bIgnoreNextError = true;
 	}
 
@@ -924,10 +732,6 @@ void NZBFile::SAX_error(NZBFile* pFile, const char *msg, ...)
 
 	// remove trailing CRLF
 	for (char* pend = szErrMsg + strlen(szErrMsg) - 1; pend >= szErrMsg && (*pend == '\n' || *pend == '\r' || *pend == ' '); pend--) *pend = '\0';
-
-	char szTextMessage[1024];
-	snprintf(szTextMessage, 1024, "Error parsing nzb-file: %s", szErrMsg);
-	szTextMessage[1024-1] = '\0';
-	pFile->GetNZBInfo()->AddMessage(Message::mkError, szTextMessage);
+    error("Error parsing nzb-file: %s", szErrMsg);
 }
 #endif

NZBFile.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,28 +27,26 @@
 #ifndef NZBFILE_H
 #define NZBFILE_H
 
-#include <list>
+#include <vector>
 
 #include "DownloadInfo.h"
 
 class NZBFile
 {
 public:
-	typedef std::list<FileInfo*>	TempFileList;
+	typedef std::vector<FileInfo*>	FileInfos;
 
 private:
+	FileInfos			m_FileInfos;
 	NZBInfo*			m_pNZBInfo;
 	char*				m_szFileName;
-	char*				m_szPassword;
 
+						NZBFile(const char* szFileName, const char* szCategory);
 	void				AddArticle(FileInfo* pFileInfo, ArticleInfo* pArticleInfo);
 	void				AddFileInfo(FileInfo* pFileInfo);
 	void				ParseSubject(FileInfo* pFileInfo, bool TryQuotes);
-	void				BuildFilenames();
-	void				ProcessFiles();
-	void				CalcHashes();
+	void				ProcessFilenames();
 	bool				HasDuplicateFilenames();
-	void				ReadPassword();
 #ifdef WIN32
     bool 				ParseNZB(IUnknown* nzb);
 	static void			EncodeURL(const char* szFilename, char* szURL);
@@ -58,7 +56,6 @@ private:
 	char*				m_szTagContent;
 	int					m_iTagContentLen;
 	bool				m_bIgnoreNextError;
-	bool				m_bPassword;
 
 	static void			SAX_StartElement(NZBFile* pFile, const char *name, const char **atts);
 	static void			SAX_EndElement(NZBFile* pFile, const char *name);
@@ -69,15 +66,16 @@ private:
 	void				Parse_EndElement(const char *name);
 	void				Parse_Content(const char *buf, int len);
 #endif
+	static NZBFile*		Create(const char* szFileName, const char* szCategory, const char* szBuffer, int iSize, bool bFromBuffer);
 
 public:
-						NZBFile(const char* szFileName, const char* szCategory);
-						~NZBFile();
-	bool				Parse();
+	virtual 			~NZBFile();
+	static NZBFile*		CreateFromBuffer(const char* szFileName, const char* szCategory, const char* szBuffer, int iSize);
+	static NZBFile*		CreateFromFile(const char* szFileName, const char* szCategory);
 	const char* 		GetFileName() const { return m_szFileName; }
+	FileInfos*			GetFileInfos() { return &m_FileInfos; }
 	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
-	const char*			GetPassword() { return m_szPassword; }
-	void				DetachNZBInfo() { m_pNZBInfo = NULL; }
+	void				DetachFileInfos();
 
 	void				LogDebugInfo();
 };

NewsServer.cpp

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-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
@@ -34,49 +34,47 @@
 
 #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 iRetention, int iLevel, int iGroup)
+NewsServer::NewsServer(const char* szHost, int iPort, const char* szUser, const char* szPass, bool bJoinGroup, bool bTLS, int iMaxConnections, int iLevel)
 {
-	m_iID = iID;
-	m_iStateID = 0;
-	m_bActive = bActive;
+	m_szHost = NULL;
 	m_iPort = iPort;
+	m_szUser = NULL;
+	m_szPassword = NULL;
 	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 : "");
-	m_iRetention = iRetention;
-	m_tBlockTime = 0;
 
-	if (szName && strlen(szName) > 0)
+	if (szHost)
 	{
-		m_szName = strdup(szName);
+		m_szHost = strdup(szHost);
 	}
-	else
+	if (szUser)
 	{
-		m_szName = (char*)malloc(20);
-		snprintf(m_szName, 20, "server%i", iID);
-		m_szName[20-1] = '\0';
+		m_szUser = strdup(szUser);
+	}
+	if (szPass)
+	{
+		m_szPassword = strdup(szPass);
 	}
 }
 
 NewsServer::~NewsServer()
 {
-	free(m_szName);
-	free(m_szHost);
-	free(m_szUser);
-	free(m_szPassword);
-	free(m_szCipher);
+	if (m_szHost)
+	{
+		free(m_szHost);
+	}
+	if (m_szUser)
+	{
+		free(m_szUser);
+	}
+	if (m_szPassword)
+	{
+		free(m_szPassword);
+	}
 }

NewsServer.h

@@ -2,7 +2,7 @@
  *  This file if part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@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
@@ -27,59 +27,29 @@
 #ifndef NEWSSERVER_H
 #define NEWSSERVER_H
 
-#include <vector>
-#include <time.h>
-
 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;
-	int				m_iRetention;
-	time_t			m_tBlockTime;
 
 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 iRetention,
-						int iLevel, int iGroup);
+					NewsServer(const char* szHost, int iPort, const char* szUser, const char* szPass, bool bJoinGroup, bool bTLS, int iMaxConnections, int iLevel);
 					~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; }
-	int				GetRetention() { return m_iRetention; }
-	time_t			GetBlockTime() { return m_tBlockTime; }
-	void			SetBlockTime(time_t tBlockTime) { m_tBlockTime = tBlockTime; }
 };
 
-typedef std::vector<NewsServer*>		Servers;
-
 #endif

Observer.cpp

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

Observer.h

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

Options.h

@@ -0,0 +1,403 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This 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 "Thread.h"
+
+class Options
+{
+public:
+	enum EClientOperation
+	{
+		opClientNoOperation,
+		opClientRequestDownload,
+		opClientRequestListFiles,
+		opClientRequestListGroups,
+		opClientRequestListStatus,
+		opClientRequestSetRate,
+		opClientRequestDumpDebug,
+		opClientRequestEditQueue,
+		opClientRequestLog,
+		opClientRequestShutdown,
+		opClientRequestReload,
+		opClientRequestVersion,
+		opClientRequestPostQueue,
+		opClientRequestWriteLog,
+		opClientRequestScanSync,
+		opClientRequestScanAsync,
+		opClientRequestDownloadPause,
+		opClientRequestDownloadUnpause,
+		opClientRequestDownload2Pause,
+		opClientRequestDownload2Unpause,
+		opClientRequestPostPause,
+		opClientRequestPostUnpause,
+		opClientRequestScanPause,
+		opClientRequestScanUnpause,
+		opClientRequestHistory,
+		opClientRequestDownloadUrl,
+		opClientRequestUrlQueue
+	};
+	enum EMessageTarget
+	{
+		mtNone,
+		mtScreen,
+		mtLog,
+		mtBoth
+	};
+	enum EOutputMode
+	{
+		omLoggable,
+		omColored,
+		omNCurses
+	};
+	enum ELoadPars
+	{
+		lpNone,
+		lpOne,
+		lpAll
+	};
+	enum EScriptLogKind
+	{
+		slNone,
+		slDetail,
+		slInfo,
+		slWarning,
+		slError,
+		slDebug
+	};
+
+	enum EMatchMode
+	{
+		mmID = 1,
+		mmName,
+		mmRegEx
+	};
+
+	enum EDomain
+	{
+		dmServer = 1,
+		dmPostProcess
+	};
+
+	class OptEntry
+	{
+	private:
+		char*			m_szName;
+		char*			m_szValue;
+		char*			m_szDefValue;
+		int				m_iLineNo;
+
+		void			SetName(const char* szName);
+		void			SetValue(const char* szValue);
+		void			SetLineNo(int iLineNo) { m_iLineNo = iLineNo; }
+
+		friend class Options;
+
+	public:
+						OptEntry();
+						OptEntry(const char* szName, const char* szValue);
+						~OptEntry();
+		const char*		GetName() { return m_szName; }
+		const char*		GetValue() { return m_szValue; }
+		const char*		GetDefValue() { return m_szDefValue; }
+		int				GetLineNo() { return m_iLineNo; }
+	};
+	
+	typedef std::vector<OptEntry*>  OptEntriesBase;
+
+	class OptEntries: public OptEntriesBase
+	{
+	public:
+						~OptEntries();
+		OptEntry*		FindOption(const char* szName);
+	};
+
+	typedef std::vector<char*>  NameList;
+
+private:
+	OptEntries			m_OptEntries;
+	bool				m_bConfigInitialized;
+	Mutex				m_mutexOptEntries;
+
+	// Options
+	bool				m_bConfigErrors;
+	int					m_iConfigLine;
+	char*				m_szConfigFilename;
+	char*				m_szDestDir;
+	char*				m_szTempDir;
+	char*				m_szQueueDir;
+	char*				m_szNzbDir;
+	char*				m_szWebDir;
+	EMessageTarget		m_eInfoTarget;
+	EMessageTarget		m_eWarningTarget;
+	EMessageTarget		m_eErrorTarget;
+	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_bAppendCategoryDir;
+	bool				m_bContinuePartial;
+	bool				m_bRenameBroken;
+	int					m_iRetries;
+	int					m_iRetryInterval;
+	bool				m_bSaveQueue;
+	bool				m_bDupeCheck;
+	char*				m_szControlIP;
+	char*				m_szControlPassword;
+	int					m_szControlPort;
+	char*				m_szLockFile;
+	char*				m_szDaemonUserName;
+	EOutputMode			m_eOutputMode;
+	bool				m_bReloadQueue;
+	bool				m_bReloadUrlQueue;
+	bool				m_bReloadPostQueue;
+	int					m_iUrlConnections;
+	int					m_iLogBufferSize;
+	bool				m_bCreateLog;
+	char*				m_szLogFile;
+	ELoadPars			m_eLoadPars;
+	bool				m_bParCheck;
+	bool				m_bParRepair;
+	char*				m_szPostProcess;
+	char*				m_szPostConfigFilename;
+	char*				m_szNZBProcess;
+	char*				m_szNZBAddedProcess;
+	bool				m_bStrictParName;
+	bool				m_bNoConfig;
+	int					m_iUMask;
+	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;
+	EScriptLogKind		m_eProcessLogKind;
+	bool				m_bAllowReProcess;
+	bool				m_bTLS;
+	bool				m_bDumpCore;
+	bool				m_bParPauseQueue;
+	bool				m_bPostPauseQueue;
+	bool				m_bNzbCleanupDisk;
+	bool				m_bDeleteCleanupDisk;
+	bool				m_bMergeNzb;
+	int					m_iParTimeLimit;
+	int					m_iKeepHistory;
+	bool				m_bAccurateRate;
+
+	// 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;
+	float				m_fSetRate;
+	int					m_iLogLines;
+	int					m_iWriteLogKind;
+	bool				m_bTestBacktrace;
+
+	// Current state
+	bool				m_bPauseDownload;
+	bool				m_bPauseDownload2;
+	bool				m_bPausePostProcess;
+	bool				m_bPauseScan;
+	float				m_fDownloadRate;
+	EClientOperation	m_eClientOperation;
+
+	void				InitDefault();
+	void				InitOptFile();
+	void				InitCommandLine(int argc, char* argv[]);
+	void				InitOptions();
+	void				InitPostConfig();
+	void				InitFileArg(int argc, char* argv[]);
+	void				InitServers();
+	void				InitScheduler();
+	void				CheckOptions();
+	void				PrintUsage(char* com);
+	void				Dump();
+	int					ParseEnumValue(const char* OptName, int argc, const char* argn[], const int argv[]);
+	int					ParseIntValue(const char* OptName, int iBase);
+	float				ParseFloatValue(const char* OptName);
+	OptEntry*			FindOption(const char* optname);
+	const char*			GetOption(const char* optname);
+	void				SetOption(const char* optname, const char* value);
+	bool				SetOptionString(const char* option);
+	bool				ValidateOptionName(const char* optname);
+	void				LoadConfigFile();
+	void				CheckDir(char** dir, const char* szOptionName, bool bAllowEmpty, bool bCreate);
+	void				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				ConvertOldOptionName(char *szOption, int iBufLen);
+
+public:
+						Options(int argc, char* argv[]);
+						~Options();
+
+	bool				LoadConfig(EDomain eDomain, OptEntries* pOptEntries);
+	bool				SaveConfig(EDomain eDomain, OptEntries* pOptEntries);
+
+	// Options
+	OptEntries*			LockOptEntries();
+	void				UnlockOptEntries();
+	const char*			GetConfigFilename() { return m_szConfigFilename; }
+	const char*			GetDestDir() { return m_szDestDir; }
+	const char*			GetTempDir() { return m_szTempDir; }
+	const char*			GetQueueDir() { return m_szQueueDir; }
+	const char*			GetNzbDir() { return m_szNzbDir; }
+	const char*			GetWebDir() { return m_szWebDir; }
+	bool				GetCreateBrokenLog() const { return m_bCreateBrokenLog; }
+	bool				GetResetLog() const { return m_bResetLog; }
+	EMessageTarget		GetInfoTarget() const { return m_eInfoTarget; }
+	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				GetAppendCategoryDir() { return m_bAppendCategoryDir; }
+	bool				GetContinuePartial() { return m_bContinuePartial; }
+	bool				GetRenameBroken() { return m_bRenameBroken; }
+	int					GetRetries() { return m_iRetries; }
+	int					GetRetryInterval() { return m_iRetryInterval; }
+	bool				GetSaveQueue() { return m_bSaveQueue; }
+	bool				GetDupeCheck() { return m_bDupeCheck; }
+	const char*			GetControlIP() { return m_szControlIP; }
+	const char*			GetControlPassword() { return m_szControlPassword; }
+	int					GetControlPort() { return m_szControlPort; }
+	const char*			GetLockFile() { return m_szLockFile; }
+	const char*			GetDaemonUserName() { return m_szDaemonUserName; }
+	EOutputMode			GetOutputMode() { return m_eOutputMode; }
+	bool				GetReloadQueue() { return m_bReloadQueue; }
+	bool				GetReloadUrlQueue() { return m_bReloadUrlQueue; }
+	bool				GetReloadPostQueue() { return m_bReloadPostQueue; }
+	int					GetUrlConnections() { return m_iUrlConnections; }
+	int					GetLogBufferSize() { return m_iLogBufferSize; }
+	bool				GetCreateLog() { return m_bCreateLog; }
+	const char*			GetLogFile() { return m_szLogFile; }
+	ELoadPars			GetLoadPars() { return m_eLoadPars; }
+	bool				GetParCheck() { return m_bParCheck; }
+	bool				GetParRepair() { return m_bParRepair; }
+	const char*			GetPostProcess() { return m_szPostProcess; }
+	const char*			GetPostConfigFilename() { return m_szPostConfigFilename; }
+	const char*			GetNZBProcess() { return m_szNZBProcess; }
+	const char*			GetNZBAddedProcess() { return m_szNZBAddedProcess; }
+	bool				GetStrictParName() { return m_bStrictParName; }
+	int					GetUMask() { return m_iUMask; }
+	int					GetUpdateInterval() {return m_iUpdateInterval; }
+	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; }
+	EScriptLogKind		GetProcessLogKind() { return m_eProcessLogKind; }
+	bool				GetAllowReProcess() { return m_bAllowReProcess; }
+	bool				GetTLS() { return m_bTLS; }
+	bool				GetDumpCore() { return m_bDumpCore; }
+	bool				GetParPauseQueue() { return m_bParPauseQueue; }
+	bool				GetPostPauseQueue() { return m_bPostPauseQueue; }
+	bool				GetNzbCleanupDisk() { return m_bNzbCleanupDisk; }
+	bool				GetDeleteCleanupDisk() { return m_bDeleteCleanupDisk; }
+	bool				GetMergeNzb() { return m_bMergeNzb; }
+	int					GetParTimeLimit() { return m_iParTimeLimit; }
+	int					GetKeepHistory() { return m_iKeepHistory; }
+	bool				GetAccurateRate() { return m_bAccurateRate; }
+
+	// 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; }
+	float				GetSetRate() { return m_fSetRate; }
+	int					GetLogLines() { return m_iLogLines; }
+	int					GetWriteLogKind() { return m_iWriteLogKind; }
+	bool				GetTestBacktrace() { return m_bTestBacktrace; }
+
+	// Current state
+	void				SetPauseDownload(bool bPauseDownload) { m_bPauseDownload = bPauseDownload; }
+	bool				GetPauseDownload() const { return m_bPauseDownload; }
+	void				SetPauseDownload2(bool bPauseDownload2) { m_bPauseDownload2 = bPauseDownload2; }
+	bool				GetPauseDownload2() const { return m_bPauseDownload2; }
+	void				SetPausePostProcess(bool bPausePostProcess) { m_bPausePostProcess = bPausePostProcess; }
+	bool				GetPausePostProcess() const { return m_bPausePostProcess; }
+	void				SetPauseScan(bool bPauseScan) { m_bPauseScan = bPauseScan; }
+	bool				GetPauseScan() const { return m_bPauseScan; }
+	void				SetDownloadRate(float fRate) { m_fDownloadRate = fRate; }
+	float				GetDownloadRate() const { return m_fDownloadRate; }
+};
+
+#endif

ParChecker.cpp

@@ -0,0 +1,558 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  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 <ctype.h>
+#include <fstream>
+#ifdef WIN32
+#include <par2cmdline.h>
+#include <par2repairer.h>
+#else
+#include <unistd.h>
+#include <libpar2/par2cmdline.h>
+#include <libpar2/par2repairer.h>
+#endif
+
+#include "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_szInfoName = NULL;
+	m_szErrMsg = NULL;
+	m_szProgressLabel = (char*)malloc(1024);
+	m_iFileProgress = 0;
+	m_iStageProgress = 0;
+	m_iExtraFiles = 0;
+	m_bVerifyingExtraFiles = false;
+	m_bCancelled = false;
+	m_eStage = ptLoadingPars;
+	m_QueuedParFiles.clear();
+}
+
+ParChecker::~ParChecker()
+{
+    debug("Destroying ParChecker");
+
+	if (m_szParFilename)
+	{
+		free(m_szParFilename);
+	}
+	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::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;
+	m_bCancelled = false;
+
+	info("Verifying %s", m_szInfoName);
+	SetStatus(psWorking);
+
+    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));
+
+	snprintf(m_szProgressLabel, 1024, "Verifying %s", m_szInfoName);
+	m_szProgressLabel[1024-1] = '\0';
+	m_iFileProgress = 0;
+	m_iStageProgress = 0;
+	UpdateProgress();
+
+    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_bQueuedParFilesChanged = false;
+			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)
+			{
+				// wait until new files are added by "AddParFile" or a change is signaled by "QueueChanged"
+				bool bQueuedParFilesChanged = false;
+				while (!bQueuedParFilesChanged && !IsStopped())
+				{
+					m_mutexQueuedParFiles.Lock();
+					bQueuedParFilesChanged = m_bQueuedParFilesChanged;
+					m_mutexQueuedParFiles.Unlock();
+					usleep(100 * 1000);
+				}
+			}
+		}
+
+		if (IsStopped())
+		{
+			break;
+		}
+
+		bMoreFilesLoaded = LoadMorePars();
+		if (bMoreFilesLoaded)
+		{
+			pRepairer->UpdateVerificationResults();
+			res = pRepairer->Process(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 (m_bCancelled)
+	{
+		warn("Repair cancelled for %s", m_szInfoName);
+		m_szErrMsg = strdup("repair cancelled");
+		SetStatus(psFailed);
+	}
+	else 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_bQueuedParFilesChanged = true;
+	m_mutexQueuedParFiles.Unlock();
+}
+
+void ParChecker::QueueChanged()
+{
+	m_mutexQueuedParFiles.Lock();
+	m_bQueuedParFilesChanged = true;
+	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)
+{
+    const 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);
+			}
+		}
+	}
+}
+
+void ParChecker::Cancel()
+{
+#ifdef HAVE_PAR2_CANCEL
+	((Repairer*)m_pRepairer)->cancelled = true;
+	m_bCancelled = true;
+#else
+	error("Could not cancel par-repair. The used version of libpar2 does not support the cancelling of par-repair. Libpar2 needs to be patched for that feature to work.");
+#endif
+}
+
+#endif

ParChecker.h

@@ -0,0 +1,117 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  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 PARCHECKER_H
+#define PARCHECKER_H
+
+#ifndef DISABLE_PARCHECK
+
+#include <deque>
+
+#include "Thread.h"
+#include "Observer.h"
+
+class ParChecker : public Thread, public Subject
+{
+public:
+	enum EStatus
+	{
+        psUndefined,
+		psWorking,
+		psFailed,
+		psFinished
+	};
+
+	enum EStage
+	{
+		ptLoadingPars,
+		ptVerifyingSources,
+		ptRepairing,
+		ptVerifyingRepaired,
+	};
+
+	typedef std::deque<char*>		QueuedParFiles;
+	
+private:
+	char*				m_szInfoName;
+	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;
+	Mutex			 	m_mutexQueuedParFiles;
+	bool				m_bQueuedParFilesChanged;
+	int					m_iProcessedFiles;
+	int					m_iFilesToRepair;
+	int					m_iExtraFiles;
+	bool				m_bVerifyingExtraFiles;
+	char*				m_szProgressLabel;
+	int					m_iFileProgress;
+	int					m_iStageProgress;
+	bool				m_bCancelled;
+
+	bool				LoadMorePars();
+	bool				CheckSplittedFragments();
+	bool				AddSplittedFragments(const char* szFilename);
+	void				signal_filename(std::string str);
+	void				signal_progress(double progress);
+	void				signal_done(std::string str, int available, int total);
+
+protected:
+	/**
+	* 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
+	*/
+	virtual bool		RequestMorePars(int iBlockNeeded, int* pBlockFound) = 0;
+	virtual void		UpdateProgress() {}
+	EStage				GetStage() { return m_eStage; }
+	const char*			GetProgressLabel() { return m_szProgressLabel; }
+	int					GetFileProgress() { return m_iFileProgress; }
+	int					GetStageProgress() { return m_iStageProgress; }
+
+public:
+						ParChecker();
+	virtual				~ParChecker();
+	virtual void		Run();
+	const char*			GetParFilename() { return m_szParFilename; }
+	void				SetParFilename(const char* szParFilename);
+	const char*			GetInfoName() { return m_szInfoName; }
+	void				SetInfoName(const char* szInfoName);
+	void				SetStatus(EStatus eStatus);
+	EStatus				GetStatus() { return m_eStatus; }
+	const char*			GetErrMsg() { return m_szErrMsg; }
+	bool				GetRepairNotNeeded() { return m_bRepairNotNeeded; }
+	void				AddParFile(const char* szParFilename);
+	void				QueueChanged();
+	void				Cancel();
+	bool				GetCancelled() { return m_bCancelled; }
+};
+
+#endif
+
+#endif

PrePostProcessor.h

@@ -0,0 +1,159 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  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 "Scanner.h"
+
+#ifndef DISABLE_PARCHECK
+#include "ParChecker.h"
+#endif
+
+class PrePostProcessor : public Thread
+{
+public:
+	enum EEditAction
+	{
+		eaPostMoveOffset = 51,			// move post to m_iOffset relative to the current position in post-queue
+		eaPostMoveTop,
+		eaPostMoveBottom,
+		eaPostDelete,
+		eaHistoryDelete,
+		eaHistoryReturn,
+		eaHistoryProcess
+	};
+
+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;
+		PostInfo*			m_pPostInfo;
+	protected:
+		virtual bool	RequestMorePars(int iBlockNeeded, int* pBlockFound);
+		virtual void	UpdateProgress();
+	public:
+		PostInfo*		GetPostInfo() { return m_pPostInfo; }
+		void			SetPostInfo(PostInfo* pPostInfo) { m_pPostInfo = pPostInfo; }
+
+		friend class PrePostProcessor;
+	};
+
+	struct BlockInfo
+	{
+		FileInfo*		m_pFileInfo;
+		int				m_iBlockCount;
+	};
+
+	typedef std::list<BlockInfo*> 	Blocks;
+#endif
+	
+private:
+	QueueCoordinatorObserver	m_QueueCoordinatorObserver;
+	bool				m_bHasMoreJobs;
+	bool				m_bPostScript;
+	bool				m_bSchedulerPauseChanged;
+	bool				m_bSchedulerPause;
+	bool				m_bPostPause;
+	Scanner				m_Scanner;
+
+	bool				IsNZBFileCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, 
+							bool bIgnorePausedPars, bool bCheckPostQueue, bool bAllowOnlyOneDeleted);
+	void				CheckPostQueue();
+	void				JobCompleted(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
+	void				StartScriptJob(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo);
+	void				SaveQueue(DownloadQueue* pDownloadQueue);
+	void				SanitisePostQueue(PostQueue* pPostQueue);
+	void				CheckDiskSpace();
+	void				ApplySchedulerState();
+	bool				PauseDownload();
+	bool				UnpauseDownload();
+	void				NZBAdded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBDownloaded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBDeleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bSaveQueue);
+	bool				FindMainPars(const char* szPath, FileList* pFileList);
+	bool				ParseParFilename(const char* szParFilename, int* iBaseNameLen, int* iBlocks);
+	bool				SameParCollection(const char* szFilename1, const char* szFilename2);
+	bool				CreatePostJobs(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bParCheck, bool bPostScript, bool bAddTop);
+	void				DeleteQueuedFile(const char* szQueuedFile);
+	void				PausePars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	NZBInfo*			MergeGroups(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	bool				PostQueueMove(IDList* pIDList, EEditAction eAction, int iOffset);
+	bool				PostQueueDelete(IDList* pIDList);
+	bool				HistoryDelete(IDList* pIDList);
+	bool				HistoryReturn(IDList* pIDList, bool bReprocess);
+	void				Cleanup();
+	FileInfo*			GetQueueGroup(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				CheckHistory();
+
+#ifndef DISABLE_PARCHECK
+	PostParChecker		m_ParChecker;
+	ParCheckerObserver	m_ParCheckerObserver;
+
+	void				ParCheckerUpdate(Subject* Caller, void* Aspect);
+	bool				AddPar(FileInfo* pFileInfo, bool bDeleted);
+	bool				RequestMorePars(NZBInfo* pNZBInfo, const char* szParFilename, int iBlockNeeded, int* pBlockFound);
+	void				FindPars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, const char* szParFilename, 
+							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; }
+	void				ScanNZBDir(bool bSyncMode);
+	bool				QueueEditList(IDList* pIDList, EEditAction eAction, int iOffset);
+};
+
+#endif

QueueCoordinator.h

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

QueueEditor.cpp

@@ -0,0 +1,927 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <cctype>
+#include <cstdio>
+#include <sys/stat.h>
+#include <set>
+#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 (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+	{
+		FileInfo* pFileInfo = *it;
+		if (pFileInfo->GetID() == iID)
+		{
+			return pFileInfo;
+		}
+	}
+	return NULL;
+}
+
+int QueueEditor::FindFileInfoEntry(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo)
+{
+	int iEntry = 0;
+	for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->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
+ * 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 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->GetFileQueue()->size() - 1)
+		{
+			iNewEntry = (int)pDownloadQueue->GetFileQueue()->size() - 1;
+		}
+
+		if (iNewEntry >= 0 && (unsigned int)iNewEntry <= pDownloadQueue->GetFileQueue()->size() - 1)
+		{
+			FileInfo* fi = pDownloadQueue->GetFileQueue()->at(iEntry);
+			pDownloadQueue->GetFileQueue()->erase(pDownloadQueue->GetFileQueue()->begin() + iEntry);
+			pDownloadQueue->GetFileQueue()->insert(pDownloadQueue->GetFileQueue()->begin() + iNewEntry, fi);
+		}
+	}
+}
+
+/*
+ * Set priority for entry
+ * returns true if successful, false if operation is not possible
+ */
+void QueueEditor::SetPriorityEntry(FileInfo* pFileInfo, const char* szPriority)
+{
+	debug("Setting priority %s for file %s", szPriority, pFileInfo->GetFilename());
+	int iPriority = atoi(szPriority);
+	pFileInfo->SetPriority(iPriority);
+}
+
+bool QueueEditor::EditEntry(int ID, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText)
+{
+	IDList cIDList;
+	cIDList.clear();
+	cIDList.push_back(ID);
+	return EditList(&cIDList, NULL, mmID, bSmartOrder, eAction, iOffset, szText);
+}
+
+bool QueueEditor::LockedEditEntry(DownloadQueue* pDownloadQueue, int ID, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText)
+{
+	IDList cIDList;
+	cIDList.clear();
+	cIDList.push_back(ID);
+	return InternEditList(pDownloadQueue, &cIDList, bSmartOrder, eAction, iOffset, szText);
+}
+
+bool QueueEditor::EditList(IDList* pIDList, NameList* pNameList, EMatchMode eMatchMode, bool bSmartOrder, 
+	EEditAction eAction, int iOffset, const char* szText)
+{
+	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
+
+	bool bOK = true;
+
+	if (pNameList)
+	{
+		pIDList = new IDList();
+		bOK = BuildIDListFromNameList(pDownloadQueue, pIDList, pNameList, eMatchMode, eAction);
+	}
+
+	bOK = bOK && (InternEditList(pDownloadQueue, pIDList, bSmartOrder, eAction, iOffset, szText) || eMatchMode == mmRegEx);
+
+	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+	{
+		g_pDiskState->SaveDownloadQueue(pDownloadQueue);
+	}
+
+	g_pQueueCoordinator->UnlockQueue();
+
+	if (pNameList)
+	{
+		delete pIDList;
+	}
+
+	return bOK;
+}
+
+bool QueueEditor::LockedEditList(DownloadQueue* pDownloadQueue, IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText)
+{
+	return InternEditList(pDownloadQueue, pIDList, bSmartOrder, eAction, iOffset, szText);
+}
+
+bool QueueEditor::InternEditList(DownloadQueue* pDownloadQueue, IDList* pIDList, bool bSmartOrder, EEditAction eAction, int iOffset, const char* szText)
+{
+	if (eAction == eaGroupMoveOffset)
+	{
+		AlignAffectedGroups(pDownloadQueue, pIDList, bSmartOrder, iOffset);
+	}
+
+	ItemList cItemList;
+	PrepareList(pDownloadQueue, &cItemList, pIDList, bSmartOrder, eAction, iOffset);
+
+	if (eAction == eaFilePauseAllPars || eAction == eaFilePauseExtraPars)
+	{
+		PauseParsInGroups(&cItemList, eAction == eaFilePauseExtraPars);
+	}
+	else if (eAction == eaGroupMerge)
+	{
+		MergeGroups(pDownloadQueue, &cItemList);
+	}
+	else if (eAction == eaFileReorder)
+	{
+		ReorderFiles(pDownloadQueue, &cItemList);
+	}
+	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 eaFileSetPriority:
+					SetPriorityEntry(pItem->m_pFileInfo, szText);
+					break;
+
+				case eaGroupSetCategory:
+					SetNZBCategory(pItem->m_pFileInfo->GetNZBInfo(), szText);
+					break;
+
+				case eaGroupSetName:
+					SetNZBName(pItem->m_pFileInfo->GetNZBInfo(), szText);
+					break;
+
+				case eaGroupSetParameter:
+					SetNZBParameter(pItem->m_pFileInfo->GetNZBInfo(), szText);
+					break;
+
+				case eaGroupPause:
+				case eaGroupResume:
+				case eaGroupDelete:
+				case eaGroupMoveTop:
+				case eaGroupMoveBottom:
+				case eaGroupMoveOffset:
+				case eaGroupPauseAllPars:
+				case eaGroupPauseExtraPars:
+				case eaGroupSetPriority:
+					EditGroup(pDownloadQueue, pItem->m_pFileInfo, eAction, iOffset, szText);
+					break;
+
+				case eaFilePauseAllPars:
+				case eaFilePauseExtraPars:
+				case eaGroupMerge:
+				case eaFileReorder:
+					// remove compiler warning "enumeration not handled in switch"
+					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->GetFileQueue()->size();
+			iStep = 1;
+		}
+		else
+		{
+			iStart = pDownloadQueue->GetFileQueue()->size() - 1;
+			iEnd = -1;
+			iStep = -1;
+		}
+		for (int iIndex = iStart; iIndex != iEnd; iIndex += iStep)
+		{
+			FileInfo* pFileInfo = pDownloadQueue->GetFileQueue()->at(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->GetFileQueue()->size()) - 1)
+						{
+							iWorkOffset = int(pDownloadQueue->GetFileQueue()->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 (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->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::BuildIDListFromNameList(DownloadQueue* pDownloadQueue, IDList* pIDList, NameList* pNameList, EMatchMode eMatchMode, EEditAction eAction)
+{
+#ifndef HAVE_REGEX_H
+	if (eMatchMode == mmRegEx)
+	{
+		return false;
+	}
+#endif
+
+	std::set<int> uniqueIDs;
+
+	for (NameList::iterator it = pNameList->begin(); it != pNameList->end(); it++)
+	{
+		const char* szName = *it;
+
+		RegEx *pRegEx = NULL;
+		if (eMatchMode == mmRegEx)
+		{
+			pRegEx = new RegEx(szName);
+			if (!pRegEx->IsValid())
+			{
+				delete pRegEx;
+				return false;
+			}
+		}
+
+		bool bFound = false;
+
+		for (FileQueue::iterator it2 = pDownloadQueue->GetFileQueue()->begin(); it2 != pDownloadQueue->GetFileQueue()->end(); it2++)
+		{
+			FileInfo* pFileInfo = *it2;
+			if (eAction < eaGroupMoveOffset)
+			{
+				// file action
+				char szFilename[MAX_PATH];
+				snprintf(szFilename, sizeof(szFilename) - 1, "%s/%s", pFileInfo->GetNZBInfo()->GetName(), Util::BaseFileName(pFileInfo->GetFilename()));
+				if (((!pRegEx && !strcmp(szFilename, szName)) || (pRegEx && pRegEx->Match(szFilename))) &&
+					(uniqueIDs.find(pFileInfo->GetID()) == uniqueIDs.end()))
+				{
+					uniqueIDs.insert(pFileInfo->GetID());
+					pIDList->push_back(pFileInfo->GetID());
+					bFound = true;
+				}
+			}
+			else
+			{
+				// group action
+				const char *szFilename = pFileInfo->GetNZBInfo()->GetName();
+				if (((!pRegEx && !strcmp(szFilename, szName)) || (pRegEx && pRegEx->Match(szFilename))) &&
+					(uniqueIDs.find(pFileInfo->GetNZBInfo()->GetID()) == uniqueIDs.end()))
+				{
+					uniqueIDs.insert(pFileInfo->GetNZBInfo()->GetID());
+					pIDList->push_back(pFileInfo->GetID());
+					bFound = true;
+				}
+			}
+		}
+
+		if (pRegEx)
+		{
+			delete pRegEx;
+		}
+
+		if (!bFound && (eMatchMode == mmName))
+		{
+			return false;
+		}
+	}
+
+	return true;
+}
+
+bool QueueEditor::EditGroup(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo, EEditAction eAction, int iOffset, const char* szText)
+{
+	IDList cIDList;
+	cIDList.clear();
+
+	// collecting files belonging to group
+	for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->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;
+	}
+	else if (eAction == eaGroupDelete)
+	{
+		pFileInfo->GetNZBInfo()->SetDeleted(true);
+		pFileInfo->GetNZBInfo()->SetCleanupDisk(CanCleanupDisk(pDownloadQueue, pFileInfo->GetNZBInfo()));
+	}
+
+	EEditAction GroupToFileMap[] = { (EEditAction)0, eaFileMoveOffset, eaFileMoveTop, eaFileMoveBottom, 
+		eaFilePause, eaFileResume, eaFileDelete, eaFilePauseAllPars, eaFilePauseExtraPars, eaFileSetPriority, eaFileReorder,
+		eaFileMoveOffset, eaFileMoveTop, eaFileMoveBottom, eaFilePause, eaFileResume, eaFileDelete, 
+		eaFilePauseAllPars, eaFilePauseExtraPars, eaFileSetPriority,
+		(EEditAction)0, (EEditAction)0, (EEditAction)0 };
+
+	return InternEditList(pDownloadQueue, &cIDList, true, GroupToFileMap[eAction], iOffset, szText);
+}
+
+void QueueEditor::BuildGroupList(DownloadQueue* pDownloadQueue, FileList* pGroupList)
+{
+	pGroupList->clear();
+    for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->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->GetNZBInfo());
+	}
+}
+
+void QueueEditor::AlignGroup(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
+{
+	FileInfo* pLastFileInfo = NULL;
+	unsigned int iLastNum = 0;
+	unsigned int iNum = 0;
+	while (iNum < pDownloadQueue->GetFileQueue()->size())
+	{
+		FileInfo* pFileInfo = pDownloadQueue->GetFileQueue()->at(iNum);
+		if (pFileInfo->GetNZBInfo() == pNZBInfo)
+		{
+			if (pLastFileInfo && iNum - iLastNum > 1)
+			{
+				pDownloadQueue->GetFileQueue()->erase(pDownloadQueue->GetFileQueue()->begin() + iNum);
+				pDownloadQueue->GetFileQueue()->insert(pDownloadQueue->GetFileQueue()->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);
+				}
+			}
+		}
+	}
+}
+
+void QueueEditor::SetNZBCategory(NZBInfo* pNZBInfo, const char* szCategory)
+{
+	debug("QueueEditor: setting category '%s' for '%s'", szCategory, Util::BaseFileName(pNZBInfo->GetFilename()));
+
+	g_pQueueCoordinator->SetQueueEntryNZBCategory(pNZBInfo, szCategory);
+}
+
+void QueueEditor::SetNZBName(NZBInfo* pNZBInfo, const char* szName)
+{
+	debug("QueueEditor: renaming '%s' to '%s'", Util::BaseFileName(pNZBInfo->GetFilename()), szName);
+
+	g_pQueueCoordinator->SetQueueEntryNZBName(pNZBInfo, szName);
+}
+
+/**
+* Check if deletion of already downloaded files is possible (when nzb id deleted from queue).
+* The deletion is most always possible, except the case if all remaining files in queue 
+* (belonging to this nzb-file) are PARS.
+*/
+bool QueueEditor::CanCleanupDisk(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
+{
+    for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+    {
+        FileInfo* pFileInfo = *it;
+		char szLoFileName[1024];
+		strncpy(szLoFileName, pFileInfo->GetFilename(), 1024);
+		szLoFileName[1024-1] = '\0';
+		for (char* p = szLoFileName; *p; p++) *p = tolower(*p); // convert string to lowercase
+
+		if (!strstr(szLoFileName, ".par2"))
+		{
+			// non-par file found
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void QueueEditor::MergeGroups(DownloadQueue* pDownloadQueue, ItemList* pItemList)
+{
+	if (pItemList->size() == 0)
+	{
+		return;
+	}
+
+	EditItem* pDestItem = pItemList->front();
+
+	for (ItemList::iterator it = pItemList->begin() + 1; it != pItemList->end(); it++)
+	{
+		EditItem* pItem = *it;
+		if (pItem->m_pFileInfo->GetNZBInfo() != pDestItem->m_pFileInfo->GetNZBInfo())
+		{
+			debug("merge %s to %s", pItem->m_pFileInfo->GetNZBInfo()->GetFilename(), pDestItem->m_pFileInfo->GetNZBInfo()->GetFilename());
+			g_pQueueCoordinator->MergeQueueEntries(pDestItem->m_pFileInfo->GetNZBInfo(), pItem->m_pFileInfo->GetNZBInfo());
+		}
+		delete pItem;
+	}
+
+	// align group
+	AlignGroup(pDownloadQueue, pDestItem->m_pFileInfo->GetNZBInfo());
+
+	delete pDestItem;
+}
+
+void QueueEditor::ReorderFiles(DownloadQueue* pDownloadQueue, ItemList* pItemList)
+{
+	if (pItemList->size() == 0)
+	{
+		return;
+	}
+
+	EditItem* pFirstItem = pItemList->front();
+	NZBInfo* pNZBInfo = pFirstItem->m_pFileInfo->GetNZBInfo();
+	unsigned int iInsertPos = 0;
+
+	// find first file of the group
+    for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+    {
+        FileInfo* pFileInfo = *it;
+		if (pFileInfo->GetNZBInfo() == pNZBInfo)
+		{
+			break;
+		}
+		iInsertPos++;
+	}
+
+	// now can reorder
+	for (ItemList::iterator it = pItemList->begin(); it != pItemList->end(); it++)
+	{
+		EditItem* pItem = *it;
+		FileInfo* pFileInfo = pItem->m_pFileInfo;
+
+		// move file item
+		for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+		{
+			FileInfo* pFileInfo1 = *it;
+			if (pFileInfo1 == pFileInfo)
+			{
+				pDownloadQueue->GetFileQueue()->erase(it);
+				pDownloadQueue->GetFileQueue()->insert(pDownloadQueue->GetFileQueue()->begin() + iInsertPos, pFileInfo);
+				iInsertPos++;				
+				break;
+			}
+		}
+
+		delete pItem;
+	}
+}
+
+void QueueEditor::SetNZBParameter(NZBInfo* pNZBInfo, const char* szParamString)
+{
+	debug("QueueEditor: setting nzb parameter '%s' for '%s'", szParamString, Util::BaseFileName(pNZBInfo->GetFilename()));
+
+	char* szStr = strdup(szParamString);
+
+	char* szValue = strchr(szStr, '=');
+	if (szValue)
+	{
+		*szValue = '\0';
+		szValue++;
+		pNZBInfo->SetParameter(szStr, szValue);
+	}
+	else
+	{
+		error("Could not set nzb parameter for %s: invalid argument: %s", pNZBInfo->GetName(), szParamString);
+	}
+
+	free(szStr);
+}

QueueEditor.h

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

README

@@ -4,7 +4,7 @@
 
 This is a short documentation. For more information please
 visit NZBGet home page at 
-  http://nzbget.net
+  http://nzbget.sourceforge.net
 
 Contents          
 --------
@@ -44,16 +44,25 @@ depends on command-line parameters passed to the program.
 2. Supported OS
 =====================================
 
-NZBGet is written in C++ and works on Windows, OS X, Linux and
-most POSIX-conform OS'es.
+NZBGet is written in C++ and was initialy developed on Linux.
+It was ported to Windows later and tested for compatibility with
+several POSIX-OS'es.
+
+It should run at least on:
+  - Linux Debian 5.0 on x86;
+  - Linux with uClibc on MIPSEL and ARM;
+  - OpenBSD 5.0 on x86;
+  - Mac OS X 10.7 Lion on x64;
+  - Windows XP SP3 on x86 and Windows 7 on x64.
 
 Clients and servers running on different OS'es may communicate with
 each other. For example, you can use NZBGet as client on Windows to 
 control your NZBGet-server running on Linux.
 
 The download-section of NZBGet web-site provides binary files
-for Windows, OS X and Linux. For most POSIX-systems you need to compile
-the program yourself. 
+for Windows. The binary packages for many routers and NAS devices are 
+also available in OPTWARE repository (http://www.nslu2-linux.org), 
+but for most POSIX-systems you need to compile the program yourself. 
 
 If you have downloaded binaries you can just jump to section 
 "Configuration".
@@ -62,8 +71,8 @@ If you have downloaded binaries you can just jump to section
 3. Prerequisites on POSIX
 =====================================
 
-NZBGet is developed on a linux-system, but it runs on other
-POSIX platforms.
+NZBGet is developed on a linux-system, but it should run on other
+POSIX platforms (see the list of tested platforms above).
 
 NZBGet absolutely needs the following libraries:
 
@@ -76,16 +85,20 @@ And the following libraries are optional:
    - libcurses   (usually part of commercial systems)
      or (better)
    - libncurses  (http://invisible-island.net/ncurses)
-    
+   
+ - for par-check and -repair (enabled by default):
+   - libpar2     (http://parchive.sourceforge.net)
+   - libsigc++   (http://libsigc.sourceforge.net)
+ 
  - for encrypted connections (TLS/SSL):
-   - OpenSSL     (http://www.openssl.org)
-     or
    - GnuTLS      (http://www.gnu.org/software/gnutls)
+     or
+   - OpenSSL     (http://www.openssl.org)
 
  - for gzip support in web-server and web-client (enabled by default):
    - zlib     (http://www.zlib.net)
 
-All these libraries are included in modern POSIX distributions and
+All these libraries are included in modern Linux distributions and
 should be available as installable packages. Please note that you also 
 need the developer packages for these libraries too, they package names 
 have often suffix "dev" or "devel". On other systems you may need to 
@@ -138,13 +151,13 @@ You may run configure with additional arguments:
     if you can not use curses/ncurses.
     
   --disable-parcheck - to make without parcheck-support. Use this option
-    if you have troubles when compiling par2-module.
+    if you can not use libpar2 or libsigc++.
 
-  --with-tlslib=(OpenSSL, GnuTLS) - to select which TLS/SSL library
+  --with-tlslib=(GnuTLS, OpenSSL) - to select which TLS/SSL library
     should be used for encrypted server connections.
       
   --disable-tls - to make without TLS/SSL support. Use this option if
-    you can not neither OpenSSL nor GnuTLS.
+    you can not neither GnuTLS nor OpenSSL.
 
   --disable-gzip - to make without gzip support. Use this option
     if you can not use zlib.
@@ -155,13 +168,37 @@ You may run configure with additional arguments:
 Optional package: par-check
 ---------------------------
 NZBGet can check and repair downloaded files for you. For this purpose
-it uses library par2.
+it uses library par2 (libpar2), which needs sigc++ on its part.
 
-For your convenience the source code of libpar2 is integrated into
-NZBGet’s source tree and is compiled automatically when you make NZBGet.
+The libpar2 and libsigc++ (version 2 or later) must be installed on your
+system. On most linux distributions these libraries are available as packages.
+If you do not have these packages you can compile them yourself. 
+Following configure-parameters may be usefull:
 
-In a case errors occur during this process the inclusion of par2-module
-can be disabled using configure option "--disable-parcheck":
+  --with-libpar2-includes
+  --with-libpar2-libraries
+  --with-libsigc-includes
+  --with-libsigc-libraries
+  
+The library libsigc++ must be installed first, since libpar2 requires it.
+
+If you use nzbget on a very slow computer like NAS-device, it may be good to
+limit the time allowed for par-repair (option "ParTimeLimit" in nzbget 
+configuration file). This feature requires a patched version of libpar2.
+To compile that version download the original source code of libpar2
+(version 0.2) and apply patches "libpar2-0.2-bugfixes.patch" and 
+"libpar2-0.2-cancel.patch", provided with nzbget:
+
+  cd libpar2-0.2
+  cp ~/nzbget/libpar2-0.2-*.patch .
+  patch < libpar2-0.2-bugfixes.patch
+  patch < libpar2-0.2-cancel.patch
+  ./configure
+  make
+  make install
+
+If you are not able to use libpar2 or libsigc++ or do not want them you can
+make nzbget without support for par-check using option "--disable-parcheck":
 
   ./configure --disable-parcheck
 
@@ -169,10 +206,10 @@ Optional package: curses
 -------------------------
 For curses-outputmode you need ncurses or curses on your system.
 If you do not have one of them you can download and compile ncurses yourself.
-Following configure-parameters may be useful:
+Following configure-parameters may be usefull:
 
-  --with-libcurses-includes=/path/to/curses/includes
-  --with-libcurses-libraries=/path/to/curses/libraries
+  --with-libcurses-includes
+  --with-libcurses-libraries
 
 If you are not able to use curses or ncurses or do not want them you can
 make the program without support for curses using option "--disable-curses":
@@ -182,20 +219,20 @@ make the program without support for curses using option "--disable-curses":
 Optional package: TLS
 -------------------------
 To enable encrypted server connections (TLS/SSL) you need to build the program
-with TLS/SSL support. NZBGet can use two libraries: OpenSSL or GnuTLS.
+with TLS/SSL support. NZBGet can use two libraries: GnuTLS or OpenSSL.
 Configure-script checks which library is installed and use it. If both are
-available it gives the precedence to OpenSSL. You may override that with
-the option --with-tlslib=(OpenSSL, GnuTLS). For example to build with GnuTLS:
+avialable it gives the precedence to GnuTLS. You may override that with
+the option --with-tlslib=(GnuTLS, OpenSSL). For example to build whith OpenSSL:
 
-  ./configure --with-tlslib= GnuTLS
+  ./configure --with-tlslib=OpenSSL
   
-Following configure-parameters may be useful:
+Following configure-parameters may be usefull:
 
-  --with-libtls-includess=/path/to/gnutls/includes
-  --with-libtls-libraries=/path/to/gnutls/libraries
+  --with-libtls-includes
+  --with-libtls-libraries
 
-  --with-openssl-includess=/path/to/openssl/includes
-  --with-openssl-libraries=/path/to/openssl/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":
@@ -210,14 +247,28 @@ NZBGet is developed using MS Visual C++ 2005. The project file and solution
 are provided. If you use MS Visual C++ 2005 Express you need to download
 and install Platform SDK.
 
-To compile the program with TLS/SSL support you need either OpenSSL or GnuTLS:
-   - OpenSSL  (http://www.openssl.org)
-   or
+To compile the program with par-check-support you also need the following 
+libraries:
+
+   - libsigc++   (http://libsigc.sourceforge.net)
+   - libpar2     (http://parchive.sourceforge.net)
+
+Download these libaries, then use patch-files provided with NZBGet to create
+preconfigured project files and solutions for each library. 
+Look at http://gnuwin32.sourceforge.net/packages/patch.htm for info on how
+to use patch-files, if you do not familiar with this technique.
+
+To compile the program with TLS/SSL support you also need the library:
+
    - GnuTLS   (http://www.gnu.org/software/gnutls)
 
-Also required are:
-   - Regex (http://gnuwin32.sourceforge.net/packages/regex.htm)
-   - Zlib (http://gnuwin32.sourceforge.net/packages/zlib.htm)
+Download a precompiled version of GnuTLS from http://josefsson.org/gnutls4win
+and create lib-file as described there in section "Using the GnuTLS DLL from 
+your Visual Studio program".
+
+After libsigc++ and libpar2 are compiled in static libraries (.lib), the 
+library for GnuTLS is created and include- and libraries-paths are configured 
+in MS Visual C++ 2005 you should be able to compile NZBGet.   
 
 =====================================
 6. Configuration
@@ -244,7 +295,6 @@ The program looks for configuration file in following standard
 locations (in this order):
 
 On POSIX systems:
-  <EXE-DIR>/nzbget.conf
   ~/.nzbget
   /etc/nzbget.conf
   /usr/etc/nzbget.conf
@@ -337,18 +387,9 @@ It prints something like:
 
   [1] nzbname\filename1.rar (50.00 MB)
   [2] nzbname\filename1.r01 (50.00 MB)
-  [3] another-nzb\filename3.r01 (100.00 MB)
-  [4] another-nzb\filename3.r02 (100.00 MB)
 
-This is the list of individual files listed within nzb-file. To print
-the list of nzb-files (without content) add G-modifier to the list command:
-
-  [1] nzbname (4.56 GB)
-  [2] another-nzb (4.20 GB)
-
-The numbers in square braces are ID's of files or groups in queue.
-They can be used in edit-command. For example to move file with
-ID 2 to the top of queue:
+The numbers in square braces are ID's of files in queue. They can be used
+in edit-command. For example to move file with ID 2 to the top of queue:
 
   nzbget -E T 2
   
@@ -361,8 +402,8 @@ or to delete files from queue:
   nzbget -E D 3 10-15 20-21 16
 
 The edit-command has also a group-mode which affects all files from the
-same nzb-file. You need to pass an ID of the group. For example to delete
-the whole group 1:
+same nzb-request. You need to pass one ID of any file in the group. For
+example to delete all files from the first nzb-request:
 
   nzbget -E G D 1
 
@@ -401,15 +442,26 @@ Post processing scripts
 -----------------------
 
 After the download of nzb-file is completed nzbget can call post-processing
-scripts, defined in configuration file.
+script, defined in configuration file. See example configuration file for
+the description of parameters passed to the script (option "PostProcess").
 
-Example post-processing scripts are provided in directory "scripts".
+An example script for unraring of downloaded files is provided in file
+"nzbget-postprocess.sh" installed into "<prefix>/bin". The script requires
+configuration file "nzbget-postprocess.conf". If you have installed the
+program with "make install" this file is copied to "<prefix>/etc",
+where the post-processing script finds it automatically. If you install
+the program manually from a binary archive you have to copy the file
+from "<prefix>/share/nzbget" to the directory where you have put the
+nzbget configuration file ("nzbget.conf").
 
-To use the scripts copy them into your local directory and set options
-<ScriptDir>, <PostScript> and <ScriptOrder>.
+Set the option "PostProcess" in "nzbget.conf" to point to the post-
+processing script.
 
-For information on writing your own post-processing scripts please
-visit NZBGet web site.
+Additional usage instructions are included in "nzbget-postprocess.sh",
+please open the file in a text editor to read them.
+
+NOTE: The post-processing script "nzbget-postprocess.sh" is for
+POSIX systems and will not work on Windows.
 
 Web-interface
 -------------
@@ -428,14 +480,13 @@ and port defined in NZBGet configuration file in options "ControlIP" and
 
   http://localhost:6789/
 
-For login credentials type username and the password defined by
-options "ControlUsername" (default "nzbget") and "ControlPassword"
-(default "tegbzn6789").
+For login credentials type username "nzbget" (predefined and not changeable)
+and the password from the option "ControlPassword" (default is tegbzn6789).
 
 In a case your browser forget credentials, to prevent typing them each
 time, there is a workaround - use URL in the form:
 
-  http://localhost:6789/username:password/
+  http://localhost:6789/nzbget:password/
 
 Please note, that in this case the password is saved in a bookmark or in
 browser history in plain text and is easy to find by persons having
@@ -454,34 +505,8 @@ Bo Cordes Petersen (placebodk@users.sourceforge.net) until 2005.
 In 2007 the abandoned project was overtaken by Andrey Prygunkov.
 Since then the program has been completely rewritten.
 
-NZBGet distribution archive includes additional components
-written by other authors:
-
-Par2:
-	Peter Brian Clements <peterbclements@users.sourceforge.net>
-
-Par2 library API:
-	Francois Lesueur <flesueur@users.sourceforge.net>
-
-Catch:
-	Two Blue Cubes Ltd <https://github.com/philsquared/Catch>
-
-jQuery:
-	John Resig <http://jquery.com>
-	The Dojo Foundation <http://sizzlejs.com>
-
-Bootstrap:
-	Twitter, Inc <http://twitter.github.com/bootstrap>
-
-Raphaël:
-	Dmitry Baranovskiy <http://raphaeljs.com>
-	Sencha Labs <http://sencha.com>
-
-Elycharts:
-	Void Labs s.n.c. <http://void.it>
-
-iconSweets:
-	Yummygum <http://yummygum.com>
+Module TLS (TLS.c, TLS.h) is based on work by Martin Lambers
+(marlam@marlam.de).
 
 =====================================
 9. Copyright
@@ -496,13 +521,21 @@ The complete content of license is provided in file COPYING.
 
 Additional exemption: compiling, linking, and/or using OpenSSL is allowed.
 
+Binary distribution for Windows contains code from the following libraries:
+
+   - libpar2     (http://parchive.sourceforge.net)
+   - libsigc++   (http://libsigc.sourceforge.net)
+   - GnuTLS      (http://www.gnu.org/software/gnutls)
+
+libpar2 is distributed under GPL; libsigc++ and GnuTLS - under LGPL.
+
 =====================================
 10. Contact
 =====================================
 
 If you encounter any problem, feel free to use the forum
 
-    nzbget.net/forum
+    nzbget.sourceforge.net/forum
 
 or contact me at
 

README.md

@@ -1,15 +0,0 @@
-# NZBGet #
-NZBGet is a binary downloader, which downloads files from Usenet
-based on information given in nzb-files. 
-
-NZBGet is written in C++ and is known for its extraordinary performance and efficiency.
-
-NZBGet can be run at almost every platform - classic PCs, NAS, media players, SAT-receivers, WLAN-routers, etc.
-The download area provides precompiled binaries
-for Windows, Mac OS X and Linux (compatible with many CPUs and platform variants). For other platforms
-the program can be compiled from sources.
-
-- [Home page (nzbget.net)](http://nzbget.net) - for first time visitors, learn more about NZBGet;
-- [Downloads](http://nzbget.net/download) - get the binaries and sources;
-- [Documentation](https://github.com/nzbget/nzbget/wiki) - installation manuals, HOW-TOs, API;
-- [Forum](http://forum.nzbget.net) - get support, share your ideas, scripts, add-ons.

RemoteClient.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -60,15 +60,13 @@ public:
 					RemoteClient();
 					~RemoteClient();
 	void			SetVerbose(bool bVerbose) { m_bVerbose = bVerbose; };
-	bool 			RequestServerDownload(const char* szNZBFilename, const char* szNZBContent, const char* szCategory,
-						bool bAddFirst, bool bAddPaused, int iPriority,
-						const char* szDupeKey, int iDupeMode, int iDupeScore);
+	bool 			RequestServerDownload(const char* szFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority);
 	bool			RequestServerList(bool bFiles, bool bGroups, const char* szPattern);
 	bool			RequestServerPauseUnpause(bool bPause, eRemotePauseUnpauseAction iAction);
-	bool			RequestServerSetDownloadRate(int iRate);
+	bool			RequestServerSetDownloadRate(float fRate);
 	bool			RequestServerDumpDebug();
-	bool 			RequestServerEditQueue(DownloadQueue::EEditAction eAction, int iOffset, const char* szText,
-						int* pIDList, int iIDCount, NameList* pNameList, eRemoteMatchMode iMatchMode);
+	bool 			RequestServerEditQueue(eRemoteEditAction iAction, int iOffset, const char* szText, 
+		int* pIDList, int iIDCount, NameList* pNameList, eRemoteMatchMode iMatchMode, bool bSmartOrder);
 	bool			RequestServerLog(int iLines);
 	bool			RequestServerShutdown();
 	bool			RequestServerReload();
@@ -76,7 +74,9 @@ public:
 	bool			RequestPostQueue();
 	bool 			RequestWriteLog(int iKind, const char* szText);
 	bool			RequestScan(bool bSyncMode);
-	bool			RequestHistory(bool bWithHidden);
+	bool			RequestHistory();
+	bool 			RequestServerDownloadUrl(const char* szURL, const char* szNZBFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority);
+	bool			RequestUrlQueue();
 	void			BuildFileList(SNZBListResponse* pListResponse, const char* pTrailingData, DownloadQueue* pDownloadQueue);
 };
 

RemoteServer.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -34,7 +34,6 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #ifndef WIN32
 #include <unistd.h>
 #include <sys/socket.h>
@@ -48,16 +47,16 @@
 #include "WebServer.h"
 #include "Log.h"
 #include "Options.h"
-#include "Util.h"
+
+extern Options* g_pOptions;
 
 //*****************************************************************
 // RemoteServer
 
-RemoteServer::RemoteServer(bool bTLS)
+RemoteServer::RemoteServer()
 {
 	debug("Creating RemoteServer");
 
-	m_bTLS = bTLS;
 	m_pConnection = NULL;
 }
 
@@ -65,51 +64,35 @@ RemoteServer::~RemoteServer()
 {
 	debug("Destroying RemoteServer");
 
-	delete m_pConnection;
+	if (m_pConnection)
+	{
+		delete m_pConnection;
+	}
 }
 
 void RemoteServer::Run()
 {
 	debug("Entering RemoteServer-loop");
 
-#ifndef DISABLE_TLS
-	if (m_bTLS)
-	{
-		if (strlen(g_pOptions->GetSecureCert()) == 0 || !Util::FileExists(g_pOptions->GetSecureCert()))
-		{
-			error("Could not initialize TLS, secure certificate is not configured or the cert-file was not found. Check option <SecureCert>");
-			return;
-		}
-
-		if (strlen(g_pOptions->GetSecureKey()) == 0 || !Util::FileExists(g_pOptions->GetSecureKey()))
-		{
-			error("Could not initialize TLS, secure key is not configured or the key-file was not found. Check option <SecureKey>");
-			return;
-		}
-	}
-#endif
-
 	while (!IsStopped())
 	{
 		bool bBind = true;
 
 		if (!m_pConnection)
 		{
-			m_pConnection = new Connection(g_pOptions->GetControlIP(), 
-				m_bTLS ? g_pOptions->GetSecurePort() : g_pOptions->GetControlPort(),
-				m_bTLS);
-			m_pConnection->SetTimeout(g_pOptions->GetUrlTimeout());
+			m_pConnection = new Connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
+			m_pConnection->SetTimeout(g_pOptions->GetConnectionTimeout());
 			m_pConnection->SetSuppressErrors(false);
-			bBind = m_pConnection->Bind();
+			bBind = m_pConnection->Bind() == 0;
 		}
 
-		// Accept connections and store the new Connection
-		Connection* pAcceptedConnection = NULL;
+		// Accept connections and store the "new" socket value
+		SOCKET iSocket = INVALID_SOCKET;
 		if (bBind)
 		{
-			pAcceptedConnection = m_pConnection->Accept();
+			iSocket = m_pConnection->Accept();
 		}
-		if (!bBind || pAcceptedConnection == NULL)
+		if (!bBind || iSocket == INVALID_SOCKET)
 		{
 			// Remote server could not bind or accept connection, waiting 1/2 sec and try again
 			if (IsStopped())
@@ -124,13 +107,9 @@ void RemoteServer::Run()
 
 		RequestProcessor* commandThread = new RequestProcessor();
 		commandThread->SetAutoDestroy(true);
-		commandThread->SetConnection(pAcceptedConnection);
-#ifndef DISABLE_TLS
-		commandThread->SetTLS(m_bTLS);
-#endif
+		commandThread->SetSocket(iSocket);
 		commandThread->Start();
 	}
-
 	if (m_pConnection)
 	{
 		m_pConnection->Disconnect();
@@ -155,32 +134,32 @@ void RemoteServer::Stop()
 //*****************************************************************
 // RequestProcessor
 
-RequestProcessor::~RequestProcessor()
-{
-	m_pConnection->Disconnect();
-	delete m_pConnection;
-}
-
 void RequestProcessor::Run()
 {
+	// Read the first 4 bytes to determine request type
 	bool bOK = false;
-
-	m_pConnection->SetSuppressErrors(true);
-
-#ifndef DISABLE_TLS
-	if (m_bTLS && !m_pConnection->StartTLS(false, g_pOptions->GetSecureCert(), g_pOptions->GetSecureKey()))
+	int iSignature = 0;
+	int iBytesReceived = recv(m_iSocket, (char*)&iSignature, sizeof(iSignature), 0);
+	if (iBytesReceived < 0)
 	{
-		debug("Could not establish secure connection to web-client: Start TLS failed");
 		return;
 	}
-#endif
 
-	// Read the first 4 bytes to determine request type
-	int iSignature = 0;
-	if (!m_pConnection->Recv((char*)&iSignature, 4))
+	// Info - connection received
+#ifdef WIN32
+	char* ip = NULL;
+#else
+	char ip[20];
+#endif
+	struct sockaddr_in PeerName;
+	int iPeerNameLength = sizeof(PeerName);
+	if (getpeername(m_iSocket, (struct sockaddr*)&PeerName, (SOCKLEN_T*) &iPeerNameLength) >= 0)
 	{
-		debug("Could not read request signature");
-		return;
+#ifdef WIN32
+		ip = inet_ntoa(PeerName.sin_addr);
+#else
+		inet_ntop(AF_INET, &PeerName.sin_addr, ip, sizeof(ip));
+#endif
 	}
 
 	if ((int)ntohl(iSignature) == (int)NZBMESSAGE_SIGNATURE)
@@ -188,7 +167,9 @@ void RequestProcessor::Run()
 		// binary request received
 		bOK = true;
 		BinRpcProcessor processor;
-		processor.SetConnection(m_pConnection);
+		processor.SetSocket(m_iSocket);
+		processor.SetSignature(iSignature);
+		processor.SetClientIP(ip);
 		processor.Execute();
 	}
 	else if (!strncmp((char*)&iSignature, "POST", 4) || 
@@ -196,8 +177,9 @@ void RequestProcessor::Run()
 		!strncmp((char*)&iSignature, "OPTI", 4))
 	{
 		// HTTP request received
+		Connection con(m_iSocket, false);
 		char szBuffer[1024];
-		if (m_pConnection->ReadLine(szBuffer, sizeof(szBuffer), NULL))
+		if (con.ReadLine(szBuffer, sizeof(szBuffer), NULL))
 		{
 			WebProcessor::EHttpMethod eHttpMethod = WebProcessor::hmGet;
 			char* szUrl = szBuffer;
@@ -219,20 +201,24 @@ void RequestProcessor::Run()
 			debug("url: %s", szUrl);
 
 			WebProcessor processor;
-			processor.SetConnection(m_pConnection);
+			processor.SetConnection(&con);
+			processor.SetClientIP(ip);
 			processor.SetUrl(szUrl);
 			processor.SetHttpMethod(eHttpMethod);
 			processor.Execute();
-
-			m_pConnection->SetGracefull(true);
-			m_pConnection->Disconnect();
-
 			bOK = true;
 		}
 	}
 
-	if (!bOK)
+	if (!bOK && iBytesReceived > 0)
 	{
-		warn("Non-nzbget request received on port %i from %s", m_bTLS ? g_pOptions->GetSecurePort() : g_pOptions->GetControlPort(), m_pConnection->GetRemoteAddr());
+		warn("Non-nzbget request received on port %i from %s", g_pOptions->GetControlPort(), ip);
 	}
+
+	if (!bOK && iBytesReceived == 0)
+	{
+		debug("empty request received on port %i from %s", g_pOptions->GetControlPort(), ip);
+	}
+
+	closesocket(m_iSocket);
 }

RemoteServer.h

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

Scanner.cpp

@@ -0,0 +1,387 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <fstream>
+#ifdef WIN32
+#include <direct.h>
+#else
+#include <unistd.h>
+#endif
+#include <sys/stat.h>
+#include <errno.h>
+
+#include "nzbget.h"
+#include "Scanner.h"
+#include "Options.h"
+#include "Log.h"
+#include "QueueCoordinator.h"
+#include "ScriptController.h"
+#include "DiskState.h"
+#include "Util.h"
+
+extern QueueCoordinator* g_pQueueCoordinator;
+extern Options* g_pOptions;
+extern DiskState* g_pDiskState;
+
+Scanner::FileData::FileData(const char* szFilename)
+{
+	m_szFilename = strdup(szFilename);
+	m_iSize = 0;
+	m_tLastChange = 0;
+}
+
+Scanner::FileData::~FileData()
+{
+	free(m_szFilename);
+}
+
+Scanner::Scanner()
+{
+	debug("Creating Scanner");
+
+	m_bRequestedNZBDirScan = false;
+	m_bScanning = false;
+	m_iNZBDirInterval = g_pOptions->GetNzbDirInterval() * 1000;
+	m_iPass = 0;
+	m_iStepMSec = 0;
+
+	const char* szNZBScript = g_pOptions->GetNZBProcess();
+	m_bNZBScript = szNZBScript && strlen(szNZBScript) > 0;
+}
+
+Scanner::~Scanner()
+{
+	debug("Destroying Scanner");
+
+	for (FileList::iterator it = m_FileList.begin(); it != m_FileList.end(); it++)
+    {
+        delete *it;
+	}
+	m_FileList.clear();
+}
+
+void Scanner::Check()
+{
+	if (g_pOptions->GetNzbDir() && (m_bRequestedNZBDirScan || 
+		(!g_pOptions->GetPauseScan() && g_pOptions->GetNzbDirInterval() > 0 && 
+		 m_iNZBDirInterval >= g_pOptions->GetNzbDirInterval() * 1000)))
+	{
+		// check nzbdir every g_pOptions->GetNzbDirInterval() seconds or if requested
+		bool bCheckStat = !m_bRequestedNZBDirScan;
+		m_bRequestedNZBDirScan = false;
+		m_bScanning = true;
+		CheckIncomingNZBs(g_pOptions->GetNzbDir(), "", bCheckStat);
+		if (!bCheckStat && m_bNZBScript)
+		{
+			// if immediate scan requesten, we need second scan to process files extracted by NzbProcess-script
+			CheckIncomingNZBs(g_pOptions->GetNzbDir(), "", bCheckStat);
+		}
+		m_bScanning = false;
+		m_iNZBDirInterval = 0;
+
+		// if NzbDirFileAge is less than NzbDirInterval (that can happen if NzbDirInterval
+		// is set for rare scans like once per hour) we make 4 scans:
+		//   - one additional scan is neccessary to check sizes of detected files;
+		//   - another scan is required to check files which were extracted by NzbProcess-script;
+		//   - third scan is needed to check sizes of extracted files.
+		if (g_pOptions->GetNzbDirFileAge() < g_pOptions->GetNzbDirInterval())
+		{
+			int iMaxPass = m_bNZBScript ? 3 : 1;
+			if (m_iPass < iMaxPass)
+			{
+				// scheduling another scan of incoming directory in NzbDirFileAge seconds.
+				m_iNZBDirInterval = (g_pOptions->GetNzbDirInterval() - g_pOptions->GetNzbDirFileAge()) * 1000;
+				m_iPass++;
+			}
+			else
+			{
+				m_iPass = 0;
+			}
+		}
+
+		DropOldFiles();
+	}
+	m_iNZBDirInterval += m_iStepMSec;
+}
+
+/**
+* Check if there are files in directory for incoming nzb-files
+* and add them to download queue
+*/
+void Scanner::CheckIncomingNZBs(const char* szDirectory, const char* szCategory, bool bCheckStat)
+{
+	DirBrowser dir(szDirectory);
+	while (const char* filename = dir.Next())
+	{
+		struct stat buffer;
+		char fullfilename[1023 + 1]; // one char reserved for the trailing slash (if needed)
+		snprintf(fullfilename, 1023, "%s%s", szDirectory, filename);
+		fullfilename[1023 - 1] = '\0';
+		if (!stat(fullfilename, &buffer))
+		{
+			// check subfolders
+			if ((buffer.st_mode & S_IFDIR) != 0 && strcmp(filename, ".") && strcmp(filename, ".."))
+			{
+				fullfilename[strlen(fullfilename) + 1] = '\0';
+				fullfilename[strlen(fullfilename)] = PATH_SEPARATOR;
+				const char* szUseCategory = filename;
+				char szSubCategory[1024];
+				if (strlen(szCategory) > 0)
+				{
+					snprintf(szSubCategory, 1023, "%s%c%s", szCategory, PATH_SEPARATOR, filename);
+					szSubCategory[1024 - 1] = '\0';
+					szUseCategory = szSubCategory;
+				}
+				CheckIncomingNZBs(fullfilename, szUseCategory, bCheckStat);
+			}
+			else if ((buffer.st_mode & S_IFDIR) == 0 && CanProcessFile(fullfilename, bCheckStat))
+			{
+				ProcessIncomingFile(szDirectory, filename, fullfilename, szCategory);
+			}
+		}
+	}
+}
+
+/**
+ * Only files which were not changed during last g_pOptions->GetNzbDirFileAge() seconds
+ * can be processed. That prevents the processing of files, which are currently being
+ * copied into nzb-directory (eg. being downloaded in web-browser).
+ */
+bool Scanner::CanProcessFile(const char* szFullFilename, bool bCheckStat)
+{
+	const char* szExtension = strrchr(szFullFilename, '.');
+	if (!szExtension ||
+		!strcasecmp(szExtension, ".queued") ||
+		!strcasecmp(szExtension, ".error") ||
+		!strcasecmp(szExtension, ".processed"))
+	{
+		return false;
+	}
+
+	if (!bCheckStat)
+	{
+		return true;
+	}
+
+	long long lSize = Util::FileSize(szFullFilename);
+	time_t tCurrent = time(NULL);
+	bool bCanProcess = false;
+	bool bInList = false;
+
+	for (FileList::iterator it = m_FileList.begin(); it != m_FileList.end(); it++)
+    {
+        FileData* pFileData = *it;
+		if (!strcmp(pFileData->GetFilename(), szFullFilename))
+		{
+			bInList = true;
+			if (pFileData->GetSize() == lSize &&
+				tCurrent - pFileData->GetLastChange() >= g_pOptions->GetNzbDirFileAge())
+			{
+				bCanProcess = true;
+				delete pFileData;
+				m_FileList.erase(it);
+			}
+			else
+			{
+				pFileData->SetSize(lSize);
+				if (pFileData->GetSize() != lSize)
+				{
+					pFileData->SetLastChange(tCurrent);
+				}
+			}
+			break;
+		}
+	}
+
+	if (!bInList)
+	{
+		FileData* pFileData = new FileData(szFullFilename);
+		pFileData->SetSize(lSize);
+		pFileData->SetLastChange(tCurrent);
+		m_FileList.push_back(pFileData);
+	}
+
+	return bCanProcess;
+}
+
+/**
+ * Remove old files from the list of monitored files.
+ * Normally these files are deleted from the list when they are processed.
+ * However if a file was detected by function "CanProcessFile" once but wasn't 
+ * processed later (for example if the user deleted it), it will stay in the list,
+ * until we remove it here.
+ */
+void Scanner::DropOldFiles()
+{
+	time_t tCurrent = time(NULL);
+
+	int i = 0;
+	for (FileList::iterator it = m_FileList.begin(); it != m_FileList.end(); )
+    {
+        FileData* pFileData = *it;
+		if ((tCurrent - pFileData->GetLastChange() >= 
+			(g_pOptions->GetNzbDirInterval() + g_pOptions->GetNzbDirFileAge()) * 2) ||
+			// can occur if the system clock was adjusted
+			tCurrent < pFileData->GetLastChange())
+		{
+			debug("Removing file %s from scan file list", pFileData->GetFilename());
+
+			delete pFileData;
+			m_FileList.erase(it);
+			it = m_FileList.begin() + i;
+		}
+		else
+		{
+			it++;
+			i++;
+		}
+	}
+}
+
+void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFilename, const char* szFullFilename, const char* szCategory)
+{
+	const char* szExtension = strrchr(szBaseFilename, '.');
+	if (!szExtension)
+	{
+		return;
+	}
+
+	char* szNZBCategory = strdup(szCategory);
+	NZBParameterList* pParameterList = new NZBParameterList;
+	int iPriority = 0;
+
+	bool bExists = true;
+
+	if (m_bNZBScript && strcasecmp(szExtension, ".nzb_processed"))
+	{
+		NZBScriptController::ExecuteScript(g_pOptions->GetNZBProcess(), szFullFilename, szDirectory, 
+			&szNZBCategory, &iPriority, pParameterList); 
+		bExists = Util::FileExists(szFullFilename);
+		if (bExists && strcasecmp(szExtension, ".nzb"))
+		{
+			char bakname2[1024];
+			bool bRenameOK = Util::RenameBak(szFullFilename, "processed", false, bakname2, 1024);
+			if (!bRenameOK)
+			{
+				error("Could not rename file %s to %s! Errcode: %i", szFullFilename, bakname2, errno);
+			}
+		}
+	}
+
+	if (!strcasecmp(szExtension, ".nzb_processed"))
+	{
+		char szRenamedName[1024];
+		bool bRenameOK = Util::RenameBak(szFullFilename, "nzb", true, szRenamedName, 1024);
+		if (bRenameOK)
+		{
+			AddFileToQueue(szRenamedName, szNZBCategory, iPriority, pParameterList);
+		}
+		else
+		{
+			error("Could not rename file %s to %s! Errcode: %i", szFullFilename, szRenamedName, errno);
+		}
+	}
+	else if (bExists && !strcasecmp(szExtension, ".nzb"))
+	{
+		AddFileToQueue(szFullFilename, szNZBCategory, iPriority, pParameterList);
+	}
+
+	for (NZBParameterList::iterator it = pParameterList->begin(); it != pParameterList->end(); it++)
+	{
+		delete *it;
+	}
+	pParameterList->clear();
+	delete pParameterList;
+
+	free(szNZBCategory);
+}
+
+void Scanner::AddFileToQueue(const char* szFilename, const char* szCategory, int iPriority, NZBParameterList* pParameterList)
+{
+	const char* szBasename = Util::BaseFileName(szFilename);
+
+	info("Collection %s found", szBasename);
+
+	NZBFile* pNZBFile = NZBFile::CreateFromFile(szFilename, szCategory);
+	if (!pNZBFile)
+	{
+		error("Could not add collection %s to queue", szBasename);
+	}
+
+	char bakname2[1024];
+	bool bRenameOK = Util::RenameBak(szFilename, pNZBFile ? "queued" : "error", false, bakname2, 1024);
+	if (!bRenameOK)
+	{
+		error("Could not rename file %s to %s! Errcode: %i", szFilename, bakname2, errno);
+	}
+
+	if (pNZBFile && bRenameOK)
+	{
+		pNZBFile->GetNZBInfo()->SetQueuedFilename(bakname2);
+
+		for (NZBParameterList::iterator it = pParameterList->begin(); it != pParameterList->end(); it++)
+		{
+			NZBParameter* pParameter = *it;
+			pNZBFile->GetNZBInfo()->SetParameter(pParameter->GetName(), pParameter->GetValue());
+		}
+
+		for (NZBFile::FileInfos::iterator it = pNZBFile->GetFileInfos()->begin(); it != pNZBFile->GetFileInfos()->end(); it++)
+		{
+			FileInfo* pFileInfo = *it;
+			pFileInfo->SetPriority(iPriority);
+		}
+
+		g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, false);
+		info("Collection %s added to queue", szBasename);
+	}
+
+	if (pNZBFile)
+	{
+		delete pNZBFile;
+	}
+}
+
+void Scanner::ScanNZBDir(bool bSyncMode)
+{
+	// ideally we should use mutex to access "m_bRequestedNZBDirScan",
+	// but it's not critical here.
+	m_bScanning = true;
+	m_bRequestedNZBDirScan = true;
+
+	while (bSyncMode && (m_bScanning || m_bRequestedNZBDirScan))
+	{
+		usleep(100 * 1000);
+	}
+}

Scanner.h

@@ -0,0 +1,77 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifndef SCANNER_H
+#define SCANNER_H
+
+#include <deque>
+#include <time.h>
+#include "DownloadInfo.h"
+
+class Scanner
+{
+private:
+	class FileData
+	{
+	private:
+		char*			m_szFilename;
+		long long		m_iSize;
+		time_t			m_tLastChange;
+
+	public:
+						FileData(const char* szFilename);
+						~FileData();
+		const char*		GetFilename() { return m_szFilename; }
+		long long		GetSize() { return m_iSize; }
+		void			SetSize(long long lSize) { m_iSize = lSize; }
+		time_t			GetLastChange() { return m_tLastChange; }
+		void			SetLastChange(time_t tLastChange) { m_tLastChange = tLastChange; }
+	};
+
+	typedef std::deque<FileData*>		FileList;
+
+	bool				m_bRequestedNZBDirScan;
+	int					m_iNZBDirInterval;
+	bool				m_bNZBScript;
+	int					m_iPass;
+	int					m_iStepMSec;
+	FileList			m_FileList;
+	bool				m_bScanning;
+
+	void				CheckIncomingNZBs(const char* szDirectory, const char* szCategory, bool bCheckStat);
+	void				AddFileToQueue(const char* szFilename, const char* szCategory, int iPriority, NZBParameterList* pParameterList);
+	void				ProcessIncomingFile(const char* szDirectory, const char* szBaseFilename, const char* szFullFilename, const char* szCategory);
+	bool				CanProcessFile(const char* szFullFilename, bool bCheckStat);
+	void				DropOldFiles();
+
+public:
+						Scanner();
+						~Scanner();
+	void				SetStepInterval(int iStepMSec) { m_iStepMSec = iStepMSec; }
+	void				ScanNZBDir(bool bSyncMode);
+	void				Check();
+};
+
+#endif

Scheduler.cpp

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

Scheduler.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2008-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2008-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,45 +27,37 @@
 #define SCHEDULER_H
 
 #include <list>
-#include <vector>
 #include <time.h>
 
 #include "Thread.h"
-#include "Service.h"
 
-class Scheduler : public Service
+class Scheduler
 {
 public:
 	enum ECommand
 	{
 		scPauseDownload,
 		scUnpauseDownload,
-		scPausePostProcess,
-		scUnpausePostProcess,
 		scDownloadRate,
-		scScript,
 		scProcess,
 		scPauseScan,
-		scUnpauseScan,
-		scActivateServer,
-		scDeactivateServer,
-		scFetchFeed
+		scUnpauseScan
 	};
 
 	class Task
 	{
 	private:
-		int				m_iID;
 		int				m_iHours;
 		int				m_iMinutes;
 		int				m_iWeekDaysBits;
 		ECommand		m_eCommand;
-		char*			m_szParam;
+		int				m_iDownloadRate;
+		char*			m_szProcess;
 		time_t			m_tLastExecuted;
 
 	public:
-						Task(int iID, int iHours, int iMinutes, int iWeekDaysBits, ECommand eCommand, 
-							const char* szParam);
+						Task(int iHours, int iMinutes, int iWeekDaysBits, ECommand eCommand, 
+							int iDownloadRate, const char* szProcess);
 						~Task();
 		friend class	Scheduler;
 	};
@@ -73,40 +65,34 @@ public:
 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;
+	int					m_iDownloadRate;
 	bool				m_bPauseDownloadChanged;
-	bool				m_bPausePostProcessChanged;
+	bool				m_bPauseDownload;
 	bool				m_bPauseScanChanged;
-	bool				m_bServerChanged;
-	ServerStatusList	m_ServerStatusList;
-	bool				m_bFirstChecked;
-
+	bool				m_bPauseScan;
 	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();
-	void				FirstCheck();
-
-protected:
-	virtual int			ServiceInterval() { return 1000; }
-	virtual void		ServiceWork();
 
 public:
 						Scheduler();
 						~Scheduler();
 	void				AddTask(Task* pTask);
+	void				FirstCheck();
+	void				IntervalCheck();
+	bool				GetDownloadRateChanged() { return m_bDownloadRateChanged; }
+	int					GetDownloadRate() { return m_iDownloadRate; }
+	bool				GetPauseDownloadChanged() { return m_bPauseDownloadChanged; }
+	bool				GetPauseDownload() { return m_bPauseDownload; }
+	bool				GetPauseScanChanged() { return m_bPauseScanChanged; }
+	bool				GetPauseScan() { return m_bPauseScan; }
 };
 
-extern Scheduler* g_pScheduler;
-
 #endif

ScriptController.cpp

@@ -0,0 +1,996 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <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"
+
+extern Options* g_pOptions;
+extern char* (*g_szEnvironmentVariables)[];
+extern DownloadQueueHolder* g_pDownloadQueueHolder;
+
+static const int POSTPROCESS_PARCHECK_CURRENT = 91;
+static const int POSTPROCESS_PARCHECK_ALL = 92;
+static const int POSTPROCESS_SUCCESS = 93;
+static const int POSTPROCESS_ERROR = 94;
+static const int POSTPROCESS_NONE = 95;
+
+#ifndef WIN32
+#define CHILD_WATCHDOG 1
+#endif
+
+#ifdef CHILD_WATCHDOG
+/**
+ * Sometimes the forked child process doesn't start properly and hangs
+ * just during the starting. I didn't find any explanation about what
+ * could cause that problem except of a general advice, that
+ * "a forking in a multithread application is not recommended".
+ *
+ * Workaround:
+ * 1) child process prints a line into stdout directly after the start;
+ * 2) parent process waits for a line for 60 seconds. If it didn't receive it
+ *    the cild process assumed to hang and will be killed. Another attempt
+ *    will be made.
+ */
+ 
+class ChildWatchDog : public Thread
+{
+private:
+	pid_t			m_hProcessID;
+protected:
+	virtual void	Run();
+public:
+	void			SetProcessID(pid_t hProcessID) { m_hProcessID = hProcessID; }
+};
+
+void ChildWatchDog::Run()
+{
+	static const int WAIT_SECONDS = 60;
+	time_t tStart = time(NULL);
+	while (!IsStopped() && (time(NULL) - tStart) < WAIT_SECONDS)
+	{
+		usleep(10 * 1000);
+	}
+
+	if (!IsStopped())
+	{
+		info("Restarting hanging child process");
+		kill(m_hProcessID, SIGKILL);
+	}
+}
+#endif
+
+
+EnvironmentStrings::EnvironmentStrings()
+{
+}
+
+EnvironmentStrings::~EnvironmentStrings()
+{
+	for (Strings::iterator it = m_strings.begin(); it != m_strings.end(); it++)
+	{
+		free(*it);
+	}
+	m_strings.clear();
+}
+
+void EnvironmentStrings::InitFromCurrentProcess()
+{
+	for (int i = 0; (*g_szEnvironmentVariables)[i]; i++)
+	{
+		char* szVar = (*g_szEnvironmentVariables)[i];
+		Append(strdup(szVar));
+	}
+}
+
+void EnvironmentStrings::Append(char* szString)
+{
+	m_strings.push_back(szString);
+}
+
+#ifdef WIN32
+/*
+ * Returns environment block in format suitable for using with CreateProcess. 
+ * The allocated memory must be freed by caller using "free()".
+ */
+char* EnvironmentStrings::GetStrings()
+{
+	int iSize = 1;
+	for (Strings::iterator it = m_strings.begin(); it != m_strings.end(); it++)
+	{
+		char* szVar = *it;
+		iSize += strlen(szVar) + 1;
+	}
+
+	char* szStrings = (char*)malloc(iSize);
+	char* szPtr = szStrings;
+	for (Strings::iterator it = m_strings.begin(); it != m_strings.end(); it++)
+	{
+		char* szVar = *it;
+		strcpy(szPtr, szVar);
+		szPtr += strlen(szVar) + 1;
+	}
+	*szPtr = '\0';
+
+	return szStrings;
+}
+
+#else
+
+/*
+ * Returns environment block in format suitable for using with execve 
+ * The allocated memory must be freed by caller using "free()".
+ */
+char** EnvironmentStrings::GetStrings()
+{
+	char** pStrings = (char**)malloc((m_strings.size() + 1) * sizeof(char*));
+	char** pPtr = pStrings;
+	for (Strings::iterator it = m_strings.begin(); it != m_strings.end(); it++)
+	{
+		char* szVar = *it;
+		*pPtr = szVar;
+		pPtr++;
+	}
+	*pPtr = NULL;
+
+	return pStrings;
+}
+#endif
+
+
+ScriptController::ScriptController()
+{
+	m_szScript = NULL;
+	m_szWorkingDir = NULL;
+	m_szArgs = NULL;
+	m_bFreeArgs = false;
+	m_szInfoName = NULL;
+	m_szDefaultKindPrefix = NULL;
+	m_bTerminated = false;
+	m_environmentStrings.InitFromCurrentProcess();
+}
+
+ScriptController::~ScriptController()
+{
+	if (m_bFreeArgs)
+	{
+		for (const char** szArgPtr = m_szArgs; *szArgPtr; szArgPtr++)
+		{
+			free((char*)*szArgPtr);
+		}
+		free(m_szArgs);
+	}
+}
+
+void ScriptController::SetEnvVar(const char* szName, const char* szValue)
+{
+	int iLen = strlen(szName) + strlen(szValue) + 2;
+	char* szVar = (char*)malloc(iLen);
+	snprintf(szVar, iLen, "%s=%s", szName, szValue);
+	m_environmentStrings.Append(szVar);
+}
+
+void ScriptController::PrepareEnvironmentStrings()
+{
+	Options::OptEntries* pOptEntries = g_pOptions->LockOptEntries();
+
+	for (Options::OptEntries::iterator it = pOptEntries->begin(); it != pOptEntries->end(); it++)
+	{
+		Options::OptEntry* pOptEntry = *it;
+		char szVarname[1024];
+		snprintf(szVarname, sizeof(szVarname), "NZBOP_%s", pOptEntry->GetName());
+
+		// convert to upper case; replace "." with "_".
+		for (char* szPtr = szVarname; *szPtr; szPtr++)
+		{
+			if (*szPtr == '.')
+			{
+				*szPtr = '_';
+			}
+			*szPtr = toupper(*szPtr);
+		}
+
+		szVarname[1024-1] = '\0';
+		SetEnvVar(szVarname, pOptEntry->GetValue());
+	}
+
+	g_pOptions->UnlockOptEntries();
+}
+
+int ScriptController::Execute()
+{
+	if (!Util::FileExists(m_szScript))
+	{
+		error("Could not start %s: could not find file %s", m_szInfoName, m_szScript);
+		return -1;
+	}
+
+	PrepareEnvironmentStrings();
+
+	int iExitCode = 0;
+	int pipein;
+
+#ifdef CHILD_WATCHDOG
+	bool bChildConfirmed = false;
+	while (!bChildConfirmed && !m_bTerminated)
+	{
+#endif
+
+#ifdef WIN32
+	// build command line
+	char szCmdLine[2048];
+	int iUsedLen = 0;
+	for (const char** szArgPtr = m_szArgs; *szArgPtr; szArgPtr++)
+	{
+		snprintf(szCmdLine + iUsedLen, 2048 - iUsedLen, "\"%s\" ", *szArgPtr);
+		iUsedLen += strlen(*szArgPtr) + 3;
+	}
+	szCmdLine[iUsedLen < 2048 ? iUsedLen - 1 : 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));
+
+	char* szEnvironmentStrings = m_environmentStrings.GetStrings();
+
+	BOOL bOK = CreateProcess(NULL, szCmdLine, NULL, NULL, TRUE, NORMAL_PRIORITY_CLASS | CREATE_NO_WINDOW, szEnvironmentStrings, m_szWorkingDir, &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 %s: %s", m_szInfoName, szErrMsg);
+		}
+		else
+		{
+			error("Could not start %s: error %i", m_szInfoName, dwErrCode);
+		}
+		free(szEnvironmentStrings);
+		return -1;
+	}
+
+	free(szEnvironmentStrings);
+
+	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
+
+	int p[2];
+	int pipeout;
+
+	// create the pipe
+	if (pipe(p))
+	{
+		error("Could not open pipe: errno %i", errno);
+		return -1;
+	}
+
+	char** pEnvironmentStrings = m_environmentStrings.GetStrings();
+
+	pipein = p[0];
+	pipeout = p[1];
+
+	debug("forking");
+	pid_t pid = fork();
+
+	if (pid == -1)
+	{
+		error("Could not start %s: errno %i", m_szInfoName, errno);
+		free(pEnvironmentStrings);
+		return -1;
+	}
+	else if (pid == 0)
+	{
+		// here goes the second instance
+
+		// create new process group (see Terminate() where it is used)
+		setsid();
+			
+		// close up the "read" end
+		close(pipein);
+      			
+		// make the pipeout to be the same as stdout and stderr
+		dup2(pipeout, 1);
+		dup2(pipeout, 2);
+		
+		close(pipeout);
+
+#ifdef CHILD_WATCHDOG
+		fwrite("\n", 1, 1, stdout);
+		fflush(stdout);
+#endif
+
+		execve(m_szScript, (char* const*)m_szArgs, (char* const*)pEnvironmentStrings);
+		fprintf(stdout, "[ERROR] Could not start script: %s", strerror(errno));
+		fflush(stdout);
+		_exit(-1);
+	}
+
+	// continue the first instance
+	debug("forked");
+	debug("Child Process-ID: %i", (int)pid);
+
+	free(pEnvironmentStrings);
+
+	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 %s", m_szInfoName);
+		return -1;
+	}
+	
+#ifdef CHILD_WATCHDOG
+	debug("Creating child watchdog");
+	ChildWatchDog* pWatchDog = new ChildWatchDog();
+	pWatchDog->SetAutoDestroy(false);
+	pWatchDog->SetProcessID(pid);
+	pWatchDog->Start();
+#endif
+	
+	char* buf = (char*)malloc(10240);
+
+	debug("Entering pipe-loop");
+	while (!feof(readpipe) && !m_bTerminated)
+	{
+		if (fgets(buf, 10240, readpipe))
+		{
+#ifdef CHILD_WATCHDOG
+			if (!bChildConfirmed)
+			{
+				bChildConfirmed = true;
+				pWatchDog->Stop();
+				debug("Child confirmed");
+			}
+#endif
+			ProcessOutput(buf);
+		}
+	}
+	debug("Exited pipe-loop");
+
+#ifdef CHILD_WATCHDOG
+	debug("Destroying WatchDog");
+	if (!bChildConfirmed)
+	{
+		pWatchDog->Stop();
+	}
+	while (pWatchDog->IsRunning())
+	{
+		usleep(1 * 1000);
+	}
+	delete pWatchDog;
+#endif
+	
+	free(buf);
+	fclose(readpipe);
+
+	if (m_bTerminated)
+	{
+		warn("Interrupted %s", m_szInfoName);
+	}
+
+	iExitCode = 0;
+
+#ifdef WIN32
+	WaitForSingleObject(m_hProcess, INFINITE);
+	DWORD dExitCode = 0;
+	GetExitCodeProcess(m_hProcess, &dExitCode);
+	iExitCode = dExitCode;
+#else
+	int iStatus = 0;
+	waitpid(m_hProcess, &iStatus, 0);
+	if (WIFEXITED(iStatus))
+	{
+		iExitCode = WEXITSTATUS(iStatus);
+	}
+#endif
+	
+#ifdef CHILD_WATCHDOG
+	}	// while (!bChildConfirmed && !m_bTerminated)
+#endif
+	
+	if (!m_bTerminated)
+	{
+		info("Completed %s", m_szInfoName);
+		debug("Exit code %i", iExitCode);
+	}
+
+	return iExitCode;
+}
+
+void ScriptController::Terminate()
+{
+	debug("Stopping %s", m_szInfoName);
+	m_bTerminated = true;
+
+#ifdef WIN32
+	BOOL bOK = TerminateProcess(m_hProcess, -1);
+#else
+	pid_t hKillProcess = m_hProcess;
+	if (getpgid(hKillProcess) == hKillProcess)
+	{
+		// if the child process has its own group (setsid() was successful), kill the whole group
+		hKillProcess = -hKillProcess;
+	}
+	bool bOK = kill(hKillProcess, SIGKILL) == 0;
+#endif
+
+	if (bOK)
+	{
+		debug("Terminated %s", m_szInfoName);
+	}
+	else
+	{
+		error("Could not terminate %s", m_szInfoName);
+	}
+
+	debug("Stopped %s", m_szInfoName);
+}
+
+void ScriptController::ProcessOutput(char* szText)
+{
+	debug("Processing output received from 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))
+	{
+		AddMessage(Message::mkInfo, false, g_pOptions->GetInfoTarget(), szText + 7);
+	}
+	else if (!strncmp(szText, "[WARNING] ", 10))
+	{
+		AddMessage(Message::mkWarning, false, g_pOptions->GetWarningTarget(), szText + 10);
+	}
+	else if (!strncmp(szText, "[ERROR] ", 8))
+	{
+		AddMessage(Message::mkError, false, g_pOptions->GetErrorTarget(), szText + 8);
+	}
+	else if (!strncmp(szText, "[DETAIL] ", 9))
+	{
+		AddMessage(Message::mkDetail, false, g_pOptions->GetDetailTarget(), szText + 9);
+	}
+	else if (!strncmp(szText, "[DEBUG] ", 8))
+	{
+		AddMessage(Message::mkDebug, false, g_pOptions->GetDebugTarget(), szText + 8);
+	}
+	else 
+	{	
+		switch (m_eDefaultLogKind)
+		{
+			case Options::slNone:
+				break;
+
+			case Options::slDetail:
+				AddMessage(Message::mkDetail, true, g_pOptions->GetDetailTarget(), szText);
+				break;
+
+			case Options::slInfo:
+				AddMessage(Message::mkInfo, true, g_pOptions->GetInfoTarget(), szText);
+				break;
+
+			case Options::slWarning:
+				AddMessage(Message::mkWarning, true, g_pOptions->GetWarningTarget(), szText);
+				break;
+
+			case Options::slError:
+				AddMessage(Message::mkError, true, g_pOptions->GetErrorTarget(), szText);
+				break;
+
+			case Options::slDebug:
+				AddMessage(Message::mkDebug, true, g_pOptions->GetDebugTarget(), szText);
+				break;
+		}
+	}
+
+	debug("Processing output received from script - completed");
+}
+
+void ScriptController::AddMessage(Message::EKind eKind, bool bDefaultKind, Options::EMessageTarget eMessageTarget, const char* szText)
+{
+	switch (eKind)
+	{
+		case Message::mkDetail:
+			detail("%s%s", (bDefaultKind && m_szDefaultKindPrefix ? m_szDefaultKindPrefix : ""), szText);
+			break;
+
+		case Message::mkInfo:
+			info("%s%s", (bDefaultKind && m_szDefaultKindPrefix ? m_szDefaultKindPrefix : ""), szText);
+			break;
+
+		case Message::mkWarning:
+			warn("%s%s", (bDefaultKind && m_szDefaultKindPrefix ? m_szDefaultKindPrefix : ""), szText);
+			break;
+
+		case Message::mkError:
+			error("%s%s", (bDefaultKind && m_szDefaultKindPrefix ? m_szDefaultKindPrefix : ""), szText);
+			break;
+
+		case Message::mkDebug:
+			debug("%s%s", (bDefaultKind && m_szDefaultKindPrefix ? m_szDefaultKindPrefix : ""), szText);
+			break;
+	}
+}
+
+void PostScriptController::StartScriptJob(PostInfo* pPostInfo, const char* szScript, bool bNZBFileCompleted, bool bHasFailedParJobs)
+{
+	info("Executing post-process-script for %s", pPostInfo->GetInfoName());
+
+	PostScriptController* pScriptController = new PostScriptController();
+	pScriptController->m_pPostInfo = pPostInfo;
+	pScriptController->SetScript(szScript);
+	pScriptController->SetWorkingDir(g_pOptions->GetDestDir());
+	pScriptController->m_bNZBFileCompleted = bNZBFileCompleted;
+	pScriptController->m_bHasFailedParJobs = bHasFailedParJobs;
+	pScriptController->SetAutoDestroy(false);
+
+	pPostInfo->SetScriptThread(pScriptController);
+
+	pScriptController->Start();
+}
+
+void PostScriptController::Run()
+{
+	// the locking is needed for accessing the members of NZBInfo
+	g_pDownloadQueueHolder->LockQueue();
+
+	char szNZBName[1024];
+	strncpy(szNZBName, m_pPostInfo->GetNZBInfo()->GetName(), 1024);
+	szNZBName[1024-1] = '\0';
+
+	char szParStatus[10];
+	snprintf(szParStatus, 10, "%i", m_pPostInfo->GetParStatus());
+	szParStatus[10-1] = '\0';
+
+	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';
+
+	char szDestDir[1024];
+	strncpy(szDestDir, m_pPostInfo->GetNZBInfo()->GetDestDir(), 1024);
+	szDestDir[1024-1] = '\0';
+	
+	char szNZBFilename[1024];
+	strncpy(szNZBFilename, m_pPostInfo->GetNZBInfo()->GetFilename(), 1024);
+	szNZBFilename[1024-1] = '\0';
+	
+	char szParFilename[1024];
+	strncpy(szParFilename, m_pPostInfo->GetParFilename(), 1024);
+	szParFilename[1024-1] = '\0';
+
+	char szCategory[1024];
+	strncpy(szCategory, m_pPostInfo->GetNZBInfo()->GetCategory(), 1024);
+	szCategory[1024-1] = '\0';
+
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "post-process-script for %s", m_pPostInfo->GetInfoName());
+	szInfoName[1024-1] = '\0';
+	SetInfoName(szInfoName);
+
+	SetDefaultKindPrefix("Post-Process: ");
+	SetDefaultLogKind(g_pOptions->GetProcessLogKind());
+
+	const char* szArgs[9];
+	szArgs[0] = GetScript();
+	szArgs[1] = szDestDir;
+	szArgs[2] = szNZBFilename;
+	szArgs[3] = szParFilename;
+	szArgs[4] = szParStatus;
+	szArgs[5] = szCollectionCompleted;
+	szArgs[6] = szHasFailedParJobs;
+	szArgs[7] = szCategory;
+	szArgs[8] = NULL;
+	SetArgs(szArgs, false);
+
+	SetEnvVar("NZBPP_NZBNAME", szNZBName);
+	SetEnvVar("NZBPP_DIRECTORY", szDestDir);
+	SetEnvVar("NZBPP_NZBFILENAME", szNZBFilename);
+	SetEnvVar("NZBPP_PARFILENAME", szParFilename);
+	SetEnvVar("NZBPP_PARSTATUS", szParStatus);
+	SetEnvVar("NZBPP_NZBCOMPLETED", szCollectionCompleted);
+	SetEnvVar("NZBPP_PARFAILED", szHasFailedParJobs);
+	SetEnvVar("NZBPP_CATEGORY", szCategory);
+
+	for (NZBParameterList::iterator it = m_pPostInfo->GetNZBInfo()->GetParameters()->begin(); it != m_pPostInfo->GetNZBInfo()->GetParameters()->end(); it++)
+	{
+		NZBParameter* pParameter = *it;
+		char szVarname[1024];
+		snprintf(szVarname, sizeof(szVarname), "NZBPR_%s", pParameter->GetName());
+		szVarname[1024-1] = '\0';
+		SetEnvVar(szVarname, pParameter->GetValue());
+	}
+
+	g_pDownloadQueueHolder->UnlockQueue();
+
+	int iResult = Execute();
+
+	switch (iResult)
+	{
+		case POSTPROCESS_SUCCESS:
+			info("%s sucessful", szInfoName);
+			m_pPostInfo->SetScriptStatus(PostInfo::srSuccess);
+			break;
+
+		case POSTPROCESS_ERROR:
+			info("%s failed", szInfoName);
+			m_pPostInfo->SetScriptStatus(PostInfo::srFailure);
+			break;
+
+		case POSTPROCESS_NONE:
+			info("%s skipped", szInfoName);
+			m_pPostInfo->SetScriptStatus(PostInfo::srNone);
+			break;
+
+#ifndef DISABLE_PARCHECK
+		case POSTPROCESS_PARCHECK_ALL:
+			if (m_pPostInfo->GetParCheck())
+			{
+				error("%s requested par-check/repair for all collections, but they were already checked", szInfoName);
+				m_pPostInfo->SetScriptStatus(PostInfo::srFailure);
+			}
+			else if (!m_bNZBFileCompleted)
+			{
+				error("%s requested par-check/repair for all collections, but it was not the call for the last collection", szInfoName);
+				m_pPostInfo->SetScriptStatus(PostInfo::srFailure);
+			}
+			else
+			{
+				info("%s requested par-check/repair for all collections", szInfoName);
+				m_pPostInfo->SetRequestParCheck(PostInfo::rpAll);
+				m_pPostInfo->SetScriptStatus(PostInfo::srSuccess);
+			}
+			break;
+
+		case POSTPROCESS_PARCHECK_CURRENT:
+			if (m_pPostInfo->GetParCheck())
+			{
+				error("%s requested par-check/repair for current collection, but it was already checked", szInfoName);
+				m_pPostInfo->SetScriptStatus(PostInfo::srFailure);
+			}
+			else if (strlen(m_pPostInfo->GetParFilename()) == 0)
+			{
+				error("%s requested par-check/repair for current collection, but it doesn't have any par-files", szInfoName);
+				m_pPostInfo->SetScriptStatus(PostInfo::srFailure);
+			}
+			else
+			{
+				info("%s requested par-check/repair for current collection", szInfoName);
+				m_pPostInfo->SetRequestParCheck(PostInfo::rpCurrent);
+				m_pPostInfo->SetScriptStatus(PostInfo::srSuccess);
+			}
+			break;
+#endif
+
+		default:
+			info("%s terminated with unknown status", szInfoName);
+			m_pPostInfo->SetScriptStatus(PostInfo::srUnknown);
+	}
+
+	m_pPostInfo->SetStage(PostInfo::ptFinished);
+	m_pPostInfo->SetWorking(false);
+}
+
+void PostScriptController::AddMessage(Message::EKind eKind, bool bDefaultKind, Options::EMessageTarget eMessageTarget, const char* szText)
+{
+	if (!strncmp(szText, "[HISTORY] ", 10))
+	{
+		if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+		{
+			m_pPostInfo->GetNZBInfo()->AppendMessage(eKind, 0, szText + 10);
+		}
+	}
+	else
+	{
+		ScriptController::AddMessage(eKind, bDefaultKind, eMessageTarget, szText);
+
+		if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+		{
+			m_pPostInfo->AppendMessage(eKind, szText);
+		}
+	}
+
+
+	if (g_pOptions->GetPausePostProcess())
+	{
+		time_t tStageTime = m_pPostInfo->GetStageTime();
+		time_t tStartTime = m_pPostInfo->GetStartTime();
+		time_t tWaitTime = time(NULL);
+
+		// wait until Post-processor is unpaused
+		while (g_pOptions->GetPausePostProcess() && !IsStopped())
+		{
+			usleep(100 * 1000);
+
+			// update time stamps
+
+			time_t tDelta = time(NULL) - tWaitTime;
+
+			if (tStageTime > 0)
+			{
+				m_pPostInfo->SetStageTime(tStageTime + tDelta);
+			}
+
+			if (tStartTime > 0)
+			{
+				m_pPostInfo->SetStartTime(tStartTime + tDelta);
+			}
+		}
+	}
+}
+
+void PostScriptController::Stop()
+{
+	debug("Stopping post-process-script");
+	Thread::Stop();
+	Terminate();
+}
+
+void NZBScriptController::ExecuteScript(const char* szScript, const char* szNZBFilename, 
+	const char* szDirectory, char** pCategory, int* iPriority, NZBParameterList* pParameterList)
+{
+	info("Executing nzb-process-script for %s", Util::BaseFileName(szNZBFilename));
+
+	NZBScriptController* pScriptController = new NZBScriptController();
+	pScriptController->SetScript(szScript);
+	pScriptController->m_pCategory = pCategory;
+	pScriptController->m_pParameterList = pParameterList;
+	pScriptController->m_iPriority = iPriority;
+
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "nzb-process-script for %s", Util::BaseFileName(szNZBFilename));
+	szInfoName[1024-1] = '\0';
+	pScriptController->SetInfoName(szInfoName);
+
+	// remove trailing slash
+	char szDir[1024];
+	strncpy(szDir, szDirectory, 1024);
+	szDir[1024-1] = '\0';
+	int iLen = strlen(szDir);
+	if (szDir[iLen-1] == PATH_SEPARATOR)
+	{
+		szDir[iLen-1] = '\0';
+	}
+
+	pScriptController->SetDefaultKindPrefix("NZB-Process: ");
+	pScriptController->SetDefaultLogKind(g_pOptions->GetProcessLogKind());
+
+	const char* szArgs[4];
+	szArgs[0] = szScript;
+	szArgs[1] = szDir;
+	szArgs[2] = szNZBFilename;
+	szArgs[3] = NULL;
+	pScriptController->SetArgs(szArgs, false);
+
+	pScriptController->SetEnvVar("NZBNP_DIRECTORY", szDir);
+	pScriptController->SetEnvVar("NZBNP_FILENAME", szNZBFilename);
+
+	pScriptController->Execute();
+
+	delete pScriptController;
+}
+
+void NZBScriptController::AddMessage(Message::EKind eKind, bool bDefaultKind, Options::EMessageTarget eMessageTarget, const char* szText)
+{
+	if (!strncmp(szText, "[NZB] ", 6))
+	{
+		debug("Command %s detected", szText + 6);
+		if (!strncmp(szText + 6, "CATEGORY=", 9))
+		{
+			free(*m_pCategory);
+			*m_pCategory = strdup(szText + 6 + 9);
+		}
+		else if (!strncmp(szText + 6, "NZBPR_", 6))
+		{
+			char* szParam = strdup(szText + 6 + 6);
+			char* szValue = strchr(szParam, '=');
+			if (szValue)
+			{
+				*szValue = '\0';
+				m_pParameterList->SetParameter(szParam, szValue + 1);
+			}
+			else
+			{
+				error("Invalid command \"%s\" received from %s", szText, GetInfoName());
+			}
+			free(szParam);
+		}
+		else if (!strncmp(szText + 6, "PRIORITY=", 9))
+		{
+			*m_iPriority = atoi(szText + 6 + 9);
+		}
+		else
+		{
+			error("Invalid command \"%s\" received from %s", szText, GetInfoName());
+		}
+	}
+	else
+	{
+		ScriptController::AddMessage(eKind, bDefaultKind, eMessageTarget, szText);
+	}
+}
+
+void NZBAddedScriptController::StartScript(DownloadQueue* pDownloadQueue, NZBInfo *pNZBInfo, const char* szScript)
+{
+	NZBAddedScriptController* pScriptController = new NZBAddedScriptController();
+	pScriptController->SetScript(szScript);
+	pScriptController->m_szNZBName = strdup(pNZBInfo->GetName());
+	pScriptController->SetEnvVar("NZBNA_NAME", pNZBInfo->GetName());
+	pScriptController->SetEnvVar("NZBNA_FILENAME", pNZBInfo->GetFilename());
+	pScriptController->SetEnvVar("NZBNA_CATEGORY", pNZBInfo->GetCategory());
+
+	int iLastID = 0;
+	int iMaxPriority = 0;
+
+	for (FileQueue::iterator it = pDownloadQueue->GetFileQueue()->begin(); it != pDownloadQueue->GetFileQueue()->end(); it++)
+    {
+        FileInfo* pFileInfo = *it;
+		if (pFileInfo->GetNZBInfo() == pNZBInfo && ( pFileInfo->GetPriority() > iMaxPriority || iLastID == 0))
+		{
+			iMaxPriority = pFileInfo->GetPriority();
+		}
+		if (pFileInfo->GetNZBInfo() == pNZBInfo && pFileInfo->GetID() > iLastID)
+		{
+			iLastID = pFileInfo->GetID();
+		}
+	}
+
+	char buf[100];
+
+	snprintf(buf, 100, "%i", iLastID);
+	pScriptController->SetEnvVar("NZBNA_LASTID", buf);
+
+	snprintf(buf, 100, "%i", iMaxPriority);
+	pScriptController->SetEnvVar("NZBNA_PRIORITY", buf);
+
+	for (NZBParameterList::iterator it = pNZBInfo->GetParameters()->begin(); it != pNZBInfo->GetParameters()->end(); it++)
+	{
+		NZBParameter* pParameter = *it;
+		char szVarname[1024];
+		snprintf(szVarname, sizeof(szVarname), "NZBPR_%s", pParameter->GetName());
+		szVarname[1024-1] = '\0';
+		pScriptController->SetEnvVar(szVarname, pParameter->GetValue());
+	}
+
+	pScriptController->SetAutoDestroy(true);
+
+	pScriptController->Start();
+}
+
+void NZBAddedScriptController::Run()
+{
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "nzb-added process-script for %s", m_szNZBName);
+	szInfoName[1024-1] = '\0';
+	SetInfoName(szInfoName);
+
+	info("Executing %s", szInfoName);
+
+	SetDefaultKindPrefix("NZB-Added Process: ");
+	SetDefaultLogKind(g_pOptions->GetProcessLogKind());
+
+	const char* szArgs[2];
+	szArgs[0] = GetScript();
+	szArgs[1] = NULL;
+	SetArgs(szArgs, false);
+
+	Execute();
+
+	free(m_szNZBName);
+}
+
+void SchedulerScriptController::StartScript(const char* szCommandLine)
+{
+	char** argv = NULL;
+	if (!Util::SplitCommandLine(szCommandLine, &argv))
+	{
+		error("Could not execute scheduled process-script, failed to parse command line: %s", szCommandLine);
+		return;
+	}
+
+	info("Executing scheduled process-script %s", Util::BaseFileName(argv[0]));
+
+	SchedulerScriptController* pScriptController = new SchedulerScriptController();
+	pScriptController->SetScript(argv[0]);
+	pScriptController->SetArgs((const char**)argv, true);
+	pScriptController->SetAutoDestroy(true);
+
+	pScriptController->Start();
+}
+
+void SchedulerScriptController::Run()
+{
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "scheduled process-script %s", Util::BaseFileName(GetScript()));
+	szInfoName[1024-1] = '\0';
+	SetInfoName(szInfoName);
+
+	SetDefaultKindPrefix("Scheduled Process: ");
+	SetDefaultLogKind(g_pOptions->GetProcessLogKind());
+
+	Execute();
+}

ScriptController.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2011 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -23,13 +23,15 @@
  */
 
 
-#ifndef SCRIPT_H
-#define SCRIPT_H
+#ifndef SCRIPTCONTROLLER_H
+#define SCRIPTCONTROLLER_H
 
-#include <vector>
+#include <list>
 
-#include "Thread.h"
 #include "Log.h"
+#include "Thread.h"
+#include "DownloadInfo.h"
+#include "Options.h"
 
 class EnvironmentStrings
 {
@@ -41,7 +43,6 @@ private:
 public:
 						EnvironmentStrings();
 						~EnvironmentStrings();
-	void				Clear();
 	void				InitFromCurrentProcess();
 	void				Append(char* szString);
 #ifdef WIN32
@@ -58,43 +59,28 @@ private:
 	const char*			m_szWorkingDir;
 	const char**		m_szArgs;
 	bool				m_bFreeArgs;
-	const char*			m_szStdArgs[2];
 	const char*			m_szInfoName;
-	const char*			m_szLogPrefix;
+	const char*			m_szDefaultKindPrefix;
 	EnvironmentStrings	m_environmentStrings;
+	Options::EScriptLogKind	m_eDefaultLogKind;
 	bool				m_bTerminated;
-	bool				m_bDetached;
-	FILE*				m_pReadpipe;
 #ifdef WIN32
 	HANDLE				m_hProcess;
-	char				m_szCmdLine[2048];
 #else
 	pid_t				m_hProcess;
 #endif
 
-	typedef std::vector<ScriptController*>	RunningScripts;
-	static RunningScripts	m_RunningScripts;
-	static Mutex			m_mutexRunning;
+	void				ProcessOutput(char* szText);
+	void				PrepareEnvironmentStrings();
 
 protected:
-	void				ProcessOutput(char* szText);
-	virtual bool		ReadLine(char* szBuf, int iBufSize, FILE* pStream);
-	void				PrintMessage(Message::EKind eKind, const char* szFormat, ...);
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-	bool				GetTerminated() { return m_bTerminated; }
-	void				ResetEnv();
-	void				PrepareEnvOptions(const char* szStripPrefix);
-	void				PrepareArgs();
-	void				UnregisterRunningScript();
+	virtual void		AddMessage(Message::EKind eKind, bool bDefaultKind, Options::EMessageTarget eMessageTarget, const char* szText);
 
 public:
 						ScriptController();
 	virtual				~ScriptController();
 	int					Execute();
 	void				Terminate();
-	void				Resume();
-	void				Detach();
-	static void			TerminateAll();
 
 	void				SetScript(const char* szScript) { m_szScript = szScript; }
 	const char*			GetScript() { return m_szScript; }
@@ -102,10 +88,57 @@ public:
 	void				SetArgs(const char** szArgs, bool bFreeArgs) { m_szArgs = szArgs; m_bFreeArgs = bFreeArgs; }
 	void				SetInfoName(const char* szInfoName) { m_szInfoName = szInfoName; }
 	const char*			GetInfoName() { return m_szInfoName; }
-	void				SetLogPrefix(const char* szLogPrefix) { m_szLogPrefix = szLogPrefix; }
+	void				SetDefaultKindPrefix(const char* szDefaultKindPrefix) { m_szDefaultKindPrefix = szDefaultKindPrefix; }
+	void				SetDefaultLogKind(Options::EScriptLogKind eDefaultLogKind) { m_eDefaultLogKind = eDefaultLogKind; }
 	void				SetEnvVar(const char* szName, const char* szValue);
-	void				SetEnvVarSpecial(const char* szPrefix, const char* szName, const char* szValue);
-	void				SetIntEnvVar(const char* szName, int iValue);
+};
+
+class PostScriptController : public Thread, ScriptController
+{
+private:
+	PostInfo*			m_pPostInfo;
+	bool				m_bNZBFileCompleted;
+	bool				m_bHasFailedParJobs;
+
+protected:
+	virtual void		AddMessage(Message::EKind eKind, bool bDefaultKind, Options::EMessageTarget eMessageTarget, const char* szText);
+
+public:
+	virtual void		Run();
+	virtual void		Stop();
+	static void			StartScriptJob(PostInfo* pPostInfo, const char* szScript, 
+							bool bNZBFileCompleted, bool bHasFailedParJobs);
+};
+
+class NZBScriptController : public ScriptController
+{
+private:
+	char**				m_pCategory;
+	int*				m_iPriority;
+	NZBParameterList*	m_pParameterList;
+
+protected:
+	virtual void		AddMessage(Message::EKind eKind, bool bDefaultKind, Options::EMessageTarget eMessageTarget, const char* szText);
+
+public:
+	static void			ExecuteScript(const char* szScript, const char* szNZBFilename, const char* szDirectory, char** pCategory, int* iPriority, NZBParameterList* pParameterList);
+};
+
+class NZBAddedScriptController : public Thread, ScriptController
+{
+private:
+	char*				m_szNZBName;
+
+public:
+	virtual void		Run();
+	static void			StartScript(DownloadQueue* pDownloadQueue, NZBInfo *pNZBInfo, const char* szScript);
+};
+
+class SchedulerScriptController : public Thread, ScriptController
+{
+public:
+	virtual void		Run();
+	static void			StartScript(const char* szCommandLine);
 };
 
 #endif

ServerPool.cpp

@@ -0,0 +1,215 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This 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 "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;
+}
+
+ServerPool::~ ServerPool()
+{
+	debug("Destroying ServerPool");
+
+	m_Levels.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();
+			}
+		}
+
+		m_Levels.push_back(iMaxConnectionsForLevel);
+	}
+}
+
+NNTPConnection* ServerPool::GetConnection(int iLevel)
+{
+	PooledConnection* pConnection = NULL;
+
+	m_mutexConnections.Lock();
+
+	if (m_Levels[iLevel] > 0)
+	{
+		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_Levels[iLevel]--;
+
+		if (!pConnection)
+		{
+			error("ServerPool: internal error, no free connection found, but there should be one");
+		}
+	}
+
+	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();
+	}
+	m_Levels[pConnection->GetNewsServer()->GetLevel()]++;
+
+	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->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());
+	}
+
+	m_mutexConnections.Unlock();
+}

ServerPool.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,12 +30,11 @@
 #include <vector>
 #include <time.h>
 
-#include "Log.h"
 #include "Thread.h"
 #include "NewsServer.h"
 #include "NNTPConnection.h"
 
-class ServerPool : public Debuggable
+class ServerPool
 {
 private:
 	class PooledConnection : public NNTPConnection
@@ -51,42 +50,29 @@ private:
 		void			SetFreeTimeNow() { m_tFreeTime = ::time(NULL); }
 	};
 
+	typedef std::vector<NewsServer*>		Servers;
 	typedef std::vector<int>				Levels;
 	typedef std::vector<PooledConnection*>	Connections;
 
 	Servers				m_Servers;
-	Servers				m_SortedServers;
 	Connections			m_Connections;
 	Levels				m_Levels;
-	int					m_iMaxNormLevel;
+	int					m_iMaxLevel;
 	Mutex			 	m_mutexConnections;
 	int					m_iTimeout;
-	int					m_iRetryInterval;
-	int					m_iGeneration;
-
-	void				NormalizeLevels();
-	static bool			CompareServers(NewsServer* pServer1, NewsServer* pServer2);
-
-protected:
-	virtual void		LogDebugInfo();
 
 public:
 						ServerPool();
 						~ServerPool();
 	void				SetTimeout(int iTimeout) { m_iTimeout = iTimeout; }
-	void				SetRetryInterval(int iRetryInterval) { m_iRetryInterval = iRetryInterval; }
 	void 				AddServer(NewsServer* pNewsServer);
 	void				InitConnections();
-	int					GetMaxNormLevel() { return m_iMaxNormLevel; }
-	Servers*			GetServers() { return &m_Servers; } // Only for read access (no lockings)
-	NNTPConnection*		GetConnection(int iLevel, NewsServer* pWantServer, Servers* pIgnoreServers);
+	int					GetMaxLevel() { return m_iMaxLevel; }
+	NNTPConnection*		GetConnection(int iLevel);
 	void 				FreeConnection(NNTPConnection* pConnection, bool bUsed);
 	void				CloseUnusedConnections();
-	void				Changed();
-	int					GetGeneration() { return m_iGeneration; }
-	void				BlockServer(NewsServer* pNewsServer);
+
+	void				LogDebugInfo();
 };
 
-extern ServerPool* g_pServerPool;
-
 #endif

TLS.h

@@ -0,0 +1,212 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Based on "tls.h" from project "mpop" by Martin Lambers
+ *  Original source code available on http://sourceforge.net/projects/mpop/
+ *
+ *  Copyright (C) 2000, 2003, 2004, 2005, 2006, 2007
+ *  Martin Lambers <marlam@marlam.de>
+ *
+ *  Copyright (C) 2008-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+#ifndef TLS_H
+#define TLS_H
+
+#ifndef DISABLE_TLS
+
+#include <time.h>
+#ifdef HAVE_LIBGNUTLS
+# include <gnutls/gnutls.h>
+#endif /* HAVE_LIBGNUTLS */
+#ifdef HAVE_OPENSSL
+# include <openssl/ssl.h>
+#endif /* HAVE_OPENSSL */
+
+
+/*
+ * If a function with an 'errstr' argument returns a value != TLS_EOK,
+ * '*errstr' either points to an allocates string containing an error 
+ * description or is NULL.
+ * If such a function returns TLS_EOK, 'errstr' will not be changed.
+ */
+#define TLS_EOK		0	/* no error */
+#define TLS_ELIBFAILED	1	/* The underlying library failed */
+#define TLS_ESEED	2	/* Cannot seed pseudo random number generator */
+#define TLS_ECERT	3	/* Certificate check or verification failed */
+#define TLS_EIO		4	/* Input/output error */
+#define TLS_EFILE	5	/* A file does not exist/cannot be read */
+#define TLS_EHANDSHAKE	6	/* TLS handshake failed */
+
+
+/*
+ * Always use tls_clear() before using a tls_t!
+ * Never call a tls_*() function with tls_t NULL!
+ */
+
+typedef struct
+{
+    int have_trust_file;
+    int is_active;
+#ifdef HAVE_LIBGNUTLS
+    gnutls_session_t session;
+    gnutls_certificate_credentials_t cred;
+#endif /* HAVE_LIBGNUTLS */
+#ifdef HAVE_OPENSSL
+    SSL_CTX *ssl_ctx;
+    SSL *ssl;
+#endif /* HAVE_OPENSSL */
+} tls_t;
+
+/*
+ * Information about a X509 certificate.
+ * The 6 owner_info and issuer_info fields are:
+ *   Common Name
+ *   Organization
+ *   Organizational unit
+ *   Locality
+ *   State/Province
+ *   Country
+ * Each of these entries may be NULL if it was not provided.
+ */
+typedef struct
+{
+    unsigned char sha1_fingerprint[20];
+    unsigned char md5_fingerprint[16];
+    time_t activation_time;
+    time_t expiration_time;
+    char *owner_info[6];		
+    char *issuer_info[6];
+} tls_cert_info_t;
+
+/*
+ * tls_lib_init()
+ *
+ * Initialize underlying TLS library. If this function returns TLS_ELIBFAILED,
+ * *errstr will always point to an error string.
+ * Used error codes: TLS_ELIBFAILED
+ */
+int tls_lib_init(char **errstr);
+
+/*
+ * tls_clear()
+ *
+ * Clears a tls_t type (marks it inactive).
+ */
+void tls_clear(tls_t *tls);
+
+/*
+ * tls_init()
+ *
+ * Initializes a tls_t. If both 'key_file' and 'ca_file' are not NULL, they are
+ * set to be used when the peer request a certificate. If 'trust_file' is not
+ * NULL, it will be used to verify the peer certificate.
+ * All files must be in PEM format.
+ * If 'force_sslv3' is set, then only the SSLv3 protocol will be accepted. This
+ * option might be needed to talk to some obsolete broken servers. Only use this
+ * if you have to.
+ * Used error codes: TLS_ELIBFAILED, TLS_EFILE
+ */
+int tls_init(tls_t *tls, 
+	const char *key_file, const char *ca_file, const char *trust_file, 
+	int force_sslv3, char **errstr);
+
+/*
+ * tls_start()
+ *
+ * Starts TLS encryption on a socket.
+ * 'tls' must be initialized using tls_init().
+ * If 'no_certcheck' is true, then no checks will be performed on the peer
+ * certificate. If it is false and no trust file was set with tls_init(), 
+ * only sanity checks are performed on the peer certificate. If it is false 
+ * and a trust file was set, real verification of the peer certificate is 
+ * performed.
+ * 'hostname' is the host to start TLS with. It is needed for sanity checks/
+ * verification.
+ * 'tci' must be allocated with tls_cert_info_new(). Information about the 
+ * peer's certificata will be stored in it. It can later be freed with
+ * tls_cert_info_free(). 'tci' is allowed to be NULL; no certificate 
+ * information will be passed in this case.
+ * Used error codes: TLS_ELIBFAILED, TLS_ECERT, TLS_EHANDSHAKE
+ */
+int tls_start(tls_t *tls, int fd, const char *hostname, int no_certcheck,
+	tls_cert_info_t *tci, char **errstr);
+
+/*
+ * tls_is_active()
+ *
+ * Returns whether 'tls' is an active TLS connection.
+ */
+int tls_is_active(tls_t *tls);
+
+/*
+ * tls_cert_info_new()
+ * Returns a new tls_cert_info_t
+ */
+tls_cert_info_t *tls_cert_info_new(void);
+
+/*
+ * tls_cert_info_free()
+ * Frees a tls_cert_info_t
+ */
+void tls_cert_info_free(tls_cert_info_t *tci);
+
+/*
+ * tls_cert_info_get()
+ *
+ * Extracts certificate information from the TLS connection 'tls' and stores
+ * it in 'tci'. See the description of tls_cert_info_t above.
+ * Used error codes: TLS_ECERT
+ */
+int tls_cert_info_get(tls_t *tls, tls_cert_info_t *tci, char **errstr);
+
+/*
+ * tls_getbuf()
+ *
+ * Reads a buffer using TLS and stores it in 's'.
+ * Used error codes: TLS_EIO
+ */
+int tls_getbuf(tls_t *tls, char* s, size_t len, size_t* readlen, char **errstr);
+
+/*
+ * tls_putbuf()
+ *
+ * Writes 'len' characters from the string 's' using TLS.
+ * Used error codes: TLS_EIO
+ */
+int tls_putbuf(tls_t *tls, const char *s, size_t len, char **errstr);
+
+/*
+ * tls_close()
+ *
+ * Close a TLS connection and mark it inactive
+ */
+void tls_close(tls_t *tls);
+
+/*
+ * tls_lib_deinit()
+ *
+ * Deinit underlying TLS library.
+ */
+void tls_lib_deinit(void);
+
+#endif
+#endif

Thread.cpp

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -98,6 +98,48 @@ void Mutex::Unlock()
 }
 
 
+#ifdef HAVE_SPINLOCK
+SpinLock::SpinLock()
+{
+#ifdef WIN32
+	m_pSpinLockObj = (CRITICAL_SECTION *)malloc(sizeof(CRITICAL_SECTION));
+	InitializeCriticalSectionAndSpinCount((CRITICAL_SECTION *)m_pSpinLockObj, 0x00FFFFFF);
+#else
+	m_pSpinLockObj = (pthread_spinlock_t *)malloc(sizeof(pthread_spinlock_t));
+	pthread_spin_init((pthread_spinlock_t *)m_pSpinLockObj, PTHREAD_PROCESS_PRIVATE);
+#endif
+}
+
+SpinLock::~SpinLock()
+{
+#ifdef WIN32
+	DeleteCriticalSection((CRITICAL_SECTION *)m_pSpinLockObj);
+#else
+	pthread_spin_destroy((pthread_spinlock_t *)m_pSpinLockObj);
+#endif
+	free((void*)m_pSpinLockObj);
+}
+
+void SpinLock::Lock()
+{
+#ifdef WIN32
+	EnterCriticalSection((CRITICAL_SECTION *)m_pSpinLockObj);
+#else
+	pthread_spin_lock((pthread_spinlock_t *)m_pSpinLockObj);
+#endif
+}
+
+void SpinLock::Unlock()
+{
+#ifdef WIN32
+	LeaveCriticalSection((CRITICAL_SECTION *)m_pSpinLockObj);
+#else
+	pthread_spin_unlock((pthread_spinlock_t *)m_pSpinLockObj);
+#endif
+}
+#endif
+
+
 void Thread::Init()
 {
 	debug("Initializing global thread data");
@@ -173,13 +215,6 @@ void Thread::Stop()
 	m_bStopped = true;
 } 
 
-void Thread::Resume()
-{
-	debug("Resuming Thread");
-
-	m_bStopped = false;
-}
-
 bool Thread::Kill()
 {
 	debug("Killing Thread");

Thread.h

@@ -2,7 +2,7 @@
  *  This file is part of nzbget
  *
  *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -39,6 +39,24 @@ public:
 	void					Unlock();
 };
 
+#ifdef HAVE_SPINLOCK
+class SpinLock
+{
+private:
+#ifdef WIN32
+	void*					m_pSpinLockObj;
+#else
+	volatile void*			m_pSpinLockObj;
+#endif
+	
+public:
+							SpinLock();
+							~SpinLock();
+	void					Lock();
+	void					Unlock();
+};
+#endif
+
 class Thread
 {
 private:
@@ -63,7 +81,6 @@ public:
 
 	virtual void 			Start();
 	virtual void 			Stop();
-	virtual void 			Resume();
 	bool					Kill();
 
 	bool 					IsStopped() { return m_bStopped; };

UrlCoordinator.cpp

@@ -0,0 +1,455 @@
+/*
+ *  This file is part of nzbget
+ *
+ *  Copyright (C) 2012 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * $Revision$
+ * $Date$
+ *
+ */
+
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#ifdef WIN32
+#include "win32.h"
+#endif
+
+#include <stdlib.h>
+#include <string.h>
+#include <cstdio>
+#include <sys/stat.h>
+#ifndef WIN32
+#include <unistd.h>
+#include <sys/time.h>
+#endif
+
+#include "nzbget.h"
+#include "UrlCoordinator.h"
+#include "Options.h"
+#include "WebDownloader.h"
+#include "DiskState.h"
+#include "Log.h"
+#include "Util.h"
+#include "NZBFile.h"
+#include "QueueCoordinator.h"
+
+extern Options* g_pOptions;
+extern DiskState* g_pDiskState;
+extern QueueCoordinator* g_pQueueCoordinator;
+
+UrlDownloader::UrlDownloader() : WebDownloader()
+{
+	m_szCategory = NULL;
+}
+
+UrlDownloader::~UrlDownloader()
+{
+	if (m_szCategory)
+	{
+		free(m_szCategory);
+	}
+}
+
+void UrlDownloader::ProcessHeader(const char* szLine)
+{
+	WebDownloader::ProcessHeader(szLine);
+
+	if (!strncmp(szLine, "X-DNZB-Category: ", 17))
+	{
+		if (m_szCategory)
+		{
+			free(m_szCategory);
+		}
+
+		const char *szCat = szLine + 17;
+
+		int iCatLen = strlen(szCat);
+
+		// trim trailing CR/LF/spaces
+		while (iCatLen > 0 && (szCat[iCatLen-1] == '\n' || szCat[iCatLen-1] == '\r' || szCat[iCatLen-1] == ' ')) iCatLen--; 
+
+		m_szCategory = (char*)malloc(iCatLen + 1);
+		strncpy(m_szCategory, szCat, iCatLen);
+		m_szCategory[iCatLen] = '\0';
+
+		debug("Category: %s", m_szCategory);
+	}
+}
+
+UrlCoordinator::UrlCoordinator()
+{
+	debug("Creating UrlCoordinator");
+
+	m_bHasMoreJobs = true;
+}
+
+UrlCoordinator::~UrlCoordinator()
+{
+	debug("Destroying UrlCoordinator");
+	// Cleanup
+
+	debug("Deleting UrlDownloaders");
+	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
+	{
+		delete *it;
+	}
+	m_ActiveDownloads.clear();
+
+	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
+	for (UrlQueue::iterator it = pDownloadQueue->GetUrlQueue()->begin(); it != pDownloadQueue->GetUrlQueue()->end(); it++)
+	{
+		delete *it;
+	}
+	pDownloadQueue->GetUrlQueue()->clear();
+	g_pQueueCoordinator->UnlockQueue();
+
+	debug("UrlCoordinator destroyed");
+}
+
+void UrlCoordinator::Run()
+{
+	debug("Entering UrlCoordinator-loop");
+
+	int iResetCounter = 0;
+
+	while (!IsStopped())
+	{
+		if (!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
+		{
+			// start download for next URL
+			DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
+
+			if ((int)m_ActiveDownloads.size() < g_pOptions->GetUrlConnections())
+			{
+				UrlInfo* pUrlInfo;
+				bool bHasMoreUrls = GetNextUrl(pDownloadQueue, pUrlInfo);
+				bool bUrlDownloadsRunning = !m_ActiveDownloads.empty();
+				m_bHasMoreJobs = bHasMoreUrls || bUrlDownloadsRunning;
+				if (bHasMoreUrls && !IsStopped() && Thread::GetThreadCount() < g_pOptions->GetThreadLimit())
+				{
+					StartUrlDownload(pUrlInfo);
+				}
+			}
+			g_pQueueCoordinator->UnlockQueue();
+		}
+
+		int iSleepInterval = 100;
+		usleep(iSleepInterval * 1000);
+
+		iResetCounter += iSleepInterval;
+		if (iResetCounter >= 1000)
+		{
+			// this code should not be called too often, once per second is OK
+			ResetHangingDownloads();
+			iResetCounter = 0;
+		}
+	}
+
+	// waiting for downloads
+	debug("UrlCoordinator: waiting for Downloads to complete");
+	bool completed = false;
+	while (!completed)
+	{
+		g_pQueueCoordinator->LockQueue();
+		completed = m_ActiveDownloads.size() == 0;
+		g_pQueueCoordinator->UnlockQueue();
+		usleep(100 * 1000);
+		ResetHangingDownloads();
+	}
+	debug("UrlCoordinator: Downloads are completed");
+
+	debug("Exiting UrlCoordinator-loop");
+}
+
+void UrlCoordinator::Stop()
+{
+	Thread::Stop();
+
+	debug("Stopping UrlDownloads");
+	g_pQueueCoordinator->LockQueue();
+	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
+	{
+		(*it)->Stop();
+	}
+	g_pQueueCoordinator->UnlockQueue();
+	debug("UrlDownloads are notified");
+}
+
+void UrlCoordinator::ResetHangingDownloads()
+{
+	const int TimeOut = g_pOptions->GetTerminateTimeout();
+	if (TimeOut == 0)
+	{
+		return;
+	}
+
+	g_pQueueCoordinator->LockQueue();
+	time_t tm = ::time(NULL);
+
+	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end();)
+	{
+		UrlDownloader* pUrlDownloader = *it;
+		if (tm - pUrlDownloader->GetLastUpdateTime() > TimeOut &&
+		   pUrlDownloader->GetStatus() == UrlDownloader::adRunning)
+		{
+			UrlInfo* pUrlInfo = pUrlDownloader->GetUrlInfo();
+			debug("Terminating hanging download %s", pUrlDownloader->GetInfoName());
+			if (pUrlDownloader->Terminate())
+			{
+				error("Terminated hanging download %s", pUrlDownloader->GetInfoName());
+				pUrlInfo->SetStatus(UrlInfo::aiUndefined);
+			}
+			else
+			{
+				error("Could not terminate hanging download %s", pUrlDownloader->GetInfoName());
+			}
+			m_ActiveDownloads.erase(it);
+			// it's not safe to destroy pUrlDownloader, because the state of object is unknown
+			delete pUrlDownloader;
+			it = m_ActiveDownloads.begin();
+			continue;
+		}
+		it++;
+	}                                              
+
+	g_pQueueCoordinator->UnlockQueue();
+}
+
+void UrlCoordinator::LogDebugInfo()
+{
+	debug("   UrlCoordinator");
+	debug("   ----------------");
+
+	g_pQueueCoordinator->LockQueue();
+	debug("    Active Downloads: %i", m_ActiveDownloads.size());
+	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
+	{
+		UrlDownloader* pUrlDownloader = *it;
+		pUrlDownloader->LogDebugInfo();
+	}
+	g_pQueueCoordinator->UnlockQueue();
+}
+
+void UrlCoordinator::AddUrlToQueue(UrlInfo* pUrlInfo, bool AddFirst)
+{
+	debug("Adding NZB-URL to queue");
+
+	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
+
+	pDownloadQueue->GetUrlQueue()->push_back(pUrlInfo);
+
+	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+	{
+		g_pDiskState->SaveDownloadQueue(pDownloadQueue);
+	}
+
+	g_pQueueCoordinator->UnlockQueue();
+}
+
+/*
+ * Returns next URL for download.
+ */
+bool UrlCoordinator::GetNextUrl(DownloadQueue* pDownloadQueue, UrlInfo* &pUrlInfo)
+{
+	bool bOK = false;
+
+	for (UrlQueue::iterator at = pDownloadQueue->GetUrlQueue()->begin(); at != pDownloadQueue->GetUrlQueue()->end(); at++)
+	{
+		pUrlInfo = *at;
+		if (pUrlInfo->GetStatus() == 0)
+		{
+			bOK = true;
+			break;
+		}
+	}
+
+	return bOK;
+}
+
+void UrlCoordinator::StartUrlDownload(UrlInfo* pUrlInfo)
+{
+	debug("Starting new UrlDownloader");
+
+	UrlDownloader* pUrlDownloader = new UrlDownloader();
+	pUrlDownloader->SetAutoDestroy(true);
+	pUrlDownloader->Attach(this);
+	pUrlDownloader->SetUrlInfo(pUrlInfo);
+	pUrlDownloader->SetURL(pUrlInfo->GetURL());
+
+	char tmp[1024];
+
+	pUrlInfo->GetName(tmp, 1024);
+	pUrlDownloader->SetInfoName(tmp);
+
+	snprintf(tmp, 1024, "%surl-%i.tmp", g_pOptions->GetTempDir(), pUrlInfo->GetID());
+	tmp[1024-1] = '\0';
+	pUrlDownloader->SetOutputFilename(tmp);
+
+	pUrlInfo->SetStatus(UrlInfo::aiRunning);
+
+	m_ActiveDownloads.push_back(pUrlDownloader);
+	pUrlDownloader->Start();
+}
+
+void UrlCoordinator::Update(Subject* Caller, void* Aspect)
+{
+	debug("Notification from UrlDownloader received");
+
+	UrlDownloader* pUrlDownloader = (UrlDownloader*) Caller;
+	if ((pUrlDownloader->GetStatus() == WebDownloader::adFinished) ||
+		(pUrlDownloader->GetStatus() == WebDownloader::adFailed) ||
+		(pUrlDownloader->GetStatus() == WebDownloader::adRetry))
+	{
+		UrlCompleted(pUrlDownloader);
+	}
+}
+
+void UrlCoordinator::UrlCompleted(UrlDownloader* pUrlDownloader)
+{
+	debug("URL downloaded");
+
+	UrlInfo* pUrlInfo = pUrlDownloader->GetUrlInfo();
+
+	if (pUrlDownloader->GetStatus() == WebDownloader::adFinished)
+	{
+		pUrlInfo->SetStatus(UrlInfo::aiFinished);
+	}
+	else if (pUrlDownloader->GetStatus() == WebDownloader::adFailed)
+	{
+		pUrlInfo->SetStatus(UrlInfo::aiFailed);
+	}
+	else if (pUrlDownloader->GetStatus() == WebDownloader::adRetry)
+	{
+		pUrlInfo->SetStatus(UrlInfo::aiUndefined);
+	}
+
+	char filename[1024];
+	if (pUrlDownloader->GetOriginalFilename())
+	{
+		strncpy(filename, pUrlDownloader->GetOriginalFilename(), 1024);
+		filename[1024-1] = '\0';
+	}
+	else
+	{
+		strncpy(filename, Util::BaseFileName(pUrlInfo->GetURL()), 1024);
+		filename[1024-1] = '\0';
+
+		// TODO: decode URL escaping
+	}
+
+	Util::MakeValidFilename(filename, '_', false);
+
+	debug("Filename: [%s]", filename);
+
+	DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
+
+	// delete Download from Queue
+	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
+	{
+		UrlDownloader* pa = *it;
+		if (pa == pUrlDownloader)
+		{
+			m_ActiveDownloads.erase(it);
+			break;
+		}
+	}
+
+	bool bDeleteObj = false;
+
+	if (pUrlInfo->GetStatus() == UrlInfo::aiFinished || pUrlInfo->GetStatus() == UrlInfo::aiFailed)
+	{
+		// delete UrlInfo from Queue
+		for (UrlQueue::iterator it = pDownloadQueue->GetUrlQueue()->begin(); it != pDownloadQueue->GetUrlQueue()->end(); it++)
+		{
+			UrlInfo* pa = *it;
+			if (pa == pUrlInfo)
+			{
+				pDownloadQueue->GetUrlQueue()->erase(it);
+				break;
+			}
+		}
+
+		bDeleteObj = true;
+
+		if (g_pOptions->GetKeepHistory() > 0 && pUrlInfo->GetStatus() == UrlInfo::aiFailed)
+		{
+			HistoryInfo* pHistoryInfo = new HistoryInfo(pUrlInfo);
+			pHistoryInfo->SetTime(time(NULL));
+			pDownloadQueue->GetHistoryList()->push_front(pHistoryInfo);
+			bDeleteObj = false;
+		}
+			
+		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+		{
+			g_pDiskState->SaveDownloadQueue(pDownloadQueue);
+		}
+	}
+
+	g_pQueueCoordinator->UnlockQueue();
+
+	if (pUrlInfo->GetStatus() == UrlInfo::aiFinished)
+	{
+		// add nzb-file to download queue
+		AddToNZBQueue(pUrlInfo, pUrlDownloader->GetOutputFilename(), filename, pUrlDownloader->GetCategory());
+	}
+
+	if (bDeleteObj)
+	{
+		delete pUrlInfo;
+	}
+}
+
+void UrlCoordinator::AddToNZBQueue(UrlInfo* pUrlInfo, const char* szTempFilename, const char* szOriginalFilename, const char* szOriginalCategory)
+{
+	info("Queue downloaded collection %s", szOriginalFilename);
+
+	NZBFile* pNZBFile = NZBFile::CreateFromFile(szTempFilename, pUrlInfo->GetCategory());
+	if (pNZBFile)
+	{
+		pNZBFile->GetNZBInfo()->SetName(NULL);
+		pNZBFile->GetNZBInfo()->SetFilename(pUrlInfo->GetNZBFilename() && strlen(pUrlInfo->GetNZBFilename()) > 0 ? pUrlInfo->GetNZBFilename() : szOriginalFilename);
+
+		if (strlen(pUrlInfo->GetCategory()) > 0)
+		{
+			pNZBFile->GetNZBInfo()->SetCategory(pUrlInfo->GetCategory());
+		}
+		else if (szOriginalCategory)
+		{
+			pNZBFile->GetNZBInfo()->SetCategory(szOriginalCategory);
+		}
+
+		pNZBFile->GetNZBInfo()->BuildDestDirName();
+
+		for (NZBFile::FileInfos::iterator it = pNZBFile->GetFileInfos()->begin(); it != pNZBFile->GetFileInfos()->end(); it++)
+		{
+			FileInfo* pFileInfo = *it;
+			pFileInfo->SetPriority(pUrlInfo->GetPriority());
+			pFileInfo->SetPaused(pUrlInfo->GetAddPaused());
+		}
+
+		g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, pUrlInfo->GetAddTop());
+		delete pNZBFile;
+		info("Collection %s added to queue", szOriginalFilename);
+	}
+	else
+	{
+		error("Could not add downloaded collection %s to queue", szOriginalFilename);
+	}
+}

UrlCoordinator.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2012-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2012 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #include <list>
 #include <time.h>
 
-#include "Log.h"
 #include "Thread.h"
 #include "WebDownloader.h"
 #include "DownloadInfo.h"
@@ -38,43 +37,39 @@
 
 class UrlDownloader;
 
-class UrlCoordinator : public Thread, public Observer, public Debuggable
+class UrlCoordinator : public Thread, public Observer, public Subject
 {
-private:
+public:
 	typedef std::list<UrlDownloader*>	ActiveDownloads;
 
 private:
 	ActiveDownloads			m_ActiveDownloads;
 	bool					m_bHasMoreJobs;
-	bool					m_bForce;
 
-	NZBInfo*				GetNextUrl(DownloadQueue* pDownloadQueue);
-	void					StartUrlDownload(NZBInfo* pNZBInfo);
+	bool					GetNextUrl(DownloadQueue* pDownloadQueue, UrlInfo* &pUrlInfo);
+	void					StartUrlDownload(UrlInfo* pUrlInfo);
 	void					UrlCompleted(UrlDownloader* pUrlDownloader);
 	void					ResetHangingDownloads();
-
-protected:
-	virtual void			LogDebugInfo();
+	void					AddToNZBQueue(UrlInfo* pUrlInfo, const char* szTempFilename, const char* szOriginalFilename, const char* szOriginalCategory);
 
 public:
 							UrlCoordinator();                
 	virtual					~UrlCoordinator();
 	virtual void			Run();
 	virtual void 			Stop();
-	void					Update(Subject* pCaller, void* pAspect);
+	void					Update(Subject* Caller, void* Aspect);
 
 	// Editing the queue
-	void					AddUrlToQueue(NZBInfo* pNZBInfo, bool bAddTop);
+	void					AddUrlToQueue(UrlInfo* pUrlInfo, bool AddFirst);
 	bool					HasMoreJobs() { return m_bHasMoreJobs; }
-	bool					DeleteQueueEntry(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bAvoidHistory);
-};
 
-extern UrlCoordinator* g_pUrlCoordinator;
+	void					LogDebugInfo();
+};
 
 class UrlDownloader : public WebDownloader
 {
 private:
-	NZBInfo*				m_pNZBInfo;
+	UrlInfo*				m_pUrlInfo;
 	char*					m_szCategory;
 
 protected:
@@ -83,8 +78,8 @@ protected:
 public:
 							UrlDownloader();
 							~UrlDownloader();
-	void					SetNZBInfo(NZBInfo* pNZBInfo) { m_pNZBInfo = pNZBInfo; }
-	NZBInfo*				GetNZBInfo() { return m_pNZBInfo; }
+	void					SetUrlInfo(UrlInfo* pUrlInfo) { m_pUrlInfo = pUrlInfo; }
+	UrlInfo*				GetUrlInfo() { return m_pUrlInfo; }
 	const char*				GetCategory() { return m_szCategory; }
 };
 

Util.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -26,11 +26,12 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#ifdef DIRBROWSER_SNAPSHOT
-#include <deque>
+#ifdef WIN32
+#include <stdio.h>
+#include <io.h>
+#else
+#include <dirent.h>
 #endif
-#include <time.h>
-#include <stdarg.h>
 
 #ifdef WIN32
 extern int optind, opterr;
@@ -42,73 +43,35 @@ class DirBrowser
 {
 private:
 #ifdef WIN32
-	WIN32_FIND_DATA		m_FindData;
-	HANDLE				m_hFile;
+	struct _finddata_t	m_FindData;
+	intptr_t			m_hFile;
 	bool				m_bFirst;
 #else
-	void*				m_pDir;    // DIR*, declared as void* to avoid including of <dirent>
+	DIR*				m_pDir;
 	struct dirent*		m_pFindData;
 #endif
 
-#ifdef DIRBROWSER_SNAPSHOT
-	bool				m_bSnapshot;
-	typedef std::deque<char*>	FileList;
-	FileList			m_Snapshot;
-	FileList::iterator	m_itSnapshot;
-#endif
-
 public:
-#ifdef DIRBROWSER_SNAPSHOT
-						DirBrowser(const char* szPath, bool bSnapshot = true);
-#else
 						DirBrowser(const char* szPath);
-#endif
 						~DirBrowser();
 	const char*			Next();
 };
 
-class StringBuilder
-{
-private:
-	char*				m_szBuffer;
-	int					m_iBufferSize;
-	int					m_iUsedSize;
-	int					m_iGrowSize;
-
-	void				Reserve(int iSize);
-
-public:
-						StringBuilder();
-						~StringBuilder();
-	void				Append(const char* szStr);
-	void				AppendFmt(const char* szFormat, ...);
-	void				AppendFmtV(const char* szFormat, va_list ap);
-	const char*			GetBuffer() { return m_szBuffer; }
-	void				SetGrowSize(int iGrowSize) { m_iGrowSize = iGrowSize; }
-	int					GetUsedSize() { return m_iUsedSize; }
-	void				Clear();
-};
-
-class Util
+class Util 
 {
 public:
+
 	static char* BaseFileName(const char* filename);
 	static void NormalizePathSeparators(char* szPath);
 	static bool LoadFileIntoBuffer(const char* szFileName, char** pBuffer, int* pBufferLength);
-	static bool SaveBufferIntoFile(const char* szFileName, const char* szBuffer, int iBufLen);
-	static bool CreateSparseFile(const char* szFilename, long long iSize);
+	static bool CreateSparseFile(const char* szFilename, int iSize);
 	static bool TruncateFile(const char* szFilename, int iSize);
 	static void MakeValidFilename(char* szFilename, char cReplaceChar, bool bAllowSlashes);
-	static bool MakeUniqueFilename(char* szDestBufFilename, int iDestBufSize, const char* szDestDir, const char* szBasename);
 	static bool MoveFile(const char* szSrcFilename, const char* szDstFilename);
-	static bool CopyFile(const char* szSrcFilename, const char* szDstFilename);
 	static bool FileExists(const char* szFilename);
-	static bool FileExists(const char* szPath, const char* szFilenameWithoutPath);
 	static bool DirectoryExists(const char* szDirFilename);
 	static bool CreateDirectory(const char* szDirFilename);
-	static bool RemoveDirectory(const char* szDirFilename);
-	static bool DeleteDirectoryWithContent(const char* szDirFilename, char* szErrBuf, int iBufSize);
-	static bool ForceDirectories(const char* szPath, char* szErrBuf, int iBufSize);
+	static bool ForceDirectories(const char* szPath);
 	static bool GetCurrentDirectory(char* szBuffer, int iBufSize);
 	static bool SetCurrentDirectory(const char* szDirFilename);
 	static long long FileSize(const char* szFilename);
@@ -117,22 +80,9 @@ public:
 	static bool RenameBak(const char* szFilename, const char* szBakPart, bool bRemoveOldExtension, char* szNewNameBuf, int iNewNameBufSize);
 #ifndef WIN32
 	static bool ExpandHomePath(const char* szFilename, char* szBuffer, int iBufSize);
-	static void FixExecPermission(const char* szFilename);
 #endif
 	static void ExpandFileName(const char* szFilename, char* szBuffer, int iBufSize);
-	static void GetExeFileName(const char* argv0, char* szBuffer, int iBufSize);
-	static char* FormatSpeed(char* szBuffer, int iBufSize, int iBytesPerSecond);
-	static char* FormatSize(char* szBuffer, int iBufLen, long long lFileSize);
-	static bool SameFilename(const char* szFilename1, const char* szFilename2);
-	static bool MatchFileExt(const char* szFilename, const char* szExtensionList, const char* szListSeparator);
-	static char* GetLastErrorMessage(char* szBuffer, int iBufLen);
-	static long long GetCurrentTicks();
-
-	/* Flush disk buffers for file with given descriptor */
-	static bool FlushFileBuffers(int iFileDescriptor, char* szErrBuf, int iBufSize);
-
-	/* Flush disk buffers for file metadata (after file renaming) */
-	static bool FlushDirBuffers(const char* szFilename, char* szErrBuf, int iBufSize);
+	static void FormatFileSize(char* szBuffer, int iBufLen, long long lFileSize);
 
 	/*
 	 * Split command line int arguments.
@@ -151,24 +101,14 @@ public:
 	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 void TrimRight(char* szStr);
-	static char* Trim(char* szStr);
-	static bool EmptyStr(const char* szStr) { return !szStr || !*szStr; }
-
-	/* replace all occurences of szFrom to szTo in string szStr with a limitation that szTo must be shorter than szFrom */
-	static char* ReduceStr(char* szStr, const char* szFrom, const char* szTo);
-
-	/* Calculate Hash using Bob Jenkins (1996) algorithm */
-	static unsigned int HashBJ96(const char* szBuffer, int iBufSize, unsigned int iInitValue);
-
-#ifdef WIN32
-	static bool RegReadStr(HKEY hKey, const char* szKeyName, const char* szValueName, char* szBuffer, int* iBufLen);
-#endif
-
-	static void SetStandByMode(bool bStandBy);
-
-	/* cross platform version of GNU timegm, which is similar to mktime but takes an UTC time as parameter */
-	static time_t Timegm(tm const *t);
 
 	/*
 	 * Returns program version and revision number as string formatted like "0.7.0-r295".
@@ -176,18 +116,14 @@ public:
 	 */
 	static const char* VersionRevision() { return VersionRevisionBuf; };
 	
-	static char VersionRevisionBuf[100];
-
-	static void Init();
-
-	static unsigned long Crc32(unsigned char *block, unsigned long length);
-	static unsigned long Crc32m(unsigned long startCrc, unsigned char *block, unsigned long length);
-	static unsigned long Crc32Combine(unsigned long crc1, unsigned long crc2, unsigned long len2);
-
 	/*
-	 * Returns number of available CPU cores or -1 if it could not be determined
+	 * Initialize buffer for program version and revision number.
+	 * This function must be called during program initialization before any
+	 * call to "VersionRevision()".
 	 */
-	static int NumberOfCpuCores();
+	static void InitVersionRevision();
+	
+	static char VersionRevisionBuf[40];
 };
 
 class WebUtil
@@ -218,18 +154,6 @@ public:
 	 */
 	static bool XmlParseTagValue(const char* szXml, const char* szTag, char* szValueBuf, int iValueBufSize, const char** pTagEnd);
 
-	/*
-	 * Replaces all tags with spaces effectively providing the text content only.
-	 * The string is transformed in-place overwriting the previous content.
-	 */
-	static void XmlStripTags(char* szXml);
-
-	/*
-	 * Replaces all entities with spaces.
-	 * The string is transformed in-place overwriting the previous content.
-	 */
-	static void XmlRemoveEntities(char* raw);
-
 	/*
 	 * Creates JSON-string by replace the certain characters with escape-sequences.
 	 * Returns new string allocated with malloc, it need to be freed by caller.
@@ -259,31 +183,6 @@ public:
 	 * The string is decoded on the place overwriting the content of raw-data.
 	 */
 	static void HttpUnquote(char* raw);
-
-	/*
-	 * Decodes URL-string.
-	 * The string is decoded on the place overwriting the content of raw-data.
-	 */
-	static void URLDecode(char* raw);
-
-	/*
-	 * Makes valid URL by replacing of spaces with "%20".
-	 * Returns new string allocated with malloc, it need to be freed by caller.
-	 */
-	static char* URLEncode(const char* raw);
-
-#ifdef WIN32
-	static bool Utf8ToAnsi(char* szBuffer, int iBufLen);
-	static bool AnsiToUtf8(char* szBuffer, int iBufLen);
-#endif
-
-	/*
-	 * Converts ISO-8859-1 (aka Latin-1) into UTF-8.
-	 * Returns new string allocated with malloc, it needs to be freed by caller.
-	 */
-	static char* Latin1ToUtf8(const char* szStr);
-
-	static time_t ParseRfc822DateTime(const char* szDateTimeStr);
 };
 
 class URL
@@ -319,38 +218,12 @@ class RegEx
 private:
 	void*				m_pContext;
 	bool				m_bValid;
-	void*				m_pMatches;
-	int					m_iMatchBufSize;
 
 public:
-						RegEx(const char *szPattern, int iMatchBufSize = 100);
+						RegEx(const char *szPattern);
 						~RegEx();
 	bool				IsValid() { return m_bValid; }
 	bool				Match(const char *szStr);
-	int					GetMatchCount();
-	int					GetMatchStart(int index);
-	int					GetMatchLen(int index);
-};
-
-class WildMask
-{
-private:
-	char*				m_szPattern;
-	bool				m_bWantsPositions;
-	int					m_iWildCount;
-	int*				m_WildStart;
-	int*				m_WildLen;
-	int					m_iArrLen;
-
-	void				ExpandArray();
-
-public:
-						WildMask(const char *szPattern, bool bWantsPositions = false);
-						~WildMask();
-	bool				Match(const char *szStr);
-	int					GetMatchCount() { return m_iWildCount; }
-	int					GetMatchStart(int index) { return m_WildStart[index]; }
-	int					GetMatchLen(int index) { return m_WildLen[index]; }
 };
 
 #ifndef DISABLE_GZIP
@@ -400,21 +273,4 @@ public:
 };
 #endif
 
-class Tokenizer
-{
-private:
-	char				m_szDefaultBuf[2014];
-	char*				m_szDataString;
-	bool				m_bInplaceBuf;
-	const char*			m_szSeparators;
-	char*				m_szSavePtr;
-	bool				m_bWorking;
-
-public:
-						Tokenizer(const char* szDataString, const char* szSeparators);
-						Tokenizer(char* szDataString, const char* szSeparators, bool bInplaceBuf);
-						~Tokenizer();
-	char*				Next();
-};
-
 #endif

WebDownloader.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2012-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2012 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+#include <cstdio>
 #ifdef WIN32
 #include <direct.h>
 #else
@@ -49,6 +49,8 @@
 #include "Options.h"
 #include "Util.h"
 
+extern Options* g_pOptions;
+
 WebDownloader::WebDownloader()
 {
 	debug("Creating WebDownloader");
@@ -60,8 +62,6 @@ WebDownloader::WebDownloader()
 	m_bConfirmedLength = false;
 	m_eStatus = adUndefined;
 	m_szOriginalFilename = NULL;
-	m_bForce = false;
-	m_bRetry = true;
 	SetLastUpdateTimeNow();
 }
 
@@ -69,10 +69,22 @@ WebDownloader::~WebDownloader()
 {
 	debug("Destroying WebDownloader");
 
-	free(m_szURL);
-	free(m_szInfoName);
-	free(m_szOutputFilename);
-	free(m_szOriginalFilename);
+	if (m_szURL)
+	{
+		free(m_szURL);
+	}
+	if (m_szInfoName)
+	{
+		free(m_szInfoName);
+	}
+	if (m_szOutputFilename)
+	{
+		free(m_szOutputFilename);
+	}
+	if (m_szOriginalFilename)
+	{
+		free(m_szOriginalFilename);
+	}
 }
 
 void WebDownloader::SetOutputFilename(const char* v)
@@ -87,8 +99,7 @@ void WebDownloader::SetInfoName(const char* v)
 
 void WebDownloader::SetURL(const char * szURL)
 {
-	free(m_szURL);
-	m_szURL = WebUtil::URLEncode(szURL);
+	m_szURL = strdup(szURL);
 }
 
 void WebDownloader::SetStatus(EStatus eStatus)
@@ -105,11 +116,6 @@ void WebDownloader::Run()
 
 	int iRemainedDownloadRetries = g_pOptions->GetRetries() > 0 ? g_pOptions->GetRetries() : 1;
 	int iRemainedConnectRetries = iRemainedDownloadRetries > 10 ? iRemainedDownloadRetries : 10;
-	if (!m_bRetry)
-	{
-		iRemainedDownloadRetries = 1;
-		iRemainedConnectRetries = 1;
-	}
 
 	EStatus Status = adFailed;
 
@@ -117,23 +123,23 @@ void WebDownloader::Run()
 	{
 		SetLastUpdateTimeNow();
 
-		Status = DownloadWithRedirects(5);
+		Status = Download();
 
 		if ((((Status == adFailed) && (iRemainedDownloadRetries > 1)) ||
 			((Status == adConnectError) && (iRemainedConnectRetries > 1)))
-			&& !IsStopped() && !(!m_bForce && g_pOptions->GetPauseDownload()))
+			&& !IsStopped() && !(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
 		{
 			detail("Waiting %i sec to retry", g_pOptions->GetRetryInterval());
 			int msec = 0;
 			while (!IsStopped() && (msec < g_pOptions->GetRetryInterval() * 1000) && 
-				!(!m_bForce && g_pOptions->GetPauseDownload()))
+				!(g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2()))
 			{
 				usleep(100 * 1000);
 				msec += 100;
 			}
 		}
 
-		if (IsStopped() || (!m_bForce && g_pOptions->GetPauseDownload()))
+		if (IsStopped() || g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2())
 		{
 			Status = adRetry;
 			break;
@@ -193,7 +199,6 @@ WebDownloader::EStatus WebDownloader::Download()
 		return Status;
 	}
 
-	m_pConnection->SetTimeout(g_pOptions->GetUrlTimeout());
 	m_pConnection->SetSuppressErrors(false);
 
 	// connection
@@ -232,24 +237,6 @@ WebDownloader::EStatus WebDownloader::Download()
 	return Status;
 }
 
-WebDownloader::EStatus WebDownloader::DownloadWithRedirects(int iMaxRedirects)
-{
-	// do sync download, following redirects
-	EStatus eStatus = adRedirect;
-	while (eStatus == adRedirect && iMaxRedirects >= 0)
-	{
-		iMaxRedirects--;
-		eStatus = Download();
-	}
-
-	if (eStatus == adRedirect && iMaxRedirects < 0)
-	{
-		warn("Too many redirects for %s", m_szInfoName);
-		eStatus = adFailed;
-	}
-
-	return eStatus;
-}
 
 WebDownloader::EStatus WebDownloader::CreateConnection(URL *pUrl)
 {
@@ -303,15 +290,7 @@ void WebDownloader::SendHeaders(URL *pUrl)
 	tmp[1024-1] = '\0';
 	m_pConnection->WriteLine(tmp);
 
-	if ((!strcasecmp(pUrl->GetProtocol(), "http") && (pUrl->GetPort() == 80 || pUrl->GetPort() == 0)) ||
-		(!strcasecmp(pUrl->GetProtocol(), "https") && (pUrl->GetPort() == 443 || pUrl->GetPort() == 0)))
-	{
-		snprintf(tmp, 1024, "Host: %s\r\n", pUrl->GetHost());
-	}
-	else
-	{
-		snprintf(tmp, 1024, "Host: %s:%i\r\n", pUrl->GetHost(), pUrl->GetPort());
-	}
+	snprintf(tmp, 1024, "Host: %s\r\n", pUrl->GetHost());
 	tmp[1024-1] = '\0';
 	m_pConnection->WriteLine(tmp);
 
@@ -333,8 +312,6 @@ WebDownloader::EStatus WebDownloader::DownloadHeaders()
 	m_iContentLen = -1;
 	bool bFirstLine = true;
 	m_bGZip = false;
-	m_bRedirecting = false;
-	m_bRedirected = false;
 
 	// Headers
 	while (!IsStopped())
@@ -370,17 +347,14 @@ WebDownloader::EStatus WebDownloader::DownloadHeaders()
 		// 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);
@@ -416,14 +390,14 @@ WebDownloader::EStatus WebDownloader::DownloadBody()
 		m_pConnection->ReadBuffer(&szBuffer, &iLen);
 		if (iLen == 0)
 		{
-			iLen = m_pConnection->TryRecv(szLineBuf, LineBufSize);
+			iLen = m_pConnection->Recv(szLineBuf, LineBufSize);
 			szBuffer = szLineBuf;
 		}
 
-		// Connection closed or timeout?
+		// Have we encountered a timeout?
 		if (iLen <= 0)
 		{
-			if (iLen == 0 && m_iContentLen == -1 && iWrittenLen > 0)
+			if (m_iContentLen == -1)
 			{
 				bEnd = true;
 				break;
@@ -456,7 +430,10 @@ WebDownloader::EStatus WebDownloader::DownloadBody()
 	free(szLineBuf);
 
 #ifndef DISABLE_GZIP
-	delete m_pGUnzipStream;
+	if (m_pGUnzipStream)
+	{
+		delete m_pGUnzipStream;
+	}
 #endif
 
 	if (m_pOutFile)
@@ -508,11 +485,6 @@ WebDownloader::EStatus WebDownloader::CheckResponse(const char* szResponse)
 		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
@@ -528,24 +500,21 @@ WebDownloader::EStatus WebDownloader::CheckResponse(const char* szResponse)
 
 void WebDownloader::ProcessHeader(const char* szLine)
 {
-	if (!strncasecmp(szLine, "Content-Length: ", 16))
+	if (!strncmp(szLine, "Content-Length: ", 16))
 	{
 		m_iContentLen = atoi(szLine + 16);
 		m_bConfirmedLength = true;
 	}
-	else if (!strncasecmp(szLine, "Content-Encoding: gzip", 22))
+
+	if (!strncmp(szLine, "Content-Encoding: gzip", 22))
 	{
 		m_bGZip = true;
 	}
-	else if (!strncasecmp(szLine, "Content-Disposition: ", 21))
+
+	if (!strncmp(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)
@@ -582,67 +551,15 @@ void WebDownloader::ParseFilename(const char* szContentDisposition)
 
 	WebUtil::HttpUnquote(fname);
 
-	free(m_szOriginalFilename);
+	if (m_szOriginalFilename)
+	{
+		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())
-	{
-		// redirect within host
-
-		char szResource[1024];
-		URL oldUrl(m_szURL);
-
-		if (*szLocation == '/')
-		{
-			// absolute path within host
-			strncpy(szResource, szLocation, 1024);
-			szResource[1024-1] = '\0';
-		}
-		else
-		{
-			// relative path within host
-			strncpy(szResource, oldUrl.GetResource(), 1024);
-			szResource[1024-1] = '\0';
-
-			char* p = strchr(szResource, '?');
-			if (p)
-			{
-				*p = '\0';
-			}
-
-			p = strrchr(szResource, '/');
-			if (p)
-			{
-				p[1] = '\0';
-			}
-
-			strncat(szResource, szLocation, 1024 - strlen(szResource));
-			szResource[1024-1] = '\0';
-		}
-
-		if (oldUrl.GetPort() > 0)
-		{
-			snprintf(szUrlBuf, 1024, "%s://%s:%i%s", oldUrl.GetProtocol(), oldUrl.GetHost(), oldUrl.GetPort(), szResource);
-		}
-		else
-		{
-			snprintf(szUrlBuf, 1024, "%s://%s%s", oldUrl.GetProtocol(), oldUrl.GetHost(), szResource);
-		}
-		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())
@@ -690,15 +607,15 @@ bool WebDownloader::PrepareFile()
 	// prepare file for writing
 
 	const char* szFilename = m_szOutputFilename;
-	m_pOutFile = fopen(szFilename, FOPEN_WB);
+	m_pOutFile = fopen(szFilename, "wb");
 	if (!m_pOutFile)
 	{
 		error("Could not %s file %s", "create", szFilename);
 		return false;
 	}
-	if (g_pOptions->GetWriteBuffer() > 0)
+	if (g_pOptions->GetWriteBufferSize() > 0)
 	{
-		setvbuf(m_pOutFile, NULL, _IOFBF, g_pOptions->GetWriteBuffer() * 1024);
+		setvbuf(m_pOutFile, (char *)NULL, _IOFBF, g_pOptions->GetWriteBufferSize());
 	}
 
 	return true;
@@ -713,7 +630,7 @@ void WebDownloader::LogDebugInfo()
 		ctime_r(&m_tLastUpdateTime, szTime);
 #endif
 
-	info("      Web-Download: status=%i, LastUpdateTime=%s, filename=%s", m_eStatus, szTime, Util::BaseFileName(m_szOutputFilename));
+	debug("      Web-Download: status=%i, LastUpdateTime=%s, filename=%s", m_eStatus, szTime, Util::BaseFileName(m_szOutputFilename));
 }
 
 void WebDownloader::Stop()

WebDownloader.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2012-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2012 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -44,7 +44,6 @@ public:
 		adFailed,
 		adRetry,
 		adNotFound,
-		adRedirect,
 		adConnectError,
 		adFatalError
 	};
@@ -61,11 +60,7 @@ private:
 	int					m_iContentLen;
 	bool				m_bConfirmedLength;
 	char*				m_szOriginalFilename;
-	bool				m_bForce;
-	bool				m_bRedirecting;
-	bool				m_bRedirected;
 	bool				m_bGZip;
-	bool				m_bRetry;
 #ifndef DISABLE_GZIP
 	GUnzipStream*		m_pGUnzipStream;
 #endif
@@ -75,24 +70,22 @@ private:
 	bool				PrepareFile();
 	void				FreeConnection();
 	EStatus				CheckResponse(const char* szResponse);
+	EStatus				Download();
 	EStatus				CreateConnection(URL *pUrl);
 	void				ParseFilename(const char* szContentDisposition);
 	void				SendHeaders(URL *pUrl);
 	EStatus				DownloadHeaders();
 	EStatus				DownloadBody();
-	void				ParseRedirect(const char* szLocation); 
 
 protected:
 	virtual void		ProcessHeader(const char* szLine);
 
 public:
 						WebDownloader();
-	virtual				~WebDownloader();
+						~WebDownloader();
 	EStatus				GetStatus() { return m_eStatus; }
 	virtual void		Run();
 	virtual void		Stop();
-	EStatus				Download();
-	EStatus				DownloadWithRedirects(int iMaxRedirects);
 	bool				Terminate();
 	void				SetInfoName(const char* v);
 	const char*			GetInfoName() { return m_szInfoName; }
@@ -103,8 +96,6 @@ public:
 	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();
 };

WebServer.cpp

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2012-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2012 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -33,7 +33,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
+#include <cstdio>
 #ifndef WIN32
 #include <unistd.h>
 #endif
@@ -45,50 +45,21 @@
 #include "Options.h"
 #include "Util.h"
 
+extern Options* g_pOptions;
+
 static const char* ERR_HTTP_BAD_REQUEST = "400 Bad Request";
 static const char* ERR_HTTP_NOT_FOUND = "404 Not Found";
 static const char* ERR_HTTP_SERVICE_UNAVAILABLE = "503 Service Unavailable";
 
 static const int MAX_UNCOMPRESSED_SIZE = 500;
-char WebProcessor::m_szServerAuthToken[3][49];
 
 //*****************************************************************
 // WebProcessor
 
-void WebProcessor::Init()
-{
-	if (m_szServerAuthToken[0][0] != 0)
-	{
-		// already initialized
-		return;
-	}
-
-	for (int j = uaControl; j <= uaAdd; j++)
-	{
-		for (int i = 0; i < sizeof(m_szServerAuthToken[j]) - 1; i++)
-		{
-			int ch = rand() % (10 + 26 + 26);
-			if (0 <= ch && ch < 10)
-			{
-				m_szServerAuthToken[j][i] = '0' + ch;
-			}
-			else if (10 <= ch && ch < 10 + 26)
-			{
-				m_szServerAuthToken[j][i] = 'a' + ch - 10;
-			}
-			else
-			{
-				m_szServerAuthToken[j][i] = 'A' + ch - 10 - 26;
-			}
-		}
-		m_szServerAuthToken[j][sizeof(m_szServerAuthToken[j]) - 1] = '\0';
-		debug("X-Auth-Token[%i]: %s", j, m_szServerAuthToken[j]);
-	}
-}
-
 WebProcessor::WebProcessor()
 {
 	m_pConnection = NULL;
+	m_szClientIP = NULL;
 	m_szRequest = NULL;
 	m_szUrl = NULL;
 	m_szOrigin = NULL;
@@ -96,9 +67,18 @@ WebProcessor::WebProcessor()
 
 WebProcessor::~WebProcessor()
 {
-	free(m_szRequest);
-	free(m_szUrl);
-	free(m_szOrigin);
+	if (m_szRequest)
+	{
+		free(m_szRequest);
+	}
+	if (m_szUrl)
+	{
+		free(m_szUrl);
+	}
+	if (m_szOrigin)
+	{
+		free(m_szOrigin);
+	}
 }
 
 void WebProcessor::SetUrl(const char* szUrl)
@@ -109,73 +89,30 @@ void WebProcessor::SetUrl(const char* szUrl)
 void WebProcessor::Execute()
 {
 	m_bGZip =false;
-	m_eUserAccess = uaControl;
-	m_szAuthInfo[0] = '\0';
-	m_szAuthToken[0] = '\0';
+	char szAuthInfo[1024];
+	szAuthInfo[0] = '\0';
 
-	ParseHeaders();
-
-	if (m_eHttpMethod == hmPost && m_iContentLen <= 0)
-	{
-		error("Invalid-request: content length is 0");
-		return;
-	}
-
-	if (m_eHttpMethod == hmOptions)
-	{
-		SendOptionsResponse();
-		return;
-	}
-
-	ParseURL();
-
-	if (!CheckCredentials())
-	{
-		SendAuthResponse();
-		return;
-	}
-
-	if (m_eHttpMethod == hmPost)
-	{
-		// reading http body (request content)
-		m_szRequest = (char*)malloc(m_iContentLen + 1);
-		m_szRequest[m_iContentLen] = '\0';
-		
-		if (!m_pConnection->Recv(m_szRequest, m_iContentLen))
-		{
-			error("Invalid-request: could not read data");
-			return;
-		}
-		debug("Request=%s", m_szRequest);
-	}
-	
-	debug("request received from %s", m_pConnection->GetRemoteAddr());
-
-	Dispatch();
-}
-
-void WebProcessor::ParseHeaders()
-{
 	// reading http header
 	char szBuffer[1024];
-	m_iContentLen = 0;
+	bool bBody = false;
+	int iContentLen = 0;
 	while (char* p = m_pConnection->ReadLine(szBuffer, sizeof(szBuffer), NULL))
 	{
 		if (char* pe = strrchr(p, '\r')) *pe = '\0';
 		debug("header=%s", p);
 		if (!strncasecmp(p, "Content-Length: ", 16))
 		{
-			m_iContentLen = atoi(p + 16);
+			iContentLen = atoi(p + 16);
 		}
 		if (!strncasecmp(p, "Authorization: Basic ", 21))
 		{
 			char* szAuthInfo64 = p + 21;
-			if (strlen(szAuthInfo64) > sizeof(m_szAuthInfo))
+			if (strlen(szAuthInfo64) > sizeof(szAuthInfo))
 			{
-				error("Invalid-request: auth-info too big");
+				error("invalid-request: auth-info too big");
 				return;
 			}
-			m_szAuthInfo[WebUtil::DecodeBase64(szAuthInfo64, 0, m_szAuthInfo)] = '\0';
+			szAuthInfo[WebUtil::DecodeBase64(szAuthInfo64, 0, szAuthInfo)] = '\0';
 		}
 		if (!strncasecmp(p, "Accept-Encoding: ", 17))
 		{
@@ -185,24 +122,28 @@ void WebProcessor::ParseHeaders()
 		{
 			m_szOrigin = strdup(p + 8);
 		}
-		if (!strncasecmp(p, "X-Auth-Token: ", 14))
-		{
-			strncpy(m_szAuthToken, p + 14, sizeof(m_szAuthToken)-1);
-			m_szAuthToken[sizeof(m_szAuthToken)-1] = '\0';
-		}
 		if (*p == '\0')
 		{
+			bBody = true;
 			break;
 		}
 	}
 
 	debug("URL=%s", m_szUrl);
-	debug("Authorization=%s", m_szAuthInfo);
-	debug("X-Auth-Token=%s", m_szAuthToken);
-}
+	debug("Authorization=%s", szAuthInfo);
+
+	if (m_eHttpMethod == hmPost && iContentLen <= 0)
+	{
+		error("invalid-request: content length is 0");
+		return;
+	}
+
+	if (m_eHttpMethod == hmOptions)
+	{
+		SendOptionsResponse();
+		return;
+	}
 
-void WebProcessor::ParseURL()
-{
 	// remove subfolder "nzbget" from the path (if exists)
 	// http://localhost:6789/nzbget/username:password/jsonrpc -> http://localhost:6789/username:password/jsonrpc
 	if (!strncmp(m_szUrl, "/nzbget/", 8))
@@ -232,91 +173,55 @@ void WebProcessor::ParseURL()
 		char* pend = strchr(pstart + 1, '/');
 		if (pend) 
 		{
-			iLen = (int)(pend - pstart < (int)sizeof(m_szAuthInfo) - 1 ? pend - pstart : (int)sizeof(m_szAuthInfo) - 1);
+			iLen = (int)(pend - pstart < (int)sizeof(szAuthInfo) - 1 ? pend - pstart : (int)sizeof(szAuthInfo) - 1);
 		}
 		else
 		{
 			iLen = strlen(pstart);
 		}
-		strncpy(m_szAuthInfo, pstart, iLen);
-		m_szAuthInfo[iLen] = '\0';
+		strncpy(szAuthInfo, pstart, iLen);
+		szAuthInfo[iLen] = '\0';
 		char* sz_OldUrl = m_szUrl;
 		m_szUrl = strdup(pend);
 		free(sz_OldUrl);
 	}
 
 	debug("Final URL=%s", m_szUrl);
-}
 
-bool WebProcessor::CheckCredentials()
-{
-	if (!Util::EmptyStr(g_pOptions->GetControlPassword()) &&
-		!(!Util::EmptyStr(g_pOptions->GetAuthorizedIP()) && IsAuthorizedIP(m_pConnection->GetRemoteAddr())))
+	if (strlen(szAuthInfo) == 0)
 	{
-		if (Util::EmptyStr(m_szAuthInfo))
-		{
-			// Authorization via X-Auth-Token
-			for (int j = uaControl; j <= uaAdd; j++)
-			{
-				if (!strcmp(m_szAuthToken, m_szServerAuthToken[j]))
-				{
-					m_eUserAccess = (EUserAccess)j;
-					return true;
-				}
-			}
-			return false;
-		}
-
-		// Authorization via username:password
-		char* pw = strchr(m_szAuthInfo, ':');
-		if (pw) *pw++ = '\0';
-
-		if ((Util::EmptyStr(g_pOptions->GetControlUsername()) ||
-			 !strcmp(m_szAuthInfo, g_pOptions->GetControlUsername())) &&
-			pw && !strcmp(pw, g_pOptions->GetControlPassword()))
-		{
-			m_eUserAccess = uaControl;
-		}
-		else if (!Util::EmptyStr(g_pOptions->GetRestrictedUsername()) &&
-			!strcmp(m_szAuthInfo, g_pOptions->GetRestrictedUsername()) &&
-			pw && !strcmp(pw, g_pOptions->GetRestrictedPassword()))
-		{
-			m_eUserAccess = uaRestricted;
-		}
-		else if (!Util::EmptyStr(g_pOptions->GetAddUsername()) &&
-			!strcmp(m_szAuthInfo, g_pOptions->GetAddUsername()) &&
-			pw && !strcmp(pw, g_pOptions->GetAddPassword()))
-		{
-			m_eUserAccess = uaAdd;
-		}
-		else
-		{
-			warn("Request received on port %i from %s, but username or password invalid (%s:%s)",
-				g_pOptions->GetControlPort(), m_pConnection->GetRemoteAddr(), m_szAuthInfo, pw);
-			return false;
-		}
+		SendAuthResponse();
+		return;
 	}
 
-	return true;
-}
-
-bool WebProcessor::IsAuthorizedIP(const char* szRemoteAddr)
-{
-	const char* szRemoteIP = m_pConnection->GetRemoteAddr();
-
-	// split option AuthorizedIP into tokens and check each token
-	bool bAuthorized = false;
-	Tokenizer tok(g_pOptions->GetAuthorizedIP(), ",;");
-	while (const char* szIP = tok.Next())
+	// Authorization
+	char* pw = strchr(szAuthInfo, ':');
+	if (pw) *pw++ = '\0';
+	if (strcmp(szAuthInfo, "nzbget") || strcmp(pw, g_pOptions->GetControlPassword()))
 	{
-		if (!strcmp(szIP, szRemoteIP))
+		warn("request received on port %i from %s, but password invalid", g_pOptions->GetControlPort(), m_szClientIP);
+		SendAuthResponse();
+		return;
+	}
+
+	if (m_eHttpMethod == hmPost)
+	{
+		// reading http body (request content)
+		m_szRequest = (char*)malloc(iContentLen + 1);
+		m_szRequest[iContentLen] = '\0';
+		
+		if (!m_pConnection->RecvAll(m_szRequest, iContentLen))
 		{
-			bAuthorized = true;
-			break;
+			free(m_szRequest);
+			error("invalid-request: could not read data");
+			return;
 		}
+		debug("Request=%s", m_szRequest);
 	}
 	
-	return bAuthorized;
+	debug("request received from %s", m_szClientIP);
+
+	Dispatch();
 }
 
 void WebProcessor::Dispatch()
@@ -331,15 +236,15 @@ void WebProcessor::Dispatch()
 	{
 		XmlRpcProcessor processor;
 		processor.SetRequest(m_szRequest);
+		processor.SetClientIP(m_szClientIP);
 		processor.SetHttpMethod(m_eHttpMethod == hmGet ? XmlRpcProcessor::hmGet : XmlRpcProcessor::hmPost);
-		processor.SetUserAccess((XmlRpcProcessor::EUserAccess)m_eUserAccess);
 		processor.SetUrl(m_szUrl);
 		processor.Execute();
 		SendBodyResponse(processor.GetResponse(), strlen(processor.GetResponse()), processor.GetContentType()); 
 		return;
 	}
 
-	if (Util::EmptyStr(g_pOptions->GetWebDir()))
+	if (!g_pOptions->GetWebDir() || strlen(g_pOptions->GetWebDir()) == 0)
 	{
 		SendErrorResponse(ERR_HTTP_SERVICE_UNAVAILABLE);
 		return;
@@ -468,7 +373,6 @@ void WebProcessor::SendBodyResponse(const char* szBody, int iBodyLen, const char
 		"Access-Control-Allow-Credentials: true\r\n"
 		"Access-Control-Max-Age: 86400\r\n"
 		"Access-Control-Allow-Headers: Content-Type, Authorization\r\n"
-		"X-Auth-Token: %s\r\n"
 		"Content-Length: %i\r\n"
 		"%s"					// Content-Type: xxx
 		"%s"					// Content-Encoding: gzip
@@ -512,7 +416,7 @@ void WebProcessor::SendBodyResponse(const char* szBody, int iBodyLen, const char
 	char szResponseHeader[1024];
 	snprintf(szResponseHeader, 1024, RESPONSE_HEADER, 
 		m_szOrigin ? m_szOrigin : "",
-		m_szServerAuthToken[m_eUserAccess], iBodyLen, szContentTypeHeader,
+		iBodyLen, szContentTypeHeader,
 		bGZip ? "Content-Encoding: gzip\r\n" : "",
 		Util::VersionRevision());
 	
@@ -521,7 +425,10 @@ void WebProcessor::SendBodyResponse(const char* szBody, int iBodyLen, const char
 	m_pConnection->Send(szBody, iBodyLen);
 	
 #ifndef DISABLE_GZIP
-	free(szGBuf);
+	if (szGBuf)
+	{
+		free(szGBuf);
+	}
 #endif
 }
 

WebServer.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2012-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2012 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -38,25 +38,14 @@ public:
 		hmOptions
 	};
 
-	enum EUserAccess
-	{
-		uaControl,
-		uaRestricted,
-		uaAdd
-	};
-
 private:
 	Connection*			m_pConnection;
+	const char*			m_szClientIP;
 	char*				m_szRequest;
 	char*				m_szUrl;
 	EHttpMethod			m_eHttpMethod;
-	EUserAccess			m_eUserAccess;
 	bool				m_bGZip;
 	char*				m_szOrigin;
-	int					m_iContentLen;
-	char				m_szAuthInfo[256+1];
-	char				m_szAuthToken[48+1];
-	static char			m_szServerAuthToken[3][48+1];
 
 	void				Dispatch();
 	void				SendAuthResponse();
@@ -66,19 +55,15 @@ private:
 	void				SendBodyResponse(const char* szBody, int iBodyLen, const char* szContentType);
 	void				SendRedirectResponse(const char* szURL);
 	const char*			DetectContentType(const char* szFilename);
-	bool				IsAuthorizedIP(const char* szRemoteAddr);
-	void				ParseHeaders();
-	void				ParseURL();
-	bool				CheckCredentials();
 
 public:
 						WebProcessor();
 						~WebProcessor();
-	static void			Init();
 	void				Execute();
 	void				SetConnection(Connection* pConnection) { m_pConnection = pConnection; }
 	void				SetUrl(const char* szUrl);
 	void				SetHttpMethod(EHttpMethod eHttpMethod) { m_eHttpMethod = eHttpMethod; }
+	void				SetClientIP(const char* szClientIP) { m_szClientIP = szClientIP; }
 };
 
 #endif

XmlRpc.h

@@ -1,7 +1,7 @@
 /*
  *  This file is part of nzbget
  *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -27,7 +27,19 @@
 #define XMLRPC_H
 
 #include "Connection.h"
-#include "Util.h"
+
+class StringBuilder
+{
+private:
+	char*				m_szBuffer;
+	int					m_iBufferSize;
+	int					m_iUsedSize;
+public:
+						StringBuilder();
+						~StringBuilder();
+	void				Append(const char* szStr);
+	const char*			GetBuffer() { return m_szBuffer; }
+};
 
 class XmlCommand;
 
@@ -48,34 +60,27 @@ public:
 		hmGet
 	};
 
-	enum EUserAccess
-	{
-		uaControl,
-		uaRestricted,
-		uaAdd
-	};
-
 private:
+	const char*			m_szClientIP;
 	char*				m_szRequest;
 	const char*			m_szContentType;
 	ERpcProtocol		m_eProtocol;
 	EHttpMethod			m_eHttpMethod;
-	EUserAccess			m_eUserAccess;
 	char*				m_szUrl;
 	StringBuilder		m_cResponse;
 
 	void				Dispatch();
 	XmlCommand*			CreateCommand(const char* szMethodName);
 	void				MutliCall();
-	void				BuildResponse(const char* szResponse, const char* szCallbackFunc, bool bFault, const char* szRequestId);
+	void				BuildResponse(const char* szResponse, const char* szCallbackFunc, bool bFault);
 
 public:
 						XmlRpcProcessor();
 						~XmlRpcProcessor();
 	void				Execute();
 	void				SetHttpMethod(EHttpMethod eHttpMethod) { m_eHttpMethod = eHttpMethod; }
-	void				SetUserAccess(EUserAccess eUserAccess) { m_eUserAccess = eUserAccess; }
 	void				SetUrl(const char* szUrl);
+	void				SetClientIP(const char* szClientIP) { m_szClientIP = szClientIP; }
 	void				SetRequest(char* szRequest) { m_szRequest = szRequest; }
 	const char*			GetResponse() { return m_cResponse.GetBuffer(); }
 	const char*			GetContentType() { return m_szContentType; }
@@ -92,21 +97,15 @@ protected:
 	bool				m_bFault;
 	XmlRpcProcessor::ERpcProtocol	m_eProtocol;
 	XmlRpcProcessor::EHttpMethod	m_eHttpMethod;
-	XmlRpcProcessor::EUserAccess	m_eUserAccess;
 
 	void				BuildErrorResponse(int iErrCode, const char* szErrText, ...);
 	void				BuildBoolResponse(bool bOK);
-	void				BuildIntResponse(int iValue);
 	void				AppendResponse(const char* szPart);
-	void				AppendFmtResponse(const char* szFormat, ...);
-	void				AppendCondResponse(const char* szPart, bool bCond);
-	void				OptimizeResponse(int iRecordCount);
 	bool				IsJson();
 	bool				CheckSafeMethod();
 	bool				NextParamAsInt(int* iValue);
 	bool				NextParamAsBool(bool* bValue);
 	bool				NextParamAsStr(char** szValueBuf);
-	char*				XmlNextValue(char* szXml, const char* szTag, int* pValueLength);
 	const char*			BoolToStr(bool bValue);
 	char*				EncodeStr(const char* szStr);
 	void				DecodeStr(char* szStr);
@@ -119,10 +118,167 @@ public:
 	void				SetRequest(char* szRequest) { m_szRequest = szRequest; m_szRequestPtr = m_szRequest; }
 	void				SetProtocol(XmlRpcProcessor::ERpcProtocol eProtocol) { m_eProtocol = eProtocol; }
 	void				SetHttpMethod(XmlRpcProcessor::EHttpMethod eHttpMethod) { m_eHttpMethod = eHttpMethod; }
-	void				SetUserAccess(XmlRpcProcessor::EUserAccess eUserAccess) { m_eUserAccess = eUserAccess; }
 	const char*			GetResponse() { return m_StringBuilder.GetBuffer(); }
 	const char*			GetCallbackFunc() { return m_szCallbackFunc; }
 	bool				GetFault() { return m_bFault; }
 };
 
+class ErrorXmlCommand: public XmlCommand
+{
+private:
+	int					m_iErrCode;
+	const char*			m_szErrText;
+
+public:
+						ErrorXmlCommand(int iErrCode, const char* szErrText);
+	virtual void		Execute();
+};
+
+class PauseUnpauseXmlCommand: public XmlCommand
+{
+public:
+	enum EPauseAction
+	{
+		paDownload,
+		paDownload2,
+		paPostProcess,
+		paScan
+	};
+
+private:
+	bool			m_bPause;
+	EPauseAction	m_eEPauseAction;
+
+public:
+						PauseUnpauseXmlCommand(bool bPause, EPauseAction eEPauseAction);
+	virtual void		Execute();
+};
+
+class ShutdownXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class ReloadXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class VersionXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class DumpDebugXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class SetDownloadRateXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class StatusXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class LogXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class ListFilesXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class ListGroupsXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class EditQueueXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class DownloadXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class PostQueueXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class WriteLogXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class ClearLogXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class ScanXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class HistoryXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class DownloadUrlXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class UrlQueueXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class ConfigXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class LoadConfigXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+};
+
+class SaveConfigXmlCommand: public XmlCommand
+{
+public:
+	virtual void		Execute();
+	void				Save(const char *szFilename);
+};
+
 #endif

config.h.in

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

configure.ac

@@ -1,32 +1,11 @@
-#
-#  This file is part of nzbget
-#
-# Copyright (C) 2008-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-#
-
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(nzbget, 16.1, hugbug@users.sourceforge.net)
-AC_CONFIG_AUX_DIR(posix)
-AM_INIT_AUTOMAKE([foreign])
-AC_CONFIG_SRCDIR([daemon/main/nzbget.cpp])
+AC_INIT(nzbget, 9.0, hugbug@users.sourceforge.net)
+AC_CANONICAL_SYSTEM
+AM_INIT_AUTOMAKE(nzbget, 9.0)
+AC_CONFIG_SRCDIR([nzbget.cpp])
 AC_CONFIG_HEADERS([config.h])
 
 
@@ -77,17 +56,10 @@ AC_CHECK_FUNC(getopt_long,
 
 
 dnl
-dnl fsync
+dnl stat64
 dnl
-AC_CHECK_FUNC(fdatasync,
-	[AC_DEFINE([HAVE_FDATASYNC], 1, [Define to 1 if fdatasync is supported])],)
-AC_CHECK_DECL(F_FULLFSYNC,
-	[AC_DEFINE([HAVE_FULLFSYNC], 1, [Define to 1 if F_FULLFSYNC is supported])],,[#include <fcntl.h>])
-
-dnl
-dnl use 64-Bits for file sizes
-dnl
-AC_SYS_LARGEFILE
+AC_CHECK_FUNC(stat64,
+	[AC_DEFINE([HAVE_STAT64], 1, [Define to 1 if stat64 is supported])],)
 
 
 dnl
@@ -171,6 +143,14 @@ if test "$FOUND" = "no"; then
 fi
 
 
+dnl
+dnl cCheck if spinlocks are available
+dnl
+AC_CHECK_FUNC(pthread_spin_init,
+	[AC_DEFINE([HAVE_SPINLOCK], 1, [Define to 1 if spinlocks are supported])]
+	AC_SEARCH_LIBS([pthread_spin_init], [pthread]),)
+
+
 dnl
 dnl Determine what socket length (socklen_t) data type is
 dnl
@@ -201,37 +181,13 @@ AC_TRY_COMPILE([
 AC_DEFINE_UNQUOTED(SOCKLEN_T, $SOCKLEN_T, [Determine what socket length (socklen_t) data type is])
 
 
-dnl
-dnl Dir-browser's snapshot
-dnl
-AC_MSG_CHECKING(whether dir-browser snapshot workaround is needed)
-if test "$target_vendor" == "apple"; then
-	AC_MSG_RESULT([[yes]])
-	AC_DEFINE([DIRBROWSER_SNAPSHOT], 1, [Define to 1 if deleting of files during reading of directory is not properly supported by OS])
-else
-	AC_MSG_RESULT([[no]])
-fi
-
-
-dnl
-dnl check cpu cores via sysconf
-dnl
-AC_MSG_CHECKING(for cpu cores via sysconf)
-AC_TRY_COMPILE(
-	[#include <unistd.h>],
-	[ int a = _SC_NPROCESSORS_ONLN; ],
-	FOUND="yes"
-	AC_MSG_RESULT([[yes]])
-	AC_DEFINE([HAVE_SC_NPROCESSORS_ONLN], 1, [Define to 1 if _SC_NPROCESSORS_ONLN is present in unistd.h]),
-	FOUND="no")
-
-
 dnl 
 dnl checks for libxml2 includes and libraries.
 dnl
 AC_ARG_WITH(libxml2_includes,
 	[AS_HELP_STRING([--with-libxml2-includes=DIR], [libxml2 include directory])],
 	[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+	[CFLAGS="${CFLAGS} -I${withval}"]
 	[INCVAL="yes"],
 	[INCVAL="no"])
 AC_ARG_WITH(libxml2_libraries,
@@ -241,9 +197,9 @@ AC_ARG_WITH(libxml2_libraries,
 	[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"],
-		AC_MSG_ERROR("libxml2 library not found"))
+		[LDFLAGS="${LDFLAGS} $libxml2_LIBS"]
+		[CPPFLAGS="${CPPFLAGS} $libxml2_CFLAGS"]
+		[CFLAGS="${CFLAGS} $libxml2_CFLAGS"])
 fi
 AC_CHECK_HEADER(libxml/tree.h,,
 	AC_MSG_ERROR("libxml2 header files not found"))
@@ -267,6 +223,7 @@ if test "$USECURSES" = "yes"; then
 		[AS_HELP_STRING([--with-libcurses-includes=DIR], [libcurses include directory])],
 		[INCVAL="$withval"])
 	CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+	CFLAGS="${CFLAGS} -I${INCVAL}"
 	AC_ARG_WITH(libcurses_libraries,
 		[AS_HELP_STRING([--with-libcurses-libraries=DIR], [libcurses library directory])],
 		[LIBVAL="$withval"])
@@ -299,37 +256,90 @@ fi
 
 
 dnl
-dnl Use par-checking. Deafult: yes.
+dnl Use libpar2 for par-checking. Deafult: no
 dnl
 AC_MSG_CHECKING(whether to include code for par-checking)
 AC_ARG_ENABLE(parcheck,
-	[AS_HELP_STRING([--disable-parcheck], [do not include par-check/-repair-support])],
+	[AS_HELP_STRING([--disable-parcheck], [do not include par-check/-repair-support (removes dependency from libpar2- and libsigc-libraries)])],
 	[ ENABLEPARCHECK=$enableval ],
 	[ ENABLEPARCHECK=yes] )
 AC_MSG_RESULT($ENABLEPARCHECK)
 if test "$ENABLEPARCHECK" = "yes"; then
-	dnl PAR2 checks. 
+
 	dnl 
-	dnl Checks for header files.
-	AC_HEADER_DIRENT
-	AC_HEADER_STDBOOL
-	AC_HEADER_STDC
-	AC_CHECK_HEADERS([stdio.h] [endian.h] [getopt.h])
-	dnl Checks for typedefs, structures, and compiler characteristics.
-	AC_TYPE_SIZE_T
-	AC_C_BIGENDIAN
-	AC_C_CONST
-	AC_C_INLINE
-	AC_FUNC_FSEEKO
-	dnl Checks for library functions.
-	AC_FUNC_MEMCMP
-	AC_CHECK_FUNCS([stricmp] [strcasecmp])
-	AC_CHECK_FUNCS([strchr] [memcpy])
-	AC_CHECK_FUNCS([getopt])
-	AM_CONDITIONAL(WITH_PAR2, true)
+	dnl checks for libsigc++ includes and libraries (required for libpar2).
+	dnl
+
+	AC_ARG_WITH(libsigc_includes,
+		[AS_HELP_STRING([--with-libsigc-includes=DIR], [libsigc++-2.0 include directory])],
+		[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+		[INCVAL="yes"],
+		[INCVAL="no"])
+	AC_ARG_WITH(libsigc_libraries,
+		[AS_HELP_STRING([--with-libsigc-libraries=DIR], [libsigc++-2.0 library directory])],
+		[LDFLAGS="${LDFLAGS} -L${withval}"]
+		[CPPFLAGS="${CPPFLAGS} -I${withval}/sigc++-2.0/include"]
+		[LIBVAL="yes"],
+		[LIBVAL="no"])
+	if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+		PKG_CHECK_MODULES(libsigc, sigc++-2.0,
+			[LDFLAGS="${LDFLAGS} $libsigc_LIBS"]
+			[CPPFLAGS="${CPPFLAGS} $libsigc_CFLAGS"])
+	fi
+	
+	AC_CHECK_HEADER(sigc++/type_traits.h,,
+		AC_MSG_ERROR("libsigc++-2.0 header files not found"))
+
+	dnl
+	dnl checks for libpar2 includes and libraries.
+	dnl
+	INCVAL="${LIBPREF}/include"
+	LIBVAL="${LIBPREF}/lib"
+	AC_ARG_WITH(libpar2_includes,
+		[AS_HELP_STRING([--with-libpar2-includes=DIR], [libpar2 include directory])],
+		[INCVAL="$withval"])
+
+	CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+	
+	AC_CHECK_HEADER(libpar2/libpar2.h,,
+		AC_MSG_ERROR("libpar2 header files not found"))
+
+	AC_ARG_WITH(libpar2_libraries,
+		[AS_HELP_STRING([--with-libpar2-libraries=DIR], [libpar2 library directory])],
+		[LIBVAL="$withval"])
+
+	LDFLAGS="${LDFLAGS} -L${LIBVAL}"
+
+	AC_SEARCH_LIBS([_ZN12Par2RepairerC1Ev], [par2], ,
+		AC_MSG_ERROR("libpar2 library not found"))
+
+	dnl
+	dnl check if libpar2 library is linkable
+	dnl
+	AC_MSG_CHECKING(for libpar2 linking)
+	AC_TRY_LINK(
+		[#include <libpar2/par2cmdline.h>]
+		[#include <libpar2/par2repairer.h>]
+		[ class Repairer : public Par2Repairer { }; ],
+		[ Repairer* p = new Repairer(); ],
+		AC_MSG_RESULT([[yes]]),
+		AC_MSG_RESULT([[no]])
+		AC_MSG_ERROR("libpar2 library not found"))
+
+	dnl
+	dnl check if libpar2 has support for cancelling
+	dnl
+	AC_MSG_CHECKING(whether libpar2 supports cancelling)
+	AC_TRY_COMPILE(
+		[#include <libpar2/par2cmdline.h>]
+		[#include <libpar2/par2repairer.h>]
+		[ class Repairer : public Par2Repairer { void test() { cancelled = true; } }; ],
+		[],
+		AC_MSG_RESULT([[yes]])
+		AC_DEFINE([HAVE_PAR2_CANCEL], 1, [Define to 1 if libpar2 supports cancelling (needs a special patch)]),
+		AC_MSG_RESULT([[no]]))
 else
-	AC_DEFINE([DISABLE_PARCHECK],1,[Define to 1 to disable par-verification and repair])
-	AM_CONDITIONAL(WITH_PAR2, false)
+	AC_DEFINE([DISABLE_PARCHECK],1,[Define to 1 to disable smart par-verification and restoration])
 fi
 
 
@@ -344,30 +354,61 @@ AC_ARG_ENABLE(tls,
 AC_MSG_RESULT($USETLS)
 if test "$USETLS" = "yes"; then
 	AC_ARG_WITH(tlslib,
-		[AS_HELP_STRING([--with-tlslib=(OpenSSL, GnuTLS)], [TLS/SSL library to use])],
+		[AS_HELP_STRING([--with-tlslib=(GnuTLS, OpenSSL)], [TLS/SSL library to use])],
 		[TLSLIB="$withval"])
 	if test "$TLSLIB" != "GnuTLS" -a "$TLSLIB" != "OpenSSL" -a "$TLSLIB" != ""; then
 		AC_MSG_ERROR([Invalid argument for option --with-tlslib])
 	fi
-
+	
+	if test "$TLSLIB" = "GnuTLS" -o "$TLSLIB" = ""; then
+		INCVAL="${LIBPREF}/include"
+		LIBVAL="${LIBPREF}/lib"
+		AC_ARG_WITH(libgnutls_includes,
+			[AS_HELP_STRING([--with-libgnutls-includes=DIR], [GnuTLS include directory])],
+			[INCVAL="$withval"])
+		CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+		CFLAGS="${CFLAGS} -I${INCVAL}"
+		AC_ARG_WITH(libgnutls_libraries,
+			[AS_HELP_STRING([--with-libgnutls-libraries=DIR], [GnuTLS library directory])],
+			[LIBVAL="$withval"])
+		LDFLAGS="${LDFLAGS} -L${LIBVAL}"
+	
+		AC_CHECK_HEADER(gnutls/gnutls.h,
+			FOUND=yes
+			TLSHEADERS=yes,
+			FOUND=no)
+		if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
+			AC_MSG_ERROR([Couldn't find GnuTLS headers (gnutls.h)])
+		fi
+		if test "$FOUND" = "yes"; then
+			AC_SEARCH_LIBS([gnutls_global_init], [gnutls],
+				AC_SEARCH_LIBS([gcry_control], [gnutls gcrypt],
+					FOUND=yes,
+					FOUND=no),
+				FOUND=no)
+			if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
+				AC_MSG_ERROR([Couldn't find GnuTLS library])
+			fi
+			if test "$FOUND" = "yes"; then
+				TLSLIB="GnuTLS"
+				AC_DEFINE([HAVE_LIBGNUTLS],1,[Define to 1 to use GnuTLS library for TLS/SSL-support.])
+			fi
+		fi
+	fi
+	
 	if test "$TLSLIB" = "OpenSSL" -o "$TLSLIB" = ""; then
+		INCVAL="${LIBPREF}/include"
+		LIBVAL="${LIBPREF}/lib"
 		AC_ARG_WITH(openssl_includes,
 			[AS_HELP_STRING([--with-openssl-includes=DIR], [OpenSSL include directory])],
-			[CPPFLAGS="${CPPFLAGS} -I${withval}"]
-			[INCVAL="yes"],
-			[INCVAL="no"])
+			[INCVAL="$withval"])
+		CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+		CFLAGS="${CFLAGS} -I${INCVAL}"
 		AC_ARG_WITH(openssl_libraries,
 			[AS_HELP_STRING([--with-openssl-libraries=DIR], [OpenSSL library directory])],
-			[LDFLAGS="${LDFLAGS} -L${withval}"]
-			[LIBVAL="yes"],
-			[LIBVAL="no"])
-		if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
-			PKG_CHECK_MODULES([openssl], [openssl],
-				[LIBS="${LIBS} $openssl_LIBS"]
-				[CPPFLAGS="${CPPFLAGS} $openssl_CFLAGS"],
-				FOUND=no)
-		fi
-
+			[LIBVAL="$withval"])
+		LDFLAGS="${LDFLAGS} -L${LIBVAL}"
+	
 		AC_CHECK_HEADER(openssl/ssl.h,
 			FOUND=yes
 			TLSHEADERS=yes,
@@ -376,10 +417,8 @@ if test "$USETLS" = "yes"; 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),
+			AC_SEARCH_LIBS([SSL_library_init], [ssl],
+				FOUND=yes,
 				FOUND=no)
 			if test "$FOUND" = "no" -a "$TLSLIB" = "OpenSSL"; then
 				AC_MSG_ERROR([Couldn't find OpenSSL library])
@@ -390,66 +429,12 @@ if test "$USETLS" = "yes"; then
 			fi
 		fi
 	fi
-
-	if test "$TLSLIB" = "GnuTLS" -o "$TLSLIB" = ""; then
-		INCVAL="${LIBPREF}/include"
-		LIBVAL="${LIBPREF}/lib"
-		AC_ARG_WITH(libgnutls_includes,
-			[AS_HELP_STRING([--with-libgnutls-includes=DIR], [GnuTLS include directory])],
-			[INCVAL="$withval"])
-		CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
-		AC_ARG_WITH(libgnutls_libraries,
-			[AS_HELP_STRING([--with-libgnutls-libraries=DIR], [GnuTLS library directory])],
-			[LIBVAL="$withval"])
-		LDFLAGS="${LDFLAGS} -L${LIBVAL}"
-
-		AC_CHECK_HEADER(gnutls/gnutls.h,
-			FOUND=yes
-			TLSHEADERS=yes,
-			FOUND=no)
-		if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
-			AC_MSG_ERROR([Couldn't find GnuTLS headers (gnutls.h)])
-		fi
-		if test "$FOUND" = "yes"; then
-			AC_SEARCH_LIBS([gnutls_global_init], [gnutls],
-				FOUND=yes,
-				FOUND=no)
-			if test "$FOUND" = "yes"; then
-				dnl gcrypt is optional
-				AC_MSG_CHECKING([whether gcrypt is needed])
-				AC_TRY_COMPILE(
-					[#include <gnutls/gnutls.h>]
-					[#if GNUTLS_VERSION_NUMBER <= 0x020b00]
-					[compile error]
-					[#endif],
-					[int a;],
-					AC_MSG_RESULT([no])
-					GCRYPT=no,
-					AC_MSG_RESULT([yes])
-					GCRYPT=yes)
-				if test "$GCRYPT" = "yes"; then
-					AC_CHECK_HEADER([gcrypt.h],
-						AC_SEARCH_LIBS([gcry_control], [gnutls gcrypt],
-							FOUND=yes,
-							FOUND=no),
-						FOUND=yes)
-				fi
-			fi
-			if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
-				AC_MSG_ERROR([Couldn't find GnuTLS library])
-			fi
-			if test "$FOUND" = "yes"; then
-				TLSLIB="GnuTLS"
-				AC_DEFINE([HAVE_LIBGNUTLS],1,[Define to 1 to use GnuTLS library for TLS/SSL-support.])
-			fi
-		fi
-	fi
-
+	
 	if test "$TLSLIB" = ""; then
 		if test "$TLSHEADERS" = ""; then
-			AC_MSG_ERROR([Couldn't find neither OpenSSL nor GnuTLS headers (ssl.h or gnutls.h)])
+			AC_MSG_ERROR([Couldn't find neither GnuTLS nor OpenSSL headers (gnutls.h or ssl.h)])
 		else
-			AC_MSG_ERROR([Couldn't find neither OpenSSL nor GnuTLS library])
+			AC_MSG_ERROR([Couldn't find neither GnuTLS nor OpenSSL library])
 		fi
 	fi
 else
@@ -473,6 +458,7 @@ if test "$USEZLIB" = "yes"; then
 		[AS_HELP_STRING([--with-zlib-includes=DIR], [zlib include directory])],
 		[INCVAL="$withval"])
 	CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+	CFLAGS="${CFLAGS} -I${INCVAL}"
 	AC_ARG_WITH(zlib_libraries,
 		[AS_HELP_STRING([--with-zlib-libraries=DIR], [zlib library directory])],
 		[LIBVAL="$withval"])
@@ -490,14 +476,22 @@ 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 Some BSD systems however may not function properly if the handler is installed.
+dnl The default behavior is to check the target and disable the handler on BSD but keep it enabled on other systems.
 dnl
 AC_MSG_CHECKING(whether to use an empty SIGCHLD handler)
 AC_ARG_ENABLE(sigchld-handler,
-	[AS_HELP_STRING([--disable-sigchld-handler], [do not use sigchld-handler (the disabling may be neccessary on 32-Bit BSD)])],
+	[AS_HELP_STRING([--disable-sigchld-handler], [do not use sigchld-handler (the disabling is recommended for BSD)])],
 	[SIGCHLDHANDLER=$enableval],
-	[SIGCHLDHANDLER=yes])
+	[SIGCHLDHANDLER=auto])
+if test "$SIGCHLDHANDLER" = "auto"; then
+	SIGCHLDHANDLER=yes
+	case "$target" in
+		*bsd*)
+			SIGCHLDHANDLER=no
+			;;
+	esac
+fi
 AC_MSG_RESULT($SIGCHLDHANDLER)
 if test "$SIGCHLDHANDLER" = "yes"; then
 	AC_DEFINE([SIGCHLD_HANDLER], 1, [Define to 1 to install an empty signal handler for SIGCHLD])
@@ -524,6 +518,16 @@ 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
@@ -587,26 +591,18 @@ AC_MSG_CHECKING(for rdynamic linker flag)
 dnl
 dnl End of debugging code
 dnl
-else
-AC_DEFINE([NDEBUG],1,Define to 1 to exclude debug-code)
 fi
 
 
-dnl
-dnl Enable test suite. Deafult: no.
-dnl
-AC_MSG_CHECKING(whether to enable unit and integration tests)
-AC_ARG_ENABLE(tests,
-	[AS_HELP_STRING([--enable-tests], [enable unit and integration tests])],
-	[ ENABLETESTS=$enableval ],
-	[ ENABLETESTS=no] )
-AC_MSG_RESULT($ENABLETESTS)
-if test "$ENABLETESTS" = "yes"; then
-	AC_DEFINE([ENABLE_TESTS],1,[Define to 1 to enable unit and integration tests])
-	AM_CONDITIONAL(WITH_TESTS, true)
-else
-	AM_CONDITIONAL(WITH_TESTS, false)
-fi
+dnl Substitute flags.
+AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
+AC_SUBST(LDFLAGS)
+AC_SUBST(CXXFLAGS)
+AC_SUBST(TAR)
+AC_SUBST(AR)
+AC_SUBST(ADDSRCS)
+
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

daemon/connect/TLS.cpp

@@ -1,565 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2008-2015 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>
-#include <stdio.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)
-{
-	char szMessage[1024];
-
-#ifdef HAVE_LIBGNUTLS
-	const char* errstr = gnutls_strerror(m_iRetCode);
-	if (m_bSuppressErrors)
-	{
-		debug("%s: %s", szErrMsg, errstr);
-	}
-	else
-	{
-		snprintf(szMessage, sizeof(szMessage), "%s: %s", szErrMsg, errstr);
-		szMessage[sizeof(szMessage) - 1] = '\0';
-		PrintError(szMessage);
-	}
-#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)
-		{
-			snprintf(szMessage, sizeof(szMessage), "%s: %s", szErrMsg, errstr);
-			szMessage[sizeof(szMessage) - 1] = '\0';
-			PrintError(szMessage);
-		}
-		else
-		{
-			PrintError(szErrMsg);
-		}
-	} while (errcode);
-#endif /* HAVE_OPENSSL */
-}
-
-void TLSSocket::PrintError(const char* szErrMsg)
-{
-	error("%s", szErrMsg);
-}
-
-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

@@ -1,65 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2008-2015 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);
-
-protected:
-	virtual void		PrintError(const char* szErrMsg);
-
-public:
-						TLSSocket(SOCKET iSocket, bool bIsClient, const char* szCertFile, const char* szKeyFile, const char* szCipher);
-	virtual				~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/extension/FeedScript.cpp

@@ -1,95 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2015 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 <sys/stat.h>
-#include <stdio.h>
-
-#include "nzbget.h"
-#include "FeedScript.h"
-#include "Options.h"
-#include "Log.h"
-#include "Util.h"
-
-
-void FeedScriptController::ExecuteScripts(const char* szFeedScript, const char* szFeedFile, int iFeedID)
-{
-	FeedScriptController* pScriptController = new FeedScriptController();
-
-	pScriptController->m_szFeedFile = szFeedFile;
-	pScriptController->m_iFeedID = iFeedID;
-
-	pScriptController->ExecuteScriptList(szFeedScript);
-
-	delete pScriptController;
-}
-
-void FeedScriptController::ExecuteScript(ScriptConfig::Script* pScript)
-{
-	if (!pScript->GetFeedScript())
-	{
-		return;
-	}
-
-	PrintMessage(Message::mkInfo, "Executing feed-script %s for Feed%i", pScript->GetName(), m_iFeedID);
-
-	SetScript(pScript->GetLocation());
-	SetArgs(NULL, false);
-
-	char szInfoName[1024];
-	snprintf(szInfoName, 1024, "feed-script %s for Feed%i", pScript->GetName(), m_iFeedID);
-	szInfoName[1024-1] = '\0';
-	SetInfoName(szInfoName);
-
-	SetLogPrefix(pScript->GetDisplayName());
-	PrepareParams(pScript->GetName());
-
-	Execute();
-
-	SetLogPrefix(NULL);
-}
-
-void FeedScriptController::PrepareParams(const char* szScriptName)
-{
-	ResetEnv();
-
-	SetEnvVar("NZBFP_FILENAME", m_szFeedFile);
-	SetIntEnvVar("NZBFP_FEEDID", m_iFeedID);
-
-	PrepareEnvScript(NULL, szScriptName);
-}

daemon/extension/FeedScript.h

@@ -1,46 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2015 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 FEEDSCRIPT_H
-#define FEEDSCRIPT_H
-
-#include "NzbScript.h"
-
-class FeedScriptController : public NZBScriptController
-{
-private:
-	const char*			m_szFeedFile;
-	int					m_iFeedID;
-
-	void				PrepareParams(const char* szScriptName);
-
-protected:
-	virtual void		ExecuteScript(ScriptConfig::Script* pScript);
-
-public:
-	static void			ExecuteScripts(const char* szFeedScript, const char* szFeedFile, int iFeedID);
-};
-
-#endif

daemon/extension/NzbScript.cpp

@@ -1,125 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2015 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 <sys/stat.h>
-#include <stdio.h>
-#include <algorithm>
-
-#include "nzbget.h"
-#include "NzbScript.h"
-#include "Options.h"
-#include "Log.h"
-#include "Util.h"
-
-		 
-/**
- * If szStripPrefix is not NULL, only pp-parameters, whose names start with the prefix
- * are processed. The prefix is then stripped from the names.
- * If szStripPrefix is NULL, all pp-parameters are processed; without stripping.
- */
-void NZBScriptController::PrepareEnvParameters(NZBParameterList* pParameters, const char* szStripPrefix)
-{
-	int iPrefixLen = szStripPrefix ? strlen(szStripPrefix) : 0;
-
-	for (NZBParameterList::iterator it = pParameters->begin(); it != pParameters->end(); it++)
-	{
-		NZBParameter* pParameter = *it;
-		const char* szValue = pParameter->GetValue();
-		
-#ifdef WIN32
-		char* szAnsiValue = strdup(szValue);
-		WebUtil::Utf8ToAnsi(szAnsiValue, strlen(szAnsiValue) + 1);
-		szValue = szAnsiValue;
-#endif
-
-		if (szStripPrefix && !strncmp(pParameter->GetName(), szStripPrefix, iPrefixLen) && (int)strlen(pParameter->GetName()) > iPrefixLen)
-		{
-			SetEnvVarSpecial("NZBPR", pParameter->GetName() + iPrefixLen, szValue);
-		}
-		else if (!szStripPrefix)
-		{
-			SetEnvVarSpecial("NZBPR", pParameter->GetName(), szValue);
-		}
-
-#ifdef WIN32
-		free(szAnsiValue);
-#endif
-	}
-}
-
-void NZBScriptController::PrepareEnvScript(NZBParameterList* pParameters, const char* szScriptName)
-{
-	if (pParameters)
-	{
-		PrepareEnvParameters(pParameters, NULL);
-	}
-
-	char szParamPrefix[1024];
-	snprintf(szParamPrefix, 1024, "%s:", szScriptName);
-	szParamPrefix[1024-1] = '\0';
-
-	if (pParameters)
-	{
-		PrepareEnvParameters(pParameters, szParamPrefix);
-	}
-
-	PrepareEnvOptions(szParamPrefix);
-}
-
-void NZBScriptController::ExecuteScriptList(const char* szScriptList)
-{
-	for (ScriptConfig::Scripts::iterator it = g_pScriptConfig->GetScripts()->begin(); it != g_pScriptConfig->GetScripts()->end(); it++)
-	{
-		ScriptConfig::Script* pScript = *it;
-
-		if (szScriptList && *szScriptList)
-		{
-			// split szScriptList into tokens
-			Tokenizer tok(szScriptList, ",;");
-			while (const char* szScriptName = tok.Next())
-			{
-				if (Util::SameFilename(szScriptName, pScript->GetName()))
-				{
-					ExecuteScript(pScript);
-					break;
-				}
-			}
-		}
-	}
-}

daemon/extension/NzbScript.h

@@ -1,42 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2015 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 NZBSCRIPT_H
-#define NZBSCRIPT_H
-
-#include "Script.h"
-#include "DownloadInfo.h"
-#include "ScriptConfig.h"
-
-class NZBScriptController : public ScriptController
-{
-protected:
-	void				PrepareEnvParameters(NZBParameterList* pParameters, const char* szStripPrefix);
-	void				PrepareEnvScript(NZBParameterList* pParameters, const char* szScriptName);
-	void				ExecuteScriptList(const char* szScriptList);
-	virtual void		ExecuteScript(ScriptConfig::Script* pScript) = 0;
-};
-
-#endif

daemon/extension/PostScript.cpp

@@ -1,351 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2015 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"
-
-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(ScriptConfig::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());
-
-	char szProgressLabel[1024];
-	snprintf(szProgressLabel, 1024, "Executing post-process-script %s", pScript->GetName());
-	szProgressLabel[1024-1] = '\0';
-
-	DownloadQueue::Lock();
-	m_pPostInfo->SetProgressLabel(szProgressLabel);
-	DownloadQueue::Unlock();
-
-	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);
-
-	m_pScript = pScript;
-	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));
-
-	SetEnvVar("NZBPP_DUPEKEY", m_pPostInfo->GetNZBInfo()->GetDupeKey());
-	SetIntEnvVar("NZBPP_DUPESCORE", m_pPostInfo->GetNZBInfo()->GetDupeScore());
-
-	const char* szDupeModeName[] = { "SCORE", "ALL", "FORCE" };
-	SetEnvVar("NZBPP_DUPEMODE", szDupeModeName[m_pPostInfo->GetNZBInfo()->GetDupeMode()]);
-
-	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 };
-	NZBInfo::EParStatus eParStatus = m_pPostInfo->GetNZBInfo()->GetParStatus();
-	// for downloads marked as bad and for deleted downloads pass par status "Failure"
-	// for compatibility with older scripts which don't check "NZBPP_TOTALSTATUS"
-	if (m_pPostInfo->GetNZBInfo()->GetDeleteStatus() != NZBInfo::dsNone ||
-		m_pPostInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksBad)
-	{
-		eParStatus = NZBInfo::psFailure;
-	}
-	SetIntEnvVar("NZBPP_PARSTATUS", iParStatus[eParStatus]);
-
-	// 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);
-				m_pPostInfo->SetForceRepair(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
-			{
-				m_pPostInfo->GetNZBInfo()->PrintMessage(Message::mkError,
-					"Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
-			}
-			free(szParam);
-		}
-		else if (!strncmp(szMsgText + 6, "MARK=BAD", 8))
-		{
-			SetLogPrefix(NULL);
-			PrintMessage(Message::mkWarning, "Marking %s as bad", m_pPostInfo->GetNZBInfo()->GetName());
-			SetLogPrefix(m_pScript->GetDisplayName());
-			m_pPostInfo->GetNZBInfo()->SetMarkStatus(NZBInfo::ksBad);
-		}
-		else
-		{
-			m_pPostInfo->GetNZBInfo()->PrintMessage(Message::mkError,
-				"Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
-		}
-	}
-	else
-	{
-		m_pPostInfo->GetNZBInfo()->AddMessage(eKind, szText);
-		DownloadQueue::Lock();
-		m_pPostInfo->SetProgressLabel(szText);
-		DownloadQueue::Unlock();
-	}
-
-	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/extension/PostScript.h

@@ -1,52 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2015 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 POSTSCRIPT_H
-#define POSTSCRIPT_H
-
-#include "Thread.h"
-#include "NzbScript.h"
-
-class PostScriptController : public Thread, public NZBScriptController
-{
-private:
-	PostInfo*			m_pPostInfo;
- 	int					m_iPrefixLen;
-	ScriptConfig::Script*	m_pScript;
-
-	void				PrepareParams(const char* szScriptName);
-	ScriptStatus::EStatus	AnalyseExitCode(int iExitCode);
-
-protected:
-	virtual void		ExecuteScript(ScriptConfig::Script* pScript);
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-
-public:
-	virtual void		Run();
-	virtual void		Stop();
-	static void			StartJob(PostInfo* pPostInfo);
-};
-
-#endif

daemon/extension/QueueScript.cpp

@@ -1,525 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2015 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 <sys/stat.h>
-#include <stdio.h>
-
-#include "nzbget.h"
-#include "QueueScript.h"
-#include "NzbScript.h"
-#include "Options.h"
-#include "Log.h"
-#include "Util.h"
-
-static const char* QUEUE_EVENT_NAMES[] = { "FILE_DOWNLOADED", "URL_COMPLETED", "NZB_ADDED", "NZB_DOWNLOADED", "NZB_DELETED" };
-
-class QueueScriptController : public Thread, public NZBScriptController
-{
-private:
-	char*				m_szNZBName;
-	char*				m_szNZBFilename;
-	char*				m_szUrl;
-	char*				m_szCategory;
-	char*				m_szDestDir;
-	int					m_iID;
-	int					m_iPriority;
-	char*				m_szDupeKey;
-	EDupeMode			m_eDupeMode;
-	int					m_iDupeScore;
-	NZBParameterList	m_Parameters;
-	int					m_iPrefixLen;
-	ScriptConfig::Script*	m_pScript;
-	QueueScriptCoordinator::EEvent	m_eEvent;
-	bool				m_bMarkBad;
-	NZBInfo::EDeleteStatus m_eDeleteStatus;
-	NZBInfo::EUrlStatus	m_eUrlStatus;
-
-	void				PrepareParams(const char* szScriptName);
-
-protected:
-	virtual void		ExecuteScript(ScriptConfig::Script* pScript);
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-
-public:
-	virtual				~QueueScriptController();
-	virtual void		Run();
-	static void			StartScript(NZBInfo* pNZBInfo, ScriptConfig::Script* pScript, QueueScriptCoordinator::EEvent eEvent);
-};
-
-
-QueueScriptController::~QueueScriptController()
-{
-	free(m_szNZBName);
-	free(m_szNZBFilename);
-	free(m_szUrl);
-	free(m_szCategory);
-	free(m_szDestDir);
-	free(m_szDupeKey);
-}
-
-void QueueScriptController::StartScript(NZBInfo* pNZBInfo, ScriptConfig::Script* pScript, QueueScriptCoordinator::EEvent eEvent)
-{
-	QueueScriptController* pScriptController = new QueueScriptController();
-
-	pScriptController->m_szNZBName = strdup(pNZBInfo->GetName());
-	pScriptController->m_szNZBFilename = strdup(pNZBInfo->GetFilename());
-	pScriptController->m_szUrl = strdup(pNZBInfo->GetURL());
-	pScriptController->m_szCategory = strdup(pNZBInfo->GetCategory());
-	pScriptController->m_szDestDir = strdup(pNZBInfo->GetDestDir());
-	pScriptController->m_iID = pNZBInfo->GetID();
-	pScriptController->m_iPriority = pNZBInfo->GetPriority();
-	pScriptController->m_szDupeKey = strdup(pNZBInfo->GetDupeKey());
-	pScriptController->m_eDupeMode = pNZBInfo->GetDupeMode();
-	pScriptController->m_iDupeScore = pNZBInfo->GetDupeScore();
-	pScriptController->m_Parameters.CopyFrom(pNZBInfo->GetParameters());
-	pScriptController->m_pScript = pScript;
-	pScriptController->m_eEvent = eEvent;
-	pScriptController->m_iPrefixLen = 0;
-	pScriptController->m_bMarkBad = false;
-	pScriptController->m_eDeleteStatus = pNZBInfo->GetDeleteStatus();
-	pScriptController->m_eUrlStatus = pNZBInfo->GetUrlStatus();
-	pScriptController->SetAutoDestroy(true);
-
-	pScriptController->Start();
-}
-
-void QueueScriptController::Run()
-{
-	ExecuteScript(m_pScript);
-
-	SetLogPrefix(NULL);
-
-	if (m_bMarkBad)
-	{
-		DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-		NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->Find(m_iID);
-		if (pNZBInfo)
-		{
-			PrintMessage(Message::mkWarning, "Cancelling download and deleting %s", m_szNZBName);
-			pNZBInfo->SetDeleteStatus(NZBInfo::dsBad);
-			pDownloadQueue->EditEntry(m_iID, DownloadQueue::eaGroupDelete, 0, NULL);
-		}
-		DownloadQueue::Unlock();
-	}
-
-	g_pQueueScriptCoordinator->CheckQueue();
-}
-
-void QueueScriptController::ExecuteScript(ScriptConfig::Script* pScript)
-{
-	PrintMessage(m_eEvent == QueueScriptCoordinator::qeFileDownloaded ? Message::mkDetail : Message::mkInfo,
-		"Executing queue-script %s for %s", pScript->GetName(), Util::BaseFileName(m_szNZBName));
-
-	SetScript(pScript->GetLocation());
-	SetArgs(NULL, false);
-
-	char szInfoName[1024];
-	snprintf(szInfoName, 1024, "queue-script %s for %s", pScript->GetName(), Util::BaseFileName(m_szNZBName));
-	szInfoName[1024-1] = '\0';
-	SetInfoName(szInfoName);
-
-	SetLogPrefix(pScript->GetDisplayName());
-	m_iPrefixLen = strlen(pScript->GetDisplayName()) + 2; // 2 = strlen(": ");
-	PrepareParams(pScript->GetName());
-
-	Execute();
-
-	SetLogPrefix(NULL);
-}
-
-void QueueScriptController::PrepareParams(const char* szScriptName)
-{
-	ResetEnv();
-
-	SetEnvVar("NZBNA_NZBNAME", m_szNZBName);
-	SetIntEnvVar("NZBNA_NZBID", m_iID);
-	SetEnvVar("NZBNA_FILENAME", m_szNZBFilename);
-	SetEnvVar("NZBNA_DIRECTORY", m_szDestDir);
-	SetEnvVar("NZBNA_URL", m_szUrl);
-	SetEnvVar("NZBNA_CATEGORY", m_szCategory);
-	SetIntEnvVar("NZBNA_PRIORITY", m_iPriority);
-	SetIntEnvVar("NZBNA_LASTID", m_iID);	// deprecated
-
-	SetEnvVar("NZBNA_DUPEKEY", m_szDupeKey);
-	SetIntEnvVar("NZBNA_DUPESCORE", m_iDupeScore);
-
-	const char* szDupeModeName[] = { "SCORE", "ALL", "FORCE" };
-	SetEnvVar("NZBNA_DUPEMODE", szDupeModeName[m_eDupeMode]);
-
-	SetEnvVar("NZBNA_EVENT", QUEUE_EVENT_NAMES[m_eEvent]);
-
-    const char* szDeleteStatusName[] = { "NONE", "MANUAL", "HEALTH", "DUPE", "BAD", "GOOD", "COPY", "SCAN" };
-	SetEnvVar("NZBNA_DELETESTATUS", szDeleteStatusName[m_eDeleteStatus]);
-
-	const char* szUrlStatusName[] = { "NONE", "UNKNOWN", "SUCCESS", "FAILURE", "UNKNOWN", "SCAN_SKIPPED", "SCAN_FAILURE" };
-	SetEnvVar("NZBNA_URLSTATUS", szUrlStatusName[m_eUrlStatus]);
-
-	PrepareEnvScript(&m_Parameters, szScriptName);
-}
-
-void QueueScriptController::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, "NZBPR_", 6))
-		{
-			char* szParam = strdup(szMsgText + 6 + 6);
-			char* szValue = strchr(szParam, '=');
-			if (szValue)
-			{
-				*szValue = '\0';
-				DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-				NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->Find(m_iID);
-				if (pNZBInfo)
-				{
-					pNZBInfo->GetParameters()->SetParameter(szParam, szValue + 1);
-				}
-				DownloadQueue::Unlock();
-			}
-			else
-			{
-				error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
-			}
-			free(szParam);
-		}
-		else if (!strncmp(szMsgText + 6, "MARK=BAD", 8))
-		{
-			m_bMarkBad = true;
-			DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-			NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->Find(m_iID);
-			if (pNZBInfo)
-			{
-				SetLogPrefix(NULL);
-				PrintMessage(Message::mkWarning, "Marking %s as bad", m_szNZBName);
-				SetLogPrefix(m_pScript->GetDisplayName());
-				pNZBInfo->SetMarkStatus(NZBInfo::ksBad);
-			}
-			DownloadQueue::Unlock();
-		}
-		else
-		{
-			error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
-		}
-	}
-	else
-	{
-		ScriptController::AddMessage(eKind, szText);
-	}
-}
-
-
-QueueScriptCoordinator::QueueItem::QueueItem(int iNZBID, ScriptConfig::Script* pScript, EEvent eEvent)
-{
-	m_iNZBID = iNZBID;
-	m_pScript = pScript;
-	m_eEvent = eEvent;
-}
-
-QueueScriptCoordinator::QueueScriptCoordinator()
-{
-	m_pCurItem = NULL;
-	m_bStopped = false;
-}
-
-QueueScriptCoordinator::~QueueScriptCoordinator()
-{
-	delete m_pCurItem;
-	for (Queue::iterator it = m_Queue.begin(); it != m_Queue.end(); it++ )
-	{
-		delete *it;
-	}
-}
-
-void QueueScriptCoordinator::InitOptions()
-{
-	m_bHasQueueScripts = false;
-	for (ScriptConfig::Scripts::iterator it = g_pScriptConfig->GetScripts()->begin(); it != g_pScriptConfig->GetScripts()->end(); it++)
-	{
-		ScriptConfig::Script* pScript = *it;
-		if (pScript->GetQueueScript())
-		{
-			m_bHasQueueScripts = true;
-			break;
-		}
-	}
-}
-
-void QueueScriptCoordinator::EnqueueScript(NZBInfo* pNZBInfo, EEvent eEvent)
-{
-	if (!m_bHasQueueScripts)
-	{
-		return;
-	}
-
-	m_mutexQueue.Lock();
-
-	if (eEvent == qeNzbDownloaded)
-	{
-		// delete all other queued scripts for this nzb
-		for (Queue::iterator it = m_Queue.begin(); it != m_Queue.end(); )
-		{
-			QueueItem* pQueueItem = *it;
-			if (pQueueItem->GetNZBID() == pNZBInfo->GetID())
-			{
-				delete pQueueItem;
-				it = m_Queue.erase(it);
-				continue;
-			}
-			it++;
-		}
-	}
-
-	// respect option "EventInterval"
-	time_t tCurTime = time(NULL);
-	if (eEvent == qeFileDownloaded &&
-		(g_pOptions->GetEventInterval() == -1 ||
-		 (g_pOptions->GetEventInterval() > 0 && tCurTime - pNZBInfo->GetQueueScriptTime() > 0 &&
-		 (int)(tCurTime - pNZBInfo->GetQueueScriptTime()) < g_pOptions->GetEventInterval())))
-	{
-		m_mutexQueue.Unlock();
-		return;
-	}
-
-	for (ScriptConfig::Scripts::iterator it = g_pScriptConfig->GetScripts()->begin(); it != g_pScriptConfig->GetScripts()->end(); it++)
-	{
-		ScriptConfig::Script* pScript = *it;
-
-		if (!pScript->GetQueueScript())
-		{
-			continue;
-		}
-
-		bool bUseScript = false;
-
-		// check queue-scripts
-		const char* szQueueScript = g_pOptions->GetQueueScript();
-		if (!Util::EmptyStr(szQueueScript))
-		{
-			// split szQueueScript into tokens
-			Tokenizer tok(szQueueScript, ",;");
-			while (const char* szScriptName = tok.Next())
-			{
-				if (Util::SameFilename(szScriptName, pScript->GetName()))
-				{
-					bUseScript = true;
-					break;
-				}
-			}
-		}
-
-		// check post-processing-scripts
-		if (!bUseScript)
-		{
-			for (NZBParameterList::iterator it = pNZBInfo->GetParameters()->begin(); it != pNZBInfo->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[1024];
-					strncpy(szScriptName, szVarname, 1024);
-					szScriptName[1024-1] = '\0';
-					szScriptName[strlen(szScriptName)-1] = '\0'; // remove trailing ':'
-					if (Util::SameFilename(szScriptName, pScript->GetName()))
-					{
-						bUseScript = true;
-						break;
-					}
-				}
-			}
-		}
-
-		bUseScript &= Util::EmptyStr(pScript->GetQueueEvents()) || strstr(pScript->GetQueueEvents(), QUEUE_EVENT_NAMES[eEvent]);
-
-		if (bUseScript)
-		{
-			bool bAlreadyQueued = false;
-			if (eEvent == qeFileDownloaded)
-			{
-				// check if this script is already queued for this nzb
-				for (Queue::iterator it2 = m_Queue.begin(); it2 != m_Queue.end(); it2++)
-				{
-					QueueItem* pQueueItem = *it2;
-					if (pQueueItem->GetNZBID() == pNZBInfo->GetID() && pQueueItem->GetScript() == pScript)
-					{
-						bAlreadyQueued = true;
-						break;
-					}
-				}
-			}
-
-			if (!bAlreadyQueued)
-			{
-				QueueItem* pQueueItem = new QueueItem(pNZBInfo->GetID(), pScript, eEvent);
-				if (m_pCurItem)
-				{
-					m_Queue.push_back(pQueueItem);
-				}
-				else
-				{
-					StartScript(pNZBInfo, pQueueItem);
-				}
-			}
-
-			pNZBInfo->SetQueueScriptTime(time(NULL));
-		}
-	}
-
-	m_mutexQueue.Unlock();
-}
-
-NZBInfo* QueueScriptCoordinator::FindNZBInfo(DownloadQueue* pDownloadQueue, int iNZBID)
-{
-	NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->Find(iNZBID);
-	if (!pNZBInfo)
-	{
-		for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
-		{
-			HistoryInfo* pHistoryInfo = *it;
-			if (pHistoryInfo->GetNZBInfo() && pHistoryInfo->GetNZBInfo()->GetID() == iNZBID)
-			{
-				pNZBInfo = pHistoryInfo->GetNZBInfo();
-				break;
-			}
-		}
-	}
-	return pNZBInfo;
-}
-
-void QueueScriptCoordinator::CheckQueue()
-{
-	if (m_bStopped)
-	{
-		return;
-	}
-
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-	m_mutexQueue.Lock();
-
-	delete m_pCurItem;
-
-	m_pCurItem = NULL;
-	NZBInfo* pCurNZBInfo = NULL;
-	Queue::iterator itCurItem = m_Queue.end();
-
-	for (Queue::iterator it = m_Queue.begin(); it != m_Queue.end(); )
-	{
-		QueueItem* pQueueItem = *it;
-
-		NZBInfo* pNZBInfo = FindNZBInfo(pDownloadQueue, pQueueItem->GetNZBID());
-
-		// in a case this nzb must not be processed further - delete queue script from queue
-		if (!pNZBInfo ||
-			(pNZBInfo->GetDeleteStatus() != NZBInfo::dsNone && pQueueItem->GetEvent() != qeNzbDeleted) ||
-			pNZBInfo->GetMarkStatus() == NZBInfo::ksBad)
-		{
-			delete pQueueItem;
-			it = m_Queue.erase(it);
-			continue;
-		}
-
-		if (!m_pCurItem || pQueueItem->GetEvent() > m_pCurItem->GetEvent())
-		{
-			m_pCurItem = pQueueItem;
-			itCurItem = it;
-			pCurNZBInfo = pNZBInfo;
-		}
-
-		it++;
-	}
-
-	if (m_pCurItem)
-	{
-		m_Queue.erase(itCurItem);
-		StartScript(pCurNZBInfo, m_pCurItem);
-	}
-
-	m_mutexQueue.Unlock();
-	DownloadQueue::Unlock();
-}
-
-void QueueScriptCoordinator::StartScript(NZBInfo* pNZBInfo, QueueItem* pQueueItem)
-{
-	m_pCurItem = pQueueItem;
-	QueueScriptController::StartScript(pNZBInfo, pQueueItem->GetScript(), pQueueItem->GetEvent());
-}
-
-bool QueueScriptCoordinator::HasJob(int iNZBID, bool* pActive)
-{
-	m_mutexQueue.Lock();
-	bool bWorking = m_pCurItem && m_pCurItem->GetNZBID() == iNZBID;
-	if (pActive)
-	{
-		*pActive = bWorking;
-	}
-	if (!bWorking)
-	{
-		for (Queue::iterator it = m_Queue.begin(); it != m_Queue.end(); it++)
-		{
-			QueueItem* pQueueItem = *it;
-			bWorking = pQueueItem->GetNZBID() == iNZBID;
-			if (bWorking)
-			{
-				break;
-			}
-		}
-	}
-	m_mutexQueue.Unlock();
-
-	return bWorking;
-}
-
-int QueueScriptCoordinator::GetQueueSize()
-{
-	m_mutexQueue.Lock();
-	int iQueuedCount = m_Queue.size();
-	if (m_pCurItem)
-	{
-		iQueuedCount++;
-	}
-	m_mutexQueue.Unlock();
-
-	return iQueuedCount;
-}

daemon/extension/QueueScript.h

@@ -1,84 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2015 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 QUEUESCRIPT_H
-#define QUEUESCRIPT_H
-
-#include <list>
-
-#include "DownloadInfo.h"
-#include "ScriptConfig.h"
-
-class QueueScriptCoordinator
-{
-public:
-	enum EEvent
-	{
-		qeFileDownloaded,	// lowest priority
-		qeUrlCompleted,
-		qeNzbAdded,
-		qeNzbDownloaded,
-		qeNzbDeleted		// highest priority
-	};
-
-private:
-	class QueueItem
-	{
-	private:
-		int					m_iNZBID;
-		ScriptConfig::Script*	m_pScript;
-		EEvent				m_eEvent;
-	public:
-							QueueItem(int iNZBID, ScriptConfig::Script* pScript, EEvent eEvent);
-		int					GetNZBID() { return m_iNZBID; }
-		ScriptConfig::Script*	GetScript() { return m_pScript; }
-		EEvent				GetEvent() { return m_eEvent; }
-	};
-
-	typedef std::list<QueueItem*> Queue;
-	
-	Queue				m_Queue;
-	Mutex				m_mutexQueue;
-	QueueItem*			m_pCurItem;
-	bool				m_bHasQueueScripts;
-	bool				m_bStopped;
-
-	void				StartScript(NZBInfo* pNZBInfo, QueueItem* pQueueItem);
-	NZBInfo*			FindNZBInfo(DownloadQueue* pDownloadQueue, int iNZBID);
-
-public:
-						QueueScriptCoordinator();
-						~QueueScriptCoordinator();
-	void				Stop() { m_bStopped = true; }
-	void				InitOptions();
-	void				EnqueueScript(NZBInfo* pNZBInfo, EEvent eEvent);
-	void				CheckQueue();
-	bool				HasJob(int iNZBID, bool* pActive);
-	int					GetQueueSize();
-};
-
-extern QueueScriptCoordinator* g_pQueueScriptCoordinator;
-
-#endif

daemon/extension/ScanScript.cpp

@@ -1,207 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2015 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 <sys/stat.h>
-#include <stdio.h>
-
-#include "nzbget.h"
-#include "ScanScript.h"
-#include "Scanner.h"
-#include "Options.h"
-#include "Log.h"
-#include "Util.h"
-
-void ScanScriptController::ExecuteScripts(const char* szNZBFilename,
-	const char* szUrl, const char* szDirectory, char** pNZBName, char** pCategory,
-	int* iPriority, NZBParameterList* pParameters, bool* bAddTop, bool* bAddPaused,
-	char** pDupeKey, int* iDupeScore, EDupeMode* eDupeMode)
-{
-	ScanScriptController* pScriptController = new ScanScriptController();
-
-	pScriptController->m_szNZBFilename = szNZBFilename;
-	pScriptController->m_szUrl = szUrl;
-	pScriptController->m_szDirectory = szDirectory;
-	pScriptController->m_pNZBName = pNZBName;
-	pScriptController->m_pCategory = pCategory;
-	pScriptController->m_pParameters = pParameters;
-	pScriptController->m_iPriority = iPriority;
-	pScriptController->m_bAddTop = bAddTop;
-	pScriptController->m_bAddPaused = bAddPaused;
-	pScriptController->m_pDupeKey = pDupeKey;
-	pScriptController->m_iDupeScore = iDupeScore;
-	pScriptController->m_eDupeMode = eDupeMode;
-	pScriptController->m_iPrefixLen = 0;
-
-	pScriptController->ExecuteScriptList(g_pOptions->GetScanScript());
-
-	delete pScriptController;
-}
-
-void ScanScriptController::ExecuteScript(ScriptConfig::Script* pScript)
-{
-	if (!pScript->GetScanScript() || !Util::FileExists(m_szNZBFilename))
-	{
-		return;
-	}
-
-	PrintMessage(Message::mkInfo, "Executing scan-script %s for %s", pScript->GetName(), Util::BaseFileName(m_szNZBFilename));
-
-	SetScript(pScript->GetLocation());
-	SetArgs(NULL, false);
-
-	char szInfoName[1024];
-	snprintf(szInfoName, 1024, "scan-script %s for %s", pScript->GetName(), Util::BaseFileName(m_szNZBFilename));
-	szInfoName[1024-1] = '\0';
-	SetInfoName(szInfoName);
-
-	SetLogPrefix(pScript->GetDisplayName());
-	m_iPrefixLen = strlen(pScript->GetDisplayName()) + 2; // 2 = strlen(": ");
-	PrepareParams(pScript->GetName());
-
-	Execute();
-
-	SetLogPrefix(NULL);
-}
-
-void ScanScriptController::PrepareParams(const char* szScriptName)
-{
-	ResetEnv();
-
-	SetEnvVar("NZBNP_FILENAME", m_szNZBFilename);
-	SetEnvVar("NZBNP_URL", m_szUrl);
-	SetEnvVar("NZBNP_NZBNAME", strlen(*m_pNZBName) > 0 ? *m_pNZBName : Util::BaseFileName(m_szNZBFilename));
-	SetEnvVar("NZBNP_CATEGORY", *m_pCategory);
-	SetIntEnvVar("NZBNP_PRIORITY", *m_iPriority);
-	SetIntEnvVar("NZBNP_TOP", *m_bAddTop ? 1 : 0);
-	SetIntEnvVar("NZBNP_PAUSED", *m_bAddPaused ? 1 : 0);
-	SetEnvVar("NZBNP_DUPEKEY", *m_pDupeKey);
-	SetIntEnvVar("NZBNP_DUPESCORE", *m_iDupeScore);
-
-	const char* szDupeModeName[] = { "SCORE", "ALL", "FORCE" };
-	SetEnvVar("NZBNP_DUPEMODE", szDupeModeName[*m_eDupeMode]);
-
-	// remove trailing slash
-	char szDir[1024];
-	strncpy(szDir, m_szDirectory, 1024);
-	szDir[1024-1] = '\0';
-	int iLen = strlen(szDir);
-	if (szDir[iLen-1] == PATH_SEPARATOR)
-	{
-		szDir[iLen-1] = '\0';
-	}
-	SetEnvVar("NZBNP_DIRECTORY", szDir);
-
-	PrepareEnvScript(m_pParameters, szScriptName);
-}
-
-void ScanScriptController::AddMessage(Message::EKind eKind, const char* szText)
-{
-	const char* szMsgText = szText + m_iPrefixLen;
-
-	if (!strncmp(szMsgText, "[NZB] ", 6))
-	{
-		debug("Command %s detected", szMsgText + 6);
-		if (!strncmp(szMsgText + 6, "NZBNAME=", 8))
-		{
-			free(*m_pNZBName);
-			*m_pNZBName = strdup(szMsgText + 6 + 8);
-		}
-		else if (!strncmp(szMsgText + 6, "CATEGORY=", 9))
-		{
-			free(*m_pCategory);
-			*m_pCategory = strdup(szMsgText + 6 + 9);
-			g_pScanner->InitPPParameters(*m_pCategory, m_pParameters, true);
-		}
-		else if (!strncmp(szMsgText + 6, "NZBPR_", 6))
-		{
-			char* szParam = strdup(szMsgText + 6 + 6);
-			char* szValue = strchr(szParam, '=');
-			if (szValue)
-			{
-				*szValue = '\0';
-				m_pParameters->SetParameter(szParam, szValue + 1);
-			}
-			else
-			{
-				error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
-			}
-			free(szParam);
-		}
-		else if (!strncmp(szMsgText + 6, "PRIORITY=", 9))
-		{
-			*m_iPriority = atoi(szMsgText + 6 + 9);
-		}
-		else if (!strncmp(szMsgText + 6, "TOP=", 4))
-		{
-			*m_bAddTop = atoi(szMsgText + 6 + 4) != 0;
-		}
-		else if (!strncmp(szMsgText + 6, "PAUSED=", 7))
-		{
-			*m_bAddPaused = atoi(szMsgText + 6 + 7) != 0;
-		}
-		else if (!strncmp(szMsgText + 6, "DUPEKEY=", 8))
-		{
-			free(*m_pDupeKey);
-			*m_pDupeKey = strdup(szMsgText + 6 + 8);
-		}
-		else if (!strncmp(szMsgText + 6, "DUPESCORE=", 10))
-		{
-			*m_iDupeScore = atoi(szMsgText + 6 + 10);
-		}
-		else if (!strncmp(szMsgText + 6, "DUPEMODE=", 9))
-		{
-			const char* szDupeMode = szMsgText + 6 + 9;
-			if (strcasecmp(szDupeMode, "score") && strcasecmp(szDupeMode, "all") && strcasecmp(szDupeMode, "force"))
-			{
-				error("Invalid value \"%s\" for command \"DUPEMODE\" received from %s", szDupeMode, GetInfoName());
-				return;
-			}
-			*m_eDupeMode = !strcasecmp(szDupeMode, "all") ? dmAll :
-				!strcasecmp(szDupeMode, "force") ? dmForce : dmScore;
-		}
-		else
-		{
-			error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
-		}
-	}
-	else
-	{
-		ScriptController::AddMessage(eKind, szText);
-	}
-}

daemon/extension/ScanScript.h

@@ -1,61 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2015 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 SCANSCRIPT_H
-#define SCANSCRIPT_H
-
-#include "NzbScript.h"
-
-class ScanScriptController : public NZBScriptController
-{
-private:
-	const char*			m_szNZBFilename;
-	const char*			m_szUrl;
-	const char*			m_szDirectory;
-	char**				m_pNZBName;
-	char**				m_pCategory;
-	int*				m_iPriority;
-	NZBParameterList*	m_pParameters;
-	bool*				m_bAddTop;
-	bool*				m_bAddPaused;
-	char**				m_pDupeKey;
-	int*				m_iDupeScore;
-	EDupeMode*			m_eDupeMode;
-	int					m_iPrefixLen;
-
-	void				PrepareParams(const char* szScriptName);
-
-protected:
-	virtual void		ExecuteScript(ScriptConfig::Script* pScript);
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-
-public:
-	static void			ExecuteScripts(const char* szNZBFilename, const char* szUrl,
-							const char* szDirectory, char** pNZBName, char** pCategory, int* iPriority,
-							NZBParameterList* pParameters, bool* bAddTop, bool* bAddPaused,
-							char** pDupeKey, int* iDupeScore, EDupeMode* eDupeMode);
-};
-
-#endif

daemon/extension/SchedulerScript.cpp

@@ -1,143 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2015 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 <sys/stat.h>
-#include <stdio.h>
-
-#include "nzbget.h"
-#include "SchedulerScript.h"
-#include "Options.h"
-#include "Log.h"
-#include "Util.h"
-
-
-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(ScriptConfig::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/extension/SchedulerScript.h

@@ -1,50 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2015 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 SCHEDULERSCRIPT_H
-#define SCHEDULERSCRIPT_H
-
-#include "NzbScript.h"
-
-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(ScriptConfig::Script* pScript);
-
-public:
-	virtual				~SchedulerScriptController();
-	virtual void		Run();
-	static void			StartScript(const char* szParam, bool bExternalProcess, int iTaskID);
-};
-
-#endif

daemon/extension/ScriptConfig.cpp

@@ -1,559 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2013-2015 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>
-#include <sys/stat.h>
-#include <set>
-
-#include "nzbget.h"
-#include "Util.h"
-#include "Options.h"
-#include "Log.h"
-#include "ScriptConfig.h"
-
-static const char* BEGIN_SCRIPT_SIGNATURE = "### NZBGET ";
-static const char* POST_SCRIPT_SIGNATURE = "POST-PROCESSING";
-static const char* SCAN_SCRIPT_SIGNATURE = "SCAN";
-static const char* QUEUE_SCRIPT_SIGNATURE = "QUEUE";
-static const char* SCHEDULER_SCRIPT_SIGNATURE = "SCHEDULER";
-static const char* FEED_SCRIPT_SIGNATURE = "FEED";
-static const char* END_SCRIPT_SIGNATURE = " SCRIPT";
-static const char* QUEUE_EVENTS_SIGNATURE = "### QUEUE EVENTS:";
-
-ScriptConfig* g_pScriptConfig = NULL;
-
-
-ScriptConfig::ConfigTemplate::ConfigTemplate(Script* pScript, const char* szTemplate)
-{
-	m_pScript = pScript;
-	m_szTemplate = strdup(szTemplate ? szTemplate : "");
-}
-
-ScriptConfig::ConfigTemplate::~ConfigTemplate()
-{
-	delete m_pScript;
-	free(m_szTemplate);
-}
-
-ScriptConfig::ConfigTemplates::~ConfigTemplates()
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		delete *it;
-	}
-}
-
-
-ScriptConfig::Script::Script(const char* szName, const char* szLocation)
-{
-	m_szName = strdup(szName);
-	m_szLocation = strdup(szLocation);
-	m_szDisplayName = strdup(szName);
-	m_bPostScript = false;
-	m_bScanScript = false;
-	m_bQueueScript = false;
-	m_bSchedulerScript = false;
-	m_bFeedScript = false;
-	m_szQueueEvents = NULL;
-}
-
-ScriptConfig::Script::~Script()
-{
-	free(m_szName);
-	free(m_szLocation);
-	free(m_szDisplayName);
-	free(m_szQueueEvents);
-}
-
-void ScriptConfig::Script::SetDisplayName(const char* szDisplayName)
-{
-	free(m_szDisplayName);
-	m_szDisplayName = strdup(szDisplayName);
-}
-
-void ScriptConfig::Script::SetQueueEvents(const char* szQueueEvents)
-{
-	free(m_szQueueEvents);
-	m_szQueueEvents = szQueueEvents ? strdup(szQueueEvents) : NULL;
-}
-
-
-ScriptConfig::Scripts::~Scripts()
-{
-	Clear();
-}
-
-void ScriptConfig::Scripts::Clear()
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		delete *it;
-	}
-	clear();
-}
-
-ScriptConfig::Script* ScriptConfig::Scripts::Find(const char* szName)
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		Script* pScript = *it;
-		if (!strcmp(pScript->GetName(), szName))
-		{
-			return pScript;
-		}
-	}
-
-	return NULL;
-}
-
-
-ScriptConfig::ScriptConfig()
-{
-	InitScripts();
-	InitConfigTemplates();
-}
-
-ScriptConfig::~ScriptConfig()
-{
-}
-
-bool ScriptConfig::LoadConfig(Options::OptEntries* pOptEntries)
-{
-	// read config file
-	FILE* infile = fopen(g_pOptions->GetConfigFilename(), FOPEN_RB);
-
-	if (!infile)
-	{
-		return false;
-	}
-
-	int iBufLen = (int)Util::FileSize(g_pOptions->GetConfigFilename()) + 1;
-	char* buf = (char*)malloc(iBufLen);
-
-	while (fgets(buf, iBufLen - 1, infile))
-	{
-		// remove trailing '\n' and '\r' and spaces
-		Util::TrimRight(buf);
-
-		// skip comments and empty lines
-		if (buf[0] == 0 || buf[0] == '#' || strspn(buf, " ") == strlen(buf))
-		{
-			continue;
-		}
-
-		char* optname;
-		char* optvalue;
-		if (g_pOptions->SplitOptionString(buf, &optname, &optvalue))
-		{
-			Options::OptEntry* pOptEntry = new Options::OptEntry();
-			pOptEntry->SetName(optname);
-			pOptEntry->SetValue(optvalue);
-			pOptEntries->push_back(pOptEntry);
-
-			free(optname);
-			free(optvalue);
-		}
-	}
-
-	fclose(infile);
-	free(buf);
-
-	return true;
-}
-
-bool ScriptConfig::SaveConfig(Options::OptEntries* pOptEntries)
-{
-	// save to config file
-	FILE* infile = fopen(g_pOptions->GetConfigFilename(), FOPEN_RBP);
-
-	if (!infile)
-	{
-		return false;
-	}
-
-	std::vector<char*> config;
-	std::set<Options::OptEntry*> writtenOptions;
-
-	// read config file into memory array
-	int iBufLen = (int)Util::FileSize(g_pOptions->GetConfigFilename()) + 1;
-	char* buf = (char*)malloc(iBufLen);
-	while (fgets(buf, iBufLen - 1, infile))
-	{
-		config.push_back(strdup(buf));
-	}
-	free(buf);
-
-	// write config file back to disk, replace old values of existing options with new values
-	rewind(infile);
-	for (std::vector<char*>::iterator it = config.begin(); it != config.end(); it++)
-    {
-        char* buf = *it;
-
-		const char* eq = strchr(buf, '=');
-		if (eq && buf[0] != '#')
-		{
-			// remove trailing '\n' and '\r' and spaces
-			Util::TrimRight(buf);
-
-			char* optname;
-			char* optvalue;
-			if (g_pOptions->SplitOptionString(buf, &optname, &optvalue))
-			{
-				Options::OptEntry *pOptEntry = pOptEntries->FindOption(optname);
-				if (pOptEntry)
-				{
-					fputs(pOptEntry->GetName(), infile);
-					fputs("=", infile);
-					fputs(pOptEntry->GetValue(), infile);
-					fputs("\n", infile);
-					writtenOptions.insert(pOptEntry);
-				}
-
-				free(optname);
-				free(optvalue);
-			}
-		}
-		else
-		{
-			fputs(buf, infile);
-		}
-
-		free(buf);
-	}
-
-	// write new options
-	for (Options::OptEntries::iterator it = pOptEntries->begin(); it != pOptEntries->end(); it++)
-	{
-		Options::OptEntry* pOptEntry = *it;
-		std::set<Options::OptEntry*>::iterator fit = writtenOptions.find(pOptEntry);
-		if (fit == writtenOptions.end())
-		{
-			fputs(pOptEntry->GetName(), infile);
-			fputs("=", infile);
-			fputs(pOptEntry->GetValue(), infile);
-			fputs("\n", infile);
-		}
-	}
-
-	// close and truncate the file
-	int pos = (int)ftell(infile);
-	fclose(infile);
-
-	Util::TruncateFile(g_pOptions->GetConfigFilename(), pos);
-
-	return true;
-}
-
-bool ScriptConfig::LoadConfigTemplates(ConfigTemplates* pConfigTemplates)
-{
-	char* szBuffer;
-	int iLength;
-	if (!Util::LoadFileIntoBuffer(g_pOptions->GetConfigTemplate(), &szBuffer, &iLength))
-	{
-		return false;
-	}
-	ConfigTemplate* pConfigTemplate = new ConfigTemplate(NULL, szBuffer);
-	pConfigTemplates->push_back(pConfigTemplate);
-	free(szBuffer);
-
-	if (!g_pOptions->GetScriptDir())
-	{
-		return true;
-	}
-
-	Scripts scriptList;
-	LoadScripts(&scriptList);
-
-	const int iBeginSignatureLen = strlen(BEGIN_SCRIPT_SIGNATURE);
-	const int iQueueEventsSignatureLen = strlen(QUEUE_EVENTS_SIGNATURE);
-
-	for (Scripts::iterator it = scriptList.begin(); it != scriptList.end(); it++)
-	{
-		Script* pScript = *it;
-
-		FILE* infile = fopen(pScript->GetLocation(), FOPEN_RB);
-		if (!infile)
-		{
-			ConfigTemplate* pConfigTemplate = new ConfigTemplate(pScript, "");
-			pConfigTemplates->push_back(pConfigTemplate);
-			continue;
-		}
-
-		StringBuilder stringBuilder;
-		char buf[1024];
-		bool bInConfig = false;
-
-		while (fgets(buf, sizeof(buf) - 1, infile))
-		{
-			if (!strncmp(buf, BEGIN_SCRIPT_SIGNATURE, iBeginSignatureLen) &&
-				strstr(buf, END_SCRIPT_SIGNATURE) &&
-				(strstr(buf, POST_SCRIPT_SIGNATURE) ||
-				 strstr(buf, SCAN_SCRIPT_SIGNATURE) ||
-				 strstr(buf, QUEUE_SCRIPT_SIGNATURE) ||
-				 strstr(buf, SCHEDULER_SCRIPT_SIGNATURE) ||
-				 strstr(buf, FEED_SCRIPT_SIGNATURE)))
-			{
-				if (bInConfig)
-				{
-					break;
-				}
-				bInConfig = true;
-				continue;
-			}
-
-			bool bSkip = !strncmp(buf, QUEUE_EVENTS_SIGNATURE, iQueueEventsSignatureLen);
-
-			if (bInConfig && !bSkip)
-			{
-				stringBuilder.Append(buf);
-			}
-		}
-
-		fclose(infile);
-
-		ConfigTemplate* pConfigTemplate = new ConfigTemplate(pScript, stringBuilder.GetBuffer());
-		pConfigTemplates->push_back(pConfigTemplate);
-	}
-
-	// clearing the list without deleting of objects, which are in pConfigTemplates now 
-	scriptList.clear();
-
-	return true;
-}
-
-void ScriptConfig::InitConfigTemplates()
-{
-	if (!LoadConfigTemplates(&m_ConfigTemplates))
-	{
-		error("Could not read configuration templates");
-	}
-}
-
-void ScriptConfig::InitScripts()
-{
-	LoadScripts(&m_Scripts);
-}
-
-void ScriptConfig::LoadScripts(Scripts* pScripts)
-{
-	if (strlen(g_pOptions->GetScriptDir()) == 0)
-	{
-		return;
-	}
-
-	Scripts tmpScripts;
-	LoadScriptDir(&tmpScripts, g_pOptions->GetScriptDir(), false);
-	tmpScripts.sort(CompareScripts);
-
-	// first add all scripts from m_szScriptOrder
-	Tokenizer tok(g_pOptions->GetScriptOrder(), ",;");
-	while (const char* szScriptName = tok.Next())
-	{
-		Script* pScript = tmpScripts.Find(szScriptName);
-		if (pScript)
-		{
-			tmpScripts.remove(pScript);
-			pScripts->push_back(pScript);
-		}
-	}
-
-	// second add all other scripts from scripts directory
-	for (Scripts::iterator it = tmpScripts.begin(); it != tmpScripts.end(); it++)
-	{
-		Script* pScript = *it;
-		if (!pScripts->Find(pScript->GetName()))
-		{
-			pScripts->push_back(pScript);
-		}
-	}
-
-	tmpScripts.clear();
-
-	BuildScriptDisplayNames(pScripts);
-}
-
-void ScriptConfig::LoadScriptDir(Scripts* pScripts, const char* szDirectory, bool bIsSubDir)
-{
-	int iBufSize = 1024*10;
-	char* szBuffer = (char*)malloc(iBufSize+1);
-
-	const int iBeginSignatureLen = strlen(BEGIN_SCRIPT_SIGNATURE);
-	const int iQueueEventsSignatureLen = strlen(QUEUE_EVENTS_SIGNATURE);
-
-	DirBrowser dir(szDirectory);
-	while (const char* szFilename = dir.Next())
-	{
-		if (szFilename[0] != '.' && szFilename[0] != '_')
-		{
-			char szFullFilename[1024];
-			snprintf(szFullFilename, 1024, "%s%s", szDirectory, szFilename);
-			szFullFilename[1024-1] = '\0';
-
-			if (!Util::DirectoryExists(szFullFilename))
-			{
-				// check if the file contains pp-script-signature
-				FILE* infile = fopen(szFullFilename, FOPEN_RB);
-				if (infile)
-				{
-					// read first 10KB of the file and look for signature
-					int iReadBytes = fread(szBuffer, 1, iBufSize, infile);
-					fclose(infile);
-					szBuffer[iReadBytes] = 0;
-
-					// split buffer into lines
-					Tokenizer tok(szBuffer, "\n\r", true);
-					while (char* szLine = tok.Next())
-					{
-						if (!strncmp(szLine, BEGIN_SCRIPT_SIGNATURE, iBeginSignatureLen) &&
-							strstr(szLine, END_SCRIPT_SIGNATURE))
-						{
-							bool bPostScript = strstr(szLine, POST_SCRIPT_SIGNATURE);
-							bool bScanScript = strstr(szLine, SCAN_SCRIPT_SIGNATURE);
-							bool bQueueScript = strstr(szLine, QUEUE_SCRIPT_SIGNATURE);
-							bool bSchedulerScript = strstr(szLine, SCHEDULER_SCRIPT_SIGNATURE);
-							bool bFeedScript = strstr(szLine, FEED_SCRIPT_SIGNATURE);
-							if (bPostScript || bScanScript || bQueueScript || bSchedulerScript || bFeedScript)
-							{
-								char szScriptName[1024];
-								if (bIsSubDir)
-								{
-									char szDirectory2[1024];
-									snprintf(szDirectory2, 1024, "%s", szDirectory);
-									szDirectory2[1024-1] = '\0';
-									int iLen = strlen(szDirectory2);
-									if (szDirectory2[iLen-1] == PATH_SEPARATOR || szDirectory2[iLen-1] == ALT_PATH_SEPARATOR)
-									{
-										// trim last path-separator
-										szDirectory2[iLen-1] = '\0';
-									}
-
-									snprintf(szScriptName, 1024, "%s%c%s", Util::BaseFileName(szDirectory2), PATH_SEPARATOR, szFilename);
-								}
-								else
-								{
-									snprintf(szScriptName, 1024, "%s", szFilename);
-								}
-								szScriptName[1024-1] = '\0';
-
-								char* szQueueEvents = NULL;
-								if (bQueueScript)
-								{
-									while (char* szLine = tok.Next())
-									{
-										if (!strncmp(szLine, QUEUE_EVENTS_SIGNATURE, iQueueEventsSignatureLen))
-										{
-											szQueueEvents = szLine + iQueueEventsSignatureLen;
-											break;
-										}
-									}
-								}
-
-								Script* pScript = new Script(szScriptName, szFullFilename);
-								pScript->SetPostScript(bPostScript);
-								pScript->SetScanScript(bScanScript);
-								pScript->SetQueueScript(bQueueScript);
-								pScript->SetSchedulerScript(bSchedulerScript);
-								pScript->SetFeedScript(bFeedScript);
-								pScript->SetQueueEvents(szQueueEvents);
-								pScripts->push_back(pScript);
-								break;
-							}
-						}
-					}
-				}
-			}
-			else if (!bIsSubDir)
-			{
-				snprintf(szFullFilename, 1024, "%s%s%c", szDirectory, szFilename, PATH_SEPARATOR);
-				szFullFilename[1024-1] = '\0';
-
-				LoadScriptDir(pScripts, szFullFilename, true);
-			}
-		}
-	}
-
-	free(szBuffer);
-}
-
-bool ScriptConfig::CompareScripts(Script* pScript1, Script* pScript2)
-{
-	return strcmp(pScript1->GetName(), pScript2->GetName()) < 0;
-}
-
-void ScriptConfig::BuildScriptDisplayNames(Scripts* pScripts)
-{
-	// trying to use short name without path and extension.
-	// if there are other scripts with the same short name - using a longer name instead (with ot without extension)
-
-	for (Scripts::iterator it = pScripts->begin(); it != pScripts->end(); it++)
-	{
-		Script* pScript = *it;
-
-		char szShortName[256];
-		strncpy(szShortName, pScript->GetName(), 256);
-		szShortName[256-1] = '\0';
-		if (char* ext = strrchr(szShortName, '.')) *ext = '\0'; // strip file extension
-
-		const char* szDisplayName = Util::BaseFileName(szShortName);
-
-		for (Scripts::iterator it2 = pScripts->begin(); it2 != pScripts->end(); it2++)
-		{
-			Script* pScript2 = *it2;
-
-			char szShortName2[256];
-			strncpy(szShortName2, pScript2->GetName(), 256);
-			szShortName2[256-1] = '\0';
-			if (char* ext = strrchr(szShortName2, '.')) *ext = '\0'; // strip file extension
-
-			const char* szDisplayName2 = Util::BaseFileName(szShortName2);
-
-			if (!strcmp(szDisplayName, szDisplayName2) && pScript->GetName() != pScript2->GetName())
-			{
-				if (!strcmp(szShortName, szShortName2))
-				{
-					szDisplayName =	pScript->GetName();
-				}
-				else
-				{
-					szDisplayName =	szShortName;
-				}
-				break;
-			}
-		}
-
-		pScript->SetDisplayName(szDisplayName);
-	}
-}