version 13.0

2026-01-14 08:58:42 -05:00 · 2014-07-14 20:51:33 +00:00
183 changed files with 5613 additions and 27317 deletions
--- a/29
+++ b/29
@@ -1,27 +1,4 @@
-NZBGet:
-	Andrey Prygunkov <hugbug@users.sourceforge.net>		    (versions 0.3.0 and later)
-	Bo Cordes Petersen <placebodk@users.sourceforge.net>	(versions ? - 0.2.3)
+nzbget:
 	Sven Henkel <sidddy@users.sourceforge.net>				(versions 0.1.0 - ?)
-
-PAR2:
-	Peter Brian Clements <peterbclements@users.sourceforge.net>
-
-PAR2 library API:
-	Francois Lesueur <flesueur@users.sourceforge.net>
-
-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>
+	Bo Cordes Petersen <placebodk@users.sourceforge.net>	(versions ? - 0.2.3)
+	Andrey Prygunkov <hugbug@users.sourceforge.net>		    (versions 0.3.0 and later)
--- a/1340
+++ b/1340
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 #
-#  This file is part of nzbget
+#  This file if part of nzbget
 #
 # Copyright (C) 2008-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 #
@@ -52,12 +52,8 @@ nzbget_SOURCES = \
 	daemon/main/Options.h \
 	daemon/main/Scheduler.cpp \
 	daemon/main/Scheduler.h \
-	daemon/main/StackTrace.cpp \
-	daemon/main/StackTrace.h \
 	daemon/nntp/ArticleDownloader.cpp \
 	daemon/nntp/ArticleDownloader.h \
-	daemon/nntp/ArticleWriter.cpp \
-	daemon/nntp/ArticleWriter.h \
 	daemon/nntp/Decoder.cpp \
 	daemon/nntp/Decoder.h \
 	daemon/nntp/NewsServer.cpp \
@@ -123,52 +119,6 @@ nzbget_SOURCES = \
 	daemon/util/Util.h \
 	svn_version.cpp

-if WITH_PAR2
-nzbget_SOURCES += \
-	lib/par2/commandline.cpp \
-	lib/par2/commandline.h \
-	lib/par2/crc.cpp \
-	lib/par2/crc.h \
-	lib/par2/creatorpacket.cpp \
-	lib/par2/creatorpacket.h \
-	lib/par2/criticalpacket.cpp \
-	lib/par2/criticalpacket.h \
-	lib/par2/datablock.cpp \
-	lib/par2/datablock.h \
-	lib/par2/descriptionpacket.cpp \
-	lib/par2/descriptionpacket.h \
-	lib/par2/diskfile.cpp \
-	lib/par2/diskfile.h \
-	lib/par2/filechecksummer.cpp \
-	lib/par2/filechecksummer.h \
-	lib/par2/galois.cpp \
-	lib/par2/galois.h \
-	lib/par2/letype.h \
-	lib/par2/mainpacket.cpp \
-	lib/par2/mainpacket.h \
-	lib/par2/md5.cpp \
-	lib/par2/md5.h \
-	lib/par2/par2cmdline.h \
-	lib/par2/par2creatorsourcefile.cpp \
-	lib/par2/par2creatorsourcefile.h \
-	lib/par2/par2fileformat.cpp \
-	lib/par2/par2fileformat.h \
-	lib/par2/par2repairer.cpp \
-	lib/par2/par2repairer.h \
-	lib/par2/par2repairersourcefile.cpp \
-	lib/par2/par2repairersourcefile.h \
-	lib/par2/parheaders.cpp \
-	lib/par2/parheaders.h \
-	lib/par2/recoverypacket.cpp \
-	lib/par2/recoverypacket.h \
-	lib/par2/reedsolomon.cpp \
-	lib/par2/reedsolomon.h \
-	lib/par2/verificationhashtable.cpp \
-	lib/par2/verificationhashtable.h \
-	lib/par2/verificationpacket.cpp \
-	lib/par2/verificationpacket.h
-endif
-
 AM_CPPFLAGS = \
 	-I$(srcdir)/daemon/connect \
 	-I$(srcdir)/daemon/feed \
@@ -178,36 +128,21 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/daemon/postprocess \
 	-I$(srcdir)/daemon/queue \
 	-I$(srcdir)/daemon/remote \
-	-I$(srcdir)/daemon/util \
-	-I$(srcdir)/lib/par2
+	-I$(srcdir)/daemon/util

 EXTRA_DIST = \
 	Makefile.cvs \
+	nzbgetd \
 	$(windows_FILES) \
-	$(osx_FILES) \
-	$(linux_FILES)
+	$(osx_FILES)

 windows_FILES = \
 	daemon/windows/NTService.cpp \
 	daemon/windows/NTService.h \
 	daemon/windows/win32.h \
-	daemon/windows/WinConsole.cpp \
-	daemon/windows/WinConsole.h \
 	nzbget.sln \
 	nzbget.vcproj \
-	windows/nzbget-command-shell.bat  \
-	windows/install-update.bat  \
-	windows/README-WINDOWS.txt  \
-	windows/package-info.json  \
-	windows/resources/mainicon.ico \
-	windows/resources/nzbget.rc \
-	windows/resources/resource.h \
-	windows/resources/trayicon_idle.ico \
-	windows/resources/trayicon_paused.ico \
-	windows/resources/trayicon_working.ico \
-	windows/setup/nzbget-setup.nsi \
-	windows/setup/install.bmp \
-	windows/setup/uninstall.bmp
+	nzbget-shell.bat

 osx_FILES = \
 	osx/App_Prefix.pch \
@@ -233,6 +168,8 @@ osx_FILES = \
 	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 \
@@ -240,18 +177,7 @@ osx_FILES = \
 	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
-
 doc_FILES = \
-	lib/par2/AUTHORS \
-	lib/par2/README \
-	AUTHORS \
 	README \
 	ChangeLog \
 	COPYING
@@ -296,6 +222,7 @@ scripts_FILES = \
 	scripts/Logger.py

 # Install
+sbin_SCRIPTS = nzbgetd
 dist_doc_DATA = $(doc_FILES)
 exampleconfdir = $(datadir)/nzbget
 dist_exampleconf_DATA = $(exampleconf_FILES)
@@ -313,6 +240,13 @@ nobase_dist_scripts_SCRIPTS = $(scripts_FILES)
 # 3) delete original.temp
 # These steps ensure that the output file has the same permissions as the original file.

+# 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"
@@ -383,5 +317,4 @@ clean-bak: rm *~
 dist-hook:
 	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 {} \;

--- a/Makefile.in
+++ b/Makefile.in
@@ -15,7 +15,7 @@
@SET_MAKE@

 #
-#  This file is part of nzbget
+#  This file if part of nzbget
 #
 # Copyright (C) 2008-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 #
@@ -61,50 +61,6 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 bin_PROGRAMS = nzbget$(EXEEXT)
-@WITH_PAR2_TRUE@am__append_1 = \
-@WITH_PAR2_TRUE@	lib/par2/commandline.cpp \
-@WITH_PAR2_TRUE@	lib/par2/commandline.h \
-@WITH_PAR2_TRUE@	lib/par2/crc.cpp \
-@WITH_PAR2_TRUE@	lib/par2/crc.h \
-@WITH_PAR2_TRUE@	lib/par2/creatorpacket.cpp \
-@WITH_PAR2_TRUE@	lib/par2/creatorpacket.h \
-@WITH_PAR2_TRUE@	lib/par2/criticalpacket.cpp \
-@WITH_PAR2_TRUE@	lib/par2/criticalpacket.h \
-@WITH_PAR2_TRUE@	lib/par2/datablock.cpp \
-@WITH_PAR2_TRUE@	lib/par2/datablock.h \
-@WITH_PAR2_TRUE@	lib/par2/descriptionpacket.cpp \
-@WITH_PAR2_TRUE@	lib/par2/descriptionpacket.h \
-@WITH_PAR2_TRUE@	lib/par2/diskfile.cpp \
-@WITH_PAR2_TRUE@	lib/par2/diskfile.h \
-@WITH_PAR2_TRUE@	lib/par2/filechecksummer.cpp \
-@WITH_PAR2_TRUE@	lib/par2/filechecksummer.h \
-@WITH_PAR2_TRUE@	lib/par2/galois.cpp \
-@WITH_PAR2_TRUE@	lib/par2/galois.h \
-@WITH_PAR2_TRUE@	lib/par2/letype.h \
-@WITH_PAR2_TRUE@	lib/par2/mainpacket.cpp \
-@WITH_PAR2_TRUE@	lib/par2/mainpacket.h \
-@WITH_PAR2_TRUE@	lib/par2/md5.cpp \
-@WITH_PAR2_TRUE@	lib/par2/md5.h \
-@WITH_PAR2_TRUE@	lib/par2/par2cmdline.h \
-@WITH_PAR2_TRUE@	lib/par2/par2creatorsourcefile.cpp \
-@WITH_PAR2_TRUE@	lib/par2/par2creatorsourcefile.h \
-@WITH_PAR2_TRUE@	lib/par2/par2fileformat.cpp \
-@WITH_PAR2_TRUE@	lib/par2/par2fileformat.h \
-@WITH_PAR2_TRUE@	lib/par2/par2repairer.cpp \
-@WITH_PAR2_TRUE@	lib/par2/par2repairer.h \
-@WITH_PAR2_TRUE@	lib/par2/par2repairersourcefile.cpp \
-@WITH_PAR2_TRUE@	lib/par2/par2repairersourcefile.h \
-@WITH_PAR2_TRUE@	lib/par2/parheaders.cpp \
-@WITH_PAR2_TRUE@	lib/par2/parheaders.h \
-@WITH_PAR2_TRUE@	lib/par2/recoverypacket.cpp \
-@WITH_PAR2_TRUE@	lib/par2/recoverypacket.h \
-@WITH_PAR2_TRUE@	lib/par2/reedsolomon.cpp \
-@WITH_PAR2_TRUE@	lib/par2/reedsolomon.h \
-@WITH_PAR2_TRUE@	lib/par2/verificationhashtable.cpp \
-@WITH_PAR2_TRUE@	lib/par2/verificationhashtable.h \
-@WITH_PAR2_TRUE@	lib/par2/verificationpacket.cpp \
-@WITH_PAR2_TRUE@	lib/par2/verificationpacket.h
-
 DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \
 	$(dist_exampleconf_DATA) $(nobase_dist_scripts_SCRIPTS) \
 	$(nobase_dist_webui_DATA) $(srcdir)/Makefile.am \
@@ -122,110 +78,17 @@ mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = config.h
 CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(scriptsdir)" \
-	"$(DESTDIR)$(docdir)" "$(DESTDIR)$(exampleconfdir)" \
-	"$(DESTDIR)$(webuidir)"
+	"$(DESTDIR)$(sbindir)" "$(DESTDIR)$(docdir)" \
+	"$(DESTDIR)$(exampleconfdir)" "$(DESTDIR)$(webuidir)"
 binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS)
-am__nzbget_SOURCES_DIST = daemon/connect/Connection.cpp \
-	daemon/connect/Connection.h daemon/connect/TLS.cpp \
-	daemon/connect/TLS.h daemon/connect/WebDownloader.cpp \
-	daemon/connect/WebDownloader.h daemon/feed/FeedCoordinator.cpp \
-	daemon/feed/FeedCoordinator.h daemon/feed/FeedFile.cpp \
-	daemon/feed/FeedFile.h daemon/feed/FeedFilter.cpp \
-	daemon/feed/FeedFilter.h daemon/feed/FeedInfo.cpp \
-	daemon/feed/FeedInfo.h daemon/frontend/ColoredFrontend.cpp \
-	daemon/frontend/ColoredFrontend.h daemon/frontend/Frontend.cpp \
-	daemon/frontend/Frontend.h \
-	daemon/frontend/LoggableFrontend.cpp \
-	daemon/frontend/LoggableFrontend.h \
-	daemon/frontend/NCursesFrontend.cpp \
-	daemon/frontend/NCursesFrontend.h daemon/main/Maintenance.cpp \
-	daemon/main/Maintenance.h daemon/main/nzbget.cpp \
-	daemon/main/nzbget.h daemon/main/Options.cpp \
-	daemon/main/Options.h daemon/main/Scheduler.cpp \
-	daemon/main/Scheduler.h daemon/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/ParChecker.cpp \
-	daemon/postprocess/ParChecker.h \
-	daemon/postprocess/ParCoordinator.cpp \
-	daemon/postprocess/ParCoordinator.h \
-	daemon/postprocess/ParRenamer.cpp \
-	daemon/postprocess/ParRenamer.h \
-	daemon/postprocess/PostScript.cpp \
-	daemon/postprocess/PostScript.h \
-	daemon/postprocess/PrePostProcessor.cpp \
-	daemon/postprocess/PrePostProcessor.h \
-	daemon/postprocess/Unpack.cpp daemon/postprocess/Unpack.h \
-	daemon/queue/DiskState.cpp daemon/queue/DiskState.h \
-	daemon/queue/DownloadInfo.cpp daemon/queue/DownloadInfo.h \
-	daemon/queue/DupeCoordinator.cpp \
-	daemon/queue/DupeCoordinator.h \
-	daemon/queue/HistoryCoordinator.cpp \
-	daemon/queue/HistoryCoordinator.h daemon/queue/NZBFile.cpp \
-	daemon/queue/NZBFile.h daemon/queue/QueueCoordinator.cpp \
-	daemon/queue/QueueCoordinator.h daemon/queue/QueueEditor.cpp \
-	daemon/queue/QueueEditor.h daemon/queue/QueueScript.cpp \
-	daemon/queue/QueueScript.h daemon/queue/Scanner.cpp \
-	daemon/queue/Scanner.h daemon/queue/UrlCoordinator.cpp \
-	daemon/queue/UrlCoordinator.h daemon/remote/BinRpc.cpp \
-	daemon/remote/BinRpc.h daemon/remote/MessageBase.h \
-	daemon/remote/RemoteClient.cpp daemon/remote/RemoteClient.h \
-	daemon/remote/RemoteServer.cpp daemon/remote/RemoteServer.h \
-	daemon/remote/WebServer.cpp daemon/remote/WebServer.h \
-	daemon/remote/XmlRpc.cpp daemon/remote/XmlRpc.h \
-	daemon/util/Log.cpp daemon/util/Log.h daemon/util/Observer.cpp \
-	daemon/util/Observer.h daemon/util/Script.cpp \
-	daemon/util/Script.h daemon/util/Thread.cpp \
-	daemon/util/Thread.h daemon/util/Util.cpp daemon/util/Util.h \
-	svn_version.cpp lib/par2/commandline.cpp \
-	lib/par2/commandline.h lib/par2/crc.cpp lib/par2/crc.h \
-	lib/par2/creatorpacket.cpp lib/par2/creatorpacket.h \
-	lib/par2/criticalpacket.cpp lib/par2/criticalpacket.h \
-	lib/par2/datablock.cpp lib/par2/datablock.h \
-	lib/par2/descriptionpacket.cpp lib/par2/descriptionpacket.h \
-	lib/par2/diskfile.cpp lib/par2/diskfile.h \
-	lib/par2/filechecksummer.cpp lib/par2/filechecksummer.h \
-	lib/par2/galois.cpp lib/par2/galois.h lib/par2/letype.h \
-	lib/par2/mainpacket.cpp lib/par2/mainpacket.h lib/par2/md5.cpp \
-	lib/par2/md5.h lib/par2/par2cmdline.h \
-	lib/par2/par2creatorsourcefile.cpp \
-	lib/par2/par2creatorsourcefile.h lib/par2/par2fileformat.cpp \
-	lib/par2/par2fileformat.h lib/par2/par2repairer.cpp \
-	lib/par2/par2repairer.h lib/par2/par2repairersourcefile.cpp \
-	lib/par2/par2repairersourcefile.h lib/par2/parheaders.cpp \
-	lib/par2/parheaders.h lib/par2/recoverypacket.cpp \
-	lib/par2/recoverypacket.h lib/par2/reedsolomon.cpp \
-	lib/par2/reedsolomon.h lib/par2/verificationhashtable.cpp \
-	lib/par2/verificationhashtable.h \
-	lib/par2/verificationpacket.cpp lib/par2/verificationpacket.h
-@WITH_PAR2_TRUE@am__objects_1 = commandline.$(OBJEXT) crc.$(OBJEXT) \
-@WITH_PAR2_TRUE@	creatorpacket.$(OBJEXT) \
-@WITH_PAR2_TRUE@	criticalpacket.$(OBJEXT) datablock.$(OBJEXT) \
-@WITH_PAR2_TRUE@	descriptionpacket.$(OBJEXT) diskfile.$(OBJEXT) \
-@WITH_PAR2_TRUE@	filechecksummer.$(OBJEXT) galois.$(OBJEXT) \
-@WITH_PAR2_TRUE@	mainpacket.$(OBJEXT) md5.$(OBJEXT) \
-@WITH_PAR2_TRUE@	par2creatorsourcefile.$(OBJEXT) \
-@WITH_PAR2_TRUE@	par2fileformat.$(OBJEXT) \
-@WITH_PAR2_TRUE@	par2repairer.$(OBJEXT) \
-@WITH_PAR2_TRUE@	par2repairersourcefile.$(OBJEXT) \
-@WITH_PAR2_TRUE@	parheaders.$(OBJEXT) recoverypacket.$(OBJEXT) \
-@WITH_PAR2_TRUE@	reedsolomon.$(OBJEXT) \
-@WITH_PAR2_TRUE@	verificationhashtable.$(OBJEXT) \
-@WITH_PAR2_TRUE@	verificationpacket.$(OBJEXT)
 am_nzbget_OBJECTS = Connection.$(OBJEXT) TLS.$(OBJEXT) \
 	WebDownloader.$(OBJEXT) FeedCoordinator.$(OBJEXT) \
 	FeedFile.$(OBJEXT) FeedFilter.$(OBJEXT) FeedInfo.$(OBJEXT) \
 	ColoredFrontend.$(OBJEXT) Frontend.$(OBJEXT) \
 	LoggableFrontend.$(OBJEXT) NCursesFrontend.$(OBJEXT) \
 	Maintenance.$(OBJEXT) nzbget.$(OBJEXT) Options.$(OBJEXT) \
-	Scheduler.$(OBJEXT) StackTrace.$(OBJEXT) \
-	ArticleDownloader.$(OBJEXT) ArticleWriter.$(OBJEXT) \
+	Scheduler.$(OBJEXT) ArticleDownloader.$(OBJEXT) \
 	Decoder.$(OBJEXT) NewsServer.$(OBJEXT) \
 	NNTPConnection.$(OBJEXT) ServerPool.$(OBJEXT) \
 	StatMeter.$(OBJEXT) ParChecker.$(OBJEXT) \
@@ -239,7 +102,7 @@ am_nzbget_OBJECTS = Connection.$(OBJEXT) TLS.$(OBJEXT) \
 	RemoteClient.$(OBJEXT) RemoteServer.$(OBJEXT) \
 	WebServer.$(OBJEXT) XmlRpc.$(OBJEXT) Log.$(OBJEXT) \
 	Observer.$(OBJEXT) Script.$(OBJEXT) Thread.$(OBJEXT) \
-	Util.$(OBJEXT) svn_version.$(OBJEXT) $(am__objects_1)
+	Util.$(OBJEXT) svn_version.$(OBJEXT)
 nzbget_OBJECTS = $(am_nzbget_OBJECTS)
 nzbget_LDADD = $(LDADD)
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
@@ -249,7 +112,8 @@ am__vpath_adj = case $$p in \
  esac;
 am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 nobase_dist_scriptsSCRIPT_INSTALL = $(install_sh_SCRIPT)
-SCRIPTS = $(nobase_dist_scripts_SCRIPTS)
+sbinSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+SCRIPTS = $(nobase_dist_scripts_SCRIPTS) $(sbin_SCRIPTS)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I.
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
@@ -263,7 +127,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(nzbget_SOURCES)
-DIST_SOURCES = $(am__nzbget_SOURCES_DIST)
+DIST_SOURCES = $(nzbget_SOURCES)
 dist_docDATA_INSTALL = $(INSTALL_DATA)
 dist_exampleconfDATA_INSTALL = $(INSTALL_DATA)
 nobase_dist_webuiDATA_INSTALL = $(install_sh_DATA)
@@ -327,8 +191,6 @@ SHELL = @SHELL@
 STRIP = @STRIP@
 TAR = @TAR@
 VERSION = @VERSION@
-WITH_PAR2_FALSE = @WITH_PAR2_FALSE@
-WITH_PAR2_TRUE = @WITH_PAR2_TRUE@
 ac_ct_CXX = @ac_ct_CXX@
 am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
 am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
@@ -359,6 +221,8 @@ infodir = @infodir@
 install_sh = @install_sh@
 libdir = @libdir@
 libexecdir = @libexecdir@
+libsigc_CFLAGS = @libsigc_CFLAGS@
+libsigc_LIBS = @libsigc_LIBS@
 libxml2_CFLAGS = @libxml2_CFLAGS@
 libxml2_LIBS = @libxml2_LIBS@
 localedir = @localedir@
@@ -380,32 +244,50 @@ target_alias = @target_alias@
 target_cpu = @target_cpu@
 target_os = @target_os@
 target_vendor = @target_vendor@
-nzbget_SOURCES = daemon/connect/Connection.cpp \
-	daemon/connect/Connection.h daemon/connect/TLS.cpp \
-	daemon/connect/TLS.h daemon/connect/WebDownloader.cpp \
-	daemon/connect/WebDownloader.h daemon/feed/FeedCoordinator.cpp \
-	daemon/feed/FeedCoordinator.h daemon/feed/FeedFile.cpp \
-	daemon/feed/FeedFile.h daemon/feed/FeedFilter.cpp \
-	daemon/feed/FeedFilter.h daemon/feed/FeedInfo.cpp \
-	daemon/feed/FeedInfo.h daemon/frontend/ColoredFrontend.cpp \
-	daemon/frontend/ColoredFrontend.h daemon/frontend/Frontend.cpp \
+nzbget_SOURCES = \
+	daemon/connect/Connection.cpp \
+	daemon/connect/Connection.h \
+	daemon/connect/TLS.cpp \
+	daemon/connect/TLS.h \
+	daemon/connect/WebDownloader.cpp \
+	daemon/connect/WebDownloader.h \
+	daemon/feed/FeedCoordinator.cpp \
+	daemon/feed/FeedCoordinator.h \
+	daemon/feed/FeedFile.cpp \
+	daemon/feed/FeedFile.h \
+	daemon/feed/FeedFilter.cpp \
+	daemon/feed/FeedFilter.h \
+	daemon/feed/FeedInfo.cpp \
+	daemon/feed/FeedInfo.h \
+	daemon/frontend/ColoredFrontend.cpp \
+	daemon/frontend/ColoredFrontend.h \
+	daemon/frontend/Frontend.cpp \
 	daemon/frontend/Frontend.h \
 	daemon/frontend/LoggableFrontend.cpp \
 	daemon/frontend/LoggableFrontend.h \
 	daemon/frontend/NCursesFrontend.cpp \
-	daemon/frontend/NCursesFrontend.h daemon/main/Maintenance.cpp \
-	daemon/main/Maintenance.h daemon/main/nzbget.cpp \
-	daemon/main/nzbget.h daemon/main/Options.cpp \
-	daemon/main/Options.h daemon/main/Scheduler.cpp \
-	daemon/main/Scheduler.h daemon/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/ParChecker.cpp \
+	daemon/frontend/NCursesFrontend.h \
+	daemon/main/Maintenance.cpp \
+	daemon/main/Maintenance.h \
+	daemon/main/nzbget.cpp \
+	daemon/main/nzbget.h \
+	daemon/main/Options.cpp \
+	daemon/main/Options.h \
+	daemon/main/Scheduler.cpp \
+	daemon/main/Scheduler.h \
+	daemon/nntp/ArticleDownloader.cpp \
+	daemon/nntp/ArticleDownloader.h \
+	daemon/nntp/Decoder.cpp \
+	daemon/nntp/Decoder.h \
+	daemon/nntp/NewsServer.cpp \
+	daemon/nntp/NewsServer.h \
+	daemon/nntp/NNTPConnection.cpp \
+	daemon/nntp/NNTPConnection.h \
+	daemon/nntp/ServerPool.cpp \
+	daemon/nntp/ServerPool.h \
+	daemon/nntp/StatMeter.cpp \
+	daemon/nntp/StatMeter.h \
+	daemon/postprocess/ParChecker.cpp \
 	daemon/postprocess/ParChecker.h \
 	daemon/postprocess/ParCoordinator.cpp \
 	daemon/postprocess/ParCoordinator.h \
@@ -415,29 +297,51 @@ nzbget_SOURCES = daemon/connect/Connection.cpp \
 	daemon/postprocess/PostScript.h \
 	daemon/postprocess/PrePostProcessor.cpp \
 	daemon/postprocess/PrePostProcessor.h \
-	daemon/postprocess/Unpack.cpp daemon/postprocess/Unpack.h \
-	daemon/queue/DiskState.cpp daemon/queue/DiskState.h \
-	daemon/queue/DownloadInfo.cpp daemon/queue/DownloadInfo.h \
+	daemon/postprocess/Unpack.cpp \
+	daemon/postprocess/Unpack.h \
+	daemon/queue/DiskState.cpp \
+	daemon/queue/DiskState.h \
+	daemon/queue/DownloadInfo.cpp \
+	daemon/queue/DownloadInfo.h \
 	daemon/queue/DupeCoordinator.cpp \
 	daemon/queue/DupeCoordinator.h \
 	daemon/queue/HistoryCoordinator.cpp \
-	daemon/queue/HistoryCoordinator.h daemon/queue/NZBFile.cpp \
-	daemon/queue/NZBFile.h daemon/queue/QueueCoordinator.cpp \
-	daemon/queue/QueueCoordinator.h daemon/queue/QueueEditor.cpp \
-	daemon/queue/QueueEditor.h daemon/queue/QueueScript.cpp \
-	daemon/queue/QueueScript.h daemon/queue/Scanner.cpp \
-	daemon/queue/Scanner.h daemon/queue/UrlCoordinator.cpp \
-	daemon/queue/UrlCoordinator.h daemon/remote/BinRpc.cpp \
-	daemon/remote/BinRpc.h daemon/remote/MessageBase.h \
-	daemon/remote/RemoteClient.cpp daemon/remote/RemoteClient.h \
-	daemon/remote/RemoteServer.cpp daemon/remote/RemoteServer.h \
-	daemon/remote/WebServer.cpp daemon/remote/WebServer.h \
-	daemon/remote/XmlRpc.cpp daemon/remote/XmlRpc.h \
-	daemon/util/Log.cpp daemon/util/Log.h daemon/util/Observer.cpp \
-	daemon/util/Observer.h daemon/util/Script.cpp \
-	daemon/util/Script.h daemon/util/Thread.cpp \
-	daemon/util/Thread.h daemon/util/Util.cpp daemon/util/Util.h \
-	svn_version.cpp $(am__append_1)
+	daemon/queue/HistoryCoordinator.h \
+	daemon/queue/NZBFile.cpp \
+	daemon/queue/NZBFile.h \
+	daemon/queue/QueueCoordinator.cpp \
+	daemon/queue/QueueCoordinator.h \
+	daemon/queue/QueueEditor.cpp \
+	daemon/queue/QueueEditor.h \
+	daemon/queue/QueueScript.cpp \
+	daemon/queue/QueueScript.h \
+	daemon/queue/Scanner.cpp \
+	daemon/queue/Scanner.h \
+	daemon/queue/UrlCoordinator.cpp \
+	daemon/queue/UrlCoordinator.h \
+	daemon/remote/BinRpc.cpp \
+	daemon/remote/BinRpc.h \
+	daemon/remote/MessageBase.h \
+	daemon/remote/RemoteClient.cpp \
+	daemon/remote/RemoteClient.h \
+	daemon/remote/RemoteServer.cpp \
+	daemon/remote/RemoteServer.h \
+	daemon/remote/WebServer.cpp \
+	daemon/remote/WebServer.h \
+	daemon/remote/XmlRpc.cpp \
+	daemon/remote/XmlRpc.h \
+	daemon/util/Log.cpp \
+	daemon/util/Log.h \
+	daemon/util/Observer.cpp \
+	daemon/util/Observer.h \
+	daemon/util/Script.cpp \
+	daemon/util/Script.h \
+	daemon/util/Thread.cpp \
+	daemon/util/Thread.h \
+	daemon/util/Util.cpp \
+	daemon/util/Util.h \
+	svn_version.cpp
+
 AM_CPPFLAGS = \
 	-I$(srcdir)/daemon/connect \
 	-I$(srcdir)/daemon/feed \
@@ -447,36 +351,21 @@ AM_CPPFLAGS = \
 	-I$(srcdir)/daemon/postprocess \
 	-I$(srcdir)/daemon/queue \
 	-I$(srcdir)/daemon/remote \
-	-I$(srcdir)/daemon/util \
-	-I$(srcdir)/lib/par2
+	-I$(srcdir)/daemon/util

 EXTRA_DIST = \
 	Makefile.cvs \
+	nzbgetd \
 	$(windows_FILES) \
-	$(osx_FILES) \
-	$(linux_FILES)
+	$(osx_FILES)

 windows_FILES = \
 	daemon/windows/NTService.cpp \
 	daemon/windows/NTService.h \
 	daemon/windows/win32.h \
-	daemon/windows/WinConsole.cpp \
-	daemon/windows/WinConsole.h \
 	nzbget.sln \
 	nzbget.vcproj \
-	windows/nzbget-command-shell.bat  \
-	windows/install-update.bat  \
-	windows/README-WINDOWS.txt  \
-	windows/package-info.json  \
-	windows/resources/mainicon.ico \
-	windows/resources/nzbget.rc \
-	windows/resources/resource.h \
-	windows/resources/trayicon_idle.ico \
-	windows/resources/trayicon_paused.ico \
-	windows/resources/trayicon_working.ico \
-	windows/setup/nzbget-setup.nsi \
-	windows/setup/install.bmp \
-	windows/setup/uninstall.bmp
+	nzbget-shell.bat

 osx_FILES = \
 	osx/App_Prefix.pch \
@@ -502,6 +391,8 @@ osx_FILES = \
 	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 \
@@ -509,18 +400,7 @@ osx_FILES = \
 	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
-
 doc_FILES = \
-	lib/par2/AUTHORS \
-	lib/par2/README \
-	AUTHORS \
 	README \
 	ChangeLog \
 	COPYING
@@ -566,6 +446,7 @@ scripts_FILES = \


 # Install
+sbin_SCRIPTS = nzbgetd
 dist_doc_DATA = $(doc_FILES)
 exampleconfdir = $(datadir)/nzbget
 dist_exampleconf_DATA = $(exampleconf_FILES)
@@ -685,6 +566,25 @@ uninstall-nobase_dist_scriptsSCRIPTS:
 	  echo " rm -f '$(DESTDIR)$(scriptsdir)/$$f'"; \
 	  rm -f "$(DESTDIR)$(scriptsdir)/$$f"; \
 	done
+install-sbinSCRIPTS: $(sbin_SCRIPTS)
+	@$(NORMAL_INSTALL)
+	test -z "$(sbindir)" || $(mkdir_p) "$(DESTDIR)$(sbindir)"
+	@list='$(sbin_SCRIPTS)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  if test -f $$d$$p; then \
+	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	    echo " $(sbinSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(sbindir)/$$f'"; \
+	    $(sbinSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(sbindir)/$$f"; \
+	  else :; fi; \
+	done
+
+uninstall-sbinSCRIPTS:
+	@$(NORMAL_UNINSTALL)
+	@list='$(sbin_SCRIPTS)'; for p in $$list; do \
+	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
+	  echo " rm -f '$(DESTDIR)$(sbindir)/$$f'"; \
+	  rm -f "$(DESTDIR)$(sbindir)/$$f"; \
+	done

 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -693,7 +593,6 @@ distclean-compile:
 	-rm -f *.tab.c

@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ArticleDownloader.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ArticleWriter.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/BinRpc.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ColoredFrontend.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Connection.Po@am__quote@
@@ -730,7 +629,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Scheduler.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Script.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ServerPool.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StackTrace.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/StatMeter.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/TLS.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/Thread.Po@am__quote@
@@ -740,28 +638,8 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WebDownloader.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/WebServer.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/XmlRpc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/commandline.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/creatorpacket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/criticalpacket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/datablock.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/descriptionpacket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/diskfile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filechecksummer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/galois.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mainpacket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/nzbget.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/par2creatorsourcefile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/par2fileformat.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/par2repairer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/par2repairersourcefile.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/parheaders.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/recoverypacket.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/reedsolomon.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/svn_version.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verificationhashtable.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/verificationpacket.Po@am__quote@

 .cpp.o:
@am__fastdepCXX_TRUE@	if $(CXXCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
@@ -987,20 +865,6 @@ Scheduler.obj: daemon/main/Scheduler.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Scheduler.obj `if test -f 'daemon/main/Scheduler.cpp'; then $(CYGPATH_W) 'daemon/main/Scheduler.cpp'; else $(CYGPATH_W) '$(srcdir)/daemon/main/Scheduler.cpp'; fi`

-StackTrace.o: daemon/main/StackTrace.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StackTrace.o -MD -MP -MF "$(DEPDIR)/StackTrace.Tpo" -c -o StackTrace.o `test -f 'daemon/main/StackTrace.cpp' || echo '$(srcdir)/'`daemon/main/StackTrace.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/StackTrace.Tpo" "$(DEPDIR)/StackTrace.Po"; else rm -f "$(DEPDIR)/StackTrace.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='daemon/main/StackTrace.cpp' object='StackTrace.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StackTrace.o `test -f 'daemon/main/StackTrace.cpp' || echo '$(srcdir)/'`daemon/main/StackTrace.cpp
-
-StackTrace.obj: daemon/main/StackTrace.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT StackTrace.obj -MD -MP -MF "$(DEPDIR)/StackTrace.Tpo" -c -o StackTrace.obj `if test -f 'daemon/main/StackTrace.cpp'; then $(CYGPATH_W) 'daemon/main/StackTrace.cpp'; else $(CYGPATH_W) '$(srcdir)/daemon/main/StackTrace.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/StackTrace.Tpo" "$(DEPDIR)/StackTrace.Po"; else rm -f "$(DEPDIR)/StackTrace.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='daemon/main/StackTrace.cpp' object='StackTrace.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o StackTrace.obj `if test -f 'daemon/main/StackTrace.cpp'; then $(CYGPATH_W) 'daemon/main/StackTrace.cpp'; else $(CYGPATH_W) '$(srcdir)/daemon/main/StackTrace.cpp'; fi`
-
 ArticleDownloader.o: daemon/nntp/ArticleDownloader.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ArticleDownloader.o -MD -MP -MF "$(DEPDIR)/ArticleDownloader.Tpo" -c -o ArticleDownloader.o `test -f 'daemon/nntp/ArticleDownloader.cpp' || echo '$(srcdir)/'`daemon/nntp/ArticleDownloader.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ArticleDownloader.Tpo" "$(DEPDIR)/ArticleDownloader.Po"; else rm -f "$(DEPDIR)/ArticleDownloader.Tpo"; exit 1; fi
@@ -1015,20 +879,6 @@ ArticleDownloader.obj: daemon/nntp/ArticleDownloader.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ArticleDownloader.obj `if test -f 'daemon/nntp/ArticleDownloader.cpp'; then $(CYGPATH_W) 'daemon/nntp/ArticleDownloader.cpp'; else $(CYGPATH_W) '$(srcdir)/daemon/nntp/ArticleDownloader.cpp'; fi`

-ArticleWriter.o: daemon/nntp/ArticleWriter.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ArticleWriter.o -MD -MP -MF "$(DEPDIR)/ArticleWriter.Tpo" -c -o ArticleWriter.o `test -f 'daemon/nntp/ArticleWriter.cpp' || echo '$(srcdir)/'`daemon/nntp/ArticleWriter.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ArticleWriter.Tpo" "$(DEPDIR)/ArticleWriter.Po"; else rm -f "$(DEPDIR)/ArticleWriter.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='daemon/nntp/ArticleWriter.cpp' object='ArticleWriter.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ArticleWriter.o `test -f 'daemon/nntp/ArticleWriter.cpp' || echo '$(srcdir)/'`daemon/nntp/ArticleWriter.cpp
-
-ArticleWriter.obj: daemon/nntp/ArticleWriter.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT ArticleWriter.obj -MD -MP -MF "$(DEPDIR)/ArticleWriter.Tpo" -c -o ArticleWriter.obj `if test -f 'daemon/nntp/ArticleWriter.cpp'; then $(CYGPATH_W) 'daemon/nntp/ArticleWriter.cpp'; else $(CYGPATH_W) '$(srcdir)/daemon/nntp/ArticleWriter.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/ArticleWriter.Tpo" "$(DEPDIR)/ArticleWriter.Po"; else rm -f "$(DEPDIR)/ArticleWriter.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='daemon/nntp/ArticleWriter.cpp' object='ArticleWriter.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o ArticleWriter.obj `if test -f 'daemon/nntp/ArticleWriter.cpp'; then $(CYGPATH_W) 'daemon/nntp/ArticleWriter.cpp'; else $(CYGPATH_W) '$(srcdir)/daemon/nntp/ArticleWriter.cpp'; fi`
-
 Decoder.o: daemon/nntp/Decoder.cpp
@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Decoder.o -MD -MP -MF "$(DEPDIR)/Decoder.Tpo" -c -o Decoder.o `test -f 'daemon/nntp/Decoder.cpp' || echo '$(srcdir)/'`daemon/nntp/Decoder.cpp; \
@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/Decoder.Tpo" "$(DEPDIR)/Decoder.Po"; else rm -f "$(DEPDIR)/Decoder.Tpo"; exit 1; fi
@@ -1462,286 +1312,6 @@ Util.obj: daemon/util/Util.cpp
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='daemon/util/Util.cpp' object='Util.obj' libtool=no @AMDEPBACKSLASH@
@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Util.obj `if test -f 'daemon/util/Util.cpp'; then $(CYGPATH_W) 'daemon/util/Util.cpp'; else $(CYGPATH_W) '$(srcdir)/daemon/util/Util.cpp'; fi`
-
-commandline.o: lib/par2/commandline.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT commandline.o -MD -MP -MF "$(DEPDIR)/commandline.Tpo" -c -o commandline.o `test -f 'lib/par2/commandline.cpp' || echo '$(srcdir)/'`lib/par2/commandline.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/commandline.Tpo" "$(DEPDIR)/commandline.Po"; else rm -f "$(DEPDIR)/commandline.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/commandline.cpp' object='commandline.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o commandline.o `test -f 'lib/par2/commandline.cpp' || echo '$(srcdir)/'`lib/par2/commandline.cpp
-
-commandline.obj: lib/par2/commandline.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT commandline.obj -MD -MP -MF "$(DEPDIR)/commandline.Tpo" -c -o commandline.obj `if test -f 'lib/par2/commandline.cpp'; then $(CYGPATH_W) 'lib/par2/commandline.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/commandline.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/commandline.Tpo" "$(DEPDIR)/commandline.Po"; else rm -f "$(DEPDIR)/commandline.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/commandline.cpp' object='commandline.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o commandline.obj `if test -f 'lib/par2/commandline.cpp'; then $(CYGPATH_W) 'lib/par2/commandline.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/commandline.cpp'; fi`
-
-crc.o: lib/par2/crc.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT crc.o -MD -MP -MF "$(DEPDIR)/crc.Tpo" -c -o crc.o `test -f 'lib/par2/crc.cpp' || echo '$(srcdir)/'`lib/par2/crc.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/crc.Tpo" "$(DEPDIR)/crc.Po"; else rm -f "$(DEPDIR)/crc.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/crc.cpp' object='crc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o crc.o `test -f 'lib/par2/crc.cpp' || echo '$(srcdir)/'`lib/par2/crc.cpp
-
-crc.obj: lib/par2/crc.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT crc.obj -MD -MP -MF "$(DEPDIR)/crc.Tpo" -c -o crc.obj `if test -f 'lib/par2/crc.cpp'; then $(CYGPATH_W) 'lib/par2/crc.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/crc.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/crc.Tpo" "$(DEPDIR)/crc.Po"; else rm -f "$(DEPDIR)/crc.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/crc.cpp' object='crc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o crc.obj `if test -f 'lib/par2/crc.cpp'; then $(CYGPATH_W) 'lib/par2/crc.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/crc.cpp'; fi`
-
-creatorpacket.o: lib/par2/creatorpacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT creatorpacket.o -MD -MP -MF "$(DEPDIR)/creatorpacket.Tpo" -c -o creatorpacket.o `test -f 'lib/par2/creatorpacket.cpp' || echo '$(srcdir)/'`lib/par2/creatorpacket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/creatorpacket.Tpo" "$(DEPDIR)/creatorpacket.Po"; else rm -f "$(DEPDIR)/creatorpacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/creatorpacket.cpp' object='creatorpacket.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o creatorpacket.o `test -f 'lib/par2/creatorpacket.cpp' || echo '$(srcdir)/'`lib/par2/creatorpacket.cpp
-
-creatorpacket.obj: lib/par2/creatorpacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT creatorpacket.obj -MD -MP -MF "$(DEPDIR)/creatorpacket.Tpo" -c -o creatorpacket.obj `if test -f 'lib/par2/creatorpacket.cpp'; then $(CYGPATH_W) 'lib/par2/creatorpacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/creatorpacket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/creatorpacket.Tpo" "$(DEPDIR)/creatorpacket.Po"; else rm -f "$(DEPDIR)/creatorpacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/creatorpacket.cpp' object='creatorpacket.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o creatorpacket.obj `if test -f 'lib/par2/creatorpacket.cpp'; then $(CYGPATH_W) 'lib/par2/creatorpacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/creatorpacket.cpp'; fi`
-
-criticalpacket.o: lib/par2/criticalpacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT criticalpacket.o -MD -MP -MF "$(DEPDIR)/criticalpacket.Tpo" -c -o criticalpacket.o `test -f 'lib/par2/criticalpacket.cpp' || echo '$(srcdir)/'`lib/par2/criticalpacket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/criticalpacket.Tpo" "$(DEPDIR)/criticalpacket.Po"; else rm -f "$(DEPDIR)/criticalpacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/criticalpacket.cpp' object='criticalpacket.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o criticalpacket.o `test -f 'lib/par2/criticalpacket.cpp' || echo '$(srcdir)/'`lib/par2/criticalpacket.cpp
-
-criticalpacket.obj: lib/par2/criticalpacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT criticalpacket.obj -MD -MP -MF "$(DEPDIR)/criticalpacket.Tpo" -c -o criticalpacket.obj `if test -f 'lib/par2/criticalpacket.cpp'; then $(CYGPATH_W) 'lib/par2/criticalpacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/criticalpacket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/criticalpacket.Tpo" "$(DEPDIR)/criticalpacket.Po"; else rm -f "$(DEPDIR)/criticalpacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/criticalpacket.cpp' object='criticalpacket.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o criticalpacket.obj `if test -f 'lib/par2/criticalpacket.cpp'; then $(CYGPATH_W) 'lib/par2/criticalpacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/criticalpacket.cpp'; fi`
-
-datablock.o: lib/par2/datablock.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT datablock.o -MD -MP -MF "$(DEPDIR)/datablock.Tpo" -c -o datablock.o `test -f 'lib/par2/datablock.cpp' || echo '$(srcdir)/'`lib/par2/datablock.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/datablock.Tpo" "$(DEPDIR)/datablock.Po"; else rm -f "$(DEPDIR)/datablock.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/datablock.cpp' object='datablock.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o datablock.o `test -f 'lib/par2/datablock.cpp' || echo '$(srcdir)/'`lib/par2/datablock.cpp
-
-datablock.obj: lib/par2/datablock.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT datablock.obj -MD -MP -MF "$(DEPDIR)/datablock.Tpo" -c -o datablock.obj `if test -f 'lib/par2/datablock.cpp'; then $(CYGPATH_W) 'lib/par2/datablock.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/datablock.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/datablock.Tpo" "$(DEPDIR)/datablock.Po"; else rm -f "$(DEPDIR)/datablock.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/datablock.cpp' object='datablock.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o datablock.obj `if test -f 'lib/par2/datablock.cpp'; then $(CYGPATH_W) 'lib/par2/datablock.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/datablock.cpp'; fi`
-
-descriptionpacket.o: lib/par2/descriptionpacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT descriptionpacket.o -MD -MP -MF "$(DEPDIR)/descriptionpacket.Tpo" -c -o descriptionpacket.o `test -f 'lib/par2/descriptionpacket.cpp' || echo '$(srcdir)/'`lib/par2/descriptionpacket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/descriptionpacket.Tpo" "$(DEPDIR)/descriptionpacket.Po"; else rm -f "$(DEPDIR)/descriptionpacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/descriptionpacket.cpp' object='descriptionpacket.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o descriptionpacket.o `test -f 'lib/par2/descriptionpacket.cpp' || echo '$(srcdir)/'`lib/par2/descriptionpacket.cpp
-
-descriptionpacket.obj: lib/par2/descriptionpacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT descriptionpacket.obj -MD -MP -MF "$(DEPDIR)/descriptionpacket.Tpo" -c -o descriptionpacket.obj `if test -f 'lib/par2/descriptionpacket.cpp'; then $(CYGPATH_W) 'lib/par2/descriptionpacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/descriptionpacket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/descriptionpacket.Tpo" "$(DEPDIR)/descriptionpacket.Po"; else rm -f "$(DEPDIR)/descriptionpacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/descriptionpacket.cpp' object='descriptionpacket.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o descriptionpacket.obj `if test -f 'lib/par2/descriptionpacket.cpp'; then $(CYGPATH_W) 'lib/par2/descriptionpacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/descriptionpacket.cpp'; fi`
-
-diskfile.o: lib/par2/diskfile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT diskfile.o -MD -MP -MF "$(DEPDIR)/diskfile.Tpo" -c -o diskfile.o `test -f 'lib/par2/diskfile.cpp' || echo '$(srcdir)/'`lib/par2/diskfile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/diskfile.Tpo" "$(DEPDIR)/diskfile.Po"; else rm -f "$(DEPDIR)/diskfile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/diskfile.cpp' object='diskfile.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o diskfile.o `test -f 'lib/par2/diskfile.cpp' || echo '$(srcdir)/'`lib/par2/diskfile.cpp
-
-diskfile.obj: lib/par2/diskfile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT diskfile.obj -MD -MP -MF "$(DEPDIR)/diskfile.Tpo" -c -o diskfile.obj `if test -f 'lib/par2/diskfile.cpp'; then $(CYGPATH_W) 'lib/par2/diskfile.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/diskfile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/diskfile.Tpo" "$(DEPDIR)/diskfile.Po"; else rm -f "$(DEPDIR)/diskfile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/diskfile.cpp' object='diskfile.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o diskfile.obj `if test -f 'lib/par2/diskfile.cpp'; then $(CYGPATH_W) 'lib/par2/diskfile.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/diskfile.cpp'; fi`
-
-filechecksummer.o: lib/par2/filechecksummer.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filechecksummer.o -MD -MP -MF "$(DEPDIR)/filechecksummer.Tpo" -c -o filechecksummer.o `test -f 'lib/par2/filechecksummer.cpp' || echo '$(srcdir)/'`lib/par2/filechecksummer.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/filechecksummer.Tpo" "$(DEPDIR)/filechecksummer.Po"; else rm -f "$(DEPDIR)/filechecksummer.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/filechecksummer.cpp' object='filechecksummer.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filechecksummer.o `test -f 'lib/par2/filechecksummer.cpp' || echo '$(srcdir)/'`lib/par2/filechecksummer.cpp
-
-filechecksummer.obj: lib/par2/filechecksummer.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT filechecksummer.obj -MD -MP -MF "$(DEPDIR)/filechecksummer.Tpo" -c -o filechecksummer.obj `if test -f 'lib/par2/filechecksummer.cpp'; then $(CYGPATH_W) 'lib/par2/filechecksummer.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/filechecksummer.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/filechecksummer.Tpo" "$(DEPDIR)/filechecksummer.Po"; else rm -f "$(DEPDIR)/filechecksummer.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/filechecksummer.cpp' object='filechecksummer.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o filechecksummer.obj `if test -f 'lib/par2/filechecksummer.cpp'; then $(CYGPATH_W) 'lib/par2/filechecksummer.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/filechecksummer.cpp'; fi`
-
-galois.o: lib/par2/galois.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT galois.o -MD -MP -MF "$(DEPDIR)/galois.Tpo" -c -o galois.o `test -f 'lib/par2/galois.cpp' || echo '$(srcdir)/'`lib/par2/galois.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/galois.Tpo" "$(DEPDIR)/galois.Po"; else rm -f "$(DEPDIR)/galois.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/galois.cpp' object='galois.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o galois.o `test -f 'lib/par2/galois.cpp' || echo '$(srcdir)/'`lib/par2/galois.cpp
-
-galois.obj: lib/par2/galois.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT galois.obj -MD -MP -MF "$(DEPDIR)/galois.Tpo" -c -o galois.obj `if test -f 'lib/par2/galois.cpp'; then $(CYGPATH_W) 'lib/par2/galois.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/galois.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/galois.Tpo" "$(DEPDIR)/galois.Po"; else rm -f "$(DEPDIR)/galois.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/galois.cpp' object='galois.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o galois.obj `if test -f 'lib/par2/galois.cpp'; then $(CYGPATH_W) 'lib/par2/galois.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/galois.cpp'; fi`
-
-mainpacket.o: lib/par2/mainpacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mainpacket.o -MD -MP -MF "$(DEPDIR)/mainpacket.Tpo" -c -o mainpacket.o `test -f 'lib/par2/mainpacket.cpp' || echo '$(srcdir)/'`lib/par2/mainpacket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mainpacket.Tpo" "$(DEPDIR)/mainpacket.Po"; else rm -f "$(DEPDIR)/mainpacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/mainpacket.cpp' object='mainpacket.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mainpacket.o `test -f 'lib/par2/mainpacket.cpp' || echo '$(srcdir)/'`lib/par2/mainpacket.cpp
-
-mainpacket.obj: lib/par2/mainpacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT mainpacket.obj -MD -MP -MF "$(DEPDIR)/mainpacket.Tpo" -c -o mainpacket.obj `if test -f 'lib/par2/mainpacket.cpp'; then $(CYGPATH_W) 'lib/par2/mainpacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/mainpacket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/mainpacket.Tpo" "$(DEPDIR)/mainpacket.Po"; else rm -f "$(DEPDIR)/mainpacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/mainpacket.cpp' object='mainpacket.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o mainpacket.obj `if test -f 'lib/par2/mainpacket.cpp'; then $(CYGPATH_W) 'lib/par2/mainpacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/mainpacket.cpp'; fi`
-
-md5.o: lib/par2/md5.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md5.o -MD -MP -MF "$(DEPDIR)/md5.Tpo" -c -o md5.o `test -f 'lib/par2/md5.cpp' || echo '$(srcdir)/'`lib/par2/md5.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/md5.Tpo" "$(DEPDIR)/md5.Po"; else rm -f "$(DEPDIR)/md5.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/md5.cpp' object='md5.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md5.o `test -f 'lib/par2/md5.cpp' || echo '$(srcdir)/'`lib/par2/md5.cpp
-
-md5.obj: lib/par2/md5.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT md5.obj -MD -MP -MF "$(DEPDIR)/md5.Tpo" -c -o md5.obj `if test -f 'lib/par2/md5.cpp'; then $(CYGPATH_W) 'lib/par2/md5.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/md5.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/md5.Tpo" "$(DEPDIR)/md5.Po"; else rm -f "$(DEPDIR)/md5.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/md5.cpp' object='md5.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o md5.obj `if test -f 'lib/par2/md5.cpp'; then $(CYGPATH_W) 'lib/par2/md5.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/md5.cpp'; fi`
-
-par2creatorsourcefile.o: lib/par2/par2creatorsourcefile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT par2creatorsourcefile.o -MD -MP -MF "$(DEPDIR)/par2creatorsourcefile.Tpo" -c -o par2creatorsourcefile.o `test -f 'lib/par2/par2creatorsourcefile.cpp' || echo '$(srcdir)/'`lib/par2/par2creatorsourcefile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/par2creatorsourcefile.Tpo" "$(DEPDIR)/par2creatorsourcefile.Po"; else rm -f "$(DEPDIR)/par2creatorsourcefile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/par2creatorsourcefile.cpp' object='par2creatorsourcefile.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o par2creatorsourcefile.o `test -f 'lib/par2/par2creatorsourcefile.cpp' || echo '$(srcdir)/'`lib/par2/par2creatorsourcefile.cpp
-
-par2creatorsourcefile.obj: lib/par2/par2creatorsourcefile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT par2creatorsourcefile.obj -MD -MP -MF "$(DEPDIR)/par2creatorsourcefile.Tpo" -c -o par2creatorsourcefile.obj `if test -f 'lib/par2/par2creatorsourcefile.cpp'; then $(CYGPATH_W) 'lib/par2/par2creatorsourcefile.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/par2creatorsourcefile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/par2creatorsourcefile.Tpo" "$(DEPDIR)/par2creatorsourcefile.Po"; else rm -f "$(DEPDIR)/par2creatorsourcefile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/par2creatorsourcefile.cpp' object='par2creatorsourcefile.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o par2creatorsourcefile.obj `if test -f 'lib/par2/par2creatorsourcefile.cpp'; then $(CYGPATH_W) 'lib/par2/par2creatorsourcefile.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/par2creatorsourcefile.cpp'; fi`
-
-par2fileformat.o: lib/par2/par2fileformat.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT par2fileformat.o -MD -MP -MF "$(DEPDIR)/par2fileformat.Tpo" -c -o par2fileformat.o `test -f 'lib/par2/par2fileformat.cpp' || echo '$(srcdir)/'`lib/par2/par2fileformat.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/par2fileformat.Tpo" "$(DEPDIR)/par2fileformat.Po"; else rm -f "$(DEPDIR)/par2fileformat.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/par2fileformat.cpp' object='par2fileformat.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o par2fileformat.o `test -f 'lib/par2/par2fileformat.cpp' || echo '$(srcdir)/'`lib/par2/par2fileformat.cpp
-
-par2fileformat.obj: lib/par2/par2fileformat.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT par2fileformat.obj -MD -MP -MF "$(DEPDIR)/par2fileformat.Tpo" -c -o par2fileformat.obj `if test -f 'lib/par2/par2fileformat.cpp'; then $(CYGPATH_W) 'lib/par2/par2fileformat.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/par2fileformat.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/par2fileformat.Tpo" "$(DEPDIR)/par2fileformat.Po"; else rm -f "$(DEPDIR)/par2fileformat.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/par2fileformat.cpp' object='par2fileformat.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o par2fileformat.obj `if test -f 'lib/par2/par2fileformat.cpp'; then $(CYGPATH_W) 'lib/par2/par2fileformat.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/par2fileformat.cpp'; fi`
-
-par2repairer.o: lib/par2/par2repairer.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT par2repairer.o -MD -MP -MF "$(DEPDIR)/par2repairer.Tpo" -c -o par2repairer.o `test -f 'lib/par2/par2repairer.cpp' || echo '$(srcdir)/'`lib/par2/par2repairer.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/par2repairer.Tpo" "$(DEPDIR)/par2repairer.Po"; else rm -f "$(DEPDIR)/par2repairer.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/par2repairer.cpp' object='par2repairer.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o par2repairer.o `test -f 'lib/par2/par2repairer.cpp' || echo '$(srcdir)/'`lib/par2/par2repairer.cpp
-
-par2repairer.obj: lib/par2/par2repairer.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT par2repairer.obj -MD -MP -MF "$(DEPDIR)/par2repairer.Tpo" -c -o par2repairer.obj `if test -f 'lib/par2/par2repairer.cpp'; then $(CYGPATH_W) 'lib/par2/par2repairer.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/par2repairer.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/par2repairer.Tpo" "$(DEPDIR)/par2repairer.Po"; else rm -f "$(DEPDIR)/par2repairer.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/par2repairer.cpp' object='par2repairer.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o par2repairer.obj `if test -f 'lib/par2/par2repairer.cpp'; then $(CYGPATH_W) 'lib/par2/par2repairer.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/par2repairer.cpp'; fi`
-
-par2repairersourcefile.o: lib/par2/par2repairersourcefile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT par2repairersourcefile.o -MD -MP -MF "$(DEPDIR)/par2repairersourcefile.Tpo" -c -o par2repairersourcefile.o `test -f 'lib/par2/par2repairersourcefile.cpp' || echo '$(srcdir)/'`lib/par2/par2repairersourcefile.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/par2repairersourcefile.Tpo" "$(DEPDIR)/par2repairersourcefile.Po"; else rm -f "$(DEPDIR)/par2repairersourcefile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/par2repairersourcefile.cpp' object='par2repairersourcefile.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o par2repairersourcefile.o `test -f 'lib/par2/par2repairersourcefile.cpp' || echo '$(srcdir)/'`lib/par2/par2repairersourcefile.cpp
-
-par2repairersourcefile.obj: lib/par2/par2repairersourcefile.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT par2repairersourcefile.obj -MD -MP -MF "$(DEPDIR)/par2repairersourcefile.Tpo" -c -o par2repairersourcefile.obj `if test -f 'lib/par2/par2repairersourcefile.cpp'; then $(CYGPATH_W) 'lib/par2/par2repairersourcefile.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/par2repairersourcefile.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/par2repairersourcefile.Tpo" "$(DEPDIR)/par2repairersourcefile.Po"; else rm -f "$(DEPDIR)/par2repairersourcefile.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/par2repairersourcefile.cpp' object='par2repairersourcefile.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o par2repairersourcefile.obj `if test -f 'lib/par2/par2repairersourcefile.cpp'; then $(CYGPATH_W) 'lib/par2/par2repairersourcefile.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/par2repairersourcefile.cpp'; fi`
-
-parheaders.o: lib/par2/parheaders.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parheaders.o -MD -MP -MF "$(DEPDIR)/parheaders.Tpo" -c -o parheaders.o `test -f 'lib/par2/parheaders.cpp' || echo '$(srcdir)/'`lib/par2/parheaders.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parheaders.Tpo" "$(DEPDIR)/parheaders.Po"; else rm -f "$(DEPDIR)/parheaders.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/parheaders.cpp' object='parheaders.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parheaders.o `test -f 'lib/par2/parheaders.cpp' || echo '$(srcdir)/'`lib/par2/parheaders.cpp
-
-parheaders.obj: lib/par2/parheaders.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT parheaders.obj -MD -MP -MF "$(DEPDIR)/parheaders.Tpo" -c -o parheaders.obj `if test -f 'lib/par2/parheaders.cpp'; then $(CYGPATH_W) 'lib/par2/parheaders.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/parheaders.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/parheaders.Tpo" "$(DEPDIR)/parheaders.Po"; else rm -f "$(DEPDIR)/parheaders.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/parheaders.cpp' object='parheaders.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o parheaders.obj `if test -f 'lib/par2/parheaders.cpp'; then $(CYGPATH_W) 'lib/par2/parheaders.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/parheaders.cpp'; fi`
-
-recoverypacket.o: lib/par2/recoverypacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT recoverypacket.o -MD -MP -MF "$(DEPDIR)/recoverypacket.Tpo" -c -o recoverypacket.o `test -f 'lib/par2/recoverypacket.cpp' || echo '$(srcdir)/'`lib/par2/recoverypacket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/recoverypacket.Tpo" "$(DEPDIR)/recoverypacket.Po"; else rm -f "$(DEPDIR)/recoverypacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/recoverypacket.cpp' object='recoverypacket.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o recoverypacket.o `test -f 'lib/par2/recoverypacket.cpp' || echo '$(srcdir)/'`lib/par2/recoverypacket.cpp
-
-recoverypacket.obj: lib/par2/recoverypacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT recoverypacket.obj -MD -MP -MF "$(DEPDIR)/recoverypacket.Tpo" -c -o recoverypacket.obj `if test -f 'lib/par2/recoverypacket.cpp'; then $(CYGPATH_W) 'lib/par2/recoverypacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/recoverypacket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/recoverypacket.Tpo" "$(DEPDIR)/recoverypacket.Po"; else rm -f "$(DEPDIR)/recoverypacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/recoverypacket.cpp' object='recoverypacket.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o recoverypacket.obj `if test -f 'lib/par2/recoverypacket.cpp'; then $(CYGPATH_W) 'lib/par2/recoverypacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/recoverypacket.cpp'; fi`
-
-reedsolomon.o: lib/par2/reedsolomon.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT reedsolomon.o -MD -MP -MF "$(DEPDIR)/reedsolomon.Tpo" -c -o reedsolomon.o `test -f 'lib/par2/reedsolomon.cpp' || echo '$(srcdir)/'`lib/par2/reedsolomon.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/reedsolomon.Tpo" "$(DEPDIR)/reedsolomon.Po"; else rm -f "$(DEPDIR)/reedsolomon.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/reedsolomon.cpp' object='reedsolomon.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o reedsolomon.o `test -f 'lib/par2/reedsolomon.cpp' || echo '$(srcdir)/'`lib/par2/reedsolomon.cpp
-
-reedsolomon.obj: lib/par2/reedsolomon.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT reedsolomon.obj -MD -MP -MF "$(DEPDIR)/reedsolomon.Tpo" -c -o reedsolomon.obj `if test -f 'lib/par2/reedsolomon.cpp'; then $(CYGPATH_W) 'lib/par2/reedsolomon.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/reedsolomon.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/reedsolomon.Tpo" "$(DEPDIR)/reedsolomon.Po"; else rm -f "$(DEPDIR)/reedsolomon.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/reedsolomon.cpp' object='reedsolomon.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o reedsolomon.obj `if test -f 'lib/par2/reedsolomon.cpp'; then $(CYGPATH_W) 'lib/par2/reedsolomon.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/reedsolomon.cpp'; fi`
-
-verificationhashtable.o: lib/par2/verificationhashtable.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT verificationhashtable.o -MD -MP -MF "$(DEPDIR)/verificationhashtable.Tpo" -c -o verificationhashtable.o `test -f 'lib/par2/verificationhashtable.cpp' || echo '$(srcdir)/'`lib/par2/verificationhashtable.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/verificationhashtable.Tpo" "$(DEPDIR)/verificationhashtable.Po"; else rm -f "$(DEPDIR)/verificationhashtable.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/verificationhashtable.cpp' object='verificationhashtable.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o verificationhashtable.o `test -f 'lib/par2/verificationhashtable.cpp' || echo '$(srcdir)/'`lib/par2/verificationhashtable.cpp
-
-verificationhashtable.obj: lib/par2/verificationhashtable.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT verificationhashtable.obj -MD -MP -MF "$(DEPDIR)/verificationhashtable.Tpo" -c -o verificationhashtable.obj `if test -f 'lib/par2/verificationhashtable.cpp'; then $(CYGPATH_W) 'lib/par2/verificationhashtable.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/verificationhashtable.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/verificationhashtable.Tpo" "$(DEPDIR)/verificationhashtable.Po"; else rm -f "$(DEPDIR)/verificationhashtable.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/verificationhashtable.cpp' object='verificationhashtable.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o verificationhashtable.obj `if test -f 'lib/par2/verificationhashtable.cpp'; then $(CYGPATH_W) 'lib/par2/verificationhashtable.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/verificationhashtable.cpp'; fi`
-
-verificationpacket.o: lib/par2/verificationpacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT verificationpacket.o -MD -MP -MF "$(DEPDIR)/verificationpacket.Tpo" -c -o verificationpacket.o `test -f 'lib/par2/verificationpacket.cpp' || echo '$(srcdir)/'`lib/par2/verificationpacket.cpp; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/verificationpacket.Tpo" "$(DEPDIR)/verificationpacket.Po"; else rm -f "$(DEPDIR)/verificationpacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/verificationpacket.cpp' object='verificationpacket.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o verificationpacket.o `test -f 'lib/par2/verificationpacket.cpp' || echo '$(srcdir)/'`lib/par2/verificationpacket.cpp
-
-verificationpacket.obj: lib/par2/verificationpacket.cpp
-@am__fastdepCXX_TRUE@	if $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT verificationpacket.obj -MD -MP -MF "$(DEPDIR)/verificationpacket.Tpo" -c -o verificationpacket.obj `if test -f 'lib/par2/verificationpacket.cpp'; then $(CYGPATH_W) 'lib/par2/verificationpacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/verificationpacket.cpp'; fi`; \
-@am__fastdepCXX_TRUE@	then mv -f "$(DEPDIR)/verificationpacket.Tpo" "$(DEPDIR)/verificationpacket.Po"; else rm -f "$(DEPDIR)/verificationpacket.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='lib/par2/verificationpacket.cpp' object='verificationpacket.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o verificationpacket.obj `if test -f 'lib/par2/verificationpacket.cpp'; then $(CYGPATH_W) 'lib/par2/verificationpacket.cpp'; else $(CYGPATH_W) '$(srcdir)/lib/par2/verificationpacket.cpp'; fi`
 uninstall-info-am:
 install-dist_docDATA: $(dist_doc_DATA)
 	@$(NORMAL_INSTALL)
@@ -1848,7 +1418,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/daemon/windows $(distdir)/lib/par2 $(distdir)/linux $(distdir)/osx $(distdir)/osx/NZBGet.xcodeproj $(distdir)/osx/Resources $(distdir)/osx/Resources/Images $(distdir)/osx/Resources/licenses $(distdir)/scripts $(distdir)/webui $(distdir)/webui/img $(distdir)/webui/lib $(distdir)/windows $(distdir)/windows/resources $(distdir)/windows/setup
+	$(mkdir_p) $(distdir)/daemon/windows $(distdir)/osx $(distdir)/osx/NZBGet.xcodeproj $(distdir)/osx/Resources $(distdir)/osx/Resources/Images $(distdir)/osx/Resources/licenses $(distdir)/scripts $(distdir)/webui $(distdir)/webui/img $(distdir)/webui/lib
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -1979,7 +1549,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(PROGRAMS) $(SCRIPTS) $(DATA) config.h
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(scriptsdir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(exampleconfdir)" "$(DESTDIR)$(webuidir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(scriptsdir)" "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(docdir)" "$(DESTDIR)$(exampleconfdir)" "$(DESTDIR)$(webuidir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
 install: install-am
@@ -2033,7 +1603,9 @@ install-data-am: install-dist_docDATA install-dist_exampleconfDATA \
 	@$(NORMAL_INSTALL)
 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook

-install-exec-am: install-binPROGRAMS
+install-exec-am: install-binPROGRAMS install-sbinSCRIPTS
+	@$(NORMAL_INSTALL)
+	$(MAKE) $(AM_MAKEFLAGS) install-exec-hook

 install-info: install-info-am

@@ -2063,7 +1635,7 @@ ps-am:
 uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
 	uninstall-dist_exampleconfDATA uninstall-info-am \
 	uninstall-nobase_dist_scriptsSCRIPTS \
-	uninstall-nobase_dist_webuiDATA
+	uninstall-nobase_dist_webuiDATA uninstall-sbinSCRIPTS

 .PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \
 	clean-binPROGRAMS clean-generic ctags dist dist-all dist-bzip2 \
@@ -2074,16 +1646,16 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
 	install-binPROGRAMS install-data install-data-am \
 	install-data-hook install-dist_docDATA \
 	install-dist_exampleconfDATA install-exec install-exec-am \
-	install-info install-info-am install-man \
+	install-exec-hook install-info install-info-am install-man \
 	install-nobase_dist_scriptsSCRIPTS \
-	install-nobase_dist_webuiDATA install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-dist_docDATA \
-	uninstall-dist_exampleconfDATA uninstall-info-am \
-	uninstall-nobase_dist_scriptsSCRIPTS \
-	uninstall-nobase_dist_webuiDATA
+	install-nobase_dist_webuiDATA install-sbinSCRIPTS \
+	install-strip installcheck installcheck-am installdirs \
+	maintainer-clean maintainer-clean-generic mostlyclean \
+	mostlyclean-compile mostlyclean-generic pdf pdf-am ps ps-am \
+	tags uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-dist_docDATA uninstall-dist_exampleconfDATA \
+	uninstall-info-am uninstall-nobase_dist_scriptsSCRIPTS \
+	uninstall-nobase_dist_webuiDATA uninstall-sbinSCRIPTS


 # Note about "sed": 
@@ -2095,6 +1667,13 @@ uninstall-am: uninstall-binPROGRAMS uninstall-dist_docDATA \
 # 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"
@@ -2160,7 +1739,6 @@ clean-bak: rm *~
 dist-hook:
 	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 {} \;
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
--- a/123
+++ b/123
@@ -44,16 +44,25 @@ depends on command-line parameters passed to the program.
 2. Supported OS
 =====================================

-NZBGet is written in C++ and works on Windows, OS X, Linux and
-most POSIX-conform OS'es.
+NZBGet is written in C++ and was initialy developed on Linux.
+It was ported to Windows later and tested for compatibility with
+several POSIX-OS'es.
+
+It should run at least on:
+  - Linux Debian 5.0 on x86;
+  - Linux with uClibc on MIPSEL and ARM;
+  - OpenBSD 5.0 on x86;
+  - Mac OS X 10.7 Lion on x64;
+  - Windows XP SP3 on x86 and Windows 7 on x64.

 Clients and servers running on different OS'es may communicate with
 each other. For example, you can use NZBGet as client on Windows to 
 control your NZBGet-server running on Linux.

 The download-section of NZBGet web-site provides binary files
-for Windows, OS X and Linux. For most POSIX-systems you need to compile
-the program yourself. 
+for Windows. The binary packages for many routers and NAS devices are 
+also available in OPTWARE repository (http://www.nslu2-linux.org), 
+but for most POSIX-systems you need to compile the program yourself. 

 If you have downloaded binaries you can just jump to section 
 "Configuration".
@@ -62,8 +71,8 @@ If you have downloaded binaries you can just jump to section
 3. Prerequisites on POSIX
 =====================================

-NZBGet is developed on a linux-system, but it runs on other
-POSIX platforms.
+NZBGet is developed on a linux-system, but it should run on other
+POSIX platforms (see the list of tested platforms above).

 NZBGet absolutely needs the following libraries:

@@ -76,7 +85,12 @@ 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://launchpad.net/libpar2,
+                  http://parchive.sourceforge.net)
+   - libsigc++   (http://libsigc.sourceforge.net)
+ 
 - for encrypted connections (TLS/SSL):
   - OpenSSL     (http://www.openssl.org)
     or
@@ -85,7 +99,7 @@ And the following libraries are optional:
 - for gzip support in web-server and web-client (enabled by default):
   - zlib     (http://www.zlib.net)

-All these libraries are included in modern POSIX distributions and
+All these libraries are included in modern Linux distributions and
 should be available as installable packages. Please note that you also 
 need the developer packages for these libraries too, they package names 
 have often suffix "dev" or "devel". On other systems you may need to 
@@ -138,7 +152,7 @@ You may run configure with additional arguments:
    if you can not use curses/ncurses.
    
  --disable-parcheck - to make without parcheck-support. Use this option
-    if you have troubles when compiling par2-module.
+    if you can not use libpar2 or libsigc++.

  --with-tlslib=(OpenSSL, GnuTLS) - to select which TLS/SSL library
    should be used for encrypted server connections.
@@ -155,13 +169,34 @@ You may run configure with additional arguments:
 Optional package: par-check
 ---------------------------
 NZBGet can check and repair downloaded files for you. For this purpose
-it uses library par2.
+it uses library par2 (libpar2), which needs sigc++ on its part.

-For your convenience the source code of libpar2 is integrated into
-NZBGet’s source tree and is compiled automatically when you make NZBGet.
+The libpar2 and libsigc++ (version 2 or later) must be installed on your
+system. On most linux distributions these libraries are available as packages.
+If you do not have these packages you can compile them yourself. 
+Following configure-parameters may be usefull:

-In a case errors occur during this process the inclusion of par2-module
-can be disabled using configure option "--disable-parcheck":
+  --with-libpar2-includes
+  --with-libpar2-libraries
+  --with-libsigc-includes
+  --with-libsigc-libraries
+  
+The library libsigc++ must be installed first, since libpar2 requires it.
+
+Official project libpar2 (http://parchive.sourceforge.net) has not been
+updated for many years. The last official version of libpar 0.2 contains
+known bugs which may crash the program during par-check. These bugs
+have been fixed in the semi-official fork maintained by Debian/Ubuntu
+team (http://launchpad.net/libpar2). It is highly recommended to use this
+version of libpar2 (version 0.4 or newer) instead of the last official
+version 0.2. Recent releases of Debian/Ubuntu include this libpar2 version.
+
+NZBGets configure script checks the installed version of libpar2 and prints
+an error if it is older than 0.4. The check can be suppressed if the update
+of libpar2 is not possible.
+
+If you are not able to use libpar2 or libsigc++ or do not want them you can
+make nzbget without support for par-check using option "--disable-parcheck":

  ./configure --disable-parcheck

@@ -169,10 +204,10 @@ Optional package: curses
 -------------------------
 For curses-outputmode you need ncurses or curses on your system.
 If you do not have one of them you can download and compile ncurses yourself.
-Following configure-parameters may be useful:
+Following configure-parameters may be usefull:

-  --with-libcurses-includes=/path/to/curses/includes
-  --with-libcurses-libraries=/path/to/curses/libraries
+  --with-libcurses-includes
+  --with-libcurses-libraries

 If you are not able to use curses or ncurses or do not want them you can
 make the program without support for curses using option "--disable-curses":
@@ -191,11 +226,11 @@ the option --with-tlslib=(OpenSSL, GnuTLS). For example to build with GnuTLS:
  
 Following configure-parameters may be useful:

-  --with-libtls-includess=/path/to/gnutls/includes
-  --with-libtls-libraries=/path/to/gnutls/libraries
+  --with-libtls-includes
+  --with-libtls-libraries

-  --with-openssl-includess=/path/to/openssl/includes
-  --with-openssl-libraries=/path/to/openssl/libraries
+  --with-openssl-includes
+  --with-openssl-libraries

 If none of these libraries is available you can make the program without 
 TLS/SSL support using option "--disable-tls":
@@ -210,15 +245,24 @@ NZBGet is developed using MS Visual C++ 2005. The project file and solution
 are provided. If you use MS Visual C++ 2005 Express you need to download
 and install Platform SDK.

-To compile the program with TLS/SSL support you need either OpenSSL or GnuTLS:
+To compile the program with par-check-support you also need the following 
+libraries:
+
+   - libsigc++   (http://libsigc.sourceforge.net)
+   - libpar2     (http://launchpad.net/libpar2,
+                  http://parchive.sourceforge.net)
+
+Download these libaries, then use patch-files provided with NZBGet to create
+preconfigured project files and solutions for each library. 
+Look at http://gnuwin32.sourceforge.net/packages/patch.htm for info on how
+to use patch-files, if you do not familiar with this technique.
+
+To compile the program with TLS/SSL support you also need the library:
+
   - OpenSSL  (http://www.openssl.org)
   or
   - GnuTLS   (http://www.gnu.org/software/gnutls)

-Also required are:
-   - Regex (http://gnuwin32.sourceforge.net/packages/regex.htm)
-   - Zlib (http://gnuwin32.sourceforge.net/packages/zlib.htm)
-
 =====================================
 6. Configuration
 =====================================
@@ -244,7 +288,6 @@ The program looks for configuration file in following standard
 locations (in this order):

 On POSIX systems:
-  <EXE-DIR>/nzbget.conf
  ~/.nzbget
  /etc/nzbget.conf
  /usr/etc/nzbget.conf
@@ -454,32 +497,6 @@ 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>
-
-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
 =====================================
--- a/config.h.in
+++ b/config.h.in
@@ -3,17 +3,13 @@
 /* Define to 1 to include debug-code */
 #undef DEBUG

-/* Define to 1 if deleting of files during reading of directory is not
-   properly supported by OS */
-#undef DIRBROWSER_SNAPSHOT
-
 /* Define to 1 to not use curses */
 #undef DISABLE_CURSES

 /* Define to 1 to disable gzip-support */
 #undef DISABLE_GZIP

-/* Define to 1 to disable par-verification and repair */
+/* Define to 1 to disable smart par-verification and restoration */
 #undef DISABLE_PARCHECK

 /* Define to 1 to not use TLS/SSL */
@@ -35,16 +31,6 @@
 /* Define to 1 if you have the <curses.h> header file. */
 #undef HAVE_CURSES_H

-/* Define to 1 if you have the <dirent.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_DIRENT_H
-
-/* Define to 1 if you have the <endian.h> header file. */
-#undef HAVE_ENDIAN_H
-
-/* Define to 1 if fseeko (and presumably ftello) exists and is declared. */
-#undef HAVE_FSEEKO
-
 /* Define to 1 if getaddrinfo is supported */
 #undef HAVE_GETADDRINFO

@@ -60,12 +46,6 @@
 /* Define to 1 if gethostbyname_r takes 6 arguments */
 #undef HAVE_GETHOSTBYNAME_R_6

-/* Define to 1 if you have the `getopt' function. */
-#undef HAVE_GETOPT
-
-/* Define to 1 if you have the <getopt.h> header file. */
-#undef HAVE_GETOPT_H
-
 /* Define to 1 if getopt_long is supported */
 #undef HAVE_GETOPT_LONG

@@ -75,9 +55,6 @@
 /* Define to 1 to use GnuTLS library for TLS/SSL-support. */
 #undef HAVE_LIBGNUTLS

-/* Define to 1 if you have the `memcpy' function. */
-#undef HAVE_MEMCPY
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H

@@ -87,56 +64,33 @@
 /* Define to 1 if you have the <ncurses/ncurses.h> header file. */
 #undef HAVE_NCURSES_NCURSES_H

-/* Define to 1 if you have the <ndir.h> header file, and it defines `DIR'. */
-#undef HAVE_NDIR_H
-
 /* Define to 1 to use OpenSSL library for TLS/SSL-support. */
 #undef HAVE_OPENSSL

+/* Define to 1 if libpar2 has recent bugfixes-patch (version 2) */
+#undef HAVE_PAR2_BUGFIXES_V2
+
+/* Define to 1 if libpar2 supports cancelling (needs a special patch) */
+#undef HAVE_PAR2_CANCEL
+
 /* Define to 1 if you have the <regex.h> header file. */
 #undef HAVE_REGEX_H

-/* Define to 1 if _SC_NPROCESSORS_ONLN is present in unistd.h */
-#undef HAVE_SC_NPROCESSORS_ONLN
-
 /* Define to 1 if spinlocks are supported */
 #undef HAVE_SPINLOCK

-/* Define to 1 if stdbool.h conforms to C99. */
-#undef HAVE_STDBOOL_H
-
 /* Define to 1 if you have the <stdint.h> header file. */
 #undef HAVE_STDINT_H

-/* Define to 1 if you have the <stdio.h> header file. */
-#undef HAVE_STDIO_H
-
 /* Define to 1 if you have the <stdlib.h> header file. */
 #undef HAVE_STDLIB_H

-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `stricmp' function. */
-#undef HAVE_STRICMP
-
 /* Define to 1 if you have the <strings.h> header file. */
 #undef HAVE_STRINGS_H

 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H

-/* Define to 1 if you have the <sys/dir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_DIR_H
-
-/* Define to 1 if you have the <sys/ndir.h> header file, and it defines `DIR'.
-   */
-#undef HAVE_SYS_NDIR_H
-
 /* Define to 1 if you have the <sys/prctl.h> header file. */
 #undef HAVE_SYS_PRCTL_H

@@ -152,12 +106,6 @@
 /* Define to 1 if variadic macros are supported */
 #undef HAVE_VARIADIC_MACROS

-/* Define to 1 if the system has the type `_Bool'. */
-#undef HAVE__BOOL
-
-/* Define to 1 to exclude debug-code */
-#undef NDEBUG
-
 /* Name of package */
 #undef PACKAGE

@@ -188,27 +136,8 @@
 /* Version number of package */
 #undef VERSION

-/* Define to 1 if your processor stores words with the most significant byte
-   first (like Motorola and SPARC, unlike Intel and VAX). */
-#undef WORDS_BIGENDIAN
-
 /* Number of bits in a file offset, on hosts where this is settable. */
 #undef _FILE_OFFSET_BITS

-/* Define to 1 to make fseeko visible on some hosts (e.g. glibc 2.2). */
-#undef _LARGEFILE_SOURCE
-
 /* Define for large files, on AIX-style hosts. */
 #undef _LARGE_FILES
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
-/* Define to `__inline__' or `__inline' if that's what the C compiler
-   calls it, or to nothing if 'inline' is not supported under any name.  */
-#ifndef __cplusplus
-#undef inline
-#endif
-
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-#undef size_t
--- a/2291
+++ b/2291
--- a/configure.ac
+++ b/configure.ac
@@ -1,31 +1,10 @@
-#
-#  This file is part of nzbget
-#
-# Copyright (C) 2008-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-#
-#
-
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.59)
-AC_INIT(nzbget, 15.0, hugbug@users.sourceforge.net)
+AC_INIT(nzbget, 13.0, hugbug@users.sourceforge.net)
 AC_CANONICAL_SYSTEM
-AM_INIT_AUTOMAKE(nzbget, 15.0)
+AM_INIT_AUTOMAKE(nzbget, 13.0)
 AC_CONFIG_SRCDIR([daemon/main/nzbget.cpp])
 AC_CONFIG_HEADERS([config.h])

@@ -164,7 +143,7 @@ fi


 dnl
-dnl Check if spinlocks are available
+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])]
@@ -201,31 +180,6 @@ AC_TRY_COMPILE([
 AC_DEFINE_UNQUOTED(SOCKLEN_T, $SOCKLEN_T, [Determine what socket length (socklen_t) data type is])


-dnl
-dnl Dir-browser's snapshot
-dnl
-AC_MSG_CHECKING(whether dir-browser snapshot workaround is needed)
-if test "$target_vendor" == "apple"; then
-	AC_MSG_RESULT([[yes]])
-	AC_DEFINE([DIRBROWSER_SNAPSHOT], 1, [Define to 1 if deleting of files during reading of directory is not properly supported by OS])
-else
-	AC_MSG_RESULT([[no]])
-fi
-
-
-dnl
-dnl check cpu cores via sysconf
-dnl
-AC_MSG_CHECKING(for cpu cores via sysconf)
-AC_TRY_COMPILE(
-	[#include <unistd.h>],
-	[ int a = _SC_NPROCESSORS_ONLN; ],
-	FOUND="yes"
-	AC_MSG_RESULT([[yes]])
-	AC_DEFINE([HAVE_SC_NPROCESSORS_ONLN], 1, [Define to 1 if _SC_NPROCESSORS_ONLN is present in unistd.h]),
-	FOUND="no")
-
-
 dnl 
 dnl checks for libxml2 includes and libraries.
 dnl
@@ -242,8 +196,7 @@ AC_ARG_WITH(libxml2_libraries,
 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"))
+		[CPPFLAGS="${CPPFLAGS} $libxml2_CFLAGS"])
 fi
 AC_CHECK_HEADER(libxml/tree.h,,
 	AC_MSG_ERROR("libxml2 header files not found"))
@@ -299,37 +252,116 @@ fi


 dnl
-dnl Use par-checking. Deafult: yes.
+dnl Use libpar2 for par-checking. Deafult: no
 dnl
 AC_MSG_CHECKING(whether to include code for par-checking)
 AC_ARG_ENABLE(parcheck,
-	[AS_HELP_STRING([--disable-parcheck], [do not include par-check/-repair-support])],
+	[AS_HELP_STRING([--disable-parcheck], [do not include par-check/-repair-support (removes dependency from libpar2- and libsigc-libraries)])],
 	[ ENABLEPARCHECK=$enableval ],
 	[ ENABLEPARCHECK=yes] )
 AC_MSG_RESULT($ENABLEPARCHECK)
 if test "$ENABLEPARCHECK" = "yes"; then
-	dnl PAR2 checks. 
+
 	dnl 
-	dnl Checks for header files.
-	AC_HEADER_DIRENT
-	AC_HEADER_STDBOOL
-	AC_HEADER_STDC
-	AC_CHECK_HEADERS([stdio.h] [endian.h] [getopt.h])
-	dnl Checks for typedefs, structures, and compiler characteristics.
-	AC_TYPE_SIZE_T
-	AC_C_BIGENDIAN
-	AC_C_CONST
-	AC_C_INLINE
-	AC_FUNC_FSEEKO
-	dnl Checks for library functions.
-	AC_FUNC_MEMCMP
-	AC_CHECK_FUNCS([stricmp] [strcasecmp])
-	AC_CHECK_FUNCS([strchr] [memcpy])
-	AC_CHECK_FUNCS([getopt])
-	AM_CONDITIONAL(WITH_PAR2, true)
+	dnl checks for libsigc++ includes and libraries (required for libpar2).
+	dnl
+
+	AC_ARG_WITH(libsigc_includes,
+		[AS_HELP_STRING([--with-libsigc-includes=DIR], [libsigc++-2.0 include directory])],
+		[CPPFLAGS="${CPPFLAGS} -I${withval}"]
+		[INCVAL="yes"],
+		[INCVAL="no"])
+	AC_ARG_WITH(libsigc_libraries,
+		[AS_HELP_STRING([--with-libsigc-libraries=DIR], [libsigc++-2.0 library directory])],
+		[LDFLAGS="${LDFLAGS} -L${withval}"]
+		[CPPFLAGS="${CPPFLAGS} -I${withval}/sigc++-2.0/include"]
+		[LIBVAL="yes"],
+		[LIBVAL="no"])
+	if test "$INCVAL" = "no" -o "$LIBVAL" = "no"; then
+		PKG_CHECK_MODULES(libsigc, sigc++-2.0,
+			[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)
+	AC_TRY_COMPILE(
+		[#include <libpar2/par2cmdline.h>]
+		[#include <libpar2/par2repairer.h>]
+		[ class Repairer : public Par2Repairer { void test() { BugfixesPatchVersion2(); } }; ],
+		[],
+		AC_MSG_RESULT([[yes]])
+		PAR2PATCHV2=yes
+		AC_DEFINE([HAVE_PAR2_BUGFIXES_V2], 1, [Define to 1 if libpar2 has recent bugfixes-patch (version 2)]),
+		AC_MSG_RESULT([[no]])
+		PAR2PATCHV2=no)
+
+	if test "$PAR2PATCHV2" = "no" ; then
+		AC_ARG_ENABLE(libpar2-bugfixes-check,
+			[AS_HELP_STRING([--disable-libpar2-bugfixes-check], [do not check libpar2 version])],
+			[ PAR2PATCHCHECK=$enableval ],
+			[ PAR2PATCHCHECK=yes] )
+		if test "$PAR2PATCHCHECK" = "yes"; then
+			AC_ERROR([Your version of libpar2 doesn't include the recent bugfixes. Please update libpar2 to version 0.4 or newer (http://launchpad.net/libpar2). If you cannot install a newer version of libpar2, you can use configure parameter --disable-libpar2-bugfixes-check to suppress the check. Please note however that in this case the program may crash during par-check/repair. The update is highly recommended!])
+		fi
+	fi
+
 else
-	AC_DEFINE([DISABLE_PARCHECK],1,[Define to 1 to disable par-verification and repair])
-	AM_CONDITIONAL(WITH_PAR2, false)
+	AC_DEFINE([DISABLE_PARCHECK],1,[Define to 1 to disable smart par-verification and restoration])
 fi


@@ -362,9 +394,10 @@ 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"],
+				FOUND=yes
 				FOUND=no)
 		fi

@@ -412,29 +445,10 @@ if test "$USETLS" = "yes"; then
 		fi
 		if test "$FOUND" = "yes"; then
 			AC_SEARCH_LIBS([gnutls_global_init], [gnutls],
-				FOUND=yes,
+				AC_SEARCH_LIBS([gcry_control], [gnutls gcrypt],
+					FOUND=yes,
+					FOUND=no),
 				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
@@ -524,6 +538,16 @@ dnl
 AC_DEFINE([DEBUG],1,Define to 1 to include debug-code)


+dnl
+dnl Set debug flags for gcc (if gcc is used)
+dnl
+if test "$CC" = "gcc"; then
+	CXXFLAGS="-g -Wall"
+else
+	CXXFLAGS=""
+fi
+
+
 dnl
 dnl check for __FUNCTION__ or __func__ macro
 dnl
@@ -587,8 +611,6 @@ 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


--- a/daemon/connect/Connection.cpp
+++ b/daemon/connect/Connection.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -49,12 +49,8 @@
 #include <sys/time.h>
 #include <arpa/inet.h>
 #include <netinet/in.h>
-#include <fcntl.h>
 #endif

-#include <vector>
-#include <algorithm>
-
 #include "nzbget.h"
 #include "Connection.h"
 #include "Log.h"
@@ -66,6 +62,7 @@ Mutex* Connection::m_pMutexGetHostByName = NULL;
 #endif
 #endif

+
 void Connection::Init()
 {
 	debug("Initializing global connection data");
@@ -131,7 +128,6 @@ Connection::Connection(const char* szHost, int iPort, bool bTLS)
 	m_bSuppressErrors = true;
 	m_szReadBuf = (char*)malloc(CONNECTION_READBUFFER_SIZE + 1);
 	m_iTotalBytesRead = 0;
-	m_bBroken = false;
 #ifndef DISABLE_TLS
 	m_pTLSSocket = NULL;
 	m_bTLSError = false;
@@ -258,18 +254,14 @@ bool Connection::Bind()
 	int res = getaddrinfo(m_szHost, iPortStr, &addr_hints, &addr_list);
 	if (res != 0)
 	{
-		ReportError("Could not resolve hostname %s", m_szHost, false, 0);
+		error("Could not resolve hostname %s", m_szHost);
 		return false;
 	}
 	
-	m_bBroken = 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);
-#ifdef WIN32
-		SetHandleInformation((HANDLE)m_iSocket, HANDLE_FLAG_INHERIT, 0);
-#endif
 		if (m_iSocket != INVALID_SOCKET)
 		{
 			int opt = 1;
@@ -353,10 +345,6 @@ int Connection::WriteLine(const char* pBuffer)
 	}

 	int iRes = send(m_iSocket, pBuffer, strlen(pBuffer), 0);
-	if (iRes <= 0)
-	{
-		m_bBroken = true;
-	}

 	return iRes;
 }
@@ -376,7 +364,6 @@ bool Connection::Send(const char* pBuffer, int iSize)
 		int iRes = send(m_iSocket, pBuffer + iBytesSent, iSize-iBytesSent, 0);
 		if (iRes <= 0)
 		{
-			m_bBroken = true;
 			return false;
 		}
 		iBytesSent += iRes;
@@ -405,7 +392,6 @@ char* Connection::ReadLine(char* pBuffer, int iSize, int* pBytesRead)
 			if (iBufAvail < 0)
 			{
 				ReportError("Could not receive data on socket", NULL, true, 0);
-				m_bBroken = true;
 				break;
 			}
 			else if (iBufAvail == 0)
@@ -544,7 +530,6 @@ bool Connection::DoConnect()
 	debug("Do connecting");

 	m_iSocket = INVALID_SOCKET;
-	m_bBroken = false;
 	
 #ifdef HAVE_GETADDRINFO
 	struct addrinfo addr_hints, *addr_list, *addr;
@@ -563,49 +548,32 @@ bool Connection::DoConnect()
 		return false;
 	}

-	std::vector<SockAddr> triedAddr;
-	bool bConnected = false;
-
 	for (addr = addr_list; addr != NULL; addr = addr->ai_next)
 	{
-		// don't try the same combinations of ai_family, ai_socktype, ai_protocol multiple times
-		SockAddr sa = { addr->ai_family, addr->ai_socktype, addr->ai_protocol };
-		if (std::find(triedAddr.begin(), triedAddr.end(), sa) != triedAddr.end())
-		{
-			continue;
-		}
-		triedAddr.push_back(sa);
-
+		bool bLastAddr = !addr->ai_next;
 		m_iSocket = socket(addr->ai_family, addr->ai_socktype, addr->ai_protocol);
-#ifdef WIN32
-		SetHandleInformation((HANDLE)m_iSocket, HANDLE_FLAG_INHERIT, 0);
-#endif
-		if (m_iSocket == INVALID_SOCKET)
+		if (m_iSocket != INVALID_SOCKET)
 		{
-			// try another addr/family/protocol
-			continue;
+			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;
 		}
-
-		if (ConnectWithTimeout(addr->ai_addr, addr->ai_addrlen))
+		else if (bLastAddr)
 		{
-			// Connection established
-			bConnected = true;
-			break;
+			ReportError("Socket creation failed for %s", m_szHost, true, 0);
 		}
 	}

-	if (m_iSocket == INVALID_SOCKET && addr_list)
-	{
-		ReportError("Socket creation failed for %s", m_szHost, true, 0);
-	}
-
-	if (!bConnected && m_iSocket != INVALID_SOCKET)
-	{
-		ReportError("Connection to %s failed", m_szHost, true, 0);
-		closesocket(m_iSocket);
-		m_iSocket = INVALID_SOCKET;
-	}
-
 	freeaddrinfo(addr_list);

 	if (m_iSocket == INVALID_SOCKET)
@@ -632,7 +600,8 @@ bool Connection::DoConnect()
 		return false;
 	}

-	if (!ConnectWithTimeout(&sSocketAddress, sizeof(sSocketAddress)))
+	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);
@@ -641,153 +610,22 @@ bool Connection::DoConnect()
 	}
 #endif

-	if (!InitSocketOpts())
-	{
-		return false;
-	}
-
-#ifndef DISABLE_TLS
-	if (m_bTLS && !StartTLS(true, NULL, NULL))
-	{
-		return false;
-	}
-#endif
-
-	return true;
-}
-
-bool Connection::InitSocketOpts()
-{
-	char* optbuf = NULL;
-	int optsize = 0;
 #ifdef WIN32
 	int MSecVal = m_iTimeout * 1000;
-	optbuf = (char*)&MSecVal;
-	optsize = sizeof(MSecVal);
+	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;
-	optbuf = (char*)&TimeVal;
-	optsize = sizeof(TimeVal);
+	int err = setsockopt(m_iSocket, SOL_SOCKET, SO_RCVTIMEO, (char*)&TimeVal, sizeof(TimeVal));
 #endif
-	int err = setsockopt(m_iSocket, SOL_SOCKET, SO_RCVTIMEO, optbuf, optsize);
 	if (err != 0)
 	{
 		ReportError("Socket initialization failed for %s", m_szHost, true, 0);
-		return false;
-	}
-	err = setsockopt(m_iSocket, SOL_SOCKET, SO_SNDTIMEO, optbuf, optsize);
-	if (err != 0)
-	{
-		ReportError("Socket initialization failed for %s", m_szHost, true, 0);
-		return false;
-	}
-	return true;
-}
-
-bool Connection::ConnectWithTimeout(void* address, int address_len)
-{
-	int flags = 0, error = 0, ret = 0;
-	fd_set rset, wset;
-	socklen_t len = sizeof(error);
-
-	struct timeval ts;
-	ts.tv_sec = m_iTimeout;
-	ts.tv_usec = 0;
-
-	//clear out descriptor sets for select
-	//add socket to the descriptor sets
-	FD_ZERO(&rset);
-	FD_SET(m_iSocket, &rset);
-	wset = rset;    //structure assignment ok
-
-	//set socket nonblocking flag
-#ifdef WIN32
-	u_long mode = 1;
-	if (ioctlsocket(m_iSocket, FIONBIO, &mode) != 0)
-	{
-		return false;
-	}
-#else
-	flags = fcntl(m_iSocket, F_GETFL, 0);
-	if (flags < 0)
-	{
-		return false;
 	}

-	if (fcntl(m_iSocket, F_SETFL, flags | O_NONBLOCK) < 0)
-	{
-		return false;
-	}
-#endif
-
-	//initiate non-blocking connect
-	ret = connect(m_iSocket, (struct sockaddr*)address, address_len);
-	if (ret < 0)
-	{
-#ifdef WIN32
-		int err = WSAGetLastError();
-		if (err != WSAEWOULDBLOCK)
-		{
-			return false;
-		}
-#else
-		if (errno != EINPROGRESS)
-		{
-			return false;
-		}
-#endif
-	}
-
-	//connect succeeded right away?
-	if (ret != 0)
-	{
-		ret = select(m_iSocket + 1, &rset, &wset, NULL, m_iTimeout ? &ts : NULL);
-		//we are waiting for connect to complete now
-		if (ret < 0)
-		{
-			return false;
-		}
-		if (ret == 0)
-		{
-			//we had a timeout
-#ifdef WIN32
-			WSASetLastError(WSAETIMEDOUT);
-#else
-			errno = ETIMEDOUT;
-#endif
-			return false;
-		}
-
-		if (!(FD_ISSET(m_iSocket, &rset) || FD_ISSET(m_iSocket, &wset)))
-		{
-			return false;
-		}
-		//we had a positivite return so a descriptor is ready
-
-		if (getsockopt(m_iSocket, SOL_SOCKET, SO_ERROR, (char*)&error, &len) < 0)
-		{
-			return false;
-		}
-
-		//check if we had a socket error
-		if (error)
-		{
-			errno = error;
-			return false;
-		}
-	}
-
-	//put socket back in blocking mode
-#ifdef WIN32
-	mode = 0;
-	if (ioctlsocket(m_iSocket, FIONBIO, &mode) != 0)
-	{
-		return false;
-	}
-#else
-	if (fcntl(m_iSocket, F_SETFL, flags) < 0)
+#ifndef DISABLE_TLS
+	if (m_bTLS && !StartTLS(true, NULL, NULL))
 	{
 		return false;
 	}
@@ -848,15 +686,12 @@ void Connection::ReportError(const char* szMsgPrefix, const char* szMsgArg, bool
 	char szErrPrefix[1024];
 	snprintf(szErrPrefix, 1024, szMsgPrefix, szMsgArg);
 	szErrPrefix[1024-1] = '\0';
-
-	char szMessage[1024];
-
+	
 	if (PrintErrCode)
 	{
 #ifdef WIN32
 		int ErrCode = WSAGetLastError();
 		char szErrMsg[1024];
-		szErrMsg[0] = '\0';
 		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, ErrCode, 0, szErrMsg, 1024, NULL);
 		szErrMsg[1024-1] = '\0';
 #else
@@ -878,9 +713,7 @@ void Connection::ReportError(const char* szMsgPrefix, const char* szMsgArg, bool
 		}
 		else
 		{
-			snprintf(szMessage, sizeof(szMessage), "%s: ErrNo %i, %s", szErrPrefix, ErrCode, szErrMsg);
-			szMessage[sizeof(szMessage) - 1] = '\0';
-			PrintError(szMessage);
+			error("%s: ErrNo %i, %s", szErrPrefix, ErrCode, szErrMsg);
 		}
 	}
 	else
@@ -891,23 +724,18 @@ void Connection::ReportError(const char* szMsgPrefix, const char* szMsgArg, bool
 		}
 		else
 		{
-			PrintError(szErrPrefix);
+			error(szErrPrefix);
 		}
 	}
 }

-void Connection::PrintError(const char* szErrMsg)
-{
-	error("%s", szErrMsg);
-}
-
 #ifndef DISABLE_TLS
 bool Connection::StartTLS(bool bIsClient, const char* szCertFile, const char* szKeyFile)
 {
 	debug("Starting TLS");

 	delete m_pTLSSocket;
-	m_pTLSSocket = new ConTLSSocket(m_iSocket, bIsClient, szCertFile, szKeyFile, m_szCipher, this);
+	m_pTLSSocket = new TLSSocket(m_iSocket, bIsClient, szCertFile, szKeyFile, m_szCipher);
 	m_pTLSSocket->SetSuppressErrors(m_bSuppressErrors);

 	return m_pTLSSocket->Start();
--- a/daemon/connect/Connection.h
+++ b/daemon/connect/Connection.h
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -61,31 +61,8 @@ protected:
 	bool				m_bSuppressErrors;
 	char				m_szRemoteAddr[20];
 	int					m_iTotalBytesRead;
-	bool				m_bBroken;
-
-	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
-	{
-	private:
-		Connection*		m_pOwner;
-	protected:
-		virtual void	PrintError(const char* szErrMsg) { m_pOwner->PrintError(szErrMsg); }
-	public:
-						ConTLSSocket(SOCKET iSocket, bool bIsClient, const char* szCertFile,
-							const char* szKeyFile, const char* szCipher, Connection* pOwner):
-							TLSSocket(iSocket, bIsClient, szCertFile, szKeyFile, szCipher), m_pOwner(pOwner) {}
-	};
-
-	ConTLSSocket*		m_pTLSSocket;
+	TLSSocket*			m_pTLSSocket;
 	bool				m_bTLSError;
 #endif
 #ifndef HAVE_GETADDRINFO
@@ -96,11 +73,8 @@ protected:

 						Connection(SOCKET iSocket, bool bTLS);
 	void				ReportError(const char* szMsgPrefix, const char* szMsgArg, bool PrintErrCode, int herrno);
-	virtual void		PrintError(const char* szErrMsg);
 	bool				DoConnect();
 	bool				DoDisconnect();
-	bool				InitSocketOpts();
-	bool				ConnectWithTimeout(void* address, int address_len);
 #ifndef HAVE_GETADDRINFO
 	unsigned int		ResolveHostAddr(const char* szHost);
 #endif
--- a/daemon/connect/TLS.cpp
+++ b/daemon/connect/TLS.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2008-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  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
@@ -35,7 +35,6 @@

 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #ifdef WIN32
 #include <winsock2.h>
 #include <ws2tcpip.h>
@@ -284,8 +283,6 @@ TLSSocket::~TLSSocket()

 void TLSSocket::ReportError(const char* szErrMsg)
 {
-	char szMessage[1024];
-
 #ifdef HAVE_LIBGNUTLS
 	const char* errstr = gnutls_strerror(m_iRetCode);
 	if (m_bSuppressErrors)
@@ -294,9 +291,7 @@ void TLSSocket::ReportError(const char* szErrMsg)
 	}
 	else
 	{
-		snprintf(szMessage, sizeof(szMessage), "%s: %s", szErrMsg, errstr);
-		szMessage[sizeof(szMessage) - 1] = '\0';
-		PrintError(szMessage);
+		error("%s: %s", szErrMsg, errstr);
 	}
 #endif /* HAVE_LIBGNUTLS */

@@ -316,23 +311,16 @@ void TLSSocket::ReportError(const char* szErrMsg)
 		}
 		else if (errcode != 0)
 		{
-			snprintf(szMessage, sizeof(szMessage), "%s: %s", szErrMsg, errstr);
-			szMessage[sizeof(szMessage) - 1] = '\0';
-			PrintError(szMessage);
+			error("%s: %s", szErrMsg, errstr);
 		}
 		else
 		{
-			PrintError(szErrMsg);
+			error("%s", szErrMsg);
 		}
 	} while (errcode);
 #endif /* HAVE_OPENSSL */
 }

-void TLSSocket::PrintError(const char* szErrMsg)
-{
-	error("%s", szErrMsg);
-}
-
 bool TLSSocket::Start()
 {
 #ifdef HAVE_LIBGNUTLS
--- a/daemon/connect/TLS.h
+++ b/daemon/connect/TLS.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2008-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  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
@@ -46,12 +46,9 @@ private:

 	void				ReportError(const char* szErrMsg);

-protected:
-	virtual void		PrintError(const char* szErrMsg);
-
 public:
 						TLSSocket(SOCKET iSocket, bool bIsClient, const char* szCertFile, const char* szKeyFile, const char* szCipher);
-	virtual				~TLSSocket();
+						~TLSSocket();
 	static void			Init();
 	static void			Final();
 	bool				Start();
--- a/daemon/connect/WebDownloader.cpp
+++ b/daemon/connect/WebDownloader.cpp
@@ -207,7 +207,6 @@ WebDownloader::EStatus WebDownloader::Download()
 		return Status;
 	}

-	m_pConnection->SetTimeout(g_pOptions->GetUrlTimeout());
 	m_pConnection->SetSuppressErrors(false);

 	// connection
@@ -366,6 +365,10 @@ WebDownloader::EStatus WebDownloader::DownloadHeaders()
 		// detect body of response
 		if (*line == '\r' || *line == '\n')
 		{
+			if (m_iContentLen == -1 && !m_bGZip)
+			{
+				warn("URL %s: Content-Length is not submitted by server, cannot verify whether the file is complete", m_szInfoName);
+			}
 			break;
 		}

@@ -416,10 +419,10 @@ WebDownloader::EStatus WebDownloader::DownloadBody()
 			szBuffer = szLineBuf;
 		}

-		// Connection closed or timeout?
+		// Have we encountered a timeout?
 		if (iLen <= 0)
 		{
-			if (iLen == 0 && m_iContentLen == -1 && iWrittenLen > 0)
+			if (m_iContentLen == -1 && iWrittenLen > 0)
 			{
 				bEnd = true;
 				break;
@@ -661,9 +664,9 @@ bool WebDownloader::PrepareFile()
 		error("Could not %s file %s", "create", szFilename);
 		return false;
 	}
-	if (g_pOptions->GetWriteBuffer() > 0)
+	if (g_pOptions->GetWriteBufferSize() > 0)
 	{
-		setvbuf(m_pOutFile, NULL, _IOFBF, g_pOptions->GetWriteBuffer() * 1024);
+		setvbuf(m_pOutFile, (char *)NULL, _IOFBF, g_pOptions->GetWriteBufferSize());
 	}

 	return true;
--- a/daemon/feed/FeedFilter.cpp
+++ b/daemon/feed/FeedFilter.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  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
@@ -330,7 +330,7 @@ bool FeedFilter::Term::Compile(char* szToken)
 }

 /*
- * If pFeedItemInfo is NULL, only field name is validated
+ * If pFeedItemInfo is NULL, only field type info is returned
 */
 bool FeedFilter::Term::GetFieldData(const char* szField, FeedItemInfo* pFeedItemInfo,
 	const char** StrValue, long long* IntValue)
@@ -408,11 +408,6 @@ bool FeedFilter::Term::GetFieldData(const char* szField, FeedItemInfo* pFeedItem
 		*IntValue = pFeedItemInfo ? pFeedItemInfo->GetDupeScore() : 0;
 		return true;
 	}
-	else if (!strcasecmp(szField, "dupestatus"))
-	{
-		*StrValue = pFeedItemInfo ? pFeedItemInfo->GetDupeStatus() : NULL;
-		return true;
-	}
 	else if (!strncasecmp(szField, "attr-", 5))
 	{
 		if (pFeedItemInfo)
@@ -521,7 +516,7 @@ bool FeedFilter::Term::ParseNumericParam(const char* szParam)
 	m_bFloat = strchr(szParam, '.');
 	
 	const char* p;
-	for (p = szParam; *p && ((*p >= '0' && *p <='9') || *p == '.' || *p == '-') ; p++) ;
+	for (p = szParam; *p && ((*p >= '0' && *p <='9') || *p == '.') ; p++) ;
 	if (*p)
 	{
 		return false;
--- a/daemon/feed/FeedInfo.cpp
+++ b/daemon/feed/FeedInfo.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -39,10 +39,8 @@

 #include "nzbget.h"
 #include "FeedInfo.h"
-#include "DupeCoordinator.h"
 #include "Util.h"

-extern DupeCoordinator* g_pDupeCoordinator;

 FeedInfo::FeedInfo(int iID, const char* szName, const char* szUrl, int iInterval,
 	const char* szFilter, bool bPauseNzb, const char* szCategory, int iPriority)
@@ -51,7 +49,7 @@ FeedInfo::FeedInfo(int iID, const char* szName, const char* szUrl, int iInterval
 	m_szName = strdup(szName ? szName : "");
 	m_szUrl = strdup(szUrl ? szUrl : "");
 	m_szFilter = strdup(szFilter ? szFilter : "");
-	m_iFilterHash = Util::HashBJ96(m_szFilter, strlen(m_szFilter), 0);
+	m_iFilterHash = Util::HashBJ96(szFilter, strlen(szFilter), 0);
 	m_szCategory = strdup(szCategory ? szCategory : "");
 	m_iInterval = iInterval;
 	m_bPauseNzb = bPauseNzb;
@@ -147,7 +145,6 @@ FeedItemInfo::FeedItemInfo()
 	m_szDupeKey = NULL;
 	m_iDupeScore = 0;
 	m_eDupeMode = dmScore;
-	m_szDupeStatus = NULL;
 }

 FeedItemInfo::~FeedItemInfo()
@@ -161,7 +158,6 @@ FeedItemInfo::~FeedItemInfo()
 	free(m_szEpisode);
 	free(m_szAddCategory);
 	free(m_szDupeKey);
-	free(m_szDupeStatus);
 }

 void FeedItemInfo::SetTitle(const char* szTitle)
@@ -323,37 +319,6 @@ void FeedItemInfo::ParseSeasonEpisode()
 	}
 }

-const char* FeedItemInfo::GetDupeStatus()
-{
-	if (!m_szDupeStatus)
-	{
-		const char* szDupeStatusName[] = { "", "QUEUED", "DOWNLOADING", "3", "SUCCESS", "5", "6", "7", "WARNING",
-			"9", "10", "11", "12", "13", "14", "15", "FAILURE" };
-		char szStatuses[200];
-		szStatuses[0] = '\0';
-
-		DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-		DupeCoordinator::EDupeStatus eDupeStatus = g_pDupeCoordinator->GetDupeStatus(pDownloadQueue, m_szTitle, m_szDupeKey);
-		DownloadQueue::Unlock();
-
-		for (int i = 1; i <= (int)DupeCoordinator::dsFailure; i = i << 1)
-		{
-			if (eDupeStatus & i)
-			{
-				if (*szStatuses)
-				{
-					strcat(szStatuses, ",");
-				}
-				strcat(szStatuses, szDupeStatusName[i]);
-			}
-		}
-
-		m_szDupeStatus = strdup(szStatuses);
-	}
-
-	return m_szDupeStatus;
-}
-

 FeedHistoryInfo::FeedHistoryInfo(const char* szUrl, FeedHistoryInfo::EStatus eStatus, time_t tLastSeen)
 {
--- a/daemon/feed/FeedInfo.h
+++ b/daemon/feed/FeedInfo.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -165,7 +165,6 @@ private:
 	char*				m_szDupeKey;
 	int					m_iDupeScore;
 	EDupeMode			m_eDupeMode;
-	char*				m_szDupeStatus;
 	SharedFeedData*		m_pSharedFeedData;
 	Attributes			m_Attributes;

@@ -220,7 +219,6 @@ public:
 	void				SetDupeScore(int iDupeScore) { m_iDupeScore = iDupeScore; }
 	EDupeMode			GetDupeMode() { return m_eDupeMode; }
 	void				SetDupeMode(EDupeMode eDupeMode) { m_eDupeMode = eDupeMode; }
-	const char*			GetDupeStatus();
 	Attributes*			GetAttributes() { return &m_Attributes; }
 };

--- a/daemon/frontend/Frontend.cpp
+++ b/daemon/frontend/Frontend.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -119,7 +119,11 @@ void Frontend::FreeData()
 {
 	if (IsRemoteMode())
 	{
-		m_RemoteMessages.Clear();
+		for (Log::Messages::iterator it = m_RemoteMessages.begin(); it != m_RemoteMessages.end(); it++)
+		{
+			delete *it;
+		}
+		m_RemoteMessages.clear();

 		DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
 		pDownloadQueue->GetQueue()->Clear();
@@ -127,7 +131,7 @@ void Frontend::FreeData()
 	}
 }

-MessageList* Frontend::LockMessages()
+Log::Messages* Frontend::LockMessages()
 {
 	if (IsRemoteMode())
 	{
--- a/daemon/frontend/Frontend.h
+++ b/daemon/frontend/Frontend.h
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -36,7 +36,7 @@
 class Frontend : public Thread
 {
 private:
-	MessageList			m_RemoteMessages;
+	Log::Messages		m_RemoteMessages;

 	bool				RequestMessages();
 	bool				RequestFileList();
@@ -62,7 +62,7 @@ protected:

 	bool				PrepareData();
 	void				FreeData();
-	MessageList*		LockMessages();
+	Log::Messages*		LockMessages();
 	void				UnlockMessages();
 	DownloadQueue*		LockQueue();
 	void				UnlockQueue();
--- a/daemon/frontend/LoggableFrontend.cpp
+++ b/daemon/frontend/LoggableFrontend.cpp
@@ -2,7 +2,7 @@
 *  This file if part of nzbget
 *
 *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015  Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -79,7 +79,7 @@ void LoggableFrontend::Update()

 	BeforePrint();

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

 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #ifndef WIN32
 #include <unistd.h>
 #endif
@@ -504,7 +503,7 @@ void NCursesFrontend::PrintMessages()
    int iLine = iLineNr + m_iMessagesWinClientHeight - 1;
 	int iLinesToPrint = m_iMessagesWinClientHeight;

-    MessageList* pMessages = LockMessages();
+    Log::Messages* pMessages = LockMessages();
    
 	// print messages from bottom
 	for (int i = (int)pMessages->size() - 1; i >= 0 && iLinesToPrint > 0; i--)
--- a/daemon/main/Maintenance.cpp
+++ b/daemon/main/Maintenance.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2013-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -48,9 +48,6 @@

 extern Options* g_pOptions;
 extern Maintenance* g_pMaintenance;
-extern void ExitProc();
-extern int g_iArgumentCount;
-extern char* (*g_szArguments)[];

 Maintenance::Maintenance()
 {
@@ -72,7 +69,7 @@ Maintenance::~Maintenance()
 		}
 	}

-	m_Messages.Clear();
+	ClearMessages();

 	free(m_szUpdateScript);
 }
@@ -84,7 +81,16 @@ void Maintenance::ResetUpdateController()
 	m_mutexController.Unlock();
 }

-MessageList* Maintenance::LockMessages()
+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;
@@ -95,7 +101,7 @@ void Maintenance::UnlockMessages()
 	m_mutexLog.Unlock();
 }

-void Maintenance::AddMessage(Message::EKind eKind, time_t tTime, const char * szText)
+void Maintenance::AppendMessage(Message::EKind eKind, time_t tTime, const char * szText)
 {
 	if (tTime == 0)
 	{
@@ -131,20 +137,7 @@ bool Maintenance::StartUpdate(EBranch eBranch)
 		return false;
 	}

-	// make absolute path
-	if (m_szUpdateScript[0] != PATH_SEPARATOR
-#ifdef WIN32
-		&& !(strlen(m_szUpdateScript) > 2 && m_szUpdateScript[1] == ':')
-#endif
-		)
-	{
-		char szFilename[MAX_PATH + 100];
-		snprintf(szFilename, sizeof(szFilename), "%s%c%s", g_pOptions->GetAppDir(), PATH_SEPARATOR, m_szUpdateScript);
-		free(m_szUpdateScript);
-		m_szUpdateScript = strdup(szFilename);
-	}
-
-	m_Messages.Clear();
+	ClearMessages();

 	m_UpdateScriptController = new UpdateScriptController();
 	m_UpdateScriptController->SetScript(m_szUpdateScript);
@@ -236,9 +229,6 @@ bool Maintenance::ReadPackageInfoStr(const char* szKey, char** pValue)

 void UpdateScriptController::Run()
 {
-	// the update-script should not be automatically terminated when the program quits
-	UnregisterRunningScript();
-
 	m_iPrefixLen = 0;
 	PrintMessage(Message::mkInfo, "Executing update-script %s", GetScript());

@@ -250,21 +240,11 @@ void UpdateScriptController::Run()
    const char* szBranchName[] = { "STABLE", "TESTING", "DEVEL" };
 	SetEnvVar("NZBUP_BRANCH", szBranchName[m_eBranch]);

-	SetEnvVar("NZBUP_RUNMODE", g_pOptions->GetDaemonMode() ? "DAEMON" : "SERVER");
-
-	for (int i = 0; i < g_iArgumentCount; i++)
-	{
-		char szEnvName[40];
-		snprintf(szEnvName, 40, "NZBUP_CMDLINE%i", i);
-		szInfoName[40-1] = '\0';
-		SetEnvVar(szEnvName, (*g_szArguments)[i]);
-	}
-
 	char szProcessID[20];
 #ifdef WIN32
 	int pid = (int)GetCurrentProcessId();
 #else
-	int pid = (int)getpid();
+	int pid = (int)getppid();
 #endif
 	snprintf(szProcessID, 20, "%i", pid);
 	szProcessID[20-1] = '\0';
@@ -286,24 +266,8 @@ void UpdateScriptController::AddMessage(Message::EKind eKind, const char* szText
 {
 	szText = szText + m_iPrefixLen;

-	if (!strncmp(szText, "[NZB] ", 6))
-	{
-		debug("Command %s detected", szText + 6);
-		if (!strcmp(szText + 6, "QUIT"))
-		{
-			Detach();
-			ExitProc();
-		}
-		else
-		{
-			error("Invalid command \"%s\" received", szText);
-		}
-	}
-	else
-	{
-		g_pMaintenance->AddMessage(eKind, time(NULL), szText);
-		ScriptController::AddMessage(eKind, szText);
-	}
+	g_pMaintenance->AppendMessage(eKind, time(NULL), szText);
+	ScriptController::AddMessage(eKind, szText);
 }

 void UpdateInfoScriptController::ExecuteScript(const char* szScript, char** pUpdateInfo)
--- a/daemon/main/Maintenance.h
+++ b/daemon/main/Maintenance.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2013-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -35,7 +35,7 @@ class UpdateScriptController;
 class Maintenance
 {
 private:
-	MessageList			m_Messages;
+	Log::Messages		m_Messages;
 	Mutex				m_mutexLog;
 	Mutex				m_mutexController;
 	int					m_iIDMessageGen;
@@ -54,8 +54,9 @@ public:

 						Maintenance();
 						~Maintenance();
-	void				AddMessage(Message::EKind eKind, time_t tTime, const char* szText);
-	MessageList*		LockMessages();
+	void				ClearMessages();
+	void				AppendMessage(Message::EKind eKind, time_t tTime, const char* szText);
+	Log::Messages*		LockMessages();
 	void				UnlockMessages();
 	bool				StartUpdate(EBranch eBranch);
 	void				ResetUpdateController();
--- a/daemon/main/Options.cpp
+++ b/daemon/main/Options.cpp
--- a/daemon/main/Options.h
+++ b/daemon/main/Options.h
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -62,14 +62,7 @@ public:
 		opClientRequestScanPause,
 		opClientRequestScanUnpause,
 		opClientRequestHistory,
-		opClientRequestHistoryAll
-	};
-	enum EWriteLog
-	{
-		wlNone,
-		wlAppend,
-		wlReset,
-		wlRotate
+		opClientRequestDownloadUrl
 	};
 	enum EMessageTarget
 	{
@@ -132,7 +125,6 @@ public:
 		const char*		GetValue() { return m_szValue; }
 		const char*		GetDefValue() { return m_szDefValue; }
 		int				GetLineNo() { return m_iLineNo; }
-		bool			Restricted();
 	};
 	
 	typedef std::vector<OptEntry*>  OptEntriesBase;
@@ -184,7 +176,6 @@ public:
 		bool			m_bScanScript;
 		bool			m_bQueueScript;
 		bool			m_bSchedulerScript;
-		char*			m_szQueueEvents;

 	public:
 						Script(const char* szName, const char* szLocation);
@@ -201,17 +192,14 @@ public:
 		void			SetQueueScript(bool bQueueScript) { m_bQueueScript = bQueueScript; }
 		bool			GetSchedulerScript() { return m_bSchedulerScript; }
 		void			SetSchedulerScript(bool bSchedulerScript) { m_bSchedulerScript = bSchedulerScript; }
-		void			SetQueueEvents(const char* szQueueEvents);
-		const char*		GetQueueEvents() { return m_szQueueEvents; }
 	};

-	typedef std::list<Script*>  ScriptsBase;
+	typedef std::list<Script*>  ScriptListBase;

-	class Scripts: public ScriptsBase
+	class ScriptList: public ScriptListBase
 	{
 	public:
-						~Scripts();
-		void			Clear();
+						~ScriptList();
 		Script*			Find(const char* szName);	
 	};

@@ -243,13 +231,10 @@ private:
 	bool				m_bConfigInitialized;
 	Mutex				m_mutexOptEntries;
 	Categories			m_Categories;
-	Scripts				m_Scripts;
-	ConfigTemplates		m_ConfigTemplates;

 	// Options
 	bool				m_bConfigErrors;
 	int					m_iConfigLine;
-	char*				m_szAppDir;
 	char*				m_szConfigFilename;
 	char*				m_szDestDir;
 	char*				m_szInterDir;
@@ -265,10 +250,9 @@ private:
 	EMessageTarget		m_eDebugTarget;
 	EMessageTarget		m_eDetailTarget;
 	bool				m_bDecode;
-	bool				m_bBrokenLog;
-	bool				m_bNzbLog;
-	int					m_iArticleTimeout;
-	int					m_iUrlTimeout;
+	bool				m_bCreateBrokenLog;
+	bool				m_bResetLog;
+	int					m_iConnectionTimeout;
 	int					m_iTerminateTimeout;
 	bool				m_bAppendCategoryDir;
 	bool				m_bContinuePartial;
@@ -279,10 +263,6 @@ private:
 	char*				m_szControlIP;
 	char*				m_szControlUsername;
 	char*				m_szControlPassword;
-	char*				m_szRestrictedUsername;
-	char*				m_szRestrictedPassword;
-	char*				m_szAddUsername;
-	char*				m_szAddPassword;
 	int					m_iControlPort;
 	bool				m_bSecureControl;
 	int					m_iSecurePort;
@@ -295,16 +275,12 @@ private:
 	bool				m_bReloadQueue;
 	int					m_iUrlConnections;
 	int					m_iLogBufferSize;
-	EWriteLog			m_eWriteLog;
-	int					m_iRotateLog;
+	bool				m_bCreateLog;
 	char*				m_szLogFile;
 	EParCheck			m_eParCheck;
 	bool				m_bParRepair;
 	EParScan			m_eParScan;
-	bool				m_bParQuick;
 	bool				m_bParRename;
-	int					m_iParBuffer;
-	int					m_iParThreads;
 	EHealthCheck		m_eHealthCheck;
 	char*				m_szPostScript;
 	char*				m_szScriptOrder;
@@ -318,7 +294,7 @@ private:
 	bool				m_bCursesGroup;
 	bool				m_bCrcCheck;
 	bool				m_bDirectWrite;
-	int					m_iWriteBuffer;
+	int					m_iWriteBufferSize;
 	int					m_iNzbDirInterval;
 	int					m_iNzbDirFileAge;
 	bool				m_bParCleanupQueue;
@@ -336,7 +312,6 @@ private:
 	bool				m_bUnpackCleanupDisk;
 	char*				m_szUnrarCmd;
 	char*				m_szSevenZipCmd;
-	char*				m_szUnpackPassFile;
 	bool				m_bUnpackPauseQueue;
 	char*				m_szExtCleanupDisk;
 	char*				m_szParIgnoreExt;
@@ -344,8 +319,6 @@ private:
 	bool				m_bUrlForce;
 	int					m_iTimeCorrection;
 	int					m_iPropagationDelay;
-	int					m_iArticleCache;
-	int					m_iEventInterval;

 	// Parsed command-line parameters
 	bool				m_bServerMode;
@@ -366,15 +339,10 @@ private:
 	char*				m_szLastArg;
 	bool				m_bPrintOptions;
 	bool				m_bAddTop;
-	char*				m_szAddDupeKey;
-	int					m_iAddDupeScore;
-	int					m_iAddDupeMode;
 	int					m_iSetRate;
 	int					m_iLogLines;
 	int					m_iWriteLogKind;
 	bool				m_bTestBacktrace;
-	bool				m_bWebGet;
-	char*				m_szWebGetFilename;

 	// Current state
 	bool				m_bPauseDownload;
@@ -395,8 +363,6 @@ private:
 	void				InitCategories();
 	void				InitScheduler();
 	void				InitFeeds();
-	void				InitScripts();
-	void				InitConfigTemplates();
 	void				CheckOptions();
 	void				PrintUsage(char* com);
 	void				Dump();
@@ -410,37 +376,32 @@ private:
 	bool				SplitOptionString(const char* option, char** pOptName, char** pOptValue);
 	bool				ValidateOptionName(const char* optname, const char* optvalue);
 	void				LoadConfigFile();
-	void				CheckDir(char** dir, const char* szOptionName, const char* szParentDir,
-							bool bAllowEmpty, bool bCreate);
+	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* szTime, int* pHours, int* pMinutes);
+	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(Scripts* pScripts, const char* szDirectory, bool bIsSubDir);
-	void				BuildScriptDisplayNames(Scripts* pScripts);
-	void				LoadScripts(Scripts* pScripts);
+	void				LoadScriptDir(ScriptList* pScriptList, const char* szDirectory, bool bIsSubDir);
+	void				BuildScriptDisplayNames(ScriptList* pScriptList);

 public:
-						Options();
+						Options(int argc, char* argv[]);
 						~Options();
-	void				Init(int argc, char* argv[]);

 	bool				LoadConfig(OptEntries* pOptEntries);
 	bool				SaveConfig(OptEntries* pOptEntries);
 	bool				LoadConfigTemplates(ConfigTemplates* pConfigTemplates);
-	Scripts*			GetScripts() { return &m_Scripts; }
-	ConfigTemplates*	GetConfigTemplates() { return &m_ConfigTemplates; }
+	void				LoadScriptList(ScriptList* pScriptList);

 	// Options
 	OptEntries*			LockOptEntries();
 	void				UnlockOptEntries();
 	const char*			GetConfigFilename() { return m_szConfigFilename; }
-	const char*			GetAppDir() { return m_szAppDir; }
 	const char*			GetDestDir() { return m_szDestDir; }
 	const char*			GetInterDir() { return m_szInterDir; }
 	const char*			GetTempDir() { return m_szTempDir; }
@@ -449,15 +410,14 @@ public:
 	const char*			GetWebDir() { return m_szWebDir; }
 	const char*			GetConfigTemplate() { return m_szConfigTemplate; }
 	const char*			GetScriptDir() { return m_szScriptDir; }
-	bool				GetBrokenLog() const { return m_bBrokenLog; }
-	bool				GetNzbLog() const { return m_bNzbLog; }
+	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					GetArticleTimeout() { return m_iArticleTimeout; }
-	int					GetUrlTimeout() { return m_iUrlTimeout; }
+	int					GetConnectionTimeout() { return m_iConnectionTimeout; }
 	int					GetTerminateTimeout() { return m_iTerminateTimeout; }
 	bool				GetDecode() { return m_bDecode; };
 	bool				GetAppendCategoryDir() { return m_bAppendCategoryDir; }
@@ -466,13 +426,9 @@ public:
 	int					GetRetryInterval() { return m_iRetryInterval; }
 	bool				GetSaveQueue() { return m_bSaveQueue; }
 	bool				GetDupeCheck() { return m_bDupeCheck; }
-	const char*			GetControlIP();
+	const char*			GetControlIP() { return m_szControlIP; }
 	const char*			GetControlUsername() { return m_szControlUsername; }
 	const char*			GetControlPassword() { return m_szControlPassword; }
-	const char*			GetRestrictedUsername() { return m_szRestrictedUsername; }
-	const char*			GetRestrictedPassword() { return m_szRestrictedPassword; }
-	const char*			GetAddUsername() { return m_szAddUsername; }
-	const char*			GetAddPassword() { return m_szAddPassword; }
 	int					GetControlPort() { return m_iControlPort; }
 	bool				GetSecureControl() { return m_bSecureControl; }
 	int					GetSecurePort() { return m_iSecurePort; }
@@ -485,16 +441,12 @@ public:
 	bool				GetReloadQueue() { return m_bReloadQueue; }
 	int					GetUrlConnections() { return m_iUrlConnections; }
 	int					GetLogBufferSize() { return m_iLogBufferSize; }
-	EWriteLog			GetWriteLog() { return m_eWriteLog; }
+	bool				GetCreateLog() { return m_bCreateLog; }
 	const char*			GetLogFile() { return m_szLogFile; }
-	int					GetRotateLog() { return m_iRotateLog; }
 	EParCheck			GetParCheck() { return m_eParCheck; }
 	bool				GetParRepair() { return m_bParRepair; }
 	EParScan			GetParScan() { return m_eParScan; }
-	bool				GetParQuick() { return m_bParQuick; }
 	bool				GetParRename() { return m_bParRename; }
-	int					GetParBuffer() { return m_iParBuffer; }
-	int					GetParThreads() { return m_iParThreads; }
 	EHealthCheck		GetHealthCheck() { return m_eHealthCheck; }
 	const char*			GetScriptOrder() { return m_szScriptOrder; }
 	const char*			GetPostScript() { return m_szPostScript; }
@@ -507,7 +459,7 @@ public:
 	bool				GetCursesGroup() { return m_bCursesGroup; }
 	bool				GetCrcCheck() { return m_bCrcCheck; }
 	bool				GetDirectWrite() { return m_bDirectWrite; }
-	int					GetWriteBuffer() { return m_iWriteBuffer; }
+	int					GetWriteBufferSize() { return m_iWriteBufferSize; }
 	int					GetNzbDirInterval() { return m_iNzbDirInterval; }
 	int					GetNzbDirFileAge() { return m_iNzbDirFileAge; }
 	bool				GetParCleanupQueue() { return m_bParCleanupQueue; }
@@ -525,7 +477,6 @@ public:
 	bool				GetUnpackCleanupDisk() { return m_bUnpackCleanupDisk; }
 	const char*			GetUnrarCmd() { return m_szUnrarCmd; }
 	const char*			GetSevenZipCmd() { return m_szSevenZipCmd; }
-	const char*			GetUnpackPassFile() { return m_szUnpackPassFile; }
 	bool				GetUnpackPauseQueue() { return m_bUnpackPauseQueue; }
 	const char*			GetExtCleanupDisk() { return m_szExtCleanupDisk; }
 	const char*			GetParIgnoreExt() { return m_szParIgnoreExt; }
@@ -533,10 +484,7 @@ public:
 	bool				GetUrlForce() { return m_bUrlForce; }
 	int					GetTimeCorrection() { return m_iTimeCorrection; }
 	int					GetPropagationDelay() { return m_iPropagationDelay; }
-	int					GetArticleCache() { return m_iArticleCache; }
-	int					GetEventInterval() { return m_iEventInterval; }

-	Categories*			GetCategories() { return &m_Categories; }
 	Category*			FindCategory(const char* szName, bool bSearchAliases) { return m_Categories.FindCategory(szName, bSearchAliases); }

 	// Parsed command-line parameters
@@ -558,15 +506,10 @@ public:
 	int					GetAddPriority() { return m_iAddPriority; }
 	char*				GetAddNZBFilename() { return m_szAddNZBFilename; }
 	bool				GetAddTop() { return m_bAddTop; }
-	const char*			GetAddDupeKey() { return m_szAddDupeKey; }
-	int					GetAddDupeScore() { return m_iAddDupeScore; }
-	int					GetAddDupeMode() { return m_iAddDupeMode; }
 	int					GetSetRate() { return m_iSetRate; }
 	int					GetLogLines() { return m_iLogLines; }
 	int					GetWriteLogKind() { return m_iWriteLogKind; }
 	bool				GetTestBacktrace() { return m_bTestBacktrace; }
-	bool				GetWebGet() { return m_bWebGet; }
-	const char*			GetWebGetFilename() { return m_szWebGetFilename; }

 	// Current state
 	void				SetPauseDownload(bool bPauseDownload) { m_bPauseDownload = bPauseDownload; }
--- a/daemon/main/Scheduler.cpp
+++ b/daemon/main/Scheduler.cpp
@@ -125,11 +125,16 @@ void Scheduler::FirstCheck()
 	m_mutexTaskList.Unlock();

 	// check all tasks for the last week
+	time_t tCurrent = time(NULL);
+	m_tLastCheck = tCurrent - 60*60*24*7;
+	m_bDetectClockChanges = false;
+	m_bExecuteProcess = false;
 	CheckTasks();
 }

 void Scheduler::IntervalCheck()
 {
+	m_bDetectClockChanges = true;
 	m_bExecuteProcess = true;
 	CheckTasks();
 	CheckScheduledResume();
@@ -145,20 +150,21 @@ void Scheduler::CheckTasks()

 	if (!m_TaskList.empty())
 	{
-		// Detect large step changes of system time 
-		time_t tDiff = tCurrent - m_tLastCheck;
-		if (tDiff > 60*90 || tDiff < 0)
+		if (m_bDetectClockChanges)
 		{
-			debug("Reset scheduled tasks (detected clock change greater than 90 minutes or negative)");
-
-			// check all tasks for the last week
-			m_tLastCheck = tCurrent - 60*60*24*7;
-			m_bExecuteProcess = false;
-
-			for (TaskList::iterator it = m_TaskList.begin(); it != m_TaskList.end(); it++)
+			// Detect large step changes of system time 
+			time_t tDiff = tCurrent - m_tLastCheck;
+			if (tDiff > 60*90 || tDiff < -60*90)
 			{
-				Task* pTask = *it;
-				pTask->m_tLastExecuted = 0;
+				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;
+				}
 			}
 		}

@@ -224,8 +230,7 @@ void Scheduler::CheckTasks()

 void Scheduler::ExecuteTask(Task* pTask)
 {
-	const char* szCommandName[] = { "Pause", "Unpause", "Pause Post-processing", "Unpause Post-processing",
-		"Set download rate", "Execute process", "Execute script",
+	const char* szCommandName[] = { "Pause", "Unpause", "Set download rate", "Execute process", "Execute script",
 		"Pause Scan", "Unpause Scan", "Enable Server", "Disable Server", "Fetch Feed" };
 	debug("Executing scheduled command: %s", szCommandName[pTask->m_eCommand]);

@@ -245,18 +250,6 @@ void Scheduler::ExecuteTask(Task* pTask)
 			m_bPauseDownloadChanged = true;
 			break;

-		case scPausePostProcess:
-		case scUnpausePostProcess:
-			g_pOptions->SetPausePostProcess(pTask->m_eCommand == scPausePostProcess);
-			m_bPausePostProcessChanged = true;
-			break;
-
-		case scPauseScan:
-		case scUnpauseScan:
-			g_pOptions->SetPauseScan(pTask->m_eCommand == scPauseScan);
-			m_bPauseScanChanged = true;
-			break;
-
 		case scScript:
 		case scProcess:
 			if (m_bExecuteProcess)
@@ -265,6 +258,12 @@ void Scheduler::ExecuteTask(Task* pTask)
 			}
 			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);
@@ -283,7 +282,6 @@ void Scheduler::PrepareLog()
 {
 	m_bDownloadRateChanged = false;
 	m_bPauseDownloadChanged = false;
-	m_bPausePostProcessChanged = false;
 	m_bPauseScanChanged = false;
 	m_bServerChanged = false;
 }
@@ -298,10 +296,6 @@ void Scheduler::PrintLog()
 	{
 		info("Scheduler: %s download", g_pOptions->GetPauseDownload() ? "pausing" : "unpausing");
 	}
-	if (m_bPausePostProcessChanged)
-	{
-		info("Scheduler: %s post-processing", g_pOptions->GetPausePostProcess() ? "pausing" : "unpausing");
-	}
 	if (m_bPauseScanChanged)
 	{
 		info("Scheduler: %s scan", g_pOptions->GetPauseScan() ? "pausing" : "unpausing");
--- a/daemon/main/Scheduler.h
+++ b/daemon/main/Scheduler.h
@@ -39,8 +39,6 @@ public:
 	{
 		scPauseDownload,
 		scUnpauseDownload,
-		scPausePostProcess,
-		scUnpausePostProcess,
 		scDownloadRate,
 		scScript,
 		scProcess,
@@ -77,10 +75,10 @@ private:
 	TaskList			m_TaskList;
 	Mutex				m_mutexTaskList;
 	time_t				m_tLastCheck;
+	bool				m_bDetectClockChanges;
 	bool				m_bDownloadRateChanged;
 	bool				m_bExecuteProcess;
 	bool				m_bPauseDownloadChanged;
-	bool				m_bPausePostProcessChanged;
 	bool				m_bPauseScanChanged;
 	bool				m_bServerChanged;
 	ServerStatusList	m_ServerStatusList;
--- a/daemon/main/StackTrace.cpp
+++ b/daemon/main/StackTrace.cpp
@@ -1,321 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#ifdef WIN32
-#include "win32.h"
-#endif
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#ifdef WIN32
-#include <dbghelp.h>
-#else
-#include <unistd.h>
-#include <sys/resource.h>
-#include <signal.h>
-#endif
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
-#ifdef HAVE_BACKTRACE
-#include <execinfo.h>
-#endif
-
-#include "nzbget.h"
-#include "Log.h"
-#include "Options.h"
-#include "StackTrace.h"
-
-extern Options* g_pOptions;
-extern void ExitProc();
-
-#ifdef WIN32
-
-#ifdef DEBUG
-
-void PrintBacktrace(PCONTEXT pContext)
-{
-	HANDLE hProcess = GetCurrentProcess();
-	HANDLE hThread = GetCurrentThread();
-
-	char szAppDir[MAX_PATH + 1];
-	GetModuleFileName(NULL, szAppDir, sizeof(szAppDir));
-	char* end = strrchr(szAppDir, PATH_SEPARATOR);
-	if (end) *end = '\0';
-
-	SymSetOptions(SymGetOptions() | SYMOPT_LOAD_LINES | SYMOPT_FAIL_CRITICAL_ERRORS);
-
-	if (!SymInitialize(hProcess, szAppDir, TRUE))
-	{
-		warn("Could not obtain detailed exception information: SymInitialize failed");
-		return;
-	}
-
-	const int MAX_NAMELEN = 1024;
-	IMAGEHLP_SYMBOL64* pSym = (IMAGEHLP_SYMBOL64 *) malloc(sizeof(IMAGEHLP_SYMBOL64) + MAX_NAMELEN);
-	memset(pSym, 0, sizeof(IMAGEHLP_SYMBOL64) + MAX_NAMELEN);
-	pSym->SizeOfStruct = sizeof(IMAGEHLP_SYMBOL64);
-	pSym->MaxNameLength = MAX_NAMELEN;
-
-	IMAGEHLP_LINE64 ilLine;
-	memset(&ilLine, 0, sizeof(ilLine));
-	ilLine.SizeOfStruct = sizeof(ilLine);
-
-	STACKFRAME64 sfStackFrame;
-	memset(&sfStackFrame, 0, sizeof(sfStackFrame));
-	DWORD imageType;
-#ifdef _M_IX86
-	imageType = IMAGE_FILE_MACHINE_I386;
-	sfStackFrame.AddrPC.Offset = pContext->Eip;
-	sfStackFrame.AddrPC.Mode = AddrModeFlat;
-	sfStackFrame.AddrFrame.Offset = pContext->Ebp;
-	sfStackFrame.AddrFrame.Mode = AddrModeFlat;
-	sfStackFrame.AddrStack.Offset = pContext->Esp;
-	sfStackFrame.AddrStack.Mode = AddrModeFlat;
-#elif _M_X64
-	imageType = IMAGE_FILE_MACHINE_AMD64;
-	sfStackFrame.AddrPC.Offset = pContext->Rip;
-	sfStackFrame.AddrPC.Mode = AddrModeFlat;
-	sfStackFrame.AddrFrame.Offset = pContext->Rsp;
-	sfStackFrame.AddrFrame.Mode = AddrModeFlat;
-	sfStackFrame.AddrStack.Offset = pContext->Rsp;
-	sfStackFrame.AddrStack.Mode = AddrModeFlat;
-#else
-	warn("Could not obtain detailed exception information: platform not supported");
-	return;
-#endif
-
-	for (int frameNum = 0; ; frameNum++)
-	{
-		if (frameNum > 1000)
-		{
-			warn("Endless stack, abort tracing");
-			return;
-		}
-
-		if (!StackWalk64(imageType, hProcess, hThread, &sfStackFrame, pContext, NULL, SymFunctionTableAccess64, SymGetModuleBase64, NULL))
-		{
-			warn("Could not obtain detailed exception information: StackWalk64 failed");
-			return;
-		}
-
-		DWORD64 dwAddr = sfStackFrame.AddrPC.Offset;
-		char szSymName[1024];
-		char szSrcFileName[1024];
-		int iLineNumber = 0;
-
-		DWORD64 dwSymbolDisplacement;
-		if (SymGetSymFromAddr64(hProcess, dwAddr, &dwSymbolDisplacement, pSym))
-		{
-			UnDecorateSymbolName(pSym->Name, szSymName, sizeof(szSymName), UNDNAME_COMPLETE);
-			szSymName[sizeof(szSymName) - 1] = '\0';
-		}
-		else
-		{
-			strncpy(szSymName, "<symbol not available>", sizeof(szSymName));
-		}
-
-		DWORD dwLineDisplacement;
-		if (SymGetLineFromAddr64(hProcess, dwAddr, &dwLineDisplacement, &ilLine))
-		{
-			iLineNumber = ilLine.LineNumber;
-			char* szUseFileName = ilLine.FileName;
-			char* szRoot = strstr(szUseFileName, "\\daemon\\");
-			if (szRoot)
-			{
-				szUseFileName = szRoot;
-			}
-			strncpy(szSrcFileName, szUseFileName, sizeof(szSrcFileName));
-			szSrcFileName[sizeof(szSrcFileName) - 1] = '\0';
-		}
-		else
-		{
-			strncpy(szSrcFileName, "<filename not available>", sizeof(szSymName));
-		}
-
-		info("%s (%i) : %s", szSrcFileName, iLineNumber, szSymName);
-
-		if (sfStackFrame.AddrReturn.Offset == 0)
-		{
-			break;
-		}
-	}
-}
-#endif
-
-LONG __stdcall ExceptionFilter(EXCEPTION_POINTERS* pExPtrs)
-{
-	error("Unhandled Exception: code: 0x%8.8X, flags: %d, address: 0x%8.8X",
-		pExPtrs->ExceptionRecord->ExceptionCode,
-		pExPtrs->ExceptionRecord->ExceptionFlags,
-		pExPtrs->ExceptionRecord->ExceptionAddress);
-
-#ifdef DEBUG
-	PrintBacktrace(pExPtrs->ContextRecord);
-#else
-	 info("Detailed exception information can be printed by debug version of NZBGet (available from download page)");
-#endif
-
-	ExitProcess(-1);
-	return EXCEPTION_CONTINUE_SEARCH;
-}
-
-void InstallErrorHandler()
-{
-	SetUnhandledExceptionFilter(ExceptionFilter);
-}
-
-#else
-
-#ifdef DEBUG
-typedef void(*sighandler)(int);
-std::vector<sighandler> SignalProcList;
-#endif
-
-#ifdef HAVE_SYS_PRCTL_H
-/**
-* activates the creation of core-files
-*/
-void EnableDumpCore()
-{
-	rlimit rlim;
-	rlim.rlim_cur= RLIM_INFINITY;
-	rlim.rlim_max= RLIM_INFINITY;
-	setrlimit(RLIMIT_CORE, &rlim);
-	prctl(PR_SET_DUMPABLE, 1);
-}
-#endif
-
-void PrintBacktrace()
-{
-#ifdef HAVE_BACKTRACE
-	printf("Segmentation fault, tracing...\n");
-	
-	void *array[100];
-	size_t size;
-	char **strings;
-	size_t i;
-
-	size = backtrace(array, 100);
-	strings = backtrace_symbols(array, size);
-
-	// first trace to screen
-	printf("Obtained %zd stack frames\n", size);
-	for (i = 0; i < size; i++)
-	{
-		printf("%s\n", strings[i]);
-	}
-
-	// then trace to log
-	error("Segmentation fault, tracing...");
-	error("Obtained %zd stack frames", size);
-	for (i = 0; i < size; i++)
-	{
-		error("%s", strings[i]);
-	}
-
-	free(strings);
-#else
-	error("Segmentation fault");
-#endif
-}
-
-/*
- * Signal handler
- */
-void SignalProc(int iSignal)
-{
-	switch (iSignal)
-	{
-		case SIGINT:
-			signal(SIGINT, SIG_DFL);   // Reset the signal handler
-			ExitProc();
-			break;
-
-		case SIGTERM:
-			signal(SIGTERM, SIG_DFL);   // Reset the signal handler
-			ExitProc();
-			break;
-
-		case SIGCHLD:
-			// ignoring
-			break;
-
-#ifdef DEBUG
-		case SIGSEGV:
-			signal(SIGSEGV, SIG_DFL);   // Reset the signal handler
-			PrintBacktrace();
-			break;
-#endif
-	}
-}
-
-void InstallErrorHandler()
-{
-#ifdef HAVE_SYS_PRCTL_H
-	if (g_pOptions->GetDumpCore())
-	{
-		EnableDumpCore();
-	}
-#endif
-
-	signal(SIGINT, SignalProc);
-	signal(SIGTERM, SignalProc);
-	signal(SIGPIPE, SIG_IGN);
-#ifdef DEBUG
-	signal(SIGSEGV, SignalProc);
-#endif
-#ifdef SIGCHLD_HANDLER
-    // it could be necessary on some systems to activate a handler for SIGCHLD
-    // however it make troubles on other systems and is deactivated by default
-	signal(SIGCHLD, SignalProc);
-#endif
-}
-
-#endif
-
-#ifdef DEBUG
-class SegFault
-{
-public:
-	void DoSegFault()
-	{
-		char* N = NULL;
-		strcpy(N, "");
-	}
-};
-
-void TestSegFault()
-{
-	SegFault s;
-	s.DoSegFault();
-}
-#endif
--- a/daemon/main/StackTrace.h
+++ b/daemon/main/StackTrace.h
@@ -1,35 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef STACKTRACE_H
-#define STACKTRACE_H
-
-void InstallErrorHandler();
-
-#ifdef DEBUG
-void TestSegFault();
-#endif
-
-#endif
--- a/daemon/main/nzbget.cpp
+++ b/daemon/main/nzbget.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -40,6 +40,7 @@
 #include <unistd.h>
 #include <pwd.h>
 #include <grp.h>
+#include <sys/resource.h>
 #ifdef HAVE_SYS_PRCTL_H
 #include <sys/prctl.h>
 #endif
@@ -52,6 +53,9 @@
 #ifndef DISABLE_PARCHECK
 #include <iostream>
 #endif
+#ifdef HAVE_BACKTRACE
+#include <execinfo.h>
+#endif

 #include "nzbget.h"
 #include "ServerPool.h"
@@ -75,15 +79,10 @@
 #include "Scanner.h"
 #include "FeedCoordinator.h"
 #include "Maintenance.h"
-#include "ArticleWriter.h"
 #include "StatMeter.h"
-#include "QueueScript.h"
 #include "Util.h"
-#include "StackTrace.h"
 #ifdef WIN32
 #include "NTService.h"
-#include "WinConsole.h"
-#include "WebDownloader.h"
 #endif

 // Prototypes
@@ -92,9 +91,16 @@ void Run(bool bReload);
 void Reload();
 void Cleanup();
 void ProcessClientRequest();
-void ProcessWebGet();
 #ifndef WIN32
+void InstallSignalHandlers();
 void Daemonize();
+void PrintBacktrace();
+#ifdef HAVE_SYS_PRCTL_H
+void EnableDumpCore();
+#endif
+#ifdef DEBUG
+void MakeSegFault();
+#endif
 #endif
 #ifndef DISABLE_PARCHECK
 void DisableCout();
@@ -117,15 +123,10 @@ Scheduler* g_pScheduler = NULL;
 Scanner* g_pScanner = NULL;
 FeedCoordinator* g_pFeedCoordinator = NULL;
 Maintenance* g_pMaintenance = NULL;
-ArticleCache* g_pArticleCache = NULL;
-QueueScriptCoordinator* g_pQueueScriptCoordinator = NULL;
 int g_iArgumentCount;
 char* (*g_szEnvironmentVariables)[] = NULL;
 char* (*g_szArguments)[] = NULL;
 bool g_bReloading = true;
-#ifdef WIN32
-WinConsole* g_pWinConsole = NULL;
-#endif

 /*
 * Main loop
@@ -136,7 +137,7 @@ int main(int argc, char *argv[], char *argp[])
 #ifdef _DEBUG
 	_CrtSetReportMode(_CRT_WARN, _CRTDBG_MODE_FILE | _CRTDBG_MODE_DEBUG);
 	_CrtSetReportFile(_CRT_WARN, _CRTDBG_FILE_STDERR);
-	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF
+	_CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF
 #ifdef DEBUG_CRTMEMLEAKS
 		| _CRTDBG_CHECK_CRT_DF | _CRTDBG_CHECK_ALWAYS_DF
 #endif
@@ -173,6 +174,12 @@ int main(int argc, char *argv[], char *argp[])

 	RunMain();

+#ifdef WIN32
+#ifdef _DEBUG
+	_CrtDumpMemoryLeaks();
+#endif
+#endif
+
 	return 0;
 }

@@ -206,11 +213,6 @@ void Run(bool bReload)
 		Thread::Init();
 	}

-#ifdef WIN32
-	g_pWinConsole = new WinConsole();
-	g_pWinConsole->InitAppMode();
-#endif
-
 	g_pServerPool = new ServerPool();
 	g_pScheduler = new Scheduler();
 	g_pQueueCoordinator = new QueueCoordinator();
@@ -221,13 +223,10 @@ void Run(bool bReload)
 	g_pDupeCoordinator = new DupeCoordinator();
 	g_pUrlCoordinator = new UrlCoordinator();
 	g_pFeedCoordinator = new FeedCoordinator();
-	g_pArticleCache = new ArticleCache();
 	g_pMaintenance = new Maintenance();
-	g_pQueueScriptCoordinator = new QueueScriptCoordinator();

 	debug("Reading options");
-	g_pOptions = new Options();
-	g_pOptions->Init(g_iArgumentCount, *g_szArguments);
+	g_pOptions = new Options(g_iArgumentCount, *g_szArguments);

 #ifndef WIN32
 	if (g_pOptions->GetUMask() < 01000)
@@ -237,9 +236,14 @@ void Run(bool bReload)
 	}
 #endif
 	
+	if (g_pOptions->GetServerMode() && g_pOptions->GetCreateLog() && g_pOptions->GetResetLog())
+	{
+		debug("Deleting old log-file");
+		g_pLog->ResetLog();
+	}
+
 	g_pLog->InitOptions();
 	g_pScanner->InitOptions();
-	g_pQueueScriptCoordinator->InitOptions();

 	if (g_pOptions->GetDaemonMode())
 	{
@@ -273,20 +277,24 @@ void Run(bool bReload)
 		g_pStatMeter->Init();
 	}

-	InstallErrorHandler();
+#ifndef WIN32
+#ifdef HAVE_SYS_PRCTL_H
+	if (g_pOptions->GetDumpCore())
+	{
+		EnableDumpCore();
+	}
+#endif
+#endif

+#ifndef WIN32
+	InstallSignalHandlers();
 #ifdef DEBUG
 	if (g_pOptions->GetTestBacktrace())
 	{
-		TestSegFault();
+		MakeSegFault();
 	}
 #endif
-
-	if (g_pOptions->GetWebGet())
-	{
-		ProcessWebGet();
-		return;
-	}
+#endif

 	// client request
 	if (g_pOptions->GetClientOperation() != Options::opClientNoOperation)
@@ -347,7 +355,7 @@ void Run(bool bReload)
 				abort("FATAL ERROR: Parsing NZB-document %s failed\n\n", g_pOptions->GetArgFilename() ? g_pOptions->GetArgFilename() : "N/A");
 				return;
 			}
-			g_pScanner->InitPPParameters(szCategory, pNZBFile->GetNZBInfo()->GetParameters(), false);
+			g_pScanner->InitPPParameters(szCategory, pNZBFile->GetNZBInfo()->GetParameters());
 			g_pQueueCoordinator->AddNZBFileToQueue(pNZBFile, NULL, false);
 			delete pNZBFile;
 		}
@@ -357,27 +365,16 @@ void Run(bool bReload)
 			g_pDiskState = new DiskState();
 		}

-#ifdef WIN32
-		g_pWinConsole->Start();
-#endif
 		g_pQueueCoordinator->Start();
 		g_pUrlCoordinator->Start();
 		g_pPrePostProcessor->Start();
 		g_pFeedCoordinator->Start();
-		if (g_pOptions->GetArticleCache() > 0)
-		{
-			g_pArticleCache->Start();
-		}

 		// enter main program-loop
 		while (g_pQueueCoordinator->IsRunning() || 
 			g_pUrlCoordinator->IsRunning() || 
 			g_pPrePostProcessor->IsRunning() ||
-			g_pFeedCoordinator->IsRunning() ||
-#ifdef WIN32
-			g_pWinConsole->IsRunning() ||
-#endif
-			g_pArticleCache->IsRunning())
+			g_pFeedCoordinator->IsRunning())
 		{
 			if (!g_pOptions->GetServerMode() && 
 				!g_pQueueCoordinator->HasMoreJobs() && 
@@ -401,10 +398,6 @@ void Run(bool bReload)
 				{
 					g_pFeedCoordinator->Stop();
 				}
-				if (!g_pArticleCache->IsStopped())
-				{
-					g_pArticleCache->Stop();
-				}
 			}
 			usleep(100 * 1000);
 		}
@@ -414,11 +407,8 @@ void Run(bool bReload)
 		debug("UrlCoordinator stopped");
 		debug("PrePostProcessor stopped");
 		debug("FeedCoordinator stopped");
-		debug("ArticleCache stopped");
 	}

-	ScriptController::TerminateAll();
-
 	// Stop network-server
 	if (g_pRemoteServer)
 	{
@@ -528,9 +518,7 @@ void ProcessClientRequest()
 			break;

 		case Options::opClientRequestDownload:
-			Client->RequestServerDownload(g_pOptions->GetAddNZBFilename(), g_pOptions->GetArgFilename(),
-				g_pOptions->GetAddCategory(), g_pOptions->GetAddTop(), g_pOptions->GetAddPaused(), g_pOptions->GetAddPriority(),
-				g_pOptions->GetAddDupeKey(), g_pOptions->GetAddDupeMode(), g_pOptions->GetAddDupeScore());
+			Client->RequestServerDownload(g_pOptions->GetArgFilename(), g_pOptions->GetAddCategory(), g_pOptions->GetAddTop(), g_pOptions->GetAddPaused(), g_pOptions->GetAddPriority());
 			break;

 		case Options::opClientRequestVersion:
@@ -569,9 +557,12 @@ void ProcessClientRequest()
 			Client->RequestServerPauseUnpause(false, eRemotePauseUnpauseActionScan);
 			break;

-		case Options::opClientRequestHistory:
-		case Options::opClientRequestHistoryAll:
-			Client->RequestHistory(g_pOptions->GetClientOperation() == Options::opClientRequestHistoryAll);
+		case Options::opClientRequestHistory:	 
+			Client->RequestHistory();	 
+			break;
+
+		case Options::opClientRequestDownloadUrl:
+			Client->RequestServerDownloadUrl(g_pOptions->GetLastArg(), g_pOptions->GetAddNZBFilename(), g_pOptions->GetAddCategory(), g_pOptions->GetAddTop(), g_pOptions->GetAddPaused(), g_pOptions->GetAddPriority());
 			break;

 		case Options::opClientNoOperation:
@@ -581,27 +572,6 @@ void ProcessClientRequest()
 	delete Client;
 }

-void ProcessWebGet()
-{
-	WebDownloader downloader;
-	downloader.SetURL(g_pOptions->GetLastArg());
-	downloader.SetForce(true);
-	downloader.SetRetry(false);
-	downloader.SetOutputFilename(g_pOptions->GetWebGetFilename());
-	downloader.SetInfoName("WebGet");
-
-	int iRedirects = 0;
-	WebDownloader::EStatus eStatus = WebDownloader::adRedirect;
-	while (eStatus == WebDownloader::adRedirect && iRedirects < 5)
-	{
-		iRedirects++;
-		eStatus = downloader.Download();
-	}
-	bool bOK = eStatus == WebDownloader::adFinished;
-
-	exit(bOK ? 0 : 1);
-}
-
 void ExitProc()
 {
 	if (!g_bReloading)
@@ -625,10 +595,6 @@ void ExitProc()
 			g_pUrlCoordinator->Stop();
 			g_pPrePostProcessor->Stop();
 			g_pFeedCoordinator->Stop();
-			g_pArticleCache->Stop();
-#ifdef WIN32
-			g_pWinConsole->Stop();
-#endif
 		}
 	}
 }
@@ -640,6 +606,114 @@ void Reload()
 	ExitProc();
 }

+#ifndef WIN32
+#ifdef DEBUG
+typedef void(*sighandler)(int);
+std::vector<sighandler> SignalProcList;
+#endif
+
+/*
+ * Signal handler
+ */
+void SignalProc(int iSignal)
+{
+	switch (iSignal)
+	{
+		case SIGINT:
+			signal(SIGINT, SIG_DFL);   // Reset the signal handler
+			ExitProc();
+			break;
+
+		case SIGTERM:
+			signal(SIGTERM, SIG_DFL);   // Reset the signal handler
+			ExitProc();
+			break;
+
+		case SIGCHLD:
+			// ignoring
+			break;
+
+#ifdef DEBUG
+		case SIGSEGV:
+			signal(SIGSEGV, SIG_DFL);   // Reset the signal handler
+			PrintBacktrace();
+			break;
+#endif
+	}
+}
+
+void InstallSignalHandlers()
+{
+	signal(SIGINT, SignalProc);
+	signal(SIGTERM, SignalProc);
+	signal(SIGPIPE, SIG_IGN);
+#ifdef DEBUG
+	signal(SIGSEGV, SignalProc);
+#endif
+#ifdef SIGCHLD_HANDLER
+    // it could be necessary on some systems to activate a handler for SIGCHLD
+    // however it make troubles on other systems and is deactivated by default
+	signal(SIGCHLD, SignalProc);
+#endif
+}
+
+void PrintBacktrace()
+{
+#ifdef HAVE_BACKTRACE
+	printf("Segmentation fault, tracing...\n");
+	
+	void *array[100];
+	size_t size;
+	char **strings;
+	size_t i;
+
+	size = backtrace(array, 100);
+	strings = backtrace_symbols(array, size);
+
+	// first trace to screen
+	printf("Obtained %zd stack frames\n", size);
+	for (i = 0; i < size; i++)
+	{
+		printf("%s\n", strings[i]);
+	}
+
+	// then trace to log
+	error("Segmentation fault, tracing...");
+	error("Obtained %zd stack frames", size);
+	for (i = 0; i < size; i++)
+	{
+		error("%s", strings[i]);
+	}
+
+	free(strings);
+#else
+	error("Segmentation fault");
+#endif
+}
+
+#ifdef DEBUG
+void MakeSegFault()
+{
+	char* N = NULL;
+	strcpy(N, "");
+}
+#endif
+
+#ifdef HAVE_SYS_PRCTL_H
+/**
+* activates the creation of core-files
+*/
+void EnableDumpCore()
+{
+	rlimit rlim;
+	rlim.rlim_cur= RLIM_INFINITY;
+	rlim.rlim_max= RLIM_INFINITY;
+	setrlimit(RLIMIT_CORE, &rlim);
+	prctl(PR_SET_DUMPABLE, 1);
+}
+#endif
+#endif
+
 void Cleanup()
 {
 	debug("Cleaning up global objects");
@@ -719,16 +793,6 @@ void Cleanup()
 	g_pFeedCoordinator = NULL;
 	debug("FeedCoordinator deleted");

-	debug("Deleting ArticleCache");
-	delete g_pArticleCache;
-	g_pArticleCache = NULL;
-	debug("ArticleCache deleted");
-
-	debug("Deleting QueueScriptCoordinator");
-	delete g_pQueueScriptCoordinator;
-	g_pQueueScriptCoordinator = NULL;
-	debug("QueueScriptCoordinator deleted");
-
 	debug("Deleting Maintenance");
 	delete g_pMaintenance;
 	g_pMaintenance = NULL;
@@ -745,11 +809,6 @@ void Cleanup()
 		Thread::Final();
 	}

-#ifdef WIN32
-	delete g_pWinConsole;
-	g_pWinConsole = NULL;
-#endif
-
 	debug("Global objects cleaned up");

 	delete g_pLog;
@@ -759,76 +818,42 @@ void Cleanup()
 #ifndef WIN32
 void Daemonize()
 {
-	int f = fork();
-	if (f < 0) exit(1); /* fork error */
-	if (f > 0) exit(0); /* parent exits */
-
+	int i, lfp;
+	char str[10];
+	if (getppid() == 1) return; /* already a daemon */
+	i = fork();
+	if (i < 0) exit(1); /* fork error */
+	if (i > 0) exit(0); /* parent exits */
 	/* child (daemon) continues */
-
-	// obtain a new process group
-	setsid();
-
-	// close all descriptors
-	for (int i = getdtablesize(); i >= 0; --i)
-	{
-		close(i);
-	}
-
-	// handle standart I/O
-	int d = open("/dev/null", O_RDWR);
-	dup(d);
-	dup(d);
-
-	// change running directory
-	chdir(g_pOptions->GetDestDir());
-
-	// set up lock-file
-	int lfp = -1;
-	if (!Util::EmptyStr(g_pOptions->GetLockFile()))
-	{
-		lfp = open(g_pOptions->GetLockFile(), O_RDWR | O_CREAT, 0640);
-		if (lfp < 0)
-		{
-			error("Starting daemon failed: could not create lock-file %s", g_pOptions->GetLockFile());
-			exit(1);
-		}
-		if (lockf(lfp, F_TLOCK, 0) < 0)
-		{
-			error("Starting daemon failed: could not acquire lock on lock-file %s", g_pOptions->GetLockFile());
-			exit(1);
-		}
-	}
+	setsid(); /* obtain a new process group */
+	for (i = getdtablesize();i >= 0;--i) close(i); /* close all descriptors */
+	i = open("/dev/null", O_RDWR); dup(i); dup(i); /* handle standart I/O */
+	chdir(g_pOptions->GetDestDir()); /* change running directory */
+	lfp = open(g_pOptions->GetLockFile(), O_RDWR | O_CREAT, 0640);
+	if (lfp < 0) exit(1); /* can not open */
+	if (lockf(lfp, F_TLOCK, 0) < 0) exit(0); /* can not lock */

 	/* Drop user if there is one, and we were run as root */
-	if (getuid() == 0 || geteuid() == 0)
+	if ( getuid() == 0 || geteuid() == 0 )
 	{
 		struct passwd *pw = getpwnam(g_pOptions->GetDaemonUsername());
 		if (pw)
 		{
-			// Change owner of lock file
-			fchown(lfp, pw->pw_uid, pw->pw_gid);
-			// Set aux groups to null.
-			setgroups(0, (const gid_t*)0);
-			// Set primary group.
-			setgid(pw->pw_gid);
-			// Try setting aux groups correctly - not critical if this fails.
-			initgroups(g_pOptions->GetDaemonUsername(), pw->pw_gid);
-			// Finally, set uid.
+			fchown(lfp, pw->pw_uid, pw->pw_gid); /* change owner of lock file  */
+			setgroups( 0, (const gid_t*) 0 ); /* Set aux groups to null. */
+			setgid(pw->pw_gid); /* Set primary group. */
+			/* Try setting aux groups correctly - not critical if this fails. */
+			initgroups( g_pOptions->GetDaemonUsername(),pw->pw_gid); 
+			/* Finally, set uid. */
 			setuid(pw->pw_uid);
 		}
 	}

-	// record pid to lockfile
-	if (lfp > -1)
-	{
-		char str[10];
-		sprintf(str, "%d\n", getpid());
-		write(lfp, str, strlen(str));
-	}
-
-	// ignore unwanted signals
-	signal(SIGCHLD, SIG_IGN);
-	signal(SIGTSTP, SIG_IGN);
+	/* first instance continues */
+	sprintf(str, "%d\n", getpid());
+	write(lfp, str, strlen(str)); /* record pid to lockfile */
+	signal(SIGCHLD, SIG_IGN); /* ignore child */
+	signal(SIGTSTP, SIG_IGN); /* ignore tty signals */
 	signal(SIGTTOU, SIG_IGN);
 	signal(SIGTTIN, SIG_IGN);
 }
--- a/daemon/main/nzbget.h
+++ b/daemon/main/nzbget.h
@@ -50,6 +50,7 @@
 #define	S_ISREG(mode)	 __S_ISTYPE((mode), _S_IFREG)
 #define	S_DIRMODE NULL
 #define usleep(usec) Sleep((usec) / 1000)
+#define gettimeofday(tm, ignore) _ftime(tm)
 #define socklen_t int
 #define SHUT_WR 0x01
 #define SHUT_RDWR 0x02
@@ -58,8 +59,6 @@
 #define LINE_ENDING "\r\n"
 #define pid_t int
 #define atoll _atoi64
-#define fseek _fseeki64
-#define ftell _ftelli64
 #ifndef FSCTL_SET_SPARSE
 #define FSCTL_SET_SPARSE 590020
 #endif
@@ -70,11 +69,6 @@
 #define FOPEN_AB "abN"
 #define FOPEN_ABP "ab+N"

-#ifdef DEBUG
-// redefine "exit" to avoid printing memory leaks report when terminated because of wrong command line switches
-#define exit(code) ExitProcess(code)
-#endif
-
 #pragma warning(disable:4800) // 'type' : forcing value to bool 'true' or 'false' (performance warning)
 #pragma warning(disable:4267) // 'var' : conversion from 'size_t' to 'type', possible loss of data

--- a/daemon/nntp/ArticleDownloader.cpp
+++ b/daemon/nntp/ArticleDownloader.cpp
--- a/daemon/nntp/ArticleDownloader.h
+++ b/daemon/nntp/ArticleDownloader.h
@@ -34,7 +34,6 @@
 #include "Thread.h"
 #include "NNTPConnection.h"
 #include "Decoder.h"
-#include "ArticleWriter.h"

 class ArticleDownloader : public Thread, public Subject
 {
@@ -48,20 +47,13 @@ public:
 		adFailed,
 		adRetry,
 		adCrcError,
+		adDecoding,
+		adJoining,
+		adJoined,
 		adNotFound,
 		adConnectError,
 		adFatalError
 	};
-
-	class ArticleWriterImpl : public ArticleWriter
-	{
-	private:
-		 ArticleDownloader*		m_pOwner;
-	protected:
-		virtual void	SetLastUpdateTimeNow() { m_pOwner->SetLastUpdateTimeNow(); } 
-	public:
-		void			SetOwner(ArticleDownloader* pOwner) { m_pOwner = pOwner; }
-	};
 			
 private:
 	FileInfo*			m_pFileInfo;
@@ -69,25 +61,31 @@ private:
 	NNTPConnection* 	m_pConnection;
 	EStatus				m_eStatus;
 	Mutex			 	m_mutexConnection;
-	char*				m_szInfoName;
-	char				m_szConnectionName[250];
+	const char*			m_szResultFilename;
+	char*				m_szTempFilename;
 	char*				m_szArticleFilename;
+	char*				m_szInfoName;
+	char*				m_szOutputFilename;
 	time_t				m_tLastUpdateTime;
 	Decoder::EFormat	m_eFormat;
 	YDecoder			m_YDecoder;
 	UDecoder			m_UDecoder;
-	ArticleWriterImpl	m_ArticleWriter;
+	FILE*				m_pOutFile;
+	bool				m_bDuplicate;
 	ServerStatList		m_ServerStats;
-	bool				m_bWritingStarted;
-	int					m_iDownloadedSize;

 	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; }
-	bool				Write(char* szLine, int iLen);
-	void				AddServerData();
+	const char* 		GetTempFilename() { return m_szTempFilename; }
+	void 				SetTempFilename(const char* v);
+	void 				SetOutputFilename(const char* v);

 public:
 						ArticleDownloader();
@@ -104,12 +102,11 @@ public:
 	time_t				GetLastUpdateTime() { return m_tLastUpdateTime; }
 	void				SetLastUpdateTimeNow() { m_tLastUpdateTime = ::time(NULL); }
 	const char* 		GetArticleFilename() { return m_szArticleFilename; }
-	void				SetInfoName(const char* szInfoName);
+	void				SetInfoName(const char* v);
 	const char*			GetInfoName() { return m_szInfoName; }
-	const char*			GetConnectionName() { return m_szConnectionName; }
+	void				CompleteFileParts();
+	static bool			MoveCompletedFiles(NZBInfo* pNZBInfo, const char* szOldDestDir);
 	void				SetConnection(NNTPConnection* pConnection) { m_pConnection = pConnection; }
-	void				CompleteFileParts() { m_ArticleWriter.CompleteFileParts(); }
-	int					GetDownloadedSize() { return m_iDownloadedSize; }

 	void				LogDebugInfo();
 };
--- a/daemon/nntp/ArticleWriter.cpp
+++ b/daemon/nntp/ArticleWriter.cpp
--- a/daemon/nntp/ArticleWriter.h
+++ b/daemon/nntp/ArticleWriter.h
@@ -1,102 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef ARTICLEWRITER_H
-#define ARTICLEWRITER_H
-
-#include "DownloadInfo.h"
-#include "Decoder.h"
-
-class ArticleWriter
-{
-private:
-	FileInfo*			m_pFileInfo;
-	ArticleInfo*		m_pArticleInfo;
-	FILE*				m_pOutFile;
-	char*				m_szTempFilename;
-	char*				m_szOutputFilename;
-	const char*			m_szResultFilename;
-	Decoder::EFormat	m_eFormat;
-	char*				m_pArticleData;
-	long long			m_iArticleOffset;
-	int					m_iArticleSize;
-	int					m_iArticlePtr;
-	bool				m_bFlushing;
-	bool				m_bDuplicate;
-	char*				m_szInfoName;
-
-	bool				PrepareFile(char* szLine);
-	bool				CreateOutputFile(long long iSize);
-	void				BuildOutputFilename();
-	bool				IsFileCached();
-	void				SetWriteBuffer(FILE* pOutFile, int iRecSize);
-
-protected:
-	virtual void		SetLastUpdateTimeNow() {}
-
-public:
-						ArticleWriter();
-						~ArticleWriter();
-	void				SetInfoName(const char* szInfoName);
-	void				SetFileInfo(FileInfo* pFileInfo) { m_pFileInfo = pFileInfo; }
-	void				SetArticleInfo(ArticleInfo* pArticleInfo) { m_pArticleInfo = pArticleInfo; }
-	void				Prepare();
-	bool				Start(Decoder::EFormat eFormat, const char* szFilename, long long iFileSize, long long iArticleOffset, int iArticleSize);
-	bool				Write(char* szBufffer, int iLen);
-	void				Finish(bool bSuccess);
-	bool				GetDuplicate() { return m_bDuplicate; }
-	void				CompleteFileParts();
-	static bool			MoveCompletedFiles(NZBInfo* pNZBInfo, const char* szOldDestDir);
-	void				FlushCache();
-};
-
-class ArticleCache : public Thread
-{
-private:
-	size_t				m_iAllocated;
-	bool				m_bFlushing;
-	Mutex				m_mutexAlloc;
-	Mutex				m_mutexFlush;
-	Mutex				m_mutexContent;
-	FileInfo*			m_pFileInfo;
-
-	bool				CheckFlush(bool bFlushEverything);
-
-public:
-						ArticleCache();
-	virtual void		Run();
-	void*				Alloc(int iSize);
-	void*				Realloc(void* buf, int iOldSize, int iNewSize);
-	void				Free(int iSize);
-	void				LockFlush();
-	void				UnlockFlush();
-	void				LockContent() { m_mutexContent.Lock(); }
-	void				UnlockContent() { m_mutexContent.Unlock(); }
-	bool				GetFlushing() { return m_bFlushing; }
-	size_t				GetAllocated() { return m_iAllocated; }
-	bool				FileBusy(FileInfo* pFileInfo) { return pFileInfo == m_pFileInfo; }
-};
-
-#endif
--- a/daemon/nntp/Decoder.cpp
+++ b/daemon/nntp/Decoder.cpp
@@ -1,7 +1,8 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004  Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -44,11 +45,14 @@
 #include "Util.h"

 const char* Decoder::FormatNames[] = { "Unknown", "yEnc", "UU" };
+unsigned int YDecoder::crc_tab[256];

 Decoder::Decoder()
 {
 	debug("Creating Decoder");

+	m_szSrcFilename		= NULL;
+	m_szDestFilename	= NULL;
 	m_szArticleFilename	= NULL;
 }

@@ -103,6 +107,17 @@ Decoder::EFormat Decoder::DetectFormat(const char* buffer, int len)
  * YDecoder: fast implementation of yEnc-Decoder
  */

+void YDecoder::Init()
+{
+	debug("Initializing global decoder");
+	crc32gentab();
+}
+
+void YDecoder::Final()
+{
+	debug("Finalizing global Decoder");
+}
+
 YDecoder::YDecoder()
 {
 	Clear();
@@ -120,13 +135,69 @@ void YDecoder::Clear()
 	m_lExpectedCRC = 0;
 	m_lCalculatedCRC = 0xFFFFFFFF;
 	m_iBegin = 0;
-	m_iEnd = 0;
+	m_iEnd = 0xFFFFFFFF;
 	m_iSize = 0;
 	m_iEndSize = 0;
+	m_bAutoSeek = false;
+	m_bNeedSetPos = false;
 	m_bCrcCheck = false;
 }

-int YDecoder::DecodeBuffer(char* buffer, int len)
+/* from crc32.c (http://www.koders.com/c/fid699AFE0A656F0022C9D6B9D1743E697B69CE5815.aspx)
+ *
+ * (c) 1999,2000 Krzysztof Dabrowski
+ * (c) 1999,2000 ElysiuM deeZine
+ * Released under GPL (thanks)
+ *
+ * chksum_crc32gentab() --      to a global crc_tab[256], this one will
+ *				calculate the crcTable for crc32-checksums.
+ *				it is generated to the polynom [..]
+ */
+void YDecoder::crc32gentab()
+{
+	unsigned long crc, poly;
+	int i, j;
+
+	poly = 0xEDB88320L;
+	for (i = 0; i < 256; i++)
+	{
+		crc = i;
+		for (j = 8; j > 0; j--)
+		{
+			if (crc & 1)
+			{
+				crc = (crc >> 1) ^ poly;
+			}
+			else
+			{
+				crc >>= 1;
+			}
+		}
+		crc_tab[i] = crc;
+	}
+}
+
+/* This is modified version of chksum_crc() from
+ * crc32.c (http://www.koders.com/c/fid699AFE0A656F0022C9D6B9D1743E697B69CE5815.aspx)
+ * (c) 1999,2000 Krzysztof Dabrowski
+ * (c) 1999,2000 ElysiuM deeZine
+ *
+ * chksum_crc() -- to a given block, this one calculates the
+ *				crc32-checksum until the length is
+ *				reached. the crc32-checksum will be
+ *				the result.
+ */
+unsigned long YDecoder::crc32m(unsigned long startCrc, unsigned char *block, unsigned int length)
+{
+	register unsigned long crc = startCrc;
+	for (unsigned long i = 0; i < length; i++)
+	{
+		crc = ((crc >> 8) & 0x00FFFFFF) ^ crc_tab[(crc ^ *block++) & 0xFF];
+	}
+	return crc;
+}
+
+unsigned int YDecoder::DecodeBuffer(char* buffer)
 {
 	if (m_bBody && !m_bEnd)
 	{
@@ -144,7 +215,7 @@ int YDecoder::DecodeBuffer(char* buffer, int len)
 			if (pb) 
 			{
 				pb += 6; //=strlen(" size=")
-				m_iEndSize = (long long)atoll(pb);
+				m_iEndSize = (int)atoi(pb);
 			}
 			return 0;
 		}
@@ -176,9 +247,9 @@ BreakLoop:

 		if (m_bCrcCheck)
 		{
-			m_lCalculatedCRC = Util::Crc32m(m_lCalculatedCRC, (unsigned char *)buffer, (unsigned int)(optr - buffer));
+			m_lCalculatedCRC = crc32m(m_lCalculatedCRC, (unsigned char *)buffer, (unsigned int)(optr - buffer));
 		}
-		return optr - buffer;
+		return (unsigned int)(optr - buffer);
 	}
 	else 
 	{
@@ -200,7 +271,7 @@ BreakLoop:
 			if (pb) 
 			{
 				pb += 6; //=strlen(" size=")
-				m_iSize = (long long)atoll(pb);
+				m_iSize = (int)atoi(pb);
 			}
 			m_bPart = strstr(buffer, " part=");
 			if (!m_bPart)
@@ -218,13 +289,13 @@ BreakLoop:
 			if (pb) 
 			{
 				pb += 7; //=strlen(" begin=")
-				m_iBegin = (long long)atoll(pb);
+				m_iBegin = (int)atoi(pb);
 			}
 			pb = strstr(buffer, " end=");
 			if (pb) 
 			{
 				pb += 5; //=strlen(" end=")
-				m_iEnd = (long long)atoll(pb);
+				m_iEnd = (int)atoi(pb);
 			}
 		}
 	}
@@ -232,6 +303,28 @@ BreakLoop:
 	return 0;
 }

+bool YDecoder::Write(char* buffer, int len, FILE* outfile)
+{
+	unsigned int wcnt = DecodeBuffer(buffer);
+	if (wcnt > 0)
+	{
+		if (m_bNeedSetPos)
+		{
+			if (m_iBegin == 0 || m_iEnd == 0xFFFFFFFF || !outfile)
+			{
+				return false;
+			}
+			if (fseek(outfile, m_iBegin - 1, SEEK_SET))
+			{
+				return false;
+			}
+			m_bNeedSetPos = false;
+		}
+		fwrite(buffer, 1, wcnt, outfile);
+	}
+	return true;
+}
+
 Decoder::EStatus YDecoder::Check()
 {
 	m_lCalculatedCRC ^= 0xFFFFFFFF;
@@ -286,7 +379,7 @@ void UDecoder::Clear()

 #define UU_DECODE_CHAR(c) (c == '`' ? 0 : (((c) - ' ') & 077))

-int UDecoder::DecodeBuffer(char* buffer, int len)
+unsigned int UDecoder::DecodeBuffer(char* buffer, int len)
 {
 	if (!m_bBody)
 	{
@@ -353,12 +446,22 @@ int UDecoder::DecodeBuffer(char* buffer, int len)
 			}
 		}

-		return optr - buffer;
+		return (unsigned int)(optr - buffer);
 	}

 	return 0;
 }

+bool UDecoder::Write(char* buffer, int len, FILE* outfile)
+{
+	unsigned int wcnt = DecodeBuffer(buffer, len);
+	if (wcnt > 0)
+	{
+		fwrite(buffer, 1, wcnt, outfile);
+	}
+	return true;
+}
+
 Decoder::EStatus UDecoder::Check()
 {
 	if (!m_bBody)
--- a/daemon/nntp/Decoder.h
+++ b/daemon/nntp/Decoder.h
@@ -1,7 +1,8 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -49,6 +50,8 @@ public:
 	static const char* FormatNames[];

 protected:
+	const char*				m_szSrcFilename;
+	const char*				m_szDestFilename;
 	char*					m_szArticleFilename;

 public:
@@ -56,7 +59,9 @@ public:
 	virtual					~Decoder();
 	virtual EStatus			Check() = 0;
 	virtual void			Clear();
-	virtual int				DecodeBuffer(char* buffer, int len) = 0;
+	virtual bool			Write(char* buffer, int len, FILE* outfile) = 0;
+	void					SetSrcFilename(const char* szSrcFilename) { m_szSrcFilename = szSrcFilename; }
+	void					SetDestFilename(const char* szDestFilename) { m_szDestFilename = szDestFilename; }
 	const char*				GetArticleFilename() { return m_szArticleFilename; }
 	static EFormat			DetectFormat(const char* buffer, int len);
 };
@@ -64,6 +69,7 @@ public:
 class YDecoder: public Decoder
 {
 protected:
+	static unsigned int		crc_tab[256];
 	bool					m_bBegin;
 	bool					m_bPart;
 	bool					m_bBody;
@@ -71,23 +77,28 @@ protected:
 	bool					m_bCrc;
 	unsigned long			m_lExpectedCRC;
 	unsigned long			m_lCalculatedCRC;
-	long long				m_iBegin;
-	long long				m_iEnd;
-	long long				m_iSize;
-	long long				m_iEndSize;
+	unsigned long			m_iBegin;
+	unsigned long			m_iEnd;
+	unsigned long			m_iSize;
+	unsigned long			m_iEndSize;
+	bool					m_bAutoSeek;
+	bool					m_bNeedSetPos;
 	bool					m_bCrcCheck;

+	unsigned int			DecodeBuffer(char* buffer);
+	static void				crc32gentab();
+	unsigned long			crc32m(unsigned long startCrc, unsigned char *block, unsigned int length);
+
 public:
 							YDecoder();
 	virtual EStatus			Check();
 	virtual void			Clear();
-	virtual int				DecodeBuffer(char* buffer, int len);
+	virtual bool			Write(char* buffer, int len, FILE* outfile);
+	void					SetAutoSeek(bool bAutoSeek) { m_bAutoSeek = m_bNeedSetPos = bAutoSeek; }
 	void					SetCrcCheck(bool bCrcCheck) { m_bCrcCheck = bCrcCheck; }
-	long long				GetBegin() { return m_iBegin; }
-	long long				GetEnd() { return m_iEnd; }
-	long long				GetSize() { return m_iSize; }
-	unsigned long			GetExpectedCrc() { return m_lExpectedCRC; }
-	unsigned long			GetCalculatedCrc() { return m_lCalculatedCRC; }
+
+	static void				Init();
+	static void				Final();
 };

 class UDecoder: public Decoder
@@ -96,11 +107,13 @@ private:
 	bool					m_bBody;
 	bool					m_bEnd;

+	unsigned int			DecodeBuffer(char* buffer, int len);
+
 public:
 							UDecoder();
 	virtual EStatus			Check();
 	virtual void			Clear();
-	virtual int				DecodeBuffer(char* buffer, int len);
+	virtual bool			Write(char* buffer, int len, FILE* outfile);
 };

 #endif
--- a/daemon/nntp/NNTPConnection.cpp
+++ b/daemon/nntp/NNTPConnection.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-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
@@ -99,8 +99,8 @@ bool NNTPConnection::Authenticate()
 {
 	if (strlen(m_pNewsServer->GetUser()) == 0 || strlen(m_pNewsServer->GetPassword()) == 0)
 	{
-		ReportError("Could not connect to %s: server requested authorization but username/password are not set in settings",
-			m_pNewsServer->GetHost(), false, 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;
 	}
@@ -125,7 +125,7 @@ bool NNTPConnection::AuthInfoUser(int iRecur)
 	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 	if (!answer)
 	{
-		ReportErrorAnswer("Authorization for %s (%s) failed: Connection closed by remote host", NULL);
+		ReportErrorAnswer("Authorization for server%i (%s) failed: Connection closed by remote host", NULL);
 		return false;
 	}

@@ -147,7 +147,7 @@ bool NNTPConnection::AuthInfoUser(int iRecur)

 	if (GetStatus() != csCancelled)
 	{
-		ReportErrorAnswer("Authorization for %s (%s) failed: %s", answer);
+		ReportErrorAnswer("Authorization for server%i (%s) failed (Answer: %s)", answer);
 	}
 	return false;
 }
@@ -168,7 +168,7 @@ bool NNTPConnection::AuthInfoPass(int iRecur)
 	char* answer = ReadLine(m_szLineBuf, CONNECTION_LINEBUFFER_SIZE, NULL);
 	if (!answer)
 	{
-		ReportErrorAnswer("Authorization failed for %s (%s): Connection closed by remote host", NULL);
+		ReportErrorAnswer("Authorization for server%i (%s) failed: Connection closed by remote host", NULL);
 		return false;
 	}
 	else if (!strncmp(answer, "2", 1))
@@ -185,7 +185,7 @@ bool NNTPConnection::AuthInfoPass(int iRecur)

 	if (GetStatus() != csCancelled)
 	{
-		ReportErrorAnswer("Authorization for %s (%s) failed: %s", answer);
+		ReportErrorAnswer("Authorization for server%i (%s) failed (Answer: %s)", answer);
 	}
 	return false;
 }
@@ -237,14 +237,14 @@ bool NNTPConnection::Connect()

 	if (!answer)
 	{
-		ReportErrorAnswer("Connection to %s (%s) failed: Connection closed by remote host", NULL);
+		ReportErrorAnswer("Connection to server%i (%s) failed: Connection closed by remote host", NULL);
 		Disconnect();
 		return false;
 	}

 	if (strncmp(answer, "2", 1))
 	{
-		ReportErrorAnswer("Connection to %s (%s) failed: %s", answer);
+		ReportErrorAnswer("Connection to server%i (%s) failed (Answer: %s)", answer);
 		Disconnect();
 		return false;
 	}
@@ -264,10 +264,7 @@ bool NNTPConnection::Disconnect()
 {
 	if (m_eStatus == csConnected)
 	{
-		if (!m_bBroken)
-		{
-			Request("quit\r\n");
-		}
+		Request("quit\r\n");
 		free(m_szActiveGroup);
 		m_szActiveGroup = NULL;
 	}
@@ -277,7 +274,7 @@ bool NNTPConnection::Disconnect()
 void NNTPConnection::ReportErrorAnswer(const char* szMsgPrefix, const char* szAnswer)
 {
 	char szErrStr[1024];
-	snprintf(szErrStr, 1024, szMsgPrefix, m_pNewsServer->GetName(), m_pNewsServer->GetHost(), szAnswer);
+	snprintf(szErrStr, 1024, szMsgPrefix, m_pNewsServer->GetID(), m_pNewsServer->GetHost(), szAnswer);
 	szErrStr[1024-1] = '\0';
 	
 	ReportError(szErrStr, NULL, false, 0);
--- a/daemon/nntp/NNTPConnection.h
+++ b/daemon/nntp/NNTPConnection.h
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2008 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -53,7 +53,6 @@ public:
 	const char* 		Request(const char* req);
 	const char*			JoinGroup(const char* grp);
 	bool				GetAuthError() { return m_bAuthError; }
-
 };

 #endif
--- a/daemon/nntp/NewsServer.cpp
+++ b/daemon/nntp/NewsServer.cpp
@@ -2,7 +2,7 @@
 *  This file if part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-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
@@ -41,7 +41,7 @@

 NewsServer::NewsServer(int iID, bool bActive, const char* szName, const char* szHost, int iPort,
 	const char* szUser, const char* szPass, bool bJoinGroup, bool bTLS,
-	const char* szCipher, int iMaxConnections, int iRetention, int iLevel, int iGroup)
+	const char* szCipher, int iMaxConnections, int iLevel, int iGroup)
 {
 	m_iID = iID;
 	m_iStateID = 0;
@@ -57,8 +57,6 @@ NewsServer::NewsServer(int iID, bool bActive, const char* szName, const char* sz
 	m_szUser = strdup(szUser ? szUser : "");
 	m_szPassword = strdup(szPass ? szPass : "");
 	m_szCipher = strdup(szCipher ? szCipher : "");
-	m_iRetention = iRetention;
-	m_tBlockTime = 0;

 	if (szName && strlen(szName) > 0)
 	{
--- a/daemon/nntp/NewsServer.h
+++ b/daemon/nntp/NewsServer.h
@@ -2,7 +2,7 @@
 *  This file if part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-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
@@ -28,7 +28,6 @@
 #define NEWSSERVER_H

 #include <vector>
-#include <time.h>

 class NewsServer
 {
@@ -48,14 +47,11 @@ private:
 	bool			m_bJoinGroup;
 	bool			m_bTLS;
 	char*			m_szCipher;
-	int				m_iRetention;
-	time_t			m_tBlockTime;

 public:
 					NewsServer(int iID, bool bActive, const char* szName, const char* szHost, int iPort,
 						const char* szUser, const char* szPass, bool bJoinGroup,
-						bool bTLS, const char* szCipher, int iMaxConnections, int iRetention,
-						int iLevel, int iGroup);
+						bool bTLS, const char* szCipher, int iMaxConnections, int iLevel, int iGroup);
 					~NewsServer();
 	int				GetID() { return m_iID; }
 	int				GetStateID() { return m_iStateID; }
@@ -75,9 +71,6 @@ public:
 	int				GetJoinGroup() { return m_bJoinGroup; }
 	bool			GetTLS() { return m_bTLS; }
 	const char*		GetCipher() { return m_szCipher; }
-	int				GetRetention() { return m_iRetention; }
-	time_t			GetBlockTime() { return m_tBlockTime; }
-	void			SetBlockTime(time_t tBlockTime) { m_tBlockTime = tBlockTime; }
 };

 typedef std::vector<NewsServer*>		Servers;
--- a/daemon/nntp/ServerPool.cpp
+++ b/daemon/nntp/ServerPool.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -58,7 +58,6 @@ ServerPool::ServerPool()
 	m_iMaxNormLevel = 0;
 	m_iTimeout = 60;
 	m_iGeneration = 0;
-	m_iRetryInterval = 0;

 	g_pLog->RegisterDebuggable(this);
 }
@@ -158,7 +157,6 @@ void ServerPool::InitConnections()
 	for (Servers::iterator it = m_SortedServers.begin(); it != m_SortedServers.end(); it++)
 	{
 		NewsServer* pNewsServer = *it;
-		pNewsServer->SetBlockTime(0);
 		int iNormLevel = pNewsServer->GetNormLevel();
 		if (pNewsServer->GetNormLevel() > -1)
 		{
@@ -201,15 +199,11 @@ void ServerPool::InitConnections()
 NNTPConnection* ServerPool::GetConnection(int iLevel, NewsServer* pWantServer, Servers* pIgnoreServers)
 {
 	PooledConnection* pConnection = NULL;
-	m_mutexConnections.Lock();

-	time_t tCurTime = time(NULL);
+	m_mutexConnections.Lock();

 	if (iLevel < (int)m_Levels.size() && m_Levels[iLevel] > 0)
 	{
-		Connections candidates;
-		candidates.reserve(m_Connections.size());
-
 		for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
 		{
 			PooledConnection* pCandidateConnection = *it;
@@ -217,11 +211,7 @@ NNTPConnection* ServerPool::GetConnection(int iLevel, NewsServer* pWantServer, S
 			if (!pCandidateConnection->GetInUse() && pCandidateServer->GetActive() &&
 				pCandidateServer->GetNormLevel() == iLevel && 
 				(!pWantServer || pCandidateServer == pWantServer ||
-				 (pWantServer->GetGroup() > 0 && pWantServer->GetGroup() == pCandidateServer->GetGroup())) &&
-				(pCandidateConnection->GetStatus() == Connection::csConnected ||
-				 !pCandidateServer->GetBlockTime() ||
-				 pCandidateServer->GetBlockTime() + m_iRetryInterval <= tCurTime ||
-				 pCandidateServer->GetBlockTime() > tCurTime))
+				 (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;
@@ -240,25 +230,15 @@ NNTPConnection* ServerPool::GetConnection(int iLevel, NewsServer* pWantServer, S
 					}
 				}

-				pCandidateServer->SetBlockTime(0);
-
 				if (bUseConnection)
 				{
-					candidates.push_back(pCandidateConnection);
+					pConnection = pCandidateConnection;
+					pConnection->SetInUse(true);
+					break;
 				}
 			}
 		}

-		if (!candidates.empty())
-		{
-			// Peeking a random free connection. This is better than taking the first
-			// available connection because provides better distribution across news servers,
-			// especially when one of servers becomes unavailable or doesn't have requested articles.
-			int iRandomIndex = rand() % candidates.size();
-			pConnection = candidates[iRandomIndex];
-			pConnection->SetInUse(true);
-		}
-
 		if (pConnection)
 		{
 			m_Levels[iLevel]--;
@@ -293,27 +273,12 @@ void ServerPool::FreeConnection(NNTPConnection* pConnection, bool bUsed)
 	m_mutexConnections.Unlock();
 }

-void ServerPool::BlockServer(NewsServer* pNewsServer)
-{
-	m_mutexConnections.Lock();
-	time_t tCurTime = time(NULL);
-	bool bNewBlock = pNewsServer->GetBlockTime() != tCurTime;
-	pNewsServer->SetBlockTime(tCurTime);
-	m_mutexConnections.Unlock();
-
-	if (bNewBlock && m_iRetryInterval > 0)
-	{
-		warn("Blocking %s (%s) for %i sec", pNewsServer->GetName(), pNewsServer->GetHost(), m_iRetryInterval);
-	}
-}
-
 void ServerPool::CloseUnusedConnections()
 {
 	m_mutexConnections.Lock();

 	time_t curtime = ::time(NULL);

-	// close and free all connections of servers which were disabled since the last check
 	int i = 0;
 	for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); )
 	{
@@ -335,6 +300,16 @@ void ServerPool::CloseUnusedConnections()
 			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++;
@@ -342,50 +317,6 @@ void ServerPool::CloseUnusedConnections()
 		}
 	}

-	// close all opened connections on levels not having any in-use connections
-	for (int iLevel = 0; iLevel <= m_iMaxNormLevel; iLevel++)
-	{
-		// check if we have in-use connections on the level
-		bool bHasInUseConnections = false;
-		int iInactiveTime = 0;
-		for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
-		{
-			PooledConnection* pConnection = *it;
-			if (pConnection->GetNewsServer()->GetNormLevel() == iLevel)
-			{
-				if (pConnection->GetInUse())
-				{
-					bHasInUseConnections = true;
-					break;
-				}
-				else
-				{
-					int tdiff = (int)(curtime - pConnection->GetFreeTime());
-					if (tdiff > iInactiveTime)
-					{
-						iInactiveTime = tdiff;
-					}
-				}
-			}
-		}
-
-		// if there are no in-use connections on the level and the hold time out has
-		// expired - close all connections of the level.
-		if (!bHasInUseConnections && iInactiveTime > CONNECTION_HOLD_SECODNS)
-		{
-			for (Connections::iterator it = m_Connections.begin(); it != m_Connections.end(); it++)
-			{
-				PooledConnection* pConnection = *it;
-				if (pConnection->GetNewsServer()->GetNormLevel() == iLevel &&
-					pConnection->GetStatus() == Connection::csConnected)
-				{
-					debug("Closing (and keeping) unused connection to server%i", pConnection->GetNewsServer()->GetID());
-					pConnection->Disconnect();
-				}
-			}
-		}
-	}
-
 	m_mutexConnections.Unlock();
 }

@@ -405,16 +336,12 @@ void ServerPool::LogDebugInfo()

 	m_mutexConnections.Lock();

-	time_t tCurTime = time(NULL);
-
 	info("    Servers: %i", m_Servers.size());
 	for (Servers::iterator it = m_Servers.begin(); it != m_Servers.end(); it++)
 	{
 		NewsServer*  pNewsServer = *it;
-		info("      %i) %s (%s): Level=%i, NormLevel=%i, BlockSec=%i", pNewsServer->GetID(), pNewsServer->GetName(),
-			pNewsServer->GetHost(), pNewsServer->GetLevel(), pNewsServer->GetNormLevel(),
-			pNewsServer->GetBlockTime() && pNewsServer->GetBlockTime() + m_iRetryInterval > tCurTime ?
-				pNewsServer->GetBlockTime() + m_iRetryInterval - tCurTime : 0);
+		info("      %i) %s (%s): Level=%i, NormLevel=%i", pNewsServer->GetID(), pNewsServer->GetName(),
+			pNewsServer->GetHost(), pNewsServer->GetLevel(), pNewsServer->GetNormLevel());
 	}

 	info("    Levels: %i", m_Levels.size());
--- a/daemon/nntp/ServerPool.h
+++ b/daemon/nntp/ServerPool.h
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-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
@@ -61,20 +61,18 @@ private:
 	int					m_iMaxNormLevel;
 	Mutex			 	m_mutexConnections;
 	int					m_iTimeout;
-	int					m_iRetryInterval;
 	int					m_iGeneration;

 	void				NormalizeLevels();
 	static bool			CompareServers(NewsServer* pServer1, NewsServer* pServer2);

 protected:
-	virtual void		LogDebugInfo();
+	virtual void			LogDebugInfo();

 public:
 						ServerPool();
 						~ServerPool();
 	void				SetTimeout(int iTimeout) { m_iTimeout = iTimeout; }
-	void				SetRetryInterval(int iRetryInterval) { m_iRetryInterval = iRetryInterval; }
 	void 				AddServer(NewsServer* pNewsServer);
 	void				InitConnections();
 	int					GetMaxNormLevel() { return m_iMaxNormLevel; }
@@ -84,7 +82,6 @@ public:
 	void				CloseUnusedConnections();
 	void				Changed();
 	int					GetGeneration() { return m_iGeneration; }
-	void				BlockServer(NewsServer* pNewsServer);
 };

 #endif
--- a/daemon/nntp/StatMeter.cpp
+++ b/daemon/nntp/StatMeter.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2014-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -40,7 +40,6 @@
 #include "Options.h"
 #include "ServerPool.h"
 #include "DiskState.h"
-#include "Util.h"

 extern ServerPool* g_pServerPool;
 extern Options* g_pOptions;
@@ -172,42 +171,43 @@ void ServerVolume::LogDebugInfo()
 {
 	info("   ---------- ServerVolume");

-	StringBuilder msg;
+	char szSec[4000];

+	szSec[0] = '\0';
 	for (int i = 0; i < 60; i++)
 	{
-		char szNum[30];
-		snprintf(szNum, 30, "[%i]=%lli ", i, m_BytesPerSeconds[i]);
-		msg.Append(szNum);
+		char szNum[20];
+		snprintf(szNum, 20, "[%i]=%lli ", i, m_BytesPerSeconds[i]);
+		strncat(szSec, szNum, 4000);
 	}
-	info("Secs: %s", msg.GetBuffer());
+	info("Secs: %s", szSec);

-	msg.Clear();
+	szSec[0] = '\0';
 	for (int i = 0; i < 60; i++)
 	{
-		char szNum[30];
-		snprintf(szNum, 30, "[%i]=%lli ", i, m_BytesPerMinutes[i]);
-		msg.Append(szNum);
+		char szNum[20];
+		snprintf(szNum, 20, "[%i]=%lli ", i, m_BytesPerMinutes[i]);
+		strncat(szSec, szNum, 4000);
 	}
-	info("Mins: %s", msg.GetBuffer());
+	info("Mins: %s", szSec);

-	msg.Clear();
+	szSec[0] = '\0';
 	for (int i = 0; i < 24; i++)
 	{
-		char szNum[30];
-		snprintf(szNum, 30, "[%i]=%lli ", i, m_BytesPerHours[i]);
-		msg.Append(szNum);
+		char szNum[20];
+		snprintf(szNum, 20, "[%i]=%lli ", i, m_BytesPerHours[i]);
+		strncat(szSec, szNum, 4000);
 	}
-	info("Hours: %s", msg.GetBuffer());
+	info("Hours: %s", szSec);

-	msg.Clear();
+	szSec[0] = '\0';
 	for (int i = 0; i < (int)m_BytesPerDays.size(); i++)
 	{
-		char szNum[30];
-		snprintf(szNum, 30, "[%i]=%lli ", m_iFirstDay + i, m_BytesPerDays[i]);
-		msg.Append(szNum);
+		char szNum[20];
+		snprintf(szNum, 20, "[%i]=%lli ", m_iFirstDay + i, m_BytesPerDays[i]);
+		strncat(szSec, szNum, 4000);
 	}
-	info("Days: %s", msg.GetBuffer());
+	info("Days: %s", szSec);
 }

 StatMeter::StatMeter()
@@ -356,7 +356,9 @@ void StatMeter::CalcTotalStat(int* iUpTimeSec, int* iDnTimeSec, long long* iAllB
 	m_mutexStat.Unlock();
 }

-// Average speed in last 30 seconds
+/*
+ * NOTE: see note to "AddSpeedReading"
+ */
 int StatMeter::CalcCurrentDownloadSpeed()
 {
 	if (m_bStandBy)
@@ -373,14 +375,6 @@ int StatMeter::CalcCurrentDownloadSpeed()
 	return (int)(m_iSpeedTotalBytes / iTimeDiff);
 }

-// Amount of data downloaded in current second
-int StatMeter::CalcMomentaryDownloadSpeed()
-{
-	time_t tCurTime = time(NULL);
-	int iSpeed = tCurTime == m_tCurSecTime ? m_iCurSecBytes : 0;
-	return iSpeed;
-}
-
 void StatMeter::AddSpeedReading(int iBytes)
 {
 	time_t tCurTime = time(NULL);
@@ -395,13 +389,6 @@ void StatMeter::AddSpeedReading(int iBytes)
 #endif
 	}

-	if (tCurTime != m_tCurSecTime)
-	{
-		m_tCurSecTime =	tCurTime;
-		m_iCurSecBytes = 0;
-	}
-	m_iCurSecBytes += iBytes;
-
 	while (iNowSlot > m_iSpeedTime[m_iSpeedBytesIndex])
 	{
 		//record bytes in next slot
@@ -465,8 +452,6 @@ void StatMeter::ResetSpeedStat()
 	m_iSpeedBytesIndex = 0;
 	m_iSpeedTotalBytes = 0;
 	m_tSpeedCorrection = tCurTime;
-	m_tCurSecTime =	0;
-	m_iCurSecBytes = 0;
 }

 void StatMeter::LogDebugInfo()
--- a/daemon/nntp/StatMeter.h
+++ b/daemon/nntp/StatMeter.h
@@ -93,8 +93,6 @@ private:
 	int					m_iSpeedStartTime; 
 	time_t				m_tSpeedCorrection;
 	int					m_iSpeedBytesIndex;
-	int					m_iCurSecBytes;
-	time_t				m_tCurSecTime;
 #ifdef HAVE_SPINLOCK
 	SpinLock			m_spinlockSpeed;
 #else
@@ -127,7 +125,6 @@ public:
 						~StatMeter();
 	void				Init();
 	int					CalcCurrentDownloadSpeed();
-	int					CalcMomentaryDownloadSpeed();
 	void				AddSpeedReading(int iBytes);
 	void				AddServerData(int iBytes, int iServerID);
 	void				CalcTotalStat(int* iUpTimeSec, int* iDnTimeSec, long long* iAllBytes, bool* bStandBy);
--- a/daemon/postprocess/ParChecker.cpp
+++ b/daemon/postprocess/ParChecker.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@

 #ifdef WIN32
 #include "win32.h"
-#include "Mmsystem.h"
 #endif

 #ifndef DISABLE_PARCHECK
@@ -38,17 +37,17 @@
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
-#ifndef WIN32
+#ifdef WIN32
+#include <par2cmdline.h>
+#include <par2repairer.h>
+#else
 #include <unistd.h>
+#include <libpar2/par2cmdline.h>
+#include <libpar2/par2repairer.h>
 #endif
-#include <vector>
 #include <algorithm>

-#include "par2cmdline.h"
-#include "par2repairer.h"
-
 #include "nzbget.h"
-#include "Thread.h"
 #include "ParChecker.h"
 #include "ParCoordinator.h"
 #include "Log.h"
@@ -67,77 +66,25 @@ const char* Par2CmdLineErrStr[] = { "OK",
 	"internal error occurred",
 	"out of memory" };

-// Sleep interval for synchronisation (microseconds)
-#ifdef WIN32
-// Windows doesn't allow sleep intervals less than one millisecond
-#define SYNC_SLEEP_INTERVAL 1000
-#else
-#define SYNC_SLEEP_INTERVAL 100
-#endif
-
-class RepairThread;

 class Repairer : public Par2Repairer
 {
 private:
-	typedef vector<Thread*> Threads;
-
-	CommandLine		commandLine;
-	ParChecker*		m_pOwner;
-	Threads			m_Threads;
-	bool			m_bParallel;
-
-#ifdef HAVE_SPINLOCK
-	SpinLock		progresslock;
-#else
-	Mutex			progresslock;
-#endif
-
-	virtual void	BeginRepair();
-	virtual void	EndRepair();
-	void			RepairBlock(u32 inputindex, u32 outputindex, size_t blocklength);
-
-protected:
-	virtual void	sig_filename(std::string filename) { m_pOwner->signal_filename(filename); }
-	virtual void	sig_progress(double progress) { m_pOwner->signal_progress(progress); }
-	virtual void	sig_done(std::string filename, int available, int total) { m_pOwner->signal_done(filename, available, total); }
-
-	virtual bool	ScanDataFile(DiskFile *diskfile, Par2RepairerSourceFile* &sourcefile,
-		MatchType &matchtype, MD5Hash &hashfull, MD5Hash &hash16k, u32 &count);
-	virtual bool	RepairData(u32 inputindex, size_t blocklength);
+    CommandLine	commandLine;

 public:
-					Repairer(ParChecker* pOwner) { m_pOwner = pOwner; }
-	Result			PreProcess(const char *szParFilename);
-	Result			Process(bool dorepair);
+	Result		PreProcess(const char *szParFilename);
+	Result		Process(bool dorepair);

 	friend class ParChecker;
-	friend class RepairThread;
-};
-
-class RepairThread : public Thread
-{
-private:
-	Repairer*		m_pOwner;
-	u32				m_inputindex;
-	u32				m_outputindex;
-	size_t			m_blocklength;
-	volatile bool	m_bWorking;
-
-protected:
-	virtual void	Run();
-
-public:
-					RepairThread(Repairer* pOwner) { this->m_pOwner = pOwner; m_bWorking = false; }
-	void			RepairBlock(u32 inputindex, u32 outputindex, size_t blocklength);
-	bool			IsWorking() { return m_bWorking; }
 };

 Result Repairer::PreProcess(const char *szParFilename)
 {
-	char szMemParam[20];
-	snprintf(szMemParam, 20, "-m%i", g_pOptions->GetParBuffer());
-	szMemParam[20-1] = '\0';
+#ifdef HAVE_PAR2_BUGFIXES_V2
+	// Ensure linking against the patched version of libpar2
+	BugfixesPatchVersion2();
+#endif

 	if (g_pOptions->GetParScan() == Options::psFull)
 	{
@@ -151,16 +98,16 @@ Result Repairer::PreProcess(const char *szParFilename)
 			szBasename[1] = '\0';
 		}

-		const char* argv[] = { "par2", "r", "-v", "-v", szMemParam, szParFilename, szWildcardParam };
-		if (!commandLine.Parse(7, (char**)argv))
+		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", szMemParam, szParFilename };
-		if (!commandLine.Parse(6, (char**)argv))
+		const char* argv[] = { "par2", "r", "-v", "-v", szParFilename };
+		if (!commandLine.Parse(5, (char**)argv))
 		{
 			return eInvalidCommandLineArguments;
 		}
@@ -175,179 +122,6 @@ Result Repairer::Process(bool dorepair)
 }


-bool Repairer::ScanDataFile(DiskFile *diskfile, Par2RepairerSourceFile* &sourcefile,
-	MatchType &matchtype, MD5Hash &hashfull, MD5Hash &hash16k, u32 &count)
-{
-	if (m_pOwner->GetParQuick() && sourcefile)
-	{
-		string path;
-		string name;
-		DiskFile::SplitFilename(diskfile->FileName(), path, name);
-
-		sig_filename(name);
-
-		int iAvailableBlocks = sourcefile->BlockCount();
-		ParChecker::EFileStatus eFileStatus = m_pOwner->VerifyDataFile(diskfile, sourcefile, &iAvailableBlocks);
-		if (eFileStatus != ParChecker::fsUnknown)
-		{
-			sig_done(name, iAvailableBlocks, sourcefile->BlockCount());
-			sig_progress(1000.0);
-			matchtype = eFileStatus == ParChecker::fsSuccess ? eFullMatch :
-				eFileStatus == ParChecker::fsPartial ? ePartialMatch : eNoMatch;
-			m_pOwner->SetParFull(false);
-			return true;
-		}
-	}
-
-	return Par2Repairer::ScanDataFile(diskfile, sourcefile, matchtype, hashfull, hash16k, count);
-}
-
-void Repairer::BeginRepair()
-{
-	int iMaxThreads = g_pOptions->GetParThreads() > 0 ? g_pOptions->GetParThreads() : Util::NumberOfCpuCores();
-	iMaxThreads = iMaxThreads > 0 ? iMaxThreads : 1;
-
-	int iThreads = iMaxThreads > (int)missingblockcount ? (int)missingblockcount : iMaxThreads;
-
-	m_pOwner->PrintMessage(Message::mkInfo, "Using %i of max %i thread(s) to repair %i block(s) for %s",
-		iThreads, iMaxThreads, (int)missingblockcount, m_pOwner->m_szNZBName);
-
-	m_bParallel = iThreads > 1;
-
-	if (m_bParallel)
-	{
-		for (int i = 0; i < iThreads; i++)
-		{
-			RepairThread* pRepairThread = new RepairThread(this);
-			m_Threads.push_back(pRepairThread);
-			pRepairThread->SetAutoDestroy(true);
-			pRepairThread->Start();
-		}
-
-#ifdef WIN32
-		timeBeginPeriod(1);
-#endif
-	}
-}
-
-void Repairer::EndRepair()
-{
-	if (m_bParallel)
-	{
-		for (Threads::iterator it = m_Threads.begin(); it != m_Threads.end(); it++)
-		{
-			RepairThread* pRepairThread = (RepairThread*)*it;
-			pRepairThread->Stop();
-		}
-
-#ifdef WIN32
-		timeEndPeriod(1);
-#endif
-	}
-}
-
-bool Repairer::RepairData(u32 inputindex, size_t blocklength)
-{
-	if (!m_bParallel)
-	{
-		return false;
-	}
-
-	for (u32 outputindex = 0; outputindex < missingblockcount; )
-	{
-		bool bJobAdded = false;
-		for (Threads::iterator it = m_Threads.begin(); it != m_Threads.end(); it++)
-		{
-			RepairThread* pRepairThread = (RepairThread*)*it;
-			if (!pRepairThread->IsWorking())
-			{
-				pRepairThread->RepairBlock(inputindex, outputindex, blocklength);
-				outputindex++;
-				bJobAdded = true;
-				break;
-			}
-		}
-
-		if (cancelled)
-		{
-			break;
-		}
-
-		if (!bJobAdded)
-		{
-			usleep(SYNC_SLEEP_INTERVAL);
-		}
-	}
-
-	// Wait until all m_Threads complete their jobs
-	bool bWorking = true;
-	while (bWorking)
-	{
-		bWorking = false;
-		for (Threads::iterator it = m_Threads.begin(); it != m_Threads.end(); it++)
-		{
-			RepairThread* pRepairThread = (RepairThread*)*it;
-			if (pRepairThread->IsWorking())
-			{
-				bWorking = true;
-				usleep(SYNC_SLEEP_INTERVAL);
-				break;
-			}
-		}
-	}
-
-	return true;
-}
-
-void Repairer::RepairBlock(u32 inputindex, u32 outputindex, size_t blocklength)
-{
-	// Select the appropriate part of the output buffer
-	void *outbuf = &((u8*)outputbuffer)[chunksize * outputindex];
-
-	// Process the data
-	rs.Process(blocklength, inputindex, inputbuffer, outputindex, outbuf);
-
-	if (noiselevel > CommandLine::nlQuiet)
-	{
-		// Update a progress indicator
-		progresslock.Lock();
-		u32 oldfraction = (u32)(1000 * progress / totaldata);
-		progress += blocklength;
-		u32 newfraction = (u32)(1000 * progress / totaldata);
-		progresslock.Unlock();
-
-		if (oldfraction != newfraction)
-		{
-			sig_progress(newfraction);
-		}
-	}
-}
-
-void RepairThread::Run()
-{
-	while (!IsStopped())
-	{
-		if (m_bWorking)
-		{
-			m_pOwner->RepairBlock(m_inputindex, m_outputindex, m_blocklength);
-			m_bWorking = false;
-		}
-		else
-		{
-			usleep(SYNC_SLEEP_INTERVAL);
-		}
-	}
-}
-
-void RepairThread::RepairBlock(u32 inputindex, u32 outputindex, size_t blocklength)
-{
-	m_inputindex = inputindex;
-	m_outputindex = outputindex;
-	m_blocklength = blocklength;
-	m_bWorking = true;
-}
-
-
 class MissingFilesComparator
 {
 private:
@@ -378,24 +152,6 @@ bool MissingFilesComparator::operator()(CommandLine::ExtraFile* pFile1, CommandL
 }


-ParChecker::Segment::Segment(bool bSuccess, long long iOffset, int iSize, unsigned long lCrc)
-{
-	m_bSuccess = bSuccess;
-	m_iOffset = iOffset;
-	m_iSize = iSize;
-	m_lCrc = lCrc;
-}
-
-
-ParChecker::SegmentList::~SegmentList()
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		delete *it;
-	}
-}
-
-
 ParChecker::ParChecker()
 {
    debug("Creating ParChecker");
@@ -414,9 +170,6 @@ ParChecker::ParChecker()
 	m_bVerifyingExtraFiles = false;
 	m_bCancelled = false;
 	m_eStage = ptLoadingPars;
-	m_bParQuick = false;
-	m_bForceRepair = false;
-	m_bParFull = false;
 }

 ParChecker::~ParChecker()
@@ -473,31 +226,18 @@ void ParChecker::SetInfoName(const char * szInfoName)
 }

 void ParChecker::Run()
-{
-	m_eStatus = RunParCheckAll();
-
-	if (m_eStatus == psRepairNotNeeded && m_bParQuick && m_bForceRepair && !m_bCancelled)
-	{
-		PrintMessage(Message::mkInfo, "Performing full par-check for %s", m_szNZBName);
-		m_bParQuick = false;
-		m_eStatus = RunParCheckAll();
-	}
-
-	Completed();
-}
-
-ParChecker::EStatus ParChecker::RunParCheckAll()
 {
 	ParCoordinator::ParFileList 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);
-		return psFailed;
+		m_eStatus = psFailed;
+		Completed();
+		return;
 	}

-	EStatus eAllStatus = psRepairNotNeeded;
+	m_eStatus = psRepairNotNeeded;
 	m_bCancelled = false;
-	m_bParFull = true;

 	for (ParCoordinator::ParFileList::iterator it = fileList.begin(); it != fileList.end(); it++)
 	{
@@ -526,12 +266,12 @@ ParChecker::EStatus ParChecker::RunParCheckAll()
 			EStatus eStatus = RunParCheck(szFullParFilename);

 			// accumulate total status, the worst status has priority
-			if (eAllStatus > eStatus)
+			if (m_eStatus > eStatus)
 			{
-				eAllStatus = eStatus;
+				m_eStatus = eStatus;
 			}

-			if (g_pOptions->GetBrokenLog())
+			if (g_pOptions->GetCreateBrokenLog())
 			{
 				WriteBrokenLog(eStatus);
 			}
@@ -540,7 +280,7 @@ ParChecker::EStatus ParChecker::RunParCheckAll()
 		free(szParFilename);
 	}

-	return eAllStatus;
+	Completed();
 }

 ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
@@ -551,7 +291,6 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 	m_iProcessedFiles = 0;
 	m_iExtraFiles = 0;
 	m_bVerifyingExtraFiles = false;
-	m_bHasDamagedFiles = false;
 	EStatus eStatus = psFailed;

 	PrintMessage(Message::mkInfo, "Verifying %s", m_szInfoName);
@@ -576,13 +315,8 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 	res = pRepairer->Process(false);
    debug("ParChecker: Process-result=%i", res);

-	if (!m_bParQuick)
-	{
-		CheckEmptyFiles();
-	}
-
 	bool bAddedSplittedFragments = false;
-	if (m_bHasDamagedFiles && !IsStopped() && res == eRepairNotPossible)
+	if (!IsStopped() && res == eRepairNotPossible)
 	{
 		bAddedSplittedFragments = AddSplittedFragments();
 		if (bAddedSplittedFragments)
@@ -592,7 +326,7 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 		}
 	}

-	if (m_bHasDamagedFiles && !IsStopped() && pRepairer->missingfilecount > 0 && 
+	if (!IsStopped() && pRepairer->missingfilecount > 0 && 
 		!(bAddedSplittedFragments && res == eRepairPossible) &&
 		g_pOptions->GetParScan() == Options::psAuto)
 	{
@@ -603,7 +337,7 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 		}
 	}

-	if (m_bHasDamagedFiles && !IsStopped() && res == eRepairNotPossible)
+	if (!IsStopped() && res == eRepairNotPossible)
 	{
 		res = (Result)ProcessMorePars();
 	}
@@ -616,7 +350,7 @@ ParChecker::EStatus ParChecker::RunParCheck(const char* szParFilename)
 	
 	eStatus = psFailed;
 	
-	if (res == eSuccess || !m_bHasDamagedFiles)
+	if (res == eSuccess)
 	{
    	PrintMessage(Message::mkInfo, "Repair not needed for %s", m_szInfoName);
 		eStatus = psRepairNotNeeded;
@@ -688,8 +422,11 @@ int ParChecker::PreProcessPar()
 	{
 		Cleanup();

-		Repairer* pRepairer = new Repairer(this);
+		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);
@@ -966,7 +703,7 @@ bool ParChecker::AddSplittedFragments()
 	{
 		m_iExtraFiles += extrafiles.size();
 		m_bVerifyingExtraFiles = true;
-		PrintMessage(Message::mkInfo, "Found %i splitted fragments for %s", (int)extrafiles.size(), m_szInfoName);
+		info("Found %i splitted fragments for %s", (int)extrafiles.size(), m_szInfoName);
 		bFragmentsAdded = ((Repairer*)m_pRepairer)->VerifyExtraFiles(extrafiles);
 		((Repairer*)m_pRepairer)->UpdateVerificationResults();
 		m_bVerifyingExtraFiles = false;
@@ -1036,7 +773,7 @@ bool ParChecker::AddMissingFiles()
 			bool bAdded = iWasMissing > (int)((Repairer*)m_pRepairer)->missingfilecount;
 			if (bAdded)
 			{
-				PrintMessage(Message::mkInfo, "Found missing file %s", Util::BaseFileName(pExtraFile->FileName().c_str()));
+				info("Found missing file %s", Util::BaseFileName(pExtraFile->FileName().c_str()));
 				RegisterParredFile(Util::BaseFileName(pExtraFile->FileName().c_str()));
 			}

@@ -1074,26 +811,14 @@ bool ParChecker::IsProcessedFile(const char* szFilename)

 void ParChecker::signal_filename(std::string str)
 {
-	if (!m_lastFilename.compare(str))
-	{
-		return;
-	}
-
-	m_lastFilename = str;
-
-	const char* szStageMessage[] = { "Loading file", "Verifying file", "Repairing file", "Verifying repaired file" };
+    const char* szStageMessage[] = { "Loading file", "Verifying file", "Repairing file", "Verifying repaired file" };

 	if (m_eStage == ptRepairing)
 	{
 		m_eStage = ptVerifyingRepaired;
 	}

-	// don't print progress messages when verifying repaired files in quick verification mode,
-	// because repaired files are not verified in this mode
-	if (!(m_eStage == ptVerifyingRepaired && m_bParQuick))
-	{
-		PrintMessage(Message::mkInfo, "%s %s", szStageMessage[m_eStage], str.c_str());
-	}
+	PrintMessage(Message::mkInfo, "%s %s", szStageMessage[m_eStage], str.c_str());

 	if (m_eStage == ptLoadingPars || m_eStage == ptVerifyingSources)
 	{
@@ -1161,14 +886,13 @@ void ParChecker::signal_done(std::string str, int available, int total)
 	{
 		if (available < total && !m_bVerifyingExtraFiles)
 		{
-			const char* szFilename = str.c_str();
-
 			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(szFilename, Util::BaseFileName(sourcefile->TargetFileName().c_str())) &&
+				if (sourcefile && !strcmp(str.c_str(), Util::BaseFileName(sourcefile->TargetFileName().c_str())) &&
 					!sourcefile->GetTargetExists())
 				{
 					bFileExists = false;
@@ -1176,62 +900,27 @@ void ParChecker::signal_done(std::string str, int available, int total)
 				}
 			}

-			bool bIgnore = Util::MatchFileExt(szFilename, g_pOptions->GetParIgnoreExt(), ",;") ||
-				Util::MatchFileExt(szFilename, g_pOptions->GetExtCleanupDisk(), ",;");
-			m_bHasDamagedFiles |= !bIgnore;
-
 			if (bFileExists)
 			{
-				PrintMessage(Message::mkWarning, "File %s has %i bad block(s) of total %i block(s)%s",
-					szFilename, total - available, total, bIgnore ? ", ignoring" : "");
+				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%s",
-					szFilename, total, bIgnore ? ", ignoring" : "");
+				PrintMessage(Message::mkWarning, "File %s with %i block(s) is missing", str.c_str(), total);
 			}
 		}
 	}
 }

-/*
- * Only if ParQuick isn't enabled:
- * For empty damaged files the callback-function "signal_done" isn't called and the flag "m_bHasDamagedFiles"
- * therefore isn't set. In this function we expicitly check such files.
- */
-void ParChecker::CheckEmptyFiles()
-{
-	for (std::vector<Par2RepairerSourceFile*>::iterator it = ((Repairer*)m_pRepairer)->sourcefiles.begin();
-		 it != ((Repairer*)m_pRepairer)->sourcefiles.end(); it++)
-	{
-		Par2RepairerSourceFile *sourcefile = *it;
-
-		if (sourcefile && sourcefile->GetDescriptionPacket())
-		{
-			const char* szFilename = sourcefile->GetDescriptionPacket()->FileName().c_str();
-			if (!IsProcessedFile(szFilename))
-			{
-				bool bIgnore = Util::MatchFileExt(szFilename, g_pOptions->GetParIgnoreExt(), ",;") ||
-					Util::MatchFileExt(szFilename, g_pOptions->GetExtCleanupDisk(), ",;");
-				m_bHasDamagedFiles |= !bIgnore;
-
-				int total = sourcefile->GetVerificationPacket() ? sourcefile->GetVerificationPacket()->BlockCount() : 0;
-				PrintMessage(Message::mkWarning, "File %s has %i bad block(s) of total %i block(s)%s",
-					szFilename, total, total, bIgnore ? ", ignoring" : "");
-			}
-		}
-		else
-		{
-			m_bHasDamagedFiles = true;
-		}
-	}
-}
-
 void ParChecker::Cancel()
 {
+#ifdef HAVE_PAR2_CANCEL
 	((Repairer*)m_pRepairer)->cancelled = true;
 	m_bCancelled = true;
 	QueueChanged();
+#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)
@@ -1329,325 +1018,4 @@ void ParChecker::DeleteLeftovers()
 	}
 }

-/**
- * This function implements quick par verification replacing the standard verification routine
- * from libpar2:
- * - for successfully downloaded files the function compares CRC of the file computed during
- *   download with CRC stored in PAR2-file;
- * - for partially downloaded files the CRCs of articles are compared with block-CRCs stored
- *   in PAR2-file;
- * - for completely failed files (not a single successful article) no verification is needed at all.
- *
- * Limitation of the function:
- * This function requires every block in the file to have an unique CRC (across all blocks
- * of the par-set). Otherwise the full verification is performed.
- * The limitation can be avoided by using something more smart than "verificationhashtable.Lookup"
- * but in the real life all blocks have unique CRCs and the simple "Lookup" works good enough.
- */
-ParChecker::EFileStatus ParChecker::VerifyDataFile(void* pDiskfile, void* pSourcefile, int* pAvailableBlocks)
-{
-	if (m_eStage != ptVerifyingSources)
-	{
-		// skipping verification for repaired files, assuming the files were correctly repaired,
-		// the only reason for incorrect files after repair are hardware errors (memory, disk),
-		// but this isn't something NZBGet should care about.
-		return fsSuccess;
-	}
-
-	DiskFile* pDiskFile = (DiskFile*)pDiskfile;
-	Par2RepairerSourceFile* pSourceFile = (Par2RepairerSourceFile*)pSourcefile;
-	if (!pSourcefile || !pSourceFile->GetTargetExists())
-	{
-		return fsUnknown;
-	}
-
-	VerificationPacket* packet = pSourceFile->GetVerificationPacket();
-	if (!packet)
-	{
-		return fsUnknown;
-	}
-
-	std::string filename = pSourceFile->GetTargetFile()->FileName();
-	const char* szFilename = filename.c_str();
-
-	if (Util::FileSize(szFilename) == 0 && pSourceFile->BlockCount() > 0)
-	{
-		*pAvailableBlocks = 0;
-		return fsFailure;
-	}
-
-	// find file status and CRC computed during download
-	unsigned long lDownloadCrc;
-	SegmentList segments;
-	EFileStatus	eFileStatus = FindFileCrc(Util::BaseFileName(szFilename), &lDownloadCrc, &segments);
-	ValidBlocks validBlocks;
-
-	if (eFileStatus == fsFailure || eFileStatus == fsUnknown)
-	{
-		return eFileStatus;
-	}
-	else if ((eFileStatus == fsSuccess && !VerifySuccessDataFile(pDiskfile, pSourcefile, lDownloadCrc)) ||
-		(eFileStatus == fsPartial && !VerifyPartialDataFile(pDiskfile, pSourcefile, &segments, &validBlocks)))
-	{
-		PrintMessage(Message::mkWarning, "Quick verification failed for %s file %s, performing full verification instead",
-			eFileStatus == fsSuccess ? "good" : "damaged", Util::BaseFileName(szFilename));
-		return fsUnknown; // let libpar2 do the full verification of the file
-	}
-
-	// attach verification blocks to the file
-	*pAvailableBlocks = 0;
-	u64 blocksize = ((Repairer*)m_pRepairer)->mainpacket->BlockSize();
-	std::deque<const VerificationHashEntry*> undoList;
-	for (unsigned int i = 0; i < packet->BlockCount(); i++)
-	{
-		if (eFileStatus == fsSuccess || validBlocks.at(i))
-		{
-			const FILEVERIFICATIONENTRY* entry = packet->VerificationEntry(i);
-			u32 blockCrc = entry->crc;
-
-			// Look for a match
-			const VerificationHashEntry* pHashEntry = ((Repairer*)m_pRepairer)->verificationhashtable.Lookup(blockCrc);
-			if (!pHashEntry || pHashEntry->SourceFile() != pSourceFile || pHashEntry->IsSet())
-			{
-				// no match found, revert back the changes made by "pHashEntry->SetBlock"
-				for (std::deque<const VerificationHashEntry*>::iterator it = undoList.begin(); it != undoList.end(); it++)
-				{
-					const VerificationHashEntry* pUndoEntry = *it;
-					pUndoEntry->SetBlock(NULL, 0);
-				}
-				return fsUnknown;
-			}
-
-			undoList.push_back(pHashEntry);
-			pHashEntry->SetBlock(pDiskFile, i*blocksize);
-			(*pAvailableBlocks)++;
-		}
-	}
-
-	PrintMessage(Message::mkDetail, "Quickly verified %s file %s",
-		eFileStatus == fsSuccess ? "good" : "damaged", Util::BaseFileName(szFilename));
-
-	return eFileStatus;
-}
-
-bool ParChecker::VerifySuccessDataFile(void* pDiskfile, void* pSourcefile, unsigned long lDownloadCrc)
-{
-	Par2RepairerSourceFile* pSourceFile = (Par2RepairerSourceFile*)pSourcefile;
-	u64 blocksize = ((Repairer*)m_pRepairer)->mainpacket->BlockSize();
-	VerificationPacket* packet = pSourceFile->GetVerificationPacket();
-
-	// extend lDownloadCrc to block size
-	lDownloadCrc = CRCUpdateBlock(lDownloadCrc ^ 0xFFFFFFFF,
-		(size_t)(blocksize * packet->BlockCount() > pSourceFile->GetTargetFile()->FileSize() ?
-			blocksize * packet->BlockCount() - pSourceFile->GetTargetFile()->FileSize() : 0)
-		) ^ 0xFFFFFFFF;
-	debug("Download-CRC: %.8x", lDownloadCrc);
-
-	// compute file CRC using CRCs of blocks
-	unsigned long lParCrc = 0;
-	for (unsigned int i = 0; i < packet->BlockCount(); i++)
-	{
-		const FILEVERIFICATIONENTRY* entry = packet->VerificationEntry(i);
-		u32 blockCrc = entry->crc;
-		lParCrc = i == 0 ? blockCrc : Util::Crc32Combine(lParCrc, blockCrc, (unsigned long)blocksize);
-	}
-	debug("Block-CRC: %x, filename: %s", lParCrc, Util::BaseFileName(pSourceFile->GetTargetFile()->FileName().c_str()));
-
-	return lParCrc == lDownloadCrc;
-}
-
-bool ParChecker::VerifyPartialDataFile(void* pDiskfile, void* pSourcefile, SegmentList* pSegments, ValidBlocks* pValidBlocks)
-{
-	Par2RepairerSourceFile* pSourceFile = (Par2RepairerSourceFile*)pSourcefile;
-	VerificationPacket* packet = pSourceFile->GetVerificationPacket();
-	long long blocksize = ((Repairer*)m_pRepairer)->mainpacket->BlockSize();
-	std::string filename = pSourceFile->GetTargetFile()->FileName();
-	const char* szFilename = filename.c_str();
-	long long iFileSize = pSourceFile->GetTargetFile()->FileSize();
-
-	// determine presumably valid and bad blocks based on article download status
-	pValidBlocks->resize(packet->BlockCount(), false);
-	for (int i = 0; i < (int)pValidBlocks->size(); i++)
-	{
-		long long blockStart = i * blocksize;
-		long long blockEnd = blockStart + blocksize < iFileSize - 1 ? blockStart + blocksize : iFileSize - 1;
-		bool bBlockOK = false;
-		bool bBlockEnd = false;
-		u64 iCurOffset = 0;
-		for (SegmentList::iterator it = pSegments->begin(); it != pSegments->end(); it++)
-		{
-			Segment* pSegment = *it;
-			if (!bBlockOK && pSegment->GetSuccess() && pSegment->GetOffset() <= blockStart &&
-				pSegment->GetOffset() + pSegment->GetSize() >= blockStart)
-			{
-				bBlockOK = true;
-				iCurOffset = pSegment->GetOffset();
-			}
-			if (bBlockOK)
-			{
-				if (!(pSegment->GetSuccess() && pSegment->GetOffset() == iCurOffset))
-				{
-					bBlockOK = false;
-					break;
-				}
-				if (pSegment->GetOffset() + pSegment->GetSize() >= blockEnd)
-				{
-					bBlockEnd = true;
-					break;
-				}
-				iCurOffset = pSegment->GetOffset() + pSegment->GetSize();
-			}
-		}
-		pValidBlocks->at(i) = bBlockOK && bBlockEnd;
-	}
-
-	char szErrBuf[256];
-	FILE* infile = fopen(szFilename, FOPEN_RB);
-	if (!infile)
-	{
-		PrintMessage(Message::mkError, "Could not open file %s: %s",
-			szFilename, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-	}
-
-	// For each sequential range of presumably valid blocks:
-	// - compute par-CRC of the range of blocks using block CRCs;
-	// - compute download-CRC for the same byte range using CRCs of articles; if articles and block
-	//   overlap - read a little bit of data from the file and calculate its CRC;
-	// - compare two CRCs - they must match; if not - the file is more damaged than we thought -
-	//   let libpar2 do the full verification of the file in this case.
-	unsigned long lParCrc = 0;
-	int iBlockStart = -1;
-	pValidBlocks->push_back(false); // end marker
-	for (int i = 0; i < (int)pValidBlocks->size(); i++)
-	{
-		bool bValidBlock = pValidBlocks->at(i);
-		if (bValidBlock)
-		{
-			if (iBlockStart == -1)
-			{
-				iBlockStart = i;
-			}
-			const FILEVERIFICATIONENTRY* entry = packet->VerificationEntry(i);
-			u32 blockCrc = entry->crc;
-			lParCrc = iBlockStart == i ? blockCrc : Util::Crc32Combine(lParCrc, blockCrc, (unsigned long)blocksize);
-		}
-		else
-		{
-			if (iBlockStart > -1)
-			{
-				int iBlockEnd = i - 1;
-				long long iBytesStart = iBlockStart * blocksize;
-				long long iBytesEnd = iBlockEnd * blocksize + blocksize - 1;
-				unsigned long lDownloadCrc = 0;
-				bool bOK = SmartCalcFileRangeCrc(infile, iBytesStart,
-					iBytesEnd < iFileSize - 1 ? iBytesEnd : iFileSize - 1, pSegments, &lDownloadCrc);
-				if (bOK && iBytesEnd > iFileSize - 1)
-				{
-					// for the last block: extend lDownloadCrc to block size
-					lDownloadCrc = CRCUpdateBlock(lDownloadCrc ^ 0xFFFFFFFF, (size_t)(iBytesEnd - (iFileSize - 1))) ^ 0xFFFFFFFF;
-				}
-
-				if (!bOK || lDownloadCrc != lParCrc)
-				{
-					fclose(infile);
-					return false;
-				}
-			}
-			iBlockStart = -1;
-		}
-	}
-
-	fclose(infile);
-
-	return true;
-}
-
-/*
- * Compute CRC of bytes range of file using CRCs of segments and reading some data directly
- * from file if necessary
- */
-bool ParChecker::SmartCalcFileRangeCrc(FILE* pFile, long long lStart, long long lEnd, SegmentList* pSegments,
-	unsigned long* pDownloadCrc)
-{
-	unsigned long lDownloadCrc = 0;
-	bool bStarted = false;
-	for (SegmentList::iterator it = pSegments->begin(); it != pSegments->end(); it++)
-	{
-		Segment* pSegment = *it;
-
-		if (!bStarted && pSegment->GetOffset() > lStart)
-		{
-			// read start of range from file
-			if (!DumbCalcFileRangeCrc(pFile, lStart, pSegment->GetOffset() - 1, &lDownloadCrc))
-			{
-				return false;
-			}
-			if (pSegment->GetOffset() + pSegment->GetSize() >= lEnd)
-			{
-				break;
-			}
-			bStarted = true;
-		}
-
-		if (pSegment->GetOffset() >= lStart && pSegment->GetOffset() + pSegment->GetSize() <= lEnd)
-		{
-			lDownloadCrc = !bStarted ? pSegment->GetCrc() : Util::Crc32Combine(lDownloadCrc, pSegment->GetCrc(), (unsigned long)pSegment->GetSize());
-			bStarted = true;
-		}
-
-		if (pSegment->GetOffset() + pSegment->GetSize() == lEnd)
-		{
-			break;
-		}
-
-		if (pSegment->GetOffset() + pSegment->GetSize() > lEnd)
-		{
-			// read end of range from file
-			unsigned long lPartialCrc = 0;
-			if (!DumbCalcFileRangeCrc(pFile, pSegment->GetOffset(), lEnd, &lPartialCrc))
-			{
-				return false;
-			}
-
-			lDownloadCrc = Util::Crc32Combine(lDownloadCrc, (unsigned long)lPartialCrc, (unsigned long)(lEnd - pSegment->GetOffset() + 1));
-
-			break;
-		}
-	}
-
-	*pDownloadCrc = lDownloadCrc;
-	return true;
-}
-
-/*
- * Compute CRC of bytes range of file reading the data directly from file
- */
-bool ParChecker::DumbCalcFileRangeCrc(FILE* pFile, long long lStart, long long lEnd, unsigned long* pDownloadCrc)
-{
-	if (fseek(pFile, lStart, SEEK_SET))
-	{
-		return false;
-	}
-
-	static const int BUFFER_SIZE = 1024 * 64;
-	unsigned char* buffer = (unsigned char*)malloc(BUFFER_SIZE);
-	unsigned long lDownloadCrc = 0xFFFFFFFF;
-
-	int cnt = BUFFER_SIZE;
-	while (cnt == BUFFER_SIZE && lStart < lEnd)
-	{
-		int iNeedBytes = lEnd - lStart + 1 > BUFFER_SIZE ? BUFFER_SIZE : (int)(lEnd - lStart + 1);
-		cnt = (int)fread(buffer, 1, iNeedBytes, pFile);
-		lDownloadCrc = Util::Crc32m(lDownloadCrc, buffer, cnt);
-		lStart += cnt;
-	}
-
-	free(buffer);
-
-	lDownloadCrc ^= 0xFFFFFFFF;
-
-	*pDownloadCrc = lDownloadCrc;
-	return true;
-}
-
 #endif
--- a/daemon/postprocess/ParChecker.h
+++ b/daemon/postprocess/ParChecker.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2013 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -29,7 +29,6 @@
 #ifndef DISABLE_PARCHECK

 #include <deque>
-#include <vector>
 #include <string>

 #include "Thread.h"
@@ -54,43 +53,8 @@ public:
 		ptVerifyingRepaired,
 	};

-	enum EFileStatus
-	{
-		fsUnknown,
-		fsSuccess,
-		fsPartial,
-		fsFailure
-	};
-
-	class Segment
-	{
-	private:
-		bool				m_bSuccess;
-		long long			m_iOffset;
-		int					m_iSize;
-		unsigned long		m_lCrc;
-
-	public:
-							Segment(bool bSuccess, long long iOffset, int iSize, unsigned long lCrc);
-		bool 				GetSuccess() { return m_bSuccess; }
-		long long			GetOffset() { return m_iOffset; }
-		int 				GetSize() { return m_iSize; }
-		unsigned long		GetCrc() { return m_lCrc; }
-	};
-
-	typedef std::deque<Segment*>	SegmentListBase;
-
-	class SegmentList : public SegmentListBase
-	{
-	public:
-							~SegmentList();
-	};
-
 	typedef std::deque<char*>		FileList;
 	typedef std::deque<void*>		SourceList;
-	typedef std::vector<bool>		ValidBlocks;
-
-	friend class Repairer;
 	
 private:
 	char*				m_szInfoName;
@@ -99,8 +63,7 @@ private:
 	const char*			m_szParFilename;
 	EStatus				m_eStatus;
 	EStage				m_eStage;
-	// declared as void* to prevent the including of libpar2-headers into this header-file
-	void*				m_pRepairer;
+	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;
@@ -115,14 +78,8 @@ private:
 	int					m_iStageProgress;
 	bool				m_bCancelled;
 	SourceList			m_sourceFiles;
-	std::string			m_lastFilename;
-	bool				m_bHasDamagedFiles;
-	bool				m_bParQuick;
-	bool				m_bForceRepair;
-	bool				m_bParFull;

 	void				Cleanup();
-	EStatus				RunParCheckAll();
 	EStatus				RunParCheck(const char* szParFilename);
 	int					PreProcessPar();
 	bool				LoadMainParBak();
@@ -137,15 +94,6 @@ private:
 	void				signal_filename(std::string str);
 	void				signal_progress(double progress);
 	void				signal_done(std::string str, int available, int total);
-	// declared as void* to prevent the including of libpar2-headers into this header-file
-	// DiskFile* pDiskfile, Par2RepairerSourceFile* pSourcefile
-	EFileStatus			VerifyDataFile(void* pDiskfile, void* pSourcefile, int* pAvailableBlocks);
-	bool				VerifySuccessDataFile(void* pDiskfile, void* pSourcefile, unsigned long lDownloadCrc);
-	bool				VerifyPartialDataFile(void* pDiskfile, void* pSourcefile, SegmentList* pSegments, ValidBlocks* pValidBlocks);
-	bool				SmartCalcFileRangeCrc(FILE* pFile, long long lStart, long long lEnd, SegmentList* pSegments,
-							unsigned long* pDownloadCrc);
-	bool				DumbCalcFileRangeCrc(FILE* pFile, long long lStart, long long lEnd, unsigned long* pDownloadCrc);
-	void				CheckEmptyFiles();

 protected:
 	/**
@@ -159,7 +107,6 @@ protected:
 	virtual void		PrintMessage(Message::EKind eKind, const char* szFormat, ...) {}
 	virtual void		RegisterParredFile(const char* szFilename) {}
 	virtual bool		IsParredFile(const char* szFilename) { return false; }
-	virtual EFileStatus	FindFileCrc(const char* szFilename, unsigned long* lCrc, SegmentList* pSegments) { return fsUnknown; }
 	EStage				GetStage() { return m_eStage; }
 	const char*			GetProgressLabel() { return m_szProgressLabel; }
 	int					GetFileProgress() { return m_iFileProgress; }
@@ -174,12 +121,6 @@ public:
 	const char*			GetInfoName() { return m_szInfoName; }
 	void				SetInfoName(const char* szInfoName);
 	void				SetNZBName(const char* szNZBName);
-	void				SetParQuick(bool bParQuick) { m_bParQuick = bParQuick; }
-	bool				GetParQuick() { return m_bParQuick; }
-	void				SetForceRepair(bool bForceRepair) { m_bForceRepair = bForceRepair; }
-	bool				GetForceRepair() { return m_bForceRepair; }
-	void				SetParFull(bool bParFull) { m_bParFull = bParFull; }
-	bool				GetParFull() { return m_bParFull; }
 	EStatus				GetStatus() { return m_eStatus; }
 	void				AddParFile(const char* szParFilename);
 	void				QueueChanged();
--- a/daemon/postprocess/ParCoordinator.cpp
+++ b/daemon/postprocess/ParCoordinator.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -45,12 +45,10 @@
 #include "nzbget.h"
 #include "ParCoordinator.h"
 #include "Options.h"
-#include "DiskState.h"
 #include "Log.h"
 #include "Util.h"

 extern Options* g_pOptions;
-extern DiskState* g_pDiskState;

 #ifndef DISABLE_PARCHECK
 bool ParCoordinator::PostParChecker::RequestMorePars(int iBlockNeeded, int* pBlockFound)
@@ -72,7 +70,7 @@ void ParCoordinator::PostParChecker::PrintMessage(Message::EKind eKind, const ch
 	va_end(args);
 	szText[1024-1] = '\0';

-	m_pPostInfo->GetNZBInfo()->AddMessage(eKind, szText);
+	m_pOwner->PrintMessage(m_pPostInfo, eKind, "%s", szText);
 }

 void ParCoordinator::PostParChecker::RegisterParredFile(const char* szFilename)
@@ -93,59 +91,6 @@ bool ParCoordinator::PostParChecker::IsParredFile(const char* szFilename)
 	return false;
 }

-ParChecker::EFileStatus ParCoordinator::PostParChecker::FindFileCrc(const char* szFilename,
-	unsigned long* lCrc, SegmentList* pSegments)
-{
-	CompletedFile* pCompletedFile = NULL;
-
-	for (CompletedFiles::iterator it = m_pPostInfo->GetNZBInfo()->GetCompletedFiles()->begin(); it != m_pPostInfo->GetNZBInfo()->GetCompletedFiles()->end(); it++)
-	{
-		CompletedFile* pCompletedFile2 = *it;
-		if (!strcasecmp(pCompletedFile2->GetFileName(), szFilename))
-		{
-			pCompletedFile = pCompletedFile2;
-			break;
-		}
-	}
-	if (!pCompletedFile)
-	{
-		return ParChecker::fsUnknown;
-	}
-
-	debug("Found completed file: %s, CRC: %.8x, Status: %i", Util::BaseFileName(pCompletedFile->GetFileName()), pCompletedFile->GetCrc(), (int)pCompletedFile->GetStatus());
-
-	*lCrc = pCompletedFile->GetCrc();
-
-	if (pCompletedFile->GetStatus() == CompletedFile::cfPartial && pCompletedFile->GetID() > 0 &&
-		!m_pPostInfo->GetNZBInfo()->GetReprocess())
-	{
-		FileInfo* pTmpFileInfo = new FileInfo(pCompletedFile->GetID());
-
-		if (!g_pDiskState->LoadFileState(pTmpFileInfo, NULL, true))
-		{
-			delete pTmpFileInfo;
-			return ParChecker::fsUnknown;
-		}
-
-		for (FileInfo::Articles::iterator it = pTmpFileInfo->GetArticles()->begin(); it != pTmpFileInfo->GetArticles()->end(); it++)
-		{
-			ArticleInfo* pa = *it;
-			ParChecker::Segment* pSegment = new Segment(pa->GetStatus() == ArticleInfo::aiFinished,
-				pa->GetSegmentOffset(), pa->GetSegmentSize(), pa->GetCrc());
-			pSegments->push_back(pSegment);
-		}
-
-		delete pTmpFileInfo;
-	}
-
-	return pCompletedFile->GetStatus() == CompletedFile::cfSuccess ? ParChecker::fsSuccess :
-		pCompletedFile->GetStatus() == CompletedFile::cfFailure &&
-			!m_pPostInfo->GetNZBInfo()->GetReprocess() ? ParChecker::fsFailure :
-		pCompletedFile->GetStatus() == CompletedFile::cfPartial && pSegments->size() > 0 &&
-			!m_pPostInfo->GetNZBInfo()->GetReprocess()? ParChecker::fsPartial :
-		ParChecker::fsUnknown;
-}
-
 void ParCoordinator::PostParRenamer::UpdateProgress()
 {
 	m_pOwner->UpdateParRenameProgress();
@@ -160,7 +105,7 @@ void ParCoordinator::PostParRenamer::PrintMessage(Message::EKind eKind, const ch
 	va_end(args);
 	szText[1024-1] = '\0';
 	
-	m_pPostInfo->GetNZBInfo()->AddMessage(eKind, szText);
+	m_pOwner->PrintMessage(m_pPostInfo, eKind, "%s", szText);
 }

 void ParCoordinator::PostParRenamer::RegisterParredFile(const char* szFilename)
@@ -168,22 +113,6 @@ void ParCoordinator::PostParRenamer::RegisterParredFile(const char* szFilename)
 	m_pPostInfo->GetParredFiles()->push_back(strdup(szFilename));
 }

-/**
- *  Update file name in the CompletedFiles-list of NZBInfo
- */
-void ParCoordinator::PostParRenamer::RegisterRenamedFile(const char* szOldFilename, const char* szNewFileName)
-{
-	for (CompletedFiles::iterator it = m_pPostInfo->GetNZBInfo()->GetCompletedFiles()->begin(); it != m_pPostInfo->GetNZBInfo()->GetCompletedFiles()->end(); it++)
-	{
-		CompletedFile* pCompletedFile = *it;
-		if (!strcasecmp(pCompletedFile->GetFileName(), szOldFilename))
-		{
-			pCompletedFile->SetFileName(szNewFileName);
-			break;
-		}
-	}
-}
-
 #endif

 ParCoordinator::ParCoordinator()
@@ -351,10 +280,6 @@ void ParCoordinator::StartParCheckJob(PostInfo* pPostInfo)
 	m_ParChecker.SetPostInfo(pPostInfo);
 	m_ParChecker.SetDestDir(pPostInfo->GetNZBInfo()->GetDestDir());
 	m_ParChecker.SetNZBName(pPostInfo->GetNZBInfo()->GetName());
-	m_ParChecker.SetParTime(time(NULL));
-	m_ParChecker.SetDownloadSec(pPostInfo->GetNZBInfo()->GetDownloadSec());
-	m_ParChecker.SetParQuick(g_pOptions->GetParQuick() && !pPostInfo->GetForceParFull());
-	m_ParChecker.SetForceRepair(pPostInfo->GetForceRepair());
 	m_ParChecker.PrintMessage(Message::mkInfo, "Checking pars for %s", pPostInfo->GetNZBInfo()->GetName());
 	pPostInfo->SetWorking(true);
 	m_ParChecker.Start();
@@ -389,12 +314,16 @@ 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)
 	{
@@ -441,7 +370,6 @@ void ParCoordinator::ParCheckCompleted()
 		pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped)
 	{
 		pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psSuccess);
-		pPostInfo->SetParRepaired(m_ParChecker.GetStatus() == ParChecker::psRepaired);
 	}
 	else if (m_ParChecker.GetStatus() == ParChecker::psRepairPossible &&
 		pPostInfo->GetNZBInfo()->GetParStatus() != NZBInfo::psFailure)
@@ -453,13 +381,6 @@ void ParCoordinator::ParCheckCompleted()
 		pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psFailure);
 	}

-	int iWaitTime = pPostInfo->GetNZBInfo()->GetDownloadSec() - m_ParChecker.GetDownloadSec();
-	pPostInfo->SetStartTime(pPostInfo->GetStartTime() + (time_t)iWaitTime);
-	int iParSec = (int)(time(NULL) - m_ParChecker.GetParTime()) - iWaitTime;
-	pPostInfo->GetNZBInfo()->SetParSec(pPostInfo->GetNZBInfo()->GetParSec() + iParSec);
-
-	pPostInfo->GetNZBInfo()->SetParFull(m_ParChecker.GetParFull());
-
 	pPostInfo->SetWorking(false);
 	pPostInfo->SetStage(PostInfo::ptQueued);

@@ -579,7 +500,7 @@ void ParCoordinator::FindPars(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo,
 	if (!ParseParFilename(szBaseParFilename, &iMainBaseLen, NULL))
 	{
 		// should not happen
-        pNZBInfo->PrintMessage(Message::mkError, "Internal error: could not parse filename %s", szBaseParFilename);
+        error("Internal error: could not parse filename %s", szBaseParFilename);
 		return;
 	}
 	int maxlen = iMainBaseLen < 1024 ? iMainBaseLen : 1024 - 1;
@@ -666,22 +587,19 @@ void ParCoordinator::UpdateParCheckProgress()
 	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);
-		if (pPostInfo->GetStage() == PostInfo::ptRepairing)
-		{
-			m_ParChecker.SetRepairTime(tCurrent);
-		}
-		else if (pPostInfo->GetStage() == PostInfo::ptVerifyingRepaired)
-		{
-			int iRepairSec = (int)(tCurrent - m_ParChecker.GetRepairTime());
-			pPostInfo->GetNZBInfo()->SetRepairSec(pPostInfo->GetNZBInfo()->GetRepairSec() + iRepairSec);
-		}
 	}

 	bool bParCancel = false;
+#ifdef HAVE_PAR2_CANCEL
 	if (!m_ParChecker.GetCancelled())
 	{
 		if ((g_pOptions->GetParTimeLimit() > 0) &&
@@ -700,6 +618,7 @@ void ParCoordinator::UpdateParCheckProgress()
 			}
 		}
 	}
+#endif

 	if (bParCancel)
 	{
@@ -717,14 +636,12 @@ void ParCoordinator::CheckPauseState(PostInfo* pPostInfo)
 	{
 		time_t tStageTime = pPostInfo->GetStageTime();
 		time_t tStartTime = pPostInfo->GetStartTime();
-		time_t tParTime = m_ParChecker.GetParTime();
-		time_t tRepairTime = m_ParChecker.GetRepairTime();
 		time_t tWaitTime = time(NULL);
 		
 		// wait until Post-processor is unpaused
 		while (g_pOptions->GetPausePostProcess() && !pPostInfo->GetNZBInfo()->GetForcePriority() && !m_bStopped)
 		{
-			usleep(50 * 1000);
+			usleep(100 * 1000);
 			
 			// update time stamps
 			
@@ -734,18 +651,11 @@ void ParCoordinator::CheckPauseState(PostInfo* pPostInfo)
 			{
 				pPostInfo->SetStageTime(tStageTime + tDelta);
 			}
+			
 			if (tStartTime > 0)
 			{
 				pPostInfo->SetStartTime(tStartTime + tDelta);
 			}
-			if (tParTime > 0)
-			{
-				m_ParChecker.SetParTime(tParTime + tDelta);
-			}
-			if (tRepairTime > 0)
-			{
-				m_ParChecker.SetRepairTime(tRepairTime + tDelta);
-			}
 		}
 	}
 }
@@ -759,7 +669,12 @@ void ParCoordinator::ParRenameCompleted()

 	if (m_ParRenamer.HasMissedFiles() && pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped)
 	{
-		m_ParRenamer.PrintMessage(Message::mkInfo, "Requesting par-check/repair for %s to restore missing files ", m_ParRenamer.GetInfoName());
+		PrintMessage(pPostInfo, Message::mkInfo, "Requesting par-check/repair for %s to restore missing files ", m_ParRenamer.GetInfoName());
+		pPostInfo->SetRequestParCheck(true);
+	}
+	else if (m_ParRenamer.HasSplittedFragments() && pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped)
+	{
+		PrintMessage(pPostInfo, Message::mkInfo, "Requesting par-check/repair for %s to join splitted fragments", m_ParRenamer.GetInfoName());
 		pPostInfo->SetRequestParCheck(true);
 	}

@@ -780,6 +695,11 @@ void ParCoordinator::UpdateParRenameProgress()
 	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);
@@ -791,4 +711,39 @@ void ParCoordinator::UpdateParRenameProgress()
 	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
--- a/daemon/postprocess/ParCoordinator.h
+++ b/daemon/postprocess/ParCoordinator.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -45,9 +45,6 @@ private:
 	private:
 		ParCoordinator*	m_pOwner;
 		PostInfo*		m_pPostInfo;
-		time_t			m_tParTime;
-		time_t			m_tRepairTime;
-		int				m_iDownloadSec;
 	protected:
 		virtual bool	RequestMorePars(int iBlockNeeded, int* pBlockFound);
 		virtual void	UpdateProgress();
@@ -55,16 +52,9 @@ private:
 		virtual void	PrintMessage(Message::EKind eKind, const char* szFormat, ...);
 		virtual void	RegisterParredFile(const char* szFilename);
 		virtual bool	IsParredFile(const char* szFilename);
-		virtual EFileStatus	FindFileCrc(const char* szFilename, unsigned long* lCrc, SegmentList* pSegments);
 	public:
 		PostInfo*		GetPostInfo() { return m_pPostInfo; }
 		void			SetPostInfo(PostInfo* pPostInfo) { m_pPostInfo = pPostInfo; }
-		time_t			GetParTime() { return m_tParTime; }
-		void			SetParTime(time_t tParTime) { m_tParTime = tParTime; }
-		time_t			GetRepairTime() { return m_tRepairTime; }
-		void			SetRepairTime(time_t tRepairTime) { m_tRepairTime = tRepairTime; }
-		int				GetDownloadSec() { return m_iDownloadSec; }
-		void			SetDownloadSec(int iDownloadSec) { m_iDownloadSec = iDownloadSec; }

 		friend class ParCoordinator;
 	};
@@ -79,7 +69,6 @@ private:
 		virtual void	Completed() { m_pOwner->ParRenameCompleted(); }
 		virtual void	PrintMessage(Message::EKind eKind, const char* szFormat, ...);
 		virtual void	RegisterParredFile(const char* szFilename);
-		virtual void	RegisterRenamedFile(const char* szOldFilename, const char* szNewFileName);
 	public:
 		PostInfo*		GetPostInfo() { return m_pPostInfo; }
 		void			SetPostInfo(PostInfo* pPostInfo) { m_pPostInfo = pPostInfo; }
@@ -114,6 +103,7 @@ protected:
 	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:
--- a/daemon/postprocess/ParRenamer.cpp
+++ b/daemon/postprocess/ParRenamer.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2013-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -37,14 +37,17 @@
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
-#ifndef WIN32
+#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 "par2cmdline.h"
-#include "par2repairer.h"
-#include "md5.h"
-
 #include "nzbget.h"
 #include "ParRenamer.h"
 #include "ParCoordinator.h"
@@ -83,6 +86,7 @@ ParRenamer::ParRenamer()
 	m_szProgressLabel = (char*)malloc(1024);
 	m_iStageProgress = 0;
 	m_bCancelled = false;
+	m_bHasSplittedFragments = false;
 	m_bHasMissedFiles = false;
 	m_bDetectMissing = false;
 }
@@ -142,6 +146,7 @@ void ParRenamer::Run()
 	m_iFileCount = 0;
 	m_iCurFile = 0;
 	m_iRenamedCount = 0;
+	m_bHasSplittedFragments = false;
 	m_bHasMissedFiles = false;
 	m_eStatus = psFailed;

@@ -262,7 +267,7 @@ void ParRenamer::LoadParFile(const char* szParFilename)
 		Par2RepairerSourceFile* sourceFile = (*it).second;
 		if (!sourceFile || !sourceFile->GetDescriptionPacket())
 		{
-			PrintMessage(Message::mkWarning, "Damaged par2-file detected: %s", szParFilename);
+			warn("Damaged par2-file detected: %s", szParFilename);
 			continue;
 		}
 		m_FileHashList.push_back(new FileHash(sourceFile->GetDescriptionPacket()->FileName().c_str(),
@@ -315,11 +320,11 @@ void ParRenamer::CheckMissing()
 			if (Util::MatchFileExt(pFileHash->GetFilename(), g_pOptions->GetParIgnoreExt(), ",;") ||
 				Util::MatchFileExt(pFileHash->GetFilename(), g_pOptions->GetExtCleanupDisk(), ",;"))
 			{
-				PrintMessage(Message::mkInfo, "File %s is missing, ignoring", pFileHash->GetFilename());
+				info("File %s is missing, ignoring", pFileHash->GetFilename());
 			}
 			else
 			{
-				PrintMessage(Message::mkInfo, "File %s is missing", pFileHash->GetFilename());
+				info("File %s is missing", pFileHash->GetFilename());
 				m_bHasMissedFiles = true;
 			}
 		}
@@ -339,10 +344,12 @@ bool ParRenamer::IsSplittedFragment(const char* szFilename, const char* szCorrec
 		{
 			for (p++; *p && strchr("0123456789", *p); p++) ;
 			bSplittedFragement = !*p;
-			bSplittedFragement = bSplittedFragement && atoi(szDiskBasename + iBaseLen + 1) <= 1; // .000 or .001
+			bSplittedFragement = bSplittedFragement && atoi(szDiskBasename + iBaseLen + 1) == 1;
 		}
 	}

+	m_bHasSplittedFragments = m_bHasSplittedFragments || bSplittedFragement;
+
 	return bSplittedFragement;
 }

@@ -396,7 +403,17 @@ void ParRenamer::CheckRegularFile(const char* szDestDir, const char* szFilename)

 			if (!Util::FileExists(szDstFilename) && !IsSplittedFragment(szFilename, pFileHash->GetFilename()))
 			{
-				RenameFile(szFilename, szDstFilename);
+				PrintMessage(Message::mkInfo, "Renaming %s to %s", Util::BaseFileName(szFilename), pFileHash->GetFilename());
+				if (Util::MoveFile(szFilename, szDstFilename))
+				{
+					m_iRenamedCount++;
+				}
+				else
+				{
+					char szErrBuf[256];
+					PrintMessage(Message::mkError, "Could not rename %s to %s: %s", szFilename, szDstFilename,
+						Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+				}
 			}
 			
 			break;
@@ -466,24 +483,17 @@ void ParRenamer::CheckParFile(const char* szDestDir, const char* szFilename)
 		iNum++;
 	}

-	RenameFile(szFilename, szDestFileName);
-}
-
-void ParRenamer::RenameFile(const char* szSrcFilename, const char* szDestFileName)
-{
-	PrintMessage(Message::mkInfo, "Renaming %s to %s", Util::BaseFileName(szSrcFilename), Util::BaseFileName(szDestFileName));
-	if (!Util::MoveFile(szSrcFilename, szDestFileName))
+	PrintMessage(Message::mkInfo, "Renaming %s to %s", Util::BaseFileName(szFilename), Util::BaseFileName(szDestFileName));
+	if (Util::MoveFile(szFilename, szDestFileName))
+	{
+		m_iRenamedCount++;
+	}
+	else
 	{
 		char szErrBuf[256];
-		PrintMessage(Message::mkError, "Could not rename %s to %s: %s", szSrcFilename, szDestFileName,
+		PrintMessage(Message::mkError, "Could not rename %s to %s: %s", szFilename, szDestFileName,
 			Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-		return;
 	}
-
-	m_iRenamedCount++;
-
-	// notify about new file name
-	RegisterRenamedFile(Util::BaseFileName(szSrcFilename), Util::BaseFileName(szDestFileName));
 }

 #endif
--- a/daemon/postprocess/ParRenamer.h
+++ b/daemon/postprocess/ParRenamer.h
@@ -59,6 +59,7 @@ public:
 	};

 	typedef std::deque<FileHash*>		FileHashList;
+
 	typedef std::deque<char*>			DirList;
 	
 private:
@@ -73,6 +74,7 @@ private:
 	int					m_iFileCount;
 	int					m_iCurFile;
 	int					m_iRenamedCount;
+	bool				m_bHasSplittedFragments;
 	bool				m_bHasMissedFiles;
 	bool				m_bDetectMissing;

@@ -87,14 +89,12 @@ private:
 	void				CheckParFile(const char* szDestDir, const char* szFilename);
 	bool				IsSplittedFragment(const char* szFilename, const char* szCorrectName);
 	void				CheckMissing();
-	void				RenameFile(const char* szSrcFilename, const char* szDestFileName);

 protected:
 	virtual void		UpdateProgress() {}
 	virtual void		Completed() {}
 	virtual void		PrintMessage(Message::EKind eKind, const char* szFormat, ...) {}
 	virtual void		RegisterParredFile(const char* szFilename) {}
-	virtual void		RegisterRenamedFile(const char* szOldFilename, const char* szNewFileName) {}
 	const char*			GetProgressLabel() { return m_szProgressLabel; }
 	int					GetStageProgress() { return m_iStageProgress; }

@@ -109,6 +109,7 @@ public:
 	EStatus				GetStatus() { return m_eStatus; }
 	void				Cancel();
 	bool				GetCancelled() { return m_bCancelled; }
+	bool				HasSplittedFragments() { return m_bHasSplittedFragments; }
 	bool				HasMissedFiles() { return m_bHasMissedFiles; }
 	void				SetDetectMissing(bool bDetectMissing) { m_bDetectMissing = bDetectMissing; }
 };
--- a/daemon/postprocess/PostScript.cpp
+++ b/daemon/postprocess/PostScript.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -104,14 +104,6 @@ void PostScriptController::ExecuteScript(Options::Script* pScript)

 	PrintMessage(Message::mkInfo, "Executing post-process-script %s for %s", pScript->GetName(), m_pPostInfo->GetNZBInfo()->GetName());

-	char szProgressLabel[1024];
-	snprintf(szProgressLabel, 1024, "Executing post-process-script %s", pScript->GetName());
-	szProgressLabel[1024-1] = '\0';
-
-	DownloadQueue::Lock();
-	m_pPostInfo->SetProgressLabel(szProgressLabel);
-	DownloadQueue::Unlock();
-
 	SetScript(pScript->GetLocation());
 	SetArgs(NULL, false);

@@ -120,7 +112,6 @@ void PostScriptController::ExecuteScript(Options::Script* pScript)
 	szInfoName[1024-1] = '\0';
 	SetInfoName(szInfoName);

-	m_pScript = pScript;
 	SetLogPrefix(pScript->GetDisplayName());
 	m_iPrefixLen = strlen(pScript->GetDisplayName()) + 2; // 2 = strlen(": ");
 	PrepareParams(pScript->GetName());
@@ -169,15 +160,7 @@ void PostScriptController::PrepareParams(const char* szScriptName)

 	// deprecated
 	int iParStatus[] = { 0, 0, 1, 2, 3, 4 };
-	NZBInfo::EParStatus eParStatus = m_pPostInfo->GetNZBInfo()->GetParStatus();
-	// for downloads marked as bad and for deleted downloads pass par status "Failure"
-	// for compatibility with older scripts which don't check "NZBPP_TOTALSTATUS"
-	if (m_pPostInfo->GetNZBInfo()->GetDeleteStatus() != NZBInfo::dsNone ||
-		m_pPostInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksBad)
-	{
-		eParStatus = NZBInfo::psFailure;
-	}
-	SetIntEnvVar("NZBPP_PARSTATUS", iParStatus[eParStatus]);
+	SetIntEnvVar("NZBPP_PARSTATUS", iParStatus[m_pPostInfo->GetNZBInfo()->GetParStatus()]);

 	// deprecated
 	int iUnpackStatus[] = { 0, 0, 1, 2, 3, 4 };
@@ -241,7 +224,6 @@ ScriptStatus::EStatus PostScriptController::AnalyseExitCode(int iExitCode)
 			{
 				PrintMessage(Message::mkInfo, "%s requested par-check/repair", GetInfoName());
 				m_pPostInfo->SetRequestParCheck(true);
-				m_pPostInfo->SetForceRepair(true);
 				return ScriptStatus::srSuccess;
 			}
 			break;
@@ -285,30 +267,23 @@ void PostScriptController::AddMessage(Message::EKind eKind, const char* szText)
 			}
 			else
 			{
-				m_pPostInfo->GetNZBInfo()->PrintMessage(Message::mkError,
-					"Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
+				error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
 			}
 			free(szParam);
 		}
-		else if (!strncmp(szMsgText + 6, "MARK=BAD", 8))
-		{
-			SetLogPrefix(NULL);
-			PrintMessage(Message::mkWarning, "Marking %s as bad", m_pPostInfo->GetNZBInfo()->GetName());
-			SetLogPrefix(m_pScript->GetDisplayName());
-			m_pPostInfo->GetNZBInfo()->SetMarkStatus(NZBInfo::ksBad);
-		}
 		else
 		{
-			m_pPostInfo->GetNZBInfo()->PrintMessage(Message::mkError,
-				"Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
+			error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
 		}
 	}
+	else if (!strncmp(szMsgText, "[HISTORY] ", 10))
+	{
+		m_pPostInfo->GetNZBInfo()->AppendMessage(eKind, 0, szMsgText);
+	}
 	else
 	{
-		m_pPostInfo->GetNZBInfo()->AddMessage(eKind, szText);
-		DownloadQueue::Lock();
-		m_pPostInfo->SetProgressLabel(szText);
-		DownloadQueue::Unlock();
+		ScriptController::AddMessage(eKind, szText);
+		m_pPostInfo->AppendMessage(eKind, szText);
 	}

 	if (g_pOptions->GetPausePostProcess() && !m_pPostInfo->GetNZBInfo()->GetForcePriority())
--- a/daemon/postprocess/PostScript.h
+++ b/daemon/postprocess/PostScript.h
@@ -36,8 +36,8 @@ class PostScriptController : public Thread, public NZBScriptController
 {
 private:
 	PostInfo*			m_pPostInfo;
+	char				m_szNZBName[1024];
 	int					m_iPrefixLen;
-	Options::Script*	m_pScript;

 	void				PrepareParams(const char* szScriptName);
 	ScriptStatus::EStatus	AnalyseExitCode(int iExitCode);
--- a/daemon/postprocess/PrePostProcessor.cpp
+++ b/daemon/postprocess/PrePostProcessor.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -55,7 +55,6 @@
 #include "Unpack.h"
 #include "NZBFile.h"
 #include "StatMeter.h"
-#include "QueueScript.h"

 extern HistoryCoordinator* g_pHistoryCoordinator;
 extern DupeCoordinator* g_pDupeCoordinator;
@@ -63,7 +62,6 @@ extern Options* g_pOptions;
 extern Scheduler* g_pScheduler;
 extern Scanner* g_pScanner;
 extern StatMeter* g_pStatMeter;
-extern QueueScriptCoordinator* g_pQueueScriptCoordinator;

 PrePostProcessor::PrePostProcessor()
 {
@@ -190,26 +188,9 @@ void PrePostProcessor::DownloadQueueUpdate(Subject* Caller, void* Aspect)
 	{
 		NZBAdded(pQueueAspect->pDownloadQueue, pQueueAspect->pNZBInfo);
 	}
-	else if (pQueueAspect->eAction == DownloadQueue::eaNzbDeleted &&
-		pQueueAspect->pNZBInfo->GetDeleting() &&
-		!pQueueAspect->pNZBInfo->GetPostInfo() &&
-		!pQueueAspect->pNZBInfo->GetParCleanup() &&
-		pQueueAspect->pNZBInfo->GetFileList()->empty())
-	{
-		// the deleting of nzbs is usually handled via eaFileDeleted-event, but when deleting nzb without
-		// any files left the eaFileDeleted-event is not fired and we need to process eaNzbDeleted-event instead
-		pQueueAspect->pNZBInfo->PrintMessage(Message::mkInfo,
-			"Collection %s deleted from queue", pQueueAspect->pNZBInfo->GetName());
-		NZBDeleted(pQueueAspect->pDownloadQueue, pQueueAspect->pNZBInfo);
-	}
 	else if ((pQueueAspect->eAction == DownloadQueue::eaFileCompleted ||
 		pQueueAspect->eAction == DownloadQueue::eaFileDeleted))
 	{
-		if (pQueueAspect->eAction == DownloadQueue::eaFileCompleted && !pQueueAspect->pNZBInfo->GetPostInfo())
-		{
-			g_pQueueScriptCoordinator->EnqueueScript(pQueueAspect->pNZBInfo, QueueScriptCoordinator::qeFileDownloaded);
-		}
-
 		if (
 #ifndef DISABLE_PARCHECK
 			!m_ParCoordinator.AddPar(pQueueAspect->pFileInfo, pQueueAspect->eAction == DownloadQueue::eaFileDeleted) &&
@@ -223,9 +204,7 @@ void PrePostProcessor::DownloadQueueUpdate(Subject* Caller, void* Aspect)
 				 IsNZBFileCompleted(pQueueAspect->pNZBInfo, false, true))) &&
 				 pQueueAspect->pFileInfo->GetNZBInfo()->GetDeleteStatus() != NZBInfo::dsHealth)
 			{
-				pQueueAspect->pNZBInfo->PrintMessage(Message::mkInfo,
-					"Collection %s completely downloaded", pQueueAspect->pNZBInfo->GetName());
-				g_pQueueScriptCoordinator->EnqueueScript(pQueueAspect->pNZBInfo, QueueScriptCoordinator::qeNzbDownloaded);
+				info("Collection %s completely downloaded", pQueueAspect->pNZBInfo->GetName());
 				NZBDownloaded(pQueueAspect->pDownloadQueue, pQueueAspect->pNZBInfo);
 			}
 			else if ((pQueueAspect->eAction == DownloadQueue::eaFileDeleted ||
@@ -234,8 +213,7 @@ void PrePostProcessor::DownloadQueueUpdate(Subject* Caller, void* Aspect)
 				!pQueueAspect->pNZBInfo->GetParCleanup() &&
 				IsNZBFileCompleted(pQueueAspect->pNZBInfo, false, true))
 			{
-				pQueueAspect->pNZBInfo->PrintMessage(Message::mkInfo,
-					"Collection %s deleted from queue", pQueueAspect->pNZBInfo->GetName());
+				info("Collection %s deleted from queue", pQueueAspect->pNZBInfo->GetName());
 				NZBDeleted(pQueueAspect->pDownloadQueue, pQueueAspect->pNZBInfo);
 			}
 		}
@@ -262,9 +240,9 @@ void PrePostProcessor::NZBAdded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo
 	{
 		NZBCompleted(pDownloadQueue, pNZBInfo, false);
 	}
-	else
+	else if (!Util::EmptyStr(g_pOptions->GetQueueScript()))
 	{
-		g_pQueueScriptCoordinator->EnqueueScript(pNZBInfo, QueueScriptCoordinator::qeNzbAdded);
+		QueueScriptController::StartScripts(pDownloadQueue, pNZBInfo);
 	}
 }

@@ -272,7 +250,7 @@ void PrePostProcessor::NZBDownloaded(DownloadQueue* pDownloadQueue, NZBInfo* pNZ
 {
 	if (!pNZBInfo->GetPostInfo() && g_pOptions->GetDecode())
 	{
-		pNZBInfo->PrintMessage(Message::mkInfo, "Queueing %s for post-processing", pNZBInfo->GetName());
+		info("Queueing %s for post-processing", pNZBInfo->GetName());

 		pNZBInfo->EnterPostProcess();
 		m_iJobCount++;
@@ -289,6 +267,14 @@ void PrePostProcessor::NZBDownloaded(DownloadQueue* pDownloadQueue, NZBInfo* pNZ
 			pNZBInfo->SetRenameStatus(NZBInfo::rsSkipped);
 		}

+		if (pNZBInfo->GetDeleteStatus() != NZBInfo::dsNone)
+		{
+			pNZBInfo->SetParStatus(NZBInfo::psFailure);
+			pNZBInfo->SetUnpackStatus(NZBInfo::usFailure);
+			pNZBInfo->SetRenameStatus(NZBInfo::rsFailure);
+			pNZBInfo->SetMoveStatus(NZBInfo::msFailure);
+		}
+
 		pDownloadQueue->Save();
 	}
 	else
@@ -305,70 +291,17 @@ void PrePostProcessor::NZBDeleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBIn
 	}
 	pNZBInfo->SetDeleting(false);

-	DeleteCleanup(pNZBInfo);
-
-	if (pNZBInfo->GetDeleteStatus() == NZBInfo::dsHealth ||
-		pNZBInfo->GetDeleteStatus() == NZBInfo::dsBad)
-	{
-		NZBDownloaded(pDownloadQueue, pNZBInfo);
-	}
-	else
-	{
-		NZBCompleted(pDownloadQueue, pNZBInfo, true);
-	}
-}
-
-void PrePostProcessor::NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bSaveQueue)
-{
-	bool bAddToHistory = g_pOptions->GetKeepHistory() > 0 && !pNZBInfo->GetAvoidHistory();
-	if (bAddToHistory)
-	{
-		g_pHistoryCoordinator->AddToHistory(pDownloadQueue, pNZBInfo);
-	}
-	pNZBInfo->SetAvoidHistory(false);
-
-	bool bNeedSave = bAddToHistory;
-
-	if (g_pOptions->GetDupeCheck() && pNZBInfo->GetDupeMode() != dmForce &&
-		(pNZBInfo->GetDeleteStatus() == NZBInfo::dsNone ||
-		 pNZBInfo->GetDeleteStatus() == NZBInfo::dsHealth ||
-		 pNZBInfo->GetDeleteStatus() == NZBInfo::dsBad))
-	{
-		g_pDupeCoordinator->NZBCompleted(pDownloadQueue, pNZBInfo);
-		bNeedSave = true;
-	}
-
-	if (!bAddToHistory)
-	{
-		g_pHistoryCoordinator->DeleteDiskFiles(pNZBInfo);
-		pDownloadQueue->GetQueue()->Remove(pNZBInfo);
-		delete pNZBInfo;
-	}
-
-	if (bSaveQueue && bNeedSave)
-	{
-		pDownloadQueue->Save();
-	}
-}
-
-void PrePostProcessor::DeleteCleanup(NZBInfo* pNZBInfo)
-{
 	if ((g_pOptions->GetDeleteCleanupDisk() && pNZBInfo->GetCleanupDisk()) ||
 		pNZBInfo->GetDeleteStatus() == NZBInfo::dsDupe)
 	{
 		// download was cancelled, deleting already downloaded files from disk
-		for (CompletedFiles::reverse_iterator it = pNZBInfo->GetCompletedFiles()->rbegin(); it != pNZBInfo->GetCompletedFiles()->rend(); it++)
+		for (NZBInfo::Files::reverse_iterator it = pNZBInfo->GetCompletedFiles()->rbegin(); it != pNZBInfo->GetCompletedFiles()->rend(); it++)
 		{
-			CompletedFile* pCompletedFile = *it;
-
-			char szFullFileName[1024];
-			snprintf(szFullFileName, 1024, "%s%c%s", pNZBInfo->GetDestDir(), (int)PATH_SEPARATOR, pCompletedFile->GetFileName());
-			szFullFileName[1024-1] = '\0';
-
-			if (Util::FileExists(szFullFileName))
+			char* szFilename = *it;
+			if (Util::FileExists(szFilename))
 			{
-				detail("Deleting file %s", pCompletedFile->GetFileName());
-				remove(szFullFileName);
+				detail("Deleting file %s", Util::BaseFileName(szFilename));
+				remove(szFilename);
 			}
 		}

@@ -394,6 +327,47 @@ void PrePostProcessor::DeleteCleanup(NZBInfo* pNZBInfo)
 			rmdir(pNZBInfo->GetDestDir());
 		}
 	}
+
+	if (pNZBInfo->GetDeleteStatus() == NZBInfo::dsHealth)
+	{
+		NZBDownloaded(pDownloadQueue, pNZBInfo);
+	}
+	else
+	{
+		NZBCompleted(pDownloadQueue, pNZBInfo, true);
+	}
+}
+
+void PrePostProcessor::NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bSaveQueue)
+{
+	bool bAddToHistory = g_pOptions->GetKeepHistory() > 0 && !pNZBInfo->GetAvoidHistory();
+	if (bAddToHistory)
+	{
+		g_pHistoryCoordinator->AddToHistory(pDownloadQueue, pNZBInfo);
+	}
+	pNZBInfo->SetAvoidHistory(false);
+
+	bool bNeedSave = bAddToHistory;
+
+	if (g_pOptions->GetDupeCheck() && pNZBInfo->GetDupeMode() != dmForce &&
+		(pNZBInfo->GetDeleteStatus() == NZBInfo::dsNone ||
+		 pNZBInfo->GetDeleteStatus() == NZBInfo::dsHealth))
+	{
+		g_pDupeCoordinator->NZBCompleted(pDownloadQueue, pNZBInfo);
+		bNeedSave = true;
+	}
+
+	if (!bAddToHistory)
+	{
+		g_pHistoryCoordinator->DeleteQueuedFile(pNZBInfo->GetQueuedFilename());
+		pDownloadQueue->GetQueue()->Remove(pNZBInfo);
+		delete pNZBInfo;
+	}
+
+	if (bSaveQueue && bNeedSave)
+	{
+		pDownloadQueue->Save();
+	}
 }

 void PrePostProcessor::CheckDiskSpace()
@@ -423,6 +397,11 @@ void PrePostProcessor::CheckPostQueue()
 	if (!m_pCurJob && m_iJobCount > 0)
 	{
 		m_pCurJob = GetNextJob(pDownloadQueue);
+		if (!m_pCurJob && !g_pOptions->GetPausePostProcess())
+		{
+			error("Internal error: no jobs found in queue");
+			m_iJobCount = 0;
+		}
 	}

 	if (m_pCurJob)
@@ -431,12 +410,9 @@ void PrePostProcessor::CheckPostQueue()
 		if (!pPostInfo->GetWorking() && !IsNZBFileDownloading(m_pCurJob))
 		{
 #ifndef DISABLE_PARCHECK
-			if (pPostInfo->GetRequestParCheck() &&
-				(pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped ||
-				 (pPostInfo->GetForceRepair() && !pPostInfo->GetNZBInfo()->GetParFull())) &&
+			if (pPostInfo->GetRequestParCheck() && pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped &&
 				g_pOptions->GetParCheck() != Options::pcManual)
 			{
-				pPostInfo->SetForceParFull(pPostInfo->GetNZBInfo()->GetParStatus() > NZBInfo::psSkipped);
 				pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psNone);
 				pPostInfo->SetRequestParCheck(false);
 				pPostInfo->SetStage(PostInfo::ptQueued);
@@ -452,15 +428,13 @@ void PrePostProcessor::CheckPostQueue()

 				if (!pPostInfo->GetNZBInfo()->GetFileList()->empty())
 				{
-					pPostInfo->GetNZBInfo()->PrintMessage(Message::mkInfo,
-						"Downloading all remaining files for manual par-check for %s", pPostInfo->GetNZBInfo()->GetName());
+					info("Downloading all remaining files for manual par-check for %s", pPostInfo->GetNZBInfo()->GetName());
 					pDownloadQueue->EditEntry(pPostInfo->GetNZBInfo()->GetID(), DownloadQueue::eaGroupResume, 0, NULL);
 					pPostInfo->SetStage(PostInfo::ptFinished);
 				}
 				else
 				{
-					pPostInfo->GetNZBInfo()->PrintMessage(Message::mkInfo,
-						"There are no par-files remain for download for %s", pPostInfo->GetNZBInfo()->GetName());
+					info("There are no par-files remain for download for %s", pPostInfo->GetNZBInfo()->GetName());
 					pPostInfo->SetStage(PostInfo::ptQueued);
 				}
 			}
@@ -500,8 +474,7 @@ NZBInfo* PrePostProcessor::GetNextJob(DownloadQueue* pDownloadQueue)
 	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
 	{
 		NZBInfo* pNZBInfo1 = *it;
-		if (pNZBInfo1->GetPostInfo() && !g_pQueueScriptCoordinator->HasJob(pNZBInfo1->GetID()) &&
-			(!pNZBInfo || pNZBInfo1->GetPriority() > pNZBInfo->GetPriority()) &&
+		if (pNZBInfo1->GetPostInfo() && (!pNZBInfo || pNZBInfo1->GetPriority() > pNZBInfo->GetPriority()) &&
 			(!g_pOptions->GetPausePostProcess() || pNZBInfo1->GetForcePriority()))
 		{
 			pNZBInfo = pNZBInfo1;
@@ -546,21 +519,14 @@ void PrePostProcessor::DeletePostThread(PostInfo* pPostInfo)

 void PrePostProcessor::StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo)
 {
-	if (!pPostInfo->GetStartTime())
-	{
-		pPostInfo->SetStartTime(time(NULL));
-	}
-
 #ifndef DISABLE_PARCHECK
-	if (pPostInfo->GetNZBInfo()->GetRenameStatus() == NZBInfo::rsNone &&
-		pPostInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsNone)
+	if (pPostInfo->GetNZBInfo()->GetRenameStatus() == NZBInfo::rsNone)
 	{
 		UpdatePauseState(g_pOptions->GetParPauseQueue(), "par-rename");
 		m_ParCoordinator.StartParRenameJob(pPostInfo);
 		return;
 	}
-	else if (pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psNone &&
-		pPostInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsNone)
+	else if (pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psNone)
 	{
 		if (m_ParCoordinator.FindMainPars(pPostInfo->GetNZBInfo()->GetDestDir(), NULL))
 		{
@@ -569,8 +535,7 @@ void PrePostProcessor::StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostIn
 		}
 		else
 		{
-			pPostInfo->GetNZBInfo()->PrintMessage(Message::mkInfo,
-				"Nothing to par-check for %s", pPostInfo->GetNZBInfo()->GetName());
+			info("Nothing to par-check for %s", pPostInfo->GetNZBInfo()->GetName());
 			pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psSkipped);
 			pPostInfo->SetWorking(false);
 			pPostInfo->SetStage(PostInfo::ptQueued);
@@ -582,8 +547,7 @@ void PrePostProcessor::StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostIn
 		pPostInfo->GetNZBInfo()->CalcCriticalHealth(false) < 1000 &&
 		m_ParCoordinator.FindMainPars(pPostInfo->GetNZBInfo()->GetDestDir(), NULL))
 	{
-		pPostInfo->GetNZBInfo()->PrintMessage(Message::mkWarning,
-			"Skipping par-check for %s due to health %.1f%% below critical %.1f%%", pPostInfo->GetNZBInfo()->GetName(),
+		warn("Skipping par-check for %s due to health %.1f%% below critical %.1f%%", pPostInfo->GetNZBInfo()->GetName(),
 			pPostInfo->GetNZBInfo()->CalcHealth() / 10.0, pPostInfo->GetNZBInfo()->CalcCriticalHealth(false) / 10.0);
 		pPostInfo->GetNZBInfo()->SetParStatus(NZBInfo::psFailure);
 		return;
@@ -592,8 +556,7 @@ void PrePostProcessor::StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostIn
 		pPostInfo->GetNZBInfo()->GetFailedSize() - pPostInfo->GetNZBInfo()->GetParFailedSize() > 0 &&
 		m_ParCoordinator.FindMainPars(pPostInfo->GetNZBInfo()->GetDestDir(), NULL))
 	{
-		pPostInfo->GetNZBInfo()->PrintMessage(Message::mkInfo,
-			"Collection %s with health %.1f%% needs par-check",
+		info("Collection %s with health %.1f%% needs par-check",
 			pPostInfo->GetNZBInfo()->GetName(), pPostInfo->GetNZBInfo()->CalcHealth() / 10.0);
 		pPostInfo->SetRequestParCheck(true);
 		return;
@@ -602,8 +565,7 @@ void PrePostProcessor::StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostIn

 	NZBParameter* pUnpackParameter = pPostInfo->GetNZBInfo()->GetParameters()->Find("*Unpack:", false);
 	bool bUnpackParam = !(pUnpackParameter && !strcasecmp(pUnpackParameter->GetValue(), "no"));
-	bool bUnpack = bUnpackParam && pPostInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usNone &&
-		pPostInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsNone;
+	bool bUnpack = bUnpackParam && (pPostInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usNone);

 	bool bParFailed = pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psFailure ||
 		pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psRepairPossible ||
@@ -611,18 +573,10 @@ void PrePostProcessor::StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostIn

 	bool bCleanup = !bUnpack &&
 		pPostInfo->GetNZBInfo()->GetCleanupStatus() == NZBInfo::csNone &&
-		!Util::EmptyStr(g_pOptions->GetExtCleanupDisk()) &&
-		((pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psSuccess &&
-		  pPostInfo->GetNZBInfo()->GetUnpackStatus() != NZBInfo::usFailure &&
-		  pPostInfo->GetNZBInfo()->GetUnpackStatus() != NZBInfo::usSpace &&
-		  pPostInfo->GetNZBInfo()->GetUnpackStatus() != NZBInfo::usPassword) ||
+		(pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psSuccess ||
 		 (pPostInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usSuccess &&
-		  pPostInfo->GetNZBInfo()->GetParStatus() != NZBInfo::psFailure) ||
-		 ((pPostInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usNone || 
-		   pPostInfo->GetNZBInfo()->GetUnpackStatus() == NZBInfo::usSkipped) &&
-		  (pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psNone ||
-		   pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psSkipped) &&
-		  pPostInfo->GetNZBInfo()->CalcHealth() == 1000));
+		  pPostInfo->GetNZBInfo()->GetParStatus() != NZBInfo::psFailure)) &&
+		strlen(g_pOptions->GetExtCleanupDisk()) > 0;

 	bool bMoveInter = !bUnpack &&
 		pPostInfo->GetNZBInfo()->GetMoveStatus() == NZBInfo::msNone &&
@@ -631,16 +585,14 @@ void PrePostProcessor::StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostIn
 		pPostInfo->GetNZBInfo()->GetUnpackStatus() != NZBInfo::usPassword &&
 		pPostInfo->GetNZBInfo()->GetParStatus() != NZBInfo::psFailure &&
 		pPostInfo->GetNZBInfo()->GetParStatus() != NZBInfo::psManual &&
-		pPostInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsNone &&
-		!Util::EmptyStr(g_pOptions->GetInterDir()) &&
+		strlen(g_pOptions->GetInterDir()) > 0 &&
 		!strncmp(pPostInfo->GetNZBInfo()->GetDestDir(), g_pOptions->GetInterDir(), strlen(g_pOptions->GetInterDir()));

 	bool bPostScript = true;

 	if (bUnpack && bParFailed)
 	{
-		pPostInfo->GetNZBInfo()->PrintMessage(Message::mkWarning,
-			"Skipping unpack for %s due to %s", pPostInfo->GetNZBInfo()->GetName(),
+		warn("Skipping unpack for %s due to %s", pPostInfo->GetNZBInfo()->GetName(),
 			pPostInfo->GetNZBInfo()->GetParStatus() == NZBInfo::psManual ? "required par-repair" : "par-failure");
 		pPostInfo->GetNZBInfo()->SetUnpackStatus(NZBInfo::usSkipped);
 		bUnpack = false;
@@ -660,6 +612,10 @@ void PrePostProcessor::StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostIn

 	pDownloadQueue->Save();

+	if (!pPostInfo->GetStartTime())
+	{
+		pPostInfo->SetStartTime(time(NULL));
+	}
 	pPostInfo->SetStageTime(time(NULL));

 	if (bUnpack)
@@ -687,44 +643,27 @@ void PrePostProcessor::StartJob(DownloadQueue* pDownloadQueue, PostInfo* pPostIn
 void PrePostProcessor::JobCompleted(DownloadQueue* pDownloadQueue, PostInfo* pPostInfo)
 {
 	NZBInfo* pNZBInfo = pPostInfo->GetNZBInfo();
-
-	if (pPostInfo->GetStartTime() > 0)
-	{
-		pNZBInfo->SetPostTotalSec((int)(time(NULL) - pPostInfo->GetStartTime()));
-		pPostInfo->SetStartTime(0);
-	}
-
 	DeletePostThread(pPostInfo);
 	pNZBInfo->LeavePostProcess();

 	if (IsNZBFileCompleted(pNZBInfo, true, false))
 	{
 		// Cleaning up queue if par-check was successful or unpack was successful or
-		// health is 100% (if unpack and par-check were not performed)
-		// or health is below critical health
-		bool bCanCleanupQueue =
-			((pNZBInfo->GetParStatus() == NZBInfo::psSuccess ||
-			  pNZBInfo->GetParStatus() == NZBInfo::psRepairPossible) &&
-			 pNZBInfo->GetUnpackStatus() != NZBInfo::usFailure &&
-			 pNZBInfo->GetUnpackStatus() != NZBInfo::usSpace &&
-			 pNZBInfo->GetUnpackStatus() != NZBInfo::usPassword) ||
-			(pNZBInfo->GetUnpackStatus() == NZBInfo::usSuccess &&
-			 pNZBInfo->GetParStatus() != NZBInfo::psFailure) ||
-			(pNZBInfo->GetUnpackStatus() <= NZBInfo::usSkipped &&
-			 pNZBInfo->GetParStatus() != NZBInfo::psFailure &&
-			 pNZBInfo->GetFailedSize() - pNZBInfo->GetParFailedSize() == 0) ||
-			(pNZBInfo->CalcHealth() < pNZBInfo->CalcCriticalHealth(false) &&
-			 pNZBInfo->CalcCriticalHealth(false) < 1000);
-		if (g_pOptions->GetParCleanupQueue() && bCanCleanupQueue && !pNZBInfo->GetFileList()->empty())
+		// script was successful (if unpack was not performed)
+		bool bCanCleanupQueue = pNZBInfo->GetParStatus() == NZBInfo::psSuccess ||
+			 pNZBInfo->GetParStatus() == NZBInfo::psRepairPossible ||
+			 pNZBInfo->GetUnpackStatus() == NZBInfo::usSuccess ||
+			 (pNZBInfo->GetUnpackStatus() == NZBInfo::usNone &&
+			  pNZBInfo->GetScriptStatuses()->CalcTotalStatus() == ScriptStatus::srSuccess);
+		if (g_pOptions->GetParCleanupQueue() && bCanCleanupQueue)
 		{
-			pNZBInfo->PrintMessage(Message::mkInfo, "Cleaning up download queue for %s", pNZBInfo->GetName());
-			pNZBInfo->SetParCleanup(true);
-			pDownloadQueue->EditEntry(pNZBInfo->GetID(), DownloadQueue::eaGroupDelete, 0, NULL);
-		}
-
-		if (pNZBInfo->GetUnpackCleanedUpDisk())
-		{
-			pNZBInfo->ClearCompletedFiles();
+			if (!pNZBInfo->GetFileList()->empty())
+			{
+				info("Cleaning up download queue for %s", pNZBInfo->GetName());
+				pNZBInfo->ClearCompletedFiles();
+				pNZBInfo->SetParCleanup(true);
+				pDownloadQueue->EditEntry(pNZBInfo->GetID(), DownloadQueue::eaGroupDelete, 0, NULL);
+			}
 		}

 		NZBCompleted(pDownloadQueue, pNZBInfo, false);
@@ -823,8 +762,7 @@ bool PrePostProcessor::PostQueueDelete(DownloadQueue* pDownloadQueue, IDList* pI
 			{
 				if (pPostInfo->GetWorking())
 				{
-					pPostInfo->GetNZBInfo()->PrintMessage(Message::mkInfo,
-						"Deleting active post-job %s", pPostInfo->GetNZBInfo()->GetName());
+					info("Deleting active post-job %s", pPostInfo->GetNZBInfo()->GetName());
 					pPostInfo->SetDeleted(true);
 #ifndef DISABLE_PARCHECK
 					if (PostInfo::ptLoadingPars <= pPostInfo->GetStage() && pPostInfo->GetStage() <= PostInfo::ptRenaming)
@@ -849,8 +787,7 @@ bool PrePostProcessor::PostQueueDelete(DownloadQueue* pDownloadQueue, IDList* pI
 				}
 				else
 				{
-					pPostInfo->GetNZBInfo()->PrintMessage(Message::mkInfo,
-						"Deleting queued post-job %s", pPostInfo->GetNZBInfo()->GetName());
+					info("Deleting queued post-job %s", pPostInfo->GetNZBInfo()->GetName());
 					JobCompleted(pDownloadQueue, pPostInfo);
 					bOK = true;
 				}
--- a/daemon/postprocess/PrePostProcessor.h
+++ b/daemon/postprocess/PrePostProcessor.h
@@ -60,13 +60,13 @@ private:
 	void				CheckDiskSpace();
 	void				UpdatePauseState(bool bNeedPause, const char* szReason);
 	void				NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
+	void				NZBAdded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
 	void				NZBDeleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
 	void				NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, bool bSaveQueue);
 	bool				PostQueueDelete(DownloadQueue* pDownloadQueue, IDList* pIDList);
 	void				DeletePostThread(PostInfo* pPostInfo);
 	NZBInfo*			GetNextJob(DownloadQueue* pDownloadQueue);
 	void				DownloadQueueUpdate(Subject* Caller, void* Aspect);
-	void				DeleteCleanup(NZBInfo* pNZBInfo);

 public:
 						PrePostProcessor();
@@ -76,7 +76,6 @@ public:
 	bool				HasMoreJobs() { return m_iJobCount > 0; }
 	int					GetJobCount() { return m_iJobCount; }
 	bool				EditList(DownloadQueue* pDownloadQueue, IDList* pIDList, DownloadQueue::EEditAction eAction, int iOffset, const char* szText);
-	void				NZBAdded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
 	void				NZBDownloaded(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
 };

--- a/daemon/postprocess/Unpack.cpp
+++ b/daemon/postprocess/Unpack.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2013-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2013-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -72,28 +72,6 @@ bool UnpackController::FileList::Exists(const char* szFilename)
 	return false;
 }

-UnpackController::ParamList::~ParamList()
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		free(*it);
-	}
-}
-
-bool UnpackController::ParamList::Exists(const char* szParam)
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		char* szParam1 = *it;
-		if (!strcmp(szParam1, szParam))
-		{
-			return true;
-		}
-	}
-
-	return false;
-}
-
 void UnpackController::StartJob(PostInfo* pPostInfo)
 {
 	UnpackController* pUnpackController = new UnpackController();
@@ -107,8 +85,6 @@ void UnpackController::StartJob(PostInfo* pPostInfo)

 void UnpackController::Run()
 {
-	time_t tStart = time(NULL);
-
 	// the locking is needed for accessing the members of NZBInfo
 	DownloadQueue::Lock();

@@ -122,14 +98,7 @@ void UnpackController::Run()
 	m_szPassword[0] = '\0';
 	m_szFinalDir[0] = '\0';
 	m_bFinalDirCreated = false;
-	m_bUnpackOK = true;
-	m_bUnpackStartError = false;
-	m_bUnpackSpaceError = false;
-	m_bUnpackDecryptError = false;
-	m_bUnpackPasswordError = false;
-	m_bAutoTerminated = false;
-	m_bPassListTried = false;
-
+	
 	NZBParameter* pParameter = m_pPostInfo->GetNZBInfo()->GetParameters()->Find("*Unpack:", false);
 	bool bUnpack = !(pParameter && !strcasecmp(pParameter->GetValue(), "no"));

@@ -158,47 +127,36 @@ void UnpackController::Run()
 		CheckArchiveFiles(bScanNonStdFiles);
 	}

-	SetInfoName(m_szInfoName);
-	SetWorkingDir(m_szDestDir);
-
-	bool bHasFiles = m_bHasRarFiles || m_bHasNonStdRarFiles || m_bHasSevenZipFiles || m_bHasSevenZipMultiFiles || m_bHasSplittedFiles;
-
-	if (m_pPostInfo->GetUnpackTried() && !m_pPostInfo->GetParRepaired() &&
-		(!Util::EmptyStr(m_szPassword) || Util::EmptyStr(g_pOptions->GetUnpackPassFile()) || m_pPostInfo->GetPassListTried()))
-	{
-		PrintMessage(Message::mkError, "%s failed: second unpack attempt skipped due to par-check not repaired anything", m_szInfoNameUp);
-		m_pPostInfo->GetNZBInfo()->SetUnpackStatus((NZBInfo::EUnpackStatus)m_pPostInfo->GetLastUnpackStatus());
-		m_pPostInfo->SetStage(PostInfo::ptQueued);
-	}
-	else if (bUnpack && bHasFiles)
+	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)
 		{
-			UnpackArchives(upUnrar, false);
+			ExecuteUnrar();
 		}

 		if (m_bHasSevenZipFiles && m_bUnpackOK)
 		{
-			UnpackArchives(upSevenZip, false);
+			ExecuteSevenZip(false);
 		}

 		if (m_bHasSevenZipMultiFiles && m_bUnpackOK)
 		{
-			UnpackArchives(upSevenZip, true);
-		}
-
-		if (m_bHasSplittedFiles && m_bUnpackOK)
-		{
-			JoinSplittedFiles();
+			ExecuteSevenZip(true);
 		}

 		Completed();
-
-		m_JoinedFiles.Clear();
 	}
 	else
 	{
@@ -208,7 +166,7 @@ void UnpackController::Run()
 		if (bUnpack && m_pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped && 
 			m_pPostInfo->GetNZBInfo()->GetRenameStatus() <= NZBInfo::rsSkipped && m_bHasParFiles)
 		{
-			RequestParCheck(false);
+			RequestParCheck();
 		}
 		else
 #endif
@@ -218,132 +176,33 @@ void UnpackController::Run()
 		}
 	}

-	int iUnpackSec = (int)(time(NULL) - tStart);
-	m_pPostInfo->GetNZBInfo()->SetUnpackSec(m_pPostInfo->GetNZBInfo()->GetUnpackSec() + iUnpackSec);
-
 	m_pPostInfo->SetWorking(false);
 }

-void UnpackController::UnpackArchives(EUnpacker eUnpacker, bool bMultiVolumes)
-{
-	if (!m_pPostInfo->GetUnpackTried() || m_pPostInfo->GetParRepaired())
-	{
-		ExecuteUnpack(eUnpacker, m_szPassword, bMultiVolumes);
-		if (!m_bUnpackOK && m_bHasParFiles && !m_bUnpackPasswordError &&
-			m_pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped)
-		{
-			// for rar4- or 7z-archives try par-check first, before trying password file
-			return;
-		}
-	}
-	else
-	{
-		m_bUnpackOK = false;
-		m_bUnpackDecryptError = m_pPostInfo->GetLastUnpackStatus() == (int)NZBInfo::usPassword;
-	}
-
-	if (!m_bUnpackOK && !m_bUnpackStartError && !m_bUnpackSpaceError &&
-		(m_bUnpackDecryptError || m_bUnpackPasswordError) &&
-		(!GetTerminated() || m_bAutoTerminated) &&
-		Util::EmptyStr(m_szPassword) && !Util::EmptyStr(g_pOptions->GetUnpackPassFile()))
-	{
-		FILE* infile = fopen(g_pOptions->GetUnpackPassFile(), FOPEN_RB);
-		if (!infile)
-		{
-			PrintMessage(Message::mkError, "Could not open file %s", g_pOptions->GetUnpackPassFile());
-			return;
-		}
-
-		char szPassword[512];
-		while (!m_bUnpackOK && !m_bUnpackStartError && !m_bUnpackSpaceError &&
-			(m_bUnpackDecryptError || m_bUnpackPasswordError) &&
-			fgets(szPassword, sizeof(szPassword) - 1, infile))
-		{
-			// trim trailing <CR> and <LF>
-			char* szEnd = szPassword + strlen(szPassword) - 1;
-			while (szEnd >= szPassword && (*szEnd == '\n' || *szEnd == '\r')) *szEnd-- = '\0';
-
-			if (!Util::EmptyStr(szPassword))
-			{
-				if (IsStopped() && m_bAutoTerminated)
-				{
-					ScriptController::Resume();
-					Thread::Resume();
-				}
-				m_bUnpackDecryptError = false;
-				m_bUnpackPasswordError = false;
-				m_bAutoTerminated = false;
-				PrintMessage(Message::mkInfo, "Trying password %s for %s", szPassword, m_szName);
-				ExecuteUnpack(eUnpacker, szPassword, bMultiVolumes);
-			}
-		}
-
-		fclose(infile);
-		m_bPassListTried = !IsStopped() || m_bAutoTerminated;
-	}
-}
-
-void UnpackController::ExecuteUnpack(EUnpacker eUnpacker, const char* szPassword, bool bMultiVolumes)
-{
-	switch (eUnpacker)
-	{
-		case upUnrar:
-			ExecuteUnrar(szPassword);
-			break;
-
-		case upSevenZip:
-			ExecuteSevenZip(szPassword, bMultiVolumes);
-			break;
-	}
-}
-
-void UnpackController::ExecuteUnrar(const char* szPassword)
+void UnpackController::ExecuteUnrar()
 {
 	// Format: 
-	//   unrar x -y -p- -o+ *.rar ./_unpack/
+	//   unrar x -y -p- -o+ *.rar ./_unpack

-	ParamList params;
-	if (!PrepareCmdParams(g_pOptions->GetUnrarCmd(), &params, "unrar"))
+	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)
 	{
-		return;
+		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);

-	if (!params.Exists("x") && !params.Exists("e"))
-	{
-		params.push_back(strdup("x"));
-	}
-
-	params.push_back(strdup("-y"));
-
-	if (!Util::EmptyStr(szPassword))
-	{
-		char szPasswordParam[1024];
-		snprintf(szPasswordParam, 1024, "-p%s", szPassword);
-		szPasswordParam[1024-1] = '\0';
-		params.push_back(strdup(szPasswordParam));
-	}
-	else
-	{
-		params.push_back(strdup("-p-"));
-	}
-
-	if (!params.Exists("-o+") && !params.Exists("-o-"))
-	{
-		params.push_back(strdup("-o+"));
-	}
-
-	params.push_back(strdup(m_bHasNonStdRarFiles ? "*.*" : "*.rar"));
-
-	char szUnpackDirParam[1024];
-	snprintf(szUnpackDirParam, 1024, "%s%c", m_szUnpackDir, PATH_SEPARATOR);
-	szUnpackDirParam[1024-1] = '\0';
-	params.push_back(strdup(szUnpackDirParam));
-
-	params.push_back(NULL);
-	SetArgs((const char**)&params.front(), false);
-	SetScript(params.at(0));
+	SetScript(g_pOptions->GetUnrarCmd());
 	SetLogPrefix("Unrar");
-	ResetEnv();

 	m_bAllOKMessageReceived = false;
 	m_eUnpacker = upUnrar;
@@ -356,7 +215,7 @@ void UnpackController::ExecuteUnrar(const char* szPassword)
 	m_bUnpackOK = iExitCode == 0 && m_bAllOKMessageReceived && !GetTerminated();
 	m_bUnpackStartError = iExitCode == -1;
 	m_bUnpackSpaceError = iExitCode == 5;
-	m_bUnpackPasswordError |= iExitCode == 11; // only for rar5-archives
+	m_bUnpackPasswordError = iExitCode == 11; // only for rar5-archives

 	if (!m_bUnpackOK && iExitCode > 0)
 	{
@@ -364,49 +223,35 @@ void UnpackController::ExecuteUnrar(const char* szPassword)
 	}
 }

-void UnpackController::ExecuteSevenZip(const char* szPassword, bool bMultiVolumes)
+void UnpackController::ExecuteSevenZip(bool bMultiVolumes)
 {
 	// Format: 
 	//   7z x -y -p- -o./_unpack *.7z
 	// OR
 	//   7z x -y -p- -o./_unpack *.7z.001

-	ParamList params;
-	if (!PrepareCmdParams(g_pOptions->GetSevenZipCmd(), &params, "7-Zip"))
-	{
-		return;
-	}
+	char szPasswordParam[1024];
+	const char* szArgs[7];
+	szArgs[0] = g_pOptions->GetSevenZipCmd();
+	szArgs[1] = "x";
+	szArgs[2] = "-y";

-	if (!params.Exists("x") && !params.Exists("e"))
+	szArgs[3] = "-p-";
+	if (strlen(m_szPassword) > 0)
 	{
-		params.push_back(strdup("x"));
-	}
-
-	params.push_back(strdup("-y"));
-
-	if (!Util::EmptyStr(szPassword))
-	{
-		char szPasswordParam[1024];
-		snprintf(szPasswordParam, 1024, "-p%s", szPassword);
-		szPasswordParam[1024-1] = '\0';
-		params.push_back(strdup(szPasswordParam));
-	}
-	else
-	{
-		params.push_back(strdup("-p-"));
+		snprintf(szPasswordParam, 1024, "-p%s", m_szPassword);
+		szArgs[3] = szPasswordParam;
 	}

 	char szUnpackDirParam[1024];
 	snprintf(szUnpackDirParam, 1024, "-o%s", m_szUnpackDir);
-	szUnpackDirParam[1024-1] = '\0';
-	params.push_back(strdup(szUnpackDirParam));
+	szArgs[4] = szUnpackDirParam;

-	params.push_back(strdup(bMultiVolumes ? "*.7z.001" : "*.7z"));
+	szArgs[5] = bMultiVolumes ? "*.7z.001" : "*.7z";
+	szArgs[6] = NULL;
+	SetArgs(szArgs, false);

-	params.push_back(NULL);
-	SetArgs((const char**)&params.front(), false);
-	SetScript(params.at(0));
-	ResetEnv();
+	SetScript(g_pOptions->GetSevenZipCmd());

 	m_bAllOKMessageReceived = false;
 	m_eUnpacker = upSevenZip;
@@ -427,205 +272,6 @@ void UnpackController::ExecuteSevenZip(const char* szPassword, bool bMultiVolume
 	}
 }

-bool UnpackController::PrepareCmdParams(const char* szCommand, ParamList* pParams, const char* szInfoName)
-{
-	if (Util::FileExists(szCommand))
-	{
-		pParams->push_back(strdup(szCommand));
-		return true;
-	}
-
-	char** pCmdArgs = NULL;
-	if (!Util::SplitCommandLine(szCommand, &pCmdArgs))
-	{
-		PrintMessage(Message::mkError, "Could not start %s, failed to parse command line: %s", szInfoName, szCommand);
-		m_bUnpackOK = false;
-		m_bUnpackStartError = true;
-		return false;
-	}
-
-	for (char** szArgPtr = pCmdArgs; *szArgPtr; szArgPtr++)
-	{
-		pParams->push_back(*szArgPtr);
-	}
-	free(pCmdArgs);
-
-	return true;
-}
-
-void UnpackController::JoinSplittedFiles()
-{
-	SetLogPrefix("Join");
-	SetProgressLabel("");
-	m_pPostInfo->SetStageProgress(0);
-
-	// determine groups
-
-	FileList groups;
-	RegEx regExSplitExt(".*\\.[a-z,0-9]{3}\\.001$");
-
-	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 (regExSplitExt.Match(filename) && !FileHasRarSignature(szFullFilename))
-			{
-				if (!JoinFile(filename))
-				{
-					m_bUnpackOK = false;
-					break;
-				}
-			}
-		}
-	}
-
-	SetLogPrefix(NULL);
-	SetProgressLabel("");
-}
-
-bool UnpackController::JoinFile(const char* szFragBaseName)
-{
-	char szDestBaseName[1024];
-	strncpy(szDestBaseName, szFragBaseName, 1024);
-	szDestBaseName[1024-1] = '\0';
-
-	// trim extension
-	char* szExtension = strrchr(szDestBaseName, '.');
-	*szExtension = '\0';
-
-	char szFullFilename[1024];
-	snprintf(szFullFilename, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, szFragBaseName);
-	szFullFilename[1024-1] = '\0';
-	long long lFirstSegmentSize = Util::FileSize(szFullFilename);
-	long long lDifSegmentSize = 0;
-
-	// Validate joinable file:
-	//  - fragments have continuous numbers (no holes);
-	//  - fragments have the same size (except of the last fragment);
-	//  - the last fragment must be smaller than other fragments,
-	//  if it has the same size it is probably not the last and there are missing fragments.
-
-	RegEx regExSplitExt(".*\\.[a-z,0-9]{3}\\.[0-9]{3}$");
-	int iCount = 0;
-	int iMin = -1;
-	int iMax = -1;
-	int iDifSizeCount = 0;
-	int iDifSizeMin = 999999;
-	DirBrowser dir(m_szDestDir);
-	while (const char* filename = dir.Next())
-	{
-		snprintf(szFullFilename, 1024, "%s%c%s", m_szDestDir, PATH_SEPARATOR, filename);
-		szFullFilename[1024-1] = '\0';
-
-		if (strcmp(filename, ".") && strcmp(filename, "..") && !Util::DirectoryExists(szFullFilename) &&
-			regExSplitExt.Match(filename))
-		{
-			const char* szSegExt = strrchr(filename, '.');
-			int iSegNum = atoi(szSegExt + 1);
-			iCount++;
-			iMin = iSegNum < iMin || iMin == -1 ? iSegNum : iMin;
-			iMax = iSegNum > iMax ? iSegNum : iMax;
-			
-			long long lSegmentSize = Util::FileSize(szFullFilename);
-			if (lSegmentSize != lFirstSegmentSize)
-			{
-				iDifSizeCount++;
-				iDifSizeMin = iSegNum < iDifSizeMin ? iSegNum : iDifSizeMin;
-				lDifSegmentSize = lSegmentSize;
-			}
-		}
-	}
-
-	int iCorrectedCount = iCount - (iMin == 0 ? 1 : 0);
-	if ((iMin > 1) || iCorrectedCount != iMax ||
-		((iDifSizeMin != iCorrectedCount || iDifSizeMin > iMax) &&
-		 m_pPostInfo->GetNZBInfo()->GetParStatus() != NZBInfo::psSuccess))
-	{
-		PrintMessage(Message::mkWarning, "Could not join splitted file %s: missing fragments detected", szDestBaseName);
-		return false;
-	}
-
-	// Now can join
-	PrintMessage(Message::mkInfo, "Joining splitted file %s", szDestBaseName);
-	m_pPostInfo->SetStageProgress(0);
-
-	char szErrBuf[256];
-	char szDestFilename[1024];
-	snprintf(szDestFilename, 1024, "%s%c%s", m_szUnpackDir, PATH_SEPARATOR, szDestBaseName);
-	szDestFilename[1024-1] = '\0';
-
-	FILE* pOutFile = fopen(szDestFilename, FOPEN_WBP);
-	if (!pOutFile)
-	{
-		PrintMessage(Message::mkError, "Could not create file %s: %s", szDestFilename, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
-		return false;
-	}
-	if (g_pOptions->GetWriteBuffer() > 0)
-	{
-		setvbuf(pOutFile, NULL, _IOFBF, g_pOptions->GetWriteBuffer() * 1024);
-	}
-
-	long long lTotalSize = lFirstSegmentSize * (iCount - 1) + lDifSegmentSize;
-	long long lWritten = 0;
-
-	static const int BUFFER_SIZE = 1024 * 50;
-	char* buffer = (char*)malloc(BUFFER_SIZE);
-
-	bool bOK = true;
-	for (int i = iMin; i <= iMax; i++)
-	{
-		PrintMessage(Message::mkInfo, "Joining from %s.%.3i", szDestBaseName, i);
-
-		char szMessage[1024];
-		snprintf(szMessage, 1024, "Joining from %s.%.3i", szDestBaseName, i);
-		szMessage[1024-1] = '\0';
-		SetProgressLabel(szMessage);
-
-		char szFragFilename[1024];
-		snprintf(szFragFilename, 1024, "%s%c%s.%.3i", m_szDestDir, PATH_SEPARATOR, szDestBaseName, i);
-		szFragFilename[1024-1] = '\0';
-		if (!Util::FileExists(szFragFilename))
-		{
-			break;
-		}
-
-		FILE* pInFile = fopen(szFragFilename, FOPEN_RB);
-		if (pInFile)
-		{
-			int cnt = BUFFER_SIZE;
-			while (cnt == BUFFER_SIZE)
-			{
-				cnt = (int)fread(buffer, 1, BUFFER_SIZE, pInFile);
-				fwrite(buffer, 1, cnt, pOutFile);
-				lWritten += cnt;
-				m_pPostInfo->SetStageProgress(int(lWritten * 1000 / lTotalSize));
-			}
-			fclose(pInFile);
-
-			char szFragFilename[1024];
-			snprintf(szFragFilename, 1024, "%s.%.3i", szDestBaseName, i);
-			szFragFilename[1024-1] = '\0';
-			m_JoinedFiles.push_back(strdup(szFragFilename));
-		}
-		else
-		{
-			PrintMessage(Message::mkError, "Could not open file %s", szFragFilename);
-			bOK = false;
-			break;
-		}
-	}
-
-	fclose(pOutFile);
-	free(buffer);
-
-	return bOK;
-}
-
 void UnpackController::Completed()
 {
 	bool bCleanupSuccess = Cleanup();
@@ -645,16 +291,11 @@ void UnpackController::Completed()
 	else
 	{
 #ifndef DISABLE_PARCHECK
-		if (!m_bUnpackOK && 
-			(m_pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped ||
-			 !m_pPostInfo->GetNZBInfo()->GetParFull()) &&
+		if (!m_bUnpackOK && m_pPostInfo->GetNZBInfo()->GetParStatus() <= NZBInfo::psSkipped &&
 			!m_bUnpackStartError && !m_bUnpackSpaceError && !m_bUnpackPasswordError &&
-			(!GetTerminated() || m_bAutoTerminated) && m_bHasParFiles)
+			!GetTerminated() && m_bHasParFiles)
 		{
-			RequestParCheck(!Util::EmptyStr(m_szPassword) ||
-				Util::EmptyStr(g_pOptions->GetUnpackPassFile()) || m_bPassListTried ||
-				!(m_bUnpackDecryptError || m_bUnpackPasswordError) ||
-				m_pPostInfo->GetNZBInfo()->GetParStatus() > NZBInfo::psSkipped);
+			RequestParCheck();
 		}
 		else
 #endif
@@ -662,7 +303,7 @@ void UnpackController::Completed()
 			PrintMessage(Message::mkError, "%s failed", m_szInfoNameUp);
 			m_pPostInfo->GetNZBInfo()->SetUnpackStatus(
 				m_bUnpackSpaceError ? NZBInfo::usSpace :
-				m_bUnpackPasswordError || m_bUnpackDecryptError ? NZBInfo::usPassword :
+				m_bUnpackPasswordError ? NZBInfo::usPassword :
 				NZBInfo::usFailure);
 			m_pPostInfo->SetStage(PostInfo::ptQueued);
 		}
@@ -670,17 +311,11 @@ void UnpackController::Completed()
 }

 #ifndef DISABLE_PARCHECK
-void UnpackController::RequestParCheck(bool bForceRepair)
+void UnpackController::RequestParCheck()
 {
-	PrintMessage(Message::mkInfo, "%s requested %s", m_szInfoNameUp, bForceRepair ? "par-check with forced repair" : "par-check/repair");
+	PrintMessage(Message::mkInfo, "%s requested par-check/repair", m_szInfoNameUp);
 	m_pPostInfo->SetRequestParCheck(true);
-	m_pPostInfo->SetForceRepair(bForceRepair);
 	m_pPostInfo->SetStage(PostInfo::ptFinished);
-	m_pPostInfo->SetUnpackTried(true);
-	m_pPostInfo->SetPassListTried(m_bPassListTried);
-	m_pPostInfo->SetLastUnpackStatus((int)(m_bUnpackSpaceError ? NZBInfo::usSpace :
-		m_bUnpackPasswordError || m_bUnpackDecryptError ? NZBInfo::usPassword :
-		NZBInfo::usFailure));
 }
 #endif

@@ -704,7 +339,7 @@ void UnpackController::CreateUnpackDir()
 	char szErrBuf[1024];
 	if (!Util::ForceDirectories(m_szUnpackDir, szErrBuf, sizeof(szErrBuf)))
 	{
-		PrintMessage(Message::mkError, "Could not create directory %s: %s", m_szUnpackDir, szErrBuf);
+		error("Could not create directory %s: %s", m_szUnpackDir, szErrBuf);
 	}
 }

@@ -715,14 +350,12 @@ void UnpackController::CheckArchiveFiles(bool bScanNonStdFiles)
 	m_bHasNonStdRarFiles = false;
 	m_bHasSevenZipFiles = false;
 	m_bHasSevenZipMultiFiles = false;
-	m_bHasSplittedFiles = false;

 	RegEx regExRar(".*\\.rar$");
 	RegEx regExRarMultiSeq(".*\\.(r|s)[0-9][0-9]$");
 	RegEx regExSevenZip(".*\\.7z$");
 	RegEx regExSevenZipMulti(".*\\.7z\\.[0-9]+$");
 	RegEx regExNumExt(".*\\.[0-9]+$");
-	RegEx regExSplitExt(".*\\.[a-z,0-9]{3}\\.[0-9]{3}$");

 	DirBrowser dir(m_szDestDir);
 	while (const char* filename = dir.Next())
@@ -733,9 +366,6 @@ void UnpackController::CheckArchiveFiles(bool bScanNonStdFiles)

 		if (strcmp(filename, ".") && strcmp(filename, "..") && !Util::DirectoryExists(szFullFilename))
 		{
-			const char* szExt = strchr(filename, '.');
-			int iExtNum = szExt ? atoi(szExt + 1) : -1;
-
 			if (regExRar.Match(filename))
 			{
 				m_bHasRarFiles = true;
@@ -748,16 +378,12 @@ void UnpackController::CheckArchiveFiles(bool bScanNonStdFiles)
 			{
 				m_bHasSevenZipMultiFiles = true;
 			}
-			else if (bScanNonStdFiles && !m_bHasNonStdRarFiles && iExtNum > 1 &&
+			else if (bScanNonStdFiles && !m_bHasNonStdRarFiles &&
 				!regExRarMultiSeq.Match(filename) && regExNumExt.Match(filename) &&
 				FileHasRarSignature(szFullFilename))
 			{
 				m_bHasNonStdRarFiles = true;
 			}
-			else if (regExSplitExt.Match(filename) && (iExtNum == 0 || iExtNum == 1))
-			{
-				m_bHasSplittedFiles = true;
-			}
 		}
 	}
 }
@@ -802,7 +428,8 @@ bool UnpackController::Cleanup()
 		DirBrowser dir(m_szUnpackDir);
 		while (const char* filename = dir.Next())
 		{
-			if (strcmp(filename, ".") && strcmp(filename, ".."))
+			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);
@@ -815,13 +442,10 @@ bool UnpackController::Cleanup()
 				// silently overwrite existing files
 				remove(szDstFile);

-				bool bHiddenFile = filename[0] == '.';
-
-				if (!Util::MoveFile(szSrcFile, szDstFile) && !bHiddenFile)
+				if (!Util::MoveFile(szSrcFile, szDstFile))
 				{
 					char szErrBuf[256];
-					PrintMessage(Message::mkError, "Could not move file %s to %s: %s", szSrcFile, szDstFile,
-						Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+					PrintMessage(Message::mkError, "Could not move file %s to %s: %s", szSrcFile, szDstFile, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
 					bOK = false;
 				}

@@ -849,7 +473,6 @@ bool UnpackController::Cleanup()
 		RegEx regExRarMultiSeq(".*\\.[r-z][0-9][0-9]$");
 		RegEx regExSevenZip(".*\\.7z$|.*\\.7z\\.[0-9]+$");
 		RegEx regExNumExt(".*\\.[0-9]+$");
-		RegEx regExSplitExt(".*\\.[a-z,0-9]{3}\\.[0-9]{3}$");

 		DirBrowser dir(m_szDestDir);
 		while (const char* filename = dir.Next())
@@ -862,9 +485,8 @@ bool UnpackController::Cleanup()
 				!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)) ||
-				 (m_bHasSplittedFiles && regExSplitExt.Match(filename) && m_JoinedFiles.Exists(filename))))
+				(regExRarMultiSeq.Match(filename) && FileHasRarSignature(szFullFilename)) ||
+				(m_bHasNonStdRarFiles && regExNumExt.Match(filename) && FileHasRarSignature(szFullFilename))))
 			{
 				PrintMessage(Message::mkInfo, "Deleting file %s", filename);

@@ -952,7 +574,6 @@ void UnpackController::AddMessage(Message::EKind eKind, const char* szText)
 	char szMsgText[1024];
 	strncpy(szMsgText, szText, 1024);
 	szMsgText[1024-1] = '\0';
-	int iLen = strlen(szText);
 	
 	// Modify unrar messages for better readability:
 	// remove the destination path part from message "Extracting file.xxx"
@@ -963,7 +584,8 @@ void UnpackController::AddMessage(Message::EKind eKind, const char* szText)
 		szMsgText[1024-1] = '\0';
 	}

-	m_pPostInfo->GetNZBInfo()->AddMessage(eKind, szMsgText);
+	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"))
@@ -985,39 +607,6 @@ void UnpackController::AddMessage(Message::EKind eKind, const char* szText)
 		SetProgressLabel(szText + 7);
 	}

-	if (m_eUnpacker == upUnrar &&
-		(!strncmp(szText, "Unrar: Checksum error in the encrypted file", 42) ||
-		 !strncmp(szText, "Unrar: CRC failed in the encrypted file", 39)))
-	{
-		m_bUnpackDecryptError = true;
-	}
-
-	if (m_eUnpacker == upUnrar && !strncmp(szText, "Unrar: The specified password is incorrect.'", 43))
-	{
-		m_bUnpackPasswordError = true;
-	}
-
-	if (m_eUnpacker == upSevenZip &&
-		(iLen > 18 && !strncmp(szText + iLen - 45, "Data Error in encrypted file. Wrong password?", 45)))
-	{
-		m_bUnpackDecryptError = true;
-	}
-
-	if (!IsStopped() && (m_bUnpackDecryptError || m_bUnpackPasswordError ||
-		strstr(szText, " : packed data CRC failed in volume") ||
-		strstr(szText, " : packed data checksum error in volume") ||
-		(iLen > 13 && !strncmp(szText + iLen - 13, " - CRC failed", 13)) ||
-		(iLen > 18 && !strncmp(szText + iLen - 18, " - checksum failed", 18)) ||
-		!strncmp(szText, "Unrar: WARNING: You need to start extraction from a previous volume", 67)))
-	{
-		char szMsgText[1024];
-		snprintf(szMsgText, 1024, "Cancelling %s due to errors", m_szInfoName);
-		szMsgText[1024-1] = '\0';
-		m_pPostInfo->GetNZBInfo()->AddMessage(Message::mkWarning, szMsgText);
-		m_bAutoTerminated = true;
-		Stop();
-	}
-
 	if ((m_eUnpacker == upUnrar && !strncmp(szText, "Unrar: All OK", 13)) ||
 		(m_eUnpacker == upSevenZip && !strncmp(szText, "7-Zip: Everything is Ok", 23)))
 	{
@@ -1073,7 +662,7 @@ void MoveController::Run()

 	DownloadQueue::Unlock();

-	PrintMessage(Message::mkInfo, "Moving completed files for %s", szNZBName);
+	info("Moving completed files for %s", szNZBName);

 	bool bOK = MoveFiles();

@@ -1081,7 +670,7 @@ void MoveController::Run()

 	if (bOK)
 	{
-		PrintMessage(Message::mkInfo, "%s successful", szInfoName);
+		info("%s successful", szInfoName);
 		// save new dest dir
 		DownloadQueue::Lock();
 		m_pPostInfo->GetNZBInfo()->SetDestDir(m_szDestDir);
@@ -1090,7 +679,7 @@ void MoveController::Run()
 	}
 	else
 	{
-		PrintMessage(Message::mkError, "%s failed", szInfoName);
+		error("%s failed", szInfoName);
 		m_pPostInfo->GetNZBInfo()->SetMoveStatus(NZBInfo::msFailure);
 	}

@@ -1103,7 +692,7 @@ bool MoveController::MoveFiles()
 	char szErrBuf[1024];
 	if (!Util::ForceDirectories(m_szDestDir, szErrBuf, sizeof(szErrBuf)))
 	{
-		PrintMessage(Message::mkError, "Could not create directory %s: %s", m_szDestDir, szErrBuf);
+		error("Could not create directory %s: %s", m_szDestDir, szErrBuf);
 		return false;
 	}

@@ -1111,7 +700,8 @@ bool MoveController::MoveFiles()
 	DirBrowser dir(m_szInterDir);
 	while (const char* filename = dir.Next())
 	{
-		if (strcmp(filename, ".") && strcmp(filename, ".."))
+		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);
@@ -1120,18 +710,10 @@ bool MoveController::MoveFiles()
 			char szDstFile[1024];
 			Util::MakeUniqueFilename(szDstFile, 1024, m_szDestDir, filename);

-			bool bHiddenFile = filename[0] == '.';
-
-			if (!bHiddenFile)
+			PrintMessage(Message::mkInfo, "Moving file %s to %s", Util::BaseFileName(szSrcFile), m_szDestDir);
+			if (!Util::MoveFile(szSrcFile, szDstFile))
 			{
-				PrintMessage(Message::mkInfo, "Moving file %s to %s", Util::BaseFileName(szSrcFile), m_szDestDir);
-			}
-
-			if (!Util::MoveFile(szSrcFile, szDstFile) && !bHiddenFile)
-			{
-				char szErrBuf[256];
-				PrintMessage(Message::mkError, "Could not move file %s to %s: %s", szSrcFile, szDstFile,
-					Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
+				PrintMessage(Message::mkError, "Could not move file %s to %s: %s", szSrcFile, szDstFile, Util::GetLastErrorMessage(szErrBuf, sizeof(szErrBuf)));
 				bOK = false;
 			}
 		}
@@ -1139,16 +721,12 @@ bool MoveController::MoveFiles()

 	if (bOK && !Util::DeleteDirectoryWithContent(m_szInterDir, szErrBuf, sizeof(szErrBuf)))
 	{
-		PrintMessage(Message::mkWarning, "Could not delete intermediate directory %s: %s", m_szInterDir, szErrBuf);
+		PrintMessage(Message::mkError, "Could not delete intermediate directory %s: %s", m_szInterDir, szErrBuf);
 	}

 	return bOK;
 }

-void MoveController::AddMessage(Message::EKind eKind, const char* szText)
-{
-	m_pPostInfo->GetNZBInfo()->AddMessage(eKind, szText);
-}

 void CleanupController::StartJob(PostInfo* pPostInfo)
 {
@@ -1192,7 +770,7 @@ void CleanupController::Run()

 	DownloadQueue::Unlock();

-	PrintMessage(Message::mkInfo, "Cleaning up %s", szNZBName);
+	info("Cleaning up %s", szNZBName);

 	bool bDeleted = false;
 	bool bOK = Cleanup(m_szDestDir, &bDeleted);
@@ -1208,17 +786,17 @@ void CleanupController::Run()

 	if (bOK && bDeleted)
 	{
-		PrintMessage(Message::mkInfo, "%s successful", szInfoName);
+		info("%s successful", szInfoName);
 		m_pPostInfo->GetNZBInfo()->SetCleanupStatus(NZBInfo::csSuccess);
 	}
 	else if (bOK)
 	{
-		PrintMessage(Message::mkInfo, "Nothing to cleanup for %s", szNZBName);
+		info("Nothing to cleanup for %s", szNZBName);
 		m_pPostInfo->GetNZBInfo()->SetCleanupStatus(NZBInfo::csSuccess);
 	}
 	else
 	{
-		PrintMessage(Message::mkError, "%s failed", szInfoName);
+		error("%s failed", szInfoName);
 		m_pPostInfo->GetNZBInfo()->SetCleanupStatus(NZBInfo::csFailure);
 	}

@@ -1234,22 +812,15 @@ bool CleanupController::Cleanup(const char* szDestDir, bool *bDeleted)
 	DirBrowser dir(szDestDir);
 	while (const char* filename = dir.Next())
 	{
-		char szFullFilename[1024];
-		snprintf(szFullFilename, 1024, "%s%c%s", szDestDir, PATH_SEPARATOR, filename);
-		szFullFilename[1024-1] = '\0';
-
-		bool bIsDir = Util::DirectoryExists(szFullFilename);
-
-		if (strcmp(filename, ".") && strcmp(filename, "..") && bIsDir)
-		{
-			bOK &= Cleanup(szFullFilename, bDeleted);
-		}
-
 		// check file extension
-		bool bDeleteIt = Util::MatchFileExt(filename, g_pOptions->GetExtCleanupDisk(), ",;") && !bIsDir;
+		bool bDeleteIt = Util::MatchFileExt(filename, g_pOptions->GetExtCleanupDisk(), ",;");

 		if (bDeleteIt)
 		{
+			char szFullFilename[1024];
+			snprintf(szFullFilename, 1024, "%s%c%s", szDestDir, PATH_SEPARATOR, filename);
+			szFullFilename[1024-1] = '\0';
+
 			PrintMessage(Message::mkInfo, "Deleting file %s", filename);
 			if (remove(szFullFilename) != 0)
 			{
@@ -1264,8 +835,3 @@ bool CleanupController::Cleanup(const char* szDestDir, bool *bDeleted)

 	return bOK;
 }
-
-void CleanupController::AddMessage(Message::EKind eKind, const char* szText)
-{
-	m_pPostInfo->GetNZBInfo()->AddMessage(eKind, szText);
-}
--- a/daemon/postprocess/Unpack.h
+++ b/daemon/postprocess/Unpack.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2013-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  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
@@ -27,7 +27,6 @@
 #define UNPACK_H

 #include <deque>
-#include <vector>

 #include "Log.h"
 #include "Thread.h"
@@ -51,14 +50,6 @@ private:
 		bool			Exists(const char* szFilename);
 	};

-	typedef std::vector<char*>		ParamListBase;
-	class ParamList : public ParamListBase
-	{
-	public:
-						~ParamList();
-		bool			Exists(const char* szParam);
-	};
-
 private:
 	PostInfo*			m_pPostInfo;
 	char				m_szName[1024];
@@ -76,38 +67,28 @@ private:
 	bool				m_bHasNonStdRarFiles;
 	bool				m_bHasSevenZipFiles;
 	bool				m_bHasSevenZipMultiFiles;
-	bool				m_bHasSplittedFiles;
 	bool				m_bUnpackOK;
 	bool				m_bUnpackStartError;
 	bool				m_bUnpackSpaceError;
-	bool				m_bUnpackDecryptError;
 	bool				m_bUnpackPasswordError;
 	bool				m_bCleanedUpDisk;
-	bool				m_bAutoTerminated;
 	EUnpacker			m_eUnpacker;
 	bool				m_bFinalDirCreated;
-	FileList			m_JoinedFiles;
-	bool				m_bPassListTried;

 protected:
 	virtual bool		ReadLine(char* szBuf, int iBufSize, FILE* pStream);
 	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-	void				ExecuteUnpack(EUnpacker eUnpacker, const char* szPassword, bool bMultiVolumes);
-	void				ExecuteUnrar(const char* szPassword);
-	void				ExecuteSevenZip(const char* szPassword, bool bMultiVolumes);
-	void				UnpackArchives(EUnpacker eUnpacker, bool bMultiVolumes);
-	void				JoinSplittedFiles();
-	bool				JoinFile(const char* szFragBaseName);
+	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(bool bForceRepair);
+	void				RequestParCheck();
 #endif
 	bool				FileHasRarSignature(const char* szFilename);
-	bool				PrepareCmdParams(const char* szCommand, ParamList* pParams, const char* szInfoName);

 public:
 	virtual void		Run();
@@ -124,9 +105,6 @@ private:

 	bool				MoveFiles();

-protected:
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-
 public:
 	virtual void		Run();
 	static void			StartJob(PostInfo* pPostInfo);
@@ -141,9 +119,6 @@ private:

 	bool				Cleanup(const char* szDestDir, bool *bDeleted);

-protected:
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-
 public:
 	virtual void		Run();
 	static void			StartJob(PostInfo* pPostInfo);
--- a/daemon/queue/DiskState.cpp
+++ b/daemon/queue/DiskState.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -29,9 +29,6 @@

 #ifdef WIN32
 #include "win32.h"
-#else
-#include <pthread.h>
-#include <unistd.h>
 #endif

 #include <stdlib.h>
@@ -139,7 +136,7 @@ bool DiskState::SaveDownloadQueue(DownloadQueue* pDownloadQueue)
 		return false;
 	}

-	fprintf(outfile, "%s%i\n", FORMATVERSION_SIGNATURE, 53);
+	fprintf(outfile, "%s%i\n", FORMATVERSION_SIGNATURE, 47);

 	// save nzb-infos
 	SaveNZBQueue(pDownloadQueue, outfile);
@@ -182,7 +179,7 @@ bool DiskState::LoadDownloadQueue(DownloadQueue* pDownloadQueue, Servers* pServe
 	char FileSignatur[128];
 	fgets(FileSignatur, sizeof(FileSignatur), infile);
 	iFormatVersion = ParseFormatVersion(FileSignatur);
-	if (iFormatVersion < 3 || iFormatVersion > 53)
+	if (iFormatVersion < 3 || iFormatVersion > 47)
 	{
 		error("Could not load diskstate due to file version mismatch");
 		fclose(infile);
@@ -364,11 +361,8 @@ void DiskState::SaveNZBInfo(NZBInfo* pNZBInfo, FILE* outfile)
 		(int)pNZBInfo->GetMarkStatus(), (int)pNZBInfo->GetUrlStatus());
 	fprintf(outfile, "%i,%i,%i\n", (int)pNZBInfo->GetUnpackCleanedUpDisk(), (int)pNZBInfo->GetHealthPaused(),
 		(int)pNZBInfo->GetAddUrlPaused());
-	fprintf(outfile, "%i,%i,%i\n", pNZBInfo->GetFileCount(), pNZBInfo->GetParkedFileCount(), pNZBInfo->GetMessageCount());
+	fprintf(outfile, "%i,%i\n", pNZBInfo->GetFileCount(), pNZBInfo->GetParkedFileCount());
 	fprintf(outfile, "%i,%i\n", (int)pNZBInfo->GetMinTime(), (int)pNZBInfo->GetMaxTime());
-	fprintf(outfile, "%i,%i,%i\n", (int)pNZBInfo->GetParFull(), 
-		pNZBInfo->GetPostInfo() ? (int)pNZBInfo->GetPostInfo()->GetForceParFull() : 0,
-		pNZBInfo->GetPostInfo() ? (int)pNZBInfo->GetPostInfo()->GetForceRepair() : 0);

 	fprintf(outfile, "%u,%u\n", pNZBInfo->GetFullContentHash(), pNZBInfo->GetFilteredContentHash());

@@ -388,16 +382,23 @@ void DiskState::SaveNZBInfo(NZBInfo* pNZBInfo, FILE* outfile)
 	fprintf(outfile, "%s\n", pNZBInfo->GetDupeKey());
 	fprintf(outfile, "%i,%i\n", (int)pNZBInfo->GetDupeMode(), pNZBInfo->GetDupeScore());

-	Util::SplitInt64(pNZBInfo->GetDownloadedSize(), &High1, &Low1);
-	fprintf(outfile, "%lu,%lu,%i,%i,%i,%i,%i\n", High1, Low1, pNZBInfo->GetDownloadSec(), pNZBInfo->GetPostTotalSec(),
-		pNZBInfo->GetParSec(), pNZBInfo->GetRepairSec(), pNZBInfo->GetUnpackSec());
+	char DestDirSlash[1024];
+	snprintf(DestDirSlash, 1023, "%s%c", pNZBInfo->GetDestDir(), PATH_SEPARATOR);
+	int iDestDirLen = strlen(DestDirSlash);

 	fprintf(outfile, "%i\n", (int)pNZBInfo->GetCompletedFiles()->size());
-	for (CompletedFiles::iterator it = pNZBInfo->GetCompletedFiles()->begin(); it != pNZBInfo->GetCompletedFiles()->end(); it++)
+	for (NZBInfo::Files::iterator it = pNZBInfo->GetCompletedFiles()->begin(); it != pNZBInfo->GetCompletedFiles()->end(); it++)
 	{
-		CompletedFile* pCompletedFile = *it;
-		fprintf(outfile, "%i,%i,%lu,%s\n", pCompletedFile->GetID(), (int)pCompletedFile->GetStatus(),
-			pCompletedFile->GetCrc(), pCompletedFile->GetFileName());
+		char* szFilename = *it;
+		// do not save full path to reduce the size of queue-file
+		if (!strncmp(DestDirSlash, szFilename, iDestDirLen))
+		{
+			fprintf(outfile, "%s\n", szFilename + iDestDirLen);
+		}
+		else
+		{
+			fprintf(outfile, "%s\n", szFilename);
+		}
 	}

 	fprintf(outfile, "%i\n", (int)pNZBInfo->GetParameters()->size());
@@ -416,6 +417,15 @@ void DiskState::SaveNZBInfo(NZBInfo* pNZBInfo, FILE* outfile)

 	SaveServerStats(pNZBInfo->GetServerStats(), outfile);

+	NZBInfo::Messages* pMessages = pNZBInfo->LockMessages();
+	fprintf(outfile, "%i\n", (int)pMessages->size());
+	for (NZBInfo::Messages::iterator it = pMessages->begin(); it != pMessages->end(); it++)
+	{
+		Message* pMessage = *it;
+		fprintf(outfile, "%i,%i,%s\n", pMessage->GetKind(), (int)pMessage->GetTime(), pMessage->GetText());
+	}
+	pNZBInfo->UnlockMessages();
+
 	// save file-infos
 	int iSize = 0;
 	for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
@@ -629,19 +639,10 @@ bool DiskState::LoadNZBInfo(NZBInfo* pNZBInfo, Servers* pServers, FILE* infile,

 	if (iFormatVersion >= 28)
 	{
-		int iFileCount, iParkedFileCount, iMessageCount = 0;
-		if (iFormatVersion >= 52)
-		{
-			if (fscanf(infile, "%i,%i,%i\n", &iFileCount, &iParkedFileCount, &iMessageCount) != 3) goto error;
-		}
-		else
-		{
-			if (fscanf(infile, "%i,%i\n", &iFileCount, &iParkedFileCount) != 2) goto error;
-		}
-
+		int iFileCount, iParkedFileCount;
+		if (fscanf(infile, "%i,%i\n", &iFileCount, &iParkedFileCount) != 2) goto error;
 		pNZBInfo->SetFileCount(iFileCount);
 		pNZBInfo->SetParkedFileCount(iParkedFileCount);
-		pNZBInfo->SetMessageCount(iMessageCount);
 	}
 	else
 	{
@@ -671,18 +672,6 @@ bool DiskState::LoadNZBInfo(NZBInfo* pNZBInfo, Servers* pServers, FILE* infile,
 		pNZBInfo->SetMaxTime((time_t)iMaxTime);
 	}

-	if (iFormatVersion >= 51)
-	{
-		int iParFull, iForceParFull, iForceRepair;
-		if (fscanf(infile, "%i,%i,%i\n", &iParFull, &iForceParFull, &iForceRepair) != 3) goto error;
-		pNZBInfo->SetParFull((bool)iParFull);
-		if (pNZBInfo->GetPostInfo())
-		{
-			pNZBInfo->GetPostInfo()->SetForceParFull((bool)iForceParFull);
-			pNZBInfo->GetPostInfo()->SetForceRepair((bool)iForceRepair);
-		}
-	}
-
 	if (true) // clang requires a block for goto to work
 	{
 		unsigned int iFullContentHash = 0, iFilteredContentHash = 0;
@@ -757,18 +746,6 @@ bool DiskState::LoadNZBInfo(NZBInfo* pNZBInfo, Servers* pServers, FILE* infile,
 		pNZBInfo->SetDupeScore(iDupeScore);
 	}

-	if (iFormatVersion >= 48)
-	{
-		unsigned long High1, Low1, iDownloadSec, iPostTotalSec, iParSec, iRepairSec, iUnpackSec;
-		if (fscanf(infile, "%lu,%lu,%i,%i,%i,%i,%i\n", &High1, &Low1, &iDownloadSec, &iPostTotalSec, &iParSec, &iRepairSec, &iUnpackSec) != 7) goto error;
-		pNZBInfo->SetDownloadedSize(Util::JoinInt64(High1, Low1));
-		pNZBInfo->SetDownloadSec(iDownloadSec);
-		pNZBInfo->SetPostTotalSec(iPostTotalSec);
-		pNZBInfo->SetParSec(iParSec);
-		pNZBInfo->SetRepairSec(iRepairSec);
-		pNZBInfo->SetUnpackSec(iUnpackSec);
-	}
-
 	if (iFormatVersion >= 4)
 	{
 		int iFileCount;
@@ -778,32 +755,16 @@ bool DiskState::LoadNZBInfo(NZBInfo* pNZBInfo, Servers* pServers, FILE* infile,
 			if (!fgets(buf, sizeof(buf), infile)) goto error;
 			if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'

-			int iID = 0;
+			// restore full file name.
 			char* szFileName = buf;
-			int iStatus = 0;
-			unsigned long lCrc = 0;
-
-			if (iFormatVersion >= 49)
+			char FullFileName[1024];
+			if (!strchr(buf, PATH_SEPARATOR))
 			{
-				if (iFormatVersion >= 50)
-				{
-					if (sscanf(buf, "%i,%i,%lu", &iID, &iStatus, &lCrc) != 3) goto error;
-					szFileName = strchr(buf, ',');
-					if (szFileName) szFileName = strchr(szFileName+1, ',');
-					if (szFileName) szFileName = strchr(szFileName+1, ',');
-				}
-				else
-				{
-					if (sscanf(buf, "%i,%lu", &iStatus, &lCrc) != 2) goto error;
-					szFileName = strchr(buf + 2, ',');
-				}
-				if (szFileName)
-				{
-					szFileName++;
-				}
+				snprintf(FullFileName, 1023, "%s%c%s", pNZBInfo->GetDestDir(), PATH_SEPARATOR, buf);
+				szFileName = FullFileName;
 			}

-			pNZBInfo->GetCompletedFiles()->push_back(new CompletedFile(iID, szFileName, (CompletedFile::EStatus)iStatus, lCrc));
+			pNZBInfo->GetCompletedFiles()->push_back(strdup(szFileName));
 		}
 	}

@@ -852,13 +813,22 @@ bool DiskState::LoadNZBInfo(NZBInfo* pNZBInfo, Servers* pServers, FILE* infile,
 		pNZBInfo->GetCurrentServerStats()->ListOp(pNZBInfo->GetServerStats(), ServerStatList::soSet);
 	}

-	if (iFormatVersion >= 11 && iFormatVersion < 52)
+	if (iFormatVersion >= 11)
 	{
 		int iLogCount;
 		if (fscanf(infile, "%i\n", &iLogCount) != 1) goto error;
 		for (int i = 0; i < iLogCount; i++)
 		{
 			if (!fgets(buf, sizeof(buf), infile)) goto error;
+			if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
+
+			int iKind, iTime;
+			sscanf(buf, "%i,%i", &iKind, &iTime);
+			char* szText = strchr(buf + 2, ',');
+			if (szText) {
+				szText++;
+			}
+			pNZBInfo->AppendMessage((Message::EKind)iKind, (time_t)iTime, szText);
 		}
 	}
 	
@@ -1008,16 +978,13 @@ bool DiskState::LoadServerStats(ServerStatList* pServerStatList, Servers* pServe
 		int iServerID, iSuccessArticles, iFailedArticles;
 		if (fscanf(infile, "%i,%i,%i\n", &iServerID, &iSuccessArticles, &iFailedArticles) != 3) goto error;

-		if (pServers)
+		// find server (id could change if config file was edited)
+		for (Servers::iterator it = pServers->begin(); it != pServers->end(); it++)
 		{
-			// find server (id could change if config file was edited)
-			for (Servers::iterator it = pServers->begin(); it != pServers->end(); it++)
+			NewsServer* pNewsServer = *it;
+			if (pNewsServer->GetStateID() == iServerID)
 			{
-				NewsServer* pNewsServer = *it;
-				if (pNewsServer->GetStateID() == iServerID)
-				{
-					pServerStatList->StatOp(pNewsServer->GetID(), iSuccessArticles, iFailedArticles, ServerStatList::soSet);
-				}
+				pServerStatList->StatOp(pNewsServer->GetID(), iSuccessArticles, iFailedArticles, ServerStatList::soSet);
 			}
 		}
 	}
@@ -1206,12 +1173,12 @@ error:
 	return false;
 }

-bool DiskState::SaveFileState(FileInfo* pFileInfo, bool bCompleted)
+bool DiskState::SaveFileState(FileInfo* pFileInfo)
 {
 	debug("Saving FileState to disk");

 	char szFilename[1024];
-	snprintf(szFilename, 1024, "%s%i%s", g_pOptions->GetQueueDir(), pFileInfo->GetID(), bCompleted ? "c" : "s");
+	snprintf(szFilename, 1024, "%s%is", g_pOptions->GetQueueDir(), pFileInfo->GetID());
 	szFilename[1024-1] = '\0';

 	FILE* outfile = fopen(szFilename, FOPEN_WB);
@@ -1222,7 +1189,7 @@ bool DiskState::SaveFileState(FileInfo* pFileInfo, bool bCompleted)
 		return false;
 	}

-	fprintf(outfile, "%s%i\n", FORMATVERSION_SIGNATURE, 2);
+	fprintf(outfile, "%s%i\n", FORMATVERSION_SIGNATURE, 1);

 	fprintf(outfile, "%i,%i\n", pFileInfo->GetSuccessArticles(), pFileInfo->GetFailedArticles());

@@ -1238,22 +1205,19 @@ bool DiskState::SaveFileState(FileInfo* pFileInfo, bool bCompleted)
 	for (FileInfo::Articles::iterator it = pFileInfo->GetArticles()->begin(); it != pFileInfo->GetArticles()->end(); it++)
 	{
 		ArticleInfo* pArticleInfo = *it;
-		fprintf(outfile, "%i,%lu,%i,%lu\n", (int)pArticleInfo->GetStatus(), (unsigned long)pArticleInfo->GetSegmentOffset(),
-			pArticleInfo->GetSegmentSize(), (unsigned long)pArticleInfo->GetCrc());
+		fprintf(outfile, "%i\n", (int)pArticleInfo->GetStatus());
 	}

 	fclose(outfile);
 	return true;
 }

-bool DiskState::LoadFileState(FileInfo* pFileInfo, Servers* pServers, bool bCompleted)
+bool DiskState::LoadFileState(FileInfo* pFileInfo, Servers* pServers)
 {
 	char szFilename[1024];
-	snprintf(szFilename, 1024, "%s%i%s", g_pOptions->GetQueueDir(), pFileInfo->GetID(), bCompleted ? "c" : "s");
+	snprintf(szFilename, 1024, "%s%is", g_pOptions->GetQueueDir(), pFileInfo->GetID());
 	szFilename[1024-1] = '\0';

-	bool bHasArticles = !pFileInfo->GetArticles()->empty();
-
 	FILE* infile = fopen(szFilename, FOPEN_RB);

 	if (!infile)
@@ -1269,7 +1233,7 @@ bool DiskState::LoadFileState(FileInfo* pFileInfo, Servers* pServers, bool bComp
 	{
 		if (buf[0] != 0) buf[strlen(buf)-1] = 0; // remove traling '\n'
 		iFormatVersion = ParseFormatVersion(buf);
-		if (iFormatVersion > 2)
+		if (iFormatVersion > 1)
 		{
 			error("Could not load diskstate due to file version mismatch");
 			goto error;
@@ -1300,28 +1264,8 @@ bool DiskState::LoadFileState(FileInfo* pFileInfo, Servers* pServers, bool bComp
 	if (fscanf(infile, "%i\n", &size) != 1) goto error;
 	for (int i = 0; i < size; i++)
 	{
-		if (!bHasArticles)
-		{
-			pFileInfo->GetArticles()->push_back(new ArticleInfo());
-		}
-		ArticleInfo* pa = pFileInfo->GetArticles()->at(i);
-
 		int iStatus;
-
-		if (iFormatVersion >= 2)
-		{
-			unsigned long iSegmentOffset, iCrc;
-			int iSegmentSize;
-			if (fscanf(infile, "%i,%lu,%i,%lu\n", &iStatus, &iSegmentOffset, &iSegmentSize, &iCrc) != 4) goto error;
-			pa->SetSegmentOffset(iSegmentOffset);
-			pa->SetSegmentSize(iSegmentSize);
-			pa->SetCrc(iCrc);
-		}
-		else
-		{
-			if (fscanf(infile, "%i\n", &iStatus) != 1) goto error;
-		}
-
+		if (fscanf(infile, "%i\n", &iStatus) != 1) goto error;
 		ArticleInfo::EStatus eStatus = (ArticleInfo::EStatus)iStatus;

 		if (eStatus == ArticleInfo::aiRunning)
@@ -1331,7 +1275,7 @@ bool DiskState::LoadFileState(FileInfo* pFileInfo, Servers* pServers, bool bComp

 		// don't allow all articles be completed or the file will stuck.
 		// such states should never be saved on disk but just in case.
-		if (iCompletedArticles == size - 1 && !bCompleted)
+		if (iCompletedArticles == size - 1)
 		{
 			eStatus = ArticleInfo::aiUndefined;
 		}
@@ -1340,7 +1284,7 @@ bool DiskState::LoadFileState(FileInfo* pFileInfo, Servers* pServers, bool bComp
 			iCompletedArticles++;
 		}

-		pa->SetStatus(eStatus);
+		pFileInfo->GetArticles()->at(i)->SetStatus(eStatus);
 	}

 	pFileInfo->SetCompletedArticles(iCompletedArticles);
@@ -1354,40 +1298,6 @@ error:
 	return false;
 }

-void DiskState::DiscardFiles(NZBInfo* pNZBInfo)
-{
-	for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
-	{
-		FileInfo* pFileInfo = *it;
-		DiscardFile(pFileInfo, true, true, true);
-	}
-
-	char szFilename[1024];
-
-	for (CompletedFiles::iterator it = pNZBInfo->GetCompletedFiles()->begin(); it != pNZBInfo->GetCompletedFiles()->end(); it++)
-	{
-		CompletedFile* pCompletedFile = *it;
-		if (pCompletedFile->GetStatus() != CompletedFile::cfSuccess && pCompletedFile->GetID() > 0)
-		{
-			snprintf(szFilename, 1024, "%s%i", g_pOptions->GetQueueDir(), pCompletedFile->GetID());
-			szFilename[1024-1] = '\0';
-			remove(szFilename);
-
-			snprintf(szFilename, 1024, "%s%is", g_pOptions->GetQueueDir(), pCompletedFile->GetID());
-			szFilename[1024-1] = '\0';
-			remove(szFilename);
-
-			snprintf(szFilename, 1024, "%s%ic", g_pOptions->GetQueueDir(), pCompletedFile->GetID());
-			szFilename[1024-1] = '\0';
-			remove(szFilename);
-		}
-	}
-
-	snprintf(szFilename, 1024, "%sn%i.log", g_pOptions->GetQueueDir(), pNZBInfo->GetID());
-	szFilename[1024-1] = '\0';
-	remove(szFilename);
-}
-
 bool DiskState::LoadPostQueue12(DownloadQueue* pDownloadQueue, NZBList* pNZBList, FILE* infile, int iFormatVersion)
 {
 	debug("Loading post-queue from disk");
@@ -1828,7 +1738,6 @@ bool DiskState::LoadHistory(DownloadQueue* pDownloadQueue, NZBList* pNZBList, Se
 			{
 				pNZBInfo = new NZBInfo();
 				if (!LoadNZBInfo(pNZBInfo, pServers, infile, iFormatVersion)) goto error;
-				pNZBInfo->LeavePostProcess();
 			}

 			pHistoryInfo = new HistoryInfo(pNZBInfo);
@@ -1944,16 +1853,6 @@ void DiskState::DiscardDownloadQueue()
 			snprintf(szFullFilename, 1024, "%s%s", g_pOptions->GetQueueDir(), filename);
 			szFullFilename[1024-1] = '\0';
 			remove(szFullFilename);
-
-			// delete file state file
-			snprintf(szFullFilename, 1024, "%s%ss", g_pOptions->GetQueueDir(), filename);
-			szFullFilename[1024-1] = '\0';
-			remove(szFullFilename);
-
-			// delete failed info file
-			snprintf(szFullFilename, 1024, "%s%sc", g_pOptions->GetQueueDir(), filename);
-			szFullFilename[1024-1] = '\0';
-			remove(szFullFilename);
 		}
 	}
 }
@@ -1968,33 +1867,22 @@ bool DiskState::DownloadQueueExists()
 	return Util::FileExists(fileName);
 }

-void DiskState::DiscardFile(FileInfo* pFileInfo, bool bDeleteData, bool bDeletePartialState, bool bDeleteCompletedState)
+bool DiskState::DiscardFile(FileInfo* pFileInfo)
 {
-	char fileName[1024];
+	// delete diskstate-file for file-info

 	// info and articles file
-	if (bDeleteData)
-	{
-		snprintf(fileName, 1024, "%s%i", g_pOptions->GetQueueDir(), pFileInfo->GetID());
-		fileName[1024-1] = '\0';
-		remove(fileName);
-	}
+	char fileName[1024];
+	snprintf(fileName, 1024, "%s%i", g_pOptions->GetQueueDir(), pFileInfo->GetID());
+	fileName[1024-1] = '\0';
+	remove(fileName);

-	// partial state file
-	if (bDeletePartialState)
-	{
-		snprintf(fileName, 1024, "%s%is", g_pOptions->GetQueueDir(), pFileInfo->GetID());
-		fileName[1024-1] = '\0';
-		remove(fileName);
-	}
+	// state file
+	snprintf(fileName, 1024, "%s%is", g_pOptions->GetQueueDir(), pFileInfo->GetID());
+	fileName[1024-1] = '\0';
+	remove(fileName);

-	// completed state file
-	if (bDeleteCompletedState)
-	{
-		snprintf(fileName, 1024, "%s%ic", g_pOptions->GetQueueDir(), pFileInfo->GetID());
-		fileName[1024-1] = '\0';
-		remove(fileName);
-	}
+	return true;
 }

 void DiskState::CleanupTempDir(DownloadQueue* pDownloadQueue)
@@ -2334,12 +2222,6 @@ void DiskState::CalcNZBFileStats(NZBInfo* pNZBInfo, int iFormatVersion)

 bool DiskState::LoadAllFileStates(DownloadQueue* pDownloadQueue, Servers* pServers)
 {
-	char szCacheFlagFilename[1024];
-	snprintf(szCacheFlagFilename, 1024, "%s%s", g_pOptions->GetQueueDir(), "acache");
-	szCacheFlagFilename[1024-1] = '\0';
-
-	bool bCacheWasActive = Util::FileExists(szCacheFlagFilename);
-
 	DirBrowser dir(g_pOptions->GetQueueDir());
 	while (const char* filename = dir.Next())
 	{
@@ -2347,7 +2229,7 @@ bool DiskState::LoadAllFileStates(DownloadQueue* pDownloadQueue, Servers* pServe
 		char suffix;
 		if (sscanf(filename, "%i%c", &id, &suffix) == 2 && suffix == 's')
 		{
-			if (g_pOptions->GetContinuePartial() && !bCacheWasActive)
+			if (g_pOptions->GetContinuePartial())
 			{
 				for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
 				{
@@ -2358,7 +2240,7 @@ bool DiskState::LoadAllFileStates(DownloadQueue* pDownloadQueue, Servers* pServe
 						if (pFileInfo->GetID() == id)
 						{
 							if (!LoadArticles(pFileInfo)) goto error;
-							if (!LoadFileState(pFileInfo, pServers, false)) goto error;
+							if (!LoadFileState(pFileInfo, pServers)) goto error;
 						}
 					}
 				}
@@ -2852,148 +2734,3 @@ error:

 	return false;
 }
-
-void DiskState::WriteCacheFlag()
-{
-	char szFlagFilename[1024];
-	snprintf(szFlagFilename, 1024, "%s%s", g_pOptions->GetQueueDir(), "acache");
-	szFlagFilename[1024-1] = '\0';
-
-	FILE* outfile = fopen(szFlagFilename, FOPEN_WB);
-	if (!outfile)
-	{
-		error("Error saving diskstate: Could not create file %s", szFlagFilename);
-		return;
-	}
-
-	fclose(outfile);
-}
-
-void DiskState::DeleteCacheFlag()
-{
-	char szFlagFilename[1024];
-	snprintf(szFlagFilename, 1024, "%s%s", g_pOptions->GetQueueDir(), "acache");
-	szFlagFilename[1024-1] = '\0';
-
-	remove(szFlagFilename);
-}
-
-void DiskState::AppendNZBMessage(int iNZBID, Message::EKind eKind, const char* szText)
-{
-	char szLogFilename[1024];
-	snprintf(szLogFilename, 1024, "%sn%i.log", g_pOptions->GetQueueDir(), iNZBID);
-	szLogFilename[1024-1] = '\0';
-
-	FILE* outfile = fopen(szLogFilename, FOPEN_ABP);
-	if (!outfile)
-	{
-		error("Error saving log: Could not create file %s", szLogFilename);
-		return;
-	}
-
-	const char* szMessageType[] = { "INFO", "WARNING", "ERROR", "DEBUG", "DETAIL"};
-
-	char tmp2[1024];
-	strncpy(tmp2, szText, 1024);
-	tmp2[1024-1] = '\0';
-
-	// replace bad chars
-	for (char* p = tmp2; *p; p++)
-	{
-		char ch = *p;
-		if (ch == '\n' || ch == '\r' || ch == '\t')
-		{
-			*p = ' ';
-		}
-	}
-
-	time_t tm = time(NULL);
-	time_t rawtime = tm + 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
-
-	fprintf(outfile, "%s\t%u\t%s\t%s%s", szTime, (int)tm, szMessageType[eKind], tmp2, LINE_ENDING);
-
-	fclose(outfile);
-}
-
-void DiskState::LoadNZBMessages(int iNZBID, MessageList* pMessages)
-{
-	// Important:
-	//   - Other threads may be writing into the log-file at any time;
-	//   - The log-file may also be deleted from another thread;
-
-	char szLogFilename[1024];
-	snprintf(szLogFilename, 1024, "%sn%i.log", g_pOptions->GetQueueDir(), iNZBID);
-	szLogFilename[1024-1] = '\0';
-
-	if (!Util::FileExists(szLogFilename))
-	{
-		return;
-	}
-
-	FILE* infile = fopen(szLogFilename, FOPEN_RB);
-	if (!infile)
-	{
-		error("Error reading log: could not open file %s", szLogFilename);
-		return;
-	}
-
-	int iID = 0;
-	char szLine[1024];
-	while (fgets(szLine, sizeof(szLine), infile))
-	{
-		Util::TrimRight(szLine);
-
-		// time (skip formatted time first)
-		char* p = strchr(szLine, '\t');
-		if (!p) goto exit;
-		int iTime = atoi(p + 1);
-
-		// kind
-		p = strchr(p + 1, '\t');
-		if (!p) goto exit;
-		char* szKind = p + 1;
-
-		Message::EKind eKind = Message::mkError;
-		if (!strncmp(szKind, "INFO", 4))
-		{
-			eKind = Message::mkInfo;
-		}
-		else if (!strncmp(szKind, "WARNING", 7))
-		{
-			eKind = Message::mkWarning;
-		}
-		else if (!strncmp(szKind, "ERROR", 5))
-		{
-			eKind = Message::mkError;
-		}
-		else if (!strncmp(szKind, "DETAIL", 6))
-		{
-			eKind = Message::mkDetail;
-		}
-		else if (!strncmp(szKind, "DEBUG", 5))
-		{
-			eKind = Message::mkDebug;
-		} 
-
-		// text
-		p = strchr(p + 1, '\t');
-		if (!p) goto exit;
-		char* szText = p + 1;
-
-		Message* pMessage = new Message(++iID, eKind, (time_t)iTime, szText);
-		pMessages->push_back(pMessage);
-	}
-
-exit:
-	fclose(infile);
-	return;
-}
--- a/daemon/queue/DiskState.h
+++ b/daemon/queue/DiskState.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #include "FeedInfo.h"
 #include "NewsServer.h"
 #include "StatMeter.h"
-#include "Log.h"

 class DiskState
 {
@@ -59,6 +58,7 @@ private:
 	bool				LoadVolumeStat(Servers* pServers, ServerVolumes* pServerVolumes, FILE* infile, int iFormatVersion);
 	void				CalcFileStats(DownloadQueue* pDownloadQueue, int iFormatVersion);
 	void				CalcNZBFileStats(NZBInfo* pNZBInfo, int iFormatVersion);
+	bool				LoadFileState(FileInfo* pFileInfo, Servers* pServers);
 	bool				LoadAllFileStates(DownloadQueue* pDownloadQueue, Servers* pServers);
 	void				SaveServerStats(ServerStatList* pServerStatList, FILE* outfile);
 	bool				LoadServerStats(ServerStatList* pServerStatList, Servers* pServers, FILE* infile);
@@ -80,21 +80,15 @@ public:
 	bool				SaveDownloadQueue(DownloadQueue* pDownloadQueue);
 	bool				LoadDownloadQueue(DownloadQueue* pDownloadQueue, Servers* pServers);
 	bool				SaveFile(FileInfo* pFileInfo);
-	bool				SaveFileState(FileInfo* pFileInfo, bool bCompleted);
-	bool				LoadFileState(FileInfo* pFileInfo, Servers* pServers, bool bCompleted);
+	bool				SaveFileState(FileInfo* pFileInfo);
 	bool				LoadArticles(FileInfo* pFileInfo);
 	void				DiscardDownloadQueue();
-	void				DiscardFile(FileInfo* pFileInfo, bool bDeleteData, bool bDeletePartialState, bool bDeleteCompletedState);
-	void				DiscardFiles(NZBInfo* pNZBInfo);
+	bool				DiscardFile(FileInfo* pFileInfo);
 	bool				SaveFeeds(Feeds* pFeeds, FeedHistory* pFeedHistory);
 	bool				LoadFeeds(Feeds* pFeeds, FeedHistory* pFeedHistory);
 	bool				SaveStats(Servers* pServers, ServerVolumes* pServerVolumes);
 	bool				LoadStats(Servers* pServers, ServerVolumes* pServerVolumes, bool* pPerfectMatch);
 	void				CleanupTempDir(DownloadQueue* pDownloadQueue);
-	void				WriteCacheFlag();
-	void				DeleteCacheFlag();
-	void				AppendNZBMessage(int iNZBID, Message::EKind eKind, const char* szText);
-	void				LoadNZBMessages(int iNZBID, MessageList* pMessages);
 };

 #endif
--- a/daemon/queue/DownloadInfo.cpp
+++ b/daemon/queue/DownloadInfo.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -35,21 +35,16 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#include <stdarg.h>
 #include <ctype.h>
 #include <sys/stat.h>
 #include <algorithm>

 #include "nzbget.h"
 #include "DownloadInfo.h"
-#include "ArticleWriter.h"
-#include "DiskState.h"
 #include "Options.h"
 #include "Util.h"

 extern Options* g_pOptions;
-extern ArticleCache* g_pArticleCache;
-extern DiskState* g_pDiskState;

 int FileInfo::m_iIDGen = 0;
 int FileInfo::m_iIDMax = 0;
@@ -335,18 +330,6 @@ NZBInfo::NZBInfo() : m_FileList(true)
 	m_pPostInfo = NULL;
 	m_iIDMessageGen = 0;
 	m_iID = ++m_iIDGen;
-	m_lDownloadedSize = 0;
-	m_iDownloadSec = 0;
-	m_iPostTotalSec = 0;
-	m_iParSec = 0;
-	m_iRepairSec = 0;
-	m_iUnpackSec = 0;
-	m_tDownloadStartTime = 0;
-	m_bReprocess = false;
-	m_tQueueScriptTime = 0;
-	m_bParFull = false;
-	m_iMessageCount = 0;
-	m_iCachedMessageCount = 0;
 }

 NZBInfo::~NZBInfo()
@@ -365,6 +348,12 @@ NZBInfo::~NZBInfo()

 	ClearCompletedFiles();

+	for (Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
+	{
+		delete *it;
+	}
+	m_Messages.clear();
+
 	m_FileList.Clear();
 }

@@ -397,9 +386,9 @@ int NZBInfo::GenerateID()

 void NZBInfo::ClearCompletedFiles()
 {
-	for (CompletedFiles::iterator it = m_completedFiles.begin(); it != m_completedFiles.end(); it++)
+	for (Files::iterator it = m_completedFiles.begin(); it != m_completedFiles.end(); it++)
 	{
-		delete *it;
+		free(*it);
 	}
 	m_completedFiles.clear();
 }
@@ -657,81 +646,27 @@ void NZBInfo::UpdateMinMaxTime()
 	}
 }

-MessageList* NZBInfo::LockCachedMessages()
+NZBInfo::Messages* NZBInfo::LockMessages()
 {
 	m_mutexLog.Lock();
 	return &m_Messages;
 }

-void NZBInfo::UnlockCachedMessages()
+void NZBInfo::UnlockMessages()
 {
 	m_mutexLog.Unlock();
 }

-void NZBInfo::AddMessage(Message::EKind eKind, const char * szText)
+void NZBInfo::AppendMessage(Message::EKind eKind, time_t tTime, const char * szText)
 {
-	switch (eKind)
+	if (tTime == 0)
 	{
-		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;
+		tTime = time(NULL);
 	}

 	m_mutexLog.Lock();
-	Message* pMessage = new Message(++m_iIDMessageGen, eKind, time(NULL), szText);
+	Message* pMessage = new Message(++m_iIDMessageGen, eKind, tTime, szText);
 	m_Messages.push_back(pMessage);
-
-	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode() && g_pOptions->GetNzbLog())
-	{
-		g_pDiskState->AppendNZBMessage(m_iID, eKind, szText);
-		m_iMessageCount++;
-	}
-
-	while (m_Messages.size() > (unsigned int)g_pOptions->GetLogBufferSize())
-	{
-		Message* pMessage = m_Messages.front();
-		delete pMessage;
-		m_Messages.pop_front();
-	}
-
-	m_iCachedMessageCount = m_Messages.size();
-	m_mutexLog.Unlock();
-}
-
-void NZBInfo::PrintMessage(Message::EKind eKind, const char* szFormat, ...)
-{
-	char tmp2[1024];
-
-	va_list ap;
-	va_start(ap, szFormat);
-	vsnprintf(tmp2, 1024, szFormat, ap);
-	tmp2[1024-1] = '\0';
-	va_end(ap);
-
-	AddMessage(eKind, tmp2);
-}
-
-void NZBInfo::ClearMessages()
-{
-	m_mutexLog.Lock();
-	m_Messages.Clear();
-	m_iCachedMessageCount = 0;
 	m_mutexLog.Unlock();
 }

@@ -788,41 +723,19 @@ void NZBInfo::LeavePostProcess()
 {
 	delete m_pPostInfo;
 	m_pPostInfo = NULL;
-	ClearMessages();
-}
-
-void NZBInfo::SetActiveDownloads(int iActiveDownloads)
-{
-	if (((m_iActiveDownloads == 0 && iActiveDownloads > 0) ||
-		 (m_iActiveDownloads > 0 && iActiveDownloads == 0)) &&
-		m_eKind == NZBInfo::nkNzb)
-	{
-		if (iActiveDownloads > 0)
-		{
-			m_tDownloadStartTime = time(NULL);
-		}
-		else
-		{
-			m_iDownloadSec += time(NULL) - m_tDownloadStartTime;
-			m_tDownloadStartTime = 0;
-		}
-	}
-	m_iActiveDownloads = iActiveDownloads;
 }

 bool NZBInfo::IsDupeSuccess()
 {
 	bool bFailure =
-		m_eMarkStatus != NZBInfo::ksSuccess &&
-		m_eMarkStatus != NZBInfo::ksGood &&
-		(m_eDeleteStatus != NZBInfo::dsNone ||
+		m_eDeleteStatus != NZBInfo::dsNone ||
 		m_eMarkStatus == NZBInfo::ksBad ||
 		m_eParStatus == NZBInfo::psFailure ||
 		m_eUnpackStatus == NZBInfo::usFailure ||
 		m_eUnpackStatus == NZBInfo::usPassword ||
 		(m_eParStatus == NZBInfo::psSkipped &&
 		 m_eUnpackStatus == NZBInfo::usSkipped &&
-		 CalcHealth() < CalcCriticalHealth(true)));
+		 CalcHealth() < CalcCriticalHealth(true));
 	return !bFailure;
 }

@@ -844,10 +757,6 @@ const char* NZBInfo::MakeTextStatus(bool bIgnoreScriptStatus)
 		{
 			szStatus = "SUCCESS/GOOD";
 		}
-		else if (m_eMarkStatus == NZBInfo::ksSuccess)
-		{
-			szStatus = "SUCCESS/MARK";
-		}
 		else if (m_eDeleteStatus == NZBInfo::dsHealth)
 		{
 			szStatus = "FAILURE/HEALTH";
@@ -860,10 +769,6 @@ const char* NZBInfo::MakeTextStatus(bool bIgnoreScriptStatus)
 		{
 			szStatus = "DELETED/DUPE";
 		}
-		else if (m_eDeleteStatus == NZBInfo::dsBad)
-		{
-			szStatus = "FAILURE/BAD";
-		}
 		else if (m_eParStatus == NZBInfo::psFailure)
 		{
 			szStatus = "FAILURE/PAR";
@@ -990,38 +895,20 @@ void NZBList::Remove(NZBInfo* pNZBInfo)
 	}
 }

-NZBInfo* NZBList::Find(int iID)
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		NZBInfo* pNZBInfo = *it;
-		if (pNZBInfo->GetID() == iID)
-		{
-			return pNZBInfo;
-		}
-	}
-
-	return NULL;
-}
-

 ArticleInfo::ArticleInfo()
 {
 	//debug("Creating ArticleInfo");
-	m_szMessageID = NULL;
-	m_iSize = 0;
-	m_pSegmentContent = NULL;
-	m_iSegmentOffset = 0;
-	m_iSegmentSize = 0;
-	m_eStatus = aiUndefined;
-	m_szResultFilename = NULL;
-	m_lCrc = 0;
+	m_szMessageID		= NULL;
+	m_iSize 			= 0;
+	m_eStatus			= aiUndefined;
+	m_szResultFilename	= NULL;
 }

 ArticleInfo::~ ArticleInfo()
 {
 	//debug("Destroying ArticleInfo");
-	DiscardSegment();
+
 	free(m_szMessageID);
 	free(m_szResultFilename);
 }
@@ -1038,26 +925,8 @@ void ArticleInfo::SetResultFilename(const char * v)
 	m_szResultFilename = strdup(v);
 }

-void ArticleInfo::AttachSegment(char* pContent, long long iOffset, int iSize)
-{
-	DiscardSegment();
-	m_pSegmentContent = pContent;
-	m_iSegmentOffset = iOffset;
-	m_iSegmentSize = iSize;
-}

-void ArticleInfo::DiscardSegment()
-{
-	if (m_pSegmentContent)
-	{
-		free(m_pSegmentContent);
-		m_pSegmentContent = NULL;
-		g_pArticleCache->Free(m_iSegmentSize);
-	}
-}
-
-
-FileInfo::FileInfo(int iID)
+FileInfo::FileInfo()
 {
 	debug("Creating FileInfo");

@@ -1087,9 +956,7 @@ FileInfo::FileInfo(int iID)
 	m_bExtraPriority = false;
 	m_iActiveDownloads = 0;
 	m_bAutoDeleted = false;
-	m_iCachedArticles = 0;
-	m_bPartialChanged = false;
-	m_iID = iID ? iID : ++m_iIDGen;
+	m_iID = ++m_iIDGen;
 }

 FileInfo::~ FileInfo()
@@ -1221,30 +1088,6 @@ void FileList::Remove(FileInfo* pFileInfo)
 	erase(std::find(begin(), end(), pFileInfo));
 }

-CompletedFile::CompletedFile(int iID, const char* szFileName, EStatus eStatus, unsigned long lCrc)
-{
-	m_iID = iID;
-
-	if (FileInfo::m_iIDMax < m_iID)
-	{
-		FileInfo::m_iIDMax = m_iID;
-	}
-
-	m_szFileName = strdup(szFileName);
-	m_eStatus = eStatus;
-	m_lCrc = lCrc;
-}
-
-void CompletedFile::SetFileName(const char* szFileName)
-{
-	free(m_szFileName);
-	m_szFileName = strdup(szFileName);
-}
-
-CompletedFile::~CompletedFile()
-{
-	free(m_szFileName);
-}

 PostInfo::PostInfo()
 {
@@ -1254,12 +1097,6 @@ PostInfo::PostInfo()
 	m_bWorking = false;
 	m_bDeleted = false;
 	m_bRequestParCheck = false;
-	m_bForceParFull = false;
-	m_bForceRepair = false;
-	m_bParRepaired = false;
-	m_bUnpackTried = false;
-	m_bPassListTried = false;
-	m_eLastUnpackStatus = 0;
 	m_szProgressLabel = strdup("");
 	m_iFileProgress = 0;
 	m_iStageProgress = 0;
@@ -1267,6 +1104,7 @@ PostInfo::PostInfo()
 	m_tStageTime = 0;
 	m_eStage = ptQueued;
 	m_pPostThread = NULL;
+	m_iIDMessageGen = 0;
 }

 PostInfo::~ PostInfo()
@@ -1275,6 +1113,11 @@ PostInfo::~ PostInfo()

 	free(m_szProgressLabel);

+	for (Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
+	{
+		delete *it;
+	}
+
 	for (ParredFiles::iterator it = m_ParredFiles.begin(); it != m_ParredFiles.end(); it++)
 	{
 		free(*it);
@@ -1287,6 +1130,32 @@ void PostInfo::SetProgressLabel(const char* szProgressLabel)
 	m_szProgressLabel = strdup(szProgressLabel);
 }

+PostInfo::Messages* PostInfo::LockMessages()
+{
+	m_mutexLog.Lock();
+	return &m_Messages;
+}
+
+void PostInfo::UnlockMessages()
+{
+	m_mutexLog.Unlock();
+}
+
+void PostInfo::AppendMessage(Message::EKind eKind, const char * szText)
+{
+	m_mutexLog.Lock();
+	Message* pMessage = new Message(++m_iIDMessageGen, eKind, time(NULL), szText);
+	m_Messages.push_back(pMessage);
+
+	while (m_Messages.size() > (unsigned int)g_pOptions->GetLogBufferSize())
+	{
+		Message* pMessage = m_Messages.front();
+		delete pMessage;
+		m_Messages.pop_front();
+	}
+	m_mutexLog.Unlock();
+}
+

 DupInfo::DupInfo()
 {
--- a/daemon/queue/DownloadInfo.h
+++ b/daemon/queue/DownloadInfo.h
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -89,12 +89,8 @@ private:
 	int					m_iPartNumber;
 	char*				m_szMessageID;
 	int					m_iSize;
-	char*				m_pSegmentContent;
-	long long			m_iSegmentOffset;
-	int					m_iSegmentSize;
 	EStatus				m_eStatus;
 	char*				m_szResultFilename;
-	unsigned long		m_lCrc;

 public:
 						ArticleInfo();
@@ -103,21 +99,12 @@ public:
 	int 				GetPartNumber() { return m_iPartNumber; }
 	const char* 		GetMessageID() { return m_szMessageID; }
 	void 				SetMessageID(const char* szMessageID);
-	void 				SetSize(int iSize) { m_iSize = iSize; }
+	void 				SetSize(int s) { m_iSize = s; }
 	int 				GetSize() { return m_iSize; }
-	void				AttachSegment(char* pContent, long long iOffset, int iSize);
-	void				DiscardSegment();
-	const char* 		GetSegmentContent() { return m_pSegmentContent; }
-	void				SetSegmentOffset(long long iSegmentOffset) { m_iSegmentOffset = iSegmentOffset; }
-	long long			GetSegmentOffset() { return m_iSegmentOffset; }
-	void 				SetSegmentSize(int iSegmentSize) { m_iSegmentSize = iSegmentSize; }
-	int 				GetSegmentSize() { return m_iSegmentSize; }
 	EStatus				GetStatus() { return m_eStatus; }
 	void				SetStatus(EStatus Status) { m_eStatus = Status; }
 	const char*			GetResultFilename() { return m_szResultFilename; }
 	void 				SetResultFilename(const char* v);
-	unsigned long		GetCrc() { return m_lCrc; }
-	void				SetCrc(unsigned long lCrc) { m_lCrc = lCrc; }
 };

 class FileInfo
@@ -155,16 +142,12 @@ private:
 	bool				m_bExtraPriority;
 	int					m_iActiveDownloads;
 	bool				m_bAutoDeleted;
-	int					m_iCachedArticles;
-	bool				m_bPartialChanged;

 	static int			m_iIDGen;
 	static int			m_iIDMax;

-	friend class CompletedFile;
-
 public:
-						FileInfo(int iID = 0);
+						FileInfo();
 						~FileInfo();
 	int					GetID() { return m_iID; }
 	void				SetID(int iID);
@@ -216,15 +199,11 @@ public:
 	bool				GetOutputInitialized() { return m_bOutputInitialized; }
 	void				SetOutputInitialized(bool bOutputInitialized) { m_bOutputInitialized = bOutputInitialized; }
 	bool				GetExtraPriority() { return m_bExtraPriority; }
-	void				SetExtraPriority(bool bExtraPriority) { m_bExtraPriority = 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; }
-	int					GetCachedArticles() { return m_iCachedArticles; }
-	void				SetCachedArticles(int iCachedArticles) { m_iCachedArticles = iCachedArticles; }
-	bool				GetPartialChanged() { return m_bPartialChanged; }
-	void				SetPartialChanged(bool bPartialChanged) { m_bPartialChanged = bPartialChanged; }
 	ServerStatList*		GetServerStats() { return &m_ServerStats; }
 };
                              
@@ -241,34 +220,6 @@ public:
 	void				Remove(FileInfo* pFileInfo);
 };

-class CompletedFile
-{
-public:
-	enum EStatus
-	{
-		cfUnknown,
-		cfSuccess,
-		cfPartial,
-		cfFailure
-	};
-
-private:
-	int					m_iID;
-	char*				m_szFileName;
-	EStatus				m_eStatus;
-	unsigned long		m_lCrc;
-
-public:
-						CompletedFile(int iID, const char* szFileName, EStatus eStatus, unsigned long lCrc);
-						~CompletedFile();
-	int					GetID() { return m_iID; }
-	void				SetFileName(const char* szFileName);
-	const char*			GetFileName() { return m_szFileName; }
-	EStatus				GetStatus() { return m_eStatus; }
-	unsigned long		GetCrc() { return m_lCrc; }
-};
-
-typedef std::deque<CompletedFile*>	CompletedFiles;

 class NZBParameter
 {
@@ -312,7 +263,7 @@ public:
 private:
 	char* 				m_szName;
 	EStatus				m_eStatus;
-
+	
 	friend class ScriptStatusList;
 	
 public:
@@ -390,16 +341,14 @@ public:
 		dsNone,
 		dsManual,
 		dsHealth,
-		dsDupe,
-		dsBad
+		dsDupe
 	};

 	enum EMarkStatus
 	{
 		ksNone,
 		ksBad,
-		ksGood,
-		ksSuccess
+		ksGood
 	};

 	enum EUrlStatus
@@ -419,6 +368,9 @@ public:
 		nkUrl
 	};

+	typedef std::vector<char*>			Files;
+	typedef std::deque<Message*>		Messages;
+
 	static const int FORCE_PRIORITY = 900;

 	friend class DupInfo;
@@ -457,7 +409,7 @@ private:
 	time_t				m_tMinTime;
 	time_t				m_tMaxTime;
 	int					m_iPriority;
-	CompletedFiles		m_completedFiles;
+	Files				m_completedFiles;
 	ERenameStatus		m_eRenameStatus;
 	EParStatus			m_eParStatus;
 	EUnpackStatus		m_eUnpackStatus;
@@ -488,27 +440,13 @@ private:
 	ServerStatList		m_ServerStats;
 	ServerStatList		m_CurrentServerStats;
 	Mutex				m_mutexLog;
-	MessageList			m_Messages;
+	Messages			m_Messages;
 	int					m_iIDMessageGen;
 	PostInfo*			m_pPostInfo;
-	long long 			m_lDownloadedSize;
-	time_t				m_tDownloadStartTime;
-	int					m_iDownloadSec;
-	int					m_iPostTotalSec;
-	int					m_iParSec;
-	int					m_iRepairSec;
-	int					m_iUnpackSec;
-	bool				m_bReprocess;
-	time_t				m_tQueueScriptTime;
-	bool				m_bParFull;
-	int					m_iMessageCount;
-	int					m_iCachedMessageCount;

 	static int			m_iIDGen;
 	static int			m_iIDMax;

-	void				ClearMessages();
-
 public:
 						NZBInfo();
 						~NZBInfo();
@@ -547,7 +485,7 @@ public:
 	int					GetRemainingParCount() { return m_iRemainingParCount; }
 	void 				SetRemainingParCount(int iRemainingParCount) { m_iRemainingParCount = iRemainingParCount; }
 	int					GetActiveDownloads() { return m_iActiveDownloads; }
-	void				SetActiveDownloads(int iActiveDownloads);
+	void				SetActiveDownloads(int iActiveDownloads) { m_iActiveDownloads = iActiveDownloads; }
 	long long			GetSuccessSize() { return m_lSuccessSize; }
 	void 				SetSuccessSize(long long lSuccessSize) { m_lSuccessSize = lSuccessSize; }
 	long long			GetFailedSize() { return m_lFailedSize; }
@@ -585,7 +523,7 @@ public:
 	void				SetMaxTime(time_t tMaxTime) { m_tMaxTime = tMaxTime; }
 	void				BuildDestDirName();
 	void				BuildFinalDirName(char* szFinalDirBuf, int iBufSize);
-	CompletedFiles*		GetCompletedFiles() { return &m_completedFiles; }		// needs locking (for shared objects)
+	Files*				GetCompletedFiles() { return &m_completedFiles; }		// needs locking (for shared objects)
 	void				ClearCompletedFiles();
 	ERenameStatus		GetRenameStatus() { return m_eRenameStatus; }
 	void				SetRenameStatus(ERenameStatus eRenameStatus) { m_eRenameStatus = eRenameStatus; }
@@ -640,27 +578,6 @@ public:
 	void				SetFullContentHash(unsigned int iFullContentHash) { m_iFullContentHash = iFullContentHash; }
 	unsigned int		GetFilteredContentHash() { return m_iFilteredContentHash; }
 	void				SetFilteredContentHash(unsigned int iFilteredContentHash) { m_iFilteredContentHash = iFilteredContentHash; }
-	long long 			GetDownloadedSize() { return m_lDownloadedSize; }
-	void 				SetDownloadedSize(long long lDownloadedSize) { m_lDownloadedSize = lDownloadedSize; }
-	int					GetDownloadSec() { return m_iDownloadSec; }
-	void 				SetDownloadSec(int iDownloadSec) { m_iDownloadSec = iDownloadSec; }
-	int					GetPostTotalSec() { return m_iPostTotalSec; }
-	void 				SetPostTotalSec(int iPostTotalSec) { m_iPostTotalSec = iPostTotalSec; }
-	int					GetParSec() { return m_iParSec; }
-	void 				SetParSec(int iParSec) { m_iParSec = iParSec; }
-	int					GetRepairSec() { return m_iRepairSec; }
-	void 				SetRepairSec(int iRepairSec) { m_iRepairSec = iRepairSec; }
-	int					GetUnpackSec() { return m_iUnpackSec; }
-	void 				SetUnpackSec(int iUnpackSec) { m_iUnpackSec = iUnpackSec; }
-	time_t				GetDownloadStartTime() { return m_tDownloadStartTime; }
-	void 				SetDownloadStartTime(time_t tDownloadStartTime) { m_tDownloadStartTime = tDownloadStartTime; }
-	void				SetReprocess(bool bReprocess) { m_bReprocess = bReprocess; }
-	bool				GetReprocess() { return m_bReprocess; }
-	time_t				GetQueueScriptTime() { return m_tQueueScriptTime; }
-	void 				SetQueueScriptTime(time_t tQueueScriptTime) { m_tQueueScriptTime = tQueueScriptTime; }
-	void				SetParFull(bool bParFull) { m_bParFull = bParFull; }
-	bool				GetParFull() { return m_bParFull; }
-
 	void				CopyFileList(NZBInfo* pSrcNZBInfo);
 	void				UpdateMinMaxTime();
 	PostInfo*			GetPostInfo() { return m_pPostInfo; }
@@ -669,13 +586,9 @@ public:
 	bool				IsDupeSuccess();
 	const char*			MakeTextStatus(bool bIgnoreScriptStatus);

-	void				AddMessage(Message::EKind eKind, const char* szText);
-	void				PrintMessage(Message::EKind eKind, const char* szFormat, ...);
-	int					GetMessageCount() { return m_iMessageCount; }
-	void				SetMessageCount(int iMessageCount) { m_iMessageCount = iMessageCount; }
-	int					GetCachedMessageCount() { return m_iCachedMessageCount; }
-	MessageList*		LockCachedMessages();
-	void				UnlockCachedMessages();
+	void				AppendMessage(Message::EKind eKind, time_t tTime, const char* szText);
+	Messages*			LockMessages();
+	void				UnlockMessages();
 };

 typedef std::deque<NZBInfo*> NZBQueueBase;
@@ -690,7 +603,6 @@ public:
 	void				Clear();
 	void				Add(NZBInfo* pNZBInfo, bool bAddTop);
 	void				Remove(NZBInfo* pNZBInfo);
-	NZBInfo*			Find(int iID);
 };

 class PostInfo
@@ -710,6 +622,7 @@ public:
 		ptFinished
 	};

+	typedef std::deque<Message*>	Messages;
 	typedef std::vector<char*>		ParredFiles;

 private:
@@ -717,12 +630,6 @@ private:
 	bool				m_bWorking;
 	bool				m_bDeleted;
 	bool				m_bRequestParCheck;
-	bool				m_bForceParFull;
-	bool				m_bForceRepair;
-	bool				m_bParRepaired;
-	bool				m_bUnpackTried;
-	bool				m_bPassListTried;
-	int					m_eLastUnpackStatus;
 	EStage				m_eStage;
 	char*				m_szProgressLabel;
 	int					m_iFileProgress;
@@ -731,6 +638,9 @@ private:
 	time_t				m_tStageTime;
 	Thread*				m_pPostThread;
 	
+	Mutex				m_mutexLog;
+	Messages			m_Messages;
+	int					m_iIDMessageGen;
 	ParredFiles			m_ParredFiles;

 public:
@@ -756,20 +666,11 @@ public:
 	void				SetDeleted(bool bDeleted) { m_bDeleted = bDeleted; }
 	bool				GetRequestParCheck() { return m_bRequestParCheck; }
 	void				SetRequestParCheck(bool bRequestParCheck) { m_bRequestParCheck = bRequestParCheck; }
-	bool				GetForceParFull() { return m_bForceParFull; }
-	void				SetForceParFull(bool bForceParFull) { m_bForceParFull = bForceParFull; }
-	bool				GetForceRepair() { return m_bForceRepair; }
-	void				SetForceRepair(bool bForceRepair) { m_bForceRepair = bForceRepair; }
-	bool				GetParRepaired() { return m_bParRepaired; }
-	void				SetParRepaired(bool bParRepaired) { m_bParRepaired = bParRepaired; }
-	bool				GetUnpackTried() { return m_bUnpackTried; }
-	void				SetUnpackTried(bool bUnpackTried) { m_bUnpackTried = bUnpackTried; }
-	bool				GetPassListTried() { return m_bPassListTried; }
-	void				SetPassListTried(bool bPassListTried) { m_bPassListTried = bPassListTried; }
-	int					GetLastUnpackStatus() { return m_eLastUnpackStatus; }
-	void				SetLastUnpackStatus(int eUnpackStatus) { m_eLastUnpackStatus = eUnpackStatus; }
 	Thread*				GetPostThread() { return m_pPostThread; }
 	void				SetPostThread(Thread* pPostThread) { m_pPostThread = pPostThread; }
+	void				AppendMessage(Message::EKind eKind, const char* szText);
+	Messages*			LockMessages();
+	void				UnlockMessages();
 	ParredFiles*		GetParredFiles() { return &m_ParredFiles; }
 };

@@ -864,7 +765,6 @@ public:
 	{
 		eaNzbFound,
 		eaNzbAdded,
-		eaNzbDeleted,
 		eaFileCompleted,
 		eaFileDeleted,
 		eaUrlCompleted
@@ -909,7 +809,6 @@ public:
 		eaGroupSetDupeKey,		// set duplicate key
 		eaGroupSetDupeScore,	// set duplicate score
 		eaGroupSetDupeMode,		// set duplicate mode
-		eaGroupSort,			// sort groups
 		eaPostDelete,			// cancel post-processing
 		eaHistoryDelete,		// hide history-item
 		eaHistoryFinalDelete,	// delete history-item
@@ -922,10 +821,7 @@ public:
 		eaHistorySetDupeMode,	// set duplicate mode
 		eaHistorySetDupeBackup,	// set duplicate backup flag
 		eaHistoryMarkBad,		// mark history-item as bad (and download other duplicate)
-		eaHistoryMarkGood,		// mark history-item as good (and push it into dup-history)
-		eaHistoryMarkSuccess,	// mark history-item as success (and do nothing more)
-		eaHistorySetCategory,	// set or change category for history-item
-		eaHistorySetName		// set history-item name (rename)
+		eaHistoryMarkGood		// mark history-item as good (and push it into dup-history)
 	};

 	enum EMatchMode
@@ -950,7 +846,7 @@ protected:
 	static void				Loaded() { g_bLoaded = true; }

 public:
-	virtual					~DownloadQueue() {}
+	virtual					~DownloadQueue() {};
 	static bool				IsLoaded() { return g_bLoaded; }
 	static DownloadQueue*	Lock();
 	static void				Unlock();
--- a/daemon/queue/DupeCoordinator.cpp
+++ b/daemon/queue/DupeCoordinator.cpp
@@ -103,58 +103,11 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 			}
 			// Flag saying QueueCoordinator to skip nzb-file
 			pNZBInfo->SetDeleteStatus(NZBInfo::dsManual);
-			g_pHistoryCoordinator->DeleteDiskFiles(pNZBInfo);
+			g_pHistoryCoordinator->DeleteQueuedFile(pNZBInfo->GetQueuedFilename());
 			return;
 		}
 	}

-	// if download has empty dupekey and empty dupescore - check if download queue
-	// or history have an item with the same name and non empty dupekey or dupescore and
-	// take these properties from this item
-	if (Util::EmptyStr(pNZBInfo->GetDupeKey()) && pNZBInfo->GetDupeScore() == 0)
-	{
-		for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
-		{
-			NZBInfo* pQueuedNZBInfo = *it;
-			if (!strcmp(pQueuedNZBInfo->GetName(), pNZBInfo->GetName()) &&
-				(!Util::EmptyStr(pQueuedNZBInfo->GetDupeKey()) || pQueuedNZBInfo->GetDupeScore() != 0))
-			{
-				pNZBInfo->SetDupeKey(pQueuedNZBInfo->GetDupeKey());
-				pNZBInfo->SetDupeScore(pQueuedNZBInfo->GetDupeScore());
-				info("Assigning dupekey %s and dupescore %i to %s from existing queue item with the same name",
-					 pNZBInfo->GetDupeKey(), pNZBInfo->GetDupeScore(), pNZBInfo->GetName());
-				break;
-			}
-		}
-	}
-	if (Util::EmptyStr(pNZBInfo->GetDupeKey()) && pNZBInfo->GetDupeScore() == 0)
-	{
-		for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
-		{
-			HistoryInfo* pHistoryInfo = *it;
-			if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
-				!strcmp(pHistoryInfo->GetNZBInfo()->GetName(), pNZBInfo->GetName()) &&
-				(!Util::EmptyStr(pHistoryInfo->GetNZBInfo()->GetDupeKey()) || pHistoryInfo->GetNZBInfo()->GetDupeScore() != 0))
-			{
-				pNZBInfo->SetDupeKey(pHistoryInfo->GetNZBInfo()->GetDupeKey());
-				pNZBInfo->SetDupeScore(pHistoryInfo->GetNZBInfo()->GetDupeScore());
-				info("Assigning dupekey %s and dupescore %i to %s from existing history item with the same name",
-					 pNZBInfo->GetDupeKey(), pNZBInfo->GetDupeScore(), pNZBInfo->GetName());
-				break;
-			}
-			if (pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
-				!strcmp(pHistoryInfo->GetDupInfo()->GetName(), pNZBInfo->GetName()) &&
-				(!Util::EmptyStr(pHistoryInfo->GetDupInfo()->GetDupeKey()) || pHistoryInfo->GetDupInfo()->GetDupeScore() != 0))
-			{
-				pNZBInfo->SetDupeKey(pHistoryInfo->GetDupInfo()->GetDupeKey());
-				pNZBInfo->SetDupeScore(pHistoryInfo->GetDupInfo()->GetDupeScore());
-				info("Assigning dupekey %s and dupescore %i to %s from existing history item with the same name",
-					 pNZBInfo->GetDupeKey(), pNZBInfo->GetDupeScore(), pNZBInfo->GetName());
-				break;
-			}
-		}
-	}
-
 	// find duplicates in history

 	bool bSkip = false;
@@ -236,7 +189,7 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 			{
 				// Flag saying QueueCoordinator to skip nzb-file
 				pNZBInfo->SetDeleteStatus(NZBInfo::dsDupe);
-				info("Collection %s is a duplicate to %s", pNZBInfo->GetName(), pHistoryInfo->GetNZBInfo()->GetName());
+				info("Collection %s is duplicate to %s", pNZBInfo->GetName(), pHistoryInfo->GetNZBInfo()->GetName());
 				return;
 			}
 		}
@@ -258,7 +211,7 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)

 		// Flag saying QueueCoordinator to skip nzb-file
 		pNZBInfo->SetDeleteStatus(NZBInfo::dsManual);
-		g_pHistoryCoordinator->DeleteDiskFiles(pNZBInfo);
+		g_pHistoryCoordinator->DeleteQueuedFile(pNZBInfo->GetQueuedFilename());
 		return;
 	}

@@ -283,7 +236,7 @@ void DupeCoordinator::NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo)
 				{
 					// Flag saying QueueCoordinator to skip nzb-file
 					pNZBInfo->SetDeleteStatus(NZBInfo::dsDupe);
-					info("Collection %s is a duplicate to %s", pNZBInfo->GetName(), pQueuedNZBInfo->GetName());
+					info("Collection %s is duplicate to %s", pNZBInfo->GetName(), pQueuedNZBInfo->GetName());
 					return;
 				}

@@ -334,7 +287,8 @@ void DupeCoordinator::ReturnBestDupe(DownloadQueue* pDownloadQueue, NZBInfo* pNZ

 		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
 			pHistoryInfo->GetNZBInfo()->GetDupeMode() != dmForce &&
-			pHistoryInfo->GetNZBInfo()->IsDupeSuccess() &&
+			(pHistoryInfo->GetNZBInfo()->IsDupeSuccess() ||
+			 pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksGood) &&
 			SameNameOrKey(pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey(), szNZBName, szDupeKey))
 		{
 			if (!bHistoryDupe || pHistoryInfo->GetNZBInfo()->GetDupeScore() > iHistoryScore)
@@ -411,25 +365,20 @@ void DupeCoordinator::ReturnBestDupe(DownloadQueue* pDownloadQueue, NZBInfo* pNZ
 	}
 }

-void DupeCoordinator::HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, NZBInfo::EMarkStatus eMarkStatus)
+void DupeCoordinator::HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, bool bGood)
 {
 	char szNZBName[1024];
 	pHistoryInfo->GetName(szNZBName, 1024);

-    const char* szMarkStatusName[] = { "NONE", "bad", "good", "success" };
-
-	info("Marking %s as %s", szNZBName, szMarkStatusName[eMarkStatus]);
+	info("Marking %s as %s", szNZBName, (bGood ? "good" : "bad"));

 	if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
 	{
-		pHistoryInfo->GetNZBInfo()->SetMarkStatus(eMarkStatus);
+		pHistoryInfo->GetNZBInfo()->SetMarkStatus(bGood ? NZBInfo::ksGood : NZBInfo::ksBad);
 	}
 	else if (pHistoryInfo->GetKind() == HistoryInfo::hkDup)
 	{
-		pHistoryInfo->GetDupInfo()->SetStatus(
-			eMarkStatus == NZBInfo::ksGood ? DupInfo::dsGood :
-			eMarkStatus == NZBInfo::ksSuccess ? DupInfo::dsSuccess :
-			DupInfo::dsBad);
+		pHistoryInfo->GetDupInfo()->SetStatus(bGood ? DupInfo::dsGood : DupInfo::dsBad);
 	}
 	else
 	{
@@ -446,13 +395,13 @@ void DupeCoordinator::HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pH
 		return;
 	}

-	if (eMarkStatus == NZBInfo::ksGood)
+	if (bGood)
 	{
 		// mark as good
 		// moving all duplicates from history to dup-history
 		HistoryCleanup(pDownloadQueue, pHistoryInfo);
 	}
-	else if (eMarkStatus == NZBInfo::ksBad)
+	else
 	{
 		// mark as bad
 		const char* szDupeKey = pHistoryInfo->GetKind() == HistoryInfo::hkNzb ? pHistoryInfo->GetNZBInfo()->GetDupeKey() :
@@ -502,67 +451,3 @@ void DupeCoordinator::HistoryCleanup(DownloadQueue* pDownloadQueue, HistoryInfo*
 		pDownloadQueue->Save();
 	}
 }
-
-DupeCoordinator::EDupeStatus DupeCoordinator::GetDupeStatus(DownloadQueue* pDownloadQueue,
-	const char* szName, const char* szDupeKey)
-{
-	EDupeStatus eStatuses = dsNone;
-
-	// find duplicates in download queue
-	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
-	{
-		NZBInfo* pNZBInfo = *it;
-		if (SameNameOrKey(szName, szDupeKey, pNZBInfo->GetName(), pNZBInfo->GetDupeKey()))
-		{
-			if (pNZBInfo->GetSuccessArticles() + pNZBInfo->GetFailedArticles() > 0)
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsDownloading);
-			}
-			else
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsQueued);
-			}
-		}
-	}
-
-	// find duplicates in history
-	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
-	{
-		HistoryInfo* pHistoryInfo = *it;
-
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
-			SameNameOrKey(szName, szDupeKey, pHistoryInfo->GetNZBInfo()->GetName(), pHistoryInfo->GetNZBInfo()->GetDupeKey()))
-		{
-			const char* szTextStatus = pHistoryInfo->GetNZBInfo()->MakeTextStatus(true);
-			if (!strncasecmp(szTextStatus, "SUCCESS", 7))
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsSuccess);
-			}
-			else if (!strncasecmp(szTextStatus, "FAILURE", 7))
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsFailure);
-			}
-			else if (!strncasecmp(szTextStatus, "WARNING", 7))
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsWarning);
-			}
-		}
-
-		if (pHistoryInfo->GetKind() == HistoryInfo::hkDup &&
-			SameNameOrKey(szName, szDupeKey, pHistoryInfo->GetDupInfo()->GetName(), pHistoryInfo->GetDupInfo()->GetDupeKey()))
-		{
-			if (pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsSuccess ||
-				pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsGood)
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsSuccess);
-			}
-			else if (pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsFailed ||
-					 pHistoryInfo->GetDupInfo()->GetStatus() == DupInfo::dsBad)
-			{
-				eStatuses = (EDupeStatus)(eStatuses | dsFailure);
-			}
-		}
-	}
-
-	return eStatuses;
-}
--- a/daemon/queue/DupeCoordinator.h
+++ b/daemon/queue/DupeCoordinator.h
@@ -30,17 +30,6 @@

 class DupeCoordinator
 {
-public:
-	enum EDupeStatus
-	{
-		dsNone = 0,
-		dsQueued = 1,
-		dsDownloading = 2,
-		dsSuccess = 4,
-		dsWarning = 8,
-		dsFailure = 16
-	};
-
 private:
 	void				ReturnBestDupe(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, const char* szNZBName, const char* szDupeKey);
 	void				HistoryCleanup(DownloadQueue* pDownloadQueue, HistoryInfo* pMarkHistoryInfo);
@@ -49,8 +38,7 @@ private:
 public:
 	void				NZBCompleted(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
 	void				NZBFound(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
-	void				HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, NZBInfo::EMarkStatus eMarkStatus);
-	EDupeStatus			GetDupeStatus(DownloadQueue* pDownloadQueue, const char* szName, const char* szDupeKey);
+	void				HistoryMark(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, bool bGood);
 };

 #endif
--- a/daemon/queue/HistoryCoordinator.cpp
+++ b/daemon/queue/HistoryCoordinator.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -119,7 +119,7 @@ void HistoryCoordinator::IntervalCheck()
 				
 				if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
 				{
-					DeleteDiskFiles(pHistoryInfo->GetNZBInfo());
+					DeleteQueuedFile(pHistoryInfo->GetNZBInfo()->GetQueuedFilename());
 				}
 				info("Collection %s removed from history", szNiceName);

@@ -144,24 +144,16 @@ void HistoryCoordinator::IntervalCheck()
 	DownloadQueue::Unlock();
 }

-void HistoryCoordinator::DeleteDiskFiles(NZBInfo* pNZBInfo)
+void HistoryCoordinator::DeleteQueuedFile(const char* szQueuedFile)
 {
-	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
-	{
-		// delete parked files
-		g_pDiskState->DiscardFiles(pNZBInfo);
-	}
-	pNZBInfo->GetFileList()->Clear();
-
-	// delete nzb-file
 	if (!g_pOptions->GetNzbCleanupDisk())
 	{
 		return;
 	}

-	// QueuedFile may contain one filename or several filenames separated
+	// szQueuedFile may contain one filename or several filenames separated
 	// with "|"-character (for merged groups)
-	char* szFilename = strdup(pNZBInfo->GetQueuedFilename());
+	char* szFilename = strdup(szQueuedFile);
 	char* szEnd = szFilename - 1;
 	
 	while (szEnd)
@@ -228,7 +220,7 @@ void HistoryCoordinator::AddToHistory(DownloadQueue* pDownloadQueue, NZBInfo* pN
 		pNZBInfo->GetFileList()->Clear();
 	}

-	pNZBInfo->PrintMessage(Message::mkInfo, "Collection %s added to history", pNZBInfo->GetName());
+	info("Collection %s added to history", pNZBInfo->GetName());
 }

 void HistoryCoordinator::HistoryHide(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, int rindex)
@@ -250,7 +242,6 @@ void HistoryCoordinator::HistoryHide(DownloadQueue* pDownloadQueue, HistoryInfo*
 	pDupInfo->SetStatus(
 		pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksGood ? DupInfo::dsGood :
 		pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksBad ? DupInfo::dsBad :
-		pHistoryInfo->GetNZBInfo()->GetMarkStatus() == NZBInfo::ksSuccess ? DupInfo::dsSuccess :
 		pHistoryInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsDupe ? DupInfo::dsDupe :
 		pHistoryInfo->GetNZBInfo()->GetDeleteStatus() == NZBInfo::dsManual ? DupInfo::dsDeleted :
 		pHistoryInfo->GetNZBInfo()->IsDupeSuccess() ? DupInfo::dsSuccess :
@@ -260,7 +251,7 @@ void HistoryCoordinator::HistoryHide(DownloadQueue* pDownloadQueue, HistoryInfo*
 	pNewHistoryInfo->SetTime(pHistoryInfo->GetTime());
 	(*pDownloadQueue->GetHistory())[pDownloadQueue->GetHistory()->size() - 1 - rindex] = pNewHistoryInfo;

-	DeleteDiskFiles(pHistoryInfo->GetNZBInfo());
+	DeleteQueuedFile(pHistoryInfo->GetNZBInfo()->GetQueuedFilename());

 	delete pHistoryInfo;
 	info("Collection %s removed from history", szNiceName);
@@ -278,8 +269,6 @@ bool HistoryCoordinator::EditList(DownloadQueue* pDownloadQueue, IDList* pIDList
 			HistoryInfo* pHistoryInfo = *itHistory;
 			if (pHistoryInfo->GetID() == iID)
 			{
-				bOK = true;
-
 				switch (eAction)
 				{
 					case DownloadQueue::eaHistoryDelete:
@@ -297,15 +286,7 @@ bool HistoryCoordinator::EditList(DownloadQueue* pDownloadQueue, IDList* pIDList
 						break;

 					case DownloadQueue::eaHistorySetParameter:
-						bOK = HistorySetParameter(pHistoryInfo, szText);
-						break;
-
- 					case DownloadQueue::eaHistorySetCategory:
-						bOK = HistorySetCategory(pHistoryInfo, szText);
-						break;
-
- 					case DownloadQueue::eaHistorySetName:
-						bOK = HistorySetName(pHistoryInfo, szText);
+						HistorySetParameter(pHistoryInfo, szText);
 						break;

 					case DownloadQueue::eaHistorySetDupeKey:
@@ -316,15 +297,8 @@ bool HistoryCoordinator::EditList(DownloadQueue* pDownloadQueue, IDList* pIDList
 						break;

 					case DownloadQueue::eaHistoryMarkBad:
-						g_pDupeCoordinator->HistoryMark(pDownloadQueue, pHistoryInfo, NZBInfo::ksBad);
-						break;
-
 					case DownloadQueue::eaHistoryMarkGood:
-						g_pDupeCoordinator->HistoryMark(pDownloadQueue, pHistoryInfo, NZBInfo::ksGood);
-						break;
-
-					case DownloadQueue::eaHistoryMarkSuccess:
-						g_pDupeCoordinator->HistoryMark(pDownloadQueue, pHistoryInfo, NZBInfo::ksSuccess);
+						g_pDupeCoordinator->HistoryMark(pDownloadQueue, pHistoryInfo, eAction == DownloadQueue::eaHistoryMarkGood);
 						break;

 					default:
@@ -332,6 +306,7 @@ bool HistoryCoordinator::EditList(DownloadQueue* pDownloadQueue, IDList* pIDList
 						break;
 				}

+				bOK = true;
 				break;
 			}
 		}
@@ -354,7 +329,20 @@ void HistoryCoordinator::HistoryDelete(DownloadQueue* pDownloadQueue, HistoryLis

 	if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
 	{
-		DeleteDiskFiles(pHistoryInfo->GetNZBInfo());
+		NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
+
+		// delete parked files
+		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
+		{
+			for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
+			{
+				FileInfo* pFileInfo = *it;
+				g_pDiskState->DiscardFile(pFileInfo);
+			}
+		}
+		pNZBInfo->GetFileList()->Clear();
+
+		DeleteQueuedFile(pNZBInfo->GetQueuedFilename());
 	}

 	if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb &&
@@ -394,6 +382,7 @@ void HistoryCoordinator::HistoryReturn(DownloadQueue* pDownloadQueue, HistoryLis
 	char szNiceName[1024];
 	pHistoryInfo->GetName(szNiceName, 1024);
 	debug("Returning %s from history back to download queue", szNiceName);
+	bool bUnparked = false;
 	NZBInfo* pNZBInfo = NULL;

 	if (bReprocess && pHistoryInfo->GetKind() != HistoryInfo::hkNzb)
@@ -407,7 +396,6 @@ void HistoryCoordinator::HistoryReturn(DownloadQueue* pDownloadQueue, HistoryLis
 		pNZBInfo = pHistoryInfo->GetNZBInfo();

 		// unpark files
-		bool bUnparked = false;
 		for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
 		{
 			FileInfo* pFileInfo = *it;
@@ -415,12 +403,6 @@ void HistoryCoordinator::HistoryReturn(DownloadQueue* pDownloadQueue, HistoryLis
 			bUnparked = true;
 		}

-		if (!(bUnparked || bReprocess))
-		{
-			warn("Could not return %s back from history to download queue: history item does not have any files left for download", szNiceName);
-			return;
-		}
-
 		pDownloadQueue->GetQueue()->push_front(pNZBInfo);
 		pHistoryInfo->DiscardNZBInfo();

@@ -431,16 +413,10 @@ void HistoryCoordinator::HistoryReturn(DownloadQueue* pDownloadQueue, HistoryLis
 			pNZBInfo->SetUnpackStatus(NZBInfo::usNone);
 			pNZBInfo->SetCleanupStatus(NZBInfo::csNone);
 			pNZBInfo->SetRenameStatus(NZBInfo::rsNone);
-			pNZBInfo->SetPostTotalSec(pNZBInfo->GetPostTotalSec() - pNZBInfo->GetUnpackSec());
-			pNZBInfo->SetUnpackSec(0);

 			if (ParCoordinator::FindMainPars(pNZBInfo->GetDestDir(), NULL))
 			{
 				pNZBInfo->SetParStatus(NZBInfo::psNone);
-				pNZBInfo->SetPostTotalSec(pNZBInfo->GetPostTotalSec() - pNZBInfo->GetParSec());
-				pNZBInfo->SetParSec(0);
-				pNZBInfo->SetRepairSec(0);
-				pNZBInfo->SetParFull(false);
 			}
 		}
 		pNZBInfo->SetDeleteStatus(NZBInfo::dsNone);
@@ -452,21 +428,28 @@ void HistoryCoordinator::HistoryReturn(DownloadQueue* pDownloadQueue, HistoryLis
 		{
 			pNZBInfo->SetMoveStatus(NZBInfo::msNone);
 		}
-		pNZBInfo->SetReprocess(bReprocess);
 	}

 	if (pHistoryInfo->GetKind() == HistoryInfo::hkUrl)
 	{
-		pNZBInfo = pHistoryInfo->GetNZBInfo();
+		NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
 		pHistoryInfo->DiscardNZBInfo();
 		pNZBInfo->SetUrlStatus(NZBInfo::lsNone);
 		pNZBInfo->SetDeleteStatus(NZBInfo::dsNone);
 		pDownloadQueue->GetQueue()->push_front(pNZBInfo);
+		bUnparked = true;
 	}

-	pDownloadQueue->GetHistory()->erase(itHistory);
-	// the object "pHistoryInfo" is released few lines later, after the call to "NZBDownloaded"
-	pNZBInfo->PrintMessage(Message::mkInfo, "%s returned from history back to download queue", szNiceName);
+	if (bUnparked || bReprocess)
+	{
+		pDownloadQueue->GetHistory()->erase(itHistory);
+		// the object "pHistoryInfo" is released few lines later, after the call to "NZBDownloaded"
+		info("%s returned from history back to download queue", szNiceName);
+	}
+	else
+	{
+		warn("Could not return %s back from history to download queue: history item does not have any files left for download", szNiceName);
+	}

 	if (bReprocess)
 	{
@@ -475,32 +458,21 @@ void HistoryCoordinator::HistoryReturn(DownloadQueue* pDownloadQueue, HistoryLis
 		g_pPrePostProcessor->NZBDownloaded(pDownloadQueue, pNZBInfo);
 	}

-	delete pHistoryInfo;
+	if (bUnparked || bReprocess)
+	{
+		delete pHistoryInfo;
+	}
 }

 void HistoryCoordinator::HistoryRedownload(DownloadQueue* pDownloadQueue, HistoryList::iterator itHistory,
 	HistoryInfo* pHistoryInfo, bool bRestorePauseState)
 {
-	if (pHistoryInfo->GetKind() == HistoryInfo::hkUrl)
-	{
-		HistoryReturn(pDownloadQueue, itHistory, pHistoryInfo, false);
-		return;
-	}
-
-	if (pHistoryInfo->GetKind() != HistoryInfo::hkNzb)
-	{
-		char szNiceName[1024];
-		pHistoryInfo->GetName(szNiceName, 1024);
-		error("Could not return %s from history back to queue: history item has wrong type", szNiceName);
-		return;
-	}
-
 	NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
 	bool bPaused = bRestorePauseState && pNZBInfo->GetDeletePaused();

 	if (!Util::FileExists(pNZBInfo->GetQueuedFilename()))
 	{
-		error("Could not return %s from history back to queue: could not find source nzb-file %s",
+		error("Could not return collection %s from history back to queue: could not find source nzb-file %s",
 			pNZBInfo->GetName(), pNZBInfo->GetQueuedFilename());
 		return;
 	}
@@ -508,12 +480,12 @@ void HistoryCoordinator::HistoryRedownload(DownloadQueue* pDownloadQueue, Histor
 	NZBFile* pNZBFile = NZBFile::Create(pNZBInfo->GetQueuedFilename(), "");
 	if (pNZBFile == NULL)
 	{
-		error("Could not return %s from history back to queue: could not parse nzb-file",
+		error("Could not return collection %s from history back to queue: could not parse nzb-file",
 			pNZBInfo->GetName());
 		return;
 	}

-	info("Returning %s from history back to queue", pNZBInfo->GetName());
+	info("Returning collection %s from history back to queue", pNZBInfo->GetName());

 	for (FileList::iterator it = pNZBFile->GetNZBInfo()->GetFileList()->begin(); it != pNZBFile->GetNZBInfo()->GetFileList()->end(); it++)
 	{
@@ -542,19 +514,11 @@ void HistoryCoordinator::HistoryRedownload(DownloadQueue* pDownloadQueue, Histor
 		}
 	}

-	g_pDiskState->DiscardFiles(pNZBInfo);
-
 	// reset status fields (which are not reset by "HistoryReturn")
 	pNZBInfo->SetMoveStatus(NZBInfo::msNone);
 	pNZBInfo->SetUnpackCleanedUpDisk(false);
 	pNZBInfo->SetParStatus(NZBInfo::psNone);
 	pNZBInfo->SetRenameStatus(NZBInfo::rsNone);
-	pNZBInfo->SetDownloadedSize(0);
-	pNZBInfo->SetDownloadSec(0);
-	pNZBInfo->SetPostTotalSec(0);
-	pNZBInfo->SetParSec(0);
-	pNZBInfo->SetRepairSec(0);
-	pNZBInfo->SetUnpackSec(0);
 	pNZBInfo->ClearCompletedFiles();
 	pNZBInfo->GetServerStats()->Clear();
 	pNZBInfo->GetCurrentServerStats()->Clear();
@@ -566,10 +530,14 @@ void HistoryCoordinator::HistoryRedownload(DownloadQueue* pDownloadQueue, Histor

 	HistoryReturn(pDownloadQueue, itHistory, pHistoryInfo, false);

-	g_pPrePostProcessor->NZBAdded(pDownloadQueue, pNZBInfo);
+	if (!bPaused && g_pOptions->GetParCheck() != Options::pcForce)
+	{
+		pDownloadQueue->EditEntry(pNZBInfo->GetID(), 
+			DownloadQueue::eaGroupPauseExtraPars, 0, NULL);
+	}
 }

-bool HistoryCoordinator::HistorySetParameter(HistoryInfo* pHistoryInfo, const char* szText)
+void HistoryCoordinator::HistorySetParameter(HistoryInfo* pHistoryInfo, const char* szText)
 {
 	char szNiceName[1024];
 	pHistoryInfo->GetName(szNiceName, 1024);
@@ -578,7 +546,7 @@ bool HistoryCoordinator::HistorySetParameter(HistoryInfo* pHistoryInfo, const ch
 	if (!(pHistoryInfo->GetKind() == HistoryInfo::hkNzb || pHistoryInfo->GetKind() == HistoryInfo::hkUrl))
 	{
 		error("Could not set post-process-parameter for %s: history item has wrong type", szNiceName);
-		return false;
+		return;
 	}

 	char* szStr = strdup(szText);
@@ -596,49 +564,6 @@ bool HistoryCoordinator::HistorySetParameter(HistoryInfo* pHistoryInfo, const ch
 	}

 	free(szStr);
-
-	return true;
-}
-
-bool HistoryCoordinator::HistorySetCategory(HistoryInfo* pHistoryInfo, const char* szText)
-{
-	char szNiceName[1024];
-	pHistoryInfo->GetName(szNiceName, 1024);
-	debug("Setting category '%s' for '%s'", szText, szNiceName);
-
-	if (!(pHistoryInfo->GetKind() == HistoryInfo::hkNzb || pHistoryInfo->GetKind() == HistoryInfo::hkUrl))
-	{
-		error("Could not set category for %s: history item has wrong type", szNiceName);
-		return false;
-	}
-
-	pHistoryInfo->GetNZBInfo()->SetCategory(szText);
-
-	return true;
-}
-
-bool HistoryCoordinator::HistorySetName(HistoryInfo* pHistoryInfo, const char* szText)
-{
-	char szNiceName[1024];
-	pHistoryInfo->GetName(szNiceName, 1024);
-	debug("Setting name '%s' for '%s'", szText, szNiceName);
-
-	if (Util::EmptyStr(szText))
-	{
-		error("Could not rename %s. The new name cannot be empty", szNiceName);
-		return false;
-	}
-
-	if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb || pHistoryInfo->GetKind() == HistoryInfo::hkUrl)
-	{
-		pHistoryInfo->GetNZBInfo()->SetName(szText);
-	}
-	else if (pHistoryInfo->GetKind() == HistoryInfo::hkDup)
-	{
-		pHistoryInfo->GetDupInfo()->SetName(szText);
-	}
-
-	return true;
 }

 void HistoryCoordinator::HistorySetDupeParam(HistoryInfo* pHistoryInfo, DownloadQueue::EEditAction eAction, const char* szText)
--- a/daemon/queue/HistoryCoordinator.h
+++ b/daemon/queue/HistoryCoordinator.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -34,10 +34,8 @@ private:
 	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);
-	bool				HistorySetParameter(HistoryInfo* pHistoryInfo, const char* szText);
+	void				HistorySetParameter(HistoryInfo* pHistoryInfo, const char* szText);
 	void				HistorySetDupeParam(HistoryInfo* pHistoryInfo, DownloadQueue::EEditAction eAction, const char* szText);
-	bool				HistorySetCategory(HistoryInfo* pHistoryInfo, const char* szText);
-	bool				HistorySetName(HistoryInfo* pHistoryInfo, const char* szText);
 	void				HistoryTransformToDup(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, int rindex);
 	void				SaveQueue(DownloadQueue* pDownloadQueue);

@@ -46,7 +44,7 @@ public:
 	virtual				~HistoryCoordinator();
 	void				AddToHistory(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo);
 	bool				EditList(DownloadQueue* pDownloadQueue, IDList* pIDList, DownloadQueue::EEditAction eAction, int iOffset, const char* szText);
-	void				DeleteDiskFiles(NZBInfo* pNZBInfo);
+	void				DeleteQueuedFile(const char* szQueuedFile);
 	void				HistoryHide(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo, int rindex);
 	void				Redownload(DownloadQueue* pDownloadQueue, HistoryInfo* pHistoryInfo);
 	void				IntervalCheck();
--- a/daemon/queue/NZBFile.cpp
+++ b/daemon/queue/NZBFile.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -461,7 +461,7 @@ void NZBFile::ReadPassword()

    // obtain file size.
    fseek(pFile , 0 , SEEK_END);
-    int iSize  = (int)ftell(pFile);
+    int iSize  = ftell(pFile);
    rewind(pFile);

 	// reading first 4KB of the file
@@ -526,27 +526,21 @@ NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory)
 	{
 		_bstr_t r(doc->GetparseError()->reason);
 		const char* szErrMsg = r;
-		error("Error parsing nzb-file %s: %s", Util::BaseFileName(szFileName), szErrMsg);
+		error("Error parsing nzb-file: %s", szErrMsg);
 		return NULL;
 	}

    NZBFile* pFile = new NZBFile(szFileName, szCategory);
-
-    if (!pFile->ParseNZB(doc))
+    if (pFile->ParseNZB(doc))
+	{
+		pFile->ProcessFiles();
+	}
+	else
 	{
 		delete pFile;
-		return NULL;
+		pFile = NULL;
 	}

-	if (pFile->GetNZBInfo()->GetFileList()->empty())
-	{
-		error("Error parsing nzb-file %s: file has no content", Util::BaseFileName(szFileName));
-		delete pFile;
-		return NULL;
-	}
-
-	pFile->ProcessFiles();
-
    return pFile;
 }

@@ -660,22 +654,17 @@ NZBFile* NZBFile::Create(const char* szFileName, const char* szCategory)

 	int ret = xmlSAXUserParseFile(&SAX_handler, pFile, szFileName);
    
-    if (ret != 0)
+    if (ret == 0)
 	{
-		error("Error parsing nzb-file %s", Util::BaseFileName(szFileName));
-		delete pFile;
-		return NULL;
+		pFile->ProcessFiles();
 	}
-
-	if (pFile->GetNZBInfo()->GetFileList()->empty())
+	else
 	{
-		error("Error parsing nzb-file %s: file has no content", Util::BaseFileName(szFileName));
+        error("Failed to parse nzb-file");
 		delete pFile;
-		return NULL;
+		pFile = NULL;
 	}
-
-	pFile->ProcessFiles();
-
+	
 	return pFile;
 }

--- a/daemon/queue/QueueCoordinator.cpp
+++ b/daemon/queue/QueueCoordinator.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -47,7 +47,6 @@
 #include "Options.h"
 #include "ServerPool.h"
 #include "ArticleDownloader.h"
-#include "ArticleWriter.h"
 #include "DiskState.h"
 #include "Util.h"
 #include "Decoder.h"
@@ -57,7 +56,6 @@ extern Options* g_pOptions;
 extern ServerPool* g_pServerPool;
 extern DiskState* g_pDiskState;
 extern StatMeter* g_pStatMeter;
-extern ArticleCache* g_pArticleCache;

 bool QueueCoordinator::CoordinatorDownloadQueue::EditEntry(
 	int ID, EEditAction eAction, int iOffset, const char* szText)
@@ -90,6 +88,7 @@ QueueCoordinator::QueueCoordinator()

 	m_DownloadQueue.m_pOwner = this;
 	CoordinatorDownloadQueue::Init(&m_DownloadQueue);
+	YDecoder::Init();
 }

 QueueCoordinator::~QueueCoordinator()
@@ -107,6 +106,7 @@ QueueCoordinator::~QueueCoordinator()
 	m_ActiveDownloads.clear();

 	CoordinatorDownloadQueue::Final();
+	YDecoder::Final();

 	debug("QueueCoordinator destroyed");
 }
@@ -149,35 +149,17 @@ void QueueCoordinator::Load()
 		pDownloadQueue->Save();

 		// re-save file states into diskstate to update server ids
-		if (g_pOptions->GetServerMode() && g_pOptions->GetSaveQueue())
+		if (g_pOptions->GetServerMode() && g_pOptions->GetSaveQueue() && g_pOptions->GetContinuePartial())
 		{
 			for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
 			{
 				NZBInfo* pNZBInfo = *it;
-
-				if (g_pOptions->GetContinuePartial())
+				for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++)
 				{
-					for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++)
+					FileInfo* pFileInfo = *it2;
+					if (!pFileInfo->GetArticles()->empty())
 					{
-						FileInfo* pFileInfo = *it2;
-						if (!pFileInfo->GetArticles()->empty())
-						{
-							g_pDiskState->SaveFileState(pFileInfo, false);
-						}
-					}
-				}
-
-				for (CompletedFiles::iterator it2 = pNZBInfo->GetCompletedFiles()->begin(); it2 != pNZBInfo->GetCompletedFiles()->end(); it2++)
-				{
-					CompletedFile* pCompletedFile = *it2;
-					if (pCompletedFile->GetStatus() != CompletedFile::cfSuccess && pCompletedFile->GetID() > 0)
-					{
-						FileInfo* pFileInfo = new FileInfo(pCompletedFile->GetID());
-						if (g_pDiskState->LoadFileState(pFileInfo, g_pServerPool->GetServers(), false))
-						{
-							g_pDiskState->SaveFileState(pFileInfo, true);
-						}
-						delete pFileInfo;
+						g_pDiskState->SaveFileState(pFileInfo);
 					}
 				}
 			}
@@ -247,10 +229,6 @@ void QueueCoordinator::Run()
 		{
 			g_pStatMeter->EnterLeaveStandBy(bStandBy);
 			bWasStandBy = bStandBy;
-			if (bStandBy)
-			{
-				SavePartialState();
-			}
 		}

 		// sleep longer in StandBy
@@ -270,10 +248,6 @@ void QueueCoordinator::Run()
 			// this code should not be called too often, once per second is OK
 			g_pServerPool->CloseUnusedConnections();
 			ResetHangingDownloads();
-			if (!bStandBy)
-			{
-				SavePartialState();
-			}
 			iResetCounter = 0;
 			g_pStatMeter->IntervalCheck();
 			AdjustDownloadsLimit();
@@ -293,8 +267,6 @@ void QueueCoordinator::Run()
 	}
 	debug("QueueCoordinator: Downloads are completed");

-	SavePartialState();
-
 	debug("Exiting QueueCoordinator-loop");
 }

@@ -346,7 +318,7 @@ void QueueCoordinator::AddNZBFileToQueue(NZBFile* pNZBFile, NZBInfo* pUrlInfo, b
 			bAllPaused &= pFileInfo->GetPaused();
 			if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
 			{
-				g_pDiskState->DiscardFile(pFileInfo, true, false, false);
+				g_pDiskState->DiscardFile(pFileInfo);
 			}
 		}
 		pNZBInfo->SetDeletePaused(bAllPaused);
@@ -398,7 +370,7 @@ void QueueCoordinator::AddNZBFileToQueue(NZBFile* pNZBFile, NZBInfo* pUrlInfo, b

 	if (eDeleteStatus == NZBInfo::dsNone)
 	{
-		pNZBInfo->PrintMessage(Message::mkInfo, "Collection %s added to queue", pNZBInfo->GetName());
+		info("Collection %s added to queue", pNZBInfo->GetName());
 	}

 	if (eDeleteStatus != NZBInfo::dsManual)
@@ -459,7 +431,7 @@ void QueueCoordinator::CheckDupeFileInfos(NZBInfo* pNZBInfo)
 		pNZBInfo->GetFileList()->Remove(pFileInfo);
 		if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
 		{
-			g_pDiskState->DiscardFile(pFileInfo, true, false, false);
+			g_pDiskState->DiscardFile(pFileInfo);
 		}
 	}
 }
@@ -561,17 +533,11 @@ bool QueueCoordinator::GetNextArticle(DownloadQueue* pDownloadQueue, FileInfo* &
 					iTotalFileCount += pNZBInfo->GetFileList()->size();
 				}

-				if (iTotalFileCount > 0)
-				{
-					int iArrSize = sizeof(bool) * iTotalFileCount;
-					pCheckedFiles = (bool*)malloc(iArrSize);
-					memset(pCheckedFiles, false, iArrSize);
-				}
-			}
-			if (pCheckedFiles)
-			{
-				pCheckedFiles[iFileNum] = true;
+				int iArrSize = sizeof(bool) * iTotalFileCount;
+				pCheckedFiles = (bool*)malloc(iArrSize);
+				memset(pCheckedFiles, false, iArrSize);
 			}
+			pCheckedFiles[iFileNum] = true;
 		}
 	}

@@ -608,7 +574,7 @@ void QueueCoordinator::Update(Subject* Caller, void* Aspect)
 {
 	debug("Notification from ArticleDownloader received");

-	ArticleDownloader* pArticleDownloader = (ArticleDownloader*)Caller;
+	ArticleDownloader* pArticleDownloader = (ArticleDownloader*) Caller;
 	if ((pArticleDownloader->GetStatus() == ArticleDownloader::adFinished) ||
 		(pArticleDownloader->GetStatus() == ArticleDownloader::adFailed) ||
 		(pArticleDownloader->GetStatus() == ArticleDownloader::adRetry))
@@ -665,7 +631,10 @@ void QueueCoordinator::ArticleCompleted(ArticleDownloader* pArticleDownloader)
 		fileCompleted = (int)pFileInfo->GetArticles()->size() == pFileInfo->GetCompletedArticles();
 		pFileInfo->GetServerStats()->ListOp(pArticleDownloader->GetServerStats(), ServerStatList::soAdd);
 		pNZBInfo->GetCurrentServerStats()->ListOp(pArticleDownloader->GetServerStats(), ServerStatList::soAdd);
-		pFileInfo->SetPartialChanged(true);
+		if (g_pOptions->GetServerMode() && g_pOptions->GetSaveQueue() && g_pOptions->GetContinuePartial())
+		{
+			g_pDiskState->SaveFileState(pFileInfo);
+		}
 	}

 	if (!pFileInfo->GetFilenameConfirmed() &&
@@ -686,8 +655,6 @@ void QueueCoordinator::ArticleCompleted(ArticleDownloader* pArticleDownloader)
 		}
 	}

-	pNZBInfo->SetDownloadedSize(pNZBInfo->GetDownloadedSize() + pArticleDownloader->GetDownloadedSize());
-
 	bool deleteFileObj = false;

 	if (fileCompleted && !pFileInfo->GetDeleted())
@@ -782,20 +749,14 @@ void QueueCoordinator::StatFileInfo(FileInfo* pFileInfo, bool bCompleted)

 void QueueCoordinator::DeleteFileInfo(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo, bool bCompleted)
 {
-	while (g_pArticleCache->FileBusy(pFileInfo))
-	{
-		usleep(5*1000);
-	}
-
 	bool fileDeleted = pFileInfo->GetDeleted();
 	pFileInfo->SetDeleted(true);

 	StatFileInfo(pFileInfo, bCompleted);

-	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode() &&
-		(!bCompleted || (pFileInfo->GetMissedArticles() == 0 && pFileInfo->GetFailedArticles() == 0)))
+	if (g_pOptions->GetSaveQueue() && g_pOptions->GetServerMode())
 	{
-		g_pDiskState->DiscardFile(pFileInfo, true, true, false);
+		g_pDiskState->DiscardFile(pFileInfo);
 	}

 	if (!bCompleted)
@@ -841,33 +802,6 @@ void QueueCoordinator::DiscardDiskFile(FileInfo* pFileInfo)
 	}
 }

-void QueueCoordinator::SavePartialState()
-{
-	if (!(g_pOptions->GetServerMode() && g_pOptions->GetSaveQueue() && g_pOptions->GetContinuePartial()))
-	{
-		return;
-	}
-
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-
-	for (NZBList::iterator it = pDownloadQueue->GetQueue()->begin(); it != pDownloadQueue->GetQueue()->end(); it++)
-	{
-		NZBInfo* pNZBInfo = *it;
-		for (FileList::iterator it2 = pNZBInfo->GetFileList()->begin(); it2 != pNZBInfo->GetFileList()->end(); it2++)
-		{
-			FileInfo* pFileInfo = *it2;
-			if (pFileInfo->GetPartialChanged())
-			{
-				debug("Saving partial state for %s", pFileInfo->GetFilename());
-				g_pDiskState->SaveFileState(pFileInfo, false);
-				pFileInfo->SetPartialChanged(false);
-			}
-		}
-	}
-
-	DownloadQueue::Unlock();
-}
-
 void QueueCoordinator::CheckHealth(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo)
 {
 	if (g_pOptions->GetHealthCheck() == Options::hcNone ||
@@ -887,10 +821,8 @@ void QueueCoordinator::CheckHealth(DownloadQueue* pDownloadQueue, FileInfo* pFil
 	}
 	else if (g_pOptions->GetHealthCheck() == Options::hcDelete)
 	{
-		pFileInfo->GetNZBInfo()->PrintMessage(Message::mkWarning,
-			"Cancelling download and deleting %s due to health %.1f%% below critical %.1f%%",
-			pFileInfo->GetNZBInfo()->GetName(), pFileInfo->GetNZBInfo()->CalcHealth() / 10.0,
-			pFileInfo->GetNZBInfo()->CalcCriticalHealth(true) / 10.0);
+		warn("Cancelling download and deleting %s due to health %.1f%% below critical %.1f%%", pFileInfo->GetNZBInfo()->GetName(),
+			pFileInfo->GetNZBInfo()->CalcHealth() / 10.0, pFileInfo->GetNZBInfo()->CalcCriticalHealth(true) / 10.0);
 		pFileInfo->GetNZBInfo()->SetDeleteStatus(NZBInfo::dsHealth);
 		pDownloadQueue->EditEntry(pFileInfo->GetNZBInfo()->GetID(), DownloadQueue::eaGroupDelete, 0, NULL);
 	}
@@ -921,7 +853,7 @@ void QueueCoordinator::LogDebugInfo()

 void QueueCoordinator::ResetHangingDownloads()
 {
-	if (g_pOptions->GetTerminateTimeout() == 0 && g_pOptions->GetArticleTimeout() == 0)
+	if (g_pOptions->GetTerminateTimeout() == 0 && g_pOptions->GetConnectionTimeout() == 0)
 	{
 		return;
 	}
@@ -932,12 +864,11 @@ void QueueCoordinator::ResetHangingDownloads()
 	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end();)
 	{
 		ArticleDownloader* pArticleDownloader = *it;
-																		   
-		if (tm - pArticleDownloader->GetLastUpdateTime() > g_pOptions->GetArticleTimeout() + 1 &&
+
+		if (tm - pArticleDownloader->GetLastUpdateTime() > g_pOptions->GetConnectionTimeout() + 1 &&
 		   pArticleDownloader->GetStatus() == ArticleDownloader::adRunning)
 		{
-			error("Cancelling hanging download %s @ %s", pArticleDownloader->GetInfoName(),
-				pArticleDownloader->GetConnectionName());
+			error("Cancelling hanging download %s", pArticleDownloader->GetInfoName());
 			pArticleDownloader->Stop();
 		}
 		
@@ -948,21 +879,16 @@ void QueueCoordinator::ResetHangingDownloads()
 			debug("Terminating hanging download %s", pArticleDownloader->GetInfoName());
 			if (pArticleDownloader->Terminate())
 			{
-				error("Terminated hanging download %s @ %s", pArticleDownloader->GetInfoName(),
-					pArticleDownloader->GetConnectionName());
+				error("Terminated hanging download %s", pArticleDownloader->GetInfoName());
 				pArticleInfo->SetStatus(ArticleInfo::aiUndefined);
 			}
 			else
 			{
-				error("Could not terminate hanging download %s @ %s", pArticleDownloader->GetInfoName(),
-					  pArticleDownloader->GetConnectionName());
+				error("Could not terminate hanging download %s", Util::BaseFileName(pArticleInfo->GetResultFilename()));
 			}
 			m_ActiveDownloads.erase(it);
-
 			pArticleDownloader->GetFileInfo()->SetActiveDownloads(pArticleDownloader->GetFileInfo()->GetActiveDownloads() - 1);
 			pArticleDownloader->GetFileInfo()->GetNZBInfo()->SetActiveDownloads(pArticleDownloader->GetFileInfo()->GetNZBInfo()->GetActiveDownloads() - 1);
-			pArticleDownloader->GetFileInfo()->GetNZBInfo()->SetDownloadedSize(pArticleDownloader->GetFileInfo()->GetNZBInfo()->GetDownloadedSize() + pArticleDownloader->GetDownloadedSize());
-
 			// it's not safe to destroy pArticleDownloader, because the state of object is unknown
 			delete pArticleDownloader;
 			it = m_ActiveDownloads.begin();
@@ -981,22 +907,21 @@ void QueueCoordinator::ResetHangingDownloads()
 bool QueueCoordinator::DeleteQueueEntry(DownloadQueue* pDownloadQueue, FileInfo* pFileInfo)
 {
 	pFileInfo->SetDeleted(true);
-	bool bDownloading = false;
+	bool hasDownloads = false;
 	for (ActiveDownloads::iterator it = m_ActiveDownloads.begin(); it != m_ActiveDownloads.end(); it++)
 	{
 		ArticleDownloader* pArticleDownloader = *it;
 		if (pArticleDownloader->GetFileInfo() == pFileInfo)
 		{
-			bDownloading = true;
+			hasDownloads = true;
 			pArticleDownloader->Stop();
 		}
 	}
-
-	if (!bDownloading)
+	if (!hasDownloads)
 	{
 		DeleteFileInfo(pDownloadQueue, pFileInfo, false);
 	}
-	return bDownloading;
+	return hasDownloads;
 }

 bool QueueCoordinator::SetQueueEntryCategory(DownloadQueue* pDownloadQueue, NZBInfo* pNZBInfo, const char* szCategory)
@@ -1015,7 +940,7 @@ bool QueueCoordinator::SetQueueEntryCategory(DownloadQueue* pDownloadQueue, NZBI
 	pNZBInfo->BuildDestDirName();

 	bool bDirUnchanged = !strcmp(pNZBInfo->GetDestDir(), szOldDestDir);
-	bool bOK = bDirUnchanged || ArticleWriter::MoveCompletedFiles(pNZBInfo, szOldDestDir);
+	bool bOK = bDirUnchanged || ArticleDownloader::MoveCompletedFiles(pNZBInfo, szOldDestDir);

 	return bOK;
 }
@@ -1054,7 +979,7 @@ bool QueueCoordinator::SetQueueEntryName(DownloadQueue* pDownloadQueue, NZBInfo*
 	pNZBInfo->BuildDestDirName();

 	bool bDirUnchanged = !strcmp(pNZBInfo->GetDestDir(), szOldDestDir);
-	bool bOK = bDirUnchanged || ArticleWriter::MoveCompletedFiles(pNZBInfo, szOldDestDir);
+	bool bOK = bDirUnchanged || ArticleDownloader::MoveCompletedFiles(pNZBInfo, szOldDestDir);

 	return bOK;
 }
@@ -1120,17 +1045,11 @@ bool QueueCoordinator::MergeQueueEntries(DownloadQueue* pDownloadQueue, NZBInfo*
 	pDestNZBInfo->SetMinTime(pSrcNZBInfo->GetMinTime() < pDestNZBInfo->GetMinTime() ? pSrcNZBInfo->GetMinTime() : pDestNZBInfo->GetMinTime());
 	pDestNZBInfo->SetMaxTime(pSrcNZBInfo->GetMaxTime() > pDestNZBInfo->GetMaxTime() ? pSrcNZBInfo->GetMaxTime() : pDestNZBInfo->GetMaxTime());

-	pDestNZBInfo->SetDownloadedSize(pDestNZBInfo->GetDownloadedSize() + pSrcNZBInfo->GetDownloadedSize());
-	pDestNZBInfo->SetDownloadSec(pDestNZBInfo->GetDownloadSec() + pSrcNZBInfo->GetDownloadSec());
-	pDestNZBInfo->SetDownloadStartTime((pDestNZBInfo->GetDownloadStartTime() > 0 &&
-		pDestNZBInfo->GetDownloadStartTime() < pSrcNZBInfo->GetDownloadStartTime()) || pSrcNZBInfo->GetDownloadStartTime() == 0 ?
-		pDestNZBInfo->GetDownloadStartTime() : pSrcNZBInfo->GetDownloadStartTime());
-
 	// reattach completed file items to new NZBInfo-object
-	for (CompletedFiles::iterator it = pSrcNZBInfo->GetCompletedFiles()->begin(); it != pSrcNZBInfo->GetCompletedFiles()->end(); it++)
+	for (NZBInfo::Files::iterator it = pSrcNZBInfo->GetCompletedFiles()->begin(); it != pSrcNZBInfo->GetCompletedFiles()->end(); it++)
    {
-		CompletedFile* pCompletedFile = *it;
-		pDestNZBInfo->GetCompletedFiles()->push_back(pCompletedFile);
+		char* szFileName = *it;
+		pDestNZBInfo->GetCompletedFiles()->push_back(szFileName);
 	}
 	pSrcNZBInfo->GetCompletedFiles()->clear();

@@ -1143,7 +1062,6 @@ bool QueueCoordinator::MergeQueueEntries(DownloadQueue* pDownloadQueue, NZBInfo*
 	free(szQueuedFilename);

 	pDownloadQueue->GetQueue()->Remove(pSrcNZBInfo);
-	g_pDiskState->DiscardFiles(pSrcNZBInfo);
 	delete pSrcNZBInfo;

 	return true;
@@ -1261,7 +1179,6 @@ bool QueueCoordinator::SplitQueueEntries(DownloadQueue* pDownloadQueue, FileList
 	if (pSrcNZBInfo->GetFileList()->empty())
 	{
 		pDownloadQueue->GetQueue()->Remove(pSrcNZBInfo);
-		g_pDiskState->DiscardFiles(pSrcNZBInfo);
 		delete pSrcNZBInfo;
 	}

--- a/daemon/queue/QueueCoordinator.h
+++ b/daemon/queue/QueueCoordinator.h
@@ -73,7 +73,6 @@ private:
 	void					ResetHangingDownloads();
 	void					AdjustDownloadsLimit();
 	void					Load();
-	void					SavePartialState();

 protected:
 	virtual void			LogDebugInfo();
--- a/daemon/queue/QueueEditor.cpp
+++ b/daemon/queue/QueueEditor.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -62,206 +62,6 @@ extern Options* g_pOptions;

 const int MAX_ID = 1000000000;

-
-class GroupSorter
-{
-public:
-	enum ESortCriteria
-	{
-		scName,
-		scSize,
-		scRemainingSize,
-		scAge,
-		scCategory,
-		scPriority
-	};
-
-	enum ESortOrder
-	{
-		soAscending,
-		soDescending,
-		soAuto
-	};
-
-private:
-	NZBList*				m_pNZBList;
-	QueueEditor::ItemList*	m_pSortItemList;
-	ESortCriteria			m_eSortCriteria;
-	ESortOrder				m_eSortOrder;
-
-	void					AlignSelectedGroups();
-
-public:
-							GroupSorter(NZBList* pNZBList, QueueEditor::ItemList* pSortItemList) :
-								m_pNZBList(pNZBList), m_pSortItemList(pSortItemList) {}
-	bool					Execute(const char* szSort);
-	bool					operator()(NZBInfo* pNZBInfo1, NZBInfo* pNZBInfo2) const;
-};
-
-bool GroupSorter::Execute(const char* szSort)
-{
-	if (!strcasecmp(szSort, "name") || !strcasecmp(szSort, "name+") || !strcasecmp(szSort, "name-"))
-	{
-		m_eSortCriteria = scName;
-	}
-	else if (!strcasecmp(szSort, "size") || !strcasecmp(szSort, "size+") || !strcasecmp(szSort, "size-"))
-	{
-		m_eSortCriteria = scSize;
-	}
-	else if (!strcasecmp(szSort, "left") || !strcasecmp(szSort, "left+") || !strcasecmp(szSort, "left-"))
-	{
-		m_eSortCriteria = scRemainingSize;
-	}
-	else if (!strcasecmp(szSort, "age") || !strcasecmp(szSort, "age+") || !strcasecmp(szSort, "age-"))
-	{
-		m_eSortCriteria = scAge;
-	}
-	else if (!strcasecmp(szSort, "category") || !strcasecmp(szSort, "category+") || !strcasecmp(szSort, "category-"))
-	{
-		m_eSortCriteria = scCategory;
-	}
-	else if (!strcasecmp(szSort, "priority") || !strcasecmp(szSort, "priority+") || !strcasecmp(szSort, "priority-"))
-	{
-		m_eSortCriteria = scPriority;
-	}
-	else
-	{
-		error("Could not sort groups: incorrect sort order (%s)", szSort);
-		return false;
-	}
-
-	char lastCh = szSort[strlen(szSort) - 1];
-	if (lastCh == '+')
-	{
-		m_eSortOrder = soAscending;
-	}
-	else if (lastCh == '-')
-	{
-		m_eSortOrder = soDescending;
-	}
-	else
-	{
-		m_eSortOrder = soAuto;
-	}
-
-	AlignSelectedGroups();
-
-	NZBList tempList = *m_pNZBList;
-
-	ESortOrder eOrigSortOrder = m_eSortOrder;
-	if (m_eSortOrder == soAuto && m_eSortCriteria == scPriority)
-	{
-		m_eSortOrder = soDescending;
-	}
-
-	std::sort(m_pNZBList->begin(), m_pNZBList->end(), *this);
-
-	if (eOrigSortOrder == soAuto && tempList == *m_pNZBList)
-	{
-		m_eSortOrder = m_eSortOrder == soDescending ? soAscending : soDescending;
-		std::sort(m_pNZBList->begin(), m_pNZBList->end(), *this);
-	}
-
-	tempList.clear(); // prevent destroying of elements
-
-	return true;
-}
-
-bool GroupSorter::operator()(NZBInfo* pNZBInfo1, NZBInfo* pNZBInfo2) const
-{
-	// if list of ID is empty - sort all items
-	bool bSortItem1 = m_pSortItemList->empty();
-	bool bSortItem2 = m_pSortItemList->empty();
-
-	for (QueueEditor::ItemList::iterator it = m_pSortItemList->begin(); it != m_pSortItemList->end(); it++)
-	{
-		QueueEditor::EditItem* pItem = *it;
-		bSortItem1 |= pItem->m_pNZBInfo == pNZBInfo1;
-		bSortItem2 |= pItem->m_pNZBInfo == pNZBInfo2;
-	}
-
-	if (!bSortItem1 || !bSortItem2)
-	{
-		return false;
-	}
-
-	bool ret = false;
-
-	if (m_eSortOrder == soDescending)
-	{
-		std::swap(pNZBInfo1, pNZBInfo2);
-	}
-
-	switch (m_eSortCriteria)
-	{
-		case scName:
-			ret = strcmp(pNZBInfo1->GetName(), pNZBInfo2->GetName()) < 0;
-			break;
-
-		case scSize:
-			ret = pNZBInfo1->GetSize() < pNZBInfo2->GetSize();
-			break;
-
-		case scRemainingSize:
-			ret = pNZBInfo1->GetRemainingSize() - pNZBInfo1->GetPausedSize() <
-				pNZBInfo2->GetRemainingSize() - pNZBInfo2->GetPausedSize();
-			break;
-
-		case scAge:
-			ret = pNZBInfo1->GetMinTime() > pNZBInfo2->GetMinTime();
-			break;
-
-		case scCategory:
-			ret = strcmp(pNZBInfo1->GetCategory(), pNZBInfo2->GetCategory()) < 0;
-			break;
-
-		case scPriority:
-			ret = pNZBInfo1->GetPriority() < pNZBInfo2->GetPriority();
-			break;
-	}
-
-	return ret;
-}
-
-void GroupSorter::AlignSelectedGroups()
-{
-	NZBInfo* pLastNZBInfo = NULL;
-	unsigned int iLastNum = 0;
-	unsigned int iNum = 0;
-	while (iNum < m_pNZBList->size())
-	{
-		NZBInfo* pNZBInfo = m_pNZBList->at(iNum);
-
-		bool bSelected = false;
-		for (QueueEditor::ItemList::iterator it = m_pSortItemList->begin(); it != m_pSortItemList->end(); it++)
-		{
-			QueueEditor::EditItem* pItem = *it;
-			if (pItem->m_pNZBInfo == pNZBInfo)
-			{
-				bSelected = true;
-				break;
-			}
-		}
-
-		if (bSelected)
-		{
-			if (pLastNZBInfo && iNum - iLastNum > 1)
-			{
-				m_pNZBList->erase(m_pNZBList->begin() + iNum);
-				m_pNZBList->insert(m_pNZBList->begin() + iLastNum + 1, pNZBInfo);
-				iLastNum++;
-			}
-			else
-			{
-				iLastNum = iNum;
-			}
-			pLastNZBInfo = pNZBInfo;
-		}
-		iNum++;
-	}
-}
-
-
 QueueEditor::EditItem::EditItem(FileInfo* pFileInfo, NZBInfo* pNZBInfo, int iOffset)
 {
 	m_pFileInfo = pFileInfo;
@@ -309,9 +109,14 @@ void QueueEditor::PauseUnpauseEntry(FileInfo* pFileInfo, bool bPause)
 */
 void QueueEditor::DeleteEntry(FileInfo* pFileInfo)
 {
-	pFileInfo->GetNZBInfo()->PrintMessage(
-		pFileInfo->GetNZBInfo()->GetDeleting() ? Message::mkDetail : Message::mkInfo,
-		"Deleting file %s from download queue", pFileInfo->GetFilename());
+	if (pFileInfo->GetNZBInfo()->GetDeleting())
+	{
+		detail("Deleting file %s from download queue", pFileInfo->GetFilename());
+	}
+	else
+	{
+		info("Deleting file %s from download queue", pFileInfo->GetFilename());
+	}
 	g_pQueueCoordinator->DeleteQueueEntry(m_pDownloadQueue, pFileInfo);
 }

@@ -400,7 +205,7 @@ bool QueueEditor::EditList(DownloadQueue* pDownloadQueue, IDList* pIDList, NameL
 	{
 		return g_pPrePostProcessor->EditList(pDownloadQueue, pIDList, eAction, iOffset, szText);
 	}
-	else if (DownloadQueue::eaHistoryDelete <= eAction && eAction <= DownloadQueue::eaHistorySetName)
+	else if (DownloadQueue::eaHistoryDelete <= eAction && eAction <= DownloadQueue::eaHistoryMarkGood)
 	{
 		return g_pHistoryCoordinator->EditList(pDownloadQueue, pIDList, eAction, iOffset, szText);
 	}
@@ -429,6 +234,8 @@ bool QueueEditor::EditList(DownloadQueue* pDownloadQueue, IDList* pIDList, NameL
 bool QueueEditor::InternEditList(ItemList* pItemList, 
 	IDList* pIDList, DownloadQueue::EEditAction eAction, int iOffset, const char* szText)
 {
+	std::set<NZBInfo*> uniqueNzbs;
+
 	ItemList itemList;
 	if (!pItemList)
 	{
@@ -446,9 +253,6 @@ bool QueueEditor::InternEditList(ItemList* pItemList,
 		case DownloadQueue::eaGroupMerge:
 			return MergeGroups(pItemList);

-		case DownloadQueue::eaGroupSort:
-			return SortGroups(pItemList, szText);
-
 		case DownloadQueue::eaFileSplit:
 			return SplitGroup(pItemList, szText);

@@ -820,7 +624,6 @@ bool QueueEditor::EditGroup(NZBInfo* pNZBInfo, DownloadQueue::EEditAction eActio
 {
 	ItemList itemList;
 	bool bAllPaused = true;
-	int iID = pNZBInfo->GetID();

 	// collecting files belonging to group
 	for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
@@ -869,17 +672,7 @@ bool QueueEditor::EditGroup(NZBInfo* pNZBInfo, DownloadQueue::EEditAction eActio
 		(DownloadQueue::EEditAction)0,
 		(DownloadQueue::EEditAction)0 };

-	bool bOK = InternEditList(&itemList, NULL, GroupToFileMap[eAction], iOffset, szText);
-
-	if ((eAction == DownloadQueue::eaGroupDelete || eAction == DownloadQueue::eaGroupDupeDelete || eAction == DownloadQueue::eaGroupFinalDelete) &&
-		// NZBInfo could have been destroyed already
-		m_pDownloadQueue->GetQueue()->Find(iID))
-	{
-		DownloadQueue::Aspect deleteAspect = { DownloadQueue::eaNzbDeleted, m_pDownloadQueue, pNZBInfo, NULL };
-		m_pDownloadQueue->Notify(&deleteAspect);
-	}
-
-	return bOK;
+	return InternEditList(&itemList, NULL, GroupToFileMap[eAction], iOffset, szText);
 }

 void QueueEditor::PauseParsInGroups(ItemList* pItemList, bool bExtraParsOnly)
@@ -1108,11 +901,6 @@ void QueueEditor::SetNZBName(NZBInfo* pNZBInfo, const char* szName)
 */
 bool QueueEditor::CanCleanupDisk(NZBInfo* pNZBInfo)
 {
-	if (pNZBInfo->GetDeleteStatus() != NZBInfo::dsNone)
-	{
-		return true;
-	}
-
    for (FileList::iterator it = pNZBInfo->GetFileList()->begin(); it != pNZBInfo->GetFileList()->end(); it++)
    {
        FileInfo* pFileInfo = *it;
@@ -1182,12 +970,6 @@ bool QueueEditor::SplitGroup(ItemList* pItemList, const char* szName)
 	return bOK;
 }

-bool QueueEditor::SortGroups(ItemList* pItemList, const char* szSort)
-{
-	GroupSorter sorter(m_pDownloadQueue->GetQueue(), pItemList);
-	return sorter.Execute(szSort);
-}
-
 void QueueEditor::ReorderFiles(ItemList* pItemList)
 {
 	if (pItemList->size() == 0)
--- a/daemon/queue/QueueEditor.h
+++ b/daemon/queue/QueueEditor.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -32,7 +32,7 @@

 class QueueEditor
 {
-public:
+private:
 	class EditItem
 	{
 	public:
@@ -45,7 +45,6 @@ public:

 	typedef std::vector<EditItem*> ItemList;

-private:
 	DownloadQueue*			m_pDownloadQueue;

 private:
@@ -61,7 +60,6 @@ private:
 	void					SetNZBName(NZBInfo* pNZBInfo, const char* szName);
 	bool					CanCleanupDisk(NZBInfo* pNZBInfo);
 	bool					MergeGroups(ItemList* pItemList);
-	bool					SortGroups(ItemList* pItemList, const char* szSort);
 	bool					SplitGroup(ItemList* pItemList, const char* szName);
 	bool					DeleteUrl(NZBInfo* pNZBInfo, DownloadQueue::EEditAction eAction);
 	void					ReorderFiles(ItemList* pItemList);
--- a/daemon/queue/QueueScript.cpp
+++ b/daemon/queue/QueueScript.cpp
@@ -39,7 +39,6 @@
 #endif
 #include <sys/stat.h>
 #include <stdio.h>
-#include <algorithm>

 #include "nzbget.h"
 #include "QueueScript.h"
@@ -48,38 +47,6 @@
 #include "Util.h"

 extern Options* g_pOptions;
-extern QueueScriptCoordinator* g_pQueueScriptCoordinator;
-
-static const char* QUEUE_EVENT_NAMES[] = { "FILE_DOWNLOADED", "NZB_ADDED", "NZB_DOWNLOADED" };
-
-class QueueScriptController : public Thread, public NZBScriptController
-{
-private:
-	char*				m_szNZBName;
-	char*				m_szNZBFilename;
-	char*				m_szUrl;
-	char*				m_szCategory;
-	char*				m_szDestDir;
-	int					m_iID;
-	int					m_iPriority;
-	NZBParameterList	m_Parameters;
-	int					m_iPrefixLen;
-	Options::Script*	m_pScript;
-	QueueScriptCoordinator::EEvent	m_eEvent;
-	bool				m_bMarkBad;
-
-	void				PrepareParams(const char* szScriptName);
-
-protected:
-	virtual void		ExecuteScript(Options::Script* pScript);
-	virtual void		AddMessage(Message::EKind eKind, const char* szText);
-
-public:
-	virtual				~QueueScriptController();
-	virtual void		Run();
-	static void			StartScript(NZBInfo* pNZBInfo, Options::Script* pScript, QueueScriptCoordinator::EEvent eEvent);
-};
-

 /**
 * If szStripPrefix is not NULL, only pp-parameters, whose names start with the prefix
@@ -137,7 +104,10 @@ void NZBScriptController::PrepareEnvScript(NZBParameterList* pParameters, const

 void NZBScriptController::ExecuteScriptList(const char* szScriptList)
 {
-	for (Options::Scripts::iterator it = g_pOptions->GetScripts()->begin(); it != g_pOptions->GetScripts()->end(); it++)
+	Options::ScriptList scriptList;
+	g_pOptions->LoadScriptList(&scriptList);
+
+	for (Options::ScriptList::iterator it = scriptList.begin(); it != scriptList.end(); it++)
 	{
 		Options::Script* pScript = *it;

@@ -158,16 +128,145 @@ void NZBScriptController::ExecuteScriptList(const char* szScriptList)
 }


+void ScanScriptController::ExecuteScripts(const char* szNZBFilename,
+	const char* szUrl, const char* szDirectory, char** pNZBName, char** pCategory,
+	int* iPriority, NZBParameterList* pParameters, bool* bAddTop, bool* bAddPaused)
+{
+	ScanScriptController* pScriptController = new ScanScriptController();
+
+	pScriptController->m_szNZBFilename = szNZBFilename;
+	pScriptController->m_szUrl = szUrl;
+	pScriptController->m_szDirectory = szDirectory;
+	pScriptController->m_pNZBName = pNZBName;
+	pScriptController->m_pCategory = pCategory;
+	pScriptController->m_pParameters = pParameters;
+	pScriptController->m_iPriority = iPriority;
+	pScriptController->m_bAddTop = bAddTop;
+	pScriptController->m_bAddPaused = bAddPaused;
+	pScriptController->m_iPrefixLen = 0;
+
+	pScriptController->ExecuteScriptList(g_pOptions->GetScanScript());
+
+	delete pScriptController;
+}
+
+void ScanScriptController::ExecuteScript(Options::Script* pScript)
+{
+	if (!pScript->GetScanScript() || !Util::FileExists(m_szNZBFilename))
+	{
+		return;
+	}
+
+	PrintMessage(Message::mkInfo, "Executing scan-script %s for %s", pScript->GetName(), Util::BaseFileName(m_szNZBFilename));
+
+	SetScript(pScript->GetLocation());
+	SetArgs(NULL, false);
+
+	char szInfoName[1024];
+	snprintf(szInfoName, 1024, "scan-script %s for %s", pScript->GetName(), Util::BaseFileName(m_szNZBFilename));
+	szInfoName[1024-1] = '\0';
+	SetInfoName(szInfoName);
+
+	SetLogPrefix(pScript->GetDisplayName());
+	m_iPrefixLen = strlen(pScript->GetDisplayName()) + 2; // 2 = strlen(": ");
+	PrepareParams(pScript->GetName());
+
+	Execute();
+
+	SetLogPrefix(NULL);
+}
+
+void ScanScriptController::PrepareParams(const char* szScriptName)
+{
+	ResetEnv();
+
+	SetEnvVar("NZBNP_FILENAME", m_szNZBFilename);
+	SetEnvVar("NZBNP_URL", m_szUrl);
+	SetEnvVar("NZBNP_NZBNAME", strlen(*m_pNZBName) > 0 ? *m_pNZBName : Util::BaseFileName(m_szNZBFilename));
+	SetEnvVar("NZBNP_CATEGORY", *m_pCategory);
+	SetIntEnvVar("NZBNP_PRIORITY", *m_iPriority);
+	SetIntEnvVar("NZBNP_TOP", *m_bAddTop ? 1 : 0);
+	SetIntEnvVar("NZBNP_PAUSED", *m_bAddPaused ? 1 : 0);
+
+	// remove trailing slash
+	char szDir[1024];
+	strncpy(szDir, m_szDirectory, 1024);
+	szDir[1024-1] = '\0';
+	int iLen = strlen(szDir);
+	if (szDir[iLen-1] == PATH_SEPARATOR)
+	{
+		szDir[iLen-1] = '\0';
+	}
+	SetEnvVar("NZBNP_DIRECTORY", szDir);
+
+	PrepareEnvScript(m_pParameters, szScriptName);
+}
+
+void ScanScriptController::AddMessage(Message::EKind eKind, const char* szText)
+{
+	const char* szMsgText = szText + m_iPrefixLen;
+
+	if (!strncmp(szMsgText, "[NZB] ", 6))
+	{
+		debug("Command %s detected", szMsgText + 6);
+		if (!strncmp(szMsgText + 6, "NZBNAME=", 8))
+		{
+			free(*m_pNZBName);
+			*m_pNZBName = strdup(szMsgText + 6 + 8);
+		}
+		else if (!strncmp(szMsgText + 6, "CATEGORY=", 9))
+		{
+			free(*m_pCategory);
+			*m_pCategory = strdup(szMsgText + 6 + 9);
+		}
+		else if (!strncmp(szMsgText + 6, "NZBPR_", 6))
+		{
+			char* szParam = strdup(szMsgText + 6 + 6);
+			char* szValue = strchr(szParam, '=');
+			if (szValue)
+			{
+				*szValue = '\0';
+				m_pParameters->SetParameter(szParam, szValue + 1);
+			}
+			else
+			{
+				error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
+			}
+			free(szParam);
+		}
+		else if (!strncmp(szMsgText + 6, "PRIORITY=", 9))
+		{
+			*m_iPriority = atoi(szMsgText + 6 + 9);
+		}
+		else if (!strncmp(szMsgText + 6, "TOP=", 4))
+		{
+			*m_bAddTop = atoi(szMsgText + 6 + 4) != 0;
+		}
+		else if (!strncmp(szMsgText + 6, "PAUSED=", 7))
+		{
+			*m_bAddPaused = atoi(szMsgText + 6 + 7) != 0;
+		}
+		else
+		{
+			error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
+		}
+	}
+	else
+	{
+		ScriptController::AddMessage(eKind, szText);
+	}
+}
+
+
 QueueScriptController::~QueueScriptController()
 {
 	free(m_szNZBName);
 	free(m_szNZBFilename);
 	free(m_szUrl);
 	free(m_szCategory);
-	free(m_szDestDir);
 }

-void QueueScriptController::StartScript(NZBInfo* pNZBInfo, Options::Script* pScript, QueueScriptCoordinator::EEvent eEvent)
+void QueueScriptController::StartScripts(DownloadQueue* pDownloadQueue, NZBInfo *pNZBInfo)
 {
 	QueueScriptController* pScriptController = new QueueScriptController();

@@ -175,14 +274,10 @@ void QueueScriptController::StartScript(NZBInfo* pNZBInfo, Options::Script* pScr
 	pScriptController->m_szNZBFilename = strdup(pNZBInfo->GetFilename());
 	pScriptController->m_szUrl = strdup(pNZBInfo->GetURL());
 	pScriptController->m_szCategory = strdup(pNZBInfo->GetCategory());
-	pScriptController->m_szDestDir = strdup(pNZBInfo->GetDestDir());
 	pScriptController->m_iID = pNZBInfo->GetID();
 	pScriptController->m_iPriority = pNZBInfo->GetPriority();
 	pScriptController->m_Parameters.CopyFrom(pNZBInfo->GetParameters());
-	pScriptController->m_pScript = pScript;
-	pScriptController->m_eEvent = eEvent;
-	pScriptController->m_iPrefixLen = 0;
-	pScriptController->m_bMarkBad = false;
+
 	pScriptController->SetAutoDestroy(true);

 	pScriptController->Start();
@@ -190,30 +285,17 @@ void QueueScriptController::StartScript(NZBInfo* pNZBInfo, Options::Script* pScr

 void QueueScriptController::Run()
 {
-	ExecuteScript(m_pScript);
-
-	SetLogPrefix(NULL);
-
-	if (m_bMarkBad)
-	{
-		DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-		NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->Find(m_iID);
-		if (pNZBInfo)
-		{
-			PrintMessage(Message::mkWarning, "Cancelling download and deleting %s", m_szNZBName);
-			pNZBInfo->SetDeleteStatus(NZBInfo::dsBad);
-			pDownloadQueue->EditEntry(m_iID, DownloadQueue::eaGroupDelete, 0, NULL);
-		}
-		DownloadQueue::Unlock();
-	}
-
-	g_pQueueScriptCoordinator->CheckQueue();
+	ExecuteScriptList(g_pOptions->GetQueueScript());
 }

 void QueueScriptController::ExecuteScript(Options::Script* pScript)
 {
-	PrintMessage(m_eEvent == QueueScriptCoordinator::qeFileDownloaded ? Message::mkDetail : Message::mkInfo,
-		"Executing queue-script %s for %s", pScript->GetName(), Util::BaseFileName(m_szNZBName));
+	if (!pScript->GetQueueScript())
+	{
+		return;
+	}
+
+	PrintMessage(Message::mkInfo, "Executing queue-script %s for %s", pScript->GetName(), Util::BaseFileName(m_szNZBName));

 	SetScript(pScript->GetLocation());
 	SetArgs(NULL, false);
@@ -224,7 +306,6 @@ void QueueScriptController::ExecuteScript(Options::Script* pScript)
 	SetInfoName(szInfoName);

 	SetLogPrefix(pScript->GetDisplayName());
-	m_iPrefixLen = strlen(pScript->GetDisplayName()) + 2; // 2 = strlen(": ");
 	PrepareParams(pScript->GetName());

 	Execute();
@@ -239,301 +320,11 @@ void QueueScriptController::PrepareParams(const char* szScriptName)
 	SetEnvVar("NZBNA_NZBNAME", m_szNZBName);
 	SetIntEnvVar("NZBNA_NZBID", m_iID);
 	SetEnvVar("NZBNA_FILENAME", m_szNZBFilename);
-	SetEnvVar("NZBNA_DIRECTORY", m_szDestDir);
 	SetEnvVar("NZBNA_URL", m_szUrl);
+	SetEnvVar("NZBNA_EVENT", "NZB_ADDED");
 	SetEnvVar("NZBNA_CATEGORY", m_szCategory);
 	SetIntEnvVar("NZBNA_PRIORITY", m_iPriority);
 	SetIntEnvVar("NZBNA_LASTID", m_iID);	// deprecated
-	SetEnvVar("NZBNA_EVENT", QUEUE_EVENT_NAMES[m_eEvent]);

 	PrepareEnvScript(&m_Parameters, szScriptName);
 }
-
-void QueueScriptController::AddMessage(Message::EKind eKind, const char* szText)
-{
-	const char* szMsgText = szText + m_iPrefixLen;
-
-	if (!strncmp(szMsgText, "[NZB] ", 6))
-	{
-		debug("Command %s detected", szMsgText + 6);
-		if (!strncmp(szMsgText + 6, "NZBPR_", 6))
-		{
-			char* szParam = strdup(szMsgText + 6 + 6);
-			char* szValue = strchr(szParam, '=');
-			if (szValue)
-			{
-				*szValue = '\0';
-				DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-				NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->Find(m_iID);
-				if (pNZBInfo)
-				{
-					pNZBInfo->GetParameters()->SetParameter(szParam, szValue + 1);
-				}
-				DownloadQueue::Unlock();
-			}
-			else
-			{
-				error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
-			}
-			free(szParam);
-		}
-		else if (!strncmp(szMsgText + 6, "MARK=BAD", 8))
-		{
-			m_bMarkBad = true;
-			DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-			NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->Find(m_iID);
-			if (pNZBInfo)
-			{
-				SetLogPrefix(NULL);
-				PrintMessage(Message::mkWarning, "Marking %s as bad", m_szNZBName);
-				SetLogPrefix(m_pScript->GetDisplayName());
-				pNZBInfo->SetMarkStatus(NZBInfo::ksBad);
-			}
-			DownloadQueue::Unlock();
-		}
-		else
-		{
-			error("Invalid command \"%s\" received from %s", szMsgText, GetInfoName());
-		}
-	}
-	else
-	{
-		ScriptController::AddMessage(eKind, szText);
-	}
-}
-
-
-QueueScriptCoordinator::QueueItem::QueueItem(int iNZBID, Options::Script* pScript, EEvent eEvent)
-{
-	m_iNZBID = iNZBID;
-	m_pScript = pScript;
-	m_eEvent = eEvent;
-}
-
-QueueScriptCoordinator::QueueScriptCoordinator()
-{
-	m_pCurItem = NULL;
-}
-
-QueueScriptCoordinator::~QueueScriptCoordinator()
-{
-	delete m_pCurItem;
-	for (Queue::iterator it = m_Queue.begin(); it != m_Queue.end(); )
-	{
-		delete *it;
-	}
-}
-
-void QueueScriptCoordinator::InitOptions()
-{
-	m_bHasQueueScripts = false;
-	for (Options::Scripts::iterator it = g_pOptions->GetScripts()->begin(); it != g_pOptions->GetScripts()->end(); it++)
-	{
-		Options::Script* pScript = *it;
-		if (pScript->GetQueueScript())
-		{
-			m_bHasQueueScripts = true;
-			break;
-		}
-	}
-}
-
-void QueueScriptCoordinator::EnqueueScript(NZBInfo* pNZBInfo, EEvent eEvent)
-{
-	if (!m_bHasQueueScripts)
-	{
-		return;
-	}
-
-	m_mutexQueue.Lock();
-
-	if (eEvent == qeNzbDownloaded)
-	{
-		// delete all other queued scripts for this nzb
-		for (Queue::iterator it = m_Queue.begin(); it != m_Queue.end(); )
-		{
-			QueueItem* pQueueItem = *it;
-			if (pQueueItem->GetNZBID() == pNZBInfo->GetID())
-			{
-				delete pQueueItem;
-				it = m_Queue.erase(it);
-				continue;
-			}
-			it++;
-		}
-	}
-
-	// respect option "EventInterval"
-	time_t tCurTime = time(NULL);
-	if (eEvent == qeFileDownloaded &&
-		(g_pOptions->GetEventInterval() == -1 ||
-		 (g_pOptions->GetEventInterval() > 0 && tCurTime - pNZBInfo->GetQueueScriptTime() > 0 &&
-		 (int)(tCurTime - pNZBInfo->GetQueueScriptTime()) < g_pOptions->GetEventInterval())))
-	{
-		m_mutexQueue.Unlock();
-		return;
-	}
-
-	for (Options::Scripts::iterator it = g_pOptions->GetScripts()->begin(); it != g_pOptions->GetScripts()->end(); it++)
-	{
-		Options::Script* pScript = *it;
-
-		if (!pScript->GetQueueScript())
-		{
-			continue;
-		}
-
-		bool bUseScript = false;
-
-		// check queue-scripts
-		const char* szQueueScript = g_pOptions->GetQueueScript();
-		if (!Util::EmptyStr(szQueueScript))
-		{
-			// split szQueueScript into tokens
-			Tokenizer tok(szQueueScript, ",;");
-			while (const char* szScriptName = tok.Next())
-			{
-				if (Util::SameFilename(szScriptName, pScript->GetName()))
-				{
-					bUseScript = true;
-					break;
-				}
-			}
-		}
-
-		// check post-processing-scripts
-		if (!bUseScript)
-		{
-			for (NZBParameterList::iterator it = pNZBInfo->GetParameters()->begin(); it != pNZBInfo->GetParameters()->end(); it++)
-			{
-				NZBParameter* pParameter = *it;
-				const char* szVarname = pParameter->GetName();
-				if (strlen(szVarname) > 0 && szVarname[0] != '*' && szVarname[strlen(szVarname)-1] == ':' &&
-					(!strcasecmp(pParameter->GetValue(), "yes") ||
-					 !strcasecmp(pParameter->GetValue(), "on") ||
-					 !strcasecmp(pParameter->GetValue(), "1")))
-				{
-					char szScriptName[1024];
-					strncpy(szScriptName, szVarname, 1024);
-					szScriptName[1024-1] = '\0';
-					szScriptName[strlen(szScriptName)-1] = '\0'; // remove trailing ':'
-					if (Util::SameFilename(szScriptName, pScript->GetName()))
-					{
-						bUseScript = true;
-						break;
-					}
-				}
-			}
-		}
-
-		bUseScript &= Util::EmptyStr(pScript->GetQueueEvents()) || strstr(pScript->GetQueueEvents(), QUEUE_EVENT_NAMES[eEvent]);
-
-		if (bUseScript)
-		{
-			bool bAlreadyQueued = false;
-			if (eEvent == qeFileDownloaded)
-			{
-				// check if this script is already queued for this nzb
-				for (Queue::iterator it2 = m_Queue.begin(); it2 != m_Queue.end(); it2++)
-				{
-					QueueItem* pQueueItem = *it2;
-					if (pQueueItem->GetNZBID() == pNZBInfo->GetID() && pQueueItem->GetScript() == pScript)
-					{
-						bAlreadyQueued = true;
-						break;
-					}
-				}
-			}
-
-			if (!bAlreadyQueued)
-			{
-				QueueItem* pQueueItem = new QueueItem(pNZBInfo->GetID(), pScript, eEvent);
-				if (m_pCurItem)
-				{
-					m_Queue.push_back(pQueueItem);
-				}
-				else
-				{
-					StartScript(pNZBInfo, pQueueItem);
-				}
-			}
-
-			pNZBInfo->SetQueueScriptTime(time(NULL));
-		}
-	}
-
-	m_mutexQueue.Unlock();
-}
-
-void QueueScriptCoordinator::CheckQueue()
-{
-	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-	m_mutexQueue.Lock();
-
-	delete m_pCurItem;
-
-	m_pCurItem = NULL;
-	NZBInfo* pCurNZBInfo = NULL;
-	Queue::iterator itCurItem = m_Queue.end();
-
-	for (Queue::iterator it = m_Queue.begin(); it != m_Queue.end(); )
-	{
-		QueueItem* pQueueItem = *it;
-
-		NZBInfo* pNZBInfo = pDownloadQueue->GetQueue()->Find(pQueueItem->GetNZBID());
-
-		// in a case this nzb must not be processed further - delete queue script from queue
-		if (!pNZBInfo || pNZBInfo->GetDeleteStatus() != NZBInfo::dsNone ||
-			pNZBInfo->GetMarkStatus() == NZBInfo::ksBad)
-		{
-			delete pQueueItem;
-			it = m_Queue.erase(it);
-			continue;
-		}
-
-		if (!m_pCurItem || pQueueItem->GetEvent() > m_pCurItem->GetEvent())
-		{
-			m_pCurItem = pQueueItem;
-			itCurItem = it;
-			pCurNZBInfo = pNZBInfo;
-		}
-
-		it++;
-	}
-
-	if (m_pCurItem)
-	{
-		m_Queue.erase(itCurItem);
-		StartScript(pCurNZBInfo, m_pCurItem);
-	}
-
-	m_mutexQueue.Unlock();
-	DownloadQueue::Unlock();
-}
-
-void QueueScriptCoordinator::StartScript(NZBInfo* pNZBInfo, QueueItem* pQueueItem)
-{
-	m_pCurItem = pQueueItem;
-	QueueScriptController::StartScript(pNZBInfo, pQueueItem->GetScript(), pQueueItem->GetEvent());
-}
-
-bool QueueScriptCoordinator::HasJob(int iNZBID)
-{
-	m_mutexQueue.Lock();
-	bool bWorking = m_pCurItem && m_pCurItem->GetNZBID() == iNZBID;
-	if (!bWorking)
-	{
-		for (Queue::iterator it = m_Queue.begin(); it != m_Queue.end(); it++)
-		{
-			QueueItem* pQueueItem = *it;
-			bWorking = pQueueItem->GetNZBID() == iNZBID;
-			if (bWorking)
-			{
-				break;
-			}
-		}
-	}
-	m_mutexQueue.Unlock();
-
-	return bWorking;
-}
--- a/daemon/queue/QueueScript.h
+++ b/daemon/queue/QueueScript.h
@@ -26,8 +26,6 @@
 #ifndef QUEUESCRIPT_H
 #define QUEUESCRIPT_H

-#include <list>
-
 #include "Script.h"
 #include "Thread.h"
 #include "DownloadInfo.h"
@@ -42,46 +40,52 @@ protected:
 	virtual void		ExecuteScript(Options::Script* pScript) = 0;
 };

-class QueueScriptCoordinator
+class ScanScriptController : public NZBScriptController
 {
-public:
-	enum EEvent
-	{
-		qeFileDownloaded,	// lowest priority
-		qeNzbAdded,
-		qeNzbDownloaded		// highest priority
-	};
-
 private:
-	class QueueItem
-	{
-	private:
-		int					m_iNZBID;
-		Options::Script*	m_pScript;
-		EEvent				m_eEvent;
-	public:
-							QueueItem(int iNZBID, Options::Script* pScript, EEvent eEvent);
-		int					GetNZBID() { return m_iNZBID; }
-		Options::Script*	GetScript() { return m_pScript; }
-		EEvent				GetEvent() { return m_eEvent; }
-	};
+	const char*			m_szNZBFilename;
+	const char*			m_szUrl;
+	const char*			m_szDirectory;
+	char**				m_pNZBName;
+	char**				m_pCategory;
+	int*				m_iPriority;
+	NZBParameterList*	m_pParameters;
+	bool*				m_bAddTop;
+	bool*				m_bAddPaused;
+	int					m_iPrefixLen;

-	typedef std::list<QueueItem*> Queue;
-	
-	Queue				m_Queue;
-	Mutex				m_mutexQueue;
-	QueueItem*			m_pCurItem;
-	bool				m_bHasQueueScripts;
+	void				PrepareParams(const char* szScriptName);

-	void				StartScript(NZBInfo* pNZBInfo, QueueItem* pQueueItem);
+protected:
+	virtual void		ExecuteScript(Options::Script* pScript);
+	virtual void		AddMessage(Message::EKind eKind, const char* szText);

 public:
-						QueueScriptCoordinator();
-						~QueueScriptCoordinator();
-	void				InitOptions();
-	void				EnqueueScript(NZBInfo* pNZBInfo, EEvent eEvent);
-	void				CheckQueue();
-	bool				HasJob(int iNZBID);
+	static void			ExecuteScripts(const char* szNZBFilename, const char* szUrl,
+							const char* szDirectory, char** pNZBName, char** pCategory, int* iPriority,
+							NZBParameterList* pParameters, bool* bAddTop, bool* bAddPaused);
+};
+
+class QueueScriptController : public Thread, public NZBScriptController
+{
+private:
+	char*				m_szNZBName;
+	char*				m_szNZBFilename;
+	char*				m_szUrl;
+	char*				m_szCategory;
+	int					m_iID;
+	int					m_iPriority;
+	NZBParameterList	m_Parameters;
+
+	void				PrepareParams(const char* szScriptName);
+
+protected:
+	virtual void		ExecuteScript(Options::Script* pScript);
+
+public:
+	virtual				~QueueScriptController();
+	virtual void		Run();
+	static void			StartScripts(DownloadQueue* pDownloadQueue, NZBInfo *pNZBInfo);
 };

 #endif
--- a/daemon/queue/Scanner.cpp
+++ b/daemon/queue/Scanner.cpp
@@ -51,198 +51,6 @@

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

 Scanner::FileData::FileData(const char* szFilename)
 {
@@ -541,7 +349,7 @@ void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFil
 	int iPriority = 0;
 	bool bAddTop = false;
 	bool bAddPaused = false;
-	char* szDupeKey = strdup("");
+	const char* szDupeKey = NULL;
 	int iDupeScore = 0;
 	EDupeMode eDupeMode = dmScore;
 	EAddStatus eAddStatus = asSkipped;
@@ -561,8 +369,7 @@ void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFil
 			free(szNZBCategory);
 			szNZBCategory = strdup(pQueueData->GetCategory());
 			iPriority = pQueueData->GetPriority();
-			free(szDupeKey);
-			szDupeKey = strdup(pQueueData->GetDupeKey());
+			szDupeKey = pQueueData->GetDupeKey();
 			iDupeScore = pQueueData->GetDupeScore();
 			eDupeMode = pQueueData->GetDupeMode();
 			bAddTop = pQueueData->GetAddTop();
@@ -572,7 +379,7 @@ void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFil
 		}
 	}

-	InitPPParameters(szNZBCategory, pParameters, false);
+	InitPPParameters(szNZBCategory, pParameters);

 	bool bExists = true;

@@ -580,8 +387,7 @@ void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFil
 	{
 		ScanScriptController::ExecuteScripts(szFullFilename, 
 			pUrlInfo ? pUrlInfo->GetURL() : "", szDirectory,
-			&szNZBName, &szNZBCategory, &iPriority, pParameters, &bAddTop,
-			&bAddPaused, &szDupeKey, &iDupeScore, &eDupeMode);
+			&szNZBName, &szNZBCategory, &iPriority, pParameters, &bAddTop, &bAddPaused); 
 		bExists = Util::FileExists(szFullFilename);
 		if (bExists && strcasecmp(szExtension, ".nzb"))
 		{
@@ -621,7 +427,6 @@ void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFil

 	free(szNZBName);
 	free(szNZBCategory);
-	free(szDupeKey);

 	if (pQueueData)
 	{
@@ -630,39 +435,27 @@ void Scanner::ProcessIncomingFile(const char* szDirectory, const char* szBaseFil
 	}
 }

-void Scanner::InitPPParameters(const char* szCategory, NZBParameterList* pParameters, bool bReset)
+void Scanner::InitPPParameters(const char* szCategory, NZBParameterList* pParameters)
 {
 	bool bUnpack = g_pOptions->GetUnpack();
 	const char* szPostScript = g_pOptions->GetPostScript();
 	
-	if (!Util::EmptyStr(szCategory))
+	if (szCategory && *szCategory)
 	{
 		Options::Category* pCategory = g_pOptions->FindCategory(szCategory, false);
 		if (pCategory)
 		{
 			bUnpack = pCategory->GetUnpack();
-			if (!Util::EmptyStr(pCategory->GetPostScript()))
+			if (pCategory->GetPostScript() && *pCategory->GetPostScript())
 			{
 				szPostScript = pCategory->GetPostScript();
 			}
 		}
 	}
-
-	if (bReset)
-	{
-		for (Options::Scripts::iterator it = g_pOptions->GetScripts()->begin(); it != g_pOptions->GetScripts()->end(); it++)
-		{
-			Options::Script* pScript = *it;
-			char szParam[1024];
-			snprintf(szParam, 1024, "%s:", pScript->GetName());
-			szParam[1024-1] = '\0';
-			pParameters->SetParameter(szParam, NULL);
-		}
-	}
-
+	
 	pParameters->SetParameter("*Unpack:", bUnpack ? "yes" : "no");
 	
-	if (!Util::EmptyStr(szPostScript))
+	if (szPostScript && *szPostScript)
 	{
 		// split szPostScript into tokens and create pp-parameter for each token
 		Tokenizer tok(szPostScript, ",;");
@@ -855,8 +648,8 @@ Scanner::EAddStatus Scanner::AddExternalFile(const char* szNZBName, const char*
 	}

 	char* szUseCategory = strdup(szCategory ? szCategory : "");
-	Options::Category *pCategory = g_pOptions->FindCategory(szUseCategory, true);
-	if (pCategory && strcmp(szUseCategory, pCategory->GetName()))
+	Options::Category *pCategory = g_pOptions->FindCategory(szCategory, true);
+	if (pCategory && strcmp(szCategory, pCategory->GetName()))
 	{
 		free(szUseCategory);
 		szUseCategory = strdup(pCategory->GetName());
--- a/daemon/queue/Scanner.h
+++ b/daemon/queue/Scanner.h
@@ -130,7 +130,7 @@ public:
 							const char* szDupeKey, int iDupeScore, EDupeMode eDupeMode,
 							NZBParameterList* pParameters, bool bAddTop, bool bAddPaused, NZBInfo* pUrlInfo,
 							const char* szFileName, const char* szBuffer, int iBufSize, int* pNZBID);
-	void				InitPPParameters(const char* szCategory, NZBParameterList* pParameters, bool bReset);
+	void				InitPPParameters(const char* szCategory, NZBParameterList* pParameters);
 };

 #endif
--- a/daemon/queue/UrlCoordinator.cpp
+++ b/daemon/queue/UrlCoordinator.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2012-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2012-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -47,11 +47,9 @@
 #include "Util.h"
 #include "NZBFile.h"
 #include "Scanner.h"
-#include "DiskState.h"

 extern Options* g_pOptions;
 extern Scanner* g_pScanner;
-extern DiskState* g_pDiskState;

 UrlDownloader::UrlDownloader() : WebDownloader()
 {
@@ -82,7 +80,7 @@ void UrlDownloader::ProcessHeader(const char* szLine)
 		char* szValue = strchr(szModLine, ':');
 		if (szValue)
 		{
-			*szValue = '\0';
+			*szValue = NULL;
 			szValue++;
 			while (*szValue == ' ') szValue++;
 			Util::Trim(szValue);
@@ -455,7 +453,6 @@ void UrlCoordinator::UrlCompleted(UrlDownloader* pUrlDownloader)

 	if (bDeleteObj)
 	{
-		g_pDiskState->DiscardFiles(pNZBInfo);
 		delete pNZBInfo;
 	}
 }
@@ -493,7 +490,6 @@ bool UrlCoordinator::DeleteQueueEntry(DownloadQueue* pDownloadQueue, NZBInfo* pN
 	}
 	else
 	{
-		g_pDiskState->DiscardFiles(pNZBInfo);
 		delete pNZBInfo;
 	}

--- a/daemon/remote/BinRpc.cpp
+++ b/daemon/remote/BinRpc.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -61,7 +61,7 @@ extern void Reload();
 const char* g_szMessageRequestNames[] =
    { "N/A", "Download", "Pause/Unpause", "List", "Set download rate", "Dump debug", 
 		"Edit queue", "Log", "Quit", "Reload", "Version", "Post-queue", "Write log", "Scan", 
-		"Pause/Unpause postprocessor", "History" };
+		"Pause/Unpause postprocessor", "History", "Download URL" };

 const unsigned int g_iMessageRequestSizes[] =
    { 0,
@@ -78,118 +78,10 @@ const unsigned int g_iMessageRequestSizes[] =
 		sizeof(SNZBPostQueueRequest),
 		sizeof(SNZBWriteLogRequest),
 		sizeof(SNZBScanRequest),
-		sizeof(SNZBHistoryRequest)
+		sizeof(SNZBHistoryRequest),
+		sizeof(SNZBDownloadUrlRequest)
    };

-
-
-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 UrlQueueBinCommand: public BinCommand
-{
-public:
-	virtual void		Execute();
-};
-
-
 //*****************************************************************
 // BinProcessor

@@ -290,6 +182,10 @@ void BinRpcProcessor::Dispatch()
 			command = new HistoryBinCommand();
 			break;

+		case eRemoteRequestDownloadUrl:
+			command = new DownloadUrlBinCommand();
+			break;
+
 		default:
 			error("Received unsupported request %i", ntohl(m_MessageBase.m_iType));
 			break;
@@ -434,59 +330,30 @@ void DownloadBinCommand::Execute()
 	}

 	int iBufLen = ntohl(DownloadRequest.m_iTrailingDataLength);
-	char* szNZBContent = (char*)malloc(iBufLen);
+	char* pRecvBuffer = (char*)malloc(iBufLen);

-	if (!m_pConnection->Recv(szNZBContent, iBufLen))
+	if (!m_pConnection->Recv(pRecvBuffer, iBufLen))
 	{
 		error("invalid request");
-		free(szNZBContent);
+		free(pRecvBuffer);
 		return;
 	}
 	
 	int iPriority = ntohl(DownloadRequest.m_iPriority);
 	bool bAddPaused = ntohl(DownloadRequest.m_bAddPaused);
 	bool bAddTop = ntohl(DownloadRequest.m_bAddFirst);
-	int iDupeMode = ntohl(DownloadRequest.m_iDupeMode);
-	int iDupeScore = ntohl(DownloadRequest.m_iDupeScore);

-	bool bOK = false;
-
-	if (!strncasecmp(szNZBContent, "http://", 6) || !strncasecmp(szNZBContent, "https://", 7))
-	{
-		// add url
-		NZBInfo* pNZBInfo = new NZBInfo();
-		pNZBInfo->SetKind(NZBInfo::nkUrl);
-		pNZBInfo->SetURL(szNZBContent);
-		pNZBInfo->SetFilename(DownloadRequest.m_szNZBFilename);
-		pNZBInfo->SetCategory(DownloadRequest.m_szCategory);
-		pNZBInfo->SetPriority(iPriority);
-		pNZBInfo->SetAddUrlPaused(bAddPaused);
-		pNZBInfo->SetDupeKey(DownloadRequest.m_szDupeKey);
-		pNZBInfo->SetDupeScore(iDupeScore);
-		pNZBInfo->SetDupeMode((EDupeMode)iDupeMode);
-
-		DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
-		pDownloadQueue->GetQueue()->Add(pNZBInfo, bAddTop);
-		pDownloadQueue->Save();
-		DownloadQueue::Unlock();
-
-		bOK = true;
-	}
-	else
-	{
-		bOK = g_pScanner->AddExternalFile(DownloadRequest.m_szNZBFilename, DownloadRequest.m_szCategory, iPriority,
-			DownloadRequest.m_szDupeKey, iDupeScore, (EDupeMode)iDupeMode, NULL, bAddTop, bAddPaused,
-			NULL, NULL, szNZBContent, iBufLen, NULL) != Scanner::asFailed;
-	}
+	bool bOK = g_pScanner->AddExternalFile(DownloadRequest.m_szFilename, DownloadRequest.m_szCategory,
+		iPriority, NULL, 0, dmScore, NULL, bAddTop, bAddPaused, NULL, NULL, pRecvBuffer, iBufLen, NULL) != Scanner::asFailed;

 	char tmp[1024];
 	snprintf(tmp, 1024, bOK ? "Collection %s added to queue" : "Download Request failed for %s",
-		Util::BaseFileName(DownloadRequest.m_szNZBFilename));
+		Util::BaseFileName(DownloadRequest.m_szFilename));
 	tmp[1024-1] = '\0';

 	SendBoolResponse(bOK, tmp);

-	free(szNZBContent);
+	free(pRecvBuffer);
 }

 void ListBinCommand::Execute()
@@ -592,7 +459,6 @@ void ListBinCommand::Execute()
 			pListAnswer->m_iPausedSizeLo		= htonl(iPausedSizeLo);
 			pListAnswer->m_iPausedSizeHi		= htonl(iPausedSizeHi);
 			pListAnswer->m_iPausedCount			= htonl(pNZBInfo->GetPausedFileCount());
-			pListAnswer->m_iRemainingParCount	= htonl(pNZBInfo->GetRemainingParCount());
 			pListAnswer->m_iPriority			= htonl(pNZBInfo->GetPriority());
 			pListAnswer->m_bMatch				= htonl(bMatchGroup && (!pRegEx || pRegEx->Match(pNZBInfo->GetName())));
 			pListAnswer->m_iFilenameLen			= htonl(strlen(pNZBInfo->GetFilename()) + 1);
@@ -770,7 +636,7 @@ void LogBinCommand::Execute()
 		return;
 	}

-	MessageList* pMessages = g_pLog->LockMessages();
+	Log::Messages* pMessages = g_pLog->LockMessages();

 	int iNrEntries = ntohl(LogRequest.m_iLines);
 	unsigned int iIDFrom = ntohl(LogRequest.m_iIDFrom);
@@ -1105,8 +971,6 @@ void HistoryBinCommand::Execute()
 		return;
 	}

-	bool bShowHidden = ntohl(HistoryRequest.m_bHidden);
-
 	SNZBHistoryResponse HistoryResponse;
 	memset(&HistoryResponse, 0, sizeof(HistoryResponse));
 	HistoryResponse.m_MessageBase.m_iSignature = htonl(NZBMESSAGE_SIGNATURE);
@@ -1120,27 +984,16 @@ void HistoryBinCommand::Execute()
 	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();

 	// calculate required buffer size for nzbs
-	int iNrEntries = 0;
-	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
-	{
-		HistoryInfo* pHistoryInfo = *it;
-		if (pHistoryInfo->GetKind() != HistoryInfo::hkDup || bShowHidden)
-		{
-			iNrEntries++;
-		}
-	}
+	int iNrEntries = pDownloadQueue->GetHistory()->size();
 	bufsize += iNrEntries * sizeof(SNZBHistoryResponseEntry);
 	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
 	{
 		HistoryInfo* pHistoryInfo = *it;
-		if (pHistoryInfo->GetKind() != HistoryInfo::hkDup || bShowHidden)
-		{
-			char szNicename[1024];
-			pHistoryInfo->GetName(szNicename, sizeof(szNicename));
-			bufsize += strlen(szNicename) + 1;
-			// align struct to 4-bytes, needed by ARM-processor (and may be others)
-			bufsize += bufsize % 4 > 0 ? 4 - bufsize % 4 : 0;
-		}
+		char szNicename[1024];
+		pHistoryInfo->GetName(szNicename, sizeof(szNicename));
+		bufsize += strlen(szNicename) + 1;
+		// align struct to 4-bytes, needed by ARM-processor (and may be others)
+		bufsize += bufsize % 4 > 0 ? 4 - bufsize % 4 : 0;
 	}

 	buf = (char*) malloc(bufsize);
@@ -1150,52 +1003,41 @@ void HistoryBinCommand::Execute()
 	for (HistoryList::iterator it = pDownloadQueue->GetHistory()->begin(); it != pDownloadQueue->GetHistory()->end(); it++)
 	{
 		HistoryInfo* pHistoryInfo = *it;
-		if (pHistoryInfo->GetKind() != HistoryInfo::hkDup || bShowHidden)
+		SNZBHistoryResponseEntry* pListAnswer = (SNZBHistoryResponseEntry*) bufptr;
+		pListAnswer->m_iID					= htonl(pHistoryInfo->GetID());
+		pListAnswer->m_iKind				= htonl((int)pHistoryInfo->GetKind());
+		pListAnswer->m_tTime				= htonl((int)pHistoryInfo->GetTime());
+
+		char szNicename[1024];
+		pHistoryInfo->GetName(szNicename, sizeof(szNicename));
+		pListAnswer->m_iNicenameLen			= htonl(strlen(szNicename) + 1);
+
+		if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
 		{
-			SNZBHistoryResponseEntry* pListAnswer = (SNZBHistoryResponseEntry*) bufptr;
-			pListAnswer->m_iID					= htonl(pHistoryInfo->GetID());
-			pListAnswer->m_iKind				= htonl((int)pHistoryInfo->GetKind());
-			pListAnswer->m_tTime				= htonl((int)pHistoryInfo->GetTime());
+			NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
+			unsigned long iSizeHi, iSizeLo;
+			Util::SplitInt64(pNZBInfo->GetSize(), &iSizeHi, &iSizeLo);
+			pListAnswer->m_iSizeLo				= htonl(iSizeLo);
+			pListAnswer->m_iSizeHi				= htonl(iSizeHi);
+			pListAnswer->m_iFileCount			= htonl(pNZBInfo->GetFileCount());
+			pListAnswer->m_iParStatus			= htonl(pNZBInfo->GetParStatus());
+			pListAnswer->m_iScriptStatus		= htonl(pNZBInfo->GetScriptStatuses()->CalcTotalStatus());
+		}
+		else if (pHistoryInfo->GetKind() == HistoryInfo::hkUrl)
+		{
+			NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
+			pListAnswer->m_iUrlStatus			= htonl(pNZBInfo->GetUrlStatus());
+		}

-			char szNicename[1024];
-			pHistoryInfo->GetName(szNicename, sizeof(szNicename));
-			pListAnswer->m_iNicenameLen			= htonl(strlen(szNicename) + 1);
-
-			if (pHistoryInfo->GetKind() == HistoryInfo::hkNzb)
-			{
-				NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
-				unsigned long iSizeHi, iSizeLo;
-				Util::SplitInt64(pNZBInfo->GetSize(), &iSizeHi, &iSizeLo);
-				pListAnswer->m_iSizeLo				= htonl(iSizeLo);
-				pListAnswer->m_iSizeHi				= htonl(iSizeHi);
-				pListAnswer->m_iFileCount			= htonl(pNZBInfo->GetFileCount());
-				pListAnswer->m_iParStatus			= htonl(pNZBInfo->GetParStatus());
-				pListAnswer->m_iScriptStatus		= htonl(pNZBInfo->GetScriptStatuses()->CalcTotalStatus());
-			}
-			else if (pHistoryInfo->GetKind() == HistoryInfo::hkDup && bShowHidden)
-			{
-				DupInfo* pDupInfo = pHistoryInfo->GetDupInfo();
-				unsigned long iSizeHi, iSizeLo;
-				Util::SplitInt64(pDupInfo->GetSize(), &iSizeHi, &iSizeLo);
-				pListAnswer->m_iSizeLo				= htonl(iSizeLo);
-				pListAnswer->m_iSizeHi				= htonl(iSizeHi);
-			}
-			else if (pHistoryInfo->GetKind() == HistoryInfo::hkUrl)
-			{
-				NZBInfo* pNZBInfo = pHistoryInfo->GetNZBInfo();
-				pListAnswer->m_iUrlStatus			= htonl(pNZBInfo->GetUrlStatus());
-			}
-
-			bufptr += sizeof(SNZBHistoryResponseEntry);
-			strcpy(bufptr, szNicename);
-			bufptr += ntohl(pListAnswer->m_iNicenameLen);
-			// align struct to 4-bytes, needed by ARM-processor (and may be others)
-			if ((size_t)bufptr % 4 > 0)
-			{
-				pListAnswer->m_iNicenameLen = htonl(ntohl(pListAnswer->m_iNicenameLen) + 4 - (size_t)bufptr % 4);
-				memset(bufptr, 0, 4 - (size_t)bufptr % 4); //suppress valgrind warning "uninitialized data"
-				bufptr += 4 - (size_t)bufptr % 4;
-			}
+		bufptr += sizeof(SNZBHistoryResponseEntry);
+		strcpy(bufptr, szNicename);
+		bufptr += ntohl(pListAnswer->m_iNicenameLen);
+		// align struct to 4-bytes, needed by ARM-processor (and may be others)
+		if ((size_t)bufptr % 4 > 0)
+		{
+			pListAnswer->m_iNicenameLen = htonl(ntohl(pListAnswer->m_iNicenameLen) + 4 - (size_t)bufptr % 4);
+			memset(bufptr, 0, 4 - (size_t)bufptr % 4); //suppress valgrind warning "uninitialized data"
+			bufptr += 4 - (size_t)bufptr % 4;
 		}
 	}

@@ -1215,3 +1057,42 @@ void HistoryBinCommand::Execute()

 	free(buf);
 }
+
+void DownloadUrlBinCommand::Execute()
+{
+	SNZBDownloadUrlRequest DownloadUrlRequest;
+	if (!ReceiveRequest(&DownloadUrlRequest, sizeof(DownloadUrlRequest)))
+	{
+		return;
+	}
+
+	URL url(DownloadUrlRequest.m_szURL);
+	if (!url.IsValid())
+	{
+		char tmp[1024];
+		snprintf(tmp, 1024, "Url %s is not valid", DownloadUrlRequest.m_szURL);
+		tmp[1024-1] = '\0';
+		SendBoolResponse(true, tmp);
+		return;
+	}
+
+	NZBInfo* pNZBInfo = new NZBInfo();
+	pNZBInfo->SetKind(NZBInfo::nkUrl);
+	pNZBInfo->SetURL(DownloadUrlRequest.m_szURL);
+	pNZBInfo->SetFilename(DownloadUrlRequest.m_szNZBFilename);
+	pNZBInfo->SetCategory(DownloadUrlRequest.m_szCategory);
+	pNZBInfo->SetPriority(ntohl(DownloadUrlRequest.m_iPriority));
+	pNZBInfo->SetAddUrlPaused(ntohl(DownloadUrlRequest.m_bAddPaused));
+
+	DownloadQueue* pDownloadQueue = DownloadQueue::Lock();
+	pDownloadQueue->GetQueue()->Add(pNZBInfo, ntohl(DownloadUrlRequest.m_bAddFirst));
+	pDownloadQueue->Save();
+	DownloadQueue::Unlock();
+
+	info("Request: Queue url %s", DownloadUrlRequest.m_szURL);
+
+	char tmp[1024];
+	snprintf(tmp, 1024, "Url %s added to queue", DownloadUrlRequest.m_szURL);
+	tmp[1024-1] = '\0';
+	SendBoolResponse(true, tmp);
+}
--- a/daemon/remote/BinRpc.h
+++ b/daemon/remote/BinRpc.h
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2009 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -44,4 +44,116 @@ public:
 	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
--- a/daemon/remote/MessageBase.h
+++ b/daemon/remote/MessageBase.h
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -27,7 +27,7 @@
 #ifndef MESSAGEBASE_H
 #define MESSAGEBASE_H

-static const int32_t NZBMESSAGE_SIGNATURE = 0x6E7A6228; // = "nzb-XX" (protocol version)
+static const int32_t NZBMESSAGE_SIGNATURE = 0x6E7A6224; // = "nzb-XX" (protocol version)
 static const int NZBREQUESTFILENAMESIZE = 512;
 static const int NZBREQUESTPASSWORDSIZE = 32;

@@ -61,7 +61,8 @@ enum eRemoteRequest
 	eRemoteRequestPostQueue,
 	eRemoteRequestWriteLog,
 	eRemoteRequestScan,
-	eRemoteRequestHistory
+	eRemoteRequestHistory,
+	eRemoteRequestDownloadUrl
 };

 // Possible values for field "m_iAction" of struct "SNZBPauseUnpauseRequest":
@@ -101,14 +102,11 @@ struct SNZBResponseBase
 struct SNZBDownloadRequest
 {
 	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	char					m_szNZBFilename[NZBREQUESTFILENAMESIZE];// Name of nzb-file. For URLs can be empty, then the filename is read from URL download response
+	char					m_szFilename[NZBREQUESTFILENAMESIZE];	// Name of nzb-file, may contain full path (local path on client) or only filename
 	char					m_szCategory[NZBREQUESTFILENAMESIZE];	// Category, can be empty
 	int32_t					m_bAddFirst;			// 1 - add file to the top of download queue
 	int32_t					m_bAddPaused;			// 1 - pause added files
 	int32_t					m_iPriority;			// Priority for files (0 - default)
-	int32_t					m_iDupeScore;			// Duplicate score
-	int32_t					m_iDupeMode;			// Duplicate mode (EDupeMode)
-	char					m_szDupeKey[NZBREQUESTFILENAMESIZE];	// Duplicate key
 	int32_t					m_iTrailingDataLength;	// Length of nzb-file in bytes
 	//char					m_szContent[m_iTrailingDataLength];	// variable sized
 };
@@ -175,7 +173,6 @@ struct SNZBListResponseNZBEntry
 	int32_t					m_iPausedSizeLo;		// Size of npaused files in bytes, Low 32-bits of 64-bit value
 	int32_t					m_iPausedSizeHi;		// Size of paused files in bytes, High 32-bits of 64-bit value
 	int32_t					m_iPausedCount;			// Number of paused files
-	int32_t					m_iRemainingParCount;	// Number of remaining par-files
 	int32_t					m_iPriority;			// Download priority
 	int32_t					m_bMatch;				// 1 - group matches the pattern (only when Request has eRemoteMatchModeRegEx)
 	int32_t					m_iFilenameLen;			// Length of Filename-string (m_szFilename), following to this record
@@ -439,7 +436,6 @@ struct SNZBScanResponse
 struct SNZBHistoryRequest
 {
 	SNZBRequestBase			m_MessageBase;			// Must be the first in the struct
-	int32_t					m_bHidden;				// 0 - only return visible records, 1 - also return hidden records
 };

 // history response
@@ -456,13 +452,12 @@ struct SNZBHistoryResponse
 struct SNZBHistoryResponseEntry
 {
 	int32_t					m_iID;					// History-ID
-	int32_t					m_iKind;				// Kind of Item: 1 - Collection (NZB), 2 - URL, 3 - DUP (hidden record)
+	int32_t					m_iKind;				// Kind of Item: 1 - Collection (NZB), 2 - URL
 	int32_t					m_tTime;				// When the item was added to history. time since the Epoch (00:00:00 UTC, January 1, 1970), measured in seconds.
 	int32_t					m_iNicenameLen;			// Length of Nicename-string (m_szNicename), following to this record
-	// for Collection and Dup items (m_iKind = 1 or 2)
+	// for Collection items (m_iKind = 1)
 	int32_t					m_iSizeLo;				// Size of all files in bytes, Low 32-bits of 64-bit value
 	int32_t					m_iSizeHi;				// Size of all files in bytes, High 32-bits of 64-bit value
-	// for Collection items (m_iKind = 1)
 	int32_t					m_iFileCount;			// Initial number of files included in NZB-file
 	int32_t					m_iParStatus;			// See NZBInfo::EParStatus
 	int32_t					m_iScriptStatus;		// See NZBInfo::EScriptStatus
@@ -472,4 +467,25 @@ struct SNZBHistoryResponseEntry
 	//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
+};
+
 #endif
--- a/daemon/remote/RemoteClient.cpp
+++ b/daemon/remote/RemoteClient.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -101,12 +101,19 @@ void RemoteClient::perror(const char * msg)
 bool RemoteClient::InitConnection()
 {
 	// Create a connection to the server
-	m_pConnection = new Connection(g_pOptions->GetControlIP(), g_pOptions->GetControlPort(), false);
+
+	const char *szControlIP = g_pOptions->GetControlIP();
+	if (!strcmp(szControlIP, "0.0.0.0"))
+	{
+		szControlIP = "127.0.0.1";
+	}
+
+	m_pConnection = new Connection(szControlIP, g_pOptions->GetControlPort(), false);

 	bool OK = m_pConnection->Connect();
 	if (!OK)
 	{
-		printf("Unable to send request to nzbget-server at %s (port %i)\n", g_pOptions->GetControlIP(), g_pOptions->GetControlPort());
+		printf("Unable to send request to nzbserver at %s (port %i)\n", szControlIP, g_pOptions->GetControlPort());
 	}
 	return OK;
 }
@@ -159,26 +166,15 @@ bool RemoteClient::ReceiveBoolResponse()
 /*
 * Sends a message to the running nzbget process.
 */
-bool RemoteClient::RequestServerDownload(const char* szNZBFilename, const char* szNZBContent,
-	const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority,
-	const char* szDupeKey, int iDupeMode, int iDupeScore)
+bool RemoteClient::RequestServerDownload(const char* szFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority)
 {
 	// Read the file into the buffer
-	char* szBuffer = NULL;
-	int iLength = 0;
-	bool bIsUrl = !strncasecmp(szNZBContent, "http://", 6) || !strncasecmp(szNZBContent, "https://", 7);
-	if (bIsUrl)
+	char* szBuffer	= NULL;
+	int iLength		= 0;
+	if (!Util::LoadFileIntoBuffer(szFilename, &szBuffer, &iLength))
 	{
-		iLength = strlen(szNZBContent) + 1;
-	}
-	else
-	{
-		if (!Util::LoadFileIntoBuffer(szNZBContent, &szBuffer, &iLength))
-		{
-			printf("Could not load file %s\n", szNZBContent);
-			return false;
-		}
-		iLength--;
+		printf("Could not load file %s\n", szFilename);
+		return false;
 	}

 	bool OK = InitConnection();
@@ -189,21 +185,10 @@ bool RemoteClient::RequestServerDownload(const char* szNZBFilename, const char*
 		DownloadRequest.m_bAddFirst = htonl(bAddFirst);
 		DownloadRequest.m_bAddPaused = htonl(bAddPaused);
 		DownloadRequest.m_iPriority = htonl(iPriority);
-		DownloadRequest.m_iDupeMode = htonl(iDupeMode);
-		DownloadRequest.m_iDupeScore = htonl(iDupeScore);
-		DownloadRequest.m_iTrailingDataLength = htonl(iLength);
-
-		DownloadRequest.m_szNZBFilename[0] = '\0';
-		if (!Util::EmptyStr(szNZBFilename))
-		{
-			strncpy(DownloadRequest.m_szNZBFilename, szNZBFilename, NZBREQUESTFILENAMESIZE - 1);
-		}
-		else if (!bIsUrl)
-		{
-			strncpy(DownloadRequest.m_szNZBFilename, szNZBContent, NZBREQUESTFILENAMESIZE - 1);
-		}
-		DownloadRequest.m_szNZBFilename[NZBREQUESTFILENAMESIZE-1] = '\0';
+		DownloadRequest.m_iTrailingDataLength = htonl(iLength - 1);

+		strncpy(DownloadRequest.m_szFilename, szFilename, NZBREQUESTFILENAMESIZE - 1);
+		DownloadRequest.m_szFilename[NZBREQUESTFILENAMESIZE-1] = '\0';
 		DownloadRequest.m_szCategory[0] = '\0';
 		if (szCategory)
 		{
@@ -211,13 +196,6 @@ bool RemoteClient::RequestServerDownload(const char* szNZBFilename, const char*
 		}
 		DownloadRequest.m_szCategory[NZBREQUESTFILENAMESIZE-1] = '\0';

-		DownloadRequest.m_szDupeKey[0] = '\0';
-		if (!Util::EmptyStr(szDupeKey))
-		{
-			strncpy(DownloadRequest.m_szDupeKey, szDupeKey, NZBREQUESTFILENAMESIZE - 1);
-		}
-		DownloadRequest.m_szDupeKey[NZBREQUESTFILENAMESIZE-1] = '\0';
-
 		if (!m_pConnection->Send((char*)(&DownloadRequest), sizeof(DownloadRequest)))
 		{
 			perror("m_pConnection->Send");
@@ -225,7 +203,7 @@ bool RemoteClient::RequestServerDownload(const char* szNZBFilename, const char*
 		}
 		else
 		{
-			m_pConnection->Send(bIsUrl ? szNZBContent : szBuffer, iLength);
+			m_pConnection->Send(szBuffer, iLength);
 			OK = ReceiveBoolResponse();
 			m_pConnection->Disconnect();
 		}
@@ -264,7 +242,6 @@ void RemoteClient::BuildFileList(SNZBListResponse* pListResponse, const char* pT
 			pNZBInfo->SetRemainingSize(Util::JoinInt64(ntohl(pListAnswer->m_iRemainingSizeHi), ntohl(pListAnswer->m_iRemainingSizeLo)));
 			pNZBInfo->SetPausedSize(Util::JoinInt64(ntohl(pListAnswer->m_iPausedSizeHi), ntohl(pListAnswer->m_iPausedSizeLo)));
 			pNZBInfo->SetPausedFileCount(ntohl(pListAnswer->m_iPausedCount));
-			pNZBInfo->SetRemainingParCount(ntohl(pListAnswer->m_iRemainingParCount));
 			pNZBInfo->SetFilename(szFileName);
 			pNZBInfo->SetName(szName);
 			pNZBInfo->SetDestDir(szDestDir);
@@ -1116,13 +1093,12 @@ bool RemoteClient::RequestScan(bool bSyncMode)
 	return OK;
 }

-bool RemoteClient::RequestHistory(bool bWithHidden)
+bool RemoteClient::RequestHistory()
 {
 	if (!InitConnection()) return false;

 	SNZBHistoryRequest HistoryRequest;
 	InitMessageBase(&HistoryRequest.m_MessageBase, eRemoteRequestHistory, sizeof(HistoryRequest));
-	HistoryRequest.m_bHidden = htonl(bWithHidden);

 	if (!m_pConnection->Send((char*)(&HistoryRequest), sizeof(HistoryRequest)))
 	{
@@ -1173,12 +1149,8 @@ bool RemoteClient::RequestHistory(bool bWithHidden)
 			HistoryInfo::EKind eKind = (HistoryInfo::EKind)ntohl(pListAnswer->m_iKind);
 			const char* szNicename = pBufPtr + sizeof(SNZBHistoryResponseEntry);

-			if (eKind == HistoryInfo::hkNzb || eKind == HistoryInfo::hkDup)
+			if (eKind == HistoryInfo::hkNzb)
 			{
-				char szFiles[20];
-				snprintf(szFiles, sizeof(szFiles), "%i files, ", ntohl(pListAnswer->m_iFileCount));
-				szFiles[20 - 1] = '\0';
-
 				long long lSize = Util::JoinInt64(ntohl(pListAnswer->m_iSizeHi), ntohl(pListAnswer->m_iSizeLo));

 				char szSize[20];
@@ -1186,20 +1158,17 @@ bool RemoteClient::RequestHistory(bool bWithHidden)

 				const char* szParStatusText[] = { "", "", ", Par failed", ", Par successful", ", Repair possible", ", Repair needed" };
 				const char* szScriptStatusText[] = { "", ", Script status unknown", ", Script failed", ", Script successful" };
-				int iParStatus = ntohl(pListAnswer->m_iParStatus);
-				int iScriptStatus = ntohl(pListAnswer->m_iScriptStatus);

-				printf("[%i] %s (%s%s%s%s%s)\n", ntohl(pListAnswer->m_iID), szNicename, 
-					(eKind == HistoryInfo::hkDup ? "Hidden, " : ""),
-					(eKind == HistoryInfo::hkDup ? "" : szFiles), szSize, 
-					(eKind == HistoryInfo::hkDup ? "" : szParStatusText[iParStatus]),
-					(eKind == HistoryInfo::hkDup ? "" : szScriptStatusText[iScriptStatus]));
+				printf("[%i] %s (%i files, %s%s%s)\n", ntohl(pListAnswer->m_iID), szNicename, 
+					ntohl(pListAnswer->m_iFileCount), szSize, 
+					szParStatusText[ntohl(pListAnswer->m_iParStatus)], 
+					szScriptStatusText[ntohl(pListAnswer->m_iScriptStatus)]);
 			}
 			else if (eKind == HistoryInfo::hkUrl)
 			{
-				const char* szUrlStatusText[] = { "", "", "Url download successful", "Url download failed", "", "Nzb scan skipped", "Nzb scan failed" };
+				const char* szUrlStatusText[] = { "", "", "Url download successful", "Url download failed", "" };

-				printf("[%i] %s (URL, %s)\n", ntohl(pListAnswer->m_iID), szNicename, 
+				printf("[%i] %s (%s)\n", ntohl(pListAnswer->m_iID), szNicename, 
 					szUrlStatusText[ntohl(pListAnswer->m_iUrlStatus)]);
 			}

@@ -1214,3 +1183,44 @@ bool RemoteClient::RequestHistory(bool bWithHidden)

 	return true;
 }
+
+bool RemoteClient::RequestServerDownloadUrl(const char* szURL, const char* szNZBFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority)
+{
+	if (!InitConnection()) return false;
+
+	SNZBDownloadUrlRequest DownloadUrlRequest;
+	InitMessageBase(&DownloadUrlRequest.m_MessageBase, eRemoteRequestDownloadUrl, sizeof(DownloadUrlRequest));
+	DownloadUrlRequest.m_bAddFirst = htonl(bAddFirst);
+	DownloadUrlRequest.m_bAddPaused = htonl(bAddPaused);
+	DownloadUrlRequest.m_iPriority = htonl(iPriority);
+
+	strncpy(DownloadUrlRequest.m_szURL, szURL, NZBREQUESTFILENAMESIZE - 1);
+	DownloadUrlRequest.m_szURL[NZBREQUESTFILENAMESIZE-1] = '\0';
+
+	DownloadUrlRequest.m_szCategory[0] = '\0';
+	if (szCategory)
+	{
+		strncpy(DownloadUrlRequest.m_szCategory, szCategory, NZBREQUESTFILENAMESIZE - 1);
+	}
+	DownloadUrlRequest.m_szCategory[NZBREQUESTFILENAMESIZE-1] = '\0';
+
+	DownloadUrlRequest.m_szNZBFilename[0] = '\0';
+	if (szNZBFilename)
+	{
+		strncpy(DownloadUrlRequest.m_szNZBFilename, szNZBFilename, NZBREQUESTFILENAMESIZE - 1);
+	}
+	DownloadUrlRequest.m_szNZBFilename[NZBREQUESTFILENAMESIZE-1] = '\0';
+
+	bool OK = m_pConnection->Send((char*)(&DownloadUrlRequest), sizeof(DownloadUrlRequest));
+	if (OK)
+	{
+		OK = ReceiveBoolResponse();
+	}
+	else
+	{
+		perror("m_pConnection->Send");
+	}
+
+	m_pConnection->Disconnect();
+	return OK;
+}
--- a/daemon/remote/RemoteClient.h
+++ b/daemon/remote/RemoteClient.h
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2005 Bo Cordes Petersen <placebodk@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -60,9 +60,7 @@ public:
 					RemoteClient();
 					~RemoteClient();
 	void			SetVerbose(bool bVerbose) { m_bVerbose = bVerbose; };
-	bool 			RequestServerDownload(const char* szNZBFilename, const char* szNZBContent, const char* szCategory,
-						bool bAddFirst, bool bAddPaused, int iPriority,
-						const char* szDupeKey, int iDupeMode, int iDupeScore);
+	bool 			RequestServerDownload(const char* szFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority);
 	bool			RequestServerList(bool bFiles, bool bGroups, const char* szPattern);
 	bool			RequestServerPauseUnpause(bool bPause, eRemotePauseUnpauseAction iAction);
 	bool			RequestServerSetDownloadRate(int iRate);
@@ -76,7 +74,8 @@ public:
 	bool			RequestPostQueue();
 	bool 			RequestWriteLog(int iKind, const char* szText);
 	bool			RequestScan(bool bSyncMode);
-	bool			RequestHistory(bool bWithHidden);
+	bool			RequestHistory();
+	bool 			RequestServerDownloadUrl(const char* szURL, const char* szNZBFilename, const char* szCategory, bool bAddFirst, bool bAddPaused, int iPriority);
 	void			BuildFileList(SNZBListResponse* pListResponse, const char* pTrailingData, DownloadQueue* pDownloadQueue);
 };

--- a/daemon/remote/RemoteServer.cpp
+++ b/daemon/remote/RemoteServer.cpp
@@ -34,7 +34,6 @@

 #include <stdlib.h>
 #include <string.h>
-#include <stdio.h>
 #ifndef WIN32
 #include <unistd.h>
 #include <sys/socket.h>
@@ -100,7 +99,7 @@ void RemoteServer::Run()
 			m_pConnection = new Connection(g_pOptions->GetControlIP(), 
 				m_bTLS ? g_pOptions->GetSecurePort() : g_pOptions->GetControlPort(),
 				m_bTLS);
-			m_pConnection->SetTimeout(g_pOptions->GetUrlTimeout());
+			m_pConnection->SetTimeout(g_pOptions->GetConnectionTimeout());
 			m_pConnection->SetSuppressErrors(false);
 			bBind = m_pConnection->Bind();
 		}
@@ -181,7 +180,7 @@ void RequestProcessor::Run()
 	int iSignature = 0;
 	if (!m_pConnection->Recv((char*)&iSignature, 4))
 	{
-		debug("Could not read request signature");
+		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;
 	}

--- a/daemon/remote/WebServer.cpp
+++ b/daemon/remote/WebServer.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2012-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2012-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
@@ -81,7 +81,6 @@ void WebProcessor::Execute()
 	m_bGZip =false;
 	char szAuthInfo[1024];
 	szAuthInfo[0] = '\0';
-	m_eUserAccess = uaControl;

 	// reading http header
 	char szBuffer[1024];
@@ -177,10 +176,10 @@ void WebProcessor::Execute()

 	debug("Final URL=%s", m_szUrl);

-	if (!Util::EmptyStr(g_pOptions->GetControlPassword()) &&
-		!(!Util::EmptyStr(g_pOptions->GetAuthorizedIP()) && IsAuthorizedIP(m_pConnection->GetRemoteAddr())))
+	if (strlen(g_pOptions->GetControlPassword()) > 0 &&
+		!(strlen(g_pOptions->GetAuthorizedIP()) > 0 && IsAuthorizedIP(m_pConnection->GetRemoteAddr())))
 	{
-		if (Util::EmptyStr(szAuthInfo))
+		if (strlen(szAuthInfo) == 0)
 		{
 			SendAuthResponse();
 			return;
@@ -189,26 +188,8 @@ void WebProcessor::Execute()
 		// Authorization
 		char* pw = strchr(szAuthInfo, ':');
 		if (pw) *pw++ = '\0';
-
-		if ((Util::EmptyStr(g_pOptions->GetControlUsername()) ||
-			 !strcmp(szAuthInfo, g_pOptions->GetControlUsername())) &&
-			pw && !strcmp(pw, g_pOptions->GetControlPassword()))
-		{
-			m_eUserAccess = uaControl;
-		}
-		else if (!Util::EmptyStr(g_pOptions->GetRestrictedUsername()) &&
-			!strcmp(szAuthInfo, g_pOptions->GetRestrictedUsername()) &&
-			pw && !strcmp(pw, g_pOptions->GetRestrictedPassword()))
-		{
-			m_eUserAccess = uaRestricted;
-		}
-		else if (!Util::EmptyStr(g_pOptions->GetAddUsername()) &&
-			!strcmp(szAuthInfo, g_pOptions->GetAddUsername()) &&
-			pw && !strcmp(pw, g_pOptions->GetAddPassword()))
-		{
-			m_eUserAccess = uaAdd;
-		}
-		else
+		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);
@@ -268,14 +249,13 @@ void WebProcessor::Dispatch()
 		XmlRpcProcessor processor;
 		processor.SetRequest(m_szRequest);
 		processor.SetHttpMethod(m_eHttpMethod == hmGet ? XmlRpcProcessor::hmGet : XmlRpcProcessor::hmPost);
-		processor.SetUserAccess((XmlRpcProcessor::EUserAccess)m_eUserAccess);
 		processor.SetUrl(m_szUrl);
 		processor.Execute();
 		SendBodyResponse(processor.GetResponse(), strlen(processor.GetResponse()), processor.GetContentType()); 
 		return;
 	}

-	if (Util::EmptyStr(g_pOptions->GetWebDir()))
+	if (!g_pOptions->GetWebDir() || strlen(g_pOptions->GetWebDir()) == 0)
 	{
 		SendErrorResponse(ERR_HTTP_SERVICE_UNAVAILABLE);
 		return;
--- a/daemon/remote/WebServer.h
+++ b/daemon/remote/WebServer.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2012-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2012 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -38,19 +38,11 @@ public:
 		hmOptions
 	};

-	enum EUserAccess
-	{
-		uaControl,
-		uaRestricted,
-		uaAdd
-	};
-
 private:
 	Connection*			m_pConnection;
 	char*				m_szRequest;
 	char*				m_szUrl;
 	EHttpMethod			m_eHttpMethod;
-	EUserAccess			m_eUserAccess;
 	bool				m_bGZip;
 	char*				m_szOrigin;

--- a/daemon/remote/XmlRpc.cpp
+++ b/daemon/remote/XmlRpc.cpp
--- a/daemon/remote/XmlRpc.h
+++ b/daemon/remote/XmlRpc.h
@@ -48,33 +48,24 @@ public:
 		hmGet
 	};

-	enum EUserAccess
-	{
-		uaControl,
-		uaRestricted,
-		uaAdd
-	};
-
 private:
 	char*				m_szRequest;
 	const char*			m_szContentType;
 	ERpcProtocol		m_eProtocol;
 	EHttpMethod			m_eHttpMethod;
-	EUserAccess			m_eUserAccess;
 	char*				m_szUrl;
 	StringBuilder		m_cResponse;

 	void				Dispatch();
 	XmlCommand*			CreateCommand(const char* szMethodName);
 	void				MutliCall();
-	void				BuildResponse(const char* szResponse, const char* szCallbackFunc, bool bFault, const char* szRequestId);
+	void				BuildResponse(const char* szResponse, const char* szCallbackFunc, bool bFault);

 public:
 						XmlRpcProcessor();
 						~XmlRpcProcessor();
 	void				Execute();
 	void				SetHttpMethod(EHttpMethod eHttpMethod) { m_eHttpMethod = eHttpMethod; }
-	void				SetUserAccess(EUserAccess eUserAccess) { m_eUserAccess = eUserAccess; }
 	void				SetUrl(const char* szUrl);
 	void				SetRequest(char* szRequest) { m_szRequest = szRequest; }
 	const char*			GetResponse() { return m_cResponse.GetBuffer(); }
@@ -92,7 +83,6 @@ protected:
 	bool				m_bFault;
 	XmlRpcProcessor::ERpcProtocol	m_eProtocol;
 	XmlRpcProcessor::EHttpMethod	m_eHttpMethod;
-	XmlRpcProcessor::EUserAccess	m_eUserAccess;

 	void				BuildErrorResponse(int iErrCode, const char* szErrText, ...);
 	void				BuildBoolResponse(bool bOK);
@@ -116,7 +106,6 @@ public:
 	void				SetRequest(char* szRequest) { m_szRequest = szRequest; m_szRequestPtr = m_szRequest; }
 	void				SetProtocol(XmlRpcProcessor::ERpcProtocol eProtocol) { m_eProtocol = eProtocol; }
 	void				SetHttpMethod(XmlRpcProcessor::EHttpMethod eHttpMethod) { m_eHttpMethod = eHttpMethod; }
-	void				SetUserAccess(XmlRpcProcessor::EUserAccess eUserAccess) { m_eUserAccess = eUserAccess; }
 	const char*			GetResponse() { return m_StringBuilder.GetBuffer(); }
 	const char*			GetCallbackFunc() { return m_szCallbackFunc; }
 	bool				GetFault() { return m_bFault; }
--- a/daemon/util/Log.cpp
+++ b/daemon/util/Log.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-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
@@ -32,7 +32,6 @@
 #include "win32.h"
 #else
 #include <pthread.h>
-#include <unistd.h>
 #endif

 #include <stdlib.h>
@@ -53,7 +52,6 @@ Log::Log()
 	m_Messages.clear();
 	m_iIDGen = 0;
 	m_szLogFilename = NULL;
-	m_tLastWritten = 0;
 #ifdef DEBUG
 	m_bExtraDebug = Util::FileExists("extradebug");
 #endif
@@ -84,57 +82,48 @@ void Log::LogDebugInfo()

 void Log::Filelog(const char* msg, ...)
 {
-	if (!m_szLogFilename)
+	if (m_szLogFilename)
 	{
-		return;
-	}
+		char tmp2[1024];

-	char tmp2[1024];
+		va_list ap;
+		va_start(ap, msg);
+		vsnprintf(tmp2, 1024, msg, ap);
+		tmp2[1024-1] = '\0';
+		va_end(ap);

-	va_list ap;
-	va_start(ap, msg);
-	vsnprintf(tmp2, 1024, msg, ap);
-	tmp2[1024-1] = '\0';
-	va_end(ap);
-
-	time_t rawtime = time(NULL) + g_pOptions->GetTimeCorrection();
-	
-	char szTime[50];
+		time_t rawtime;
+		time(&rawtime);
+		rawtime += g_pOptions->GetTimeCorrection();
+		
+		char szTime[50];
 #ifdef HAVE_CTIME_R_3
-	ctime_r(&rawtime, szTime, 50);
+		ctime_r(&rawtime, szTime, 50);
 #else
-	ctime_r(&rawtime, szTime);
+		ctime_r(&rawtime, szTime);
 #endif
-	szTime[50-1] = '\0';
-	szTime[strlen(szTime) - 1] = '\0'; // trim LF
+		szTime[50-1] = '\0';
+		szTime[strlen(szTime) - 1] = '\0'; // trim LF

-	if ((int)rawtime/86400 != (int)m_tLastWritten/86400 && g_pOptions->GetWriteLog() == Options::wlRotate)
-	{
-		RotateLog();
-	}
-
-	m_tLastWritten = rawtime;
-
-	FILE* file = fopen(m_szLogFilename, FOPEN_ABP);
-	if (file)
-	{
+		FILE* file = fopen(m_szLogFilename, FOPEN_ABP);
+		if (file)
+		{
 #ifdef WIN32
-		unsigned long iProcessId = GetCurrentProcessId();
-		unsigned long iThreadId = GetCurrentThreadId();
+			unsigned long iThreadId = GetCurrentThreadId();
 #else
-		unsigned long iProcessId = (unsigned long)getpid();
-		unsigned long iThreadId = (unsigned long)pthread_self();
+			unsigned long iThreadId = (unsigned long)pthread_self();
 #endif
 #ifdef DEBUG
-		fprintf(file, "%s\t%lu\t%lu\t%s%s", szTime, iProcessId, iThreadId, tmp2, LINE_ENDING);
+			fprintf(file, "%s\t%lu\t%s%s", szTime, iThreadId, tmp2, LINE_ENDING);
 #else
-		fprintf(file, "%s\t%s%s", szTime, tmp2, LINE_ENDING);
+			fprintf(file, "%s\t%s%s", szTime, tmp2, LINE_ENDING);
 #endif
-		fclose(file);
-	}
-	else
-	{
-		perror(m_szLogFilename);
+			fclose(file);
+		}
+		else
+		{
+			perror(m_szLogFilename);
+		}
 	}
 }

@@ -177,14 +166,14 @@ void debug(const char* msg, ...)
 	}

 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetDebugTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AddMessage(Message::mkDebug, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("DEBUG\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkDebug, tmp2);
+	}

 	g_pLog->m_mutexLog.Unlock();
 }
@@ -203,14 +192,14 @@ void error(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();

 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetErrorTarget() : Options::mtBoth;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AddMessage(Message::mkError, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("ERROR\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkError, tmp2);
+	}

 	g_pLog->m_mutexLog.Unlock();
 }
@@ -228,14 +217,14 @@ void warn(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();

 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetWarningTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AddMessage(Message::mkWarning, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("WARNING\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkWarning, tmp2);
+	}

 	g_pLog->m_mutexLog.Unlock();
 }
@@ -253,14 +242,14 @@ void info(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();

 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetInfoTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AddMessage(Message::mkInfo, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("INFO\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkInfo, tmp2);
+	}

 	g_pLog->m_mutexLog.Unlock();
 }
@@ -278,14 +267,14 @@ void detail(const char* msg, ...)
 	g_pLog->m_mutexLog.Lock();

 	Options::EMessageTarget eMessageTarget = g_pOptions ? g_pOptions->GetDetailTarget() : Options::mtScreen;
-	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
-	{
-		g_pLog->AddMessage(Message::mkDetail, tmp2);
-	}
 	if (eMessageTarget == Options::mtLog || eMessageTarget == Options::mtBoth)
 	{
 		g_pLog->Filelog("DETAIL\t%s", tmp2);
 	}
+	if (eMessageTarget == Options::mtScreen || eMessageTarget == Options::mtBoth)
+	{
+		g_pLog->AppendMessage(Message::mkDetail, tmp2);
+	}

 	g_pLog->m_mutexLog.Unlock();
 }
@@ -334,28 +323,18 @@ Message::~ Message()
 	free(m_szText);
 }

-MessageList::~MessageList()
-{
-	Clear();
-}
-
-void MessageList::Clear()
-{
-	for (iterator it = begin(); it != end(); it++)
-	{
-		delete *it;
-	}
-	clear();
-}
-
 void Log::Clear()
 {
 	m_mutexLog.Lock();
-	m_Messages.Clear();
+	for (Messages::iterator it = m_Messages.begin(); it != m_Messages.end(); it++)
+	{
+		delete *it;
+	}
+	m_Messages.clear();
 	m_mutexLog.Unlock();
 }

-void Log::AddMessage(Message::EKind eKind, const char * szText)
+void Log::AppendMessage(Message::EKind eKind, const char * szText)
 {
 	Message* pMessage = new Message(++m_iIDGen, eKind, time(NULL), szText);
 	m_Messages.push_back(pMessage);
@@ -371,7 +350,7 @@ void Log::AddMessage(Message::EKind eKind, const char * szText)
 	}
 }

-MessageList* Log::LockMessages()
+Log::Messages* Log::LockMessages()
 {
 	m_mutexLog.Lock();
 	return &m_Messages;
@@ -387,82 +366,6 @@ void Log::ResetLog()
 	remove(g_pOptions->GetLogFile());
 }

-void Log::RotateLog()
-{
-	char szDirectory[1024];
-	strncpy(szDirectory, g_pOptions->GetLogFile(), 1024);
-	szDirectory[1024-1] = '\0';
-
-	// split the full filename into path, basename and extension
-	char* szBaseName = Util::BaseFileName(szDirectory);
-	if (szBaseName > szDirectory)
-	{
-		szBaseName[-1] = '\0';
-	}
-
-	char szBaseExt[250];
-	char* szExt = strrchr(szBaseName, '.');
-	if (szExt && szExt > szBaseName)
-	{
-		strncpy(szBaseExt, szExt, 250);
-		szBaseExt[250-1] = '\0';
-		szExt[0] = '\0';
-	}
-	else
-	{
-		szBaseExt[0] = '\0';
-	}
-
-	char szFileMask[1024];
-	snprintf(szFileMask, 1024, "%s-####-##-##%s", szBaseName, szBaseExt);
-	szFileMask[1024-1] = '\0';
-
-	time_t tCurTime = time(NULL) + g_pOptions->GetTimeCorrection();
-	int iCurDay = (int)tCurTime / 86400;
-	char szFullFilename[1024];
-
-	WildMask mask(szFileMask, true);
-	DirBrowser dir(szDirectory);
-	while (const char* filename = dir.Next())
-	{
-		if (mask.Match(filename))
-		{
-			snprintf(szFullFilename, 1024, "%s%c%s", szDirectory, PATH_SEPARATOR, filename);
-			szFullFilename[1024-1] = '\0';
-
-			struct tm tm;
-			memset(&tm, 0, sizeof(tm));
-			tm.tm_year = atoi(filename + mask.GetMatchStart(0)) - 1900;
-			tm.tm_mon = atoi(filename + mask.GetMatchStart(1)) - 1;
-			tm.tm_mday = atoi(filename + mask.GetMatchStart(2));
-			time_t tFileTime = Util::Timegm(&tm);
-			int iFileDay = (int)tFileTime / 86400;
-
-			if (iFileDay <= iCurDay - g_pOptions->GetRotateLog())
-			{
-				char szMessage[1024];
-				snprintf(szMessage, 1024, "Deleting old log-file %s\n", filename);
-				szMessage[1024-1] = '\0';
-				g_pLog->AddMessage(Message::mkInfo, szMessage);
-
-				remove(szFullFilename);
-			}
-		}
-	}
-
-	struct tm tm;
-	gmtime_r(&tCurTime, &tm);
-	snprintf(szFullFilename, 1024, "%s%c%s-%i-%.2i-%.2i%s", szDirectory, PATH_SEPARATOR,
-		szBaseName, tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, szBaseExt);
-	szFullFilename[1024-1] = '\0';
-
-	free(m_szLogFilename);
-	m_szLogFilename = strdup(szFullFilename);
-#ifdef WIN32
-	WebUtil::Utf8ToAnsi(m_szLogFilename, strlen(m_szLogFilename) + 1);
-#endif
-}
-
 /*
 * During intializing stage (when options were not read yet) all messages
 * are saved in screen log, even if they shouldn't (according to options).
@@ -476,17 +379,12 @@ void Log::InitOptions()
 {
 	const char* szMessageType[] = { "INFO", "WARNING", "ERROR", "DEBUG", "DETAIL"};

-	if (g_pOptions->GetWriteLog() != Options::wlNone && g_pOptions->GetLogFile())
+	if (g_pOptions->GetCreateLog() && g_pOptions->GetLogFile())
 	{
 		m_szLogFilename = strdup(g_pOptions->GetLogFile());
 #ifdef WIN32
 		WebUtil::Utf8ToAnsi(m_szLogFilename, strlen(m_szLogFilename) + 1);
 #endif
-
-		if (g_pOptions->GetServerMode() && g_pOptions->GetWriteLog() == Options::wlReset)
-		{
-			g_pLog->ResetLog();
-		}
 	}

 	m_iIDGen = 0;
--- a/daemon/util/Log.h
+++ b/daemon/util/Log.h
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -76,15 +76,6 @@ public:
 	const char*			GetText() { return m_szText; }
 };

-typedef std::deque<Message*> MessageListBase;
-
-class MessageList: public MessageListBase
-{
-public:
-						~MessageList();
-	void				Clear();
-};
-
 class Debuggable
 {
 protected:
@@ -95,23 +86,22 @@ protected:
 class Log
 {
 public:
+	typedef std::deque<Message*>	Messages;
 	typedef std::list<Debuggable*>	Debuggables;

 private:
 	Mutex				m_mutexLog;
-	MessageList			m_Messages;
+	Messages			m_Messages;
 	Debuggables			m_Debuggables;
 	Mutex				m_mutexDebug;
 	char*				m_szLogFilename;
 	unsigned int		m_iIDGen;
-	time_t				m_tLastWritten;
 #ifdef DEBUG
 	bool				m_bExtraDebug;
 #endif

 	void				Filelog(const char* msg, ...);
-	void				AddMessage(Message::EKind eKind, const char* szText);
-	void				RotateLog();
+	void				AppendMessage(Message::EKind eKind, const char* szText);

 	friend void error(const char* msg, ...);
 	friend void warn(const char* msg, ...);
@@ -129,7 +119,7 @@ private:
 public:
 						Log();
 						~Log();
-	MessageList*		LockMessages();
+	Messages*			LockMessages();
 	void				UnlockMessages();
 	void				Clear();
 	void				ResetLog();
--- a/daemon/util/Script.cpp
+++ b/daemon/util/Script.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -38,15 +38,12 @@
 #include <unistd.h>
 #include <sys/wait.h>
 #include <signal.h>
-#else
-#include <io.h>
 #endif
 #include <sys/stat.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdarg.h>
-#include <algorithm>

 #include "nzbget.h"
 #include "Script.h"
@@ -60,9 +57,6 @@ extern char** environ;
 extern Options* g_pOptions;
 extern char* (*g_szEnvironmentVariables)[];

-ScriptController::RunningScripts ScriptController::m_RunningScripts;
-Mutex ScriptController::m_mutexRunning;
-
 #ifndef WIN32
 #define CHILD_WATCHDOG 1
 #endif
@@ -132,14 +126,7 @@ void EnvironmentStrings::InitFromCurrentProcess()
 	for (int i = 0; (*g_szEnvironmentVariables)[i]; i++)
 	{
 		char* szVar = (*g_szEnvironmentVariables)[i];
-		// Ignore all env vars set by NZBGet.
-		// This is to avoid the passing of env vars after program update (when NZBGet is
-		// started from a script which was started by a previous instance of NZBGet).
-		// Format: NZBXX_YYYY (XX are any two characters, YYYY are any number of any characters).
-		if (!(!strncmp(szVar, "NZB", 3) && strlen(szVar) > 5 && szVar[5] == '_'))
-		{
-			Append(strdup(szVar));
-		}
+		Append(strdup(szVar));
 	}
 }

@@ -208,12 +195,7 @@ ScriptController::ScriptController()
 	m_szLogPrefix = NULL;
 	m_bTerminated = false;
 	m_bDetached = false;
-	m_hProcess = 0;
-	ResetEnv();
-
-	m_mutexRunning.Lock();
-	m_RunningScripts.push_back(this);
-	m_mutexRunning.Unlock();
+	m_environmentStrings.InitFromCurrentProcess();
 }

 ScriptController::~ScriptController()
@@ -226,19 +208,6 @@ ScriptController::~ScriptController()
 		}
 		free(m_szArgs);
 	}
-
-	UnregisterRunningScript();
-}
-
-void ScriptController::UnregisterRunningScript()
-{
-    m_mutexRunning.Lock();
-    RunningScripts::iterator it = std::find(m_RunningScripts.begin(), m_RunningScripts.end(), this);
-    if (it != m_RunningScripts.end())
-    {
-        m_RunningScripts.erase(it);
-    }
-    m_mutexRunning.Unlock();
 }

 void ScriptController::ResetEnv()
@@ -412,8 +381,6 @@ int ScriptController::Execute()

 	CreatePipe(&hReadPipe, &hWritePipe, &SecurityAttributes, 0);

-	SetHandleInformation(hReadPipe, HANDLE_FLAG_INHERIT, 0);
-
 	STARTUPINFO StartupInfo;
 	memset(&StartupInfo, 0, sizeof(StartupInfo));
 	StartupInfo.cb = sizeof(StartupInfo);
@@ -435,15 +402,15 @@ int ScriptController::Execute()
 		szErrMsg[255-1] = '\0';
 		if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, NULL, dwErrCode, 0, szErrMsg, 255, NULL))
 		{
-			PrintMessage(Message::mkError, "Could not start %s: %s", m_szInfoName, szErrMsg);
+			error("Could not start %s: %s", m_szInfoName, szErrMsg);
 		}
 		else
 		{
-			PrintMessage(Message::mkError, "Could not start %s: error %i", m_szInfoName, dwErrCode);
+			error("Could not start %s: error %i", m_szInfoName, dwErrCode);
 		}
 		if (!Util::FileExists(m_szScript))
 		{
-			PrintMessage(Message::mkError, "Could not find file %s", m_szScript);
+			error("Could not find file %s", m_szScript);
 		}
 		free(szEnvironmentStrings);
 		return -1;
@@ -468,7 +435,7 @@ int ScriptController::Execute()
 	// create the pipe
 	if (pipe(p))
 	{
-		PrintMessage(Message::mkError, "Could not open pipe: errno %i", errno);
+		error("Could not open pipe: errno %i", errno);
 		return -1;
 	}

@@ -482,7 +449,7 @@ int ScriptController::Execute()

 	if (pid == -1)
 	{
-		PrintMessage(Message::mkError, "Could not start %s: errno %i", m_szInfoName, errno);
+		error("Could not start %s: errno %i", m_szInfoName, errno);
 		free(pEnvironmentStrings);
 		return -1;
 	}
@@ -542,7 +509,7 @@ int ScriptController::Execute()
 	m_pReadpipe = fdopen(pipein, "r");
 	if (!m_pReadpipe)
 	{
-		PrintMessage(Message::mkError, "Could not open pipe to %s", m_szInfoName);
+		error("Could not open pipe to %s", m_szInfoName);
 		return -1;
 	}
 	
@@ -645,17 +612,6 @@ void ScriptController::Terminate()

 #ifdef WIN32
 	BOOL bOK = TerminateProcess(m_hProcess, -1);
-	if (bOK)
-	{
-		// wait 60 seconds for process to terminate
-		WaitForSingleObject(m_hProcess, 60 * 1000);
-	}
-	else
-	{
-		DWORD dExitCode = 0;
-		GetExitCodeProcess(m_hProcess, &dExitCode);
-		bOK = dExitCode != STILL_ACTIVE;
-	}
 #else
 	pid_t hKillProcess = m_hProcess;
 	if (getpgid(hKillProcess) == hKillProcess)
@@ -663,7 +619,7 @@ void ScriptController::Terminate()
 		// if the child process has its own group (setsid() was successful), kill the whole group
 		hKillProcess = -hKillProcess;
 	}
-	bool bOK = hKillProcess && kill(hKillProcess, SIGKILL) == 0;
+	bool bOK = kill(hKillProcess, SIGKILL) == 0;
 #endif

 	if (bOK)
@@ -678,20 +634,6 @@ void ScriptController::Terminate()
 	debug("Stopped %s", m_szInfoName);
 }

-void ScriptController::TerminateAll()
-{
-	m_mutexRunning.Lock();
-	for (RunningScripts::iterator it = m_RunningScripts.begin(); it != m_RunningScripts.end(); it++)
-	{
-		ScriptController* pScript = *it;
-		if (pScript->m_hProcess && !pScript->m_bDetached)
-		{
-			pScript->Terminate();
-		}
-	}
-	m_mutexRunning.Unlock();
-}
-
 void ScriptController::Detach()
 {
 	debug("Detaching %s", m_szInfoName);
@@ -701,12 +643,6 @@ void ScriptController::Detach()
 	fclose(pReadpipe);
 }
 	
-void ScriptController::Resume()
-{
-	m_bTerminated = false;
-	m_bDetached = false;
-	m_hProcess = 0;
-}

 bool ScriptController::ReadLine(char* szBuf, int iBufSize, FILE* pStream)
 {
--- a/daemon/util/Script.h
+++ b/daemon/util/Script.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -28,7 +28,6 @@

 #include <vector>

-#include "Thread.h"
 #include "Log.h"

 class EnvironmentStrings
@@ -72,10 +71,6 @@ private:
 	pid_t				m_hProcess;
 #endif

-	typedef std::vector<ScriptController*>	RunningScripts;
-	static RunningScripts	m_RunningScripts;
-	static Mutex			m_mutexRunning;
-
 protected:
 	void				ProcessOutput(char* szText);
 	virtual bool		ReadLine(char* szBuf, int iBufSize, FILE* pStream);
@@ -85,16 +80,13 @@ protected:
 	void				ResetEnv();
 	void				PrepareEnvOptions(const char* szStripPrefix);
 	void				PrepareArgs();
-	void				UnregisterRunningScript();

 public:
 						ScriptController();
 	virtual				~ScriptController();
 	int					Execute();
 	void				Terminate();
-	void				Resume();
 	void				Detach();
-	static void			TerminateAll();

 	void				SetScript(const char* szScript) { m_szScript = szScript; }
 	const char*			GetScript() { return m_szScript; }
--- a/daemon/util/Thread.cpp
+++ b/daemon/util/Thread.cpp
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -215,13 +215,6 @@ void Thread::Stop()
 	m_bStopped = true;
 } 

-void Thread::Resume()
-{
-	debug("Resuming Thread");
-
-	m_bStopped = false;
-}
-
 bool Thread::Kill()
 {
 	debug("Killing Thread");
--- a/daemon/util/Thread.h
+++ b/daemon/util/Thread.h
@@ -2,7 +2,7 @@
 *  This file is part of nzbget
 *
 *  Copyright (C) 2004 Sven Henkel <sidddy@users.sourceforge.net>
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2010 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -81,7 +81,6 @@ public:

 	virtual void 			Start();
 	virtual void 			Stop();
-	virtual void 			Resume();
 	bool					Kill();

 	bool 					IsStopped() { return m_bStopped; };
--- a/daemon/util/Util.cpp
+++ b/daemon/util/Util.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -38,14 +38,12 @@
 #include <errno.h>
 #include <ctype.h>
 #ifdef WIN32
-#include <io.h>
 #include <direct.h>
 #include <WinIoCtl.h>
 #else
 #include <unistd.h>
 #include <sys/statvfs.h>
 #include <pwd.h>
-#include <dirent.h>
 #endif
 #ifdef HAVE_REGEX_H
 #include <regex.h>
@@ -179,70 +177,30 @@ const char* DirBrowser::Next()

 #else

-#ifdef DIRBROWSER_SNAPSHOT
-DirBrowser::DirBrowser(const char* szPath, bool bSnapshot)
-#else
 DirBrowser::DirBrowser(const char* szPath)
-#endif
 {
-#ifdef DIRBROWSER_SNAPSHOT
-	m_bSnapshot = bSnapshot;
-	if (m_bSnapshot)
-	{
-		DirBrowser dir(szPath, false);
-		while (const char* filename = dir.Next())
-		{
-			m_Snapshot.push_back(strdup(filename));
-		}
-		m_itSnapshot = m_Snapshot.begin();
-	}
-	else
-#endif
-	{
-		m_pDir = opendir(szPath);
-	}
+	m_pDir = opendir(szPath);
 }

 DirBrowser::~DirBrowser()
 {
-#ifdef DIRBROWSER_SNAPSHOT
-	if (m_bSnapshot)
+	if (m_pDir)
 	{
-		for (FileList::iterator it = m_Snapshot.begin(); it != m_Snapshot.end(); it++)
-		{
-			delete *it;
-		}
-	}
-	else
-#endif
-	{
-		if (m_pDir)
-		{
-			closedir((DIR*)m_pDir);
-		}
+		closedir(m_pDir);
 	}
 }

 const char* DirBrowser::Next()
 {
-#ifdef DIRBROWSER_SNAPSHOT
-	if (m_bSnapshot)
+	if (m_pDir)
 	{
-		return m_itSnapshot == m_Snapshot.end() ? NULL : *m_itSnapshot++;
-	}
-	else
-#endif
-	{
-		if (m_pDir)
+		m_pFindData = readdir(m_pDir);
+		if (m_pFindData)
 		{
-			m_pFindData = readdir((DIR*)m_pDir);
-			if (m_pFindData)
-			{
-				return m_pFindData->d_name;
-			}
+			return m_pFindData->d_name;
 		}
-		return NULL;
 	}
+	return NULL;
 }

 #endif
@@ -260,14 +218,6 @@ StringBuilder::~StringBuilder()
 	free(m_szBuffer);
 }

-void StringBuilder::Clear()
-{
-	free(m_szBuffer);
-	m_szBuffer = NULL;
-	m_iBufferSize = 0;
-	m_iUsedSize = 0;
-}
-
 void StringBuilder::Append(const char* szStr)
 {
 	int iPartLen = strlen(szStr);
@@ -444,7 +394,7 @@ bool Util::LoadFileIntoBuffer(const char* szFileName, char** pBuffer, int* pBuff

    // obtain file size.
    fseek(pFile , 0 , SEEK_END);
-    int iSize  = (int)ftell(pFile);
+    int iSize  = ftell(pFile);
    rewind(pFile);

    // allocate memory to contain the whole file.
@@ -480,7 +430,7 @@ bool Util::SaveBufferIntoFile(const char* szFileName, const char* szBuffer, int
 	return iWrittenBytes == iBufLen;
 }

-bool Util::CreateSparseFile(const char* szFilename, long long iSize)
+bool Util::CreateSparseFile(const char* szFilename, int iSize)
 {
 	bool bOK = false;
 #ifdef WIN32
@@ -492,9 +442,7 @@ bool Util::CreateSparseFile(const char* szFilename, long long iSize)
 		DWORD dwBytesReturned;
 		DeviceIoControl(hFile, FSCTL_SET_SPARSE, NULL, 0, NULL, 0, &dwBytesReturned, NULL);

-		LARGE_INTEGER iSize64;
-		iSize64.QuadPart = iSize;
-		SetFilePointerEx(hFile, iSize64, NULL, FILE_END);
+		SetFilePointer(hFile, iSize, NULL, FILE_END);
 		SetEndOfFile(hFile);
 		CloseHandle(hFile);
 		bOK = true;
@@ -508,7 +456,7 @@ bool Util::CreateSparseFile(const char* szFilename, long long iSize)
 	}
 	// there are no reliable function to expand file on POSIX, so we must try different approaches,
 	// starting with the fastest one and hoping it will work
-	// 1) set file size using function "truncate" (it is fast, if it works)
+	// 1) set file size using function "truncate" (it is fast, if works)
 	truncate(szFilename, iSize);
 	// check if it worked
 	pFile = fopen(szFilename, FOPEN_AB);
@@ -948,7 +896,7 @@ bool Util::ExpandHomePath(const char* szFilename, char* szBuffer, int iBufSize)
 	}
 	else
 	{
-		strncpy(szBuffer, szFilename ? szFilename : "", iBufSize);
+		strncpy(szBuffer, szFilename, iBufSize);
 		szBuffer[iBufSize - 1] = '\0';
 	}
 	
@@ -980,30 +928,6 @@ void Util::ExpandFileName(const char* szFilename, char* szBuffer, int iBufSize)
 #endif
 }

-void Util::GetExeFileName(const char* argv0, char* szBuffer, int iBufSize)
-{
-#ifdef WIN32
-	GetModuleFileName(NULL, szBuffer, iBufSize);
-#else
-	// Linux
-	int r = readlink("/proc/self/exe", szBuffer, iBufSize-1);
-	if (r > 0)
-	{
-		szBuffer[r] = '\0';
-		return;
-	}
-	// FreeBSD
-	r = readlink("/proc/curproc/file", szBuffer, iBufSize-1);
-	if (r > 0)
-	{
-		szBuffer[r] = '\0';
-		return;
-	}
-
-	ExpandFileName(argv0, szBuffer, iBufSize);
-#endif
-}
-
 void Util::FormatFileSize(char * szBuffer, int iBufLen, long long lFileSize)
 {
 	if (lFileSize > 1024 * 1024 * 1000)
@@ -1046,14 +970,6 @@ bool Util::MatchFileExt(const char* szFilename, const char* szExtensionList, con
 		{
 			return true;
 		}
-		if (strchr(szExt, '*') || strchr(szExt, '?'))
-		{
-			WildMask mask(szExt);
-			if (mask.Match(szFilename))
-			{
-				return true;
-			}
-		}
 	}

 	return false;
@@ -1080,28 +996,6 @@ char* Util::GetLastErrorMessage(char* szBuffer, int iBufLen)
 	return szBuffer;
 }

-void Util::FormatSpeed(int iBytesPerSecond, char* szBuffer, int iBufSize)
-{
-	if (iBytesPerSecond >= 100 * 1024 * 1024)
-	{
-		snprintf(szBuffer, iBufSize, "%i MB/s", iBytesPerSecond / 1024 / 1024);
-	}
-	else if (iBytesPerSecond >= 10 * 1024 * 1024)
-	{
-		snprintf(szBuffer, iBufSize, "%0.1f MB/s", (float)iBytesPerSecond / 1024.0 / 1024.0);
-	}
-	else if (iBytesPerSecond >= 1024 * 1000)
-	{
-		snprintf(szBuffer, iBufSize, "%0.2f MB/s", (float)iBytesPerSecond / 1024.0 / 1024.0);
-	}
-	else
-	{
-		snprintf(szBuffer, iBufSize, "%i KB/s", iBytesPerSecond / 1024);
-	}
-
-	szBuffer[iBufSize - 1] = '\0';
-}
-
 void Util::InitVersionRevision()
 {
 #ifndef WIN32
@@ -1324,7 +1218,7 @@ bool Util::RegReadStr(HKEY hKey, const char* szKeyName, const char* szValueName,

 /* From boost */

-inline int is_leap(int year)
+inline int32_t is_leap(int32_t year)
 {
  if(year % 400 == 0)
  return 1;
@@ -1334,19 +1228,19 @@ inline int is_leap(int year)
  return 1;
  return 0;
 }
-inline int days_from_0(int year)
+inline int32_t days_from_0(int32_t year)
 {
  year--;
  return 365 * year + (year / 400) - (year/100) + (year / 4);
 }
-inline int days_from_1970(int year)
+inline int32_t days_from_1970(int32_t year)
 {
-  static const int days_from_0_to_1970 = 719162; // days_from_0(1970);
+  static const int days_from_0_to_1970 = days_from_0(1970);
  return days_from_0(year) - days_from_0_to_1970;
 }
-inline int days_from_1jan(int year,int month,int day)
+inline int32_t days_from_1jan(int32_t year,int32_t month,int32_t day)
 {
-  static const int days[2][12] =
+  static const int32_t days[2][12] =
  {
    { 0,31,59,90,120,151,181,212,243,273,304,334},
    { 0,31,60,91,121,152,182,213,244,274,305,335}
@@ -1380,11 +1274,6 @@ inline time_t internal_timegm(tm const *t)
  return result;
 }

-time_t Util::Timegm(tm const *t)
-{
-	return internal_timegm(t);
-}
-
 // prevent PC from going to sleep
 void Util::SetStandByMode(bool bStandBy)
 {
@@ -1393,171 +1282,11 @@ void Util::SetStandByMode(bool bStandBy)
 #endif
 }

-static unsigned long crc32_tab[] = {
-	0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
-	0xe963a535, 0x9e6495a3,	0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
-	0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
-	0xf3b97148, 0x84be41de,	0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
-	0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec,	0x14015c4f, 0x63066cd9,
-	0xfa0f3d63, 0x8d080df5,	0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
-	0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,	0x35b5a8fa, 0x42b2986c,
-	0xdbbbc9d6, 0xacbcf940,	0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
-	0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
-	0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
-	0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,	0x76dc4190, 0x01db7106,
-	0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
-	0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
-	0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
-	0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
-	0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
-	0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
-	0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
-	0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
-	0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
-	0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
-	0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
-	0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
-	0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
-	0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
-	0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
-	0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
-	0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
-	0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
-	0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
-	0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
-	0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
-	0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
-	0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
-	0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
-	0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
-	0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
-	0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
-	0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
-	0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
-	0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
-	0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
-	0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d
-};
-
-/* This is a 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 Util::Crc32m(unsigned long startCrc, unsigned char *block, unsigned long length)
+time_t Util::Timegm(tm const *t)
 {
-	register unsigned long crc = startCrc;
-	for (unsigned long i = 0; i < length; i++)
-	{
-		crc = ((crc >> 8) & 0x00FFFFFF) ^ crc32_tab[(crc ^ *block++) & 0xFF];
-	}
-	return crc;
+	return internal_timegm(t);
 }

-unsigned long Util::Crc32(unsigned char *block, unsigned long length)
-{
-	return Util::Crc32m(0xFFFFFFFF, block, length) ^ 0xFFFFFFFF;
-}
-
-/* From zlib/crc32.c (http://www.zlib.net/)
- * Copyright (C) 1995-2006, 2010, 2011, 2012 Mark Adler
- */
-
-#define GF2_DIM 32      /* dimension of GF(2) vectors (length of CRC) */
-
-unsigned long gf2_matrix_times(unsigned long *mat, unsigned long vec)
-{
-    unsigned long sum;
-
-    sum = 0;
-    while (vec) {
-        if (vec & 1)
-            sum ^= *mat;
-        vec >>= 1;
-        mat++;
-    }
-    return sum;
-}
-
-void gf2_matrix_square(unsigned long *square, unsigned long *mat)
-{
-    int n;
-
-    for (n = 0; n < GF2_DIM; n++)
-        square[n] = gf2_matrix_times(mat, mat[n]);
-}
-
-unsigned long Util::Crc32Combine(unsigned long crc1, unsigned long crc2, unsigned long len2)
-{
-    int n;
-    unsigned long row;
-    unsigned long even[GF2_DIM];    /* even-power-of-two zeros operator */
-    unsigned long odd[GF2_DIM];     /* odd-power-of-two zeros operator */
-
-    /* degenerate case (also disallow negative lengths) */
-    if (len2 <= 0)
-        return crc1;
-
-    /* put operator for one zero bit in odd */
-    odd[0] = 0xedb88320UL;          /* CRC-32 polynomial */
-    row = 1;
-    for (n = 1; n < GF2_DIM; n++) {
-        odd[n] = row;
-        row <<= 1;
-    }
-
-    /* put operator for two zero bits in even */
-    gf2_matrix_square(even, odd);
-
-    /* put operator for four zero bits in odd */
-    gf2_matrix_square(odd, even);
-
-    /* apply len2 zeros to crc1 (first square will put the operator for one
-       zero byte, eight zero bits, in even) */
-    do {
-        /* apply zeros operator for this bit of len2 */
-        gf2_matrix_square(even, odd);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(even, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-        if (len2 == 0)
-            break;
-
-        /* another iteration of the loop with odd and even swapped */
-        gf2_matrix_square(odd, even);
-        if (len2 & 1)
-            crc1 = gf2_matrix_times(odd, crc1);
-        len2 >>= 1;
-
-        /* if no more bits set, then done */
-    } while (len2 != 0);
-
-    /* return combined crc */
-    crc1 ^= crc2;
-
-    return crc1;
-}
-
-int Util::NumberOfCpuCores()
-{
-#ifdef WIN32
-	SYSTEM_INFO sysinfo;
-	GetSystemInfo(&sysinfo);
-	return sysinfo.dwNumberOfProcessors;
-#elif HAVE_SC_NPROCESSORS_ONLN
-	return sysconf(_SC_NPROCESSORS_ONLN);
-#endif
-	return -1;
-}
-
-
 unsigned int WebUtil::DecodeBase64(char* szInputBuffer, int iInputBufferLength, char* szOutputBuffer)
 {
 	unsigned int InputBufferIndex  = 0;
@@ -2092,38 +1821,6 @@ BreakLoop:
 	*output = '\0';
 }

-void WebUtil::URLDecode(char* raw)
-{
-	char* output = raw;
-	for (char* p = raw;;)
-	{
-		switch (*p)
-		{
-			case '\0':
-				goto BreakLoop;
-			case '%':
-				{
-					p++;
-					unsigned char c1 = *p++;
-					unsigned char c2 = *p++;
-					c1 = '0' <= c1 && c1 <= '9' ? c1 - '0' : 'A' <= c1 && c1 <= 'F' ? c1 - 'A' + 10 :
-						'a' <= c1 && c1 <= 'f' ? c1 - 'a' + 10 : 0;
-					c2 = '0' <= c2 && c2 <= '9' ? c2 - '0' : 'A' <= c2 && c2 <= 'F' ? c2 - 'A' + 10 :
-						'a' <= c2 && c2 <= 'f' ? c2 - 'a' + 10 : 0;
-					unsigned char ch = (c1 << 4) + c2;
-					*output++ = (char)ch;
-                    break;
-				}
-			default:
-				*output++ = *p++;
-				break;
-		}
-	}
-BreakLoop:
-
-	*output = '\0';
-}
-
 #ifdef WIN32
 bool WebUtil::Utf8ToAnsi(char* szBuffer, int iBufLen)
 {
@@ -2672,8 +2369,6 @@ GUnzipStream::EStatus GUnzipStream::Read(const void **pOutputBuffer, int *iOutpu
 	return zlError;
 }

-#endif
-
 Tokenizer::Tokenizer(const char* szDataString, const char* szSeparators)
 {
 	// an optimization to avoid memory allocation for short data string (shorten than 1024 chars)
@@ -2728,3 +2423,5 @@ char* Tokenizer::Next()
 	}
 	return szToken;
 }
+
+#endif
--- a/daemon/util/Util.h
+++ b/daemon/util/Util.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -26,9 +26,13 @@
 #ifndef UTIL_H
 #define UTIL_H

-#ifdef DIRBROWSER_SNAPSHOT
-#include <deque>
+#ifdef WIN32
+#include <stdio.h>
+#include <io.h>
+#else
+#include <dirent.h>
 #endif
+
 #include <time.h>

 #ifdef WIN32
@@ -45,23 +49,12 @@ private:
 	HANDLE				m_hFile;
 	bool				m_bFirst;
 #else
-	void*				m_pDir;    // DIR*, declared as void* to avoid including of <dirent>
+	DIR*				m_pDir;
 	struct dirent*		m_pFindData;
 #endif

-#ifdef DIRBROWSER_SNAPSHOT
-	bool				m_bSnapshot;
-	typedef std::deque<char*>	FileList;
-	FileList			m_Snapshot;
-	FileList::iterator	m_itSnapshot;
-#endif
-
 public:
-#ifdef DIRBROWSER_SNAPSHOT
-						DirBrowser(const char* szPath, bool bSnapshot = true);
-#else
 						DirBrowser(const char* szPath);
-#endif
 						~DirBrowser();
 	const char*			Next();
 };
@@ -77,17 +70,17 @@ public:
 						~StringBuilder();
 	void				Append(const char* szStr);
 	const char*			GetBuffer() { return m_szBuffer; }
-	void				Clear();
 };

 class Util
 {
 public:
+
 	static char* BaseFileName(const char* filename);
 	static void NormalizePathSeparators(char* szPath);
 	static bool LoadFileIntoBuffer(const char* szFileName, char** pBuffer, int* pBufferLength);
 	static bool SaveBufferIntoFile(const char* szFileName, const char* szBuffer, int iBufLen);
-	static bool CreateSparseFile(const char* szFilename, long long iSize);
+	static bool CreateSparseFile(const char* szFilename, int iSize);
 	static bool TruncateFile(const char* szFilename, int iSize);
 	static void MakeValidFilename(char* szFilename, char cReplaceChar, bool bAllowSlashes);
 	static bool MakeUniqueFilename(char* szDestBufFilename, int iDestBufSize, const char* szDestDir, const char* szBasename);
@@ -110,12 +103,10 @@ public:
 	static void FixExecPermission(const char* szFilename);
 #endif
 	static void ExpandFileName(const char* szFilename, char* szBuffer, int iBufSize);
-	static void GetExeFileName(const char* argv0, char* szBuffer, int iBufSize);
 	static void FormatFileSize(char* szBuffer, int iBufLen, long long lFileSize);
 	static bool SameFilename(const char* szFilename1, const char* szFilename2);
 	static bool MatchFileExt(const char* szFilename, const char* szExtensionList, const char* szListSeparator);
 	static char* GetLastErrorMessage(char* szBuffer, int iBufLen);
-	static void FormatSpeed(int iBytesPerSecond, char* szBuffer, int iBufSize);

 	/*
 	 * Split command line int arguments.
@@ -166,18 +157,14 @@ public:
 	 */
 	static const char* VersionRevision() { return VersionRevisionBuf; };
 	
-	static char VersionRevisionBuf[40];
-
-	static void InitVersionRevision();
-
-	static unsigned long Crc32(unsigned char *block, unsigned long length);
-	static unsigned long Crc32m(unsigned long startCrc, unsigned char *block, unsigned long length);
-	static unsigned long Crc32Combine(unsigned long crc1, unsigned long crc2, unsigned long len2);
-
 	/*
-	 * Returns number of available CPU cores or -1 if it could not be determined
+	 * Initialize buffer for program version and revision number.
+	 * This function must be called during program initialization before any
+	 * call to "VersionRevision()".
 	 */
-	static int NumberOfCpuCores();
+	static void InitVersionRevision();
+	
+	static char VersionRevisionBuf[40];
 };

 class WebUtil
@@ -238,12 +225,6 @@ public:
 	 */
 	static void HttpUnquote(char* raw);

-	/*
-	 * Decodes URL-string.
-	 * The string is decoded on the place overwriting the content of raw-data.
-	 */
-	static void URLDecode(char* raw);
-
 #ifdef WIN32
 	static bool Utf8ToAnsi(char* szBuffer, int iBufLen);
 	static bool AnsiToUtf8(char* szBuffer, int iBufLen);
--- a/daemon/windows/NTService.cpp
+++ b/daemon/windows/NTService.cpp
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007  Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -30,7 +30,6 @@
 #include "win32.h"

 #include <string.h>
-#include <stdio.h>

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

 void InstallUninstallServiceCheck(int argc, char *argv[]);
 void StartService(RunProc RunProcPtr);
-bool IsServiceRunning();

 #endif
--- a/daemon/windows/WinConsole.cpp
+++ b/daemon/windows/WinConsole.cpp
--- a/daemon/windows/WinConsole.h
+++ b/daemon/windows/WinConsole.h
@@ -1,106 +0,0 @@
-/*
- *  This file is part of nzbget
- *
- *  Copyright (C) 2014-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- *
- * $Revision$
- * $Date$
- *
- */
-
-
-#ifndef WINCONSOLE_H
-#define WINCONSOLE_H
-
-#include "Thread.h"
-
-class WinConsole : public Thread
-{
-private:
-	bool					m_bAppMode;
-	char**					m_pDefaultArguments;
-	char**					m_pInitialArguments;
-	int						m_iInitialArgumentCount;
-	HWND					m_hTrayWindow;
-	NOTIFYICONDATA*			m_pNidIcon;
-	UINT					UM_TASKBARCREATED;
-	HMENU					m_hMenu;
-	HINSTANCE				m_hInstance;
-	bool					m_bModal;
-	HFONT					m_hLinkFont;
-	HFONT					m_hNameFont;
-	HFONT					m_hTitleFont;
-	HCURSOR					m_hHandCursor;
-	HICON					m_hAboutIcon;
-	HICON					m_hRunningIcon;
-	HICON					m_hIdleIcon;
-	HICON					m_hWorkingIcon;
-	HICON					m_hPausedIcon;
-	bool					m_bAutostart;
-	bool					m_bTray;
-	bool					m_bConsole;
-	bool					m_bWebUI;
-	bool					m_bAutoParam;
-	bool					m_bRunning;
-	bool					m_bRunningService;
-
-	void					CreateResources();
-	void					CreateTrayIcon();
-	void					ShowWebUI();
-	void					ShowMenu();
-	void					ShowInExplorer(const char* szFileName);
-	void					ShowAboutBox();
-	void					OpenConfigFileInTextEdit();
-	void					ShowPrefsDialog();
-	void					SavePrefs();
-	void					LoadPrefs();
-	void					ApplyPrefs();
-	void					ShowRunningDialog();
-	void					CheckRunning();
-	void					UpdateTrayIcon();
-	void					BuildMenu();
-	void					ShowCategoryDir(int iCatIndex);
-	void					SetupConfigFile();
-	void					SetupScripts();
-	void					ShowFactoryResetDialog();
-	void					ResetFactoryDefaults();
-
-	static BOOL WINAPI		ConsoleCtrlHandler(DWORD dwCtrlType);
-	static LRESULT CALLBACK	TrayWndProcStat(HWND hwndWin, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	LRESULT					TrayWndProc(HWND hwndWin, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	static BOOL CALLBACK	AboutDialogProcStat(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	BOOL					AboutDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	static BOOL CALLBACK	PrefsDialogProcStat(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	BOOL					PrefsDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	static BOOL CALLBACK	RunningDialogProcStat(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	BOOL					RunningDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	static BOOL CALLBACK	FactoryResetDialogProcStat(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-	BOOL					FactoryResetDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
-
-protected:
-	virtual void			Run();
-
-public:
-							WinConsole();
-							~WinConsole();
-	virtual void			Stop();
-	void					InitAppMode();
-	bool					GetAppMode() { return m_bAppMode; }
-	void					SetupFirstStart();
-};
-
-#endif
--- a/daemon/windows/win32.h
+++ b/daemon/windows/win32.h
@@ -1,7 +1,7 @@
 /*
 *  This file is part of nzbget
 *
- *  Copyright (C) 2007-2015 Andrey Prygunkov <hugbug@users.sourceforge.net>
+ *  Copyright (C) 2007-2014 Andrey Prygunkov <hugbug@users.sourceforge.net>
 *
 *  This program is free software; you can redistribute it and/or modify
 *  it under the terms of the GNU General Public License as published by
@@ -59,6 +59,9 @@
 /* Define to 1 if libpar2 supports cancelling (needs a special patch) */
 #define HAVE_PAR2_CANCEL

+/* Define to 1 if libpar2 has bugfixes applied (needs a special patch) */
+#define HAVE_PAR2_BUGFIXES_V2
+
 /* Define to 1 if function GetAddrInfo is supported */
 #define HAVE_GETADDRINFO

@@ -71,7 +74,7 @@
 /* Define to 1 if spinlocks are supported */
 #define HAVE_SPINLOCK

-#define VERSION "15.0"
+#define VERSION "13.0"

 /* Suppress warnings */
 #define _CRT_SECURE_NO_DEPRECATE
@@ -81,11 +84,6 @@

 #define _USE_32BIT_TIME_T

-#if _WIN32_WINNT < 0x0501
-#undef _WIN32_WINNT
-#define _WIN32_WINNT   0x0501
-#endif
-
 #ifdef _DEBUG
 // detection of memory leaks
 #define _CRTDBG_MAP_ALLOC
--- a/lib/par2/AUTHORS
+++ b/lib/par2/AUTHORS
@@ -1,3 +0,0 @@
-par2cmdline 0.4: Peter Brian Clements <peterbclements@users.sourceforge.net>
-library API: Francois Lesueur <flesueur@users.sourceforge.net>
-changes for NZBGet: Andrey Prygunkov <hugbug@users.sourceforge.net>
--- a/lib/par2/README
+++ b/lib/par2/README
@@ -1,326 +0,0 @@
-Based on libpar2 v 0.4 (http://launchpad.net/libpar2), which
-is a Debian/Ubuntu fork of original libpar2 (http://parchive.sourceforge.net),
-which is a library for par2 based on par2cmdline 0.4.
-
-Changes made to libpar2-0.4:
- - removed files not required for NZBGet;
- - eliminated dependency from libsigc++ by changing of library
-   API to use virtual functions instead of sigc++ signals. 
-
-par2cmdline README follows :
-
-------------------------------------------------------------
-
-par2cmdline is a PAR 2.0 compatible file verification and repair tool.
-
-See http://parchive.sourceforge.net for details of PAR 2.0 specification 
-and discussion of all things PAR.
-
-WHAT EXACTLY IS PAR2CMDLINE?
-
-par2cmdline is a program for creating and using PAR2 files to detect 
-damage in data files and repair them if necessary. It can be used with 
-any kind of file. 
-
-WHY IS PAR 2.0 better than PAR 1.0?
-
- * It is not necessary to split a single large file into many equally
-   size small files (although you can still do so if you wish).
-
- * There is no loss of efficiency when operating on multiple files
-   of different sizes.
-
- * It is possible to repair damaged files (using exactly the amount of
-   recovery data that corresponds to the amount of damage), rather than
-   requiring the complete reconstruction of the damaged file.
-
- * Recovery files may be of different sizes making it possible to
-   obtain exactly the amount of recovery data required to carry out
-   a repair.
-
- * Because damaged data files are still useable during the recovery 
-   process, less recovery data is required to achieve a successfull
-   repair. It is not therefore necessary to create as much recovery 
-   data in the first place to achieve the same level of protection.
-
- * You can protect up to 32768 files rather than the 256 that PAR 1.0
-   is limited to.
-
- * Damaged or incomplete recovery files can also be used during the
-   recovery process in the same way that damaged data files can.
-   
- * You require less recovery data to provide the same level of protection
-   from damage compared with PAR 1.0.
-
-DOES PAR 2.0 HAVE ANY DISSADVANTAGES?
-
-Yes, there is one dissadvantage:
-
- * All PAR 2.0 program will take somewhat longer to create recovery
-   files than a PAR 1.0 program does.
-
-This dissadvantage is considerably mitigated by the fact that you don't
-need to create as much recovery data in the first place to provide the
-same level of protection against loss and damage.
-
-COMPILING PAR2CMDLINE
-
-You should have received par2cmdline in the form of source code which 
-you can compile on your computer. You may optionally have received a 
-pre-compiled version of the program for your operating system.
-
-If you have only downloaded a precompiled executable, then the source
-code should be available from the same location that you downloaded the
-executable from.
-
-If you have MS Visual Studio .NET, then just open the par2cmdline.sln
-file and compile. You should then copy par2cmdline.exe to an appropriate
-location that is on your path.
-
-To compile on Linux and other unix variants use the following commands:
-
-  ./configure
-  make
-  make check
-  make install
-
-See INSTALL for full details of how to use the "configure" script.
-
-USING PAR2CMDLINE
-
-The command line parameters for par2cmdline are as follow:
-
-    par2 c(reate) [options] <par2 file> [files]
-    par2 v(erify) [options] <par2 file> [files]
-    par2 r(epair) [options] <par2 file> [files]
-
-  Also:
-
-    par2create [options] <par2 file> [files]
-    par2verify [options] <par2 file> [files]
-    par2repair [options] <par2 file> [files]
-    
-  Options:
-
-    -b<n>  : Set the Block-Count
-    -s<n>  : Set the Block-Size (Don't use both -b and -s)
-    -r<n>  : Level of Redundancy (%)
-    -c<n>  : Recovery block count (don't use both -r and -c)
-    -f<n>  : First Recovery-Block-Number
-    -u     : Uniform recovery file sizes
-    -l     : Limit size of recovery files (Don't use both -u and -l)
-    -n<n>  : Number of recovery files (Don't use both -n and -l)
-    -m<n>  : Memory (in MB) to use
-    -v [-v]: Be more verbose
-    -q [-q]: Be more quiet (-qq gives silence)
-    --     : Treat all remaining CommandLine as filenames
-    
-If you wish to create par2 files for a single source file, you may leave
-out the name of the par2 file from the command line. par2cmdline will then
-assume that you wish to base the filenames for the par2 files on the name
-of the source file.
-
-You may also leave off the .par2 file extension when verifying and repairing.
-
-CREATING PAR2 FILES
-
-With PAR 2.0 you can create PAR2 recovery files for as few as 1 or as many as
-32768 files. If you wanted to create PAR1 recovery files for a single file
-you are forced to split the file into muliple parts and RAR is frequently 
-used for this purpose. You do NOT need to split files with PAR 2.0.
-
-To create PAR 2 recovery files for a single data file (e.g. one called 
-test.mpg), you can use the following command:
-
-  par2 create test.mpg
-
-If test.mpg is an 800 MB file, then this will create a total of 8 PAR2 files
-with the following filenames (taking roughly 6 minutes on a PC with a 
-1500MHz CPU):
-
-  test.mpg.par2          - This is an index file for verification only
-  test.mpg.vol00+01.par2 - Recovery file with 1 recovery block
-  test.mpg.vol01+02.par2 - Recovery file with 2 recovery blocks
-  test.mpg.vol03+04.par2 - Recovery file with 4 recovery blocks
-  test.mpg.vol07+08.par2 - Recovery file with 8 recovery blocks
-  test.mpg.vol15+16.par2 - Recovery file with 16 recovery blocks
-  test.mpg.vol31+32.par2 - Recovery file with 32 recovery blocks
-  test.mpg.vol63+37.par2 - Recovery file with 37 recovery blocks
-
-The test.mpg.par2 file is 39 KB in size and the other files vary in size from
-443 KB to 15 MB.
-
-These par2 files will enable the recovery of up to 100 errors totalling 40 MB 
-of lost or damaged data from the original test.mpg file when it and the par2
-files are posted on UseNet.
-
-When posting on UseNet it is recommended that you use the "-s" option to set
-a blocksize that is equal to the Article size that you will use to post the
-data file. If you wanted to post the test.mpg file using an article size 
-of 300 KB then the command you would type is:
-
-  par2 create -s307200 test.mpg
-  
-This will create 9 PAR2 files instead of 8, and they will be capable of 
-correcting up to 134 errors totalling 40 MB. It will take roughly 8 minutes
-to create the recovery files this time.
-
-In both of these two examples, the total quantity of recovery data created
-was 40 MB (which is 5% of 800 MB). If you wish to create a greater or lesser
-quantity of recovery data, you can use the "-r" option.
-
-To create 10% recovery data instead of the default of 5% and also to use a
-block size of 300 KB, you would use the following command:
-
-  par2 create -s307200 -r10 test.mpg
-  
-This would also create 9 PAR2 files, but they would be able to correct up to
-269 errors totalling 80 MB. Since twice as much recovery data is created, it
-will take about 16 minutes to do so with a 1500MHz CPU.
-
-The "-u" and "-n" options can be used to control exactly how many recovery 
-files are created and how the recovery blocks are distributed amoungst them.
-They do not affect the total quantity of recovery data created.
-
-The "-f" option is used when you create additional recovery data. 
-
-e.g. If you have already created 10% and want another 5% then you migh use
-the following command:
-
-  par2 create -s307200 -r5 -f300 test.mpg
-
-This specifies the same block size (which is a requirement for additional
-recovery files), 5% recovery data, and a first block number of 300.
-
-The "-m" option controls how much memory par2cmdline uses. It defaults to
-16 MB unless you override it.
-
-CREATING PAR2 FILES FOR MULTIPLE DATA FILES
-
-When creating PAR2 recovery files form multiple data files, you must specify
-the base filename to use for the par2 files and the names of all of the data
-files.
-
-If test.mpg had been split into multiple RAR files, then you could use:
-
-  par2 create test.mpg.rar.par2 test.mpg.part*.rar
-
-The files filename "test.mpg.rar.par2" says what you want the par2 files to
-be called and "test.mpg.part*.rar" should select all of the RAR files.
-
-VERIFYING AND REPAIRING
-
-When using par2 recovery files to verify or repair the data files from
-which they were created, you only need to specify the filename of one
-of the par2 files to par2cmdline.
-
-e.g.:
-
-  par2 verify test.mpg.par2
-
-This tells par2cmdline to use the information in test.mpg.par2 to verify the
-data files.
-
-par2cmdline will automatically search for the other par2 files that were
-created and use the information they contain to determine the filenames
-of the original data files and then to verify them.
-
-If all of the data files are ok, then par2cmdline will report that repair
-will not be required.
-
-If any of the data files are missing or damaged, par2cmdline will report
-the details of what it has found. If the recovery files contain enough
-recovery blocks to repair the damage, you will be told that repair is
-possible. Otherwise you will be told exactly how many recovery blocks
-will be required in order to repair.
-
-To carry out a repair use the following command:
-
-  par2 repair test.mpg.par2
-
-This tells par2cmdline to verify and if possible repair any damaged or
-missing files. If a repair is carried out, then each file which is
-repaired will be re-verified to confirm that the repair was successful.
-
-MISSNAMED AND INCOMPLETE DATA FILES
-
-If any of the recovery files or data files have the wrong filename, then
-par2cmdline will not automatically find and scan them.
-
-To have par2cmdline scan such files, you must include them on the command
-line when attempting to verify or repair.
-
-e.g.:
-
-  par2 r test.mpg.par2 other.mpg
-
-This tells par2cmdline to scan the file called other.mpg to see if it 
-contains any data belonging to the original data files.
-
-If one of the extra files specified in this way is an exact match
-for a data file, then the repair process will rename the file so that
-it has the correct filename.
-
-Because par2cmdline is designed to be able to find good data within a
-damaged file, it can do the same with incomplete files downloaded from
-UseNet. If some of the articles for a file are missing, you should still
-download the file and save it to disk for par2cmdline to scan. If you
-do this then you may find that you can carry out a repair in a situation
-where you would not otherwise have sufficient recovery data.
-
-You can have par2cmdline scan all files that are in the current directory
-using a command such as:
-
-  par2 r test.mpg.par2 *
-
-WHAT TO DO WHEN YOU ARE TOLD YOU NEED MORE RECOVERY BLOCKS
-
-If par2cmdline determines that any of the data files are damaged or
-missing and finds that there is insufficient recovery data to effect
-a repair, you will be told that you need a certain number of recovery
-blocks. You can obtain these by downloading additional recovery files.
-
-In order to make things easy, par2 files have filenames that tell you
-exactly how many recovery blocks each one contains.
-
-Assuming that the following command was used to create recovery data:
-
-  par2 c -b1000 -r5 test.mpg
-
-Then the recovery files that are created would be called:
-
-  test.mpg.par2
-  test.mpg.vol00+01.par2
-  test.mpg.vol01+02.par2
-  test.mpg.vol03+04.par2
-  test.mpg.vol07+08.par2
-  test.mpg.vol15+16.par2
-  test.mpg.vol31+19.par2
-  
-The first file in this list does not contain any recovery data, it only
-contains information sufficient to verify the data files.
-
-Each of the other files contains a different number of recovery blocks.
-The number after the '+' sign is the number of recovery blocks and the
-number preceding the '+' sign is the block number of the first recovery
-block in that file.
-
-If par2cmdline told you that you needed 10 recovery blocks, then you would
-need "test.mpg.vol01+02.par2" and "test.mpg.vol07+08.par". You might of course
-choose to fetch "test.mpg.vol15+16.par2" instead (in which case you would have
-an extra 6 recovery blocks which would not be used for the repair).
-
-NOTES
-
-This version of par2cmdline does not support recording path information for
-files. Whilst you can create recovery files for files from multiple locations,
-it will expect all files to be in the current directory when verifying and
-repairing. This limitation will be corrected in an update.
-
-REED SOLOMON CODING
-
-PAR2 uses Reed Solomon Coding to perform its calculations. For details of this
-coding technique try the following link:
-
-``A Tutorial on Reed-Solomon Coding for Fault-Tolerance in RAID-like Systems''
-<http://www.cs.utk.edu/~plank/plank/papers/CS-96-332.html>
--- a/lib/par2/commandline.cpp
+++ b/lib/par2/commandline.cpp
@@ -1,827 +0,0 @@
-//  This file is part of par2cmdline (a PAR 2.0 compatible file verification and
-//  repair tool). See http://parchive.sourceforge.net for details of PAR 2.0.
-//
-//  Copyright (c) 2003 Peter Brian Clements
-//
-//  par2cmdline 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.
-//
-//  par2cmdline 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
-
-#include "par2cmdline.h"
-
-#ifdef _MSC_VER
-#ifdef _DEBUG
-#undef THIS_FILE
-static char THIS_FILE[]=__FILE__;
-#define new DEBUG_NEW
-#endif
-#endif
-
-CommandLine::ExtraFile::ExtraFile(void)
-: filename()
-, filesize(0)
-{
-}
-
-CommandLine::ExtraFile::ExtraFile(const CommandLine::ExtraFile &other)
-: filename(other.filename)
-, filesize(other.filesize)
-{
-}
-
-CommandLine::ExtraFile& CommandLine::ExtraFile::operator=(const CommandLine::ExtraFile &other)
-{
-  filename = other.filename;
-  filesize = other.filesize;
-
-  return *this;
-}
-
-CommandLine::ExtraFile::ExtraFile(const string &name, u64 size)
-: filename(name)
-, filesize(size)
-{
-}
-
-
-CommandLine::CommandLine(void)
-: operation(opNone)
-, version(verUnknown)
-, noiselevel(nlUnknown)
-, blockcount(0)
-, blocksize(0)
-, firstblock(0)
-, recoveryfilescheme(scUnknown)
-, recoveryfilecount(0)
-, recoveryblockcount(0)
-, recoveryblockcountset(false)
-, redundancy(0)
-, redundancyset(false)
-, parfilename()
-, extrafiles()
-, totalsourcesize(0)
-, largestsourcesize(0)
-, memorylimit(0)
-{
-}
-
-void CommandLine::usage(void)
-{
-  cout << 
-    "\n"
-    "Usage:\n"
-    "\n"
-    "  par2 c(reate) [options] <par2 file> [files] : Create PAR2 files\n"
-    "  par2 v(erify) [options] <par2 file> [files] : Verify files using PAR2 file\n"
-    "  par2 r(epair) [options] <par2 file> [files] : Repair files using PAR2 files\n"
-    "\n"
-    "You may also leave out the \"c\", \"v\", and \"r\" commands by using \"parcreate\",\n"
-    "\"par2verify\", or \"par2repair\" instead.\n"
-    "\n"
-    "Options:\n"
-    "\n"
-    "  -b<n>  : Set the Block-Count\n"
-    "  -s<n>  : Set the Block-Size (Don't use both -b and -s)\n"
-    "  -r<n>  : Level of Redundancy (%%)\n"
-    "  -c<n>  : Recovery block count (Don't use both -r and -c)\n"
-    "  -f<n>  : First Recovery-Block-Number\n"
-    "  -u     : Uniform recovery file sizes\n"
-    "  -l     : Limit size of recovery files (Don't use both -u and -l)\n"
-    "  -n<n>  : Number of recovery files (Don't use both -n and -l)\n"
-    "  -m<n>  : Memory (in MB) to use\n"
-    "  -v [-v]: Be more verbose\n"
-    "  -q [-q]: Be more quiet (-q -q gives silence)\n"
-    "  --     : Treat all remaining CommandLine as filenames\n"
-    "\n"
-    "If you wish to create par2 files for a single source file, you may leave\n"
-    "out the name of the par2 file from the command line.\n";
-}
-
-bool CommandLine::Parse(int argc, char *argv[])
-{
-  if (argc<1)
-  {
-    return false;
-  }
-
-  // Split the program name into path and filename
-  string path, name;
-  DiskFile::SplitFilename(argv[0], path, name);
-  argc--;
-  argv++;
-
-  // Strip ".exe" from the end
-  if (name.size() > 4 && 0 == stricmp(".exe", name.substr(name.length()-4).c_str()))
-  {
-    name = name.substr(0, name.length()-4);
-  }
-
-  // Check the resulting program name
-  if (0 == stricmp("par2create", name.c_str()))
-  {
-    operation = opCreate;
-  } 
-  else if (0 == stricmp("par2verify", name.c_str()))
-  {
-    operation = opVerify;
-  }
-  else if (0 == stricmp("par2repair", name.c_str()))
-  {
-    operation = opRepair;
-  }
-
-  // Have we determined what operation we want?
-  if (operation == opNone)
-  {
-    if (argc<2)
-    {
-      cerr << "Not enough command line arguments." << endl;
-      return false;
-    }
-
-    switch (tolower(argv[0][0]))
-    {
-    case 'c':
-      if (argv[0][1] == 0 || 0 == stricmp(argv[0], "create"))
-        operation = opCreate;
-      break;
-    case 'v':
-      if (argv[0][1] == 0 || 0 == stricmp(argv[0], "verify"))
-        operation = opVerify;
-      break;
-    case 'r':
-      if (argv[0][1] == 0 || 0 == stricmp(argv[0], "repair"))
-        operation = opRepair;
-      break;
-    }
-    if (operation == opNone)
-    {
-      cerr << "Invalid operation specified: " << argv[0] << endl;
-      return false;
-    }
-    argc--;
-    argv++;
-  }
-
-  bool options = true;
-
-  while (argc>0)
-  {
-    if (argv[0][0])
-    {
-      if (options && argv[0][0] != '-')
-        options = false;
-
-      if (options)
-      {
-        switch (tolower(argv[0][1]))
-        {
-        case 'b':  // Set the block count
-          {
-            if (operation != opCreate)
-            {
-              cerr << "Cannot specify block count unless creating." << endl;
-              return false;
-            }
-            if (blockcount > 0)
-            {
-              cerr << "Cannot specify block count twice." << endl;
-              return false;
-            }
-            else if (blocksize > 0)
-            {
-              cerr << "Cannot specify both block count and block size." << endl;
-              return false;
-            }
-            
-            char *p = &argv[0][2];
-            while (blockcount <= 3276 && *p && isdigit(*p))
-            {
-              blockcount = blockcount * 10 + (*p - '0');
-              p++;
-            }
-            if (0 == blockcount || blockcount > 32768 || *p)
-            {
-              cerr << "Invalid block count option: " << argv[0] << endl;
-              return false;
-            }
-          }
-          break;
-
-        case 's':  // Set the block size
-          {
-            if (operation != opCreate)
-            {
-              cerr << "Cannot specify block size unless creating." << endl;
-              return false;
-            }
-            if (blocksize > 0)
-            {
-              cerr << "Cannot specify block size twice." << endl;
-              return false;
-            }
-            else if (blockcount > 0)
-            {
-              cerr << "Cannot specify both block count and block size." << endl;
-              return false;
-            }
-
-            char *p = &argv[0][2];
-            while (blocksize <= 429496729 && *p && isdigit(*p))
-            {
-              blocksize = blocksize * 10 + (*p - '0');
-              p++;
-            }
-            if (*p || blocksize == 0)
-            {
-              cerr << "Invalid block size option: " << argv[0] << endl;
-              return false;
-            }
-            if (blocksize & 3)
-            {
-              cerr << "Block size must be a multiple of 4." << endl;
-              return false;
-            }
-          }
-          break;
-
-        case 'r':  // Set the amount of redundancy required
-          {
-            if (operation != opCreate)
-            {
-              cerr << "Cannot specify redundancy unless creating." << endl;
-              return false;
-            }
-            if (redundancyset)
-            {
-              cerr << "Cannot specify redundancy twice." << endl;
-              return false;
-            }
-            else if (recoveryblockcountset)
-            {
-              cerr << "Cannot specify both redundancy and recovery block count." << endl;
-              return false;
-            }
-
-            char *p = &argv[0][2];
-            while (redundancy <= 10 && *p && isdigit(*p))
-            {
-              redundancy = redundancy * 10 + (*p - '0');
-              p++;
-            }
-            if (redundancy > 100 || *p)
-            {
-              cerr << "Invalid redundancy option: " << argv[0] << endl;
-              return false;
-            }
-            if (redundancy == 0 && recoveryfilecount > 0)
-            {
-              cerr << "Cannot set redundancy to 0 and file count > 0" << endl;
-              return false;
-            }
-            redundancyset = true;
-          }
-          break;
-
-        case 'c': // Set the number of recovery blocks to create
-          {
-            if (operation != opCreate)
-            {
-              cerr << "Cannot specify recovery block count unless creating." << endl;
-              return false;
-            }
-            if (recoveryblockcountset)
-            {
-              cerr << "Cannot specify recovery block count twice." << endl;
-              return false;
-            }
-            else if (redundancyset)
-            {
-              cerr << "Cannot specify both recovery block count and redundancy." << endl;
-              return false;
-            }
-
-            char *p = &argv[0][2];
-            while (recoveryblockcount <= 32768 && *p && isdigit(*p))
-            {
-              recoveryblockcount = recoveryblockcount * 10 + (*p - '0');
-              p++;
-            }
-            if (recoveryblockcount > 32768 || *p)
-            {
-              cerr << "Invalid recoveryblockcount option: " << argv[0] << endl;
-              return false;
-            }
-            if (recoveryblockcount == 0 && recoveryfilecount > 0)
-            {
-              cerr << "Cannot set recoveryblockcount to 0 and file count > 0" << endl;
-              return false;
-            }
-            recoveryblockcountset = true;
-          }
-          break;
-
-        case 'f':  // Specify the First block recovery number
-          {
-            if (operation != opCreate)
-            {
-              cerr << "Cannot specify first block number unless creating." << endl;
-              return false;
-            }
-            if (firstblock > 0)
-            {
-              cerr << "Cannot specify first block twice." << endl;
-              return false;
-            }
-
-            char *p = &argv[0][2];
-            while (firstblock <= 3276 && *p && isdigit(*p))
-            {
-              firstblock = firstblock * 10 + (*p - '0');
-              p++;
-            }
-            if (firstblock > 32768 || *p)
-            {
-              cerr << "Invalid first block option: " << argv[0] << endl;
-              return false;
-            }
-          }
-          break;
-
-        case 'u':  // Specify uniformly sized recovery files
-          {
-            if (operation != opCreate)
-            {
-              cerr << "Cannot specify uniform files unless creating." << endl;
-              return false;
-            }
-            if (argv[0][2])
-            {
-              cerr << "Invalid option: " << argv[0] << endl;
-              return false;
-            }
-            if (recoveryfilescheme != scUnknown)
-            {
-              cerr << "Cannot specify two recovery file size schemes." << endl;
-              return false;
-            }
-
-            recoveryfilescheme = scUniform;
-          }
-          break;
-
-        case 'l':  // Limit the size of the recovery files
-          {
-            if (operation != opCreate)
-            {
-              cerr << "Cannot specify limit files unless creating." << endl;
-              return false;
-            }
-            if (argv[0][2])
-            {
-              cerr << "Invalid option: " << argv[0] << endl;
-              return false;
-            }
-            if (recoveryfilescheme != scUnknown)
-            {
-              cerr << "Cannot specify two recovery file size schemes." << endl;
-              return false;
-            }
-            if (recoveryfilecount > 0)
-            {
-              cerr << "Cannot specify limited size and number of files at the same time." << endl;
-              return false;
-            }
-
-            recoveryfilescheme = scLimited;
-          }
-          break;
-
-        case 'n':  // Specify the number of recovery files
-          {
-            if (operation != opCreate)
-            {
-              cerr << "Cannot specify recovery file count unless creating." << endl;
-              return false;
-            }
-            if (recoveryfilecount > 0)
-            {
-              cerr << "Cannot specify recovery file count twice." << endl;
-              return false;
-            }
-            if (redundancyset && redundancy == 0)
-            {
-              cerr << "Cannot set file count when redundancy is set to 0." << endl;
-              return false;
-            }
-            if (recoveryblockcountset && recoveryblockcount == 0)
-            {
-              cerr << "Cannot set file count when recovery block count is set to 0." << endl;
-              return false;
-            }
-            if (recoveryfilescheme == scLimited)
-            {
-              cerr << "Cannot specify limited size and number of files at the same time." << endl;
-              return false;
-            }
-
-            char *p = &argv[0][2];
-            while (*p && isdigit(*p))
-            {
-              recoveryfilecount = recoveryfilecount * 10 + (*p - '0');
-              p++;
-            }
-            if (recoveryfilecount == 0 || *p)
-            {
-              cerr << "Invalid recovery file count option: " << argv[0] << endl;
-              return false;
-            }
-          }
-          break;
-
-        case 'm':  // Specify how much memory to use for output buffers
-          {
-            if (memorylimit > 0)
-            {
-              cerr << "Cannot specify memory limit twice." << endl;
-              return false;
-            }
-
-            char *p = &argv[0][2];
-            while (*p && isdigit(*p))
-            {
-              memorylimit = memorylimit * 10 + (*p - '0');
-              p++;
-            }
-            if (memorylimit == 0 || *p)
-            {
-              cerr << "Invalid memory limit option: " << argv[0] << endl;
-              return false;
-            }
-          }
-          break;
-
-        case 'v':
-          {
-            switch (noiselevel)
-            {
-            case nlUnknown:
-              {
-                if (argv[0][2] == 'v')
-                  noiselevel = nlDebug;
-                else
-                  noiselevel = nlNoisy;
-              }
-              break;
-            case nlNoisy:
-            case nlDebug:
-              noiselevel = nlDebug;
-              break;
-            default:
-              cerr << "Cannot use both -v and -q." << endl;
-              return false;
-              break;
-            }
-          }
-          break;
-
-        case 'q':
-          {
-            switch (noiselevel)
-            {
-            case nlUnknown:
-              {
-                if (argv[0][2] == 'q')
-                  noiselevel = nlSilent;
-                else
-                  noiselevel = nlQuiet;
-              }
-              break;
-            case nlQuiet:
-            case nlSilent:
-              noiselevel = nlSilent;
-              break;
-            default:
-              cerr << "Cannot use both -v and -q." << endl;
-              return false;
-              break;
-            }
-          }
-          break;
-
-        case '-':
-          {
-            argc--;
-            argv++;
-            options = false;
-            continue;
-          }
-          break;
-        default:
-          {
-            cerr << "Invalid option specified: " << argv[0] << endl;
-            return false;
-          }
-        }
-      }
-      else
-      {
-        list<string> *filenames;
-
-        // If the argument includes wildcard characters, 
-        // search the disk for matching files
-        if (strchr(argv[0], '*') || strchr(argv[0], '?'))
-        {
-          string path;
-          string name;
-          DiskFile::SplitFilename(argv[0], path, name);
-
-          filenames = DiskFile::FindFiles(path, name);
-        }
-        else
-        {
-          //start of shell expanded * patch. -- Michael Evans
-          //The shell might expaned * so, if we have our name and we're creating, then filter for files...
-          if ((parfilename.length() != 0) && (operation == opCreate))
-          {
-#ifdef WIN32
-            if (GetFileAttributes(argv[0]) & FILE_ATTRIBUTE_DIRECTORY) // != 0, but no need...
-#else //Not WIN32, probably *nix
-            struct stat st;
-            if (!(stat(argv[0], &st) == 0 && S_ISREG(st.st_mode)))
-#endif
-            {
-              cerr << "Skipping non-regular file: " << argv[0] << endl;
-              argc--;
-              argv++;
-              options = false;
-              continue;
-            }
-          }//end of shell expanded * patch. -- Michael Evans
-          filenames = new list<string>;
-          filenames->push_back(argv[0]);
-        }
-
-        list<string>::iterator fn = filenames->begin();
-        while (fn != filenames->end())
-        {
-          // Convert filename from command line into a full path + filename
-          string filename = DiskFile::GetCanonicalPathname(*fn);
-
-          // If this is the first file on the command line, then it
-          // is the main PAR2 file.
-          if (parfilename.length() == 0)
-          {
-            // If we are verifying or repairing, the PAR2 file must
-            // already exist
-            if (operation != opCreate)
-            {
-              // Find the last '.' in the filename
-              string::size_type where = filename.find_last_of('.');
-              if (where != string::npos)
-              {
-                // Get what follows the last '.'
-                string tail = filename.substr(where+1);
-
-                if (0 == stricmp(tail.c_str(), "par2"))
-                {
-                  parfilename = filename;
-                  version = verPar2;
-                }
-                else if (0 == stricmp(tail.c_str(), "par") ||
-                         (tail.size() == 3 &&
-                         tolower(tail[0]) == 'p' &&
-                         isdigit(tail[1]) &&
-                         isdigit(tail[2])))
-                {
-                  parfilename = filename;
-                  version = verPar1;
-                }
-              }
-
-              // If we haven't figured out which version of PAR file we
-              // are using from the file extension, then presumable the
-              // files filename was actually the name of a data file.
-              if (version == verUnknown)
-              {
-                // Check for the existence of a PAR2 of PAR file.
-                if (DiskFile::FileExists(filename + ".par2"))
-                {
-                  version = verPar2;
-                  parfilename = filename + ".par2";
-                }
-                else if (DiskFile::FileExists(filename + ".PAR2"))
-                {
-                  version = verPar2;
-                  parfilename = filename + ".PAR2";
-                }
-                else if (DiskFile::FileExists(filename + ".par"))
-                {
-                  version = verPar1;
-                  parfilename = filename + ".par";
-                }
-                else if (DiskFile::FileExists(filename + ".PAR"))
-                {
-                  version = verPar1;
-                  parfilename = filename + ".PAR";
-                }
-              }
-              else
-              {
-                // Does the specified PAR or PAR2 file exist
-                if (!DiskFile::FileExists(filename))
-                {
-                  version = verUnknown;
-                }
-              }
-
-              if (version == verUnknown)
-              {
-                cerr << "The recovery file does not exist: " << filename << endl;
-                return false;
-              }
-            }
-            else
-            {
-              // We are creating a new file
-              version = verPar2;
-              parfilename = filename;
-            }
-          }
-          else
-          {
-            // All other files must exist
-            if (!DiskFile::FileExists(filename))
-            {
-              cerr << "The source file does not exist: " << filename << endl;
-              return false;
-            }
-
-            u64 filesize = DiskFile::GetFileSize(filename);
-
-            // Ignore all 0 byte files
-            if (filesize > 0)
-            {
-              extrafiles.push_back(ExtraFile(filename, filesize));
-
-              // track the total size of the source files and how
-              // big the largest one is.
-              totalsourcesize += filesize;
-              if (largestsourcesize < filesize)
-                largestsourcesize = filesize;
-            }
-            else
-            {
-              cout << "Skipping 0 byte file: " << filename << endl;
-            }
-          }
-
-          ++fn;
-        }
-        delete filenames;
-      }
-    }
-
-    argc--;
-    argv++;
-  }
-
-  if (parfilename.length() == 0)
-  {
-    cerr << "You must specify a Recovery file." << endl;
-    return false;
-  }
-
-  // Default noise level
-  if (noiselevel == nlUnknown)
-  {
-    noiselevel = nlNormal;
-  }
-
-  // If we a creating, check the other parameters
-  if (operation == opCreate)
-  {
-    // If no recovery file size scheme is specified then use Variable
-    if (recoveryfilescheme == scUnknown)
-    {
-      recoveryfilescheme = scVariable;
-    }
-
-    // If neither block count not block size is specified
-    if (blockcount == 0 && blocksize == 0)
-    {
-      // Use a block count of 2000
-      blockcount = 2000;
-    }
-
-    // If we are creating, the source files must be given.
-    if (extrafiles.size() == 0)
-    {
-      // Does the par filename include the ".par2" on the end?
-      if (parfilename.length() > 5 && 0 == stricmp(parfilename.substr(parfilename.length()-5, 5).c_str(), ".par2"))
-      {
-        // Yes it does.
-        cerr << "You must specify a list of files when creating." << endl;
-        return false;
-      }
-      else
-      {
-        // No it does not.
-
-        // In that case check to see if the file exists, and if it does
-        // assume that you wish to create par2 files for it.
-
-        u64 filesize = 0;
-	if (DiskFile::FileExists(parfilename) &&
-            (filesize = DiskFile::GetFileSize(parfilename)) > 0)
-        {
-          extrafiles.push_back(ExtraFile(parfilename, filesize));
-
-          // track the total size of the source files and how
-          // big the largest one is.
-          totalsourcesize += filesize;
-          if (largestsourcesize < filesize)
-            largestsourcesize = filesize;
-        }
-        else
-        {
-          // The file does not exist or it is empty.
-
-          cerr << "You must specify a list of files when creating." << endl;
-          return false;
-        }
-      }
-    }
-
-    // Strip the ".par2" from the end of the filename of the main PAR2 file.
-    if (parfilename.length() > 5 && 0 == stricmp(parfilename.substr(parfilename.length()-5, 5).c_str(), ".par2"))
-    {
-      parfilename = parfilename.substr(0, parfilename.length()-5);
-    }
-
-    // Assume a redundancy of 5% if neither redundancy or recoveryblockcount were set.
-    if (!redundancyset && !recoveryblockcountset)
-    {
-      redundancy = 5;
-    }
-  }
-
-  // Assume a memory limit of 16MB if not specified.
-  if (memorylimit == 0)
-  {
-#ifdef WIN32
-    u64 TotalPhysicalMemory = 0;
-
-    HMODULE hLib = ::LoadLibraryA("kernel32.dll");
-    if (NULL != hLib)
-    {
-      BOOL (WINAPI *pfn)(LPMEMORYSTATUSEX) = (BOOL (WINAPI*)(LPMEMORYSTATUSEX))::GetProcAddress(hLib, "GlobalMemoryStatusEx");
-
-      if (NULL != pfn)
-      {
-        MEMORYSTATUSEX mse;
-        mse.dwLength = sizeof(mse);
-        if (pfn(&mse))
-        {
-          TotalPhysicalMemory = mse.ullTotalPhys;
-        }
-      }
-
-      ::FreeLibrary(hLib);
-    }
-
-    if (TotalPhysicalMemory == 0)
-    {
-      MEMORYSTATUS ms;
-      ::ZeroMemory(&ms, sizeof(ms));
-      ::GlobalMemoryStatus(&ms);
-
-      TotalPhysicalMemory = ms.dwTotalPhys;
-    }
-
-    if (TotalPhysicalMemory == 0)
-    {
-      // Assume 128MB
-      TotalPhysicalMemory = 128 * 1048576;
-    }
-
-    // Half of total physical memory
-    memorylimit = (size_t)(TotalPhysicalMemory / 1048576 / 2);
-#else
-    memorylimit = 16;
-#endif
-  }
-  memorylimit *= 1048576;
-
-  return true;
-}
--- a/Show More
+++ b/Show More