Commit d9704cc185d7a1af397a8de64633b61aa1d903b9 - nzbget

+30

-1

ChangeLog less more

0		nzbget-21.1:
	0	nzbget-21.2-testing:
1	1	- please see repository change log at
2	2	https://github.com/nzbget/nzbget/commits/develop
	3
	4	nzbget-21.1:
	5	- fixed crash on systems with 64-bit time;
	6	- corrected icon in Windows "uninstall program" list;
	7	- allow special characters in URL for username and password;
	8	- improved reporting for binding errors on Windows;
	9	- fixed unicode space characters in javascript files, which could cause issues
	10	with nginx proxy;
	11	- fixed negative values for "FileSizeLo" in json-rpc;
	12	- corrected url detection in rpc-method "append";
	13	- added support for new error messages in unrar 5.80;
	14	- now always using snapshots when reading directory contents:
	15	- in previous versions snapshots were used on macOS only;
	16	- now they are used on all OSes;
	17	- this solves issue with leftovers during directory cleanup, which could
	18	happen on certain OSes when working with network drives;
	19	- fixed file allocating on file systems where sparse files are not supported:
	20	- the issue could happen when InterDir was located on a network drive;
	21	- fixed crash caused by malformed nzb files;
	22	- fixed GROUP command in nserv;
	23	- updated url of the global certificate storage file in the build scripts;
	24	- fixed: file selector in WebKit based browsers doesn't allow to choose the
	25	same file again;
	26	- removed outdated links from web interface;
	27	- fixed PC sleep mode not working (Windows only);
	28	- set "SameSite" attribute for cookies;
	29	- corrected typo in about dialog of web interface;
	30	- updated license text: changed address of Free Software Foundation and minor
	31	formatting changes.
3	32
4	33	nzbget-21.0:
5	34	- reworked duplicate handling to support URLs, especially when using RSS

+5

-10

README.md less more

10	10	NZBGet is a binary downloader, which downloads files from Usenet
11	11	based on information given in nzb-files.
12	12
13		NZBGet is written in C++ and is known for its extraordinary performance and efficiency.
	13	NZBGet is written in C++ and is known for its performance and efficiency.
