Par2-turbo integration

CMakeLists.txt

@@ -5,26 +5,24 @@ if (PROJECT_SOURCE_DIR STREQUAL PROJECT_BINARY_DIR)
 endif()
 
 set(VERSION "24.4")
-set(PACKAGE "nzbget" CACHE INTERNAL "")
-set(LIBS "" CACHE INTERNAL "")
-set(INCLUDES "" CACHE INTERNAL "")
+set(PACKAGE "nzbget")
+set(LIBS "")
+set(INCLUDES ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+
 set(PACKAGE_BUGREPORT "https://github.com/nzbgetcom/nzbget/issues")
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_C_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_C_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
 set(CMAKE_C_EXTENSIONS OFF)
-set(CMAKE_CONFIGURATION_TYPES "Release" "Debug")
 
 string(REGEX MATCH "^([0-9]+)\\.([0-9]+)" VERSION_MATCH ${VERSION})
 set(VERSION_MAJOR ${CMAKE_MATCH_1})
 set(VERSION_MINOR ${CMAKE_MATCH_2})
 
-add_compile_definitions(HAVE_CONFIG_H=1)
-
 if(NOT CMAKE_BUILD_TYPE)
-	set(CMAKE_BUILD_TYPE "Release" CACHE STRING "")
+	set(CMAKE_BUILD_TYPE "Release")
 endif()
 
 option(BUILD_ONLY_TESTS "Build only tests (for CI)")
@@ -36,61 +34,12 @@ project(
 	LANGUAGES C CXX
 )
 
-if(APPLE)
-	# On macOS Cmake, when cross-compiling, sometimes CMAKE_SYSTEM_PROCESSOR wrongfully stays
-	# the same as CMAKE_HOST_SYSTEM_PROCESSOR regardless the target CPU.
-	# The manual call to set(CMAKE_SYSTEM_PROCESSOR) has to be set after the project() call.
-	# because project() might reset CMAKE_SYSTEM_PROCESSOR back to the value of CMAKE_HOST_SYSTEM_PROCESSOR.
-	# Check if CMAKE_SYSTEM_PROCESSOR is not equal to CMAKE_OSX_ARCHITECTURES
-	if(NOT CMAKE_OSX_ARCHITECTURES STREQUAL "")
-		if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_OSX_ARCHITECTURES)
-			# Split CMAKE_OSX_ARCHITECTURES into a list
-			string(REPLACE ";" " " ARCH_LIST ${CMAKE_OSX_ARCHITECTURES})
-			separate_arguments(ARCH_LIST UNIX_COMMAND ${ARCH_LIST})
-			# Count the number of architectures
-			list(LENGTH ARCH_LIST ARCH_COUNT)
-			# Ensure that exactly one architecture is specified
-			if(NOT ARCH_COUNT EQUAL 1)
-				message(FATAL_ERROR "CMAKE_OSX_ARCHITECTURES must have exactly one value. Current value: ${CMAKE_OSX_ARCHITECTURES}")
-			endif()
-			set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_OSX_ARCHITECTURES})
-			message(STATUS "CMAKE_SYSTEM_PROCESSOR is manually set to ${CMAKE_SYSTEM_PROCESSOR}")
-		endif()
-	endif()
-endif()
-
-if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
-		set(CMAKE_CXX_FLAGS "-O0 -pthread -g -DDEBUG -Weverything -Wno-c++98-compat" CACHE STRING "" FORCE)
-	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-		set(CMAKE_CXX_FLAGS "-O0 -pthread -g -DDEBUG -Wall -Wextra" CACHE STRING "" FORCE)
-	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-		set(CMAKE_CXX_FLAGS "/Od /Zi /MTd /MP /utf-8 /W4 /EHs /DDEBUG /D_DEBUG /DWIN32 /wd4800 /wd4267" CACHE STRING "" FORCE)
-		set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} winmm.lib Dbghelp.lib libcpmtd.lib" CACHE STRING "" FORCE)
-	endif()
-elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
-	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
-		set(CMAKE_CXX_FLAGS "-O2 -g0 -pthread -DNDEBUG -Wno-c++98-compat" CACHE STRING "" FORCE)
-	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
-		set(CMAKE_CXX_FLAGS "-O2 -g0 -pthread -DNDEBUG" CACHE STRING "" FORCE)
-	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-		set(CMAKE_CXX_FLAGS "/O2 /MT /MP /utf-8 /EHs /DNDEBUG /DWIN32 /wd4800 /wd4267" CACHE STRING "" FORCE)
-		set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CXX_STANDARD_LIBRARIES} winmm.lib" CACHE STRING "" FORCE)
-	endif()
-endif()
-
-set(CMAKE_C_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE)
-set(CMAKE_C_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS_DEBUG ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE)
-set(CMAKE_CXX_FLAGS_RELEASE ${CMAKE_CXX_FLAGS} CACHE STRING "" FORCE)
-
-include_directories(${CMAKE_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR})
-
+include(cmake/common.cmake)
 include(daemon/sources.cmake)
 
 if(NOT BUILD_ONLY_TESTS)
 	add_executable(${PACKAGE} ${SRC})
