mirror of
https://github.com/nzbget/nzbget.git
synced 2025-12-24 06:37:44 -05:00
Compare commits
37 Commits
v21.0-r229
...
develop
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5e26d52d70 | ||
|
|
ae81c9403d | ||
|
|
b0d35f9a09 | ||
|
|
ce7cd631c2 | ||
|
|
0432cf13d3 | ||
|
|
799de88b3e | ||
|
|
7ff3251dcf | ||
|
|
97ae03bbd3 | ||
|
|
6bbfb6b7b7 | ||
|
|
f02bbbefd7 | ||
|
|
4d19c899bd | ||
|
|
1d008bd1f5 | ||
|
|
8c1e62ef49 | ||
|
|
e18c25c231 | ||
|
|
6dbe6edbab | ||
|
|
1ee8e02586 | ||
|
|
f8f9dd2b6d | ||
|
|
414ffcbc35 | ||
|
|
0522b5f49d | ||
|
|
575b823758 | ||
|
|
a124a91a84 | ||
|
|
4546b0f368 | ||
|
|
625e7a61e1 | ||
|
|
f1c1373c7d | ||
|
|
5dda6b2e49 | ||
|
|
81aa56324f | ||
|
|
a8533e7f0a | ||
|
|
bbfcf07689 | ||
|
|
fd35e05b61 | ||
|
|
3e0be12cb3 | ||
|
|
d6e8f67927 | ||
|
|
a159a1ff5a | ||
|
|
15f4955f38 | ||
|
|
aac98b53ee | ||
|
|
fa4a5bb261 | ||
|
|
d19c9b80e7 | ||
|
|
c7716ae9b7 |
41
COPYING
41
COPYING
@@ -1,12 +1,12 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.
|
||||
59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
|
||||
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users. This
|
||||
General Public License applies to most of the Free Software
|
||||
Foundation's software and to any other program whose authors commit to
|
||||
using it. (Some other Free Software Foundation software is covered by
|
||||
the GNU Library General Public License instead.) You can apply it to
|
||||
the GNU Lesser General Public License instead.) You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
@@ -55,8 +55,8 @@ patent must be licensed for everyone's free use or not licensed at all.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License applies to any program or other work which contains
|
||||
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
|
||||
License. (Exception: if the Program itself is interactive but
|
||||
does not normally print such an announcement, your work based on
|
||||
the Program is not required to print an announcement.)
|
||||
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Program,
|
||||
and can be reasonably considered independent and separate works in
|
||||
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
|
||||
access to copy the source code from the same place counts as
|
||||
distribution of the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
|
||||
4. You may not copy, modify, sublicense, or distribute the Program
|
||||
except as expressly provided under this License. Any attempt
|
||||
otherwise to copy, modify, sublicense or distribute the Program is
|
||||
@@ -225,7 +225,7 @@ impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
|
||||
8. If the distribution and/or use of the Program is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Program under this License
|
||||
@@ -255,7 +255,7 @@ make exceptions for this. Our decision will be guided by the two goals
|
||||
of preserving the free status of all derivatives of our free software and
|
||||
of promoting the sharing and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
NO WARRANTY
|
||||
|
||||
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
|
||||
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
|
||||
@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
|
||||
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
|
||||
POSSIBILITY OF SUCH DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
@@ -303,10 +303,9 @@ the "copyright" line and a pointer to where the full notice is found.
|
||||
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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
|
||||
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.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
@@ -336,5 +335,5 @@ necessary. Here is a sample; alter the names:
|
||||
This General Public License does not permit incorporating your program into
|
||||
proprietary programs. If your program is a subroutine library, you may
|
||||
consider it more useful to permit linking proprietary applications with the
|
||||
library. If this is what you want to do, use the GNU Library General
|
||||
Public License instead of this License.
|
||||
library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License.
|
||||
92
ChangeLog
92
ChangeLog
@@ -1,7 +1,97 @@
|
||||
nzbget-21.0:
|
||||
nzbget-21.2-testing:
|
||||
- please see repository change log at
|
||||
https://github.com/nzbget/nzbget/commits/develop
|
||||
|
||||
nzbget-21.1:
|
||||
- fixed crash on systems with 64-bit time;
|
||||
- corrected icon in Windows "uninstall program" list;
|
||||
- allow special characters in URL for username and password;
|
||||
- improved reporting for binding errors on Windows;
|
||||
- fixed unicode space characters in javascript files, which could cause issues
|
||||
with nginx proxy;
|
||||
- fixed negative values for "FileSizeLo" in json-rpc;
|
||||
- corrected url detection in rpc-method "append";
|
||||
- added support for new error messages in unrar 5.80;
|
||||
- now always using snapshots when reading directory contents:
|
||||
- in previous versions snapshots were used on macOS only;
|
||||
- now they are used on all OSes;
|
||||
- this solves issue with leftovers during directory cleanup, which could
|
||||
happen on certain OSes when working with network drives;
|
||||
- fixed file allocating on file systems where sparse files are not supported:
|
||||
- the issue could happen when InterDir was located on a network drive;
|
||||
- fixed crash caused by malformed nzb files;
|
||||
- fixed GROUP command in nserv;
|
||||
- updated url of the global certificate storage file in the build scripts;
|
||||
- fixed: file selector in WebKit based browsers doesn't allow to choose the
|
||||
same file again;
|
||||
- removed outdated links from web interface;
|
||||
- fixed PC sleep mode not working (Windows only);
|
||||
- set "SameSite" attribute for cookies;
|
||||
- corrected typo in about dialog of web interface;
|
||||
- updated license text: changed address of Free Software Foundation and minor
|
||||
formatting changes.
|
||||
|
||||
nzbget-21.0:
|
||||
- reworked duplicate handling to support URLs, especially when using RSS
|
||||
feeds:
|
||||
- queue items added via URLs (to be fetched by nzbget) are no longer
|
||||
immediately fetched;
|
||||
- instead url-items are handled by duplicate check similar to nzb-items
|
||||
and may be placed into history as duplicate backups;
|
||||
- if an url-item needs to be downloaded as backup for a failed other item
|
||||
the nzb-file is fetched via provided URL;
|
||||
- this greatly reduces the number of nzbs fetched from indexers when using
|
||||
RSS feeds and duplicate handling;
|
||||
- improved support for Android devices:
|
||||
- now providing a separate installer package for Android;
|
||||
- the package contains binaries built using Android NDK;
|
||||
- this improves compatibility with Android, in particular with Android 8,
|
||||
where general Linux installer version of NZBGet didn't work anymore due
|
||||
to security changes in Android;
|
||||
- android installer app is updated to use the new android installer package
|
||||
instead of general Linux package;
|
||||
- thoroughly optimised the program to reduce power consumption in idle state:
|
||||
- number of CPU wake ups in idle state has been reduced from hundreds times
|
||||
per second to about only one per second;
|
||||
- optimisations for large queues with thousands of items:
|
||||
- speed up saving of queue state and reduced number of queue state savings;
|
||||
- improved queue state format to reduce amount of state data saved during
|
||||
downloading;
|
||||
- in tests download speed for very large queue (16000 items) has been
|
||||
increased from 45 MB/s to 300 MB/s (comparing to 400 MB/s with small
|
||||
queue);
|
||||
- added native support for aarch64 architecture (ARM 64 Bit CPU) in Linux and
|
||||
Android installers;
|
||||
- force par-check for nzbs without archives;
|
||||
- added functional tests for unpack CRC error;
|
||||
- click on nzbget logo in web-interface now switches to downloads tab instead
|
||||
of showing "About dialog" which has been moved into settings;
|
||||
- improved handling of files splitted via par2;
|
||||
- added python 3 compatibility to EMail.py script;
|
||||
- added python 3 compatibility to Logger.py script;
|
||||
- proper UTF-8 encoding of email content in EMail.py script;
|
||||
- improved error reporting for queue disk state corruption;
|
||||
- updated unrar to 5.7 and 7-zip to 19.0;
|
||||
- Windows installer now includes unrar in 32 bit and 64 bit variants;
|
||||
- allowing wildcards in option AuthorizedIP;
|
||||
- removed suggestion of RC4 cipher;
|
||||
- better description of option UMask;
|
||||
- integrated LGTM code analyser tool into project;
|
||||
- fixed: failed downloads not having any par2- or archive- files were moved to
|
||||
DestDir instead of remaining in InterDir;
|
||||
- fixed crash when using FIPS version of OpenSSL;
|
||||
- fixed compatibility issue with OpenSSL compiled without compression support;
|
||||
- fixed deprecated OpenSSL calls;
|
||||
- fixed potential crash in built-in web-server;
|
||||
- fixed: statistics for session download time and speed may be way off on high
|
||||
load;
|
||||
- fixed many compilation warnings in GCC;
|
||||
- fixed: macOS menubar widget could not connect if password contained special
|
||||
characters;
|
||||
- fixed: remote clients not displaying current download speed;
|
||||
- fixed: remote server could crash when feed with invalid api request;
|
||||
- fixed trimming of relative paths in config.
|
||||
|
||||
nzbget-20.0:
|
||||
- massive performance optimisations in downloader:
|
||||
- improved yEnc decoder;
|
||||
|
||||
15
README.md
15
README.md
@@ -11,14 +11,9 @@
|
||||
NZBGet is a binary downloader, which downloads files from Usenet
|
||||
based on information given in nzb-files.
|
||||
|
||||
NZBGet is written in C++ and is known for its extraordinary performance and efficiency.
|
||||
NZBGet is written in C++ and is known for its performance and efficiency.
|
||||
|
||||
NZBGet can be run on almost every device - classic PCs, NAS, media players, SAT-receivers, WLAN-routers, etc.
|
||||
The download area provides precompiled binaries
|
||||
for Windows, macOS, Linux (compatible with many CPUs and platform variants), FreeBSD and Android. For other platforms
|
||||
the program can be compiled from sources.
|
||||
|
||||
- [Home page (nzbget.net)](http://nzbget.net) - learn more about NZBGet;
|
||||
- [Downloads](http://nzbget.net/download) - get compiled binaries and sources;
|
||||
- [Documentation](http://nzbget.net/documentation) - installation manuals, HOW-TOs, API;
|
||||
- [Forum](http://forum.nzbget.net) - get support, share your ideas, scripts, add-ons.
|
||||
NZBGet can run on almost any device - classic PC, NAS, media player, SAT-receiver, WLAN-router, etc.
|
||||
The download area provides precompiled binaries for Windows, macOS, Linux (compatible with
|
||||
many CPUs and platform variants), FreeBSD and Android. For other platforms
|
||||
the program can be compiled from sources.
|
||||
@@ -3,10 +3,6 @@
|
||||
/* 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
|
||||
|
||||
|
||||
34
configure
vendored
34
configure
vendored
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Guess values for system-dependent variables and create Makefiles.
|
||||
# Generated by GNU Autoconf 2.69 for nzbget 21.0-testing.
|
||||
# Generated by GNU Autoconf 2.69 for nzbget 21.2-testing.
|
||||
#
|
||||
# Report bugs to <hugbug@users.sourceforge.net>.
|
||||
#
|
||||
@@ -580,8 +580,8 @@ MAKEFLAGS=
|
||||
# Identity of this package.
|
||||
PACKAGE_NAME='nzbget'
|
||||
PACKAGE_TARNAME='nzbget'
|
||||
PACKAGE_VERSION='21.0-testing'
|
||||
PACKAGE_STRING='nzbget 21.0-testing'
|
||||
PACKAGE_VERSION='21.2-testing'
|
||||
PACKAGE_STRING='nzbget 21.2-testing'
|
||||
PACKAGE_BUGREPORT='hugbug@users.sourceforge.net'
|
||||
PACKAGE_URL=''
|
||||
|
||||
@@ -1348,7 +1348,7 @@ if test "$ac_init_help" = "long"; then
|
||||
# Omit some internal or obsolete options to make the list less imposing.
|
||||
# This message is too long to be a string in the A/UX 3.1 sh.
|
||||
cat <<_ACEOF
|
||||
\`configure' configures nzbget 21.0-testing to adapt to many kinds of systems.
|
||||
\`configure' configures nzbget 21.2-testing to adapt to many kinds of systems.
|
||||
|
||||
Usage: $0 [OPTION]... [VAR=VALUE]...
|
||||
|
||||
@@ -1419,7 +1419,7 @@ fi
|
||||
|
||||
if test -n "$ac_init_help"; then
|
||||
case $ac_init_help in
|
||||
short | recursive ) echo "Configuration of nzbget 21.0-testing:";;
|
||||
short | recursive ) echo "Configuration of nzbget 21.2-testing:";;
|
||||
esac
|
||||
cat <<\_ACEOF
|
||||
|
||||
@@ -1584,7 +1584,7 @@ fi
|
||||
test -n "$ac_init_help" && exit $ac_status
|
||||
if $ac_init_version; then
|
||||
cat <<\_ACEOF
|
||||
nzbget configure 21.0-testing
|
||||
nzbget configure 21.2-testing
|
||||
generated by GNU Autoconf 2.69
|
||||
|
||||
Copyright (C) 2012 Free Software Foundation, Inc.
|
||||
@@ -2053,7 +2053,7 @@ cat >config.log <<_ACEOF
|
||||
This file contains any messages produced by compilers while
|
||||
running configure, to aid debugging if configure makes a mistake.
|
||||
|
||||
It was created by nzbget $as_me 21.0-testing, which was
|
||||
It was created by nzbget $as_me 21.2-testing, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
$ $0 $@
|
||||
@@ -3026,7 +3026,7 @@ fi
|
||||
|
||||
# Define the identity of the package.
|
||||
PACKAGE='nzbget'
|
||||
VERSION='21.0-testing'
|
||||
VERSION='21.2-testing'
|
||||
|
||||
|
||||
cat >>confdefs.h <<_ACEOF
|
||||
@@ -6611,20 +6611,6 @@ _ACEOF
|
||||
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether dir-browser snapshot workaround is needed" >&5
|
||||
$as_echo_n "checking whether dir-browser snapshot workaround is needed... " >&6; }
|
||||
if test "$target_vendor" == "apple"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
$as_echo "yes" >&6; }
|
||||
|
||||
$as_echo "#define DIRBROWSER_SNAPSHOT 1" >>confdefs.h
|
||||
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for cpu cores via sysconf" >&5
|
||||
$as_echo_n "checking for cpu cores via sysconf... " >&6; }
|
||||
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
|
||||
@@ -9177,7 +9163,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
|
||||
# report actual input values of CONFIG_FILES etc. instead of their
|
||||
# values after options handling.
|
||||
ac_log="
|
||||
This file was extended by nzbget $as_me 21.0-testing, which was
|
||||
This file was extended by nzbget $as_me 21.2-testing, which was
|
||||
generated by GNU Autoconf 2.69. Invocation command line was
|
||||
|
||||
CONFIG_FILES = $CONFIG_FILES
|
||||
@@ -9243,7 +9229,7 @@ _ACEOF
|
||||
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
|
||||
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
|
||||
ac_cs_version="\\
|
||||
nzbget config.status 21.0-testing
|
||||
nzbget config.status 21.2-testing
|
||||
configured by $0, generated by GNU Autoconf 2.69,
|
||||
with options \\"\$ac_cs_config\\"
|
||||
|
||||
|
||||
16
configure.ac
16
configure.ac
@@ -1,7 +1,7 @@
|
||||
#
|
||||
# This file is part of nzbget. See <http://nzbget.net>.
|
||||
#
|
||||
# Copyright (C) 2008-2018 Andrey Prygunkov <hugbug@users.sourceforge.net>
|
||||
# Copyright (C) 2008-2021 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
|
||||
@@ -21,7 +21,7 @@
|
||||
# Process this file with autoconf to produce a configure script.
|
||||
|
||||
AC_PREREQ(2.65)
|
||||
AC_INIT(nzbget, 21.0-testing, hugbug@users.sourceforge.net)
|
||||
AC_INIT(nzbget, 21.2-testing, hugbug@users.sourceforge.net)
|
||||
AC_CONFIG_AUX_DIR(posix)
|
||||
AC_CANONICAL_TARGET
|
||||
AM_INIT_AUTOMAKE([foreign subdir-objects])
|
||||
@@ -222,18 +222,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
|
||||
|
||||
@@ -209,6 +209,8 @@ bool Connection::Bind()
|
||||
return true;
|
||||
}
|
||||
|
||||
int errcode = 0;
|
||||
|
||||
#ifndef WIN32
|
||||
if (m_host && m_host[0] == '/')
|
||||
{
|
||||
@@ -280,6 +282,7 @@ bool Connection::Bind()
|
||||
break;
|
||||
}
|
||||
// Connection failed
|
||||
errcode = GetLastNetworkError();
|
||||
closesocket(m_socket);
|
||||
m_socket = INVALID_SOCKET;
|
||||
}
|
||||
@@ -320,6 +323,7 @@ bool Connection::Bind()
|
||||
if (res == -1)
|
||||
{
|
||||
// Connection failed
|
||||
errcode = GetLastNetworkError();
|
||||
closesocket(m_socket);
|
||||
m_socket = INVALID_SOCKET;
|
||||
}
|
||||
@@ -328,7 +332,7 @@ bool Connection::Bind()
|
||||
|
||||
if (m_socket == INVALID_SOCKET)
|
||||
{
|
||||
ReportError("Binding socket failed for %s", m_host, true);
|
||||
ReportError("Binding socket failed for %s", m_host, true, errcode);
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -785,18 +789,15 @@ bool Connection::ConnectWithTimeout(void* address, int address_len)
|
||||
ret = connect(m_socket, (struct sockaddr*)address, address_len);
|
||||
if (ret < 0)
|
||||
{
|
||||
int err = GetLastNetworkError();
|
||||
#ifdef WIN32
|
||||
int err = WSAGetLastError();
|
||||
if (err != WSAEWOULDBLOCK)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
#else
|
||||
if (errno != EINPROGRESS)
|
||||
if (err != EINPROGRESS)
|
||||
#endif
|
||||
{
|
||||
return false;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
//connect succeeded right away?
|
||||
@@ -916,7 +917,16 @@ void Connection::Cancel()
|
||||
}
|
||||
}
|
||||
|
||||
void Connection::ReportError(const char* msgPrefix, const char* msgArg, bool PrintErrCode, int herrno, const char* herrMsg)
|
||||
int Connection::GetLastNetworkError()
|
||||
{
|
||||
#ifdef WIN32
|
||||
return WSAGetLastError();
|
||||
#else
|
||||
return errno;
|
||||
#endif
|
||||
}
|
||||
|
||||
void Connection::ReportError(const char* msgPrefix, const char* msgArg, bool printErrCode, int errCode, const char* errMsg)
|
||||
{
|
||||
#ifndef DISABLE_TLS
|
||||
if (m_tlsError)
|
||||
@@ -929,34 +939,34 @@ void Connection::ReportError(const char* msgPrefix, const char* msgArg, bool Pri
|
||||
|
||||
BString<1024> errPrefix(msgPrefix, msgArg);
|
||||
|
||||
if (PrintErrCode)
|
||||
if (printErrCode)
|
||||
{
|
||||
#ifdef WIN32
|
||||
int ErrCode = WSAGetLastError();
|
||||
char errMsg[1024];
|
||||
errMsg[0] = '\0';
|
||||
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, ErrCode, 0, errMsg, 1024, nullptr);
|
||||
errMsg[1024-1] = '\0';
|
||||
#else
|
||||
const char* errMsg = herrMsg;
|
||||
int ErrCode = herrno;
|
||||
if (herrno == 0)
|
||||
BString<1024> printErrMsg;
|
||||
if (errCode == 0)
|
||||
{
|
||||
ErrCode = errno;
|
||||
errMsg = strerror(ErrCode);
|
||||
errCode = GetLastNetworkError();
|
||||
}
|
||||
else if (!herrMsg)
|
||||
if (errMsg)
|
||||
{
|
||||
errMsg = hstrerror(ErrCode);
|
||||
}
|
||||
#endif
|
||||
if (m_suppressErrors)
|
||||
{
|
||||
debug("%s: ErrNo %i, %s", *errPrefix, ErrCode, errMsg);
|
||||
printErrMsg = errMsg;
|
||||
}
|
||||
else
|
||||
{
|
||||
PrintError(BString<1024>("%s: ErrNo %i, %s", *errPrefix, ErrCode, errMsg));
|
||||
#ifdef WIN32
|
||||
FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM, nullptr, errCode, 0, printErrMsg, printErrMsg.Capacity(), nullptr);
|
||||
printErrMsg[1024-1] = '\0';
|
||||
#else
|
||||
printErrMsg = strerror(errCode);
|
||||
#endif
|
||||
}
|
||||
|
||||
if (m_suppressErrors)
|
||||
{
|
||||
debug("%s: Error %i - %s", *errPrefix, errCode, (const char*)printErrMsg);
|
||||
}
|
||||
else
|
||||
{
|
||||
PrintError(BString<1024>("%s: Error %i - %s", *errPrefix, errCode, (const char*)printErrMsg));
|
||||
}
|
||||
}
|
||||
else
|
||||
@@ -1074,7 +1084,7 @@ in_addr_t Connection::ResolveHostAddr(const char* host)
|
||||
#endif
|
||||
if (err)
|
||||
{
|
||||
ReportError("Could not resolve hostname %s", host, true, h_errnop);
|
||||
ReportError("Could not resolve hostname %s", host, true, h_errnop, hstrerror(h_errnop));
|
||||
return INADDR_NONE;
|
||||
}
|
||||
|
||||
|
||||
@@ -136,9 +136,10 @@ protected:
|
||||
#endif
|
||||
#endif
|
||||
|
||||
void ReportError(const char* msgPrefix, const char* msgArg, bool PrintErrCode, int herrno = 0,
|
||||
const char* herrMsg = nullptr);
|
||||
void ReportError(const char* msgPrefix, const char* msgArg, bool printErrCode, int errCode = 0,
|
||||
const char* errMsg = nullptr);
|
||||
virtual void PrintError(const char* errMsg);
|
||||
int GetLastNetworkError();
|
||||
bool DoConnect();
|
||||
bool DoDisconnect();
|
||||
bool InitSocketOpts(SOCKET socket);
|
||||
|
||||
@@ -642,8 +642,6 @@ void Options::CheckDir(CString& dir, const char* optionName,
|
||||
|
||||
FileSystem::NormalizePathSeparators((char*)usedir2);
|
||||
dir = usedir2;
|
||||
|
||||
usedir2[usedir2.Length() - 1] = '\0';
|
||||
SetOption(optionName, usedir2);
|
||||
}
|
||||
|
||||
|
||||
@@ -172,7 +172,7 @@ void NntpProcessor::Run()
|
||||
}
|
||||
else if (!strncasecmp(line, "GROUP ", 6))
|
||||
{
|
||||
m_connection->WriteLine(CString::FormatStr("211 0 0 0 %s\r\n", line + 7));
|
||||
m_connection->WriteLine(CString::FormatStr("211 0 0 0 %s\r\n", line + 6));
|
||||
}
|
||||
else if (!strncasecmp(line, "AUTHINFO ", 9))
|
||||
{
|
||||
|
||||
@@ -888,7 +888,8 @@ void UnpackController::AddMessage(Message::EKind kind, const char* text)
|
||||
m_unpackDecryptError = true;
|
||||
}
|
||||
|
||||
if (m_unpacker == upUnrar && !strncmp(text, "Unrar: The specified password is incorrect.", 43))
|
||||
if (m_unpacker == upUnrar && (!strncmp(text, "Unrar: The specified password is incorrect.", 43) ||
|
||||
!strncmp(text, "Unrar: Incorrect password for", 29)))
|
||||
{
|
||||
m_unpackPasswordError = true;
|
||||
}
|
||||
|
||||
@@ -117,6 +117,12 @@ void NzbFile::ParseSubject(FileInfo* fileInfo, bool TryQuotes)
|
||||
{
|
||||
// Example subject: some garbage "title" yEnc (10/99)
|
||||
|
||||
if (!fileInfo->GetSubject())
|
||||
{
|
||||
// Malformed file element without subject. We generate subject using internal element id.
|
||||
fileInfo->SetSubject(CString::FormatStr("%d", fileInfo->GetId()));
|
||||
}
|
||||
|
||||
// strip the "yEnc (10/99)"-suffix
|
||||
BString<1024> subject = fileInfo->GetSubject();
|
||||
char* end = subject + strlen(subject) - 1;
|
||||
|
||||
@@ -253,7 +253,6 @@ void QueueCoordinator::Run()
|
||||
// sleep longer in StandBy
|
||||
if (standBy)
|
||||
{
|
||||
Util::SetStandByMode(true);
|
||||
Guard guard(m_waitMutex);
|
||||
// sleeping max. 2 seconds; can't sleep much longer because we can't rely on
|
||||
// notifications from 'WorkState' and we also have periodical work to do here
|
||||
@@ -280,7 +279,7 @@ void QueueCoordinator::Run()
|
||||
g_StatMeter->IntervalCheck();
|
||||
g_Log->IntervalCheck();
|
||||
AdjustDownloadsLimit();
|
||||
Util::SetStandByMode(false);
|
||||
Util::SetStandByMode(standBy);
|
||||
lastReset = Util::CurrentTime();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -675,7 +675,7 @@ void ListBinCommand::Execute()
|
||||
Util::SplitInt64(remainingSize, &sizeHi, &sizeLo);
|
||||
ListResponse.m_remainingSizeHi = htonl(sizeHi);
|
||||
ListResponse.m_remainingSizeLo = htonl(sizeLo);
|
||||
ListResponse.m_downloadRate = htonl(g_WorkState->GetSpeedLimit());
|
||||
ListResponse.m_downloadLimit = htonl(g_WorkState->GetSpeedLimit());
|
||||
ListResponse.m_downloadPaused = htonl(g_WorkState->GetPauseDownload());
|
||||
ListResponse.m_postPaused = htonl(g_WorkState->GetPausePostProcess());
|
||||
ListResponse.m_scanPaused = htonl(g_WorkState->GetPauseScan());
|
||||
|
||||
@@ -541,9 +541,9 @@ bool RemoteClient::RequestServerList(bool files, bool groups, const char* patter
|
||||
int averageSpeed = (int)(ntohl(ListResponse.m_downloadTimeSec) > 0 ? allBytes / ntohl(ListResponse.m_downloadTimeSec) : 0);
|
||||
printf("Session download rate: %s\n", *Util::FormatSpeed(averageSpeed));
|
||||
|
||||
if (ntohl(ListResponse.m_downloadRate) > 0)
|
||||
if (ntohl(ListResponse.m_downloadLimit) > 0)
|
||||
{
|
||||
printf("Speed limit: %s\n", *Util::FormatSpeed(ntohl(ListResponse.m_downloadRate)));
|
||||
printf("Speed limit: %s\n", *Util::FormatSpeed(ntohl(ListResponse.m_downloadLimit)));
|
||||
}
|
||||
|
||||
int sec = ntohl(ListResponse.m_upTimeSec);
|
||||
|
||||
@@ -222,18 +222,11 @@ void WebProcessor::ParseUrl()
|
||||
if (pauth1 && pauth1 < pauth2)
|
||||
{
|
||||
char* pstart = m_url + 1;
|
||||
int len = 0;
|
||||
char* pend = strchr(pstart + 1, '/');
|
||||
if (pend)
|
||||
{
|
||||
len = (int)(pend - pstart < (int)sizeof(m_authInfo) - 1 ? pend - pstart : (int)sizeof(m_authInfo) - 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
len = strlen(pstart);
|
||||
}
|
||||
char* pend = pauth2;
|
||||
int len = std::min((int)(pend - pstart), (int)sizeof(m_authInfo) - 1);
|
||||
strncpy(m_authInfo, pstart, len);
|
||||
m_authInfo[len] = '\0';
|
||||
WebUtil::UrlDecode(m_authInfo);
|
||||
m_url = CString(pend);
|
||||
}
|
||||
|
||||
@@ -301,9 +294,10 @@ bool WebProcessor::IsAuthorizedIp(const char* remoteAddr)
|
||||
// split option AuthorizedIP into tokens and check each token
|
||||
bool authorized = false;
|
||||
Tokenizer tok(g_Options->GetAuthorizedIp(), ",;");
|
||||
while (const char* iP = tok.Next())
|
||||
while (const char* ip = tok.Next())
|
||||
{
|
||||
if (!strcmp(iP, remoteIp))
|
||||
WildMask mask(ip);
|
||||
if (mask.Match(remoteIp))
|
||||
{
|
||||
authorized = true;
|
||||
break;
|
||||
@@ -465,8 +459,8 @@ void WebProcessor::SendBodyResponse(const char* body, int bodyLen, const char* c
|
||||
"Access-Control-Allow-Credentials: true\r\n"
|
||||
"Access-Control-Max-Age: 86400\r\n"
|
||||
"Access-Control-Allow-Headers: Content-Type, Authorization\r\n"
|
||||
"Set-Cookie: Auth-Type=%s\r\n"
|
||||
"Set-Cookie: Auth-Token=%s; HttpOnly\r\n"
|
||||
"Set-Cookie: Auth-Type=%s; SameSite=Lax\r\n"
|
||||
"Set-Cookie: Auth-Token=%s; HttpOnly; SameSite=Lax\r\n"
|
||||
"Content-Length: %i\r\n"
|
||||
"%s" // Content-Type: xxx
|
||||
"%s" // Content-Encoding: gzip
|
||||
|
||||
@@ -561,9 +561,7 @@ void XmlRpcProcessor::BuildResponse(const char* response, const char* callbackFu
|
||||
void XmlRpcProcessor::BuildErrorResponse(int errCode, const char* errText)
|
||||
{
|
||||
ErrorXmlCommand command(errCode, errText);
|
||||
command.SetRequest(m_request);
|
||||
command.SetProtocol(m_protocol);
|
||||
command.PrepareParams();
|
||||
command.Execute();
|
||||
BuildResponse(command.GetResponse(), "", command.GetFault(), nullptr);
|
||||
}
|
||||
@@ -1445,7 +1443,7 @@ void LogXmlCommand::Execute()
|
||||
|
||||
AppendCondResponse(",\n", IsJson() && index++ > 0);
|
||||
AppendFmtResponse(IsJson() ? JSON_LOG_ITEM : XML_LOG_ITEM,
|
||||
message.GetId(), messageType[message.GetKind()], message.GetTime(),
|
||||
message.GetId(), messageType[message.GetKind()], (int)message.GetTime(),
|
||||
*EncodeStr(message.GetText()));
|
||||
}
|
||||
|
||||
@@ -1552,7 +1550,7 @@ void ListFilesXmlCommand::Execute()
|
||||
AppendCondResponse(",\n", IsJson() && index++ > 0);
|
||||
AppendFmtResponse(IsJson() ? JSON_LIST_ITEM : XML_LIST_ITEM,
|
||||
fileInfo->GetId(), fileSizeLo, fileSizeHi, remainingSizeLo, remainingSizeHi,
|
||||
fileInfo->GetTime(), BoolToStr(fileInfo->GetFilenameConfirmed()),
|
||||
(int)fileInfo->GetTime(), BoolToStr(fileInfo->GetFilenameConfirmed()),
|
||||
BoolToStr(fileInfo->GetPaused()), fileInfo->GetNzbInfo()->GetId(),
|
||||
*xmlNzbNicename, *xmlNzbNicename, *EncodeStr(fileInfo->GetNzbInfo()->GetFilename()),
|
||||
*EncodeStr(fileInfo->GetSubject()), *EncodeStr(fileInfo->GetFilename()),
|
||||
@@ -1750,14 +1748,14 @@ void NzbInfoXmlCommand::AppendNzbInfoFields(NzbInfo* nzbInfo)
|
||||
deleteStatusName[nzbInfo->GetDeleteStatus()], markStatusName[nzbInfo->GetMarkStatus()],
|
||||
urlStatusName[nzbInfo->GetUrlStatus()],
|
||||
fileSizeLo, fileSizeHi, fileSizeMB, nzbInfo->GetFileCount(),
|
||||
nzbInfo->GetMinTime(), nzbInfo->GetMaxTime(),
|
||||
(int)nzbInfo->GetMinTime(), (int)nzbInfo->GetMaxTime(),
|
||||
nzbInfo->GetTotalArticles(), nzbInfo->GetCurrentSuccessArticles(), nzbInfo->GetCurrentFailedArticles(),
|
||||
nzbInfo->CalcHealth(), nzbInfo->CalcCriticalHealth(false),
|
||||
*EncodeStr(nzbInfo->GetDupeKey()), nzbInfo->GetDupeScore(), dupeModeName[nzbInfo->GetDupeMode()],
|
||||
BoolToStr(nzbInfo->GetDeleteStatus() != NzbInfo::dsNone),
|
||||
downloadedSizeLo, downloadedSizeHi, downloadedSizeMB, nzbInfo->GetDownloadSec(),
|
||||
nzbInfo->GetPostTotalSec() + (nzbInfo->GetPostInfo() && nzbInfo->GetPostInfo()->GetStartTime() ?
|
||||
Util::CurrentTime() - nzbInfo->GetPostInfo()->GetStartTime() : 0),
|
||||
(int)(nzbInfo->GetPostTotalSec() + (nzbInfo->GetPostInfo() && nzbInfo->GetPostInfo()->GetStartTime() ?
|
||||
Util::CurrentTime() - nzbInfo->GetPostInfo()->GetStartTime() : 0)),
|
||||
nzbInfo->GetParSec(), nzbInfo->GetRepairSec(), nzbInfo->GetUnpackSec(), messageCount, nzbInfo->GetExtraParBlocks());
|
||||
|
||||
// Post-processing parameters
|
||||
@@ -1858,8 +1856,8 @@ void NzbInfoXmlCommand::AppendPostInfoFields(PostInfo* postInfo, int logEntries,
|
||||
|
||||
AppendFmtResponse(itemStart, *EncodeStr(postInfo->GetProgressLabel()),
|
||||
postInfo->GetStageProgress(),
|
||||
postInfo->GetStageTime() ? curTime - postInfo->GetStageTime() : 0,
|
||||
postInfo->GetStartTime() ? curTime - postInfo->GetStartTime() : 0);
|
||||
(int)(postInfo->GetStageTime() ? curTime - postInfo->GetStageTime() : 0),
|
||||
(int)(postInfo->GetStartTime() ? curTime - postInfo->GetStartTime() : 0));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1886,7 +1884,7 @@ void NzbInfoXmlCommand::AppendPostInfoFields(PostInfo* postInfo, int logEntries,
|
||||
|
||||
AppendCondResponse(",\n", IsJson() && index++ > 0);
|
||||
AppendFmtResponse(IsJson() ? JSON_LOG_ITEM : XML_LOG_ITEM,
|
||||
message.GetId(), messageType[message.GetKind()], message.GetTime(),
|
||||
message.GetId(), messageType[message.GetKind()], (int)message.GetTime(),
|
||||
*EncodeStr(message.GetText()));
|
||||
}
|
||||
}
|
||||
@@ -2240,7 +2238,7 @@ void DownloadXmlCommand::Execute()
|
||||
}
|
||||
}
|
||||
|
||||
if (!strncasecmp(nzbContent, "http://", 6) || !strncasecmp(nzbContent, "https://", 7))
|
||||
if (!strncasecmp(nzbContent, "http://", 7) || !strncasecmp(nzbContent, "https://", 8))
|
||||
{
|
||||
// add url
|
||||
std::unique_ptr<NzbInfo> nzbInfo = std::make_unique<NzbInfo>();
|
||||
@@ -2466,8 +2464,8 @@ void HistoryXmlCommand::Execute()
|
||||
"\"Kind\" : \"%s\",\n"
|
||||
"\"Name\" : \"%s\",\n"
|
||||
"\"HistoryTime\" : %i,\n"
|
||||
"\"FileSizeLo\" : %i,\n"
|
||||
"\"FileSizeHi\" : %i,\n"
|
||||
"\"FileSizeLo\" : %u,\n"
|
||||
"\"FileSizeHi\" : %u,\n"
|
||||
"\"FileSizeMB\" : %i,\n"
|
||||
"\"DupeKey\" : \"%s\",\n"
|
||||
"\"DupeScore\" : %i,\n"
|
||||
@@ -2504,7 +2502,7 @@ void HistoryXmlCommand::Execute()
|
||||
|
||||
AppendFmtResponse(IsJson() ? JSON_HISTORY_ITEM_START : XML_HISTORY_ITEM_START,
|
||||
historyInfo->GetId(), *EncodeStr(historyInfo->GetName()), nzbInfo->GetParkedFileCount(),
|
||||
BoolToStr(nzbInfo->GetCompletedFiles()->size()), historyInfo->GetTime(), status);
|
||||
BoolToStr(nzbInfo->GetCompletedFiles()->size()), (int)historyInfo->GetTime(), status);
|
||||
}
|
||||
else if (historyInfo->GetKind() == HistoryInfo::hkDup)
|
||||
{
|
||||
@@ -2516,7 +2514,7 @@ void HistoryXmlCommand::Execute()
|
||||
|
||||
AppendFmtResponse(IsJson() ? JSON_HISTORY_DUP_ITEM : XML_HISTORY_DUP_ITEM,
|
||||
historyInfo->GetId(), historyInfo->GetId(), "DUP", *EncodeStr(historyInfo->GetName()),
|
||||
historyInfo->GetTime(), fileSizeLo, fileSizeHi, fileSizeMB,
|
||||
(int)historyInfo->GetTime(), fileSizeLo, fileSizeHi, fileSizeMB,
|
||||
*EncodeStr(dupInfo->GetDupeKey()), dupInfo->GetDupeScore(),
|
||||
dupeModeName[dupInfo->GetDupeMode()], dupStatusName[dupInfo->GetStatus()],
|
||||
status);
|
||||
@@ -2838,8 +2836,8 @@ void ViewFeedXmlCommand::Execute()
|
||||
"<member><name>Title</name><value><string>%s</string></value></member>\n"
|
||||
"<member><name>Filename</name><value><string>%s</string></value></member>\n"
|
||||
"<member><name>URL</name><value><string>%s</string></value></member>\n"
|
||||
"<member><name>SizeLo</name><value><i4>%i</i4></value></member>\n"
|
||||
"<member><name>SizeHi</name><value><i4>%i</i4></value></member>\n"
|
||||
"<member><name>SizeLo</name><value><i4>%u</i4></value></member>\n"
|
||||
"<member><name>SizeHi</name><value><i4>%u</i4></value></member>\n"
|
||||
"<member><name>SizeMB</name><value><i4>%i</i4></value></member>\n"
|
||||
"<member><name>Category</name><value><string>%s</string></value></member>\n"
|
||||
"<member><name>AddCategory</name><value><string>%s</string></value></member>\n"
|
||||
@@ -2859,8 +2857,8 @@ void ViewFeedXmlCommand::Execute()
|
||||
"\"Title\" : \"%s\",\n"
|
||||
"\"Filename\" : \"%s\",\n"
|
||||
"\"URL\" : \"%s\",\n"
|
||||
"\"SizeLo\" : %i,\n"
|
||||
"\"SizeHi\" : %i,\n"
|
||||
"\"SizeLo\" : %u,\n"
|
||||
"\"SizeHi\" : %u,\n"
|
||||
"\"SizeMB\" : %i,\n"
|
||||
"\"Category\" : \"%s\",\n"
|
||||
"\"AddCategory\" : \"%s\",\n"
|
||||
@@ -2895,7 +2893,7 @@ void ViewFeedXmlCommand::Execute()
|
||||
*EncodeStr(feedItemInfo.GetTitle()), *EncodeStr(feedItemInfo.GetFilename()),
|
||||
*EncodeStr(feedItemInfo.GetUrl()), sizeLo, sizeHi, sizeMB,
|
||||
*EncodeStr(feedItemInfo.GetCategory()), *EncodeStr(feedItemInfo.GetAddCategory()),
|
||||
BoolToStr(feedItemInfo.GetPauseNzb()), feedItemInfo.GetPriority(), feedItemInfo.GetTime(),
|
||||
BoolToStr(feedItemInfo.GetPauseNzb()), feedItemInfo.GetPriority(), (int)feedItemInfo.GetTime(),
|
||||
matchStatusType[feedItemInfo.GetMatchStatus()], feedItemInfo.GetMatchRule(),
|
||||
*EncodeStr(feedItemInfo.GetDupeKey()), feedItemInfo.GetDupeScore(),
|
||||
dupeModeType[feedItemInfo.GetDupeMode()], statusType[feedItemInfo.GetStatus()]);
|
||||
@@ -3121,11 +3119,11 @@ void ServerVolumesXmlCommand::Execute()
|
||||
"\"ServerID\" : %i,\n"
|
||||
"\"DataTime\" : %i,\n"
|
||||
"\"FirstDay\" : %i,\n"
|
||||
"\"TotalSizeLo\" : %i,\n"
|
||||
"\"TotalSizeHi\" : %i,\n"
|
||||
"\"TotalSizeLo\" : %u,\n"
|
||||
"\"TotalSizeHi\" : %u,\n"
|
||||
"\"TotalSizeMB\" : %i,\n"
|
||||
"\"CustomSizeLo\" : %i,\n"
|
||||
"\"CustomSizeHi\" : %i,\n"
|
||||
"\"CustomSizeLo\" : %u,\n"
|
||||
"\"CustomSizeHi\" : %u,\n"
|
||||
"\"CustomSizeMB\" : %i,\n"
|
||||
"\"CustomTime\" : %i,\n"
|
||||
"\"SecSlot\" : %i,\n"
|
||||
|
||||
@@ -304,10 +304,29 @@ bool FileSystem::AllocateFile(const char* filename, int64 size, bool sparse, CSt
|
||||
errmsg = GetLastErrorMessage();
|
||||
return false;
|
||||
}
|
||||
char c = '0';
|
||||
fwrite(&c, 1, size, file);
|
||||
|
||||
// write zeros in 16K chunks
|
||||
CharBuffer zeros(16 * 1024);
|
||||
memset(zeros, 0, zeros.Size());
|
||||
for (int64 remaining = size; remaining > 0;)
|
||||
{
|
||||
int64 needbytes = std::min(remaining, (int64)zeros.Size());
|
||||
int64 written = fwrite(zeros, 1, needbytes, file);
|
||||
if (written != needbytes)
|
||||
{
|
||||
errmsg = GetLastErrorMessage();
|
||||
fclose(file);
|
||||
return false;
|
||||
}
|
||||
remaining -= written;
|
||||
}
|
||||
fclose(file);
|
||||
|
||||
ok = FileSize(filename) == size;
|
||||
if (!ok)
|
||||
{
|
||||
errmsg = "created file has wrong size";
|
||||
}
|
||||
}
|
||||
#endif
|
||||
return ok;
|
||||
@@ -1020,52 +1039,9 @@ CString FileSystem::WidePathToUtfPath(const wchar_t* wpath)
|
||||
#endif
|
||||
|
||||
|
||||
#ifdef WIN32
|
||||
DirBrowser::DirBrowser(const char* path)
|
||||
{
|
||||
BString<1024> mask("%s%c*.*", path, PATH_SEPARATOR);
|
||||
m_file = FindFirstFileW(FileSystem::UtfPathToWidePath(mask), &m_findData);
|
||||
m_first = true;
|
||||
}
|
||||
|
||||
DirBrowser::~DirBrowser()
|
||||
{
|
||||
if (m_file != INVALID_HANDLE_VALUE)
|
||||
{
|
||||
FindClose(m_file);
|
||||
}
|
||||
}
|
||||
|
||||
const char* DirBrowser::InternNext()
|
||||
{
|
||||
bool ok = false;
|
||||
if (m_first)
|
||||
{
|
||||
ok = m_file != INVALID_HANDLE_VALUE;
|
||||
m_first = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
ok = FindNextFileW(m_file, &m_findData) != 0;
|
||||
}
|
||||
if (ok)
|
||||
{
|
||||
m_filename = FileSystem::WidePathToUtfPath(m_findData.cFileName);
|
||||
return m_filename;
|
||||
}
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#ifdef DIRBROWSER_SNAPSHOT
|
||||
DirBrowser::DirBrowser(const char* path, bool snapshot) :
|
||||
m_snapshot(snapshot)
|
||||
#else
|
||||
DirBrowser::DirBrowser(const char* path)
|
||||
#endif
|
||||
{
|
||||
#ifdef DIRBROWSER_SNAPSHOT
|
||||
if (m_snapshot)
|
||||
{
|
||||
DirBrowser dir(path, false);
|
||||
@@ -1076,35 +1052,57 @@ DirBrowser::DirBrowser(const char* path)
|
||||
m_snapshotIter = m_snapshotFiles.begin();
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
#ifdef WIN32
|
||||
BString<1024> mask("%s%c*.*", path, PATH_SEPARATOR);
|
||||
m_file = FindFirstFileW(FileSystem::UtfPathToWidePath(mask), &m_findData);
|
||||
m_first = true;
|
||||
#else
|
||||
m_dir = opendir(path);
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
DirBrowser::~DirBrowser()
|
||||
{
|
||||
#ifdef DIRBROWSER_SNAPSHOT
|
||||
if (!m_snapshot)
|
||||
#endif
|
||||
#ifdef WIN32
|
||||
if (m_file != INVALID_HANDLE_VALUE)
|
||||
{
|
||||
if (m_dir)
|
||||
{
|
||||
closedir(m_dir);
|
||||
}
|
||||
FindClose(m_file);
|
||||
}
|
||||
#else
|
||||
if (m_dir)
|
||||
{
|
||||
closedir(m_dir);
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
const char* DirBrowser::InternNext()
|
||||
{
|
||||
#ifdef DIRBROWSER_SNAPSHOT
|
||||
if (m_snapshot)
|
||||
{
|
||||
return m_snapshotIter == m_snapshotFiles.end() ? nullptr : **m_snapshotIter++;
|
||||
}
|
||||
else
|
||||
#endif
|
||||
{
|
||||
#ifdef WIN32
|
||||
bool ok = false;
|
||||
if (m_first)
|
||||
{
|
||||
ok = m_file != INVALID_HANDLE_VALUE;
|
||||
m_first = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
ok = FindNextFileW(m_file, &m_findData) != 0;
|
||||
}
|
||||
if (ok)
|
||||
{
|
||||
m_filename = FileSystem::WidePathToUtfPath(m_findData.cFileName);
|
||||
return m_filename;
|
||||
}
|
||||
#else
|
||||
if (m_dir)
|
||||
{
|
||||
m_findData = readdir(m_dir);
|
||||
@@ -1113,10 +1111,10 @@ const char* DirBrowser::InternNext()
|
||||
return m_findData->d_name;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
return nullptr;
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
const char* DirBrowser::Next()
|
||||
{
|
||||
|
||||
@@ -84,18 +84,14 @@ public:
|
||||
class DirBrowser
|
||||
{
|
||||
public:
|
||||
#ifdef DIRBROWSER_SNAPSHOT
|
||||
DirBrowser(const char* path, bool snapshot = true);
|
||||
#else
|
||||
DirBrowser(const char* path);
|
||||
#endif
|
||||
~DirBrowser();
|
||||
const char* Next();
|
||||
|
||||
private:
|
||||
#ifdef WIN32
|
||||
WIN32_FIND_DATAW m_findData;
|
||||
HANDLE m_file;
|
||||
HANDLE m_file = INVALID_HANDLE_VALUE;
|
||||
bool m_first;
|
||||
CString m_filename;
|
||||
#else
|
||||
@@ -103,12 +99,10 @@ private:
|
||||
struct dirent* m_findData;
|
||||
#endif
|
||||
|
||||
#ifdef DIRBROWSER_SNAPSHOT
|
||||
bool m_snapshot;
|
||||
typedef std::deque<CString> FileList;
|
||||
FileList m_snapshotFiles;
|
||||
FileList::iterator m_snapshotIter;
|
||||
#endif
|
||||
|
||||
const char* InternNext();
|
||||
};
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
# This file is part of nzbget
|
||||
#
|
||||
# Copyright (C) 2015-2018 Andrey Prygunkov <hugbug@users.sourceforge.net>
|
||||
# Copyright (C) 2015-2019 Andrey Prygunkov <hugbug@users.sourceforge.net>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@@ -25,7 +25,7 @@ set -o errexit
|
||||
# Uncomment next line for debuging
|
||||
#set -x
|
||||
|
||||
ALLTARGETS="dist i686 x86_64 armel armhf mipsel mipseb ppc6xx ppc500 x86_64-bsd i686-ndk armhf-ndk"
|
||||
ALLTARGETS="dist i686 x86_64 armel armhf aarch64 mipsel mipseb ppc6xx ppc500 x86_64-bsd i686-ndk armhf-ndk aarch64-ndk"
|
||||
ROOT=`pwd`
|
||||
ROOTPATH=$PATH
|
||||
OUTPUTDIR=$ROOT/output
|
||||
@@ -183,7 +183,9 @@ UpdateFromRepository()
|
||||
|
||||
echo "Updating root certificates"
|
||||
cd ../setup
|
||||
curl --remote-name --time-cond cacert.pem https://curl.haxx.se/ca/cacert.pem
|
||||
curl --remote-name --time-cond cacert.pem https://curl.se/ca/cacert.pem
|
||||
# remove expired DST Root CA X3 certificate
|
||||
sed '/^DST Root CA X3$/,/^-----END CERTIFICATE-----$/d;' -i cacert.pem
|
||||
cd $BUILDDIR
|
||||
fi
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
#
|
||||
# This file is part of nzbget. See <http://nzbget.net>.
|
||||
#
|
||||
# Copyright (C) 2015-2018 Andrey Prygunkov <hugbug@users.sourceforge.net>
|
||||
# Copyright (C) 2015-2019 Andrey Prygunkov <hugbug@users.sourceforge.net>
|
||||
#
|
||||
# This program is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
@@ -25,7 +25,7 @@ set -o errexit
|
||||
# Uncomment next line for debuging
|
||||
#set -x
|
||||
|
||||
ALLTARGETS="i686 x86_64 armel armhf mipsel mipseb ppc6xx ppc500 x86_64-bsd i686-ndk x86_64-ndk armhf-ndk aarch64-ndk"
|
||||
ALLTARGETS="i686 x86_64 armel armhf aarch64 mipsel mipseb ppc6xx ppc500 x86_64-bsd i686-ndk x86_64-ndk armhf-ndk aarch64-ndk"
|
||||
ROOT=`pwd`
|
||||
OUTPUTDIR=$ROOT/setup
|
||||
BUILDDIR=temp
|
||||
|
||||
@@ -92,6 +92,7 @@ PrintHelp()
|
||||
PrintArch "x86_64" " x86_64 - x86, 64 Bit"
|
||||
PrintArch "armel" " armel - ARMv5/v6 (ARM9 and ARM11 families)"
|
||||
PrintArch "armhf" " armhf - ARMv7/v8 (Cortex family)"
|
||||
PrintArch "aarch64" " aarch64 - ARMv8, 64 Bit"
|
||||
PrintArch "mipsel" " mipsel - MIPS (little endian)"
|
||||
PrintArch "mipseb" " mipseb - MIPS (big endian)"
|
||||
PrintArch "ppc6xx" " ppc6xx - PowerPC 6xx (603e series)"
|
||||
@@ -188,9 +189,12 @@ DetectArch()
|
||||
armv5*|armv6*|armel)
|
||||
ARCH=armel
|
||||
;;
|
||||
armv7*|armv8*|aarch64)
|
||||
armv7*|armv8*)
|
||||
ARCH=armhf
|
||||
;;
|
||||
aarch64)
|
||||
ARCH=aarch64
|
||||
;;
|
||||
ppc)
|
||||
ARCH=ppcx
|
||||
;;
|
||||
|
||||
29
nzbget.conf
29
nzbget.conf
@@ -225,13 +225,6 @@ Server1.Encryption=no
|
||||
#
|
||||
# See http://nzbget.net/choosing-cipher for details.
|
||||
#
|
||||
# NOTE: One of the fastest cipher is RC4. To select it use the cipher string
|
||||
# "RC4-MD5" (if NZBGet was configured to use OpenSSL) or
|
||||
# "NONE:+VERS-TLS-ALL:+ARCFOUR-128:+RSA:+MD5:+COMP-ALL"
|
||||
# (if NZBGet was configured to use GnuTLS). Note that RC4 is considered insecure
|
||||
# by the IETF (http://tools.ietf.org/html/rfc7465), but may be sufficient for
|
||||
# the usage of NZBGet.
|
||||
#
|
||||
# NOTE: You may get a TLS handshake error if the news server does
|
||||
# not support the chosen cipher. You can also get an error "Could not
|
||||
# select cipher for TLS" if the cipher string is not valid.
|
||||
@@ -404,11 +397,13 @@ SecureKey=
|
||||
|
||||
# IP-addresses allowed to connect without authorization.
|
||||
#
|
||||
# Comma separated list of privileged IPs for easy access to NZBGet
|
||||
# built-in web-server (web-interface and RPC). The connected clients
|
||||
# have full unrestricted access.
|
||||
# List of privileged IPs for easy access to NZBGet built-in web-server
|
||||
# (web-interface and RPC). The connected clients have full unrestricted access.
|
||||
#
|
||||
# Example: 127.0.0.1,192.168.178.2.
|
||||
# Separate entries with commas or semicolons. Use wildcard characters
|
||||
# * and ? for pattern matching.
|
||||
#
|
||||
# Example: 127.0.0.1, 192.168.178.*
|
||||
#
|
||||
# NOTE: Do not use this option if the program works behind another
|
||||
# web-server because all requests will have the address of this server.
|
||||
@@ -454,12 +449,18 @@ UpdateCheck=stable
|
||||
# current user id.
|
||||
DaemonUsername=root
|
||||
|
||||
# Specify default umask (affects file permissions) for newly created
|
||||
# files, POSIX only (000-1000).
|
||||
# Specify default umask, POSIX only (000-1000).
|
||||
#
|
||||
# UMask determines the settings of a mask that controls how file permissions
|
||||
# are set for newly created files and directories. Please note that UMask
|
||||
# doesn't set file permissions directly, it merely filters out certain
|
||||
# permissions. It also has very different effect from command "chmod", which
|
||||
# you shouldn't confuse UMask with. Please read
|
||||
# http://en.wikipedia.org/wiki/Umask for details.
|
||||
#
|
||||
# The value should be written in octal form (the same as for "umask" shell
|
||||
# command).
|
||||
# Empty value or value "1000" disable the setting of umask-mode; current
|
||||
# Empty value or value "1000" disables the setting of umask-mode; current
|
||||
# umask-mode (set via shell) is used in this case.
|
||||
UMask=1000
|
||||
|
||||
|
||||
@@ -80,7 +80,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<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>
|
||||
<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.0-testing";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.2-testing";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
@@ -101,7 +101,7 @@
|
||||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<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>
|
||||
<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.0-testing";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.2-testing";_DEBUG;_CONSOLE;DEBUG;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
|
||||
@@ -120,7 +120,7 @@
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<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>
|
||||
<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.0-testing";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.2-testing";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
@@ -151,7 +151,7 @@
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
<ClCompile>
|
||||
<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>
|
||||
<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.0-testing";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;PACKAGE="nzbget";VERSION="21.2-testing";NDEBUG;_CONSOLE;_WIN32_WINNT=0x0403;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<ExceptionHandling>Sync</ExceptionHandling>
|
||||
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
|
||||
@@ -24,8 +24,6 @@
|
||||
<string>10.7</string>
|
||||
<key>LSUIElement</key>
|
||||
<true/>
|
||||
<key>NSHumanReadableCopyright</key>
|
||||
<string>Copyright © 2007-2018 Andrey Prygunkov</string>
|
||||
<key>NSMainNibFile</key>
|
||||
<string>MainApp</string>
|
||||
<key>NSAppTransportSecurity</key>
|
||||
|
||||
@@ -504,7 +504,6 @@ var Config = (new function($)
|
||||
var $ConfigTabBadgeEmpty;
|
||||
var $ConfigContent;
|
||||
var $ConfigInfo;
|
||||
var $ConfigAbout;
|
||||
var $ConfigTitle;
|
||||
var $ConfigTable;
|
||||
var $ViewButton;
|
||||
@@ -533,7 +532,6 @@ var Config = (new function($)
|
||||
$ConfigTabBadgeEmpty = $('#ConfigTabBadgeEmpty');
|
||||
$ConfigContent = $('#ConfigContent');
|
||||
$ConfigInfo = $('#ConfigInfo');
|
||||
$ConfigAbout = $('#ConfigAbout');
|
||||
$ConfigTitle = $('#ConfigTitle');
|
||||
$ViewButton = $('#Config_ViewButton');
|
||||
$LeaveConfigDialog = $('#LeaveConfigDialog');
|
||||
@@ -829,7 +827,6 @@ var Config = (new function($)
|
||||
else if (option.caption.toLowerCase().indexOf('password') > -1 &&
|
||||
option.name.toLowerCase() !== '*unpack:password')
|
||||
{
|
||||
console.log(option.caption);
|
||||
option.type = 'password';
|
||||
html += '<div class="password-field input-append">' +
|
||||
'<input type="password" id="' + option.formId + '" value="' + Util.textToAttr(value) + '" class="editsmall">'+
|
||||
@@ -879,6 +876,11 @@ var Config = (new function($)
|
||||
|
||||
htmldescr = htmldescr.replace(/&/g, '&');
|
||||
|
||||
// add extra new line after Examples not ended with dot
|
||||
htmldescr = htmldescr.replace(/Example:.*/g, function (match) {
|
||||
return match + (Util.endsWith(match, '.') ? '' : '\n');
|
||||
});
|
||||
|
||||
// replace URLs
|
||||
exp = /(http:\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/ig;
|
||||
htmldescr = htmldescr.replace(exp, "<a href='$1'>$1</a>");
|
||||
@@ -1207,10 +1209,9 @@ var Config = (new function($)
|
||||
$('li', $ConfigNav).removeClass('active');
|
||||
link.closest('li').addClass('active');
|
||||
$ConfigContent.removeClass('search');
|
||||
Util.show($ViewButton, sectionId !== 'Config-Info' && sectionId !== 'Config-About');
|
||||
Util.show($ViewButton, sectionId !== 'Config-Info');
|
||||
|
||||
$ConfigInfo.hide();
|
||||
$ConfigAbout.hide();
|
||||
|
||||
if (sectionId === 'Search')
|
||||
{
|
||||
@@ -1224,15 +1225,7 @@ var Config = (new function($)
|
||||
{
|
||||
$ConfigInfo.show();
|
||||
$ConfigData.children().hide();
|
||||
$ConfigTitle.text('INFO: SETTINGS');
|
||||
return;
|
||||
}
|
||||
|
||||
if (sectionId === 'Config-About')
|
||||
{
|
||||
$ConfigAbout.show();
|
||||
$ConfigData.children().hide();
|
||||
$ConfigTitle.text('ABOUT NZBGET');
|
||||
$ConfigTitle.text('INFO');
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@@ -683,7 +683,7 @@
|
||||
function itemCheckClick(data, event)
|
||||
{
|
||||
var checkmark = $(event.target).hasClass('check');
|
||||
if (data.dragging || (!checkmark && !data.config.rowSelect))
|
||||
if (data.dragging || (!checkmark && !data.config.rowSelect))
|
||||
{
|
||||
return;
|
||||
}
|
||||
@@ -712,7 +712,7 @@
|
||||
function titleCheckClick(data, event)
|
||||
{
|
||||
var checkmark = $(event.target).hasClass('check');
|
||||
if (data.dragging || (!checkmark && !data.config.rowSelect))
|
||||
if (data.dragging || (!checkmark && !data.config.rowSelect))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -538,7 +538,6 @@
|
||||
<div class="span3">
|
||||
<ul class="nav nav-list" id="ConfigNav">
|
||||
<li class="config-static"><a href="#Config-Info">INFO</a></li>
|
||||
<li class="config-static"><a href="#Config-About">ABOUT NZBGET</a></li>
|
||||
<li class="config-static"><a href="#Config-System">SYSTEM</a></li>
|
||||
</ul>
|
||||
</div>
|
||||
@@ -547,7 +546,7 @@
|
||||
<div>
|
||||
|
||||
<div class="config-header clearfix">
|
||||
<div class="pull-left" id="ConfigTitle">INFO: SETTINGS</div>
|
||||
<div class="pull-left" id="ConfigTitle">INFO</div>
|
||||
<div class="btn-group pull-right">
|
||||
<a class="btn dropdown-toggle" id="Config_ViewButton" data-toggle="dropdown">View <span class="caret"></span></a>
|
||||
<ul class="dropdown-menu footer-button-menu" id="Config_ViewMenu">
|
||||
@@ -569,12 +568,6 @@
|
||||
When you configure NZBGet for the first time you need
|
||||
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.
|
||||
</p>
|
||||
<p>
|
||||
There are many configuration options affecting performance. If you use
|
||||
NZBGet on a computer with limited capabilities, such as NAS, media player,
|
||||
router, etc. you should take your time to configure NZBGet for best
|
||||
performance - see <a href="http://nzbget.net/performance-tips">Performance tips</a>.
|
||||
</p>
|
||||
|
||||
<h4>Extension scripts settings</h4>
|
||||
<p>
|
||||
@@ -595,11 +588,6 @@
|
||||
<p>
|
||||
This can be done in section <em><strong>SYSTEM</strong></em>.
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<div id="ConfigAbout">
|
||||
<p>For info on NZBGet poject 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>
|
||||
<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>
|
||||
|
||||
<h4>Copyright</h4>
|
||||
<p>This program is free software; you can redistribute it and/or modify
|
||||
|
||||
@@ -172,13 +172,9 @@ var Upload = (new function($)
|
||||
{
|
||||
var inp = $('#AddDialog_Input');
|
||||
|
||||
// Reset file input control; needed for IE10 but produce problems with opera (the old non-webkit one).
|
||||
if ($.browser.msie)
|
||||
{
|
||||
inp.wrap('<form>').closest('form').get(0).reset();
|
||||
inp.unwrap();
|
||||
}
|
||||
|
||||
// Reset file input control
|
||||
inp.val('');
|
||||
|
||||
inp.click();
|
||||
}
|
||||
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
rem
|
||||
rem This file is part of nzbget
|
||||
rem
|
||||
rem Copyright (C) 2013-2017 Andrey Prygunkov <hugbug@users.sourceforge.net>
|
||||
rem Copyright (C) 2013-2019 Andrey Prygunkov <hugbug@users.sourceforge.net>
|
||||
rem
|
||||
rem This program is free software; you can redistribute it and/or modify
|
||||
rem it under the terms of the GNU General Public License as published by
|
||||
@@ -93,8 +93,10 @@ if errorlevel 1 goto BUILD_FAILED
|
||||
rem Update ca root certificates
|
||||
echo Updating root certificates
|
||||
cd image
|
||||
%CURL% --remote-name --time-cond cacert.pem https://curl.haxx.se/ca/cacert.pem
|
||||
%CURL% --remote-name --time-cond cacert.pem https://curl.se/ca/cacert.pem
|
||||
if errorlevel 1 goto BUILD_FAILED
|
||||
rem remove expired DST Root CA X3 certificate
|
||||
%SED% -e "/^DST Root CA X3$/,/^-----END CERTIFICATE-----$/d;" -i cacert.pem
|
||||
cd ..
|
||||
|
||||
cd tmp\nzbget-%VERSION%
|
||||
@@ -241,6 +243,8 @@ xcopy /E scripts ..\distrib\NZBGet\scripts
|
||||
if errorlevel 1 goto BUILD_FAILED
|
||||
|
||||
copy ..\..\image\* ..\distrib\NZBGet
|
||||
copy ..\..\image\32\* ..\distrib\NZBGet\32
|
||||
copy ..\..\image\64\* ..\distrib\NZBGet\64
|
||||
if errorlevel 1 goto BUILD_FAILED
|
||||
|
||||
del /S ..\distrib\NZBGet\_*.*
|
||||
|
||||
@@ -176,8 +176,9 @@ CreateShortCut "$SMPROGRAMS\NZBGet\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
|
||||
; Add control panel entry for Uninstall
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NZBGet" "DisplayName" "NZBGet"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NZBGet" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NZBGet" "Publisher" "Andrey Prygunkov"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NZBGet" "InstallLocation" "$INSTDIR"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NZBGet" "Publisher" "nzbget.net"
|
||||
WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\NZBGet" "DisplayIcon" "$\"$INSTDIR\nzbget.exe$\",0"
|
||||
|
||||
${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
|
||||
IntFmt $0 "0x%08X" $0
|
||||
|
||||
@@ -15,17 +15,15 @@
|
||||
// Neutral resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// Menu
|
||||
//
|
||||
|
||||
IDR_TRAYMENU MENU
|
||||
IDR_TRAYMENU MENU
|
||||
BEGIN
|
||||
POPUP "Menu"
|
||||
BEGIN
|
||||
@@ -81,20 +79,19 @@ IDI_TRAYICON_WORKING ICON "trayicon_working.ico"
|
||||
// Dialog
|
||||
//
|
||||
|
||||
IDD_ABOUTBOX DIALOGEX 0, 0, 176, 194
|
||||
IDD_ABOUTBOX DIALOGEX 0, 0, 177, 182
|
||||
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
|
||||
CAPTION "About NZBGet"
|
||||
FONT 8, "Tahoma", 400, 0, 0x0
|
||||
BEGIN
|
||||
DEFPUSHBUTTON "OK",IDOK,63,173,50,14
|
||||
CTEXT "Version 15.0-testing-r1200",IDC_ABOUT_VERSION,16,70,144,8
|
||||
CTEXT "Lightweight usenet downloader",IDC_STATIC,16,83,144,8
|
||||
DEFPUSHBUTTON "OK",IDOK,63,161,50,14
|
||||
CTEXT "Version 15.0-testing-r1200",IDC_ABOUT_VERSION,16,70,145,8
|
||||
CTEXT "Lightweight usenet downloader",IDC_STATIC,16,83,145,8
|
||||
CTEXT "http://nzbget.net",IDC_ABOUT_HOMEPAGE,55,144,64,9,SS_NOTIFY
|
||||
CTEXT "Copyright <20> 2007-2018 Andrey Prygunkov",IDC_STATIC,16,156,144,8
|
||||
ICON "",IDC_ABOUT_ICON,67,7,21,20
|
||||
CTEXT "NZBGet",IDC_ABOUT_NAME,16,51,144,16
|
||||
CTEXT "The package includes other software; see program's folder for licenses.",IDC_STATIC,16,121,144,20
|
||||
CTEXT "NZBGet is free software; use it under the terms of the ",IDC_STATIC,16,99,144,20
|
||||
CTEXT "NZBGet",IDC_ABOUT_NAME,16,51,145,16
|
||||
CTEXT "The package includes other software; see program's folder for licenses.",IDC_STATIC,16,121,145,20
|
||||
CTEXT "NZBGet is free software; use it under the terms of the ",IDC_STATIC,16,99,145,20
|
||||
CTEXT "GNU General Public License",IDC_ABOUT_GPL,62,107,90,8,SS_NOTIFY
|
||||
LTEXT ".",IDC_STATIC,151,107,8,8,SS_NOTIFY
|
||||
END
|
||||
@@ -153,14 +150,14 @@ END
|
||||
//
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
GUIDELINES DESIGNINFO
|
||||
GUIDELINES DESIGNINFO
|
||||
BEGIN
|
||||
IDD_ABOUTBOX, DIALOG
|
||||
BEGIN
|
||||
LEFTMARGIN, 16
|
||||
RIGHTMARGIN, 160
|
||||
RIGHTMARGIN, 161
|
||||
TOPMARGIN, 7
|
||||
BOTTOMMARGIN, 187
|
||||
BOTTOMMARGIN, 175
|
||||
END
|
||||
|
||||
IDD_PREFDIALOG, DIALOG
|
||||
@@ -183,6 +180,17 @@ BEGIN
|
||||
END
|
||||
#endif // APSTUDIO_INVOKED
|
||||
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
//
|
||||
// AFX_DIALOG_LAYOUT
|
||||
//
|
||||
|
||||
IDD_ABOUTBOX AFX_DIALOG_LAYOUT
|
||||
BEGIN
|
||||
0
|
||||
END
|
||||
|
||||
#endif // Neutral resources
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
@@ -191,10 +199,8 @@ END
|
||||
// German (Germany) resources
|
||||
|
||||
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
|
||||
#ifdef _WIN32
|
||||
LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
|
||||
#pragma code_page(1252)
|
||||
#endif //_WIN32
|
||||
|
||||
#ifdef APSTUDIO_INVOKED
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user