14	14
15		NZBGet can be run on almost every device - classic PCs, NAS, media players, SAT-receivers, WLAN-routers, etc.
16		The download area provides precompiled binaries
17		for Windows, macOS, Linux (compatible with many CPUs and platform variants), FreeBSD and Android. For other platforms
18		the program can be compiled from sources.
19
20		- [Home page (nzbget.net)](http://nzbget.net) - learn more about NZBGet;
21		- [Downloads](http://nzbget.net/download) - get compiled binaries and sources;
22		- [Documentation](http://nzbget.net/documentation) - installation manuals, HOW-TOs, API;
23		- [Forum](http://forum.nzbget.net) - get support, share your ideas, scripts, add-ons.
	15	NZBGet can run on almost any device - classic PC, NAS, media player, SAT-receiver, WLAN-router, etc.
	16	The download area provides precompiled binaries for Windows, macOS, Linux (compatible with
	17	many CPUs and platform variants), FreeBSD and Android. For other platforms
	18	the program can be compiled from sources.⏎

+0

-4

config.h.in less more

1	1
2	2	/* Define to 1 to include debug-code */
3	3	#undef DEBUG
4
5		/* Define to 1 if deleting of files during reading of directory is not
6		properly supported by OS */
7		#undef DIRBROWSER_SNAPSHOT
8	4
9	5	/* Define to 1 to not use curses */
10	6	#undef DISABLE_CURSES

+10

-24

configure less more

0	0	#! /bin/sh
1	1	# Guess values for system-dependent variables and create Makefiles.
2		# Generated by GNU Autoconf 2.69 for nzbget 21.1-testing.
	2	# Generated by GNU Autoconf 2.69 for nzbget 21.2-testing.
3	3	#
4	4	# Report bugs to <hugbug@users.sourceforge.net>.
5	5	#

579	579	# Identity of this package.
580	580	PACKAGE_NAME='nzbget'
581	581	PACKAGE_TARNAME='nzbget'
582		PACKAGE_VERSION='21.1-testing'
583		PACKAGE_STRING='nzbget 21.1-testing'
	582	PACKAGE_VERSION='21.2-testing'
	583	PACKAGE_STRING='nzbget 21.2-testing'
584	584	PACKAGE_BUGREPORT='hugbug@users.sourceforge.net'
585	585	PACKAGE_URL=''
586	586

1347	1347	# Omit some internal or obsolete options to make the list less imposing.
1348	1348	# This message is too long to be a string in the A/UX 3.1 sh.
1349	1349	cat <<_ACEOF
1350		\`configure' configures nzbget 21.1-testing to adapt to many kinds of systems.
	1350	\`configure' configures nzbget 21.2-testing to adapt to many kinds of systems.
1351	1351
1352	1352	Usage: $0 [OPTION]... [VAR=VALUE]...
1353	1353

1418	1418
1419	1419	if test -n "$ac_init_help"; then
1420	1420	case $ac_init_help in
1421		short \| recursive ) echo "Configuration of nzbget 21.1-testing:";;
	1421	short \| recursive ) echo "Configuration of nzbget 21.2-testing:";;
1422	1422	esac
1423	1423	cat <<\_ACEOF
1424	1424

1583	1583	test -n "$ac_init_help" && exit $ac_status
1584	1584	if $ac_init_version; then
1585	1585	cat <<\_ACEOF
1586		nzbget configure 21.1-testing
	1586	nzbget configure 21.2-testing
1587	1587	generated by GNU Autoconf 2.69
1588	1588
1589	1589	Copyright (C) 2012 Free Software Foundation, Inc.

2052	2052	This file contains any messages produced by compilers while
2053	2053	running configure, to aid debugging if configure makes a mistake.
2054	2054
2055		It was created by nzbget $as_me 21.1-testing, which was
	2055	It was created by nzbget $as_me 21.2-testing, which was
2056	2056	generated by GNU Autoconf 2.69. Invocation command line was
2057	2057
2058	2058	$ $0 $@

3025	3025
3026	3026	# Define the identity of the package.
3027	3027	PACKAGE='nzbget'
3028		VERSION='21.1-testing'
	3028	VERSION='21.2-testing'
3029	3029
3030	3030
3031	3031	cat >>confdefs.h <<_ACEOF

6610	6610
6611	6611
6612	6612
6613		{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dir-browser snapshot workaround is needed" >&5
6614		$as_echo_n "checking whether dir-browser snapshot workaround is needed... " >&6; }
6615		if test "$target_vendor" == "apple"; then
6616		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
6617		$as_echo "yes" >&6; }
6618
6619		$as_echo "#define DIRBROWSER_SNAPSHOT 1" >>confdefs.h
6620
6621		else
6622		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
6623		$as_echo "no" >&6; }
6624		fi
6625
6626
6627	6613	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpu cores via sysconf" >&5
6628	6614	$as_echo_n "checking for cpu cores via sysconf... " >&6; }
6629	6615	cat confdefs.h - <<_ACEOF >conftest.$ac_ext

9176	9162	# report actual input values of CONFIG_FILES etc. instead of their
9177	9163	# values after options handling.
9178	9164	ac_log="
9179		This file was extended by nzbget $as_me 21.1-testing, which was
	9165	This file was extended by nzbget $as_me 21.2-testing, which was
9180	9166	generated by GNU Autoconf 2.69. Invocation command line was
9181	9167
9182	9168	CONFIG_FILES = $CONFIG_FILES

9242	9228	cat >>$CONFIG_STATUS <<_ACEOF \|\| ac_write_fail=1
9243	9229	ac_cs_config="`$as_echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
9244	9230	ac_cs_version="\\
9245		nzbget config.status 21.1-testing
	9231	nzbget config.status 21.2-testing
9246	9232	configured by $0, generated by GNU Autoconf 2.69,
9247	9233	with options \\"\$ac_cs_config\\"
9248	9234

+2

-14

configure.ac less more

0	0	#
1	1	# This file is part of nzbget. See <http://nzbget.net>.
2	2	#
3		# Copyright (C) 2008-2019 Andrey Prygunkov <hugbug@users.sourceforge.net>
	3	# Copyright (C) 2008-2021 Andrey Prygunkov <hugbug@users.sourceforge.net>
4	4	#
5	5	# This program is free software; you can redistribute it and/or modify
6	6	# it under the terms of the GNU General Public License as published by

20	20	# Process this file with autoconf to produce a configure script.
21	21
22	22	AC_PREREQ(2.65)
23		AC_INIT(nzbget, 21.1-testing, hugbug@users.sourceforge.net)
	23	AC_INIT(nzbget, 21.2-testing, hugbug@users.sourceforge.net)
24	24	AC_CONFIG_AUX_DIR(posix)
25	25	AC_CANONICAL_TARGET
26	26	AM_INIT_AUTOMAKE([foreign subdir-objects])

219	219	AC_MSG_WARN(could not determine)
220	220	SOCKLEN_T=int])])])
221	221	AC_DEFINE_UNQUOTED(SOCKLEN_T, $SOCKLEN_T, [Determine what socket length (socklen_t) data type is])
222
223
224		dnl
225		dnl Dir-browser's snapshot
226		dnl
227		AC_MSG_CHECKING(whether dir-browser snapshot workaround is needed)
228		if test "$target_vendor" == "apple"; then
229		AC_MSG_RESULT([[yes]])
230		AC_DEFINE([DIRBROWSER_SNAPSHOT], 1, [Define to 1 if deleting of files during reading of directory is not properly supported by OS])
231		else
232		AC_MSG_RESULT([[no]])
233		fi
234	222
235	223
236	224	dnl

+43

-33

daemon/connect/Connection.cpp less more

208	208	return true;
209	209	}
210	210
	211	int errcode = 0;
	212
211	213	#ifndef WIN32
212	214	if (m_host && m_host[0] == '/')
213	215	{

279	281	break;
280	282	}
281	283	// Connection failed
	284	errcode = GetLastNetworkError();
282	285	closesocket(m_socket);
283	286	m_socket = INVALID_SOCKET;
284	287	}

319	322	if (res == -1)
320	323	{
321	324	// Connection failed
	325	errcode = GetLastNetworkError();
322	326	closesocket(m_socket);
323	327	m_socket = INVALID_SOCKET;
324	328	}

327	331
328	332	if (m_socket == INVALID_SOCKET)
329	333	{
330		ReportError("Binding socket failed for %s", m_host, true);
	334	ReportError("Binding socket failed for %s", m_host, true, errcode);
331	335	return false;
332	336	}
333	337

