updated version string to "21.0"

(only in Windows app)

.gitattributes

@@ -0,0 +1,25 @@
+* 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

@@ -0,0 +1,74 @@
+# 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.h.in~
+config.log
+config.status
+Makefile
+stamp-h1
+autom4te.cache/
+.dirstamp
+*.o-*
+
+# 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
+.vscode/
+
+# macOS
+.DS_Store
+
+# NZBGet specific
+nzbget
+code_revision.cpp
+*.temp
+*.pyc
+pytest.ini
+.cache

.lgtm.yml

@@ -0,0 +1,17 @@
+# Configuration file for integration with http://lgtm.com
+
+path_classifiers:
+  library:
+    # exclude these directories from default alerts report:
+    - lib
+    - webui/lib
+
+extraction:
+  cpp:
+    configure:
+      command:
+        # compile with tests to activate scanning of C++ sources for tests
+        - ./configure --enable-tests
+
+queries:
+  - exclude: js/incomplete-sanitization  # this one gives false positives only and nothing useful

.travis.yml

@@ -0,0 +1,67 @@
+sudo: required
+dist: trusty
+language: cpp
+
+matrix:
+  include:
+
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-5
+            - unrar
+            - p7zip-full
+            - par2
+      env:
+        - COMPILER=g++-5
+
+    - compiler: gcc
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+          packages:
+            - g++-4.9
+            - unrar
+            - p7zip-full
+            - par2
+      env:
+        - COMPILER=g++-4.9
+
+    - compiler: gcc
+      addons:
+        apt:
+          packages:
+            - unrar
+            - p7zip-full
+            - par2
+      env:
+        - COMPILER=g++-4.8
+        - CXXFLAGS="-std=c++11 -O2 -s"
+        - CONFIGUREOPTS="--disable-cpp-check"
+
+    - compiler: clang
+      addons:
+        apt:
+          sources:
+            - ubuntu-toolchain-r-test
+            - llvm-toolchain-precise-3.6
+          packages:
+            - clang-3.6
+            - unrar
+            - p7zip-full
+            - par2
+      env:
+        - COMPILER=clang++-3.6
+
+install:
+  - sudo pip install -U pytest
+
+script:
+  - $COMPILER --version
+  - CXX=$COMPILER ./configure $CONFIGUREOPTS --enable-tests && make
+  - ./nzbget --tests
+  - cd tests/functional && pytest -v

AUTHORS

@@ -1,4 +0,0 @@
-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

@@ -1,122 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef ARTICLEDOWNLOADER_H
-#define ARTICLEDOWNLOADER_H
-
-#include <time.h>
-
-#include "Observer.h"
-#include "DownloadInfo.h"
-#include "Thread.h"
-#include "NNTPConnection.h"
-#include "Decoder.h"
-
-class ArticleDownloader : public Thread, public Subject
-{
-public:
-	enum EStatus
-	{
-		adUndefined,
-		adRunning,
-		adWaiting,
-		adFinished,
-		adFailed,
-		adRetry,
-		adCrcError,
-		adDecoding,
-		adJoining,
-		adJoined,
-		adNotFound,
-		adConnectError,
-		adFatalError
-	};
-			
-private:
-	FileInfo*			m_pFileInfo;
-	ArticleInfo*		m_pArticleInfo;
-	NNTPConnection* 	m_pConnection;
-	EStatus				m_eStatus;
-	Mutex			 	m_mutexConnection;
-	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;
-	FILE*				m_pOutFile;
-	bool				m_bDuplicate;
-	ServerStatList		m_ServerStats;
-
-	EStatus				Download();
-	bool				Write(char* szLine, int iLen);
-	bool				PrepareFile(char* szLine);
-	bool				CreateOutputFile(int iSize);
-	void				BuildOutputFilename();
-	EStatus				DecodeCheck();
-	void				FreeConnection(bool bKeepConnected);
-	EStatus				CheckResponse(const char* szResponse, const char* szComment);
-	void				SetStatus(EStatus eStatus) { m_eStatus = eStatus; }
-	const char* 		GetTempFilename() { return m_szTempFilename; }
-	void 				SetTempFilename(const char* v);
-	void 				SetOutputFilename(const char* v);
-
-public:
-						ArticleDownloader();
-						~ArticleDownloader();
-	void				SetFileInfo(FileInfo* pFileInfo) { m_pFileInfo = pFileInfo; }
-	FileInfo*			GetFileInfo() { return m_pFileInfo; }
-	void				SetArticleInfo(ArticleInfo* pArticleInfo) { m_pArticleInfo = pArticleInfo; }
-	ArticleInfo*		GetArticleInfo() { return m_pArticleInfo; }
-	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* 		GetArticleFilename() { return m_szArticleFilename; }
-	void				SetInfoName(const char* v);
-	const char*			GetInfoName() { return m_szInfoName; }
-	void				CompleteFileParts();
-	static bool			MoveCompletedFiles(NZBInfo* pNZBInfo, const char* szOldDestDir);
-	void				SetConnection(NNTPConnection* pConnection) { m_pConnection = pConnection; }
-
-	void				LogDebugInfo();
-};
-
-class DownloadSpeedMeter
-{
-public:
-	virtual				~DownloadSpeedMeter() {};
-	virtual int			CalcCurrentDownloadSpeed() = 0;
-	virtual void		AddSpeedReading(int iBytes) = 0;
-};
-
-#endif

BinRpc.h

@@ -1,159 +0,0 @@
-/*
- *  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:
-	SNZBRequestBase		m_MessageBase;
-	Connection*			m_pConnection;
-
-	void				Dispatch();
-
-public:
-						BinRpcProcessor();
-	void				Execute();
-	void				SetConnection(Connection* pConnection) { m_pConnection = pConnection; }
-};
-
-class BinCommand
-{
-protected:
-	Connection*			m_pConnection;
-	SNZBRequestBase*	m_pMessageBase;
-
-	bool				ReceiveRequest(void* pBuffer, int iSize);
-	void				SendBoolResponse(bool bSuccess, const char* szText);
-
-public:
-	virtual				~BinCommand() {}
-	virtual void		Execute() = 0;
-	void				SetConnection(Connection* pConnection) { m_pConnection = pConnection; }
-	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

@@ -1,194 +0,0 @@
-/*
- *  This file if part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifndef WIN32
-#include <unistd.h>
-#endif
-
-#include "nzbget.h"
-#include "ColoredFrontend.h"
-#include "Util.h"
-
-ColoredFrontend::ColoredFrontend()
-{
-	m_bSummary = true;
-	m_bNeedGoBack = false;
-#ifdef WIN32
-	m_hConsole = GetStdHandle(STD_OUTPUT_HANDLE);
-#endif
-}
-
-void ColoredFrontend::BeforePrint()
-{
-	if (m_bNeedGoBack)
-	{
-		// go back one line
-#ifdef WIN32
-		CONSOLE_SCREEN_BUFFER_INFO BufInfo;
-		GetConsoleScreenBufferInfo(m_hConsole, &BufInfo);
-		BufInfo.dwCursorPosition.Y--;
-		SetConsoleCursorPosition(m_hConsole, BufInfo.dwCursorPosition);
-#else
-		printf("\r\033[1A");
-#endif
-		m_bNeedGoBack = false;
-	}
-}
-
-void ColoredFrontend::PrintStatus()
-{
-	char tmp[1024];
-	char timeString[100];
-	timeString[0] = '\0';
-	int iCurrentDownloadSpeed = m_bStandBy ? 0 : m_iCurrentDownloadSpeed;
-
-	if (iCurrentDownloadSpeed > 0 && !(m_bPauseDownload || m_bPauseDownload2))
-	{
-		long long remain_sec = (long long)(m_lRemainingSize / iCurrentDownloadSpeed);
-		int h = (int)(remain_sec / 3600);
-		int m = (int)((remain_sec % 3600) / 60);
-		int s = (int)(remain_sec % 60);
-		sprintf(timeString, " (~ %.2d:%.2d:%.2d)", h, m, s);
-	}
-
-	char szDownloadLimit[128];
-	if (m_iDownloadLimit > 0)
-	{
-		sprintf(szDownloadLimit, ", Limit %.0f KB/s", (float)m_iDownloadLimit / 1024.0);
-	}
-	else
-	{
-		szDownloadLimit[0] = 0;
-	}
-
-    char szPostStatus[128];
-    if (m_iPostJobCount > 0)
-    {
-        sprintf(szPostStatus, ", %i post-job%s", m_iPostJobCount, m_iPostJobCount > 1 ? "s" : "");
-    }
-    else
-    {
-        szPostStatus[0] = 0;
-    }
-
-#ifdef WIN32
-	char* szControlSeq = "";
-#else
-	printf("\033[s");
-	const char* szControlSeq = "\033[K";
-#endif
-
-	snprintf(tmp, 1024, " %d threads, %.*f KB/s, %.2f MB remaining%s%s%s%s%s\n", 
-		m_iThreadCount, (iCurrentDownloadSpeed >= 10*1024 ? 0 : 1), (float)iCurrentDownloadSpeed / 1024.0, 
-		(float)(Util::Int64ToFloat(m_lRemainingSize) / 1024.0 / 1024.0), timeString, szPostStatus, 
-		m_bPauseDownload || m_bPauseDownload2 ? (m_bStandBy ? ", Paused" : ", Pausing") : "",
-		szDownloadLimit, szControlSeq);
-	tmp[1024-1] = '\0';
-	printf("%s", tmp);
-	m_bNeedGoBack = true;
-} 
-
-void ColoredFrontend::PrintMessage(Message * pMessage)
-{
-#ifdef WIN32
-	switch (pMessage->GetKind())
-	{
-		case Message::mkDebug:
-			SetConsoleTextAttribute(m_hConsole, 8);
-			printf("[DEBUG]");
-			break;
-		case Message::mkError:
-			SetConsoleTextAttribute(m_hConsole, 4);
-			printf("[ERROR]");
-			break; 
-		case Message::mkWarning:
-			SetConsoleTextAttribute(m_hConsole, 5);
-			printf("[WARNING]");
-			break;
-		case Message::mkInfo:
-			SetConsoleTextAttribute(m_hConsole, 2);
-			printf("[INFO]");
-			break;
-		case Message::mkDetail:
-			SetConsoleTextAttribute(m_hConsole, 2);
-			printf("[DETAIL]");
-			break;
-	}
-	SetConsoleTextAttribute(m_hConsole, 7);
-	char* msg = strdup(pMessage->GetText());
-	CharToOem(msg, msg);
-	printf(" %s\n", msg);
-	free(msg);
-#else
-	const char* msg = pMessage->GetText();
-	switch (pMessage->GetKind())
-	{
-		case Message::mkDebug:
-			printf("[DEBUG] %s\033[K\n", msg);
-			break;
-		case Message::mkError:
-			printf("\033[31m[ERROR]\033[39m %s\033[K\n", msg);
-			break;
-		case Message::mkWarning:
-			printf("\033[35m[WARNING]\033[39m %s\033[K\n", msg);
-			break;
-		case Message::mkInfo:
-			printf("\033[32m[INFO]\033[39m %s\033[K\n", msg);
-			break;
-		case Message::mkDetail:
-			printf("\033[32m[DETAIL]\033[39m %s\033[K\n", msg);
-			break;
-	}
-#endif
-}
-
-void ColoredFrontend::PrintSkip()
-{
-#ifdef WIN32
-	printf(".....\n");
-#else
-	printf(".....\033[K\n");
-#endif
-}
-
-void ColoredFrontend::BeforeExit()
-{
-	if (IsRemoteMode())
-	{
-		printf("\n");
-	}
-}

Connection.cpp

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

Connection.h

@@ -1,117 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef CONNECTION_H
-#define CONNECTION_H
-
-#ifndef HAVE_GETADDRINFO
-#ifndef HAVE_GETHOSTBYNAME_R
-#include "Thread.h"
-#endif
-#endif
-#ifndef DISABLE_TLS
-#include "TLS.h"
-#endif
-
-class Connection
-{
-public:
-	enum EStatus
-	{
-		csConnected,
-		csDisconnected,
-		csListening,
-		csCancelled
-	};
-
-protected:
-	char*				m_szHost;
-	int					m_iPort;
-	SOCKET				m_iSocket;
-	bool				m_bTLS;
-	char*				m_szCipher;
-	char*				m_szReadBuf;
-	int					m_iBufAvail;
-	char*				m_szBufPtr;
-	EStatus				m_eStatus;
-	int					m_iTimeout;
-	bool				m_bSuppressErrors;
-	char				m_szRemoteAddr[20];
-#ifndef DISABLE_TLS
-	TLSSocket*			m_pTLSSocket;
-	bool				m_bTLSError;
-#endif
-#ifndef HAVE_GETADDRINFO
-#ifndef HAVE_GETHOSTBYNAME_R
-	static Mutex*		m_pMutexGetHostByName;
-#endif
-#endif
-
-						Connection(SOCKET iSocket, bool bTLS);
-	void				ReportError(const char* szMsgPrefix, const char* szMsgArg, bool PrintErrCode, int herrno);
-	bool				DoConnect();
-	bool				DoDisconnect();
-#ifndef HAVE_GETADDRINFO
-	unsigned int		ResolveHostAddr(const char* szHost);
-#endif
-#ifndef DISABLE_TLS
-	int					recv(SOCKET s, char* buf, int len, int flags);
-	int					send(SOCKET s, const char* buf, int len, int flags);
-	void				CloseTLS();
-#endif
-
-public:
-						Connection(const char* szHost, int iPort, bool bTLS);
-	virtual 			~Connection();
-	static void			Init();
-	static void			Final();
-	virtual bool 		Connect();
-	virtual bool		Disconnect();
-	bool				Bind();
-	bool				Send(const char* pBuffer, int iSize);
-	bool				Recv(char* pBuffer, int iSize);
-	int					TryRecv(char* pBuffer, int iSize);
-	char*				ReadLine(char* pBuffer, int iSize, int* pBytesRead);
-	void				ReadBuffer(char** pBuffer, int *iBufLen);
-	int					WriteLine(const char* pBuffer);
-	Connection*			Accept();
-	void				Cancel();
-	const char*			GetHost() { return m_szHost; }
-	int					GetPort() { return m_iPort; }
-	bool				GetTLS() { return m_bTLS; }
-	const char*			GetCipher() { return m_szCipher; }
-	void				SetCipher(const char* szCipher);
-	void				SetTimeout(int iTimeout) { m_iTimeout = iTimeout; }
-	EStatus				GetStatus() { return m_eStatus; }
-	void				SetSuppressErrors(bool bSuppressErrors);
-	bool				GetSuppressErrors() { return m_bSuppressErrors; }
-	const char*			GetRemoteAddr();
-#ifndef DISABLE_TLS
-	bool				StartTLS(bool bIsClient, const char* szCertFile, const char* szKeyFile);
-#endif
-};
-
-#endif

Decoder.cpp

@@ -1,473 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  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
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifndef WIN32
-#include <unistd.h>
-#endif
-
-#include "nzbget.h"
-#include "Decoder.h"
-#include "Log.h"
-#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;
-}
-
-Decoder::~ Decoder()
-{
-	debug("Destroying Decoder");
-
-	free(m_szArticleFilename);
-}
-
-void Decoder::Clear()
-{
-	free(m_szArticleFilename);
-	m_szArticleFilename = NULL;
-}
-
-Decoder::EFormat Decoder::DetectFormat(const char* buffer, int len)
-{
-	if (!strncmp(buffer, "=ybegin ", 8))
-	{
-		return efYenc;
-	}
-	
-	if ((len == 62 || len == 63) && (buffer[62] == '\n' || buffer[62] == '\r') && *buffer == 'M')
-	{
-		return efUx;
-	}
-
-	if (!strncmp(buffer, "begin ", 6))
-	{
-		bool bOK = true;
-		buffer += 6; //strlen("begin ")
-		while (*buffer && *buffer != ' ')
-		{
-			char ch = *buffer++;
-			if (ch < '0' || ch > '7')
-			{
-				bOK = false;
-				break;
-			}
-		}
-		if (bOK)
-		{
-			return efUx;
-		}
-	}
-
-	return efUnknown;
-}
-
-/**
-  * YDecoder: fast implementation of yEnc-Decoder
-  */
-
-void YDecoder::Init()
-{
-	debug("Initializing global decoder");
-	crc32gentab();
-}
-
-void YDecoder::Final()
-{
-	debug("Finalizing global Decoder");
-}
-
-YDecoder::YDecoder()
-{
-	Clear();
-}
-
-void YDecoder::Clear()
-{
-	Decoder::Clear();
-
-	m_bBody = false;
-	m_bBegin = false;
-	m_bPart = false;
-	m_bEnd = false;
-	m_bCrc = false;
-	m_lExpectedCRC = 0;
-	m_lCalculatedCRC = 0xFFFFFFFF;
-	m_iBegin = 0;
-	m_iEnd = 0xFFFFFFFF;
-	m_iSize = 0;
-	m_iEndSize = 0;
-	m_bAutoSeek = false;
-	m_bNeedSetPos = false;
-	m_bCrcCheck = false;
-}
-
-/* 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)
-	{
-		if (!strncmp(buffer, "=yend ", 6))
-		{
-			m_bEnd = true;
-			char* pb = strstr(buffer, m_bPart ? " pcrc32=" : " crc32=");
-			if (pb)
-			{
-				m_bCrc = true;
-				pb += 7 + (int)m_bPart; //=strlen(" crc32=") or strlen(" pcrc32=")
-				m_lExpectedCRC = strtoul(pb, NULL, 16);
-			}
-			pb = strstr(buffer, " size=");
-			if (pb) 
-			{
-				pb += 6; //=strlen(" size=")
-				m_iEndSize = (int)atoi(pb);
-			}
-			return 0;
-		}
-
-		char* iptr = buffer;
-		char* optr = buffer;
-		while (true)
-		{
-			switch (*iptr)
-			{
-				case '=':	//escape-sequence
-					iptr++;
-					*optr = *iptr - 64 - 42;
-					optr++;
-					break;
-				case '\n':	// ignored char
-				case '\r':	// ignored char
-					break;
-				case '\0':
-					goto BreakLoop;
-				default:	// normal char
-					*optr = *iptr - 42;
-					optr++;
-					break;
-			}
-			iptr++;
-		}
-BreakLoop:
-
-		if (m_bCrcCheck)
-		{
-			m_lCalculatedCRC = crc32m(m_lCalculatedCRC, (unsigned char *)buffer, (unsigned int)(optr - buffer));
-		}
-		return (unsigned int)(optr - buffer);
-	}
-	else 
-	{
-		if (!m_bPart && !strncmp(buffer, "=ybegin ", 8))
-		{
-			m_bBegin = true;
-			char* pb = strstr(buffer, " name=");
-			if (pb)
-			{
-				pb += 6; //=strlen(" name=")
-				char* pe;
-				for (pe = pb; *pe != '\0' && *pe != '\n' && *pe != '\r'; pe++) ;
-				free(m_szArticleFilename);
-				m_szArticleFilename = (char*)malloc(pe - pb + 1);
-				strncpy(m_szArticleFilename, pb, pe - pb);
-				m_szArticleFilename[pe - pb] = '\0';
-			}
-			pb = strstr(buffer, " size=");
-			if (pb) 
-			{
-				pb += 6; //=strlen(" size=")
-				m_iSize = (int)atoi(pb);
-			}
-			m_bPart = strstr(buffer, " part=");
-			if (!m_bPart)
-			{
-				m_bBody = true;
-				m_iBegin = 1;
-				m_iEnd = m_iSize;
-			}
-		}
-		else if (m_bPart && !strncmp(buffer, "=ypart ", 7))
-		{
-			m_bPart = true;
-			m_bBody = true;
-			char* pb = strstr(buffer, " begin=");
-			if (pb) 
-			{
-				pb += 7; //=strlen(" begin=")
-				m_iBegin = (int)atoi(pb);
-			}
-			pb = strstr(buffer, " end=");
-			if (pb) 
-			{
-				pb += 5; //=strlen(" end=")
-				m_iEnd = (int)atoi(pb);
-			}
-		}
-	}
-
-	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;
-
-	debug("Expected crc32=%x", m_lExpectedCRC);
-	debug("Calculated crc32=%x", m_lCalculatedCRC);
-
-	if (!m_bBegin)
-	{
-		return eNoBinaryData;
-	}
-	else if (!m_bEnd)
-	{
-		return eArticleIncomplete;
-	}
-	else if (!m_bPart && m_iSize != m_iEndSize)
-	{
-		return eInvalidSize;
-	}
-	else if (m_bCrcCheck && m_bCrc && (m_lExpectedCRC != m_lCalculatedCRC))
-	{
-		return eCrcError;
-	}
-
-	return eFinished;
-}
-
-
-/**
-  * UDecoder: supports UU encoding formats
-  */
-
-UDecoder::UDecoder()
-{
-
-}
-
-void UDecoder::Clear()
-{
-	Decoder::Clear();
-
-	m_bBody = false;
-	m_bEnd = false;
-}
-
-/* DecodeBuffer-function uses portions of code from tool UUDECODE by Clem Dye
- * UUDECODE.c (http://www.bastet.com/uue.zip)
- * Copyright (C) 1998 Clem Dye
- *
- * Released under GPL (thanks)
- */
-
-#define UU_DECODE_CHAR(c) (c == '`' ? 0 : (((c) - ' ') & 077))
-
-unsigned int UDecoder::DecodeBuffer(char* buffer, int len)
-{
-	if (!m_bBody)
-	{
-		if (!strncmp(buffer, "begin ", 6))
-		{
-			char* pb = buffer;
-			pb += 6; //strlen("begin ")
-
-			// skip file-permissions
-			for (; *pb != ' ' && *pb != '\0' && *pb != '\n' && *pb != '\r'; pb++) ; 
-			pb++;
-
-			// extracting filename
-			char* pe;
-			for (pe = pb; *pe != '\0' && *pe != '\n' && *pe != '\r'; pe++) ;
-			free(m_szArticleFilename);
-			m_szArticleFilename = (char*)malloc(pe - pb + 1);
-			strncpy(m_szArticleFilename, pb, pe - pb);
-			m_szArticleFilename[pe - pb] = '\0';
-
-			m_bBody = true;
-			return 0;
-		}
-		else if ((len == 62 || len == 63) && (buffer[62] == '\n' || buffer[62] == '\r') && *buffer == 'M')
-		{
-			m_bBody = true;
-		}
-	}
-
-	if (m_bBody && (!strncmp(buffer, "end ", 4) || *buffer == '`'))
-	{
-		m_bEnd = true;
-	}
-
-	if (m_bBody && !m_bEnd)
-	{
-		int iEffLen = UU_DECODE_CHAR(buffer[0]);
-		if (iEffLen > len)
-		{
-			// error;
-			return 0;
-		}
-
-		char* iptr = buffer;
-		char* optr = buffer;
-		for (++iptr; iEffLen > 0; iptr += 4, iEffLen -= 3)
-		{
-			if (iEffLen >= 3)
-			{
-				*optr++ = UU_DECODE_CHAR (iptr[0]) << 2 | UU_DECODE_CHAR (iptr[1]) >> 4; 
-				*optr++ = UU_DECODE_CHAR (iptr[1]) << 4 | UU_DECODE_CHAR (iptr[2]) >> 2; 
-				*optr++ = UU_DECODE_CHAR (iptr[2]) << 6 | UU_DECODE_CHAR (iptr[3]);
-			}
-			else
-			{
-				if (iEffLen >= 1)
-				{
-					*optr++ = UU_DECODE_CHAR (iptr[0]) << 2 | UU_DECODE_CHAR (iptr[1]) >> 4; 
-				}
-				if (iEffLen >= 2)
-				{
-					*optr++ = UU_DECODE_CHAR (iptr[1]) << 4 | UU_DECODE_CHAR (iptr[2]) >> 2; 
-				}
-			}
-		}
-
-		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)
-	{
-		return eNoBinaryData;
-	}
-
-	return eFinished;
-}

Decoder.h

@@ -1,119 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This 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 DECODER_H
-#define DECODER_H
-
-class Decoder
-{
-public:
-	enum EStatus
-	{
-		eUnknownError,
-		eFinished,
-		eArticleIncomplete,
-		eCrcError,
-		eInvalidSize,
-		eNoBinaryData
-	};
-
-	enum EFormat
-	{
-		efUnknown,
-		efYenc,
-		efUx,
-	};
-
-	static const char* FormatNames[];
-
-protected:
-	const char*				m_szSrcFilename;
-	const char*				m_szDestFilename;
-	char*					m_szArticleFilename;
-
-public:
-							Decoder();
-	virtual					~Decoder();
-	virtual EStatus			Check() = 0;
-	virtual void			Clear();
-	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);
-};
-
-class YDecoder: public Decoder
-{
-protected:
-	static unsigned int		crc_tab[256];
-	bool					m_bBegin;
-	bool					m_bPart;
-	bool					m_bBody;
-	bool					m_bEnd;
-	bool					m_bCrc;
-	unsigned long			m_lExpectedCRC;
-	unsigned long			m_lCalculatedCRC;
-	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 bool			Write(char* buffer, int len, FILE* outfile);
-	void					SetAutoSeek(bool bAutoSeek) { m_bAutoSeek = m_bNeedSetPos = bAutoSeek; }
-	void					SetCrcCheck(bool bCrcCheck) { m_bCrcCheck = bCrcCheck; }
-
-	static void				Init();
-	static void				Final();
-};
-
-class UDecoder: public Decoder
-{
-private:
-	bool					m_bBody;
-	bool					m_bEnd;
-
-	unsigned int			DecodeBuffer(char* buffer, int len);
-
-public:
-							UDecoder();
-	virtual EStatus			Check();
-	virtual void			Clear();
-	virtual bool			Write(char* buffer, int len, FILE* outfile);
-};
-
-#endif

DiskState.h

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

DownloadInfo.h

@@ -1,820 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef 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;
-	long long			m_lSuccessSize;
-	long long			m_lFailedSize;
-	long long			m_lMissedSize;
-	int					m_iTotalArticles;
-	int					m_iMissedArticles;
-	int					m_iFailedArticles;
-	int					m_iSuccessArticles;
-	time_t				m_tTime;
-	bool				m_bPaused;
-	bool				m_bDeleted;
-	bool				m_bFilenameConfirmed;
-	bool				m_bParFile;
-	int					m_iCompleted;
-	bool				m_bOutputInitialized;
-	char*				m_szOutputFilename;
-	Mutex*				m_pMutexOutputFile;
-	int					m_iPriority;
-	bool				m_bExtraPriority;
-	int					m_iActiveDownloads;
-	bool				m_bAutoDeleted;
-
-	static int			m_iIDGen;
-	static int			m_iIDMax;
-
-public:
-						FileInfo();
-						~FileInfo();
-	int					GetID() { return m_iID; }
-	void				SetID(int iID);
-	static void			ResetGenID(bool bMax);
-	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
-	void				SetNZBInfo(NZBInfo* pNZBInfo);
-	Articles* 			GetArticles() { return &m_Articles; }
-	Groups* 			GetGroups() { return &m_Groups; }
-	const char*			GetSubject() { return m_szSubject; }
-	void 				SetSubject(const char* szSubject);
-	const char*			GetFilename() { return m_szFilename; }
-	void 				SetFilename(const char* szFilename);
-	void				MakeValidFilename();
-	bool				GetFilenameConfirmed() { return m_bFilenameConfirmed; }
-	void				SetFilenameConfirmed(bool bFilenameConfirmed) { m_bFilenameConfirmed = bFilenameConfirmed; }
-	void 				SetSize(long long lSize) { m_lSize = lSize; m_lRemainingSize = lSize; }
-	long long 			GetSize() { return m_lSize; }
-	long long 			GetRemainingSize() { return m_lRemainingSize; }
-	void 				SetRemainingSize(long long lRemainingSize) { m_lRemainingSize = lRemainingSize; }
-	long long			GetMissedSize() { return m_lMissedSize; }
-	void 				SetMissedSize(long long lMissedSize) { m_lMissedSize = lMissedSize; }
-	long long			GetSuccessSize() { return m_lSuccessSize; }
-	void 				SetSuccessSize(long long lSuccessSize) { m_lSuccessSize = lSuccessSize; }
-	long long			GetFailedSize() { return m_lFailedSize; }
-	void 				SetFailedSize(long long lFailedSize) { m_lFailedSize = lFailedSize; }
-	int					GetTotalArticles() { return m_iTotalArticles; }
-	void 				SetTotalArticles(int iTotalArticles) { m_iTotalArticles = iTotalArticles; }
-	int					GetMissedArticles() { return m_iMissedArticles; }
-	void 				SetMissedArticles(int iMissedArticles) { m_iMissedArticles = iMissedArticles; }
-	int					GetFailedArticles() { return m_iFailedArticles; }
-	void 				SetFailedArticles(int iFailedArticles) { m_iFailedArticles = iFailedArticles; }
-	int					GetSuccessArticles() { return m_iSuccessArticles; }
-	void 				SetSuccessArticles(int iSuccessArticles) { m_iSuccessArticles = iSuccessArticles; }
-	time_t				GetTime() { return m_tTime; }
-	void				SetTime(time_t tTime) { m_tTime = tTime; }
-	bool				GetPaused() { return m_bPaused; }
-	void				SetPaused(bool Paused) { m_bPaused = Paused; }
-	bool				GetDeleted() { return m_bDeleted; }
-	void				SetDeleted(bool Deleted) { m_bDeleted = Deleted; }
-	int					GetCompleted() { return m_iCompleted; }
-	void				SetCompleted(int iCompleted) { m_iCompleted = iCompleted; }
-	bool				GetParFile() { return m_bParFile; }
-	void				SetParFile(bool bParFile) { m_bParFile = bParFile; }
-	void				ClearArticles();
-	void				LockOutputFile();
-	void				UnlockOutputFile();
-	const char*			GetOutputFilename() { return m_szOutputFilename; }
-	void 				SetOutputFilename(const char* szOutputFilename);
-	bool				GetOutputInitialized() { return m_bOutputInitialized; }
-	void				SetOutputInitialized(bool bOutputInitialized) { m_bOutputInitialized = bOutputInitialized; }
-	int					GetPriority() { return m_iPriority; }
-	void				SetPriority(int iPriority) { m_iPriority = iPriority; }
-	bool				GetExtraPriority() { return m_bExtraPriority; }
-	void				SetExtraPriority(bool bExtraPriority) { m_bExtraPriority = bExtraPriority; };
-	int					GetActiveDownloads() { return m_iActiveDownloads; }
-	void				SetActiveDownloads(int iActiveDownloads);
-	bool				GetAutoDeleted() { return m_bAutoDeleted; }
-	void				SetAutoDeleted(bool bAutoDeleted) { m_bAutoDeleted = bAutoDeleted; }
-};
-                              
-typedef std::deque<FileInfo*> FileQueue;
-
-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*> GroupQueueBase;
-
-class GroupQueue : public GroupQueueBase
-{
-public:
-						~GroupQueue();
-	void				Clear();
-};
-
-
-class NZBParameter
-{
-private:
-	char* 				m_szName;
-	char* 				m_szValue;
-
-	void				SetValue(const char* szValue);
-
-	friend class NZBParameterList;
-
-public:
-						NZBParameter(const char* szName);
-						~NZBParameter();
-	const char*			GetName() { return m_szName; }
-	const char*			GetValue() { return m_szValue; }
-};
-
-typedef std::deque<NZBParameter*> NZBParameterListBase;
-
-class NZBParameterList : public NZBParameterListBase
-{
-public:
-						~NZBParameterList();
-	void				SetParameter(const char* szName, const char* szValue);
-	NZBParameter*		Find(const char* szName, bool bCaseSensitive);
-	void				Clear();
-	void				CopyFrom(NZBParameterList* pSourceParameters);
-};
-
-class ScriptStatus
-{
-public:
-	enum EStatus
-	{
-		srNone,
-		srFailure,
-		srSuccess
-	};
-
-private:
-	char* 				m_szName;
-	EStatus				m_eStatus;
-	
-	friend class ScriptStatusList;
-	
-public:
-						ScriptStatus(const char* szName, EStatus eStatus);
-						~ScriptStatus();
-	const char*			GetName() { return m_szName; }
-	EStatus				GetStatus() { return m_eStatus; }
-};
-
-typedef std::deque<ScriptStatus*> ScriptStatusListBase;
-
-class ScriptStatusList : public ScriptStatusListBase
-{
-public:
-						~ScriptStatusList();
-	void				Add(const char* szScriptName, ScriptStatus::EStatus eStatus);
-	void				Clear();
-	ScriptStatus::EStatus	CalcTotalStatus();
-};
-
-class ServerStat
-{
-private:
-	int					m_iServerID;
-	int					m_iSuccessArticles;
-	int					m_iFailedArticles;
-
-public:
-						ServerStat(int iServerID);
-	int					GetServerID() { return m_iServerID; }
-	int					GetSuccessArticles() { return m_iSuccessArticles; }
-	void				SetSuccessArticles(int iSuccessArticles) { m_iSuccessArticles = iSuccessArticles; }
-	int					GetFailedArticles() { return m_iFailedArticles; }
-	void				SetFailedArticles(int iFailedArticles) { m_iFailedArticles = iFailedArticles; }
-};
-
-typedef std::vector<ServerStat*>	ServerStatListBase;
-
-class ServerStatList : public ServerStatListBase
-{
-public:
-						~ServerStatList();
-	void				SetStat(int iServerID, int iSuccessArticles, int iFailedArticles, bool bAdd);
-	void				Add(ServerStatList* pServerStats);
-	void				Clear();
-};
-
-enum EDupeMode
-{
-	dmScore,
-	dmAll,
-	dmForce
-};
-
-class NZBInfoList;
-
-class NZBInfo
-{
-public:
-	enum ERenameStatus
-	{
-		rsNone,
-		rsSkipped,
-		rsFailure,
-		rsSuccess
-	};
-
-	enum EParStatus
-	{
-		psNone,
-		psSkipped,
-		psFailure,
-		psSuccess,
-		psRepairPossible,
-		psManual
-	};
-
-	enum EUnpackStatus
-	{
-		usNone,
-		usSkipped,
-		usFailure,
-		usSuccess,
-		usSpace,
-		usPassword
-	};
-
-	enum ECleanupStatus
-	{
-		csNone,
-		csFailure,
-		csSuccess
-	};
-
-	enum EMoveStatus
-	{
-		msNone,
-		msFailure,
-		msSuccess
-	};
-
-	enum EDeleteStatus
-	{
-		dsNone,
-		dsManual,
-		dsHealth,
-		dsDupe
-	};
-
-	enum EMarkStatus
-	{
-		ksNone,
-		ksBad,
-		ksGood
-	};
-
-	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_szFinalDir;
-	char* 				m_szCategory;
-	int		 			m_iFileCount;
-	int		 			m_iParkedFileCount;
-	long long 			m_lSize;
-	long long			m_lSuccessSize;
-	long long			m_lFailedSize;
-	long long			m_lCurrentSuccessSize;
-	long long			m_lCurrentFailedSize;
-	long long			m_lParSize;
-	long long			m_lParSuccessSize;
-	long long			m_lParFailedSize;
-	long long			m_lParCurrentSuccessSize;
-	long long			m_lParCurrentFailedSize;
-	int					m_iTotalArticles;
-	int					m_iSuccessArticles;
-	int					m_iFailedArticles;
-	Files				m_completedFiles;
-	bool				m_bPostProcess;
-	ERenameStatus		m_eRenameStatus;
-	EParStatus			m_eParStatus;
-	EUnpackStatus		m_eUnpackStatus;
-	ECleanupStatus		m_eCleanupStatus;
-	EMoveStatus			m_eMoveStatus;
-	EDeleteStatus		m_eDeleteStatus;
-	EMarkStatus			m_eMarkStatus;
-	bool				m_bDeletePaused;
-	bool				m_bManyDupeFiles;
-	char*				m_szQueuedFilename;
-	bool				m_bDeleting;
-	bool				m_bAvoidHistory;
-	bool				m_bHealthPaused;
-	bool				m_bParCleanup;
-	bool				m_bParManual;
-	bool				m_bCleanupDisk;
-	bool				m_bUnpackCleanedUpDisk;
-	char*				m_szDupeKey;
-	int					m_iDupeScore;
-	EDupeMode			m_eDupeMode;
-	unsigned int		m_iFullContentHash;
-	unsigned int		m_iFilteredContentHash;
-	NZBInfoList*		m_Owner;
-	NZBParameterList	m_ppParameters;
-	ScriptStatusList	m_scriptStatuses;
-	ServerStatList		m_ServerStats;
-	Mutex				m_mutexLog;
-	Messages			m_Messages;
-	int					m_iIDMessageGen;
-
-	static int			m_iIDGen;
-	static int			m_iIDMax;
-
-	friend class NZBInfoList;
-
-public:
-						NZBInfo(bool bPersistent = true);
-						~NZBInfo();
-	void				Retain();
-	void				Release();
-	int					GetID() { return m_iID; }
-	void				SetID(int iID);
-	static void			ResetGenID(bool bMax);
-	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*			GetFinalDir() { return m_szFinalDir; }   // needs locking (for shared objects)
-	void				SetFinalDir(const char* szFinalDir);     // needs locking (for shared objects)
-	const char*			GetCategory() { return m_szCategory; } // needs locking (for shared objects)
-	void				SetCategory(const char* szCategory);   // needs locking (for shared objects)
-	const char*			GetName() { return m_szName; } 	   // needs locking (for shared objects)
-	void				SetName(const char* szName);	   // needs locking (for shared objects)
-	int					GetFileCount() { return m_iFileCount; }
-	void 				SetFileCount(int iFileCount) { m_iFileCount = iFileCount; }
-	int					GetParkedFileCount() { return m_iParkedFileCount; }
-	void 				SetParkedFileCount(int iParkedFileCount) { m_iParkedFileCount = iParkedFileCount; }
-	long long 			GetSize() { return m_lSize; }
-	void 				SetSize(long long lSize) { m_lSize = lSize; }
-	long long			GetSuccessSize() { return m_lSuccessSize; }
-	void 				SetSuccessSize(long long lSuccessSize) { m_lSuccessSize = lSuccessSize; }
-	long long			GetFailedSize() { return m_lFailedSize; }
-	void 				SetFailedSize(long long lFailedSize) { m_lFailedSize = lFailedSize; }
-	long long			GetCurrentSuccessSize() { return m_lCurrentSuccessSize; }
-	void 				SetCurrentSuccessSize(long long lCurrentSuccessSize) { m_lCurrentSuccessSize = lCurrentSuccessSize; }
-	long long			GetCurrentFailedSize() { return m_lCurrentFailedSize; }
-	void 				SetCurrentFailedSize(long long lCurrentFailedSize) { m_lCurrentFailedSize = lCurrentFailedSize; }
-	long long			GetParSize() { return m_lParSize; }
-	void 				SetParSize(long long lParSize) { m_lParSize = lParSize; }
-	long long			GetParSuccessSize() { return m_lParSuccessSize; }
-	void 				SetParSuccessSize(long long lParSuccessSize) { m_lParSuccessSize = lParSuccessSize; }
-	long long			GetParFailedSize() { return m_lParFailedSize; }
-	void 				SetParFailedSize(long long lParFailedSize) { m_lParFailedSize = lParFailedSize; }
-	long long			GetParCurrentSuccessSize() { return m_lParCurrentSuccessSize; }
-	void 				SetParCurrentSuccessSize(long long lParCurrentSuccessSize) { m_lParCurrentSuccessSize = lParCurrentSuccessSize; }
-	long long			GetParCurrentFailedSize() { return m_lParCurrentFailedSize; }
-	void 				SetParCurrentFailedSize(long long lParCurrentFailedSize) { m_lParCurrentFailedSize = lParCurrentFailedSize; }
-	int					GetTotalArticles() { return m_iTotalArticles; }
-	void 				SetTotalArticles(int iTotalArticles) { m_iTotalArticles = iTotalArticles; }
-	int					GetSuccessArticles() { return m_iSuccessArticles; }
-	void 				SetSuccessArticles(int iSuccessArticles) { m_iSuccessArticles = iSuccessArticles; }
-	int					GetFailedArticles() { return m_iFailedArticles; }
-	void 				SetFailedArticles(int iFailedArticles) { m_iFailedArticles = iFailedArticles; }
-	void				BuildDestDirName();
-	void				BuildFinalDirName(char* szFinalDirBuf, int iBufSize);
-	Files*				GetCompletedFiles() { return &m_completedFiles; }		// needs locking (for shared objects)
-	void				ClearCompletedFiles();
-	bool				GetPostProcess() { return m_bPostProcess; }
-	void				SetPostProcess(bool bPostProcess) { m_bPostProcess = bPostProcess; }
-	ERenameStatus		GetRenameStatus() { return m_eRenameStatus; }
-	void				SetRenameStatus(ERenameStatus eRenameStatus) { m_eRenameStatus = eRenameStatus; }
-	EParStatus			GetParStatus() { return m_eParStatus; }
-	void				SetParStatus(EParStatus eParStatus) { m_eParStatus = eParStatus; }
-	EUnpackStatus		GetUnpackStatus() { return m_eUnpackStatus; }
-	void				SetUnpackStatus(EUnpackStatus eUnpackStatus) { m_eUnpackStatus = eUnpackStatus; }
-	ECleanupStatus		GetCleanupStatus() { return m_eCleanupStatus; }
-	void				SetCleanupStatus(ECleanupStatus eCleanupStatus) { m_eCleanupStatus = eCleanupStatus; }
-	EMoveStatus			GetMoveStatus() { return m_eMoveStatus; }
-	void				SetMoveStatus(EMoveStatus eMoveStatus) { m_eMoveStatus = eMoveStatus; }
-	EDeleteStatus		GetDeleteStatus() { return m_eDeleteStatus; }
-	void				SetDeleteStatus(EDeleteStatus eDeleteStatus) { m_eDeleteStatus = eDeleteStatus; }
-	EMarkStatus			GetMarkStatus() { return m_eMarkStatus; }
-	void				SetMarkStatus(EMarkStatus eMarkStatus) { m_eMarkStatus = eMarkStatus; }
-	const char*			GetQueuedFilename() { return m_szQueuedFilename; }
-	void				SetQueuedFilename(const char* szQueuedFilename);
-	bool				GetDeleting() { return m_bDeleting; }
-	void				SetDeleting(bool bDeleting) { m_bDeleting = bDeleting; }
-	bool				GetDeletePaused() { return m_bDeletePaused; }
-	void				SetDeletePaused(bool bDeletePaused) { m_bDeletePaused = bDeletePaused; }
-	bool				GetManyDupeFiles() { return m_bManyDupeFiles; }
-	void				SetManyDupeFiles(bool bManyDupeFiles) { m_bManyDupeFiles = bManyDupeFiles; }
-	bool				GetAvoidHistory() { return m_bAvoidHistory; }
-	void				SetAvoidHistory(bool bAvoidHistory) { m_bAvoidHistory = bAvoidHistory; }
-	bool				GetHealthPaused() { return m_bHealthPaused; }
-	void				SetHealthPaused(bool bHealthPaused) { m_bHealthPaused = bHealthPaused; }
-	bool				GetParCleanup() { return m_bParCleanup; }
-	void				SetParCleanup(bool bParCleanup) { m_bParCleanup = bParCleanup; }
-	bool				GetCleanupDisk() { return m_bCleanupDisk; }
-	void				SetCleanupDisk(bool bCleanupDisk) { m_bCleanupDisk = bCleanupDisk; }
-	bool				GetUnpackCleanedUpDisk() { return m_bUnpackCleanedUpDisk; }
-	void				SetUnpackCleanedUpDisk(bool bUnpackCleanedUpDisk) { m_bUnpackCleanedUpDisk = bUnpackCleanedUpDisk; }
-	NZBParameterList*	GetParameters() { return &m_ppParameters; }				// needs locking (for shared objects)
-	ScriptStatusList*	GetScriptStatuses() { return &m_scriptStatuses; }        // needs locking (for shared objects)
-	ServerStatList*		GetServerStats() { return &m_ServerStats; }
-	int					CalcHealth();
-	int					CalcCriticalHealth();
-	const char*			GetDupeKey() { return m_szDupeKey; }					// needs locking (for shared objects)
-	void				SetDupeKey(const char* szDupeKey);						// needs locking (for shared objects)
-	int					GetDupeScore() { return m_iDupeScore; }
-	void				SetDupeScore(int iDupeScore) { m_iDupeScore = iDupeScore; }
-	EDupeMode			GetDupeMode() { return m_eDupeMode; }
-	void				SetDupeMode(EDupeMode eDupeMode) { m_eDupeMode = eDupeMode; }
-	unsigned int		GetFullContentHash() { return m_iFullContentHash; }
-	void				SetFullContentHash(unsigned int iFullContentHash) { m_iFullContentHash = iFullContentHash; }
-	unsigned int		GetFilteredContentHash() { return m_iFilteredContentHash; }
-	void				SetFilteredContentHash(unsigned int iFilteredContentHash) { m_iFilteredContentHash = iFilteredContentHash; }
-	void				AppendMessage(Message::EKind eKind, time_t tTime, const char* szText);
-	Messages*			LockMessages();
-	void				UnlockMessages();
-};
-
-typedef std::deque<NZBInfo*> NZBInfoListBase;
-
-class NZBInfoList : public NZBInfoListBase
-{
-public:
-	void				Add(NZBInfo* pNZBInfo);
-	void				Remove(NZBInfo* pNZBInfo);
-	void				ReleaseAll();
-};
-
-class PostInfo
-{
-public:
-	enum EStage
-	{
-		ptQueued,
-		ptLoadingPars,
-		ptVerifyingSources,
-		ptRepairing,
-		ptVerifyingRepaired,
-		ptRenaming,
-		ptUnpacking,
-		ptMoving,
-		ptExecutingScript,
-		ptFinished
-	};
-
-	typedef std::deque<Message*>	Messages;
-
-private:
-	int					m_iID;
-	NZBInfo*			m_pNZBInfo;
-	char*				m_szInfoName;
-	bool				m_bWorking;
-	bool				m_bDeleted;
-	bool				m_bRequestParCheck;
-	EStage				m_eStage;
-	char*				m_szProgressLabel;
-	int					m_iFileProgress;
-	int					m_iStageProgress;
-	time_t				m_tStartTime;
-	time_t				m_tStageTime;
-	Thread*				m_pPostThread;
-	
-	Mutex				m_mutexLog;
-	Messages			m_Messages;
-	int					m_iIDMessageGen;
-
-	static int			m_iIDGen;
-	static int			m_iIDMax;
-
-public:
-						PostInfo();
-						~PostInfo();
-	int					GetID() { return m_iID; }
-	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
-	void				SetNZBInfo(NZBInfo* pNZBInfo);
-	const char*			GetInfoName() { return m_szInfoName; }
-	void				SetInfoName(const char* szInfoName);
-	EStage				GetStage() { return m_eStage; }
-	void				SetStage(EStage eStage) { m_eStage = eStage; }
-	void				SetProgressLabel(const char* szProgressLabel);
-	const char*			GetProgressLabel() { return m_szProgressLabel; }
-	int					GetFileProgress() { return m_iFileProgress; }
-	void				SetFileProgress(int iFileProgress) { m_iFileProgress = iFileProgress; }
-	int					GetStageProgress() { return m_iStageProgress; }
-	void				SetStageProgress(int iStageProgress) { m_iStageProgress = iStageProgress; }
-	time_t				GetStartTime() { return m_tStartTime; }
-	void				SetStartTime(time_t tStartTime) { m_tStartTime = tStartTime; }
-	time_t				GetStageTime() { return m_tStageTime; }
-	void				SetStageTime(time_t tStageTime) { m_tStageTime = tStageTime; }
-	bool				GetWorking() { return m_bWorking; }
-	void				SetWorking(bool bWorking) { m_bWorking = bWorking; }
-	bool				GetDeleted() { return m_bDeleted; }
-	void				SetDeleted(bool bDeleted) { m_bDeleted = bDeleted; }
-	bool				GetRequestParCheck() { return m_bRequestParCheck; }
-	void				SetRequestParCheck(bool bRequestParCheck) { m_bRequestParCheck = bRequestParCheck; }
-	void				AppendMessage(Message::EKind eKind, const char* szText);
-	Thread*				GetPostThread() { return m_pPostThread; }
-	void				SetPostThread(Thread* pPostThread) { m_pPostThread = pPostThread; }
-	Messages*			LockMessages();
-	void				UnlockMessages();
-};
-
-typedef std::deque<PostInfo*> PostQueue;
-
-typedef std::vector<int> IDList;
-
-typedef std::vector<char*> NameList;
-
-class UrlInfo
-{
-public:
-	enum EStatus
-	{
-		aiUndefined,
-		aiRunning,
-		aiFinished,
-		aiFailed,
-		aiRetry,
-		aiScanSkipped,
-		aiScanFailed
-	};
-
-private:
-	int					m_iID;
-	char*				m_szURL;
-	char*				m_szNZBFilename;
-	char* 				m_szCategory;
-	int					m_iPriority;
-	char*				m_szDupeKey;
-	int					m_iDupeScore;
-	EDupeMode			m_eDupeMode;
-	bool				m_bAddTop;
-	bool				m_bAddPaused;
-	bool				m_bForce;
-	EStatus				m_eStatus;
-
-	static int			m_iIDGen;
-	static int			m_iIDMax;
-
-public:
-						UrlInfo();
-						~UrlInfo();
-	int					GetID() { return m_iID; }
-	void				SetID(int iID);
-	static void			ResetGenID(bool bMax);
-	const char*			GetURL() { return m_szURL; }			// needs locking (for shared objects)
-	void				SetURL(const char* szURL);				// needs locking (for shared objects)
-	const char*			GetNZBFilename() { return m_szNZBFilename; }		// needs locking (for shared objects)
-	void				SetNZBFilename(const char* szNZBFilename);			// needs locking (for shared objects)
-	const char*			GetCategory() { return m_szCategory; }	// needs locking (for shared objects)
-	void				SetCategory(const char* szCategory);	// needs locking (for shared objects)
-	int					GetPriority() { return m_iPriority; }
-	void				SetPriority(int iPriority) { m_iPriority = iPriority; }
-	const char*			GetDupeKey() { return m_szDupeKey; }
-	void				SetDupeKey(const char* szDupeKey);
-	int					GetDupeScore() { return m_iDupeScore; }
-	void				SetDupeScore(int iDupeScore) { m_iDupeScore = iDupeScore; }
-	EDupeMode			GetDupeMode() { return m_eDupeMode; }
-	void				SetDupeMode(EDupeMode eDupeMode) { m_eDupeMode = eDupeMode; }
-	bool				GetAddTop() { return m_bAddTop; }
-	void				SetAddTop(bool bAddTop) { m_bAddTop = bAddTop; }
-	bool				GetAddPaused() { return m_bAddPaused; }
-	void				SetAddPaused(bool bAddPaused) { m_bAddPaused = bAddPaused; }
-	void				GetName(char* szBuffer, int iSize);		// needs locking (for shared objects)
-	static void			MakeNiceName(const char* szURL, const char* szNZBFilename, char* szBuffer, int iSize);
-	bool				GetForce() { return m_bForce; }
-	void				SetForce(bool bForce) { m_bForce = bForce; }
-	EStatus				GetStatus() { return m_eStatus; }
-	void				SetStatus(EStatus Status) { m_eStatus = Status; }
-};
-
-typedef std::deque<UrlInfo*> UrlQueue;
-
-class DupInfo
-{
-public:
-	enum EStatus
-	{
-		dsUndefined,
-		dsSuccess,
-		dsFailed,
-		dsDeleted,
-		dsDupe,
-		dsBad,
-		dsGood
-	};
-
-private:
-	char*				m_szName;
-	char*				m_szDupeKey;
-	int					m_iDupeScore;
-	EDupeMode			m_eDupeMode;
-	long long 			m_lSize;
-	unsigned int		m_iFullContentHash;
-	unsigned int		m_iFilteredContentHash;
-	EStatus				m_eStatus;
-
-public:
-						DupInfo();
-						~DupInfo();
-	const char*			GetName() { return m_szName; }			// needs locking (for shared objects)
-	void				SetName(const char* szName);			// needs locking (for shared objects)
-	const char*			GetDupeKey() { return m_szDupeKey; }	// needs locking (for shared objects)
-	void				SetDupeKey(const char* szDupeKey);		// needs locking (for shared objects)
-	int					GetDupeScore() { return m_iDupeScore; }
-	void				SetDupeScore(int iDupeScore) { m_iDupeScore = iDupeScore; }
-	EDupeMode			GetDupeMode() { return m_eDupeMode; }
-	void				SetDupeMode(EDupeMode eDupeMode) { m_eDupeMode = eDupeMode; }
-	long long			GetSize() { return m_lSize; }
-	void 				SetSize(long long lSize) { m_lSize = lSize; }
-	unsigned int		GetFullContentHash() { return m_iFullContentHash; }
-	void				SetFullContentHash(unsigned int iFullContentHash) { m_iFullContentHash = iFullContentHash; }
-	unsigned int		GetFilteredContentHash() { return m_iFilteredContentHash; }
-	void				SetFilteredContentHash(unsigned int iFilteredContentHash) { m_iFilteredContentHash = iFilteredContentHash; }
-	EStatus				GetStatus() { return m_eStatus; }
-	void				SetStatus(EStatus Status) { m_eStatus = Status; }
-};
-
-class HistoryInfo
-{
-public:
-	enum EKind
-	{
-		hkUnknown,
-		hkNZBInfo,
-		hkUrlInfo,
-		hkDupInfo
-	};
-
-private:
-	int					m_iID;
-	EKind				m_eKind;
-	void*				m_pInfo;
-	time_t				m_tTime;
-
-	static int			m_iIDGen;
-	static int			m_iIDMax;
-
-public:
-						HistoryInfo(NZBInfo* pNZBInfo);
-						HistoryInfo(UrlInfo* pUrlInfo);
-						HistoryInfo(DupInfo* pDupInfo);
-						~HistoryInfo();
-	int					GetID() { return m_iID; }
-	void				SetID(int iID);
-	static void			ResetGenID(bool bMax);
-	EKind				GetKind() { return m_eKind; }
-	NZBInfo*			GetNZBInfo() { return (NZBInfo*)m_pInfo; }
-	UrlInfo*			GetUrlInfo() { return (UrlInfo*)m_pInfo; }
-	DupInfo*			GetDupInfo() { return (DupInfo*)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

DupeCoordinator.cpp

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

DupeCoordinator.h

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

FeedCoordinator.cpp

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

FeedCoordinator.h

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

FeedFile.cpp

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

FeedFile.h

@@ -1,70 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef FEEDFILE_H
-#define FEEDFILE_H
-
-#include <vector>
-
-#include "FeedInfo.h"
-
-class FeedFile
-{
-private:
-	FeedItemInfos*		m_pFeedItemInfos;
-	char*				m_szFileName;
-
-						FeedFile(const char* szFileName);
-	void				AddItem(FeedItemInfo* pFeedItemInfo);
-	void				ParseSubject(FeedItemInfo* pFeedItemInfo);
-#ifdef WIN32
-    bool 				ParseFeed(IUnknown* nzb);
-	static void			EncodeURL(const char* szFilename, char* szURL);
-#else
-	FeedItemInfo*		m_pFeedItemInfo;
-	char*				m_szTagContent;
-	int					m_iTagContentLen;
-	bool				m_bIgnoreNextError;
-
-	static void			SAX_StartElement(FeedFile* pFile, const char *name, const char **atts);
-	static void			SAX_EndElement(FeedFile* pFile, const char *name);
-	static void			SAX_characters(FeedFile* pFile, const char * xmlstr, int len);
-	static void*		SAX_getEntity(FeedFile* pFile, const char * name);
-	static void			SAX_error(FeedFile* pFile, const char *msg, ...);
-	void				Parse_StartElement(const char *name, const char **atts);
-	void				Parse_EndElement(const char *name);
-	void				Parse_Content(const char *buf, int len);
-	void				ResetTagContent();
-#endif
-
-public:
-	virtual 			~FeedFile();
-	static FeedFile*	Create(const char* szFileName);
-	FeedItemInfos*		GetFeedItemInfos() { return m_pFeedItemInfos; }
-
-	void				LogDebugInfo();
-};
-
-#endif

FeedFilter.h

@@ -1,186 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef FEEDFILTER_H
-#define FEEDFILTER_H
-
-#include "DownloadInfo.h"
-#include "FeedInfo.h"
-#include "Util.h"
-
-class FeedFilter
-{
-private:
-	typedef std::deque<char*> RefValues;
-
-	enum ETermCommand
-	{
-		fcText,
-		fcRegex,
-		fcEqual,
-		fcLess,
-		fcLessEqual,
-		fcGreater,
-		fcGreaterEqual,
-		fcOpeningBrace,
-		fcClosingBrace,
-		fcOrOperator
-	};
-	
-	class Term
-	{
-	private:
-		bool			m_bPositive;
-		char*			m_szField;
-		ETermCommand	m_eCommand;
-		char*			m_szParam;
-		long long		m_iIntParam;
-		double			m_fFloatParam;
-		bool			m_bFloat;
-		RegEx*			m_pRegEx;
-		RefValues*		m_pRefValues;
-
-		bool			GetFieldData(const char* szField, FeedItemInfo* pFeedItemInfo,
-							const char** StrValue, long long* IntValue);
-		bool			ParseParam(const char* szField, const char* szParam);
-		bool			ParseSizeParam(const char* szParam);
-		bool			ParseAgeParam(const char* szParam);
-		bool			ParseNumericParam(const char* szParam);
-		bool			MatchValue(const char* szStrValue, long long iIntValue);
-		bool			MatchText(const char* szStrValue);
-		bool			MatchRegex(const char* szStrValue);
-		void			FillWildMaskRefValues(const char* szStrValue, WildMask* pMask, int iRefOffset);
-		void			FillRegExRefValues(const char* szStrValue, RegEx* pRegEx);
-
-	public:
-						Term();
-						~Term();
-		void			SetRefValues(RefValues* pRefValues) { m_pRefValues = pRefValues; }
-		bool			Compile(char* szToken);
-		bool			Match(FeedItemInfo* pFeedItemInfo);
-		ETermCommand	GetCommand() { return m_eCommand; }
-	};
-
-	typedef std::deque<Term*> TermList;
-
-	enum ERuleCommand
-	{
-		frAccept,
-		frReject,
-		frRequire,
-		frOptions,
-		frComment
-	};
-
-	class Rule
-	{
-	private:
-		bool			m_bIsValid;
-		ERuleCommand	m_eCommand;
-		char*			m_szCategory;
-		int				m_iPriority;
-		int				m_iAddPriority;
-		bool			m_bPause;
-		int				m_iDupeScore;
-		int				m_iAddDupeScore;
-		char*			m_szDupeKey;
-		char*			m_szAddDupeKey;
-		EDupeMode		m_eDupeMode;
-		char*			m_szSeries;
-		char*			m_szRageId;
-		bool			m_bHasCategory;
-		bool			m_bHasPriority;
-		bool			m_bHasAddPriority;
-		bool			m_bHasPause;
-		bool			m_bHasDupeScore;
-		bool			m_bHasAddDupeScore;
-		bool			m_bHasDupeKey;
-		bool			m_bHasAddDupeKey;
-		bool			m_bHasDupeMode;
-		bool			m_bPatCategory;
-		bool			m_bPatDupeKey;
-		bool			m_bPatAddDupeKey;
-		bool			m_bHasSeries;
-		bool			m_bHasRageId;
-		char*			m_szPatCategory;
-		char*			m_szPatDupeKey;
-		char*			m_szPatAddDupeKey;
-		TermList		m_Terms;
-		RefValues		m_RefValues;
-
-		char*			CompileCommand(char* szRule);
-		char*			CompileOptions(char* szRule);
-		bool			CompileTerm(char* szTerm);
-		bool			MatchExpression(FeedItemInfo* pFeedItemInfo);
-
-	public:
-						Rule();
-						~Rule();
-		void			Compile(char* szRule);
-		bool			IsValid() { return m_bIsValid; }
-		ERuleCommand	GetCommand() { return m_eCommand; }
-		const char*		GetCategory() { return m_szCategory; }
-		int				GetPriority() { return m_iPriority; }
-		int				GetAddPriority() { return m_iAddPriority; }
-		bool			GetPause() { return m_bPause; }
-		const char*		GetDupeKey() { return m_szDupeKey; }
-		const char*		GetAddDupeKey() { return m_szAddDupeKey; }
-		int				GetDupeScore() { return m_iDupeScore; }
-		int				GetAddDupeScore() { return m_iAddDupeScore; }
-		EDupeMode		GetDupeMode() { return m_eDupeMode; }
-		const char*		GetRageId() { return m_szRageId; }
-		const char*		GetSeries() { return m_szSeries; }
-		bool			HasCategory() { return m_bHasCategory; }
-		bool			HasPriority() { return m_bHasPriority; }
-		bool			HasAddPriority() { return m_bHasAddPriority; }
-		bool			HasPause() { return m_bHasPause; }
-		bool			HasDupeScore() { return m_bHasDupeScore; }
-		bool			HasAddDupeScore() { return m_bHasAddDupeScore; }
-		bool			HasDupeKey() { return m_bHasDupeKey; }
-		bool			HasAddDupeKey() { return m_bHasAddDupeKey; }
-		bool			HasDupeMode() { return m_bHasDupeMode; }
-		bool			HasRageId() { return m_bHasRageId; }
-		bool			HasSeries() { return m_bHasSeries; }
-		bool			Match(FeedItemInfo* pFeedItemInfo);
-		void			ExpandRefValues(FeedItemInfo* pFeedItemInfo, char** pDestStr, char* pPatStr);
-		const char*		GetRefValue(FeedItemInfo* pFeedItemInfo, const char* szVarName);
-	};
-
-	typedef std::deque<Rule*> RuleList;
-
-private:
-	RuleList			m_Rules;
-
-	void				Compile(const char* szFilter);
-	void				CompileRule(char* szRule);
-	void				ApplyOptions(Rule* pRule, FeedItemInfo* pFeedItemInfo);
-
-public:
-						FeedFilter(const char* szFilter);
-						~FeedFilter();
-	void				Match(FeedItemInfo* pFeedItemInfo);
-};
-
-#endif

FeedInfo.cpp

@@ -1,440 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision: 0 $
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <ctype.h>
-#include <sys/stat.h>
-
-#include "nzbget.h"
-#include "FeedInfo.h"
-#include "Util.h"
-
-
-FeedInfo::FeedInfo(int iID, const char* szName, const char* szUrl, int iInterval,
-	const char* szFilter, bool bPauseNzb, const char* szCategory, int iPriority)
-{
-	m_iID = iID;
-	m_szName = strdup(szName ? szName : "");
-	m_szUrl = strdup(szUrl ? szUrl : "");
-	m_szFilter = strdup(szFilter ? szFilter : "");
-	m_iFilterHash = Util::HashBJ96(szFilter, strlen(szFilter), 0);
-	m_szCategory = strdup(szCategory ? szCategory : "");
-	m_iInterval = iInterval;
-	m_bPauseNzb = bPauseNzb;
-	m_iPriority = iPriority;
-	m_tLastUpdate = 0;
-	m_bPreview = false;
-	m_eStatus = fsUndefined;
-	m_szOutputFilename = NULL;
-	m_bFetch = false;
-	m_bForce = false;
-}
-
-FeedInfo::~FeedInfo()
-{
-	free(m_szName);
-	free(m_szUrl);
-	free(m_szFilter);
-	free(m_szCategory);
-	free(m_szOutputFilename);
-}
-
-void FeedInfo::SetOutputFilename(const char* szOutputFilename)
-{
-	free(m_szOutputFilename);
-	m_szOutputFilename = strdup(szOutputFilename);
-}
-
-
-FeedItemInfo::Attr::Attr(const char* szName, const char* szValue)
-{
-	m_szName = strdup(szName ? szName : "");
-	m_szValue = strdup(szValue ? szValue : "");
-}
-
-FeedItemInfo::Attr::~Attr()
-{
-	free(m_szName);
-	free(m_szValue);
-}
-
-
-FeedItemInfo::Attributes::~Attributes()
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		delete *it;
-	}
-}
-
-void FeedItemInfo::Attributes::Add(const char* szName, const char* szValue)
-{
-	push_back(new Attr(szName, szValue));
-}
-
-FeedItemInfo::Attr* FeedItemInfo::Attributes::Find(const char* szName)
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		Attr* pAttr = *it;
-		if (!strcasecmp(pAttr->GetName(), szName))
-		{
-			return pAttr;
-		}
-	}
-
-	return NULL;
-}
-
-
-FeedItemInfo::FeedItemInfo()
-{
-	m_pSharedFeedData = NULL;
-	m_szTitle = NULL;
-	m_szFilename = NULL;
-	m_szUrl = NULL;
-	m_szCategory = strdup("");
-	m_lSize = 0;
-	m_tTime = 0;
-	m_iImdbId = 0;
-	m_iRageId = 0;
-	m_szDescription = strdup("");
-	m_szSeason = NULL;
-	m_szEpisode = NULL;
-	m_iSeasonNum = 0;
-	m_iEpisodeNum = 0;
-	m_bSeasonEpisodeParsed = false;
-	m_szAddCategory = strdup("");
-	m_bPauseNzb = false;
-	m_iPriority = 0;
-	m_eStatus = isUnknown;
-	m_eMatchStatus = msIgnored;
-	m_iMatchRule = 0;
-	m_szDupeKey = NULL;
-	m_iDupeScore = 0;
-	m_eDupeMode = dmScore;
-}
-
-FeedItemInfo::~FeedItemInfo()
-{
-	free(m_szTitle);
-	free(m_szFilename);
-	free(m_szUrl);
-	free(m_szCategory);
-	free(m_szDescription);
-	free(m_szSeason);
-	free(m_szEpisode);
-	free(m_szAddCategory);
-	free(m_szDupeKey);
-}
-
-void FeedItemInfo::SetTitle(const char* szTitle)
-{
-	free(m_szTitle);
-	m_szTitle = szTitle ? strdup(szTitle) : NULL;
-}
-
-void FeedItemInfo::SetFilename(const char* szFilename)
-{
-	free(m_szFilename);
-	m_szFilename = szFilename ? strdup(szFilename) : NULL;
-}
-
-void FeedItemInfo::SetUrl(const char* szUrl)
-{
-	free(m_szUrl);
-	m_szUrl = szUrl ? strdup(szUrl) : NULL;
-}
-
-void FeedItemInfo::SetCategory(const char* szCategory)
-{
-	free(m_szCategory);
-	m_szCategory = strdup(szCategory ? szCategory: "");
-}
-
-void FeedItemInfo::SetDescription(const char* szDescription)
-{
-	free(m_szDescription);
-	m_szDescription = strdup(szDescription ? szDescription: "");
-}
-
-void FeedItemInfo::SetSeason(const char* szSeason)
-{
-	free(m_szSeason);
-	m_szSeason = szSeason ? strdup(szSeason) : NULL;
-	m_iSeasonNum = szSeason ? ParsePrefixedInt(szSeason) : 0;
-}
-
-void FeedItemInfo::SetEpisode(const char* szEpisode)
-{
-	free(m_szEpisode);
-	m_szEpisode = szEpisode ? strdup(szEpisode) : NULL;
-	m_iEpisodeNum = szEpisode ? ParsePrefixedInt(szEpisode) : 0;
-}
-
-int FeedItemInfo::ParsePrefixedInt(const char *szValue)
-{
-	const char* szVal = szValue;
-	if (!strchr("0123456789", *szVal))
-	{
-		szVal++;
-	}
-	return atoi(szVal);
-}
-
-void FeedItemInfo::SetAddCategory(const char* szAddCategory)
-{
-	free(m_szAddCategory);
-	m_szAddCategory = strdup(szAddCategory ? szAddCategory : "");
-}
-
-void FeedItemInfo::SetDupeKey(const char* szDupeKey)
-{
-	free(m_szDupeKey);
-	m_szDupeKey = strdup(szDupeKey ? szDupeKey : "");
-}
-
-void FeedItemInfo::AppendDupeKey(const char* szExtraDupeKey)
-{
-	if (!m_szDupeKey || *m_szDupeKey == '\0' || !szExtraDupeKey || *szExtraDupeKey == '\0')
-	{
-		return;
-	}
-
-	int iLen = (m_szDupeKey ? strlen(m_szDupeKey) : 0) + 1 + strlen(szExtraDupeKey) + 1;
-	char* szNewKey = (char*)malloc(iLen);
-	snprintf(szNewKey, iLen, "%s-%s", m_szDupeKey, szExtraDupeKey);
-	szNewKey[iLen - 1] = '\0';
-
-	free(m_szDupeKey);
-	m_szDupeKey = szNewKey;
-}
-
-void FeedItemInfo::BuildDupeKey(const char* szRageId, const char* szSeries)
-{
-	int iRageId = szRageId && *szRageId ? atoi(szRageId) : m_iRageId;
-
-	free(m_szDupeKey);
-
-	if (m_iImdbId != 0)
-	{
-		m_szDupeKey = (char*)malloc(20);
-		snprintf(m_szDupeKey, 20, "imdb=%i", m_iImdbId);
-	}
-	else if (szSeries && *szSeries && GetSeasonNum() != 0 && GetEpisodeNum() != 0)
-	{
-		int iLen = strlen(szSeries) + 50;
-		m_szDupeKey = (char*)malloc(iLen);
-		snprintf(m_szDupeKey, iLen, "series=%s-%s-%s", szSeries, m_szSeason, m_szEpisode);
-		m_szDupeKey[iLen-1] = '\0';
-	}
-	else if (iRageId != 0 && GetSeasonNum() != 0 && GetEpisodeNum() != 0)
-	{
-		m_szDupeKey = (char*)malloc(100);
-		snprintf(m_szDupeKey, 100, "rageid=%i-%s-%s", iRageId, m_szSeason, m_szEpisode);
-		m_szDupeKey[100-1] = '\0';
-	}
-	else
-	{
-		m_szDupeKey = strdup("");
-	}
-}
-
-int FeedItemInfo::GetSeasonNum()
-{
-	if (!m_szSeason && !m_bSeasonEpisodeParsed)
-	{
-		ParseSeasonEpisode();
-	}
-
-	return m_iSeasonNum;
-}
-
-int FeedItemInfo::GetEpisodeNum()
-{
-	if (!m_szEpisode && !m_bSeasonEpisodeParsed)
-	{
-		ParseSeasonEpisode();
-	}
-
-	return m_iEpisodeNum;
-}
-
-void FeedItemInfo::ParseSeasonEpisode()
-{
-	m_bSeasonEpisodeParsed = true;
-
-	RegEx* pRegEx = m_pSharedFeedData->GetSeasonEpisodeRegEx();
-
-	if (pRegEx->Match(m_szTitle))
-	{
-		char szRegValue[100];
-		char szValue[100];
-
-		snprintf(szValue, 100, "S%02d", atoi(m_szTitle + pRegEx->GetMatchStart(1)));
-		szValue[100-1] = '\0';
-		SetSeason(szValue);
-
-		int iLen = pRegEx->GetMatchLen(2);
-		iLen = iLen < 99 ? iLen : 99;
-		strncpy(szRegValue, m_szTitle + pRegEx->GetMatchStart(2), pRegEx->GetMatchLen(2));
-		szRegValue[iLen] = '\0';
-		snprintf(szValue, 100, "E%s", szRegValue);
-		szValue[100-1] = '\0';
-		Util::ReduceStr(szValue, "-", "");
-		for (char* p = szValue; *p; p++) *p = toupper(*p); // convert string to uppercase e02 -> E02
-		SetEpisode(szValue);
-	}
-}
-
-
-FeedHistoryInfo::FeedHistoryInfo(const char* szUrl, FeedHistoryInfo::EStatus eStatus, time_t tLastSeen)
-{
-	m_szUrl = szUrl ? strdup(szUrl) : NULL;
-	m_eStatus = eStatus;
-	m_tLastSeen = tLastSeen;
-}
-
-FeedHistoryInfo::~FeedHistoryInfo()
-{
-	free(m_szUrl);
-}
-
-
-FeedHistory::~FeedHistory()
-{
-	Clear();
-}
-
-void FeedHistory::Clear()
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		delete *it;
-	}
-	clear();
-}
-
-void FeedHistory::Add(const char* szUrl, FeedHistoryInfo::EStatus eStatus, time_t tLastSeen)
-{
-	push_back(new FeedHistoryInfo(szUrl, eStatus, tLastSeen));
-}
-
-void FeedHistory::Remove(const char* szUrl)
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		FeedHistoryInfo* pFeedHistoryInfo = *it;
-		if (!strcmp(pFeedHistoryInfo->GetUrl(), szUrl))
-		{
-			delete pFeedHistoryInfo;
-			erase(it);
-			break;
-		}
-	}
-}
-
-FeedHistoryInfo* FeedHistory::Find(const char* szUrl)
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		FeedHistoryInfo* pFeedHistoryInfo = *it;
-		if (!strcmp(pFeedHistoryInfo->GetUrl(), szUrl))
-		{
-			return pFeedHistoryInfo;
-		}
-	}
-
-	return NULL;
-}
-
-
-FeedItemInfos::FeedItemInfos()
-{
-	debug("Creating FeedItemInfos");
-	
-	m_iRefCount = 0;
-}
-
-FeedItemInfos::~FeedItemInfos()
-{
-	debug("Destroing FeedItemInfos");
-	
-	for (iterator it = begin(); it != end(); it++)
-    {
-        delete *it;
-    }
-}
-
-void FeedItemInfos::Retain()
-{
-	m_iRefCount++;
-}
-
-void FeedItemInfos::Release()
-{
-	m_iRefCount--;
-	if (m_iRefCount <= 0)
-	{
-		delete this;
-	}
-}
-
-void FeedItemInfos::Add(FeedItemInfo* pFeedItemInfo)
-{
-	push_back(pFeedItemInfo);
-	pFeedItemInfo->SetSharedFeedData(&m_SharedFeedData);
-}
-
-
-SharedFeedData::SharedFeedData()
-{
-	m_pSeasonEpisodeRegEx = NULL;
-}
-
-SharedFeedData::~SharedFeedData()
-{
-	delete m_pSeasonEpisodeRegEx;
-}
-
-RegEx* SharedFeedData::GetSeasonEpisodeRegEx()
-{
-	if (!m_pSeasonEpisodeRegEx)
-	{
-		m_pSeasonEpisodeRegEx = new RegEx("[^[:alnum:]]s?([0-9]+)[ex]([0-9]+(-?e[0-9]+)?)[^[:alnum:]]", 10);
-	}
-
-	return m_pSeasonEpisodeRegEx;
-}

FeedInfo.h

@@ -1,278 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision: 0 $
- * $Date$
- *
- */
-
-
-#ifndef FEEDINFO_H
-#define FEEDINFO_H
-
-#include <deque>
-#include <time.h>
-
-#include "Util.h"
-#include "DownloadInfo.h"
-
-
-class FeedInfo
-{
-public:
-	enum EStatus
-	{
-		fsUndefined,
-		fsRunning,
-		fsFinished,
-		fsFailed
-	};
-
-private:
-	int					m_iID;
-	char*				m_szName;
-	char*				m_szUrl;
-	int					m_iInterval;
-	char*				m_szFilter;
-	unsigned int		m_iFilterHash;
-	bool				m_bPauseNzb;
-	char*				m_szCategory;
-	int					m_iPriority;
-	time_t				m_tLastUpdate;
-	bool				m_bPreview;
-	EStatus				m_eStatus;
-	char*				m_szOutputFilename;
-	bool				m_bFetch;
-	bool				m_bForce;
-
-public:
-						FeedInfo(int iID, const char* szName, const char* szUrl, int iInterval,
-							const char* szFilter, bool bPauseNzb, const char* szCategory, int iPriority);
-						~FeedInfo();
-	int					GetID() { return m_iID; }
-	const char*			GetName() { return m_szName; }
-	const char*			GetUrl() { return m_szUrl; }
-	int					GetInterval() { return m_iInterval; }
-	const char*			GetFilter() { return m_szFilter; }
-	unsigned int		GetFilterHash() { return m_iFilterHash; }
-	bool				GetPauseNzb() { return m_bPauseNzb; }
-	const char*			GetCategory() { return m_szCategory; }
-	int					GetPriority() { return m_iPriority; }
-	time_t				GetLastUpdate() { return m_tLastUpdate; }
-	void				SetLastUpdate(time_t tLastUpdate) { m_tLastUpdate = tLastUpdate; }
-	bool				GetPreview() { return m_bPreview; }
-	void				SetPreview(bool bPreview) { m_bPreview = bPreview; }
-	EStatus				GetStatus() { return m_eStatus; }
-	void				SetStatus(EStatus Status) { m_eStatus = Status; }
-	const char*			GetOutputFilename() { return m_szOutputFilename; }
-	void 				SetOutputFilename(const char* szOutputFilename);
-	bool				GetFetch() { return m_bFetch; }
-	void				SetFetch(bool bFetch) { m_bFetch = bFetch; }
-	bool				GetForce() { return m_bForce; }
-	void				SetForce(bool bForce) { m_bForce = bForce; }
-};
-
-typedef std::deque<FeedInfo*> Feeds;
-
-class SharedFeedData
-{
-private:
-	RegEx*				m_pSeasonEpisodeRegEx;
-
-public:
-						SharedFeedData();
-						~SharedFeedData();
-	RegEx*				GetSeasonEpisodeRegEx();
-};
-
-class FeedItemInfo
-{
-public:
-	enum EStatus
-	{
-		isUnknown,
-		isBacklog,
-		isFetched,
-		isNew
-	};
-
-	enum EMatchStatus
-	{
-		msIgnored,
-		msAccepted,
-		msRejected
-	};
-
-	class Attr
-	{
-	private:
-		char*			m_szName;
-		char*			m_szValue;
-	public:
-						Attr(const char* szName, const char* szValue);
-						~Attr();
-		const char*		GetName() { return m_szName; }
-		const char*		GetValue() { return m_szValue; }
-	};
-	
-	typedef std::deque<Attr*>  AttributesBase;
-
-	class Attributes: public AttributesBase
-	{
-	public:
-						~Attributes();
-		void			Add(const char* szName, const char* szValue);
-		Attr*			Find(const char* szName);
-	};
-
-private:
-	char*				m_szTitle;
-	char*				m_szFilename;
-	char*				m_szUrl;
-	time_t				m_tTime;
-	long long			m_lSize;
-	char*				m_szCategory;
-	int					m_iImdbId;
-	int					m_iRageId;
-	char*				m_szDescription;
-	char*				m_szSeason;
-	char*				m_szEpisode;
-	int					m_iSeasonNum;
-	int					m_iEpisodeNum;
-	bool				m_bSeasonEpisodeParsed;
-	char*				m_szAddCategory;
-	bool				m_bPauseNzb;
-	int					m_iPriority;
-	EStatus				m_eStatus;
-	EMatchStatus		m_eMatchStatus;
-	int					m_iMatchRule;
-	char*				m_szDupeKey;
-	int					m_iDupeScore;
-	EDupeMode			m_eDupeMode;
-	SharedFeedData*		m_pSharedFeedData;
-	Attributes			m_Attributes;
-
-	int					ParsePrefixedInt(const char *szValue);
-	void				ParseSeasonEpisode();
-
-public:
-						FeedItemInfo();
-						~FeedItemInfo();
-	void				SetSharedFeedData(SharedFeedData* pSharedFeedData) { m_pSharedFeedData = pSharedFeedData; }
-	const char*			GetTitle() { return m_szTitle; }
-	void				SetTitle(const char* szTitle);
-	const char*			GetFilename() { return m_szFilename; }
-	void				SetFilename(const char* szFilename);
-	const char*			GetUrl() { return m_szUrl; }
-	void				SetUrl(const char* szUrl);
-	long long			GetSize() { return m_lSize; }
-	void				SetSize(long long lSize) { m_lSize = lSize; }
-	const char*			GetCategory() { return m_szCategory; }
-	void				SetCategory(const char* szCategory);
-	int					GetImdbId() { return m_iImdbId; }
-	void				SetImdbId(int iImdbId) { m_iImdbId = iImdbId; }
-	int					GetRageId() { return m_iRageId; }
-	void				SetRageId(int iRageId) { m_iRageId = iRageId; }
-	const char*			GetDescription() { return m_szDescription; }
-	void				SetDescription(const char* szDescription);
-	const char*			GetSeason() { return m_szSeason; }
-	void				SetSeason(const char* szSeason);
-	const char*			GetEpisode() { return m_szEpisode; }
-	void				SetEpisode(const char* szEpisode);
-	int					GetSeasonNum();
-	int					GetEpisodeNum();
-	const char*			GetAddCategory() { return m_szAddCategory; }
-	void				SetAddCategory(const char* szAddCategory);
-	bool				GetPauseNzb() { return m_bPauseNzb; }
-	void				SetPauseNzb(bool bPauseNzb) { m_bPauseNzb = bPauseNzb; }
-	int					GetPriority() { return m_iPriority; }
-	void				SetPriority(int iPriority) { m_iPriority = iPriority; }
-	time_t				GetTime() { return m_tTime; }
-	void				SetTime(time_t tTime) { m_tTime = tTime; }
-	EStatus				GetStatus() { return m_eStatus; }
-	void				SetStatus(EStatus eStatus) { m_eStatus = eStatus; }
-	EMatchStatus		GetMatchStatus() { return m_eMatchStatus; }
-	void				SetMatchStatus(EMatchStatus eMatchStatus) { m_eMatchStatus = eMatchStatus; }
-	int					GetMatchRule() { return m_iMatchRule; }
-	void				SetMatchRule(int iMatchRule) { m_iMatchRule = iMatchRule; }
-	const char*			GetDupeKey() { return m_szDupeKey; }
-	void				SetDupeKey(const char* szDupeKey);
-	void				AppendDupeKey(const char* szExtraDupeKey);
-	void				BuildDupeKey(const char* szRageId, const char* szSeries);
-	int					GetDupeScore() { return m_iDupeScore; }
-	void				SetDupeScore(int iDupeScore) { m_iDupeScore = iDupeScore; }
-	EDupeMode			GetDupeMode() { return m_eDupeMode; }
-	void				SetDupeMode(EDupeMode eDupeMode) { m_eDupeMode = eDupeMode; }
-	Attributes*			GetAttributes() { return &m_Attributes; }
-};
-
-typedef std::deque<FeedItemInfo*>	FeedItemInfosBase;
-
-class FeedItemInfos : public FeedItemInfosBase
-{
-private:
-	int					m_iRefCount;
-	SharedFeedData		m_SharedFeedData;
-
-public:
-						FeedItemInfos();
-						~FeedItemInfos();
-	void				Retain();
-	void				Release();
-	void				Add(FeedItemInfo* pFeedItemInfo);
-};
-
-class FeedHistoryInfo
-{
-public:
-	enum EStatus
-	{
-		hsUnknown,
-		hsBacklog,
-		hsFetched
-	};
-
-private:
-	char*				m_szUrl;
-	EStatus				m_eStatus;
-	time_t				m_tLastSeen;
-
-public:
-						FeedHistoryInfo(const char* szUrl, EStatus eStatus, time_t tLastSeen);
-						~FeedHistoryInfo();
-	const char*			GetUrl() { return m_szUrl; }
-	EStatus				GetStatus() { return m_eStatus; }
-	void				SetStatus(EStatus Status) { m_eStatus = Status; }
-	time_t				GetLastSeen() { return m_tLastSeen; }
-	void				SetLastSeen(time_t tLastSeen) { m_tLastSeen = tLastSeen; }
-};
-
-typedef std::deque<FeedHistoryInfo*> FeedHistoryBase;
-
-class FeedHistory : public FeedHistoryBase
-{
-public:
-						~FeedHistory();
-	void				Clear();
-	void				Add(const char* szUrl, FeedHistoryInfo::EStatus eStatus, time_t tLastSeen);
-	void				Remove(const char* szUrl);
-	FeedHistoryInfo*	Find(const char* szUrl);
-};
-
-#endif

Frontend.cpp

@@ -1,416 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifndef WIN32
-#include <unistd.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#endif
-
-#include "nzbget.h"
-#include "Options.h"
-#include "Frontend.h"
-#include "Log.h"
-#include "Connection.h"
-#include "MessageBase.h"
-#include "QueueCoordinator.h"
-#include "RemoteClient.h"
-#include "Util.h"
-
-extern QueueCoordinator* g_pQueueCoordinator;
-extern Options* g_pOptions;
-
-Frontend::Frontend()
-{
-	debug("Creating Frontend");
-
-	m_iNeededLogFirstID = 0;
-	m_iNeededLogEntries = 0;
-	m_bSummary = false;
-	m_bFileList = false;
-	m_iCurrentDownloadSpeed = 0;
-	m_lRemainingSize = 0;
-	m_bPauseDownload = false;
-	m_bPauseDownload2 = false;
-	m_iDownloadLimit = 0;
-	m_iThreadCount = 0;
-	m_iPostJobCount = 0;
-	m_iUpTimeSec = 0;
-	m_iDnTimeSec = 0;
-	m_iAllBytes = 0;
-	m_bStandBy = 0;
-	m_iUpdateInterval = g_pOptions->GetUpdateInterval();
-}
-
-bool Frontend::PrepareData()
-{
-	if (IsRemoteMode())
-	{
-		if (IsStopped())
-		{
-			return false;
-		}
-		if (!RequestMessages() || ((m_bSummary || m_bFileList) && !RequestFileList()))
-		{
-			printf("\nUnable to send request to nzbget-server at %s (port %i)    \n", g_pOptions->GetControlIP(), g_pOptions->GetControlPort());
-			Stop();
-			return false;
-		}
-	}
-	else
-	{
-		if (m_bSummary)
-		{
-			m_iCurrentDownloadSpeed = g_pQueueCoordinator->CalcCurrentDownloadSpeed();
-			m_lRemainingSize = g_pQueueCoordinator->CalcRemainingSize();
-			m_bPauseDownload = g_pOptions->GetPauseDownload();
-			m_bPauseDownload2 = g_pOptions->GetPauseDownload2();
-			m_iDownloadLimit = g_pOptions->GetDownloadRate();
-			m_iThreadCount = Thread::GetThreadCount();
-			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;
-}
-
-void Frontend::FreeData()
-{
-	if (IsRemoteMode())
-	{
-		for (Log::Messages::iterator it = m_RemoteMessages.begin(); it != m_RemoteMessages.end(); it++)
-		{
-			delete *it;
-		}
-		m_RemoteMessages.clear();
-
-		for (FileQueue::iterator it = m_RemoteQueue.GetFileQueue()->begin(); it != m_RemoteQueue.GetFileQueue()->end(); it++)
-		{
-			delete *it;
-		}
-		m_RemoteQueue.GetFileQueue()->clear();
-	}
-}
-
-Log::Messages * Frontend::LockMessages()
-{
-	if (IsRemoteMode())
-	{
-		return &m_RemoteMessages;
-	}
-	else
-	{
-		return g_pLog->LockMessages();
-	}
-}
-
-void Frontend::UnlockMessages()
-{
-	if (!IsRemoteMode())
-	{
-		g_pLog->UnlockMessages();
-	}
-}
-
-DownloadQueue* Frontend::LockQueue()
-{
-	if (IsRemoteMode())
-	{
-		return &m_RemoteQueue;
-	}
-	else
-	{
-		return g_pQueueCoordinator->LockQueue();
-	}
-}
-
-void Frontend::UnlockQueue()
-{
-	if (!IsRemoteMode())
-	{
-		g_pQueueCoordinator->UnlockQueue();
-	}
-}
-
-bool Frontend::IsRemoteMode()
-{
-	return g_pOptions->GetRemoteClientMode();
-}
-
-void Frontend::ServerPauseUnpause(bool bPause, bool bSecondRegister)
-{
-	if (IsRemoteMode())
-	{
-		RequestPauseUnpause(bPause, bSecondRegister);
-	}
-	else
-	{
-		g_pOptions->SetResumeTime(0);
-		if (bSecondRegister)
-		{
-			g_pOptions->SetPauseDownload2(bPause);
-		}
-		else
-		{
-			g_pOptions->SetPauseDownload(bPause);
-		}
-	}
-}
-
-void Frontend::ServerSetDownloadRate(int iRate)
-{
-	if (IsRemoteMode())
-	{
-		RequestSetDownloadRate(iRate);
-	}
-	else
-	{
-		g_pOptions->SetDownloadRate(iRate);
-	}
-}
-
-void Frontend::ServerDumpDebug()
-{
-	if (IsRemoteMode())
-	{
-		RequestDumpDebug();
-	}
-	else
-	{
-		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;
-}
-
-void Frontend::InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int iSize)
-{
-	pMessageBase->m_iSignature	= htonl(NZBMESSAGE_SIGNATURE);
-	pMessageBase->m_iType = htonl(iRequest);
-	pMessageBase->m_iStructSize = htonl(iSize);
-
-	strncpy(pMessageBase->m_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()
-{
-	Connection connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
-
-	bool OK = connection.Connect();
-	if (!OK)
-	{
-		return false;
-	}
-
-	SNZBLogRequest LogRequest;
-	InitMessageBase(&LogRequest.m_MessageBase, eRemoteRequestLog, sizeof(LogRequest));
-	LogRequest.m_iLines = htonl(m_iNeededLogEntries);
-	if (m_iNeededLogEntries == 0)
-	{
-		LogRequest.m_iIDFrom = htonl(m_iNeededLogFirstID > 0 ? m_iNeededLogFirstID : 1);
-	}
-	else
-	{
-		LogRequest.m_iIDFrom = 0;
-	}
-
-	if (!connection.Send((char*)(&LogRequest), sizeof(LogRequest)))
-	{
-		return false;
-	}
-
-	// Now listen for the returned log
-	SNZBLogResponse LogResponse;
-	bool bRead = connection.Recv((char*) &LogResponse, sizeof(LogResponse));
-	if (!bRead || 
-		(int)ntohl(LogResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
-		ntohl(LogResponse.m_MessageBase.m_iStructSize) != sizeof(LogResponse))
-	{
-		return false;
-	}
-
-	char* pBuf = NULL;
-	if (ntohl(LogResponse.m_iTrailingDataLength) > 0)
-	{
-		pBuf = (char*)malloc(ntohl(LogResponse.m_iTrailingDataLength));
-		if (!connection.Recv(pBuf, ntohl(LogResponse.m_iTrailingDataLength)))
-		{
-			free(pBuf);
-			return false;
-		}
-	}
-
-	connection.Disconnect();
-
-	if (ntohl(LogResponse.m_iTrailingDataLength) > 0)
-	{
-		char* pBufPtr = (char*)pBuf;
-		for (unsigned int i = 0; i < ntohl(LogResponse.m_iNrTrailingEntries); i++)
-		{
-			SNZBLogResponseEntry* pLogAnswer = (SNZBLogResponseEntry*) pBufPtr;
-
-			char* szText = pBufPtr + sizeof(SNZBLogResponseEntry);
-
-			Message* pMessage = new Message(ntohl(pLogAnswer->m_iID), (Message::EKind)ntohl(pLogAnswer->m_iKind), ntohl(pLogAnswer->m_tTime), szText);
-			m_RemoteMessages.push_back(pMessage);
-
-			pBufPtr += sizeof(SNZBLogResponseEntry) + ntohl(pLogAnswer->m_iTextLen);
-		}
-
-		free(pBuf);
-	}
-
-	return true;
-}
-
-bool Frontend::RequestFileList()
-{
-	Connection connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
-
-	bool OK = connection.Connect();
-	if (!OK)
-	{
-		return false;
-	}
-
-	SNZBListRequest ListRequest;
-	InitMessageBase(&ListRequest.m_MessageBase, eRemoteRequestList, sizeof(ListRequest));
-	ListRequest.m_bFileList = htonl(m_bFileList);
-	ListRequest.m_bServerState = htonl(m_bSummary);
-
-	if (!connection.Send((char*)(&ListRequest), sizeof(ListRequest)))
-	{
-		return false;
-	}
-
-	// Now listen for the returned list
-	SNZBListResponse ListResponse;
-	bool bRead = connection.Recv((char*) &ListResponse, sizeof(ListResponse));
-	if (!bRead || 
-		(int)ntohl(ListResponse.m_MessageBase.m_iSignature) != (int)NZBMESSAGE_SIGNATURE ||
-		ntohl(ListResponse.m_MessageBase.m_iStructSize) != sizeof(ListResponse))
-	{
-		return false;
-	}
-
-	char* pBuf = NULL;
-	if (ntohl(ListResponse.m_iTrailingDataLength) > 0)
-	{
-		pBuf = (char*)malloc(ntohl(ListResponse.m_iTrailingDataLength));
-		if (!connection.Recv(pBuf, ntohl(ListResponse.m_iTrailingDataLength)))
-		{
-			free(pBuf);
-			return false;
-		}
-	}
-
-	connection.Disconnect();
-
-	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_iThreadCount = ntohl(ListResponse.m_iThreadCount);
-		m_iPostJobCount = ntohl(ListResponse.m_iPostJobCount);
-		m_iUpTimeSec = ntohl(ListResponse.m_iUpTimeSec);
-		m_iDnTimeSec = ntohl(ListResponse.m_iDownloadTimeSec);
-		m_bStandBy = ntohl(ListResponse.m_bDownloadStandBy);
-		m_iAllBytes = Util::JoinInt64(ntohl(ListResponse.m_iDownloadedBytesHi), ntohl(ListResponse.m_iDownloadedBytesLo));
-	}
-
-	if (m_bFileList && ntohl(ListResponse.m_iTrailingDataLength) > 0)
-	{
-		RemoteClient client;
-		client.SetVerbose(false);
-		client.BuildFileList(&ListResponse, pBuf, &m_RemoteQueue);
-	}
-
-	if (pBuf)
-	{
-		free(pBuf);
-	}
-
-	return true;
-}
-
-bool Frontend::RequestPauseUnpause(bool bPause, bool bSecondRegister)
-{
-	RemoteClient client;
-	client.SetVerbose(false);
-	return client.RequestServerPauseUnpause(bPause, bSecondRegister ? eRemotePauseUnpauseActionDownload2 : eRemotePauseUnpauseActionDownload);
-}
-
-bool Frontend::RequestSetDownloadRate(int iRate)
-{
-	RemoteClient client;
-	client.SetVerbose(false);
-	return client.RequestServerSetDownloadRate(iRate);
-}
-
-bool Frontend::RequestDumpDebug()
-{
-	RemoteClient client;
-	client.SetVerbose(false);
-	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

@@ -1,86 +0,0 @@
-/*
- *  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 FRONTEND_H
-#define FRONTEND_H
-
-#include "Thread.h"
-#include "Log.h"
-#include "DownloadInfo.h"
-#include "MessageBase.h"
-#include "QueueEditor.h"
-
-class Frontend : public Thread
-{
-private:
-	Log::Messages		m_RemoteMessages;
-	DownloadQueue		m_RemoteQueue;
-
-	bool				RequestMessages();
-	bool				RequestFileList();
-
-protected:
-	bool				m_bSummary;
-	bool				m_bFileList;
-	unsigned int		m_iNeededLogEntries;
-	unsigned int		m_iNeededLogFirstID;
-	int					m_iUpdateInterval;
-
-	// summary
-	int					m_iCurrentDownloadSpeed;
-	long long 			m_lRemainingSize;
-	bool				m_bPauseDownload;
-	bool				m_bPauseDownload2;
-	int					m_iDownloadLimit;
-	int					m_iThreadCount;
-	int					m_iPostJobCount;
-	int					m_iUpTimeSec;
-	int					m_iDnTimeSec;
-	long long			m_iAllBytes;
-	bool				m_bStandBy;
-
-	bool				PrepareData();
-	void				FreeData();
-	Log::Messages*		LockMessages();
-	void				UnlockMessages();
-	DownloadQueue*		LockQueue();
-	void				UnlockQueue();
-	bool				IsRemoteMode();
-	void				InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int iSize);
-	void				ServerPauseUnpause(bool bPause, bool bSecondRegister);
-	bool				RequestPauseUnpause(bool bPause, bool bSecondRegister);
-	void				ServerSetDownloadRate(int iRate);
-	bool				RequestSetDownloadRate(int iRate);
-	void				ServerDumpDebug();
-	bool				RequestDumpDebug();
-	bool 				ServerEditQueue(QueueEditor::EEditAction eAction, int iOffset, int iEntry);
-	bool 				RequestEditQueue(eRemoteEditAction iAction, int iOffset, int iID);
-
-public:
-						Frontend();
-};
-
-#endif

INSTALL

@@ -1,167 +0,0 @@
-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

@@ -1,414 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#else
-#include <pthread.h>
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#include "nzbget.h"
-#include "Options.h"
-#include "Log.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-
-Log::Log()
-{
-	m_Messages.clear();
-	m_iIDGen = 0;
-	m_szLogFilename = NULL;
-#ifdef DEBUG
-	m_bExtraDebug = Util::FileExists("extradebug");
-#endif
-}
-
-Log::~Log()
-{
-	Clear();
-	free(m_szLogFilename);
-}
-
-void Log::Filelog(const char* msg, ...)
-{
-	if (m_szLogFilename)
-	{
-		char tmp2[1024];
-
-		va_list ap;
-		va_start(ap, msg);
-		vsnprintf(tmp2, 1024, msg, ap);
-		tmp2[1024-1] = '\0';
-		va_end(ap);
-
-		time_t rawtime;
-		time(&rawtime);
-		rawtime += g_pOptions->GetTimeCorrection();
-		
-		char szTime[50];
-#ifdef HAVE_CTIME_R_3
-		ctime_r(&rawtime, szTime, 50);
-#else
-		ctime_r(&rawtime, szTime);
-#endif
-		szTime[50-1] = '\0';
-		szTime[strlen(szTime) - 1] = '\0'; // trim LF
-
-		FILE* file = fopen(m_szLogFilename, "ab+");
-		if (file)
-		{
-#ifdef WIN32
-			unsigned long iThreadId = GetCurrentThreadId();
-#else
-			unsigned long iThreadId = (unsigned long)pthread_self();
-#endif
-#ifdef DEBUG
-			fprintf(file, "%s\t%lu\t%s%s", szTime, iThreadId, tmp2, LINE_ENDING);
-#else
-			fprintf(file, "%s\t%s%s", szTime, tmp2, LINE_ENDING);
-#endif
-			fclose(file);
-		}
-		else
-		{
-			perror(m_szLogFilename);
-		}
-	}
-}
-
-#ifdef DEBUG
-#undef debug
-#ifdef HAVE_VARIADIC_MACROS
-void debug(const char* szFilename, const char* szFuncname, int iLineNr, const char* msg, ...)
-#else
-void debug(const char* msg, ...)
-#endif
-{
-	char tmp1[1024];
-
-	va_list ap;
-	va_start(ap, msg);
-	vsnprintf(tmp1, 1024, msg, ap);
-	tmp1[1024-1] = '\0';
-	va_end(ap);
-
-	char tmp2[1024];
-#ifdef HAVE_VARIADIC_MACROS
-	if (szFuncname)
-	{
-		snprintf(tmp2, 1024, "%s (%s:%i:%s)", tmp1, Util::BaseFileName(szFilename), iLineNr, szFuncname);
-	}
-	else
-	{
-		snprintf(tmp2, 1024, "%s (%s:%i)", tmp1, Util::BaseFileName(szFilename), iLineNr);
-	}
-#else
-	snprintf(tmp2, 1024, "%s", tmp1);
-#endif
-	tmp2[1024-1] = '\0';
-
-	g_pLog->m_mutexLog.Lock();
-
-	if (!g_pOptions && g_pLog->m_bExtraDebug)
-	{
-		printf("%s\n", tmp2);
-	}
-
-	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetDebugTarget() : Options::mtScreen;
-	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();
-}
-#endif
-
-void error(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();
-
-	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetErrorTarget() : Options::mtBoth;
-	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();
-}
-
-void warn(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();
-
-	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetWarningTarget() : Options::mtScreen;
-	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();
-}
-
-void info(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();
-
-	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetInfoTarget() : Options::mtScreen;
-	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();
-}
-
-void detail(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();
-
-	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetDetailTarget() : Options::mtScreen;
-	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
-
-Message::Message(unsigned int iID, EKind eKind, time_t tTime, const char* szText)
-{
-	m_iID = iID;
-	m_eKind = eKind;
-	m_tTime = tTime;
-	if (szText)
-	{
-		m_szText = strdup(szText);
-	}
-	else
-	{
-		m_szText = NULL;
-	}
-}
-
-Message::~ Message()
-{
-	free(m_szText);
-}
-
-void Log::Clear()
-{
-	m_mutexLog.Lock();
-	for (Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
-	{
-		delete *it;
-	}
-	m_Messages.clear();
-	m_mutexLog.Unlock();
-}
-
-void Log::AppendMessage(Message::EKind eKind, const char * szText)
-{
-	Message* pMessage = new Message(++m_iIDGen, eKind, time(NULL), szText);
-	m_Messages.push_back(pMessage);
-
-	if (g_pOptions)
-	{
-		while (m_Messages.size() > (unsigned int)g_pOptions->GetLogBufferSize())
-		{
-			Message* pMessage = m_Messages.front();
-			delete pMessage;
-			m_Messages.pop_front();
-		}
-	}
-}
-
-Log::Messages* Log::LockMessages()
-{
-	m_mutexLog.Lock();
-	return &m_Messages;
-}
-
-void Log::UnlockMessages()
-{
-	m_mutexLog.Unlock();
-}
-
-void Log::ResetLog()
-{
-	remove(g_pOptions->GetLogFile());
-}
-
-/*
-* During intializing stage (when options were not read yet) all messages
-* are saved in screen log, even if they shouldn't (according to options).
-* Method "InitOptions()" check all messages added to screen log during
-* intializing stage and does three things:
-* 1) save the messages to log-file (if they should according to options);
-* 2) delete messages from screen log (if they should not be saved in screen log).
-* 3) renumerate IDs
-*/
-void Log::InitOptions()
-{
-	const char* szMessageType[] = { "INFO", "WARNING", "ERROR", "DEBUG", "DETAIL"};
-
-	if (g_pOptions->GetCreateLog() && g_pOptions->GetLogFile())
-	{
-		m_szLogFilename = strdup(g_pOptions->GetLogFile());
-#ifdef WIN32
-		WebUtil::Utf8ToAnsi(m_szLogFilename, strlen(m_szLogFilename) + 1);
-#endif
-	}
-
-	m_iIDGen = 0;
-
-	for (unsigned int i = 0; i < m_Messages.size(); )
-	{
-		Message* pMessage = m_Messages.at(i);
-		Options::EMessageTarget eTarget = Options::mtNone;
-		switch (pMessage->GetKind())
-		{
-			case Message::mkDebug:
-				eTarget = g_pOptions->GetDebugTarget();
-				break;
-			case Message::mkDetail:
-				eTarget = g_pOptions->GetDetailTarget();
-				break;
-			case Message::mkInfo:
-				eTarget = g_pOptions->GetInfoTarget();
-				break;
-			case Message::mkWarning:
-				eTarget = g_pOptions->GetWarningTarget();
-				break;
-			case Message::mkError:
-				eTarget = g_pOptions->GetErrorTarget();
-				break;
-		}
-
-		if (eTarget == Options::mtLog || eTarget == Options::mtBoth)
-		{
-			Filelog("%s\t%s", szMessageType[pMessage->GetKind()], pMessage->GetText());
-		}
-
-		if (eTarget == Options::mtLog || eTarget == Options::mtNone)
-		{
-			delete pMessage;
-			m_Messages.erase(m_Messages.begin() + i);
-		}
-		else
-		{
-			pMessage->m_iID = ++m_iIDGen;
-			i++;
-		}
-	}
-}

Log.h

@@ -1,128 +0,0 @@
-/*
- *  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$
- *
- */
-
-
-#ifndef LOG_H
-#define LOG_H
-
-#include <deque>
-#include <time.h>
-
-#include "Thread.h"
-
-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
-	void debug(const char* szFilename, const char* szFuncname, int iLineNr, const char* msg, ...);
-#else
-	void debug(const char* msg, ...);
-#endif
-#endif
-
-class Message
-{
-public:
-	enum EKind
-	{
-		mkInfo,
-	    mkWarning,
-	    mkError,
-	    mkDebug,
-	    mkDetail
-	};
-
-private:
-	unsigned int		m_iID;
-	EKind				m_eKind;
-	time_t				m_tTime;
-	char*				m_szText;
-
-	friend class Log;
-
-public:
-						Message(unsigned int iID, EKind eKind, time_t tTime, const char* szText);
-						~Message();
-	unsigned int		GetID() { return m_iID; }
-	EKind				GetKind() { return m_eKind; }
-	time_t				GetTime() { return m_tTime; }
-	const char*			GetText() { return m_szText; }
-};
-
-class Log
-{
-public:
-	typedef std::deque<Message*>	Messages;
-
-private:
-	Mutex				m_mutexLog;
-	Messages			m_Messages;
-	char*				m_szLogFilename;
-	unsigned int		m_iIDGen;
-#ifdef DEBUG
-	bool				m_bExtraDebug;
-#endif
-
-	void				Filelog(const char* msg, ...);
-	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
-	friend void debug(const char* szFilename, const char* szFuncname, int iLineNr, const char* msg, ...);
-#else	
-	friend void debug(const char* msg, ...);
-#endif
-#endif
-	
-public:
-						Log();
-						~Log();
-	Messages*			LockMessages();
-	void				UnlockMessages();
-	void				Clear();
-	void				ResetLog();
-	void				InitOptions();
-};
-
-#ifdef DEBUG
-#ifdef HAVE_VARIADIC_MACROS
-#define debug(...)   debug(__FILE__, FUNCTION_MACRO_NAME, __LINE__, __VA_ARGS__)
-#endif
-#else
-#define debug(...)   do { } while(0)
-#endif
-
-extern Log* g_pLog;
-
-#endif

Maintenance.cpp

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

Maintenance.h

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

Makefile.am

@@ -1,7 +1,7 @@
 #
-#  This file if part of nzbget
+#  This file is part of nzbget. See <http://nzbget.net>.
 #
-# Copyright (C) 2008-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
+# Copyright (C) 2008-2019 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
@@ -14,85 +14,446 @@
 # 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.
-#
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
 bin_PROGRAMS = nzbget
 
 nzbget_SOURCES = \
-	ArticleDownloader.cpp ArticleDownloader.h BinRpc.cpp BinRpc.h \
-	ColoredFrontend.cpp ColoredFrontend.h Connection.cpp Connection.h Decoder.cpp Decoder.h \
-	DiskState.cpp DiskState.h DownloadInfo.cpp DownloadInfo.h DupeCoordinator.cpp DupeCoordinator.h \
-	Frontend.cpp Frontend.h FeedCoordinator.cpp FeedCoordinator.h FeedFile.cpp FeedFile.h \
-	FeedFilter.cpp FeedFilter.h FeedInfo.cpp FeedInfo.h Log.cpp Log.h LoggableFrontend.cpp \
-	LoggableFrontend.h Maintenance.cpp Maintenance.h MessageBase.h NCursesFrontend.cpp \
-	NCursesFrontend.h NNTPConnection.cpp \
-	NNTPConnection.h NZBFile.cpp NZBFile.h NewsServer.cpp NewsServer.h Observer.cpp \
-	Observer.h Options.cpp Options.h ParChecker.cpp ParChecker.h ParRenamer.cpp ParRenamer.h \
-	ParCoordinator.cpp ParCoordinator.h PrePostProcessor.cpp PrePostProcessor.h QueueCoordinator.cpp \
-	QueueCoordinator.h QueueEditor.cpp QueueEditor.h RemoteClient.cpp RemoteClient.h \
-	RemoteServer.cpp RemoteServer.h Scanner.cpp Scanner.h Scheduler.cpp Scheduler.h ScriptController.cpp \
-	ScriptController.h ServerPool.cpp ServerPool.h svn_version.cpp TLS.cpp TLS.h Thread.cpp Thread.h \
-	Util.cpp Util.h XmlRpc.cpp XmlRpc.h WebDownloader.cpp WebDownloader.h WebServer.cpp WebServer.h \
-	UrlCoordinator.cpp UrlCoordinator.h Unpack.cpp Unpack.h nzbget.cpp nzbget.h
+	daemon/connect/Connection.cpp \
+	daemon/connect/Connection.h \
+	daemon/connect/TlsSocket.cpp \
+	daemon/connect/TlsSocket.h \
+	daemon/connect/WebDownloader.cpp \
+	daemon/connect/WebDownloader.h \
+	daemon/extension/FeedScript.cpp \
+	daemon/extension/FeedScript.h \
+	daemon/extension/CommandScript.cpp \
+	daemon/extension/CommandScript.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/WorkState.cpp \
+	daemon/main/WorkState.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/ParParser.cpp \
+	daemon/postprocess/ParParser.h \
+	daemon/postprocess/ParRenamer.cpp \
+	daemon/postprocess/ParRenamer.h \
+	daemon/postprocess/PrePostProcessor.cpp \
+	daemon/postprocess/PrePostProcessor.h \
+	daemon/postprocess/RarRenamer.cpp \
+	daemon/postprocess/RarRenamer.h \
+	daemon/postprocess/RarReader.cpp \
+	daemon/postprocess/RarReader.h \
+	daemon/postprocess/Rename.cpp \
+	daemon/postprocess/Rename.h \
+	daemon/postprocess/Repair.cpp \
+	daemon/postprocess/Repair.h \
+	daemon/postprocess/Unpack.cpp \
+	daemon/postprocess/Unpack.h \
+	daemon/postprocess/DirectUnpack.cpp \
+	daemon/postprocess/DirectUnpack.h \
+	daemon/queue/DirectRenamer.cpp \
+	daemon/queue/DirectRenamer.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/NString.cpp \
+	daemon/util/NString.h \
+	daemon/util/Container.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/FileSystem.cpp \
+	daemon/util/FileSystem.h \
+	daemon/util/Util.cpp \
+	daemon/util/Util.h \
+	daemon/nserv/NServMain.h \
+	daemon/nserv/NServMain.cpp \
+	daemon/nserv/NServFrontend.h \
+	daemon/nserv/NServFrontend.cpp \
+	daemon/nserv/NntpServer.h \
+	daemon/nserv/NntpServer.cpp \
+	daemon/nserv/NzbGenerator.h \
+	daemon/nserv/NzbGenerator.cpp \
+	daemon/nserv/YEncoder.h \
+	daemon/nserv/YEncoder.cpp \
+	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/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
+
+# Simd decoder and Crc32
+nzbget_SOURCES += \
+	lib/yencode/YEncode.h \
+	lib/yencode/SimdInit.cpp \
+	lib/yencode/SimdDecoder.cpp \
+	lib/yencode/ScalarDecoder.cpp \
+	lib/yencode/Sse2Decoder.cpp \
+	lib/yencode/Ssse3Decoder.cpp \
+	lib/yencode/PclmulCrc.cpp \
+	lib/yencode/NeonDecoder.cpp \
+	lib/yencode/AcleCrc.cpp \
+	lib/yencode/SliceCrc.cpp
+
+lib/yencode/Sse2Decoder.$(OBJEXT) : CXXFLAGS+=$(SSE2_CXXFLAGS)
+lib/yencode/Ssse3Decoder.$(OBJEXT) : CXXFLAGS+=$(SSSE3_CXXFLAGS)
+lib/yencode/PclmulCrc.$(OBJEXT) : CXXFLAGS+=$(PCLMUL_CXXFLAGS)
+lib/yencode/NeonDecoder.$(OBJEXT) : CXXFLAGS+=$(NEON_CXXFLAGS)
+lib/yencode/AcleCrc.$(OBJEXT) : CXXFLAGS+=$(ACLECRC_CXXFLAGS)
+
+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)/daemon/nserv \
+	-I$(srcdir)/lib/par2 \
+	-I$(srcdir)/lib/yencode
+
+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/DupeMatcherTest.cpp \
+	tests/postprocess/RarRenamerTest.cpp \
+	tests/postprocess/RarReaderTest.cpp \
+	tests/postprocess/DirectUnpackTest.cpp \
+	tests/queue/NzbFileTest.cpp \
+	tests/nntp/ServerPoolTest.cpp \
+	tests/util/FileSystemTest.cpp \
+	tests/util/NStringTest.cpp \
+	tests/util/UtilTest.cpp
+
+if WITH_PAR2
+nzbget_SOURCES += \
+	tests/postprocess/ParCheckerTest.cpp \
+	tests/postprocess/ParRenamerTest.cpp
+endif
+
+AM_CPPFLAGS += \
+	-I$(srcdir)/lib/catch \
+	-I$(srcdir)/tests/suite
+endif
 
 EXTRA_DIST = \
-	Makefile.cvs nzbgetd \
-	$(patches_FILES) $(windows_FILES) $(osx_FILES)
-
-patches_FILES = \
-	libpar2-0.2-bugfixes.patch libpar2-0.2-cancel.patch \
-	libpar2-0.2-MSVC8.patch libsigc++-2.0.18-MSVC8.patch
+	$(windows_FILES) \
+	$(osx_FILES) \
+	$(linux_FILES) \
+	$(testdata_FILES) \
+	$(par2doc_FILES)
 
 windows_FILES = \
-	win32.h NTService.cpp NTService.h nzbget.sln nzbget.vcproj nzbget-shell.bat
+	daemon/windows/StdAfx.cpp \
+	daemon/windows/WinService.cpp \
+	daemon/windows/WinService.h \
+	daemon/windows/WinConsole.cpp \
+	daemon/windows/WinConsole.h \
+	nzbget.vcxproj \
+	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/resources/install.bmp \
+	windows/resources/uninstall.bmp \
+	windows/nzbget-setup.nsi
 
 osx_FILES = \
-	osx/App_Prefix.pch osx/NZBGet-Info.plist \
-	osx/DaemonController.h osx/DaemonController.m \
-	osx/MainApp.h osx/MainApp.m osx/MainApp.xib \
-	osx/PFMoveApplication.h osx/PFMoveApplication.m \
-	osx/PreferencesDialog.h osx/PreferencesDialog.m osx/PreferencesDialog.xib \
-	osx/RPC.h osx/RPC.m osx/WebClient.h osx/WebClient.m \
-	osx/WelcomeDialog.h osx/WelcomeDialog.m osx/WelcomeDialog.xib \
+	osx/App_Prefix.pch \
+	osx/NZBGet-Info.plist \
+	osx/DaemonController.h \
+	osx/DaemonController.m \
+	osx/MainApp.h \
+	osx/MainApp.m \
+	osx/MainApp.xib \
+	osx/PFMoveApplication.h \
+	osx/PFMoveApplication.m \
+	osx/PreferencesDialog.h \
+	osx/PreferencesDialog.m \
+	osx/PreferencesDialog.xib \
+	osx/RPC.h \
+	osx/RPC.m \
+	osx/WebClient.h \
+	osx/WebClient.m \
+	osx/WelcomeDialog.h \
+	osx/WelcomeDialog.m \
+	osx/WelcomeDialog.xib \
 	osx/NZBGet.xcodeproj/project.pbxproj \
-	osx/Resources/Images/mainicon.icns osx/Resources/Images/statusicon.png \
-	osx/Resources/Images/statusicon@2x.png osx/Resources/Images/statusicon-inv.png \
-	osx/Resources/Images/statusicon-inv@2x.png osx/Resources/licenses/license-bootstrap.txt \
-	osx/Resources/licenses/license-jquery-GPL.txt osx/Resources/licenses/license-jquery-MIT.txt \
-	osx/Resources/Credits.rtf osx/Resources/Localizable.strings osx/Resources/Welcome.rtf
+	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 \
+	linux/build-toolchain-android \
+	linux/build-toolchain-freebsd
 
 doc_FILES = \
-	README ChangeLog COPYING
+	README \
+	ChangeLog \
+	COPYING
+
+par2doc_FILES = \
+	lib/par2/AUTHORS \
+	lib/par2/README
 
 exampleconf_FILES = \
 	nzbget.conf
 
 webui_FILES = \
-	webui/index.html webui/index.js webui/downloads.js webui/edit.js webui/fasttable.js \
-	webui/history.js webui/messages.js webui/status.js webui/style.css webui/upload.js \
-	webui/util.js webui/config.js webui/feed.js \
-	webui/lib/bootstrap.js webui/lib/bootstrap.min.js webui/lib/bootstrap.css  \
-	webui/lib/jquery.js webui/lib/jquery.min.js \
-	webui/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
+	webui/index.html \
+	webui/index.js \
+	webui/downloads.js \
+	webui/edit.js \
+	webui/fasttable.js \
+	webui/history.js \
+	webui/messages.js \
+	webui/status.js \
+	webui/style.css \
+	webui/upload.js \
+	webui/util.js \
+	webui/config.js \
+	webui/feed.js \
+	webui/lib/bootstrap.js \
+	webui/lib/bootstrap.min.js \
+	webui/lib/bootstrap.css  \
+	webui/lib/jquery.js \
+	webui/lib/jquery.min.js \
+	webui/lib/raphael.js \
+	webui/lib/raphael.min.js \
+	webui/lib/elycharts.js \
+	webui/lib/elycharts.min.js \
+	webui/img/icons.png \
+	webui/img/icons-2x.png \
+	webui/img/transmit.gif \
+	webui/img/transmit-file.gif \
+	webui/img/favicon.ico \
+	webui/img/download-anim-green-2x.png \
+	webui/img/download-anim-orange-2x.png \
+	webui/img/transmit-reload-2x.gif \
+	webui/img/favicon-256x256-opaque.png \
+	webui/img/favicon-256x256.png
 
-ppscripts_FILES = \
-	ppscripts/EMail.py ppscripts/Logger.py
+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 \
+	tests/testdata/parchecker2/crc.txt \
+	tests/testdata/parchecker2/testfile.7z.001 \
+	tests/testdata/parchecker2/testfile.7z.002 \
+	tests/testdata/parchecker2/testfile.7z.003 \
+	tests/testdata/parchecker2/testfile.7z.par2 \
+	tests/testdata/parchecker2/testfile.7z.vol0+1.PAR2 \
+	tests/testdata/parchecker2/testfile.7z.vol1+2.PAR2 \
+	tests/testdata/parchecker2/testfile.7z.vol3+3.PAR2 \
+	tests/testdata/rarrenamer/testfile3.part01.rar \
+	tests/testdata/rarrenamer/testfile3.part02.rar \
+	tests/testdata/rarrenamer/testfile3.part03.rar \
+	tests/testdata/rarrenamer/testfile5.part01.rar \
+	tests/testdata/rarrenamer/testfile5.part02.rar \
+	tests/testdata/rarrenamer/testfile5.part03.rar \
+	tests/testdata/rarrenamer/testfile3oldnam.rar \
+	tests/testdata/rarrenamer/testfile3oldnam.r00 \
+	tests/testdata/rarrenamer/testfile3oldnam.r01 \
+	tests/testdata/rarrenamer/testfile3encdata.part01.rar \
+	tests/testdata/rarrenamer/testfile3encdata.part02.rar \
+	tests/testdata/rarrenamer/testfile3encdata.part03.rar \
+	tests/testdata/rarrenamer/testfile3encnam.part01.rar \
+	tests/testdata/rarrenamer/testfile3encnam.part02.rar \
+	tests/testdata/rarrenamer/testfile3encnam.part03.rar \
+	tests/testdata/rarrenamer/testfile5encdata.part01.rar \
+	tests/testdata/rarrenamer/testfile5encdata.part02.rar \
+	tests/testdata/rarrenamer/testfile5encdata.part03.rar \
+	tests/testdata/rarrenamer/testfile5encnam.part01.rar \
+	tests/testdata/rarrenamer/testfile5encnam.part02.rar \
+	tests/testdata/rarrenamer/testfile5encnam.part03.rar
 
 # Install
-sbin_SCRIPTS = nzbgetd
 dist_doc_DATA = $(doc_FILES)
 exampleconfdir = $(datadir)/nzbget
 dist_exampleconf_DATA = $(exampleconf_FILES)
 webuidir = $(datadir)/nzbget
 nobase_dist_webui_DATA = $(webui_FILES)
-ppscriptsdir = $(datadir)/nzbget
-nobase_dist_ppscripts_SCRIPTS = $(ppscripts_FILES)
+scriptsdir = $(datadir)/nzbget
+nobase_dist_scripts_SCRIPTS = $(scripts_FILES)
 
 # Note about "sed": 
 # We need to make some changes in installed files.
@@ -103,13 +464,6 @@ nobase_dist_ppscripts_SCRIPTS = $(ppscripts_FILES)
 # 3) delete original.temp
 # These steps ensure that the output file has the same permissions as the original file.
 
-# Configure installed script
-install-exec-hook:
-	rm -f "$(DESTDIR)$(sbindir)/nzbgetd.temp"
-	cp "$(DESTDIR)$(sbindir)/nzbgetd" "$(DESTDIR)$(sbindir)/nzbgetd.temp"
-	sed 's?/usr/local/bin?$(bindir)?' < "$(DESTDIR)$(sbindir)/nzbgetd.temp" > "$(DESTDIR)$(sbindir)/nzbgetd"
-	rm "$(DESTDIR)$(sbindir)/nzbgetd.temp"
-
 # Prepare example configuration file
 install-data-hook:
 	rm -f "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
@@ -118,7 +472,7 @@ install-data-hook:
 	sed 's:configuration file (typically installed:configuration file (installed:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
 	sed 's:/usr/local/share/nzbget/nzbget.conf):$(exampleconfdir)/nzbget.conf):' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
 	sed 's:^WebDir=:WebDir=$(webuidir)/webui:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
-	sed 's:typically installed to /usr/local/share/nzbget/ppscripts:installed to $(ppscriptsdir)/ppscripts:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
+	sed 's:typically installed to /usr/local/share/nzbget/scripts:installed to $(scriptsdir)/scripts:' < "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp" > "$(DESTDIR)$(exampleconfdir)/nzbget.conf"
 	rm "$(DESTDIR)$(exampleconfdir)/nzbget.conf.temp"
 
 # Install configuration files into /etc
@@ -132,44 +486,59 @@ install-conf:
 uninstall-conf:
 	rm -f "$(DESTDIR)$(sysconfdir)/nzbget.conf"
 
-# Determining subversion revision:
-# 1) If directory ".svn" exists we take revision from it using program svnversion (part of subversion package)
+# Determining git revision:
+# 1) If directory ".git" exists we take revision from git log.
 #    File is recreated only if revision number was changed.
-# 2) If directory ".svn" doesn't exists we keep and reuse file "svn_version.cpp",
+# 2) If directory ".git" doesn't exists we keep and reuse file "code_revision.cpp",
 #    which was possibly created early.
-# 3) If neither directory ".svn" nor file "svn_version.cpp" are available
-#    we create new file "svn_version.c" with empty revision number.
-svn_version.cpp: FORCE
-	@ if test -d ./.svn ; then \
-		V="$(shell svnversion -n .)"; \
-		H="$(shell test -f ./svn_version.cpp && head -n 1 svn_version.cpp)"; \
+# 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=`git branch | sed -n -e 's/^\* \(.*\)/\1/p'`; \
+		M=`git status --porcelain` ; \
+		if test "$$M" != "" ; then \
+			M="M" ; \
+		fi ; \
+		if test "$$B" = "master" ; then \
+			V="$$M" ; \
+		elif test "$$B" = "develop" ; then \
+			V=`git rev-list HEAD | wc -l | xargs` ; \
+			V="$${V}$$M" ; \
+		else \
+			V=`git rev-list HEAD | wc -l | xargs` ; \
+			V="$${V}$$M ($$B)" ; \
+		fi ; \
+		H=`test -f ./code_revision.cpp && head -n 1 code_revision.cpp`; \
 		if test "/* $$V */" != "$$H" ; then \
 			( \
 			echo "/* $$V */" ;\
 			echo "/* This file is automatically regenerated on each build. Do not edit it. */" ;\
-			echo "const char* svn_version(void)" ;\
+			echo "#include \"nzbget.h\"" ;\
+			echo "const char* code_revision(void)" ;\
 			echo "{" ;\
-			echo "	const char* SVN_Version = \"$$V\";" ;\
-			echo "	return SVN_Version;" ;\
+			echo "	const char* revision = \"$$V\";" ;\
+			echo "	return revision;" ;\
 			echo "}" ;\
-			) > svn_version.cpp ; \
+			) > code_revision.cpp ; \
 		fi \
-	elif test -f ./svn_version.cpp ; then \
+	elif test -f ./code_revision.cpp ; then \
 		test "ok, reuse existing file"; \
 	else \
 		( \
 		echo "/*  */" ;\
 		echo "/* This file is automatically regenerated on each build. Do not edit it. */" ;\
-		echo "const char* svn_version(void)" ;\
+		echo "#include \"nzbget.h\"" ;\
+		echo "const char* code_revision(void)" ;\
 		echo "{" ;\
-		echo "	const char* SVN_Version = \"\";" ;\
-		echo "	return SVN_Version;" ;\
+		echo "	const char* revision = \"\";" ;\
+		echo "	return revision;" ;\
 		echo "}" ;\
-		) > svn_version.cpp ; \
+		) > code_revision.cpp ; \
 	fi
 FORCE:
 
-# Ignore "svn_version.cpp" in distcleancheck
+# Ignore "code_revision.cpp" in distcleancheck
 distcleancheck_listfiles = \
 	find . -type f -exec sh -c 'test -f $(srcdir)/$$1 || echo $$1' \
 	sh '{}' ';'
@@ -178,6 +547,8 @@ clean-bak: rm *~
 
 # Fix premissions
 dist-hook:
-	chmod -x $(distdir)/*.cpp $(distdir)/*.h
+	find $(distdir)/daemon -type f -print -exec chmod -x {} \;
 	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

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

MessageBase.h

@@ -1,566 +0,0 @@
-/*
- *  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>
- *
- *  This 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 MESSAGEBASE_H
-#define MESSAGEBASE_H
-
-static const int32_t NZBMESSAGE_SIGNATURE = 0x6E7A621B; // = "nzb-XX" (protocol version)
-static const int NZBREQUESTFILENAMESIZE = 512;
-static const int NZBREQUESTPASSWORDSIZE = 32;
-
-/**
- * NZBGet communication protocol uses only two basic data types: integer and char.
- * Integer values are passed using network byte order (Big-Endian).
- * Use function "htonl" and "ntohl" to convert integers to/from machine 
- * (host) byte order.
- * All char-strings ends with NULL-char.
- *
- * NOTE: 
- * NZBGet communication protocol is intended for usage only by NZBGet itself.
- * The communication works only if server and client has the same version.
- * The compatibility with previous program versions is not provided.
- * Third-party programs should use JSON-RPC or XML-RPC to communicate with NZBGet.
- */
-
-// Possible values for field "m_iType" of struct "SNZBRequestBase":
-enum eRemoteRequest
-{
-	eRemoteRequestDownload = 1,
-	eRemoteRequestPauseUnpause,
-	eRemoteRequestList,
-	eRemoteRequestSetDownloadRate,
-	eRemoteRequestDumpDebug,
-	eRemoteRequestEditQueue,
-	eRemoteRequestLog,
-	eRemoteRequestShutdown,
-	eRemoteRequestReload,
-	eRemoteRequestVersion,
-	eRemoteRequestPostQueue,
-	eRemoteRequestWriteLog,
-	eRemoteRequestScan,
-	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)
-	eRemoteEditActionFileSplit,				// split - create new group from selected files
-	eRemoteEditActionGroupMoveOffset,		// move group to m_iOffset relative to the current position in download-queue
-	eRemoteEditActionGroupMoveTop,			// move group to the top of download-queue
-	eRemoteEditActionGroupMoveBottom,		// move group to the bottom of download-queue
-	eRemoteEditActionGroupPause,			// pause group
-	eRemoteEditActionGroupResume,			// resume (unpause) group
-	eRemoteEditActionGroupDelete,			// delete group
-	eRemoteEditActionGroupDupeDelete,		// delete group
-	eRemoteEditActionGroupFinalDelete,		// delete group
-	eRemoteEditActionGroupPauseAllPars,		// pause only (all) pars (does not affect other files) in group
-	eRemoteEditActionGroupPauseExtraPars,	// pause only (almost all) pars in group, except main par-file (does not affect other files)
-	eRemoteEditActionGroupSetPriority,		// set priority for groups
-	eRemoteEditActionGroupSetCategory,		// set or change category for a group
-	eRemoteEditActionGroupMerge,			// merge group
-	eRemoteEditActionGroupSetParameter,		// set post-process parameter for group
-	eRemoteEditActionGroupSetName,			// set group name (rename group)
-	eRemoteEditActionGroupSetDupeKey,		// (reserved)
-	eRemoteEditActionGroupSetDupeScore,		// (reserved)
-	eRemoteEditActionGroupSetDupeMode,		// (reserved)
-	eRemoteEditActionPostMoveOffset = 51,	// move post-job to m_iOffset relative to the current position in post-queue
-	eRemoteEditActionPostMoveTop,			// move post-job to the top of post-queue
-	eRemoteEditActionPostMoveBottom,		// move post-job to the bottom of post-queue
-	eRemoteEditActionPostDelete,			// delete post-job
-	eRemoteEditActionHistoryDelete,			// hide history-item
-	eRemoteEditActionHistoryFinalDelete,	// delete history-item
-	eRemoteEditActionHistoryReturn,			// move history-item back to download queue
-	eRemoteEditActionHistoryProcess,		// move history-item back to download queue and start postprocessing
-	eRemoteEditActionHistoryRedownload,		// move history-item back to download queue for redownload
-	eRemoteEditActionHistorySetParameter,	// set post-process parameter for history-item
-	eRemoteEditActionHistorySetDupeKey,		// (reserved)
-	eRemoteEditActionHistorySetDupeScore,	// (reserved)
-	eRemoteEditActionHistorySetDupeMode,	// (reserved)
-	eRemoteEditActionHistorySetDupeBackup,	// (reserved)
-	eRemoteEditActionHistoryMarkBad,		// mark history-item as bad (and download other duplicate)
-	eRemoteEditActionHistoryMarkGood		// mark history-item as good (and push it into dup-history)
-};
-
-// Possible values for field "m_iAction" of struct "SNZBPauseUnpauseRequest":
-enum eRemotePauseUnpauseAction
-{
-	eRemotePauseUnpauseActionDownload = 1,	// pause/unpause download queue
-	eRemotePauseUnpauseActionDownload2,		// pause/unpause download queue (second pause-register)
-	eRemotePauseUnpauseActionPostProcess,	// pause/unpause post-processor queue
-	eRemotePauseUnpauseActionScan			// pause/unpause scan of incoming nzb-directory
-};
-
-// Possible values for field "m_iMatchMode" of struct "SNZBEditQueueRequest":
-enum eRemoteMatchMode
-{
-	eRemoteMatchModeID = 1,				// ID
-	eRemoteMatchModeName,				// Name
-	eRemoteMatchModeRegEx,				// RegEx
-};
-
-// The basic SNZBRequestBase struct, used in all requests
-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
-};
-
-// The basic SNZBResposneBase struct, used in all responses
-struct SNZBResponseBase
-{
-	int32_t					m_iSignature;			// Signature must be NZBMESSAGE_SIGNATURE in integer-value
-	int32_t					m_iStructSize;			// Size of the entire struct
-};
-
-// A download request
-struct SNZBDownloadRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	char					m_szFilename[NZBREQUESTFILENAMESIZE];	// Name of nzb-file, may contain full path (local path on client) or only filename
-	char					m_szCategory[NZBREQUESTFILENAMESIZE];	// Category, can be empty
-	int32_t					m_bAddFirst;			// 1 - add file to the top of download queue
-	int32_t					m_bAddPaused;			// 1 - pause added files
-	int32_t					m_iPriority;			// Priority for files (0 - default)
-	int32_t					m_iTrailingDataLength;	// Length of nzb-file in bytes
-	//char					m_szContent[m_iTrailingDataLength];	// variable sized
-};
-
-// A download response
-struct SNZBDownloadResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bSuccess;				// 0 - command failed, 1 - command executed successfully
-	int32_t					m_iTrailingDataLength;	// Length of Text-string (m_szText), following to this record
-	//char					m_szText[m_iTrailingDataLength];	// variable sized
-};
-
-// A list and status request
-struct SNZBListRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bFileList;			// 1 - return file list
-	int32_t					m_bServerState;			// 1 - return server state
-	int32_t					m_iMatchMode;			// File/Group match mode, see enum eRemoteMatchMode (only values eRemoteMatchModeID (no filter) and eRemoteMatchModeRegEx are allowed)
-	int32_t					m_bMatchGroup;			// 0 - match files; 1 - match nzbs (when m_iMatchMode == eRemoteMatchModeRegEx)
-	char					m_szPattern[NZBREQUESTFILENAMESIZE];	// RegEx Pattern (when m_iMatchMode == eRemoteMatchModeRegEx)
-};
-
-// A list response
-struct SNZBListResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iEntrySize;			// Size of the SNZBListResponseEntry-struct
-	int32_t 				m_iRemainingSizeLo;		// Remaining size in bytes, Low 32-bits of 64-bit value
-	int32_t 				m_iRemainingSizeHi;		// Remaining size in bytes, High 32-bits of 64-bit value
-	int32_t					m_iDownloadRate;		// Current download speed, in Bytes pro Second
-	int32_t					m_iDownloadLimit;		// Current download limit, in Bytes pro Second
-	int32_t					m_bDownloadPaused;		// 1 - download queue is currently in paused-state
-	int32_t					m_bDownload2Paused;		// 1 - download queue is currently in paused-state (second pause-register)
-	int32_t					m_bDownloadStandBy;		// 0 - there are currently downloads running, 1 - no downloads in progress (download queue paused or all download jobs completed)
-	int32_t					m_bPostPaused;			// 1 - post-processor queue is currently in paused-state
-	int32_t					m_bScanPaused;			// 1 - scaning of incoming directory is currently in paused-state
-	int32_t					m_iThreadCount;			// Number of threads running
-	int32_t					m_iPostJobCount;		// Number of jobs in post-processor queue (including current job)
-	int32_t					m_iUpTimeSec;			// Server up time in seconds
-	int32_t					m_iDownloadTimeSec;		// Server download time in seconds (up_time - standby_time)
-	int32_t					m_iDownloadedBytesLo;	// Amount of data downloaded since server start, Low 32-bits of 64-bit value
-	int32_t					m_iDownloadedBytesHi;	// Amount of data downloaded since server start, High 32-bits of 64-bit value
-	int32_t					m_bRegExValid;			// 0 - error in RegEx-pattern, 1 - RegEx-pattern is valid (only when Request has eRemoteMatchModeRegEx)
-	int32_t					m_iNrTrailingNZBEntries;	// Number of List-NZB-entries, following to this structure
-	int32_t					m_iNrTrailingPPPEntries;	// Number of List-PPP-entries, following to this structure
-	int32_t					m_iNrTrailingFileEntries;	// Number of List-File-entries, following to this structure
-	int32_t					m_iTrailingDataLength;		// Length of all List-entries, following to this structure
-	// SNZBListResponseEntry m_NZBEntries[m_iNrTrailingNZBEntries]			// variable sized
-	// SNZBListResponseEntry m_PPPEntries[m_iNrTrailingPPPEntries]			// variable sized
-	// SNZBListResponseEntry m_FileEntries[m_iNrTrailingFileEntries]		// variable sized
-};
-
-// A list response nzb entry
-struct SNZBListResponseNZBEntry
-{
-	int32_t					m_iSizeLo;				// Size of all files in bytes, Low 32-bits of 64-bit value
-	int32_t					m_iSizeHi;				// Size of all files in bytes, High 32-bits of 64-bit value
-	int32_t					m_bMatch;				// 1 - group matches the pattern (only when Request has eRemoteMatchModeRegEx)
-	int32_t					m_iFilenameLen;			// Length of Filename-string (m_szFilename), following to this record
-	int32_t					m_iNameLen;				// Length of Name-string (m_szName), following to this record
-	int32_t					m_iDestDirLen;			// Length of DestDir-string (m_szDestDir), following to this record
-	int32_t					m_iCategoryLen;			// Length of Category-string (m_szCategory), following to this record
-	int32_t					m_iQueuedFilenameLen;	// Length of queued file name (m_szQueuedFilename), following to this record
-	//char					m_szFilename[m_iFilenameLen];				// variable sized
-	//char					m_szName[m_iNameLen];						// variable sized
-	//char					m_szDestDir[m_iDestDirLen];					// variable sized
-	//char					m_szCategory[m_iCategoryLen];				// variable sized
-	//char					m_szQueuedFilename[m_iQueuedFilenameLen];	// variable sized
-};
-
-// A list response pp-parameter entry
-struct SNZBListResponsePPPEntry
-{
-	int32_t					m_iNZBIndex;			// Index of NZB-Entry in m_NZBEntries-list
-	int32_t					m_iNameLen;				// Length of Name-string (m_szName), following to this record
-	int32_t					m_iValueLen;			// Length of Value-string (m_szValue), following to this record
-	//char					m_szName[m_iNameLen];	// variable sized
-	//char					m_szValue[m_iValueLen];	// variable sized
-};
-
-// A list response file entry
-struct SNZBListResponseFileEntry
-{
-	int32_t					m_iID;					// Entry-ID
-	int32_t					m_iNZBIndex;			// Index of NZB-Entry in m_NZBEntries-list
-	int32_t					m_iFileSizeLo;			// Filesize in bytes, Low 32-bits of 64-bit value
-	int32_t					m_iFileSizeHi;			// Filesize in bytes, High 32-bits of 64-bit value
-	int32_t					m_iRemainingSizeLo;		// Remaining size in bytes, Low 32-bits of 64-bit value
-	int32_t					m_iRemainingSizeHi;		// Remaining size in bytes, High 32-bits of 64-bit value
-	int32_t					m_bPaused;				// 1 - file is paused
-	int32_t					m_bFilenameConfirmed;	// 1 - Filename confirmed (read from article body), 0 - Filename parsed from subject (can be changed after reading of article)
-	int32_t					m_iPriority;			// Download priority
-	int32_t					m_iActiveDownloads;		// Number of active downloads for this file
-	int32_t					m_bMatch;				// 1 - file matches the pattern (only when Request has eRemoteMatchModeRegEx)
-	int32_t					m_iSubjectLen;			// Length of Subject-string (m_szSubject), following to this record
-	int32_t					m_iFilenameLen;			// Length of Filename-string (m_szFilename), following to this record
-	//char					m_szSubject[m_iSubjectLen];			// variable sized
-	//char					m_szFilename[m_iFilenameLen];		// variable sized
-};
-
-// A log request
-struct SNZBLogRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iIDFrom;				// Only one of these two parameters
-	int32_t					m_iLines;				// can be set. The another one must be set to "0".
-};
-
-// A log response
-struct SNZBLogResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iEntrySize;			// Size of the SNZBLogResponseEntry-struct
-	int32_t					m_iNrTrailingEntries;	// Number of Log-entries, following to this structure
-	int32_t					m_iTrailingDataLength;	// Length of all Log-entries, following to this structure
-	// SNZBLogResponseEntry m_Entries[m_iNrTrailingEntries]	// variable sized
-};
-
-// A log response entry
-struct SNZBLogResponseEntry
-{
-	int32_t					m_iID;					// ID of Log-entry
-	int32_t					m_iKind;				// see Message::Kind in "Log.h"
-	int32_t					m_tTime;				// time since the Epoch (00:00:00 UTC, January 1, 1970), measured in seconds.
-	int32_t					m_iTextLen;				// Length of Text-string (m_szText), following to this record
-	//char					m_szText[m_iTextLen];	// variable sized
-};
-
-// A Pause/Unpause request
-struct SNZBPauseUnpauseRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bPause;				// 1 - server must be paused, 0 - server must be unpaused
-	int32_t					m_iAction;				// Action to be executed, see enum eRemotePauseUnpauseAction
-};
-
-// A Pause/Unpause response
-struct SNZBPauseUnpauseResponse
-{
-	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
-};
-
-// Request setting the download rate
-struct SNZBSetDownloadRateRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iDownloadRate;		// Speed limit, in Bytes pro Second
-};
-
-// A setting download rate response
-struct SNZBSetDownloadRateResponse
-{
-	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
-};
-
-// edit queue request
-struct SNZBEditQueueRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iAction;				// Action to be executed, see enum eRemoteEditAction
-	int32_t					m_iOffset;				// Offset to move (for m_iAction = 0)
-	int32_t					m_bSmartOrder;			// For Move-Actions: 0 - execute action for each ID in order they are placed in array;
-													// 1 - smart execute to ensure that the relative order of all affected IDs are not changed.
-	int32_t					m_iMatchMode;				// File/Group match mode, see enum eRemoteMatchMode
-	int32_t					m_iNrTrailingIDEntries;		// Number of ID-entries, following to this structure
-	int32_t					m_iNrTrailingNameEntries;	// Number of Name-entries, following to this structure
-	int32_t					m_iTrailingNameEntriesLen;	// Length of all Name-entries, following to this structure
-	int32_t					m_iTextLen;					// Length of Text-string (m_szText), following to this record
-	int32_t					m_iTrailingDataLength;		// Length of Text-string and all ID-entries, following to this structure
-	//char					m_szText[m_iTextLen];		// variable sized
-	//int32_t				m_iIDs[m_iNrTrailingIDEntries];			// variable sized array of IDs. For File-Actions - ID of file, for Group-Actions - ID of any file belonging to group
-	//char*					m_szNames[m_iNrTrailingNameEntries];	// variable sized array of strings. For File-Actions - name of file incl. nzb-name as path, for Group-Actions - name of group
-};
-
-// An edit queue response
-struct SNZBEditQueueResponse
-{
-	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
-};
-
-// Request dumping of debug info
-struct SNZBDumpDebugRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-};
-
-// Dumping of debug response
-struct SNZBDumpDebugResponse
-{
-	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
-};
-
-// Shutdown server request
-struct SNZBShutdownRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-};
-
-// Shutdown server response
-struct SNZBShutdownResponse
-{
-	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
-};
-
-// Reload server request
-struct SNZBReloadRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-};
-
-// Reload server response
-struct SNZBReloadResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bSuccess;				// 0 - command failed, 1 - command executed successfully
-	int32_t					m_iTrailingDataLength;	// Length of Text-string (m_szText), following to this record
-	//char					m_szText[m_iTrailingDataLength];	// variable sized
-};
-
-// Server version request
-struct SNZBVersionRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-};
-
-// Server version  response
-struct SNZBVersionResponse
-{
-	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
-};
-
-// PostQueue request
-struct SNZBPostQueueRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-};
-
-// A PostQueue response
-struct SNZBPostQueueResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iEntrySize;			// Size of the SNZBPostQueueResponseEntry-struct
-	int32_t					m_iNrTrailingEntries;	// Number of PostQueue-entries, following to this structure
-	int32_t					m_iTrailingDataLength;	// Length of all PostQueue-entries, following to this structure
-	// SNZBPostQueueResponseEntry m_Entries[m_iNrTrailingEntries]		// variable sized
-};
-
-// A PostQueue response entry
-struct SNZBPostQueueResponseEntry
-{
-	int32_t					m_iID;					// ID of Post-entry
-	int32_t					m_iStage;				// See PrePostProcessor::EPostJobStage
-	int32_t					m_iStageProgress;		// Progress of current stage, value in range 0..1000
-	int32_t					m_iFileProgress;		// Progress of current file, value in range 0..1000
-	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_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_szInfoName[m_iInfoNameLen];			// variable sized
-	//char					m_szDestDir[m_iDestDirLen];				// variable sized
-	//char					m_szProgressLabel[m_iProgressLabelLen];	// variable sized
-};
-
-// Write log request
-struct SNZBWriteLogRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iKind;				// see Message::Kind in "Log.h"
-	int32_t					m_iTrailingDataLength;	// Length of nzb-file in bytes
-	//char					m_szText[m_iTrailingDataLength];	// variable sized
-};
-
-// Write log response
-struct SNZBWriteLogResponse
-{
-	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
-};
-
-// Scan nzb directory request
-struct SNZBScanRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bSyncMode;			// 0 - asynchronous Scan (the command returns immediately), 1 - synchronous Scan (the command returns when the scan is completed)
-};
-
-// Scan nzb directory response
-struct SNZBScanResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bSuccess;				// 0 - command failed, 1 - command executed successfully
-	int32_t					m_iTrailingDataLength;	// Length of Text-string (m_szText), following to this record
-	//char					m_szText[m_iTrailingDataLength];	// variable sized
-};
-
-// A history request
-struct SNZBHistoryRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-};
-
-// history response
-struct SNZBHistoryResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iEntrySize;			// Size of the SNZBHistoryResponseEntry-struct
-	int32_t					m_iNrTrailingEntries;	// Number of History-entries, following to this structure
-	int32_t					m_iTrailingDataLength;	// Length of all History-entries, following to this structure
-	// SNZBHistoryResponseEntry m_Entries[m_iNrTrailingEntries]			// variable sized
-};
-
-// history entry
-struct SNZBHistoryResponseEntry
-{
-	int32_t					m_iID;					// History-ID
-	int32_t					m_iKind;				// Kind of Item: 1 - Collection (NZB), 2 - URL
-	int32_t					m_tTime;				// When the item was added to history. time since the Epoch (00:00:00 UTC, January 1, 1970), measured in seconds.
-	int32_t					m_iNicenameLen;			// Length of Nicename-string (m_szNicename), following to this record
-	// for Collection items (m_iKind = 1)
-	int32_t					m_iSizeLo;				// Size of all files in bytes, Low 32-bits of 64-bit value
-	int32_t					m_iSizeHi;				// Size of all files in bytes, High 32-bits of 64-bit value
-	int32_t					m_iFileCount;			// Initial number of files included in NZB-file
-	int32_t					m_iParStatus;			// See NZBInfo::EParStatus
-	int32_t					m_iScriptStatus;		// See NZBInfo::EScriptStatus
-	// for URL items (m_iKind = 2)
-	int32_t					m_iUrlStatus;			// See UrlInfo::EStatus
-	// trailing data
-	//char					m_szNicename[m_iNicenameLen];				// variable sized
-};
-
-// download url request
-struct SNZBDownloadUrlRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	char					m_szURL[NZBREQUESTFILENAMESIZE];		// url to nzb-file
-	char					m_szNZBFilename[NZBREQUESTFILENAMESIZE];// Name of nzb-file. Can be empty, then the filename is read from URL download response
-	char					m_szCategory[NZBREQUESTFILENAMESIZE];	// Category, can be empty
-	int32_t					m_bAddFirst;							// 1 - add url to the top of download queue
-	int32_t					m_bAddPaused;							// 1 - pause added files
-	int32_t					m_iPriority;							// Priority for files (0 - default)
-};
-
-// download url response
-struct SNZBDownloadUrlResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bSuccess;				// 0 - command failed, 1 - command executed successfully
-	int32_t					m_iTrailingDataLength;	// Length of Text-string (m_szText), following to this record
-	//char					m_szText[m_iTrailingDataLength];	// variable sized
-};
-
-// UrlQueue request
-struct SNZBUrlQueueRequest
-{
-	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-};
-
-// UrlQueue response
-struct SNZBUrlQueueResponse
-{
-	SNZBResponseBase		m_MessageBase;			// Must be the first in the struct
-	int32_t					m_iEntrySize;			// Size of the SNZBUrlQueueResponseEntry-struct
-	int32_t					m_iNrTrailingEntries;	// Number of UrlQueue-entries, following to this structure
-	int32_t					m_iTrailingDataLength;	// Length of all UrlQueue-entries, following to this structure
-	// SNZBUrlQueueResponseEntry m_Entries[m_iNrTrailingEntries]		// variable sized
-};
-
-// UrlQueue response entry
-struct SNZBUrlQueueResponseEntry
-{
-	int32_t					m_iID;					// ID of Url-entry
-	int32_t					m_iURLLen;				// Length of URL-string (m_szURL), following to this record
-	int32_t					m_iNZBFilenameLen;		// Length of NZBFilename-string (m_szNZBFilename), following to this record
-	//char					m_szURL[m_iURLLen];					// variable sized
-	//char					m_szNZBFilename[m_iNZBFilenameLen];	// variable sized
-};
-
-#endif

NCursesFrontend.h

@@ -1,130 +0,0 @@
-/*
- *  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$
- *
- */
-
-
-#ifndef NCURSESFRONTEND_H
-#define NCURSESFRONTEND_H
-
-#ifndef DISABLE_CURSES
-
-#include <vector>
-#include <time.h>
-
-#include "Frontend.h"
-#include "Log.h"
-#include "DownloadInfo.h"
-
-class NCursesFrontend : public Frontend
-{
-private:
-
-	enum EInputMode
-	{
-	    eNormal,
-	    eEditQueue,
-	    eDownloadRate
-	};
-
-	bool				m_bUseColor;
-	int					m_iDataUpdatePos;
-    bool				m_bUpdateNextTime;
-	int					m_iScreenHeight;
-	int					m_iScreenWidth;
-	int					m_iQueueWinTop;
-	int					m_iQueueWinHeight;
-	int					m_iQueueWinClientHeight;
-	int					m_iMessagesWinTop;
-	int					m_iMessagesWinHeight;
-	int					m_iMessagesWinClientHeight;
-	int					m_iSelectedQueueEntry;
-	int					m_iLastEditEntry;
-	bool				m_bLastPausePars;
-	int					m_iQueueScrollOffset;
-	GroupQueue			m_groupQueue;
-	char*				m_szHint;
-	time_t				m_tStartHint;
-	int					m_iColWidthFiles;
-	int					m_iColWidthTotal;
-	int					m_iColWidthLeft;
-
-	// Inputting numbers
-	int					m_iInputNumberIndex;
-	int					m_iInputValue;
-
-#ifdef WIN32
-	CHAR_INFO*			m_pScreenBuffer;
-	CHAR_INFO*			m_pOldScreenBuffer;
-	int					m_iScreenBufferSize;
-	std::vector<WORD>	m_ColorAttr;
-#else
-	void* 				m_pWindow;  //  WINDOW*
-#endif
-
-	EInputMode			m_eInputMode;
-	bool				m_bShowNZBname;
-	bool				m_bShowTimestamp;
-	bool				m_bGroupFiles;
-	float				m_QueueWindowPercentage;
-
-#ifdef WIN32
-	void			init_pair(int iColorNumber, WORD wForeColor, WORD wBackColor);
-#endif
-	void			PlotLine(const char * szString, int iRow, int iPos, int iColorPair);
-	void			PlotText(const char * szString, int iRow, int iPos, int iColorPair, bool bBlink);
-	void			PrintMessages();
-	void			PrintQueue();
-	void			PrintFileQueue();
-	void			PrintFilename(FileInfo* pFileInfo, int iRow, bool bSelected);
-	void			PrintGroupQueue();
-	void			ResetColWidths();
-	void			PrintGroupname(GroupInfo * pGroupInfo, int iRow, bool bSelected, bool bCalcColWidth);
-	void			PrepareGroupQueue();
-	void			PrintTopHeader(char* szHeader, int iLineNr, bool bUpTime);
-	void			ClearGroupQueue();
-	int				PrintMessage(Message* Msg, int iRow, int iMaxLines);
-	void			PrintKeyInputBar();
-	void 			PrintStatus();
-	void			UpdateInput(int initialKey);
-	void			Update(int iKey);
-	void			SetCurrentQueueEntry(int iEntry);
-	void			CalcWindowSizes();
-	void			RefreshScreen();
-	int				ReadConsoleKey();
-	int				CalcQueueSize();
-	void			NeedUpdateData();
-	bool			EditQueue(QueueEditor::EEditAction eAction, int iOffset);
-	void			SetHint(const char* szHint);
-
-protected:
-	virtual void 	Run();
-
-public:
-					NCursesFrontend();
-	virtual			~NCursesFrontend();
-};
-
-#endif
-
-#endif

NNTPConnection.cpp

@@ -1,281 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#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 "nzbget.h"
-#include "Log.h"
-#include "NNTPConnection.h"
-#include "Connection.h"
-#include "NewsServer.h"
-
-static const int CONNECTION_LINEBUFFER_SIZE = 1024*10;
-
-NNTPConnection::NNTPConnection(NewsServer* pNewsServer) : Connection(pNewsServer->GetHost(), pNewsServer->GetPort(), pNewsServer->GetTLS())
-{
-	m_pNewsServer = pNewsServer;
-	m_szActiveGroup = NULL;
-	m_szLineBuf = (char*)malloc(CONNECTION_LINEBUFFER_SIZE);
-	m_bAuthError = false;
-	SetCipher(pNewsServer->GetCipher());
-}
-
-NNTPConnection::~NNTPConnection()
-{
-	free(m_szActiveGroup);
-	free(m_szLineBuf);
-}
-
-const char* NNTPConnection::Request(const char* req)
-{
-	if (!req)
-	{
-		return NULL;
-	}
-
-	m_bAuthError = false;
-
-	WriteLine(req);
-
-	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
-
-	if (!answer)
-	{
-		return NULL;
-	}
-
-	if (!strncmp(answer, "480", 3))
-	{
-		debug("%s requested authorization", GetHost());
-
-		if (!Authenticate())
-		{
-			return NULL;
-		}
-
-		//try again
-		WriteLine(req);
-		answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
-	}
-
-	return answer;
-}
-
-bool NNTPConnection::Authenticate()
-{
-	if (strlen(m_pNewsServer->GetUser()) == 0 || strlen(m_pNewsServer->GetPassword()) == 0)
-	{
-		error("%c%s (%s) requested authorization but username/password are not set in settings", 
-			toupper(m_pNewsServer->GetName()[0]), m_pNewsServer->GetName() + 1, m_pNewsServer->GetHost());
-		m_bAuthError = true;
-		return false;
-	}
-
-	m_bAuthError = !AuthInfoUser(0);
-	return !m_bAuthError;
-}
-
-bool NNTPConnection::AuthInfoUser(int iRecur)
-{
-	if (iRecur > 10)
-	{
-		return false;
-	}
-
-	char tmp[1024];
-	snprintf(tmp, 1024, "AUTHINFO USER %s\r\n", m_pNewsServer->GetUser());
-	tmp[1024-1] = '\0';
-
-	WriteLine(tmp);
-
-	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
-	if (!answer)
-	{
-		ReportErrorAnswer("Authorization for server%i (%s) failed: Connection closed by remote host", NULL);
-		return false;
-	}
-
-	if (!strncmp(answer, "281", 3))
-	{
-		debug("Authorization for %s successful", GetHost());
-		return true;
-	}
-	else if (!strncmp(answer, "381", 3))
-	{
-		return AuthInfoPass(++iRecur);
-	}
-	else if (!strncmp(answer, "480", 3))
-	{
-		return AuthInfoUser(++iRecur);
-	}
-
-	if (char* p = strrchr(answer, '\r')) *p = '\0'; // remove last CRLF from error message
-
-	if (GetStatus() != csCancelled)
-	{
-		ReportErrorAnswer("Authorization for server%i (%s) failed (Answer: %s)", answer);
-	}
-	return false;
-}
-
-bool NNTPConnection::AuthInfoPass(int iRecur)
-{
-	if (iRecur > 10)
-	{
-		return false;
-	}
-
-	char tmp[1024];
-	snprintf(tmp, 1024, "AUTHINFO PASS %s\r\n", m_pNewsServer->GetPassword());
-	tmp[1024-1] = '\0';
-
-	WriteLine(tmp);
-
-	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
-	if (!answer)
-	{
-		ReportErrorAnswer("Authorization for server%i (%s) failed: Connection closed by remote host", NULL);
-		return false;
-	}
-	else if (!strncmp(answer, "2", 1))
-	{
-		debug("Authorization for %s successful", GetHost());
-		return true;
-	}
-	else if (!strncmp(answer, "381", 3))
-	{
-		return AuthInfoPass(++iRecur);
-	}
-
-	if (char* p = strrchr(answer, '\r')) *p = '\0'; // remove last CRLF from error message
-
-	if (GetStatus() != csCancelled)
-	{
-		ReportErrorAnswer("Authorization for server%i (%s) failed (Answer: %s)", answer);
-	}
-	return false;
-}
-
-const char* NNTPConnection::JoinGroup(const char* grp)
-{
-	if (m_szActiveGroup && !strcmp(m_szActiveGroup, grp))
-	{
-		// already in group
-		strcpy(m_szLineBuf, "211 ");
-		return m_szLineBuf;
-	}
-
-	char tmp[1024];
-	snprintf(tmp, 1024, "GROUP %s\r\n", grp);
-	tmp[1024-1] = '\0';
-
-	const char* answer = Request(tmp);
-
-	if (answer && !strncmp(answer, "2", 1))
-	{
-		debug("Changed group to %s on %s", grp, GetHost());
-		free(m_szActiveGroup);
-		m_szActiveGroup = strdup(grp);
-	}
-	else
-	{
-		debug("Error changing group on %s to %s: %s.", GetHost(), grp, answer);
-	}
-
-	return answer;
-}
-
-bool NNTPConnection::Connect()
-{
-	debug("Opening connection to %s", GetHost());
-
-	if (m_eStatus == csConnected)
-	{
-		return true;
-	}
-
-	if (!Connection::Connect())
-	{
-		return false;
-	}
-
-	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
-
-	if (!answer)
-	{
-		ReportErrorAnswer("Connection to server%i (%s) failed: Connection closed by remote host", NULL);
-		Disconnect();
-		return false;
-	}
-
-	if (strncmp(answer, "2", 1))
-	{
-		ReportErrorAnswer("Connection to server%i (%s) failed (Answer: %s)", answer);
-		Disconnect();
-		return false;
-	}
-
-	if ((strlen(m_pNewsServer->GetUser()) > 0 && strlen(m_pNewsServer->GetPassword()) > 0) &&
-		!Authenticate())
-	{
-		return false;
-	}
-
-	debug("Connection to %s established", GetHost());
-
-	return true;
-}
-
-bool NNTPConnection::Disconnect()
-{
-	if (m_eStatus == csConnected)
-	{
-		Request("quit\r\n");
-		free(m_szActiveGroup);
-		m_szActiveGroup = NULL;
-	}
-	return Connection::Disconnect();
-}
-
-void NNTPConnection::ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer)
-{
-	char szErrStr[1024];
-	snprintf(szErrStr, 1024, szMsgPrefix, m_pNewsServer->GetID(), m_pNewsServer->GetHost(), szAnswer);
-	szErrStr[1024-1] = '\0';
-	
-	ReportError(szErrStr, NULL, false, 0);
-}

NNTPConnection.h

@@ -1,59 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This 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 NNTPCONNECTION_H
-#define NNTPCONNECTION_H
-
-#include "NewsServer.h"
-#include "Connection.h"
-
-class NNTPConnection : public Connection
-{
-private:
-	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);
-
-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; }
-};
-
-#endif
-

NZBFile.cpp

@@ -1,909 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <string.h>
-#include <list>
-#include <ctype.h>
-#ifdef WIN32
-#include <comutil.h>
-#import <msxml.tlb> named_guids 
-using namespace MSXML;
-#else
-#include <libxml/parser.h>
-#include <libxml/xmlreader.h>
-#include <libxml/xmlerror.h>
-#include <libxml/entities.h>
-#endif
-
-#include "nzbget.h"
-#include "NZBFile.h"
-#include "Log.h"
-#include "DownloadInfo.h"
-#include "Options.h"
-#include "DiskState.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-extern DiskState* g_pDiskState;
-
-NZBFile::NZBFile(const char* szFileName, const char* szCategory)
-{
-    debug("Creating NZBFile");
-
-    m_szFileName = strdup(szFileName);
-	m_szPassword = NULL;
-	m_pNZBInfo = new NZBInfo();
-	m_pNZBInfo->Retain();
-	m_pNZBInfo->SetFilename(szFileName);
-	m_pNZBInfo->SetCategory(szCategory);
-	m_pNZBInfo->BuildDestDirName();
-
-#ifndef WIN32
-	m_bPassword = false;
-	m_pFileInfo = NULL;
-	m_pArticle = NULL;
-	m_szTagContent = NULL;
-	m_iTagContentLen = 0;
-#endif
-
-    m_FileInfos.clear();
-}
-
-NZBFile::~NZBFile()
-{
-    debug("Destroying NZBFile");
-
-    // Cleanup
-    free(m_szFileName);
-    free(m_szPassword);
-
-    for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
-    {
-        delete *it;
-    }
-    m_FileInfos.clear();
-
-	if (m_pNZBInfo)
-	{
-		m_pNZBInfo->Release();
-	}
-
-#ifndef WIN32
-	delete m_pFileInfo;
-	free(m_szTagContent);
-#endif
-}
-
-void NZBFile::LogDebugInfo()
-{
-    debug(" NZBFile %s", m_szFileName);
-}
-
-void NZBFile::DetachFileInfos()
-{
-    m_FileInfos.clear();
-}
-
-void NZBFile::AddArticle(FileInfo* pFileInfo, ArticleInfo* pArticleInfo)
-{
-	// make Article-List big enough
-	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;
-}
-
-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;
-	FileInfo::Articles* pArticles = pFileInfo->GetArticles();
-	int iTotalArticles = (int)pArticles->size();
-	int i = 0;
-	for (FileInfo::Articles::iterator it = pArticles->begin(); it != pArticles->end(); )
-	{
-		ArticleInfo* pArticle = *it;
-		if (!pArticle)
-		{
-			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())
-	{
-		delete pFileInfo;
-		return;
-	}
-
-	lMissedSize += iUncountedArticles * lOneSize;
-	lSize += lMissedSize;
-	m_FileInfos.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)
-{
-	if (TryQuotes)
-	{
-		// try to use the filename in quatation marks 
-		char* p = (char*)pFileInfo->GetSubject();
-		char* start = strchr(p, '\"');
-		if (start)
-		{
-			start++;
-			char* end = strchr(start + 1, '\"');
-			if (end)
-			{
-				int len = (int)(end - start);
-				char* point = strchr(start + 1, '.');
-				if (point && point < end)
-				{
-					char* filename = (char*)malloc(len + 1);
-					strncpy(filename, start, len);
-					filename[len] = '\0';
-					pFileInfo->SetFilename(filename);
-					free(filename);
-					return;
-				}
-			}
-		}
-	}
-
-	// tokenize subject, considering spaces as separators and quotation 
-	// marks as non separatable token delimiters.
-	// then take the last token containing dot (".") as a filename
-
-	typedef std::list<char*> TokenList;
-	TokenList tokens;
-	tokens.clear();
-
-	// tokenizing
-	char* p = (char*)pFileInfo->GetSubject();
-	char* start = p;
-	bool quot = false;
-	while (true)
-	{
-		char ch = *p;
-		bool sep = (ch == '\"') || (!quot && ch == ' ') || (ch == '\0');
-		if (sep)
-		{
-			// end of token
-			int len = (int)(p - start);
-			if (len > 0)
-			{
-				char* token = (char*)malloc(len + 1);
-				strncpy(token, start, len);
-				token[len] = '\0';
-				tokens.push_back(token);
-			}
-			start = p;
-			if (ch != '\"' || quot)
-			{
-				start++;
-			}
-			quot = *start == '\"';
-			if (quot)
-			{
-				start++;
-				char* q = strchr(start, '\"');
-				if (q)
-				{
-					p = q - 1;
-				}
-				else
-				{
-					quot = false;
-				}
-			}
-		}
-		if (ch == '\0')
-		{
-			break;
-		}
-		p++;
-	}
-
-	if (!tokens.empty())
-	{
-		// finding the best candidate for being a filename
-		char* besttoken = tokens.back();
-		for (TokenList::reverse_iterator it = tokens.rbegin(); it != tokens.rend(); it++)
-		{
-			char* s = *it;
-			char* p = strchr(s, '.');
-			if (p && (p[1] != '\0'))
-			{
-				besttoken = s;
-				break;
-			}
-		}
-		pFileInfo->SetFilename(besttoken);
-
-		// free mem
-		for (TokenList::iterator it = tokens.begin(); it != tokens.end(); it++)
-		{
-			free(*it);
-		}
-	}
-	else
-	{
-		// subject is empty or contains only separators?
-		debug("Could not extract Filename from Subject: %s. Using Subject as Filename", pFileInfo->GetSubject());
-		pFileInfo->SetFilename(pFileInfo->GetSubject());
-	}
-}
-
-bool NZBFile::HasDuplicateFilenames()
-{
-	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
-    {
-        FileInfo* pFileInfo1 = *it;
-		int iDupe = 1;
-		for (FileInfos::iterator it2 = it + 1; it2 != m_FileInfos.end(); it2++)
-		{
-			FileInfo* pFileInfo2 = *it2;
-			if (!strcmp(pFileInfo1->GetFilename(), pFileInfo2->GetFilename()) &&
-				strcmp(pFileInfo1->GetSubject(), pFileInfo2->GetSubject()))
-			{
-				iDupe++;
-			}
-		}
-
-		// If more than two files have the same parsed filename but different subjects,
-		// this means, that the parsing was not correct.
-		// in this case we take subjects as filenames to prevent 
-		// false "duplicate files"-alarm.
-		// It's Ok for just two files to have the same filename, this is 
-		// an often case by posting-errors to repost bad files
-		if (iDupe > 2 || (iDupe == 2 && m_FileInfos.size() == 2))
-		{
-			return true;
-		}
-    }
-
-	return false;
-}
-
-/**
- * Generate filenames from subjects and check if the parsing of subject was correct
- */
-void NZBFile::BuildFilenames()
-{
-	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
-    {
-        FileInfo* pFileInfo = *it;
-		ParseSubject(pFileInfo, true);
-	}
-
-	if (HasDuplicateFilenames())
-    {
-		for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
-		{
-			FileInfo* pFileInfo = *it;
-			ParseSubject(pFileInfo, false);
-		}
-	}
-
-	if (HasDuplicateFilenames())
-    {
-		m_pNZBInfo->SetManyDupeFiles(true);
-		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()
-{
-	FileInfoList fileList;
-
-	for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.end(); it++)
-	{
-		fileList.push_back(*it);
-	}
-
-	fileList.sort(CompareFileInfo);
-
-	// split ExtCleanupDisk into tokens and create a list
-	ExtList extList;
-	char* szExtCleanupDisk = strdup(g_pOptions->GetExtCleanupDisk());
-	char* saveptr;
-	char* szExt = strtok_r(szExtCleanupDisk, ",; ", &saveptr);
-	while (szExt)
-	{
-		extList.push_back(szExt);
-		szExt = strtok_r(NULL, ",; ", &saveptr);
-	}
-
-	unsigned int iFullContentHash = 0;
-	unsigned int iFilteredContentHash = 0;
-	int iUseForFilteredCount = 0;
-
-	for (FileInfoList::iterator it = fileList.begin(); it != fileList.end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-
-		// check file extension
-		int iFilenameLen = strlen(pFileInfo->GetFilename());
-		bool bSkip = false;
-		for (ExtList::iterator it = extList.begin(); it != extList.end(); it++)
-		{
-			const char* szExt = *it;
-			int iExtLen = strlen(szExt);
-			if (iFilenameLen >= iExtLen && !strcasecmp(szExt, pFileInfo->GetFilename() + iFilenameLen - iExtLen))
-			{
-				bSkip = true;
-				break;
-			}
-		}
-
-		bSkip = bSkip && !pFileInfo->GetParFile();
-
-		for (FileInfo::Articles::iterator it = pFileInfo->GetArticles()->begin(); it != pFileInfo->GetArticles()->end(); it++)
-		{
-			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++;
-			}
-		}
-	}
-
-	free(szExtCleanupDisk);
-
-	// if filtered hash is based on less than a half of files - do not use filtered hash at all
-	if (iUseForFilteredCount < (int)fileList.size() / 2)
-	{
-		iFilteredContentHash = 0;
-	}
-
-	m_pNZBInfo->SetFullContentHash(iFullContentHash);
-	m_pNZBInfo->SetFilteredContentHash(iFilteredContentHash);
-}
-
-void NZBFile::ProcessFiles()
-{
-	BuildFilenames();
-
-	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->SetFailedSize(m_pNZBInfo->GetFailedSize() + pFileInfo->GetMissedSize());
-		m_pNZBInfo->SetCurrentFailedSize(m_pNZBInfo->GetFailedSize());
-
-		pFileInfo->SetParFile(bParFile);
-		if (bParFile)
-		{
-			m_pNZBInfo->SetParSize(m_pNZBInfo->GetParSize() + pFileInfo->GetSize());
-			m_pNZBInfo->SetParFailedSize(m_pNZBInfo->GetParFailedSize() + pFileInfo->GetMissedSize());
-			m_pNZBInfo->SetParCurrentFailedSize(m_pNZBInfo->GetParFailedSize());
-		}
-	}
-
-	CalcHashes();
-
-	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-	{
-		for (FileInfos::iterator it = m_FileInfos.begin(); it != m_FileInfos.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, "rb");
-    if (!pFile)
-    {
-        return;
-    }
-
-    // obtain file size.
-    fseek(pFile , 0 , SEEK_END);
-    int iSize  = 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
-NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory)
-{
-    CoInitialize(NULL);
-
-	HRESULT hr;
-
-	MSXML::IXMLDOMDocumentPtr doc;
-	hr = doc.CreateInstance(MSXML::CLSID_DOMDocument);
-    if (FAILED(hr))
-    {
-        return NULL;
-    }
-
-    // Load the XML document file...
-	doc->put_resolveExternals(VARIANT_FALSE);
-	doc->put_validateOnParse(VARIANT_FALSE);
-	doc->put_async(VARIANT_FALSE);
-
-	// filename needs to be properly encoded
-	char* szURL = (char*)malloc(strlen(szFileName)*3 + 1);
-	EncodeURL(szFileName, szURL);
-	debug("url=\"%s\"", szURL);
-	_variant_t v(szURL);
-	free(szURL);
-
-	VARIANT_BOOL success = doc->load(v);
-	if (success == VARIANT_FALSE)
-	{
-		_bstr_t r(doc->GetparseError()->reason);
-		const char* szErrMsg = r;
-		error("Error parsing nzb-file: %s", szErrMsg);
-		return NULL;
-	}
-
-    NZBFile* pFile = new NZBFile(szFileName, szCategory);
-    if (pFile->ParseNZB(doc))
-	{
-		pFile->ProcessFiles();
-	}
-	else
-	{
-		delete pFile;
-		pFile = NULL;
-	}
-
-    return pFile;
-}
-
-void NZBFile::EncodeURL(const char* szFilename, char* szURL)
-{
-	while (char ch = *szFilename++)
-	{
-		if (('0' <= ch && ch <= '9') ||
-			('a' <= ch && ch <= 'z') ||
-			('A' <= ch && ch <= 'Z') )
-		{
-			*szURL++ = ch;
-		}
-		else
-		{
-			*szURL++ = '%';
-			int a = (unsigned char)ch >> 4;
-			*szURL++ = a > 9 ? a - 10 + 'a' : a + '0';
-			a = ch & 0xF;
-			*szURL++ = a > 9 ? a - 10 + 'a' : a + '0';
-		}
-	}
-	*szURL = NULL;
-}
-
-bool NZBFile::ParseNZB(IUnknown* nzb)
-{
-	MSXML::IXMLDOMDocumentPtr doc = nzb;
-	MSXML::IXMLDOMNodePtr root = doc->documentElement;
-
-	MSXML::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 attribute = node->Getattributes()->getNamedItem("subject");
-		if (!attribute) return false;
-		_bstr_t subject(attribute->Gettext());
-        FileInfo* pFileInfo = new FileInfo();
-		pFileInfo->SetSubject(subject);
-
-		attribute = node->Getattributes()->getNamedItem("date");
-		if (attribute)
-		{
-			_bstr_t date(attribute->Gettext());
-			pFileInfo->SetTime(atoi(date));
-		}
-
-		MSXML::IXMLDOMNodeListPtr groupList = node->selectNodes("groups/group");
-		for (int g = 0; g < groupList->Getlength(); g++)
-		{
-			MSXML::IXMLDOMNodePtr node = groupList->Getitem(g);
-			_bstr_t group = node->Gettext();
-			pFileInfo->GetGroups()->push_back(strdup((const char*)group));
-		}
-
-		MSXML::IXMLDOMNodeListPtr segmentList = node->selectNodes("segments/segment");
-		for (int g = 0; g < segmentList->Getlength(); g++)
-		{
-			MSXML::IXMLDOMNodePtr node = segmentList->Getitem(g);
-			_bstr_t id = node->Gettext();
-            char szId[2048];
-            snprintf(szId, 2048, "<%s>", (const char*)id);
-
-			MSXML::IXMLDOMNodePtr attribute = node->Getattributes()->getNamedItem("number");
-			if (!attribute) return false;
-			_bstr_t number(attribute->Gettext());
-
-			attribute = node->Getattributes()->getNamedItem("bytes");
-			if (!attribute) return false;
-			_bstr_t bytes(attribute->Gettext());
-
-			int partNumber = atoi(number);
-			int lsize = atoi(bytes);
-
-			if (partNumber > 0)
-			{
-				ArticleInfo* pArticle = new ArticleInfo();
-				pArticle->SetPartNumber(partNumber);
-				pArticle->SetMessageID(szId);
-				pArticle->SetSize(lsize);
-				AddArticle(pFileInfo, pArticle);
-			}
-		}
-
-		AddFileInfo(pFileInfo);
-	}
-	return true;
-}
-
-#else
-
-NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory)
-{
-    NZBFile* pFile = new NZBFile(szFileName, szCategory);
-
-	xmlSAXHandler SAX_handler = {0};
-	SAX_handler.startElement = reinterpret_cast<startElementSAXFunc>(SAX_StartElement);
-	SAX_handler.endElement = reinterpret_cast<endElementSAXFunc>(SAX_EndElement);
-	SAX_handler.characters = reinterpret_cast<charactersSAXFunc>(SAX_characters);
-	SAX_handler.error = reinterpret_cast<errorSAXFunc>(SAX_error);
-	SAX_handler.getEntity = reinterpret_cast<getEntitySAXFunc>(SAX_getEntity);
-
-	pFile->m_bIgnoreNextError = false;
-
-	int ret = xmlSAXUserParseFile(&SAX_handler, pFile, szFileName);
-    
-    if (ret == 0)
-	{
-		pFile->ProcessFiles();
-	}
-	else
-	{
-        error("Failed to parse nzb-file");
-		delete pFile;
-		pFile = NULL;
-	}
-	
-	return pFile;
-}
-
-void NZBFile::Parse_StartElement(const char *name, const char **atts)
-{
-	if (m_szTagContent)
-	{
-		free(m_szTagContent);
-		m_szTagContent = NULL;
-		m_iTagContentLen = 0;
-	}
-	
-	if (!strcmp("file", name))
-	{
-		m_pFileInfo = new FileInfo();
-		m_pFileInfo->SetFilename(m_szFileName);
-
-    	for (int i = 0; atts[i]; i += 2)
-    	{
-    		const char* attrname = atts[i];
-    		const char* attrvalue = atts[i + 1];
-			if (!strcmp("subject", attrname))
-			{
-				m_pFileInfo->SetSubject(attrvalue);
-			}
-			if (!strcmp("date", attrname))
-			{
-				m_pFileInfo->SetTime(atoi(attrvalue));
-			}
-		}
-	}
-	else if (!strcmp("segment", name))
-	{
-		if (!m_pFileInfo)
-		{
-			// error: bad nzb-file
-			return;
-		}
-	
-		long long lsize = -1;
-		int partNumber = -1;
-
-    	for (int i = 0; atts[i]; i += 2)
-    	{
-    		const char* attrname = atts[i];
-    		const char* attrvalue = atts[i + 1];
-			if (!strcmp("bytes", attrname))
-			{
-				lsize = atol(attrvalue);
-			}
-			if (!strcmp("number", attrname))
-			{
-				partNumber = atol(attrvalue);
-			}
-		}
-
-		if (partNumber > 0)
-		{
-			// new segment, add it!
-			m_pArticle = new ArticleInfo();
-			m_pArticle->SetPartNumber(partNumber);
-			m_pArticle->SetSize(lsize);
-			AddArticle(m_pFileInfo, m_pArticle);
-		}
-	}
-	else if (!strcmp("meta", name))
-	{
-		m_bPassword = atts[0] && atts[1] && !strcmp("type", atts[0]) && !strcmp("password", atts[1]);
-	}
-}
-
-void NZBFile::Parse_EndElement(const char *name)
-{
-	if (!strcmp("file", name))
-	{
-		// Close the file element, add the new file to file-list
-		AddFileInfo(m_pFileInfo);
-		m_pFileInfo = NULL;
-		m_pArticle = NULL;
-	}
-	else if (!strcmp("group", name))
-	{
-		if (!m_pFileInfo)
-		{
-			// error: bad nzb-file
-			return;
-		}
-		
-		m_pFileInfo->GetGroups()->push_back(m_szTagContent);
-		m_szTagContent = NULL;
-		m_iTagContentLen = 0;
-	}
-	else if (!strcmp("segment", name))
-	{
-		if (!m_pFileInfo || !m_pArticle)
-		{
-			// error: bad nzb-file
-			return;
-		}
-
-		// Get the #text part
-		char ID[2048];
-		snprintf(ID, 2048, "<%s>", m_szTagContent);
-		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)
-{
-	m_szTagContent = (char*)realloc(m_szTagContent, m_iTagContentLen + len + 1);
-	strncpy(m_szTagContent + m_iTagContentLen, buf, len);
-	m_iTagContentLen += len;
-	m_szTagContent[m_iTagContentLen] = '\0';
-}
-
-void NZBFile::SAX_StartElement(NZBFile* pFile, const char *name, const char **atts)
-{
-	pFile->Parse_StartElement(name, atts);
-}
-
-void NZBFile::SAX_EndElement(NZBFile* pFile, const char *name)
-{
-	pFile->Parse_EndElement(name);
-}
-
-void NZBFile::SAX_characters(NZBFile* pFile, const char * xmlstr, int len)
-{
-	char* str = (char*)xmlstr;
-	
-	// trim starting blanks
-	int off = 0;
-	for (int i = 0; i < len; i++)
-	{
-		char ch = str[i];
-		if (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
-		{
-			off++;
-		}
-		else
-		{
-			break;
-		}
-	}
-	
-	int newlen = len - off;
-	
-	// trim ending blanks
-	for (int i = len - 1; i >= off; i--)
-	{
-		char ch = str[i];
-		if (ch == ' ' || ch == 10 || ch == 13 || ch == 9)
-		{
-			newlen--;
-		}
-		else
-		{
-			break;
-		}
-	}
-	
-	if (newlen > 0)
-	{
-		// interpret tag content
-		pFile->Parse_Content(str + off, newlen);
-	}
-}
-
-void* NZBFile::SAX_getEntity(NZBFile* pFile, const char * name)
-{
-	xmlEntityPtr e = xmlGetPredefinedEntity((xmlChar* )name);
-	if (!e)
-	{
-		warn("entity not found");
-		pFile->m_bIgnoreNextError = true;
-	}
-
-	return e;
-}
-
-void NZBFile::SAX_error(NZBFile* pFile, const char *msg, ...)
-{
-	if (pFile->m_bIgnoreNextError)
-	{
-		pFile->m_bIgnoreNextError = false;
-		return;
-	}
-	
-    va_list argp;
-    va_start(argp, msg);
-    char szErrMsg[1024];
-    vsnprintf(szErrMsg, sizeof(szErrMsg), msg, argp);
-    szErrMsg[1024-1] = '\0';
-    va_end(argp);
-
-	// remove trailing CRLF
-	for (char* pend = szErrMsg + strlen(szErrMsg) - 1; pend >= szErrMsg && (*pend == '\n' || *pend == '\r' || *pend == ' '); pend--) *pend = '\0';
-    error("Error parsing nzb-file: %s", szErrMsg);
-}
-#endif

NZBFile.h

@@ -1,90 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef NZBFILE_H
-#define NZBFILE_H
-
-#include <vector>
-#include <list>
-
-#include "DownloadInfo.h"
-
-class NZBFile
-{
-public:
-	typedef std::vector<FileInfo*>	FileInfos;
-	typedef std::list<FileInfo*>	FileInfoList;
-	typedef std::list<char*>		ExtList;
-
-private:
-	FileInfos			m_FileInfos;
-	NZBInfo*			m_pNZBInfo;
-	char*				m_szFileName;
-	char*				m_szPassword;
-
-						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();
-	bool				HasDuplicateFilenames();
-	void				ReadPassword();
-#ifdef WIN32
-    bool 				ParseNZB(IUnknown* nzb);
-	static void			EncodeURL(const char* szFilename, char* szURL);
-#else
-	FileInfo*			m_pFileInfo;
-	ArticleInfo*		m_pArticle;
-	char*				m_szTagContent;
-	int					m_iTagContentLen;
-	bool				m_bIgnoreNextError;
-	bool				m_bPassword;
-
-	static void			SAX_StartElement(NZBFile* pFile, const char *name, const char **atts);
-	static void			SAX_EndElement(NZBFile* pFile, const char *name);
-	static void			SAX_characters(NZBFile* pFile, const char * xmlstr, int len);
-	static void*		SAX_getEntity(NZBFile* pFile, const char * name);
-	static void			SAX_error(NZBFile* pFile, const char *msg, ...);
-	void				Parse_StartElement(const char *name, const char **atts);
-	void				Parse_EndElement(const char *name);
-	void				Parse_Content(const char *buf, int len);
-#endif
-
-public:
-	virtual 			~NZBFile();
-	static NZBFile*		Create(const char* szFileName, const char* szCategory);
-	const char* 		GetFileName() const { return m_szFileName; }
-	FileInfos*			GetFileInfos() { return &m_FileInfos; }
-	NZBInfo*			GetNZBInfo() { return m_pNZBInfo; }
-	const char*			GetPassword() { return m_szPassword; }
-	void				DetachFileInfos();
-
-	void				LogDebugInfo();
-};
-
-#endif

NewsServer.cpp

@@ -1,80 +0,0 @@
-/*
- *  This file if part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#include "nzbget.h"
-#include "NewsServer.h"
-
-NewsServer::NewsServer(int iID, bool bActive, const char* szName, const char* szHost, int iPort,
-	const char* szUser, const char* szPass, bool bJoinGroup, bool bTLS,
-	const char* szCipher, int iMaxConnections, int iLevel, int iGroup)
-{
-	m_iID = iID;
-	m_iStateID = 0;
-	m_bActive = bActive;
-	m_iPort = iPort;
-	m_iLevel = iLevel;
-	m_iNormLevel = iLevel;
-	m_iGroup = iGroup;
-	m_iMaxConnections = iMaxConnections;
-	m_bJoinGroup = bJoinGroup;
-	m_bTLS = bTLS;
-	m_szHost = strdup(szHost ? szHost : "");
-	m_szUser = strdup(szUser ? szUser : "");
-	m_szPassword = strdup(szPass ? szPass : "");
-	m_szCipher = strdup(szCipher ? szCipher : "");
-
-	if (szName && strlen(szName) > 0)
-	{
-		m_szName = strdup(szName);
-	}
-	else
-	{
-		m_szName = (char*)malloc(20);
-		snprintf(m_szName, 20, "server%i", iID);
-		m_szName[20-1] = '\0';
-	}
-}
-
-NewsServer::~NewsServer()
-{
-	free(m_szName);
-	free(m_szHost);
-	free(m_szUser);
-	free(m_szPassword);
-	free(m_szCipher);
-}

NewsServer.h

@@ -1,78 +0,0 @@
-/*
- *  This file if part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef NEWSSERVER_H
-#define NEWSSERVER_H
-
-#include <vector>
-
-class NewsServer
-{
-private:
-	int				m_iID;
-	int				m_iStateID;
-	bool			m_bActive;
-	char*			m_szName;
-	int				m_iGroup;
-	char*			m_szHost;
-	int				m_iPort;
-	char*			m_szUser;
-	char*			m_szPassword;
-	int				m_iMaxConnections;
-	int				m_iLevel;
-	int				m_iNormLevel;
-	bool			m_bJoinGroup;
-	bool			m_bTLS;
-	char*			m_szCipher;
-
-public:
-					NewsServer(int iID, bool bActive, const char* szName, const char* szHost, int iPort,
-						const char* szUser, const char* szPass, bool bJoinGroup,
-						bool bTLS, const char* szCipher, int iMaxConnections, int iLevel, int iGroup);
-					~NewsServer();
-	int				GetID() { return m_iID; }
-	int				GetStateID() { return m_iStateID; }
-	void			SetStateID(int iStateID) { m_iStateID = iStateID; }
-	bool			GetActive() { return m_bActive; }
-	void			SetActive(bool bActive) { m_bActive = bActive; }
-	const char*		GetName() { return m_szName; }
-	int				GetGroup() { return m_iGroup; }
-	const char*		GetHost() { return m_szHost; }
-	int				GetPort() { return m_iPort; }
-	const char*		GetUser() { return m_szUser; }
-	const char*		GetPassword() { return m_szPassword; }
-	int				GetMaxConnections() { return m_iMaxConnections; }
-	int				GetLevel() { return m_iLevel; }
-	int				GetNormLevel() { return m_iNormLevel; }
-	void			SetNormLevel(int iLevel) { m_iNormLevel = iLevel; }
-	int				GetJoinGroup() { return m_bJoinGroup; }
-	bool			GetTLS() { return m_bTLS; }
-	const char*		GetCipher() { return m_szCipher; }
-};
-
-typedef std::vector<NewsServer*>		Servers;
-
-#endif

Observer.cpp

@@ -1,62 +0,0 @@
-/*
- *  This file if part of nzbget
- *
- *  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
- *  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 "Observer.h"
-#include "Log.h"
-
-Subject::Subject()
-{
-	m_Observers.clear();
-}
-
-void Subject::Attach(Observer* Observer)
-{
-	m_Observers.push_back(Observer);
-}
-
-void Subject::Detach(Observer* Observer)
-{
-	m_Observers.remove(Observer);
-}
-
-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, Aspect);
-	}
-}

Options.h

@@ -1,529 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef OPTIONS_H
-#define OPTIONS_H
-
-#include <vector>
-#include <list>
-#include <time.h>
-
-#include "Thread.h"
-#include "Util.h"
-
-class Options
-{
-public:
-	enum EClientOperation
-	{
-		opClientNoOperation,
-		opClientRequestDownload,
-		opClientRequestListFiles,
-		opClientRequestListGroups,
-		opClientRequestListStatus,
-		opClientRequestSetRate,
-		opClientRequestDumpDebug,
-		opClientRequestEditQueue,
-		opClientRequestLog,
-		opClientRequestShutdown,
-		opClientRequestReload,
-		opClientRequestVersion,
-		opClientRequestPostQueue,
-		opClientRequestWriteLog,
-		opClientRequestScanSync,
-		opClientRequestScanAsync,
-		opClientRequestDownloadPause,
-		opClientRequestDownloadUnpause,
-		opClientRequestDownload2Pause,
-		opClientRequestDownload2Unpause,
-		opClientRequestPostPause,
-		opClientRequestPostUnpause,
-		opClientRequestScanPause,
-		opClientRequestScanUnpause,
-		opClientRequestHistory,
-		opClientRequestDownloadUrl,
-		opClientRequestUrlQueue
-	};
-	enum EMessageTarget
-	{
-		mtNone,
-		mtScreen,
-		mtLog,
-		mtBoth
-	};
-	enum EOutputMode
-	{
-		omLoggable,
-		omColored,
-		omNCurses
-	};
-	enum EParCheck
-	{
-		pcAuto,
-		pcForce,
-		pcManual
-	};
-	enum EParScan
-	{
-		psLimited,
-		psFull,
-		psAuto
-	};
-	enum EHealthCheck
-	{
-		hcPause,
-		hcDelete,
-		hcNone
-	};
-	enum EScriptLogKind
-	{
-		slNone,
-		slDetail,
-		slInfo,
-		slWarning,
-		slError,
-		slDebug
-	};
-	enum EMatchMode
-	{
-		mmID = 1,
-		mmName,
-		mmRegEx
-	};
-
-	class OptEntry
-	{
-	private:
-		char*			m_szName;
-		char*			m_szValue;
-		char*			m_szDefValue;
-		int				m_iLineNo;
-
-		void			SetName(const char* szName);
-		void			SetValue(const char* szValue);
-		void			SetLineNo(int iLineNo) { m_iLineNo = iLineNo; }
-
-		friend class Options;
-
-	public:
-						OptEntry();
-						OptEntry(const char* szName, const char* szValue);
-						~OptEntry();
-		const char*		GetName() { return m_szName; }
-		const char*		GetValue() { return m_szValue; }
-		const char*		GetDefValue() { return m_szDefValue; }
-		int				GetLineNo() { return m_iLineNo; }
-	};
-	
-	typedef std::vector<OptEntry*>  OptEntriesBase;
-
-	class OptEntries: public OptEntriesBase
-	{
-	public:
-						~OptEntries();
-		OptEntry*		FindOption(const char* szName);
-	};
-
-	class ConfigTemplate
-	{
-	private:
-		char*			m_szName;
-		char*			m_szDisplayName;
-		char*			m_szTemplate;
-
-		friend class Options;
-
-	public:
-						ConfigTemplate(const char* szName, const char* szDisplayName, const char* szTemplate);
-						~ConfigTemplate();
-		const char*		GetName() { return m_szName; }
-		const char*		GetDisplayName() { return m_szDisplayName; }
-		const char*		GetTemplate() { return m_szTemplate; }
-	};
-	
-	typedef std::vector<ConfigTemplate*>  ConfigTemplatesBase;
-
-	class ConfigTemplates: public ConfigTemplatesBase
-	{
-	public:
-						~ConfigTemplates();
-	};
-
-	typedef std::vector<char*>  NameList;
-
-	class Category
-	{
-	private:
-		char*			m_szName;
-		char*			m_szDestDir;
-		bool			m_bUnpack;
-		char*			m_szDefScript;
-		NameList		m_Aliases;
-
-	public:
-						Category(const char* szName, const char* szDestDir, bool bUnpack, const char* szDefScript);
-						~Category();
-		const char*		GetName() { return m_szName; }
-		const char*		GetDestDir() { return m_szDestDir; }
-		bool			GetUnpack() { return m_bUnpack; }
-		const char*		GetDefScript() { return m_szDefScript; }
-		NameList*		GetAliases() { return &m_Aliases; }
-	};
-	
-	typedef std::vector<Category*>  CategoriesBase;
-
-	class Categories: public CategoriesBase
-	{
-	public:
-						~Categories();
-		Category*		FindCategory(const char* szName, bool bSearchAliases);
-	};
-
-	class Script
-	{
-	private:
-		char*			m_szName;
-		char*			m_szLocation;
-		char*			m_szDisplayName;
-
-	public:
-						Script(const char* szName, const char* szLocation);
-						~Script();
-		const char*		GetName() { return m_szName; }
-		const char*		GetLocation() { return m_szLocation; }
-		void			SetDisplayName(const char* szDisplayName);
-		const char*		GetDisplayName() { return m_szDisplayName; }
-	};
-
-	typedef std::list<Script*>  ScriptListBase;
-
-	class ScriptList: public ScriptListBase
-	{
-	public:
-						~ScriptList();
-		Script*			Find(const char* szName);	
-	};
-
-private:
-	OptEntries			m_OptEntries;
-	bool				m_bConfigInitialized;
-	Mutex				m_mutexOptEntries;
-	Categories			m_Categories;
-
-	// Options
-	bool				m_bConfigErrors;
-	int					m_iConfigLine;
-	char*				m_szConfigFilename;
-	char*				m_szDestDir;
-	char*				m_szInterDir;
-	char*				m_szTempDir;
-	char*				m_szQueueDir;
-	char*				m_szNzbDir;
-	char*				m_szWebDir;
-	char*				m_szConfigTemplate;
-	char*				m_szScriptDir;
-	EMessageTarget		m_eInfoTarget;
-	EMessageTarget		m_eWarningTarget;
-	EMessageTarget		m_eErrorTarget;
-	EMessageTarget		m_eDebugTarget;
-	EMessageTarget		m_eDetailTarget;
-	bool				m_bDecode;
-	bool				m_bCreateBrokenLog;
-	bool				m_bResetLog;
-	int					m_iConnectionTimeout;
-	int					m_iTerminateTimeout;
-	bool				m_bAppendCategoryDir;
-	bool				m_bContinuePartial;
-	int					m_iRetries;
-	int					m_iRetryInterval;
-	bool				m_bSaveQueue;
-	bool				m_bDupeCheck;
-	char*				m_szControlIP;
-	char*				m_szControlUsername;
-	char*				m_szControlPassword;
-	int					m_iControlPort;
-	bool				m_bSecureControl;
-	int					m_iSecurePort;
-	char*				m_szSecureCert;
-	char*				m_szSecureKey;
-	char*				m_szAuthorizedIP;
-	char*				m_szLockFile;
-	char*				m_szDaemonUsername;
-	EOutputMode			m_eOutputMode;
-	bool				m_bReloadQueue;
-	bool				m_bReloadUrlQueue;
-	bool				m_bReloadPostQueue;
-	int					m_iUrlConnections;
-	int					m_iLogBufferSize;
-	bool				m_bCreateLog;
-	char*				m_szLogFile;
-	EParCheck			m_eParCheck;
-	bool				m_bParRepair;
-	EParScan			m_eParScan;
-	bool				m_bParRename;
-	EHealthCheck		m_eHealthCheck;
-	char*				m_szDefScript;
-	char*				m_szScriptOrder;
-	char*				m_szNZBProcess;
-	char*				m_szNZBAddedProcess;
-	bool				m_bNoConfig;
-	int					m_iUMask;
-	int					m_iUpdateInterval;
-	bool				m_bCursesNZBName;
-	bool				m_bCursesTime;
-	bool				m_bCursesGroup;
-	bool				m_bCrcCheck;
-	bool				m_bDirectWrite;
-	int					m_iWriteBufferSize;
-	int					m_iNzbDirInterval;
-	int					m_iNzbDirFileAge;
-	bool				m_bParCleanupQueue;
-	int					m_iDiskSpace;
-	bool				m_bTLS;
-	bool				m_bDumpCore;
-	bool				m_bParPauseQueue;
-	bool				m_bScriptPauseQueue;
-	bool				m_bNzbCleanupDisk;
-	bool				m_bDeleteCleanupDisk;
-	int					m_iParTimeLimit;
-	int					m_iKeepHistory;
-	bool				m_bAccurateRate;
-	bool				m_bUnpack;
-	bool				m_bUnpackCleanupDisk;
-	char*				m_szUnrarCmd;
-	char*				m_szSevenZipCmd;
-	bool				m_bUnpackPauseQueue;
-	char*				m_szExtCleanupDisk;
-	int					m_iFeedHistory;
-	bool				m_bUrlForce;
-	int					m_iTimeCorrection;
-
-	// Parsed command-line parameters
-	bool				m_bServerMode;
-	bool				m_bDaemonMode;
-	bool				m_bRemoteClientMode;
-	int					m_iEditQueueAction;
-	int					m_iEditQueueOffset;
-	int*				m_pEditQueueIDList;
-	int					m_iEditQueueIDCount;
-	NameList			m_EditQueueNameList;
-	EMatchMode			m_EMatchMode;
-	char*				m_szEditQueueText;
-	char*				m_szArgFilename;
-	char*				m_szAddCategory;
-	int					m_iAddPriority;
-	bool				m_bAddPaused;
-	char*				m_szAddNZBFilename;
-	char*				m_szLastArg;
-	bool				m_bPrintOptions;
-	bool				m_bAddTop;
-	int					m_iSetRate;
-	int					m_iLogLines;
-	int					m_iWriteLogKind;
-	bool				m_bTestBacktrace;
-
-	// Current state
-	bool				m_bPauseDownload;
-	bool				m_bPauseDownload2;
-	bool				m_bPausePostProcess;
-	bool				m_bPauseScan;
-	int					m_iDownloadRate;
-	EClientOperation	m_eClientOperation;
-	time_t				m_tResumeTime;
-
-	void				InitDefault();
-	void				InitOptFile();
-	void				InitCommandLine(int argc, char* argv[]);
-	void				InitOptions();
-	void				InitFileArg(int argc, char* argv[]);
-	void				InitServers();
-	void				InitCategories();
-	void				InitScheduler();
-	void				InitFeeds();
-	void				CheckOptions();
-	void				PrintUsage(char* com);
-	void				Dump();
-	int					ParseEnumValue(const char* OptName, int argc, const char* argn[], const int argv[]);
-	int					ParseIntValue(const char* OptName, int iBase);
-	float				ParseFloatValue(const char* OptName);
-	OptEntry*			FindOption(const char* optname);
-	const char*			GetOption(const char* optname);
-	void				SetOption(const char* optname, const char* value);
-	bool				SetOptionString(const char* option);
-	bool				SplitOptionString(const char* option, char** pOptName, char** pOptValue);
-	bool				ValidateOptionName(const char* optname);
-	void				LoadConfigFile();
-	void				CheckDir(char** dir, const char* szOptionName, bool bAllowEmpty, bool bCreate);
-	void				ParseFileIDList(int argc, char* argv[], int optind);
-	void				ParseFileNameList(int argc, char* argv[], int optind);
-	bool				ParseTime(const char** pTime, int* pHours, int* pMinutes);
-	bool				ParseWeekDays(const char* szWeekDays, int* pWeekDaysBits);
-	void				ConfigError(const char* msg, ...);
-	void				ConfigWarn(const char* msg, ...);
-	void				LocateOptionSrcPos(const char *szOptionName);
-	void				ConvertOldOption(char *szOption, int iOptionBufLen, char *szValue, int iValueBufLen);
-	static bool			CompareScripts(Script* pScript1, Script* pScript2);
-	void				LoadScriptDir(ScriptList* pScriptList, const char* szDirectory, bool bIsSubDir);
-	void				BuildScriptDisplayNames(ScriptList* pScriptList);
-
-public:
-						Options(int argc, char* argv[]);
-						~Options();
-
-	bool				LoadConfig(OptEntries* pOptEntries);
-	bool				SaveConfig(OptEntries* pOptEntries);
-	bool				LoadConfigTemplates(ConfigTemplates* pConfigTemplates);
-	void				LoadScriptList(ScriptList* pScriptList);
-
-	// Options
-	OptEntries*			LockOptEntries();
-	void				UnlockOptEntries();
-	const char*			GetConfigFilename() { return m_szConfigFilename; }
-	const char*			GetDestDir() { return m_szDestDir; }
-	const char*			GetInterDir() { return m_szInterDir; }
-	const char*			GetTempDir() { return m_szTempDir; }
-	const char*			GetQueueDir() { return m_szQueueDir; }
-	const char*			GetNzbDir() { return m_szNzbDir; }
-	const char*			GetWebDir() { return m_szWebDir; }
-	const char*			GetConfigTemplate() { return m_szConfigTemplate; }
-	const char*			GetScriptDir() { return m_szScriptDir; }
-	bool				GetCreateBrokenLog() const { return m_bCreateBrokenLog; }
-	bool				GetResetLog() const { return m_bResetLog; }
-	EMessageTarget		GetInfoTarget() const { return m_eInfoTarget; }
-	EMessageTarget		GetWarningTarget() const { return m_eWarningTarget; }
-	EMessageTarget		GetErrorTarget() const { return m_eErrorTarget; }
-	EMessageTarget		GetDebugTarget() const { return m_eDebugTarget; }
-	EMessageTarget		GetDetailTarget() const { return m_eDetailTarget; }
-	int					GetConnectionTimeout() { return m_iConnectionTimeout; }
-	int					GetTerminateTimeout() { return m_iTerminateTimeout; }
-	bool				GetDecode() { return m_bDecode; };
-	bool				GetAppendCategoryDir() { return m_bAppendCategoryDir; }
-	bool				GetContinuePartial() { return m_bContinuePartial; }
-	int					GetRetries() { return m_iRetries; }
-	int					GetRetryInterval() { return m_iRetryInterval; }
-	bool				GetSaveQueue() { return m_bSaveQueue; }
-	bool				GetDupeCheck() { return m_bDupeCheck; }
-	const char*			GetControlIP() { return m_szControlIP; }
-	const char*			GetControlUsername() { return m_szControlUsername; }
-	const char*			GetControlPassword() { return m_szControlPassword; }
-	int					GetControlPort() { return m_iControlPort; }
-	bool				GetSecureControl() { return m_bSecureControl; }
-	int					GetSecurePort() { return m_iSecurePort; }
-	const char*			GetSecureCert() { return m_szSecureCert; }
-	const char*			GetSecureKey() { return m_szSecureKey; }
-	const char*			GetAuthorizedIP() { return m_szAuthorizedIP; }
-	const char*			GetLockFile() { return m_szLockFile; }
-	const char*			GetDaemonUsername() { return m_szDaemonUsername; }
-	EOutputMode			GetOutputMode() { return m_eOutputMode; }
-	bool				GetReloadQueue() { return m_bReloadQueue; }
-	bool				GetReloadUrlQueue() { return m_bReloadUrlQueue; }
-	bool				GetReloadPostQueue() { return m_bReloadPostQueue; }
-	int					GetUrlConnections() { return m_iUrlConnections; }
-	int					GetLogBufferSize() { return m_iLogBufferSize; }
-	bool				GetCreateLog() { return m_bCreateLog; }
-	const char*			GetLogFile() { return m_szLogFile; }
-	EParCheck			GetParCheck() { return m_eParCheck; }
-	bool				GetParRepair() { return m_bParRepair; }
-	EParScan			GetParScan() { return m_eParScan; }
-	bool				GetParRename() { return m_bParRename; }
-	EHealthCheck		GetHealthCheck() { return m_eHealthCheck; }
-	const char*			GetScriptOrder() { return m_szScriptOrder; }
-	const char*			GetDefScript() { return m_szDefScript; }
-	const char*			GetNZBProcess() { return m_szNZBProcess; }
-	const char*			GetNZBAddedProcess() { return m_szNZBAddedProcess; }
-	int					GetUMask() { return m_iUMask; }
-	int					GetUpdateInterval() {return m_iUpdateInterval; }
-	bool				GetCursesNZBName() { return m_bCursesNZBName; }
-	bool				GetCursesTime() { return m_bCursesTime; }
-	bool				GetCursesGroup() { return m_bCursesGroup; }
-	bool				GetCrcCheck() { return m_bCrcCheck; }
-	bool				GetDirectWrite() { return m_bDirectWrite; }
-	int					GetWriteBufferSize() { return m_iWriteBufferSize; }
-	int					GetNzbDirInterval() { return m_iNzbDirInterval; }
-	int					GetNzbDirFileAge() { return m_iNzbDirFileAge; }
-	bool				GetParCleanupQueue() { return m_bParCleanupQueue; }
-	int					GetDiskSpace() { return m_iDiskSpace; }
-	bool				GetTLS() { return m_bTLS; }
-	bool				GetDumpCore() { return m_bDumpCore; }
-	bool				GetParPauseQueue() { return m_bParPauseQueue; }
-	bool				GetScriptPauseQueue() { return m_bScriptPauseQueue; }
-	bool				GetNzbCleanupDisk() { return m_bNzbCleanupDisk; }
-	bool				GetDeleteCleanupDisk() { return m_bDeleteCleanupDisk; }
-	int					GetParTimeLimit() { return m_iParTimeLimit; }
-	int					GetKeepHistory() { return m_iKeepHistory; }
-	bool				GetAccurateRate() { return m_bAccurateRate; }
-	bool				GetUnpack() { return m_bUnpack; }
-	bool				GetUnpackCleanupDisk() { return m_bUnpackCleanupDisk; }
-	const char*			GetUnrarCmd() { return m_szUnrarCmd; }
-	const char*			GetSevenZipCmd() { return m_szSevenZipCmd; }
-	bool				GetUnpackPauseQueue() { return m_bUnpackPauseQueue; }
-	const char*			GetExtCleanupDisk() { return m_szExtCleanupDisk; }
-	int					GetFeedHistory() { return m_iFeedHistory; }
-	bool				GetUrlForce() { return m_bUrlForce; }
-	int					GetTimeCorrection() { return m_iTimeCorrection; }
-
-	Category*			FindCategory(const char* szName, bool bSearchAliases) { return m_Categories.FindCategory(szName, bSearchAliases); }
-
-	// Parsed command-line parameters
-	bool				GetServerMode() { return m_bServerMode; }
-	bool				GetDaemonMode() { return m_bDaemonMode; }
-	bool				GetRemoteClientMode() { return m_bRemoteClientMode; }
-	EClientOperation	GetClientOperation() { return m_eClientOperation; }
-	int					GetEditQueueAction() { return m_iEditQueueAction; }
-	int					GetEditQueueOffset() { return m_iEditQueueOffset; }
-	int*				GetEditQueueIDList() { return m_pEditQueueIDList; }
-	int					GetEditQueueIDCount() { return m_iEditQueueIDCount; }
-	NameList*			GetEditQueueNameList() { return &m_EditQueueNameList; }
-	EMatchMode			GetMatchMode() { return m_EMatchMode; }
-	const char*			GetEditQueueText() { return m_szEditQueueText; }
-	const char*			GetArgFilename() { return m_szArgFilename; }
-	const char*			GetAddCategory() { return m_szAddCategory; }
-	bool				GetAddPaused() { return m_bAddPaused; }
-	const char*			GetLastArg() { return m_szLastArg; }
-	int					GetAddPriority() { return m_iAddPriority; }
-	char*				GetAddNZBFilename() { return m_szAddNZBFilename; }
-	bool				GetAddTop() { return m_bAddTop; }
-	int					GetSetRate() { return m_iSetRate; }
-	int					GetLogLines() { return m_iLogLines; }
-	int					GetWriteLogKind() { return m_iWriteLogKind; }
-	bool				GetTestBacktrace() { return m_bTestBacktrace; }
-
-	// Current state
-	void				SetPauseDownload(bool bPauseDownload) { m_bPauseDownload = bPauseDownload; }
-	bool				GetPauseDownload() const { return m_bPauseDownload; }
-	void				SetPauseDownload2(bool bPauseDownload2) { m_bPauseDownload2 = bPauseDownload2; }
-	bool				GetPauseDownload2() const { return m_bPauseDownload2; }
-	void				SetPausePostProcess(bool bPausePostProcess) { m_bPausePostProcess = bPausePostProcess; }
-	bool				GetPausePostProcess() const { return m_bPausePostProcess; }
-	void				SetPauseScan(bool bPauseScan) { m_bPauseScan = bPauseScan; }
-	bool				GetPauseScan() const { return m_bPauseScan; }
-	void				SetDownloadRate(int iRate) { m_iDownloadRate = iRate; }
-	int					GetDownloadRate() const { return m_iDownloadRate; }
-	void				SetResumeTime(time_t tResumeTime) { m_tResumeTime = tResumeTime; }
-	time_t				GetResumeTime() const { return m_tResumeTime; }
-};
-
-#endif

ParChecker.cpp

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

ParChecker.h

@@ -1,131 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef PARCHECKER_H
-#define PARCHECKER_H
-
-#ifndef DISABLE_PARCHECK
-
-#include <deque>
-#include <string>
-
-#include "Thread.h"
-#include "Log.h"
-
-class ParChecker : public Thread
-{
-public:
-	enum EStatus
-	{
-		psFailed,
-		psRepairPossible,
-		psRepaired,
-		psRepairNotNeeded
-	};
-
-	enum EStage
-	{
-		ptLoadingPars,
-		ptVerifyingSources,
-		ptRepairing,
-		ptVerifyingRepaired,
-	};
-
-	typedef std::deque<char*>		FileList;
-	typedef std::deque<void*>		SourceList;
-	
-private:
-	char*				m_szInfoName;
-	char*				m_szDestDir;
-	char*				m_szNZBName;
-	const char*			m_szParFilename;
-	EStatus				m_eStatus;
-	EStage				m_eStage;
-	void*				m_pRepairer;	// declared as void* to prevent the including of libpar2-headers into this header-file
-	char*				m_szErrMsg;
-	FileList			m_QueuedParFiles;
-	Mutex			 	m_mutexQueuedParFiles;
-	bool				m_bQueuedParFilesChanged;
-	FileList			m_ProcessedFiles;
-	int					m_iProcessedFiles;
-	int					m_iFilesToRepair;
-	int					m_iExtraFiles;
-	bool				m_bVerifyingExtraFiles;
-	char*				m_szProgressLabel;
-	int					m_iFileProgress;
-	int					m_iStageProgress;
-	bool				m_bCancelled;
-	SourceList			m_sourceFiles;
-
-	void				Cleanup();
-	EStatus				RunParCheck(const char* szParFilename);
-	int					PreProcessPar();
-	bool				LoadMainParBak();
-	int					ProcessMorePars();
-	bool				LoadMorePars();
-	bool				CheckSplittedFragments();
-	bool				AddSplittedFragments(const char* szFilename);
-	bool				AddMissingFiles();
-	void				WriteBrokenLog(EStatus eStatus);
-	void				SaveSourceList();
-	void				DeleteLeftovers();
-	void				signal_filename(std::string str);
-	void				signal_progress(double progress);
-	void				signal_done(std::string str, int available, int total);
-
-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() {}
-	virtual void		Completed() {}
-	virtual void		PrintMessage(Message::EKind eKind, const char* szFormat, ...) {}
-	EStage				GetStage() { return m_eStage; }
-	const char*			GetProgressLabel() { return m_szProgressLabel; }
-	int					GetFileProgress() { return m_iFileProgress; }
-	int					GetStageProgress() { return m_iStageProgress; }
-
-public:
-						ParChecker();
-	virtual				~ParChecker();
-	virtual void		Run();
-	void				SetDestDir(const char* szDestDir);
-	const char*			GetParFilename() { return m_szParFilename; }
-	const char*			GetInfoName() { return m_szInfoName; }
-	void				SetInfoName(const char* szInfoName);
-	void				SetNZBName(const char* szNZBName);
-	EStatus				GetStatus() { return m_eStatus; }
-	void				AddParFile(const char* szParFilename);
-	void				QueueChanged();
-	void				Cancel();
-	bool				GetCancelled() { return m_bCancelled; }
-};
-
-#endif
-
-#endif

ParCoordinator.cpp

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

ParCoordinator.h

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

ParRenamer.cpp

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

ParRenamer.h

@@ -1,106 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef PARRENAMER_H
-#define PARRENAMER_H
-
-#ifndef DISABLE_PARCHECK
-
-#include <deque>
-
-#include "Thread.h"
-#include "Log.h"
-
-class ParRenamer : public Thread
-{
-public:
-	enum EStatus
-	{
-		psFailed,
-		psSuccess
-	};
-	
-	class FileHash
-	{
-	private:
-		char*			m_szFilename;
-		char*			m_szHash;
-
-	public:
-						FileHash(const char* szFilename, const char* szHash);
-						~FileHash();
-		const char*		GetFilename() { return m_szFilename; }
-		const char*		GetHash() { return m_szHash; }
-	};
-
-	typedef std::deque<FileHash*>		FileHashList;
-
-	typedef std::deque<char*>			DirList;
-	
-private:
-	char*				m_szInfoName;
-	char*				m_szDestDir;
-	EStatus				m_eStatus;
-	char*				m_szProgressLabel;
-	int					m_iStageProgress;
-	bool				m_bCancelled;
-	DirList				m_DirList;
-	FileHashList		m_FileHashList;
-	int					m_iFileCount;
-	int					m_iCurFile;
-	int					m_iRenamedCount;
-
-	void				Cleanup();
-	void				ClearHashList();
-	void				BuildDirList(const char* szDestDir);
-	void				CheckDir(const char* szDestDir);
-	void				LoadParFiles(const char* szDestDir);
-	void				LoadParFile(const char* szParFilename);
-	void				CheckFiles(const char* szDestDir);
-	void				CheckFile(const char* szDestDir, const char* szFilename);
-
-protected:
-	virtual void		UpdateProgress() {}
-	virtual void		Completed() {}
-	virtual void		PrintMessage(Message::EKind eKind, const char* szFormat, ...) {}
-	const char*			GetProgressLabel() { return m_szProgressLabel; }
-	int					GetStageProgress() { return m_iStageProgress; }
-
-public:
-						ParRenamer();
-	virtual				~ParRenamer();
-	virtual void		Run();
-	void				SetDestDir(const char* szDestDir);
-	const char*			GetInfoName() { return m_szInfoName; }
-	void				SetInfoName(const char* szInfoName);
-	void				SetStatus(EStatus eStatus);
-	EStatus				GetStatus() { return m_eStatus; }
-	void				Cancel();
-	bool				GetCancelled() { return m_bCancelled; }
-};
-
-#endif
-
-#endif

PrePostProcessor.h

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

QueueCoordinator.h

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

QueueEditor.h

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

README

@@ -4,7 +4,7 @@
 
 This is a short documentation. For more information please
 visit NZBGet home page at 
-  http://nzbget.sourceforge.net
+  http://nzbget.net
 
 Contents          
 --------
@@ -44,25 +44,16 @@ depends on command-line parameters passed to the program.
 2. Supported OS
 =====================================
 
-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.
+NZBGet is written in C++ and works on Windows, OS X, Linux and
+most POSIX-conform OS'es.
 
 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. 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. 
+for Windows, OS X and Linux. For most POSIX-systems you need to compile
+the program yourself. 
 
 If you have downloaded binaries you can just jump to section 
 "Configuration".
@@ -71,8 +62,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 should run on other
-POSIX platforms (see the list of tested platforms above).
+NZBGet is developed on a linux-system, but it runs on other
+POSIX platforms.
 
 NZBGet absolutely needs the following libraries:
 
@@ -85,20 +76,16 @@ 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):
-   - GnuTLS      (http://www.gnu.org/software/gnutls)
-     or
    - OpenSSL     (http://www.openssl.org)
+     or
+   - GnuTLS      (http://www.gnu.org/software/gnutls)
 
  - for gzip support in web-server and web-client (enabled by default):
    - zlib     (http://www.zlib.net)
 
-All these libraries are included in modern Linux distributions and
+All these libraries are included in modern POSIX 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 
@@ -151,13 +138,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 can not use libpar2 or libsigc++.
+    if you have troubles when compiling par2-module.
 
-  --with-tlslib=(GnuTLS, OpenSSL) - to select which TLS/SSL library
+  --with-tlslib=(OpenSSL, GnuTLS) - to select which TLS/SSL library
     should be used for encrypted server connections.
       
   --disable-tls - to make without TLS/SSL support. Use this option if
-    you can not neither GnuTLS nor OpenSSL.
+    you can not neither OpenSSL nor GnuTLS.
 
   --disable-gzip - to make without gzip support. Use this option
     if you can not use zlib.
@@ -168,37 +155,13 @@ 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 (libpar2), which needs sigc++ on its part.
+it uses library par2.
 
-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:
+For your convenience the source code of libpar2 is integrated into
+NZBGet’s source tree and is compiled automatically when you make NZBGet.
 
-  --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":
+In a case errors occur during this process the inclusion of par2-module
+can be disabled using configure option "--disable-parcheck":
 
   ./configure --disable-parcheck
 
@@ -206,10 +169,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 usefull:
+Following configure-parameters may be useful:
 
-  --with-libcurses-includes
-  --with-libcurses-libraries
+  --with-libcurses-includes=/path/to/curses/includes
+  --with-libcurses-libraries=/path/to/curses/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":
@@ -219,20 +182,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: GnuTLS or OpenSSL.
+with TLS/SSL support. NZBGet can use two libraries: OpenSSL or GnuTLS.
 Configure-script checks which library is installed and use it. If both are
-avialable it gives the precedence to GnuTLS. You may override that with
-the option --with-tlslib=(GnuTLS, OpenSSL). For example to build whith OpenSSL:
+available it gives the precedence to OpenSSL. You may override that with
+the option --with-tlslib=(OpenSSL, GnuTLS). For example to build with GnuTLS:
 
-  ./configure --with-tlslib=OpenSSL
+  ./configure --with-tlslib= GnuTLS
   
-Following configure-parameters may be usefull:
+Following configure-parameters may be useful:
 
-  --with-libtls-includes
-  --with-libtls-libraries
+  --with-libtls-includess=/path/to/gnutls/includes
+  --with-libtls-libraries=/path/to/gnutls/libraries
 
-  --with-openssl-includes
-  --with-openssl-libraries
+  --with-openssl-includess=/path/to/openssl/includes
+  --with-openssl-libraries=/path/to/openssl/libraries
 
 If none of these libraries is available you can make the program without 
 TLS/SSL support using option "--disable-tls":
@@ -243,32 +206,17 @@ TLS/SSL support using option "--disable-tls":
 5. Compiling on Windows
 =====================================
 
-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 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:
+NZBGet is developed using MS Visual Studio 2015 (Community Edition). The project
+file is provided.
 
+To compile the program with TLS/SSL support you need either OpenSSL or GnuTLS:
+   - OpenSSL  (http://www.openssl.org)
+   or
    - GnuTLS   (http://www.gnu.org/software/gnutls)
 
-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.   
+Also required are:
+   - Regex (http://gnuwin32.sourceforge.net/packages/regex.htm)
+   - Zlib (http://gnuwin32.sourceforge.net/packages/zlib.htm)
 
 =====================================
 6. Configuration
@@ -295,6 +243,7 @@ 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
@@ -387,9 +336,18 @@ It prints something like:
 
   [1] nzbname\filename1.rar (50.00 MB)
   [2] nzbname\filename1.r01 (50.00 MB)
+  [3] another-nzb\filename3.r01 (100.00 MB)
+  [4] another-nzb\filename3.r02 (100.00 MB)
 
-The numbers in square braces are ID's of files in queue. They can be used
-in edit-command. For example to move file with ID 2 to the top of queue:
+This is the list of individual files listed within nzb-file. To print
+the list of nzb-files (without content) add G-modifier to the list command:
+
+  [1] nzbname (4.56 GB)
+  [2] another-nzb (4.20 GB)
+
+The numbers in square braces are ID's of files or groups in queue.
+They can be used in edit-command. For example to move file with
+ID 2 to the top of queue:
 
   nzbget -E T 2
   
@@ -402,8 +360,8 @@ or to delete files from queue:
   nzbget -E D 3 10-15 20-21 16
 
 The edit-command has also a group-mode which affects all files from the
-same nzb-request. You need to pass one ID of any file in the group. For
-example to delete all files from the first nzb-request:
+same nzb-file. You need to pass an ID of the group. For example to delete
+the whole group 1:
 
   nzbget -E G D 1
 
@@ -444,10 +402,10 @@ Post processing scripts
 After the download of nzb-file is completed nzbget can call post-processing
 scripts, defined in configuration file.
 
-Example post-processing scripts are provided in directory "ppscripts".
+Example post-processing scripts are provided in directory "scripts".
 
 To use the scripts copy them into your local directory and set options
-<ScriptDir>, <DefScript> and <ScriptOrder>.
+<ScriptDir>, <PostScript> and <ScriptOrder>.
 
 For information on writing your own post-processing scripts please
 visit NZBGet web site.
@@ -469,13 +427,14 @@ and port defined in NZBGet configuration file in options "ControlIP" and
 
   http://localhost:6789/
 
-For login credentials type username "nzbget" (predefined and not changeable)
-and the password from the option "ControlPassword" (default is tegbzn6789).
+For login credentials type username and the password defined by
+options "ControlUsername" (default "nzbget") and "ControlPassword"
+(default "tegbzn6789").
 
 In a case your browser forget credentials, to prevent typing them each
 time, there is a workaround - use URL in the form:
 
-  http://localhost:6789/nzbget:password/
+  http://localhost:6789/username:password/
 
 Please note, that in this case the password is saved in a bookmark or in
 browser history in plain text and is easy to find by persons having
@@ -494,6 +453,35 @@ 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>
+
 =====================================
 9. Copyright
 =====================================
@@ -507,21 +495,13 @@ 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.sourceforge.net/forum
+    nzbget.net/forum
 
 or contact me at
 

README.md

@@ -0,0 +1,24 @@
+# NZBGet #
+[![License](https://img.shields.io/badge/license-GPL-blue.svg)](http://www.gnu.org/licenses/)
+[![Build Status](https://img.shields.io/travis/nzbget/nzbget/develop.svg)](https://travis-ci.org/nzbget/nzbget)
+[![Code Quality: Cpp](https://img.shields.io/lgtm/grade/cpp/g/nzbget/nzbget.svg?label=code%20quality:%20c%2b%2b)](https://lgtm.com/projects/g/nzbget/nzbget/context:cpp)
+[![Code Quality: JavaScript](https://img.shields.io/lgtm/grade/javascript/g/nzbget/nzbget.svg?label=code%20quality:%20js)](https://lgtm.com/projects/g/nzbget/nzbget/context:javascript)
+[![Total Alerts](https://img.shields.io/lgtm/alerts/g/nzbget/nzbget.svg)](https://lgtm.com/projects/g/nzbget/nzbget/alerts)
+
+[![Total downloads](https://img.shields.io/github/downloads/nzbget/nzbget/total.svg)](https://github.com/nzbget/nzbget/releases)
+[![Downloads (latest release)](https://img.shields.io/github/downloads/nzbget/nzbget/latest/total.svg?label=latest%20release)](https://github.com/nzbget/nzbget/releases/latest)
+
+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 on almost every device - classic PCs, NAS, media players, SAT-receivers, WLAN-routers, etc.
+The download area provides precompiled binaries
+for Windows, macOS, Linux (compatible with many CPUs and platform variants), FreeBSD and Android. For other platforms
+the program can be compiled from sources.
+
+- [Home page (nzbget.net)](http://nzbget.net) - learn more about NZBGet;
+- [Downloads](http://nzbget.net/download) - get compiled binaries and sources;
+- [Documentation](http://nzbget.net/documentation) - installation manuals, HOW-TOs, API;
+- [Forum](http://forum.nzbget.net) - get support, share your ideas, scripts, add-ons.

RemoteClient.h

@@ -1,83 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@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$
- *
- */
-
-
-#ifndef REMOTECLIENT_H
-#define REMOTECLIENT_H
-
-#include "Options.h"
-#include "MessageBase.h"
-#include "Connection.h"
-#include "DownloadInfo.h"
-
-class RemoteClient
-{
-private:
-	class MatchedNZBInfo: public NZBInfo
-	{
-	public:
-		bool		m_bMatch;
-	};
-
-	class MatchedFileInfo: public FileInfo
-	{
-	public:
-		bool		m_bMatch;
-	};
-
-	Connection* 	m_pConnection;
-	bool			m_bVerbose;
-
-	bool			InitConnection();
-	void			InitMessageBase(SNZBRequestBase* pMessageBase, int iRequest, int iSize);
-	bool			ReceiveBoolResponse();
-	void			printf(const char* msg, ...);
-	void			perror(const char* msg);
-
-public:
-					RemoteClient();
-					~RemoteClient();
-	void			SetVerbose(bool bVerbose) { m_bVerbose = bVerbose; };
-	bool 			RequestServerDownload(const char* szFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority);
-	bool			RequestServerList(bool bFiles, bool bGroups, const char* szPattern);
-	bool			RequestServerPauseUnpause(bool bPause, eRemotePauseUnpauseAction iAction);
-	bool			RequestServerSetDownloadRate(int iRate);
-	bool			RequestServerDumpDebug();
-	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();
-	bool			RequestServerVersion();
-	bool			RequestPostQueue();
-	bool 			RequestWriteLog(int iKind, const char* szText);
-	bool			RequestScan(bool bSyncMode);
-	bool			RequestHistory();
-	bool 			RequestServerDownloadUrl(const char* szURL, const char* szNZBFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority);
-	bool			RequestUrlQueue();
-	void			BuildFileList(SNZBListResponse* pListResponse, const char* pTrailingData, DownloadQueue* pDownloadQueue);
-};
-
-#endif

RemoteServer.cpp

@@ -1,235 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This 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 <sys/socket.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#endif
-
-#include "nzbget.h"
-#include "RemoteServer.h"
-#include "BinRpc.h"
-#include "WebServer.h"
-#include "Log.h"
-#include "Options.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-
-//*****************************************************************
-// RemoteServer
-
-RemoteServer::RemoteServer(bool bTLS)
-{
-	debug("Creating RemoteServer");
-
-	m_bTLS = bTLS;
-	m_pConnection = NULL;
-}
-
-RemoteServer::~RemoteServer()
-{
-	debug("Destroying RemoteServer");
-
-	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->GetConnectionTimeout());
-			m_pConnection->SetSuppressErrors(false);
-			bBind = m_pConnection->Bind();
-		}
-
-		// Accept connections and store the new Connection
-		Connection* pAcceptedConnection = NULL;
-		if (bBind)
-		{
-			pAcceptedConnection = m_pConnection->Accept();
-		}
-		if (!bBind || pAcceptedConnection == NULL)
-		{
-			// Remote server could not bind or accept connection, waiting 1/2 sec and try again
-			if (IsStopped())
-			{
-				break; 
-			}
-			usleep(500 * 1000);
-			delete m_pConnection;
-			m_pConnection = NULL;
-			continue;
-		}
-
-		RequestProcessor* commandThread = new RequestProcessor();
-		commandThread->SetAutoDestroy(true);
-		commandThread->SetConnection(pAcceptedConnection);
-#ifndef DISABLE_TLS
-		commandThread->SetTLS(m_bTLS);
-#endif
-		commandThread->Start();
-	}
-
-	if (m_pConnection)
-	{
-		m_pConnection->Disconnect();
-	}
-
-	debug("Exiting RemoteServer-loop");
-}
-
-void RemoteServer::Stop()
-{
-	Thread::Stop();
-	if (m_pConnection)
-	{
-		m_pConnection->SetSuppressErrors(true);
-		m_pConnection->Cancel();
-#ifdef WIN32
-		m_pConnection->Disconnect();
-#endif
-	}
-}
-
-//*****************************************************************
-// RequestProcessor
-
-RequestProcessor::~RequestProcessor()
-{
-	m_pConnection->Disconnect();
-	delete m_pConnection;
-}
-
-void RequestProcessor::Run()
-{
-	bool bOK = false;
-
-	m_pConnection->SetSuppressErrors(true);
-
-#ifndef DISABLE_TLS
-	if (m_bTLS && !m_pConnection->StartTLS(false, g_pOptions->GetSecureCert(), g_pOptions->GetSecureKey()))
-	{
-		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))
-	{
-		debug("Could not read request signature, request received on port %i from %s", m_bTLS ? g_pOptions->GetSecurePort() : g_pOptions->GetControlPort(), m_pConnection->GetRemoteAddr());
-		return;
-	}
-
-	if ((int)ntohl(iSignature) == (int)NZBMESSAGE_SIGNATURE)
-	{
-		// binary request received
-		bOK = true;
-		BinRpcProcessor processor;
-		processor.SetConnection(m_pConnection);
-		processor.Execute();
-	}
-	else if (!strncmp((char*)&iSignature, "POST", 4) || 
-		!strncmp((char*)&iSignature, "GET ", 4) ||
-		!strncmp((char*)&iSignature, "OPTI", 4))
-	{
-		// HTTP request received
-		char szBuffer[1024];
-		if (m_pConnection->ReadLine(szBuffer, sizeof(szBuffer), NULL))
-		{
-			WebProcessor::EHttpMethod eHttpMethod = WebProcessor::hmGet;
-			char* szUrl = szBuffer;
-			if (!strncmp((char*)&iSignature, "POST", 4))
-			{
-				eHttpMethod = WebProcessor::hmPost;
-				szUrl++;
-			}
-			if (!strncmp((char*)&iSignature, "OPTI", 4) && strlen(szUrl) > 4)
-			{
-				eHttpMethod = WebProcessor::hmOptions;
-				szUrl += 4;
-			}
-			if (char* p = strchr(szUrl, ' '))
-			{
-				*p = '\0';
-			}
-
-			debug("url: %s", szUrl);
-
-			WebProcessor processor;
-			processor.SetConnection(m_pConnection);
-			processor.SetUrl(szUrl);
-			processor.SetHttpMethod(eHttpMethod);
-			processor.Execute();
-			bOK = true;
-		}
-	}
-
-	if (!bOK)
-	{
-		warn("Non-nzbget request received on port %i from %s", m_bTLS ? g_pOptions->GetSecurePort() : g_pOptions->GetControlPort(), m_pConnection->GetRemoteAddr());
-	}
-}

RemoteServer.h

@@ -1,59 +0,0 @@
-/*
- *  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>
- *
- *  This 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 REMOTESERVER_H
-#define REMOTESERVER_H
-
-#include "Thread.h"
-#include "Connection.h"
-
-class RemoteServer : public Thread
-{
-private:
-	bool				m_bTLS;
-	Connection*			m_pConnection;
-
-public:
-						RemoteServer(bool bTLS);
-						~RemoteServer();
-	virtual void		Run();
-	virtual void 		Stop();
-};
-
-class RequestProcessor : public Thread
-{
-private:
-	bool				m_bTLS;
-	Connection*			m_pConnection;
-
-public:
-						~RequestProcessor();
-	virtual void		Run();
-	void				SetTLS(bool bTLS) { m_bTLS = bTLS; }
-	void				SetConnection(Connection* pConnection) { m_pConnection = pConnection; }
-};
-
-#endif

Scanner.cpp

@@ -1,651 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifdef WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#endif
-#include <sys/stat.h>
-
-#include "nzbget.h"
-#include "Scanner.h"
-#include "Options.h"
-#include "Log.h"
-#include "QueueCoordinator.h"
-#include "ScriptController.h"
-#include "DiskState.h"
-#include "Util.h"
-
-extern QueueCoordinator* g_pQueueCoordinator;
-extern Options* g_pOptions;
-extern DiskState* g_pDiskState;
-
-Scanner::FileData::FileData(const char* szFilename)
-{
-	m_szFilename = strdup(szFilename);
-	m_iSize = 0;
-	m_tLastChange = 0;
-}
-
-Scanner::FileData::~FileData()
-{
-	free(m_szFilename);
-}
-
-
-Scanner::QueueData::QueueData(const char* szFilename, const char* szNZBName, const char* szCategory,
-	int iPriority, const char* szDupeKey, int iDupeScore, EDupeMode eDupeMode,
-	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused, EAddStatus* pAddStatus)
-{
-	m_szFilename = strdup(szFilename);
-	m_szNZBName = strdup(szNZBName);
-	m_szCategory = strdup(szCategory ? szCategory : "");
-	m_iPriority = iPriority;
-	m_szDupeKey = strdup(szDupeKey ? szDupeKey : "");
-	m_iDupeScore = iDupeScore;
-	m_eDupeMode = eDupeMode;
-	m_bAddTop = bAddTop;
-	m_bAddPaused = bAddPaused;
-	m_pAddStatus = pAddStatus;
-
-	if (pParameters)
-	{
-		m_Parameters.CopyFrom(pParameters);
-	}
-}
-
-Scanner::QueueData::~QueueData()
-{
-	free(m_szFilename);
-	free(m_szNZBName);
-	free(m_szCategory);
-	free(m_szDupeKey);
-}
-
-void Scanner::QueueData::SetAddStatus(EAddStatus eAddStatus)
-{
-	if (m_pAddStatus)
-	{
-		*m_pAddStatus = eAddStatus;
-	}
-}
-
-
-Scanner::Scanner()
-{
-	debug("Creating Scanner");
-
-	m_bRequestedNZBDirScan = false;
-	m_bScanning = false;
-	m_iNZBDirInterval = g_pOptions->GetNzbDirInterval() * 1000;
-	m_iPass = 0;
-
-	const char* szNZBScript = g_pOptions->GetNZBProcess();
-	m_bNZBScript = szNZBScript && strlen(szNZBScript) > 0;
-}
-
-Scanner::~Scanner()
-{
-	debug("Destroying Scanner");
-
-	for (FileList::iterator it = m_FileList.begin(); it != m_FileList.end(); it++)
-    {
-        delete *it;
-	}
-	m_FileList.clear();
-
-	ClearQueueList();
-}
-
-void Scanner::ClearQueueList()
-{
-	for (QueueList::iterator it = m_QueueList.begin(); it != m_QueueList.end(); it++)
-    {
-        delete *it;
-	}
-	m_QueueList.clear();
-}
-
-void Scanner::Check()
-{
-	m_mutexScan.Lock();
-
-	if (m_bRequestedNZBDirScan || 
-		(!g_pOptions->GetPauseScan() && g_pOptions->GetNzbDirInterval() > 0 && 
-		 m_iNZBDirInterval >= g_pOptions->GetNzbDirInterval() * 1000))
-	{
-		// check nzbdir every g_pOptions->GetNzbDirInterval() seconds or if requested
-		bool bCheckStat = !m_bRequestedNZBDirScan;
-		m_bRequestedNZBDirScan = false;
-		m_bScanning = true;
-		CheckIncomingNZBs(g_pOptions->GetNzbDir(), "", bCheckStat);
-		if (!bCheckStat && m_bNZBScript)
-		{
-			// if immediate scan requested, we need second scan to process files extracted by NzbProcess-script
-			CheckIncomingNZBs(g_pOptions->GetNzbDir(), "", bCheckStat);
-		}
-		m_bScanning = false;
-		m_iNZBDirInterval = 0;
-
-		// if NzbDirFileAge is less than NzbDirInterval (that can happen if NzbDirInterval
-		// is set for rare scans like once per hour) we make 4 scans:
-		//   - one additional scan is neccessary to check sizes of detected files;
-		//   - another scan is required to check files which were extracted by NzbProcess-script;
-		//   - third scan is needed to check sizes of extracted files.
-		if (g_pOptions->GetNzbDirInterval() > 0 && g_pOptions->GetNzbDirFileAge() < g_pOptions->GetNzbDirInterval())
-		{
-			int iMaxPass = m_bNZBScript ? 3 : 1;
-			if (m_iPass < iMaxPass)
-			{
-				// scheduling another scan of incoming directory in NzbDirFileAge seconds.
-				m_iNZBDirInterval = (g_pOptions->GetNzbDirInterval() - g_pOptions->GetNzbDirFileAge()) * 1000;
-				m_iPass++;
-			}
-			else
-			{
-				m_iPass = 0;
-			}
-		}
-
-		DropOldFiles();
-		ClearQueueList();
-	}
-	m_iNZBDirInterval += 200;
-
-	m_mutexScan.Unlock();
-}
-
-/**
-* Check if there are files in directory for incoming nzb-files
-* and add them to download queue
-*/
-void Scanner::CheckIncomingNZBs(const char* szDirectory, const char* szCategory, bool bCheckStat)
-{
-	DirBrowser dir(szDirectory);
-	while (const char* filename = dir.Next())
-	{
-		struct stat buffer;
-		char fullfilename[1023 + 1]; // one char reserved for the trailing slash (if needed)
-		snprintf(fullfilename, 1023, "%s%s", szDirectory, filename);
-		fullfilename[1023 - 1] = '\0';
-		if (!stat(fullfilename, &buffer))
-		{
-			// check subfolders
-			if ((buffer.st_mode & S_IFDIR) != 0 && strcmp(filename, ".") && strcmp(filename, ".."))
-			{
-				fullfilename[strlen(fullfilename) + 1] = '\0';
-				fullfilename[strlen(fullfilename)] = PATH_SEPARATOR;
-				const char* szUseCategory = filename;
-				char szSubCategory[1024];
-				if (strlen(szCategory) > 0)
-				{
-					snprintf(szSubCategory, 1023, "%s%c%s", szCategory, PATH_SEPARATOR, filename);
-					szSubCategory[1024 - 1] = '\0';
-					szUseCategory = szSubCategory;
-				}
-				CheckIncomingNZBs(fullfilename, szUseCategory, bCheckStat);
-			}
-			else if ((buffer.st_mode & S_IFDIR) == 0 && CanProcessFile(fullfilename, bCheckStat))
-			{
-				ProcessIncomingFile(szDirectory, filename, fullfilename, szCategory);
-			}
-		}
-	}
-}
-
-/**
- * Only files which were not changed during last g_pOptions->GetNzbDirFileAge() seconds
- * can be processed. That prevents the processing of files, which are currently being
- * copied into nzb-directory (eg. being downloaded in web-browser).
- */
-bool Scanner::CanProcessFile(const char* szFullFilename, bool bCheckStat)
-{
-	const char* szExtension = strrchr(szFullFilename, '.');
-	if (!szExtension ||
-		!strcasecmp(szExtension, ".queued") ||
-		!strcasecmp(szExtension, ".error") ||
-		!strcasecmp(szExtension, ".processed"))
-	{
-		return false;
-	}
-
-	if (!bCheckStat)
-	{
-		return true;
-	}
-
-	long long lSize = Util::FileSize(szFullFilename);
-	time_t tCurrent = time(NULL);
-	bool bCanProcess = false;
-	bool bInList = false;
-
-	for (FileList::iterator it = m_FileList.begin(); it != m_FileList.end(); it++)
-    {
-        FileData* pFileData = *it;
-		if (!strcmp(pFileData->GetFilename(), szFullFilename))
-		{
-			bInList = true;
-			if (pFileData->GetSize() == lSize &&
-				tCurrent - pFileData->GetLastChange() >= g_pOptions->GetNzbDirFileAge())
-			{
-				bCanProcess = true;
-				delete pFileData;
-				m_FileList.erase(it);
-			}
-			else
-			{
-				pFileData->SetSize(lSize);
-				if (pFileData->GetSize() != lSize)
-				{
-					pFileData->SetLastChange(tCurrent);
-				}
-			}
-			break;
-		}
-	}
-
-	if (!bInList)
-	{
-		FileData* pFileData = new FileData(szFullFilename);
-		pFileData->SetSize(lSize);
-		pFileData->SetLastChange(tCurrent);
-		m_FileList.push_back(pFileData);
-	}
-
-	return bCanProcess;
-}
-
-/**
- * Remove old files from the list of monitored files.
- * Normally these files are deleted from the list when they are processed.
- * However if a file was detected by function "CanProcessFile" once but wasn't 
- * processed later (for example if the user deleted it), it will stay in the list,
- * until we remove it here.
- */
-void Scanner::DropOldFiles()
-{
-	time_t tCurrent = time(NULL);
-
-	int i = 0;
-	for (FileList::iterator it = m_FileList.begin(); it != m_FileList.end(); )
-    {
-        FileData* pFileData = *it;
-		if ((tCurrent - pFileData->GetLastChange() >= 
-			(g_pOptions->GetNzbDirInterval() + g_pOptions->GetNzbDirFileAge()) * 2) ||
-			// can occur if the system clock was adjusted
-			tCurrent < pFileData->GetLastChange())
-		{
-			debug("Removing file %s from scan file list", pFileData->GetFilename());
-
-			delete pFileData;
-			m_FileList.erase(it);
-			it = m_FileList.begin() + i;
-		}
-		else
-		{
-			it++;
-			i++;
-		}
-	}
-}
-
-void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFilename,
-	const char* szFullFilename, const char* szCategory)
-{
-	const char* szExtension = strrchr(szBaseFilename, '.');
-	if (!szExtension)
-	{
-		return;
-	}
-
-	char* szNZBName = strdup("");
-	char* szNZBCategory = strdup(szCategory);
-	NZBParameterList* pParameters = new NZBParameterList();
-	int iPriority = 0;
-	bool bAddTop = false;
-	bool bAddPaused = false;
-	const char* szDupeKey = NULL;
-	int iDupeScore = 0;
-	EDupeMode eDupeMode = dmScore;
-	EAddStatus eAddStatus = asSkipped;
-	bool bAdded = false;
-	QueueData* pQueueData = NULL;
-
-	for (QueueList::iterator it = m_QueueList.begin(); it != m_QueueList.end(); it++)
-    {
-		QueueData* pQueueData1 = *it;
-		if (Util::SameFilename(pQueueData1->GetFilename(), szFullFilename))
-		{
-			pQueueData = pQueueData1;
-			free(szNZBName);
-			szNZBName = strdup(pQueueData->GetNZBName());
-			free(szNZBCategory);
-			szNZBCategory = strdup(pQueueData->GetCategory());
-			iPriority = pQueueData->GetPriority();
-			szDupeKey = pQueueData->GetDupeKey();
-			iDupeScore = pQueueData->GetDupeScore();
-			eDupeMode = pQueueData->GetDupeMode();
-			bAddTop = pQueueData->GetAddTop();
-			bAddPaused = pQueueData->GetAddPaused();
-			pParameters->CopyFrom(pQueueData->GetParameters());
-		}
-	}
-
-	InitPPParameters(szNZBCategory, pParameters);
-
-	bool bExists = true;
-
-	if (m_bNZBScript && strcasecmp(szExtension, ".nzb_processed"))
-	{
-		NZBScriptController::ExecuteScript(g_pOptions->GetNZBProcess(), szFullFilename, szDirectory, 
-			&szNZBName, &szNZBCategory, &iPriority, pParameters, &bAddTop, &bAddPaused); 
-		bExists = Util::FileExists(szFullFilename);
-		if (bExists && strcasecmp(szExtension, ".nzb"))
-		{
-			char bakname2[1024];
-			bool bRenameOK = Util::RenameBak(szFullFilename, "processed", false, bakname2, 1024);
-			if (!bRenameOK)
-			{
-				char szSysErrStr[256];
-				error("Could not rename file %s to %s: %s", szFullFilename, bakname2, Util::GetLastErrorMessage(szSysErrStr, sizeof(szSysErrStr)));
-			}
-		}
-	}
-
-	if (!strcasecmp(szExtension, ".nzb_processed"))
-	{
-		char szRenamedName[1024];
-		bool bRenameOK = Util::RenameBak(szFullFilename, "nzb", true, szRenamedName, 1024);
-		if (bRenameOK)
-		{
-			bAdded = AddFileToQueue(szRenamedName, szNZBName, szNZBCategory, iPriority,
-				szDupeKey, iDupeScore, eDupeMode, pParameters, bAddTop, bAddPaused);
-		}
-		else
-		{
-			char szSysErrStr[256];
-			error("Could not rename file %s to %s: %s", szFullFilename, szRenamedName, Util::GetLastErrorMessage(szSysErrStr, sizeof(szSysErrStr)));
-			eAddStatus = asFailed;
-		}
-	}
-	else if (bExists && !strcasecmp(szExtension, ".nzb"))
-	{
-		bAdded = AddFileToQueue(szFullFilename, szNZBName, szNZBCategory, iPriority,
-			szDupeKey, iDupeScore, eDupeMode, pParameters, bAddTop, bAddPaused);
-	}
-
-	delete pParameters;
-
-	free(szNZBName);
-	free(szNZBCategory);
-
-	if (pQueueData)
-	{
-		pQueueData->SetAddStatus(eAddStatus == asFailed ? asFailed : bAdded ? asSuccess : asSkipped);
-	}
-}
-
-void Scanner::InitPPParameters(const char* szCategory, NZBParameterList* pParameters)
-{
-	bool bUnpack = g_pOptions->GetUnpack();
-	const char* szDefScript = g_pOptions->GetDefScript();
-	
-	if (szCategory && *szCategory)
-	{
-		Options::Category* pCategory = g_pOptions->FindCategory(szCategory, false);
-		if (pCategory)
-		{
-			bUnpack = pCategory->GetUnpack();
-			if (pCategory->GetDefScript() && *pCategory->GetDefScript())
-			{
-				szDefScript = pCategory->GetDefScript();
-			}
-		}
-	}
-	
-	pParameters->SetParameter("*Unpack:", bUnpack ? "yes" : "no");
-	
-	if (szDefScript && *szDefScript)
-	{
-		// split szDefScript into tokens and create pp-parameter for each token
-		char* szDefScript2 = strdup(szDefScript);
-		char* saveptr;
-		char* szScriptName = strtok_r(szDefScript2, ",;", &saveptr);
-		while (szScriptName)
-		{
-			szScriptName = Util::Trim(szScriptName);
-			if (szScriptName[0] != '\0')
-			{
-				char szParam[1024];
-				snprintf(szParam, 1024, "%s:", szScriptName);
-				szParam[1024-1] = '\0';
-				pParameters->SetParameter(szParam, "yes");
-			}
-			szScriptName = strtok_r(NULL, ",;", &saveptr);
-		}
-		free(szDefScript2);
-	}
-}
-
-bool Scanner::AddFileToQueue(const char* szFilename, const char* szNZBName, const char* szCategory,
-	int iPriority, const char* szDupeKey, int iDupeScore, EDupeMode eDupeMode,
-	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused)
-{
-	const char* szBasename = Util::BaseFileName(szFilename);
-
-	info("Collection %s found", szBasename);
-
-	NZBFile* pNZBFile = NZBFile::Create(szFilename, szCategory);
-	bool bOK = pNZBFile != NULL;
-	if (!bOK)
-	{
-		error("Could not add collection %s to queue", szBasename);
-	}
-
-	char bakname2[1024];
-	if (!Util::RenameBak(szFilename, pNZBFile ? "queued" : "error", false, bakname2, 1024))
-	{
-		bOK = false;
-		char szSysErrStr[256];
-		error("Could not rename file %s to %s: %s", szFilename, bakname2, Util::GetLastErrorMessage(szSysErrStr, sizeof(szSysErrStr)));
-	}
-
-	if (bOK)
-	{
-		pNZBFile->GetNZBInfo()->SetQueuedFilename(bakname2);
-
-		if (szNZBName && strlen(szNZBName) > 0)
-		{
-			pNZBFile->GetNZBInfo()->SetName(NULL);
-#ifdef WIN32
-			char* szAnsiFilename = strdup(szNZBName);
-			WebUtil::Utf8ToAnsi(szAnsiFilename, strlen(szAnsiFilename) + 1);
-			pNZBFile->GetNZBInfo()->SetFilename(szAnsiFilename);
-			free(szAnsiFilename);
-#else
-			pNZBFile->GetNZBInfo()->SetFilename(szNZBName);
-#endif
-			pNZBFile->GetNZBInfo()->BuildDestDirName();
-		}
-
-		pNZBFile->GetNZBInfo()->SetDupeKey(szDupeKey);
-		pNZBFile->GetNZBInfo()->SetDupeScore(iDupeScore);
-		pNZBFile->GetNZBInfo()->SetDupeMode(eDupeMode);
-
-		if (pNZBFile->GetPassword())
-		{
-			pNZBFile->GetNZBInfo()->GetParameters()->SetParameter("*Unpack:Password", pNZBFile->GetPassword());
-		}
-
-		pNZBFile->GetNZBInfo()->GetParameters()->CopyFrom(pParameters);
-
-		for (NZBFile::FileInfos::iterator it = pNZBFile->GetFileInfos()->begin(); it != pNZBFile->GetFileInfos()->end(); it++)
-		{
-			FileInfo* pFileInfo = *it;
-			pFileInfo->SetPriority(iPriority);
-			pFileInfo->SetPaused(bAddPaused);
-		}
-
-		g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, bAddTop);
-	}
-
-	delete pNZBFile;
-
-	return bOK;
-}
-
-void Scanner::ScanNZBDir(bool bSyncMode)
-{
-	m_mutexScan.Lock();
-	m_bScanning = true;
-	m_bRequestedNZBDirScan = true;
-	m_mutexScan.Unlock();
-
-	while (bSyncMode && (m_bScanning || m_bRequestedNZBDirScan))
-	{
-		usleep(100 * 1000);
-	}
-}
-
-Scanner::EAddStatus Scanner::AddExternalFile(const char* szNZBName, const char* szCategory,
-	int iPriority, const char* szDupeKey, int iDupeScore,  EDupeMode eDupeMode,
-	NZBParameterList* pParameters, bool bAddTop, bool bAddPaused,
-	const char* szFileName, const char* szBuffer, int iBufSize)
-{
-	bool bNZB = false;
-	char szTempFileName[1024];
-
-	if (szFileName)
-	{
-		strncpy(szTempFileName, szFileName, 1024);
-		szTempFileName[1024-1] = '\0';
-	}
-	else
-	{
-		int iNum = 1;
-		while (iNum == 1 || Util::FileExists(szTempFileName))
-		{
-			snprintf(szTempFileName, 1024, "%snzb-%i.tmp", g_pOptions->GetTempDir(), iNum);
-			szTempFileName[1024-1] = '\0';
-			iNum++;
-		}
-
-		if (!Util::SaveBufferIntoFile(szTempFileName, szBuffer, iBufSize))
-		{
-			error("Could not create file %s", szTempFileName);
-			return asFailed;
-		}
-
-		char buf[1024];
-		strncpy(buf, szBuffer, 1024);
-		buf[1024-1] = '\0';
-		bNZB = !strncmp(buf, "<?xml", 5) && strstr(buf, "<nzb");
-	}
-
-	// move file into NzbDir, make sure the file name is unique
-	char szValidNZBName[1024];
-	strncpy(szValidNZBName, Util::BaseFileName(szNZBName), 1024);
-	szValidNZBName[1024-1] = '\0';
-	Util::MakeValidFilename(szValidNZBName, '_', false);
-
-#ifdef WIN32
-	WebUtil::Utf8ToAnsi(szValidNZBName, 1024);
-#endif
-
-	const char* szExtension = strrchr(szNZBName, '.');
-	if (bNZB && (!szExtension || strcasecmp(szExtension, ".nzb")))
-	{
-		strncat(szValidNZBName, ".nzb", 1024 - strlen(szValidNZBName) - 1);
-	}
-
-	char szScanFileName[1024];
-	snprintf(szScanFileName, 1024, "%s%s", g_pOptions->GetNzbDir(), szValidNZBName);
-
-	char *szExt = strrchr(szValidNZBName, '.');
-	if (szExt)
-	{
-		*szExt = '\0';
-		szExt++;
-	}
-
-	int iNum = 2;
-	while (Util::FileExists(szScanFileName))
-	{
-		if (szExt)
-		{
-			snprintf(szScanFileName, 1024, "%s%s_%i.%s", g_pOptions->GetNzbDir(), szValidNZBName, iNum, szExt);
-		}
-		else
-		{
-			snprintf(szScanFileName, 1024, "%s%s_%i", g_pOptions->GetNzbDir(), szValidNZBName, iNum);
-		}
-		szScanFileName[1024-1] = '\0';
-		iNum++;
-	}
-
-	m_mutexScan.Lock();
-
-	if (!Util::MoveFile(szTempFileName, szScanFileName))
-	{
-		char szSysErrStr[256];
-		error("Could not move file %s to %s: %s", szTempFileName, szScanFileName, Util::GetLastErrorMessage(szSysErrStr, sizeof(szSysErrStr)));
-		remove(szTempFileName);
-		m_mutexScan.Unlock(); // UNLOCK
-		return asFailed;
-	}
-
-	char* szUseCategory = strdup(szCategory ? szCategory : "");
-	Options::Category *pCategory = g_pOptions->FindCategory(szCategory, true);
-	if (pCategory && strcmp(szCategory, pCategory->GetName()))
-	{
-		free(szUseCategory);
-		szUseCategory = strdup(pCategory->GetName());
-		detail("Category %s matched to %s for %s", szCategory, szUseCategory, szNZBName);
-	}
-
-	EAddStatus eAddStatus = asSkipped;
-	QueueData* pQueueData = new QueueData(szScanFileName, szNZBName, szUseCategory,
-		iPriority, szDupeKey, iDupeScore, eDupeMode, pParameters, bAddTop, bAddPaused, &eAddStatus);
-	free(szUseCategory);
-	m_QueueList.push_back(pQueueData);
-
-	m_mutexScan.Unlock();
-
-	ScanNZBDir(true);
-
-	return eAddStatus;
-}

Scanner.h

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

Scheduler.cpp

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

Scheduler.h

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

ScriptController.h

@@ -1,167 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef SCRIPTCONTROLLER_H
-#define SCRIPTCONTROLLER_H
-
-#include <list>
-
-#include "Log.h"
-#include "Thread.h"
-#include "DownloadInfo.h"
-#include "Options.h"
-
-class EnvironmentStrings
-{
-private:
-	typedef std::vector<char*>		Strings;
-	
-	Strings				m_strings;
-
-public:
-						EnvironmentStrings();
-						~EnvironmentStrings();
-	void				Clear();
-	void				InitFromCurrentProcess();
-	void				Append(char* szString);
-#ifdef WIN32
-	char*				GetStrings();
-#else	
-	char**				GetStrings();
-#endif
-};
-
-class ScriptController
-{
-private:
-	const char*			m_szScript;
-	const char*			m_szWorkingDir;
-	const char**		m_szArgs;
-	bool				m_bFreeArgs;
-	const char*			m_szStdArgs[2];
-	const char*			m_szInfoName;
-	const char*			m_szLogPrefix;
-	EnvironmentStrings	m_environmentStrings;
-	bool				m_bTerminated;
-	bool				m_bDetached;
-	FILE*				m_pReadpipe;
-#ifdef WIN32
-	HANDLE				m_hProcess;
-	char				m_szCmdLine[2048];
-#else
-	pid_t				m_hProcess;
-#endif
-
-protected:
-	void				ProcessOutput(char* szText);
-	virtual bool		ReadLine(char* szBuf, int iBufSize, FILE* pStream);
-	void				PrintMessage(Message::EKind eKind, const char* szFormat, ...);
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-	bool				GetTerminated() { return m_bTerminated; }
-	void				ResetEnv();
-	void				PrepareEnvOptions(const char* szStripPrefix);
-	void				PrepareEnvParameters(NZBInfo* pNZBInfo, const char* szStripPrefix);
-	void				PrepareArgs();
-
-public:
-						ScriptController();
-	virtual				~ScriptController();
-	int					Execute();
-	void				Terminate();
-	void				Detach();
-
-	void				SetScript(const char* szScript) { m_szScript = szScript; }
-	const char*			GetScript() { return m_szScript; }
-	void				SetWorkingDir(const char* szWorkingDir) { m_szWorkingDir = szWorkingDir; }
-	void				SetArgs(const char** szArgs, bool bFreeArgs) { m_szArgs = szArgs; m_bFreeArgs = bFreeArgs; }
-	void				SetInfoName(const char* szInfoName) { m_szInfoName = szInfoName; }
-	const char*			GetInfoName() { return m_szInfoName; }
-	void				SetLogPrefix(const char* szLogPrefix) { m_szLogPrefix = szLogPrefix; }
-	void				SetEnvVar(const char* szName, const char* szValue);
-	void				SetEnvVarSpecial(const char* szPrefix, const char* szName, const char* szValue);
-	void				SetIntEnvVar(const char* szName, int iValue);
-};
-
-class PostScriptController : public Thread, public ScriptController
-{
-private:
-	PostInfo*			m_pPostInfo;
-	char				m_szNZBName[1024];
- 	int					m_iPrefixLen;
-
-	void				ExecuteScript(const char* szScriptName, const char* szDisplayName, const char* szLocation);
-	void				PrepareParams(const char* szScriptName);
-	ScriptStatus::EStatus	AnalyseExitCode(int iExitCode);
-
-	typedef std::deque<char*>		FileList;
-
-protected:
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-
-public:
-	virtual void		Run();
-	virtual void		Stop();
-	static void			StartJob(PostInfo* pPostInfo);
-	static void			InitParamsForNewNZB(NZBInfo* pNZBInfo);
-};
-
-class NZBScriptController : public ScriptController
-{
-private:
-	char**				m_pNZBName;
-	char**				m_pCategory;
-	int*				m_iPriority;
-	NZBParameterList*	m_pParameters;
-	bool*				m_bAddTop;
-	bool*				m_bAddPaused;
-	int					m_iPrefixLen;
-
-protected:
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-
-public:
-	static void			ExecuteScript(const char* szScript, const char* szNZBFilename, const char* szDirectory,
-							char** pNZBName, char** pCategory, int* iPriority, NZBParameterList* pParameters,
-							bool* bAddTop, bool* bAddPaused);
-};
-
-class NZBAddedScriptController : public Thread, public ScriptController
-{
-private:
-	char*				m_szNZBName;
-
-public:
-	virtual void		Run();
-	static void			StartScript(DownloadQueue* pDownloadQueue, NZBInfo *pNZBInfo, const char* szScript);
-};
-
-class SchedulerScriptController : public Thread, public ScriptController
-{
-public:
-	virtual void		Run();
-	static void			StartScript(const char* szCommandLine);
-};
-
-#endif

ServerPool.cpp

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

ServerPool.h

@@ -1,85 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef SERVERPOOL_H
-#define SERVERPOOL_H
-
-#include <vector>
-#include <time.h>
-
-#include "Thread.h"
-#include "NewsServer.h"
-#include "NNTPConnection.h"
-
-class ServerPool
-{
-private:
-	class PooledConnection : public NNTPConnection
-	{
-	private:
-		bool			m_bInUse;
-		time_t			m_tFreeTime;
-	public:
-						PooledConnection(NewsServer* server);
-		bool			GetInUse() { return m_bInUse; }
-		void			SetInUse(bool bInUse) { m_bInUse = bInUse; }
-		time_t			GetFreeTime() { return m_tFreeTime; }
-		void			SetFreeTimeNow() { m_tFreeTime = ::time(NULL); }
-	};
-
-	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;
-	Mutex			 	m_mutexConnections;
-	int					m_iTimeout;
-	int					m_iGeneration;
-
-	void				NormalizeLevels();
-	static bool			CompareServers(NewsServer* pServer1, NewsServer* pServer2);
-
-public:
-						ServerPool();
-						~ServerPool();
-	void				SetTimeout(int iTimeout) { m_iTimeout = iTimeout; }
-	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);
-	void 				FreeConnection(NNTPConnection* pConnection, bool bUsed);
-	void				CloseUnusedConnections();
-	void				Changed();
-	int					GetGeneration() { return m_iGeneration; }
-
-	void				LogDebugInfo();
-};
-
-#endif

TLS.cpp

@@ -1,553 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2008-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#ifdef WIN32
-#define SKIP_DEFAULT_WINDOWS_HEADERS
-#include "win32.h"
-#endif
-
-#ifndef DISABLE_TLS
-
-#include <stdlib.h>
-#include <string.h>
-#ifdef WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
-#include <strings.h>
-#endif
-#include <ctype.h>
-#include <limits.h>
-#include <time.h>
-#include <errno.h>
-#include <list>
-
-#ifdef WIN32
-#include "nzbget.h"
-#endif
-
-#ifdef HAVE_LIBGNUTLS
-#include <gnutls/gnutls.h>
-#if GNUTLS_VERSION_NUMBER <= 0x020b00
-#define NEED_GCRYPT_LOCKING
-#endif
-#ifdef NEED_GCRYPT_LOCKING
-#include <gcrypt.h>
-#endif /* NEED_GCRYPT_LOCKING */
-#endif /* HAVE_LIBGNUTLS */
-#ifdef HAVE_OPENSSL
-#include <openssl/ssl.h>
-#include <openssl/err.h>
-#endif /* HAVE_OPENSSL */
-
-#ifndef WIN32
-#include "nzbget.h"
-#endif
-
-#include "TLS.h"
-#include "Thread.h"
-#include "Log.h"
-
-
-#ifdef HAVE_LIBGNUTLS
-#ifdef NEED_GCRYPT_LOCKING
-
-/**
- * Mutexes for gcryptlib
- */
-
-typedef std::list<Mutex*> Mutexes;
-Mutexes* g_pGCryptLibMutexes;
-
-static int gcry_mutex_init(void **priv)
-{
-	Mutex* pMutex = new Mutex();
-	g_pGCryptLibMutexes->push_back(pMutex);
-	*priv = pMutex;
-	return 0;
-}
-
-static int gcry_mutex_destroy(void **lock)
-{
-	Mutex* pMutex = ((Mutex*)*lock);
-	g_pGCryptLibMutexes->remove(pMutex);
-	delete pMutex;
-	return 0;
-}
-
-static int gcry_mutex_lock(void **lock)
-{
-	((Mutex*)*lock)->Lock();
-	return 0;
-}
-
-static int gcry_mutex_unlock(void **lock)
-{
-	((Mutex*)*lock)->Unlock();
-	return 0;
-}
-
-static struct gcry_thread_cbs gcry_threads_Mutex =
-{	GCRY_THREAD_OPTION_USER, NULL,
-	gcry_mutex_init, gcry_mutex_destroy,
-	gcry_mutex_lock, gcry_mutex_unlock,
-	NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL
-};
-
-#endif /* NEED_GCRYPT_LOCKING */
-#endif /* HAVE_LIBGNUTLS */
-
-
-#ifdef HAVE_OPENSSL
-
-/**
- * Mutexes for OpenSSL
- */
-
-Mutex* *g_pOpenSSLMutexes;
-
-static void openssl_locking(int mode, int n, const char *file, int line)
-{
-	Mutex* mutex = g_pOpenSSLMutexes[n];
-	if (mode & CRYPTO_LOCK)
-	{
-		mutex->Lock();
-	}
-	else
-	{
-		mutex->Unlock();
-	}
-}
-
-/*
-static unsigned long openssl_thread_id(void)
-{
-#ifdef WIN32
-	return (unsigned long)GetCurrentThreadId();
-#else
-	return (unsigned long)pthread_self();
-#endif
-}
-*/
-
-static struct CRYPTO_dynlock_value* openssl_dynlock_create(const char *file, int line)
-{
-	return (CRYPTO_dynlock_value*)new Mutex();
-}
-
-static void openssl_dynlock_destroy(struct CRYPTO_dynlock_value *l, const char *file, int line)
-{
-	Mutex* mutex = (Mutex*)l;
-	delete mutex;
-}
-
-static void openssl_dynlock_lock(int mode, struct CRYPTO_dynlock_value *l, const char *file, int line)
-{
-	Mutex* mutex = (Mutex*)l;
-	if (mode & CRYPTO_LOCK)
-	{
-		mutex->Lock();
-	}
-	else
-	{
-		mutex->Unlock();
-	}
-}
-
-#endif /* HAVE_OPENSSL */
-
-
-void TLSSocket::Init()
-{
-	debug("Initializing TLS library");
-
-#ifdef HAVE_LIBGNUTLS
-#ifdef NEED_GCRYPT_LOCKING
-	g_pGCryptLibMutexes = new Mutexes();
-#endif /* NEED_GCRYPT_LOCKING */
-
-	int error_code;
-
-#ifdef NEED_GCRYPT_LOCKING
-	error_code = gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_Mutex);
-	if (error_code != 0)
-	{
-		error("Could not initialize libcrypt");
-		return;
-	}
-#endif /* NEED_GCRYPT_LOCKING */
-
-	error_code = gnutls_global_init();
-	if (error_code != 0)
-	{
-		error("Could not initialize libgnutls");
-		return;
-	}
-
-#endif /* HAVE_LIBGNUTLS */
-
-#ifdef HAVE_OPENSSL
-	int iMaxMutexes = CRYPTO_num_locks();
-	g_pOpenSSLMutexes = (Mutex**)malloc(sizeof(Mutex*)*iMaxMutexes);
-	for (int i=0; i < iMaxMutexes; i++)
-	{
-		g_pOpenSSLMutexes[i] = new Mutex();
-	}
-	
-	SSL_load_error_strings();
-	SSL_library_init();
-	OpenSSL_add_all_algorithms();
-
-	CRYPTO_set_locking_callback(openssl_locking);
-	//CRYPTO_set_id_callback(openssl_thread_id);
-	CRYPTO_set_dynlock_create_callback(openssl_dynlock_create);
-	CRYPTO_set_dynlock_destroy_callback(openssl_dynlock_destroy);
-	CRYPTO_set_dynlock_lock_callback(openssl_dynlock_lock);
-	
-#endif /* HAVE_OPENSSL */
-}
-
-void TLSSocket::Final()
-{
-	debug("Finalizing TLS library");
-
-#ifdef HAVE_LIBGNUTLS
-	gnutls_global_deinit();
-
-#ifdef NEED_GCRYPT_LOCKING
-	// fixing memory leak in gcryptlib
-	for (Mutexes::iterator it = g_pGCryptLibMutexes->begin(); it != g_pGCryptLibMutexes->end(); it++)
-	{
-		delete *it;
-	}
-	delete g_pGCryptLibMutexes;
-#endif /* NEED_GCRYPT_LOCKING */
-#endif /* HAVE_LIBGNUTLS */
-
-#ifdef HAVE_OPENSSL
-	int iMaxMutexes = CRYPTO_num_locks();
-	for (int i=0; i < iMaxMutexes; i++)
-	{
-		delete g_pOpenSSLMutexes[i];
-	}
-	free(g_pOpenSSLMutexes);
-#endif /* HAVE_OPENSSL */
-}
-
-TLSSocket::TLSSocket(SOCKET iSocket, bool bIsClient, const char* szCertFile, const char* szKeyFile, const char* szCipher)
-{
-	m_iSocket = iSocket;
-	m_bIsClient = bIsClient;
-	m_szCertFile = szCertFile ? strdup(szCertFile) : NULL;
-	m_szKeyFile = szKeyFile ? strdup(szKeyFile) : NULL;
-	m_szCipher = szCipher && strlen(szCipher) > 0 ? strdup(szCipher) : NULL;
-	m_pContext = NULL;
-	m_pSession = NULL;
-	m_bSuppressErrors = false;
-	m_bInitialized = false;
-	m_bConnected = false;
-}
-
-TLSSocket::~TLSSocket()
-{
-	free(m_szCertFile);
-	free(m_szKeyFile);
-	free(m_szCipher);
-	Close();
-}
-
-void TLSSocket::ReportError(const char* szErrMsg)
-{
-#ifdef HAVE_LIBGNUTLS
-	const char* errstr = gnutls_strerror(m_iRetCode);
-	if (m_bSuppressErrors)
-	{
-		debug("%s: %s", szErrMsg, errstr);
-	}
-	else
-	{
-		error("%s: %s", szErrMsg, errstr);
-	}
-#endif /* HAVE_LIBGNUTLS */
-
-#ifdef HAVE_OPENSSL
-	int errcode;
-	do
-	{
-		errcode = ERR_get_error();
-
-		char errstr[1024];
-		ERR_error_string_n(errcode, errstr, sizeof(errstr));
-		errstr[1024-1] = '\0';
-		
-		if (m_bSuppressErrors)
-		{
-			debug("%s: %s", szErrMsg, errstr);
-		}
-		else if (errcode != 0)
-		{
-			error("%s: %s", szErrMsg, errstr);
-		}
-		else
-		{
-			error("%s", szErrMsg);
-		}
-	} while (errcode);
-#endif /* HAVE_OPENSSL */
-}
-
-bool TLSSocket::Start()
-{
-#ifdef HAVE_LIBGNUTLS
-	gnutls_certificate_credentials_t cred;
-	m_iRetCode = gnutls_certificate_allocate_credentials(&cred);
-	if (m_iRetCode != 0)
-	{
-		ReportError("Could not create TLS context");
-		return false;
-	}
-
-	m_pContext = cred;
-
-	if (m_szCertFile && m_szKeyFile)
-	{
-		m_iRetCode = gnutls_certificate_set_x509_key_file((gnutls_certificate_credentials_t)m_pContext,
-			m_szCertFile, m_szKeyFile, GNUTLS_X509_FMT_PEM);
-		if (m_iRetCode != 0)
-		{
-			ReportError("Could not load certificate or key file");
-			Close();
-			return false;
-		}
-	}
-
-	gnutls_session_t sess;
-	m_iRetCode = gnutls_init(&sess, m_bIsClient ? GNUTLS_CLIENT : GNUTLS_SERVER);
-	if (m_iRetCode != 0)
-	{
-		ReportError("Could not create TLS session");
-		Close();
-		return false;
-	}
-
-	m_pSession = sess;
-
-	m_bInitialized = true;
-
-	const char* szPriority = m_szCipher ? m_szCipher : "NORMAL";
-
-	m_iRetCode = gnutls_priority_set_direct((gnutls_session_t)m_pSession, szPriority, NULL);
-	if (m_iRetCode != 0)
-	{
-		ReportError("Could not select cipher for TLS session");
-		Close();
-		return false;
-	}
-
-	m_iRetCode = gnutls_credentials_set((gnutls_session_t)m_pSession, GNUTLS_CRD_CERTIFICATE, 
-		(gnutls_certificate_credentials_t*)m_pContext);
-	if (m_iRetCode != 0)
-	{
-		ReportError("Could not initialize TLS session");
-		Close();
-		return false;
-	}
-
-	gnutls_transport_set_ptr((gnutls_session_t)m_pSession, (gnutls_transport_ptr_t)(size_t)m_iSocket);
-
-	m_iRetCode = gnutls_handshake((gnutls_session_t)m_pSession);
-	if (m_iRetCode != 0)
-	{
-		ReportError("TLS handshake failed");
-		Close();
-		return false;
-	}
-
-	m_bConnected = true;
-	return true;
-#endif /* HAVE_LIBGNUTLS */
-
-#ifdef HAVE_OPENSSL
-	m_pContext = SSL_CTX_new(SSLv23_method());
-
-	if (!m_pContext)
-	{
-		ReportError("Could not create TLS context");
-		return false;
-	}
-
-	if (m_szCertFile && m_szKeyFile)
-	{
-		if (SSL_CTX_use_certificate_file((SSL_CTX*)m_pContext, m_szCertFile, SSL_FILETYPE_PEM) != 1)
-		{
-			ReportError("Could not load certificate file");
-			Close();
-			return false;
-		}
-		if (SSL_CTX_use_PrivateKey_file((SSL_CTX*)m_pContext, m_szKeyFile, SSL_FILETYPE_PEM) != 1)
-		{
-			ReportError("Could not load key file");
-			Close();
-			return false;
-		}
-	}
-	
-	m_pSession = SSL_new((SSL_CTX*)m_pContext);
-	if (!m_pSession)
-	{
-		ReportError("Could not create TLS session");
-		Close();
-		return false;
-	}
-
-	if (m_szCipher && !SSL_set_cipher_list((SSL*)m_pSession, m_szCipher))
-	{
-		ReportError("Could not select cipher for TLS");
-		Close();
-		return false;
-	}
-
-	if (!SSL_set_fd((SSL*)m_pSession, m_iSocket))
-	{
-		ReportError("Could not set the file descriptor for TLS");
-		Close();
-		return false;
-	}
-
-	int error_code = m_bIsClient ? SSL_connect((SSL*)m_pSession) : SSL_accept((SSL*)m_pSession);
-	if (error_code < 1)
-	{
-		ReportError("TLS handshake failed");
-		Close();
-		return false;
-	}
-
-	m_bConnected = true;
-	return true;
-#endif /* HAVE_OPENSSL */
-}
-
-void TLSSocket::Close()
-{
-	if (m_pSession)
-	{
-#ifdef HAVE_LIBGNUTLS
-		if (m_bConnected)
-		{
-			gnutls_bye((gnutls_session_t)m_pSession, GNUTLS_SHUT_WR);
-		}
-		if (m_bInitialized)
-		{
-			gnutls_deinit((gnutls_session_t)m_pSession);
-		}
-#endif /* HAVE_LIBGNUTLS */
-
-#ifdef HAVE_OPENSSL
-		if (m_bConnected)
-		{
-			SSL_shutdown((SSL*)m_pSession);
-		}
-		SSL_free((SSL*)m_pSession);
-#endif /* HAVE_OPENSSL */
-
-		m_pSession = NULL;
-	}
-
-	if (m_pContext)
-	{
-#ifdef HAVE_LIBGNUTLS
-		gnutls_certificate_free_credentials((gnutls_certificate_credentials_t)m_pContext);
-#endif /* HAVE_LIBGNUTLS */
-
-#ifdef HAVE_OPENSSL
-		SSL_CTX_free((SSL_CTX*)m_pContext);
-#endif /* HAVE_OPENSSL */
-
-		m_pContext = NULL;
-	}
-}
-
-int TLSSocket::Send(const char* pBuffer, int iSize)
-{
-	int ret;
-
-#ifdef HAVE_LIBGNUTLS
-	ret = gnutls_record_send((gnutls_session_t)m_pSession, pBuffer, iSize);
-#endif /* HAVE_LIBGNUTLS */
-
-#ifdef HAVE_OPENSSL
-	ret = SSL_write((SSL*)m_pSession, pBuffer, iSize);
-#endif /* HAVE_OPENSSL */
-
-	if (ret < 0)
-	{
-#ifdef HAVE_OPENSSL
-		if (ERR_peek_error() == 0)
-		{
-			ReportError("Could not write to TLS-Socket: Connection closed by remote host");
-		}
-		else
-#endif /* HAVE_OPENSSL */
-		ReportError("Could not write to TLS-Socket");
-		return -1;
-	}
-
-	return ret;
-}
-
-int TLSSocket::Recv(char* pBuffer, int iSize)
-{
-	int ret;
-
-#ifdef HAVE_LIBGNUTLS
-	ret = gnutls_record_recv((gnutls_session_t)m_pSession, pBuffer, iSize);
-#endif /* HAVE_LIBGNUTLS */
-
-#ifdef HAVE_OPENSSL
-	ret = SSL_read((SSL*)m_pSession, pBuffer, iSize);
-#endif /* HAVE_OPENSSL */
-
-	if (ret < 0)
-	{
-#ifdef HAVE_OPENSSL
-		if (ERR_peek_error() == 0)
-		{
-			ReportError("Could not read from TLS-Socket: Connection closed by remote host");
-		}
-		else
-#endif /* HAVE_OPENSSL */
-		{
-			ReportError("Could not read from TLS-Socket");
-		}
-		return -1;
-	}
-
-	return ret;
-}
-
-#endif

TLS.h

@@ -1,62 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2008-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-#ifndef TLS_H
-#define TLS_H
-
-#ifndef DISABLE_TLS
-
-class TLSSocket
-{
-private:
-	bool				m_bIsClient;
-	char*				m_szCertFile;
-	char*				m_szKeyFile;
-	char*				m_szCipher;
-	SOCKET				m_iSocket;
-	bool				m_bSuppressErrors;
-	int					m_iRetCode;
-	bool				m_bInitialized;
-	bool				m_bConnected;
-
-	// using "void*" to prevent the including of GnuTLS/OpenSSL header files into TLS.h
-	void*				m_pContext;
-	void*				m_pSession;
-
-	void				ReportError(const char* szErrMsg);
-
-public:
-						TLSSocket(SOCKET iSocket, bool bIsClient, const char* szCertFile, const char* szKeyFile, const char* szCipher);
-						~TLSSocket();
-	static void			Init();
-	static void			Final();
-	bool				Start();
-	void				Close();
-	int					Send(const char* pBuffer, int iSize);
-	int					Recv(char* pBuffer, int iSize);
-	void				SetSuppressErrors(bool bSuppressErrors) { m_bSuppressErrors = bSuppressErrors; }
-};
-
-#endif
-#endif

Thread.cpp

@@ -1,279 +0,0 @@
-/*
- *  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$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <errno.h>
-
-#ifdef WIN32
-#include <process.h>
-#else
-#include <fcntl.h>
-#include <pthread.h>
-#endif
-
-#include "Log.h"
-#include "Thread.h"
-
-int Thread::m_iThreadCount = 1; // take the main program thread into account
-Mutex* Thread::m_pMutexThread;
-
-
-Mutex::Mutex()
-{
-#ifdef WIN32
-	m_pMutexObj = (CRITICAL_SECTION*)malloc(sizeof(CRITICAL_SECTION));
-	InitializeCriticalSection((CRITICAL_SECTION*)m_pMutexObj);
-#else
-	m_pMutexObj = (pthread_mutex_t*)malloc(sizeof(pthread_mutex_t));
-	pthread_mutex_init((pthread_mutex_t*)m_pMutexObj, NULL);
-#endif
-}
-
-Mutex::~ Mutex()
-{
-#ifdef WIN32
-	DeleteCriticalSection((CRITICAL_SECTION*)m_pMutexObj);
-#else
-	pthread_mutex_destroy((pthread_mutex_t*)m_pMutexObj);
-#endif
-	free(m_pMutexObj);
-}
-
-void Mutex::Lock()
-{
-#ifdef WIN32
-	EnterCriticalSection((CRITICAL_SECTION*)m_pMutexObj);
-#ifdef DEBUG
-	// CriticalSections on Windows can be locked many times from the same thread,
-	// but we do not want this and must treat such situations as errors and detect them.
-	if (((CRITICAL_SECTION*)m_pMutexObj)->RecursionCount > 1)
-	{
-		error("Internal program error: inconsistent thread-lock detected");
-	}
-#endif
-#else
-	pthread_mutex_lock((pthread_mutex_t*)m_pMutexObj);
-#endif
-}
-
-void Mutex::Unlock()
-{
-#ifdef WIN32
-	LeaveCriticalSection((CRITICAL_SECTION*)m_pMutexObj);
-#else
-	pthread_mutex_unlock((pthread_mutex_t*)m_pMutexObj);
-#endif
-}
-
-
-#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");
-
-	m_pMutexThread = new Mutex();
-}
-
-void Thread::Final()
-{
-	debug("Finalizing global thread data");
-
-	delete m_pMutexThread;
-}
-
-Thread::Thread()
-{
-	debug("Creating Thread");
-
-#ifdef WIN32
-	m_pThreadObj = NULL;
-#else
-	m_pThreadObj = (pthread_t*)malloc(sizeof(pthread_t));
-	*((pthread_t*)m_pThreadObj) = 0;
-#endif
-	m_bRunning = false;
-	m_bStopped = false;
-	m_bAutoDestroy = false;
-}
-
-Thread::~Thread()
-{
-	debug("Destroying Thread");
-#ifndef WIN32
-	free(m_pThreadObj);
-#endif
-}
-
-void Thread::Start()
-{
-	debug("Starting Thread");
-
-	m_bRunning = true;
-	
-	// NOTE: we must guarantee, that in a time we set m_bRunning
-	// to value returned from pthread_create, the thread-object still exists.
-	// This is not obviously!
-	// pthread_create could wait long enough before returning result
-	// back to allow the started thread to complete its job and terminate.
-	// We lock mutex m_pMutexThread on calling pthread_create; the started thread
-	// then also try to lock the mutex (see thread_handler) and therefore
-	// must wait until we unlock it
-	m_pMutexThread->Lock();
-
-#ifdef WIN32
-	m_pThreadObj = (HANDLE)_beginthread(Thread::thread_handler, 0, (void *)this);
-	m_bRunning = m_pThreadObj != NULL;
-#else
-	pthread_attr_t m_Attr;
-	pthread_attr_init(&m_Attr);
-	pthread_attr_setdetachstate(&m_Attr, PTHREAD_CREATE_DETACHED);
-	pthread_attr_setinheritsched(&m_Attr , PTHREAD_INHERIT_SCHED);
-	m_bRunning = !pthread_create((pthread_t*)m_pThreadObj, &m_Attr, Thread::thread_handler, (void *) this);
-	pthread_attr_destroy(&m_Attr);
-#endif
-
-	m_pMutexThread->Unlock();
-}
-
-void Thread::Stop()
-{
-	debug("Stopping Thread");
-
-	m_bStopped = true;
-} 
-
-bool Thread::Kill()
-{
-	debug("Killing Thread");
-
-	m_pMutexThread->Lock();
-
-#ifdef WIN32
-	bool terminated = TerminateThread((HANDLE)m_pThreadObj, 0) != 0;
-#else
-	bool terminated = pthread_cancel(*(pthread_t*)m_pThreadObj) == 0;
-#endif
-
-	if (terminated)
-	{
-		m_iThreadCount--;
-	}
-	m_pMutexThread->Unlock();
-	return terminated;
-}
-
-#ifdef WIN32
-void __cdecl Thread::thread_handler(void* pObject)
-#else
-void* Thread::thread_handler(void* pObject)
-#endif
-{
-	m_pMutexThread->Lock();
-	m_iThreadCount++;
-	m_pMutexThread->Unlock();
-
-	debug("Entering Thread-func");
-
-	Thread* pThread = (Thread*)pObject;
-
-	pThread->Run();
-
-	debug("Thread-func exited");
-	
-	pThread->m_bRunning = false;
-	
-	if (pThread->m_bAutoDestroy)
-	{
-		debug("Autodestroying Thread-object");
-		delete pThread;
-	}
-
-	m_pMutexThread->Lock();
-	m_iThreadCount--;
-	m_pMutexThread->Unlock();
-
-#ifndef WIN32
-	return NULL;
-#endif
-}
-
-int Thread::GetThreadCount()
-{
-	m_pMutexThread->Lock();
-	int iThreadCount = m_iThreadCount;
-	m_pMutexThread->Unlock();
-	return iThreadCount;
-}

Thread.h

@@ -1,97 +0,0 @@
-/*
- *  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 THREAD_H
-#define THREAD_H
-
-class Mutex
-{
-private:
-	void*					m_pMutexObj;
-	
-public:
-							Mutex();
-							~Mutex();
-	void					Lock();
-	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:
-	static Mutex*			m_pMutexThread;
-	static int				m_iThreadCount;
-	void*	 				m_pThreadObj;
-	bool 					m_bRunning;
-	bool					m_bStopped;
-	bool					m_bAutoDestroy;
-
-#ifdef WIN32
-	static void __cdecl 	thread_handler(void* pObject);
-#else
-	static void				*thread_handler(void* pObject);
-#endif
-
-public:
-							Thread();
-	virtual 				~Thread();
-	static void				Init();
-	static void				Final();
-
-	virtual void 			Start();
-	virtual void 			Stop();
-	bool					Kill();
-
-	bool 					IsStopped() { return m_bStopped; };
-	bool 					IsRunning()	const { return m_bRunning; }
-	void 					SetRunning(bool bOnOff) { m_bRunning = bOnOff; }
-	bool					GetAutoDestroy() { return m_bAutoDestroy; }
-	void					SetAutoDestroy(bool bAutoDestroy) { m_bAutoDestroy = bAutoDestroy; }
-	static int				GetThreadCount();
-
-protected:
-	virtual void 			Run() {}; // Virtual function - override in derivatives
-};
-
-#endif

Unpack.cpp

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

Unpack.h

@@ -1,129 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef UNPACK_H
-#define UNPACK_H
-
-#include <deque>
-
-#include "Log.h"
-#include "Thread.h"
-#include "DownloadInfo.h"
-#include "ScriptController.h"
-
-class UnpackController : public Thread, public ScriptController
-{
-private:
-	enum EUnpacker
-	{
-		upUnrar,
-		upSevenZip
-	};
-
-	typedef std::deque<char*>		FileListBase;
-	class FileList : public FileListBase
-	{
-	public:
-		void			Clear();
-		bool			Exists(const char* szFilename);
-	};
-
-private:
-	PostInfo*			m_pPostInfo;
-	char				m_szName[1024];
-	char				m_szInfoName[1024];
-	char				m_szInfoNameUp[1024];
-	char				m_szDestDir[1024];
-	char				m_szFinalDir[1024];
-	char				m_szUnpackDir[1024];
-	char				m_szPassword[1024];
-	bool				m_bInterDir;
-	bool				m_bAllOKMessageReceived;
-	bool				m_bNoFilesMessageReceived;
-	bool				m_bHasParFiles;
-	bool				m_bHasRarFiles;
-	bool				m_bHasNonStdRarFiles;
-	bool				m_bHasSevenZipFiles;
-	bool				m_bHasSevenZipMultiFiles;
-	bool				m_bUnpackOK;
-	bool				m_bUnpackStartError;
-	bool				m_bUnpackSpaceError;
-	bool				m_bUnpackPasswordError;
-	bool				m_bCleanedUpDisk;
-	EUnpacker			m_eUnpacker;
-	bool				m_bFinalDirCreated;
-
-protected:
-	virtual bool		ReadLine(char* szBuf, int iBufSize, FILE* pStream);
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-	void				ExecuteUnrar();
-	void				ExecuteSevenZip(bool bMultiVolumes);
-	void				Completed();
-	void				CreateUnpackDir();
-	bool				Cleanup();
-	void				CheckArchiveFiles(bool bScanNonStdFiles);
-	void				SetProgressLabel(const char* szProgressLabel);
-#ifndef DISABLE_PARCHECK
-	void				RequestParCheck();
-#endif
-	bool				FileHasRarSignature(const char* szFilename);
-
-public:
-	virtual void		Run();
-	virtual void		Stop();
-	static void			StartJob(PostInfo* pPostInfo);
-};
-
-class MoveController : public Thread, public ScriptController
-{
-private:
-	PostInfo*			m_pPostInfo;
-	char				m_szInterDir[1024];
-	char				m_szDestDir[1024];
-
-	bool				MoveFiles();
-
-public:
-	virtual void		Run();
-	static void			StartJob(PostInfo* pPostInfo);
-};
-
-class CleanupController : public Thread, public ScriptController
-{
-private:
-	PostInfo*			m_pPostInfo;
-	char				m_szDestDir[1024];
-	char				m_szFinalDir[1024];
-
-	bool				Cleanup(const char* szDestDir, bool *bDeleted);
-
-	typedef std::deque<char*>	ExtList;
-
-public:
-	virtual void		Run();
-	static void			StartJob(PostInfo* pPostInfo);
-};
-
-#endif

UrlCoordinator.cpp

@@ -1,454 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#include <sys/stat.h>
-#ifndef WIN32
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-
-#include "nzbget.h"
-#include "UrlCoordinator.h"
-#include "Options.h"
-#include "WebDownloader.h"
-#include "DiskState.h"
-#include "Log.h"
-#include "Util.h"
-#include "NZBFile.h"
-#include "QueueCoordinator.h"
-#include "Scanner.h"
-
-extern Options* g_pOptions;
-extern DiskState* g_pDiskState;
-extern QueueCoordinator* g_pQueueCoordinator;
-extern Scanner* g_pScanner;
-
-
-UrlDownloader::UrlDownloader() : WebDownloader()
-{
-	m_szCategory = NULL;
-}
-
-UrlDownloader::~UrlDownloader()
-{
-	free(m_szCategory);
-}
-
-void UrlDownloader::ProcessHeader(const char* szLine)
-{
-	WebDownloader::ProcessHeader(szLine);
-
-	if (!strncmp(szLine, "X-DNZB-Category:", 16))
-	{
-		free(m_szCategory);
-		char* szCategory = strdup(szLine + 16);
-		m_szCategory = strdup(Util::Trim(szCategory));
-		free(szCategory);
-
-		debug("Category: %s", m_szCategory);
-	}
-	else if (!strncmp(szLine, "X-DNZB-", 7))
-	{
-		char* szModLine = strdup(szLine);
-		char* szValue = strchr(szModLine, ':');
-		if (szValue)
-		{
-			*szValue = NULL;
-			szValue++;
-			while (*szValue == ' ') szValue++;
-			Util::Trim(szValue);
-			
-			debug("X-DNZB: %s", szModLine);
-			debug("Value: %s", szValue);
-
-			char szParamName[100];
-			snprintf(szParamName, 100, "*DNZB:%s", szModLine + 7);
-			szParamName[100-1] = '\0';
-
-			char* szVal = WebUtil::Latin1ToUtf8(szValue);
-			m_ppParameters.SetParameter(szParamName, szVal);
-			free(szVal);
-		}
-		free(szModLine);
-	}
-}
-
-UrlCoordinator::UrlCoordinator()
-{
-	debug("Creating UrlCoordinator");
-
-	m_bHasMoreJobs = true;
-	m_bForce = false;
-}
-
-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()) || m_bForce || g_pOptions->GetUrlForce())
-		{
-			// start download for next URL
-			DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
-
-			if ((int)m_ActiveDownloads.size() < g_pOptions->GetUrlConnections())
-			{
-				UrlInfo* pUrlInfo;
-				bool bHasMoreUrls = GetNextUrl(pDownloadQueue, pUrlInfo);
-				bool bUrlDownloadsRunning = !m_ActiveDownloads.empty();
-				m_bHasMoreJobs = bHasMoreUrls || bUrlDownloadsRunning;
-				if (bHasMoreUrls && !IsStopped())
-				{
-					StartUrlDownload(pUrlInfo);
-				}
-				if (!bHasMoreUrls)
-				{
-					m_bForce = false;
-				}
-			}
-			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);
-	}
-
-	if (pUrlInfo->GetForce())
-	{
-		m_bForce = true;
-	}
-
-	g_pQueueCoordinator->UnlockQueue();
-}
-
-/*
- * Returns next URL for download.
- */
-bool UrlCoordinator::GetNextUrl(DownloadQueue* pDownloadQueue, UrlInfo* &pUrlInfo)
-{
-	bool bPauseDownload = g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2();
-
-	for (UrlQueue::iterator at = pDownloadQueue->GetUrlQueue()->begin(); at != pDownloadQueue->GetUrlQueue()->end(); at++)
-	{
-		pUrlInfo = *at;
-		if (pUrlInfo->GetStatus() == 0 && (!bPauseDownload || pUrlInfo->GetForce() || g_pOptions->GetUrlForce()))
-		{
-			return true;
-			break;
-		}
-	}
-
-	return false;
-}
-
-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());
-	pUrlDownloader->SetForce(pUrlInfo->GetForce() || g_pOptions->GetUrlForce());
-
-	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* pCaller, void* pAspect)
-{
-	debug("Notification from UrlDownloader received");
-
-	UrlDownloader* pUrlDownloader = (UrlDownloader*) pCaller;
-	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);
-
-	// delete Download from active jobs
-	g_pQueueCoordinator->LockQueue();
-	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
-	{
-		UrlDownloader* pa = *it;
-		if (pa == pUrlDownloader)
-		{
-			m_ActiveDownloads.erase(it);
-			break;
-		}
-	}
-	g_pQueueCoordinator->UnlockQueue();
-
-	Aspect aspect = { eaUrlCompleted, pUrlInfo };
-	Notify(&aspect);
-
-	if (pUrlInfo->GetStatus() == UrlInfo::aiFinished)
-	{
-		// add nzb-file to download queue
-		Scanner::EAddStatus eAddStatus = g_pScanner->AddExternalFile(
-			pUrlInfo->GetNZBFilename() && strlen(pUrlInfo->GetNZBFilename()) > 0 ? pUrlInfo->GetNZBFilename() : filename,
-			strlen(pUrlInfo->GetCategory()) > 0 ? pUrlInfo->GetCategory() : pUrlDownloader->GetCategory(),
-			pUrlInfo->GetPriority(), pUrlInfo->GetDupeKey(), pUrlInfo->GetDupeScore(), pUrlInfo->GetDupeMode(),
-			pUrlDownloader->GetParameters(), pUrlInfo->GetAddTop(), pUrlInfo->GetAddPaused(),
-			pUrlDownloader->GetOutputFilename(), NULL, 0);
-
-		if (eAddStatus != Scanner::asSuccess)
-		{
-			pUrlInfo->SetStatus(eAddStatus == Scanner::asFailed ? UrlInfo::aiScanFailed : UrlInfo::aiScanSkipped);
-		}
-	}
-
-	// delete Download from Url Queue
-	if (pUrlInfo->GetStatus() != UrlInfo::aiRetry)
-	{
-		DownloadQueue* pDownloadQueue = g_pQueueCoordinator->LockQueue();
-
-		for (UrlQueue::iterator it = pDownloadQueue->GetUrlQueue()->begin(); it != pDownloadQueue->GetUrlQueue()->end(); it++)
-		{
-			UrlInfo* pa = *it;
-			if (pa == pUrlInfo)
-			{
-				pDownloadQueue->GetUrlQueue()->erase(it);
-				break;
-			}
-		}
-
-		bool bDeleteObj = true;
-
-		if (g_pOptions->GetKeepHistory() > 0 && pUrlInfo->GetStatus() != UrlInfo::aiFinished)
-		{
-			HistoryInfo* pHistoryInfo = new HistoryInfo(pUrlInfo);
-			pHistoryInfo->SetTime(time(NULL));
-			pDownloadQueue->GetHistoryList()->push_front(pHistoryInfo);
-			bDeleteObj = false;
-		}
-			
-		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-		{
-			g_pDiskState->SaveDownloadQueue(pDownloadQueue);
-		}
-
-		g_pQueueCoordinator->UnlockQueue();
-
-		if (bDeleteObj)
-		{
-			delete pUrlInfo;
-		}
-	}
-}

UrlCoordinator.h

@@ -1,98 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef URLCOORDINATOR_H
-#define URLCOORDINATOR_H
-
-#include <deque>
-#include <list>
-#include <time.h>
-
-#include "Thread.h"
-#include "WebDownloader.h"
-#include "DownloadInfo.h"
-#include "Observer.h"
-
-class UrlDownloader;
-
-class UrlCoordinator : public Thread, public Observer, public Subject
-{
-public:
-	typedef std::list<UrlDownloader*>	ActiveDownloads;
-	enum EAspectAction
-	{
-		eaUrlAdded,
-		eaUrlCompleted
-	};
-	struct Aspect
-	{
-		EAspectAction eAction;
-		UrlInfo* pUrlInfo;
-	};
-
-private:
-	ActiveDownloads			m_ActiveDownloads;
-	bool					m_bHasMoreJobs;
-	bool					m_bForce;
-
-	bool					GetNextUrl(DownloadQueue* pDownloadQueue, UrlInfo* &pUrlInfo);
-	void					StartUrlDownload(UrlInfo* pUrlInfo);
-	void					UrlCompleted(UrlDownloader* pUrlDownloader);
-	void					ResetHangingDownloads();
-
-public:
-							UrlCoordinator();                
-	virtual					~UrlCoordinator();
-	virtual void			Run();
-	virtual void 			Stop();
-	void					Update(Subject* pCaller, void* pAspect);
-
-	// Editing the queue
-	void					AddUrlToQueue(UrlInfo* pUrlInfo, bool AddFirst);
-	bool					HasMoreJobs() { return m_bHasMoreJobs; }
-
-	void					LogDebugInfo();
-};
-
-class UrlDownloader : public WebDownloader
-{
-private:
-	UrlInfo*				m_pUrlInfo;
-	char*					m_szCategory;
-	NZBParameterList		m_ppParameters;
-
-protected:
-	virtual void			ProcessHeader(const char* szLine);
-
-public:
-							UrlDownloader();
-							~UrlDownloader();
-	void					SetUrlInfo(UrlInfo* pUrlInfo) { m_pUrlInfo = pUrlInfo; }
-	UrlInfo*				GetUrlInfo() { return m_pUrlInfo; }
-	const char*				GetCategory() { return m_szCategory; }
-	NZBParameterList*		GetParameters() { return &m_ppParameters; }
-};
-
-#endif

Util.h

@@ -1,348 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef UTIL_H
-#define UTIL_H
-
-#ifdef WIN32
-#include <stdio.h>
-#include <io.h>
-#else
-#include <dirent.h>
-#endif
-
-#ifdef WIN32
-extern int optind, opterr;
-extern char *optarg;
-int getopt(int argc, char *argv[], char *optstring);
-#endif
-
-class DirBrowser
-{
-private:
-#ifdef WIN32
-	struct _finddata_t	m_FindData;
-	intptr_t			m_hFile;
-	bool				m_bFirst;
-#else
-	DIR*				m_pDir;
-	struct dirent*		m_pFindData;
-#endif
-
-public:
-						DirBrowser(const char* szPath);
-						~DirBrowser();
-	const char*			Next();
-};
-
-class StringBuilder
-{
-private:
-	char*				m_szBuffer;
-	int					m_iBufferSize;
-	int					m_iUsedSize;
-public:
-						StringBuilder();
-						~StringBuilder();
-	void				Append(const char* szStr);
-	const char*			GetBuffer() { return m_szBuffer; }
-};
-
-class Util 
-{
-public:
-
-	static char* BaseFileName(const char* filename);
-	static void NormalizePathSeparators(char* szPath);
-	static bool LoadFileIntoBuffer(const char* szFileName, char** pBuffer, int* pBufferLength);
-	static bool SaveBufferIntoFile(const char* szFileName, const char* szBuffer, int iBufLen);
-	static bool CreateSparseFile(const char* szFilename, int iSize);
-	static bool TruncateFile(const char* szFilename, int iSize);
-	static 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 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);
-	static bool ForceDirectories(const char* szPath, char* szErrBuf, int iBufSize);
-	static bool GetCurrentDirectory(char* szBuffer, int iBufSize);
-	static bool SetCurrentDirectory(const char* szDirFilename);
-	static long long FileSize(const char* szFilename);
-	static long long FreeDiskSize(const char* szPath);
-	static bool DirEmpty(const char* szDirFilename);
-	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 FormatFileSize(char* szBuffer, int iBufLen, long long lFileSize);
-	static bool SameFilename(const char* szFilename1, const char* szFilename2);
-	static char* GetLastErrorMessage(char* szBuffer, int iBufLen);
-
-	/*
-	 * Split command line int arguments.
-	 * Uses spaces and single quotation marks as separators.
-	 * Returns bool if sucessful or false if bad escaping was detected.
-	 * Parameter "argv" may be NULL if only a syntax check is needed.
-	 * Parsed parameters returned in Array "argv", which contains at least one element.
-	 * The last element in array is NULL.
-	 * Restrictions: the number of arguments is limited to 100 and each arguments must
-	 * be maximum 1024 chars long.
-	 * If these restrictions are exceeded, only first 100 arguments and only first 1024
-	 * for each argument are returned (the functions still returns "true").
-	 */
-	static bool SplitCommandLine(const char* szCommandLine, char*** argv);
-
-	static long long JoinInt64(unsigned long Hi, unsigned long Lo);
-	static void SplitInt64(long long Int64, unsigned long* Hi, unsigned long* Lo);
-
-	/**
-	 * 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
-
-	/*
-	 * Returns program version and revision number as string formatted like "0.7.0-r295".
-	 * If revision number is not available only version is returned ("0.7.0").
-	 */
-	static const char* VersionRevision() { return VersionRevisionBuf; };
-	
-	/*
-	 * Initialize buffer for program version and revision number.
-	 * This function must be called during program initialization before any
-	 * call to "VersionRevision()".
-	 */
-	static void InitVersionRevision();
-	
-	static char VersionRevisionBuf[40];
-};
-
-class WebUtil
-{
-public:
-	static unsigned int DecodeBase64(char* szInputBuffer, int iInputBufferLength, char* szOutputBuffer);
-
-	/*
-	 * Encodes string to be used as content of xml-tag.
-	 * Returns new string allocated with malloc, it need to be freed by caller.
-	 */
-	static char* XmlEncode(const char* raw);
-
-	/*
-	 * Decodes string from xml.
-	 * The string is decoded on the place overwriting the content of raw-data.
-	 */
-	static void XmlDecode(char* raw);
-
-	/*
-	 * Returns pointer to tag-content and length of content in iValueLength
-	 * The returned pointer points to the part of source-string, no additional strings are allocated.
-	 */
-	static const char* XmlFindTag(const char* szXml, const char* szTag, int* pValueLength);
-
-	/*
-	 * Parses tag-content into szValueBuf.
-	 */
-	static bool XmlParseTagValue(const char* szXml, const char* szTag, char* szValueBuf, int iValueBufSize, const char** pTagEnd);
-
-	/*
-	 * Creates JSON-string by replace the certain characters with escape-sequences.
-	 * Returns new string allocated with malloc, it need to be freed by caller.
-	 */
-	static char* JsonEncode(const char* raw);
-
-	/*
-	 * Decodes JSON-string.
-	 * The string is decoded on the place overwriting the content of raw-data.
-	 */
-	static void JsonDecode(char* raw);
-
-	/*
-	 * Returns pointer to field-content and length of content in iValueLength
-	 * The returned pointer points to the part of source-string, no additional strings are allocated.
-	 */
-	static const char* JsonFindField(const char* szJsonText, const char* szFieldName, int* pValueLength);
-
-	/*
-	 * Returns pointer to field-content and length of content in iValueLength
-	 * The returned pointer points to the part of source-string, no additional strings are allocated.
-	 */
-	static const char* JsonNextValue(const char* szJsonText, int* pValueLength);
-
-	/*
-	 * Unquote http quoted string.
-	 * The string is decoded on the place overwriting the content of raw-data.
-	 */
-	static void HttpUnquote(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
-{
-private:
-	char*				m_szAddress;
-	char*				m_szProtocol;
-	char*				m_szUser;
-	char*				m_szPassword;
-	char*				m_szHost;
-	char*				m_szResource;
-	int					m_iPort;
-	bool				m_bTLS;
-	bool				m_bValid;
-	void				ParseURL();
-
-public:
-	 					URL(const char* szAddress);
-						~URL();
-	bool				IsValid() { return m_bValid; }
-	const char*			GetAddress() { return m_szAddress; }
-	const char*			GetProtocol() { return m_szProtocol; }
-	const char*			GetUser() { return m_szUser; }
-	const char*			GetPassword() { return m_szPassword; }
-	const char*			GetHost() { return m_szHost; }
-	const char*			GetResource() { return m_szResource; }
-	int					GetPort() { return m_iPort; }
-	bool				GetTLS() { return m_bTLS; }
-};
-
-class RegEx
-{
-private:
-	void*				m_pContext;
-	bool				m_bValid;
-	void*				m_pMatches;
-	int					m_iMatchBufSize;
-
-public:
-						RegEx(const char *szPattern, int iMatchBufSize = 100);
-						~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
-class ZLib
-{
-public:
-	/*
-	 * calculates the size required for output buffer
-	 */
-	static unsigned int GZipLen(int iInputBufferLength);
-	
-	/*
-	 * returns the size of bytes written to szOutputBuffer or 0 if the buffer is too small or an error occured.
-	 */
-	static unsigned int GZip(const void* szInputBuffer, int iInputBufferLength, void* szOutputBuffer, int iOutputBufferLength);
-};
-
-class GUnzipStream
-{
-public:
-	enum EStatus
-	{
-		zlError,
-		zlFinished,
-		zlOK
-	};
-
-private:
-	void*				m_pZStream;
-	void*				m_pOutputBuffer;
-	int					m_iBufferSize;
-
-public:
-						GUnzipStream(int BufferSize);
-						~GUnzipStream();
-
-	/*
-	 * set next memory block for uncompression
-	 */
-	void				Write(const void *pInputBuffer, int iInputBufferLength);
-
-	/*
-	 * get next uncompressed memory block.
-	 * iOutputBufferLength - the size of uncompressed block. if it is "0" the next compressed block must be provided via "Write".
-	 */
-	EStatus				Read(const void **pOutputBuffer, int *iOutputBufferLength);
-};
-#endif
-
-#endif

WebDownloader.cpp

@@ -1,722 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifdef WIN32
-#include <direct.h>
-#else
-#include <unistd.h>
-#include <sys/time.h>
-#endif
-#include <sys/stat.h>
-#include <errno.h>
-
-#include "nzbget.h"
-#include "WebDownloader.h"
-#include "Log.h"
-#include "Options.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-
-WebDownloader::WebDownloader()
-{
-	debug("Creating WebDownloader");
-
-	m_szURL	= NULL;
-	m_szOutputFilename	= NULL;
-	m_pConnection = NULL;
-	m_szInfoName = NULL;
-	m_bConfirmedLength = false;
-	m_eStatus = adUndefined;
-	m_szOriginalFilename = NULL;
-	m_bForce = false;
-	m_bRetry = true;
-	SetLastUpdateTimeNow();
-}
-
-WebDownloader::~WebDownloader()
-{
-	debug("Destroying WebDownloader");
-
-	free(m_szURL);
-	free(m_szInfoName);
-	free(m_szOutputFilename);
-	free(m_szOriginalFilename);
-}
-
-void WebDownloader::SetOutputFilename(const char* v)
-{
-	m_szOutputFilename = strdup(v);
-}
-
-void WebDownloader::SetInfoName(const char* v)
-{
-	m_szInfoName = strdup(v);
-}
-
-void WebDownloader::SetURL(const char * szURL)
-{
-	free(m_szURL);
-	m_szURL = strdup(szURL);
-}
-
-void WebDownloader::SetStatus(EStatus eStatus)
-{
-	m_eStatus = eStatus;
-	Notify(NULL);
-}
-
-void WebDownloader::Run()
-{
-	debug("Entering WebDownloader-loop");
-
-	SetStatus(adRunning);
-
-	int iRemainedDownloadRetries = g_pOptions->GetRetries() > 0 ? g_pOptions->GetRetries() : 1;
-	int iRemainedConnectRetries = iRemainedDownloadRetries > 10 ? iRemainedDownloadRetries : 10;
-	if (!m_bRetry)
-	{
-		iRemainedDownloadRetries = 1;
-		iRemainedConnectRetries = 1;
-	}
-
-	m_iRedirects = 0;
-	EStatus Status = adFailed;
-
-	while (!IsStopped() && iRemainedDownloadRetries > 0 && iRemainedConnectRetries > 0)
-	{
-		SetLastUpdateTimeNow();
-
-		Status = Download();
-
-		if ((((Status == adFailed) && (iRemainedDownloadRetries > 1)) ||
-			((Status == adConnectError) && (iRemainedConnectRetries > 1)))
-			&& !IsStopped() && !(!m_bForce && (g_pOptions->GetPauseDownload() || 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->GetPauseDownload2())))
-			{
-				usleep(100 * 1000);
-				msec += 100;
-			}
-		}
-
-		if (IsStopped() || (!m_bForce && (g_pOptions->GetPauseDownload() || g_pOptions->GetPauseDownload2())))
-		{
-			Status = adRetry;
-			break;
-		}
-
-		if (Status == adFinished || Status == adFatalError || Status == adNotFound)
-		{
-			break;
-		}
-
-		if (Status == adRedirect)
-		{
-			m_iRedirects++;
-			if (m_iRedirects > 5)
-			{
-				warn("Too many redirects for %s", m_szInfoName);
-				Status = adFailed;
-				break;
-			}
-		}
-
-		if (Status != adConnectError)
-		{
-			iRemainedDownloadRetries--;
-		}
-		else
-		{
-			iRemainedConnectRetries--;
-		}
-	}
-
-	if (Status != adFinished && Status != adRetry)
-	{
-		Status = adFailed;
-	}
-
-	if (Status == adFailed)
-	{
-		if (IsStopped())
-		{
-			detail("Download %s cancelled", m_szInfoName);
-		}
-		else
-		{
-			error("Download %s failed", m_szInfoName);
-		}
-	}
-
-	if (Status == adFinished)
-	{
-		detail("Download %s completed", m_szInfoName);
-	}
-
-	SetStatus(Status);
-
-	debug("Exiting WebDownloader-loop");
-}
-
-WebDownloader::EStatus WebDownloader::Download()
-{
-	EStatus Status = adRunning;
-
-	URL url(m_szURL);
-
-	Status = CreateConnection(&url);
-	if (Status != adRunning)
-	{
-		return Status;
-	}
-
-	m_pConnection->SetSuppressErrors(false);
-
-	// connection
-	bool bConnected = m_pConnection->Connect();
-	if (!bConnected || IsStopped())
-	{
-		FreeConnection();
-		return adConnectError;
-	}
-
-	// Okay, we got a Connection. Now start downloading.
-	detail("Downloading %s", m_szInfoName);
-
-	SendHeaders(&url);
-
-	Status = DownloadHeaders();
-
-	if (Status == adRunning)
-	{
-		Status = DownloadBody();
-	}
-
-	if (IsStopped())
-	{
-		Status = adFailed;
-	}
-
-	FreeConnection();
-
-	if (Status != adFinished)
-	{
-		// Download failed, delete broken output file
-		remove(m_szOutputFilename);
-	}
-
-	return Status;
-}
-
-
-WebDownloader::EStatus WebDownloader::CreateConnection(URL *pUrl)
-{
-	if (!pUrl->IsValid())
-	{
-		error("URL is not valid: %s", pUrl->GetAddress());
-		return adFatalError;
-	}
-
-	int iPort = pUrl->GetPort();
-	if (iPort == 0 && !strcasecmp(pUrl->GetProtocol(), "http"))
-	{
-		iPort = 80;
-	}
-	if (iPort == 0 && !strcasecmp(pUrl->GetProtocol(), "https"))
-	{
-		iPort = 443;
-	}
-
-	if (strcasecmp(pUrl->GetProtocol(), "http") && strcasecmp(pUrl->GetProtocol(), "https"))
-	{
-		error("Unsupported protocol in URL: %s", pUrl->GetAddress());
-		return adFatalError;
-	}
-
-#ifdef DISABLE_TLS
-	if (!strcasecmp(pUrl->GetProtocol(), "https"))
-	{
-		error("Program was compiled without TLS/SSL-support. Cannot download using https protocol. URL: %s", pUrl->GetAddress());
-		return adFatalError;
-	}
-#endif
-
-	bool bTLS = !strcasecmp(pUrl->GetProtocol(), "https");
-
-	m_pConnection = new Connection(pUrl->GetHost(), iPort, bTLS);
-
-	return adRunning;
-}
-
-void WebDownloader::SendHeaders(URL *pUrl)
-{
-	char tmp[1024];
-
-	// retrieve file
-	snprintf(tmp, 1024, "GET %s HTTP/1.0\r\n", pUrl->GetResource());
-	tmp[1024-1] = '\0';
-	m_pConnection->WriteLine(tmp);
-
-	snprintf(tmp, 1024, "User-Agent: nzbget/%s\r\n", Util::VersionRevision());
-	tmp[1024-1] = '\0';
-	m_pConnection->WriteLine(tmp);
-
-	snprintf(tmp, 1024, "Host: %s\r\n", pUrl->GetHost());
-	tmp[1024-1] = '\0';
-	m_pConnection->WriteLine(tmp);
-
-	m_pConnection->WriteLine("Accept: */*\r\n");
-#ifndef DISABLE_GZIP
-	m_pConnection->WriteLine("Accept-Encoding: gzip\r\n");
-#endif
-	m_pConnection->WriteLine("Connection: close\r\n");
-	m_pConnection->WriteLine("\r\n");
-}
-
-WebDownloader::EStatus WebDownloader::DownloadHeaders()
-{
-	EStatus Status = adRunning;
-
-	m_bConfirmedLength = false;
-	const int LineBufSize = 1024*10;
-	char* szLineBuf = (char*)malloc(LineBufSize);
-	m_iContentLen = -1;
-	bool bFirstLine = true;
-	m_bGZip = false;
-	m_bRedirecting = false;
-	m_bRedirected = false;
-
-	// Headers
-	while (!IsStopped())
-	{
-		SetLastUpdateTimeNow();
-
-		int iLen = 0;
-		char* line = m_pConnection->ReadLine(szLineBuf, LineBufSize, &iLen);
-
-		if (bFirstLine)
-		{
-			Status = CheckResponse(szLineBuf);
-			if (Status != adRunning)
-			{
-				break;
-			}
-			bFirstLine = false;
-		}
-
-		// Have we encountered a timeout?
-		if (!line)
-		{
-			if (!IsStopped())
-			{
-				warn("URL %s failed: Unexpected end of file", m_szInfoName);
-			}
-			Status = adFailed;
-			break;
-		}
-
-		debug("Header: %s", line);
-
-		// detect body of response
-		if (*line == '\r' || *line == '\n')
-		{
-			if (m_iContentLen == -1 && !m_bGZip)
-			{
-				warn("URL %s: Content-Length is not submitted by server, cannot verify whether the file is complete", m_szInfoName);
-			}
-			break;
-		}
-
-		Util::TrimRight(line);
-		ProcessHeader(line);
-
-		if (m_bRedirected)
-		{
-			Status = adRedirect;
-			break;
-		}
-	}
-
-	free(szLineBuf);
-
-	return Status;
-}
-
-WebDownloader::EStatus WebDownloader::DownloadBody()
-{
-	EStatus Status = adRunning;
-
-	m_pOutFile = NULL;
-	bool bEnd = false;
-	const int LineBufSize = 1024*10;
-	char* szLineBuf = (char*)malloc(LineBufSize);
-	int iWrittenLen = 0;
-
-#ifndef DISABLE_GZIP
-	m_pGUnzipStream = NULL;
-	if (m_bGZip)
-	{
-		m_pGUnzipStream = new GUnzipStream(1024*10);
-	}
-#endif
-
-	// Body
-	while (!IsStopped())
-	{
-		SetLastUpdateTimeNow();
-
-		char* szBuffer;
-		int iLen;
-		m_pConnection->ReadBuffer(&szBuffer, &iLen);
-		if (iLen == 0)
-		{
-			iLen = m_pConnection->TryRecv(szLineBuf, LineBufSize);
-			szBuffer = szLineBuf;
-		}
-
-		// Have we encountered a timeout?
-		if (iLen <= 0)
-		{
-			if (m_iContentLen == -1 && iWrittenLen > 0)
-			{
-				bEnd = true;
-				break;
-			}
-
-			if (!IsStopped())
-			{
-				warn("URL %s failed: Unexpected end of file", m_szInfoName);
-			}
-			Status = adFailed;
-			break;
-		}
-
-		// write to output file
-		if (!Write(szBuffer, iLen))
-		{
-			Status = adFatalError;
-			break;
-		}
-		iWrittenLen += iLen;
-
-		//detect end of file
-		if (iWrittenLen == m_iContentLen || (m_iContentLen == -1 && m_bGZip && m_bConfirmedLength))
-		{
-			bEnd = true;
-			break;
-		}
-	}
-
-	free(szLineBuf);
-
-#ifndef DISABLE_GZIP
-	delete m_pGUnzipStream;
-#endif
-
-	if (m_pOutFile)
-	{
-		fclose(m_pOutFile);
-	}
-
-	if (!bEnd && Status == adRunning && !IsStopped())
-	{
-		warn("URL %s failed: file incomplete", m_szInfoName);
-		Status = adFailed;
-	}
-
-	if (bEnd)
-	{
-		Status = adFinished;
-	}
-
-	return Status;
-}
-
-WebDownloader::EStatus WebDownloader::CheckResponse(const char* szResponse)
-{
-	if (!szResponse)
-	{
-		if (!IsStopped())
-		{
-			warn("URL %s: Connection closed by remote host", m_szInfoName);
-		}
-		return adConnectError;
-	}
-
-	const char* szHTTPResponse = strchr(szResponse, ' ');
-	if (strncmp(szResponse, "HTTP", 4) || !szHTTPResponse)
-	{
-		warn("URL %s failed: %s", m_szInfoName, szResponse);
-		return adFailed;
-	}
-
-	szHTTPResponse++;
-
-	if (!strncmp(szHTTPResponse, "400", 3) || !strncmp(szHTTPResponse, "499", 3))
-	{
-		warn("URL %s failed: %s", m_szInfoName, szHTTPResponse);
-		return adConnectError;
-	}
-	else if (!strncmp(szHTTPResponse, "404", 3))
-	{
-		warn("URL %s failed: %s", m_szInfoName, szHTTPResponse);
-		return adNotFound;
-	}
-	else if (!strncmp(szHTTPResponse, "301", 3) || !strncmp(szHTTPResponse, "302", 3))
-	{
-		m_bRedirecting = true;
-		return adRunning;
-	}
-	else if (!strncmp(szHTTPResponse, "200", 3))
-	{
-		// OK
-		return adRunning;
-	}
-	else 
-	{
-		// unknown error, no special handling
-		warn("URL %s failed: %s", m_szInfoName, szResponse);
-		return adFailed;
-	}
-}
-
-void WebDownloader::ProcessHeader(const char* szLine)
-{
-	if (!strncasecmp(szLine, "Content-Length: ", 16))
-	{
-		m_iContentLen = atoi(szLine + 16);
-		m_bConfirmedLength = true;
-	}
-	else if (!strncasecmp(szLine, "Content-Encoding: gzip", 22))
-	{
-		m_bGZip = true;
-	}
-	else if (!strncasecmp(szLine, "Content-Disposition: ", 21))
-	{
-		ParseFilename(szLine);
-	}
-	else if (m_bRedirecting && !strncasecmp(szLine, "Location: ", 10))
-	{
-		ParseRedirect(szLine + 10);
-		m_bRedirected = true;
-	}
-}
-
-void WebDownloader::ParseFilename(const char* szContentDisposition)
-{
-	// Examples:
-	// Content-Disposition: attachment; filename="fname.ext"
-	// Content-Disposition: attachement;filename=fname.ext
-	// Content-Disposition: attachement;filename=fname.ext;
-	const char *p = strstr(szContentDisposition, "filename");
-	if (!p)
-	{
-		return;
-	}
-
-	p = strchr(p, '=');
-	if (!p)
-	{
-		return;
-	}
-
-	p++;
-
-	while (*p == ' ') p++;
-
-	char fname[1024];
-	strncpy(fname, p, 1024);
-	fname[1024-1] = '\0';
-
-	char *pe = fname + strlen(fname) - 1;
-	while ((*pe == ' ' || *pe == '\n' || *pe == '\r' || *pe == ';') && pe > fname) {
-		*pe = '\0';
-		pe--;
-	}
-
-	WebUtil::HttpUnquote(fname);
-
-	free(m_szOriginalFilename);
-	m_szOriginalFilename = strdup(Util::BaseFileName(fname));
-
-	debug("OriginalFilename: %s", m_szOriginalFilename);
-}
-
-void WebDownloader::ParseRedirect(const char* szLocation)
-{
-	const char* szNewURL = szLocation;
-	char szUrlBuf[1024];
-	URL newUrl(szNewURL);
-	if (!newUrl.IsValid())
-	{
-		// relative address
-		URL oldUrl(m_szURL);
-		if (oldUrl.GetPort() > 0)
-		{
-			snprintf(szUrlBuf, 1024, "%s://%s:%i%s", oldUrl.GetProtocol(), oldUrl.GetHost(), oldUrl.GetPort(), szNewURL);
-		}
-		else
-		{
-			snprintf(szUrlBuf, 1024, "%s://%s%s", oldUrl.GetProtocol(), oldUrl.GetHost(), szNewURL);
-		}
-		szUrlBuf[1024-1] = '\0';
-		szNewURL = szUrlBuf;
-	}
-	detail("URL %s redirected to %s", m_szURL, szNewURL);
-	SetURL(szNewURL);
-}
-
-bool WebDownloader::Write(void* pBuffer, int iLen)
-{
-	if (!m_pOutFile && !PrepareFile())
-	{
-		return false;
-	}
-
-#ifndef DISABLE_GZIP
-	if (m_bGZip)
-	{
-		m_pGUnzipStream->Write(pBuffer, iLen);
-		const void *pOutBuf;
-		int iOutLen = 1;
-		while (iOutLen > 0)
-		{
-			GUnzipStream::EStatus eGZStatus = m_pGUnzipStream->Read(&pOutBuf, &iOutLen);
-
-			if (eGZStatus == GUnzipStream::zlError)
-			{
-				error("URL %s: GUnzip failed", m_szInfoName);
-				return false;
-			}
-
-			if (iOutLen > 0 && fwrite(pOutBuf, 1, iOutLen, m_pOutFile) <= 0)
-			{
-				return false;
-			}
-
-			if (eGZStatus == GUnzipStream::zlFinished)
-			{
-				m_bConfirmedLength = true;
-				return true;
-			}
-		}
-		return true;
-	}
-	else
-#endif
-
-	return fwrite(pBuffer, 1, iLen, m_pOutFile) > 0;
-}
-
-bool WebDownloader::PrepareFile()
-{
-	// prepare file for writing
-
-	const char* szFilename = m_szOutputFilename;
-	m_pOutFile = fopen(szFilename, "wb");
-	if (!m_pOutFile)
-	{
-		error("Could not %s file %s", "create", szFilename);
-		return false;
-	}
-	if (g_pOptions->GetWriteBufferSize() > 0)
-	{
-		setvbuf(m_pOutFile, (char *)NULL, _IOFBF, g_pOptions->GetWriteBufferSize());
-	}
-
-	return true;
-}
-
-void WebDownloader::LogDebugInfo()
-{
-	char szTime[50];
-#ifdef HAVE_CTIME_R_3
-		ctime_r(&m_tLastUpdateTime, szTime, 50);
-#else
-		ctime_r(&m_tLastUpdateTime, szTime);
-#endif
-
-	debug("      Web-Download: status=%i, LastUpdateTime=%s, filename=%s", m_eStatus, szTime, Util::BaseFileName(m_szOutputFilename));
-}
-
-void WebDownloader::Stop()
-{
-	debug("Trying to stop WebDownloader");
-	Thread::Stop();
-	m_mutexConnection.Lock();
-	if (m_pConnection)
-	{
-		m_pConnection->SetSuppressErrors(true);
-		m_pConnection->Cancel();
-	}
-	m_mutexConnection.Unlock();
-	debug("WebDownloader stopped successfully");
-}
-
-bool WebDownloader::Terminate()
-{
-	Connection* pConnection = m_pConnection;
-	bool terminated = Kill();
-	if (terminated && pConnection)
-	{
-		debug("Terminating connection");
-		pConnection->SetSuppressErrors(true);
-		pConnection->Cancel();
-		pConnection->Disconnect();
-		delete pConnection;
-	}
-	return terminated;
-}
-
-void WebDownloader::FreeConnection()
-{
-	if (m_pConnection)							
-	{
-		debug("Releasing connection");
-		m_mutexConnection.Lock();
-		if (m_pConnection->GetStatus() == Connection::csCancelled)
-		{
-			m_pConnection->Disconnect();
-		}
-		delete m_pConnection;
-		m_pConnection = NULL;
-		m_mutexConnection.Unlock();
-	}
-}

WebDownloader.h

@@ -1,112 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef WEBDOWNLOADER_H
-#define WEBDOWNLOADER_H
-
-#include <time.h>
-
-#include "Observer.h"
-#include "Thread.h"
-#include "Connection.h"
-#include "Util.h"
-
-class WebDownloader : public Thread, public Subject
-{
-public:
-	enum EStatus
-	{
-		adUndefined,
-		adRunning,
-		adFinished,
-		adFailed,
-		adRetry,
-		adNotFound,
-		adRedirect,
-		adConnectError,
-		adFatalError
-	};
-			
-private:
-	char*				m_szURL;
-	char*				m_szOutputFilename;
-	Connection* 		m_pConnection;
-	Mutex			 	m_mutexConnection;
-	EStatus				m_eStatus;
-	time_t				m_tLastUpdateTime;
-	char*				m_szInfoName;
-	FILE*				m_pOutFile;
-	int					m_iContentLen;
-	bool				m_bConfirmedLength;
-	char*				m_szOriginalFilename;
-	bool				m_bForce;
-	bool				m_bRedirecting;
-	bool				m_bRedirected;
-	int					m_iRedirects;
-	bool				m_bGZip;
-	bool				m_bRetry;
-#ifndef DISABLE_GZIP
-	GUnzipStream*		m_pGUnzipStream;
-#endif
-
-	void				SetStatus(EStatus eStatus);
-	bool				Write(void* pBuffer, int iLen);
-	bool				PrepareFile();
-	void				FreeConnection();
-	EStatus				CheckResponse(const char* szResponse);
-	EStatus				CreateConnection(URL *pUrl);
-	void				ParseFilename(const char* szContentDisposition);
-	void				SendHeaders(URL *pUrl);
-	EStatus				DownloadHeaders();
-	EStatus				DownloadBody();
-	void				ParseRedirect(const char* szLocation); 
-
-protected:
-	virtual void		ProcessHeader(const char* szLine);
-
-public:
-						WebDownloader();
-						~WebDownloader();
-	EStatus				GetStatus() { return m_eStatus; }
-	virtual void		Run();
-	virtual void		Stop();
-	EStatus				Download();
-	bool				Terminate();
-	void				SetInfoName(const char* v);
-	const char*			GetInfoName() { return m_szInfoName; }
-	void 				SetURL(const char* szURL);
-	const char*			GetOutputFilename() { return m_szOutputFilename; }
-	void 				SetOutputFilename(const char* v);
-	time_t				GetLastUpdateTime() { return m_tLastUpdateTime; }
-	void				SetLastUpdateTimeNow() { m_tLastUpdateTime = ::time(NULL); }
-	bool				GetConfirmedLength() { return m_bConfirmedLength; }
-	const char*			GetOriginalFilename() { return m_szOriginalFilename; }
-	void				SetForce(bool bForce) { m_bForce = bForce; }
-	void				SetRetry(bool bRetry) { m_bRetry = bRetry; }
-
-	void				LogDebugInfo();
-};
-
-#endif

WebServer.cpp

@@ -1,498 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-#ifndef WIN32
-#include <unistd.h>
-#endif
-
-#include "nzbget.h"
-#include "WebServer.h"
-#include "XmlRpc.h"
-#include "Log.h"
-#include "Options.h"
-#include "Util.h"
-
-extern Options* g_pOptions;
-
-static const char* ERR_HTTP_BAD_REQUEST = "400 Bad Request";
-static const char* ERR_HTTP_NOT_FOUND = "404 Not Found";
-static const char* ERR_HTTP_SERVICE_UNAVAILABLE = "503 Service Unavailable";
-
-static const int MAX_UNCOMPRESSED_SIZE = 500;
-
-//*****************************************************************
-// WebProcessor
-
-WebProcessor::WebProcessor()
-{
-	m_pConnection = NULL;
-	m_szRequest = NULL;
-	m_szUrl = NULL;
-	m_szOrigin = NULL;
-}
-
-WebProcessor::~WebProcessor()
-{
-	free(m_szRequest);
-	free(m_szUrl);
-	free(m_szOrigin);
-}
-
-void WebProcessor::SetUrl(const char* szUrl)
-{
-	m_szUrl = strdup(szUrl);
-}
-
-void WebProcessor::Execute()
-{
-	m_bGZip =false;
-	char szAuthInfo[1024];
-	szAuthInfo[0] = '\0';
-
-	// reading http header
-	char szBuffer[1024];
-	int iContentLen = 0;
-	while (char* p = m_pConnection->ReadLine(szBuffer, sizeof(szBuffer), NULL))
-	{
-		if (char* pe = strrchr(p, '\r')) *pe = '\0';
-		debug("header=%s", p);
-		if (!strncasecmp(p, "Content-Length: ", 16))
-		{
-			iContentLen = atoi(p + 16);
-		}
-		if (!strncasecmp(p, "Authorization: Basic ", 21))
-		{
-			char* szAuthInfo64 = p + 21;
-			if (strlen(szAuthInfo64) > sizeof(szAuthInfo))
-			{
-				error("Invalid-request: auth-info too big");
-				return;
-			}
-			szAuthInfo[WebUtil::DecodeBase64(szAuthInfo64, 0, szAuthInfo)] = '\0';
-		}
-		if (!strncasecmp(p, "Accept-Encoding: ", 17))
-		{
-			m_bGZip = strstr(p, "gzip");
-		}
-		if (!strncasecmp(p, "Origin: ", 8))
-		{
-			m_szOrigin = strdup(p + 8);
-		}
-		if (*p == '\0')
-		{
-			break;
-		}
-	}
-
-	debug("URL=%s", m_szUrl);
-	debug("Authorization=%s", szAuthInfo);
-
-	if (m_eHttpMethod == hmPost && iContentLen <= 0)
-	{
-		error("Invalid-request: content length is 0");
-		return;
-	}
-
-	if (m_eHttpMethod == hmOptions)
-	{
-		SendOptionsResponse();
-		return;
-	}
-
-	// remove subfolder "nzbget" from the path (if exists)
-	// http://localhost:6789/nzbget/username:password/jsonrpc -> http://localhost:6789/username:password/jsonrpc
-	if (!strncmp(m_szUrl, "/nzbget/", 8))
-	{
-		char* sz_OldUrl = m_szUrl;
-		m_szUrl = strdup(m_szUrl + 7);
-		free(sz_OldUrl);
-	}
-	// http://localhost:6789/nzbget -> http://localhost:6789
-	if (!strcmp(m_szUrl, "/nzbget"))
-	{
-		char szRedirectURL[1024];
-		snprintf(szRedirectURL, 1024, "%s/", m_szUrl);
-		szRedirectURL[1024-1] = '\0';
-		SendRedirectResponse(szRedirectURL);
-		return;
-	}
-
-	// authorization via URL in format:
-	// http://localhost:6789/username:password/jsonrpc
-	char* pauth1 = strchr(m_szUrl + 1, ':');
-	char* pauth2 = strchr(m_szUrl + 1, '/');
-	if (pauth1 && pauth1 < pauth2)
-	{
-		char* pstart = m_szUrl + 1;
-		int iLen = 0;
-		char* pend = strchr(pstart + 1, '/');
-		if (pend) 
-		{
-			iLen = (int)(pend - pstart < (int)sizeof(szAuthInfo) - 1 ? pend - pstart : (int)sizeof(szAuthInfo) - 1);
-		}
-		else
-		{
-			iLen = strlen(pstart);
-		}
-		strncpy(szAuthInfo, pstart, iLen);
-		szAuthInfo[iLen] = '\0';
-		char* sz_OldUrl = m_szUrl;
-		m_szUrl = strdup(pend);
-		free(sz_OldUrl);
-	}
-
-	debug("Final URL=%s", m_szUrl);
-
-	if (strlen(g_pOptions->GetControlPassword()) > 0 &&
-		!(strlen(g_pOptions->GetAuthorizedIP()) > 0 && IsAuthorizedIP(m_pConnection->GetRemoteAddr())))
-	{
-		if (strlen(szAuthInfo) == 0)
-		{
-			SendAuthResponse();
-			return;
-		}
-
-		// Authorization
-		char* pw = strchr(szAuthInfo, ':');
-		if (pw) *pw++ = '\0';
-		if ((strlen(g_pOptions->GetControlUsername()) > 0 && strcmp(szAuthInfo, g_pOptions->GetControlUsername())) ||
-			strcmp(pw, g_pOptions->GetControlPassword()))
-		{
-			warn("Request received on port %i from %s, but username or password invalid (%s:%s)",
-				g_pOptions->GetControlPort(), m_pConnection->GetRemoteAddr(), szAuthInfo, pw);
-			SendAuthResponse();
-			return;
-		}
-	}
-
-	if (m_eHttpMethod == hmPost)
-	{
-		// reading http body (request content)
-		m_szRequest = (char*)malloc(iContentLen + 1);
-		m_szRequest[iContentLen] = '\0';
-		
-		if (!m_pConnection->Recv(m_szRequest, iContentLen))
-		{
-			error("Invalid-request: could not read data");
-			return;
-		}
-		debug("Request=%s", m_szRequest);
-	}
-	
-	debug("request received from %s", m_pConnection->GetRemoteAddr());
-
-	Dispatch();
-}
-
-bool WebProcessor::IsAuthorizedIP(const char* szRemoteAddr)
-{
-	const char* szRemoteIP = m_pConnection->GetRemoteAddr();
-
-	// split option AuthorizedIP into tokens and check each token
-	bool bAuthorized = false;
-	char* szAuthorizedIP = strdup(g_pOptions->GetAuthorizedIP());
-	char* saveptr;
-	char* szIP = strtok_r(szAuthorizedIP, ",;", &saveptr);
-	while (szIP)
-	{
-		szIP = Util::Trim(szIP);
-		if (szIP[0] != '\0' && !strcmp(szIP, szRemoteIP))
-		{
-			bAuthorized = true;
-			break;
-		}
-		szIP = strtok_r(NULL, ",;", &saveptr);
-	}
-	free(szAuthorizedIP);
-	
-	return bAuthorized;
-}
-
-void WebProcessor::Dispatch()
-{
-	if (*m_szUrl != '/')
-	{
-		SendErrorResponse(ERR_HTTP_BAD_REQUEST);
-		return;
-	}
-
-	if (XmlRpcProcessor::IsRpcRequest(m_szUrl))
-	{
-		XmlRpcProcessor processor;
-		processor.SetRequest(m_szRequest);
-		processor.SetHttpMethod(m_eHttpMethod == hmGet ? XmlRpcProcessor::hmGet : XmlRpcProcessor::hmPost);
-		processor.SetUrl(m_szUrl);
-		processor.Execute();
-		SendBodyResponse(processor.GetResponse(), strlen(processor.GetResponse()), processor.GetContentType()); 
-		return;
-	}
-
-	if (!g_pOptions->GetWebDir() || strlen(g_pOptions->GetWebDir()) == 0)
-	{
-		SendErrorResponse(ERR_HTTP_SERVICE_UNAVAILABLE);
-		return;
-	}
-	
-	if (m_eHttpMethod != hmGet)
-	{
-		SendErrorResponse(ERR_HTTP_BAD_REQUEST);
-		return;
-	}
-	
-	// for security reasons we allow only characters "0..9 A..Z a..z . - _ /" in the URLs
-	// we also don't allow ".." in the URLs
-	for (char *p = m_szUrl; *p; p++)
-	{
-		if (!((*p >= '0' && *p <= '9') || (*p >= 'A' && *p <= 'Z') || (*p >= 'a' && *p <= 'z') ||
-			*p == '.' || *p == '-' || *p == '_' || *p == '/') || (*p == '.' && p[1] == '.'))
-		{
-			SendErrorResponse(ERR_HTTP_NOT_FOUND);
-			return;
-		}
-	}
-
-	const char *szDefRes = "";
-	if (m_szUrl[strlen(m_szUrl)-1] == '/')
-	{
-		// default file in directory (if not specified) is "index.html"
-		szDefRes = "index.html";
-	}
-
-	char disk_filename[1024];
-	snprintf(disk_filename, sizeof(disk_filename), "%s%s%s", g_pOptions->GetWebDir(), m_szUrl + 1, szDefRes);
-
-	disk_filename[sizeof(disk_filename)-1] = '\0';
-
-	SendFileResponse(disk_filename);
-}
-
-void WebProcessor::SendAuthResponse()
-{
-	const char* AUTH_RESPONSE_HEADER =
-		"HTTP/1.0 401 Unauthorized\r\n"
-		"WWW-Authenticate: Basic realm=\"NZBGet\"\r\n"
-		"Connection: close\r\n"
-		"Content-Type: text/plain\r\n"
-		"Server: nzbget-%s\r\n"
-		"\r\n";
-	char szResponseHeader[1024];
-	snprintf(szResponseHeader, 1024, AUTH_RESPONSE_HEADER, Util::VersionRevision());
-	 
-	// Send the response answer
-	debug("ResponseHeader=%s", szResponseHeader);
-	m_pConnection->Send(szResponseHeader, strlen(szResponseHeader));
-}
-
-void WebProcessor::SendOptionsResponse()
-{
-	const char* OPTIONS_RESPONSE_HEADER =
-		"HTTP/1.1 200 OK\r\n"
-		"Connection: close\r\n"
-		//"Content-Type: plain/text\r\n"
-		"Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n"
-		"Access-Control-Allow-Origin: %s\r\n"
-		"Access-Control-Allow-Credentials: true\r\n"
-		"Access-Control-Max-Age: 86400\r\n"
-		"Access-Control-Allow-Headers: Content-Type, Authorization\r\n"
-		"Server: nzbget-%s\r\n"
-		"\r\n";
-	char szResponseHeader[1024];
-	snprintf(szResponseHeader, 1024, OPTIONS_RESPONSE_HEADER, 
-		m_szOrigin ? m_szOrigin : "",
-		Util::VersionRevision());
-	 
-	// Send the response answer
-	debug("ResponseHeader=%s", szResponseHeader);
-	m_pConnection->Send(szResponseHeader, strlen(szResponseHeader));
-}
-
-void WebProcessor::SendErrorResponse(const char* szErrCode)
-{
-	const char* RESPONSE_HEADER = 
-		"HTTP/1.0 %s\r\n"
-		"Connection: close\r\n"
-		"Content-Length: %i\r\n"
-		"Content-Type: text/html\r\n"
-		"Server: nzbget-%s\r\n"
-		"\r\n";
-
-	warn("Web-Server: %s, Resource: %s", szErrCode, m_szUrl);
-
-	char szResponseBody[1024];
-	snprintf(szResponseBody, 1024, "<html><head><title>%s</title></head><body>Error: %s</body></html>", szErrCode, szErrCode);
-	int iPageContentLen = strlen(szResponseBody);
-
-	char szResponseHeader[1024];
-	snprintf(szResponseHeader, 1024, RESPONSE_HEADER, szErrCode, iPageContentLen, Util::VersionRevision());
-
-	// Send the response answer
-	m_pConnection->Send(szResponseHeader, strlen(szResponseHeader));
-	m_pConnection->Send(szResponseBody, iPageContentLen);
-}
-
-void WebProcessor::SendRedirectResponse(const char* szURL)
-{
-	const char* REDIRECT_RESPONSE_HEADER =
-		"HTTP/1.0 301 Moved Permanently\r\n"
-		"Location: %s\r\n"
-		"Connection: close\r\n"
-		"Server: nzbget-%s\r\n"
-		"\r\n";
-	char szResponseHeader[1024];
-	snprintf(szResponseHeader, 1024, REDIRECT_RESPONSE_HEADER, szURL, Util::VersionRevision());
-	 
-	// Send the response answer
-	debug("ResponseHeader=%s", szResponseHeader);
-	m_pConnection->Send(szResponseHeader, strlen(szResponseHeader));
-}
-
-void WebProcessor::SendBodyResponse(const char* szBody, int iBodyLen, const char* szContentType)
-{
-	const char* RESPONSE_HEADER = 
-		"HTTP/1.1 200 OK\r\n"
-		"Connection: close\r\n"
-		"Access-Control-Allow-Methods: GET, POST, OPTIONS\r\n"
-		"Access-Control-Allow-Origin: %s\r\n"
-		"Access-Control-Allow-Credentials: true\r\n"
-		"Access-Control-Max-Age: 86400\r\n"
-		"Access-Control-Allow-Headers: Content-Type, Authorization\r\n"
-		"Content-Length: %i\r\n"
-		"%s"					// Content-Type: xxx
-		"%s"					// Content-Encoding: gzip
-		"Server: nzbget-%s\r\n"
-		"\r\n";
-	
-#ifndef DISABLE_GZIP
-	char *szGBuf = NULL;
-	bool bGZip = m_bGZip && iBodyLen > MAX_UNCOMPRESSED_SIZE;
-	if (bGZip)
-	{
-		unsigned int iOutLen = ZLib::GZipLen(iBodyLen);
-		szGBuf = (char*)malloc(iOutLen);
-		int iGZippedLen = ZLib::GZip(szBody, iBodyLen, szGBuf, iOutLen);
-		if (iGZippedLen > 0 && iGZippedLen < iBodyLen)
-		{
-			szBody = szGBuf;
-			iBodyLen = iGZippedLen;
-		}
-		else
-		{
-			free(szGBuf);
-			szGBuf = NULL;
-			bGZip = false;
-		}
-	}
-#else
-	bool bGZip = false;
-#endif
-	
-	char szContentTypeHeader[1024];
-	if (szContentType)
-	{
-		snprintf(szContentTypeHeader, 1024, "Content-Type: %s\r\n", szContentType);
-	}
-	else
-	{
-		szContentTypeHeader[0] = '\0';
-	}
-	
-	char szResponseHeader[1024];
-	snprintf(szResponseHeader, 1024, RESPONSE_HEADER, 
-		m_szOrigin ? m_szOrigin : "",
-		iBodyLen, szContentTypeHeader,
-		bGZip ? "Content-Encoding: gzip\r\n" : "",
-		Util::VersionRevision());
-	
-	// Send the request answer
-	m_pConnection->Send(szResponseHeader, strlen(szResponseHeader));
-	m_pConnection->Send(szBody, iBodyLen);
-	
-#ifndef DISABLE_GZIP
-	free(szGBuf);
-#endif
-}
-
-void WebProcessor::SendFileResponse(const char* szFilename)
-{
-	debug("serving file: %s", szFilename);
-
-	char *szBody;
-	int iBodyLen;
-	if (!Util::LoadFileIntoBuffer(szFilename, &szBody, &iBodyLen))
-	{
-		SendErrorResponse(ERR_HTTP_NOT_FOUND);
-		return;
-	}
-	
-	// "LoadFileIntoBuffer" adds a trailing NULL, which we don't need here
-	iBodyLen--;
-	
-	SendBodyResponse(szBody, iBodyLen, DetectContentType(szFilename));
-
-	free(szBody);
-}
-
-const char* WebProcessor::DetectContentType(const char* szFilename)
-{
-	if (const char *szExt = strrchr(szFilename, '.'))
-	{
-		if (!strcasecmp(szExt, ".css"))
-		{
-			return "text/css";
-		}
-		else if (!strcasecmp(szExt, ".html"))
-		{
-			return "text/html";
-		}
-		else if (!strcasecmp(szExt, ".js"))
-		{
-			return "application/javascript";
-		}
-		else if (!strcasecmp(szExt, ".png"))
-		{
-			return "image/png";
-		}
-		else if (!strcasecmp(szExt, ".jpeg"))
-		{
-			return "image/jpeg";
-		}
-		else if (!strcasecmp(szExt, ".gif"))
-		{
-			return "image/gif";
-		}
-	}
-	return NULL;
-}

WebServer.h

@@ -1,68 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2012 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef WEBSERVER_H
-#define WEBSERVER_H
-
-#include "Connection.h"
-
-class WebProcessor
-{
-public:
-	enum EHttpMethod
-	{
-		hmPost,
-		hmGet,
-		hmOptions
-	};
-
-private:
-	Connection*			m_pConnection;
-	char*				m_szRequest;
-	char*				m_szUrl;
-	EHttpMethod			m_eHttpMethod;
-	bool				m_bGZip;
-	char*				m_szOrigin;
-
-	void				Dispatch();
-	void				SendAuthResponse();
-	void				SendOptionsResponse();
-	void				SendErrorResponse(const char* szErrCode);
-	void				SendFileResponse(const char* szFilename);
-	void				SendBodyResponse(const char* szBody, int iBodyLen, const char* szContentType);
-	void				SendRedirectResponse(const char* szURL);
-	const char*			DetectContentType(const char* szFilename);
-	bool				IsAuthorizedIP(const char* szRemoteAddr);
-
-public:
-						WebProcessor();
-						~WebProcessor();
-	void				Execute();
-	void				SetConnection(Connection* pConnection) { m_pConnection = pConnection; }
-	void				SetUrl(const char* szUrl);
-	void				SetHttpMethod(EHttpMethod eHttpMethod) { m_eHttpMethod = eHttpMethod; }
-};
-
-#endif

XmlRpc.h

@@ -1,112 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef XMLRPC_H
-#define XMLRPC_H
-
-#include "Connection.h"
-#include "Util.h"
-
-class XmlCommand;
-
-class XmlRpcProcessor
-{
-public:
-	enum ERpcProtocol
-	{
-		rpUndefined,
-		rpXmlRpc,
-		rpJsonRpc,
-		rpJsonPRpc
-	};
-
-	enum EHttpMethod
-	{
-		hmPost,
-		hmGet
-	};
-
-private:
-	char*				m_szRequest;
-	const char*			m_szContentType;
-	ERpcProtocol		m_eProtocol;
-	EHttpMethod			m_eHttpMethod;
-	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);
-
-public:
-						XmlRpcProcessor();
-						~XmlRpcProcessor();
-	void				Execute();
-	void				SetHttpMethod(EHttpMethod eHttpMethod) { m_eHttpMethod = eHttpMethod; }
-	void				SetUrl(const char* szUrl);
-	void				SetRequest(char* szRequest) { m_szRequest = szRequest; }
-	const char*			GetResponse() { return m_cResponse.GetBuffer(); }
-	const char*			GetContentType() { return m_szContentType; }
-	static bool			IsRpcRequest(const char* szUrl);
-};
-
-class XmlCommand
-{
-protected:
-	char*				m_szRequest;
-	char*				m_szRequestPtr;
-	char*				m_szCallbackFunc;
-	StringBuilder		m_StringBuilder;
-	bool				m_bFault;
-	XmlRpcProcessor::ERpcProtocol	m_eProtocol;
-	XmlRpcProcessor::EHttpMethod	m_eHttpMethod;
-
-	void				BuildErrorResponse(int iErrCode, const char* szErrText, ...);
-	void				BuildBoolResponse(bool bOK);
-	void				AppendResponse(const char* szPart);
-	bool				IsJson();
-	bool				CheckSafeMethod();
-	bool				NextParamAsInt(int* iValue);
-	bool				NextParamAsBool(bool* bValue);
-	bool				NextParamAsStr(char** szValueBuf);
-	const char*			BoolToStr(bool bValue);
-	char*				EncodeStr(const char* szStr);
-	void				DecodeStr(char* szStr);
-
-public:
-						XmlCommand();
-	virtual 			~XmlCommand() {}
-	virtual void		Execute() = 0;
-	void				PrepareParams();
-	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; }
-	const char*			GetResponse() { return m_StringBuilder.GetBuffer(); }
-	const char*			GetCallbackFunc() { return m_szCallbackFunc; }
-	bool				GetFault() { return m_bFault; }
-};
-
-#endif

config.h.in

@@ -3,18 +3,28 @@
 /* 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 smart par-verification and restoration */
+/* Define to 1 to not use libxml2, only for development purposes */
+#undef DISABLE_LIBXML2
+
+/* Define to 1 to disable par-verification and repair */
 #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
@@ -31,6 +41,21 @@
 /* Define to 1 if you have the <curses.h> header file. */
 #undef HAVE_CURSES_H
 
+/* define if the compiler supports basic C++14 syntax */
+#undef HAVE_CXX14
+
+/* 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
 
@@ -46,6 +71,12 @@
 /* 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
 
@@ -55,6 +86,9 @@
 /* Define to 1 to use GnuTLS library for TLS/SSL-support. */
 #undef HAVE_LIBGNUTLS
 
+/* Define to 1 if lockf is supported */
+#undef HAVE_LOCKF
+
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 
@@ -64,20 +98,20 @@
 /* Define to 1 if you have the <ncurses/ncurses.h> header file. */
 #undef HAVE_NCURSES_NCURSES_H
 
-/* Define to 1 to use OpenSSL library for TLS/SSL-support. */
+/* Define to 1 to use Nettle library for decryption. */
+#undef HAVE_NETTLE
+
+/* Define to 1 to use OpenSSL library for TLS/SSL-support and decryption. */
 #undef HAVE_OPENSSL
 
-/* Define to 1 if libpar2 has recent bugfixes-patch (version 2) */
-#undef HAVE_PAR2_BUGFIXES_V2
-
-/* Define to 1 if libpar2 supports cancelling (needs a special patch) */
-#undef HAVE_PAR2_CANCEL
+/* Define to 1 if pthread_cancel is supported */
+#undef HAVE_PTHREAD_CANCEL
 
 /* Define to 1 if you have the <regex.h> header file. */
 #undef HAVE_REGEX_H
 
-/* Define to 1 if spinlocks are supported */
-#undef HAVE_SPINLOCK
+/* Define to 1 if _SC_NPROCESSORS_ONLN is present in unistd.h */
+#undef HAVE_SC_NPROCESSORS_ONLN
 
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H
@@ -85,6 +119,9 @@
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H
 
+/* 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
 
@@ -106,6 +143,12 @@
 /* Define to 1 if variadic macros are supported */
 #undef HAVE_VARIADIC_MACROS
 
+/* Define to 1 if OpenSSL supports function "X509_check_host". */
+#undef HAVE_X509_CHECK_HOST
+
+/* Define to 1 to exclude debug-code */
+#undef NDEBUG
+
 /* Name of package */
 #undef PACKAGE
 
@@ -121,6 +164,9 @@
 /* Define to the one symbol short name of this package. */
 #undef PACKAGE_TARNAME
 
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
 /* Define to the version of this package. */
 #undef PACKAGE_VERSION
 
@@ -136,8 +182,19 @@
 /* Version number of package */
 #undef VERSION
 
+/* Enable large inode numbers on Mac OS X 10.5.  */
+#ifndef _DARWIN_USE_64_BIT_INODE
+# define _DARWIN_USE_64_BIT_INODE 1
+#endif
+
 /* 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 `unsigned int' if <sys/types.h> does not define. */
+#undef size_t

configure.ac

@@ -1,20 +1,35 @@
+#
+#  This file is part of nzbget. See <http://nzbget.net>.
+#
+# Copyright (C) 2008-2019 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, see <http://www.gnu.org/licenses/>.
+#
+
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.59)
-AC_INIT(nzbget, 12.0, hugbug@users.sourceforge.net)
-AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(nzbget, 12.0)
-AC_CONFIG_SRCDIR([nzbget.cpp])
+AC_PREREQ(2.65)
+AC_INIT(nzbget, 21.0, hugbug@users.sourceforge.net)
+AC_CONFIG_AUX_DIR(posix)
+AC_CANONICAL_TARGET
+AM_INIT_AUTOMAKE([foreign subdir-objects])
+AC_CONFIG_SRCDIR([daemon/main/nzbget.cpp])
 AC_CONFIG_HEADERS([config.h])
+AM_MAINTAINER_MODE
 
-
-dnl
-dnl Set default library path, if not specified in environment variable "LIBPREF".
-dnl
-if test "$LIBPREF" = ""; then
-	LIBPREF="/usr"
-fi
+m4_include([posix/ax_cxx_compile_stdcxx.m4])
 
 
 dnl
@@ -31,12 +46,26 @@ dnl Do all tests with c++ compiler.
 dnl
 AC_LANG(C++)
 
+dnl
+dnl Determine compiler switches to support C++14 standard.
+dnl
+AC_MSG_CHECKING(whether to test compiler features)
+AC_ARG_ENABLE(cpp-check,
+	[AS_HELP_STRING([--disable-cpp-check], [disable check for C++14 compiler features])],
+	[ ENABLECPPCHECK=$enableval ],
+	[ ENABLECPPCHECK=yes] )
+AC_MSG_RESULT($ENABLECPPCHECK)
+if test "$ENABLECPPCHECK" = "yes"; then
+	AX_CXX_COMPILE_STDCXX(14,,[optional])
+	if test "$HAVE_CXX14" != "1"; then
+		AC_MSG_ERROR("A compiler with support for C++14 language features is required. For details visit http://nzbget.net/cpp14")
+	fi
+fi
 
 dnl
 dnl Checks for header files.
 dnl
-AC_CHECK_HEADERS(sys/prctl.h)
-AC_CHECK_HEADERS(regex.h)
+AC_CHECK_HEADERS(sys/prctl.h regex.h endian.h getopt.h)
 
 
 dnl
@@ -48,6 +77,19 @@ AC_SEARCH_LIBS([inet_addr], [nsl])
 AC_SEARCH_LIBS([hstrerror], [resolv])
 
 
+dnl
+dnl Android NDK restrictions
+dnl
+AC_CHECK_FUNC(lockf,
+	[AC_CHECK_DECL(lockf,
+		[AC_DEFINE([HAVE_LOCKF], 1, [Define to 1 if lockf is supported])],,
+		[#include <unistd.h>])])
+AC_CHECK_FUNC(pthread_cancel,
+	[AC_CHECK_DECL(pthread_cancel,
+		[AC_DEFINE([HAVE_PTHREAD_CANCEL], 1, [Define to 1 if pthread_cancel is supported])],,
+		[#include <pthread.h>])])
+
+
 dnl
 dnl Getopt
 dnl
@@ -55,6 +97,14 @@ AC_CHECK_FUNC(getopt_long,
 	[AC_DEFINE([HAVE_GETOPT_LONG], 1, [Define to 1 if getopt_long is supported])],)
 
 
+dnl
+dnl fsync
+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
@@ -108,7 +158,7 @@ if test "$FOUND" = "no"; then
 		[	char* szHost; struct hostent hinfobuf; char* strbuf; int h_errnop;
 			struct hostent* hinfo = gethostbyname_r(szHost, &hinfobuf, strbuf, 1024, &h_errnop); ],
 		AC_MSG_RESULT([[yes, and it takes 5 arguments]])
-		FOUND="yes"                      
+		FOUND="yes"
 		AC_DEFINE([HAVE_GETHOSTBYNAME_R_5], 1, [Define to 1 if gethostbyname_r takes 5 arguments]),
 		FOUND="no")
 	
@@ -142,14 +192,6 @@ 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
@@ -166,42 +208,78 @@ AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <sys/socket.h>],[
 (void)getsockopt (1, 1, 1, NULL, (size_t*)NULL)],[
-    AC_MSG_RESULT(size_t)
-    SOCKLEN_T=size_t],[
-    AC_TRY_COMPILE([
+	AC_MSG_RESULT(size_t)
+	SOCKLEN_T=size_t],[
+	AC_TRY_COMPILE([
 #include <stddef.h>
 #include <sys/types.h>
 #include <sys/socket.h>],[
 (void)getsockopt (1, 1, 1, NULL, (int*)NULL)],[
-      AC_MSG_RESULT(int)
-      SOCKLEN_T=int],[
-      AC_MSG_WARN(could not determine)
-      SOCKLEN_T=int])])])
+	AC_MSG_RESULT(int)
+	SOCKLEN_T=int],[
+	AC_MSG_WARN(could not determine)
+	SOCKLEN_T=int])])])
 AC_DEFINE_UNQUOTED(SOCKLEN_T, $SOCKLEN_T, [Determine what socket length (socklen_t) data type is])
 
 
+dnl
+dnl 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}"]
-	[INCVAL="yes"],
-	[INCVAL="no"])
-AC_ARG_WITH(libxml2_libraries,
-	[AS_HELP_STRING([--with-libxml2-libraries=DIR], [libxml2 library directory])],
-	[LDFLAGS="${LDFLAGS} -L${withval}"]
-	[LIBVAL="yes"],
-	[LIBVAL="no"])
-if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
-	PKG_CHECK_MODULES(libxml2, libxml-2.0,
-		[LIBS="${LIBS} $libxml2_LIBS"]
-		[CPPFLAGS="${CPPFLAGS} $libxml2_CFLAGS"])
+AC_MSG_CHECKING(whether to use libxml2)
+AC_ARG_ENABLE(libxml2,
+	[AS_HELP_STRING([--disable-libxml2], [do not use libxml2 (removes dependency from libxml2-library, only for development purposes)])],
+	[USELIBXML2=$enableval],
+	[USELIBXML2=yes] )
+AC_MSG_RESULT($USELIBXML2)
+if test "$USELIBXML2" = "yes"; then
+	AC_ARG_WITH(libxml2_includes,
+		[AS_HELP_STRING([--with-libxml2-includes=DIR], [libxml2 include directory])],
+		[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+		[INCVAL="yes"],
+		[INCVAL="no"])
+	AC_ARG_WITH(libxml2_libraries,
+		[AS_HELP_STRING([--with-libxml2-libraries=DIR], [libxml2 library directory])],
+		[LDFLAGS="${LDFLAGS} -L${withval}"]
+		[LIBVAL="yes"],
+		[LIBVAL="no"])
+	if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+		PKG_CHECK_MODULES(libxml2, libxml-2.0,
+			[LIBS="${LIBS} $libxml2_LIBS"]
+			[CPPFLAGS="${CPPFLAGS} $libxml2_CFLAGS"],
+			AC_MSG_ERROR("libxml2 library not found"))
+	fi
+	AC_CHECK_HEADER(libxml/tree.h,,
+		AC_MSG_ERROR("libxml2 header files not found"))
+	AC_SEARCH_LIBS([xmlNewNode], [xml2], ,
+		AC_MSG_ERROR("libxml2 library not found"))
+else
+	AC_DEFINE([DISABLE_LIBXML2],1,[Define to 1 to not use libxml2, only for development purposes])
 fi
-AC_CHECK_HEADER(libxml/tree.h,,
-	AC_MSG_ERROR("libxml2 header files not found"))
-AC_SEARCH_LIBS([xmlNewNode], [xml2], ,
-	AC_MSG_ERROR("libxml2 library not found"))
 
 
 dnl
@@ -214,17 +292,23 @@ AC_ARG_ENABLE(curses,
 	[USECURSES=yes] )
 AC_MSG_RESULT($USECURSES)
 if test "$USECURSES" = "yes"; then
-	INCVAL="${LIBPREF}/include"
-	LIBVAL="${LIBPREF}/lib"
 	AC_ARG_WITH(libcurses_includes,
 		[AS_HELP_STRING([--with-libcurses-includes=DIR], [libcurses include directory])],
-		[INCVAL="$withval"])
-	CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+		[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+		[INCVAL="yes"],
+		[INCVAL="no"])
 	AC_ARG_WITH(libcurses_libraries,
 		[AS_HELP_STRING([--with-libcurses-libraries=DIR], [libcurses library directory])],
-		[LIBVAL="$withval"])
-	LDFLAGS="${LDFLAGS} -L${LIBVAL}"
-	
+		[LDFLAGS="${LDFLAGS} -L${withval}"]
+		[LIBVAL="yes"],
+		[LIBVAL="no"])
+	if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+		PKG_CHECK_MODULES(ncurses, ncurses,
+			[LIBS="${LIBS} $ncurses_LIBS"]
+			[CPPFLAGS="${CPPFLAGS} $ncurses_CFLAGS"],
+			AC_MSG_ERROR("ncurses library not found"))
+	fi
+
 	AC_CHECK_HEADER(ncurses.h,
 		FOUND=yes
 		AC_DEFINE([HAVE_NCURSES_H],1,[Define to 1 if you have the <ncurses.h> header file.]),
@@ -246,122 +330,35 @@ if test "$USECURSES" = "yes"; then
 	fi
 	AC_SEARCH_LIBS([refresh], [ncurses curses],, 
 		AC_ERROR([Couldn't find curses library]))
+	AC_SEARCH_LIBS([nodelay], [ncurses curses tinfo],, 
+		AC_ERROR([Couldn't find curses library]))
 else
 	AC_DEFINE([DISABLE_CURSES],1,[Define to 1 to not use curses])
 fi
 
 
 dnl
-dnl Use libpar2 for par-checking. Deafult: no
+dnl Use par-checking. Deafult: yes.
 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 (removes dependency from libpar2- and libsigc-libraries)])],
+	[AS_HELP_STRING([--disable-parcheck], [do not include par-check/-repair-support])],
 	[ ENABLEPARCHECK=$enableval ],
 	[ ENABLEPARCHECK=yes] )
 AC_MSG_RESULT($ENABLEPARCHECK)
 if test "$ENABLEPARCHECK" = "yes"; then
-
+	dnl PAR2 checks. 
 	dnl 
-	dnl checks for libsigc++ includes and libraries (required for libpar2).
-	dnl
-
-	AC_ARG_WITH(libsigc_includes,
-		[AS_HELP_STRING([--with-libsigc-includes=DIR], [libsigc++-2.0 include directory])],
-		[CPPFLAGS="${CPPFLAGS} -I${withval}"]
-		[INCVAL="yes"],
-		[INCVAL="no"])
-	AC_ARG_WITH(libsigc_libraries,
-		[AS_HELP_STRING([--with-libsigc-libraries=DIR], [libsigc++-2.0 library directory])],
-		[LDFLAGS="${LDFLAGS} -L${withval}"]
-		[CPPFLAGS="${CPPFLAGS} -I${withval}/sigc++-2.0/include"]
-		[LIBVAL="yes"],
-		[LIBVAL="no"])
-	if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
-		PKG_CHECK_MODULES(libsigc, sigc++-2.0,
-			[LIBS="${LIBS} $libsigc_LIBS"]
-			[CPPFLAGS="${CPPFLAGS} $libsigc_CFLAGS"])
-	fi
-	
-	AC_CHECK_HEADER(sigc++/type_traits.h,,
-		AC_MSG_ERROR("libsigc++-2.0 header files not found"))
-
-	dnl
-	dnl checks for libpar2 includes and libraries.
-	dnl
-	INCVAL="${LIBPREF}/include"
-	LIBVAL="${LIBPREF}/lib"
-	AC_ARG_WITH(libpar2_includes,
-		[AS_HELP_STRING([--with-libpar2-includes=DIR], [libpar2 include directory])],
-		[INCVAL="$withval"])
-
-	CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
-	
-	AC_CHECK_HEADER(libpar2/libpar2.h,,
-		AC_MSG_ERROR("libpar2 header files not found"))
-
-	AC_ARG_WITH(libpar2_libraries,
-		[AS_HELP_STRING([--with-libpar2-libraries=DIR], [libpar2 library directory])],
-		[LIBVAL="$withval"])
-
-	LDFLAGS="${LDFLAGS} -L${LIBVAL}"
-
-	AC_SEARCH_LIBS([_ZN12Par2RepairerC1Ev], [par2], ,
-		AC_MSG_ERROR("libpar2 library not found"))
-
-	dnl
-	dnl check if libpar2 library is linkable
-	dnl
-	AC_MSG_CHECKING(for libpar2 linking)
-	AC_TRY_LINK(
-		[#include <libpar2/par2cmdline.h>]
-		[#include <libpar2/par2repairer.h>]
-		[ class Repairer : public Par2Repairer { }; ],
-		[ Repairer* p = new Repairer(); ],
-		AC_MSG_RESULT([[yes]]),
-		AC_MSG_RESULT([[no]])
-		AC_MSG_ERROR("libpar2 library not found"))
-
-	dnl
-	dnl check if libpar2 has support for cancelling
-	dnl
-	AC_MSG_CHECKING(whether libpar2 supports cancelling)
-	AC_TRY_COMPILE(
-		[#include <libpar2/par2cmdline.h>]
-		[#include <libpar2/par2repairer.h>]
-		[ class Repairer : public Par2Repairer { void test() { cancelled = true; } }; ],
-		[],
-		AC_MSG_RESULT([[yes]])
-		AC_DEFINE([HAVE_PAR2_CANCEL], 1, [Define to 1 if libpar2 supports cancelling (needs a special patch)]),
-		AC_MSG_RESULT([[no]]))
-
-	dnl
-	dnl check if libpar2 has recent bugfixes-patch
-	dnl
-	AC_MSG_CHECKING(whether libpar2 has recent bugfixes-patch (version 2))
-	AC_TRY_COMPILE(
-		[#include <libpar2/par2cmdline.h>]
-		[#include <libpar2/par2repairer.h>]
-		[ class Repairer : public Par2Repairer { void test() { BugfixesPatchVersion2(); } }; ],
-		[],
-		AC_MSG_RESULT([[yes]])
-		PAR2PATCHV2=yes
-		AC_DEFINE([HAVE_PAR2_BUGFIXES_V2], 1, [Define to 1 if libpar2 has recent bugfixes-patch (version 2)]),
-		AC_MSG_RESULT([[no]])
-		PAR2PATCHV2=no)
-
-	if test "$PAR2PATCHV2" = "no" ; then
-		AC_ARG_ENABLE(libpar2-bugfixes-check,
-			[AS_HELP_STRING([--disable-libpar2-bugfixes-check], [do not check if libpar2 has recent bugfixes-patch applied])],
-			[ PAR2PATCHCHECK=$enableval ],
-			[ PAR2PATCHCHECK=yes] )
-		if test "$PAR2PATCHCHECK" = "yes"; then
-			AC_ERROR([Your version of libpar2 doesn't include the recent bugfixes-patch (version 2, updated Dec 3, 2012). Please patch libpar2 with the patches supplied with NZBGet (see README for details). If you cannot patch libpar2, you can use configure parameter --disable-libpar2-bugfixes-check to suppress the check. Please note however that in this case the program may crash during par-check/repair. The patch is highly recommended!])
-		fi
-	fi
-
+	dnl Checks for typedefs, structures, and compiler characteristics.
+	AC_TYPE_SIZE_T
+	AC_FUNC_FSEEKO
+	dnl Checks for library functions.
+	AC_CHECK_FUNCS([stricmp])
+	AC_CHECK_FUNCS([getopt])
+	AM_CONDITIONAL(WITH_PAR2, true)
 else
-	AC_DEFINE([DISABLE_PARCHECK],1,[Define to 1 to disable smart par-verification and restoration])
+	AC_DEFINE([DISABLE_PARCHECK],1,[Define to 1 to disable par-verification and repair])
+	AM_CONDITIONAL(WITH_PAR2, false)
 fi
 
 
@@ -376,47 +373,12 @@ AC_ARG_ENABLE(tls,
 AC_MSG_RESULT($USETLS)
 if test "$USETLS" = "yes"; then
 	AC_ARG_WITH(tlslib,
-		[AS_HELP_STRING([--with-tlslib=(GnuTLS, OpenSSL)], [TLS/SSL library to use])],
+		[AS_HELP_STRING([--with-tlslib=(OpenSSL, GnuTLS)], [TLS/SSL library to use])],
 		[TLSLIB="$withval"])
 	if test "$TLSLIB" != "GnuTLS" -a "$TLSLIB" != "OpenSSL" -a "$TLSLIB" != ""; then
 		AC_MSG_ERROR([Invalid argument for option --with-tlslib])
 	fi
-	
-	if test "$TLSLIB" = "GnuTLS" -o "$TLSLIB" = ""; then
-		INCVAL="${LIBPREF}/include"
-		LIBVAL="${LIBPREF}/lib"
-		AC_ARG_WITH(libgnutls_includes,
-			[AS_HELP_STRING([--with-libgnutls-includes=DIR], [GnuTLS include directory])],
-			[INCVAL="$withval"])
-		CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
-		AC_ARG_WITH(libgnutls_libraries,
-			[AS_HELP_STRING([--with-libgnutls-libraries=DIR], [GnuTLS library directory])],
-			[LIBVAL="$withval"])
-		LDFLAGS="${LDFLAGS} -L${LIBVAL}"
 
-		AC_CHECK_HEADER(gnutls/gnutls.h,
-			FOUND=yes
-			TLSHEADERS=yes,
-			FOUND=no)
-		if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
-			AC_MSG_ERROR([Couldn't find GnuTLS headers (gnutls.h)])
-		fi
-		if test "$FOUND" = "yes"; then
-			AC_SEARCH_LIBS([gnutls_global_init], [gnutls],
-				AC_SEARCH_LIBS([gcry_control], [gnutls gcrypt],
-					FOUND=yes,
-					FOUND=no),
-				FOUND=no)
-			if test "$FOUND" = "no" -a "$TLSLIB" = "GnuTLS"; then
-				AC_MSG_ERROR([Couldn't find GnuTLS library])
-			fi
-			if test "$FOUND" = "yes"; then
-				TLSLIB="GnuTLS"
-				AC_DEFINE([HAVE_LIBGNUTLS],1,[Define to 1 to use GnuTLS library for TLS/SSL-support.])
-			fi
-		fi
-	fi
-	
 	if test "$TLSLIB" = "OpenSSL" -o "$TLSLIB" = ""; then
 		AC_ARG_WITH(openssl_includes,
 			[AS_HELP_STRING([--with-openssl-includes=DIR], [OpenSSL include directory])],
@@ -429,7 +391,7 @@ if test "$USETLS" = "yes"; then
 			[LIBVAL="yes"],
 			[LIBVAL="no"])
 		if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
-			PKG_CHECK_MODULES(openssl, openssl,
+			PKG_CHECK_MODULES([openssl], [openssl],
 				[LIBS="${LIBS} $openssl_LIBS"]
 				[CPPFLAGS="${CPPFLAGS} $openssl_CFLAGS"])
 		fi
@@ -442,8 +404,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],
+			AC_SEARCH_LIBS([ASN1_OBJECT_free], [crypto],
+				AC_SEARCH_LIBS([SSL_CTX_new], [ssl],
 					FOUND=yes,
 					FOUND=no),
 				FOUND=no)
@@ -452,16 +414,110 @@ if test "$USETLS" = "yes"; then
 			fi
 			if test "$FOUND" = "yes"; then
 				TLSLIB="OpenSSL"
-				AC_DEFINE([HAVE_OPENSSL],1,[Define to 1 to use OpenSSL library for TLS/SSL-support.])
+				AC_DEFINE([HAVE_OPENSSL],1,[Define to 1 to use OpenSSL library for TLS/SSL-support and decryption.])
+				AC_SEARCH_LIBS([X509_check_host], [crypto],
+					AC_DEFINE([HAVE_X509_CHECK_HOST],1,[Define to 1 if OpenSSL supports function "X509_check_host".]))
 			fi
 		fi
 	fi
-	
+
+	if test "$TLSLIB" = "GnuTLS" -o "$TLSLIB" = ""; then
+		AC_ARG_WITH(libgnutls_includes,
+			[AS_HELP_STRING([--with-libgnutls-includes=DIR], [GnuTLS include directory])],
+			[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+			[INCVAL="yes"],
+			[INCVAL="no"])
+		AC_ARG_WITH(libgnutls_libraries,
+			[AS_HELP_STRING([--with-libgnutls-libraries=DIR], [GnuTLS library directory])],
+			[LDFLAGS="${LDFLAGS} -L${withval}"]
+			[LIBVAL="yes"],
+			[LIBVAL="no"])
+		if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+			PKG_CHECK_MODULES([gnutls], [gnutls],
+				[LIBS="${LIBS} $gnutls_LIBS"]
+				[CPPFLAGS="${CPPFLAGS} $gnutls_CFLAGS"])
+		fi
+
+		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
+
+		if test "$TLSLIB" = "GnuTLS"; then
+			AC_ARG_WITH(libnettle_includes,
+				[AS_HELP_STRING([--with-libnettle-includes=DIR], [Nettle include directory])],
+				[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+				[INCVAL="yes"],
+				[INCVAL="no"])
+			AC_ARG_WITH(libnettle_libraries,
+				[AS_HELP_STRING([--with-libnettle-libraries=DIR], [Nettle library directory])],
+				[LDFLAGS="${LDFLAGS} -L${withval}"]
+				[LIBVAL="yes"],
+				[LIBVAL="no"])
+			if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+				PKG_CHECK_MODULES([nettle], [nettle],
+					[LIBS="${LIBS} $nettle_LIBS"]
+					[CPPFLAGS="${CPPFLAGS} $nettle_CFLAGS"])
+			fi
+			AC_CHECK_HEADER(nettle/sha.h,
+				FOUND=yes,
+				FOUND=no)
+			if test "$FOUND" = "no"; then
+				AC_MSG_ERROR([Couldn't find Nettle headers (sha.h)])
+			fi
+			AC_SEARCH_LIBS([nettle_pbkdf2_hmac_sha256], [nettle],
+				FOUND=yes,
+				FOUND=no)
+			if test "$FOUND" = "no"; then
+				AC_MSG_ERROR([Couldn't find Nettle library, required when using GnuTLS])
+			fi
+			if test "$FOUND" = "yes"; then
+				AC_DEFINE([HAVE_NETTLE],1,[Define to 1 to use Nettle library for decryption.])
+			fi
+		fi
+	fi
+
 	if test "$TLSLIB" = ""; then
 		if test "$TLSHEADERS" = ""; then
-			AC_MSG_ERROR([Couldn't find neither GnuTLS nor OpenSSL headers (gnutls.h or ssl.h)])
+			AC_MSG_ERROR([Couldn't find neither OpenSSL nor GnuTLS headers (ssl.h or gnutls.h)])
 		else
-			AC_MSG_ERROR([Couldn't find neither GnuTLS nor OpenSSL library])
+			AC_MSG_ERROR([Couldn't find neither OpenSSL nor GnuTLS library])
 		fi
 	fi
 else
@@ -479,16 +535,21 @@ AC_ARG_ENABLE(gzip,
 	[USEZLIB=yes] )
 AC_MSG_RESULT($USEZLIB)
 if test "$USEZLIB" = "yes"; then
-	INCVAL="${LIBPREF}/include"
-	LIBVAL="${LIBPREF}/lib"
 	AC_ARG_WITH(zlib_includes,
 		[AS_HELP_STRING([--with-zlib-includes=DIR], [zlib include directory])],
-		[INCVAL="$withval"])
-	CPPFLAGS="${CPPFLAGS} -I${INCVAL}"
+		[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+		[INCVAL="yes"],
+		[INCVAL="no"])
 	AC_ARG_WITH(zlib_libraries,
 		[AS_HELP_STRING([--with-zlib-libraries=DIR], [zlib library directory])],
-		[LIBVAL="$withval"])
-	LDFLAGS="${LDFLAGS} -L${LIBVAL}"
+		[LDFLAGS="${LDFLAGS} -L${withval}"]
+		[LIBVAL="yes"],
+		[LIBVAL="no"])
+	if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+		PKG_CHECK_MODULES([zlib], [zlib],
+			[LIBS="${LIBS} $zlib_LIBS"]
+			[CPPFLAGS="${CPPFLAGS} $zlib_CFLAGS"])
+	fi
 	
 	AC_CHECK_HEADER(zlib.h,,
 		AC_MSG_ERROR("zlib header files not found"))
@@ -499,6 +560,36 @@ else
 fi
 
 
+dnl
+dnl Determine if CPU supports SIMD instructions
+dnl
+AC_MSG_CHECKING(whether to use SIMD-optimized routines)
+USE_SIMD=no
+case $host_cpu in
+	i?86|x86_64)
+		SSE2_CXXFLAGS="-msse2"
+		SSSE3_CXXFLAGS="-mssse3"
+		PCLMUL_CXXFLAGS="-msse4.1 -mpclmul"
+		USE_SIMD=yes
+		;;
+	arm*)
+		NEON_CXXFLAGS="-mfpu=neon"
+		ACLECRC_CXXFLAGS="-march=armv8-a+crc -fpermissive"
+		USE_SIMD=yes
+		;;
+	aarch64)
+		ACLECRC_CXXFLAGS="-march=armv8-a+crc -fpermissive"
+		USE_SIMD=yes
+		;;
+esac
+AC_MSG_RESULT($USE_SIMD)
+AC_SUBST([SSE2_CXXFLAGS])
+AC_SUBST([SSSE3_CXXFLAGS])
+AC_SUBST([PCLMUL_CXXFLAGS])
+AC_SUBST([NEON_CXXFLAGS])
+AC_SUBST([ACLECRC_CXXFLAGS])
+
+
 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.
@@ -536,16 +627,6 @@ 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
@@ -567,11 +648,10 @@ dnl
 dnl variadic macros
 dnl 
 AC_MSG_CHECKING(for variadic macros)
-AC_COMPILE_IFELSE([
-	#define macro(...)   macrofunc(__VA_ARGS__)
-	int macrofunc(int a, int b) { return a + b; }
-	int test() { return macro(1, 2); }
-	],
+AC_TRY_COMPILE(
+	[ #define macro(...)   macrofunc(__VA_ARGS__) ]
+	[ int macrofunc(int a, int b) { return a + b; } ],
+	[ int a=macro(1, 2); ],
 	AC_MSG_RESULT([yes])
 	AC_DEFINE([HAVE_VARIADIC_MACROS], 1, Define to 1 if variadic macros are supported),
 	AC_MSG_RESULT([no]))
@@ -609,8 +689,26 @@ 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
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

daemon/connect/Connection.h

@@ -0,0 +1,156 @@
+/*
+ *  This file is part of nzbget. See <http://nzbget.net>.
+ *
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2017 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, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef CONNECTION_H
+#define CONNECTION_H
+
+#include "NString.h"
+
+#ifndef HAVE_GETADDRINFO
+#ifndef HAVE_GETHOSTBYNAME_R
+#include "Thread.h"
+#endif
+#endif
+#ifndef DISABLE_TLS
+#include "TlsSocket.h"
+#endif
+
+class Connection
+{
+public:
+	enum EStatus
+	{
+		csConnected,
+		csDisconnected,
+		csListening,
+		csCancelled,
+		csBroken
+	};
+
+	enum EIPVersion
+	{
+		ipAuto,
+		ipV4,
+		ipV6
+	};
+
+	Connection(const char* host, int port, bool tls);
+	Connection(SOCKET socket, bool tls);
+	virtual ~Connection();
+	static void Init();
+	static void Final();
+	virtual bool Connect();
+	virtual bool Disconnect();
+	bool Bind();
+	bool Send(const char* buffer, int size);
+	bool Recv(char* buffer, int size);
+	int TryRecv(char* buffer, int size);
+	char* ReadLine(char* buffer, int size, int* bytesRead);
+	void ReadBuffer(char** buffer, int *bufLen);
+	int WriteLine(const char* buffer);
+	std::unique_ptr<Connection> Accept();
+	void Cancel();
+	const char* GetHost() { return m_host; }
+	int GetPort() { return m_port; }
+	bool GetTls() { return m_tls; }
+	const char* GetCipher() { return m_cipher; }
+	void SetCipher(const char* cipher) { m_cipher = cipher; }
+	void SetTimeout(int timeout) { m_timeout = timeout; }
+	void SetIPVersion(EIPVersion ipVersion) { m_ipVersion = ipVersion; }
+	EStatus GetStatus() { return m_status; }
+	void SetSuppressErrors(bool suppressErrors);
+	bool GetSuppressErrors() { return m_suppressErrors; }
+	const char* GetRemoteAddr();
+	bool GetGracefull() { return m_gracefull; }
+	void SetGracefull(bool gracefull) { m_gracefull = gracefull; }
+	void SetForceClose(bool forceClose) { m_forceClose = forceClose; }
+#ifndef DISABLE_TLS
+	bool StartTls(bool isClient, const char* certFile, const char* keyFile);
+#endif
+	int FetchTotalBytesRead();
+
+protected:
+	CString m_host;
+	int m_port;
+	bool m_tls;
+	EIPVersion m_ipVersion = ipAuto;
+	SOCKET m_socket = INVALID_SOCKET;
+	CString m_cipher;
+	CharBuffer m_readBuf;
+	int m_bufAvail = 0;
+	char* m_bufPtr = nullptr;
+	EStatus m_status = csDisconnected;
+	int m_timeout = 60;
+	bool m_suppressErrors = true;
+	BString<100> m_remoteAddr;
+	int m_totalBytesRead = 0;
+	bool m_gracefull = false;
+	bool m_forceClose = false;
+
+	struct SockAddr
+	{
+		int ai_family;
+		int ai_socktype;
+		int ai_protocol;
+		bool operator==(const SockAddr& rhs) const
+			{ return memcmp(this, &rhs, sizeof(SockAddr)) == 0; }
+	};
+
+#ifndef DISABLE_TLS
+	class ConTlsSocket: public TlsSocket
+	{
+	public:
+		ConTlsSocket(SOCKET socket, bool isClient, const char* host,
+			const char* certFile, const char* keyFile, const char* cipher, Connection* owner) :
+			TlsSocket(socket, isClient, host, certFile, keyFile, cipher), m_owner(owner) {}
+	protected:
+		virtual void PrintError(const char* errMsg) { m_owner->PrintError(errMsg); }
+	private:
+		Connection* m_owner;
+	};
+
+	std::unique_ptr<ConTlsSocket> m_tlsSocket;
+	bool m_tlsError = false;
+#endif
+#ifndef HAVE_GETADDRINFO
+#ifndef HAVE_GETHOSTBYNAME_R
+	static std::unique_ptr<Mutex> m_getHostByNameMutex;
+#endif
+#endif
+
+	void ReportError(const char* msgPrefix, const char* msgArg, bool PrintErrCode, int herrno = 0,
+		const char* herrMsg = nullptr);
+	virtual void PrintError(const char* errMsg);
+	bool DoConnect();
+	bool DoDisconnect();
+	bool InitSocketOpts(SOCKET socket);
+	bool ConnectWithTimeout(void* address, int address_len);
+#ifndef HAVE_GETADDRINFO
+	in_addr_t ResolveHostAddr(const char* host);
+#endif
+#ifndef DISABLE_TLS
+	int recv(SOCKET s, char* buf, int len, int flags);
+	int send(SOCKET s, const char* buf, int len, int flags);
+	void CloseTls();
+#endif
+};
+
+#endif