+	target_precompile_headers(${PACKAGE} PRIVATE ${CMAKE_SOURCE_DIR}/daemon/main/nzbget.h)
 
 	if(CMAKE_BUILD_TYPE STREQUAL "Release")
 		add_custom_command(

cmake/common.cmake

@@ -0,0 +1,24 @@
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
+		add_compile_options(-Weverything)
+	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+		add_compile_options(-Wall -Wextra)
+	elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+		add_compile_options(/Zi /MTd /MP /EHs /W4 /utf-8)
+	endif()
+elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
+	if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+		add_compile_options(/MT /Oi /MP /EHs /GR- /W0 /utf-8)
+	else()
+		add_compile_options(-fno-rtti -Wno-unused-function -Wno-unused-variable -Wno-unused-parameter)
+		if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "powerpc")
+			add_compile_options(-fstack-protector)
+		endif()
+	endif()
+
+	if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang")
+		add_compile_options(-Wno-c++98-compat)
+	endif()
+endif()
+
+include(FetchContent)

cmake/par2-turbo.cmake

@@ -0,0 +1,17 @@
+set(FETCHCONTENT_QUIET FALSE)
+FetchContent_Declare(
+	par2-turbo
+	GIT_REPOSITORY  https://github.com/nzbgetcom/par2cmdline-turbo.git
+	GIT_TAG         nzbget
+	TLS_VERIFY	    TRUE
+	GIT_SHALLOW     TRUE
+	GIT_PROGRESS	TRUE
+)
+
+add_compile_definitions(HAVE_CONFIG_H PARPAR_ENABLE_HASHER_MD5CRC)
+set(BUILD_TOOL OFF CACHE BOOL "")
+set(BUILD_LIB ON CACHE BOOL "")
+FetchContent_MakeAvailable(par2-turbo)
+
+set(LIBS ${LIBS} par2-turbo gf16 hasher)
+set(INCLUDES ${INCLUDES} ${par2_SOURCE_DIR}/include)

cmake/posix.cmake

@@ -31,6 +31,29 @@ message(STATUS "  DISABLE CURSES:   ${DISABLE_CURSES}")
 message(STATUS "  DISABLE GZIP:     ${DISABLE_GZIP}")
 message(STATUS "  DISABLE PARCHECK: ${DISABLE_PARCHECK}")
 