784	788	ret = connect(m_socket, (struct sockaddr*)address, address_len);
785	789	if (ret < 0)
786	790	{
	791	int err = GetLastNetworkError();
787	792	#ifdef WIN32
788		int err = WSAGetLastError();
789	793	if (err != WSAEWOULDBLOCK)
790		{
791		return false;
792		}
793	794	#else
794		if (errno != EINPROGRESS)
795		{
796		return false;
797		}
798		#endif
	795	if (err != EINPROGRESS)
	796	#endif
	797	{
	798	return false;
	799	}
799	800	}
800	801
801	802	//connect succeeded right away?

915	916	}
916	917	}
917	918
918		void Connection::ReportError(const char* msgPrefix, const char* msgArg, bool PrintErrCode, int herrno, const char* herrMsg)
	919	int Connection::GetLastNetworkError()
	920	{
	921	#ifdef WIN32
	922	return WSAGetLastError();
	923	#else
	924	return errno;
	925	#endif
	926	}
	927
	928	void Connection::ReportError(const char* msgPrefix, const char* msgArg, bool printErrCode, int errCode, const char* errMsg)
919	929	{
920	930	#ifndef DISABLE_TLS
921	931	if (m_tlsError)

928	938
929	939	BString<1024> errPrefix(msgPrefix, msgArg);
930	940
931		if (PrintErrCode)
932		{
	941	if (printErrCode)
	942	{
	943	BString<1024> printErrMsg;
	944	if (errCode == 0)
	945	{
	946	errCode = GetLastNetworkError();
	947	}
	948	if (errMsg)
	949	{
	950	printErrMsg = errMsg;
	951	}
	952	else
	953	{
933	954	#ifdef WIN32
934		int ErrCode = WSAGetLastError();
935		char errMsg[1024];
936		errMsg[0] = '\0';
937		FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, ErrCode, 0, errMsg, 1024, nullptr);
938		errMsg[1024-1] = '\0';
	955	FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, errCode, 0, printErrMsg, printErrMsg.Capacity(), nullptr);
	956	printErrMsg[1024-1] = '\0';
939	957	#else
940		const char* errMsg = herrMsg;
941		int ErrCode = herrno;
942		if (herrno == 0)
943		{
944		ErrCode = errno;
945		errMsg = strerror(ErrCode);
946		}
947		else if (!herrMsg)
948		{
949		errMsg = hstrerror(ErrCode);
950		}
951		#endif
	958	printErrMsg = strerror(errCode);
	959	#endif
	960	}
	961
952	962	if (m_suppressErrors)
953	963	{
954		debug("%s: ErrNo %i, %s", *errPrefix, ErrCode, errMsg);
	964	debug("%s: Error %i - %s", errPrefix, errCode, (const char)printErrMsg);
955	965	}
956	966	else
957	967	{
958		PrintError(BString<1024>("%s: ErrNo %i, %s", *errPrefix, ErrCode, errMsg));
	968	PrintError(BString<1024>("%s: Error %i - %s", errPrefix, errCode, (const char)printErrMsg));
959	969	}
960	970	}
961	971	else

1073	1083	#endif
1074	1084	if (err)
1075	1085	{
1076		ReportError("Could not resolve hostname %s", host, true, h_errnop);
	1086	ReportError("Could not resolve hostname %s", host, true, h_errnop, hstrerror(h_errnop));
1077	1087	return INADDR_NONE;
1078	1088	}
1079	1089

+3

-2

daemon/connect/Connection.h less more

135	135	#endif
136	136	#endif
137	137
138		void ReportError(const char* msgPrefix, const char* msgArg, bool PrintErrCode, int herrno = 0,
139		const char* herrMsg = nullptr);
	138	void ReportError(const char* msgPrefix, const char* msgArg, bool printErrCode, int errCode = 0,
	139	const char* errMsg = nullptr);
140	140	virtual void PrintError(const char* errMsg);
	141	int GetLastNetworkError();
141	142	bool DoConnect();
142	143	bool DoDisconnect();
143	144	bool InitSocketOpts(SOCKET socket);

+1

-1

daemon/nserv/NntpServer.cpp less more

171	171	}
172	172	else if (!strncasecmp(line, "GROUP ", 6))
173	173	{
174		m_connection->WriteLine(CString::FormatStr("211 0 0 0 %s\r\n", line + 7));
	174	m_connection->WriteLine(CString::FormatStr("211 0 0 0 %s\r\n", line + 6));
175	175	}
176	176	else if (!strncasecmp(line, "AUTHINFO ", 9))
177	177	{

+2

-1

daemon/postprocess/Unpack.cpp less more

887	887	m_unpackDecryptError = true;
888	888	}
889	889
890		if (m_unpacker == upUnrar && !strncmp(text, "Unrar: The specified password is incorrect.", 43))
	890	if (m_unpacker == upUnrar && (!strncmp(text, "Unrar: The specified password is incorrect.", 43) \|\|
	891	!strncmp(text, "Unrar: Incorrect password for", 29)))
891	892	{
892	893	m_unpackPasswordError = true;
893	894	}

+6

-0

daemon/queue/NzbFile.cpp less more

116	116	{
117	117	// Example subject: some garbage "title" yEnc (10/99)
118	118
	119	if (!fileInfo->GetSubject())
	120	{
	121	// Malformed file element without subject. We generate subject using internal element id.
	122	fileInfo->SetSubject(CString::FormatStr("%d", fileInfo->GetId()));
	123	}
	124
119	125	// strip the "yEnc (10/99)"-suffix
120	126	BString<1024> subject = fileInfo->GetSubject();
121	127	char* end = subject + strlen(subject) - 1;

+5

-12

daemon/remote/WebServer.cpp less more

221	221	if (pauth1 && pauth1 < pauth2)
222	222	{
223	223	char* pstart = m_url + 1;
224		int len = 0;
225		char* pend = strchr(pstart + 1, '/');
226		if (pend)
227		{
228		len = (int)(pend - pstart < (int)sizeof(m_authInfo) - 1 ? pend - pstart : (int)sizeof(m_authInfo) - 1);
229		}
230		else
231		{
232		len = strlen(pstart);
233		}
	224	char* pend = pauth2;
	225	int len = std::min((int)(pend - pstart), (int)sizeof(m_authInfo) - 1);
234	226	strncpy(m_authInfo, pstart, len);
235	227	m_authInfo[len] = '\0';
	228	WebUtil::UrlDecode(m_authInfo);
236	229	m_url = CString(pend);
237	230	}
238	231

465	458	"Access-Control-Allow-Credentials: true\r\n"
466	459	"Access-Control-Max-Age: 86400\r\n"
467	460	"Access-Control-Allow-Headers: Content-Type, Authorization\r\n"
468		"Set-Cookie: Auth-Type=%s\r\n"
469		"Set-Cookie: Auth-Token=%s; HttpOnly\r\n"
	461	"Set-Cookie: Auth-Type=%s; SameSite=Lax\r\n"
	462	"Set-Cookie: Auth-Token=%s; HttpOnly; SameSite=Lax\r\n"
470	463	"Content-Length: %i\r\n"
471	464	"%s" // Content-Type: xxx
472	465	"%s" // Content-Encoding: gzip

+22

-22

daemon/remote/XmlRpc.cpp less more

1442	1442
1443	1443	AppendCondResponse(",\n", IsJson() && index++ > 0);
1444	1444	AppendFmtResponse(IsJson() ? JSON_LOG_ITEM : XML_LOG_ITEM,
1445		message.GetId(), messageType[message.GetKind()], message.GetTime(),
	1445	message.GetId(), messageType[message.GetKind()], (int)message.GetTime(),
1446	1446	*EncodeStr(message.GetText()));
1447	1447	}
1448	1448

1549	1549	AppendCondResponse(",\n", IsJson() && index++ > 0);
1550	1550	AppendFmtResponse(IsJson() ? JSON_LIST_ITEM : XML_LIST_ITEM,
1551	1551	fileInfo->GetId(), fileSizeLo, fileSizeHi, remainingSizeLo, remainingSizeHi,
1552		fileInfo->GetTime(), BoolToStr(fileInfo->GetFilenameConfirmed()),
	1552	(int)fileInfo->GetTime(), BoolToStr(fileInfo->GetFilenameConfirmed()),
1553	1553	BoolToStr(fileInfo->GetPaused()), fileInfo->GetNzbInfo()->GetId(),
1554	1554	xmlNzbNicename, xmlNzbNicename, *EncodeStr(fileInfo->GetNzbInfo()->GetFilename()),
1555	1555	EncodeStr(fileInfo->GetSubject()), EncodeStr(fileInfo->GetFilename()),

1747	1747	deleteStatusName[nzbInfo->GetDeleteStatus()], markStatusName[nzbInfo->GetMarkStatus()],
1748	1748	urlStatusName[nzbInfo->GetUrlStatus()],
1749	1749	fileSizeLo, fileSizeHi, fileSizeMB, nzbInfo->GetFileCount(),
1750		nzbInfo->GetMinTime(), nzbInfo->GetMaxTime(),
	1750	(int)nzbInfo->GetMinTime(), (int)nzbInfo->GetMaxTime(),
1751	1751	nzbInfo->GetTotalArticles(), nzbInfo->GetCurrentSuccessArticles(), nzbInfo->GetCurrentFailedArticles(),
1752	1752	nzbInfo->CalcHealth(), nzbInfo->CalcCriticalHealth(false),
1753	1753	*EncodeStr(nzbInfo->GetDupeKey()), nzbInfo->GetDupeScore(), dupeModeName[nzbInfo->GetDupeMode()],
1754	1754	BoolToStr(nzbInfo->GetDeleteStatus() != NzbInfo::dsNone),
1755	1755	downloadedSizeLo, downloadedSizeHi, downloadedSizeMB, nzbInfo->GetDownloadSec(),
1756		nzbInfo->GetPostTotalSec() + (nzbInfo->GetPostInfo() && nzbInfo->GetPostInfo()->GetStartTime() ?
1757		Util::CurrentTime() - nzbInfo->GetPostInfo()->GetStartTime() : 0),
	1756	(int)(nzbInfo->GetPostTotalSec() + (nzbInfo->GetPostInfo() && nzbInfo->GetPostInfo()->GetStartTime() ?
	1757	Util::CurrentTime() - nzbInfo->GetPostInfo()->GetStartTime() : 0)),
1758	1758	nzbInfo->GetParSec(), nzbInfo->GetRepairSec(), nzbInfo->GetUnpackSec(), messageCount, nzbInfo->GetExtraParBlocks());
1759	1759
1760	1760	// Post-processing parameters