+if(APPLE)
+	# On macOS Cmake, when cross-compiling, sometimes CMAKE_SYSTEM_PROCESSOR wrongfully stays
+	# the same as CMAKE_HOST_SYSTEM_PROCESSOR regardless the target CPU.
+	# The manual call to set(CMAKE_SYSTEM_PROCESSOR) has to be set after the project() call.
+	# because project() might reset CMAKE_SYSTEM_PROCESSOR back to the value of CMAKE_HOST_SYSTEM_PROCESSOR.
+	# Check if CMAKE_SYSTEM_PROCESSOR is not equal to CMAKE_OSX_ARCHITECTURES
+	if(NOT CMAKE_OSX_ARCHITECTURES STREQUAL "")
+		if(NOT CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_OSX_ARCHITECTURES)
+			# Split CMAKE_OSX_ARCHITECTURES into a list
+			string(REPLACE ";" " " ARCH_LIST ${CMAKE_OSX_ARCHITECTURES})
+			separate_arguments(ARCH_LIST UNIX_COMMAND ${ARCH_LIST})
+			# Count the number of architectures
+			list(LENGTH ARCH_LIST ARCH_COUNT)
+			# Ensure that exactly one architecture is specified
+			if(NOT ARCH_COUNT EQUAL 1)
+				message(FATAL_ERROR "CMAKE_OSX_ARCHITECTURES must have exactly one value. Current value: ${CMAKE_OSX_ARCHITECTURES}")
+			endif()
+			set(CMAKE_SYSTEM_PROCESSOR ${CMAKE_OSX_ARCHITECTURES})
+			message(STATUS "CMAKE_SYSTEM_PROCESSOR is manually set to ${CMAKE_SYSTEM_PROCESSOR}")
+		endif()
+	endif()
+endif()
+
 if(ENABLE_CLANG_TIDY)
 	set(CMAKE_CXX_CLANG_TIDY clang-tidy -checks=-*,readability-*)
 endif()