1855	1855
1856	1856	AppendFmtResponse(itemStart, *EncodeStr(postInfo->GetProgressLabel()),
1857	1857	postInfo->GetStageProgress(),
1858		postInfo->GetStageTime() ? curTime - postInfo->GetStageTime() : 0,
1859		postInfo->GetStartTime() ? curTime - postInfo->GetStartTime() : 0);
	1858	(int)(postInfo->GetStageTime() ? curTime - postInfo->GetStageTime() : 0),
	1859	(int)(postInfo->GetStartTime() ? curTime - postInfo->GetStartTime() : 0));
1860	1860	}
1861	1861	else
1862	1862	{

1883	1883
1884	1884	AppendCondResponse(",\n", IsJson() && index++ > 0);
1885	1885	AppendFmtResponse(IsJson() ? JSON_LOG_ITEM : XML_LOG_ITEM,
1886		message.GetId(), messageType[message.GetKind()], message.GetTime(),
	1886	message.GetId(), messageType[message.GetKind()], (int)message.GetTime(),
1887	1887	*EncodeStr(message.GetText()));
1888	1888	}
1889	1889	}

2237	2237	}
2238	2238	}
2239	2239
2240		if (!strncasecmp(nzbContent, "http://", 6) \|\| !strncasecmp(nzbContent, "https://", 7))
	2240	if (!strncasecmp(nzbContent, "http://", 7) \|\| !strncasecmp(nzbContent, "https://", 8))
2241	2241	{
2242	2242	// add url
2243	2243	std::unique_ptr<NzbInfo> nzbInfo = std::make_unique<NzbInfo>();

2463	2463	"\"Kind\" : \"%s\",\n"
2464	2464	"\"Name\" : \"%s\",\n"
2465	2465	"\"HistoryTime\" : %i,\n"
2466		"\"FileSizeLo\" : %i,\n"
2467		"\"FileSizeHi\" : %i,\n"
	2466	"\"FileSizeLo\" : %u,\n"
	2467	"\"FileSizeHi\" : %u,\n"
2468	2468	"\"FileSizeMB\" : %i,\n"
2469	2469	"\"DupeKey\" : \"%s\",\n"
2470	2470	"\"DupeScore\" : %i,\n"

2501	2501
2502	2502	AppendFmtResponse(IsJson() ? JSON_HISTORY_ITEM_START : XML_HISTORY_ITEM_START,
2503	2503	historyInfo->GetId(), *EncodeStr(historyInfo->GetName()), nzbInfo->GetParkedFileCount(),
2504		BoolToStr(nzbInfo->GetCompletedFiles()->size()), historyInfo->GetTime(), status);
	2504	BoolToStr(nzbInfo->GetCompletedFiles()->size()), (int)historyInfo->GetTime(), status);
2505	2505	}
2506	2506	else if (historyInfo->GetKind() == HistoryInfo::hkDup)
2507	2507	{

2513	2513
2514	2514	AppendFmtResponse(IsJson() ? JSON_HISTORY_DUP_ITEM : XML_HISTORY_DUP_ITEM,
2515	2515	historyInfo->GetId(), historyInfo->GetId(), "DUP", *EncodeStr(historyInfo->GetName()),
2516		historyInfo->GetTime(), fileSizeLo, fileSizeHi, fileSizeMB,
	2516	(int)historyInfo->GetTime(), fileSizeLo, fileSizeHi, fileSizeMB,
2517	2517	*EncodeStr(dupInfo->GetDupeKey()), dupInfo->GetDupeScore(),
2518	2518	dupeModeName[dupInfo->GetDupeMode()], dupStatusName[dupInfo->GetStatus()],
2519	2519	status);

2835	2835	"<member><name>Title</name><value><string>%s</string></value></member>\n"
2836	2836	"<member><name>Filename</name><value><string>%s</string></value></member>\n"
2837	2837	"<member><name>URL</name><value><string>%s</string></value></member>\n"
2838		"<member><name>SizeLo</name><value><i4>%i</i4></value></member>\n"
2839		"<member><name>SizeHi</name><value><i4>%i</i4></value></member>\n"
	2838	"<member><name>SizeLo</name><value><i4>%u</i4></value></member>\n"
	2839	"<member><name>SizeHi</name><value><i4>%u</i4></value></member>\n"
2840	2840	"<member><name>SizeMB</name><value><i4>%i</i4></value></member>\n"
2841	2841	"<member><name>Category</name><value><string>%s</string></value></member>\n"
2842	2842	"<member><name>AddCategory</name><value><string>%s</string></value></member>\n"

2856	2856	"\"Title\" : \"%s\",\n"
2857	2857	"\"Filename\" : \"%s\",\n"
2858	2858	"\"URL\" : \"%s\",\n"
2859		"\"SizeLo\" : %i,\n"
2860		"\"SizeHi\" : %i,\n"
	2859	"\"SizeLo\" : %u,\n"
	2860	"\"SizeHi\" : %u,\n"
2861	2861	"\"SizeMB\" : %i,\n"
2862	2862	"\"Category\" : \"%s\",\n"
2863	2863	"\"AddCategory\" : \"%s\",\n"

2892	2892	EncodeStr(feedItemInfo.GetTitle()), EncodeStr(feedItemInfo.GetFilename()),
2893	2893	*EncodeStr(feedItemInfo.GetUrl()), sizeLo, sizeHi, sizeMB,
2894	2894	EncodeStr(feedItemInfo.GetCategory()), EncodeStr(feedItemInfo.GetAddCategory()),
2895		BoolToStr(feedItemInfo.GetPauseNzb()), feedItemInfo.GetPriority(), feedItemInfo.GetTime(),
	2895	BoolToStr(feedItemInfo.GetPauseNzb()), feedItemInfo.GetPriority(), (int)feedItemInfo.GetTime(),
2896	2896	matchStatusType[feedItemInfo.GetMatchStatus()], feedItemInfo.GetMatchRule(),
2897	2897	*EncodeStr(feedItemInfo.GetDupeKey()), feedItemInfo.GetDupeScore(),
2898	2898	dupeModeType[feedItemInfo.GetDupeMode()], statusType[feedItemInfo.GetStatus()]);

3118	3118	"\"ServerID\" : %i,\n"
3119	3119	"\"DataTime\" : %i,\n"
3120	3120	"\"FirstDay\" : %i,\n"
3121		"\"TotalSizeLo\" : %i,\n"
3122		"\"TotalSizeHi\" : %i,\n"
	3121	"\"TotalSizeLo\" : %u,\n"
	3122	"\"TotalSizeHi\" : %u,\n"
3123	3123	"\"TotalSizeMB\" : %i,\n"
3124		"\"CustomSizeLo\" : %i,\n"
3125		"\"CustomSizeHi\" : %i,\n"
	3124	"\"CustomSizeLo\" : %u,\n"
	3125	"\"CustomSizeHi\" : %u,\n"
3126	3126	"\"CustomSizeMB\" : %i,\n"
3127	3127	"\"CustomTime\" : %i,\n"
3128	3128	"\"SecSlot\" : %i,\n"

+59

-61

daemon/util/FileSystem.cpp less more

303	303	errmsg = GetLastErrorMessage();
304	304	return false;
305	305	}
306		char c = '0';
307		fwrite(&c, 1, size, file);
	306
	307	// write zeros in 16K chunks
	308	CharBuffer zeros(16 * 1024);
	309	memset(zeros, 0, zeros.Size());
	310	for (int64 remaining = size; remaining > 0;)
	311	{
	312	int64 needbytes = std::min(remaining, (int64)zeros.Size());
	313	int64 written = fwrite(zeros, 1, needbytes, file);
	314	if (written != needbytes)
	315	{
	316	errmsg = GetLastErrorMessage();
	317	fclose(file);
	318	return false;
	319	}
	320	remaining -= written;
	321	}
308	322	fclose(file);
	323
309	324	ok = FileSize(filename) == size;
	325	if (!ok)
	326	{
	327	errmsg = "created file has wrong size";
	328	}
310	329	}
311	330	#endif
312	331	return ok;