@@ -41,9 +64,13 @@ if(ENABLE_STATIC)
 		set(CMAKE_EXE_LINKER_FLAGS_DEBUG "-static" CACHE STRING "" FORCE)
 		set(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -static" CACHE STRING "" FORCE)
 	endif()
+
 	set(BUILD_SHARED_LIBS OFF)
 	set(LIBS ${LIBS} $ENV{LIBS})
 	set(INCLUDES ${INCLUDES} $ENV{INCLUDES})
+
+	# for the sub-projects
+	include_directories($ENV{INCLUDES})
 else()
 	find_package(Threads REQUIRED)
 	find_package(LibXml2 REQUIRED)
@@ -82,20 +109,22 @@ else()
 
 	if(NOT Boost_JSON_FOUND)
 		message(STATUS "The Boost library will be installed from github")
-		include(ExternalProject)
 
 		include(${CMAKE_SOURCE_DIR}/cmake/boost.cmake)
 
 		add_dependencies(${PACKAGE} boost)
 		add_dependencies(yencode boost)
-		add_dependencies(par2 boost)
 		add_dependencies(regex boost)
 	else()
 		set(LIBS ${LIBS} Boost::json)
 		set(INCLUDES ${INCLUDES} ${Boost_INCLUDE_DIR})
 	endif()
 endif()
 
+if(NOT DISABLE_PARCHECK)
+	include(${CMAKE_SOURCE_DIR}/cmake/par2-turbo.cmake)
+endif()
+
 include(CheckIncludeFiles)
 include(CheckLibraryExists)
 include(CheckSymbolExists)

cmake/windows.cmake

@@ -16,7 +16,9 @@ find_package(Threads REQUIRED)
 find_package(LibXml2 REQUIRED)
 find_package(Boost REQUIRED COMPONENTS json)
 
-set(LIBS ${LIBS} Threads::Threads Boost::json LibXml2::LibXml2)
+include(${CMAKE_SOURCE_DIR}/cmake/par2-turbo.cmake)
+
+set(LIBS ${LIBS} Threads::Threads Boost::json LibXml2::LibXml2 winmm.lib)
 set(INCLUDES ${INCLUDES} ${Boost_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
 
 if(NOT DISABLE_TLS)

daemon/main/Options.cpp

@@ -482,7 +482,7 @@ void Options::InitDefaults()
 	SetOption(OPTION_FILENAMING, "article");
 	SetOption(OPTION_PARRENAME, "yes");
 	SetOption(OPTION_PARBUFFER, "16");
-	SetOption(OPTION_PARTHREADS, "1");
+	SetOption(OPTION_PARTHREADS, "0");
 	SetOption(OPTION_RARRENAME, "yes");
 	SetOption(OPTION_HEALTHCHECK, "none");
 	SetOption(OPTION_DIRECTRENAME, "no");

daemon/main/nzbget.h

@@ -22,66 +22,11 @@
 #ifndef NZBGET_H
 #define NZBGET_H
 
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 /***************** DEFINES FOR WINDOWS *****************/
 #ifdef WIN32
 
-/* Define to 1 to not use curses */
-//#define DISABLE_CURSES
-
-/* Define to 1 to disable smart par-verification and restoration */
-//#define DISABLE_PARCHECK
-
-/* Define to 1 to disable TLS/SSL-support. */
-//#define DISABLE_TLS
-
-#ifndef DISABLE_TLS
-/* Define to 1 to use OpenSSL library for TLS/SSL-support */
-#define HAVE_OPENSSL
-/* Define to 1 to use GnuTLS library for TLS/SSL-support */
-//#define HAVE_LIBGNUTLS
-#endif
-
-/* Define to 1 if OpenSSL supports function "X509_check_host". */
-#define HAVE_X509_CHECK_HOST 1
-
-/* Define to the name of macro which returns the name of function being
-compiled */
-#define FUNCTION_MACRO_NAME __FUNCTION__
-
-/* Define to 1 if ctime_r takes 2 arguments */
-#undef HAVE_CTIME_R_2
-
-/* Define to 1 if ctime_r takes 3 arguments */
-#define HAVE_CTIME_R_3
-
-/* Define to 1 if getopt_long is supported */
-#undef HAVE_GETOPT_LONG
-
-/* Define to 1 if variadic macros are supported */
-#define HAVE_VARIADIC_MACROS
-
-/* Define to 1 if function GetAddrInfo is supported */
-#define HAVE_GETADDRINFO
-
-/* Determine what socket length (socklen_t) data type is */
-#define SOCKLEN_T socklen_t
-
-/* Define to 1 if you have the <regex.h> header file. */
-#ifndef DISABLE_REGEX
-#define HAVE_REGEX_H 1
-// Static linking to regex library
-#define REGEX_STATIC
-#endif
-
-#ifndef DISABLE_GZIP
-// Static linking to zlib library
-//#define ZLIB_WINAPI
-#endif
-
 /* Suppress warnings */
 #define _CRT_SECURE_NO_DEPRECATE
 
@@ -204,6 +149,7 @@ compiled */
 #include <inttypes.h>
 
 #include <string>
+#include <string_view>
 #include <vector>
 #include <deque>
 #include <list>
@@ -216,6 +162,9 @@ compiled */
 #include <memory>
 #include <functional>
 #include <thread>
+#include <atomic>
+#include <utility>
+#include <future>
 #include <mutex>
 #include <shared_mutex>
 #include <condition_variable>
@@ -225,13 +174,16 @@ compiled */
 #include <limits>
 #include <type_traits>
 #include <random>
+#include <exception>
 
 #include <libxml/parser.h>
 #include <libxml/xmlreader.h>
 #include <libxml/xmlerror.h>
 #include <libxml/entities.h>
 #include <libxml/tree.h>
 
+#include <boost/asio.hpp>
+
 // NOTE: do not include <iostream> in "nzbget.h". <iostream> contains objects requiring
 // intialization, causing every unit in nzbget to have initialization routine. This in particular
 // is causing fatal problems in SIMD units which must not have static initialization because