1019	1038	#endif
1020	1039
1021	1040
1022		#ifdef WIN32
1023		DirBrowser::DirBrowser(const char* path)
1024		{
1025		BString<1024> mask("%s%c.", path, PATH_SEPARATOR);
1026		m_file = FindFirstFileW(FileSystem::UtfPathToWidePath(mask), &m_findData);
1027		m_first = true;
1028		}
1029
1030		DirBrowser::~DirBrowser()
1031		{
1032		if (m_file != INVALID_HANDLE_VALUE)
1033		{
1034		FindClose(m_file);
1035		}
1036		}
1037
1038		const char* DirBrowser::InternNext()
1039		{
1040		bool ok = false;
1041		if (m_first)
1042		{
1043		ok = m_file != INVALID_HANDLE_VALUE;
1044		m_first = false;
1045		}
1046		else
1047		{
1048		ok = FindNextFileW(m_file, &m_findData) != 0;
1049		}
1050		if (ok)
1051		{
1052		m_filename = FileSystem::WidePathToUtfPath(m_findData.cFileName);
1053		return m_filename;
1054		}
1055		return nullptr;
1056		}
1057
1058		#else
1059
1060		#ifdef DIRBROWSER_SNAPSHOT
1061	1041	DirBrowser::DirBrowser(const char* path, bool snapshot) :
1062	1042	m_snapshot(snapshot)
1063		#else
1064		DirBrowser::DirBrowser(const char* path)
1065		#endif
1066		{
1067		#ifdef DIRBROWSER_SNAPSHOT
	1043	{
1068	1044	if (m_snapshot)
1069	1045	{
1070	1046	DirBrowser dir(path, false);

1075	1051	m_snapshotIter = m_snapshotFiles.begin();
1076	1052	}
1077	1053	else
1078		#endif
1079		{
	1054	{
	1055	#ifdef WIN32
	1056	BString<1024> mask("%s%c.", path, PATH_SEPARATOR);
	1057	m_file = FindFirstFileW(FileSystem::UtfPathToWidePath(mask), &m_findData);
	1058	m_first = true;
	1059	#else
1080	1060	m_dir = opendir(path);
	1061	#endif
1081	1062	}
1082	1063	}
1083	1064
1084	1065	DirBrowser::~DirBrowser()
1085	1066	{
1086		#ifdef DIRBROWSER_SNAPSHOT
1087		if (!m_snapshot)
1088		#endif
1089		{
1090		if (m_dir)
1091		{
1092		closedir(m_dir);
1093		}
1094		}
	1067	#ifdef WIN32
	1068	if (m_file != INVALID_HANDLE_VALUE)
	1069	{
	1070	FindClose(m_file);
	1071	}
	1072	#else
	1073	if (m_dir)
	1074	{
	1075	closedir(m_dir);
	1076	}
	1077	#endif
1095	1078	}
1096	1079
1097	1080	const char* DirBrowser::InternNext()
1098	1081	{
1099		#ifdef DIRBROWSER_SNAPSHOT
1100	1082	if (m_snapshot)
1101	1083	{
1102	1084	return m_snapshotIter == m_snapshotFiles.end() ? nullptr : **m_snapshotIter++;
1103	1085	}
1104	1086	else
1105		#endif
1106		{
	1087	{
	1088	#ifdef WIN32
	1089	bool ok = false;
	1090	if (m_first)
	1091	{
	1092	ok = m_file != INVALID_HANDLE_VALUE;
	1093	m_first = false;
	1094	}
	1095	else
	1096	{
	1097	ok = FindNextFileW(m_file, &m_findData) != 0;
	1098	}
	1099	if (ok)
	1100	{
	1101	m_filename = FileSystem::WidePathToUtfPath(m_findData.cFileName);
	1102	return m_filename;
	1103	}
	1104	#else
1107	1105	if (m_dir)
1108	1106	{
1109	1107	m_findData = readdir(m_dir);

1112	1110	return m_findData->d_name;
1113	1111	}
1114	1112	}
	1113	#endif
1115	1114	return nullptr;
1116	1115	}
1117	1116	}
1118		#endif
1119	1117
1120	1118	const char* DirBrowser::Next()
1121	1119	{

+1

-7

daemon/util/FileSystem.h less more

83	83	class DirBrowser
84	84	{
85	85	public:
86		#ifdef DIRBROWSER_SNAPSHOT
87	86	DirBrowser(const char* path, bool snapshot = true);
88		#else
89		DirBrowser(const char* path);
90		#endif
91	87	~DirBrowser();
92	88	const char* Next();
93	89
94	90	private:
95	91	#ifdef WIN32
96	92	WIN32_FIND_DATAW m_findData;
97		HANDLE m_file;
	93	HANDLE m_file = INVALID_HANDLE_VALUE;
98	94	bool m_first;
99	95	CString m_filename;
100	96	#else

102	98	struct dirent* m_findData;
103	99	#endif
104	100
105		#ifdef DIRBROWSER_SNAPSHOT
106	101	bool m_snapshot;
107	102	typedef std::deque<CString> FileList;
108	103	FileList m_snapshotFiles;
109	104	FileList::iterator m_snapshotIter;
110		#endif
111	105
112	106	const char* InternNext();
113	107	};

+6

-0

debian/changelog less more

	0	nzbget (21.2~r2333-1) UNRELEASED; urgency=low
	1
	2	* New upstream release.
	3
	4	-- Debian Janitor <janitor@jelmer.uk> Wed, 16 Mar 2022 01:37:58 -0000
	5
0	6	nzbget (21.1~r2311+dfsg-2) experimental; urgency=medium
1	7
2	8	* Update standards version

+3

-1

linux/build-nzbget less more

182	182
183	183	echo "Updating root certificates"
184	184	cd ../setup
185		curl --remote-name --time-cond cacert.pem https://curl.haxx.se/ca/cacert.pem
	185	curl --remote-name --time-cond cacert.pem https://curl.se/ca/cacert.pem
	186	# remove expired DST Root CA X3 certificate
	187	sed '/^DST Root CA X3$/,/^-----END CERTIFICATE-----$/d;' -i cacert.pem
186	188	cd $BUILDDIR
187	189	fi
188	190	}

+4

-4

nzbget.vcxproj less more

79	79	<ClCompile>
80	80	<Optimization>Disabled</Optimization>
81	81	<AdditionalIncludeDirectories>.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\par2;.\lib\yencode;.\windows\resources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82		<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.1-testing";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
	82	<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.2-testing";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
83	83	<MinimalRebuild>false</MinimalRebuild>
84	84	<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
85	85	<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

100	100	<ClCompile>
101	101	<Optimization>Disabled</Optimization>
102	102	<AdditionalIncludeDirectories>.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\par2;.\lib\yencode;.\windows\resources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
103		<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.1-testing";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
	103	<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.2-testing";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
104	104	<MinimalRebuild>false</MinimalRebuild>
105	105	<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
106	106	<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

119	119	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|Win32'">
120	120	<ClCompile>
121	121	<AdditionalIncludeDirectories>.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\par2;.\lib\yencode;.\windows\resources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
122		<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.1-testing";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
	122	<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.2-testing";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
123	123	<ExceptionHandling>Sync</ExceptionHandling>
124	124	<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
125	125	<PrecompiledHeader>Use</PrecompiledHeader>

150	150	<ItemDefinitionGroup Condition="'$(Configuration)\|$(Platform)'=='Release\|x64'">
151	151	<ClCompile>
152	152	<AdditionalIncludeDirectories>.\daemon\connect;.\daemon\extension;.\daemon\feed;.\daemon\frontend;.\daemon\main;.\daemon\nserv;.\daemon\nntp;.\daemon\postprocess;.\daemon\queue;.\daemon\remote;.\daemon\util;.\daemon\windows;.\lib\par2;.\lib\yencode;.\windows\resources;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
153		<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.1-testing";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
	153	<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.2-testing";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
154	154	<ExceptionHandling>Sync</ExceptionHandling>
155	155	<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
156	156	<PrecompiledHeader>Use</PrecompiledHeader>

+2

-13

webui/config.js less more

503	503	var $ConfigTabBadgeEmpty;
504	504	var $ConfigContent;
505	505	var $ConfigInfo;
506		var $ConfigAbout;
507	506	var $ConfigTitle;
508	507	var $ConfigTable;
509	508	var $ViewButton;

532	531	$ConfigTabBadgeEmpty = $('#ConfigTabBadgeEmpty');
533	532	$ConfigContent = $('#ConfigContent');
534	533	$ConfigInfo = $('#ConfigInfo');
535		$ConfigAbout = $('#ConfigAbout');
536	534	$ConfigTitle = $('#ConfigTitle');
537	535	$ViewButton = $('#Config_ViewButton');
538	536	$LeaveConfigDialog = $('#LeaveConfigDialog');

1210	1208	$('li', $ConfigNav).removeClass('active');
1211	1209	link.closest('li').addClass('active');
1212	1210	$ConfigContent.removeClass('search');
1213		Util.show($ViewButton, sectionId !== 'Config-Info' && sectionId !== 'Config-About');
	1211	Util.show($ViewButton, sectionId !== 'Config-Info');
1214	1212
1215	1213	$ConfigInfo.hide();
1216		$ConfigAbout.hide();
1217	1214
1218	1215	if (sectionId === 'Search')
1219	1216	{

1227	1224	{
1228	1225	$ConfigInfo.show();
1229	1226	$ConfigData.children().hide();
1230		$ConfigTitle.text('INFO: SETTINGS');
1231		return;
1232		}
1233
1234		if (sectionId === 'Config-About')
1235		{
1236		$ConfigAbout.show();
1237		$ConfigData.children().hide();
1238		$ConfigTitle.text('NZBGET ' + Options.option('version'));
	1227	$ConfigTitle.text('INFO');
1239	1228	return;
1240	1229	}
1241	1230

+2

-2

webui/fasttable.js less more

682	682	function itemCheckClick(data, event)
683	683	{
684	684	var checkmark = $(event.target).hasClass('check');
685		if (data.dragging \|\| (!checkmark && !data.config.rowSelect))
	685	if (data.dragging \|\| (!checkmark && !data.config.rowSelect))
686	686	{
687	687	return;
688	688	}

711	711	function titleCheckClick(data, event)
712	712	{
713	713	var checkmark = $(event.target).hasClass('check');
714		if (data.dragging \|\| (!checkmark && !data.config.rowSelect))
	714	if (data.dragging \|\| (!checkmark && !data.config.rowSelect))
715	715	{
716	716	return;
717	717	}

+1

-13

webui/index.html less more

537	537	<div class="span3">
538	538	<ul class="nav nav-list" id="ConfigNav">
539	539	<li class="config-static"><a href="#Config-Info">INFO</a></li>
540		<li class="config-static"><a href="#Config-About">ABOUT NZBGET</a></li>
541	540	<li class="config-static"><a href="#Config-System">SYSTEM</a></li>
542	541	</ul>
543	542	</div>

546	545	<div>
547	546
548	547	<div class="config-header clearfix">
549		<div class="pull-left" id="ConfigTitle">INFO: SETTINGS</div>
	548	<div class="pull-left" id="ConfigTitle">INFO</div>
550	549	<div class="btn-group pull-right">
551	550	<a class="btn dropdown-toggle" id="Config_ViewButton" data-toggle="dropdown">View <span class="caret"></span></a>
552	551	<ul class="dropdown-menu footer-button-menu" id="Config_ViewMenu">

568	567	When you configure NZBGet for the first time you need
569	568	to check at least the option <a class="option" href="#" data-category="S" onclick="Config.scrollToOption(event, this)">MainDir</a> and configure one news server.
570	569	</p>
571		<p>
572		There are many configuration options affecting performance. If you use
573		NZBGet on a computer with limited capabilities, such as NAS, media player,
574		router, etc. you should take your time to configure NZBGet for best
575		performance - see <a href="http://nzbget.net/performance-tips">Performance tips</a>.
576		</p>
577	570
578	571	<h4>Extension scripts settings</h4>
579	572	<p>

594	587	<p>
595	588	This can be done in section <em><strong>SYSTEM</strong></em>.
596	589	</p>
597		</div>
598
599		<div id="ConfigAbout">
600		<p>For info on NZBGet project please visit <a href="http://nzbget.net">NZBGet Home Page</a>. Among other things the developers of third-party apps find there complete docs about RPC interface.</p>
601		<p>Should you need help, have suggestions or want to share your improvements - <a href="http://nzbget.net/forum">NZBGet Forum</a> is a place to do that.</p>
602	590
603	591	<h4>Copyright</h4>
604	592	<p>This program is free software; you can redistribute it and/or modify

+3

-7

webui/upload.js less more

171	171	{
172	172	var inp = $('#AddDialog_Input');
173	173
174		// Reset file input control; needed for IE10 but produce problems with opera (the old non-webkit one).
175		if ($.browser.msie)
176		{
177		inp.wrap('<form>').closest('form').get(0).reset();
178		inp.unwrap();
179		}
180
	174	// Reset file input control
	175	inp.val('');
	176
181	177	inp.click();
182	178	}
183	179